botmux 2.73.0 → 2.75.0

package/dist/core/command-handler.d.ts

@@ -1,3 +1,4 @@
+import type { CliId, ResumableSession } from '../adapters/cli/types.js';
 import { validateWorkingDir } from './working-dir.js';
 import { type AdoptableSession } from './session-discovery.js';
 import { type ZellijAdoptableSession } from './zellij-adopt-discovery.js';
@@ -117,4 +118,13 @@ export declare function handleTermLinkCommand(rootId: string, larkAppId: string,
 export declare function handleCommand(cmd: string, rootId: string, message: LarkMessage, deps: CommandHandlerDeps, larkAppId?: string): Promise<void>;
 export declare function startCodexAppThreadSession(thread: CodexAppThreadSummary, ds: DaemonSession, deps: CommandHandlerDeps, larkAppId?: string): Promise<void>;
 export declare function startAdoptSession(target: AdoptableSession | ZellijAdoptableSession, ds: DaemonSession, deps: CommandHandlerDeps, larkAppId?: string): Promise<void>;
+/** Discover the sessions resumable from disk for `cliId`, excluding any whose
+ *  CLI-native id is already live in a botmux session (so a session botmux
+ *  already runs isn't offered for re-import). Returns [] when the adapter has
+ *  no on-disk store. */
+export declare function discoverResumableSessionsForBot(cliId: CliId, cliPathOverride: string | undefined, activeSessions: Map<string, DaemonSession>, limit?: number): Promise<ResumableSession[]>;
+/** Import (resume) a stored session into the current topic: re-spawn the bot's
+ *  CLI via `--resume <cliSessionId>` in `cwd`. Mirrors the manual resume path —
+ *  the worker owns the CLI (NOT an observe-adopt), so no `adoptedFrom` is set. */
+export declare function startResumeImportSession(target: ResumableSession, ds: DaemonSession, deps: CommandHandlerDeps, larkAppId?: string): Promise<void>;
 //# sourceMappingURL=command-handler.d.ts.map

package/dist/core/command-handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"command-handler.d.ts","sourceRoot":"","sources":["../../src/core/command-handler.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"command-handler.d.ts","sourceRoot":"","sources":["../../src/core/command-handler.ts"],"names":[],"mappings":"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"}

package/dist/core/command-handler.js

@@ -30,6 +30,7 @@ import { generateAuthUrl, getTokenStatus } from '../utils/user-token.js';
 import { bindOncall, unbindOncall, getOncallStatus } from '../services/oncall-store.js';
 import { CONFIG_FIELDS, findConfigField, settableFieldKeys, parseBooleanValue, applyConfigField, setBotAllowedUsers, getConfigSnapshot, getConfigCardData, } from '../services/bot-config-store.js';
 import { resolveCliId, findInvalidAllowedUserEntries } from '../setup/bot-config-editor.js';
+import { decorateResumeForWrapper } from '../setup/cli-selection.js';
 import { publishAttentionPatch, announcePendingRepoSession } from './session-activity.js';
 import { setCardMode } from '../services/card-mode-store.js';
 import { canOperate } from '../im/lark/event-dispatcher.js';
@@ -879,10 +880,11 @@ export async function handleCommand(cmd, rootId, message, deps, larkAppId) {
                     const cliResumeCommand = (() => {
                         try {
                             const adapter = createCliAdapterSync(closedCliId, botCfg.cliPathOverride);
-                            return adapter.buildResumeCommand?.({
+                            const raw = adapter.buildResumeCommand?.({
                                 sessionId: closedSessionId,
                                 cliSessionId: ds.session.cliSessionId,
                             }) ?? null;
+                            return raw ? decorateResumeForWrapper(raw, botCfg.wrapperCli) : null;
                         }
                         catch {
                             return null;
@@ -1433,7 +1435,12 @@ export async function handleCommand(cmd, rootId, message, deps, larkAppId) {
                     ...discoverAdoptableSessions(botCliId),
                     ...discoverAdoptableZellijSessions(botCliId),
                 ];
-                if (sessions.length === 0) {
+                // Second filter: sessions resumable from disk (paseo-style import).
+                // Only the bot's OWN CLI is offered (resume needs that CLI's binary).
+                const resumable = botCliId
+                    ? await discoverResumableSessionsForBot(botCliId, botCfgForAdopt?.cliPathOverride, activeSessions)
+                    : [];
+                if (sessions.length === 0 && resumable.length === 0) {
                     await sessionReply(rootId, t('cmd.adopt.no_sessions', undefined, loc));
                     break;
                 }
@@ -1445,15 +1452,22 @@ export async function handleCommand(cmd, rootId, message, deps, larkAppId) {
                     const target = sessions.find(s => 'zellijPaneId' in s
                         ? `${s.zellijSession}:${s.zellijPaneId}` === zellijNorm
                         : adoptTargetLabel(s) === directTarget || adoptTargetKey(s) === directTarget || s.tmuxTarget === directTarget || s.herdrPaneId === directTarget);
-                    if (!target) {
-                        await sessionReply(rootId, t('cmd.adopt.pane_not_found', { pane: directTarget }, loc));
+                    if (target) {
+                        if (ds)
+                            await startAdoptSession(target, ds, deps, larkAppId);
+                        break;
+                    }
+                    // Fall back to a resumable session matched by its CLI-native id.
+                    const resumeTarget = resumable.find(r => r.cliSessionId === directTarget);
+                    if (resumeTarget) {
+                        if (ds)
+                            await startResumeImportSession(resumeTarget, ds, deps, larkAppId);
                         break;
                     }
-                    if (ds)
-                        await startAdoptSession(target, ds, deps, larkAppId);
+                    await sessionReply(rootId, t('cmd.adopt.pane_not_found', { pane: directTarget }, loc));
                     break;
                 }
-                const cardJson = buildAdoptSelectCard(sessions, rootId, loc);
+                const cardJson = buildAdoptSelectCard(sessions, rootId, loc, resumable);
                 await sessionReply(rootId, cardJson, 'interactive');
                 break;
             }
@@ -2388,4 +2402,61 @@ export async function startAdoptSession(target, ds, deps, larkAppId) {
     const cliName = getCliDisplayName(target.cliId);
     await sessionReply(sessionAnchorId(ds), t('cmd.adopt.success', { cliName, project, pane }, loc));
 }
+/** Discover the sessions resumable from disk for `cliId`, excluding any whose
+ *  CLI-native id is already live in a botmux session (so a session botmux
+ *  already runs isn't offered for re-import). Returns [] when the adapter has
+ *  no on-disk store. */
+export async function discoverResumableSessionsForBot(cliId, cliPathOverride, activeSessions, limit = 20) {
+    let adapter;
+    try {
+        adapter = createCliAdapterSync(cliId, cliPathOverride);
+    }
+    catch {
+        return [];
+    }
+    if (!adapter.listResumableSessions)
+        return [];
+    // Exclude every session botmux already manages — live OR closed — so the
+    // picker surfaces only genuinely external sessions (a CLI the user ran
+    // standalone). botmux's own closed sessions stay resumable via their
+    // session-closed cards, so hiding them here avoids a redundant, confusing
+    // duplicate. The identity set spans all bot stores and includes both the
+    // botmux sessionId (= the claude jsonl filename) and the cliSessionId
+    // (codex/traex rollout id), covering every CLI's id shape. Passed INTO the
+    // adapter so exclusion happens BEFORE the `limit` truncation.
+    const exclude = sessionStore.collectBotmuxSessionIdentities() ?? new Set();
+    // Belt-and-suspenders: also fold in the in-memory active map (freshest).
+    for (const ds of activeSessions.values()) {
+        if (ds.session.sessionId)
+            exclude.add(ds.session.sessionId);
+        if (ds.session.cliSessionId)
+            exclude.add(ds.session.cliSessionId);
+    }
+    try {
+        return await adapter.listResumableSessions({ limit, exclude });
+    }
+    catch {
+        return [];
+    }
+}
+/** Import (resume) a stored session into the current topic: re-spawn the bot's
+ *  CLI via `--resume <cliSessionId>` in `cwd`. Mirrors the manual resume path —
+ *  the worker owns the CLI (NOT an observe-adopt), so no `adoptedFrom` is set. */
+export async function startResumeImportSession(target, ds, deps, larkAppId) {
+    const sessionReply = (rid, content, msgType) => deps.sessionReply(rid, content, msgType, larkAppId);
+    const loc = localeForBot(ds.larkAppId ?? larkAppId);
+    const project = target.cwd.split('/').pop() || target.cwd;
+    ds.workingDir = target.cwd;
+    ds.session.workingDir = target.cwd;
+    ds.session.cliSessionId = target.cliSessionId;
+    ds.session.title = target.title || `Import: ${project}`;
+    // Resume sandbox decision is left to forkWorker (resume=true → not sandboxed,
+    // matching restore semantics). Mark history so the session is treated as a
+    // resume, not a fresh spawn.
+    ds.hasHistory = true;
+    sessionStore.updateSession(ds.session);
+    forkWorker(ds, '', true);
+    const cliName = getCliDisplayName(getBot(ds.larkAppId).config.cliId);
+    await sessionReply(sessionAnchorId(ds), t('cmd.adopt.resume_success', { cliName, project, title: target.title || target.cliSessionId.slice(0, 8) }, loc));
+}
 //# sourceMappingURL=command-handler.js.map