aimux-cli 0.1.16 → 0.1.19

package/dist/multiplexer/services.js

@@ -4,11 +4,12 @@ import { findMainRepo } from "../worktree.js";
 import { getStatePath } from "../paths.js";
 import { wrapCommandWithShellIntegration, wrapInteractiveShellWithIntegration } from "../shell-hooks.js";
 import { markLastUsed } from "../last-used.js";
+import { removeTopologyService, upsertTopologyService, } from "../runtime-core/topology-services.js";
 export function generateServiceId() {
     return `service-${randomUUID().slice(0, 8)}`;
 }
 export function getServiceLaunchCommandLine(metadata) {
-    return metadata.command === "shell" ? "" : metadata.args?.[0] === "-lc" ? (metadata.args[1] ?? "") : "";
+    return metadata.args?.[0] === "-lc" ? (metadata.args[1] ?? "") : "";
 }
 function shellQuote(value) {
     return `'${value.replace(/'/g, `'\\''`)}'`;
@@ -29,13 +30,14 @@ function buildServiceLaunchScript(commandLine, shellPath) {
     ].join("; ");
 }
 export function buildServiceStateFromMetadata(serviceId, metadata, opts = {}) {
+    const launchCommandLine = metadata.launchCommandLine?.trim() || getServiceLaunchCommandLine(metadata);
     return {
         id: serviceId,
         createdAt: metadata.createdAt,
         worktreePath: metadata.worktreePath,
         cwd: opts.cwd,
         label: metadata.label,
-        launchCommandLine: getServiceLaunchCommandLine(metadata),
+        launchCommandLine,
         tmuxTarget: opts.tmuxTarget,
         retained: opts.retained,
     };
@@ -55,6 +57,30 @@ function markServiceUsed(host, serviceId) {
     }
     catch { }
 }
+function serviceMetadataToTopologyState(serviceId, metadata, opts = {}) {
+    return {
+        id: serviceId,
+        command: metadata.command,
+        args: metadata.args ?? [],
+        createdAt: metadata.createdAt?.trim() || undefined,
+        worktreePath: metadata.worktreePath,
+        cwd: opts.cwd,
+        label: metadata.label,
+        launchCommandLine: metadata.launchCommandLine?.trim() || getServiceLaunchCommandLine(metadata),
+        tmuxTarget: opts.tmuxTarget,
+    };
+}
+function serviceStateToTopologyState(service) {
+    return {
+        id: service.id,
+        createdAt: service.createdAt?.trim() || undefined,
+        worktreePath: service.worktreePath,
+        cwd: service.cwd,
+        label: service.label,
+        launchCommandLine: service.launchCommandLine,
+        tmuxTarget: service.tmuxTarget,
+    };
+}
 export function serviceLabelForCommand(commandLine) {
     const trimmed = commandLine.trim();
     if (!trimmed)
@@ -96,7 +122,7 @@ export function createService(host, commandLine, worktreePath, opts) {
     const tmuxSession = host.tmuxRuntimeManager.ensureProjectSession(process.cwd());
     const shouldRenderPending = host.startedInDashboard && host.mode === "dashboard";
     if (shouldRenderPending) {
-        host.setPendingDashboardSessionAction(serviceId, "creating", {
+        host.setPendingDashboardServiceAction(serviceId, "creating", {
             serviceSeed: {
                 id: serviceId,
                 command: trimmed ? shell : "shell",
@@ -123,19 +149,30 @@ export function createService(host, commandLine, worktreePath, opts) {
             createdAt: new Date().toISOString(),
             worktreePath,
             label,
+            launchCommandLine: trimmed,
         });
+        upsertTopologyService({
+            id: serviceId,
+            command: trimmed ? shell : "shell",
+            args: trimmed ? ["-lc", trimmed] : ["-l"],
+            launchCommandLine: trimmed,
+            worktreePath,
+            cwd,
+            label,
+            tmuxTarget: target,
+        }, "running");
         host.tmuxRuntimeManager.applyManagedAgentWindowPolicy(target, "service");
         host.saveState();
         host.invalidateDesktopStateSnapshot();
         host.refreshLocalDashboardModel();
         host.updateWorktreeSessions();
         host.preferDashboardEntrySelection("service", serviceId, worktreePath);
-        host.settleDashboardCreatePending(serviceId);
+        host.settleDashboardCreatePending(serviceId, "service");
         return { serviceId };
     }
     catch (error) {
         if (shouldRenderPending) {
-            host.setPendingDashboardSessionAction(serviceId, null);
+            host.setPendingDashboardServiceAction(serviceId, null);
         }
         throw error;
     }
@@ -159,6 +196,10 @@ export function stopService(host, serviceId) {
             retained: true,
         }),
     ];
+    upsertTopologyService(serviceMetadataToTopologyState(serviceId, match.metadata, {
+        cwd,
+        tmuxTarget: match.target,
+    }), "stopped");
     host.tmuxRuntimeManager.sendKey(match.target, "C-c");
     host.tmuxRuntimeManager.setWindowMetadata(match.target, {
         ...match.metadata,
@@ -190,6 +231,7 @@ export function removeOfflineService(host, serviceId) {
         catch { }
     }
     host.offlineServices = host.offlineServices.filter((service) => service.id !== serviceId);
+    removeTopologyService(serviceId);
     const statePath = getStatePath();
     if (existsSync(statePath)) {
         try {
@@ -274,11 +316,19 @@ export function resumeOfflineService(host, service) {
         sessionId: service.id,
         command: launchCommandLine ? shell : "shell",
         args: launchCommandLine ? ["-lc", launchCommandLine] : ["-l"],
+        launchCommandLine,
         toolConfigKey: "service",
         createdAt: service.createdAt ?? new Date().toISOString(),
         worktreePath: service.worktreePath,
         label,
     });
+    upsertTopologyService({
+        ...serviceStateToTopologyState(service),
+        command: launchCommandLine ? shell : "shell",
+        args: launchCommandLine ? ["-lc", launchCommandLine] : ["-l"],
+        label,
+        tmuxTarget: target,
+    }, "running");
     host.tmuxRuntimeManager.applyManagedAgentWindowPolicy(target, "service");
     host.offlineServices = host.offlineServices.filter((entry) => entry.id !== service.id);
     markServiceUsed(host, service.id);
@@ -306,4 +356,3 @@ export function resumeOfflineServiceById(host, serviceId) {
     const restored = buildServiceStateFromMetadata(serviceId, existing.metadata);
     return resumeOfflineService(host, restored);
 }
-//# sourceMappingURL=services.js.map

package/dist/multiplexer/session-capture.d.ts

@@ -0,0 +1 @@
+export declare function extractCodexBackendSessionIdFromArgs(args: string[]): string | undefined;

package/dist/multiplexer/session-capture.js

@@ -0,0 +1,23 @@
+export function extractCodexBackendSessionIdFromArgs(args) {
+    for (let i = 0; i < args.length; i += 1) {
+        const arg = args[i];
+        if (arg === "resume") {
+            const next = args[i + 1]?.trim();
+            if (next && !next.startsWith("-"))
+                return next;
+            continue;
+        }
+        if (arg === "--resume") {
+            const next = args[i + 1]?.trim();
+            if (next && !next.startsWith("-"))
+                return next;
+            continue;
+        }
+        if (arg.startsWith("--resume=")) {
+            const value = arg.slice("--resume=".length).trim();
+            if (value)
+                return value;
+        }
+    }
+    return undefined;
+}

package/dist/multiplexer/session-launch.d.ts

@@ -1,4 +1,7 @@
+import type { SessionTeamMetadata } from "../team.js";
 type SessionLaunchHost = any;
+export declare function summarizeLaunchArgs(args: string[]): string[];
+export declare function injectCodexDeveloperInstructions(args: string[], key: string, instructions: string): string[];
 export declare function run(host: SessionLaunchHost, opts: {
     command: string;
     args: string[];
@@ -7,7 +10,7 @@ export declare function runDashboard(host: SessionLaunchHost): Promise<number>;
 export declare function runProjectService(host: SessionLaunchHost): Promise<number>;
 export declare function resumeSessions(host: SessionLaunchHost, toolFilter?: string): Promise<number>;
 export declare function restoreSessions(host: SessionLaunchHost, toolFilter?: string): Promise<number>;
-export declare function createSession(host: SessionLaunchHost, command: string, args: string[], preambleFlag?: string[], toolConfigKey?: string, extraPreamble?: string, sessionIdFlag?: string[], worktreePath?: string, backendSessionIdOverride?: string, sessionIdOverride?: string, detachedInTmux?: boolean, suppressStartupPreamble?: boolean): any;
+export declare function createSession(host: SessionLaunchHost, command: string, args: string[], preambleFlag?: string[], toolConfigKey?: string, extraPreamble?: string, sessionIdFlag?: string[], worktreePath?: string, backendSessionIdOverride?: string, sessionIdOverride?: string, detachedInTmux?: boolean, suppressStartupPreamble?: boolean, team?: SessionTeamMetadata): any;
 export declare function migrateAgent(host: SessionLaunchHost, sessionId: string, targetWorktreePath: string): Promise<void>;
 export declare function getSessionWorktreePath(host: SessionLaunchHost, sessionId: string): string | undefined;
 export declare function getSessionsByWorktree(host: SessionLaunchHost): Map<string | undefined, any[]>;

package/dist/multiplexer/session-launch.js

@@ -4,19 +4,108 @@ import { buildContextPreamble } from "../context/context-bridge.js";
 import { readHistory } from "../context/history.js";
 import { findMainRepo } from "../worktree.js";
 import { TmuxSessionTransport } from "../tmux/session-transport.js";
-import { injectClaudeHookArgs, shouldSkipClaudeSessionIdInjection } from "../claude-hooks.js";
+import { extractClaudeBackendSessionIdFromArgs, injectClaudeHookArgs, shouldSkipClaudeSessionIdInjection, } from "../claude-hooks.js";
 import { wrapCommandWithManagedLaunchEnv } from "../managed-launch-env.js";
 import { wrapCommandWithShellIntegration } from "../shell-hooks.js";
-import { debug } from "../debug.js";
+import { debug, log } from "../debug.js";
 import { updateNotificationContext } from "../notification-context.js";
 import { markNotificationsRead } from "../notifications.js";
+import { clearSessionTranscriptPath } from "../metadata-store.js";
+import { extractCodexBackendSessionIdFromArgs } from "./session-capture.js";
+import { listTopologySessionStates } from "../runtime-core/topology-sessions.js";
+function listLaunchableTopologySessions(toolFilter) {
+    const sessions = listTopologySessionStates({ statuses: ["offline"] });
+    return toolFilter ? sessions.filter((s) => s.tool === toolFilter || s.toolConfigKey === toolFilter) : sessions;
+}
+function reconcileLaunchableTopology(host) {
+    host.syncSessionsFromTopology?.();
+    host.saveState?.();
+}
+const CODEX_OPTIONS_WITH_VALUE = new Set([
+    "-a",
+    "--add-dir",
+    "--ask-for-approval",
+    "-c",
+    "--cd",
+    "--config",
+    "-i",
+    "--image",
+    "--local-provider",
+    "-m",
+    "--model",
+    "-p",
+    "--profile",
+    "--remote",
+    "--remote-auth-token-env",
+    "-s",
+    "--sandbox",
+]);
+const SENSITIVE_ENV_ARG_PATTERN = /^[A-Za-z_][A-Za-z0-9_]*(?:TOKEN|SECRET|PASSWORD|PASS|KEY|CREDENTIAL|AUTH)[A-Za-z0-9_]*=/i;
+const SENSITIVE_OPTION_ARG_PATTERN = /^--?[A-Za-z0-9-]*(?:token|secret|password|pass|key|credential|auth)[A-Za-z0-9-]*(?:=.*)?$/i;
+const SENSITIVE_OPTION_ASSIGNMENT_PATTERN = /^(--?[A-Za-z0-9-]*(?:token|secret|password|pass|key|credential|auth)[A-Za-z0-9-]*=).+/i;
+function summarizeLaunchArg(arg) {
+    const sensitiveOptionAssignment = arg.match(SENSITIVE_OPTION_ASSIGNMENT_PATTERN);
+    if (sensitiveOptionAssignment) {
+        return `${sensitiveOptionAssignment[1]}<redacted>`;
+    }
+    if (SENSITIVE_ENV_ARG_PATTERN.test(arg)) {
+        return `${arg.slice(0, arg.indexOf("=") + 1)}<redacted>`;
+    }
+    return arg.length > 100 ? `${arg.slice(0, 100)}...` : arg;
+}
+export function summarizeLaunchArgs(args) {
+    let redactNext = false;
+    return args.map((arg) => {
+        if (redactNext) {
+            redactNext = false;
+            return "<redacted>";
+        }
+        const summarized = summarizeLaunchArg(arg);
+        redactNext = SENSITIVE_OPTION_ARG_PATTERN.test(arg) && !arg.includes("=");
+        return summarized;
+    });
+}
+function firstCodexPositionalArgIndex(args) {
+    let skipNext = false;
+    for (let i = 0; i < args.length; i += 1) {
+        const arg = args[i];
+        if (skipNext) {
+            skipNext = false;
+            continue;
+        }
+        if (arg === "--") {
+            return i;
+        }
+        if (arg.startsWith("--")) {
+            const [name, value] = arg.split("=", 2);
+            if (CODEX_OPTIONS_WITH_VALUE.has(name) && value === undefined) {
+                skipNext = true;
+            }
+            continue;
+        }
+        if (arg.startsWith("-")) {
+            if (CODEX_OPTIONS_WITH_VALUE.has(arg)) {
+                skipNext = true;
+            }
+            continue;
+        }
+        return i;
+    }
+    return args.length;
+}
+function codexConfigArg(key, value) {
+    return `${key}=${JSON.stringify(value)}`;
+}
+export function injectCodexDeveloperInstructions(args, key, instructions) {
+    if (!key.trim() || !instructions.trim())
+        return [...args];
+    const insertionIndex = firstCodexPositionalArgIndex(args);
+    return [...args.slice(0, insertionIndex), "-c", codexConfigArg(key, instructions), ...args.slice(insertionIndex)];
+}
 export async function run(host, opts) {
     initProject();
-    await host.instanceDirectory.registerInstance(host.instanceId, process.cwd());
     host.startHeartbeat();
-    host.syncSessionsFromState();
-    host.taskDispatcher = host.createTaskDispatcher();
-    host.orchestrationDispatcher = host.createOrchestrationDispatcher();
+    host.syncSessionsFromTopology();
     host.defaultCommand = opts.command;
     host.defaultArgs = opts.args;
     const config = loadConfig();
@@ -30,11 +119,10 @@ export async function run(host, opts) {
 }
 export async function runDashboard(host) {
     initProject();
-    await host.instanceDirectory.registerInstance(host.instanceId, process.cwd());
     host.startHeartbeat();
     host.startedInDashboard = true;
     host.mode = "dashboard";
-    host.syncSessionsFromState();
+    host.syncSessionsFromTopology();
     const config = loadConfig();
     const defaultTool = config.tools[config.defaultTool];
     if (defaultTool) {
@@ -130,9 +218,7 @@ export async function runDashboard(host) {
 export async function runProjectService(host) {
     initProject();
     host.mode = "project-service";
-    host.syncSessionsFromState();
-    host.taskDispatcher = host.createTaskDispatcher();
-    host.orchestrationDispatcher = host.createOrchestrationDispatcher();
+    host.syncSessionsFromTopology();
     host.writeInstructionFiles();
     await host.startProjectServices();
     host.startStatusRefresh();
@@ -146,60 +232,50 @@ export async function runProjectService(host) {
 }
 export async function resumeSessions(host, toolFilter) {
     initProject();
-    await host.instanceDirectory.registerInstance(host.instanceId, process.cwd());
     host.startHeartbeat();
-    const state = host.constructor.loadState();
-    if (!state || state.sessions.length === 0) {
+    reconcileLaunchableTopology(host);
+    const sessionsToResume = listLaunchableTopologySessions(toolFilter);
+    if (sessionsToResume.length === 0) {
         console.error("No saved session state found (or state is stale). Starting fresh.");
         return host.runDashboard();
     }
     const config = loadConfig();
-    const sessionsToResume = toolFilter
-        ? state.sessions.filter((s) => s.tool === toolFilter || s.toolConfigKey === toolFilter)
-        : state.sessions;
-    if (sessionsToResume.length === 0) {
-        console.error(`No saved sessions found for tool "${toolFilter}". Starting fresh.`);
-        return host.runDashboard();
-    }
-    const ownedByOthers = host.getRemoteOwnedSessionKeys();
+    log.info("resuming saved sessions", "session", {
+        requestedTool: toolFilter,
+        count: sessionsToResume.length,
+    });
     for (const saved of sessionsToResume) {
-        if (ownedByOthers.has(saved.id) || (saved.backendSessionId && ownedByOthers.has(saved.backendSessionId))) {
-            debug(`skipping resume of ${saved.id} — owned by another instance`, "session");
-            continue;
-        }
+        const backendSessionId = saved.backendSessionId;
         const toolCfg = config.tools[saved.toolConfigKey];
         if (!toolCfg)
             continue;
-        const bsid = saved.backendSessionId;
-        let resumeArgs;
-        if (host.sessionBootstrap.canResumeWithBackendSessionId(toolCfg, bsid)) {
-            resumeArgs = toolCfg.resumeArgs.map((a) => a.replace("{sessionId}", bsid));
-        }
-        else {
-            resumeArgs = toolCfg.resumeFallback ?? [];
+        if (!backendSessionId || !host.sessionBootstrap.canResumeWithBackendSessionId(toolCfg, backendSessionId)) {
+            console.error(`Skipping saved session "${saved.id}" because "${saved.toolConfigKey}" has no exact resumable backend session id.`);
+            continue;
         }
+        const resumeArgs = toolCfg.resumeArgs.map((a) => a.replace("{sessionId}", backendSessionId));
         const args = host.sessionBootstrap.composeToolArgs(toolCfg, resumeArgs, saved.args);
-        debug(`resuming ${saved.command} with backendSessionId=${bsid ?? "none (fallback)"}`, "session");
-        host.createSession(saved.command, args, toolCfg.preambleFlag, saved.toolConfigKey, undefined, undefined, saved.worktreePath, saved.backendSessionId, undefined, false, true);
+        log.info("resuming session", "session", {
+            sessionId: saved.id,
+            command: saved.command,
+            backendSessionId,
+            toolConfigKey: saved.toolConfigKey,
+            worktreePath: saved.worktreePath,
+        });
+        host.createSession(saved.command, args, toolCfg.preambleFlag, saved.toolConfigKey, undefined, undefined, saved.worktreePath, backendSessionId, saved.id, false, true, saved.team);
     }
     host.openTmuxDashboardTarget();
     return 0;
 }
 export async function restoreSessions(host, toolFilter) {
     initProject();
-    const state = host.constructor.loadState();
-    if (!state || state.sessions.length === 0) {
+    reconcileLaunchableTopology(host);
+    const sessionsToRestore = listLaunchableTopologySessions(toolFilter);
+    if (sessionsToRestore.length === 0) {
         console.error("No saved session state found (or state is stale). Starting fresh.");
         return host.runDashboard();
     }
     const config = loadConfig();
-    const sessionsToRestore = toolFilter
-        ? state.sessions.filter((s) => s.tool === toolFilter || s.toolConfigKey === toolFilter)
-        : state.sessions;
-    if (sessionsToRestore.length === 0) {
-        console.error(`No saved sessions found for tool "${toolFilter}". Starting fresh.`);
-        return host.runDashboard();
-    }
     for (const saved of sessionsToRestore) {
         const toolCfg = config.tools[saved.toolConfigKey];
         if (!toolCfg)
@@ -225,12 +301,12 @@ export async function restoreSessions(host, toolFilter) {
         }
         const liveContext = buildContextPreamble(sessionsToRestore.filter((s) => s.id !== saved.id).map((s) => s.id));
         const extraPreamble = historyContext + (liveContext ? "\n" + liveContext : "");
-        host.createSession(saved.command, saved.args, toolCfg.preambleFlag, saved.toolConfigKey, extraPreamble.trim() || undefined, undefined, saved.worktreePath);
+        host.createSession(saved.command, saved.args, toolCfg.preambleFlag, saved.toolConfigKey, extraPreamble.trim() || undefined, undefined, saved.worktreePath, undefined, saved.id, false, false, saved.team);
     }
     host.openTmuxDashboardTarget();
     return 0;
 }
-export function createSession(host, command, args, preambleFlag, toolConfigKey, extraPreamble, sessionIdFlag, worktreePath, backendSessionIdOverride, sessionIdOverride, detachedInTmux = false, suppressStartupPreamble = false) {
+export function createSession(host, command, args, preambleFlag, toolConfigKey, extraPreamble, sessionIdFlag, worktreePath, backendSessionIdOverride, sessionIdOverride, detachedInTmux = false, suppressStartupPreamble = false, team) {
     const cols = process.stdout.columns ?? 80;
     const sessionId = sessionIdOverride ?? `${command}-${Math.random().toString(36).slice(2, 8)}`;
     if (host.sessions.some((session) => session.id === sessionId)) {
@@ -240,9 +316,18 @@ export function createSession(host, command, args, preambleFlag, toolConfigKey,
     const toolCfg = toolConfigKey ? config.tools[toolConfigKey] : undefined;
     const isClaudeResumeStyleLaunch = Boolean(toolCfg && toolConfigKey === "claude" && toolCfg.command === command) &&
         shouldSkipClaudeSessionIdInjection(args);
-    const effectiveSuppressStartupPreamble = suppressStartupPreamble || isClaudeResumeStyleLaunch;
+    const explicitClaudeBackendSessionId = toolCfg && toolConfigKey === "claude" && toolCfg.command === command
+        ? extractClaudeBackendSessionIdFromArgs(args)
+        : undefined;
+    const explicitCodexBackendSessionId = toolCfg && toolConfigKey === "codex" && toolCfg.command === command
+        ? extractCodexBackendSessionIdFromArgs(args)
+        : undefined;
+    const effectiveSuppressStartupPreamble = suppressStartupPreamble;
     const effectiveSessionIdFlag = isClaudeResumeStyleLaunch ? undefined : sessionIdFlag;
-    const backendSessionId = backendSessionIdOverride ?? (effectiveSessionIdFlag ? randomUUID() : undefined);
+    const backendSessionId = backendSessionIdOverride ??
+        explicitClaudeBackendSessionId ??
+        explicitCodexBackendSessionId ??
+        (effectiveSessionIdFlag ? randomUUID() : undefined);
     const automaticPreambleEnabled = config.runtime.agentPreambleEnabled !== false;
     const preamble = effectiveSuppressStartupPreamble
         ? ""
@@ -252,10 +337,19 @@ export function createSession(host, command, args, preambleFlag, toolConfigKey,
             worktreePath,
             extraPreamble,
             includeAimuxPreamble: automaticPreambleEnabled,
+            team,
         });
     const shouldInjectLaunchPreamble = Boolean(!effectiveSuppressStartupPreamble && preambleFlag && preamble.trim());
+    const shouldInjectCodexDeveloperInstructions = Boolean(!effectiveSuppressStartupPreamble &&
+        toolCfg?.command === command &&
+        command === "codex" &&
+        toolCfg.developerInstructionsConfigKey &&
+        preamble.trim());
     host.sessionBootstrap.ensurePlanFile(sessionId, command, worktreePath);
     let finalArgs = shouldInjectLaunchPreamble ? [...args, ...preambleFlag, preamble] : [...args];
+    if (shouldInjectCodexDeveloperInstructions) {
+        finalArgs = injectCodexDeveloperInstructions(finalArgs, toolCfg.developerInstructionsConfigKey, preamble);
+    }
     let launchCommand = command;
     if (effectiveSessionIdFlag && backendSessionId) {
         const expandedFlag = effectiveSessionIdFlag.map((a) => a.replace("{sessionId}", backendSessionId));
@@ -268,6 +362,8 @@ export function createSession(host, command, args, preambleFlag, toolConfigKey,
     catch {
         projectRoot = process.cwd();
     }
+    clearSessionTranscriptPath(sessionId);
+    clearSessionTranscriptPath(sessionId, projectRoot);
     if (toolCfg && toolConfigKey === "claude" && toolCfg.command === command && toolCfg.wrapperEnabled !== false) {
         finalArgs = injectClaudeHookArgs(finalArgs, {
             sessionId,
@@ -301,18 +397,19 @@ export function createSession(host, command, args, preambleFlag, toolConfigKey,
         host.sessionBootstrap.finalizePreamble(command, preamble);
     }
     debug(`creating session: ${command} (configKey=${toolConfigKey ?? "cli"}, backendId=${backendSessionId ?? "none"}, cwd=${worktreePath ?? process.cwd()}, args=${finalArgs.length})`, "session");
-    debug(`spawn args: ${JSON.stringify(finalArgs.map((a) => (a.length > 100 ? a.slice(0, 100) + "..." : a)))}`, "session");
+    debug(`spawn args: ${JSON.stringify(summarizeLaunchArgs(finalArgs))}`, "session");
     const sessionStartTime = Date.now();
     const tmuxSession = host.tmuxRuntimeManager.ensureProjectSession(process.cwd());
     const target = host.tmuxRuntimeManager.createWindow(tmuxSession.sessionName, host.getSessionLabel(sessionId) ?? command, worktreePath ?? process.cwd(), launchCommand, finalArgs, { detached: detachedInTmux });
     const tmuxTransport = new TmuxSessionTransport(sessionId, command, target, host.tmuxRuntimeManager, cols, process.stdout.rows ?? 24);
     host.sessionTmuxTargets.set(sessionId, target);
     const session = tmuxTransport;
-    host.registerManagedSession(tmuxTransport, args, toolConfigKey, worktreePath, undefined, sessionStartTime);
+    host.registerManagedSession(tmuxTransport, args, toolConfigKey, worktreePath, undefined, sessionStartTime, team);
     session.backendSessionId = backendSessionId;
     if (session instanceof TmuxSessionTransport) {
         host.syncTmuxWindowMetadata(sessionId);
     }
+    void projectRoot;
     host.activeIndex = host.sessions.length - 1;
     if (host.startedInDashboard && host.mode === "dashboard") {
         host.invalidateDesktopStateSnapshot();
@@ -322,14 +419,6 @@ export function createSession(host, command, args, preambleFlag, toolConfigKey,
         host.renderDashboard();
     }
     host.saveState();
-    if (!effectiveSuppressStartupPreamble &&
-        !preambleFlag &&
-        !extraPreamble &&
-        automaticPreambleEnabled &&
-        preamble.trim()) {
-        const kickoff = host.sessionBootstrap.buildInitialKickoffPrompt(sessionId, preamble);
-        void host.sessionBootstrap.deliverDetachedCodexKickoffPrompt(sessionId, kickoff, 1800);
-    }
     return session;
 }
 export async function migrateAgent(host, sessionId, targetWorktreePath) {
@@ -382,12 +471,11 @@ export async function migrateAgent(host, sessionId, targetWorktreePath) {
     session.kill();
     await waitForExit().catch(() => { });
     if (!toolCfg?.preambleFlag) {
-        createSession(host, session.command, originalArgs, undefined, toolConfigKey, undefined, undefined, effectiveTarget, backendSessionId, sessionId, true, true);
-        const kickoff = host.sessionBootstrap.buildCodexMigrationKickoffPrompt(sessionId, sourceCwd, targetWorktreePath, sourceSnapshot);
-        await host.sessionBootstrap.deliverDetachedCodexKickoffPrompt(sessionId, kickoff, 1800);
+        const continuityPreamble = host.sessionBootstrap.buildCodexMigrationContinuityPreamble(sessionId, sourceCwd, targetWorktreePath, sourceSnapshot);
+        createSession(host, session.command, migrateArgs, undefined, toolConfigKey, continuityPreamble, undefined, effectiveTarget, useBackendResume ? backendSessionId : undefined, sessionId, true, false, session.team);
         return;
     }
-    createSession(host, session.command, migrateArgs, useBackendResume ? undefined : toolCfg?.preambleFlag, toolConfigKey, historyContext.trim() || undefined, useBackendResume ? undefined : toolCfg?.sessionIdFlag, effectiveTarget, backendSessionId, sessionId);
+    createSession(host, session.command, migrateArgs, useBackendResume ? undefined : toolCfg?.preambleFlag, toolConfigKey, historyContext.trim() || undefined, useBackendResume ? undefined : toolCfg?.sessionIdFlag, effectiveTarget, useBackendResume ? backendSessionId : undefined, sessionId, false, false, session.team);
 }
 export function getSessionWorktreePath(host, sessionId) {
     return host.sessionWorktreePaths.get(sessionId);
@@ -415,6 +503,7 @@ export function focusSession(host, index) {
     host.agentTracker.markSeen(sid);
     updateNotificationContext("tui", {
         focused: true,
+        screen: "agent",
         sessionId: sid,
         panelOpen: false,
     });
@@ -497,8 +586,7 @@ export function handleAction(host, action) {
             host.showWorktreeList();
             break;
         case "review":
-            host.handleReviewRequest();
+            void host.handleReviewRequest();
             break;
     }
 }
-//# sourceMappingURL=session-launch.js.map

package/dist/multiplexer/session-runtime-core.d.ts

@@ -1,6 +1,4 @@
-import { TmuxSessionTransport } from "../tmux/session-transport.js";
-import { readSessionMessages } from "../session-message-history.js";
-import { type SessionInputOperationRecord } from "../session-input-operations.js";
+import type { SessionTeamMetadata } from "../team.js";
 type SessionRuntimeHost = any;
 export declare function getSessionLabel(host: SessionRuntimeHost, sessionId: string): string | undefined;
 export declare function applySessionLabel(host: SessionRuntimeHost, sessionId: string, label?: string): void;
@@ -10,24 +8,12 @@ export declare function readStatusHeadline(_host: SessionRuntimeHost, sessionId:
 export declare function deriveHeadline(host: SessionRuntimeHost, sessionId: string): string | undefined;
 export declare function resolveRunningSession(host: SessionRuntimeHost, sessionId: string): any;
 export declare function resolveLiveSessionTmuxTarget(host: SessionRuntimeHost, sessionId: string, fallback?: any): any;
-export declare function writeTmuxAgentInput(host: SessionRuntimeHost, sessionId: string, transport: TmuxSessionTransport, data: string): void;
-export declare function normalizeAgentInput(host: SessionRuntimeHost, data: string, submit: boolean, sessionId?: string): string;
-export declare function paneStillContainsAgentDraft(host: SessionRuntimeHost, target: any, draft: string): boolean;
-export declare function scheduleTmuxAgentSubmit(host: SessionRuntimeHost, sessionId: string, target: any, draft: string): void;
-export declare function writeAgentInput(host: SessionRuntimeHost, sessionId: string, data?: string, parts?: any[], clientMessageId?: string, submit?: boolean): Promise<{
-    sessionId: string;
-    accepted: boolean;
-    operation: SessionInputOperationRecord;
-    messageId?: string;
-    error?: string;
-}>;
-export declare function readAgentHistory(host: SessionRuntimeHost, sessionId: string, lastN?: number): Promise<{
+export declare function interruptAgent(host: SessionRuntimeHost, sessionId: string): Promise<{
     sessionId: string;
-    messages: ReturnType<typeof readSessionMessages>;
-    lastN?: number;
 }>;
-export declare function interruptAgent(host: SessionRuntimeHost, sessionId: string): Promise<{
+export declare function sendAgentInput(host: SessionRuntimeHost, sessionId: string, text: string): Promise<{
     sessionId: string;
+    accepted: true;
 }>;
 export declare function readAgentOutput(host: SessionRuntimeHost, sessionId: string, startLine?: number): Promise<{
     sessionId: string;
@@ -35,9 +21,11 @@ export declare function readAgentOutput(host: SessionRuntimeHost, sessionId: str
     startLine?: number;
     parsed: any;
 }>;
-export declare function registerManagedSession(host: SessionRuntimeHost, session: any, args: string[], toolConfigKey?: string, worktreePath?: string, role?: string, startTime?: number): any;
+export declare function registerManagedSession(host: SessionRuntimeHost, session: any, args: string[], toolConfigKey?: string, worktreePath?: string, role?: string, startTime?: number, team?: SessionTeamMetadata): any;
 export declare function handleSessionRuntimeEvent(host: SessionRuntimeHost, runtime: any, event: any): void;
-export declare function buildTmuxWindowMetadata(host: SessionRuntimeHost, sessionId: string, command: string): any;
+export declare function buildTmuxWindowMetadata(host: SessionRuntimeHost, sessionId: string, command: string, existing?: {
+    team?: SessionTeamMetadata;
+} | null): any;
 export declare function syncTmuxWindowMetadata(host: SessionRuntimeHost, sessionId: string): void;
 export declare function updateContextWatcherSessions(host: SessionRuntimeHost): void;
 export {};