diff --git a/apps/csbie-server/src/routes/mcp.ts b/apps/csbie-server/src/routes/mcp.ts
index 552ace6..1a1aab5 100644
--- a/apps/csbie-server/src/routes/mcp.ts
+++ b/apps/csbie-server/src/routes/mcp.ts
@@ -99,8 +99,22 @@ const confirmationIdFromPreview = (value: unknown) => {
   return typeof confirmationId === 'string' && confirmationId ? confirmationId : undefined
 }
 
-const accountTypeSchema = z.enum(['general', 'specific', 'nisa', 'juniorNisa', 'unknown'])
-const depositTypeSchema = z.enum(['general', 'specific', 'nisa', 'juniorNisa', 'unknown'])
+const accountTypeSchema = z.enum([
+  'general',
+  'specific',
+  'growthInvestment',
+  'nisa',
+  'juniorNisa',
+  'unknown',
+])
+const depositTypeSchema = z.enum([
+  'general',
+  'specific',
+  'growthInvestment',
+  'nisa',
+  'juniorNisa',
+  'unknown',
+])
 const tradeSideSchema = z.enum(['buy', 'sell'])
 const marketCodeSchema = z.string().min(1).describe('SBI market code')
 const issueCodeSchema = z.string().min(1).describe('Issue code')
