@chongqingliangyunzhijing/ssquant-cli 0.1.0 → 0.2.1

package/README.md

@@ -5,7 +5,10 @@
 
 ## 发给 AI
 
+开户完成后，账户列表显示柜台分配的实际交易账号，可直接用于 `account use` 和 `account delete`。开户中的请求可按操作号查询进度，已有内部编号仍可用于选择账户。
+
 > 请完整读取 https://www.pandaaiquant.com/ssquant/openapi/v1/agent-install-guide/cli ，按指引帮我安装 SSQUANT 期货仿真交易 CLI，使用我的 PandaAI 账号登录。请完成安装和环境检查，需要浏览器登录、验证码或授权时提醒我。登录后列出账户和剩余名额。如果我需要开户，问我初始资金（万元，1 至 10000），换算成人民币元，等我确认再创建。最后告诉我账户和就绪状态。本次仅做接入和开户。
 
 运行 `ssquant --help` 查看交易命令。查询、开户、交易计划和操作状态支持 `--json`。
+交易模式默认逐笔确认，适用于同一 PandaAI 用户下的全部 SSQUANT 仿真账户。用 `ssquant trade-mode show` 查询，`ssquant trade-mode set direct` 开启直接交易，`ssquant trade-mode set confirm` 恢复逐笔确认。AI 应按用户的明确指令更改设置。直接交易执行计划时省略 `--yes`。
 删除使用 `ssquant account delete <账户号>`。确认后释放本地名额，柜台已有委托仍可能成交。

package/bin/ssquant.js

@@ -6,6 +6,7 @@ import * as acct from '../src/commands/account.js';
 import * as trade from '../src/commands/trade.js';
 import * as mandate from '../src/commands/mandate.js';
 import * as plans from '../src/commands/plan.js';
+import * as tradeMode from '../src/commands/trade-mode.js';
 import { CLIENT_VERSION } from '../src/version.js';
 import * as sim from '../src/commands/sim.js';
 
@@ -39,6 +40,9 @@ program.command('login')
 program.command('logout').description('登出并清除本地凭证').action(run(async () => sys.logout()));
 program.command('whoami').description('查看登录状态与绑定账户').action(run(sys.whoami));
 program.command('doctor').description('连通性与状态自检').action(run(sys.doctor));
+const mode = program.command('trade-mode').description('当前 PandaAI 用户的 SSQUANT 交易确认设置');
+mode.command('show').description('查看交易模式').action(run(tradeMode.show));
+mode.command('set <mode>').description('confirm 逐笔确认，direct 直接交易').action(run(tradeMode.set));
 const plan = program.command('plan').description('冻结交易计划');
 plan.command('create')
   .requiredOption('--operation <name>', 'place_order/cancel_order/cancel_all/close_all/rollover/target_position')
@@ -48,7 +52,7 @@ plan.command('create')
 plan.command('show').argument('<planId>').description('查看计划').action(run(plans.show));
 plan.command('execute').argument('<planId>').description('确认并执行计划')
   .option('--client-request-id <id>', '网络重试复用的幂等号')
-  .requiredOption('-y, --yes', '确认执行该冻结计划')
+  .option('-y, --yes', '用户已确认执行该冻结计划')
   .action(run(plans.execute));
 
 const operation = program.command('operation').description('交易操作状态');
@@ -132,6 +136,7 @@ program.command('order')
 program.command('cancel')
   .argument('<orderId>', '委托号')
   .description('撤单')
+  .option('-y, --yes', '用户已确认撤销该委托')
   .action(run(trade.cancel));
 
 program.command('cancel-all')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chongqingliangyunzhijing/ssquant-cli",
