lark-remote 0.1.13 → 0.2.1

package/dist/common/fs.js

@@ -1,4 +1,6 @@
 import fs from 'node:fs';
+import { getLogger } from '../logger/index.js';
+import { currentPlatform, isWin32 } from '../platform/select.js';
 /**
  * Unlink a file, silently ignoring ENOENT and other errors.
  *
@@ -8,10 +10,62 @@ import fs from 'node:fs';
  */
 export function silentlyUnlink(path) {
     try {
-        fs.unlinkSync(path);
+        withBusyRetry(() => fs.unlinkSync(path));
     }
-    catch {
-        /* ignore — file may not exist */
+    catch (err) {
+        // 占用放弃（win32 重试耗尽 / posix 首次占用即失败）：按设计「告警，
+        // 不静默吞」，但清理路径不向调用方抛错（保持本函数契约）
+        getLogger().warn(`[fs] silentlyUnlink gave up on busy file ${path}: ${String(err)}`);
+    }
+}
+/**
+ * win32 句柄占用重试：rename/unlink 目标被
+ * 其他句柄持有时报 EPERM/EBUSY（共享冲突），短暂退避后重试通常即可成功。
+ * 仅 win32 启用重试：posix 上这两个错误码不是「占用瞬态」语义（如 NFS 权限
+ * 问题），立即失败——避免忙等阻塞单线程 bridge 的事件循环。
+ */
+const BUSY_CODES = new Set(['EPERM', 'EBUSY']);
+/**
+ * 退避参数（取参照项目上线验证值）：
+ * 最多 5 次，第 n 次失败后睡 BASE_RETRY_DELAY_MS × n——总阻塞上界 ~250ms。
+ * Windows 上杀毒/索引器持锁更久，窗口比短退避更稳。
+ */
+const BASE_RETRY_DELAY_MS = 25;
+const MAX_RETRY_ATTEMPTS = 5;
+export function isBusyError(err) {
+    return BUSY_CODES.has(err?.code ?? '');
+}
+function busySleep(ms) {
+    if (ms <= 0)
+        return;
+    const end = Date.now() + ms;
+    // 同步退避只能忙等（调用方均为 sync API）；总上界 ~250ms
+    while (Date.now() < end) {
+        /* spin */
+    }
+}
+/**
+ * 对 sync 文件操作套占用退避重试：win32 上遇 EPERM/EBUSY 按退避序列重试，
+ * 其他错误或重试耗尽后抛最后一个错误；posix 上占用错误不重试、立即失败。
+ * `onGiveUp` 仅在「占用导致的放弃」时回调（告警/保留现场）；非占用错误
+ * （如 EXDEV）不走回调、直接透传，避免误触发调用方的占用善后逻辑。
+ */
+export function withBusyRetry(op, opts) {
+    const win32 = isWin32(opts?.platform ?? currentPlatform);
+    for (let attempt = 1;; attempt++) {
+        try {
+            return op();
+        }
+        catch (err) {
+            if (!isBusyError(err))
+                throw err;
+            if (!win32 || attempt >= MAX_RETRY_ATTEMPTS) {
+                // 真正放弃才回调：中间重试失败不能触发「保留现场」类善后
+                opts?.onGiveUp?.(err);
+                throw err;
+            }
+            busySleep(BASE_RETRY_DELAY_MS * attempt);
+        }
     }
 }
 //# sourceMappingURL=fs.js.map

package/dist/config/codex-config.js

@@ -176,6 +176,7 @@ export function getCodexCatalogModels(codexHome) {
             maxBuffer: 4 * 1024 * 1024,
             env: process.env,
             stdio: ['ignore', 'pipe', 'ignore'],
+            windowsHide: true, // codex 是 npm .cmd 垫片：不隐藏会闪 cmd.exe 控制台
         });
         const models = parseCodexModelsOutput(stdout);
         catalogCache = { key, models, ts: now, failed: models.length === 0 };
