lark-remote 0.4.0 → 0.4.1

package/dist/router/config/opencode.js

@@ -2,6 +2,7 @@
  * OpenCode config builder — builds fields and handles field changes for OpenCode agent.
  */
 import { loadOpencodeConfig } from '../../config/opencode-config.js';
+import { DEFAULT_TURN_IDLE_TIMEOUT_MINUTES } from '../../config/index.js';
 import { resetModelPatch } from './common/model-patch.js';
 const MODE_OPTIONS = [
     { text: 'build（默认，逐项审批）', value: 'build' },
@@ -38,6 +39,16 @@ export class OpencodeConfigBuilder {
             options: MODE_OPTIONS,
             currentValue: currentMode,
         });
+        // Turn 空闲超时（纯 ACP 对齐 kimi：卡片暴露 turnIdleTimeoutMinutes，
+        // binary/requestTimeoutMs/idleTtlMs 为 YAML-only 工程参数）
+        const currentTurnIdleTimeoutMinutes = displayConfig.agents?.opencode?.acp?.turnIdleTimeoutMinutes ??
+            DEFAULT_TURN_IDLE_TIMEOUT_MINUTES;
+        fields.push({
+            key: 'agents.opencode.acp.turnIdleTimeoutMinutes',
+            label: 'Turn 空闲超时(分钟, 0关闭)',
+            type: 'input',
+            currentValue: String(currentTurnIdleTimeoutMinutes),
+        });
         return fields;
     }
     handleFieldChange(key, value, config) {

package/dist/router/index.d.ts

@@ -121,6 +121,11 @@ export declare class CommandRouter {
      * returns its pid. Injected from index.ts; /restart is unavailable without it.
      */
     private restartSpawner?;
+    /**
+     * 冲刷装配器窗口内未提交的入站 turn（/exit、/restart 干净退出前调用，
+     * 避免静默期窗口内的内容丢失）。index.ts 注入。
+     */
+    private flushInbound?;
     private idleTimeoutMs;
     /** Dev mode flag: --dev means the bridge was started from source (bun src/index.ts). */
     private devMode;
@@ -197,12 +202,24 @@ export declare class CommandRouter {
      * The reader is fetched from the registry each time to reflect config changes.
      */
     private get sessionReader();
+    /**
+     * 注入入站装配器的冲刷回调（/exit、/restart 干净退出前调用，
+     * 避免静默期窗口内未提交的 turn 丢失）。index.ts 在构造后接线。
+     */
+    setInboundFlusher(flush: () => Promise<void>): void;
     /**
      * Route a message: if it starts with /, handle as command; if it starts with !, execute as bash; otherwise forward to Claude.
+     *
+     * 命令识别前置条件（2026-09-15 P0 修复）：
+     * 裸前缀判定会被结构占位符命中 —— SDK 把富文本里的图片渲染成 `![image](img_v3_…)`，
+     * 首字符恰好是 `!`，整段用户消息被当 shell 命令执行（`executeBash "[image](img_v3_…"`）。
+     * 因此命令前缀只在「调用方声明纯文本 + 剥离占位符后非空且无占位符 + 首字符是 / 或 !」
+     * 三条同时成立时生效，其余一律按文本转发。
      */
     handle(message: string, ctx: CommandContext, opts?: {
         cwdOverride?: string;
         binding?: AgentBinding;
+        allowCommandPrefix?: boolean;
     }): Promise<CommandResult | null>;
     /**
      * 一次别名展开：bridge 收到用户消息后、命令分发前调用。

package/dist/router/index.js

@@ -9,6 +9,7 @@ import { OrderStore } from '../order/index.js';
 import { resolveAlias } from '../order/alias-resolve.js';
 import { diffConfig, setNestedValue } from './config-diff.js';
 import { getLogger } from '../logger/index.js';
+import { stripPlaceholders } from '../inbound/placeholder.js';
 import { activeRunUsage, clampInt } from './utils.js';
 import { markdownDiv, buildSessionHistoryCard, paginationBar, parseJumpOffset, PAGE_JUMP_INVALID_HINT, } from './card-helpers.js';
 import { MAX_FILE_UPLOAD_SIZE } from '../connector/file-limits.js';
@@ -342,6 +343,11 @@ export class CommandRouter {
      * returns its pid. Injected from index.ts; /restart is unavailable without it.
      */
     restartSpawner;
+    /**
+     * 冲刷装配器窗口内未提交的入站 turn（/exit、/restart 干净退出前调用，
+     * 避免静默期窗口内的内容丢失）。index.ts 注入。
+     */
+    flushInbound;
     idleTimeoutMs;
     /** Dev mode flag: --dev means the bridge was started from source (bun src/index.ts). */
     devMode;
@@ -416,13 +422,33 @@ export class CommandRouter {
     get sessionReader() {
         return this.sessionReaderRegistry.get(this.config.defaultAgent);
     }
+    /**
+     * 注入入站装配器的冲刷回调（/exit、/restart 干净退出前调用，
+     * 避免静默期窗口内未提交的 turn 丢失）。index.ts 在构造后接线。
+     */
+    setInboundFlusher(flush) {
+        this.flushInbound = flush;
+    }
     /**
      * Route a message: if it starts with /, handle as command; if it starts with !, execute as bash; otherwise forward to Claude.
+     *
+     * 命令识别前置条件（2026-09-15 P0 修复）：
+     * 裸前缀判定会被结构占位符命中 —— SDK 把富文本里的图片渲染成 `![image](img_v3_…)`，
+     * 首字符恰好是 `!`，整段用户消息被当 shell 命令执行（`executeBash "[image](img_v3_…"`）。
+     * 因此命令前缀只在「调用方声明纯文本 + 剥离占位符后非空且无占位符 + 首字符是 / 或 !」
+     * 三条同时成立时生效，其余一律按文本转发。
      */
     async handle(message, ctx, opts) {
         const trimmed = message.trim();
-        const startsWithBang = trimmed.startsWith('!');
-        const startsWithSlash = trimmed.startsWith('/');
+        // 双保险：任何调用点都必须先剥离结构占位符，再判命令前缀
+        //（index.ts 传 allowCommandPrefix = rawContentType === 'text'，但那层不是唯一入口）。
+        const guard = stripPlaceholders(trimmed);
+        // 默认 true：order.exec 等既有内部调用点传的是用户已确认的指令文本，
+        // 且剥离后无占位符 —— 默认放行不改变它们的语义（见 command-guard.test.ts）。
+        const allowCommandPrefix = opts?.allowCommandPrefix ?? true;
+        const commandEligible = allowCommandPrefix && guard.kinds.length === 0 && guard.clean !== '';
+        const startsWithBang = commandEligible && guard.clean.startsWith('!');
+        const startsWithSlash = commandEligible && guard.clean.startsWith('/');
         getLogger().info(`[router] handle message="${message.slice(0, 50)}..." trimmed="${trimmed.slice(0, 50)}..." startsWithSlash=${startsWithSlash} startsWithBang=${startsWithBang}`);
         // 复制分身流程活跃期：一切消息（含命令）交给 clone 状态机处理，
         // 不转发 coding agent、不进命令分发（index.ts 已在入队前拦截，这里
@@ -432,20 +458,20 @@ export class CommandRouter {
             return null;
         }
         if (startsWithSlash) {
-            const result = await this.executeCommand(trimmed, ctx);
+            const result = await this.executeCommand(guard.clean, ctx);
             if (result) {
                 await this.bridge.sendResult(result, ctx);
             }
             if (this.pendingExit) {
-                // 干净退出前冲刷待合批的媒体保存提示，避免 500ms 窗口内的提示丢失。
-                await this.bridge.flushAllMediaNotifications();
+                // 干净退出前冲刷装配器窗口内未提交的入站 turn，避免静默期窗口内的内容丢失。
+                await this.flushInbound?.();
                 this.exitHandler();
             }
             return result;
         }
         // Handle bang commands (!command)
-        if (trimmed.startsWith('!')) {
-            const cmd = trimmed.slice(1).trim();
+        if (startsWithBang) {
+            const cmd = guard.clean.slice(1).trim();
             if (!cmd) {
                 await this.bridge.sendResult({ text: '请输入要执行的命令，例如 !ls' }, ctx);
                 return null;
@@ -456,7 +482,9 @@ export class CommandRouter {
         // Forward to Claude (P1-14: pass the enqueue-time workspace through so the
         // run uses the same cwd as the serial queue lane, even if /cd ran while
         // the message was queued)
-        await this.bridge.forwardToClaude(trimmed, ctx, opts);
+        // 剥离占位符后再转发：agent 只该看到用户文本（附图已转成 attachments 块，
+        // 那是装配器生成的协议块，stripPlaceholders 会原样保留）。
+        await this.bridge.forwardToClaude(guard.clean, ctx, opts);
         return null;
     }
     /**
@@ -607,7 +635,7 @@ export class CommandRouter {
                     // 必须同样消费，否则点击 /restart 按钮 spawn 成功后旧进程不退出，
                     // 新进程撞单例锁退出 → 重启两头落空（2026-08-01 红绿 anchor 锁定）。
                     if (this.pendingExit) {
-                        await this.bridge.flushAllMediaNotifications();
+                        await this.flushInbound?.();
                         this.exitHandler();
                     }
                     return;

package/dist/runner/common/connection-based-runner.js

@@ -1,8 +1,12 @@
 import { ConnectionLostError } from './jsonrpc/client.js';
 import { getLogger } from '../../logger/index.js';
 import { syntheticInitEvent } from './runner-utils.js';
-/** How long to wait for turn output notifications before failing. */
-const TURN_IDLE_TIMEOUT_MS = 10 * 60 * 1000;
+import { DEFAULT_TURN_IDLE_TIMEOUT_MINUTES } from '../../config/index.js';
+/** How long to wait for turn output notifications before failing.
+ *  30 分钟（单源于 config 的 DEFAULT_TURN_IDLE_TIMEOUT_MINUTES）：ACP/app-server
+ *  类 agent 常因长工具调用（pip/npm install 等）或等待 SubAgent 长时间静默，
+ *  10 分钟会误杀正常进行中的 run。未接配置的 runner（如 opencode）直接吃此默认。 */
+const TURN_IDLE_TIMEOUT_MS = DEFAULT_TURN_IDLE_TIMEOUT_MINUTES * 60 * 1000;
 export class ConnectionBasedRunner {
     kind;
     sessionReader;

package/dist/runner/kimi/acp/runner.d.ts

@@ -36,7 +36,7 @@ export interface KimiAcpRunnerOptions {
     requestTimeoutMs?: number;
     /** Idle TTL for connection manager. */
     idleTtlMs?: number;
-    /** How long to wait for turn output before failing. Defaults to 10 min. */
+    /** How long to wait for turn output before failing. Defaults to 30 min. */
     turnIdleTimeoutMs?: number;
     /** §5.2: compaction 等待的沉默超时——距上次观察到任何新 compaction 记录
      *  （begin/terminal）超过该时长仍未终态才放弃（outcome unknown，卡片 error，

package/dist/runner/kimi/acp/runner.js

@@ -27,7 +27,7 @@ import { mapAnswersByIndex } from '../../question-common.js';
 import { getLogger } from '../../../logger/index.js';
 import { BaseAcpRunner } from '../../common/acp/base-acp-runner.js';
 import { ProcessStopper } from '../../common/process-stopper.js';
-/** §5.2: compaction 等待的默认沉默超时（对齐 turnIdleTimeoutMs 默认值）。 */
+/** §5.2: compaction 等待的默认沉默超时（10 分钟，独立于 turn idle 默认 30 分钟）。 */
 const COMPACT_IDLE_TIMEOUT_MS = 10 * 60_000;
 /** Poll interval for the wire.jsonl compaction record. */
 const COMPACT_POLL_INTERVAL_MS = 1_000;

package/dist/runner/opencode/acp/runner.d.ts

@@ -40,7 +40,7 @@ export interface OpencodeAcpRunnerOptions {
     requestTimeoutMs?: number;
     /** Idle TTL for connection manager. */
     idleTtlMs?: number;
-    /** How long to wait for turn output before failing. Defaults to 10 min. */
+    /** How long to wait for turn output before failing. Defaults to 30 min. */
     turnIdleTimeoutMs?: number;
     model?: string;
     /** Configured session mode: 'build' (default) or 'plan' (opencode agent names). */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lark-remote",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "description": "Feishu (Lark) private-chat bridge to local coding agents — Claude Code / Codex / opencode / pi / kimi, with live-streaming CardKit 2.0 cards",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",