lark-remote 0.1.1 → 0.1.2

package/dist/bridge/index.d.ts

@@ -1,4 +1,4 @@
-import type { Runner, AgentRunner } from '../runner/index.js';
+import type { AgentRunner } from '../runner/index.js';
 import type { AgentRegistry } from '../runner/registry.js';
 import type { SessionReaderRegistry, SessionStore } from '../session/index.js';
 import type { AppConfig } from '../config/index.js';
@@ -51,7 +51,6 @@ export interface ActiveRunSnapshot {
     cacheCreationTokens?: number;
 }
 interface BridgeDeps {
-    runner: Runner;
     connector: BridgeChannel;
     sessionStore: SessionStore;
     config: AppConfig;
@@ -93,7 +92,6 @@ interface BridgeDeps {
  * Runner/BridgeChannel seams.
  */
 export declare class Bridge {
-    private runner;
     private connector;
     private sessionStore;
     private config;

package/dist/bridge/index.js

@@ -7,7 +7,7 @@ import { BashCardSession, capBashOutput } from '../card/bash-card-session.js';
 import { markdownDiv } from '../card/collapsible.js';
 import { sessionEventPanel } from '../router/card-helpers.js';
 import { formatUsageStats } from '../router/index.js';
-import { agentDisplayName } from '../card/card-shared.js';
+import { agentDisplayName, resumeUseButton } from '../card/card-shared.js';
 import { enforceCardBudget } from '../card/card-budget.js';
 import { normalizeResultUsage } from '../runner/common/usage.js';
 import { BashProcessRunner } from '../runner/index.js';
@@ -58,7 +58,6 @@ function terminalReactionEmoji(terminal) {
  * Runner/BridgeChannel seams.
  */
 export class Bridge {
-    runner;
     connector;
     sessionStore;
     config;
@@ -89,7 +88,6 @@ export class Bridge {
      */
     activeBashRuns = new Map();
     constructor(deps) {
-        this.runner = deps.runner;
         this.connector = deps.connector;
         this.sessionStore = deps.sessionStore;
         this.config = deps.config;
@@ -1104,14 +1102,7 @@ export class Bridge {
                     {
                         tag: 'column',
                         width: 'auto',
-                        elements: [
-                            {
-                                tag: 'button',
-                                text: { tag: 'plain_text', content: '🔁 切换到此会话' },
-                                type: 'primary',
-                                behaviors: [{ type: 'callback', value: { cmd: 'resume.use', sessionId } }],
-                            },
-                        ],
+                        elements: [resumeUseButton(sessionId, agentKind)],
                     },
                 ],
             });

package/dist/card/card-shared.d.ts

@@ -1,3 +1,4 @@
+import { type AgentKind } from '../runner/index.js';
 interface TruncateOptions {
     suffix?: string;
     normalizeWhitespace?: boolean;
@@ -25,4 +26,11 @@ export declare function stopButton(runId: string): object;
  * Standardized: ✨ 新会话 + primary type
  */
 export declare function newSessionButton(): object;
+/**
+ * Create a CardKit 2.0 "resume session" button with behaviors callback.
+ * Carries both sessionId and agent so the handler routes to the correct
+ * agent's session reader (P2 fix: completion cards from non-default agents
+ * must carry agent to avoid wrong-reader fallback).
+ */
+export declare function resumeUseButton(sessionId: string, agent: AgentKind): object;
 export {};

package/dist/card/card-shared.js

@@ -96,4 +96,18 @@ export function newSessionButton() {
         behaviors: [{ type: 'callback', value: { cmd: 'new-session' } }],
     };
 }
+/**
+ * Create a CardKit 2.0 "resume session" button with behaviors callback.
+ * Carries both sessionId and agent so the handler routes to the correct
+ * agent's session reader (P2 fix: completion cards from non-default agents
+ * must carry agent to avoid wrong-reader fallback).
+ */
+export function resumeUseButton(sessionId, agent) {
+    return {
+        tag: 'button',
+        text: { tag: 'plain_text', content: '🔁 切换到此会话' },
+        type: 'primary',
+        behaviors: [{ type: 'callback', value: { cmd: 'resume.use', sessionId, agent } }],
+    };
+}
 //# sourceMappingURL=card-shared.js.map

package/dist/index.js

@@ -143,27 +143,24 @@ 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 (binary, 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({
+            binary: claudeConfig.binary,
+            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().
@@ -215,7 +212,8 @@ 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,
@@ -260,7 +258,7 @@ function initializeRunner(config, configDir, cliArgs) {
             binary: kimiConf?.binary ?? 'kimi',
             model: kimiConf?.model ?? 'kimi-code/k3',
             thinkingEffort: kimiConf?.thinkingEffort ?? 'max',
-            stopGraceMs: config.claude?.stopGraceMs ?? DEFAULT_STOP_GRACE_MS,
+            stopGraceMs: latestConfig.claude?.stopGraceMs ?? DEFAULT_STOP_GRACE_MS,
             pidDir: configDir,
             workspace: ws,
             sessionReader: kimiSessionReader,
@@ -275,7 +273,7 @@ function initializeRunner(config, configDir, cliArgs) {
     agentRegistry.registerDisplayName('kimi', 'Kimi');
     // 设置全局 registry，供 agentDisplayName 等全局函数使用
     AgentRegistry.setGlobalInstance(agentRegistry);
-    return { createRunner, runner, agentRegistry, sessionReaderRegistry };
+    return { agentRegistry, sessionReaderRegistry };
 }
 /** Setup message and card action handlers. */
 function setupMessageHandlers(connector, router, bridge, sessionStore, workspaceStore, binder, logger) {
@@ -492,7 +490,7 @@ async function main() {
     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 +505,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,

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

package/dist/router/index.js

@@ -43,7 +43,7 @@ import { newSessionButton, agentDisplayName } from '../card/card-shared.js';
  * 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
@@ -617,25 +617,55 @@ export class CommandRouter {
             await this.bridge.sendResult({ text: '⚠️ 缺少新消息内容' }, ctx);
             return;
         }
+        // RACE FIX: register the replacement closure BEFORE any await. The old
+        // code awaited updateMessagePreview first, yielding to the microtask
+        // queue. Between that yield and the later setTaskReplacement call, the
+        // queue chain could advance: the task's begin path would find no
+        // replacement → the original stale closure would run → the user saw
+        // "消息已更新" but the agent executed the old prompt.
+        //
+        // By registering synchronously first, the begin path always finds the
+        // replacement if the task starts during the subsequent await. Both
+        // setTaskReplacement and the begin-path consumption are synchronous, so
+        // there is no interleaving window.
+        //
+        // D3/Step3：复用原任务 binding（不重新快照）+ 恢复 cwdOverride。
+        const inputTask = this.bridge.getQueuedTask(workspace, messageId);
+        if (!inputTask) {
+            // Task already left the queue (began or was cancelled) before we could
+            // register the replacement. The user must be told the edit failed.
+            await this.bridge.sendResult({ text: '⚠️ 任务已不在队列中（可能已开始执行或被撤销）' }, ctx);
+            return;
+        }
+        this.bridge.setTaskReplacement(workspace, messageId, async () => {
+            await this.handle(newMessage, ctx, { cwdOverride: workspace, binding: inputTask.binding });
+        });
         // Update the message preview (and editedMessage so handleQueueImmediate
         // re-enqueues the edited content instead of the stale original closure),
         // and build the updated queue card. Returning the card in the callback
         // response makes Feishu render it in place -- a toast-only response leaves
         // the card stuck in the edit state (Feishu keeps the pre-click card when
         // the callback response has no `card` field).
+        //
+        // After the synchronous replacement registration above, it is safe to
+        // await here: even if the queue chain advances and the replacement is
+        // consumed, the user-facing card update is best-effort (the executing card
+        // is updated by updateQueueCardToExecuting instead).
         const card = await this.bridge.updateMessagePreview(workspace, messageId, newMessage);
         if (!card) {
-            await this.bridge.sendResult({ text: '⚠️ 任务已不在队列中' }, ctx);
-            return;
+            // Task left the queue during the await (began or cancelled). The
+            // replacement was already consumed (begin path) or cleaned up
+            // (cancel/removeFromQueue path). Inform the user the edit didn't stick
+            // as a *card update*, but the replacement closure was already in effect.
+            if (this.bridge.hasTaskBegan(messageId)) {
+                return {
+                    toast: { type: 'success', content: '消息已更新（任务已开始执行）' },
+                };
+            }
+            return {
+                toast: { type: 'info', content: '任务已不在队列中，编辑未生效' },
+            };
         }
-        // 编辑即生效：自然轮到时（不经立即执行）也必须执行编辑后内容，而不是
-        // enqueue 时闭包冻结的旧指令。setTaskReplacement 原位替换该任务槽位的闭包，
-        // 保持队列位置；handleQueueImmediate 后续注册/刷新幂等覆盖。
-        // D3/Step3：复用原任务 binding（不重新快照）+ 恢复 cwdOverride。
-        const inputTask = this.bridge.getQueuedTask(workspace, messageId);
-        this.bridge.setTaskReplacement(workspace, messageId, async () => {
-            await this.handle(newMessage, ctx, { cwdOverride: workspace, binding: inputTask?.binding });
-        });
         return {
             toast: { type: 'success', content: '消息已更新' },
             card: { type: 'raw', data: card },

package/dist/session/claude/sessions.d.ts

@@ -1,13 +1,15 @@
 import type { AgentSession, AgentSessionContentEvent, AgentSessionUsage } from '../../runner/index.js';
 /**
- * Read cwd from a Claude session JSONL by scanning events for the first
- * `cwd` field. Claude CLI writes the absolute (symlink-resolved) cwd on
+ * Read the FIRST cwd from a Claude session JSONL. Used for display and
+ * diagnostics. Claude CLI writes the absolute (symlink-resolved) cwd on
  * every event that produces one; older versions wrote it once on init.
  * Returns the first non-empty value, or undefined if absent.
  *
- * This is the SOLE source of truth for cwd. The directory name under
- * ~/.claude/projects/ is lossy (encodes `/` AND `_` as `-`), so it cannot
- * be decoded back to a real path. See regression 2026-06-21 /resume & /cd 路径错乱.
+ * For cwd GUARD checks (list/read), use `jsonlContainsCwd` which accepts
+ * any matching cwd field (required for relocated sessions whose first cwd
+ * is the pre-relocate path). The directory name under ~/.claude/projects/
+ * is lossy (encodes `/` AND `_` as `-`), so it cannot be decoded back to
+ * a real path. See regression 2026-06-21 /resume & /cd 路径错乱.
  */
 export declare function readCwdFromJsonl(filePath: string): string | undefined;
 /**

package/dist/session/claude/sessions.js

@@ -22,14 +22,16 @@ function projectDirForCwd(cwd, projectsDir) {
     return path.join(projectsDir, encoded);
 }
 /**
- * Read cwd from a Claude session JSONL by scanning events for the first
- * `cwd` field. Claude CLI writes the absolute (symlink-resolved) cwd on
+ * Read the FIRST cwd from a Claude session JSONL. Used for display and
+ * diagnostics. Claude CLI writes the absolute (symlink-resolved) cwd on
  * every event that produces one; older versions wrote it once on init.
  * Returns the first non-empty value, or undefined if absent.
  *
- * This is the SOLE source of truth for cwd. The directory name under
- * ~/.claude/projects/ is lossy (encodes `/` AND `_` as `-`), so it cannot
- * be decoded back to a real path. See regression 2026-06-21 /resume & /cd 路径错乱.
+ * For cwd GUARD checks (list/read), use `jsonlContainsCwd` which accepts
+ * any matching cwd field (required for relocated sessions whose first cwd
+ * is the pre-relocate path). The directory name under ~/.claude/projects/
+ * is lossy (encodes `/` AND `_` as `-`), so it cannot be decoded back to
+ * a real path. See regression 2026-06-21 /resume & /cd 路径错乱.
  */
 export function readCwdFromJsonl(filePath) {
     const line = findJsonlLine(filePath, (l) => {
@@ -185,7 +187,7 @@ export function listClaudeSessions(cwd, opts = {}) {
         sessions = cached.sessions;
     }
     else {
-        sessions = scanClaudeSessions(cwd, dir);
+        sessions = scanClaudeSessions(cwd, dir, opts.projectsDir);
         claudeListCache.set(cacheKey, { builtAt: Date.now(), sessions });
         // Bound the cache (map iteration order = insertion order).
         if (claudeListCache.size > LIST_CACHE_MAX_ENTRIES) {
@@ -196,8 +198,13 @@ export function listClaudeSessions(cwd, opts = {}) {
     }
     return limit === undefined ? sessions : sessions.slice(0, limit);
 }
-/** Uncached scan of a claude project dir (the expensive part being cached). */
-function scanClaudeSessions(cwd, dir) {
+/**
+ * Scan a single project directory for jsonl files whose cwd field matches
+ * the requested cwd. Uses `jsonlContainsCwd` (any cwd field matches) rather
+ * than `readCwdFromJsonl` (first cwd only) so that relocated sessions whose
+ * first cwd is the pre-relocate path are still found. P1 fix 2026-08-10.
+ */
+function scanDirForSessions(cwd, dir) {
     let files;
     try {
         files = fs.readdirSync(dir).filter((f) => f.endsWith('.jsonl'));
@@ -210,11 +217,10 @@ function scanClaudeSessions(cwd, dir) {
         const full = path.join(dir, f);
         try {
             const st = fs.statSync(full);
-            // Verify the jsonl's cwd field actually matches. Defends against
-            // directory-name collisions where a different cwd encoded to the same
-            // directory name.
-            const fileCwd = readCwdFromJsonl(full);
-            if (fileCwd !== cwd)
+            // P1 fix: use jsonlContainsCwd (any match) instead of readCwdFromJsonl
+            // (first only). Defends against directory-name collisions AND includes
+            // relocated sessions whose first cwd is the pre-relocate path.
+            if (!jsonlContainsCwd(full, cwd))
                 continue;
             const sessionId = f.slice(0, -'.jsonl'.length);
             sessions.push({
@@ -227,6 +233,97 @@ function scanClaudeSessions(cwd, dir) {
             getLogger().warn(`[session] skip ${f}: ${err.message}`);
         }
     }
+    return sessions;
+}
+/**
+ * Scan OTHER project subdirectories for jsonl files whose cwd matches the
+ * requested cwd. Used as a fallback when the primary dir doesn't contain the
+ * session (EnterWorktree moves the transcript to the new cwd's project dir).
+ * Skips the primary dir (already scanned) and any sessionIds already found
+ * (avoids duplicates). P1 fix 2026-08-10.
+ */
+function scanRelocatedSessions(cwd, primaryDir, projectsDir, seenIds) {
+    let entries;
+    try {
+        entries = fs.readdirSync(projectsDir);
+    }
+    catch {
+        return [];
+    }
+    const sessions = [];
+    for (const entry of entries.sort()) {
+        const subdir = path.join(projectsDir, entry);
+        // Skip the primary dir (already scanned) and non-directories
+        if (subdir === primaryDir)
+            continue;
+        try {
+            if (!fs.statSync(subdir).isDirectory())
+                continue;
+        }
+        catch {
+            continue;
+        }
+        let files;
+        try {
+            files = fs
+                .readdirSync(subdir)
+                .filter((f) => f.endsWith('.jsonl'))
+                .sort();
+        }
+        catch {
+            continue;
+        }
+        for (const f of files) {
+            const full = path.join(subdir, f);
+            const sessionId = f.slice(0, -'.jsonl'.length);
+            // Skip sessions already found in the primary dir scan
+            if (seenIds.has(sessionId))
+                continue;
+            try {
+                const st = fs.statSync(full);
+                if (!jsonlContainsCwd(full, cwd))
+                    continue;
+                sessions.push({
+                    sessionId,
+                    summary: truncate(summarizeSession(full), 60, { normalizeWhitespace: true }),
+                    mtime: st.mtimeMs,
+                });
+            }
+            catch (err) {
+                getLogger().warn(`[session] skip ${f}: ${err.message}`);
+            }
+        }
+    }
+    return sessions;
+}
+/** Uncached scan of a claude project dir (the expensive part being cached).
+ *  P1 fix: cwd guard now uses `jsonlContainsCwd` (any cwd field matches)
+ *  instead of `readCwdFromJsonl` (first cwd only). Relocated sessions
+ *  (EnterWorktree) contain multiple cwd values; the first one is the
+ *  pre-relocate path, which would be rejected by the old first-cwd-only
+ *  check. See regression 2026-08-10 list vs read inconsistency.
+ */
+function scanClaudeSessions(cwd, dir, projectsDir) {
+    const sessions = [];
+    // Phase 1: scan the primary project dir (fast path)
+    const primarySessions = scanDirForSessions(cwd, dir);
+    sessions.push(...primarySessions);
+    // Phase 2: cross-dir fallback for relocated sessions whose transcript
+    // was moved away from the primary dir. Only scan OTHER project subdirs
+    // when the primary scan found nothing (the common case: primary dir has
+    // all sessions, no need to scan elsewhere). When primary has results,
+    // relocated sessions in other dirs that match this cwd are already
+    // handled by jsonlContainsCwd on files in the primary dir (the file was
+    // moved TO the primary dir's encoded path). Skip to avoid O(all projects)
+    // overhead on every cached-miss list call.
+    const effectiveProjectsDir = projectsDir ?? defaultProjectsDir();
+    if (primarySessions.length === 0 &&
+        effectiveProjectsDir &&
+        dir.startsWith(effectiveProjectsDir)) {
+        const seenIds = new Set(primarySessions.map((s) => s.sessionId));
+        const crossDirSessions = scanRelocatedSessions(cwd, dir, effectiveProjectsDir, seenIds);
+        sessions.push(...crossDirSessions);
+    }
     // Same-mtime ties: secondary key keeps the full order deterministic.
     sessions.sort((a, b) => b.mtime - a.mtime || a.sessionId.localeCompare(b.sessionId));
     return sessions;
@@ -283,9 +380,18 @@ function isSessionActive(filePath, mtimeMs, now = Date.now()) {
  * used for session-active detection. Returns false if the file doesn't exist.
  */
 export function isClaudeSessionActive(sessionId, cwd, opts = {}) {
-    const dir = projectDirForCwd(cwd, opts.projectsDir ?? defaultProjectsDir());
-    const filePath = path.join(dir, `${sessionId}.jsonl`);
-    if (!fs.existsSync(filePath))
+    const projectsDir = opts.projectsDir ?? defaultProjectsDir();
+    const dir = projectDirForCwd(cwd, projectsDir);
+    let filePath = path.join(dir, `${sessionId}.jsonl`);
+    if (!fs.existsSync(filePath)) {
+        // EnterWorktree relocate: transcript moved to the new cwd's project dir.
+        const relocated = findSessionFileInProjects(sessionId, projectsDir);
+        if (!relocated)
+            return false;
+        filePath = relocated;
+    }
+    // Verify the jsonl belongs to the requested cwd (any cwd field may match).
+    if (!jsonlContainsCwd(filePath, cwd))
         return false;
     try {
         const st = fs.statSync(filePath);

package/dist/session/codex/rollout-reader.d.ts

@@ -70,6 +70,7 @@ export declare function listCodexRollouts(opts?: ListCodexRolloutsOptions): {
 export declare function readCodexSessionContent(sessionId: string, opts?: {
     codexHome?: string;
     maxEvents?: number;
+    cwd?: string;
 }): SessionContent;
 /**
  * Check if a session is still active (recently updated).

package/dist/session/codex/rollout-reader.js

@@ -253,6 +253,12 @@ export function readCodexSessionContent(sessionId, opts = {}) {
     if (!entry) {
         return { events: [] };
     }
+    // Cwd guard: when a cwd is provided, the session's working directory must
+    // match. Without this, /resume <id> finds sessions by global ID lookup and
+    // allows resuming a session from workspace B while the user is in workspace A.
+    if (opts.cwd && entry.cwd !== opts.cwd) {
+        return { events: [] };
+    }
     const rollout = readCodexRollout(entry.filePath);
     if (!rollout || rollout.threadId !== sessionId) {
         return { events: [] };

package/dist/session/codex/sessions.d.ts

@@ -13,7 +13,7 @@ export declare class CodexSessionReader implements AgentSessionReader {
         total: number;
     };
     getNewestSession(cwd: string): AgentSession | null;
-    readSessionContent(sessionId: string, _cwd: string, opts?: {
+    readSessionContent(sessionId: string, cwd: string, opts?: {
         maxEvents?: number;
     }): SessionContent;
     isSessionActive(sessionId: string, _cwd: string): boolean;

package/dist/session/codex/sessions.js

@@ -27,10 +27,11 @@ export class CodexSessionReader {
     getNewestSession(cwd) {
         return this.listSessions(cwd, { limit: 1 }).sessions[0] ?? null;
     }
-    readSessionContent(sessionId, _cwd, opts) {
+    readSessionContent(sessionId, cwd, opts) {
         return readCodexSessionContent(sessionId, {
             codexHome: this.codexHome,
             maxEvents: opts?.maxEvents,
+            cwd,
         });
     }
     isSessionActive(sessionId, _cwd) {

package/dist/session/kimi/sessions.js

@@ -283,27 +283,57 @@ export class KimiSessionReader {
      * Read session content (events + usage)
      */
     readSessionContent(sessionId, cwd, opts) {
-        // Find session directory from index
-        const sessionDir = this.findSessionDirFromIndex(sessionId);
+        // Find session directory from index (also retrieve index entry for
+        // fallback cwd guard when state.json is missing or unparseable)
+        const indexEntry = this.findSessionIndexEntry(sessionId);
+        const sessionDir = indexEntry?.sessionDir ?? null;
         if (!sessionDir) {
             return { events: [] };
         }
         const statePath = path.join(sessionDir, 'state.json');
+        let realCwd;
+        try {
+            realCwd = fs.realpathSync(cwd);
+        }
+        catch {
+            getLogger().warn(`[kimi-session-reader] fs.realpathSync failed for cwd=${cwd} (session ${sessionId}), returning empty`);
+            return { events: [] };
+        }
+        let cwdGuardPassed = false;
         try {
             if (fs.existsSync(statePath)) {
                 const state = JSON.parse(fs.readFileSync(statePath, 'utf-8'));
-                const realCwd = fs.realpathSync(cwd);
                 const guardResult = checkCwdGuard(state, realCwd);
                 if (guardResult === 'failed') {
                     return { events: [] };
                 }
                 if (guardResult === 'unverifiable') {
-                    getLogger().warn(`[kimi-session-reader] state.json has no workDir/cwd field for session ${sessionId}, skipping cwd guard`);
+                    getLogger().warn(`[kimi-session-reader] state.json has no workDir/cwd field for session ${sessionId}, falling back to index workDir`);
+                    // Fall through to index-based guard below
+                }
+                else {
+                    // verified — state.json cwd matches
+                    cwdGuardPassed = true;
                 }
             }
         }
         catch {
-            // Unverifiable — skip the check
+            // state.json unparseable — fall through to index-based guard
+            getLogger().warn(`[kimi-session-reader] state.json parse failed for session ${sessionId}, falling back to index workDir`);
+        }
+        // Fallback: when state.json is missing, unparseable, or has no workDir/cwd,
+        // use the workDir from the session index entry as a secondary guard.
+        // This prevents /resume <id> from accessing a session belonging to a
+        // different workspace when state.json is unavailable.
+        if (!cwdGuardPassed) {
+            const indexWorkDir = indexEntry?.workDir;
+            if (indexWorkDir && indexWorkDir !== realCwd) {
+                return { events: [] };
+            }
+            // When index also has no workDir, fall through (unverifiable from all sources)
+            if (!indexWorkDir) {
+                getLogger().warn(`[kimi-session-reader] no cwd source (state.json + index) for session ${sessionId}, skipping cwd guard`);
+            }
         }
         const wirePath = path.join(sessionDir, 'agents', 'main', 'wire.jsonl');
         if (!fs.existsSync(wirePath)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lark-remote",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "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",