@@ -284,6 +285,7 @@ function execFileAsync(file, args) {
             timeout: 8_000,
             maxBuffer: 4 * 1024 * 1024,
             env: process.env,
+            windowsHide: true,
         }, (err, stdout) => {
             if (err)
                 reject(err);

package/dist/config/index.d.ts

@@ -241,11 +241,6 @@ export declare const AppConfigSchema: z.ZodObject<{
     idle: z.ZodDefault<z.ZodObject<{
         watchdogMinutes: z.ZodDefault<z.ZodNumber>;
     }, z.core.$strip>>;
-    output: z.ZodDefault<z.ZodObject<{
-        showThinking: z.ZodDefault<z.ZodBoolean>;
-        showToolUse: z.ZodDefault<z.ZodBoolean>;
-        showToolResult: z.ZodDefault<z.ZodBoolean>;
-    }, z.core.$strip>>;
     logging: z.ZodDefault<z.ZodObject<{
         level: z.ZodDefault<z.ZodEnum<{
             debug: "debug";

package/dist/config/index.js

@@ -202,11 +202,6 @@ const IdleConfigSchema = z.object({
      */
     watchdogMinutes: z.number().int().min(0).default(DEFAULTS.IDLE_WATCHDOG_MINUTES),
 });
-const OutputConfigSchema = z.object({
-    showThinking: z.boolean().default(true),
-    showToolUse: z.boolean().default(true),
-    showToolResult: z.boolean().default(true),
-});
 const LoggingConfigSchema = z.object({
     level: z.enum(['debug', 'info', 'warn', 'error']).default('info'),
 });
@@ -256,7 +251,6 @@ export const AppConfigSchema = z.object({
     /** Agent-specific saved choices for quick switching. */
     agentChoices: AgentChoicesSchema.optional(),
     idle: IdleConfigSchema.default(IdleConfigSchema.parse({})),
-    output: OutputConfigSchema.default(OutputConfigSchema.parse({})),
     logging: LoggingConfigSchema.default(LoggingConfigSchema.parse({})),
     /** 入站媒体（图片/文件）落盘配置。 */
     inboundMedia: InboundMediaConfigSchema.default(InboundMediaConfigSchema.parse({})),
@@ -280,11 +274,6 @@ claude:
 idle:
   watchdogMinutes: ${DEFAULTS.IDLE_WATCHDOG_MINUTES}
 
-output:
-  showThinking: true
-  showToolUse: true
-  showToolResult: true
-
 logging:
   level: info
 

package/dist/config/kimi-config.js

@@ -34,6 +34,7 @@ export function loadKimiConfig() {
             stdio: ['ignore', 'pipe', 'ignore'],
             timeout: 10000,
             maxBuffer: 2 * 1024 * 1024,
+            windowsHide: true, // kimi 是 npm .cmd 垫片：不隐藏会闪 cmd.exe 控制台
         });
         const data = JSON.parse(output.toString());
         if (!data.models || Object.keys(data.models).length === 0) {

package/dist/config/opencode-config.js

@@ -3,7 +3,8 @@
  *
  * 从 opencode models --verbose 命令获取 provider 和 model 信息
  */
-import { execSync } from 'node:child_process';
+import { resolveExecutable } from '../platform/command.js';
+import { spawnProcessSync } from '../platform/spawn.js';
 import { getLogger } from '../logger/index.js';
 /**
  * 内置的 fallback 列表
@@ -66,13 +67,23 @@ export function loadOpencodeConfig() {
         return buildFallbackResult();
     }
     try {
+        // 经 seam 解析真实可执行文件（win32 PATHEXT），cross-spawn 同步执行
+        const resolved = resolveExecutable('opencode');
+        if (!resolved)
+            throw new Error('opencode not found');
         // 执行 opencode models --verbose 获取所有模型信息
-        const output = execSync('opencode models --verbose', {
+        const res = spawnProcessSync(resolved.file, ['models', '--verbose'], {
             encoding: 'utf-8',
             // P1-8：30s → 10s，与 codex/kimi 对齐；maxBuffer 防模型清单 ENOBUFS 隐性截断
             timeout: 10000,
             maxBuffer: 64 * 1024 * 1024,
         });
+        if (res.error)
+            throw res.error;
+        if (res.status !== 0) {
+            throw new Error(`opencode models exited code=${res.status}: ${String(res.stderr).slice(-200)}`);
+        }
+        const output = String(res.stdout);
         // 按 provider 分组收集模型（只存 model ID，不存 provider/model 完整格式）
         const providerModels = new Map();
         // 解析输出：每个模型以 provider/model 格式开头，后面跟着 JSON 块

package/dist/config/qr.d.ts

@@ -0,0 +1,36 @@
+export type TerminalQrMode = 'full-block' | 'half-block';
+export interface TerminalQr {
+    mode: TerminalQrMode;
+    /** Columns the rendered symbol occupies — compare against the terminal width. */
+    columns: number;
+    /** Symbol rows, one text row per line, no trailing newline. */
+    text: string;
+}
+/**
+ * Render a scannable symbol for the current terminal.
+ *
+ * Prefers the Windows-safe full-block rendering; when it is too wide for the
+ * terminal, POSIX terminals fall back to the compact half-block rendering
+ * (macOS/Linux terminals draw its glyphs correctly). Windows deliberately does
+ * not: half blocks are exactly what does not scan there, so the caller falls
+ * back to the image file instead. Returns `null` when nothing fits.
+ */
+export declare function renderTerminalQr(text: string, options?: {
+    columns?: number;
+    platform?: NodeJS.Platform;
+}): TerminalQr | null;
+/**
+ * Render the symbol as a GIF.
+ *
+ * The escape hatch for terminals where block rendering still does not scan
+ * (narrow window, missing glyphs): a real image file always scans.
+ */
+export declare function renderQrImage(text: string, cellSize?: number): Buffer;
+/**
+ * Whether the wizard should also write the QR image file.
+ *
+ * Windows always gets the file: its consoles are exactly where block glyphs
+ * render unreliably, so the image is the dependable path there. Elsewhere the
+ * file is only written when the terminal could not show a symbol at all.
+ */
+export declare function needsQrImage(terminalQr: TerminalQr | null, platform?: NodeJS.Platform): boolean;

package/dist/config/qr.js

@@ -0,0 +1,124 @@
+import qrcode from 'qrcode-generator';
+import { currentPlatform, isWin32 } from '../platform/select.js';
+/**
+ * Terminal rendering for the first-run wizard's QR symbol.
+ *
+ * Everything is drawn from one module matrix. Two renderers exist because
+ * terminals disagree about block glyphs:
+ *
+ * - `full-block` draws each module as two `█` columns. It only relies on the
+ *   full block glyph, which every console font has, and stays square in a
+ *   typical 1:2 terminal cell. This is the Windows-safe rendering.
+ * - `half-block` packs two QR rows into one text row with `▀`/`▄`. It is half
+ *   as tall, but needs a font that draws those glyphs as exact half-height
+ *   blocks — Windows consoles (raster/CJK fonts, extra line spacing) often
+ *   don't, which is why the symbol printed there often cannot be scanned.
+ *
+ * Both renderers emit the 4-module light quiet zone the QR spec requires;
+ * `qrcode-terminal`'s half-block output had none, and a missing quiet zone
+ * alone can make scanners fail.
+ *
+ * Polarity follows `qrcode-terminal`: glyphs are painted in the foreground
+ * colour and stand for the *light* modules, so the terminal's dark background
+ * supplies the dark modules (the common default theme).
+ */
+/** Light modules that must surround a symbol for scanners to lock on (QR spec). */
+const QUIET_ZONE = 4;
+const LIGHT_FULL = '██';
+const DARK_FULL = '  ';
+const LIGHT_HALF_BOTH = '█';
+const LIGHT_HALF_TOP = '▀';
+const LIGHT_HALF_BOTTOM = '▄';
+const DARK_HALF_BOTH = ' ';
+/** Used when stdout reports no width — non-TTY pipes, and consoles that report 0. */
+const DEFAULT_COLUMNS = 80;
+function buildSymbol(text) {
+    const symbol = qrcode(0, 'L');
+    symbol.addData(text);
+    symbol.make();
+    return symbol;
+}
+function renderFullBlock(symbol) {
+    const count = symbol.getModuleCount();
+    const lightRow = LIGHT_FULL.repeat(count + QUIET_ZONE * 2);
+    const pad = LIGHT_FULL.repeat(QUIET_ZONE);
+    const rows = new Array(count + QUIET_ZONE * 2).fill(lightRow);
+    for (let row = 0; row < count; row++) {
+        let line = pad;
+        for (let col = 0; col < count; col++) {
+            line += symbol.isDark(row, col) ? DARK_FULL : LIGHT_FULL;
+        }
+        rows[QUIET_ZONE + row] = line + pad;
+    }
+    return rows.join('\n');
+}
+function renderHalfBlock(symbol) {
+    const count = symbol.getModuleCount();
+    // Module counts are always odd (4 * version + 17), so the final row pairs
+    // with an implicit light row.
+    const textRows = Math.ceil(count / 2);
+    const quietRows = QUIET_ZONE / 2;
+    const lightRow = LIGHT_HALF_BOTH.repeat(count + QUIET_ZONE * 2);
+    const rows = new Array(textRows + quietRows * 2).fill(lightRow);
+    for (let pair = 0; pair < count; pair += 2) {
+        let line = LIGHT_HALF_BOTH.repeat(QUIET_ZONE);
+        for (let col = 0; col < count; col++) {
+            const top = symbol.isDark(pair, col);
+            const bottom = pair + 1 < count && symbol.isDark(pair + 1, col);
+            if (!top && !bottom)
+                line += LIGHT_HALF_BOTH;
+            else if (!top)
+                line += LIGHT_HALF_TOP;
+            else if (!bottom)
+                line += LIGHT_HALF_BOTTOM;
+            else
+                line += DARK_HALF_BOTH;
+        }
+        rows[quietRows + pair / 2] = line + LIGHT_HALF_BOTH.repeat(QUIET_ZONE);
+    }
+    return rows.join('\n');
+}
+/**
+ * Render a scannable symbol for the current terminal.
+ *
+ * Prefers the Windows-safe full-block rendering; when it is too wide for the
+ * terminal, POSIX terminals fall back to the compact half-block rendering
+ * (macOS/Linux terminals draw its glyphs correctly). Windows deliberately does
+ * not: half blocks are exactly what does not scan there, so the caller falls
+ * back to the image file instead. Returns `null` when nothing fits.
+ */
+export function renderTerminalQr(text, options = {}) {
+    const columns = options.columns && options.columns > 0 ? options.columns : DEFAULT_COLUMNS;
+    const platform = options.platform ?? currentPlatform;
+    const symbol = buildSymbol(text);
+    const width = symbol.getModuleCount() + QUIET_ZONE * 2;
+    if (width * 2 <= columns) {
+        return { mode: 'full-block', columns: width * 2, text: renderFullBlock(symbol) };
+    }
+    if (!isWin32(platform) && width <= columns) {
+        return { mode: 'half-block', columns: width, text: renderHalfBlock(symbol) };
+    }
+    return null;
+}
+/**
+ * Render the symbol as a GIF.
+ *
+ * The escape hatch for terminals where block rendering still does not scan
+ * (narrow window, missing glyphs): a real image file always scans.
+ */
+export function renderQrImage(text, cellSize = 8) {
+    const symbol = buildSymbol(text);
+    const dataUrl = symbol.createDataURL(cellSize);
+    return Buffer.from(dataUrl.slice(dataUrl.indexOf(',') + 1), 'base64');
+}
+/**
+ * Whether the wizard should also write the QR image file.
+ *
+ * Windows always gets the file: its consoles are exactly where block glyphs
+ * render unreliably, so the image is the dependable path there. Elsewhere the
+ * file is only written when the terminal could not show a symbol at all.
+ */
+export function needsQrImage(terminalQr, platform = currentPlatform) {
+    return terminalQr === null || isWin32(platform);
+}
+//# sourceMappingURL=qr.js.map

package/dist/config/wizard.js

@@ -1,41 +1,83 @@
 import { registerApp } from '@larksuite/channel';
-import qrcode from 'qrcode-terminal';
 import fs from 'node:fs';
 import path from 'node:path';
 import YAML from 'yaml';
 import { AppConfigSchema } from './index.js';
+import { needsQrImage, renderQrImage, renderTerminalQr } from './qr.js';
+import { silentlyUnlink } from '../common/fs.js';
+/** Where the fallback QR image is written (next to the config it will seed). */
+const QR_IMAGE_NAME = 'qr-code.gif';
+/**
+ * Print the scan-to-create QR code.
+ *
+ * The terminal symbol uses full blocks on Windows (half blocks there often
+ * render wrong and cannot be scanned); the image file is offered whenever the
+ * terminal cannot show a trustworthy symbol — Windows, or a window too narrow
+ * for the symbol to fit without wrapping.
+ *
+ * Returns true when the fallback image was written, so the caller only cleans
+ * up a file that actually exists.
+ */
+function printRegistrationQr(info, imagePath) {
+    console.log('请用飞书 App 扫描以下二维码完成应用创建：\n');
+    const qr = renderTerminalQr(info.url, { columns: process.stdout.columns });
+    if (qr)
+        console.log(`${qr.text}\n`);
+    else
+        console.log('（当前终端太窄，二维码显示不下：可拉宽窗口重试，或扫下面的图片）\n');
+    let wroteImage = false;
+    if (needsQrImage(qr)) {
+        try {
+            fs.mkdirSync(path.dirname(imagePath), { recursive: true });
+            fs.writeFileSync(imagePath, renderQrImage(info.url));
+            wroteImage = true;
+            console.log(`二维码图片：${imagePath}（或用图片查看器打开后扫码）`);
+        }
+        catch (err) {
+            console.log(`二维码图片写入失败：${String(err)}`);
+        }
+    }
+    const mins = Math.max(1, Math.round(info.expireIn / 60));
+    console.log(`\n二维码有效期：约 ${mins} 分钟`);
+    console.log(`也可以直接在浏览器打开：${info.url}\n`);
+    return wroteImage;
+}
 /**
  * Run the QR-code registration wizard. The user scans the QR with their
  * Feishu/Lark app to create a new application; the SDK polls until the
  * creation completes and returns the credentials.
  */
-async function runRegistrationWizard() {
+async function runRegistrationWizard(configPath) {
     console.log('\n[lark-remote] 未检测到飞书应用配置，进入扫码创建向导。\n');
-    const result = await registerApp({
-        source: 'lark-remote',
-        onQRCodeReady: (info) => {
-            console.log('请用飞书 App 扫描以下二维码完成应用创建：\n');
-            qrcode.generate(info.url, { small: true });
-            const mins = Math.max(1, Math.round(info.expireIn / 60));
-            console.log(`\n二维码有效期：约 ${mins} 分钟`);
-            console.log(`也可以直接在浏览器打开：${info.url}\n`);
-        },
-        onStatusChange: (info) => {
-            if (info.status === 'domain_switched') {
-                console.log('识别到国际版租户，已切换到 larksuite.com 域名。');
-            }
-            else if (info.status === 'slow_down') {
-                console.log('轮询速度过快，已自动降速。');
-            }
-        },
-    });
-    console.log('\n✓ 应用创建成功');
-    console.log(`  App ID:  ${result.client_id}`);
-    if (result.user_info?.tenant_brand) {
-        console.log(`  Tenant:  ${result.user_info.tenant_brand}`);
+    const imagePath = path.join(path.dirname(configPath), QR_IMAGE_NAME);
+    let wroteImage = false;
+    try {
+        const result = await registerApp({
+            source: 'lark-remote',
+            onQRCodeReady: (info) => {
+                wroteImage = printRegistrationQr(info, imagePath);
+            },
+            onStatusChange: (info) => {
+                if (info.status === 'domain_switched') {
+                    console.log('识别到国际版租户，已切换到 larksuite.com 域名。');
+                }
+                else if (info.status === 'slow_down') {
+                    console.log('轮询速度过快，已自动降速。');
+                }
+            },
+        });
+        console.log('\n✓ 应用创建成功');
+        console.log(`  App ID:  ${result.client_id}`);
+        if (result.user_info?.tenant_brand) {
+            console.log(`  Tenant:  ${result.user_info.tenant_brand}`);
+        }
+        console.log('');
+        return { appId: result.client_id, appSecret: result.client_secret };
+    }
+    finally {
+        if (wroteImage)
+            silentlyUnlink(imagePath);
     }
-    console.log('');
-    return { appId: result.client_id, appSecret: result.client_secret };
 }
 function isInteractiveTerminal() {
     return Boolean(process.stdin.isTTY && process.stdout.isTTY);
@@ -77,7 +119,7 @@ export async function ensureConfig(configPath) {
         return;
     if (!isInteractiveTerminal())
         return;
-    const { appId, appSecret } = await runRegistrationWizard();
+    const { appId, appSecret } = await runRegistrationWizard(configPath);
     writeConfigWithCredentials(configPath, appId, appSecret);
     console.log(`[lark-remote] 凭证已写入 ${configPath}，继续启动...\n`);
 }

package/dist/connector/index.d.ts

@@ -6,9 +6,10 @@ import type { AppConfig } from '../config/index.js';
  * 必须远小于用户连击间隔，否则同一按钮的连续点击会被当成"重复事件"丢弃：
  * - SDK 的 cardAction dedup eventId = `card:{messageId}:{operator.openId}:{actionId}`
  * - actionId = `tag|name|option|JSON.stringify(value)`，不含时间戳/事件序号
- * - config 卡片原地更新（updateCardInPlace），用户在同一张卡上连点 toggle：
+ * - config 卡片原地更新（updateCardInPlace），用户在同一张卡上重复触发
+ *   固定 value 的按钮（如 config.toggle）：
  *   messageId / operator / value 三段都相同 → eventId 完全相同 → 第二次点击被
- *   seenCache drop，toggle 不可逆（"显示工具结果"等开关第二次点击静默失效）。
+ *   seenCache drop，toggle 不可逆（第二次点击静默失效）。
  *
  * SDK 默认 12h 太长；60s 仍会误伤连击。300ms 挡飞书瞬时重投递（<100ms 级），
  * 放过用户连击（慢点两次通常 >500ms）。代价：削弱 message 秒级重投递防护——

package/dist/connector/index.js

@@ -6,6 +6,7 @@ import { sleep } from '../common/sleep.js';
 import axios from 'axios';
 import fs from 'node:fs';
 import { silentlyUnlink } from '../common/fs.js';
+import { displayName } from '../platform/path.js';
 import https from 'node:https';
 import os from 'node:os';
 import path from 'node:path';
@@ -29,9 +30,10 @@ const noKeepAliveAgent = new https.Agent({ keepAlive: false });
  * 必须远小于用户连击间隔，否则同一按钮的连续点击会被当成"重复事件"丢弃：
  * - SDK 的 cardAction dedup eventId = `card:{messageId}:{operator.openId}:{actionId}`
  * - actionId = `tag|name|option|JSON.stringify(value)`，不含时间戳/事件序号
- * - config 卡片原地更新（updateCardInPlace），用户在同一张卡上连点 toggle：
+ * - config 卡片原地更新（updateCardInPlace），用户在同一张卡上重复触发
+ *   固定 value 的按钮（如 config.toggle）：
  *   messageId / operator / value 三段都相同 → eventId 完全相同 → 第二次点击被
- *   seenCache drop，toggle 不可逆（"显示工具结果"等开关第二次点击静默失效）。
+ *   seenCache drop，toggle 不可逆（第二次点击静默失效）。
  *
  * SDK 默认 12h 太长；60s 仍会误伤连击。300ms 挡飞书瞬时重投递（<100ms 级），
  * 放过用户连击（慢点两次通常 >500ms）。代价：削弱 message 秒级重投递防护——
@@ -128,7 +130,6 @@ export class FeishuConnector {
         // 返回时，lark SDK 正常 resolve、@larksuite/channel 的 patchCard 丢弃返回值，
         // 导致终态卡 patch 被业务层拒绝时全链路无日志无兜底。这里只观测不改行为——
         // 不 throw、不重试，返回值原样透传。
-        // 详见 .adversarial-tdd/prompt-patchcard-business-code-observability.md
         // Guard: unit-test mocks may omit rawClient; skip probe installation in that case.
         const messageService = tryGetPatchService(this.channel);
         if (messageService?.patch) {
@@ -403,7 +404,7 @@ export class FeishuConnector {
         if (stat.size > MAX_FILE_UPLOAD_SIZE) {
             throw new Error(`File too large (${(stat.size / 1_000_000).toFixed(1)}MB), exceeds ${MAX_FILE_UPLOAD_SIZE / (1024 * 1024)}MB limit`);
         }
-        const fileName = filePath.split('/').pop() ?? 'file';
+        const fileName = displayName(filePath);
         // P2-18: capture the read stream so it can be destroyed on any failure
         // path. Without this, a token/upload/send failure leaks the fd (axios
         // only closes the stream when it fully consumes it on success).

package/dist/index.js

@@ -9,7 +9,7 @@ import { probeAllAgents } from './runner/probe.js';
 import { warmCodexCatalogCache } from './config/codex-config.js';
 import { SessionReaderRegistry, SessionStore } from './session/index.js';
 import { ClaudeSessionReader, CodexSessionReader, OpencodeSessionReader, PiSessionReader, KimiSessionReader, DshSessionReader, } from './session/index.js';
-import { CommandRouter, isImmediateAction } from './router/index.js';
+import { CommandRouter, isImmediateAction, DIRECT_RETURN_CMDS, } from './router/index.js';
 import { dispatchOrderExecForQueue } from './router/order-exec-dispatch.js';
 import { buildCardActionFullValue } from './router/card-action-payload.js';
 import { Bridge } from './bridge/index.js';
@@ -117,13 +117,14 @@ function setupInstanceLockAndHandlers(instanceLock, logger, configDir) {
 /** Initialize per-workspace runner factory + agent registry. */
 function initializeRunner(config, configDir, cliArgs) {
     const agentRegistry = new AgentRegistry();
+    // W2.10 单点化：runner factory 取最新 config 的唯一入口（P1-15 语义保持，
+    // container 未接线时回退启动快照）。
+    const latest = () => agentRegistry.getConfigContainer()?.current ?? config;
     // P1-15: Claude factory reads from configContainer (not closure) so runtime
     // config changes (model, effort, stopGraceMs) take effect after
     // bridge.setConfig() + clearRunners(). Same pattern as codex/pi/kimi.
     agentRegistry.register('claude', (ws) => {
-        const container = agentRegistry.getConfigContainer();
-        const latestConfig = container?.current ?? config;
-        const claudeConfig = latestConfig.claude;
+        const claudeConfig = latest().claude;
         return new ClaudeRunner({
             model: claudeConfig.model,
             effort: claudeConfig.effort,
@@ -141,9 +142,7 @@ function initializeRunner(config, configDir, cliArgs) {
     // + clearRunners().
     const codexSessionReader = new CodexSessionReader({ codexHome: process.env.CODEX_HOME });
     agentRegistry.register('codex', (_ws) => {
-        const container = agentRegistry.getConfigContainer();
-        const latestConfig = container?.current ?? config;
-        const codexConfig = getAgentConfig(latestConfig, 'codex');
+        const codexConfig = getAgentConfig(latest(), 'codex');
         return new CodexAppServerRunner({
             kind: 'codex',
             model: codexConfig?.model,
@@ -169,10 +168,7 @@ function initializeRunner(config, configDir, cliArgs) {
     // Using `opencode session list` and `opencode export` instead of HTTP API
     const opencodeSessionReader = new OpencodeSessionReader();
     agentRegistry.register('opencode', (_ws) => {
-        // Get latest config from container (set below for pi)
-        const container = agentRegistry.getConfigContainer();
-        const latestConfig = container?.current ?? config;
-        const ocConfig = getAgentConfig(latestConfig, 'opencode');
+        const ocConfig = getAgentConfig(latest(), 'opencode');
         // Build model string with validation: provider/model format
         let model;
         if (ocConfig?.modelID) {
@@ -201,10 +197,7 @@ function initializeRunner(config, configDir, cliArgs) {
     agentRegistry.setConfigContainer(configContainer);
     const piSessionReader = new PiSessionReader();
     agentRegistry.register('pi', (ws) => {
-        // 每次 factory 调用时从 registry 获取最新 config
-        const container = agentRegistry.getConfigContainer();
-        const latestConfig = container?.current ?? config;
-        const piConf = getAgentConfig(latestConfig, 'pi');
+        const piConf = getAgentConfig(latest(), 'pi');
         return new PiRpcRunner({
             provider: piConf?.provider ?? 'Volcano',
             model: piConf?.model ?? 'glm-5.2',
@@ -221,10 +214,7 @@ function initializeRunner(config, configDir, cliArgs) {
     // Register KimiAcpRunner (pure ACP mode) and KimiSessionReader
     const kimiSessionReader = new KimiSessionReader();
     agentRegistry.register('kimi', (_ws) => {
-        // 每次 factory 调用时从 registry 获取最新 config
-        const container = agentRegistry.getConfigContainer();
-        const latestConfig = container?.current ?? config;
-        const kimiConf = getAgentConfig(latestConfig, 'kimi');
+        const kimiConf = getAgentConfig(latest(), 'kimi');
         const acpConf = kimiConf?.acp;
         return new KimiAcpRunner({
             kind: 'kimi',
@@ -244,18 +234,10 @@ function initializeRunner(config, configDir, cliArgs) {
     const dshSessionReader = new DshSessionReader({
         // hostProvider 每次调用读最新 config：/config 修改 host 后 runner 重建为
         // 新 host，reader（/resume、用量、完成卡）也跟随新 host（CC-02）。
-        hostProvider: () => {
-            const container = agentRegistry.getConfigContainer();
-            const latestConfig = container?.current ?? config;
-            return getAgentConfig(latestConfig, 'dsh')?.host;
-        },
+        hostProvider: () => getAgentConfig(latest(), 'dsh')?.host,
     });
     agentRegistry.register('dsh', (_ws) => {
-        // Read latest config from container so /config host changes take effect
-        // after bridge.setConfig() + clearRunners().
-        const container = agentRegistry.getConfigContainer();
-        const latestConfig = container?.current ?? config;
-        const dshConf = getAgentConfig(latestConfig, 'dsh');
+        const dshConf = getAgentConfig(latest(), 'dsh');
         return new DshRunner({
             kind: 'dsh',
             sessionReader: dshSessionReader,
@@ -456,7 +438,7 @@ function setupMessageHandlers(connector, router, bridge, sessionStore, workspace
             const workspaces = workspaceStore.list();
             if (workspaces.length > 0) {
                 // NOTE: fallback uses insertion order, not sort preference — by design
-                // (workspace-sorting.md §9: cwd fallback stays insertion-order for now)
+                // (cwd fallback stays insertion-order for now)
                 workspace = workspaces[0].path;
             }
         }
@@ -541,18 +523,9 @@ function setupMessageHandlers(connector, router, bridge, sessionStore, workspace
         // order.aliasInput / order.aliasRemove / order.textInput 也返回 toast+card，
         // 需直返避免被吞（order.textInput 曾漏在列表外，编辑卡停留在编辑界面）。
         // approval.planFeedback 同 answer 系列：附意见的 toast 需直返 + 不落串行队列。
-        if (actionValue.cmd === 'queue.input' ||
-            actionValue.cmd === 'order.aliasInput' ||
-            actionValue.cmd === 'order.aliasRemove' ||
-            actionValue.cmd === 'order.textInput' ||
-            actionValue.cmd === 'config.save' ||
-            actionValue.cmd === 'approval.respond' ||
-            actionValue.cmd === 'approval.toggle' ||
-            actionValue.cmd === 'approval.answer' ||
-            actionValue.cmd === 'approval.answerSubmit' ||
-            actionValue.cmd === 'approval.answerCustom' ||
-            actionValue.cmd === 'approval.answerNote' ||
-            actionValue.cmd === 'approval.planFeedback') {
+        // W2.1：直返名单以 router 的 DIRECT_RETURN_CMDS 为单一来源（历史注释：
+        // order.textInput 曾漏在列表外、answer 家族曾漏在直返列表外——两份拷贝漂移）。
+        if (DIRECT_RETURN_CMDS.has(actionValue.cmd)) {
             return router.handleCardAction(fullValue, { userId, chatId, messageId });
         }
         // order.exec → equivalent queued message (Plan A): resolve the order text

package/dist/instance-lock.js

@@ -116,6 +116,13 @@ export class InstanceLock {
                 process.exit(129);
             });
         }
+        else {
+            // win32 无 SIGHUP；CTRL_BREAK 退出前也要释放锁（§3.5，对照 cli.ts 信号转发）
+            process.on('SIGBREAK', () => {
+                this.release();
+                process.exit(149);
+            });
+        }
     }
     /**
      * Lock file stores `pid\ncomm` where comm is the owning process's command