-  "version": "0.1.0",
+  "version": "0.2.1",
   "description": "SSQUANT 期货仿真交易命令行工具",
   "type": "module",
   "bin": {

package/src/auth.js

@@ -61,7 +61,7 @@ export async function loginBrowser({ scope = 'futures:read futures:trade', timeo
   const { verifier, challenge } = makePkce();
   const state = b64url(crypto.randomBytes(16));
 
-  const { server, port, waitForCode } = await startCallbackServer(timeout);
+  const { server, port, waitForCode, finish } = await startCallbackServer(timeout, state);
   const redirectUri = `http://127.0.0.1:${port}/callback`;
 
   const url = apiUrl('/oauth/authorize') + '?' + new URLSearchParams({
@@ -93,42 +93,49 @@ export async function loginBrowser({ scope = 'futures:read futures:trade', timeo
         client_id: clientId(),
       },
     });
-    return persist(data);
+    const saved = persist(data);
+    finish('success');
+    return saved;
+  } catch (error) {
+    finish('error');
+    throw error;
   } finally {
     server.close();
   }
 }
 
-function startCallbackServer(timeoutSec) {
+export function startCallbackServer(timeoutSec, expectedState) {
   return new Promise((resolve, reject) => {
     let settle;
     const waitForCode = new Promise((res, rej) => {
       settle = { res, rej };
     });
 
+    let browserResponse;
+    const finish = (result) => {
+      if (!browserResponse || browserResponse.writableEnded) return;
+      browserResponse.writeHead(303, {
+        Location: LOGIN_HOME_URL + '?result=' + result,
+        'Cache-Control': 'no-store',
+        'Referrer-Policy': 'no-referrer',
+      }).end();
+    };
     const server = http.createServer((req, res) => {
       const u = new URL(req.url, 'http://127.0.0.1');
-      if (!u.pathname.startsWith('/callback')) {
+      if (req.method !== 'GET' || u.pathname !== '/callback') {
         res.writeHead(404).end();
         return;
       }
-      const err = u.searchParams.get('error');
-      const html = (msg) =>
-        `<!doctype html><meta charset="utf-8"><body style="font-family:system-ui;padding:40px">
-         <h2>${msg}</h2><p>可以关闭本页面，回到命令行继续。</p></body>`;
-      if (err) {
-        res.writeHead(200, { 'Content-Type': 'text/html; charset=utf-8' })
-          .end(html('✗ 授权被拒绝'));
+      if (u.searchParams.get('state') !== expectedState || browserResponse ||
+          (!u.searchParams.get('code') && !u.searchParams.get('error'))) {
+        res.writeHead(400, { 'Cache-Control': 'no-store' }).end();
+        return;
+      }
+      browserResponse = res;
+      if (u.searchParams.get('error')) {
         settle.rej(new ApiError('access_denied', '你在浏览器中拒绝了授权'));
         return;
       }
-      // 回调只负责交付一次性 code；交付后离开 localhost 页面，避免把 code
-      // 留在地址栏或让用户看到一个简陋的本地确认页。
-      res.writeHead(303, {
-        Location: LOGIN_HOME_URL,
-        'Cache-Control': 'no-store',
-        'Referrer-Policy': 'no-referrer',
-      }).end();
       settle.res({
         code: u.searchParams.get('code'),
         state: u.searchParams.get('state'),
@@ -144,7 +151,7 @@ function startCallbackServer(timeoutSec) {
 
     // 端口交给系统分配：固定端口会在多开时冲突
     server.listen(0, '127.0.0.1', () => {
-      resolve({ server, port: server.address().port, waitForCode });
+      resolve({ server, port: server.address().port, waitForCode, finish });
     });
     server.on('error', reject);
   });
@@ -158,6 +165,7 @@ export function persist(d) {
     expiresAt: Date.now() + (d.expires_in || 2592000) * 1000,
     scope: d.scope,
     accountId: d.account_id,
+    tradingAccount: d.trading_account ?? null,
     market: d.market,
     clientId: clientId(),
     savedAt: new Date().toISOString(),

package/src/commands/plan.js

@@ -22,7 +22,9 @@ export async function create(opts) {
     leg.contractCode || leg.orderId || '-', `${leg.side || ''}/${leg.offset || ''}`,
     leg.volume ?? leg.quantity ?? '-',
   ]));
-  say('  这是预演计划，尚未真实执行。取得用户明确确认后使用 plan execute。');
+  if (data.status === 'prepared') say(data.tradeMode === 'direct'
+    ? '当前为直接交易模式，可用 plan execute 执行本计划。'
+    : '请展示本计划，用户明确确认后用 plan execute --yes 执行。');
 }
 
 export async function show(planId) {
@@ -33,12 +35,8 @@ export async function show(planId) {
 }
 
 export async function execute(planId, opts) {
-  if (!opts.yes) {
-    const err = new Error('执行冻结计划必须显式传 --yes，表示用户已经确认该 planId');
-    err.code = 'confirmation_required'; throw err;
-  }
   const { data } = await request(`/futures/plans/${encodeURIComponent(planId)}/execute`, {
-    method: 'POST', body: { confirmed: true, clientRequestId: opts.clientRequestId },
+    method: 'POST', body: { confirmed: !!opts.yes, clientRequestId: opts.clientRequestId },
   });
   emit(data);
   kv([['操作号', data.operationId], ['计划号', data.planId], ['状态', data.status],

package/src/commands/sim.js

@@ -34,7 +34,7 @@ export async function create(opts) {
 export async function use(id) {
   const { data } = await request('/sim/accounts/' + encodeURIComponent(id) + '/select', { method:'POST' });
   persist(data);
-  show({ accountId:id });
+  show({ accountId: data.trading_account ?? null, ...(!data.trading_account && { accountRef: data.account_id }) });
 }
 export async function remove(id, opts) {
   if (!opts.yes && !/^y(es)?$/i.test(await ask(`确认删除 ${id} 并释放名额？柜台已有委托仍可能成交。[y/N] `))) return;

package/src/commands/system.js

@@ -5,7 +5,7 @@ import { emit, say } from '../output.js';
 
 export async function login() {
   const info = await loginBrowser();
-  emit({ authenticated: true, accountId: info.accountId || null });
+  emit({ authenticated: true, accountId: info.tradingAccount || null });
   say('已登录 PandaAI。运行 ssquant account list 查看账户和名额。');
 }
 export function logout() {

package/src/commands/trade-mode.js

@@ -0,0 +1,31 @@
+import { request } from '../http.js';
+import { emit, isJson, say } from '../output.js';
+
+const path = '/settings/trade-mode';
+
+function display(data) {
+  emit(data);
+  say(data.mode === 'direct' ? '当前为直接交易模式。' : '当前为逐笔确认模式。');
+}
+
+export async function show() {
+  display((await request(path)).data);
+}
+
+export async function set(mode) {
+  if (!['confirm', 'direct'].includes(mode)) throw Error('模式必须为 confirm 或 direct');
+  display((await request(path, { method: 'PUT', body: { mode } })).data);
+}
+
+// 跳过提示不等同于用户确认，直接模式执行仍向服务端发送 confirmed=false。
+export async function needsPrompt(opts, mode) {
+  if (opts.yes) return false;
+  const current = mode ?? (await request(path)).data.mode;
+  if (current === 'direct') return false;
+  if (!process.stdin.isTTY || isJson()) {
+    const error = new Error('当前为逐笔确认模式，请在用户确认本次交易后使用 --yes');
+    error.code = 'confirmation_required';
+    throw error;
+  }
+  return true;
+}

package/src/commands/trade.js

@@ -3,12 +3,13 @@
  *
  * ★ 开仓允许传中文品种名/品种码，服务端会解析为当前主力实际合约；平仓仍必须传持仓实际合约。
  *   ① 传 --price 自动按 GFD 限价单；不传价格自动按 IOC 市价单
- *   ② 真实下单前若未加 --yes，交互确认（Agent 场景用 --yes 跳过）
+ *   ② 按用户当前的交易模式确认后执行或直接执行
  */
 import readline from 'node:readline/promises';
 import { request } from '../http.js';
 import { emit, kv, num, say, table } from '../output.js';
 import { showQuote, showContractSpec } from './account.js';
+import { needsPrompt } from './trade-mode.js';
 
 export async function order(opts) {
   const code = opts.symbol;
@@ -30,13 +31,12 @@ export async function order(opts) {
     orderType,
     volume: Number(opts.volume),
     dryRun: !!opts.dryRun,
+    confirmed: !!opts.yes,
   };
   if (opts.price !== undefined && opts.price !== null) body.price = Number(opts.price);
   if (opts.clientOrderId) body.clientOrderId = opts.clientOrderId;
 
-  if (!opts.dryRun && !opts.yes && !process.stdin.isTTY) throw Error('非交互下单需要 --dry-run 预演或 --yes 明确确认');
-  // 预演永远直接执行；真实下单在交互模式下要确认
-  if (!opts.dryRun && !opts.yes && process.stdin.isTTY) {
+  if (!opts.dryRun && await needsPrompt(opts)) {
     const { data: preview } = await request('/futures/orders', {
       method: 'POST', body: { ...body, dryRun: true },
     });
@@ -61,6 +61,7 @@ export async function order(opts) {
       say('已取消，未下单。');
       return;
     }
+    body.confirmed = true;
   }
 
   const { data } = await request('/futures/orders', { method: 'POST', body });
@@ -101,8 +102,16 @@ export function showOrderPreview(data) {
   if (data.suggestion) say(`  建议：${data.suggestion}`);
 }
 
-export async function cancel(orderId) {
-  const { data } = await request(`/futures/orders/${encodeURIComponent(orderId)}`,
+export async function cancel(orderId, opts) {
+  let confirmed = !!opts.yes;
+  if (await needsPrompt(opts)) {
+    const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+    const answer = await rl.question(`确认撤销委托 ${orderId}？(yes/N) `);
+    rl.close();
+    if (!/^y(es)?$/i.test(answer.trim())) { say('已取消。'); return; }
+    confirmed = true;
+  }
+  const { data } = await request(`/futures/orders/${encodeURIComponent(orderId)}?confirmed=${confirmed}`,
     { method: 'DELETE' });
   emit(data);
   kv([['委托号', data.orderId || orderId], ['状态', data.statusText || data.status || '-']]);
@@ -124,14 +133,16 @@ export async function cancelAll(opts) {
     return;
   }
   if (!rows.length) { emit(plan); say('当前没有活动挂单。'); return; }
-  if (!opts.yes && process.stdin.isTTY) {
+  let confirmed = !!opts.yes;
+  if (await needsPrompt(opts)) {
     const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
     const ans = await rl.question(`即将撤销 ${rows.length} 笔挂单，确认？(yes/N) `);
     rl.close();
     if (!/^y(es)?$/i.test(ans.trim())) { say('已取消。'); return; }
+    confirmed = true;
   }
   const { data } = await request('/futures/orders/cancel-all', {
-    method: 'POST', body: { ...body, dryRun: false },
+    method: 'POST', body: { ...body, dryRun: false, confirmed },
   });
   emit(data);
   table(['委托号', '结果'], (data.results || []).map((r) => [
@@ -166,11 +177,8 @@ export async function closeAll(opts) {
     say('  没有可平的持仓。');
     return;
   }
-  if (!opts.yes && !process.stdin.isTTY) {
-    say('  非交互环境执行移仓必须显式传入 --yes。');
-    return;
-  }
-  if (!opts.yes) {
+  body.confirmed = !!opts.yes;
+  if (await needsPrompt(opts)) {
     const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
     say('即将由服务端提交以下平仓腿：');
     table(['合约', '方向', '手数'], plan.legs.map((p) => [
@@ -181,6 +189,7 @@ export async function closeAll(opts) {
       say('已取消。');
       return;
     }
+    body.confirmed = true;
   }
   const { data } = await request('/futures/positions/close-all', {
     method: 'POST', body,
@@ -196,29 +205,27 @@ async function frozenBatch(operation, parameters, opts) {
   const { data: plan } = await request('/futures/plans', {
     method: 'POST', body: { operation, parameters },
   });
-  emit(plan);
   say(plan.summary || '');
   table(['合约', '方向', '手数'], (plan.legs || []).map(leg =>
     [leg.contractCode, `${leg.side}/${leg.offset}`, leg.volume]));
-  if (plan.status !== 'prepared' || !plan.requiresConfirmation) {
+  if (plan.status !== 'prepared') {
+    emit(plan);
     if (plan.preview?.message) say(plan.preview.message);
     if (plan.preview?.candidates?.length) table(['旧合约', '方向', '可平手数'],
       plan.preview.candidates.map(item => [item.contractCode, item.direction, item.closable]));
     say('预演未通过或需要补充参数，未发送真实订单。');
     return;
   }
-  if (!opts.yes) {
-    if (!process.stdin.isTTY) {
-      const err = new Error('非交互执行需要用户明确确认后传 --yes');
-      err.code = 'confirmation_required'; throw err;
-    }
+  let confirmed = !!opts.yes;
+  if (await needsPrompt(opts, plan.tradeMode)) {
     const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
     const answer = await rl.question(`确认执行以上冻结计划 ${plan.planId}？(yes/N) `);
     rl.close();
     if (!/^y(es)?$/i.test(answer.trim())) { say('已取消。'); return; }
+    confirmed = true;
   }
   const { data: operationResult } = await request(`/futures/plans/${encodeURIComponent(plan.planId)}/execute`, {
-    method: 'POST', body: { confirmed: true, clientRequestId: opts.clientRequestId },
+    method: 'POST', body: { confirmed, clientRequestId: opts.clientRequestId },
   });
   const data = { status: operationResult.status, ...operationResult.result,
     planId: plan.planId, operationId: operationResult.operationId };

package/src/http.js

@@ -89,10 +89,23 @@ async function rawFetch(url, {
   return { res, json };
 }
 
+// API 保留稳定的内部关联键，CLI 的账户号始终用柜台分配的交易账号。
+function forDisplay(value, selectedAccount) {
+  if (Array.isArray(value)) return value.map(item => forDisplay(item, selectedAccount));
+  if (!value || typeof value !== 'object') return value;
+  const result = Object.fromEntries(Object.entries(value).map(([key, item]) => [key, forDisplay(item, selectedAccount)]));
+  if (typeof result.accountId === 'string' && result.accountId.startsWith('sq_')) {
+    const number = result.tradingAccount ?? selectedAccount ?? null;
+    if (!number) result.accountRef = result.accountId;
+    result.accountId = number;
+  }
+  return result;
+}
+
 /** 服务端信封 → 结果或抛错 */
 function unwrap({ res, json }) {
   if (res.ok && json && json.code === '0') {
-    return { data: json.data, meta: json.meta, requestId: json.request_id };
+    return { data: forDisplay(json.data, res.headers.get('X-SSQUANT-Trading-Account')), meta: json.meta, requestId: json.request_id };
   }
   const code = (json && json.code) || `http_${res.status}`;
   const message = (json && json.message) || `HTTP ${res.status}`;