@adhdev/daemon-core 0.7.44 → 0.7.46

package/src/cli-adapters/provider-cli-adapter.ts

@@ -276,7 +276,7 @@ function shSingleQuote(arg: string): string {
     return `'${arg.replace(/'/g, `'\\''`)}'`;
 }
 
-function estimatePromptDisplayLines(text: string, cols = 100): number {
+function estimatePromptDisplayLines(text: string, cols = 80): number {
     const normalized = String(text || '').replace(/\r/g, '');
     if (!normalized) return 1;
     return normalized
@@ -433,7 +433,7 @@ export class ProviderCliAdapter implements CliAdapter {
     /** Full accumulated raw PTY output (with ANSI) */
     private accumulatedRawBuffer: string = '';
     /** Current visible terminal screen snapshot */
-    private terminalScreen = new TerminalScreen(30, 100);
+    private terminalScreen = new TerminalScreen(24, 80);
     /** Max accumulated buffer size (last 50KB) */
     private static readonly MAX_ACCUMULATED_BUFFER = 50000;
     private currentTurnScope: TurnParseScope | null = null;
@@ -620,8 +620,8 @@ export class ProviderCliAdapter implements CliAdapter {
         }
 
         const ptyOpts = {
-            cols: 100,
-            rows: 30,
+            cols: 80,
+            rows: 24,
             cwd: this.workingDir,
             env: buildCliSpawnEnv(process.env, spawnConfig.env),
         };
@@ -684,7 +684,7 @@ export class ProviderCliAdapter implements CliAdapter {
         this.spawnAt = Date.now();
         this.startupParseGate = true;
         this.startupBuffer = '';
-        this.terminalScreen.reset(30, 100);
+        this.terminalScreen.reset(24, 80);
         this.pendingTerminalQueryTail = '';
         this.currentTurnScope = null;
         this.ready = false;
@@ -1025,6 +1025,7 @@ export class ProviderCliAdapter implements CliAdapter {
                 title: parsed.title || this.cliName,
                 messages: parsed.messages,
                 activeModal: parsed.activeModal ?? this.activeModal,
+                providerSessionId: typeof parsed.providerSessionId === 'string' ? parsed.providerSessionId : undefined,
             };
         }
 
@@ -1222,6 +1223,11 @@ export class ProviderCliAdapter implements CliAdapter {
         return this.ptyProcess.getMetadata();
     }
 
+    updateRuntimeMeta(meta: Record<string, unknown>, replace = false): void {
+        if (!this.ptyProcess || typeof this.ptyProcess.updateMeta !== 'function') return;
+        this.ptyProcess.updateMeta(meta, replace);
+    }
+
     cancel(): void { this.shutdown(); }
 
     async saveAndStop(): Promise<void> {

package/src/cli-adapters/pty-transport.ts

@@ -43,6 +43,7 @@ export interface PtyRuntimeTransport {
   kill(): void;
   clearBuffer?(): void;
   detach?(): void;
+  updateMeta?(meta: Record<string, unknown>, replace?: boolean): void;
   getMetadata?(): PtyRuntimeMetadata | null;
   onData(callback: (data: string) => void): void;
   onExit(callback: (info: { exitCode: number }) => void): void;

package/src/cli-adapters/session-host-transport.ts

@@ -171,6 +171,25 @@ class SessionHostRuntimeTransport implements PtyRuntimeTransport {
         });
     }
 
+    updateMeta(meta: Record<string, unknown>, replace = false): void {
+        this.enqueue(async () => {
+            const response = await this.client.request<SessionHostRecord>({
+                type: 'update_session_meta',
+                payload: {
+                    sessionId: this.options.runtimeId,
+                    meta,
+                    replace,
+                },
+            });
+            if (!response?.success) {
+                throw new Error(response.error || `Failed to update runtime meta ${this.options.runtimeId}`);
+            }
+            if (response.result) {
+                this.updateMetadata(response.result);
+            }
+        });
+    }
+
     private async boot(): Promise<void> {
         await this.client.connect();
         this.unsubscribe = this.client.onEvent((event: SessionHostEvent) => this.handleEvent(event));

package/src/commands/chat-commands.ts

@@ -59,6 +59,19 @@ function buildRecentSendKey(h: CommandHelpers, args: any, provider: any, text: s
     return `${transport}:${target}:${text.trim()}`;
 }
 
+function getHistorySessionId(h: CommandHelpers, args: any): string | undefined {
+    const explicit = typeof args?.historySessionId === 'string' ? args.historySessionId.trim() : '';
+    if (explicit) return explicit;
+
+    const targetSessionId = typeof args?.targetSessionId === 'string' ? args.targetSessionId.trim() : '';
+    if (!targetSessionId) return undefined;
+
+    const instance = h.ctx.instanceManager?.getInstance(targetSessionId) as any;
+    const state = instance?.getState?.();
+    const providerSessionId = typeof state?.providerSessionId === 'string' ? state.providerSessionId.trim() : '';
+    return providerSessionId || targetSessionId;
+}
+
 function isRecentDuplicateSend(key: string): boolean {
     const now = Date.now();
     for (const [candidate, ts] of recentSendByTarget.entries()) {
@@ -72,11 +85,11 @@ function isRecentDuplicateSend(key: string): boolean {
 
 export async function handleChatHistory(h: CommandHelpers, args: any): Promise<CommandResult> {
     const { agentType, offset, limit } = args;
-    const instanceId = args?.targetSessionId;
+    const historySessionId = getHistorySessionId(h, args);
     try {
         const provider = h.getProvider(agentType);
         const agentStr = provider?.type || agentType || getCurrentProviderType(h);
-        const result = readChatHistory(agentStr, offset || 0, limit || 30, instanceId);
+        const result = readChatHistory(agentStr, offset || 0, limit || 30, historySessionId);
         return { success: true, ...result, agent: agentStr };
     } catch (e: any) {
         return { success: false, error: e.message };
@@ -86,6 +99,7 @@ export async function handleChatHistory(h: CommandHelpers, args: any): Promise<C
 export async function handleReadChat(h: CommandHelpers, args: any): Promise<CommandResult> {
     const provider = h.getProvider(args?.agentType);
     const transport = getTargetTransport(h, provider);
+    const historySessionId = getHistorySessionId(h, args);
 
     const _log = (msg: string) => LOG.debug('Command', `[read_chat] ${msg}`);
 
@@ -120,7 +134,8 @@ export async function handleReadChat(h: CommandHelpers, args: any): Promise<Comm
                         provider?.type || 'unknown_extension',
                         parsed.messages || [],
                         parsed.title,
-                        args?.targetSessionId
+                        args?.targetSessionId,
+                        historySessionId,
                     );
                     return { success: true, ...parsed };
                 }
@@ -142,7 +157,8 @@ export async function handleReadChat(h: CommandHelpers, args: any): Promise<Comm
                         stream.agentType,
                         stream.messages || [],
                         undefined,
-                        args?.targetSessionId
+                        args?.targetSessionId,
+                        historySessionId,
                     );
                     return { success: true, messages: stream.messages || [], status: stream.status, agentType: stream.agentType };
                 }
@@ -169,11 +185,12 @@ export async function handleReadChat(h: CommandHelpers, args: any): Promise<Comm
                 if (typeof parsed === 'string') { try { parsed = JSON.parse(parsed); } catch { } }
                 if (parsed && typeof parsed === 'object') {
                     _log(`Webview OK: ${parsed.messages?.length || 0} msgs`);
-                    h.historyWriter.appendNewMessages(
+                h.historyWriter.appendNewMessages(
                     provider?.type || getCurrentProviderType(h, 'unknown_webview'),
                     parsed.messages || [],
                     parsed.title,
-                    args?.targetSessionId
+                    args?.targetSessionId,
+                    historySessionId,
                 );
                     return { success: true, ...parsed };
                 }
@@ -197,7 +214,8 @@ export async function handleReadChat(h: CommandHelpers, args: any): Promise<Comm
                     provider?.type || getCurrentProviderType(h, 'unknown_ide'),
                     parsed.messages || [],
                     parsed.title,
-                    args?.targetSessionId
+                    args?.targetSessionId,
+                    historySessionId,
                 );
                 return { success: true, ...parsed };
             }
@@ -216,13 +234,15 @@ export async function handleSendChat(h: CommandHelpers, args: any): Promise<Comm
     const provider = h.getProvider(args?.agentType);
     const transport = getTargetTransport(h, provider);
     const dedupeKey = buildRecentSendKey(h, args, provider, text);
+    const historySessionId = getHistorySessionId(h, args);
 
     const _logSendSuccess = (method: string, targetAgent?: string) => {
         h.historyWriter.appendNewMessages(
             targetAgent || provider?.type || getCurrentProviderType(h, 'unknown_agent'),
             [{ role: 'user', content: text, receivedAt: Date.now() }],
             undefined, // title
-            args?.targetSessionId
+            args?.targetSessionId,
+            historySessionId,
         );
         return { success: true, sent: true, method, targetAgent };
     };

package/src/commands/cli-manager.ts

@@ -14,10 +14,12 @@ import { detectCLI } from '../detection/cli-detector.js';
 import { loadConfig, saveConfig } from '../config/config.js';
 import { getWorkspaceState, resolveLaunchDirectory } from '../config/workspaces.js';
 import { appendRecentActivity } from '../config/recent-activity.js';
+import { upsertSavedProviderSession } from '../config/saved-sessions.js';
 import { CliProviderInstance } from '../providers/cli-provider-instance.js';
 import { AcpProviderInstance } from '../providers/acp-provider-instance.js';
 import type { ProviderInstanceManager } from '../providers/provider-instance-manager.js';
 import { ProviderLoader } from '../providers/provider-loader.js';
+import type { ProviderModule, ProviderResumeCapability } from '../providers/contracts.js';
 import type { CliAdapter } from '../cli-adapter-types.js';
 import type { PtyTransportFactory } from '../cli-adapters/pty-transport.js';
 import type { SessionRegistry } from '../sessions/registry.js';
@@ -29,7 +31,7 @@ export interface CliManagerDeps {
  /** Server connection — injected into adapter */
     getServerConn(): any | null;
  /** P2P — PTY output transmit */
-    getP2p(): { broadcastPtyOutput(key: string, data: string): void } | null;
+    getP2p(): { broadcastSessionOutput(key: string, data: string): void } | null;
  /** StatusReporter callback */
     onStatusChange(): void;
     removeAgentTracking(key: string): void;
@@ -47,6 +49,7 @@ export interface CliTransportFactoryParams {
     providerType: string;
     workspace: string;
     cliArgs?: string[];
+    providerSessionId?: string;
     attachExisting?: boolean;
 }
 
@@ -60,6 +63,7 @@ export interface HostedCliRuntimeDescriptor {
     cliType: string;
     workspace: string;
     cliArgs?: string[];
+    providerSessionId?: string;
 }
 
 const chalkApi: any = (chalk as any)?.yellow
@@ -71,6 +75,148 @@ function colorize(color: 'red' | 'green' | 'yellow' | 'cyan', text: string): str
     return typeof fn === 'function' ? fn(text) : text;
 }
 
+type CliLaunchMode = 'new' | 'resume' | 'manual';
+
+type CliSessionBinding = {
+    cliArgs?: string[];
+    providerSessionId?: string;
+    launchMode: CliLaunchMode;
+};
+
+function isUuid(value: string): boolean {
+    return /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i.test(value);
+}
+
+function readArgValue(args: string[], flags: string[]): string | undefined {
+    for (let index = 0; index < args.length; index += 1) {
+        const arg = args[index];
+        for (const flag of flags) {
+            if (arg === flag) {
+                const next = args[index + 1];
+                if (next && !next.startsWith('-')) return next;
+            }
+            const prefix = `${flag}=`;
+            if (arg.startsWith(prefix)) return arg.slice(prefix.length);
+        }
+    }
+    return undefined;
+}
+
+function hasArg(args: string[], flags: string[]): boolean {
+    return args.some((arg) => flags.some((flag) => arg === flag || arg.startsWith(`${flag}=`)));
+}
+
+function expandResumeArgs(template: string[] | undefined, sessionId: string): string[] | undefined {
+    if (!Array.isArray(template) || template.length === 0) return undefined;
+    return template.map((part) => part === '{{id}}' ? sessionId : part);
+}
+
+function readCodexResumeSessionId(args: string[]): string | undefined {
+    const resumeIndex = args.findIndex((arg) => arg === 'resume' || arg === 'fork');
+    if (resumeIndex < 0) return undefined;
+    const candidate = args[resumeIndex + 1];
+    if (!candidate || candidate.startsWith('-')) return undefined;
+    return candidate;
+}
+
+function detectExplicitProviderSessionId(
+    normalizedType: string,
+    args: string[],
+): { providerSessionId?: string; launchMode: CliLaunchMode } {
+    const explicitResumeId = readArgValue(args, ['--resume', '-r']);
+    if (explicitResumeId) {
+        return { providerSessionId: explicitResumeId, launchMode: 'resume' };
+    }
+
+    const explicitSessionFlagId = readArgValue(args, ['--session']);
+    if (explicitSessionFlagId) {
+        return {
+            providerSessionId: explicitSessionFlagId,
+            launchMode: 'resume',
+        };
+    }
+
+    const explicitSessionId = readArgValue(args, ['--session-id']);
+    if (explicitSessionId) {
+        if (normalizedType === 'goose-cli' && !hasArg(args, ['--resume', '-r'])) {
+            return { launchMode: 'manual' };
+        }
+        const isResume = normalizedType === 'goose-cli'
+            ? hasArg(args, ['--resume', '-r'])
+            : (hasArg(args, ['--continue']) || hasArg(args, ['--resume', '-r']));
+        return {
+            providerSessionId: explicitSessionId,
+            launchMode: isResume ? 'resume' : 'new',
+        };
+    }
+
+    if (normalizedType === 'codex-cli') {
+        const codexSessionId = readCodexResumeSessionId(args);
+        if (codexSessionId) {
+            return { providerSessionId: codexSessionId, launchMode: 'resume' };
+        }
+    }
+
+    return { launchMode: 'manual' };
+}
+
+export function supportsExplicitSessionResume(resume?: ProviderResumeCapability): boolean {
+    return !!(resume?.supported && Array.isArray(resume.resumeSessionArgs) && resume.resumeSessionArgs.length > 0);
+}
+
+function supportsExplicitSessionStart(resume?: ProviderResumeCapability): boolean {
+    return !!(resume?.supported && Array.isArray(resume.newSessionArgs) && resume.newSessionArgs.length > 0);
+}
+
+function resolveCliSessionBinding(
+    provider: ProviderModule | undefined,
+    normalizedType: string,
+    cliArgs?: string[],
+    requestedResumeSessionId?: string,
+): CliSessionBinding {
+    const baseArgs = Array.isArray(cliArgs) ? [...cliArgs] : undefined;
+    const resume = provider?.resume;
+    if (!resume?.supported) {
+        return { cliArgs: baseArgs, launchMode: 'manual' };
+    }
+
+    const explicit = detectExplicitProviderSessionId(normalizedType, baseArgs || []);
+    if (explicit.providerSessionId) {
+        return {
+            cliArgs: baseArgs,
+            providerSessionId: explicit.providerSessionId,
+            launchMode: explicit.launchMode,
+        };
+    }
+
+    if (requestedResumeSessionId) {
+        if (resume.sessionIdFormat === 'uuid' && !isUuid(requestedResumeSessionId)) {
+            throw new Error(`Invalid ${provider?.displayName || provider?.name || normalizedType} session ID: ${requestedResumeSessionId}`);
+        }
+        const resumeSessionArgs = expandResumeArgs(resume.resumeSessionArgs, requestedResumeSessionId);
+        if (!resumeSessionArgs) {
+            return { cliArgs: baseArgs, launchMode: 'manual' };
+        }
+        return {
+            cliArgs: [...(baseArgs || []), ...resumeSessionArgs],
+            providerSessionId: requestedResumeSessionId,
+            launchMode: 'resume',
+        };
+    }
+
+    if (!supportsExplicitSessionStart(resume)) {
+        return { cliArgs: baseArgs, launchMode: 'manual' };
+    }
+
+    const providerSessionId = crypto.randomUUID();
+    const newSessionArgs = expandResumeArgs(resume.newSessionArgs, providerSessionId);
+    return {
+        cliArgs: [...(baseArgs || []), ...(newSessionArgs || [])],
+        providerSessionId,
+        launchMode: 'new',
+    };
+}
+
 // ─── DaemonCliManager ────────────────────────────
 
 export class DaemonCliManager {
@@ -107,13 +253,26 @@ export class DaemonCliManager {
         kind: 'ide' | 'cli' | 'acp';
         providerType: string;
         providerName: string;
+        providerSessionId?: string;
         workspace?: string;
         currentModel?: string;
         sessionId?: string;
         title?: string;
     }): void {
         try {
-            saveConfig(appendRecentActivity(loadConfig(), entry));
+            let nextConfig = appendRecentActivity(loadConfig(), entry);
+            if (entry.providerSessionId && (entry.kind === 'cli' || entry.kind === 'acp')) {
+                nextConfig = upsertSavedProviderSession(nextConfig, {
+                    kind: entry.kind,
+                    providerType: entry.providerType,
+                    providerName: entry.providerName,
+                    providerSessionId: entry.providerSessionId,
+                    workspace: entry.workspace,
+                    currentModel: entry.currentModel,
+                    title: entry.title,
+                });
+            }
+            saveConfig(nextConfig);
         } catch (e) {
             console.error(colorize('red', `  ✗ Failed to save recent activity: ${e}`));
         }
@@ -124,6 +283,7 @@ export class DaemonCliManager {
         providerType: string,
         workspace: string,
         cliArgs?: string[],
+        providerSessionId?: string,
         attachExisting = false,
     ): PtyTransportFactory | undefined {
         return this.deps.createPtyTransportFactory?.({
@@ -131,6 +291,7 @@ export class DaemonCliManager {
             providerType,
             workspace,
             cliArgs,
+            providerSessionId,
             attachExisting,
         }) || undefined;
     }
@@ -140,6 +301,7 @@ export class DaemonCliManager {
         workingDir: string,
         cliArgs: string[] | undefined,
         runtimeId: string,
+        providerSessionId?: string,
         attachExisting = false,
     ): CliAdapter {
  // cliType normalize (Resolve alias)
@@ -150,7 +312,14 @@ export class DaemonCliManager {
         if (provider && provider.category === 'cli' && provider.patterns && provider.spawn) {
             console.log(colorize('cyan', `  📦 Using provider: ${provider.name} (${provider.type})`));
             const resolvedProvider = this.providerLoader.resolve(normalizedType) || provider;
-            const transportFactory = this.getTransportFactory(runtimeId, normalizedType, workingDir, cliArgs, attachExisting);
+            const transportFactory = this.getTransportFactory(
+                runtimeId,
+                normalizedType,
+                workingDir,
+                cliArgs,
+                providerSessionId,
+                attachExisting,
+            );
             return new ProviderCliAdapter(resolvedProvider as any, workingDir, cliArgs, transportFactory);
         }
 
@@ -191,18 +360,37 @@ export class DaemonCliManager {
         provider: any,
         settings: Record<string, any>,
         attachExisting = false,
+        options?: {
+            providerSessionId?: string;
+            launchMode?: CliLaunchMode;
+            onProviderSessionResolved?: (info: {
+                instanceId: string;
+                providerType: string;
+                providerName: string;
+                workspace: string;
+                providerSessionId: string;
+                previousProviderSessionId?: string;
+            }) => void;
+        },
     ): Promise<void> {
         const instanceManager = this.deps.getInstanceManager();
         const sessionRegistry = this.deps.getSessionRegistry?.() || null;
         if (!instanceManager) throw new Error('InstanceManager not available');
-        const transportFactory = this.getTransportFactory(key, normalizedType, resolvedDir, cliArgs, attachExisting);
-        const cliInstance = new CliProviderInstance(provider, resolvedDir, cliArgs, key, transportFactory);
+        const transportFactory = this.getTransportFactory(
+            key,
+            normalizedType,
+            resolvedDir,
+            cliArgs,
+            options?.providerSessionId,
+            attachExisting,
+        );
+        const cliInstance = new CliProviderInstance(provider, resolvedDir, cliArgs, key, transportFactory, options);
         try {
             await instanceManager.addInstance(key, cliInstance, {
                 serverConn: this.deps.getServerConn(),
                 settings,
                 onPtyData: (data: string) => {
-                    this.deps.getP2p()?.broadcastPtyOutput(cliInstance.instanceId, data);
+                    this.deps.getP2p()?.broadcastSessionOutput(cliInstance.instanceId, data);
                 },
             });
             sessionRegistry?.register({
@@ -225,7 +413,13 @@ export class DaemonCliManager {
 
  // ─── Session start/management ──────────────────────────────
 
-    async startSession(cliType: string, workingDir: string, cliArgs?: string[], initialModel?: string): Promise<void> {
+    async startSession(
+        cliType: string,
+        workingDir: string,
+        cliArgs?: string[],
+        initialModel?: string,
+        options?: { resumeSessionId?: string },
+    ): Promise<{ runtimeSessionId: string; providerSessionId?: string }> {
         const trimmed = (workingDir || '').trim();
         if (!trimmed) throw new Error('working directory required');
         const resolvedDir = trimmed.startsWith('~')
@@ -319,7 +513,7 @@ export class DaemonCliManager {
                 title: provider.displayName || provider.name || normalizedType,
             });
             this.deps.onStatusChange();
-            return;
+            return { runtimeSessionId: sessionId };
         }
 
  // ─── CLI category handling (existing) ───
@@ -331,8 +525,9 @@ export class DaemonCliManager {
             console.log(colorize('cyan', `  📦 Using provider: ${provider.name} (${provider.type})`));
         }
 
- // ─── Resolve launch options → extra args ───
-        const resolvedCliArgs = cliArgs;
+ // ─── Resolve launch options → provider session binding ───
+        const sessionBinding = resolveCliSessionBinding(provider, normalizedType, cliArgs, options?.resumeSessionId);
+        const resolvedCliArgs = sessionBinding.cliArgs;
 
  // If InstanceManager exists, manage as CliProviderInstance unified
         const instanceManager = this.deps.getInstanceManager();
@@ -347,11 +542,32 @@ export class DaemonCliManager {
                 resolvedProvider,
                 {},
                 false,
+                {
+                    providerSessionId: sessionBinding.providerSessionId,
+                    launchMode: sessionBinding.launchMode,
+                    onProviderSessionResolved: ({ providerSessionId, providerName, providerType, workspace }) => {
+                        this.persistRecentActivity({
+                            kind: 'cli',
+                            providerType,
+                            providerName,
+                            providerSessionId,
+                            workspace,
+                            title: providerName,
+                        });
+                    },
+                },
             );
             console.log(colorize('green', `  ✓ CLI started: ${cliInfo.displayName} v${cliInfo.version || 'unknown'} in ${resolvedDir}`));
         } else {
  // Fallback: InstanceManager without directly adapter manage
-            const adapter = this.createAdapter(cliType, resolvedDir, resolvedCliArgs, key, false);
+            const adapter = this.createAdapter(
+                cliType,
+                resolvedDir,
+                resolvedCliArgs,
+                key,
+                sessionBinding.providerSessionId,
+                false,
+            );
             try {
                 await adapter.spawn();
             } catch (spawnErr: any) {
@@ -380,7 +596,7 @@ export class DaemonCliManager {
 
             if (typeof adapter.setOnPtyData === 'function') {
                 adapter.setOnPtyData((data: string) => {
-                    this.deps.getP2p()?.broadcastPtyOutput(key, data);
+                    this.deps.getP2p()?.broadcastSessionOutput(key, data);
                 });
             }
 
@@ -392,6 +608,7 @@ export class DaemonCliManager {
             kind: 'cli',
             providerType: normalizedType,
             providerName: provider?.displayName || provider?.name || normalizedType,
+            providerSessionId: sessionBinding.providerSessionId,
             workspace: resolvedDir,
             currentModel: initialModel,
             sessionId: key,
@@ -399,6 +616,10 @@ export class DaemonCliManager {
         });
 
         this.deps.onStatusChange();
+        return {
+            runtimeSessionId: key,
+            providerSessionId: sessionBinding.providerSessionId,
+        };
     }
 
     async stopSession(key: string): Promise<void> {
@@ -464,6 +685,12 @@ export class DaemonCliManager {
             if (!providerMeta || providerMeta.category !== 'cli') continue;
 
             const resolvedProvider = this.providerLoader.resolve(normalizedType) || providerMeta;
+            const sessionBinding = resolveCliSessionBinding(
+                resolvedProvider,
+                normalizedType,
+                record.cliArgs,
+                record.providerSessionId,
+            );
             try {
                 await this.registerCliInstance(
                     record.runtimeId,
@@ -474,6 +701,10 @@ export class DaemonCliManager {
                     resolvedProvider,
                     {},
                     true,
+                    {
+                        providerSessionId: sessionBinding.providerSessionId,
+                        launchMode: 'manual',
+                    },
                 );
                 restored += 1;
                 LOG.info('CLI', `♻ Restored hosted runtime: ${record.runtimeKey || record.runtimeId} (${record.displayName || record.workspace})`);
@@ -562,17 +793,23 @@ export class DaemonCliManager {
                 const launchSource = resolved.source;
                 if (!cliType) throw new Error('cliType required');
 
-                await this.startSession(cliType, dir, args?.cliArgs, args?.initialModel);
-
- // On startSession success, new UUID key exists in adapters (last added item)
-                let newKey: string | null = null;
-                for (const [k, adapter] of this.adapters) {
-                    if (adapter.cliType === cliType && adapter.workingDir === dir) {
-                        newKey = k; // Last match = just added item
-                    }
-                }
+                const started = await this.startSession(
+                    cliType,
+                    dir,
+                    args?.cliArgs,
+                    args?.initialModel,
+                    { resumeSessionId: args?.resumeSessionId },
+                );
 
-                return { success: true, cliType, dir, id: newKey, launchSource };
+                return {
+                    success: true,
+                    cliType,
+                    dir,
+                    id: started.runtimeSessionId,
+                    sessionId: started.runtimeSessionId,
+                    providerSessionId: started.providerSessionId,
+                    launchSource,
+                };
             }
             case 'stop_cli': {
                 const cliType = args?.cliType;