lark-remote 0.1.6 → 0.1.7

package/dist/router/config/opencode.js

@@ -2,6 +2,11 @@
  * OpenCode config builder — builds fields and handles field changes for OpenCode agent.
  */
 import { loadOpencodeConfig } from '../../config/opencode-config.js';
+import { resetModelPatch } from './common/model-patch.js';
+const MODE_OPTIONS = [
+    { text: 'build（默认，逐项审批）', value: 'build' },
+    { text: 'plan（规划模式）', value: 'plan' },
+];
 export class OpencodeConfigBuilder {
     buildFields(displayConfig) {
         const fields = [];
@@ -23,6 +28,16 @@ export class OpencodeConfigBuilder {
             type: 'select',
             options: modelOptions,
         });
+        // §P5: mode select（build/plan，默认 build）——opencode 无运行期审批档位，
+        // mode 即审批粒度档位（build 逐项审批 / plan 规划模式）。
+        const currentMode = displayConfig.agents?.opencode?.mode ?? 'build';
+        fields.push({
+            key: 'agents.opencode.mode',
+            label: '会话模式',
+            type: 'select',
+            options: MODE_OPTIONS,
+            currentValue: currentMode,
+        });
         return fields;
     }
     handleFieldChange(key, value, config) {
@@ -31,12 +46,10 @@ export class OpencodeConfigBuilder {
         // provider 变更时，重置 model 为新 provider 的首个模型
         if (key === 'agents.opencode.providerID' && typeof value === 'string') {
             const opencodeCfg = loadOpencodeConfig();
-            const newModelOptions = opencodeCfg.modelOptions(value);
             const currentModel = config.agents?.opencode?.modelID;
-            const currentModelIsValid = newModelOptions.some((m) => m === currentModel);
-            if (!currentModelIsValid && newModelOptions.length > 0) {
-                patches.push({ key: 'agents.opencode.modelID', value: newModelOptions[0] });
-            }
+            const modelPatch = resetModelPatch(key, 'agents.opencode.modelID', currentModel, opencodeCfg.modelOptions(value));
+            if (modelPatch)
+                patches.push(modelPatch);
         }
         return patches;
     }

package/dist/router/config/pi.js

@@ -3,6 +3,7 @@
  */
 import { loadPiConfig, getPiModelOptions } from '../../config/pi-config.js';
 import { PI_THINKING_LEVELS } from '../../config/index.js';
+import { resetModelPatch } from './common/model-patch.js';
 export class PiConfigBuilder {
     buildFields(displayConfig) {
         const fields = [];
@@ -37,12 +38,10 @@ export class PiConfigBuilder {
         patches.push({ key, value });
         // provider 变更时，重置 model 为新 provider 的首个模型
         if (key === 'agents.pi.provider' && typeof value === 'string') {
-            const newModelOptions = getPiModelOptions(value);
             const currentModel = config.agents?.pi?.model;
-            const currentModelIsValid = newModelOptions.some((m) => m === currentModel);
-            if (!currentModelIsValid && newModelOptions.length > 0) {
-                patches.push({ key: 'agents.pi.model', value: newModelOptions[0] });
-            }
+            const modelPatch = resetModelPatch(key, 'agents.pi.model', currentModel, getPiModelOptions(value));
+            if (modelPatch)
+                patches.push(modelPatch);
         }
         return patches;
     }

package/dist/router/config/types.d.ts

@@ -5,13 +5,22 @@
  * The router delegates to `getConfigBuilder(agent)` instead of a giant switch-case.
  */
 import type { AppConfig } from '../../config/index.js';
+/** A select option with separate display text and config value. */
+export interface SelectOption {
+    /** Display text shown in the dropdown (may include annotations). */
+    text: string;
+    /** Config value written to config.yaml (must match schema enum values). */
+    value: string;
+}
 /** A single field descriptor in the /config card. */
 export interface ConfigField {
     key: string;
     label: string;
     type: 'boolean' | 'select' | 'input' | 'note';
-    /** For select type: the list of options shown in the dropdown. */
-    options?: readonly string[];
+    /** For select type: the list of options shown in the dropdown.
+     *  Accepts plain strings (text=value) or {text, value} objects for
+     *  display-value separation (e.g. 'manual（逐项审批）' → value 'manual'). */
+    options?: readonly (string | SelectOption)[];
     /** Override the currentValue shown in the card (takes priority over getConfigValue). */
     currentValue?: string | boolean;
 }

package/dist/router/index.d.ts

@@ -64,14 +64,14 @@ export interface CardActionPayload {
     requestId?: number | string;
     /** Decision for approval.respond (e.g. 'accept', 'decline', 'cancel'). */
     decision?: string;
-    /** Scope for acceptForSession: 'turn' | 'session'. */
-    scope?: 'turn' | 'session';
     /** Unique nonce to prevent duplicate processing. */
     nonce?: string;
     /** Permission item ID for approval.toggle. */
     permId?: string;
     /** Desired selection state for approval.toggle (card renders !current). */
     selected?: boolean;
+    /** Claude AskUserQuestion 问题索引（approval.answer / approval.answerSubmit）。 */
+    questionIndex?: number;
 }
 /**
  * Response a cardAction handler may return to give the clicking user native
@@ -91,11 +91,15 @@ export declare class CommandRouter {
     /** Valid agent kinds — single source of truth for resume.use / resume.page / cmdResume. */
     static readonly VALID_AGENTS: readonly ["claude", "codex", "opencode", "pi", "kimi"];
     private sessionStore;
-    private bridge;
-    private config;
-    private configPath;
+    /** 飞书桥接实例（public：测试直接访问断言，替代 as unknown as）。 */
+    bridge: Bridge;
+    /** 当前配置（public：测试直接读取断言，替代 as unknown as）。 */
+    config: AppConfig;
+    /** 配置文件的绝对路径（public：/config 保存链路与测试共用）。 */
+    configPath: string;
     private workspaceStore;
     private orderStore;
+    private aliasStore;
     private exitHandler;
     private pendingExit;
     /**
@@ -110,7 +114,8 @@ export declare class CommandRouter {
     private updateCachePath?;
     /** Injected update functions (for testability; defaults to real implementation). */
     private updateFns;
-    private pendingConfig;
+    /** /config 卡片编辑暂存区（public：测试直接读取断言，替代 as unknown as）。 */
+    pendingConfig: AppConfig | null;
     /**
      * Monotonic counter minting unique internal keys for order.exec enqueue
      * actions. One order card can be clicked many times, so the Feishu card
@@ -131,7 +136,8 @@ export declare class CommandRouter {
      * it uses `listRegisteredAgents()` from `router/config/index.ts` (the
      * config-builder registry), which mirrors the agents with a config card.
      */
-    private sessionReaderRegistry;
+    /** Session reader 注册中心（public：测试注入/读取，替代 as unknown as）。 */
+    sessionReaderRegistry: SessionReaderRegistry;
     /**
      * 串行化 config.* 卡片回调（2026-07-04）。
      * CardKit 2.0 input/button 回调经 `enqueueImmediate` 分发，**不进串行队列**，
@@ -148,6 +154,8 @@ export declare class CommandRouter {
         configPath: string;
         workspacePath?: string;
         ordersPath?: string;
+        /** 别名存储路径（<configDir>/aliases.json）。 */
+        aliasesPath?: string;
         exitHandler?: () => void;
         /** Spawn the detached replacement bridge process and return its pid (throws on failure). */
         restartSpawner?: () => number;
@@ -180,6 +188,11 @@ export declare class CommandRouter {
         cwdOverride?: string;
         binding?: AgentBinding;
     }): Promise<CommandResult | null>;
+    /**
+     * 一次别名展开：bridge 收到用户消息后、命令分发前调用。
+     * 仅 `$name` 开头的消息可能被展开；未知别名 / 非 `$` 消息原样返回。
+     */
+    expandAliasMessage(message: string): string;
     /**
      * Handle a CardKit card button click (§6.2).
      * Validates payload and dispatches to the corresponding command.
@@ -310,7 +323,7 @@ export declare class CommandRouter {
      */
     private cardLsFile;
     /** 确保 pendingConfig 已初始化（从当前 config 克隆） */
-    private ensurePendingConfig;
+    ensurePendingConfig(): void;
     /**
      * 串行化 config.* 卡片回调（2026-07-04 修复 toggle 卡死 bug）。
      *
@@ -324,11 +337,14 @@ export declare class CommandRouter {
      */
     private enqueueConfigAction;
     /** 实际的 config.* 分发逻辑（在串行队列内执行） */
-    private dispatchConfigAction;
+    /** config.* 卡片动作分发（public：测试直接调用，替代 as unknown as）。 */
+    dispatchConfigAction(value: CardActionPayload, ctx: CommandContext): Promise<CardActionResponse | void>;
     /** 设置嵌套属性值（仅修改内存对象，不写盘） */
-    private setNestedValue;
+    /** 在 pendingConfig 上按 dot-separated key 设置嵌套值（config 卡片编辑用）。 */
+    setNestedValue(target: AppConfig, key: string, value: unknown): void;
     /** 对比原始 config 与 pendingConfig，返回变化的 key→string 映射 */
-    private diffConfig;
+    /** config diff（public：测试直接调用，替代 as unknown as）。 */
+    diffConfig(original: AppConfig, pending: AppConfig): Record<string, string | undefined>;
     /** 递归收集差异 */
     private collectDiff;
     /**
@@ -350,7 +366,8 @@ export declare class CommandRouter {
     private propagateConfigSave;
     private executeCommand;
     cmdHelp(): CommandResult;
-    private cmdStatus;
+    /** /status 实现（public：测试直接调用，替代 as any）。 */
+    cmdStatus(ctx: CommandContext): CommandResult;
     private cmdPs;
     private cmdStop;
     private cmdExit;
@@ -384,14 +401,27 @@ export declare class CommandRouter {
     private buildConfigSwitchCard;
     /**
      * Whether a session of the given agent kind can be compacted from a resume
-     * card. Compact (thread/compact/start) is only implemented by the codex
-     * app-server runner (`runCompact`), so the button is gated on
-     * `serviceMode === 'app-server'` — exec mode spawns a fresh CLI per message
-     * and has no persistent session to compact.
+     * card. Design doc §6.2-2: duck-typing — check if the runner has `runCompact`
+     * (codex app-server, kimi acp), instead of hardcoding agentKind === 'codex'.
      */
     private canCompactSession;
+    /**
+     * Assemble the action buttons for a resume / session-history card.
+     * Shared by buildAutoResumeCard, buildConfigSwitchCard, and cmdResume so the
+     * button set (stop / compact / new-session) follows one contract instead of
+     * drifting per call site.
+     *
+     * - stop: only when the session has an in-memory active run (isActive), bound
+     *   to the real activeRun.runId so bridge.interruptCurrentRun can match.
+     * - compact: only when a compact-capable runner applies and the session is
+     *   not running (a live run would occupy the runner, so compaction would
+     *   fail). The caller passes `compact` only when canCompactSession holds.
+     * - new-session: when requested (always shown on resume cards).
+     */
+    private buildResumeActionButtons;
     private static readonly LS_PAGE_SIZE;
-    private cmdLs;
+    /** /ls 实现（public：测试直接调用，替代 as unknown as）。 */
+    cmdLs(args: string[], ctx: CommandContext, offset?: number): CommandResult;
     private cmdWs;
     /**
      * L3: degraded card when a session's export is non-empty but unparseable
@@ -400,7 +430,11 @@ export declare class CommandRouter {
      * misleading "未找到". Reuses the same card-builder helpers (markdownDiv) as
      * the normal resume card; enforceCardBudget still applies at send time.
      */
-    private cmdResume;
+    /**
+     * /resume 核心实现（public：handleResumePage / handle / resume.use 共用，
+     * 也是测试的直接 seam，避免测试用 @ts-expect-error 摸私有方法）。
+     */
+    cmdResume(args: string[], ctx: CommandContext, offset?: number): CommandResult;
     private cmdActive;
     /**
      * Build CardKit 2.0 /active card from bridge memory (not file system).
@@ -411,7 +445,8 @@ export declare class CommandRouter {
     private cmdReconnect;
     private cmdConfig;
     /** Build an interactive config card with CardKit 2.0 tabs + batch save */
-    private buildConfigCard;
-    private cmdOrder;
+    buildConfigCard(): CommandResult;
+    /** /order 实现（public：测试直接调用，替代 as unknown as）。 */
+    cmdOrder(args: string[], _ctx: CommandContext, offset?: number): CommandResult;
 }
-export { formatUsageStats } from './utils.js';
+export {};