@@ -202,6 +216,9 @@ const cashOrderPriceConditionSchema = z.enum([
 ])
 
 const cashOrderSchema = stockOrderBaseSchema.extend({
+  preOrderMarket: marketCodeSchema
+    .optional()
+    .describe('APK pre-order market for S-kabu; live S-kabu orders still send STK'),
   price: z.number().positive().optional().describe('Order price for price-based orders'),
   kind: z.enum(['market', 'limit', 'stop', 'oco', 'ifd', 'ifdo', 's', 'unknown']).optional(),
   priceCondition: cashOrderPriceConditionSchema
@@ -219,21 +236,92 @@ const cashOrderSchema = stockOrderBaseSchema.extend({
     .optional()
     .describe('Secondary execution condition for OCO orders'),
   secondaryPrice: z.number().positive().optional().describe('Secondary price for OCO orders'),
+  ippanMarginPaymentLimit: z
+    .string()
+    .optional()
+    .describe('APK ippan margin payment-limit code from board/pre-order information'),
   sorLastMarket: marketCodeSchema
     .optional()
     .describe('Previous market code sent with SOR orders; defaults to login profile'),
 })
 
+const cashOrderPreOrderSchema = z.object({
+  issueCode: issueCodeSchema,
+  market: marketCodeSchema,
+  side: tradeSideSchema,
+  accountType: accountTypeSchema.optional(),
+  depositType: depositTypeSchema.optional(),
+  kind: z.enum(['s']).optional().describe('Requests APK S-kabu pre-order constraints'),
+  preOrderMarket: marketCodeSchema.optional().describe('APK pre-order market for S-kabu checks'),
+})
+
+const stockOrderMarginPositionSchema = z.object({
+  openTradeDate: z
+    .string()
+    .describe('Open trade date from the margin position record, in yyyyMMdd or yyyy-MM-dd format'),
+  openPrice: z
+    .union([z.number().positive(), z.string().min(1)])
+    .describe('Open price from the margin position record'),
+  quantity: z
+    .union([z.number().positive(), z.string().min(1)])
+    .describe('Selected quantity from the margin position record'),
+  orgNewTradeDate: z.string().describe('Original new-trade date from the margin position record'),
+  bargainMarketCode: marketCodeSchema.describe(
+    'Bargain market code from the margin position record',
+  ),
+})
+
 const placeCashOrderSchema = cashOrderSchema.extend({
   confirmationId: z
     .string()
     .optional()
     .describe('Confirmation ID returned by the confirmation step'),
+  omitConfirmation: z
+    .boolean()
+    .optional()
+    .describe('APK confirmation-screen omission flag for live submit calls'),
   allowTrading: z.literal(true).optional().describe('Explicitly allows sending a live order'),
 })
 
 const orderCorrectionSchema = z.object({
+  orderNumber: z
+    .string()
+    .min(1)
+    .optional()
+    .describe('Order number shown in order inquiry; required by the mobile pre-correction route'),
   orderId: orderIdSchema,
+  issueCode: issueCodeSchema.optional().describe('Issue code from the pre-correction response'),
+  market: marketCodeSchema.optional().describe('Market code from the pre-correction response'),
+  tradeId: z.string().min(1).optional().describe('Original trade id code'),
+  correctionType: z.string().min(1).optional().describe('Additional correction flag'),
+  status: z.string().min(1).optional().describe('Original order status code'),
+  rbeOrderStatus: z.string().min(1).optional().describe('Original RBE order status code'),
+  depositTypeText: z.string().min(1).optional().describe('Display deposit type text'),
+  orderMethod: z.enum(['normal', 'stop', 'oco']).optional().describe('Primary order method'),
+  priceCondition: cashOrderPriceConditionSchema
+    .optional()
+    .describe('Corrected primary execution condition'),
+  triggerZone: z.enum(['above', 'below']).optional().describe('Stop trigger direction'),
+  triggerPrice: z.number().positive().optional().describe('Stop trigger price'),
+  secondaryPriceCondition: cashOrderPriceConditionSchema
+    .optional()
+    .describe('Secondary/OCO execution condition'),
+  secondaryPrice: z.number().positive().optional().describe('Secondary/OCO price'),
+  ifdPriceCondition: cashOrderPriceConditionSchema
+    .optional()
+    .describe('IFD follow-up execution condition for IF/IFDOCO correction'),
+  ifdPrice: z.number().positive().optional().describe('IFD follow-up price'),
+  ifdOrderMethod: z
+    .enum(['normal', 'stop', 'oco'])
+    .optional()
+    .describe('IFD follow-up special order method'),
+  ifdTriggerZone: z.enum(['above', 'below']).optional().describe('IFD stop trigger direction'),
+  ifdTriggerPrice: z.number().positive().optional().describe('IFD stop trigger price'),
+  ifdSecondaryPriceCondition: cashOrderPriceConditionSchema
+    .optional()
+    .describe('IFD secondary/OCO execution condition'),
+  ifdSecondaryPrice: z.number().positive().optional().describe('IFD secondary/OCO price'),
+  correctionControlFlag: z.enum(['1', '2']).optional().describe('Mobile correction control flag'),
   quantity: z.number().positive().optional().describe('Corrected order quantity'),
   price: z.number().positive().optional().describe('Corrected order price'),
 })
@@ -260,13 +348,40 @@ const placeOrderCancelSchema = orderCancelSchema.extend({
     .describe('Explicitly allows sending a live cancellation request'),
 })
 
-const marginOpenOrderSchema = cashOrderSchema
+const marginOpenTradeTypeSchema = z.enum([
+  'standard',
+  'generalBuy',
+  'generalSellShort',
+  'generalSellInventoryLimited',
+  'generalSellInventoryUnlimited',
+  'day',
+  'hyper',
+])
+
+const marginOpenOrderSchema = cashOrderSchema.extend({
+  kind: z.enum(['market', 'limit', 'stop', 'oco', 'ifd', 'ifdo', 'unknown']).optional(),
+  marginTradeType: marginOpenTradeTypeSchema.describe('APK margin-open trade type'),
+  ippanMarginPaymentLimit: z
+    .string()
+    .optional()
+    .describe('APK ippan margin payment-limit code from board/pre-order information'),
+})
+
+const marginOpenOrderPreOrderSchema = stockOrderBaseSchema.omit({ quantity: true }).extend({
+  marginTradeType: marginOpenTradeTypeSchema
+    .optional()
+    .describe('APK margin-open trade type used by the mobile pre-order request'),
+})
 
 const placeMarginOpenOrderSchema = marginOpenOrderSchema.extend({
   confirmationId: z
     .string()
     .optional()
     .describe('Confirmation ID returned by the confirmation step'),
+  omitConfirmation: z
+    .boolean()
+    .optional()
+    .describe('APK confirmation-screen omission flag for live submit calls'),
   allowTrading: z
     .literal(true)
     .optional()
@@ -275,9 +390,31 @@ const placeMarginOpenOrderSchema = marginOpenOrderSchema.extend({
 
 const marginCloseOrderSchema = cashOrderSchema.extend({
   positionId: positionIdSchema.optional().describe('Position ID to close'),
+  marginCloseTradeType: z
+    .enum(['sixMonth', 'noLimit', 'oneDay', 'fifteenDay'])
+    .describe('APK margin-close trade type'),
+  marginPositions: z
+    .array(stockOrderMarginPositionSchema)
+    .optional()
+    .describe('Margin position records selected for specified close orders'),
+  marginClosePositionOrder: z
+    .enum(['profitFirst', 'lossFirst', 'newestFirst', 'oldestFirst', 'specify'])
+    .optional()
+    .describe('APK close-position ordering used by summary close orders'),
+})
+
+const marginCloseOrderPreOrderSchema = stockOrderBaseSchema.omit({ quantity: true }).extend({
+  marginCloseTradeType: z
+    .enum(['sixMonth', 'noLimit', 'oneDay', 'fifteenDay'])
+    .optional()
+    .describe('APK margin-close trade type used by the mobile pre-order request'),
 })
 
 const placeMarginCloseOrderSchema = marginCloseOrderSchema.extend({
+  omitConfirmation: z
+    .boolean()
+    .optional()
+    .describe('APK confirmation-screen omission flag for live submit calls'),
   allowTrading: z
     .literal(true)
     .optional()
@@ -293,6 +430,22 @@ const actualDeliveryOrderSchema = z.object({
   price: z.number().positive().optional().describe('Order price for price-based requests'),
   kind: z.enum(['genbiki', 'genwatashi']),
   positionId: positionIdSchema.optional().describe('Position ID to deliver'),
+  marginPositions: z
+    .array(stockOrderMarginPositionSchema)
+    .optional()
+    .describe('Margin position records selected for genbiki/genwatashi delivery'),
+  ippanMarginPaymentLimit: z
+    .string()
+    .optional()
+    .describe('APK ippan margin payment-limit code from board/pre-order information'),
+})
+
+const actualDeliveryOrderPreOrderSchema = actualDeliveryOrderSchema.omit({
+  quantity: true,
+  price: true,
+  positionId: true,
+  marginPositions: true,
+  ippanMarginPaymentLimit: true,
 })
 
 const placeActualDeliveryOrderSchema = actualDeliveryOrderSchema.extend({
@@ -300,6 +453,10 @@ const placeActualDeliveryOrderSchema = actualDeliveryOrderSchema.extend({
     .string()
     .optional()
     .describe('Confirmation ID returned by the confirmation step'),
+  omitConfirmation: z
+    .boolean()
+    .optional()
+    .describe('APK confirmation-screen omission flag for live submit calls'),
   allowTrading: z
     .literal(true)
     .optional()
@@ -311,6 +468,39 @@ const ifdOrderSchema = cashOrderSchema.extend({
     .enum(['cash', 'marginOpen'])
     .optional()
     .describe('Product to use for the first IFD leg'),
+  marginTradeType: marginOpenTradeTypeSchema
+    .optional()
+    .describe('APK margin-open trade type for the first leg when tradeType is marginOpen'),
+  ippanMarginPaymentLimit: z
+    .string()
+    .optional()
+    .describe('APK ippan margin payment-limit code for the first IFD leg'),
+  ifdPriceCondition: cashOrderPriceConditionSchema
+    .optional()
+    .describe('Execution condition for the IFD follow-up leg'),
+  ifdPrice: z.number().positive().optional().describe('Order price for the IFD follow-up leg'),
+  ifdOrderTerm: z.enum(['day', 'week', 'date']).optional().describe('IFD follow-up validity term'),
+  ifdOrderDate: z
+    .string()
+    .optional()
+    .describe('IFD follow-up validity date in yyyyMMdd or yyyy-MM-dd format'),
+  ifdOrderMethod: z
+    .enum(['normal', 'stop', 'oco'])
+    .optional()
+    .describe('Special order method for the IFD follow-up leg'),
+  ifdTriggerZone: z
+    .enum(['above', 'below'])
+    .optional()
+    .describe('Stop trigger direction for the IFD follow-up leg'),
+  ifdTriggerPrice: z
+    .number()
+    .positive()
+    .optional()
+    .describe('Stop trigger price for the IFD follow-up leg'),
+  ifdSecondaryPriceCondition: cashOrderPriceConditionSchema
+    .optional()
+    .describe('Secondary OCO execution condition for IFDOCO'),
+  ifdSecondaryPrice: z.number().positive().optional().describe('Secondary OCO price for IFDOCO'),
 })
 
 const placeIfdOrderSchema = ifdOrderSchema.extend({
@@ -318,15 +508,58 @@ const placeIfdOrderSchema = ifdOrderSchema.extend({
     .string()
     .optional()
     .describe('Confirmation ID returned by the confirmation step'),
+  omitConfirmation: z
+    .boolean()
+    .optional()
+    .describe('APK confirmation-screen omission flag for live submit calls'),
   allowTrading: z.literal(true).optional().describe('Explicitly allows sending a live IFD order'),
 })
 
 const themeInvestmentOrderSchema = z.object({
   themeId: z.string().min(1).describe('Theme ID for the theme investment order'),
+  themeSetYyyymm: z
+    .string()
+    .length(6)
+    .describe('Theme set year/month (`theme_set_yyyymm`) from the mobile APK handoff'),
+  themeCourse: z
+    .union([z.number().int().nonnegative(), z.string().min(1).max(2)])
+    .describe('Theme course (`theme_course`) from the mobile APK handoff'),
   side: tradeSideSchema,
+  accountType: accountTypeSchema.optional().describe('Account/deposit type used for the order'),
+  depositType: accountTypeSchema.optional().describe('Deposit type used for the order'),
+  components: z
+    .array(
+      z.object({
+        issueCode: issueCodeSchema,
+        quantity: z.union([z.number().positive(), z.string().min(1)]),
+      }),
+    )
+    .min(1)
+    .max(10)
+    .describe('Component stock orders selected by the mobile theme investment flow'),
   amount: z.number().positive().optional().describe('Order amount for the theme investment order'),
 })
 
+const themeInvestmentPreOrderSchema = z.object({
+  themeId: z.string().min(1).describe('Theme ID from the mobile theme investment handoff'),
+  themeName: z
+    .string()
+    .min(1)
+    .optional()
+    .describe('Theme name from the mobile theme investment handoff'),
+  exchangeCode: marketCodeSchema.describe('Exchange code used by the mobile pre-order call'),
+  components: z
+    .array(
+      z.object({
+        issueCode: issueCodeSchema,
+        quantity: z.union([z.number().positive(), z.string().min(1)]).optional(),
+      }),
+    )
+    .min(1)
+    .max(10)
+    .describe('Component stocks selected by the mobile theme investment flow'),
+})
+
 const placeThemeInvestmentOrderSchema = themeInvestmentOrderSchema.extend({
   allowTrading: z
     .literal(true)
@@ -366,6 +599,7 @@ const methodParamSchemas = {
   'watchlist.list': undefined,
   'orders.inquiry.executionsToday': orderInquiryOptionsSchema.optional(),
   'orders.inquiry.open': orderInquiryOptionsSchema.optional(),
+  'orders.cash.preOrder': cashOrderPreOrderSchema,
   'orders.cash.estimate': cashOrderSchema,
   'orders.cash.place': placeCashOrderSchema,
   'orders.cash.estimateCorrection': orderCorrectionSchema,
@@ -373,23 +607,26 @@ const methodParamSchemas = {
   'orders.cash.placeCorrection': placeOrderCorrectionSchema,
   'orders.cash.estimateCancel': orderCancelSchema,
   'orders.cash.placeCancel': placeOrderCancelSchema,
+  'orders.margin.preOrderOpen': marginOpenOrderPreOrderSchema,
   'orders.margin.estimateOpen': marginOpenOrderSchema,
   'orders.margin.open': placeMarginOpenOrderSchema,
+  'orders.margin.preOrderClose': marginCloseOrderPreOrderSchema,
   'orders.margin.estimateClose': marginCloseOrderSchema,
   'orders.margin.close': placeMarginCloseOrderSchema,
   'orders.margin.estimateCloseSummary': marginCloseOrderSchema,
   'orders.margin.closeSummary': placeMarginCloseOrderSchema,
   'orders.margin.estimateSummary': marginCloseOrderSchema,
   'orders.margin.placeSummary': placeMarginCloseOrderSchema,
+  'orders.margin.preOrderActualDelivery': actualDeliveryOrderPreOrderSchema,
   'orders.margin.estimateActualDelivery': actualDeliveryOrderSchema,
   'orders.margin.actualDelivery': placeActualDeliveryOrderSchema,
   'orders.ifd.estimate': ifdOrderSchema,
   'orders.ifd.place': placeIfdOrderSchema,
   'orders.ifd.estimateCorrection': orderCorrectionSchema,
   'orders.ifd.placeCorrection': placeOrderCorrectionSchema,
-  'orders.ifd.estimateCancel': orderCorrectionSchema,
-  'orders.ifd.placeCancel': placeOrderCorrectionSchema,
-  'orders.themeInvestment.list': undefined,
+  'orders.ifd.estimateCancel': orderCancelSchema,
+  'orders.ifd.placeCancel': placeOrderCancelSchema,
+  'orders.themeInvestment.list': themeInvestmentPreOrderSchema,
   'orders.themeInvestment.estimate': themeInvestmentOrderSchema,
   'orders.themeInvestment.place': placeThemeInvestmentOrderSchema,
 } satisfies Record<RpcMethod, z.ZodType | undefined>
diff --git a/apps/csbie-server/src/rpc/methods.ts b/apps/csbie-server/src/rpc/methods.ts
index 4292389..50d1dab 100644
--- a/apps/csbie-server/src/rpc/methods.ts
+++ b/apps/csbie-server/src/rpc/methods.ts
@@ -32,6 +32,7 @@ export const RPC_METHODS = [
   'watchlist.list',
   'orders.inquiry.executionsToday',
   'orders.inquiry.open',
+  'orders.cash.preOrder',
   'orders.cash.estimate',
   'orders.cash.place',
   'orders.cash.estimateCorrection',
@@ -39,14 +40,17 @@ export const RPC_METHODS = [
   'orders.cash.placeCorrection',
   'orders.cash.estimateCancel',
   'orders.cash.placeCancel',
+  'orders.margin.preOrderOpen',
   'orders.margin.estimateOpen',
   'orders.margin.open',
+  'orders.margin.preOrderClose',
   'orders.margin.estimateClose',
   'orders.margin.close',
   'orders.margin.estimateCloseSummary',
   'orders.margin.closeSummary',
   'orders.margin.estimateSummary',
   'orders.margin.placeSummary',
+  'orders.margin.preOrderActualDelivery',
   'orders.margin.estimateActualDelivery',
   'orders.margin.actualDelivery',
   'orders.ifd.estimate',
diff --git a/apps/csbie-ui/package.json b/apps/csbie-ui/package.json
index fab453d..487e40e 100644
--- a/apps/csbie-ui/package.json
+++ b/apps/csbie-ui/package.json
@@ -10,6 +10,7 @@
   },
   "dependencies": {
     "@simplewebauthn/browser": "^13.1.2",
+    "d3": "^7.9.0",
     "lucide-vue-next": "^1.0.0",
     "motion-v": "^2.3.0",
     "tailwindcss": "^4.1.10",
@@ -19,6 +20,7 @@
   },
   "devDependencies": {
     "@tailwindcss/vite": "^4.3.1",
+    "@types/d3": "^7.4.3",
     "@vitejs/plugin-vue": "^6.0.7",
     "typescript": "^5",
     "vue-tsc": "^3"
diff --git a/apps/csbie-ui/src/App.vue b/apps/csbie-ui/src/App.vue
index e877783..e34d874 100644
--- a/apps/csbie-ui/src/App.vue
+++ b/apps/csbie-ui/src/App.vue
@@ -25,7 +25,10 @@ const activeTab = computed<RouteName>(() => {
   return routeNames.includes(route.name as RouteName) ? (route.name as RouteName) : 'portfolio'
 })
 const showAuthGate = computed(() => true)
-const navigate = (name: RouteName) => router.push({ name })
+const navigate = (name: RouteName) => {
+  if (name === 'settings') return router.push('/settings/api-keys')
+  return router.push({ name })
+}
 
 const {
   status,
@@ -67,6 +70,7 @@ const {
   quantityInput,
   priceInput,
   chartMode,
+  chartRange,
   showSearch,
   searchQuery,
   countryFilter,
@@ -86,6 +90,7 @@ const {
   orderHistoryNotice,
   positions,
   chartPricePoints,
+  chartNotice,
   pricePolling,
   selectedStock,
   orderQuantity,
@@ -93,6 +98,11 @@ const {
   cashOrderPrimaryRequiresPrice,
   cashOrderTriggerPrice,
   cashOrderSecondaryPrice,
+  cashOrderAccountTypeOptions,
+  cashOrderMarketOptions,
+  cashOrderTermOptions,
+  cashOrderDateOptions,
+  cashOrderPriceStep,
   estimatedAmount,
   showPortfolioSpinner,
   canRequestCashEstimate,
@@ -106,7 +116,6 @@ const {
   totalAssetValue,
   stockAssetRatio,
   cashAssetRatio,
-  boxPlotStyle,
   hasQuote,
   selectStock,
   connect,
@@ -211,17 +220,23 @@ onMounted(async () => {
           v-model:quantity-input="quantityInput"
           v-model:price-input="priceInput"
           v-model:chart-mode="chartMode"
+          v-model:chart-range="chartRange"
           :viewed-stocks="viewedStocks"
           :selected-stock="selectedStock"
           :selected-position="selectedPosition"
           :connected="connected"
           :order-quantity="orderQuantity"
           :estimated-amount="estimatedAmount"
+          :cash-order-account-type-options="cashOrderAccountTypeOptions"
+          :cash-order-market-options="cashOrderMarketOptions"
+          :cash-order-term-options="cashOrderTermOptions"
+          :cash-order-date-options="cashOrderDateOptions"
+          :cash-order-price-step="cashOrderPriceStep"
           :can-request-cash-estimate="canRequestCashEstimate"
           :can-place-cash-order="canPlaceCashOrder"
           :realtime-price-points="chartPricePoints"
+          :chart-notice="chartNotice"
           :price-polling="pricePolling"
-          :box-plot-style="boxPlotStyle"
           :has-quote="hasQuote"
           @open-search="showSearch = true"
           @select-stock="selectStock"
diff --git a/apps/csbie-ui/src/components/ApiKeyPolicyEditor.vue b/apps/csbie-ui/src/components/ApiKeyPolicyEditor.vue
index 6a4a176..7edfa76 100644
--- a/apps/csbie-ui/src/components/ApiKeyPolicyEditor.vue
+++ b/apps/csbie-ui/src/components/ApiKeyPolicyEditor.vue
@@ -103,8 +103,8 @@ const methodAllowed = (method: string) => {
 
 const ui = {
   root: 'grid gap-3',
-  limitGrid: 'grid grid-cols-3 gap-3',
-  limitGridCompact: 'grid-cols-5',
+  limitGrid: 'grid grid-cols-1 gap-3 md:grid-cols-2 xl:grid-cols-3',
+  limitGridCompact: 'xl:grid-cols-5',
   label: 'grid gap-2 text-xs font-extrabold text-[#9aa0a9]',
   input:
     'min-h-12 w-full rounded-[16px] border border-[#4a5058] bg-[#111418] px-4 text-[#e3e3e9] outline-none transition focus:border-[#a8c7fa]',
@@ -113,7 +113,7 @@ const ui = {
   actions: 'mt-3 flex flex-wrap gap-2',
   button:
     'min-h-9 rounded-full bg-[#263141] px-4 text-sm font-extrabold text-[#d3e3fd] transition hover:bg-[#303b4d]',
-  methodGrid: 'mt-3 grid grid-cols-2 gap-2',
+  methodGrid: 'mt-3 grid grid-cols-1 gap-2 xl:grid-cols-2',
   methodToggle:
     'flex min-h-10 items-center gap-2 rounded-[16px] bg-[#111418] p-3 text-xs text-[#c3c7cf]',
   checkbox: 'h-4 min-h-4 w-4',
@@ -128,7 +128,7 @@ const ui = {
         <input v-model.number="settings.maxTradesPerHour" :class="ui.input" type="number" min="0" />
       </label>
       <label :class="ui.label">
-        3時間 取引上限
+        6時間 取引上限
         <input
           v-model.number="settings.maxTradesPer6Hours"
           :class="ui.input"
diff --git a/apps/csbie-ui/src/components/ui/UiField.vue b/apps/csbie-ui/src/components/ui/UiField.vue
index eef0467..22ca35f 100644
--- a/apps/csbie-ui/src/components/ui/UiField.vue
+++ b/apps/csbie-ui/src/components/ui/UiField.vue
@@ -13,6 +13,7 @@ const props = withDefaults(
     readonly?: boolean
     disabled?: boolean
     min?: string | number
+    step?: string | number
     autofocus?: boolean
   }>(),
   {
@@ -24,6 +25,7 @@ const props = withDefaults(
     readonly: false,
     disabled: false,
     min: undefined,
+    step: undefined,
     autofocus: false,
   },
 )
@@ -77,6 +79,7 @@ const controlClass =
       :value="modelValue"
       :type="type"
       :min="min"
+      :step="step"
       :placeholder="placeholder"
       :autocomplete="autocomplete"
       :spellcheck="spellcheck"
diff --git a/apps/csbie-ui/src/constants/trade.ts b/apps/csbie-ui/src/constants/trade.ts
index e02cdc6..427ffaf 100644
--- a/apps/csbie-ui/src/constants/trade.ts
+++ b/apps/csbie-ui/src/constants/trade.ts
@@ -3,7 +3,6 @@ import type {
   CashOrderMarket,
   CashOrderMethod,
   CashOrderPriceCondition,
-  CashOrderTerm,
   CashOrderTriggerZone,
   OrderKind,
   TradeSide,
@@ -25,6 +24,8 @@ export const cashOrderAccountTypeOptions: Array<{
 }> = [
   { label: '特定', value: 'specific' },
   { label: '一般', value: 'general' },
+  { label: 'NISA成長投資枠', value: 'growthInvestment' },
+  { label: 'NISA', value: 'nisa' },
 ]
 
 export const cashOrderMarketOptions: Array<{
@@ -33,6 +34,9 @@ export const cashOrderMarketOptions: Array<{
 }> = [
   { label: '自動', value: 'auto' },
   { label: '東証', value: 'TKY' },
+  { label: '名証', value: 'NGY' },
+  { label: '福証', value: 'FKO' },
+  { label: '札証', value: 'SPR' },
   { label: 'SOR', value: 'SOR' },
   { label: 'PTS', value: 'PTS' },
   { label: 'PTS(X)', value: 'PTX' },
@@ -58,15 +62,6 @@ export const cashOrderPriceConditionOptions: Array<{
   { label: '不成', value: 'funari' },
 ]
 
-export const cashOrderTermOptions: Array<{
-  label: string
-  value: CashOrderTerm
-}> = [
-  { label: '当日中', value: 'day' },
-  { label: '今週中', value: 'week' },
-  { label: '日付指定', value: 'date' },
-]
-
 export const cashOrderMethodOptions: Array<{
   label: string
   value: CashOrderMethod
diff --git a/apps/csbie-ui/src/features/orders/OrderDialogs.vue b/apps/csbie-ui/src/features/orders/OrderDialogs.vue
index 05a487d..17350f9 100644
--- a/apps/csbie-ui/src/features/orders/OrderDialogs.vue
+++ b/apps/csbie-ui/src/features/orders/OrderDialogs.vue
@@ -65,6 +65,14 @@ const orderMethodLabel = (method: CashOrderMethod) =>
   method === 'normal' ? '通常' : method === 'stop' ? '逆指値' : 'OCO'
 
 const triggerZoneLabel = (zone: CashOrderTriggerZone) => (zone === 'above' ? '以上' : '以下')
+
+const accountTypeLabel = (type: CashOrderAccountType) =>
+  ({
+    specific: '特定',
+    general: '一般',
+    growthInvestment: 'NISA成長投資枠',
+    nisa: 'NISA',
+  })[type]
 </script>
 
 <template>
@@ -80,7 +88,7 @@ const triggerZoneLabel = (zone: CashOrderTriggerZone) => (zone === 'above' ? '
       </div>
       <div :class="ui.confirmRow">
         <dt>預り区分</dt>
-        <dd>{{ accountType === 'specific' ? '特定' : '一般' }}</dd>
+        <dd>{{ accountTypeLabel(accountType) }}</dd>
       </div>
       <div :class="ui.confirmRow">
         <dt>注文市場</dt>
@@ -151,7 +159,7 @@ const triggerZoneLabel = (zone: CashOrderTriggerZone) => (zone === 'above' ? '
       </div>
       <div :class="ui.confirmRow">
         <dt>預り区分</dt>
-        <dd>{{ accountType === 'specific' ? '特定' : '一般' }}</dd>
+        <dd>{{ accountTypeLabel(accountType) }}</dd>
       </div>
       <div :class="ui.confirmRow">
         <dt>注文市場</dt>
diff --git a/apps/csbie-ui/src/features/settings/SettingsView.vue b/apps/csbie-ui/src/features/settings/SettingsView.vue
index f37988e..124289e 100644
--- a/apps/csbie-ui/src/features/settings/SettingsView.vue
+++ b/apps/csbie-ui/src/features/settings/SettingsView.vue
@@ -1,5 +1,18 @@
 <script setup lang="ts">
-import { Ban, KeyRound, Plug, RefreshCw, Save, Trash2 } from 'lucide-vue-next'
+import {
+  Ban,
+  ChevronRight,
+  KeyRound,
+  Pencil,
+  Plug,
+  RefreshCw,
+  Save,
+  ShieldCheck,
+  Trash2,
+  UserRoundCog,
+} from 'lucide-vue-next'
+import { computed, ref } from 'vue'
+import { useRoute, useRouter } from 'vue-router'
 import type { ApiKey, ApiKeySettings, SbiPasskey } from '../../api'
 import ApiKeyPolicyEditor from '../../components/ApiKeyPolicyEditor.vue'
 import { ui } from '../../styles/ui'
@@ -27,142 +40,326 @@ const emit = defineEmits<{
   connect: []
   removeSbiPasskey: [id: string]
 }>()
+
+type SettingsSection = 'api-keys' | 'passkeys'
+
+const route = useRoute()
+const router = useRouter()
+const editingApiKey = ref<ApiKey | null>(null)
+
+const activeSection = computed<SettingsSection>(() => {
+  return route.params.section === 'passkeys' ? 'passkeys' : 'api-keys'
+})
+
+const settingsGroups = [
+  {
+    label: 'アクセス',
+    items: [
+      {
+        id: 'api-keys',
+        label: 'API キー',
+        description: '権限と取引上限を管理',
+        icon: KeyRound,
+      },
+    ],
+  },
+  {
+    label: '証券口座',
+    items: [
+      {
+        id: 'passkeys',
+        label: 'SBI パスキー',
+        description: '接続プロフィールを管理',
+        icon: UserRoundCog,
+      },
+    ],
+  },
+] as const
+
+const openSection = (section: SettingsSection) => {
+  router.push(`/settings/${section}`)
+}
+
+const sectionTitle = computed(() =>
+  activeSection.value === 'api-keys' ? 'API キー' : 'SBI パスキー',
+)
+
+const openApiKeyEditor = (key: ApiKey) => {
+  editingApiKey.value = {
+    ...key,
+    allowedMethods: key.allowedMethods ? [...key.allowedMethods] : key.allowedMethods,
+  }
+}
+
+const closeApiKeyEditor = () => {
+  editingApiKey.value = null
+}
+
+const saveEditingApiKey = () => {
+  if (!editingApiKey.value) return
+  emit('saveApiKeySettings', editingApiKey.value)
+  closeApiKeyEditor()
+}
 </script>
 
 <template>
-  <section :class="ui.settingsLayout">
-    <div :class="ui.apiLayout">
-      <article :class="ui.panel">
-        <div :class="ui.panelHead">
-          <div>
-            <p :class="ui.eyebrow">Fine-grained</p>
-            <h2>API Key 発行</h2>
-          </div>
-          <button :class="ui.primaryButton" type="button" @click="emit('addApiKey')">
-            <KeyRound class="h-4 w-4" aria-hidden="true" />
-            発行
-          </button>
+  <section
+    class="grid min-h-[calc(100dvh-9rem)] min-w-0 max-w-full gap-0 lg:grid-cols-[18rem_minmax(0,1fr)]"
+  >
+    <aside
+      class="min-w-0 border-b border-[#30343a] pb-4 lg:sticky lg:top-0 lg:h-fit lg:border-r lg:border-b-0 lg:pr-5 lg:pb-0"
+      aria-label="Settings"
+    >
+      <div class="grid gap-5">
+        <div class="grid gap-1">
+          <h2 class="text-xl font-black text-[#e3e3e9]">設定</h2>
+          <p class="text-sm font-semibold text-[#9aa0a9]">用途ごとに管理項目を分けています。</p>
         </div>
-        <label :class="ui.label">
-          名前
-          <input v-model="apiKeyLabel" :class="ui.input" placeholder="例: trade-bot-readonly" />
-        </label>
-        <ApiKeyPolicyEditor v-model="newApiKeySettings" permissions-open />
-        <textarea v-if="newApiToken" v-model="newApiToken" :class="ui.input" readonly></textarea>
-      </article>
 
-      <article :class="ui.panel">
-        <div :class="ui.panelHead">
-          <h2>発行済みキー</h2>
-          <button :class="ui.ghostButton" type="button" @click="emit('refresh')">
-            <RefreshCw class="h-4 w-4" aria-hidden="true" />
-            更新
-          </button>
+        <nav class="grid gap-5">
+          <section v-for="group in settingsGroups" :key="group.label" class="grid gap-2">
+            <p class="px-2 text-xs font-black text-[#747982]">{{ group.label }}</p>
+            <button
+              v-for="item in group.items"
+              :key="item.id"
+              :class="[
+                'grid min-h-16 grid-cols-[2.5rem_minmax(0,1fr)_auto] items-center gap-3 rounded-[18px] px-3 text-left transition hover:bg-[#22272e] focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-[#d3e3fd]',
+                activeSection === item.id ? 'bg-[#263141] text-[#d3e3fd]' : 'text-[#e3e3e9]',
+              ]"
+              type="button"
+              @click="openSection(item.id)"
+            >
+              <span
+                :class="[
+                  'grid h-10 w-10 place-items-center rounded-full',
+                  activeSection === item.id
+                    ? 'bg-[#a8c7fa] text-[#102033]'
+                    : 'bg-[#111418] text-[#c3c7cf]',
+                ]"
+                aria-hidden="true"
+              >
+                <component :is="item.icon" class="h-5 w-5" :stroke-width="2.4" />
+              </span>
+              <span class="grid min-w-0 gap-0.5">
+                <strong class="truncate text-sm font-black">{{ item.label }}</strong>
+                <small class="truncate text-xs font-semibold text-[#9aa0a9]">
+                  {{ item.description }}
+                </small>
+              </span>
+              <ChevronRight class="h-4 w-4 text-[#8f949d]" aria-hidden="true" />
+            </button>
+          </section>
+        </nav>
+      </div>
+    </aside>
+
+    <div class="grid min-w-0 content-start gap-5 pt-5 lg:pl-7 lg:pt-0">
+      <header
+        class="flex flex-wrap items-center justify-between gap-3 border-b border-[#30343a] pb-5"
+      >
+        <div class="grid gap-1">
+          <p :class="ui.eyebrow">Settings</p>
+          <h2 class="text-2xl font-black text-[#e3e3e9]">{{ sectionTitle }}</h2>
         </div>
-        <div :class="ui.list">
-          <div v-for="key in apiKeys" :key="key.id" :class="ui.keyRow">
-            <div :class="ui.row">
-              <span>{{ key.label }}</span>
-              <div :class="ui.rowActions">
-                <button
-                  :class="ui.primaryButton"
-                  type="button"
-                  title="Save settings"
-                  @click="emit('saveApiKeySettings', key)"
-                >
-                  <Save class="h-4 w-4" aria-hidden="true" />
-                  保存
-                </button>
-                <button
-                  :class="ui.dangerButton"
-                  type="button"
-                  title="Revoke"
-                  @click="emit('revokeApiKey', key.id)"
-                >
-                  <Ban class="h-4 w-4" aria-hidden="true" />
-                  失効
-                </button>
+        <button :class="ui.ghostButton" type="button" @click="emit('refresh')">
+          <RefreshCw class="h-4 w-4" aria-hidden="true" />
+          更新
+        </button>
+      </header>
+
+      <template v-if="activeSection === 'api-keys'">
+        <article :class="[ui.panel, 'min-w-0 overflow-hidden']">
+          <div class="flex flex-wrap items-center justify-between gap-3">
+            <div>
+              <p :class="ui.eyebrow">Create</p>
+              <h3 class="text-lg font-black">API Key 発行</h3>
+            </div>
+            <button :class="ui.primaryButton" type="button" @click="emit('addApiKey')">
+              <KeyRound class="h-4 w-4" aria-hidden="true" />
+              発行
+            </button>
+          </div>
+          <label :class="ui.label">
+            名前
+            <input v-model="apiKeyLabel" :class="ui.input" placeholder="例: trade-bot-readonly" />
+          </label>
+          <ApiKeyPolicyEditor v-model="newApiKeySettings" permissions-open />
+          <label v-if="newApiToken" :class="ui.label">
+            新しい API キー
+            <textarea
+              v-model="newApiToken"
+              :class="[ui.input, 'min-h-28 py-3']"
+              readonly
+            ></textarea>
+          </label>
+        </article>
+
+        <article :class="[ui.panel, 'min-w-0 overflow-hidden']">
+          <div class="flex flex-wrap items-center justify-between gap-3">
+            <div>
+              <p :class="ui.eyebrow">Active keys</p>
+              <h3 class="text-lg font-black">発行済みキー</h3>
+            </div>
+          </div>
+          <div v-if="apiKeys.length" :class="ui.list">
+            <div v-for="key in apiKeys" :key="key.id" :class="ui.keyRow">
+              <div :class="ui.row">
+                <span class="min-w-0 truncate font-black">{{ key.label }}</span>
+                <div class="flex flex-wrap gap-2">
+                  <button
+                    :class="ui.ghostButton"
+                    type="button"
+                    title="Edit settings"
+                    @click="openApiKeyEditor(key)"
+                  >
+                    <Pencil class="h-4 w-4" aria-hidden="true" />
+                    編集
+                  </button>
+                  <button
+                    :class="ui.dangerButton"
+                    type="button"
+                    title="Revoke"
+                    @click="emit('revokeApiKey', key.id)"
+                  >
+                    <Ban class="h-4 w-4" aria-hidden="true" />
+                    失効
+                  </button>
+                </div>
               </div>
             </div>
-            <ApiKeyPolicyEditor
-              :model-value="key"
-              compact
-              @update:model-value="Object.assign(key, $event)"
-            />
           </div>
-        </div>
-      </article>
+          <div
+            v-else
+            class="rounded-[18px] border border-[#30343a] bg-[#111418] p-5 text-sm font-semibold text-[#9aa0a9]"
+          >
+            発行済みの API キーはありません。
+          </div>
+        </article>
+      </template>
+
+      <template v-else>
+        <article :class="[ui.panel, 'min-w-0 overflow-hidden']">
+          <div class="flex flex-wrap items-center justify-between gap-3">
+            <div>
+              <p :class="ui.eyebrow">Profiles</p>
+              <h3 class="text-lg font-black">パスキー追加</h3>
+            </div>
+            <button :class="ui.primaryButton" type="button" @click="emit('addSbiPasskey')">
+              <Save class="h-4 w-4" aria-hidden="true" />
+              保存
+            </button>
+          </div>
+          <label :class="ui.label">
+            名前
+            <input v-model="sbiLabel" :class="ui.input" placeholder="例: 個人メイン" />
+          </label>
+          <label :class="ui.label">
+            パスキー JSON
+            <textarea
+              v-model="sbiCredentialJson"
+              :class="[ui.input, 'min-h-48 py-3 font-mono text-xs']"
+              spellcheck="false"
+              placeholder="{ ... }"
+            ></textarea>
+          </label>
+          <div class="grid grid-cols-1 gap-3 xl:grid-cols-2">
+            <label :class="ui.label">
+              取引パスワード
+              <input v-model="tradePassword" :class="ui.input" type="password" autocomplete="off" />
+            </label>
+            <label :class="ui.label">
+              デバイスキー
+              <input
+                v-model="sbiDeviceId"
+                :class="ui.input"
+                autocomplete="off"
+                spellcheck="false"
+              />
+            </label>
+          </div>
+        </article>
+
+        <article :class="[ui.panel, 'min-w-0 overflow-hidden']">
+          <div class="flex flex-wrap items-center justify-between gap-3">
+            <div>
+              <p :class="ui.eyebrow">Connection</p>
+              <h3 class="text-lg font-black">プロフィール切り替え</h3>
+            </div>
+            <button :class="ui.ghostButton" type="button" @click="emit('connect')">
+              <Plug class="h-4 w-4" aria-hidden="true" />
+              接続
+            </button>
+          </div>
+          <div v-if="sbiPasskeys.length" :class="ui.list">
+            <label v-for="passkey in sbiPasskeys" :key="passkey.id" :class="ui.profileRow">
+              <input
+                v-model="selectedPasskeyId"
+                type="radio"
+                :value="passkey.id"
+                @change="emit('connect')"
+              />
+              <span class="grid min-w-0 gap-1">
+                <strong class="truncate">{{ passkey.label }}</strong>
+                <small class="truncate text-[#8f949d]">
+                  {{ new Date(passkey.createdAt).toLocaleString() }}
+                </small>
+              </span>
+              <button
+                :class="ui.dangerButton"
+                type="button"
+                title="Delete passkey"
+                @click.prevent="emit('removeSbiPasskey', passkey.id)"
+              >
+                <Trash2 class="h-4 w-4" aria-hidden="true" />
+                削除
+              </button>
+            </label>
+          </div>
+          <div
+            v-else
+            class="grid gap-2 rounded-[18px] border border-[#30343a] bg-[#111418] p-5 text-sm font-semibold text-[#9aa0a9]"
+          >
+            <span class="inline-flex items-center gap-2 text-[#c3c7cf]">
+              <ShieldCheck class="h-4 w-4" aria-hidden="true" />
+              保存済みプロフィールはありません。
+            </span>
+          </div>
+        </article>
+      </template>
     </div>
 
-    <div :class="ui.apiLayout">
-      <article :class="ui.panel">
-        <div :class="ui.panelHead">
-          <div>
-            <p :class="ui.eyebrow">Profiles</p>
-            <h2>パスキー設定</h2>
+    <div
+      v-if="editingApiKey"
+      class="fixed inset-0 z-30 grid place-items-center overflow-y-auto bg-[#101418]/75 p-4 backdrop-blur-sm"
+      role="dialog"
+      aria-modal="true"
+      @click.self="closeApiKeyEditor"
+    >
+      <section
+        class="grid max-h-[calc(100dvh-2rem)] w-full max-w-5xl gap-5 overflow-y-auto rounded-[28px] border border-[#30343a] bg-[#1b1f24] p-6 shadow-2xl shadow-black/35"
+      >
+        <header
+          class="flex flex-wrap items-center justify-between gap-3 border-b border-[#33383f] pb-4"
+        >
+          <div class="grid min-w-0 gap-1">
+            <p :class="ui.eyebrow">Edit API key</p>
+            <h3 class="truncate text-xl font-black text-[#e3e3e9]">
+              {{ editingApiKey.label }}
+            </h3>
           </div>
-          <button :class="ui.primaryButton" type="button" @click="emit('addSbiPasskey')">
-            <Save class="h-4 w-4" aria-hidden="true" />
-            保存
-          </button>
-        </div>
-        <label :class="ui.label">
-          名前
-          <input v-model="sbiLabel" :class="ui.input" placeholder="例: 個人メイン" />
-        </label>
-        <label :class="ui.label">
-          パスキー JSON
-          <textarea
-            v-model="sbiCredentialJson"
-            :class="ui.input"
-            spellcheck="false"
-            placeholder="{ ... }"
-          ></textarea>
-        </label>
-        <div :class="ui.ticketBox">
-          <label :class="ui.label">
-            取引パスワード
-            <input v-model="tradePassword" :class="ui.input" type="password" autocomplete="off" />
-          </label>
-          <label :class="ui.label">
-            デバイスキー
-            <input v-model="sbiDeviceId" :class="ui.input" autocomplete="off" spellcheck="false" />
-          </label>
-        </div>
-      </article>
-
-      <article :class="ui.panel">
-        <div :class="ui.panelHead">
-          <h2>プロフィール切り替え</h2>
-          <button :class="ui.ghostButton" type="button" @click="emit('connect')">
-            <Plug class="h-4 w-4" aria-hidden="true" />
-            接続
-          </button>
-        </div>
-        <div :class="ui.list">
-          <label v-for="passkey in sbiPasskeys" :key="passkey.id" :class="ui.profileRow">
-            <input
-              v-model="selectedPasskeyId"
-              type="radio"
-              :value="passkey.id"
-              @change="emit('connect')"
-            />
-            <span>
-              <strong>{{ passkey.label }}</strong>
-              <small>{{ new Date(passkey.createdAt).toLocaleString() }}</small>
-            </span>
-            <button
-              :class="ui.dangerButton"
-              type="button"
-              title="Delete passkey"
-              @click.prevent="emit('removeSbiPasskey', passkey.id)"
-            >
-              <Trash2 class="h-4 w-4" aria-hidden="true" />
-              削除
+          <div class="flex flex-wrap gap-2">
+            <button :class="ui.ghostButton" type="button" @click="closeApiKeyEditor">
+              キャンセル
             </button>
-          </label>
-        </div>
-      </article>
+            <button :class="ui.primaryButton" type="button" @click="saveEditingApiKey">
+              <Save class="h-4 w-4" aria-hidden="true" />
+              保存
+            </button>
+          </div>
+        </header>
+
+        <ApiKeyPolicyEditor v-model="editingApiKey" permissions-open />
+      </section>
     </div>
   </section>
 </template>
diff --git a/apps/csbie-ui/src/features/trade/RealtimePriceChart.vue b/apps/csbie-ui/src/features/trade/RealtimePriceChart.vue
index 89cd77f..96daadb 100644
--- a/apps/csbie-ui/src/features/trade/RealtimePriceChart.vue
+++ b/apps/csbie-ui/src/features/trade/RealtimePriceChart.vue
@@ -1,225 +1,719 @@
 <script setup lang="ts">
-import Chart from 'chart.js/auto'
-import { Minus, Plus, RotateCcw } from 'lucide-vue-next'
+import * as d3 from 'd3'
 import { computed, nextTick, onBeforeUnmount, onMounted, ref, watch } from 'vue'
 import Spinner from '../../components/ui/Spinner.vue'
-import type { RealtimePricePoint } from '../../types/trading'
+import type { ChartMode, ChartNotice, ChartRange, RealtimePricePoint } from '../../types/trading'
 
 const props = defineProps<{
   points: RealtimePricePoint[]
   stockName: string
   active: boolean
+  mode: ChartMode
+  range: ChartRange
+  previousClose?: number
+  notice?: ChartNotice | null
 }>()
 
-const canvas = ref<HTMLCanvasElement | null>(null)
-const scroller = ref<HTMLDivElement | null>(null)
-const zoomScale = ref(1)
-let chart: Chart<'line', number[], string> | undefined
-let wasScrolledToEnd = true
+type ChartPoint = RealtimePricePoint & {
+  index: number
+  date: Date
+}
 
-const minChartWidth = 720
+const root = ref<HTMLDivElement | null>(null)
+const svg = ref<SVGSVGElement | null>(null)
+const gridLayer = ref<SVGGElement | null>(null)
+const xAxisLayer = ref<SVGGElement | null>(null)
+const yAxisLayer = ref<SVGGElement | null>(null)
+const areaPath = ref<SVGPathElement | null>(null)
+const linePath = ref<SVGPathElement | null>(null)
+const previousCloseLine = ref<SVGLineElement | null>(null)
+const dotsLayer = ref<SVGGElement | null>(null)
+const candlesLayer = ref<SVGGElement | null>(null)
+const hoverLayer = ref<SVGGElement | null>(null)
+const hoverLine = ref<SVGLineElement | null>(null)
+const hoverDot = ref<SVGCircleElement | null>(null)
+const clipRect = ref<SVGRectElement | null>(null)
+const zoomScale = ref(1)
+const size = ref({ width: 0, height: 0 })
+const tooltip = ref({
+  visible: false,
+  x: 0,
+  y: 0,
+  price: '',
+  date: '',
+  detail: '',
+})
+
+let resizeObserver: ResizeObserver | undefined
+let zoomBehavior: d3.ZoomBehavior<SVGSVGElement, unknown> | undefined
+let zoomTransform = d3.zoomIdentity
+let syncingZoom = false
+let followsLatest = true
+let latestXScale: d3.ScaleTime<number, number> | undefined
+let latestYScale: d3.ScaleLinear<number, number> | undefined
+
+const clipId = `realtime-price-clip-${Math.random().toString(36).slice(2)}`
+const margin = { top: 12, right: 18, bottom: 28, left: 48 }
 const minZoom = 0.6
-const maxZoom = 3
+const maxZoom = 6
 const zoomStep = 0.2
 const basePointSpacing = 10
-const pointSpacing = computed(() => basePointSpacing * zoomScale.value)
+const dayMs = 24 * 60 * 60 * 1000
+const tolerancePx = 10
+const offscreenPointBuffer = 4
+const minXAxisTickSpacing = 72
 
-const labelFor = (point: RealtimePricePoint) => {
-  const date = new Date(point.at)
-  if (date.getHours() === 0 && date.getMinutes() === 0 && date.getSeconds() === 0) {
+const chartPoints = computed<ChartPoint[]>(() =>
+  props.points
+    .map((point, index) => ({ ...point, index, date: new Date(point.at) }))
+    .filter((point) => Number.isFinite(point.price) && !Number.isNaN(point.date.getTime())),
+)
+
+const plotWidth = computed(() => Math.max(1, size.value.width - margin.left - margin.right))
+const plotHeight = computed(() => Math.max(1, size.value.height - margin.top - margin.bottom))
+
+const labelFor = (point: ChartPoint) => {
+  if (props.range === '1D') {
+    return new Intl.DateTimeFormat('ja-JP', {
+      hour: '2-digit',
+      minute: '2-digit',
+    }).format(point.date)
+  }
+
+  if (
+    point.date.getHours() === 0 &&
+    point.date.getMinutes() === 0 &&
+    point.date.getSeconds() === 0
+  ) {
     return new Intl.DateTimeFormat('ja-JP', {
       month: 'numeric',
       day: 'numeric',
-    }).format(date)
+    }).format(point.date)
   }
   return new Intl.DateTimeFormat('ja-JP', {
     hour: '2-digit',
     minute: '2-digit',
-    second: '2-digit',
-  }).format(date)
+  }).format(point.date)
 }
 
-const labels = computed(() => props.points.map(labelFor))
+const closePrice = (point: ChartPoint) => point.close ?? point.price
 
-const prices = computed(() => props.points.map((point) => point.price))
+const previousCloseValue = computed(() =>
+  props.range === '1D' && Number.isFinite(props.previousClose) && props.previousClose
+    ? props.previousClose
+    : null,
+)
 
-const chartWidth = computed(() => {
-  const width = Math.max(minChartWidth, props.points.length * pointSpacing.value + 72)
-  return `max(100%, ${width}px)`
+const ohlcFor = (point: ChartPoint) => {
+  const close = closePrice(point)
+  const open = point.open ?? close
+  const high = Math.max(point.high ?? close, open, close)
+  const low = Math.min(point.low ?? close, open, close)
+  return { open, high, low, close }
+}
+
+const tooltipDateFor = (point: ChartPoint) => {
+  const hasTime =
+    point.date.getHours() !== 0 || point.date.getMinutes() !== 0 || point.date.getSeconds() !== 0
+  return new Intl.DateTimeFormat('ja-JP', {
+    year: 'numeric',
+    month: '2-digit',
+    day: '2-digit',
+    ...(hasTime
+      ? {
+          hour: '2-digit',
+          minute: '2-digit',
+          second: '2-digit',
+        }
+      : {}),
+  }).format(point.date)
+}
+
+const tooltipStyle = computed(() => {
+  const width = 152
+  const pad = 8
+  const left = Math.min(
+    Math.max(pad, tooltip.value.x + 12),
+    Math.max(pad, size.value.width - width - pad),
+  )
+  const top =
+    tooltip.value.y > 76
+      ? Math.max(pad, tooltip.value.y - 70)
+      : Math.min(size.value.height - 64, tooltip.value.y + 14)
+  return {
+    left: `${left}px`,
+    top: `${top}px`,
+  }
 })
 
-const rememberScrollPosition = () => {
-  const element = scroller.value
-  if (!element) return
-  wasScrolledToEnd =
-    element.scrollLeft + element.clientWidth >= element.scrollWidth - pointSpacing.value
+const timeDomainMs = (): [number, number] => {
+  const points = chartPoints.value
+  const start = d3.min(points, (point) => point.date.getTime()) ?? 0
+  const end = d3.max(points, (point) => point.date.getTime()) ?? start + dayMs
+  return end === start ? [start, start + dayMs] : [start, end]
 }
 
-const scrollToEndIfNeeded = async () => {
-  if (!wasScrolledToEnd) return
-  await nextTick()
-  const element = scroller.value
-  if (!element) return
-  element.scrollLeft = element.scrollWidth
+const baseContentWidth = () => {
+  const points = chartPoints.value
+  return Math.max(plotWidth.value, Math.max(1, points.length - 1) * basePointSpacing)
 }
 
-const updateChart = () => {
-  if (!chart) return
-  rememberScrollPosition()
-  chart.data.labels = labels.value
-  const dataset = chart.data.datasets[0]
-  if (dataset) dataset.data = prices.value
-  chart.update('none')
-  chart.resize()
-  void scrollToEndIfNeeded()
+const basePixelsPerMs = () => {
+  const [start, end] = timeDomainMs()
+  const duration = end - start
+  return duration > 0 ? baseContentWidth() / duration : basePointSpacing / dayMs
+}
+
+const contentWidth = (k = zoomTransform.k) => {
+  return Math.max(plotWidth.value, baseContentWidth() * k)
+}
+
+const minTranslateX = (k = zoomTransform.k) => Math.min(0, plotWidth.value - contentWidth(k))
+
+const zoomTransformWith = (k: number, x: number) => d3.zoomIdentity.translate(x, 0).scale(k)
+
+const clampTransform = (transform: d3.ZoomTransform) => {
+  const k = Math.min(maxZoom, Math.max(minZoom, transform.k))
+  const minX = minTranslateX(k)
+  const x = Math.min(0, Math.max(minX, transform.x))
+  return zoomTransformWith(k, x)
+}
+
+const isLatestVisible = (transform = zoomTransform) =>
+  contentWidth(transform.k) + transform.x <= plotWidth.value + tolerancePx
+
+const syncZoomBehavior = (transform: d3.ZoomTransform) => {
+  if (!svg.value || !zoomBehavior) return
+  syncingZoom = true
+  d3.select(svg.value).call(zoomBehavior.transform, transform)
+  syncingZoom = false
+}
+
+const applyTransform = (transform: d3.ZoomTransform, sync = true) => {
+  zoomTransform = clampTransform(transform)
+  zoomScale.value = Number(zoomTransform.k.toFixed(2))
+  followsLatest = isLatestVisible(zoomTransform)
+  renderChart()
+  if (sync) syncZoomBehavior(zoomTransform)
+}
+
+const alignLatest = (k = zoomTransform.k, sync = true) => {
+  followsLatest = true
+  applyTransform(zoomTransformWith(k, minTranslateX(k)), sync)
+}
+
+const visibleTickIndexes = () => {
+  if (!latestXScale) return [] as Date[]
+  const maxTicks = Math.max(2, Math.floor(plotWidth.value / minXAxisTickSpacing))
+  const tickDates = latestXScale.ticks(maxTicks).filter((date) => {
+    const x = latestXScale?.(date) ?? 0
+    return x >= margin.left && x <= margin.left + plotWidth.value
+  })
+
+  const visibleTicks: Date[] = []
+  let previousX = Number.NEGATIVE_INFINITY
+  for (const date of tickDates) {
+    const x = latestXScale(date)
+    if (x - previousX < minXAxisTickSpacing) continue
+    visibleTicks.push(date)
+    previousX = x
+  }
+  return visibleTicks
+}
+
+const visiblePointRange = (points: ChartPoint[]) => {
+  const [domainStart] = timeDomainMs()
+  const pixelsPerMs = basePixelsPerMs() * zoomTransform.k
+  const rawStartMs = domainStart + -zoomTransform.x / pixelsPerMs
+  const rawEndMs = domainStart + (plotWidth.value - zoomTransform.x) / pixelsPerMs
+  const rawStart = d3
+    .bisector<ChartPoint, number>((point) => point.date.getTime())
+    .left(points, rawStartMs)
+  const rawEnd = d3
+    .bisector<ChartPoint, number>((point) => point.date.getTime())
+    .right(points, rawEndMs)
+  const start = Math.max(0, Math.min(points.length - 1, rawStart - offscreenPointBuffer))
+  const end = Math.max(start, Math.min(points.length - 1, rawEnd + offscreenPointBuffer))
+  return { start, end }
+}
+
+const renderChart = () => {
+  const points = chartPoints.value
+  const width = size.value.width
+  const height = size.value.height
+  if (
+    !svg.value ||
+    !gridLayer.value ||
+    !xAxisLayer.value ||
+    !yAxisLayer.value ||
+    !areaPath.value ||
+    !linePath.value ||
+    !previousCloseLine.value ||
+    !dotsLayer.value ||
+    !candlesLayer.value ||
+    !hoverLayer.value ||
+    !clipRect.value ||
+    width <= 0 ||
+    height <= 0
+  ) {
+    return
+  }
+
+  d3.select(clipRect.value)
+    .attr('x', margin.left)
+    .attr('y', margin.top)
+    .attr('width', plotWidth.value)
+    .attr('height', plotHeight.value)
+
+  if (!points.length) {
+    d3.select(areaPath.value).attr('d', '')
+    d3.select(linePath.value).attr('d', '')
+    d3.select(previousCloseLine.value).attr('display', 'none')
+    d3.select(dotsLayer.value).selectAll('circle').remove()
+    d3.select(candlesLayer.value).selectAll('*').remove()
+    hideHover()
+    d3.select(gridLayer.value).selectAll('*').remove()
+    d3.select(xAxisLayer.value).selectAll('*').remove()
+    d3.select(yAxisLayer.value).selectAll('*').remove()
+    return
+  }
+
+  const prices =
+    props.mode === 'box'
+      ? points.flatMap((point) => {
+          const ohlc = ohlcFor(point)
+          return [ohlc.open, ohlc.high, ohlc.low, ohlc.close]
+        })
+      : points.map(closePrice)
+  if (previousCloseValue.value) prices.push(previousCloseValue.value)
+  const minPrice = d3.min(prices) ?? 0
+  const maxPrice = d3.max(prices) ?? 1
+  const padding = Math.max(1, (maxPrice - minPrice) * 0.08)
+  const yScale = d3
+    .scaleLinear()
+    .domain([minPrice - padding, maxPrice + padding])
+    .nice()
+    .range([margin.top + plotHeight.value, margin.top])
+
+  const [domainStart, domainEnd] = timeDomainMs()
+  const xScale = d3
+    .scaleTime()
+    .domain([new Date(domainStart), new Date(domainEnd)])
+    .range([margin.left + zoomTransform.x, margin.left + contentWidth() + zoomTransform.x])
+  latestXScale = xScale
+  latestYScale = yScale
+
+  const line = d3
+    .line<ChartPoint>()
+    .defined((point) => Number.isFinite(closePrice(point)))
+    .x((point) => xScale(point.date))
+    .y((point) => yScale(closePrice(point)))
+    .curve(d3.curveMonotoneX)
+
+  const area = d3
+    .area<ChartPoint>()
+    .defined((point) => Number.isFinite(closePrice(point)))
+    .x((point) => xScale(point.date))
+    .y0(margin.top + plotHeight.value)
+    .y1((point) => yScale(closePrice(point)))
+    .curve(d3.curveMonotoneX)
+
+  const { start, end } = visiblePointRange(points)
+  const visiblePoints = points.slice(start, end + 1)
+
+  d3.select(areaPath.value).attr('d', props.mode === 'line' ? (area(visiblePoints) ?? '') : '')
+  d3.select(linePath.value).attr('d', props.mode === 'line' ? (line(visiblePoints) ?? '') : '')
+
+  d3.select(dotsLayer.value)
+    .selectAll<SVGCircleElement, ChartPoint>('circle')
+    .data(props.mode === 'line' ? visiblePoints : [], (point) => point.at)
+    .join(
+      (enter) =>
+        enter
+          .append('circle')
+          .attr('r', 2.5)
+          .attr('fill', '#d3e3fd')
+          .attr('stroke', '#40dba2')
+          .attr('stroke-width', 1.6),
+      (update) => update,
+      (exit) => exit.remove(),
+    )
+    .attr('cx', (point) => xScale(point.date))
+    .attr('cy', (point) => yScale(closePrice(point)))
+
+  const previousCloseY = previousCloseValue.value ? yScale(previousCloseValue.value) : null
+  d3.select(previousCloseLine.value)
+    .attr('display', previousCloseY === null ? 'none' : null)
+    .attr('x1', margin.left)
+    .attr('x2', margin.left + plotWidth.value)
+    .attr('y1', previousCloseY ?? 0)
+    .attr('y2', previousCloseY ?? 0)
+
+  const candleGroups = d3
+    .select(candlesLayer.value)
+    .selectAll<SVGGElement, ChartPoint>('g')
+    .data(props.mode === 'box' ? visiblePoints : [], (point) => point.at)
+    .join(
+      (enter) => {
+        const group = enter.append('g')
+        group
+          .append('line')
+          .attr('class', 'wick')
+          .attr('stroke-width', 1.4)
+          .attr('stroke-linecap', 'round')
+        group.append('rect').attr('class', 'body').attr('rx', 1.5)
+        return group
+      },
+      (update) => update,
+      (exit) => exit.remove(),
+    )
+
+  candleGroups.each(function (point) {
+    const ohlc = ohlcFor(point)
+    const x = xScale(point.date)
+    const pointIndex = points.indexOf(point)
+    const previous = points[pointIndex - 1]
+    const next = points[pointIndex + 1]
+    const previousGap = previous ? point.date.getTime() - previous.date.getTime() : undefined
+    const nextGap = next ? next.date.getTime() - point.date.getTime() : undefined
+    const gap = Math.min(
+      ...(previousGap && nextGap ? [previousGap, nextGap] : [previousGap ?? nextGap ?? dayMs]),
+    )
+    const candleWidth = Math.max(2, Math.min(14, gap * basePixelsPerMs() * zoomTransform.k * 0.62))
+    const yOpen = yScale(ohlc.open)
+    const yClose = yScale(ohlc.close)
+    const yHigh = yScale(ohlc.high)
+    const yLow = yScale(ohlc.low)
+    const rising = ohlc.close >= ohlc.open
+    const color = rising ? '#40dba2' : '#ffb4ab'
+    const bodyY = Math.min(yOpen, yClose)
+    const bodyHeight = Math.max(2, Math.abs(yClose - yOpen))
+
+    d3.select(this)
+      .select<SVGLineElement>('line.wick')
+      .attr('x1', x)
+      .attr('x2', x)
+      .attr('y1', yHigh)
+      .attr('y2', yLow)
+      .attr('stroke', color)
+
+    d3.select(this)
+      .select<SVGRectElement>('rect.body')
+      .attr('x', x - candleWidth / 2)
+      .attr('y', bodyY)
+      .attr('width', candleWidth)
+      .attr('height', bodyHeight)
+      .attr('fill', rising ? 'rgba(64, 219, 162, 0.28)' : 'rgba(255, 180, 171, 0.28)')
+      .attr('stroke', color)
+      .attr('stroke-width', 1.4)
+  })
+
+  const yGridAxis = d3
+    .axisLeft(yScale)
+    .ticks(5)
+    .tickSize(-plotWidth.value)
+    .tickFormat(() => '')
+  d3.select(gridLayer.value)
+    .attr('transform', `translate(${margin.left}, 0)`)
+    .call(yGridAxis)
+    .call((selection) => {
+      selection.select('.domain').remove()
+      selection.selectAll('line').attr('stroke', 'rgba(143, 148, 157, 0.12)')
+    })
+
+  const yAxis = d3
+    .axisLeft(yScale)
+    .ticks(5)
+    .tickSize(0)
+    .tickPadding(8)
+    .tickFormat((value) => Number(value).toLocaleString('ja-JP'))
+  d3.select(yAxisLayer.value)
+    .attr('transform', `translate(${margin.left}, 0)`)
+    .call(yAxis)
+    .call((selection) => {
+      selection.select('.domain').remove()
+      selection.selectAll('text').attr('fill', '#8f949d').attr('font-size', 12)
+    })
+
+  const tickDates = visibleTickIndexes()
+  const xAxis = d3
+    .axisBottom(xScale)
+    .tickValues(tickDates)
+    .tickSize(0)
+    .tickPadding(8)
+    .tickFormat((value) => {
+      const date = value instanceof Date ? value : new Date(Number(value))
+      return labelFor({
+        at: date.toISOString(),
+        date,
+        index: 0,
+        price: 0,
+      })
+    })
+  d3.select(xAxisLayer.value)
+    .attr('transform', `translate(0, ${margin.top + plotHeight.value})`)
+    .call(xAxis)
+    .call((selection) => {
+      selection.select('.domain').remove()
+      selection.selectAll('text').attr('fill', '#8f949d').attr('font-size', 12)
+    })
+
+  if (tooltip.value.visible) {
+    const hovered = nearestPointAt(tooltip.value.x)
+    if (hovered) showHover(hovered)
+    else hideHover()
+  }
+}
+
+const nearestPointAt = (x: number) => {
+  if (!latestXScale) return undefined
+  const time = latestXScale.invert(x).getTime()
+  return d3.least(chartPoints.value, (point) => Math.abs(point.date.getTime() - time))
+}
+
+const showHover = (point: ChartPoint) => {
+  if (!latestXScale || !latestYScale || !hoverLayer.value || !hoverLine.value || !hoverDot.value)
+    return
+
+  const x = latestXScale(point.date)
+  const ohlc = ohlcFor(point)
+  const y = latestYScale(props.mode === 'box' ? ohlc.close : closePrice(point))
+  if (x < margin.left || x > margin.left + plotWidth.value) {
+    hideHover()
+    return
+  }
+
+  tooltip.value = {
+    visible: true,
+    x,
+    y,
+    price: `${closePrice(point).toLocaleString('ja-JP')}円`,
+    date: tooltipDateFor(point),
+    detail:
+      props.mode === 'box'
+        ? `始 ${ohlc.open.toLocaleString('ja-JP')} / 高 ${ohlc.high.toLocaleString('ja-JP')} / 安 ${ohlc.low.toLocaleString('ja-JP')}`
+        : '',
+  }
+
+  d3.select(hoverLayer.value).style('opacity', 1)
+  d3.select(hoverLine.value)
+    .transition()
+    .duration(120)
+    .ease(d3.easeCubicOut)
+    .attr('x1', x)
+    .attr('x2', x)
+    .attr('y1', margin.top)
+    .attr('y2', margin.top + plotHeight.value)
+  d3.select(hoverDot.value)
+    .transition()
+    .duration(120)
+    .ease(d3.easeCubicOut)
+    .attr('cx', x)
+    .attr('cy', y)
+    .attr('r', 5)
+}
+
+const hideHover = () => {
+  tooltip.value = { ...tooltip.value, visible: false }
+  if (!hoverLayer.value || !hoverDot.value) return
+  d3.select(hoverLayer.value).transition().duration(120).style('opacity', 0)
+  d3.select(hoverDot.value).transition().duration(120).attr('r', 0)
 }
 
 const setZoomScale = (value: number) => {
-  rememberScrollPosition()
-  zoomScale.value = Math.min(maxZoom, Math.max(minZoom, value))
+  const k = Math.min(maxZoom, Math.max(minZoom, value))
+  const center = plotWidth.value / 2
+  const contentCenter = (center - zoomTransform.x) / zoomTransform.k
+  applyTransform(zoomTransformWith(k, center - contentCenter * k))
 }
 
 const zoomOut = () => setZoomScale(zoomScale.value - zoomStep)
 
 const zoomIn = () => setZoomScale(zoomScale.value + zoomStep)
 
-const resetZoom = () => setZoomScale(1)
+const resetZoom = () => alignLatest(1)
 
-const setZoomScaleFromInput = (event: Event) => {
-  const value = Number((event.target as HTMLInputElement).value)
-  setZoomScale(value)
+defineExpose({
+  resetZoom,
+  zoomIn,
+  zoomOut,
+})
+
+const normalizedWheelDelta = (value: number, event: WheelEvent) => {
+  if (event.deltaMode === WheelEvent.DOM_DELTA_LINE) return value * 16
+  if (event.deltaMode === WheelEvent.DOM_DELTA_PAGE) return value * plotWidth.value
+  return value
+}
+
+const zoomAround = (k: number, localX: number) => {
+  const nextK = Math.min(maxZoom, Math.max(minZoom, k))
+  const center = Math.min(plotWidth.value, Math.max(0, localX - margin.left))
+  const contentCenter = (center - zoomTransform.x) / zoomTransform.k
+  applyTransform(zoomTransformWith(nextK, center - contentCenter * nextK))
 }
 
 const handleWheel = (event: WheelEvent) => {
-  if (!event.ctrlKey && !event.metaKey) return
   event.preventDefault()
-  setZoomScale(zoomScale.value + (event.deltaY < 0 ? zoomStep : -zoomStep))
+  hideHover()
+
+  const deltaX = normalizedWheelDelta(event.deltaX, event)
+  const deltaY = normalizedWheelDelta(event.deltaY, event)
+  const panDelta = event.shiftKey && !deltaX ? deltaY : deltaX
+
+  if ((event.shiftKey && panDelta) || Math.abs(panDelta) > Math.abs(deltaY)) {
+    applyTransform(zoomTransformWith(zoomTransform.k, zoomTransform.x - panDelta))
+    return
+  }
+
+  if (!deltaY) return
+  const direction = deltaY < 0 ? 1 : -1
+  const [x] = svg.value ? d3.pointer(event, svg.value) : [event.offsetX]
+  zoomAround(zoomTransform.k + direction * zoomStep, x)
 }
 
-onMounted(() => {
-  if (!canvas.value) return
-  chart = new Chart(canvas.value, {
-    type: 'line',
-    data: {
-      labels: labels.value,
-      datasets: [
-        {
-          data: prices.value,
-          borderColor: '#40dba2',
-          backgroundColor: 'rgba(64, 219, 162, 0.14)',
-          borderWidth: 2,
-          fill: true,
-          pointBackgroundColor: '#d3e3fd',
-          pointBorderColor: '#40dba2',
-          pointRadius: 2.5,
-          pointHoverRadius: 4,
-          tension: 0.25,
-        },
-      ],
-    },
-    options: {
-      responsive: true,
-      maintainAspectRatio: false,
-      animation: false,
-      plugins: {
-        legend: { display: false },
-        tooltip: {
-          displayColors: false,
-          callbacks: {
-            label: (item) => `${(item.parsed.y ?? 0).toLocaleString('ja-JP')}円`,
-          },
-        },
-      },
-      scales: {
-        x: {
-          grid: { color: 'rgba(143, 148, 157, 0.12)' },
-          ticks: { color: '#8f949d', maxTicksLimit: 5 },
-        },
-        y: {
-          grid: { color: 'rgba(143, 148, 157, 0.12)' },
-          ticks: {
-            color: '#8f949d',
-            callback: (value) =>
-              typeof value === 'number' ? value.toLocaleString('ja-JP') : value,
-          },
-        },
-      },
-    },
+const handlePointerMove = (event: PointerEvent) => {
+  if (!svg.value || event.buttons) {
+    hideHover()
+    return
+  }
+  const [x, y] = d3.pointer(event, svg.value)
+  const insidePlot =
+    x >= margin.left &&
+    x <= margin.left + plotWidth.value &&
+    y >= margin.top &&
+    y <= margin.top + plotHeight.value
+  if (!insidePlot) {
+    hideHover()
+    return
+  }
+  const point = nearestPointAt(x)
+  if (point) showHover(point)
+}
+
+onMounted(async () => {
+  await nextTick()
+  if (!root.value || !svg.value) return
+
+  resizeObserver = new ResizeObserver((entries) => {
+    const rect = entries[0]?.contentRect
+    if (!rect) return
+    size.value = { width: rect.width, height: rect.height }
+    if (followsLatest) alignLatest(zoomTransform.k)
+    else applyTransform(zoomTransform)
   })
-  void scrollToEndIfNeeded()
+  resizeObserver.observe(root.value)
+
+  zoomBehavior = d3
+    .zoom<SVGSVGElement, unknown>()
+    .scaleExtent([minZoom, maxZoom])
+    .filter((event) => event.type !== 'wheel' && !event.button && event.type !== 'dblclick')
+    .on('zoom', (event) => {
+      if (syncingZoom) return
+      applyTransform(event.transform, false)
+      syncZoomBehavior(zoomTransform)
+    })
+
+  d3.select(svg.value).call(zoomBehavior).on('dblclick.zoom', null)
+  alignLatest(1)
 })
 
-watch(() => props.points, updateChart, { deep: true })
-watch(chartWidth, () => {
-  chart?.resize()
-  void scrollToEndIfNeeded()
-})
+watch(
+  () => props.points,
+  () => {
+    if (followsLatest) alignLatest(zoomTransform.k)
+    else applyTransform(zoomTransform)
+  },
+  { deep: true },
+)
+
+watch(
+  () => [props.mode, props.range, props.previousClose],
+  () => {
+    hideHover()
+    renderChart()
+  },
+)
 
 onBeforeUnmount(() => {
-  chart?.destroy()
-  chart = undefined
+  resizeObserver?.disconnect()
+  if (svg.value) d3.select(svg.value).on('.zoom', null)
 })
 </script>
 
 <template>
-  <div class="relative h-full w-full">
-    <div
-      ref="scroller"
-      class="h-full w-full overflow-x-auto overflow-y-hidden"
-      @scroll="rememberScrollPosition"
+  <div ref="root" class="relative h-full w-full">
+    <svg
+      ref="svg"
+      class="h-full w-full cursor-grab touch-none select-none active:cursor-grabbing"
+      :aria-label="`${stockName} realtime price chart`"
+      role="img"
       @wheel="handleWheel"
+      @pointermove="handlePointerMove"
+      @pointerleave="hideHover"
     >
-      <div class="h-full" :style="{ width: chartWidth }">
-        <canvas
-          ref="canvas"
-          class="h-full w-full"
-          :aria-label="`${stockName} realtime price chart`"
-        ></canvas>
-      </div>
-    </div>
+      <defs>
+        <clipPath :id="clipId">
+          <rect ref="clipRect"></rect>
+        </clipPath>
+      </defs>
+      <g ref="gridLayer"></g>
+      <g ref="yAxisLayer"></g>
+      <g ref="xAxisLayer"></g>
+      <path :clip-path="`url(#${clipId})`" ref="areaPath" fill="rgba(64, 219, 162, 0.14)"></path>
+      <path
+        :clip-path="`url(#${clipId})`"
+        ref="linePath"
+        fill="none"
+        stroke="#40dba2"
+        stroke-linecap="round"
+        stroke-linejoin="round"
+        stroke-width="2.2"
+      ></path>
+      <line
+        ref="previousCloseLine"
+        stroke="#ffcf6e"
+        stroke-dasharray="5 5"
+        stroke-linecap="round"
+        stroke-width="1.2"
+      ></line>
+      <g :clip-path="`url(#${clipId})`" ref="candlesLayer"></g>
+      <g :clip-path="`url(#${clipId})`" ref="dotsLayer"></g>
+      <g ref="hoverLayer" :clip-path="`url(#${clipId})`" class="pointer-events-none" opacity="0">
+        <line
+          ref="hoverLine"
+          stroke="rgba(211, 227, 253, 0.42)"
+          stroke-dasharray="4 4"
+          stroke-width="1"
+        ></line>
+        <circle ref="hoverDot" fill="#111418" r="0" stroke="#40dba2" stroke-width="2"></circle>
+      </g>
+    </svg>
+
     <span
       v-if="active && !points.length"
       class="absolute inset-0 grid place-items-center text-[#8f949d]"
     >
       <Spinner />
     </span>
+
     <div
-      class="absolute right-2 top-2 flex items-center gap-1 rounded-md border border-[#2d3440] bg-[#111418]/90 px-1.5 py-1 shadow-sm"
+      v-if="notice"
+      class="pointer-events-none absolute left-3 top-3 max-w-[min(22rem,calc(100%-1.5rem))] rounded-md border border-[#3a424f] bg-[#111418]/90 px-3 py-2 text-xs text-[#d3e3fd] shadow-lg shadow-black/20"
     >
-      <button
-        class="grid h-6 w-6 place-items-center rounded text-[#d3e3fd] hover:bg-[#1d232b]"
-        type="button"
-        aria-label="縮小"
-        @click="zoomOut"
-      >
-        <Minus class="h-3.5 w-3.5" aria-hidden="true" />
-      </button>
-      <input
-        :value="zoomScale"
-        class="h-6 w-24 accent-[#40dba2]"
-        type="range"
-        :min="minZoom"
-        :max="maxZoom"
-        :step="zoomStep"
-        aria-label="グラフ縮尺"
-        @input="setZoomScaleFromInput"
-      />
-      <button
-        class="grid h-6 w-6 place-items-center rounded text-[#d3e3fd] hover:bg-[#1d232b]"
-        type="button"
-        aria-label="拡大"
-        @click="zoomIn"
-      >
-        <Plus class="h-3.5 w-3.5" aria-hidden="true" />
-      </button>
-      <button
-        class="grid h-6 w-6 place-items-center rounded text-[#8f949d] hover:bg-[#1d232b] hover:text-[#d3e3fd]"
-        type="button"
-        aria-label="縮尺を戻す"
-        @click="resetZoom"
-      >
-        <RotateCcw class="h-3.5 w-3.5" aria-hidden="true" />
-      </button>
+      <div class="font-black text-[#ffcf6e]">{{ notice.title }}</div>
+      <div v-if="notice.detail" class="mt-0.5 text-[#8f949d]">{{ notice.detail }}</div>
+    </div>
+
+    <div
+      class="pointer-events-none absolute w-[152px] translate-y-1 rounded-md border border-[#2d3440] bg-[#111418]/95 px-3 py-2 text-xs text-[#d3e3fd] opacity-0 shadow-lg shadow-black/30 transition-all duration-150 ease-out"
+      :class="tooltip.visible && 'translate-y-0 opacity-100'"
+      :style="tooltipStyle"
+    >
+      <div class="font-black text-[#40dba2]">{{ tooltip.price }}</div>
+      <div class="mt-1 text-[#8f949d]">{{ tooltip.date }}</div>
+      <div v-if="tooltip.detail" class="mt-1 leading-relaxed text-[#8f949d]">
+        {{ tooltip.detail }}
+      </div>
     </div>
   </div>
 </template>
diff --git a/apps/csbie-ui/src/features/trade/TradeView.vue b/apps/csbie-ui/src/features/trade/TradeView.vue
index 7862d1b..3c52791 100644
--- a/apps/csbie-ui/src/features/trade/TradeView.vue
+++ b/apps/csbie-ui/src/features/trade/TradeView.vue
@@ -1,5 +1,14 @@
 <script setup lang="ts">
-import { ChevronDown, Download, FileCheck2, Search, ShieldCheck } from 'lucide-vue-next'
+import {
+  ChevronDown,
+  Download,
+  FileCheck2,
+  Minus,
+  Plus,
+  RotateCcw,
+  Search,
+  ShieldCheck,
+} from 'lucide-vue-next'
 import { AnimatePresence, LayoutGroup, motion } from 'motion-v'
 import { computed, ref } from 'vue'
 import Spinner from '../../components/ui/Spinner.vue'
@@ -7,19 +16,17 @@ import UiButton from '../../components/ui/UiButton.vue'
 import UiField from '../../components/ui/UiField.vue'
 import UiSegmented from '../../components/ui/UiSegmented.vue'
 import {
-  cashOrderAccountTypeOptions,
-  cashOrderMarketOptions,
   cashOrderMethodOptions,
   cashOrderPriceConditionOptions,
-  cashOrderTermOptions,
   cashOrderTriggerZoneOptions,
   orderKindOptions,
-  sKabuOrderMarketOptions,
   tradeSideOptions,
 } from '../../constants/trade'
 import { ui } from '../../styles/ui'
 import type {
   ChartMode,
+  ChartNotice,
+  ChartRange,
   CashOrderAccountType,
   CashOrderMarket,
   CashOrderMethod,
@@ -36,6 +43,24 @@ import { currency } from '../../utils/format'
 import RealtimePriceChart from './RealtimePriceChart.vue'
 
 type StockInfoTab = 'detail' | 'holding'
+type CashOrderAccountTypeOption = {
+  label: string
+  value: CashOrderAccountType
+}
+type CashOrderMarketOption = {
+  label: string
+  value: CashOrderMarket
+}
+type CashOrderTermOption = {
+  label: string
+  value: CashOrderTerm
+}
+type CashOrderDateOption = {
+  label: string
+  value: string
+}
+
+const chartRangeOptions: ChartRange[] = ['1D', '7D', '1M', '3M', '1Y', 'ALL']
 
 defineProps<{
   viewedStocks: Stock[]
@@ -44,17 +69,16 @@ defineProps<{
   connected: boolean
   orderQuantity: number
   estimatedAmount: number
+  cashOrderAccountTypeOptions: CashOrderAccountTypeOption[]
+  cashOrderMarketOptions: CashOrderMarketOption[]
+  cashOrderTermOptions: CashOrderTermOption[]
+  cashOrderDateOptions: CashOrderDateOption[]
+  cashOrderPriceStep: number
   canRequestCashEstimate: boolean
   canPlaceCashOrder: boolean
   realtimePricePoints: RealtimePricePoint[]
+  chartNotice: ChartNotice | null
   pricePolling: boolean
-  boxPlotStyle: {
-    min: string
-    q1: string
-    median: string
-    q3: string
-    max: string
-  }
   hasQuote: (stock: Stock) => boolean
 }>()
 
@@ -90,11 +114,10 @@ const cashOrderSecondaryPriceInput = defineModel<string>('cashOrderSecondaryPric
 const quantityInput = defineModel<string>('quantityInput', { required: true })
 const priceInput = defineModel<string>('priceInput', { required: true })
 const chartMode = defineModel<ChartMode>('chartMode', { required: true })
+const chartRange = defineModel<ChartRange>('chartRange', { required: true })
 const activeStockInfoTab = ref<StockInfoTab>('detail')
 const advancedOptionsOpen = ref(false)
-const orderMarketOptions = computed(() =>
-  orderKind.value === 's' ? sKabuOrderMarketOptions : cashOrderMarketOptions,
-)
+const priceChart = ref<InstanceType<typeof RealtimePriceChart> | null>(null)
 const primaryPriceConditionRequiresPrice = computed(() =>
   ['limit', 'limitAtOpen', 'limitAtClose', 'limitIoc', 'funari'].includes(
     cashOrderPriceCondition.value,
@@ -178,27 +201,65 @@ const emit = defineEmits<{
         </div>
 
         <div :class="ui.periodTabs">
-          <button :class="[ui.periodButton, ui.periodButtonActive]" type="button">1D</button>
-          <button :class="ui.periodButton" type="button">1W</button>
-          <button :class="ui.periodButton" type="button">1M</button>
+          <button
+            v-for="range in chartRangeOptions"
+            :key="range"
+            :class="[ui.periodButton, chartRange === range && ui.periodButtonActive]"
+            type="button"
+            :aria-pressed="chartRange === range"
+            @click="chartRange = range"
+          >
+            {{ range }}
+          </button>
         </div>
 
         <div :class="ui.chartActions">
-          <div :class="ui.smallTabs">
-            <button
-              :class="[ui.smallTab, chartMode === 'line' && ui.smallTabActive]"
-              type="button"
-              @click="chartMode = 'line'"
-            >
-              推移
-            </button>
-            <button
-              :class="[ui.smallTab, chartMode === 'box' && ui.smallTabActive]"
-              type="button"
-              @click="chartMode = 'box'"
-            >
-              箱ひげ
-            </button>
+          <div class="flex items-center gap-2">
+            <div :class="ui.smallTabs">
+              <button
+                :class="[ui.smallTab, chartMode === 'line' && ui.smallTabActive]"
+                type="button"
+                @click="chartMode = 'line'"
+              >
+                推移
+              </button>
+              <button
+                :class="[ui.smallTab, chartMode === 'box' && ui.smallTabActive]"
+                type="button"
+                @click="chartMode = 'box'"
+              >
+                箱ひげ
+              </button>
+            </div>
+            <div class="flex items-center gap-1">
+              <button
+                class="grid h-8 w-8 place-items-center rounded-md border border-[#2d3440] text-[#d3e3fd] transition hover:bg-[#1d232b] disabled:opacity-40"
+                type="button"
+                aria-label="縮小"
+                :disabled="!hasQuote(selectedStock)"
+                @click="priceChart?.zoomOut()"
+              >
+                <Minus class="h-3.5 w-3.5" aria-hidden="true" />
+              </button>
+              <button
+                class="grid h-8 w-8 place-items-center rounded-md border border-[#2d3440] text-[#d3e3fd] transition hover:bg-[#1d232b] disabled:opacity-40"
+                type="button"
+                aria-label="拡大"
+                :disabled="!hasQuote(selectedStock)"
+                @click="priceChart?.zoomIn()"
+              >
+                <Plus class="h-3.5 w-3.5" aria-hidden="true" />
+              </button>
+              <button
+                class="grid h-8 w-8 place-items-center rounded-md border border-[#2d3440] text-[#8f949d] transition hover:bg-[#1d232b] hover:text-[#d3e3fd] disabled:opacity-40"
+                type="button"
+                aria-label="縮尺を戻す"
+                :disabled="!hasQuote(selectedStock)"
+                @click="priceChart?.resetZoom()"
+              >
+                <RotateCcw class="h-3.5 w-3.5" aria-hidden="true" />
+              </button>
+            </div>
           </div>
           <button :class="ui.ghostButton" type="button" @click="emit('downloadCsv')">
             <Download class="h-4 w-4" aria-hidden="true" />
@@ -206,53 +267,22 @@ const emit = defineEmits<{
           </button>
         </div>
 
-        <div v-if="chartMode === 'line'" :class="ui.chartBox">
+        <div :class="ui.chartBox">
           <RealtimePriceChart
             v-if="hasQuote(selectedStock)"
+            ref="priceChart"
             :points="realtimePricePoints"
             :stock-name="selectedStock.name"
             :active="pricePolling"
+            :mode="chartMode"
+            :range="chartRange"
+            :previous-close="selectedStock.prevClose"
+            :notice="chartNotice"
           />
           <span v-else class="grid h-full place-items-center text-[#8f949d]">
             <Spinner />
           </span>
         </div>
-        <div v-else :class="ui.boxplot">
-          <div :class="ui.boxplotScale">
-            <span>
-              <template v-if="hasQuote(selectedStock)">{{
-                currency(selectedStock.box.min)
-              }}</template>
-              <Spinner v-else size="sm" />
-            </span>
-            <span>
-              <template v-if="hasQuote(selectedStock)">{{
-                currency(selectedStock.box.max)
-              }}</template>
-              <Spinner v-else size="sm" />
-            </span>
-          </div>
-          <div v-if="hasQuote(selectedStock)" :class="ui.boxplotTrack">
-            <i
-              :class="ui.whisker"
-              :style="{
-                left: boxPlotStyle.min,
-                width: `calc(${boxPlotStyle.max} - ${boxPlotStyle.min})`,
-              }"
-            ></i>
-            <i
-              :class="ui.box"
-              :style="{
-                left: boxPlotStyle.q1,
-                width: `calc(${boxPlotStyle.q3} - ${boxPlotStyle.q1})`,
-              }"
-            ></i>
-            <i :class="ui.median" :style="{ left: boxPlotStyle.median }"></i>
-          </div>
-          <div v-else class="grid min-h-20 place-items-center text-[#8f949d]">
-            <Spinner />
-          </div>
-        </div>
       </article>
 
       <LayoutGroup id="stock-info-tabs">
@@ -413,10 +443,30 @@ const emit = defineEmits<{
                 :transition="advancedTransition"
               >
                 <span :class="ui.advancedLabel">預り区分</span>
-                <UiSegmented
-                  v-model="cashOrderAccountType"
-                  :options="cashOrderAccountTypeOptions"
-                />
+                <LayoutGroup id="cash-order-account-type">
+                  <div :class="ui.accountTypeGrid" role="radiogroup" aria-label="預り区分">
+                    <button
+                      v-for="option in cashOrderAccountTypeOptions"
+                      :key="option.value"
+                      type="button"
+                      role="radio"
+                      :aria-checked="cashOrderAccountType === option.value"
+                      :class="[
+                        ui.accountTypeButton,
+                        cashOrderAccountType === option.value && ui.accountTypeButtonActive,
+                      ]"
+                      @click="cashOrderAccountType = option.value"
+                    >
+                      <motion.span
+                        v-if="cashOrderAccountType === option.value"
+                        layout-id="cash-order-account-type-indicator"
+                        :class="ui.accountTypeIndicator"
+                        :transition="tabTransition"
+                      />
+                      <span :class="ui.accountTypeText">{{ option.label }}</span>
+                    </button>
+                  </div>
+                </LayoutGroup>
                 <UiField
                   v-model="cashOrderMarket"
                   as="select"
@@ -424,7 +474,7 @@ const emit = defineEmits<{
                   :disabled="orderKind === 's'"
                 >
                   <option
-                    v-for="option in orderMarketOptions"
+                    v-for="option in cashOrderMarketOptions"
                     :key="option.value"
                     :value="option.value"
                   >
@@ -447,6 +497,7 @@ const emit = defineEmits<{
                     label="注文価格"
                     type="number"
                     min="1"
+                    :step="cashOrderPriceStep"
                     placeholder="価格を入力"
                   />
                   <UiField v-model="cashOrderTerm" as="select" label="有効期限">
@@ -459,7 +510,21 @@ const emit = defineEmits<{
                     </option>
                   </UiField>
                   <UiField
-                    v-if="cashOrderTerm === 'date'"
+                    v-if="cashOrderTerm === 'date' && cashOrderDateOptions.length"
+                    v-model="cashOrderDateInput"
+                    as="select"
+                    label="指定日"
+                  >
+                    <option
+                      v-for="option in cashOrderDateOptions"
+                      :key="option.value"
+                      :value="option.value"
+                    >
+                      {{ option.label }}
+                    </option>
+                  </UiField>
+                  <UiField
+                    v-else-if="cashOrderTerm === 'date'"
                     v-model="cashOrderDateInput"
                     label="指定日"
                     type="date"
@@ -488,6 +553,7 @@ const emit = defineEmits<{
                       label="逆指値価格"
                       type="number"
                       min="1"
+                      :step="cashOrderPriceStep"
                       placeholder="価格を入力"
                     />
                   </template>
@@ -511,6 +577,7 @@ const emit = defineEmits<{
                       label="OCO価格"
                       type="number"
                       min="1"
+                      :step="cashOrderPriceStep"
                       placeholder="価格を入力"
                     />
                   </template>
diff --git a/apps/csbie-ui/src/features/trading/trading-data.ts b/apps/csbie-ui/src/features/trading/trading-data.ts
index b9171e3..fc85225 100644
--- a/apps/csbie-ui/src/features/trading/trading-data.ts
+++ b/apps/csbie-ui/src/features/trading/trading-data.ts
@@ -1,4 +1,5 @@
 import type {
+  ChartNotice,
   OrderPreview,
   OrderRow,
   Position,
@@ -180,7 +181,83 @@ export const stockFromBoard = (
   }
 }
 
-const chartDateTimeToIso = (value: string) => {
+const zonedPartsFormatter = (timeZone: string) =>
+  new Intl.DateTimeFormat('en-US', {
+    timeZone,
+    hourCycle: 'h23',
+    year: 'numeric',
+    month: '2-digit',
+    day: '2-digit',
+    hour: '2-digit',
+    minute: '2-digit',
+    second: '2-digit',
+  })
+
+const zonedParts = (date: Date, timeZone: string) => {
+  const parts = Object.fromEntries(
+    zonedPartsFormatter(timeZone)
+      .formatToParts(date)
+      .filter((part) => part.type !== 'literal')
+      .map((part) => [part.type, Number(part.value)]),
+  ) as Partial<Record<'year' | 'month' | 'day' | 'hour' | 'minute' | 'second', number>>
+
+  const missing = (['year', 'month', 'day', 'hour', 'minute', 'second'] as const).filter(
+    (part) => parts[part] == null,
+  )
+  if (missing.length) {
+    throw new Error(`Failed to read ${missing.join(', ')} from ${timeZone} date parts`)
+  }
+
+  return {
+    year: parts.year as number,
+    month: parts.month as number,
+    day: parts.day as number,
+    hour: parts.hour as number,
+    minute: parts.minute as number,
+    second: parts.second as number,
+  }
+}
+
+const timeZoneOffsetMs = (date: Date, timeZone: string) => {
+  const parts = zonedParts(date, timeZone)
+  return (
+    Date.UTC(parts.year, parts.month - 1, parts.day, parts.hour, parts.minute, parts.second) -
+    date.getTime()
+  )
+}
+
+const zonedDateTimeToUtcMs = (
+  timeZone: string,
+  parts: {
+    year: number
+    month: number
+    day: number
+    hour?: number
+    minute?: number
+    second?: number
+  },
+) => {
+  const utcGuess = Date.UTC(
+    parts.year,
+    parts.month - 1,
+    parts.day,
+    parts.hour ?? 0,
+    parts.minute ?? 0,
+    parts.second ?? 0,
+  )
+  return utcGuess - timeZoneOffsetMs(new Date(utcGuess), timeZone)
+}
+
+export const startOfMarketDateUtcMs = (timeZone: string, now = new Date()) => {
+  const parts = zonedParts(now, timeZone)
+  return zonedDateTimeToUtcMs(timeZone, {
+    year: parts.year,
+    month: parts.month,
+    day: parts.day,
+  })
+}
+
+const chartDateTimeToIso = (value: string, timeZone = 'Asia/Tokyo') => {
   const digits = value.replace(/\D/g, '')
   if (digits.length < 8) return ''
   const year = Number(digits.slice(0, 4))
@@ -188,19 +265,72 @@ const chartDateTimeToIso = (value: string) => {
   const day = Number(digits.slice(6, 8))
   const hour = Number(digits.slice(8, 10) || '0')
   const minute = Number(digits.slice(10, 12) || '0')
-  const date = new Date(year, month - 1, day, hour, minute)
-  return Number.isNaN(date.getTime()) ? '' : date.toISOString()
+  const time = zonedDateTimeToUtcMs(timeZone, { year, month, day, hour, minute })
+  return Number.isNaN(time) ? '' : new Date(time).toISOString()
 }
 
-export const pricePointsFromIssueChart = (value: unknown): RealtimePricePoint[] =>
+export const pricePointsFromIssueChart = (
+  value: unknown,
+  timeZone = 'Asia/Tokyo',
+): RealtimePricePoint[] =>
   asArray(asRecord(value).prices)
     .map((entry) => {
       const price = asRecord(entry)
-      const at = chartDateTimeToIso(textValue(price.dateTime))
-      return { at, price: numberValue(price.close) }
+      const at = chartDateTimeToIso(textValue(price.dateTime), timeZone)
+      const close = numberValue(price.close)
+      return {
+        at,
+        price: close,
+        open: numberValue(price.open),
+        high: numberValue(price.high),
+        low: numberValue(price.low),
+        close,
+        volume: numberValue(price.volume, 0),
+      }
     })
     .filter((point) => point.at && point.price > 0)
 
+const japanDateFormatter = new Intl.DateTimeFormat('en-CA', {
+  timeZone: 'Asia/Tokyo',
+  year: 'numeric',
+  month: '2-digit',
+  day: '2-digit',
+})
+
+const chartDateTimeToLocalDate = (value: string) => {
+  const digits = value.replace(/\D/g, '')
+  if (digits.length < 8) return ''
+  return `${digits.slice(0, 4)}-${digits.slice(4, 6)}-${digits.slice(6, 8)}`
+}
+
+const japanToday = () => japanDateFormatter.format(new Date())
+
+const isWeekendInJapan = () => {
+  const weekday = new Intl.DateTimeFormat('en-US', {
+    timeZone: 'Asia/Tokyo',
+    weekday: 'short',
+  }).format(new Date())
+  return weekday === 'Sat' || weekday === 'Sun'
+}
+
+export const chartNoticeFromIssueChart = (value: unknown): ChartNotice | null => {
+  const chart = asRecord(value)
+  const latestDate = chartDateTimeToLocalDate(textValue(chart.latestDateTime))
+  const today = japanToday()
+  if (!latestDate || latestDate >= today) return null
+
+  const formattedLatestDate = new Intl.DateTimeFormat('ja-JP', {
+    timeZone: 'Asia/Tokyo',
+    month: 'numeric',
+    day: 'numeric',
+  }).format(new Date(`${latestDate}T00:00:00+09:00`))
+
+  return {
+    title: isWeekendInJapan() ? '本日は休場日です' : '本日の取引データはまだありません',
+    detail: `最新のチャートは${formattedLatestDate}です`,
+  }
+}
+
 export const positionFromApi = (value: unknown): Position | null => {
   const item = asRecord(value)
   const issue = issueFrom(item.issue)
@@ -243,7 +373,7 @@ export const orderFromApi = (value: unknown): OrderRow | null => {
   const quantity =
     status === '約定済'
       ? (executedQuantity ?? orderedQuantity ?? unexecutedQuantity)
-      : (orderedQuantity ?? unexecutedQuantity ?? executedQuantity)
+      : (unexecutedQuantity ?? orderedQuantity ?? executedQuantity)
   const price =
     status === '約定済'
       ? (nullableNumberValue(item.executedPrice) ?? nullableNumberValue(item.price))
diff --git a/apps/csbie-ui/src/features/trading/useTradingSession.ts b/apps/csbie-ui/src/features/trading/useTradingSession.ts
index bf96476..7041fae 100644
--- a/apps/csbie-ui/src/features/trading/useTradingSession.ts
+++ b/apps/csbie-ui/src/features/trading/useTradingSession.ts
@@ -1,7 +1,14 @@
 import { computed, ref, watch, type Ref } from 'vue'
 import { createRpcSocket } from '../../api'
+import {
+  cashOrderAccountTypeOptions as defaultCashOrderAccountTypeOptions,
+  cashOrderMarketOptions as defaultCashOrderMarketOptions,
+  sKabuOrderMarketOptions,
+} from '../../constants/trade'
 import type {
   ChartMode,
+  ChartRange,
+  ChartNotice,
   CashOrderAccountType,
   CashOrderMarket,
   CashOrderMethod,
@@ -29,8 +36,10 @@ import {
   orderFromApi,
   orderHistoryKey,
   orderHistoryResultNotice,
+  chartNoticeFromIssueChart,
   pricePointsFromIssueChart,
   positionFromApi,
+  startOfMarketDateUtcMs,
   stockFromBoard,
   stockFromIssue,
   stockFromPosition,
@@ -43,6 +52,26 @@ type RpcResolver = {
   reject: (reason: Error) => void
 }
 
+type CashOrderTermOption = {
+  label: string
+  value: CashOrderTerm
+}
+
+type CashOrderAccountTypeOption = {
+  label: string
+  value: CashOrderAccountType
+}
+
+type CashOrderMarketOption = {
+  label: string
+  value: CashOrderMarket
+}
+
+type CashOrderDateOption = {
+  label: string
+  value: string
+}
+
 const priceBasedCashOrderConditions = new Set<CashOrderPriceCondition>([
   'limit',
   'limitAtOpen',
@@ -54,6 +83,77 @@ const priceBasedCashOrderConditions = new Set<CashOrderPriceCondition>([
 const cashOrderPriceConditionRequiresPrice = (condition: CashOrderPriceCondition) =>
   priceBasedCashOrderConditions.has(condition)
 
+const chartRangeOptions = {
+  '1D': { period: 'minute', unit: 5, count: 120 },
+  '7D': { period: 'day', unit: 1, count: 7 },
+  '1M': { period: 'day', unit: 1, count: 31 },
+  '3M': { period: 'day', unit: 1, count: 93 },
+  '1Y': { period: 'day', unit: 1, count: 365 },
+  ALL: { period: 'month', unit: 1, count: 9999 },
+} as const satisfies Record<
+  ChartRange,
+  { period: 'minute' | 'day' | 'week' | 'month'; unit: number; count: number }
+>
+
+const marketTimeZones: Record<string, string> = {
+  FKO: 'Asia/Tokyo',
+  NGY: 'Asia/Tokyo',
+  PTS: 'Asia/Tokyo',
+  PTX: 'Asia/Tokyo',
+  SOR: 'Asia/Tokyo',
+  SPR: 'Asia/Tokyo',
+  STK: 'Asia/Tokyo',
+  TKY: 'Asia/Tokyo',
+  AMEX: 'America/New_York',
+  ARCX: 'America/New_York',
+  NAS: 'America/New_York',
+  NASDAQ: 'America/New_York',
+  NYS: 'America/New_York',
+  NYSE: 'America/New_York',
+  XNAS: 'America/New_York',
+  XNYS: 'America/New_York',
+}
+
+const countryTimeZones: Record<string, string> = {
+  アメリカ: 'America/New_York',
+  日本: 'Asia/Tokyo',
+  米国: 'America/New_York',
+  US: 'America/New_York',
+  USA: 'America/New_York',
+}
+
+const timeZoneForStock = (stock: Stock) =>
+  marketTimeZones[stock.market.toUpperCase()] ?? countryTimeZones[stock.country] ?? null
+
+const normalizeApkOrderTermDate = (value: string) => {
+  const digits = value.replace(/\D/g, '')
+  if (digits.length === 6) return `20${digits}`
+  if (digits.length === 8) return digits
+  return ''
+}
+
+const displayApkOrderTermDate = (value: string) => {
+  const normalized = normalizeApkOrderTermDate(value)
+  if (!normalized) return value
+  return `${normalized.slice(0, 4)}/${normalized.slice(4, 6)}/${normalized.slice(6, 8)}`
+}
+
+const apkExchangeMarketCodes: CashOrderMarket[] = ['SOR', 'TKY', 'NGY', 'FKO', 'SPR', 'PTS', 'PTX']
+
+const parseApkExchangeMarkets = (value: string) => {
+  const markets: CashOrderMarket[] = []
+  for (let index = 0; index < value.length; index += 3) {
+    const code = value.slice(index, index + 3) as CashOrderMarket
+    if (apkExchangeMarketCodes.includes(code) && !markets.includes(code)) markets.push(code)
+  }
+  return markets
+}
+
+const priceMatchesStep = (price: number, step: number) => {
+  if (!Number.isFinite(price) || !Number.isFinite(step) || step <= 0) return true
+  return Math.abs(price / step - Math.round(price / step)) < 1e-8
+}
+
 export const useTradingSession = (selectedPasskeyId: Ref<string>) => {
   const selectedStockCode = ref('')
   const viewedStockCodes = ref<string[]>([])
@@ -72,6 +172,7 @@ export const useTradingSession = (selectedPasskeyId: Ref<string>) => {
   const quantityInput = ref('')
   const priceInput = ref('')
   const chartMode = ref<ChartMode>('line')
+  const chartRange = ref<ChartRange>('1D')
   const showSearch = ref(false)
   const searchQuery = ref('')
   const countryFilter = ref('all')
@@ -81,6 +182,7 @@ export const useTradingSession = (selectedPasskeyId: Ref<string>) => {
   const pendingCashEstimateId = ref<number | null>(null)
   const lastCashEstimate = ref<OrderPreview | null>(null)
   const lastCashEstimateKey = ref('')
+  const cashPreOrder = ref<RecordLike | null>(null)
   const ws = ref<WebSocket | null>(null)
   const rpcPending = new Map<number, RpcResolver>()
   const sbiConnected = ref(false)
@@ -96,16 +198,16 @@ export const useTradingSession = (selectedPasskeyId: Ref<string>) => {
   const positions = ref<Position[]>([])
   const stocks = ref<Stock[]>([])
   const historicalPricePoints = ref<RealtimePricePoint[]>([])
+  const chartNotice = ref<ChartNotice | null>(null)
   const realtimePricePoints = ref<RealtimePricePoint[]>([])
   const pricePolling = ref(false)
   let rpcId = 0
   let boardPollingSubscriptionId = ''
   let boardPollingRequestId = 0
   let chartHistoryRequestId = 0
+  let cashPreOrderRequestId = 0
 
   const maxRealtimePricePoints = 120
-  const maxChartPricePoints = 240
-
   const errorMessage = (cause: unknown, fallback: string) =>
     cause instanceof Error ? cause.message : fallback
 
@@ -139,6 +241,111 @@ export const useTradingSession = (selectedPasskeyId: Ref<string>) => {
     if (orderKind.value === 's') return 'STK'
     return cashOrderMarket.value === 'auto' ? selectedStock.value.market : cashOrderMarket.value
   })
+  const sKabuAvailable = computed(() => {
+    if (orderKind.value !== 's') return true
+    const sKabu = cashPreOrder.value ? asRecord(cashPreOrder.value.sKabu) : null
+    return sKabu?.available !== false
+  })
+  const cashOrderIppanMarginPaymentLimit = computed(() => {
+    const margin = cashPreOrder.value ? asRecord(cashPreOrder.value.margin) : {}
+    return textValue(margin.ippanPaymentLimit) || undefined
+  })
+  const cashOrderAccountTypeOptions = computed<CashOrderAccountTypeOption[]>(() => {
+    const nisa = cashPreOrder.value ? asRecord(cashPreOrder.value.nisa) : {}
+    const options = defaultCashOrderAccountTypeOptions.filter(
+      (option) => option.value === 'specific' || option.value === 'general',
+    )
+    if (textValue(nisa.growthServiceKbn) === '1') {
+      const growth = defaultCashOrderAccountTypeOptions.find(
+        (option) => option.value === 'growthInvestment',
+      )
+      if (growth) options.push(growth)
+    }
+    if (textValue(nisa.serviceKbn) === '1') {
+      const nisaOption = defaultCashOrderAccountTypeOptions.find(
+        (option) => option.value === 'nisa',
+      )
+      if (nisaOption) options.push(nisaOption)
+    }
+    return options
+  })
+  const cashOrderMarketOptions = computed<CashOrderMarketOption[]>(() => {
+    if (orderKind.value === 's') return sKabuOrderMarketOptions
+    const exchangeList = textValue(cashPreOrder.value?.exchangeList)
+    if (!exchangeList) return defaultCashOrderMarketOptions
+    const markets = parseApkExchangeMarkets(exchangeList)
+    const options = markets
+      .map((market) => defaultCashOrderMarketOptions.find((option) => option.value === market))
+      .filter((option): option is CashOrderMarketOption => Boolean(option))
+    return options.length ? options : defaultCashOrderMarketOptions
+  })
+  const preferredCashOrderMarket = computed(() => {
+    if (orderKind.value === 's') return 'STK'
+    const index = Number(textValue(cashPreOrder.value?.exchangeListIndexFlag))
+    const indexedOption =
+      Number.isInteger(index) && index > 0 ? cashOrderMarketOptions.value[index - 1] : undefined
+    return (
+      indexedOption?.value ??
+      cashOrderMarketOptions.value.find((option) => option.value === selectedStock.value.market)
+        ?.value ??
+      cashOrderMarketOptions.value[0]?.value ??
+      'auto'
+    )
+  })
+  const apkOrderTerms = computed(() =>
+    asArray(cashPreOrder.value?.orderTerms)
+      .map((value) => textValue(value))
+      .filter(Boolean),
+  )
+  const apkOrderTermDates = computed(() =>
+    asArray(cashPreOrder.value?.orderTermDates)
+      .map((value) => textValue(value))
+      .filter(Boolean),
+  )
+  const cashOrderTermOptions = computed<CashOrderTermOption[]>(() => {
+    if (orderKind.value === 's') return [{ label: '当日中', value: 'day' }]
+    const terms = apkOrderTerms.value
+    if (!terms.length) {
+      return [
+        { label: '当日中', value: 'day' },
+        { label: '今週中', value: 'week' },
+        { label: '日付指定', value: 'date' },
+      ]
+    }
+    const options: CashOrderTermOption[] = []
+    if (terms.some((term) => term === '当日中')) options.push({ label: '当日中', value: 'day' })
+    if (terms.some((term) => term === '今週中')) options.push({ label: '今週中', value: 'week' })
+    if (apkOrderTermDates.value.length || terms.some((term) => /\d/.test(term))) {
+      options.push({ label: '日付指定', value: 'date' })
+    }
+    return options.length ? options : [{ label: '当日中', value: 'day' }]
+  })
+  const cashOrderDateOptions = computed<CashOrderDateOption[]>(() => {
+    const dates = apkOrderTermDates.value.length
+      ? apkOrderTermDates.value
+      : apkOrderTerms.value.filter((term) => /\d/.test(term))
+    return dates
+      .map((date) => ({
+        label: displayApkOrderTermDate(date),
+        value: normalizeApkOrderTermDate(date),
+      }))
+      .filter((option) => option.value)
+  })
+  const cashOrderPriceStep = computed(() => {
+    const steps = asArray(cashPreOrder.value?.priceSteps)
+      .map((value) => {
+        const record = asRecord(value)
+        return {
+          upper: numberValue(record.from),
+          step: numberValue(record.to),
+        }
+      })
+      .filter((step) => step.upper > 0 && step.step > 0)
+      .sort((left, right) => left.upper - right.upper)
+    if (!steps.length) return 1
+    const referencePrice = orderPrice.value > 0 ? orderPrice.value : selectedStock.value.price
+    return steps.find((step) => referencePrice <= step.upper)?.step ?? steps.at(-1)?.step ?? 1
+  })
   const estimatedAmount = computed(() => Math.max(0, orderQuantity.value * orderPrice.value))
   const hasQuote = (stock: Stock) => stock.price > 0
   const hasAccountSummary = computed(
@@ -154,10 +361,12 @@ export const useTradingSession = (selectedPasskeyId: Ref<string>) => {
     JSON.stringify({
       issueCode: selectedStock.value.code,
       market: resolvedCashOrderMarket.value,
+      preOrderMarket: orderKind.value === 's' ? selectedStock.value.market : undefined,
       side: tradeSide.value,
       quantity: orderQuantity.value,
       kind: orderKind.value,
       accountType: cashOrderAccountType.value,
+      depositType: cashOrderAccountType.value,
       priceCondition: orderKind.value === 's' ? undefined : cashOrderPriceCondition.value,
       price:
         orderKind.value !== 's' && cashOrderPrimaryRequiresPrice.value
@@ -187,14 +396,30 @@ export const useTradingSession = (selectedPasskeyId: Ref<string>) => {
         cashOrderSecondaryRequiresPrice.value
           ? cashOrderSecondaryPrice.value
           : undefined,
+      ippanMarginPaymentLimit:
+        orderKind.value !== 's' ? cashOrderIppanMarginPaymentLimit.value : undefined,
     }),
   )
   const canRequestCashEstimate = computed(() => {
     if (!connected.value || !selectedStock.value.code || orderQuantity.value <= 0) return false
+    if (orderKind.value === 's' && !selectedStock.value.market) return false
+    if (!sKabuAvailable.value) return false
     if (orderKind.value === 's') return true
     if (cashOrderPrimaryRequiresPrice.value && orderPrice.value <= 0) return false
+    if (
+      cashOrderPrimaryRequiresPrice.value &&
+      !priceMatchesStep(orderPrice.value, cashOrderPriceStep.value)
+    ) {
+      return false
+    }
     if (cashOrderTerm.value === 'date' && !cashOrderDateInput.value) return false
     if (cashOrderMethod.value !== 'normal' && cashOrderTriggerPrice.value <= 0) return false
+    if (
+      cashOrderMethod.value !== 'normal' &&
+      !priceMatchesStep(cashOrderTriggerPrice.value, cashOrderPriceStep.value)
+    ) {
+      return false
+    }
     if (
       cashOrderMethod.value === 'oco' &&
       cashOrderSecondaryRequiresPrice.value &&
@@ -202,6 +427,13 @@ export const useTradingSession = (selectedPasskeyId: Ref<string>) => {
     ) {
       return false
     }
+    if (
+      cashOrderMethod.value === 'oco' &&
+      cashOrderSecondaryRequiresPrice.value &&
+      !priceMatchesStep(cashOrderSecondaryPrice.value, cashOrderPriceStep.value)
+    ) {
+      return false
+    }
     return true
   })
   const canPlaceCashOrder = computed(
@@ -251,22 +483,20 @@ export const useTradingSession = (selectedPasskeyId: Ref<string>) => {
     if (!totalAssetValue.value) return 0
     return (buyingPower.value / totalAssetValue.value) * 100
   })
-  const chartPricePoints = computed(() =>
-    [...historicalPricePoints.value, ...realtimePricePoints.value].slice(-maxChartPricePoints),
-  )
-  const boxPlotStyle = computed(() => {
-    const box = selectedStock.value.box
-    const range = Math.max(1, box.max - box.min)
-    const toPct = (value: number) => ((value - box.min) / range) * 100
-    return {
-      min: `${toPct(box.min)}%`,
-      q1: `${toPct(box.q1)}%`,
-      median: `${toPct(box.median)}%`,
-      q3: `${toPct(box.q3)}%`,
-      max: `${toPct(box.max)}%`,
-    }
-  })
+  const selectedStockTimeZone = computed(() => timeZoneForStock(selectedStock.value))
+  const chartPricePoints = computed(() => {
+    const points = [...historicalPricePoints.value, ...realtimePricePoints.value]
+    if (chartRange.value !== '1D') return points
 
+    const timeZone = selectedStockTimeZone.value
+    if (!timeZone) return points
+
+    const start = startOfMarketDateUtcMs(timeZone)
+    return points.filter((point) => {
+      const time = Date.parse(point.at)
+      return Number.isFinite(time) && time >= start
+    })
+  })
   const recordViewedStock = (code: string) => {
     if (!code) return
     viewedStockCodes.value = [code, ...viewedStockCodes.value.filter((entry) => entry !== code)]
@@ -289,7 +519,7 @@ export const useTradingSession = (selectedPasskeyId: Ref<string>) => {
     if (!Number.isFinite(price) || price <= 0) return
     realtimePricePoints.value = [
       ...realtimePricePoints.value,
-      { at: at.toISOString(), price },
+      { at: at.toISOString(), price, open: price, high: price, low: price, close: price },
     ].slice(-maxRealtimePricePoints)
   }
 
@@ -550,6 +780,7 @@ export const useTradingSession = (selectedPasskeyId: Ref<string>) => {
       boardPollingSubscriptionId = ''
       chartHistoryRequestId += 1
       historicalPricePoints.value = []
+      chartNotice.value = null
       realtimePricePoints.value = []
       pricePolling.value = false
       sbiConnected.value = false
@@ -591,19 +822,27 @@ export const useTradingSession = (selectedPasskeyId: Ref<string>) => {
 
   const loadSelectedStockChart = async () => {
     historicalPricePoints.value = []
+    chartNotice.value = null
     const stock = selectedStock.value
     if (!connected.value || !stock.code) return
 
     const requestId = ++chartHistoryRequestId
+    const chartOptions = chartRangeOptions[chartRange.value]
     try {
+      const timeZone = selectedStockTimeZone.value
+      if (!timeZone) {
+        throw new Error(`Unsupported market timezone for ${stock.market || stock.country}`)
+      }
       const chart = await rpcCall<RecordLike>('market.issue.chart', {
         issueCode: stock.code,
         market: stock.market || undefined,
-        period: 'day',
-        count: 120,
+        period: chartOptions.period,
+        unit: chartOptions.unit,
+        count: chartOptions.count,
       })
       if (requestId !== chartHistoryRequestId) return
-      historicalPricePoints.value = pricePointsFromIssueChart(chart)
+      historicalPricePoints.value = pricePointsFromIssueChart(chart, timeZone)
+      chartNotice.value = chartNoticeFromIssueChart(chart)
     } catch (cause) {
       if (requestId === chartHistoryRequestId) {
         reportDataError(errorMessage(cause, '価格履歴の取得に失敗しました'), cause)
@@ -649,10 +888,12 @@ export const useTradingSession = (selectedPasskeyId: Ref<string>) => {
   const cashOrderParams = () => ({
     issueCode: selectedStock.value.code,
     market: resolvedCashOrderMarket.value || undefined,
+    preOrderMarket: orderKind.value === 's' ? selectedStock.value.market || undefined : undefined,
     side: tradeSide.value,
     quantity: orderQuantity.value,
     kind: orderKind.value === 's' ? 's' : undefined,
     accountType: cashOrderAccountType.value,
+    depositType: cashOrderAccountType.value,
     price:
       orderKind.value !== 's' && cashOrderPrimaryRequiresPrice.value ? orderPrice.value : undefined,
     priceCondition: orderKind.value !== 's' ? cashOrderPriceCondition.value : undefined,
@@ -680,8 +921,36 @@ export const useTradingSession = (selectedPasskeyId: Ref<string>) => {
       cashOrderSecondaryRequiresPrice.value
         ? cashOrderSecondaryPrice.value
         : undefined,
+    ippanMarginPaymentLimit:
+      orderKind.value !== 's' ? cashOrderIppanMarginPaymentLimit.value : undefined,
   })
 
+  const refreshCashPreOrder = async () => {
+    const requestId = ++cashPreOrderRequestId
+    if (!connected.value || !selectedStock.value.code || !resolvedCashOrderMarket.value) {
+      cashPreOrder.value = null
+      return
+    }
+    try {
+      const preOrder = await rpcCall<RecordLike>('orders.cash.preOrder', {
+        issueCode: selectedStock.value.code,
+        market: resolvedCashOrderMarket.value,
+        preOrderMarket:
+          orderKind.value === 's' ? selectedStock.value.market || undefined : undefined,
+        side: tradeSide.value,
+        kind: orderKind.value === 's' ? 's' : undefined,
+        accountType: cashOrderAccountType.value,
+        depositType: cashOrderAccountType.value,
+      })
+      if (requestId === cashPreOrderRequestId) cashPreOrder.value = preOrder
+    } catch (cause) {
+      if (requestId === cashPreOrderRequestId) {
+        cashPreOrder.value = null
+        reportDataError(errorMessage(cause, '注文前情報の取得に失敗しました'), cause)
+      }
+    }
+  }
+
   const askPlaceOrder = () => {
     if (!canPlaceCashOrder.value) return
     showEstimateDialog.value = false
@@ -783,7 +1052,35 @@ export const useTradingSession = (selectedPasskeyId: Ref<string>) => {
   })
 
   watch(cashOrderTerm, (term) => {
-    if (term !== 'date') cashOrderDateInput.value = ''
+    if (term !== 'date') {
+      cashOrderDateInput.value = ''
+      return
+    }
+    const firstDate = cashOrderDateOptions.value[0]?.value
+    if (firstDate && !cashOrderDateInput.value) cashOrderDateInput.value = firstDate
+  })
+
+  watch(cashOrderAccountTypeOptions, (options) => {
+    if (options.some((option) => option.value === cashOrderAccountType.value)) return
+    cashOrderAccountType.value = options[0]?.value ?? 'specific'
+  })
+
+  watch(cashOrderMarketOptions, (options) => {
+    if (options.some((option) => option.value === cashOrderMarket.value)) return
+    cashOrderMarket.value = preferredCashOrderMarket.value
+  })
+
+  watch(cashOrderTermOptions, (options) => {
+    if (options.some((option) => option.value === cashOrderTerm.value)) return
+    cashOrderTerm.value = options[0]?.value ?? 'day'
+  })
+
+  watch(cashOrderDateOptions, (options) => {
+    if (cashOrderTerm.value !== 'date') return
+    const firstOption = options[0]
+    if (!firstOption) return
+    if (options.some((option) => option.value === cashOrderDateInput.value)) return
+    cashOrderDateInput.value = firstOption.value
   })
 
   watch(cashOrderMethod, (method) => {
@@ -795,6 +1092,22 @@ export const useTradingSession = (selectedPasskeyId: Ref<string>) => {
     if (method === 'stop') cashOrderSecondaryPriceInput.value = ''
   })
 
+  watch(
+    [
+      connected,
+      () => selectedStock.value.code,
+      () => selectedStock.value.market,
+      resolvedCashOrderMarket,
+      tradeSide,
+      orderKind,
+      cashOrderAccountType,
+    ],
+    () => {
+      void refreshCashPreOrder()
+    },
+    { immediate: true },
+  )
+
   watch(searchQuery, (query) => {
     clearTimeout(searchTimer)
     const trimmed = query.trim()
@@ -818,7 +1131,7 @@ export const useTradingSession = (selectedPasskeyId: Ref<string>) => {
   })
 
   watch(
-    [connected, () => selectedStock.value.code, () => selectedStock.value.market],
+    [connected, () => selectedStock.value.code, () => selectedStock.value.market, chartRange],
     () => {
       void loadSelectedStockChart()
       void startBoardPolling()
@@ -843,6 +1156,7 @@ export const useTradingSession = (selectedPasskeyId: Ref<string>) => {
     quantityInput,
     priceInput,
     chartMode,
+    chartRange,
     showSearch,
     searchQuery,
     countryFilter,
@@ -863,6 +1177,7 @@ export const useTradingSession = (selectedPasskeyId: Ref<string>) => {
     positions,
     realtimePricePoints,
     chartPricePoints,
+    chartNotice,
     pricePolling,
     selectedStock,
     orderQuantity,
@@ -870,6 +1185,11 @@ export const useTradingSession = (selectedPasskeyId: Ref<string>) => {
     cashOrderPrimaryRequiresPrice,
     cashOrderTriggerPrice,
     cashOrderSecondaryPrice,
+    cashOrderAccountTypeOptions,
+    cashOrderMarketOptions,
+    cashOrderTermOptions,
+    cashOrderDateOptions,
+    cashOrderPriceStep,
     estimatedAmount,
     showPortfolioSpinner,
     canRequestCashEstimate,
@@ -883,7 +1203,6 @@ export const useTradingSession = (selectedPasskeyId: Ref<string>) => {
     totalAssetValue,
     stockAssetRatio,
     cashAssetRatio,
-    boxPlotStyle,
     hasQuote,
     selectStock,
     connect,
diff --git a/apps/csbie-ui/src/router.ts b/apps/csbie-ui/src/router.ts
index cb3d942..7de8dbd 100644
--- a/apps/csbie-ui/src/router.ts
+++ b/apps/csbie-ui/src/router.ts
@@ -12,8 +12,9 @@ export const router = createRouter({
     { path: '/portfolio', name: 'portfolio', component: RouteStub },
     { path: '/trade', name: 'trade', component: RouteStub },
     { path: '/history', name: 'history', component: RouteStub },
-    { path: '/api-keys', redirect: '/settings' },
-    { path: '/settings', name: 'settings', component: RouteStub },
+    { path: '/api-keys', redirect: '/settings/api-keys' },
+    { path: '/settings', redirect: '/settings/api-keys' },
+    { path: '/settings/:section(api-keys|passkeys)', name: 'settings', component: RouteStub },
     { path: '/oauth/authorize', name: 'oauthAuthorize', component: RouteStub },
     { path: '/:pathMatch(.*)*', redirect: '/portfolio' },
   ],
diff --git a/apps/csbie-ui/src/styles/ui.ts b/apps/csbie-ui/src/styles/ui.ts
index 1f328d2..65ac824 100644
--- a/apps/csbie-ui/src/styles/ui.ts
+++ b/apps/csbie-ui/src/styles/ui.ts
@@ -79,7 +79,7 @@ export const ui = {
   stockHoldingNote:
     'inline-flex w-fit items-center rounded-full border border-[#2f343b] bg-[#111418] px-4 py-2 text-sm font-semibold text-[#c3c7cf]',
   quoteBox: 'grid justify-items-end gap-1',
-  periodTabs: 'flex justify-end gap-3',
+  periodTabs: 'flex flex-wrap justify-end gap-2',
   periodButton: 'min-h-7 rounded-full bg-transparent px-3 text-xs font-bold text-[#8f949d]',
   periodButtonActive: 'bg-[#d3e3fd] text-[#102033]',
   chartActions: 'flex items-center justify-between gap-4',
@@ -120,6 +120,12 @@ export const ui = {
   advancedSummaryIcon: 'h-4 w-4',
   advancedBody: 'grid gap-2 pt-3',
   advancedLabel: 'text-xs font-extrabold text-[#9aa0a9]',
+  accountTypeGrid: 'grid grid-cols-2 gap-2',
+  accountTypeButton:
+    'relative isolate grid min-h-11 place-items-center overflow-hidden rounded-[14px] bg-[#111418] px-2 py-2 text-center text-xs font-extrabold leading-snug text-[#9aa0a9] transition hover:bg-[#1d232b] focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-[#d3e3fd]',
+  accountTypeButtonActive: 'text-[#d3e3fd]',
+  accountTypeIndicator: 'absolute inset-0 -z-10 rounded-[14px] bg-[#263141]',
+  accountTypeText: 'relative block whitespace-normal break-keep leading-snug',
   label: 'grid gap-2 text-xs font-extrabold text-[#9aa0a9]',
   input:
     'min-h-12 w-full rounded-[16px] border border-[#4a5058] bg-[#111418] px-4 text-[#e3e3e9] outline-none transition placeholder:text-[#747982] focus:border-[#a8c7fa]',
diff --git a/apps/csbie-ui/src/types/trading.ts b/apps/csbie-ui/src/types/trading.ts
index 9e839da..3d22895 100644
--- a/apps/csbie-ui/src/types/trading.ts
+++ b/apps/csbie-ui/src/types/trading.ts
@@ -1,7 +1,7 @@
 export type TradeSide = 'buy' | 'sell'
 export type OrderKind = 'standard' | 's'
-export type CashOrderAccountType = 'specific' | 'general'
-export type CashOrderMarket = 'auto' | 'TKY' | 'SOR' | 'PTS' | 'PTX' | 'STK'
+export type CashOrderAccountType = 'specific' | 'general' | 'growthInvestment' | 'nisa'
+export type CashOrderMarket = 'auto' | 'TKY' | 'NGY' | 'FKO' | 'SPR' | 'SOR' | 'PTS' | 'PTX' | 'STK'
 export type CashOrderPriceCondition =
   | 'limit'
   | 'limitAtOpen'
@@ -16,6 +16,7 @@ export type CashOrderTerm = 'day' | 'week' | 'date'
 export type CashOrderMethod = 'normal' | 'stop' | 'oco'
 export type CashOrderTriggerZone = 'above' | 'below'
 export type ChartMode = 'line' | 'box'
+export type ChartRange = '1D' | '7D' | '1M' | '3M' | '1Y' | 'ALL'
 
 export type RpcMessage = {
   id: number
@@ -48,6 +49,16 @@ export type JsonRpcResponse = {
 export type RealtimePricePoint = {
   at: string
   price: number
+  open?: number
+  high?: number
+  low?: number
+  close?: number
+  volume?: number | null
+}
+
+export type ChartNotice = {
+  title: string
+  detail?: string
 }
 
 export type Stock = {
diff --git a/apps/csbie/Dockerfile b/apps/csbie/Dockerfile
index 9376118..cf3f959 100644
--- a/apps/csbie/Dockerfile
+++ b/apps/csbie/Dockerfile
@@ -12,10 +12,13 @@ COPY . .
 RUN bun --filter @repo/csbie build
 
 FROM oven/bun:1-slim AS runtime
-WORKDIR /app
 ENV NODE_ENV=production
+ENV CSBIE_DATABASE_PATH=/app/data/csbie.sqlite
+WORKDIR /app
 COPY --from=build /app/apps/csbie/dist ./apps/csbie/dist
 COPY --from=build /app/apps/csbie-ui/dist ./apps/csbie-ui/dist
-COPY --from=build /app/node_modules ./node_modules
+COPY --from=build /app/node_modules/.bun/@napi-rs+keyring@*/node_modules/@napi-rs/keyring ./node_modules/@napi-rs/keyring
+COPY --from=build /app/node_modules/.bun/@napi-rs+keyring-linux-x64-gnu@*/node_modules/@napi-rs/keyring-linux-x64-gnu ./node_modules/@napi-rs/keyring-linux-x64-gnu
+WORKDIR /app/apps/csbie/dist
 EXPOSE 8787
-CMD ["bun", "apps/csbie/dist/index.js"]
+CMD ["bun", "index.js"]
diff --git a/apps/csbie/package.json b/apps/csbie/package.json
index 0e289c0..7cdc07e 100644
--- a/apps/csbie/package.json
+++ b/apps/csbie/package.json
@@ -5,7 +5,7 @@
   "scripts": {
     "clean": "rm -rf dist ../csbie-ui/dist",
     "dev": "bun --env-file=../../.env src/dev.ts",
-    "build": "bun --filter @repo/csbie-ui build && bun build src/index.ts --target=bun --outdir=dist",
+    "build": "bun --filter @repo/csbie-ui build && bun build src/index.ts --target=bun --outdir=dist --external @napi-rs/keyring",
     "start": "bun --env-file=../../.env dist/index.js",
     "typecheck": "tsc"
   },
diff --git a/bun.lock b/bun.lock
index 1516c6c..aaa6a38 100644
--- a/bun.lock
+++ b/bun.lock
@@ -45,6 +45,7 @@
       "name": "@repo/csbie-ui",
       "dependencies": {
         "@simplewebauthn/browser": "^13.1.2",
+        "d3": "^7.9.0",
         "lucide-vue-next": "^1.0.0",
         "motion-v": "^2.3.0",
         "tailwindcss": "^4.1.10",
@@ -54,6 +55,7 @@
       },
       "devDependencies": {
         "@tailwindcss/vite": "^4.3.1",
+        "@types/d3": "^7.4.3",
         "@vitejs/plugin-vue": "^6.0.7",
         "typescript": "^5",
         "vue-tsc": "^3",
@@ -399,8 +401,72 @@
 
     "@types/chai": ["@types/chai@5.2.3", "", { "dependencies": { "@types/deep-eql": "*", "assertion-error": "^2.0.1" } }, "sha512-Mw558oeA9fFbv65/y4mHtXDs9bPnFMZAL/jxdPFUpOHHIXX91mcgEHbS5Lahr+pwZFR8A7GQleRWeI6cGFC2UA=="],
 
+    "@types/d3": ["@types/d3@7.4.3", "", { "dependencies": { "@types/d3-array": "*", "@types/d3-axis": "*", "@types/d3-brush": "*", "@types/d3-chord": "*", "@types/d3-color": "*", "@types/d3-contour": "*", "@types/d3-delaunay": "*", "@types/d3-dispatch": "*", "@types/d3-drag": "*", "@types/d3-dsv": "*", "@types/d3-ease": "*", "@types/d3-fetch": "*", "@types/d3-force": "*", "@types/d3-format": "*", "@types/d3-geo": "*", "@types/d3-hierarchy": "*", "@types/d3-interpolate": "*", "@types/d3-path": "*", "@types/d3-polygon": "*", "@types/d3-quadtree": "*", "@types/d3-random": "*", "@types/d3-scale": "*", "@types/d3-scale-chromatic": "*", "@types/d3-selection": "*", "@types/d3-shape": "*", "@types/d3-time": "*", "@types/d3-time-format": "*", "@types/d3-timer": "*", "@types/d3-transition": "*", "@types/d3-zoom": "*" } }, "sha512-lZXZ9ckh5R8uiFVt8ogUNf+pIrK4EsWrx2Np75WvF/eTpJ0FMHNhjXk8CKEx/+gpHbNQyJWehbFaTvqmHWB3ww=="],
+
+    "@types/d3-array": ["@types/d3-array@3.2.2", "", {}, "sha512-hOLWVbm7uRza0BYXpIIW5pxfrKe0W+D5lrFiAEYR+pb6w3N2SwSMaJbXdUfSEv+dT4MfHBLtn5js0LAWaO6otw=="],
+
+    "@types/d3-axis": ["@types/d3-axis@3.0.6", "", { "dependencies": { "@types/d3-selection": "*" } }, "sha512-pYeijfZuBd87T0hGn0FO1vQ/cgLk6E1ALJjfkC0oJ8cbwkZl3TpgS8bVBLZN+2jjGgg38epgxb2zmoGtSfvgMw=="],
+
+    "@types/d3-brush": ["@types/d3-brush@3.0.6", "", { "dependencies": { "@types/d3-selection": "*" } }, "sha512-nH60IZNNxEcrh6L1ZSMNA28rj27ut/2ZmI3r96Zd+1jrZD++zD3LsMIjWlvg4AYrHn/Pqz4CF3veCxGjtbqt7A=="],
+
+    "@types/d3-chord": ["@types/d3-chord@3.0.6", "", {}, "sha512-LFYWWd8nwfwEmTZG9PfQxd17HbNPksHBiJHaKuY1XeqscXacsS2tyoo6OdRsjf+NQYeB6XrNL3a25E3gH69lcg=="],
+
+    "@types/d3-color": ["@types/d3-color@3.1.3", "", {}, "sha512-iO90scth9WAbmgv7ogoq57O9YpKmFBbmoEoCHDB2xMBY0+/KVrqAaCDyCE16dUspeOvIxFFRI+0sEtqDqy2b4A=="],
+
+    "@types/d3-contour": ["@types/d3-contour@3.0.6", "", { "dependencies": { "@types/d3-array": "*", "@types/geojson": "*" } }, "sha512-BjzLgXGnCWjUSYGfH1cpdo41/hgdWETu4YxpezoztawmqsvCeep+8QGfiY6YbDvfgHz/DkjeIkkZVJavB4a3rg=="],
+
+    "@types/d3-delaunay": ["@types/d3-delaunay@6.0.4", "", {}, "sha512-ZMaSKu4THYCU6sV64Lhg6qjf1orxBthaC161plr5KuPHo3CNm8DTHiLw/5Eq2b6TsNP0W0iJrUOFscY6Q450Hw=="],
+
+    "@types/d3-dispatch": ["@types/d3-dispatch@3.0.7", "", {}, "sha512-5o9OIAdKkhN1QItV2oqaE5KMIiXAvDWBDPrD85e58Qlz1c1kI/J0NcqbEG88CoTwJrYe7ntUCVfeUl2UJKbWgA=="],
+
+    "@types/d3-drag": ["@types/d3-drag@3.0.7", "", { "dependencies": { "@types/d3-selection": "*" } }, "sha512-HE3jVKlzU9AaMazNufooRJ5ZpWmLIoc90A37WU2JMmeq28w1FQqCZswHZ3xR+SuxYftzHq6WU6KJHvqxKzTxxQ=="],
+
+    "@types/d3-dsv": ["@types/d3-dsv@3.0.7", "", {}, "sha512-n6QBF9/+XASqcKK6waudgL0pf/S5XHPPI8APyMLLUHd8NqouBGLsU8MgtO7NINGtPBtk9Kko/W4ea0oAspwh9g=="],
+
+    "@types/d3-ease": ["@types/d3-ease@3.0.2", "", {}, "sha512-NcV1JjO5oDzoK26oMzbILE6HW7uVXOHLQvHshBUW4UMdZGfiY6v5BeQwh9a9tCzv+CeefZQHJt5SRgK154RtiA=="],
+
+    "@types/d3-fetch": ["@types/d3-fetch@3.0.7", "", { "dependencies": { "@types/d3-dsv": "*" } }, "sha512-fTAfNmxSb9SOWNB9IoG5c8Hg6R+AzUHDRlsXsDZsNp6sxAEOP0tkP3gKkNSO/qmHPoBFTxNrjDprVHDQDvo5aA=="],
+
+    "@types/d3-force": ["@types/d3-force@3.0.10", "", {}, "sha512-ZYeSaCF3p73RdOKcjj+swRlZfnYpK1EbaDiYICEEp5Q6sUiqFaFQ9qgoshp5CzIyyb/yD09kD9o2zEltCexlgw=="],
+
+    "@types/d3-format": ["@types/d3-format@3.0.4", "", {}, "sha512-fALi2aI6shfg7vM5KiR1wNJnZ7r6UuggVqtDA+xiEdPZQwy/trcQaHnwShLuLdta2rTymCNpxYTiMZX/e09F4g=="],
+
+    "@types/d3-geo": ["@types/d3-geo@3.1.0", "", { "dependencies": { "@types/geojson": "*" } }, "sha512-856sckF0oP/diXtS4jNsiQw/UuK5fQG8l/a9VVLeSouf1/PPbBE1i1W852zVwKwYCBkFJJB7nCFTbk6UMEXBOQ=="],
+
+    "@types/d3-hierarchy": ["@types/d3-hierarchy@3.1.7", "", {}, "sha512-tJFtNoYBtRtkNysX1Xq4sxtjK8YgoWUNpIiUee0/jHGRwqvzYxkq0hGVbbOGSz+JgFxxRu4K8nb3YpG3CMARtg=="],
+
+    "@types/d3-interpolate": ["@types/d3-interpolate@3.0.4", "", { "dependencies": { "@types/d3-color": "*" } }, "sha512-mgLPETlrpVV1YRJIglr4Ez47g7Yxjl1lj7YKsiMCb27VJH9W8NVM6Bb9d8kkpG/uAQS5AmbA48q2IAolKKo1MA=="],
+
+    "@types/d3-path": ["@types/d3-path@3.1.1", "", {}, "sha512-VMZBYyQvbGmWyWVea0EHs/BwLgxc+MKi1zLDCONksozI4YJMcTt8ZEuIR4Sb1MMTE8MMW49v0IwI5+b7RmfWlg=="],
+
+    "@types/d3-polygon": ["@types/d3-polygon@3.0.2", "", {}, "sha512-ZuWOtMaHCkN9xoeEMr1ubW2nGWsp4nIql+OPQRstu4ypeZ+zk3YKqQT0CXVe/PYqrKpZAi+J9mTs05TKwjXSRA=="],
+
+    "@types/d3-quadtree": ["@types/d3-quadtree@3.0.6", "", {}, "sha512-oUzyO1/Zm6rsxKRHA1vH0NEDG58HrT5icx/azi9MF1TWdtttWl0UIUsjEQBBh+SIkrpd21ZjEv7ptxWys1ncsg=="],
+
+    "@types/d3-random": ["@types/d3-random@3.0.3", "", {}, "sha512-Imagg1vJ3y76Y2ea0871wpabqp613+8/r0mCLEBfdtqC7xMSfj9idOnmBYyMoULfHePJyxMAw3nWhJxzc+LFwQ=="],
+
+    "@types/d3-scale": ["@types/d3-scale@4.0.9", "", { "dependencies": { "@types/d3-time": "*" } }, "sha512-dLmtwB8zkAeO/juAMfnV+sItKjlsw2lKdZVVy6LRr0cBmegxSABiLEpGVmSJJ8O08i4+sGR6qQtb6WtuwJdvVw=="],
+
+    "@types/d3-scale-chromatic": ["@types/d3-scale-chromatic@3.1.0", "", {}, "sha512-iWMJgwkK7yTRmWqRB5plb1kadXyQ5Sj8V/zYlFGMUBbIPKQScw+Dku9cAAMgJG+z5GYDoMjWGLVOvjghDEFnKQ=="],
+
+    "@types/d3-selection": ["@types/d3-selection@3.0.11", "", {}, "sha512-bhAXu23DJWsrI45xafYpkQ4NtcKMwWnAC/vKrd2l+nxMFuvOT3XMYTIj2opv8vq8AO5Yh7Qac/nSeP/3zjTK0w=="],
+
+    "@types/d3-shape": ["@types/d3-shape@3.1.8", "", { "dependencies": { "@types/d3-path": "*" } }, "sha512-lae0iWfcDeR7qt7rA88BNiqdvPS5pFVPpo5OfjElwNaT2yyekbM0C9vK+yqBqEmHr6lDkRnYNoTBYlAgJa7a4w=="],
+
+    "@types/d3-time": ["@types/d3-time@3.0.4", "", {}, "sha512-yuzZug1nkAAaBlBBikKZTgzCeA+k1uy4ZFwWANOfKw5z5LRhV0gNA7gNkKm7HoK+HRN0wX3EkxGk0fpbWhmB7g=="],
+
+    "@types/d3-time-format": ["@types/d3-time-format@4.0.3", "", {}, "sha512-5xg9rC+wWL8kdDj153qZcsJ0FWiFt0J5RB6LYUNZjwSnesfblqrI/bJ1wBdJ8OQfncgbJG5+2F+qfqnqyzYxyg=="],
+
+    "@types/d3-timer": ["@types/d3-timer@3.0.2", "", {}, "sha512-Ps3T8E8dZDam6fUyNiMkekK3XUsaUEik+idO9/YjPtfj2qruF8tFBXS7XhtE4iIXBLxhmLjP3SXpLhVf21I9Lw=="],
+
+    "@types/d3-transition": ["@types/d3-transition@3.0.9", "", { "dependencies": { "@types/d3-selection": "*" } }, "sha512-uZS5shfxzO3rGlu0cC3bjmMFKsXv+SmZZcgp0KD22ts4uGXp5EVYGzu/0YdwZeKmddhcAccYtREJKkPfXkZuCg=="],
+
+    "@types/d3-zoom": ["@types/d3-zoom@3.0.8", "", { "dependencies": { "@types/d3-interpolate": "*", "@types/d3-selection": "*" } }, "sha512-iqMC4/YlFCSlO8+2Ii1GGGliCAY4XdeG748w5vQUbevlbDu0zSjH/+jojorQVBK/se0j6DUFNPBGSqD3YWYnDw=="],
+
     "@types/deep-eql": ["@types/deep-eql@4.0.2", "", {}, "sha512-c9h9dVVMigMPc4bwTvC5dxqtqJZwQPePsWjPlpSOnojbor6pGqdk541lfA7AqFQr5pB1BRdq0juY9db81BwyFw=="],
 
+    "@types/geojson": ["@types/geojson@7946.0.16", "", {}, "sha512-6C8nqWur3j98U6+lXDfTUWIfgvZU+EumvpHKcYjujKH7woYyLj2sUmff0tRhrqM7BohUw7Pz3ZB1jj2gW9Fvmg=="],
+
     "@types/jsesc": ["@types/jsesc@2.5.1", "", {}, "sha512-9VN+6yxLOPLOav+7PwjZbxiID2bVaeq0ED4qSQmdQTdjnXJSaCVKTR58t15oqH1H5t8Ng2ZX1SabJVoN9Q34bw=="],
 
     "@types/node": ["@types/node@25.9.3", "", { "dependencies": { "undici-types": ">=7.24.0 <7.24.7" } }, "sha512-603BddQMv3pUcr4U2dhujk83N2tTDVr/34wII2B6bJy6g+8WD6yUb11jszNs0gdi4PesVWl7ABt8nYMVpnLUcg=="],
@@ -503,6 +569,8 @@
 
     "chokidar": ["chokidar@5.0.0", "", { "dependencies": { "readdirp": "^5.0.0" } }, "sha512-TQMmc3w+5AxjpL8iIiwebF73dRDF4fBIieAqGn9RGCWaEVwQ6Fb2cGe31Yns0RRIzii5goJ1Y7xbMwo1TxMplw=="],
 
+    "commander": ["commander@7.2.0", "", {}, "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw=="],
+
     "confbox": ["confbox@0.2.4", "", {}, "sha512-ysOGlgTFbN2/Y6Cg3Iye8YKulHw+R2fNXHrgSmXISQdMnomY6eNDprVdW9R5xBguEqI954+S6709UyiO7B+6OQ=="],
 
     "content-disposition": ["content-disposition@1.1.0", "", {}, "sha512-5jRCH9Z/+DRP7rkvY83B+yGIGX96OYdJmzngqnw2SBSxqCFPd0w2km3s5iawpGX8krnwSGmF0FW5Nhr0Hfai3g=="],
@@ -519,8 +587,72 @@
 
     "csstype": ["csstype@3.2.3", "", {}, "sha512-z1HGKcYy2xA8AGQfwrn0PAy+PB7X/GSj3UVJW9qKyn43xWa+gl5nXmU4qqLMRzWVLFC8KusUX8T/0kCiOYpAIQ=="],
 
+    "d3": ["d3@7.9.0", "", { "dependencies": { "d3-array": "3", "d3-axis": "3", "d3-brush": "3", "d3-chord": "3", "d3-color": "3", "d3-contour": "4", "d3-delaunay": "6", "d3-dispatch": "3", "d3-drag": "3", "d3-dsv": "3", "d3-ease": "3", "d3-fetch": "3", "d3-force": "3", "d3-format": "3", "d3-geo": "3", "d3-hierarchy": "3", "d3-interpolate": "3", "d3-path": "3", "d3-polygon": "3", "d3-quadtree": "3", "d3-random": "3", "d3-scale": "4", "d3-scale-chromatic": "3", "d3-selection": "3", "d3-shape": "3", "d3-time": "3", "d3-time-format": "4", "d3-timer": "3", "d3-transition": "3", "d3-zoom": "3" } }, "sha512-e1U46jVP+w7Iut8Jt8ri1YsPOvFpg46k+K8TpCb0P+zjCkjkPnV7WzfDJzMHy1LnA+wj5pLT1wjO901gLXeEhA=="],
+
+    "d3-array": ["d3-array@3.2.4", "", { "dependencies": { "internmap": "1 - 2" } }, "sha512-tdQAmyA18i4J7wprpYq8ClcxZy3SC31QMeByyCFyRt7BVHdREQZ5lpzoe5mFEYZUWe+oq8HBvk9JjpibyEV4Jg=="],
+
+    "d3-axis": ["d3-axis@3.0.0", "", {}, "sha512-IH5tgjV4jE/GhHkRV0HiVYPDtvfjHQlQfJHs0usq7M30XcSBvOotpmH1IgkcXsO/5gEQZD43B//fc7SRT5S+xw=="],
+
+    "d3-brush": ["d3-brush@3.0.0", "", { "dependencies": { "d3-dispatch": "1 - 3", "d3-drag": "2 - 3", "d3-interpolate": "1 - 3", "d3-selection": "3", "d3-transition": "3" } }, "sha512-ALnjWlVYkXsVIGlOsuWH1+3udkYFI48Ljihfnh8FZPF2QS9o+PzGLBslO0PjzVoHLZ2KCVgAM8NVkXPJB2aNnQ=="],
+
+    "d3-chord": ["d3-chord@3.0.1", "", { "dependencies": { "d3-path": "1 - 3" } }, "sha512-VE5S6TNa+j8msksl7HwjxMHDM2yNK3XCkusIlpX5kwauBfXuyLAtNg9jCp/iHH61tgI4sb6R/EIMWCqEIdjT/g=="],
+
+    "d3-color": ["d3-color@3.1.0", "", {}, "sha512-zg/chbXyeBtMQ1LbD/WSoW2DpC3I0mpmPdW+ynRTj/x2DAWYrIY7qeZIHidozwV24m4iavr15lNwIwLxRmOxhA=="],
+
+    "d3-contour": ["d3-contour@4.0.2", "", { "dependencies": { "d3-array": "^3.2.0" } }, "sha512-4EzFTRIikzs47RGmdxbeUvLWtGedDUNkTcmzoeyg4sP/dvCexO47AaQL7VKy/gul85TOxw+IBgA8US2xwbToNA=="],
+
+    "d3-delaunay": ["d3-delaunay@6.0.4", "", { "dependencies": { "delaunator": "5" } }, "sha512-mdjtIZ1XLAM8bm/hx3WwjfHt6Sggek7qH043O8KEjDXN40xi3vx/6pYSVTwLjEgiXQTbvaouWKynLBiUZ6SK6A=="],
+
+    "d3-dispatch": ["d3-dispatch@3.0.1", "", {}, "sha512-rzUyPU/S7rwUflMyLc1ETDeBj0NRuHKKAcvukozwhshr6g6c5d8zh4c2gQjY2bZ0dXeGLWc1PF174P2tVvKhfg=="],
+
+    "d3-drag": ["d3-drag@3.0.0", "", { "dependencies": { "d3-dispatch": "1 - 3", "d3-selection": "3" } }, "sha512-pWbUJLdETVA8lQNJecMxoXfH6x+mO2UQo8rSmZ+QqxcbyA3hfeprFgIT//HW2nlHChWeIIMwS2Fq+gEARkhTkg=="],
+
+    "d3-dsv": ["d3-dsv@3.0.1", "", { "dependencies": { "commander": "7", "iconv-lite": "0.6", "rw": "1" }, "bin": { "csv2json": "bin/dsv2json.js", "csv2tsv": "bin/dsv2dsv.js", "dsv2dsv": "bin/dsv2dsv.js", "dsv2json": "bin/dsv2json.js", "json2csv": "bin/json2dsv.js", "json2dsv": "bin/json2dsv.js", "json2tsv": "bin/json2dsv.js", "tsv2csv": "bin/dsv2dsv.js", "tsv2json": "bin/dsv2json.js" } }, "sha512-UG6OvdI5afDIFP9w4G0mNq50dSOsXHJaRE8arAS5o9ApWnIElp8GZw1Dun8vP8OyHOZ/QJUKUJwxiiCCnUwm+Q=="],
+
+    "d3-ease": ["d3-ease@3.0.1", "", {}, "sha512-wR/XK3D3XcLIZwpbvQwQ5fK+8Ykds1ip7A2Txe0yxncXSdq1L9skcG7blcedkOX+ZcgxGAmLX1FrRGbADwzi0w=="],
+
+    "d3-fetch": ["d3-fetch@3.0.1", "", { "dependencies": { "d3-dsv": "1 - 3" } }, "sha512-kpkQIM20n3oLVBKGg6oHrUchHM3xODkTzjMoj7aWQFq5QEM+R6E4WkzT5+tojDY7yjez8KgCBRoj4aEr99Fdqw=="],
+
+    "d3-force": ["d3-force@3.0.0", "", { "dependencies": { "d3-dispatch": "1 - 3", "d3-quadtree": "1 - 3", "d3-timer": "1 - 3" } }, "sha512-zxV/SsA+U4yte8051P4ECydjD/S+qeYtnaIyAs9tgHCqfguma/aAQDjo85A9Z6EKhBirHRJHXIgJUlffT4wdLg=="],
+
+    "d3-format": ["d3-format@3.1.2", "", {}, "sha512-AJDdYOdnyRDV5b6ArilzCPPwc1ejkHcoyFarqlPqT7zRYjhavcT3uSrqcMvsgh2CgoPbK3RCwyHaVyxYcP2Arg=="],
+
+    "d3-geo": ["d3-geo@3.1.1", "", { "dependencies": { "d3-array": "2.5.0 - 3" } }, "sha512-637ln3gXKXOwhalDzinUgY83KzNWZRKbYubaG+fGVuc/dxO64RRljtCTnf5ecMyE1RIdtqpkVcq0IbtU2S8j2Q=="],
+
+    "d3-hierarchy": ["d3-hierarchy@3.1.2", "", {}, "sha512-FX/9frcub54beBdugHjDCdikxThEqjnR93Qt7PvQTOHxyiNCAlvMrHhclk3cD5VeAaq9fxmfRp+CnWw9rEMBuA=="],
+
+    "d3-interpolate": ["d3-interpolate@3.0.1", "", { "dependencies": { "d3-color": "1 - 3" } }, "sha512-3bYs1rOD33uo8aqJfKP3JWPAibgw8Zm2+L9vBKEHJ2Rg+viTR7o5Mmv5mZcieN+FRYaAOWX5SJATX6k1PWz72g=="],
+
+    "d3-path": ["d3-path@3.1.0", "", {}, "sha512-p3KP5HCf/bvjBSSKuXid6Zqijx7wIfNW+J/maPs+iwR35at5JCbLUT0LzF1cnjbCHWhqzQTIN2Jpe8pRebIEFQ=="],
+
+    "d3-polygon": ["d3-polygon@3.0.1", "", {}, "sha512-3vbA7vXYwfe1SYhED++fPUQlWSYTTGmFmQiany/gdbiWgU/iEyQzyymwL9SkJjFFuCS4902BSzewVGsHHmHtXg=="],
+
+    "d3-quadtree": ["d3-quadtree@3.0.1", "", {}, "sha512-04xDrxQTDTCFwP5H6hRhsRcb9xxv2RzkcsygFzmkSIOJy3PeRJP7sNk3VRIbKXcog561P9oU0/rVH6vDROAgUw=="],
+
+    "d3-random": ["d3-random@3.0.1", "", {}, "sha512-FXMe9GfxTxqd5D6jFsQ+DJ8BJS4E/fT5mqqdjovykEB2oFbTMDVdg1MGFxfQW+FBOGoB++k8swBrgwSHT1cUXQ=="],
+
+    "d3-scale": ["d3-scale@4.0.2", "", { "dependencies": { "d3-array": "2.10.0 - 3", "d3-format": "1 - 3", "d3-interpolate": "1.2.0 - 3", "d3-time": "2.1.1 - 3", "d3-time-format": "2 - 4" } }, "sha512-GZW464g1SH7ag3Y7hXjf8RoUuAFIqklOAq3MRl4OaWabTFJY9PN/E1YklhXLh+OQ3fM9yS2nOkCoS+WLZ6kvxQ=="],
+
+    "d3-scale-chromatic": ["d3-scale-chromatic@3.1.0", "", { "dependencies": { "d3-color": "1 - 3", "d3-interpolate": "1 - 3" } }, "sha512-A3s5PWiZ9YCXFye1o246KoscMWqf8BsD9eRiJ3He7C9OBaxKhAd5TFCdEx/7VbKtxxTsu//1mMJFrEt572cEyQ=="],
+
+    "d3-selection": ["d3-selection@3.0.0", "", {}, "sha512-fmTRWbNMmsmWq6xJV8D19U/gw/bwrHfNXxrIN+HfZgnzqTHp9jOmKMhsTUjXOJnZOdZY9Q28y4yebKzqDKlxlQ=="],
+
+    "d3-shape": ["d3-shape@3.2.0", "", { "dependencies": { "d3-path": "^3.1.0" } }, "sha512-SaLBuwGm3MOViRq2ABk3eLoxwZELpH6zhl3FbAoJ7Vm1gofKx6El1Ib5z23NUEhF9AsGl7y+dzLe5Cw2AArGTA=="],
+
+    "d3-time": ["d3-time@3.1.0", "", { "dependencies": { "d3-array": "2 - 3" } }, "sha512-VqKjzBLejbSMT4IgbmVgDjpkYrNWUYJnbCGo874u7MMKIWsILRX+OpX/gTk8MqjpT1A/c6HY2dCA77ZN0lkQ2Q=="],
+
+    "d3-time-format": ["d3-time-format@4.1.0", "", { "dependencies": { "d3-time": "1 - 3" } }, "sha512-dJxPBlzC7NugB2PDLwo9Q8JiTR3M3e4/XANkreKSUxF8vvXKqm1Yfq4Q5dl8budlunRVlUUaDUgFt7eA8D6NLg=="],
+
+    "d3-timer": ["d3-timer@3.0.1", "", {}, "sha512-ndfJ/JxxMd3nw31uyKoY2naivF+r29V+Lc0svZxe1JvvIRmi8hUsrMvdOwgS1o6uBHmiz91geQ0ylPP0aj1VUA=="],
+
+    "d3-transition": ["d3-transition@3.0.1", "", { "dependencies": { "d3-color": "1 - 3", "d3-dispatch": "1 - 3", "d3-ease": "1 - 3", "d3-interpolate": "1 - 3", "d3-timer": "1 - 3" }, "peerDependencies": { "d3-selection": "2 - 3" } }, "sha512-ApKvfjsSR6tg06xrL434C0WydLr7JewBB3V+/39RMHsaXTOG0zmt/OAXeng5M5LBm0ojmxJrpomQVZ1aPvBL4w=="],
+
+    "d3-zoom": ["d3-zoom@3.0.0", "", { "dependencies": { "d3-dispatch": "1 - 3", "d3-drag": "2 - 3", "d3-interpolate": "1 - 3", "d3-selection": "2 - 3", "d3-transition": "2 - 3" } }, "sha512-b8AmV3kfQaqWAuacbPuNbL6vahnOJflOhexLzMMNLga62+/nh0JzvJ0aO/5a5MVgUFGS7Hu1P9P03o3fJkDCyw=="],
+
     "debug": ["debug@4.4.3", "", { "dependencies": { "ms": "^2.1.3" } }, "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA=="],
 
+    "delaunator": ["delaunator@5.1.0", "", { "dependencies": { "robust-predicates": "^3.0.2" } }, "sha512-AGrQ4QSgssa1NGmWmLPqN5NY2KajF5MqxetNEO+o0n3ZwZZeTmt7bBnvzHWrmkZFxGgr4HdyFgelzgi06otLuQ=="],
+
     "depd": ["depd@2.0.0", "", {}, "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw=="],
 
     "detect-libc": ["detect-libc@2.1.2", "", {}, "sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ=="],
@@ -611,6 +743,8 @@
 
     "inherits": ["inherits@2.0.4", "", {}, "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="],
 
+    "internmap": ["internmap@2.0.3", "", {}, "sha512-5Hh7Y1wQbvY5ooGgPbDaL5iYLAPzMTUrjMulskHLH6wnv/A+1q5rgEaiuqEjB+oxGXIVZs1FF+R/KPN3ZSQYYg=="],
+
     "ip-address": ["ip-address@10.2.0", "", {}, "sha512-/+S6j4E9AHvW9SWMSEY9Xfy66O5PWvVEJ08O0y5JGyEKQpojb0K0GKpz/v5HJ/G0vi3D2sjGK78119oXZeE0qA=="],
 
     "ipaddr.js": ["ipaddr.js@1.9.1", "", {}, "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g=="],
@@ -755,10 +889,14 @@
 
     "resolve-pkg-maps": ["resolve-pkg-maps@1.0.0", "", {}, "sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw=="],
 
+    "robust-predicates": ["robust-predicates@3.0.3", "", {}, "sha512-NS3levdsRIUOmiJ8FZWCP7LG3QpJyrs/TE0Zpf1yvZu8cAJJ6QMW92H1c7kWpdIHo8RvmLxN/o2JXTKHp74lUA=="],
+
     "rolldown": ["rolldown@1.0.3", "", { "dependencies": { "@oxc-project/types": "=0.133.0", "@rolldown/pluginutils": "^1.0.0" }, "optionalDependencies": { "@rolldown/binding-android-arm64": "1.0.3", "@rolldown/binding-darwin-arm64": "1.0.3", "@rolldown/binding-darwin-x64": "1.0.3", "@rolldown/binding-freebsd-x64": "1.0.3", "@rolldown/binding-linux-arm-gnueabihf": "1.0.3", "@rolldown/binding-linux-arm64-gnu": "1.0.3", "@rolldown/binding-linux-arm64-musl": "1.0.3", "@rolldown/binding-linux-ppc64-gnu": "1.0.3", "@rolldown/binding-linux-s390x-gnu": "1.0.3", "@rolldown/binding-linux-x64-gnu": "1.0.3", "@rolldown/binding-linux-x64-musl": "1.0.3", "@rolldown/binding-openharmony-arm64": "1.0.3", "@rolldown/binding-wasm32-wasi": "1.0.3", "@rolldown/binding-win32-arm64-msvc": "1.0.3", "@rolldown/binding-win32-x64-msvc": "1.0.3" }, "bin": { "rolldown": "./bin/cli.mjs" } }, "sha512-i00lAJ2ks1BYr7rjNjKC7BcqAS7nVfiT3QX1SI5aY+AFHblCmaUf9OE9dbdzDvW6dJxbi2ZCZiy9v3CcwOiX3g=="],
 
     "router": ["router@2.2.0", "", { "dependencies": { "debug": "^4.4.0", "depd": "^2.0.0", "is-promise": "^4.0.0", "parseurl": "^1.3.3", "path-to-regexp": "^8.0.0" } }, "sha512-nLTrUKm2UyiL7rlhapu/Zl45FwNgkZGaCpZbIHajDYgwlJCOzLSk+cIPAnsEqV955GjILJnKbdQC1nVPz+gAYQ=="],
 
+    "rw": ["rw@1.3.3", "", {}, "sha512-PdhdWy89SiZogBLaw42zdeqtRJ//zFd2PgQavcICDUgJT5oW10QCRKbJ6bg4r0/UY2M6BWd5tkxuGFRvCkgfHQ=="],
+
     "safer-buffer": ["safer-buffer@2.1.2", "", {}, "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="],
 
     "scule": ["scule@1.3.0", "", {}, "sha512-6FtHJEvt+pVMIB9IBY+IcCJ6Z5f1iQnytgyfKMhDKgmzYG+TeH/wx1y3l27rshSbLiSanrR9ffZDrEsmjlQF2g=="],
@@ -879,6 +1017,8 @@
 
     "body-parser/content-type": ["content-type@2.0.0", "", {}, "sha512-j/O/d7GcZCyNl7/hwZAb606rzqkyvaDctLmckbxLzHvFBzTJHuGEdodATcP3yIRoDrLHkIATJuvzbFlp/ki2cQ=="],
 
+    "d3-dsv/iconv-lite": ["iconv-lite@0.6.3", "", { "dependencies": { "safer-buffer": ">= 2.1.2 < 3.0.0" } }, "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw=="],
+
     "mlly/pkg-types": ["pkg-types@1.3.1", "", { "dependencies": { "confbox": "^0.1.8", "mlly": "^1.7.4", "pathe": "^2.0.1" } }, "sha512-/Jm5M4RvtBFVkKWRu2BLUTNP8/M2a+UwuAX+ae4770q1qVGtfjG+WTCupoZixokjmHiry8uI+dlY8KXYV5HVVQ=="],
 
     "tsx/esbuild": ["esbuild@0.28.1", "", { "optionalDependencies": { "@esbuild/aix-ppc64": "0.28.1", "@esbuild/android-arm": "0.28.1", "@esbuild/android-arm64": "0.28.1", "@esbuild/android-x64": "0.28.1", "@esbuild/darwin-arm64": "0.28.1", "@esbuild/darwin-x64": "0.28.1", "@esbuild/freebsd-arm64": "0.28.1", "@esbuild/freebsd-x64": "0.28.1", "@esbuild/linux-arm": "0.28.1", "@esbuild/linux-arm64": "0.28.1", "@esbuild/linux-ia32": "0.28.1", "@esbuild/linux-loong64": "0.28.1", "@esbuild/linux-mips64el": "0.28.1", "@esbuild/linux-ppc64": "0.28.1", "@esbuild/linux-riscv64": "0.28.1", "@esbuild/linux-s390x": "0.28.1", "@esbuild/linux-x64": "0.28.1", "@esbuild/netbsd-arm64": "0.28.1", "@esbuild/netbsd-x64": "0.28.1", "@esbuild/openbsd-arm64": "0.28.1", "@esbuild/openbsd-x64": "0.28.1", "@esbuild/openharmony-arm64": "0.28.1", "@esbuild/sunos-x64": "0.28.1", "@esbuild/win32-arm64": "0.28.1", "@esbuild/win32-ia32": "0.28.1", "@esbuild/win32-x64": "0.28.1" }, "bin": { "esbuild": "bin/esbuild" } }, "sha512-HrJrvZv5ayxBzPfwphOoNzkzOIIlifzk0KJrGK2c8R4+LKpMtpYLQeUdjnwjWv/LZlkH2laZk+4w78pi99D4Vw=="],
diff --git a/compose.yml b/compose.yml
new file mode 100644
index 0000000..912dffb
--- /dev/null
+++ b/compose.yml
@@ -0,0 +1,9 @@
+services:
+  csbie:
+    image: git.yutakobayashi.com/nakasyou/csbi:latest
+    ports:
+      - '18787:8787'
+    env_file:
+      - .env
+    volumes:
+      - ./data:/app/data
diff --git a/flake.lock b/flake.lock
new file mode 100644
index 0000000..0ee7307
--- /dev/null
+++ b/flake.lock
@@ -0,0 +1,27 @@
+{
+  "nodes": {
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1781577229,
+        "narHash": "sha256-lrp67w8AulE9Ks53n27I45ADSzbOCn4H+CNW1Ck8B+8=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "567a49d1913ce81ac6e9582e3553dd90a955875f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "nixpkgs": "nixpkgs"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}
diff --git a/flake.nix b/flake.nix
new file mode 100644
index 0000000..3b1f1f3
--- /dev/null
+++ b/flake.nix
@@ -0,0 +1,126 @@
+{
+  description = "cSBI development and runtime helpers";
+
+  inputs = {
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+  };
+
+  outputs =
+    { nixpkgs, ... }:
+    let
+      systems = [
+        "aarch64-darwin"
+        "aarch64-linux"
+        "x86_64-darwin"
+        "x86_64-linux"
+      ];
+
+      forAllSystems = nixpkgs.lib.genAttrs systems;
+    in
+    {
+      devShells = forAllSystems (
+        system:
+        let
+          pkgs = import nixpkgs { inherit system; };
+        in
+        {
+          default = pkgs.mkShell {
+            packages = with pkgs; [
+              bun
+              docker
+              docker-compose
+              git
+            ];
+          };
+        }
+      );
+
+      apps = forAllSystems (
+        system:
+        let
+          pkgs = import nixpkgs { inherit system; };
+          composeUp = pkgs.writeShellApplication {
+            name = "csbi-compose-up";
+            runtimeInputs = [
+              pkgs.docker-compose
+            ];
+            text = ''
+              exec docker-compose up "$@"
+            '';
+          };
+        in
+        {
+          default = {
+            type = "app";
+            program = "${composeUp}/bin/csbi-compose-up";
+            meta.description = "Run cSBI with docker-compose";
+          };
+
+          compose-up = {
+            type = "app";
+            program = "${composeUp}/bin/csbi-compose-up";
+            meta.description = "Run cSBI with docker-compose";
+          };
+        }
+      );
+
+      nixosModules.default =
+        {
+          config,
+          lib,
+          ...
+        }:
+        let
+          cfg = config.services.csbie;
+        in
+        {
+          options.services.csbie = {
+            enable = lib.mkEnableOption "cSBI";
+
+            image = lib.mkOption {
+              type = lib.types.str;
+              default = "git.yutakobayashi.com/nakasyou/csbi:latest";
+              description = "Container image to run.";
+            };
+
+            envFile = lib.mkOption {
+              type = lib.types.path;
+              description = "Environment file passed to the container.";
+            };
+
+            dataDir = lib.mkOption {
+              type = lib.types.str;
+              default = "/var/lib/csbie";
+              description = "Host directory mounted at /app/data.";
+            };
+
+            port = lib.mkOption {
+              type = lib.types.port;
+              default = 18787;
+              description = "Host port exposed for cSBI.";
+            };
+          };
+
+          config = lib.mkIf cfg.enable {
+            virtualisation.oci-containers.backend = lib.mkDefault "docker";
+
+            systemd.tmpfiles.rules = [
+              "d ${cfg.dataDir} 0750 root root -"
+            ];
+
+            virtualisation.oci-containers.containers.csbie = {
+              image = cfg.image;
+              ports = [
+                "${toString cfg.port}:8787"
+              ];
+              environmentFiles = [
+                cfg.envFile
+              ];
+              volumes = [
+                "${cfg.dataDir}:/app/data"
+              ];
+            };
+          };
+        };
+    };
+}
diff --git a/packages/sbi-client/src/index.ts b/packages/sbi-client/src/index.ts
index 7ac504a..9151d67 100644
--- a/packages/sbi-client/src/index.ts
+++ b/packages/sbi-client/src/index.ts
@@ -23,5 +23,12 @@ export type {
   IssueSearchItem,
   IssueSearchResult,
   IssueSearchStatus,
+  OrderCorrectionPreOrder,
+  OrderCorrectionPreOrderDetail,
+  OrderPreview,
+  StockOrderPreOrder,
+  StockOrderPreOrderMarginTradeType,
+  StockOrderPreOrderPaymentLimit,
+  StockOrderPreOrderPriceStep,
 } from './types'
 export type * from './methods/types'
diff --git a/packages/sbi-client/src/methods/index.ts b/packages/sbi-client/src/methods/index.ts
index 708763f..3223dca 100644
--- a/packages/sbi-client/src/methods/index.ts
+++ b/packages/sbi-client/src/methods/index.ts
@@ -10,6 +10,7 @@ import type {
   ChartPeriod,
   ChartPrice,
   CurrencyAmount,
+  DepositType,
   DomesticMarket,
   IssueChart,
   IssueRef,
@@ -18,10 +19,13 @@ import type {
   IssueSearchStatus,
   MarginPosition,
   MarginPositionList,
+  MarketCode,
   MarketIndex,
   NewsItem,
   NewsList,
   Order,
+  OrderCorrectionPreOrder,
+  OrderKind,
   OrderList,
   OrderPreview,
   OrderReceipt,
@@ -34,14 +38,18 @@ import type {
   SbiSession,
   SbiTradeAuthenticationRequest,
   SignedTextValue,
+  StockOrderPreOrder,
+  StockOrderPreOrderPriceStep,
   ThemeInvestmentList,
   TradeSide,
   Watchlist,
 } from '../types'
 import type {
   AccountPowerOptions,
+  ActualDeliveryOrderPreOrderOptions,
   ActualDeliveryOrderOptions,
   BoardOptions,
+  CashOrderPreOrderOptions,
   CashOrderMethod,
   CashOrderOptions,
   CashOrderPriceCondition,
@@ -52,8 +60,14 @@ import type {
   IssueChartOptions,
   IssueSearchOptions,
   IssueOptions,
+  MarginClosePositionOrder,
+  MarginCloseOrderPreOrderOptions,
   MarginCloseOrderOptions,
+  MarginCloseSummaryOrderOptions,
+  MarginCloseTradeType,
+  MarginOpenOrderPreOrderOptions,
   MarginOpenOrderOptions,
+  MarginOpenTradeType,
   MarketIssueBoardPollingOptions,
   MarginPositionOptions,
   OrderCancelOptions,
@@ -62,7 +76,10 @@ import type {
   PlaceCashOrderOptions,
   PlaceOrderCancelOptions,
   SbiClientMethods,
+  StandardCashOrderOptions,
+  StockOrderMarginPosition,
   ThemeInvestmentOrderOptions,
+  ThemeInvestmentPreOrderOptions,
 } from './types'
 import { SbiServerError } from './error-map'
 
@@ -397,7 +414,13 @@ export const createMethodsFromSession = (session: SbiSession): SbiClientMethods
           ),
       },
       cash: {
+        preOrder: async (options) =>
+          parseStockOrderPreOrder(
+            await callMts(session, cashPreOrderTrCode(options), cashPreOrderTrin(session, options)),
+            options,
+          ),
         estimate: async (options) => {
+          assertNoOmitConfirmation(options, 'orders.cash.estimate')
           assertCashOrderOptions(options)
           await prepareCashOrder(session, options)
           return parseOrderPreview(
@@ -422,45 +445,63 @@ export const createMethodsFromSession = (session: SbiSession): SbiClientMethods
           )
         },
         estimateCorrection: async (options) =>
-          parseOrderPreview(
-            await callMts(session, 'F2301', orderCorrectionTrin(session, options)),
+          parseOrderCorrectionPreOrder(
+            await callMts(session, 'F2301', orderCorrectionPreOrderTrin(session, options)),
             cashCorrectionPreviewInput,
           ),
         estimateCorrectionConfirm: async (options) =>
           parseOrderPreview(
-            await callMts(session, 'F2302', orderCorrectionTrin(session, options)),
+            await callMts(session, 'F2302', orderCorrectionSubmitTrin(session, options)),
             cashCorrectionPreviewInput,
           ),
         placeCorrection: async (options) => {
           assertTradingAllowed(options, 'orders.cash.placeCorrection')
           return parseOrderReceipt(
-            await callMts(session, 'F2302', orderCorrectionTrin(session, options)),
+            await callMts(session, 'F2303', orderCorrectionSubmitTrin(session, options)),
           )
         },
-        estimateCancel: async (options) =>
-          parseOrderPreview(
+        estimateCancel: async (options) => {
+          assertOrderCancelOptions(options)
+          return parseOrderCorrectionPreOrder(
             await callMts(session, 'F2311', orderCancelPreOrderTrin(session, options)),
             cashCorrectionPreviewInput,
-          ),
+          )
+        },
         placeCancel: async (options) => {
           assertTradingAllowed(options, 'orders.cash.placeCancel')
+          assertPlaceOrderCancelOptions(session, options, 'orders.cash.placeCancel')
           return parseOrderReceipt(
-            await callMts(session, 'F2302', orderCancelSubmitTrin(session, options)),
+            await callMts(session, 'F2304', orderCancelSubmitTrin(session, options)),
           )
         },
       },
       margin: {
-        estimateOpen: async (options) =>
-          parseOrderPreview(
+        preOrderOpen: async (options) =>
+          parseStockOrderPreOrder(
+            await callMts(
+              session,
+              stockPreOrderTrCode('marginOpen', options.side),
+              stockPreOrderTrin(session, options, 'marginOpen'),
+            ),
+            options,
+          ),
+        estimateOpen: async (options) => {
+          assertNoOmitConfirmation(options, 'orders.margin.estimateOpen')
+          assertMarginOpenOrderOptions(options)
+          await prepareMarginOpenOrder(session, options)
+          return parseOrderPreview(
             await callMtsReturningHeaderError(
               session,
               marginOpenConfirmTrCode(options),
               marginOpenOrderTrin(session, options),
             ),
             options,
-          ),
+          )
+        },
         open: async (options) => {
           assertTradingAllowed(options, 'orders.margin.open')
+          assertMarginOpenOrderOptions(options)
+          await prepareMarginOpenOrder(session, options)
           return parseOrderReceipt(
             await callMtsReturningHeaderError(
               session,
@@ -469,74 +510,108 @@ export const createMethodsFromSession = (session: SbiSession): SbiClientMethods
             ),
           )
         },
-        estimateClose: async (options) =>
-          parseOrderPreview(
+        preOrderClose: async (options) =>
+          parseStockOrderPreOrder(
             await callMts(
               session,
-              marginCloseConfirmTrCode(options),
-              orderConfirmTrin(session, options),
+              stockPreOrderTrCode('marginClose', options.side),
+              stockPreOrderTrin(session, options, 'marginClose'),
             ),
             options,
           ),
+        estimateClose: async (options) => {
+          assertNoOmitConfirmation(options, 'orders.margin.estimateClose')
+          assertMarginCloseOrderOptions(options)
+          return parseOrderPreview(
+            await callMts(
+              session,
+              marginCloseConfirmTrCode(options),
+              marginCloseOrderTrin(session, options),
+            ),
+            options,
+          )
+        },
         close: async (options) => {
           assertTradingAllowed(options, 'orders.margin.close')
+          assertMarginCloseOrderOptions(options)
           return parseOrderReceipt(
             await callMts(
               session,
               marginCloseReceptionTrCode(options),
-              orderConfirmTrin(session, options),
+              marginCloseOrderTrin(session, options),
             ),
           )
         },
-        estimateCloseSummary: async (options) =>
-          parseOrderPreview(
+        estimateCloseSummary: async (options) => {
+          assertNoOmitConfirmation(options, 'orders.margin.estimateCloseSummary')
+          assertMarginCloseOrderOptions(options)
+          return parseOrderPreview(
             await callMts(
               session,
               marginCloseConfirmTrCode(options),
-              orderConfirmTrin(session, options),
+              marginCloseOrderTrin(session, options),
             ),
             options,
-          ),
+          )
+        },
         closeSummary: async (options) => {
           assertTradingAllowed(options, 'orders.margin.closeSummary')
+          assertMarginCloseOrderOptions(options)
           return parseOrderReceipt(
             await callMts(
               session,
               marginCloseReceptionTrCode(options),
-              orderConfirmTrin(session, options),
+              marginCloseOrderTrin(session, options),
             ),
           )
         },
-        estimateSummary: async (options) =>
-          parseOrderPreview(
+        estimateSummary: async (options) => {
+          assertNoOmitConfirmation(options, 'orders.margin.estimateSummary')
+          assertMarginCloseSummaryOrderOptions(options)
+          return parseOrderPreview(
             await callMts(
               session,
               marginCloseSummaryConfirmTrCode(options),
-              marginSummaryOrderTrin(session, options),
+              marginCloseSummaryOrderTrin(session, options),
             ),
             options,
-          ),
+          )
+        },
         placeSummary: async (options) => {
           assertTradingAllowed(options, 'orders.margin.placeSummary')
+          assertMarginCloseSummaryOrderOptions(options)
           return parseOrderReceipt(
             await callMts(
               session,
               marginCloseSummaryReceptionTrCode(options),
-              marginSummaryOrderTrin(session, options),
+              marginCloseSummaryOrderTrin(session, options),
             ),
           )
         },
-        estimateActualDelivery: async (options) =>
-          parseOrderPreview(
+        preOrderActualDelivery: async (options) =>
+          parseStockOrderPreOrder(
+            await callMts(
+              session,
+              stockPreOrderTrCode(options.kind, actualDeliverySide(options)),
+              stockPreOrderTrin(session, options, options.kind),
+            ),
+            options,
+          ),
+        estimateActualDelivery: async (options) => {
+          assertNoOmitConfirmation(options, 'orders.margin.estimateActualDelivery')
+          assertActualDeliveryOrderOptions(options)
+          return parseOrderPreview(
             await callMts(
               session,
               actualDeliveryConfirmTrCode(options),
               actualDeliveryOrderTrin(session, options),
             ),
             { ...options, side: actualDeliverySide(options) },
-          ),
+          )
+        },
         actualDelivery: async (options) => {
           assertTradingAllowed(options, 'orders.margin.actualDelivery')
+          assertActualDeliveryOrderOptions(options)
           return parseOrderReceipt(
             await callMts(
               session,
@@ -547,48 +622,72 @@ export const createMethodsFromSession = (session: SbiSession): SbiClientMethods
         },
       },
       ifd: {
-        estimate: async (options) =>
-          parseOrderPreview(
-            await callMts(session, ifdConfirmTrCode(options), ifdOrderTrin(session, options)),
+        estimate: async (options) => {
+          assertNoOmitConfirmation(options, 'orders.ifd.estimate')
+          assertIfdOrderOptions(options)
+          return parseOrderPreview(
+            await callMtsReturningHeaderError(
+              session,
+              ifdConfirmTrCode(options),
+              ifdOrderTrin(session, options),
+            ),
             options,
-          ),
+          )
+        },
         place: async (options) => {
           assertTradingAllowed(options, 'orders.ifd.place')
+          assertIfdOrderOptions(options)
           return parseOrderReceipt(
-            await callMts(session, ifdReceptionTrCode(options), ifdOrderTrin(session, options)),
+            await callMtsReturningHeaderError(
+              session,
+              ifdReceptionTrCode(options),
+              ifdOrderTrin(session, options),
+            ),
           )
         },
         estimateCorrection: async (options) =>
           parseOrderPreview(
-            await callMts(session, 'F2331', orderCorrectionTrin(session, options)),
+            await callMts(session, 'F2331', orderIfdCorrectionSubmitTrin(session, options)),
             cashCorrectionPreviewInput,
           ),
         placeCorrection: async (options) => {
           assertTradingAllowed(options, 'orders.ifd.placeCorrection')
           return parseOrderReceipt(
-            await callMts(session, 'F2332', orderCorrectionTrin(session, options)),
+            await callMts(session, 'F2332', orderIfdCorrectionSubmitTrin(session, options)),
           )
         },
-        estimateCancel: async (options) =>
-          parseOrderPreview(
-            await callMts(session, 'F2331', orderCorrectionTrin(session, options)),
+        estimateCancel: async (options) => {
+          assertOrderCancelOptions(options)
+          return parseOrderPreview(
+            await callMts(session, 'F2311', orderCancelPreOrderTrin(session, options)),
             cashCorrectionPreviewInput,
-          ),
+          )
+        },
         placeCancel: async (options) => {
           assertTradingAllowed(options, 'orders.ifd.placeCancel')
+          assertPlaceOrderCancelOptions(session, options, 'orders.ifd.placeCancel')
           return parseOrderReceipt(
-            await callMts(session, 'F2332', orderCorrectionTrin(session, options)),
+            await callMts(session, 'F2304', orderCancelSubmitTrin(session, options)),
           )
         },
       },
       themeInvestment: {
-        list: async () => parseThemeInvestmentList(await callMts(session, 'F1750')),
-        estimate: async (options) =>
-          parseThemeOrderPreview(
+        list: async (options) => {
+          assertThemeInvestmentPreOrderOptions(options)
+          return parseThemeInvestmentList(
+            await callMts(session, 'F1750', themePreOrderTrin(session, options)),
+            options,
+          )
+        },
+        estimate: async (options) => {
+          assertThemeInvestmentOrderOptions(session, options)
+          return parseThemeOrderPreview(
             await callMts(session, 'F1904', themeOrderTrin(session, options)),
             options,
-          ),
+          )
+        },
         place: async (options) => {
+          assertThemeInvestmentOrderOptions(session, options)
           assertTradingAllowed(options, 'orders.themeInvestment.place')
           return parseOrderReceipt(
             await callMts(session, 'F1905', themeOrderTrin(session, options)),
@@ -1782,6 +1881,189 @@ const parseOrderPreview = (response: MtsResponse, options: OrderPreviewInput): O
   error: methodErrorFromHeader(response),
 })
 
+const parseOrderCorrectionPreOrder = (
+  response: MtsResponse,
+  options: OrderPreviewInput,
+): OrderPreview => {
+  const headerError = methodErrorFromHeader(response)
+  const warnings = collectMessages(response.text)
+  const fallback = {
+    issue: { code: options.issueCode, market: options.market },
+    side: options.side,
+    warnings,
+    confirmationId: response.header.lastExecutionTime || undefined,
+    message: warnings.join('\n') || undefined,
+    error: headerError,
+  } satisfies OrderPreview
+
+  if (headerError || response.buffer.length <= MTS_HEADER_BYTES) return fallback
+
+  const reader = readerFor(response)
+  const tradeTitle = reader.text(20)
+  const buyingPowerTotal = reader.text(15)
+  const controlledStockCode = reader.text(1)
+  const deficitMessageFlag = reader.text(1)
+  const deficitMessage = reader.text(1500)
+  const issueCode = reader.text(5)
+  const market = reader.text(3)
+  const details: OrderCorrectionPreOrder['details'] = []
+  const detailCount = safeCount(reader, 1)
+
+  for (let index = 0; index < detailCount; index += 1) {
+    const exchangeName = reader.text(30)
+    const marketLoanKbn = reader.text(4)
+    const marketIppanLoanKbn = reader.text(4)
+    const currentPrice = reader.text(11)
+    const tradeColorFlag = reader.text(1)
+    const priceTick = reader.text(1)
+    const priceTickText = reader.text(2)
+    const tradeTime = reader.text(5)
+    const changeText = reader.text(25)
+    const volumeText = reader.text(11)
+    details.push({
+      exchangeName: emptyToUndefined(exchangeName),
+      marketLoanKbn: emptyToUndefined(marketLoanKbn),
+      marketIppanLoanKbn: emptyToUndefined(marketIppanLoanKbn),
+      currentPrice: yen(currentPrice),
+      tradeColorFlag: emptyToUndefined(tradeColorFlag),
+      priceTick: emptyToUndefined(priceTick),
+      priceTickText: emptyToUndefined(priceTickText),
+      tradeTime: emptyToUndefined(tradeTime),
+      changeText: emptyToUndefined(changeText),
+      volumeText: emptyToUndefined(volumeText),
+    })
+  }
+
+  const orderNumber = reader.text(6)
+  const orderId = reader.text(7)
+  const primaryOrderMethod = reader.text(3)
+  const primaryTriggerZone = reader.text(1)
+  const primaryTriggerPrice = reader.text(10)
+  const status = reader.text(1)
+  const statusText = reader.text(6)
+  const tradeId = reader.text(1)
+  const tradeName = reader.text(6)
+  const quantityText = reader.text(8)
+  const quantityDetailText = reader.text(20)
+  reader.skip(18)
+  reader.skip(2)
+  reader.skip(40)
+  reader.skip(40)
+  const orderLimit = reader.text(2)
+  const orderLimitText = reader.text(20)
+  const priceSteps: StockOrderPreOrderPriceStep[] = []
+  const priceStepCount = safeCount(reader, 4)
+
+  for (let index = 0; index < priceStepCount; index += 1) {
+    const from = reader.text(11)
+    const to = reader.text(11)
+    priceSteps.push({ from: yen(from), to: yen(to) })
+  }
+
+  const sessionRange = reader.text(30)
+  const inputDateText = reader.text(8)
+  const primaryOrderTerm = reader.text(14)
+  const nonSpecificTradeText = reader.text(12)
+  const marketName = reader.text(10)
+  const rbeOrderStatus = reader.text(1)
+  const priceCondition = reader.text(1)
+  const price = reader.text(10)
+  const exchangeName = reader.text(30)
+  const transId = reader.text(1)
+  const ptsDayNightFlag = reader.text(1)
+  const smallTickFlag = reader.text(1)
+  const juniorBuyingPowerTotal = reader.text(17)
+  const secondaryPriceCondition = reader.text(1)
+  const secondaryPrice = reader.text(15)
+  const autoOrderKind = reader.text(4)
+  const autoOrderNumber = reader.text(7)
+  const autoOrderInputDate = reader.text(14)
+  const secondaryOrderMethod = reader.text(3)
+  const secondaryTriggerZone = reader.text(1)
+  const secondaryTriggerPrice = reader.text(10)
+  const secondaryOrderCondition = reader.text(1)
+  const secondaryLimitPrice = reader.text(10)
+  const secondaryOrderTerm = reader.text(8)
+  const secondaryOcoPriceCondition = reader.text(1)
+  const secondaryOcoPrice = reader.text(10)
+  reader.skip(1)
+  const exchangeList = reader.text(30)
+
+  const issue = {
+    code: emptyToUndefined(issueCode) ?? options.issueCode,
+    market: emptyToUndefined(market) ?? options.market,
+  }
+  const parsedPrice = yen(price)
+  const parsedQuantity = parseNumber(quantityText)
+  const correction: OrderCorrectionPreOrder = {
+    issue,
+    tradeTitle: emptyToUndefined(tradeTitle),
+    buyingPowerTotal: yen(buyingPowerTotal),
+    controlledStockCode: emptyToUndefined(controlledStockCode),
+    hasTradeWarning: controlledStockCode === '1',
+    deficitMessageFlag: emptyToUndefined(deficitMessageFlag),
+    deficitMessage: emptyToUndefined(deficitMessage),
+    details,
+    orderNumber: emptyToUndefined(orderNumber),
+    orderId: emptyToUndefined(orderId),
+    primaryOrderMethod: emptyControlFieldToUndefined(primaryOrderMethod),
+    primaryTriggerZone: emptyControlFieldToUndefined(primaryTriggerZone),
+    primaryTriggerPrice: parseNumber(primaryTriggerPrice),
+    status: emptyToUndefined(status),
+    statusText: emptyToUndefined(statusText),
+    tradeId: emptyToUndefined(tradeId),
+    tradeName: emptyToUndefined(tradeName),
+    quantity: parsedQuantity,
+    quantityText: emptyToUndefined(quantityDetailText),
+    orderLimit: emptyToUndefined(orderLimit),
+    orderLimitText: emptyToUndefined(orderLimitText),
+    priceSteps,
+    sessionRange: emptyToUndefined(sessionRange),
+    inputDateText: emptyToUndefined(inputDateText),
+    primaryOrderTerm: emptyToUndefined(primaryOrderTerm),
+    nonSpecificTradeText: emptyToUndefined(nonSpecificTradeText),
+    marketName: emptyToUndefined(marketName),
+    rbeOrderStatus: emptyToUndefined(rbeOrderStatus),
+    priceCondition: emptyControlFieldToUndefined(priceCondition),
+    price: parsedPrice.value,
+    priceAmount: parsedPrice,
+    exchangeName: emptyToUndefined(exchangeName),
+    transId: emptyToUndefined(transId),
+    ptsDayNightFlag: emptyToUndefined(ptsDayNightFlag),
+    smallTickFlag: emptyToUndefined(smallTickFlag),
+    juniorBuyingPowerTotal: yen(juniorBuyingPowerTotal),
+    secondaryPriceCondition: emptyControlFieldToUndefined(secondaryPriceCondition),
+    secondaryPrice: parseNumber(secondaryPrice),
+    secondaryPriceAmount: yen(secondaryPrice),
+    autoOrderKind: emptyToUndefined(autoOrderKind),
+    autoOrderNumber: emptyToUndefined(autoOrderNumber),
+    autoOrderInputDate: emptyToUndefined(autoOrderInputDate),
+    secondaryOrderMethod: emptyControlFieldToUndefined(secondaryOrderMethod),
+    secondaryTriggerZone: emptyControlFieldToUndefined(secondaryTriggerZone),
+    secondaryTriggerPrice: parseNumber(secondaryTriggerPrice),
+    secondaryOrderCondition: emptyControlFieldToUndefined(secondaryOrderCondition),
+    secondaryLimitPrice: parseNumber(secondaryLimitPrice),
+    secondaryLimitPriceAmount: yen(secondaryLimitPrice),
+    secondaryOrderTerm: emptyToUndefined(secondaryOrderTerm),
+    secondaryOcoPriceCondition: emptyControlFieldToUndefined(secondaryOcoPriceCondition),
+    secondaryOcoPrice: parseNumber(secondaryOcoPrice),
+    secondaryOcoPriceAmount: yen(secondaryOcoPrice),
+    exchangeList: emptyToUndefined(exchangeList),
+  }
+
+  return {
+    issue,
+    side: correction.tradeId ? mapSide(correction.tradeId) : options.side,
+    quantity: parsedQuantity ?? undefined,
+    price: parsedPrice,
+    warnings,
+    confirmationId: response.header.lastExecutionTime || undefined,
+    message: warnings.join('\n') || undefined,
+    correction,
+    error: headerError,
+  }
+}
+
 const parseThemeOrderPreview = (
   response: MtsResponse,
   options: ThemeInvestmentOrderOptions,
@@ -1806,7 +2088,269 @@ const parseOrderReceipt = (response: MtsResponse): OrderReceipt => {
   }
 }
 
-const parseThemeInvestmentList = (_response: MtsResponse): ThemeInvestmentList => ({ themes: [] })
+type StockOrderPreOrderInput =
+  | CashOrderOptions
+  | CashOrderPreOrderOptions
+  | MarginOpenOrderPreOrderOptions
+  | MarginCloseOrderPreOrderOptions
+  | ActualDeliveryOrderPreOrderOptions
+
+const parseStockOrderPreOrder = (
+  response: MtsResponse,
+  options: StockOrderPreOrderInput,
+): StockOrderPreOrder => {
+  const headerError = methodErrorFromHeader(response)
+  const fallback = {
+    issue: { code: options.issueCode, market: options.market },
+    market: options.market,
+    priceSteps: [],
+    orderTerms: [],
+    orderTermDates: [],
+    paymentLimits: [],
+    error: headerError,
+  } satisfies StockOrderPreOrder
+
+  if (headerError || response.buffer.length <= MTS_HEADER_BYTES) return fallback
+
+  const reader = readerFor(response)
+  const tradeTitle = reader.text(20)
+  const buyingPowerTotal = reader.text(25)
+  const controlledStockCode = reader.text(1)
+  const deficitMessageFlag = reader.text(1)
+  const deficitMessage = reader.text(1500)
+  const issueCode = reader.text(5)
+  const market = reader.text(3)
+  const issueName = reader.text(30)
+  const exchangeList = reader.text(30)
+  const exchangeListName = reader.text(30)
+  const exchangeListIndexFlag = reader.text(1)
+  const marketLoanKbn = reader.text(4)
+  const marketIppanLoanKbn = reader.text(4)
+  const currentPrice = reader.text(11)
+  const tradeColorFlag = reader.text(1)
+  const priceTick = reader.text(1)
+  const priceTickText = reader.text(2)
+  const tradeTime = reader.text(5)
+  const changeText = reader.text(25)
+  const volume = reader.text(11)
+  const lotSize = reader.text(20)
+  const priceSteps: StockOrderPreOrderPriceStep[] = []
+  const priceStepCount = safeCount(reader, 4)
+
+  for (let index = 0; index < priceStepCount; index += 1) {
+    const from = reader.text(11)
+    const to = reader.text(11)
+    priceSteps.push({ from: yen(from), to: yen(to) })
+  }
+
+  const sessionRange = reader.text(30)
+  const basePrice = reader.text(11)
+  const orderTerms: string[] = []
+  const orderTermDates: string[] = []
+  const orderTermCount = safeCount(reader, 2)
+  for (let index = 0; index < orderTermCount; index += 1) {
+    const term = reader.text(8)
+    const termDate = reader.text(8)
+    const normalizedTerm = emptyControlFieldToUndefined(term)
+    const normalizedTermDate = emptyControlFieldToUndefined(termDate)
+    if (normalizedTerm) orderTerms.push(normalizedTerm)
+    if (normalizedTermDate) orderTermDates.push(normalizedTermDate)
+  }
+
+  const paymentLimits: StockOrderPreOrder['paymentLimits'] = []
+  const paymentLimitCount = safeCount(reader, 2)
+  for (let index = 0; index < paymentLimitCount; index += 1) {
+    const text = reader.text(16)
+    const code = reader.text(1)
+    paymentLimits.push({
+      text: emptyToUndefined(text),
+      code: emptyToUndefined(code),
+    })
+  }
+
+  const nonSpecificTradeText = reader.text(12)
+  const paymentLimitText = reader.text(16)
+  const acquisitionPrice = reader.text(11)
+  const position = reader.text(36)
+  const unexecutedQuantity = reader.text(16)
+  const lotSize2 = reader.text(11)
+  const ptsDayNightFlag = reader.text(1)
+  const sorServiceType = reader.text(1)
+  const isaServiceKbn = reader.text(1)
+  const isaBuyLimit = reader.text(12)
+  const isaGrowthServiceKbn = reader.text(1)
+  const smallTickFlag = reader.text(1)
+  const ippanShort = reader.text(1)
+  const ippanLong = reader.text(1)
+  const dayBuy = reader.text(1)
+  const daySell = reader.text(1)
+  const premiumShortSelling = reader.text(1)
+  const premiumFee = reader.text(25)
+  const ippanPaymentLimit = reader.text(2)
+  const positionStatus = reader.text(1)
+  const juniorNisaBuyLimit = reader.text(12)
+  const juniorNisaServiceKbn = reader.text(1)
+  const juniorBuyingPowerTotal = reader.text(17)
+  const sKabuCode = reader.text(1)
+
+  return {
+    issue: {
+      code: emptyToUndefined(issueCode) ?? options.issueCode,
+      market: emptyToUndefined(market) ?? options.market,
+      name: emptyToUndefined(stripIssueCodePrefix(issueName, issueCode)),
+    },
+    tradeTitle: emptyToUndefined(tradeTitle),
+    buyingPowerTotal: yen(buyingPowerTotal),
+    controlledStockCode: emptyToUndefined(controlledStockCode),
+    hasTradeWarning: controlledStockCode === '1',
+    market: emptyToUndefined(market) ?? options.market,
+    exchangeList: emptyToUndefined(exchangeList),
+    exchangeListName: emptyToUndefined(exchangeListName),
+    exchangeListIndexFlag: emptyToUndefined(exchangeListIndexFlag),
+    marketLoanKbn: emptyToUndefined(marketLoanKbn),
+    marketIppanLoanKbn: emptyToUndefined(marketIppanLoanKbn),
+    currentPrice: yen(currentPrice),
+    tradeColorFlag: emptyToUndefined(tradeColorFlag),
+    priceTick: emptyToUndefined(priceTick),
+    priceTickText: emptyToUndefined(priceTickText),
+    tradeTime: emptyToUndefined(tradeTime),
+    changeText: emptyToUndefined(changeText),
+    volume: parseNumber(volume),
+    lotSize: parseNumber(lotSize),
+    priceSteps,
+    sessionRange: emptyToUndefined(sessionRange),
+    basePrice: yen(basePrice),
+    orderTerms,
+    orderTermDates,
+    paymentLimits,
+    nonSpecificTradeText: emptyToUndefined(nonSpecificTradeText),
+    paymentLimitText: emptyToUndefined(paymentLimitText),
+    acquisitionPrice: yen(acquisitionPrice),
+    position: parseNumber(position),
+    unexecutedQuantity: parseNumber(unexecutedQuantity),
+    lotSize2: parseNumber(lotSize2),
+    ptsDayNightFlag: emptyToUndefined(ptsDayNightFlag),
+    sorServiceType: emptyToUndefined(sorServiceType),
+    nisa: {
+      serviceKbn: emptyToUndefined(isaServiceKbn),
+      buyLimit: yen(isaBuyLimit),
+      growthServiceKbn: emptyToUndefined(isaGrowthServiceKbn),
+      juniorServiceKbn: emptyToUndefined(juniorNisaServiceKbn),
+      juniorBuyLimit: yen(juniorNisaBuyLimit),
+      juniorBuyingPowerTotal: yen(juniorBuyingPowerTotal),
+    },
+    smallTickFlag: emptyToUndefined(smallTickFlag),
+    margin: {
+      tradeTypes: stockPreOrderMarginTradeTypes(paymentLimits),
+      ippanShort: emptyToUndefined(ippanShort),
+      ippanLong: emptyToUndefined(ippanLong),
+      dayBuy: emptyToUndefined(dayBuy),
+      daySell: emptyToUndefined(daySell),
+      premiumShortSelling: emptyToUndefined(premiumShortSelling),
+      premiumFee: yen(premiumFee),
+      ippanPaymentLimit: emptyToUndefined(ippanPaymentLimit),
+      positionStatus: emptyToUndefined(positionStatus),
+    },
+    sKabu: {
+      code: emptyToUndefined(sKabuCode),
+      available: sKabuCode === '1',
+    },
+    deficitMessageFlag: emptyToUndefined(deficitMessageFlag),
+    deficitMessage: emptyToUndefined(deficitMessage),
+    error: headerError,
+  }
+}
+
+const stockPreOrderMarginTradeTypes = (
+  paymentLimits: StockOrderPreOrder['paymentLimits'],
+): MarginOpenTradeType[] => {
+  const tradeTypes = paymentLimits
+    .map((paymentLimit) => marginOpenTradeTypeFromCode(paymentLimit.code))
+    .filter((value): value is MarginOpenTradeType => Boolean(value))
+  return [...new Set(tradeTypes)]
+}
+
+const marginOpenTradeTypeFromCode = (
+  value: string | undefined,
+): MarginOpenTradeType | undefined => {
+  if (value === '6') return 'standard'
+  if (value === '9') return 'generalBuy'
+  if (value === 'A') return 'generalSellShort'
+  if (value === 'B') return 'generalSellInventoryLimited'
+  if (value === 'C') return 'generalSellInventoryUnlimited'
+  if (value === 'D') return 'day'
+  if (value === 'E') return 'hyper'
+  return undefined
+}
+
+const parseThemeInvestmentList = (
+  response: MtsResponse,
+  options: ThemeInvestmentPreOrderOptions,
+): ThemeInvestmentList => {
+  const reader = readerFor(response)
+  const buyingPowerTotal = reader.text(25)
+  const deficitMessageFlag = reader.text(1)
+  const deficitMessage = reader.text(1500)
+  const isaBuyLimit = reader.text(12)
+  const juniorNisaBuyLimit = reader.text(12)
+  const buyingPowerTotalJuniorNisa = reader.text(17)
+  const count = safeCount(reader, 4)
+  const issues: ThemeInvestmentList['themes'][number]['issues'] = []
+
+  for (let index = 0; index < count; index += 1) {
+    const productName = reader.text(30)
+    const exchangeCode = reader.text(3)
+    const controlledStockCode = reader.text(1)
+    const nisaServiceKbn = reader.text(1)
+    const juniorNisaServiceKbn = reader.text(1)
+    const growthNisaServiceKbn = reader.text(1)
+    const sKabuCode = reader.text(1)
+    const lotSize = reader.text(10)
+    const currentPrice = reader.text(11)
+    const tradeColorFlag = reader.text(1)
+    const priceTick = reader.text(1)
+    const priceTickText = reader.text(2)
+    const tradeTime = reader.text(5)
+
+    const code = options.components[index]?.issueCode
+    if (!code) continue
+    issues.push({
+      code,
+      market: emptyToUndefined(exchangeCode) ?? options.exchangeCode,
+      name: emptyToUndefined(productName),
+      controlledStockCode: emptyToUndefined(controlledStockCode),
+      hasTradeWarning: Boolean(emptyToUndefined(controlledStockCode)),
+      nisaServiceKbn: emptyToUndefined(nisaServiceKbn),
+      juniorNisaServiceKbn: emptyToUndefined(juniorNisaServiceKbn),
+      growthNisaServiceKbn: emptyToUndefined(growthNisaServiceKbn),
+      sKabuCode: emptyToUndefined(sKabuCode),
+      sKabuAvailable: sKabuCode === '1',
+      lotSize: parseNumber(lotSize),
+      currentPrice: yen(currentPrice),
+      tradeColorFlag: emptyToUndefined(tradeColorFlag),
+      priceTick: emptyToUndefined(priceTick),
+      priceTickText: emptyToUndefined(priceTickText),
+      tradeTime: emptyToUndefined(tradeTime),
+    })
+  }
+
+  return {
+    themes: [
+      {
+        id: options.themeId,
+        name: options.themeName ?? options.themeId,
+        issues,
+      },
+    ],
+    buyingPowerTotal: yen(buyingPowerTotal),
+    isaBuyLimit: yen(isaBuyLimit),
+    juniorNisaBuyLimit: yen(juniorNisaBuyLimit),
+    buyingPowerTotalJuniorNisa: yen(buyingPowerTotalJuniorNisa),
+    deficitMessage: emptyToUndefined(deficitMessage),
+    deficitMessageFlag: emptyToUndefined(deficitMessageFlag),
+    error: methodErrorFromHeader(response),
+  }
+}
 
 const assertTradingAllowed = (options: { allowTrading?: true }, name: string) => {
   if (options.allowTrading !== true) {
@@ -1816,7 +2360,23 @@ const assertTradingAllowed = (options: { allowTrading?: true }, name: string) =>
   }
 }
 
+const assertNoOmitConfirmation = (options: unknown, methodName: string) => {
+  if (
+    options &&
+    typeof options === 'object' &&
+    !Array.isArray(options) &&
+    (options as { omitConfirmation?: unknown }).omitConfirmation
+  ) {
+    throw new Error(
+      `${methodName} cannot use omitConfirmation because APK confirmation calls may submit orders`,
+    )
+  }
+}
+
 const assertCashOrderOptions = (options: CashOrderOptions) => {
+  if (options.accountType && options.depositType && options.accountType !== options.depositType) {
+    throw new Error('orders.cash accountType and depositType must match when both are specified')
+  }
   if (options.kind === 's') {
     const optionRecord = options as Record<string, unknown>
     const unsupportedFields = [
@@ -1829,6 +2389,7 @@ const assertCashOrderOptions = (options: CashOrderOptions) => {
       'triggerPrice',
       'secondaryPriceCondition',
       'secondaryPrice',
+      'ippanMarginPaymentLimit',
       'sorLastMarket',
     ].filter((key) => key in optionRecord && optionRecord[key] != null)
     if (unsupportedFields.length) {
@@ -1837,22 +2398,35 @@ const assertCashOrderOptions = (options: CashOrderOptions) => {
     if (options.market !== 'STK') {
       throw new Error('orders.cash with kind: "s" requires market: "STK"')
     }
+    if (!options.preOrderMarket) {
+      throw new Error('orders.cash with kind: "s" requires preOrderMarket for APK pre-order')
+    }
     if (!Number.isInteger(options.quantity)) {
       throw new Error('orders.cash with kind: "s" requires an integer quantity')
     }
     return
   }
 
+  assertStandardStockOrderOptions(options, 'orders.cash')
+}
+
+const assertStandardStockOrderOptions = (
+  options: StandardStockOrderOptions,
+  methodName: string,
+) => {
+  if (options.accountType && options.depositType && options.accountType !== options.depositType) {
+    throw new Error(`${methodName} accountType and depositType must match when both are specified`)
+  }
   const priceCondition = cashOrderPriceCondition(options)
   if (cashOrderPriceConditionRequiresPrice(priceCondition) && options.price == null) {
-    throw new Error(`orders.cash priceCondition: "${priceCondition}" requires price`)
+    throw new Error(`${methodName} priceCondition: "${priceCondition}" requires price`)
   }
   if (!cashOrderPriceConditionRequiresPrice(priceCondition) && options.price != null) {
-    throw new Error(`orders.cash priceCondition: "${priceCondition}" cannot specify price`)
+    throw new Error(`${methodName} priceCondition: "${priceCondition}" cannot specify price`)
   }
   if (options.orderTerm === 'date') normalizeOrderDate(options.orderDate)
   if (options.orderTerm !== 'date' && options.orderDate) {
-    throw new Error('orders.cash orderDate requires orderTerm: "date"')
+    throw new Error(`${methodName} orderDate requires orderTerm: "date"`)
   }
 
   const orderMethod = cashOrderMethod(options)
@@ -1860,36 +2434,233 @@ const assertCashOrderOptions = (options: CashOrderOptions) => {
   const hasSecondary = options.secondaryPriceCondition != null || options.secondaryPrice != null
   if (orderMethod === 'normal') {
     if (hasTrigger)
-      throw new Error('orders.cash trigger fields require orderMethod: "stop" or "oco"')
-    if (hasSecondary) throw new Error('orders.cash secondary fields require orderMethod: "oco"')
+      throw new Error(`${methodName} trigger fields require orderMethod: "stop" or "oco"`)
+    if (hasSecondary) throw new Error(`${methodName} secondary fields require orderMethod: "oco"`)
   }
   if (orderMethod === 'stop' || orderMethod === 'oco') {
     if (!options.triggerZone) {
-      throw new Error(`orders.cash orderMethod: "${orderMethod}" requires triggerZone`)
+      throw new Error(`${methodName} orderMethod: "${orderMethod}" requires triggerZone`)
     }
     if (options.triggerPrice == null) {
-      throw new Error(`orders.cash orderMethod: "${orderMethod}" requires triggerPrice`)
+      throw new Error(`${methodName} orderMethod: "${orderMethod}" requires triggerPrice`)
     }
   }
   if (orderMethod === 'stop' && hasSecondary) {
-    throw new Error('orders.cash orderMethod: "stop" cannot specify secondary fields')
+    throw new Error(`${methodName} orderMethod: "stop" cannot specify secondary fields`)
   }
   if (orderMethod === 'oco') {
     if (!options.secondaryPriceCondition) {
-      throw new Error('orders.cash orderMethod: "oco" requires secondaryPriceCondition')
+      throw new Error(`${methodName} orderMethod: "oco" requires secondaryPriceCondition`)
     }
     if (
       cashOrderPriceConditionRequiresPrice(options.secondaryPriceCondition) &&
       options.secondaryPrice == null
     ) {
-      throw new Error('orders.cash orderMethod: "oco" requires secondaryPrice')
+      throw new Error(`${methodName} orderMethod: "oco" requires secondaryPrice`)
     }
     if (
       !cashOrderPriceConditionRequiresPrice(options.secondaryPriceCondition) &&
       options.secondaryPrice != null
     ) {
       throw new Error(
-        `orders.cash secondaryPriceCondition: "${options.secondaryPriceCondition}" cannot specify secondaryPrice`,
+        `${methodName} secondaryPriceCondition: "${options.secondaryPriceCondition}" cannot specify secondaryPrice`,
+      )
+    }
+  }
+}
+
+type StandardStockOrderOptions = StandardCashOrderOptions
+
+const assertMarginOpenOrderOptions = (options: MarginOpenOrderOptions) => {
+  assertStandardStockOrderOptions(options, 'orders.margin.open')
+  marginOpenTradeTypeCode(options.marginTradeType)
+}
+
+const assertMarginCloseOrderOptions = (options: MarginCloseOrderOptions) => {
+  assertStandardStockOrderOptions(options, 'orders.margin.close')
+  marginCloseTradeTypeCode(options.marginCloseTradeType)
+  if (options.positionId && !options.marginPositions?.length) {
+    throw new Error(
+      'orders.margin.close positionId is not enough for the APK payload; specify marginPositions',
+    )
+  }
+  if (!options.marginPositions?.length) {
+    throw new Error('orders.margin.close requires marginPositions selected from the APK fields')
+  }
+  if (options.marginClosePositionOrder) {
+    throw new Error(
+      'orders.margin.close marginClosePositionOrder is only sent by orders.margin.estimateSummary/placeSummary',
+    )
+  }
+}
+
+const assertMarginCloseSummaryOrderOptions = (options: MarginCloseSummaryOrderOptions) => {
+  assertStandardStockOrderOptions(options, 'orders.margin.placeSummary')
+  marginCloseTradeTypeCode(options.marginCloseTradeType)
+  marginClosePositionOrderCode(options.marginClosePositionOrder)
+  if (options.marginPositions?.length) {
+    throw new Error(
+      'orders.margin.placeSummary does not send marginPositions; use orders.margin.close for specified close',
+    )
+  }
+}
+
+const assertActualDeliveryOrderOptions = (options: ActualDeliveryOrderOptions) => {
+  if (options.accountType && options.depositType && options.accountType !== options.depositType) {
+    throw new Error(
+      'orders.margin.actualDelivery accountType and depositType must match when both are specified',
+    )
+  }
+  if (options.price != null) {
+    throw new Error(
+      'orders.margin.actualDelivery uses market orders in the APK and cannot specify price',
+    )
+  }
+  if (options.positionId && !options.marginPositions?.length) {
+    throw new Error(
+      'orders.margin.actualDelivery positionId is not enough for the APK payload; specify marginPositions',
+    )
+  }
+  if (!options.marginPositions?.length) {
+    throw new Error(
+      'orders.margin.actualDelivery requires marginPositions selected from the APK fields',
+    )
+  }
+}
+
+const assertThemeInvestmentOrderOptions = (
+  session: SbiSession,
+  options: ThemeInvestmentOrderOptions,
+) => {
+  if (options.accountType && options.depositType && options.accountType !== options.depositType) {
+    throw new Error(
+      'orders.themeInvestment accountType and depositType must match when both are specified',
+    )
+  }
+  if (options.side !== 'buy') {
+    throw new Error('orders.themeInvestment APK payload does not support side: "sell"')
+  }
+  if (!options.themeSetYyyymm) {
+    throw new Error('orders.themeInvestment requires themeSetYyyymm from the APK handoff')
+  }
+  if (String(options.themeSetYyyymm).length !== 6) {
+    throw new Error('orders.themeInvestment themeSetYyyymm must be 6 digits')
+  }
+  if (options.themeCourse == null || String(options.themeCourse).length > 2) {
+    throw new Error('orders.themeInvestment themeCourse must fit the APK 2-byte field')
+  }
+  if (!options.components?.length) {
+    throw new Error('orders.themeInvestment requires components selected from the APK fields')
+  }
+  if (options.components.length > 10) {
+    throw new Error('orders.themeInvestment supports up to 10 component stocks from the APK')
+  }
+  for (const [index, component] of options.components.entries()) {
+    if (!component.issueCode) {
+      throw new Error(`orders.themeInvestment components.${index}.issueCode is required`)
+    }
+    if (component.quantity == null || String(component.quantity).length === 0) {
+      throw new Error(`orders.themeInvestment components.${index}.quantity is required`)
+    }
+  }
+  if (!session.tradePassword) {
+    throw new Error('orders.themeInvestment requires tradePassword in loginWithPasskey options')
+  }
+  orderDepositType(session, options, 'orders.themeInvestment')
+}
+
+const assertThemeInvestmentPreOrderOptions = (options: ThemeInvestmentPreOrderOptions) => {
+  if (!options.themeId) {
+    throw new Error('orders.themeInvestment.list requires themeId from the APK handoff')
+  }
+  if (!options.exchangeCode) {
+    throw new Error('orders.themeInvestment.list requires exchangeCode from the APK handoff')
+  }
+  if (!options.components?.length) {
+    throw new Error('orders.themeInvestment.list requires components selected from the APK fields')
+  }
+  if (options.components.length > 10) {
+    throw new Error('orders.themeInvestment.list supports up to 10 component stocks from the APK')
+  }
+  for (const [index, component] of options.components.entries()) {
+    if (!component.issueCode) {
+      throw new Error(`orders.themeInvestment.list components.${index}.issueCode is required`)
+    }
+  }
+}
+
+const assertOrderCancelOptions = (options: OrderCancelOptions) => {
+  if (!options.orderNumber) {
+    throw new Error('orders cancel requires orderNumber')
+  }
+}
+
+const assertPlaceOrderCancelOptions = (
+  session: SbiSession,
+  options: PlaceOrderCancelOptions,
+  methodName: string,
+) => {
+  assertOrderCancelOptions(options)
+  if (!options.tradePassword && !session.tradePassword) {
+    throw new Error(`${methodName} requires tradePassword in loginWithPasskey options`)
+  }
+}
+
+const assertIfdOrderOptions = (options: IfdOrderOptions) => {
+  assertCashOrderOptions(options)
+  if (options.tradeType === 'marginOpen') {
+    marginOpenTradeTypeCode(options.marginTradeType)
+  } else if (options.marginTradeType) {
+    throw new Error('orders.ifd marginTradeType requires tradeType: "marginOpen"')
+  }
+  const ifdPriceCondition = ifdOrderPriceCondition(options)
+  if (cashOrderPriceConditionRequiresPrice(ifdPriceCondition) && options.ifdPrice == null) {
+    throw new Error(`orders.ifd ifdPriceCondition: "${ifdPriceCondition}" requires ifdPrice`)
+  }
+  if (!cashOrderPriceConditionRequiresPrice(ifdPriceCondition) && options.ifdPrice != null) {
+    throw new Error(`orders.ifd ifdPriceCondition: "${ifdPriceCondition}" cannot specify ifdPrice`)
+  }
+  if (options.ifdOrderTerm === 'date') normalizeOrderDate(options.ifdOrderDate)
+  if (options.ifdOrderTerm !== 'date' && options.ifdOrderDate) {
+    throw new Error('orders.ifd ifdOrderDate requires ifdOrderTerm: "date"')
+  }
+
+  const method = ifdOrderMethod(options)
+  const hasTrigger = options.ifdTriggerZone != null || options.ifdTriggerPrice != null
+  const hasSecondary =
+    options.ifdSecondaryPriceCondition != null || options.ifdSecondaryPrice != null
+  if (method === 'normal') {
+    if (hasTrigger)
+      throw new Error('orders.ifd trigger fields require ifdOrderMethod: "stop" or "oco"')
+    if (hasSecondary) throw new Error('orders.ifd secondary fields require ifdOrderMethod: "oco"')
+  }
+  if (method === 'stop' || method === 'oco') {
+    if (!options.ifdTriggerZone) {
+      throw new Error(`orders.ifd ifdOrderMethod: "${method}" requires ifdTriggerZone`)
+    }
+    if (options.ifdTriggerPrice == null) {
+      throw new Error(`orders.ifd ifdOrderMethod: "${method}" requires ifdTriggerPrice`)
+    }
+  }
+  if (method === 'stop' && hasSecondary) {
+    throw new Error('orders.ifd ifdOrderMethod: "stop" cannot specify secondary fields')
+  }
+  if (method === 'oco') {
+    if (!options.ifdSecondaryPriceCondition) {
+      throw new Error('orders.ifd ifdOrderMethod: "oco" requires ifdSecondaryPriceCondition')
+    }
+    if (
+      cashOrderPriceConditionRequiresPrice(options.ifdSecondaryPriceCondition) &&
+      options.ifdSecondaryPrice == null
+    ) {
+      throw new Error('orders.ifd ifdOrderMethod: "oco" requires ifdSecondaryPrice')
+    }
+    if (
+      !cashOrderPriceConditionRequiresPrice(options.ifdSecondaryPriceCondition) &&
+      options.ifdSecondaryPrice != null
+    ) {
+      throw new Error(
+        `orders.ifd ifdSecondaryPriceCondition: "${options.ifdSecondaryPriceCondition}" cannot specify ifdSecondaryPrice`,
       )
     }
   }
@@ -1901,28 +2672,255 @@ const prepareCashOrder = async (session: SbiSession, options: CashOrderOptions)
     cashPreOrderTrCode(options),
     cashPreOrderTrin(session, options),
   )
-  const preOrderInfo = parseCashPreOrderInfo(preOrder)
-  await ensureTradeAuthenticated(session, options, preOrderInfo)
+  const preOrderInfo = parseStockOrderPreOrder(preOrder, options)
+  if (options.kind === 's' && preOrderInfo.sKabu?.available === false) {
+    throw new Error('orders.cash S-kabu is not available for this issue according to APK pre-order')
+  }
+  assertStockOrderQuantityAvailable(options, preOrderInfo, 'orders.cash')
+  assertStockOrderMarketAvailable(options, preOrderInfo, 'orders.cash')
+  assertStockOrderTermAvailable(options, preOrderInfo, 'orders.cash')
+  assertCashOrderDepositTypeAvailable(options, preOrderInfo)
+  assertCashOrderPriceSteps(options, preOrderInfo)
+  await ensureTradeAuthenticated(session, options, cashPreOrderInfoForAuthentication(preOrderInfo))
 }
 
-const parseCashPreOrderInfo = (response: MtsResponse): CashPreOrderInfo => {
-  if (methodErrorFromHeader(response) || response.buffer.length <= MTS_HEADER_BYTES) return {}
-  const reader = readerFor(response)
-  reader.skip(20)
-  reader.skip(25)
-  reader.skip(1)
-  reader.skip(1)
-  reader.skip(1500)
-  const issueCode = reader.text(5)
-  const market = reader.text(3)
-  const issueName = reader.text(30)
-  return {
-    issueCode: emptyToUndefined(issueCode),
-    market: emptyToUndefined(market),
-    issueName: emptyToUndefined(stripIssueCodePrefix(issueName, issueCode)),
+const prepareMarginOpenOrder = async (session: SbiSession, options: MarginOpenOrderOptions) => {
+  const depositType = orderDepositType(session, options, 'orders.margin.open')
+  assertMarginOrderDepositType(depositType, 'orders.margin.open')
+  const preOrder = await callMts(
+    session,
+    stockPreOrderTrCode('marginOpen', options.side),
+    stockPreOrderTrin(session, options, 'marginOpen'),
+  )
+  const preOrderInfo = parseStockOrderPreOrder(preOrder, options)
+  assertStockOrderQuantityAvailable(options, preOrderInfo, 'orders.margin.open')
+  assertStockOrderMarketAvailable(options, preOrderInfo, 'orders.margin.open')
+  assertStockOrderTermAvailable(options, preOrderInfo, 'orders.margin.open')
+  assertMarginOpenTradeTypeAvailable(options, preOrderInfo)
+  assertCashOrderPriceSteps(options, preOrderInfo, 'orders.margin.open')
+}
+
+const assertStockOrderQuantityAvailable = (
+  options: { kind?: OrderKind; quantity: number },
+  preOrder: StockOrderPreOrder,
+  methodName: string,
+) => {
+  if (!Number.isInteger(options.quantity) || options.quantity <= 0) {
+    throw new Error(`${methodName} quantity must be a positive integer`)
+  }
+  const lotSize = preOrder.lotSize2
+  if (typeof lotSize !== 'number' || lotSize <= 1) return
+  if (options.kind === 's') {
+    if (options.quantity >= lotSize) {
+      throw new Error(
+        `${methodName} with kind: "s" quantity must be less than APK lotSize2: ${lotSize}`,
+      )
+    }
+    return
+  }
+  if (options.quantity % lotSize !== 0) {
+    throw new Error(`${methodName} quantity must be a multiple of APK lotSize2: ${lotSize}`)
   }
 }
 
+const assertStockOrderMarketAvailable = (
+  options: { kind?: OrderKind; market: MarketCode },
+  preOrder: StockOrderPreOrder,
+  methodName: string,
+) => {
+  if (options.kind === 's') return
+  const markets = stockPreOrderExchangeMarkets(preOrder.exchangeList)
+  if (!markets.length || markets.includes(options.market)) return
+  throw new Error(
+    `${methodName} market: "${options.market}" is not available according to APK pre-order exchangeList`,
+  )
+}
+
+const assertStockOrderTermAvailable = (
+  options: { kind?: OrderKind; orderTerm?: CashOrderTerm; orderDate?: string },
+  preOrder: StockOrderPreOrder,
+  methodName: string,
+) => {
+  if (options.kind === 's') return
+  const terms = stockPreOrderTermValues(preOrder)
+  if (!terms.size) return
+  const orderTerm = options.orderTerm ?? 'day'
+  if (!terms.has(orderTerm)) {
+    throw new Error(
+      `${methodName} orderTerm: "${orderTerm}" is not available according to APK pre-order`,
+    )
+  }
+  if (orderTerm !== 'date') return
+  const dates = stockPreOrderTermDates(preOrder)
+  if (!dates.length) return
+  const orderDate = normalizeOrderDate(options.orderDate)
+  if (!dates.includes(orderDate)) {
+    throw new Error(
+      `${methodName} orderDate: "${orderDate}" is not available according to APK pre-order`,
+    )
+  }
+}
+
+const stockPreOrderTermValues = (preOrder: StockOrderPreOrder): Set<CashOrderTerm> => {
+  const terms = new Set<CashOrderTerm>()
+  for (const term of preOrder.orderTerms) {
+    if (term === '当日中') terms.add('day')
+    if (term === '今週中') terms.add('week')
+    if (/\d/.test(term)) terms.add('date')
+  }
+  if (preOrder.orderTermDates.length) terms.add('date')
+  return terms
+}
+
+const stockPreOrderTermDates = (preOrder: StockOrderPreOrder) => {
+  const values = preOrder.orderTermDates.length
+    ? preOrder.orderTermDates
+    : preOrder.orderTerms.filter((term) => /\d/.test(term))
+  return values.map((value) => value.replace(/\D/g, '')).filter((value) => value.length === 8)
+}
+
+const assertMarginOpenTradeTypeAvailable = (
+  options: MarginOpenOrderOptions,
+  preOrder: StockOrderPreOrder,
+) => {
+  const tradeTypes = preOrder.margin?.tradeTypes ?? []
+  const tradeType = options.marginTradeType
+  const sideTradeTypes =
+    options.side === 'buy'
+      ? new Set<MarginOpenTradeType>(['standard', 'generalBuy', 'day'])
+      : new Set<MarginOpenTradeType>([
+          'standard',
+          'generalSellShort',
+          'generalSellInventoryLimited',
+          'generalSellInventoryUnlimited',
+          'day',
+          'hyper',
+        ])
+  if (!sideTradeTypes.has(tradeType)) {
+    throw new Error(
+      `orders.margin.open marginTradeType: "${tradeType}" is not selectable for side: "${options.side}" in the APK`,
+    )
+  }
+  if (tradeTypes.length && !marginOpenTradeTypeSelectableFromPreOrder(tradeType, tradeTypes)) {
+    throw new Error(
+      `orders.margin.open marginTradeType: "${tradeType}" is not available according to APK pre-order`,
+    )
+  }
+}
+
+const marginOpenTradeTypeSelectableFromPreOrder = (
+  tradeType: MarginOpenTradeType,
+  tradeTypes: MarginOpenTradeType[],
+) => {
+  if (tradeTypes.includes(tradeType)) return true
+  if (tradeType === 'generalSellInventoryLimited') {
+    return tradeTypes.includes('generalSellInventoryUnlimited')
+  }
+  return false
+}
+
+const STOCK_PRE_ORDER_EXCHANGE_MARKET_CODES = new Set([
+  'SOR',
+  'TKY',
+  'NGY',
+  'FKO',
+  'SPR',
+  'PTS',
+  'PTX',
+])
+
+const stockPreOrderExchangeMarkets = (value: string | undefined): MarketCode[] => {
+  if (!value) return []
+  const markets: MarketCode[] = []
+  for (let index = 0; index < value.length; index += 3) {
+    const code = value.slice(index, index + 3)
+    if (STOCK_PRE_ORDER_EXCHANGE_MARKET_CODES.has(code) && !markets.includes(code)) {
+      markets.push(code)
+    }
+  }
+  return markets
+}
+
+const assertCashOrderDepositTypeAvailable = (
+  options: CashOrderOptions,
+  preOrder: StockOrderPreOrder,
+) => {
+  const depositType = cashOrderDepositType(options)
+  if (!depositType || depositType === 'specific' || depositType === 'general') return
+  if (depositType === 'growthInvestment' && preOrder.nisa?.growthServiceKbn !== '1') {
+    throw new Error(
+      'orders.cash depositType: "growthInvestment" is not available according to APK pre-order',
+    )
+  }
+  if (depositType === 'nisa' && preOrder.nisa?.serviceKbn !== '1') {
+    throw new Error('orders.cash depositType: "nisa" is not available according to APK pre-order')
+  }
+  if (depositType === 'juniorNisa' && preOrder.nisa?.juniorServiceKbn !== '1') {
+    throw new Error(
+      'orders.cash depositType: "juniorNisa" is not available according to APK pre-order',
+    )
+  }
+  if (depositType === 'unknown') {
+    throw new Error('orders.cash depositType: "unknown" cannot be sent as an APK order payload')
+  }
+}
+
+const assertCashOrderPriceSteps = (
+  options: CashOrderOptions,
+  preOrder: StockOrderPreOrder,
+  methodName = 'orders.cash',
+) => {
+  if (options.kind === 's') return
+  const values: Array<{ field: string; value: number | undefined }> = []
+  const priceCondition = cashOrderPriceCondition(options)
+  if (cashOrderPriceConditionRequiresPrice(priceCondition)) {
+    values.push({ field: 'price', value: options.price })
+  }
+  const method = cashOrderMethod(options)
+  if (method !== 'normal') values.push({ field: 'triggerPrice', value: options.triggerPrice })
+  if (
+    method === 'oco' &&
+    options.secondaryPriceCondition &&
+    cashOrderPriceConditionRequiresPrice(options.secondaryPriceCondition)
+  ) {
+    values.push({ field: 'secondaryPrice', value: options.secondaryPrice })
+  }
+
+  for (const { field, value } of values) {
+    if (value == null) continue
+    const step = cashOrderPriceStepFor(preOrder, value)
+    if (!step || priceMatchesStep(value, step)) continue
+    throw new Error(`${methodName} ${field} must match APK price step ${step}`)
+  }
+}
+
+const cashOrderPriceStepFor = (preOrder: StockOrderPreOrder, price: number) => {
+  const steps = preOrder.priceSteps
+    .map((step) => ({
+      upper: step.from?.value,
+      step: step.to?.value,
+    }))
+    .filter(
+      (step): step is { upper: number; step: number } =>
+        typeof step.upper === 'number' &&
+        typeof step.step === 'number' &&
+        step.upper > 0 &&
+        step.step > 0,
+    )
+    .sort((left, right) => left.upper - right.upper)
+  if (!steps.length) return undefined
+  return steps.find((step) => price <= step.upper)?.step ?? steps.at(-1)?.step
+}
+
+const priceMatchesStep = (price: number, step: number) =>
+  Math.abs(price / step - Math.round(price / step)) < 1e-8
+
+const cashPreOrderInfoForAuthentication = (preOrder: StockOrderPreOrder): CashPreOrderInfo => ({
+  issueCode: preOrder.issue.code,
+  market: preOrder.issue.market,
+  issueName: preOrder.issue.name,
+})
+
 const ensureTradeAuthenticated = async (
   session: SbiSession,
   options: CashOrderOptions,
@@ -2269,72 +3267,246 @@ const recentOrdersTrin = (session: SbiSession, options?: OrderInquiryOptions) =>
     { width: 1, value: '' },
   ])
 
-const orderPreviewTrin = (session: SbiSession, options: StockOrderTrinOptions) =>
-  fixedTrin([
-    { width: 3, value: session.profile.butenCode ?? session.profile.branchCode },
-    { width: 7, value: session.profile.accountNumber },
-    { width: 5, value: options.issueCode },
-    { width: 3, value: options.market },
-    { width: 1, value: sideCode(options.side) },
-  ])
-
 const cashOrderTrin = (session: SbiSession, options: CashOrderOptions) =>
   appCashOrderTrin(session, options)
 
-const cashPreOrderTrin = (session: SbiSession, options: CashOrderOptions) =>
+const cashPreOrderTrin = (
+  session: SbiSession,
+  options: CashOrderOptions | CashOrderPreOrderOptions,
+) => stockPreOrderTrin(session, options, 'cash')
+
+type StockPreOrderTradeType =
+  | 'cash'
+  | 'marginOpen'
+  | 'marginClose'
+  | ActualDeliveryOrderOptions['kind']
+
+const stockPreOrderTrin = (
+  session: SbiSession,
+  options: StockOrderPreOrderInput,
+  tradeType: StockPreOrderTradeType,
+) =>
   fixedTrin([
     { width: 5, value: options.issueCode },
     { width: 80, value: '' },
-    { width: 3, value: options.market },
+    { width: 3, value: stockPreOrderMarket(options, tradeType) },
     { width: 3, value: session.profile.butenCode ?? session.profile.branchCode },
     { width: 7, value: session.profile.accountNumber },
     { width: 1, value: session.profile.marginAccount ?? '' },
-    { width: 1, value: cashPreOrderDepositType(options) },
-    { width: 2, value: '' },
+    { width: 1, value: stockPreOrderDepositType(options, tradeType) },
+    { width: 1, value: stockPreOrderMarginCloseTradeType(options, tradeType) },
+    { width: 1, value: '' },
   ])
 
-const cashPreOrderDepositType = (options: CashOrderOptions) =>
-  options.side === 'sell' ? orderDepositTypeCode(options.accountType) : ''
+const stockPreOrderDepositType = (
+  options: StockOrderPreOrderInput,
+  tradeType: StockPreOrderTradeType,
+) =>
+  stockPreOrderSide(options, tradeType) === 'sell'
+    ? orderDepositTypeCode(cashOrderDepositType(options))
+    : ''
 
-const appCashOrderTrin = (session: SbiSession, options: CashOrderOptions) => {
-  if (!session.tradePassword) {
-    throw new Error('orders.cash requires tradePassword in loginWithPasskey options')
+const stockPreOrderSide = (
+  options: StockOrderPreOrderInput,
+  tradeType: StockPreOrderTradeType,
+): TradeSide => {
+  if (tradeType === 'genwatashi') return 'sell'
+  if (tradeType === 'genbiki') return 'buy'
+  if (!('side' in options)) {
+    throw new Error(`orders preOrder with tradeType "${tradeType}" requires side`)
   }
-  const accountType = options.accountType ?? session.profile.accountType
-  const standardOptions = options.kind === 's' ? undefined : options
-  const priceCondition = cashOrderPriceCondition(options)
-  const isPriceBased = cashOrderPriceConditionRequiresPrice(priceCondition)
+  return options.side
+}
+
+const stockPreOrderMarket = (
+  options: StockOrderPreOrderInput,
+  tradeType: StockPreOrderTradeType,
+) => {
+  if (tradeType === 'genbiki' || tradeType === 'genwatashi') return null
+  if (!isCashPreOrderInput(options) || options.kind !== 's') return options.market
+  if (!options.preOrderMarket) {
+    throw new Error('orders.cash.preOrder with kind: "s" requires preOrderMarket')
+  }
+  return options.preOrderMarket
+}
+
+const stockPreOrderMarginCloseTradeType = (
+  options: StockOrderPreOrderInput,
+  tradeType: StockPreOrderTradeType,
+) => {
+  if (tradeType !== 'marginClose') return null
+  const marginCloseTradeType = (options as MarginCloseOrderPreOrderOptions).marginCloseTradeType
+  return marginCloseTradeType ? marginCloseTradeTypeCode(marginCloseTradeType) : null
+}
+
+const isCashPreOrderInput = (
+  options: StockOrderPreOrderInput,
+): options is CashOrderOptions | CashOrderPreOrderOptions => 'kind' in options
+
+type AppStockOrderTrinOptions = {
+  issueCode: string
+  market: MarketCode
+  quantity: number
+  price?: number
+  priceCondition: CashOrderPriceCondition
+  depositType: AccountType | DepositType
+  marginTradeTypeCode: string
+  orderTermCode: string
+  orderMethod: CashOrderMethod
+  triggerZone?: CashOrderTriggerZone
+  triggerPrice?: number
+  marginPositions?: StockOrderMarginPosition[]
+  bCode?: string
+  ippanMarginPaymentLimit?: string
+  secondaryPriceCondition?: CashOrderPriceCondition
+  secondaryPrice?: number
+  sorLastMarket?: MarketCode
+  omitConfirmation?: boolean
+  methodName: string
+}
+
+type OmitConfirmationOption = {
+  omitConfirmation?: boolean
+}
+
+const appStockOrderTrin = (session: SbiSession, options: AppStockOrderTrinOptions) => {
+  if (!session.tradePassword) {
+    throw new Error(`${options.methodName} requires tradePassword in loginWithPasskey options`)
+  }
+  const isPriceBased = cashOrderPriceConditionRequiresPrice(options.priceCondition)
+  const secondaryRequiresPrice =
+    options.secondaryPriceCondition != null &&
+    cashOrderPriceConditionRequiresPrice(options.secondaryPriceCondition)
   return fixedTrin([
     { width: 32, value: mtsTradePassword(session.tradePassword) },
     { width: 3, value: session.profile.butenCode ?? session.profile.branchCode },
     { width: 7, value: session.profile.accountNumber },
     { width: 5, value: options.issueCode },
-    { width: 3, value: orderMarketCode(options) },
+    { width: 3, value: options.market },
     { width: 8, value: options.quantity },
-    { width: 1, value: cashOrderPriceConditionCode(priceCondition) },
+    { width: 1, value: cashOrderPriceConditionCode(options.priceCondition) },
     { width: 10, value: isPriceBased ? options.price : '' },
-    { width: 1, value: orderDepositTypeCode(accountType) },
-    { width: 1, value: '0' },
-    { width: 8, value: cashOrderTermCode(options) },
-    { width: 2, value: '00' },
-    { width: 3, value: cashOrderMethodCode(cashOrderMethod(options)) },
-    { width: 1, value: triggerZoneCode(standardOptions?.triggerZone) },
-    { width: 10, value: standardOptions?.triggerPrice ?? '' },
-    { width: 1, value: '2' },
+    { width: 1, value: orderDepositTypeCode(options.depositType) },
+    { width: 1, value: options.marginTradeTypeCode },
+    { width: 8, value: options.orderTermCode },
+    ...stockOrderMarginPositionFields(options.marginPositions),
+    { width: 3, value: cashOrderMethodCode(options.orderMethod) },
+    { width: 1, value: triggerZoneCode(options.triggerZone) },
+    { width: 10, value: options.triggerPrice ?? '' },
+    { width: 1, value: options.omitConfirmation ? '1' : (options.bCode ?? '2') },
     { width: 1, value: '' },
-    { width: 2, value: '' },
-    { width: 1, value: secondaryPriceConditionCode(options) },
+    { width: 2, value: options.ippanMarginPaymentLimit ?? '' },
+    {
+      width: 1,
+      value: options.secondaryPriceCondition
+        ? cashOrderPriceConditionCode(options.secondaryPriceCondition)
+        : '',
+    },
     {
       width: 10,
-      value: secondaryPriceConditionRequiresPrice(options) ? standardOptions?.secondaryPrice : '',
+      value: secondaryRequiresPrice ? options.secondaryPrice : '',
       align: 'right',
-      pad: secondaryPriceConditionRequiresPrice(options) ? '0' : ' ',
+      pad: secondaryRequiresPrice ? '0' : ' ',
     },
-    { width: 3, value: sorLastMarketCode(session, options) },
+    { width: 3, value: options.sorLastMarket ?? '' },
   ])
 }
 
-const orderMarketCode = (options: CashOrderOptions) => options.market
+const appCashOrderTrin = (
+  session: SbiSession,
+  options: CashOrderOptions | PlaceCashOrderOptions,
+) => {
+  const depositType = orderDepositType(session, options, 'orders.cash')
+  const standardOptions = options.kind === 's' ? undefined : options
+  const priceCondition = cashOrderPriceCondition(options)
+  return appStockOrderTrin(session, {
+    issueCode: options.issueCode,
+    market: orderMarketCode(options),
+    quantity: options.quantity,
+    price: standardOptions?.price,
+    priceCondition,
+    depositType,
+    marginTradeTypeCode: '0',
+    orderTermCode: cashOrderTermCode(options),
+    orderMethod: cashOrderMethod(options),
+    triggerZone: standardOptions?.triggerZone,
+    triggerPrice: standardOptions?.triggerPrice,
+    ippanMarginPaymentLimit: standardOptions?.ippanMarginPaymentLimit,
+    secondaryPriceCondition: standardOptions?.secondaryPriceCondition,
+    secondaryPrice: standardOptions?.secondaryPrice,
+    sorLastMarket: sorLastMarketCode(session, options),
+    omitConfirmation: 'omitConfirmation' in options ? options.omitConfirmation : undefined,
+    methodName: 'orders.cash',
+  })
+}
+
+const stockOrderMarginPositionFields = (
+  positions: StockOrderMarginPosition[] = [],
+  countWidth = 2,
+) => {
+  const maxCount = 10 ** countWidth - 1
+  if (positions.length > maxCount) {
+    throw new Error(`stock order marginPositions cannot exceed ${maxCount} records`)
+  }
+  return [
+    { width: countWidth, value: positions.length.toString().padStart(countWidth, '0') },
+    ...positions.flatMap((position) => [
+      { width: 8, value: normalizeStockOrderRecordDate(position.openTradeDate, 'openTradeDate') },
+      { width: 13, value: position.openPrice },
+      { width: 8, value: position.quantity },
+      {
+        width: 8,
+        value: normalizeStockOrderRecordDate(position.orgNewTradeDate, 'orgNewTradeDate'),
+      },
+      { width: 3, value: position.bargainMarketCode },
+    ]),
+  ]
+}
+
+const normalizeStockOrderRecordDate = (value: string, fieldName: string) => {
+  const date = value.replace(/\D/g, '')
+  if (date.length !== 8) {
+    throw new Error(`stock order marginPositions.${fieldName} must be yyyyMMdd or yyyy-MM-dd`)
+  }
+  return date
+}
+
+const orderMarketCode = (options: { market: MarketCode }) => options.market
+
+const cashOrderDepositType = (options: { depositType?: DepositType; accountType?: AccountType }) =>
+  options.depositType ?? options.accountType
+
+const orderDepositType = (
+  session: SbiSession,
+  options: { depositType?: DepositType; accountType?: AccountType },
+  methodName: string,
+): AccountType | DepositType => {
+  const depositType = cashOrderDepositType(options) ?? session.profile.accountType
+  if (!depositType) {
+    throw new Error(`${methodName} requires accountType or depositType when login profile has none`)
+  }
+  return depositType
+}
+
+const assertMarginOrderDepositType = (
+  depositType: AccountType | DepositType,
+  methodName: string,
+) => {
+  if (depositType !== 'specific') {
+    throw new Error(
+      `${methodName} requires depositType/accountType: "specific" for APK margin orders`,
+    )
+  }
+}
+
+const assertActualDeliveryDepositType = (
+  depositType: AccountType | DepositType,
+  methodName: string,
+) => {
+  if (depositType !== 'specific' && depositType !== 'general') {
+    throw new Error(`${methodName} supports only "specific" or "general" depositType/accountType`)
+  }
+}
 
 const CASH_ORDER_PRICE_CONDITION_CODES = {
   limit: '',
@@ -2374,10 +3546,18 @@ const CASH_ORDER_TERM_CODES = {
   week: 'WEEKLY',
 } as const satisfies Record<Exclude<CashOrderTerm, 'date'>, string>
 
-const cashOrderTermCode = (options: CashOrderOptions) => {
+const cashOrderTermCode = (options: {
+  kind?: OrderKind
+  orderTerm?: CashOrderTerm
+  orderDate?: string
+}) => {
   if (options.kind === 's') return ''
   const term = options.orderTerm ?? 'day'
-  if (term === 'date') return normalizeOrderDate(options.orderDate)
+  return orderTermCode(term, options.orderDate)
+}
+
+const orderTermCode = (term: CashOrderTerm, date?: string) => {
+  if (term === 'date') return normalizeOrderDate(date)
   return CASH_ORDER_TERM_CODES[term]
 }
 
@@ -2393,7 +3573,11 @@ const CASH_ORDER_METHOD_CODES = {
   oco: 'OCO',
 } as const satisfies Record<CashOrderMethod, string>
 
-const cashOrderMethod = (options: CashOrderOptions): CashOrderMethod => {
+const cashOrderMethod = (options: {
+  kind?: OrderKind
+  price?: number
+  orderMethod?: CashOrderMethod
+}): CashOrderMethod => {
   if (options.kind === 's') return 'normal'
   if (options.orderMethod) return options.orderMethod
   if (options.kind === 'stop') return 'stop'
@@ -2423,54 +3607,454 @@ const secondaryPriceConditionRequiresPrice = (options: CashOrderOptions) =>
   options.secondaryPriceCondition != null &&
   cashOrderPriceConditionRequiresPrice(options.secondaryPriceCondition)
 
-const sorLastMarketCode = (session: SbiSession, options: CashOrderOptions) => {
+const ifdOrderPriceCondition = (options: IfdOrderOptions): CashOrderPriceCondition => {
+  if (options.ifdPriceCondition) return options.ifdPriceCondition
+  if (options.ifdPrice != null) return 'limit'
+  return 'market'
+}
+
+const ifdOrderTermCode = (options: IfdOrderOptions) =>
+  orderTermCode(options.ifdOrderTerm ?? 'day', options.ifdOrderDate)
+
+const ifdOrderMethod = (options: IfdOrderOptions): CashOrderMethod => {
+  if (options.ifdOrderMethod) return options.ifdOrderMethod
+  if (options.kind === 'ifdo') return 'oco'
+  return 'normal'
+}
+
+const ifdSecondaryPriceConditionCode = (options: IfdOrderOptions) =>
+  options.ifdSecondaryPriceCondition
+    ? cashOrderPriceConditionCode(options.ifdSecondaryPriceCondition)
+    : ''
+
+const ifdSecondaryPriceConditionRequiresPrice = (options: IfdOrderOptions) =>
+  options.ifdSecondaryPriceCondition != null &&
+  cashOrderPriceConditionRequiresPrice(options.ifdSecondaryPriceCondition)
+
+const sorLastMarketCode = (
+  session: SbiSession,
+  options: {
+    market: MarketCode
+    sorLastMarket?: MarketCode
+    depositType?: DepositType
+    accountType?: AccountType
+  },
+) => {
   if (options.market !== 'SOR') return ''
   if (options.sorLastMarket) return options.sorLastMarket
-  if (options.accountType === 'juniorNisa') return session.profile.sor?.juniorNisaLastMarket ?? ''
+  if (cashOrderDepositType(options) === 'juniorNisa') {
+    return session.profile.sor?.juniorNisaLastMarket ?? ''
+  }
   return session.profile.sor?.lastMarket ?? ''
 }
 
-type StockOrderTrinOptions = {
-  issueCode: string
-  market: string
-  side: TradeSide
-  quantity?: number
-  price?: number
-  confirmationId?: string
-  positionId?: string
+const marginOpenOrderTrin = (
+  session: SbiSession,
+  options: MarginOpenOrderOptions & OmitConfirmationOption,
+) => {
+  const depositType = orderDepositType(session, options, 'orders.margin.open')
+  assertMarginOrderDepositType(depositType, 'orders.margin.open')
+  const priceCondition = cashOrderPriceCondition(options)
+  return appStockOrderTrin(session, {
+    issueCode: options.issueCode,
+    market: orderMarketCode(options),
+    quantity: options.quantity,
+    price: options.price,
+    priceCondition,
+    depositType,
+    marginTradeTypeCode: marginOpenTradeTypeCode(options.marginTradeType),
+    orderTermCode: cashOrderTermCode(options),
+    orderMethod: cashOrderMethod(options),
+    triggerZone: options.triggerZone,
+    triggerPrice: options.triggerPrice,
+    ippanMarginPaymentLimit: options.ippanMarginPaymentLimit,
+    secondaryPriceCondition: options.secondaryPriceCondition,
+    secondaryPrice: options.secondaryPrice,
+    sorLastMarket: sorLastMarketCode(session, options),
+    omitConfirmation: options.omitConfirmation,
+    methodName: 'orders.margin.open',
+  })
 }
 
-const orderConfirmTrin = (session: SbiSession, options: StockOrderTrinOptions) =>
-  orderPreviewTrin(session, options) +
-  fixedTrin([
-    { width: 16, value: options.quantity, align: 'right', pad: '0' },
-    { width: 11, value: options.price ?? '', align: 'right', pad: '0' },
-    { width: 20, value: mtsTradePassword(session.tradePassword) },
-    { width: 32, value: (options as PlaceCashOrderOptions).confirmationId ?? '' },
-    { width: 32, value: (options as MarginCloseOrderOptions).positionId ?? '' },
-  ])
-
-const marginOpenOrderTrin = (session: SbiSession, options: MarginOpenOrderOptions) =>
-  orderConfirmTrin(session, options)
-
-const marginSummaryOrderTrin = (session: SbiSession, options: MarginCloseOrderOptions) =>
-  orderConfirmTrin(session, options)
-
-const actualDeliveryOrderTrin = (session: SbiSession, options: ActualDeliveryOrderOptions) =>
-  orderConfirmTrin(session, { ...options, side: actualDeliverySide(options) })
-
-const ifdOrderTrin = (session: SbiSession, options: IfdOrderOptions) =>
-  orderConfirmTrin(session, options)
-
-const orderCorrectionTrin = (session: SbiSession, options: OrderCorrectionOptions) =>
-  fixedTrin([
+const marginCloseOrderTrin = (
+  session: SbiSession,
+  options: MarginCloseOrderOptions & OmitConfirmationOption,
+) => {
+  const depositType = orderDepositType(session, options, 'orders.margin.close')
+  assertMarginOrderDepositType(depositType, 'orders.margin.close')
+  const priceCondition = cashOrderPriceCondition(options)
+  const secondaryRequiresPrice = secondaryPriceConditionRequiresPrice(options)
+  return fixedTrin([
+    { width: 32, value: mtsTradePassword(session.tradePassword) },
     { width: 3, value: session.profile.butenCode ?? session.profile.branchCode },
     { width: 7, value: session.profile.accountNumber },
-    { width: 20, value: options.orderId },
-    { width: 16, value: options.quantity ?? '', align: 'right', pad: '0' },
-    { width: 11, value: options.price ?? '', align: 'right', pad: '0' },
-    { width: 20, value: mtsTradePassword(session.tradePassword) },
+    { width: 5, value: options.issueCode },
+    { width: 3, value: orderMarketCode(options) },
+    { width: 8, value: options.quantity },
+    { width: 1, value: cashOrderPriceConditionCode(priceCondition) },
+    {
+      width: 10,
+      value: cashOrderPriceConditionRequiresPrice(priceCondition) ? options.price : '',
+    },
+    { width: 1, value: orderDepositTypeCode(depositType) },
+    { width: 1, value: marginCloseTradeTypeCode(options.marginCloseTradeType) },
+    { width: 8, value: cashOrderTermCode(options) },
+    ...stockOrderMarginPositionFields(options.marginPositions, 4),
+    { width: 3, value: cashOrderMethodCode(cashOrderMethod(options)) },
+    { width: 1, value: triggerZoneCode(options.triggerZone) },
+    { width: 10, value: options.triggerPrice ?? '' },
+    { width: 1, value: options.omitConfirmation ? '1' : '2' },
+    { width: 1, value: secondaryPriceConditionCode(options) },
+    {
+      width: 10,
+      value: secondaryRequiresPrice ? options.secondaryPrice : '',
+      align: 'right',
+      pad: secondaryRequiresPrice ? '0' : ' ',
+    },
+    { width: 3, value: sorLastMarketCode(session, options) },
   ])
+}
+
+const marginCloseSummaryOrderTrin = (
+  session: SbiSession,
+  options: MarginCloseSummaryOrderOptions & OmitConfirmationOption,
+) => {
+  const depositType = orderDepositType(session, options, 'orders.margin.placeSummary')
+  assertMarginOrderDepositType(depositType, 'orders.margin.placeSummary')
+  const priceCondition = cashOrderPriceCondition(options)
+  const secondaryRequiresPrice = secondaryPriceConditionRequiresPrice(options)
+  return fixedTrin([
+    { width: 32, value: mtsTradePassword(session.tradePassword) },
+    { width: 3, value: session.profile.butenCode ?? session.profile.branchCode },
+    { width: 7, value: session.profile.accountNumber },
+    { width: 1, value: sideCode(options.side) },
+    { width: 5, value: options.issueCode },
+    { width: 3, value: orderMarketCode(options) },
+    { width: 8, value: options.quantity },
+    { width: 1, value: cashOrderPriceConditionCode(priceCondition) },
+    {
+      width: 10,
+      value: cashOrderPriceConditionRequiresPrice(priceCondition) ? options.price : '',
+    },
+    { width: 1, value: orderDepositTypeCode(depositType) },
+    { width: 1, value: marginCloseTradeTypeCode(options.marginCloseTradeType) },
+    { width: 8, value: cashOrderTermCode(options) },
+    { width: 3, value: cashOrderMethodCode(cashOrderMethod(options)) },
+    { width: 1, value: triggerZoneCode(options.triggerZone) },
+    { width: 10, value: options.triggerPrice ?? '' },
+    { width: 2, value: marginClosePositionOrderCode(options.marginClosePositionOrder) },
+    { width: 1, value: options.omitConfirmation ? '1' : '2' },
+    { width: 1, value: secondaryPriceConditionCode(options) },
+    {
+      width: 10,
+      value: secondaryRequiresPrice ? options.secondaryPrice : '',
+      align: 'right',
+      pad: secondaryRequiresPrice ? '0' : ' ',
+    },
+    { width: 3, value: sorLastMarketCode(session, options) },
+  ])
+}
+
+const actualDeliveryOrderTrin = (
+  session: SbiSession,
+  options: ActualDeliveryOrderOptions & OmitConfirmationOption,
+) => {
+  const depositType = orderDepositType(session, options, 'orders.margin.actualDelivery')
+  assertActualDeliveryDepositType(depositType, 'orders.margin.actualDelivery')
+  return appStockOrderTrin(session, {
+    issueCode: options.issueCode,
+    market: orderMarketCode(options),
+    quantity: options.quantity,
+    priceCondition: 'market',
+    depositType,
+    marginTradeTypeCode: '0',
+    orderTermCode: '',
+    orderMethod: 'normal',
+    marginPositions: options.marginPositions,
+    ippanMarginPaymentLimit: options.ippanMarginPaymentLimit,
+    omitConfirmation: options.omitConfirmation,
+    methodName: 'orders.margin.actualDelivery',
+  })
+}
+
+const MARGIN_OPEN_TRADE_TYPE_CODES = {
+  standard: '6',
+  generalBuy: '9',
+  generalSellShort: 'A',
+  generalSellInventoryLimited: 'B',
+  generalSellInventoryUnlimited: 'C',
+  day: 'D',
+  hyper: 'E',
+} as const satisfies Record<MarginOpenTradeType, string>
+
+const marginOpenTradeTypeCode = (value: MarginOpenTradeType | undefined) => {
+  const code = value ? MARGIN_OPEN_TRADE_TYPE_CODES[value] : undefined
+  if (!code) throw new Error(`orders.margin.open unsupported marginTradeType: ${String(value)}`)
+  return code
+}
+
+const MARGIN_CLOSE_TRADE_TYPE_CODES = {
+  sixMonth: '6',
+  noLimit: '9',
+  oneDay: 'A',
+  fifteenDay: 'D',
+} as const satisfies Record<MarginCloseTradeType, string>
+
+const marginCloseTradeTypeCode = (value: MarginCloseTradeType) => {
+  const code = MARGIN_CLOSE_TRADE_TYPE_CODES[value]
+  if (!code)
+    throw new Error(`orders.margin.close unsupported marginCloseTradeType: ${String(value)}`)
+  return code
+}
+
+const MARGIN_CLOSE_POSITION_ORDER_CODES = {
+  profitFirst: '61',
+  lossFirst: '51',
+  newestFirst: '26',
+  oldestFirst: '16',
+  specify: '0',
+} as const satisfies Record<MarginClosePositionOrder, string>
+
+const marginClosePositionOrderCode = (value: MarginClosePositionOrder | undefined) => {
+  const code = value ? MARGIN_CLOSE_POSITION_ORDER_CODES[value] : undefined
+  if (!code) {
+    throw new Error(
+      `orders.margin.placeSummary unsupported marginClosePositionOrder: ${String(value)}`,
+    )
+  }
+  return code
+}
+
+const ifdOrderTrin = (session: SbiSession, options: IfdOrderOptions & OmitConfirmationOption) => {
+  if (!session.tradePassword) {
+    throw new Error('orders.ifd requires tradePassword in loginWithPasskey options')
+  }
+  const depositType = orderDepositType(session, options, 'orders.ifd')
+  const priceCondition = cashOrderPriceCondition(options)
+  const ifdPriceCondition = ifdOrderPriceCondition(options)
+  return fixedTrin([
+    { width: 32, value: mtsTradePassword(session.tradePassword) },
+    { width: 3, value: session.profile.butenCode ?? session.profile.branchCode },
+    { width: 7, value: session.profile.accountNumber },
+    { width: 5, value: options.issueCode },
+    { width: 3, value: options.market },
+    { width: 8, value: options.quantity },
+    { width: 1, value: cashOrderPriceConditionCode(priceCondition) },
+    {
+      width: 10,
+      value: cashOrderPriceConditionRequiresPrice(priceCondition) ? options.price : '',
+    },
+    { width: 1, value: orderDepositTypeCode(depositType) },
+    { width: 1, value: ifdPrimaryMarginTradeTypeCode(options) },
+    { width: 8, value: cashOrderTermCode(options) },
+    { width: 3, value: cashOrderMethodCode(cashOrderMethod(options)) },
+    { width: 1, value: triggerZoneCode(options.triggerZone) },
+    { width: 10, value: options.triggerPrice ?? '' },
+    { width: 1, value: options.omitConfirmation ? '1' : '2' },
+    { width: 1, value: '' },
+    { width: 2, value: options.ippanMarginPaymentLimit ?? '' },
+    { width: 1, value: secondaryPriceConditionCode(options) },
+    {
+      width: 10,
+      value: secondaryPriceConditionRequiresPrice(options) ? options.secondaryPrice : '',
+      align: 'right',
+      pad: secondaryPriceConditionRequiresPrice(options) ? '0' : ' ',
+    },
+    { width: 4, value: 'IF' },
+    { width: 1, value: cashOrderPriceConditionCode(ifdPriceCondition) },
+    {
+      width: 10,
+      value: cashOrderPriceConditionRequiresPrice(ifdPriceCondition) ? options.ifdPrice : '',
+      align: 'right',
+      pad: '0',
+    },
+    { width: 8, value: ifdOrderTermCode(options) },
+    { width: 3, value: cashOrderMethodCode(ifdOrderMethod(options)) },
+    { width: 1, value: triggerZoneCode(options.ifdTriggerZone) },
+    {
+      width: 10,
+      value: options.ifdTriggerPrice ?? '',
+      align: 'right',
+      pad: options.ifdTriggerPrice != null ? '0' : ' ',
+    },
+    { width: 1, value: ifdSecondaryPriceConditionCode(options) },
+    {
+      width: 10,
+      value: ifdSecondaryPriceConditionRequiresPrice(options) ? options.ifdSecondaryPrice : '',
+      align: 'right',
+      pad: options.ifdSecondaryPriceCondition ? '0' : ' ',
+    },
+  ])
+}
+
+const ifdPrimaryMarginTradeTypeCode = (options: IfdOrderOptions) =>
+  options.tradeType === 'marginOpen' ? marginOpenTradeTypeCode(options.marginTradeType) : '0'
+
+const orderCorrectionSubmitTrin = (session: SbiSession, options: OrderCorrectionOptions) => {
+  if (!session.tradePassword) {
+    throw new Error('orders correction submit requires tradePassword in loginWithPasskey options')
+  }
+  const required = {
+    orderNumber: options.orderNumber,
+    orderId: options.orderId,
+    issueCode: options.issueCode,
+    market: options.market,
+    tradeId: options.tradeId,
+    quantity: options.quantity,
+  }
+  const missing = Object.entries(required)
+    .filter(([, value]) => value == null || value === '')
+    .map(([key]) => key)
+  if (missing.length) {
+    throw new Error(`orders correction submit requires ${missing.join(', ')}`)
+  }
+  const priceCondition = orderCorrectionPriceCondition(options)
+  if (cashOrderPriceConditionRequiresPrice(priceCondition) && options.price == null) {
+    throw new Error(`orders correction priceCondition: "${priceCondition}" requires price`)
+  }
+  if (!cashOrderPriceConditionRequiresPrice(priceCondition) && options.price != null) {
+    throw new Error(`orders correction priceCondition: "${priceCondition}" cannot specify price`)
+  }
+  const secondaryRequiresPrice =
+    options.secondaryPriceCondition != null &&
+    cashOrderPriceConditionRequiresPrice(options.secondaryPriceCondition)
+  if (secondaryRequiresPrice && options.secondaryPrice == null) {
+    throw new Error('orders correction secondaryPriceCondition requires secondaryPrice')
+  }
+  if (
+    options.secondaryPriceCondition != null &&
+    !secondaryRequiresPrice &&
+    options.secondaryPrice != null
+  ) {
+    throw new Error('orders correction secondaryPriceCondition cannot specify secondaryPrice')
+  }
+  return fixedTrin([
+    { width: 32, value: mtsTradePassword(session.tradePassword) },
+    { width: 3, value: session.profile.butenCode ?? session.profile.branchCode },
+    { width: 7, value: session.profile.accountNumber },
+    { width: 1, value: 'P' },
+    { width: 6, value: options.orderNumber },
+    { width: 7, value: options.orderId },
+    { width: 5, value: options.issueCode },
+    { width: 3, value: options.market },
+    { width: 1, value: options.tradeId },
+    { width: 8, value: options.quantity },
+    { width: 1, value: cashOrderPriceConditionCode(priceCondition) },
+    { width: 10, value: cashOrderPriceConditionRequiresPrice(priceCondition) ? options.price : '' },
+    { width: 12, value: options.depositTypeText ?? '' },
+    { width: 1, value: options.status ?? '' },
+    { width: 3, value: cashOrderMethodCode(options.orderMethod ?? 'normal') },
+    { width: 1, value: triggerZoneCode(options.triggerZone) },
+    { width: 10, value: options.triggerPrice ?? '' },
+    { width: 1, value: options.rbeOrderStatus ?? '' },
+    { width: 1, value: options.correctionControlFlag ?? '2' },
+    { width: 1, value: orderCorrectionSecondaryPriceConditionCode(options) },
+    {
+      width: 10,
+      value: secondaryRequiresPrice ? options.secondaryPrice : '',
+      align: 'right',
+      pad: secondaryRequiresPrice ? '0' : ' ',
+    },
+  ])
+}
+
+const orderIfdCorrectionSubmitTrin = (session: SbiSession, options: OrderCorrectionOptions) => {
+  const primary = orderCorrectionSubmitTrin(session, options)
+  const ifdPriceCondition = orderCorrectionIfdPriceCondition(options)
+  if (cashOrderPriceConditionRequiresPrice(ifdPriceCondition) && options.ifdPrice == null) {
+    throw new Error(
+      `orders ifd correction ifdPriceCondition: "${ifdPriceCondition}" requires ifdPrice`,
+    )
+  }
+  if (!cashOrderPriceConditionRequiresPrice(ifdPriceCondition) && options.ifdPrice != null) {
+    throw new Error(
+      `orders ifd correction ifdPriceCondition: "${ifdPriceCondition}" cannot specify ifdPrice`,
+    )
+  }
+  const ifdSecondaryRequiresPrice =
+    options.ifdSecondaryPriceCondition != null &&
+    cashOrderPriceConditionRequiresPrice(options.ifdSecondaryPriceCondition)
+  if (ifdSecondaryRequiresPrice && options.ifdSecondaryPrice == null) {
+    throw new Error('orders ifd correction ifdSecondaryPriceCondition requires ifdSecondaryPrice')
+  }
+  if (
+    options.ifdSecondaryPriceCondition != null &&
+    !ifdSecondaryRequiresPrice &&
+    options.ifdSecondaryPrice != null
+  ) {
+    throw new Error(
+      'orders ifd correction ifdSecondaryPriceCondition cannot specify ifdSecondaryPrice',
+    )
+  }
+  return (
+    primary +
+    fixedTrin([
+      { width: 4, value: 'IF' },
+      { width: 1, value: cashOrderPriceConditionCode(ifdPriceCondition) },
+      {
+        width: 10,
+        value: cashOrderPriceConditionRequiresPrice(ifdPriceCondition) ? options.ifdPrice : '',
+        align: 'right',
+        pad: '0',
+      },
+      { width: 3, value: cashOrderMethodCode(options.ifdOrderMethod ?? 'normal') },
+      { width: 1, value: triggerZoneCode(options.ifdTriggerZone) },
+      {
+        width: 10,
+        value: options.ifdTriggerPrice ?? '',
+        align: 'right',
+        pad: options.ifdTriggerPrice != null ? '0' : ' ',
+      },
+      {
+        width: 1,
+        value: options.ifdSecondaryPriceCondition
+          ? cashOrderPriceConditionCode(options.ifdSecondaryPriceCondition)
+          : '',
+      },
+      {
+        width: 10,
+        value: ifdSecondaryRequiresPrice ? options.ifdSecondaryPrice : '',
+        align: 'right',
+        pad: ifdSecondaryRequiresPrice ? '0' : ' ',
+      },
+    ])
+  )
+}
+
+const orderCorrectionPreOrderTrin = (session: SbiSession, options: OrderCorrectionOptions) => {
+  if (!options.orderNumber) {
+    throw new Error('orders correction pre-order requires orderNumber')
+  }
+  return fixedTrin([
+    { width: 3, value: session.profile.butenCode ?? session.profile.branchCode },
+    { width: 7, value: session.profile.accountNumber },
+    { width: 6, value: options.orderNumber },
+    { width: 1, value: options.tradeId ?? '' },
+    { width: 1, value: session.profile.marginAccount ?? '' },
+    { width: 1, value: options.correctionType ?? '' },
+  ])
+}
+
+const orderCorrectionPriceCondition = (
+  options: OrderCorrectionOptions,
+): CashOrderPriceCondition => {
+  if (options.priceCondition) return options.priceCondition
+  if (options.price != null) return 'limit'
+  return 'market'
+}
+
+const orderCorrectionSecondaryPriceConditionCode = (options: OrderCorrectionOptions) =>
+  options.secondaryPriceCondition
+    ? cashOrderPriceConditionCode(options.secondaryPriceCondition)
+    : ''
+
+const orderCorrectionIfdPriceCondition = (
+  options: OrderCorrectionOptions,
+): CashOrderPriceCondition => {
+  if (options.ifdPriceCondition) return options.ifdPriceCondition
+  if (options.ifdPrice != null) return 'limit'
+  return 'market'
+}
 
 const orderCancelPreOrderTrin = (session: SbiSession, options: OrderCancelOptions) =>
   fixedTrin([
@@ -2487,9 +4071,9 @@ const orderCancelSubmitTrin = (session: SbiSession, options: PlaceOrderCancelOpt
     { width: 32, value: mtsTradePassword(options.tradePassword ?? session.tradePassword) },
     { width: 3, value: session.profile.butenCode ?? session.profile.branchCode },
     { width: 7, value: session.profile.accountNumber },
-    { width: 1, value: 'P' },
+    { width: 1, value: '' },
     { width: 6, value: options.orderNumber },
-    { width: 7, value: options.orderId ?? '' },
+    { width: 7, value: '' },
     { width: 5, value: '' },
     { width: 3, value: '' },
     { width: 1, value: options.tradeId ?? '' },
@@ -2502,22 +4086,56 @@ const orderCancelSubmitTrin = (session: SbiSession, options: PlaceOrderCancelOpt
     { width: 1, value: '' },
     { width: 10, value: '' },
     { width: 1, value: '' },
-    { width: 1, value: '2' },
+    { width: 1, value: '' },
+    { width: 1, value: '' },
     { width: 1, value: '' },
     { width: 10, value: '', align: 'right', pad: ' ' },
   ])
 
-const themeOrderTrin = (session: SbiSession, options: ThemeInvestmentOrderOptions) =>
+const themePreOrderTrin = (session: SbiSession, options: ThemeInvestmentPreOrderOptions) =>
   fixedTrin([
-    { width: 20, value: options.themeId },
-    { width: 1, value: sideCode(options.side) },
-    { width: 16, value: options.amount ?? '', align: 'right', pad: '0' },
-    { width: 20, value: mtsTradePassword(session.tradePassword) },
+    { width: 3, value: session.profile.butenCode ?? session.profile.branchCode },
+    { width: 7, value: session.profile.accountNumber },
+    { width: 1, value: session.profile.marginAccount ?? '' },
+    { width: 4, value: options.components.length },
+    ...options.components.flatMap((component) => [
+      { width: 5, value: component.issueCode },
+      { width: 3, value: options.exchangeCode },
+    ]),
   ])
 
-const cashPreOrderTrCode = (options: CashOrderOptions) =>
+const themeOrderTrin = (session: SbiSession, options: ThemeInvestmentOrderOptions) => {
+  const depositType = orderDepositType(session, options, 'orders.themeInvestment')
+  return fixedTrin([
+    { width: 32, value: mtsTradePassword(session.tradePassword) },
+    { width: 3, value: session.profile.butenCode ?? session.profile.branchCode },
+    { width: 7, value: session.profile.accountNumber },
+    { width: 10, value: options.themeId },
+    { width: 6, value: options.themeSetYyyymm },
+    { width: 2, value: options.themeCourse },
+    { width: 1, value: orderDepositTypeCode(depositType) },
+    { width: 1, value: '0' },
+    { width: 8, value: null },
+    { width: 2, value: String(options.components.length).padStart(2, '0') },
+    ...options.components.flatMap((component) => [
+      { width: 5, value: component.issueCode },
+      { width: 1, value: 'N' },
+      { width: 10, value: '' },
+      { width: 8, value: component.quantity },
+    ]),
+  ])
+}
+
+const cashPreOrderTrCode = (options: CashOrderOptions | CashOrderPreOrderOptions) =>
   options.side === 'sell' ? 'F2102' : 'F2101'
 
+const stockPreOrderTrCode = (tradeType: StockPreOrderTradeType, side: TradeSide) => {
+  if (tradeType === 'cash') return side === 'sell' ? 'F2102' : 'F2101'
+  if (tradeType === 'marginOpen') return side === 'sell' ? 'F2113' : 'F2103'
+  if (tradeType === 'marginClose') return side === 'sell' ? 'F2211' : 'F2201'
+  return tradeType === 'genwatashi' ? 'F2214' : 'F2204'
+}
+
 const cashConfirmTrCode = (options: CashOrderOptions) => {
   if (options.kind === 'ifd') return 'F2151'
   return options.side === 'sell' ? 'F2124' : 'F2104'
@@ -2552,7 +4170,7 @@ const actualDeliveryConfirmTrCode = (options: ActualDeliveryOrderOptions) =>
 const actualDeliveryReceptionTrCode = (options: ActualDeliveryOrderOptions) =>
   options.kind === 'genwatashi' ? 'F2236' : 'F2206'
 
-const actualDeliverySide = (options: ActualDeliveryOrderOptions): TradeSide =>
+const actualDeliverySide = (options: Pick<ActualDeliveryOrderOptions, 'kind'>): TradeSide =>
   options.kind === 'genwatashi' ? 'sell' : 'buy'
 
 const ifdConfirmTrCode = (options: IfdOrderOptions) => {
@@ -2775,6 +4393,11 @@ const emptyToUndefined = (value: string | undefined) => {
   return trimmed ? trimmed : undefined
 }
 
+const emptyControlFieldToUndefined = (value: string | undefined) => {
+  const trimmed = value?.replaceAll('\0', '').trim()
+  return trimmed ? trimmed : undefined
+}
+
 const sleep = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms))
 
 const extractIssueName = (value: string) => {
@@ -2817,10 +4440,11 @@ const joinDateTime = (date: string, time: string) => {
 }
 
 const mapAccountType = (value: string | undefined) => {
-  if (value === '1') return 'specific'
-  if (value === '2') return 'nisa'
-  if (value === '3') return 'juniorNisa'
-  if (value === '0') return 'general'
+  if (value === '0') return 'specific'
+  if (value === '1' || value === '-') return 'general'
+  if (value === 'H') return 'growthInvestment'
+  if (value === '4') return 'nisa'
+  if (['5', '6', '7', 'J'].includes(value ?? '')) return 'juniorNisa'
   return 'unknown'
 }
 
@@ -2837,6 +4461,7 @@ const depositTypeCode = (value: BoardOptions['accountType']) => {
 const orderDepositTypeCode = (value: AccountType | undefined) => {
   if (value === 'specific') return '0'
   if (value === 'general') return '1'
+  if (value === 'growthInvestment') return 'H'
   if (value === 'nisa') return '4'
   if (value === 'juniorNisa') return '5'
   return ''
diff --git a/packages/sbi-client/src/methods/types.ts b/packages/sbi-client/src/methods/types.ts
index 1e63939..840634c 100644
--- a/packages/sbi-client/src/methods/types.ts
+++ b/packages/sbi-client/src/methods/types.ts
@@ -19,6 +19,7 @@ import type {
   OrderKind,
   OrderList,
   OrderPreview,
+  StockOrderPreOrder,
   OrderReceipt,
   OrderStatus,
   PositionId,
@@ -156,6 +157,19 @@ export type CashOrderTriggerZone = 'above' | 'below'
 
 export type CashOrderMethod = 'normal' | 'stop' | 'oco'
 
+export type StockOrderMarginPosition = {
+  /** Open trade date from the margin position record, in yyyyMMdd or yyyy-MM-dd format. */
+  openTradeDate: string
+  /** Open price from the margin position record. Raw strings are accepted to preserve APK values. */
+  openPrice: number | string
+  /** Quantity selected from the margin position record. */
+  quantity: number | string
+  /** Original new-trade date from the margin position record, in yyyyMMdd or yyyy-MM-dd format. */
+  orgNewTradeDate: string
+  /** Bargain market code from the margin position record. */
+  bargainMarketCode: MarketCode
+}
+
 export type StandardCashOrderOptions = StockOrderBaseOptions & {
   /** Order price for limit and other price-based orders. */
   price?: number
@@ -177,18 +191,68 @@ export type StandardCashOrderOptions = StockOrderBaseOptions & {
   secondaryPriceCondition?: CashOrderPriceCondition
   /** Secondary order price used by OCO price-based conditions. */
   secondaryPrice?: number
+  /** APK ippan margin payment-limit code returned by stock board/pre-order information. */
+  ippanMarginPaymentLimit?: string
 }
 
 export type SKabuOrderOptions = StockOrderBaseOptions & {
   /** Places the cash order as an S-kabu order. S-kabu cannot specify a price. */
   kind: 's'
+  /** APK pre-order market for the underlying issue. The live S-kabu order still sends `market: "STK"`. */
+  preOrderMarket?: MarketCode
   /** S-kabu cannot specify a price. */
   price?: never
 }
 
 export type CashOrderOptions = StandardCashOrderOptions | SKabuOrderOptions
 
-export type MarginOpenOrderOptions = StandardCashOrderOptions
+export type CashOrderPreOrderOptions = Pick<
+  StockOrderBaseOptions,
+  'issueCode' | 'market' | 'side' | 'accountType' | 'depositType'
+> & {
+  /** Requests the APK S-kabu pre-order route constraints for this issue. */
+  kind?: 's'
+  /** APK pre-order market for S-kabu checks. The live S-kabu order still sends `market: "STK"`. */
+  preOrderMarket?: MarketCode
+}
+
+export type MarginOpenTradeType =
+  | 'standard'
+  | 'generalBuy'
+  | 'generalSellShort'
+  | 'generalSellInventoryLimited'
+  | 'generalSellInventoryUnlimited'
+  | 'day'
+  | 'hyper'
+
+export type MarginOpenOrderPreOrderOptions = Pick<
+  StockOrderBaseOptions,
+  'issueCode' | 'market' | 'side' | 'accountType' | 'depositType'
+>
+
+export type MarginOpenOrderOptions = StandardCashOrderOptions & {
+  /** APK margin-open trade type. Required because the mobile payload has no safe default. */
+  marginTradeType: MarginOpenTradeType
+  /** APK ippan margin payment-limit code, when returned by board/pre-order information. */
+  ippanMarginPaymentLimit?: string
+}
+
+export type MarginCloseTradeType = 'sixMonth' | 'noLimit' | 'oneDay' | 'fifteenDay'
+
+export type MarginCloseOrderPreOrderOptions = Pick<
+  StockOrderBaseOptions,
+  'issueCode' | 'market' | 'side' | 'accountType' | 'depositType'
+> & {
+  /** APK margin-close trade type used by the mobile pre-order request. */
+  marginCloseTradeType?: MarginCloseTradeType
+}
+
+export type MarginClosePositionOrder =
+  | 'profitFirst'
+  | 'lossFirst'
+  | 'newestFirst'
+  | 'oldestFirst'
+  | 'specify'
 
 export type ActualDeliveryKind = 'genbiki' | 'genwatashi'
 
@@ -209,11 +273,22 @@ export type ActualDeliveryOrderOptions = {
   kind: ActualDeliveryKind
   /** Position ID to deliver. */
   positionId?: PositionId
+  /** Margin position records selected for genbiki/genwatashi delivery. */
+  marginPositions?: StockOrderMarginPosition[]
+  /** APK ippan margin payment-limit code returned by stock board/pre-order information. */
+  ippanMarginPaymentLimit?: string
 }
 
+export type ActualDeliveryOrderPreOrderOptions = Pick<
+  ActualDeliveryOrderOptions,
+  'issueCode' | 'market' | 'accountType' | 'depositType' | 'kind'
+>
+
 export type PlaceCashOrderOptions = CashOrderOptions & {
   /** Confirmation ID returned by the confirmation step. */
   confirmationId?: string
+  /** APK confirmation-screen omission flag. Only valid for live submit calls. */
+  omitConfirmation?: boolean
   /** Explicitly allows sending a live order. */
   allowTrading?: true
 }
@@ -221,6 +296,8 @@ export type PlaceCashOrderOptions = CashOrderOptions & {
 export type PlaceMarginOpenOrderOptions = MarginOpenOrderOptions & {
   /** Confirmation ID returned by the confirmation step. */
   confirmationId?: string
+  /** APK confirmation-screen omission flag. Only valid for live submit calls. */
+  omitConfirmation?: boolean
   /** Explicitly allows sending a live margin open order. */
   allowTrading?: true
 }
@@ -228,13 +305,59 @@ export type PlaceMarginOpenOrderOptions = MarginOpenOrderOptions & {
 export type PlaceActualDeliveryOrderOptions = ActualDeliveryOrderOptions & {
   /** Confirmation ID returned by the confirmation step. */
   confirmationId?: string
+  /** APK confirmation-screen omission flag. Only valid for live submit calls. */
+  omitConfirmation?: boolean
   /** Explicitly allows sending a live actual-delivery order. */
   allowTrading?: true
 }
 
 export type OrderCorrectionOptions = {
+  /** Order number shown in order inquiry. Required by the mobile pre-correction route. */
+  orderNumber?: string
   /** Order ID to correct. */
   orderId: OrderId
+  /** Issue code from the pre-correction response. */
+  issueCode?: IssueCode
+  /** Market code from the pre-correction response. */
+  market?: MarketCode
+  /** Original trade ID code. */
+  tradeId?: string
+  /** Additional correction flag used by the mobile MTS route. */
+  correctionType?: string
+  /** Original order status code from the pre-correction response. */
+  status?: string
+  /** Original RBE order status code from the pre-correction response. */
+  rbeOrderStatus?: string
+  /** Display deposit type text from the original order. */
+  depositTypeText?: string
+  /** Primary order method for correction. */
+  orderMethod?: CashOrderMethod
+  /** Corrected primary execution condition. */
+  priceCondition?: CashOrderPriceCondition
+  /** Stop trigger direction for correction. */
+  triggerZone?: CashOrderTriggerZone
+  /** Stop trigger price for correction. */
+  triggerPrice?: number
+  /** Secondary/OCO execution condition for correction. */
+  secondaryPriceCondition?: CashOrderPriceCondition
+  /** Secondary/OCO price for correction. */
+  secondaryPrice?: number
+  /** IFD follow-up execution condition for IF/IFDOCO correction. */
+  ifdPriceCondition?: CashOrderPriceCondition
+  /** IFD follow-up price for IF/IFDOCO correction. */
+  ifdPrice?: number
+  /** IFD follow-up special order method for correction. */
+  ifdOrderMethod?: CashOrderMethod
+  /** IFD follow-up stop trigger direction for correction. */
+  ifdTriggerZone?: CashOrderTriggerZone
+  /** IFD follow-up stop trigger price for correction. */
+  ifdTriggerPrice?: number
+  /** IFD follow-up secondary/OCO execution condition for correction. */
+  ifdSecondaryPriceCondition?: CashOrderPriceCondition
+  /** IFD follow-up secondary/OCO price for correction. */
+  ifdSecondaryPrice?: number
+  /** Mobile correction control flag. Defaults to normal mobile value when omitted. */
+  correctionControlFlag?: '1' | '2'
   /** Corrected order quantity. */
   quantity?: number
   /** Corrected order price. */
@@ -267,9 +390,17 @@ export type PlaceOrderCancelOptions = OrderCancelOptions & {
 export type MarginCloseOrderOptions = StandardCashOrderOptions & {
   /** Position ID to close. */
   positionId?: PositionId
+  /** APK margin-close trade type. Required because the mobile payload has no safe default. */
+  marginCloseTradeType: MarginCloseTradeType
+  /** Margin position records selected for specified close orders. */
+  marginPositions?: StockOrderMarginPosition[]
+  /** APK close-position ordering used by summary close orders. */
+  marginClosePositionOrder?: MarginClosePositionOrder
 }
 
 export type PlaceMarginCloseOrderOptions = MarginCloseOrderOptions & {
+  /** APK confirmation-screen omission flag. Only valid for live submit calls. */
+  omitConfirmation?: boolean
   /** Explicitly allows sending a live margin close order. */
   allowTrading?: true
 }
@@ -277,6 +408,8 @@ export type PlaceMarginCloseOrderOptions = MarginCloseOrderOptions & {
 export type MarginCloseSummaryOrderOptions = MarginCloseOrderOptions
 
 export type PlaceMarginCloseSummaryOrderOptions = MarginCloseSummaryOrderOptions & {
+  /** APK confirmation-screen omission flag. Only valid for live submit calls. */
+  omitConfirmation?: boolean
   /** Explicitly allows sending a live margin close summary order. */
   allowTrading?: true
 }
@@ -284,11 +417,35 @@ export type PlaceMarginCloseSummaryOrderOptions = MarginCloseSummaryOrderOptions
 export type IfdOrderOptions = StandardCashOrderOptions & {
   /** Product to use for the first IFD leg. Defaults to cash. */
   tradeType?: 'cash' | 'marginOpen'
+  /** APK margin-open trade type for the first leg when `tradeType` is `marginOpen`. */
+  marginTradeType?: MarginOpenTradeType
+  /** APK ippan margin payment-limit code for the first leg. */
+  ippanMarginPaymentLimit?: string
+  /** Execution condition for the IFD follow-up leg. */
+  ifdPriceCondition?: CashOrderPriceCondition
+  /** Order price for the IFD follow-up leg. */
+  ifdPrice?: number
+  /** Validity for the IFD follow-up leg. */
+  ifdOrderTerm?: CashOrderTerm
+  /** Explicit validity date for the IFD follow-up leg. */
+  ifdOrderDate?: string
+  /** Special order method for the IFD follow-up leg. */
+  ifdOrderMethod?: CashOrderMethod
+  /** Stop trigger direction for the IFD follow-up leg. */
+  ifdTriggerZone?: CashOrderTriggerZone
+  /** Stop trigger price for the IFD follow-up leg. */
+  ifdTriggerPrice?: number
+  /** Secondary OCO execution condition for IFDOCO. */
+  ifdSecondaryPriceCondition?: CashOrderPriceCondition
+  /** Secondary OCO price for IFDOCO. */
+  ifdSecondaryPrice?: number
 }
 
 export type PlaceIfdOrderOptions = IfdOrderOptions & {
   /** Confirmation ID returned by the confirmation step. */
   confirmationId?: string
+  /** APK confirmation-screen omission flag. Only valid for live submit calls. */
+  omitConfirmation?: boolean
   /** Explicitly allows sending a live IFD order. */
   allowTrading?: true
 }
@@ -296,12 +453,47 @@ export type PlaceIfdOrderOptions = IfdOrderOptions & {
 export type ThemeInvestmentOrderOptions = {
   /** Theme ID for the theme investment order. */
   themeId: ThemeId
+  /** Theme set year/month (`theme_set_yyyymm`) from the mobile APK handoff. */
+  themeSetYyyymm: string
+  /** Theme course (`theme_course`) from the mobile APK handoff. */
+  themeCourse: number | string
   /** Buy or sell side for the order. */
   side: TradeSide
+  /** Account/deposit type used for the theme investment order. */
+  accountType?: AccountType
+  /** Deposit type used for the theme investment order. */
+  depositType?: DepositType
+  /** Component stock orders selected by the mobile theme investment flow. */
+  components: ThemeInvestmentOrderComponent[]
   /** Order amount for the theme investment order. */
   amount?: number
 }
 
+export type ThemeInvestmentOrderComponent = {
+  /** Component stock issue code. */
+  issueCode: IssueCode
+  /** Component order quantity. */
+  quantity: number | string
+}
+
+export type ThemeInvestmentPreOrderComponent = {
+  /** Component stock issue code selected by the mobile theme investment flow. */
+  issueCode: IssueCode
+  /** Component order quantity from the mobile handoff, when already selected. */
+  quantity?: number | string
+}
+
+export type ThemeInvestmentPreOrderOptions = {
+  /** Theme ID for the theme investment order target. */
+  themeId: ThemeId
+  /** Theme name from the mobile theme investment flow, when available. */
+  themeName?: string
+  /** Exchange code used for all component stocks in the mobile pre-order call. */
+  exchangeCode: MarketCode
+  /** Component stocks selected by the mobile theme investment flow. */
+  components: ThemeInvestmentPreOrderComponent[]
+}
+
 export type PlaceThemeInvestmentOrderOptions = ThemeInvestmentOrderOptions & {
   /** Explicitly allows sending a live theme investment order. */
   allowTrading?: true
@@ -425,6 +617,8 @@ export interface SbiClientMethodOrderInquiry {
 }
 
 export interface SbiClientMethodCashOrder {
+  /** Fetches APK cash pre-order information and selectable constraints. */
+  preOrder(options: CashOrderPreOrderOptions): Promise<StockOrderPreOrder>
   /** Estimates a cash order without submitting a live order. */
   estimate(options: CashOrderOptions): Promise<OrderPreview>
   /** Places a live cash order. Requires `allowTrading: true`. */
@@ -442,10 +636,14 @@ export interface SbiClientMethodCashOrder {
 }
 
 export interface SbiClientMethodMarginOrder {
+  /** Fetches APK margin-open pre-order information and selectable constraints. */
+  preOrderOpen(options: MarginOpenOrderPreOrderOptions): Promise<StockOrderPreOrder>
   /** Estimates a margin-open order without submitting a live order. */
   estimateOpen(options: MarginOpenOrderOptions): Promise<OrderPreview>
   /** Places a live margin-open order. Requires `allowTrading: true`. */
   open(options: PlaceMarginOpenOrderOptions): Promise<OrderReceipt>
+  /** Fetches APK margin-close pre-order information and selectable constraints. */
+  preOrderClose(options: MarginCloseOrderPreOrderOptions): Promise<StockOrderPreOrder>
   /** Estimates a margin close order without submitting a live order. */
   estimateClose(options: MarginCloseOrderOptions): Promise<OrderPreview>
   /** Places a live margin close order. Requires `allowTrading: true`. */
@@ -458,6 +656,8 @@ export interface SbiClientMethodMarginOrder {
   estimateSummary(options: MarginCloseSummaryOrderOptions): Promise<OrderPreview>
   /** Places a mobile margin close summary order. Requires `allowTrading: true`. */
   placeSummary(options: PlaceMarginCloseSummaryOrderOptions): Promise<OrderReceipt>
+  /** Fetches APK genbiki/genwatashi pre-order information and selectable constraints. */
+  preOrderActualDelivery(options: ActualDeliveryOrderPreOrderOptions): Promise<StockOrderPreOrder>
   /** Estimates a genbiki/genwatashi actual-delivery order without submitting a live order. */
   estimateActualDelivery(options: ActualDeliveryOrderOptions): Promise<OrderPreview>
   /** Places a genbiki/genwatashi actual-delivery order. Requires `allowTrading: true`. */
@@ -474,14 +674,14 @@ export interface SbiClientMethodIfdOrder {
   /** Places a live IFD order correction. Requires `allowTrading: true`. */
   placeCorrection(options: PlaceOrderCorrectionOptions): Promise<OrderReceipt>
   /** Estimates an IFD order cancellation without submitting a live cancellation. */
-  estimateCancel(options: OrderCorrectionOptions): Promise<OrderPreview>
+  estimateCancel(options: OrderCancelOptions): Promise<OrderPreview>
   /** Places a live IFD order cancellation. Requires `allowTrading: true`. */
-  placeCancel(options: PlaceOrderCorrectionOptions): Promise<OrderReceipt>
+  placeCancel(options: PlaceOrderCancelOptions): Promise<OrderReceipt>
 }
 
 export interface SbiClientMethodThemeInvestmentOrder {
-  /** Fetches theme investment holdings or order targets. */
-  list(): Promise<ThemeInvestmentList>
+  /** Fetches APK theme investment pre-order targets for selected component stocks. */
+  list(options: ThemeInvestmentPreOrderOptions): Promise<ThemeInvestmentList>
   /** Estimates a theme investment order without submitting a live order. */
   estimate(options: ThemeInvestmentOrderOptions): Promise<OrderPreview>
   /** Places a live theme investment order. Requires `allowTrading: true`. */
diff --git a/packages/sbi-client/src/types.ts b/packages/sbi-client/src/types.ts
index 4295a7f..7ddedb7 100644
--- a/packages/sbi-client/src/types.ts
+++ b/packages/sbi-client/src/types.ts
@@ -150,8 +150,20 @@ export type SignedTextValue = {
   sign?: 'positive' | 'negative' | 'zero'
 }
 
-export type AccountType = 'general' | 'specific' | 'nisa' | 'juniorNisa' | 'unknown'
-export type DepositType = 'general' | 'specific' | 'nisa' | 'juniorNisa' | 'unknown'
+export type AccountType =
+  | 'general'
+  | 'specific'
+  | 'growthInvestment'
+  | 'nisa'
+  | 'juniorNisa'
+  | 'unknown'
+export type DepositType =
+  | 'general'
+  | 'specific'
+  | 'growthInvestment'
+  | 'nisa'
+  | 'juniorNisa'
+  | 'unknown'
 export type TradeSide = 'buy' | 'sell'
 export type MarginTradeSide = 'buy' | 'sell'
 export type OrderStatus = 'open' | 'executed' | 'cancelled' | 'expired' | 'rejected' | 'unknown'
@@ -561,6 +573,75 @@ export type OrderList = {
   error?: SbiMethodError
 }
 
+export type OrderCorrectionPreOrderDetail = {
+  exchangeName?: string
+  marketLoanKbn?: string
+  marketIppanLoanKbn?: string
+  currentPrice?: CurrencyAmount
+  tradeColorFlag?: string
+  priceTick?: string
+  priceTickText?: string
+  tradeTime?: string
+  changeText?: string
+  volumeText?: string
+}
+
+export type OrderCorrectionPreOrder = {
+  issue: IssueRef
+  tradeTitle?: string
+  buyingPowerTotal?: CurrencyAmount
+  controlledStockCode?: string
+  hasTradeWarning?: boolean
+  deficitMessageFlag?: string
+  deficitMessage?: string
+  details: OrderCorrectionPreOrderDetail[]
+  orderNumber?: string
+  orderId?: string
+  primaryOrderMethod?: string
+  primaryTriggerZone?: string
+  primaryTriggerPrice?: number | null
+  status?: string
+  statusText?: string
+  tradeId?: string
+  tradeName?: string
+  quantity?: number | null
+  quantityText?: string
+  orderLimit?: string
+  orderLimitText?: string
+  priceSteps: StockOrderPreOrderPriceStep[]
+  sessionRange?: string
+  inputDateText?: string
+  primaryOrderTerm?: string
+  nonSpecificTradeText?: string
+  marketName?: string
+  rbeOrderStatus?: string
+  priceCondition?: string
+  price?: number | null
+  priceAmount?: CurrencyAmount
+  exchangeName?: string
+  transId?: string
+  ptsDayNightFlag?: string
+  smallTickFlag?: string
+  juniorBuyingPowerTotal?: CurrencyAmount
+  secondaryPriceCondition?: string
+  secondaryPrice?: number | null
+  secondaryPriceAmount?: CurrencyAmount
+  autoOrderKind?: string
+  autoOrderNumber?: string
+  autoOrderInputDate?: string
+  secondaryOrderMethod?: string
+  secondaryTriggerZone?: string
+  secondaryTriggerPrice?: number | null
+  secondaryOrderCondition?: string
+  secondaryLimitPrice?: number | null
+  secondaryLimitPriceAmount?: CurrencyAmount
+  secondaryOrderTerm?: string
+  secondaryOcoPriceCondition?: string
+  secondaryOcoPrice?: number | null
+  secondaryOcoPriceAmount?: CurrencyAmount
+  exchangeList?: string
+}
+
 export type OrderPreview = {
   issue: IssueRef
   side: TradeSide
@@ -572,6 +653,89 @@ export type OrderPreview = {
   warnings: string[]
   confirmationId?: string
   message?: string
+  correction?: OrderCorrectionPreOrder
+  error?: SbiMethodError
+}
+
+export type StockOrderPreOrderPriceStep = {
+  from?: CurrencyAmount
+  to?: CurrencyAmount
+}
+
+export type StockOrderPreOrderPaymentLimit = {
+  text?: string
+  code?: string
+}
+
+export type StockOrderPreOrderMarginTradeType =
+  | 'standard'
+  | 'generalBuy'
+  | 'generalSellShort'
+  | 'generalSellInventoryLimited'
+  | 'generalSellInventoryUnlimited'
+  | 'day'
+  | 'hyper'
+
+export type StockOrderPreOrder = {
+  issue: IssueRef
+  tradeTitle?: string
+  buyingPowerTotal?: CurrencyAmount
+  controlledStockCode?: string
+  hasTradeWarning?: boolean
+  market?: MarketCode
+  exchangeList?: string
+  exchangeListName?: string
+  exchangeListIndexFlag?: string
+  marketLoanKbn?: string
+  marketIppanLoanKbn?: string
+  currentPrice?: CurrencyAmount
+  tradeColorFlag?: string
+  priceTick?: string
+  priceTickText?: string
+  tradeTime?: string
+  changeText?: string
+  volume?: number | null
+  lotSize?: number | null
+  priceSteps: StockOrderPreOrderPriceStep[]
+  sessionRange?: string
+  basePrice?: CurrencyAmount
+  orderTerms: string[]
+  orderTermDates: string[]
+  paymentLimits: StockOrderPreOrderPaymentLimit[]
+  nonSpecificTradeText?: string
+  paymentLimitText?: string
+  acquisitionPrice?: CurrencyAmount
+  position?: number | null
+  unexecutedQuantity?: number | null
+  lotSize2?: number | null
+  ptsDayNightFlag?: string
+  sorServiceType?: string
+  nisa?: {
+    serviceKbn?: string
+    buyLimit?: CurrencyAmount
+    growthServiceKbn?: string
+    juniorServiceKbn?: string
+    juniorBuyLimit?: CurrencyAmount
+    juniorBuyingPowerTotal?: CurrencyAmount
+  }
+  smallTickFlag?: string
+  margin?: {
+    tradeTypes?: StockOrderPreOrderMarginTradeType[]
+    ippanShort?: string
+    ippanLong?: string
+    dayBuy?: string
+    daySell?: string
+    premiumShortSelling?: string
+    premiumFee?: CurrencyAmount
+    ippanPaymentLimit?: string
+    positionStatus?: string
+  }
+  sKabu?: {
+    code?: string
+    available?: boolean
+  }
+  deficitMessageFlag?: string
+  deficitMessage?: string
   error?: SbiMethodError
 }
 
@@ -586,12 +750,34 @@ export type OrderReceipt = {
 export type ThemeInvestment = {
   id: ThemeId
   name: string
-  issues: IssueRef[]
+  issues: ThemeInvestmentIssue[]
   minimumAmount?: CurrencyAmount
 }
 
+export type ThemeInvestmentIssue = IssueRef & {
+  controlledStockCode?: string
+  hasTradeWarning?: boolean
+  nisaServiceKbn?: string
+  juniorNisaServiceKbn?: string
+  growthNisaServiceKbn?: string
+  sKabuCode?: string
+  sKabuAvailable?: boolean
+  lotSize?: number | null
+  currentPrice?: CurrencyAmount
+  tradeColorFlag?: string
+  priceTick?: string
+  priceTickText?: string
+  tradeTime?: string
+}
+
 export type ThemeInvestmentList = {
   themes: ThemeInvestment[]
+  buyingPowerTotal?: CurrencyAmount
+  isaBuyLimit?: CurrencyAmount
+  juniorNisaBuyLimit?: CurrencyAmount
+  buyingPowerTotalJuniorNisa?: CurrencyAmount
+  deficitMessage?: string
+  deficitMessageFlag?: string
   error?: SbiMethodError
 }
 
diff --git a/vite.config.ts b/vite.config.ts
index a92327c..c2f1603 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -40,6 +40,13 @@ export default defineConfig({
       verify: {
         command: ['vp check', 'vp run typecheck:all', 'vp run app:build'],
       },
+      'docker:build':
+        'docker build --no-cache -f apps/csbie/Dockerfile -t git.yutakobayashi.com/nakasyou/csbi:latest .',
+      'docker:run':
+        'docker run --rm -p 8787:8787 --env-file .env -v "$PWD/data:/app/data" git.yutakobayashi.com/nakasyou/csbi:latest',
+      'docker:tag':
+        'docker tag git.yutakobayashi.com/nakasyou/csbi:latest git.yutakobayashi.com/nakasyou/csbi:latest',
+      'docker:push': 'docker push git.yutakobayashi.com/nakasyou/csbi:latest',
     },
   },
 })