lark-remote 0.1.1 → 0.1.3

package/dist/index.js

@@ -5,6 +5,7 @@ import { parseCliArgs, resolveConfigDir, setConfigDir, printHelp, printVersion,
 import { FeishuConnector } from './connector/index.js';
 import { ClaudeRunner, CodexExecRunner, OpencodeExecRunner, PiRunner, KimiRunner, } from './runner/index.js';
 import { AgentRegistry } from './runner/registry.js';
+import { probeAllAgents } from './runner/probe.js';
 import { SessionReaderRegistry, SessionStore } from './session/index.js';
 import { ClaudeSessionReader, CodexSessionReader, OpencodeSessionReader, PiSessionReader, KimiSessionReader, } from './session/index.js';
 import { CommandRouter, isImmediateAction, formatUsageStats, } from './router/index.js';
@@ -21,6 +22,7 @@ import { markdownDiv } from './card/collapsible.js';
 import { sessionEventPanel } from './router/card-helpers.js';
 import { newSessionButton, agentDisplayName } from './card/card-shared.js';
 import path from 'node:path';
+import fs from 'node:fs';
 /** Send auto-resume card for a restored session */
 async function sendAutoResumeCard(connector, contact, cwd, session, state) {
     if (!contact.userId)
@@ -143,27 +145,23 @@ function setupInstanceLockAndHandlers(instanceLock, logger, configDir) {
 }
 /** Initialize per-workspace runner factory + agent registry. */
 function initializeRunner(config, configDir, cliArgs) {
-    const createRunner = (workspace) => {
-        const runner = new ClaudeRunner({
-            binary: config.claude.binary,
-            model: config.claude.model,
-            effort: config.claude.effort,
-            stopGraceMs: config.claude.stopGraceMs,
+    const agentRegistry = new AgentRegistry();
+    // 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;
+        return new ClaudeRunner({
+            model: claudeConfig.model,
+            effort: claudeConfig.effort,
+            stopGraceMs: claudeConfig.stopGraceMs,
             settings: cliArgs.settings,
             pidDir: configDir,
-            workspace,
+            workspace: ws,
         });
-        return runner;
-    };
-    const runner = createRunner('default');
-    runner.killOrphan();
-    runner.registerExitHandlers();
-    // Wire multi-agent registries. All five agents (claude/codex/opencode/pi/kimi)
-    // are already registered. Bridge and Router depend on these registries instead of
-    // importing session readers directly, so adding a new agent is "register factory + reader"
-    // with zero upstream changes.
-    const agentRegistry = new AgentRegistry();
-    agentRegistry.register('claude', (ws) => createRunner(ws));
+    });
     // Register CodexExecRunner (codex exec --json, approval_policy=never).
     // Factory reads latest config from container.current so runtime config changes
     // (reasoningEffort, model, etc.) take effect after bridge.setConfig() + clearRunners().
@@ -173,7 +171,6 @@ function initializeRunner(config, configDir, cliArgs) {
         const latestConfig = container?.current ?? config;
         const codexConfig = getAgentConfig(latestConfig, 'codex');
         return new CodexExecRunner({
-            binary: codexConfig?.binary ?? 'codex',
             model: codexConfig?.model,
             modelProvider: codexConfig?.modelProvider,
             reasoningEffort: codexConfig?.reasoningEffort,
@@ -185,20 +182,17 @@ function initializeRunner(config, configDir, cliArgs) {
     });
     // Register OpencodeExecRunner (run mode)
     // Using `opencode run --format json --auto` instead of HTTP+SSE server mode
-    const opencodeConfig = getAgentConfig(config, 'opencode');
     // Register session reader (same instance as used by runner)
     const sessionReaderRegistry = new SessionReaderRegistry();
     sessionReaderRegistry.register('claude', new ClaudeSessionReader());
     sessionReaderRegistry.register('codex', codexSessionReader);
     // Register OpencodeSessionReader (CLI version)
     // Using `opencode session list` and `opencode export` instead of HTTP API
-    const opencodeSessionReader = new OpencodeSessionReader({
-        binary: opencodeConfig?.binary ?? 'opencode',
-    });
+    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;
+        const latestConfig = container?.current ?? config;
         const ocConfig = getAgentConfig(latestConfig, 'opencode');
         // Build model string with validation: provider/model format
         let model;
@@ -213,9 +207,9 @@ function initializeRunner(config, configDir, cliArgs) {
             }
         }
         return new OpencodeExecRunner({
-            binary: ocConfig?.binary ?? 'opencode',
             model,
-            stopGraceMs: config.claude?.stopGraceMs ?? DEFAULT_STOP_GRACE_MS,
+            // P1-15: read stopGraceMs from latestConfig (not startup closure)
+            stopGraceMs: latestConfig.claude?.stopGraceMs ?? DEFAULT_STOP_GRACE_MS,
             pidDir: configDir,
             workspace: ws,
             sessionReader: opencodeSessionReader,
@@ -232,10 +226,9 @@ function initializeRunner(config, configDir, cliArgs) {
     agentRegistry.register('pi', (ws) => {
         // 每次 factory 调用时从 registry 获取最新 config
         const container = agentRegistry.getConfigContainer();
-        const latestConfig = container?.current;
+        const latestConfig = container?.current ?? config;
         const piConf = getAgentConfig(latestConfig, 'pi');
         return new PiRunner({
-            binary: piConf?.binary ?? 'pi',
             provider: piConf?.provider ?? 'Volcano',
             model: piConf?.model ?? 'glm-5.2',
             thinking: piConf?.thinking ?? 'medium',
@@ -254,13 +247,13 @@ function initializeRunner(config, configDir, cliArgs) {
     agentRegistry.register('kimi', (ws) => {
         // 每次 factory 调用时从 registry 获取最新 config
         const container = agentRegistry.getConfigContainer();
-        const latestConfig = container?.current;
+        const latestConfig = container?.current ?? config;
         const kimiConf = getAgentConfig(latestConfig, 'kimi');
         return new KimiRunner({
-            binary: kimiConf?.binary ?? 'kimi',
             model: kimiConf?.model ?? 'kimi-code/k3',
             thinkingEffort: kimiConf?.thinkingEffort ?? 'max',
-            stopGraceMs: config.claude?.stopGraceMs ?? DEFAULT_STOP_GRACE_MS,
+            // P1-15: read stopGraceMs from latestConfig (not startup closure)
+            stopGraceMs: latestConfig.claude?.stopGraceMs ?? DEFAULT_STOP_GRACE_MS,
             pidDir: configDir,
             workspace: ws,
             sessionReader: kimiSessionReader,
@@ -275,10 +268,25 @@ function initializeRunner(config, configDir, cliArgs) {
     agentRegistry.registerDisplayName('kimi', 'Kimi');
     // 设置全局 registry，供 agentDisplayName 等全局函数使用
     AgentRegistry.setGlobalInstance(agentRegistry);
-    return { createRunner, runner, agentRegistry, sessionReaderRegistry };
+    // Probe agent CLI availability (fire-and-forget, populates cache for /config card).
+    // Don't block startup — log unavailable agents as warnings.
+    probeAllAgents()
+        .then((availability) => {
+        const unavailable = [...availability.entries()].filter(([, ok]) => !ok).map(([kind]) => kind);
+        if (unavailable.length > 0) {
+            getLogger().warn(`[probe] agent CLI not found or not functional: ${unavailable.join(', ')}`);
+        }
+        else {
+            getLogger().info('[probe] all agent CLIs available');
+        }
+    })
+        .catch(() => {
+        // Probe failure is non-fatal; /config card will retry on open.
+    });
+    return { agentRegistry, sessionReaderRegistry };
 }
 /** Setup message and card action handlers. */
-function setupMessageHandlers(connector, router, bridge, sessionStore, workspaceStore, binder, logger) {
+function setupMessageHandlers(connector, router, bridge, sessionStore, workspaceStore, binder, logger, config) {
     connector.setMessageHandler((msg) => {
         // 绑定/授权闸门：仅 owner 放行；非 owner 静默丢弃；未绑定时要求 PIN 认领
         const decision = binder.classify(msg.userId, msg.content, msg.chatId);
@@ -288,9 +296,50 @@ function setupMessageHandlers(connector, router, bridge, sessionStore, workspace
         if (decision.kind === 'pin_wrong')
             return;
         if (decision.kind === 'bind_success') {
-            void connector
-                .sendWithRetry(msg.chatId, { text: '✅ 已绑定到本账号，此后仅你可使用本应用' })
-                .catch((err) => logger.error('[binder] bind-success reply failed:', err));
+            // First-run onboarding: set default cwd + send welcome + Help card.
+            // setCwd is synchronous (outside the async closure) so that the user's
+            // next message — which will hit the `owner` branch now that
+            // startup-contact.json has been written — finds cwd already set.
+            // process.cwd() is the only sensible default: the user started
+            // lark-remote in the directory they want to work in.
+            // setCwd only when no cwd is set yet (e.g. fresh start after bind).
+            // Don't overwrite an existing cwd — the user may have already set one
+            // via /cd or a previous bind. Use realpath for canonical form (matching
+            // Claude JSONL cwd, e.g. /tmp → /private/tmp on macOS).
+            let resolvedCwd;
+            try {
+                resolvedCwd = fs.realpathSync(process.cwd());
+            }
+            catch {
+                resolvedCwd = process.cwd();
+            }
+            if (!sessionStore.getCwd(msg.userId)) {
+                sessionStore.setCwd(msg.userId, resolvedCwd);
+            }
+            void (async () => {
+                try {
+                    // Message 1: bind confirmation + status (combined to avoid
+                    // Feishu out-of-order delivery across three separate messages).
+                    await connector.sendWithRetry(msg.chatId, {
+                        text: `✅ 已绑定到本账号，此后仅你可使用本应用\n` +
+                            `📂 当前工作目录: \`${resolvedCwd}\`\n` +
+                            `🤖 默认 Agent: ${agentDisplayName(config.defaultAgent)}\n` +
+                            `💡 直接输入消息即可开始对话，或 /cd 切换目录`,
+                    });
+                    // Message 2: Help card.
+                    // Use router.cmdHelp() + manual send (without replyTo) so the Help
+                    // card appears as an independent message, not a reply to the PIN
+                    // message. router.handle('/help') would set replyTo=msg.messageId
+                    // (the PIN), causing the card to nest under the PIN in Feishu UI.
+                    const helpResult = router.cmdHelp();
+                    if (helpResult.card) {
+                        await connector.sendWithRetry(msg.chatId, { card: helpResult.card });
+                    }
+                }
+                catch (err) {
+                    logger.error('[binder] onboarding send failed:', err);
+                }
+            })();
             return;
         }
         // decision.kind === 'owner'：正常处理（不再每条覆盖 startup-contact）
@@ -488,11 +537,11 @@ async function main() {
     logger.info('config loaded');
     logger.info(`configDir = ${configDir}`);
     logger.info(`feishu.appId = ${config.feishu.appId}`);
-    logger.info(`claude.binary = ${config.claude.binary}`);
+    logger.info(`claude.model = ${config.claude.model}`);
     if (cliArgs.settings) {
         logger.info(`claude.settings = ${cliArgs.settings}`);
     }
-    const { runner, agentRegistry, sessionReaderRegistry } = initializeRunner(config, configDir, cliArgs);
+    const { agentRegistry, sessionReaderRegistry } = initializeRunner(config, configDir, cliArgs);
     const connector = new FeishuConnector(config);
     const startupContactStore = new StartupContactStore(path.join(configDir, 'startup-contact.json'));
     const binder = new OwnerBinder(startupContactStore);
@@ -507,7 +556,6 @@ async function main() {
     const sessionStore = new SessionStore(path.join(configDir, 'last-session.json'), config.defaultAgent);
     const workspaceStore = new WorkspaceStore(path.join(configDir, 'workspace.json'));
     const bridge = new Bridge({
-        runner,
         connector,
         sessionStore,
         config,
@@ -525,7 +573,7 @@ async function main() {
         restartSpawner: () => spawnReplacementBridge(path.join(configDir, 'logs')),
         sessionReaderRegistry,
     });
-    setupMessageHandlers(connector, router, bridge, sessionStore, workspaceStore, binder, logger);
+    setupMessageHandlers(connector, router, bridge, sessionStore, workspaceStore, binder, logger, config);
     try {
         await connector.connect();
     }
@@ -535,7 +583,7 @@ async function main() {
     }
     if (binder.isBound()) {
         // 仅已绑定时发送启动通知；未绑定时不打扰（PIN 引导已在控制台输出）
-        await sendStartupHello(connector, startupContactStore);
+        await sendStartupHello(connector, startupContactStore, { dev: cliArgs.dev });
     }
     // Auto-restore: resume the persisted sessionId if available
     const restoredContact = startupContactStore.getContact();

package/dist/router/config/codex.js

@@ -6,14 +6,12 @@ export class CodexConfigBuilder {
     buildFields(displayConfig) {
         const fields = [];
         // 从 codex config.toml 动态读取 provider 和 model
-        const codexBinary = displayConfig.agents?.codex?.binary ?? 'codex';
-        const codexCfg = loadCodexConfig({ binary: codexBinary });
+        const codexCfg = loadCodexConfig();
         const codexProviderNames = codexCfg.providerNames;
         const currentModelProvider = displayConfig.agents?.codex?.modelProvider ?? codexCfg.currentProvider;
         const currentCodexModel = displayConfig.agents?.codex?.model ?? codexCfg.currentModel;
-        const currentReasoningEffort = displayConfig.agents?.codex?.reasoningEffort ??
-            getDefaultReasoningEffort(currentCodexModel, codexBinary);
-        // 传入当前 provider 过滤模型列���
+        const currentReasoningEffort = displayConfig.agents?.codex?.reasoningEffort ?? getDefaultReasoningEffort(currentCodexModel);
+        // 传入当前 provider 过滤模型列表
         const codexModelOptions = codexCfg.modelOptions(currentModelProvider);
         fields.push({
             key: 'agents.codex.modelProvider',
@@ -42,7 +40,7 @@ export class CodexConfigBuilder {
             label: '推理强度',
             type: 'select',
             // 档位按目录实际声明透传（P2-5）：codex 支持 none/Custom，不再按标准枚举过滤
-            options: getReasoningEffortOptions(currentCodexModel, codexBinary),
+            options: getReasoningEffortOptions(currentCodexModel),
             currentValue: currentReasoningEffort,
         });
         return fields;
@@ -50,10 +48,9 @@ export class CodexConfigBuilder {
     handleFieldChange(key, value, config) {
         const patches = [];
         patches.push({ key, value });
-        // provider 变更时，重置 model 为�� provider 的首个模型
+        // provider 变更时，重置 model 为新 provider 的首个模型
         if (key === 'agents.codex.modelProvider' && typeof value === 'string') {
-            const codexBinary = config.agents?.codex?.binary ?? 'codex';
-            const codexCfg = loadCodexConfig({ binary: codexBinary });
+            const codexCfg = loadCodexConfig();
             const newModelOptions = codexCfg.modelOptions(value);
             const currentModel = config.agents?.codex?.model;
             const currentModelIsValid = newModelOptions.some((m) => m === currentModel);
@@ -86,14 +83,13 @@ export class CodexConfigBuilder {
      *   对 undefined 做键删除，P1）。
      */
     effortPatchForModel(config, newModel) {
-        const codexBinary = config.agents?.codex?.binary ?? 'codex';
         const currentReasoningEffort = config.agents?.codex?.reasoningEffort;
-        const newModelSupportedEfforts = getReasoningEffortOptions(newModel, codexBinary);
+        const newModelSupportedEfforts = getReasoningEffortOptions(newModel);
         const isCurrentEffortValid = currentReasoningEffort && newModelSupportedEfforts.includes(currentReasoningEffort);
         if (isCurrentEffortValid)
             return null;
         const middle = newModelSupportedEfforts[Math.floor((newModelSupportedEfforts.length - 1) / 2)];
-        const newEffort = middle ?? getDefaultReasoningEffort(newModel, codexBinary);
+        const newEffort = middle ?? getDefaultReasoningEffort(newModel);
         return { key: 'agents.codex.reasoningEffort', value: newEffort };
     }
 }

package/dist/router/index.d.ts

@@ -26,7 +26,7 @@ interface CommandResult {
  * stop        — interrupt current run
  * ls.file     — send file only
  * ws.remove   — delete workspace alias only
- * resume.use  — set sessionId only
+ * resume.use  — set sessionId + agent for correct reader routing
  * help.*      — read-only help commands
  * order.delete — delete order only
  * order.exec is intercepted by index.ts at the enqueue boundary
@@ -73,6 +73,8 @@ interface CardActionResponse {
     [key: string]: unknown;
 }
 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;
@@ -187,6 +189,11 @@ export declare class CommandRouter {
      * Mirrors handleLsPage — updates the same card, never sends a new one.
      */
     private handleResumePage;
+    /**
+     * Handle active.page: paginate the /active run list in place.
+     * Mirrors handleResumePage — updates the same card, never sends a new one.
+     */
+    private handleActivePage;
     /**
      * Handle ls.browse: browse directory without switching cwd.
      */
@@ -223,6 +230,11 @@ export declare class CommandRouter {
      * Handle order.delete: remove the order and update card in place.
      */
     private handleOrderDelete;
+    /**
+     * Handle order.page: paginate the /order list in place.
+     * Mirrors handleLsPage — updates the same card, never sends a new one.
+     */
+    private handleOrderPage;
     /**
      * Handle ws.remove: remove the workspace alias and refresh the /ws list card
      * in place (mirrors handleOrderDelete). Without this the stale alias would
@@ -273,7 +285,7 @@ export declare class CommandRouter {
      */
     private propagateConfigSave;
     private executeCommand;
-    private cmdHelp;
+    cmdHelp(): CommandResult;
     private cmdStatus;
     private cmdPs;
     private cmdStop;
@@ -307,6 +319,7 @@ export declare class CommandRouter {
     /**
      * Build CardKit 2.0 /active card from bridge memory (not file system).
      * Shows only runs that were started by THIS bridge process.
+     * Paginates with ACTIVE_PAGE_SIZE (default 20) items per page.
      */
     private buildActiveCardFromMemory;
     private cmdReconnect;