@otto-code/server 0.5.0

package/dist/server/server/agent/agent-manager.js

@@ -0,0 +1,3049 @@
+import { randomUUID } from "node:crypto";
+import { resolve } from "node:path";
+import { stat } from "node:fs/promises";
+import { AGENT_LIFECYCLE_STATUSES, } from "@otto-code/protocol/agent-lifecycle";
+import { getParentAgentIdFromLabels, isDelegatedAgent, PARENT_AGENT_ID_LABEL, } from "@otto-code/protocol/agent-labels";
+import { normalizePersonalityRoles } from "@otto-code/protocol/agent-personalities";
+import { z } from "zod";
+import { getAgentStreamEventTurnId, } from "./agent-sdk-types.js";
+import { toObservedSubagentPayload } from "./agent-projections.js";
+import { buildArchivedAgentRecord } from "./agent-archive.js";
+import { InMemoryAgentTimelineStore, } from "./agent-timeline-store.js";
+import { AGENT_STREAM_COALESCE_DEFAULT_WINDOW_MS, AgentStreamCoalescer, } from "./agent-stream-coalescer.js";
+import { ForegroundRunState } from "./foreground-run-state.js";
+import { getAgentProviderDefinition } from "@otto-code/protocol/provider-manifest";
+import { invokeRewindCapability } from "./rewind/rewind.js";
+import { isSystemInjectedEnvelope } from "./agent-prompt.js";
+import { stripInternalOttoMcpServer, withRuntimeOttoMcpServer } from "./runtime-mcp-config.js";
+import { resolveCreateAgentTitles } from "./create-agent-title.js";
+const RELOAD_SESSION_CLOSE_TIMEOUT_MS = 3000;
+const INTERRUPT_SESSION_TIMEOUT_MS = 2000;
+const STORED_AGENT_CAPABILITIES = {
+    supportsStreaming: false,
+    supportsSessionPersistence: true,
+    supportsDynamicModes: false,
+    supportsMcpServers: false,
+    supportsReasoningStream: false,
+    supportsToolInvocations: true,
+    supportsRewindConversation: false,
+    supportsRewindFiles: false,
+    supportsRewindBoth: false,
+};
+function formatProviderList(providers) {
+    return providers.length > 0 ? providers.join(", ") : "none";
+}
+function buildStoredAgentConfig(record) {
+    const config = {
+        provider: record.provider,
+        cwd: record.cwd,
+    };
+    if (!record.config) {
+        return config;
+    }
+    if (record.config.modeId != null)
+        config.modeId = record.config.modeId;
+    if (record.config.model != null)
+        config.model = record.config.model;
+    if (record.config.thinkingOptionId != null) {
+        config.thinkingOptionId = record.config.thinkingOptionId;
+    }
+    if (record.config.featureValues != null) {
+        config.featureValues = record.config.featureValues;
+    }
+    if (record.config.extra != null)
+        config.extra = record.config.extra;
+    if (record.config.systemPrompt != null) {
+        config.systemPrompt = record.config.systemPrompt;
+    }
+    if (record.config.mcpServers != null)
+        config.mcpServers = record.config.mcpServers;
+    if (record.config.personalitySnapshot != null) {
+        // Storage keeps roles as a loose string array; normalize back to the known
+        // PersonalityRole set on the way in.
+        config.personalitySnapshot = {
+            ...record.config.personalitySnapshot,
+            roles: normalizePersonalityRoles(record.config.personalitySnapshot.roles),
+        };
+    }
+    return stripInternalOttoMcpServer(config);
+}
+export { AGENT_LIFECYCLE_STATUSES };
+function resolveInitialAttention(input) {
+    if (input == null || !input.requiresAttention) {
+        return { requiresAttention: false };
+    }
+    return {
+        requiresAttention: true,
+        attentionReason: input.attentionReason,
+        attentionTimestamp: new Date(input.attentionTimestamp),
+    };
+}
+const SYSTEM_ERROR_PREFIX = "[System Error]";
+function attachPersistenceCwd(handle, cwd) {
+    if (!handle) {
+        return null;
+    }
+    return {
+        ...handle,
+        metadata: {
+            ...handle.metadata,
+            cwd,
+        },
+    };
+}
+const BUSY_STATUSES = new Set(["initializing", "running"]);
+const AgentIdSchema = z.guid();
+function isAgentBusy(status) {
+    return BUSY_STATUSES.has(status);
+}
+function isTurnTerminalEvent(event) {
+    return (event.type === "turn_completed" ||
+        event.type === "turn_failed" ||
+        event.type === "turn_canceled");
+}
+function abortMessage(reason, fallbackMessage) {
+    if (typeof reason === "string")
+        return reason;
+    if (reason instanceof Error)
+        return reason.message;
+    return fallbackMessage;
+}
+function createAbortError(signal, fallbackMessage) {
+    const message = abortMessage(signal?.reason, fallbackMessage);
+    return Object.assign(new Error(message), { name: "AbortError" });
+}
+function validateAgentId(agentId, source) {
+    const result = AgentIdSchema.safeParse(agentId);
+    if (!result.success) {
+        throw new Error(`${source}: agentId must be a UUID`);
+    }
+    return result.data;
+}
+function applyLabelPatch(labels, patch) {
+    const nextLabels = { ...labels };
+    for (const [key, value] of Object.entries(patch)) {
+        if (value === null) {
+            delete nextLabels[key];
+        }
+        else {
+            nextLabels[key] = value;
+        }
+    }
+    return nextLabels;
+}
+function buildExplicitTimelineSeedForRegister(now, options) {
+    const hasTimeline = Boolean(options?.timeline?.length);
+    const hasTimelineRows = Boolean(options?.timelineRows?.length);
+    const hasTimelineNextSeq = options?.timelineNextSeq !== undefined;
+    if (!hasTimeline && !hasTimelineRows && !hasTimelineNextSeq) {
+        return null;
+    }
+    return {
+        items: options?.timeline,
+        rows: options?.timelineRows,
+        nextSeq: options?.timelineNextSeq,
+        timestamp: (options?.updatedAt ?? options?.createdAt ?? now).toISOString(),
+    };
+}
+function buildImportedTimelineRows(entries) {
+    const rows = [];
+    for (const entry of entries) {
+        if (entry.item.type === "user_message" && isSystemInjectedEnvelope(entry.item.text)) {
+            continue;
+        }
+        rows.push({
+            seq: rows.length + 1,
+            timestamp: entry.timestamp ?? new Date().toISOString(),
+            item: entry.item,
+        });
+    }
+    return rows;
+}
+function resolveImportedAgentTitle(config, timelineRows) {
+    const initialPrompt = getFirstUserMessageTextFromRows(timelineRows);
+    if (!initialPrompt) {
+        return null;
+    }
+    const { explicitTitle, provisionalTitle } = resolveCreateAgentTitles({
+        configTitle: config.title,
+        initialPrompt,
+    });
+    return explicitTitle ?? provisionalTitle ?? null;
+}
+function getFirstUserMessageTextFromRows(rows) {
+    for (const row of rows) {
+        const item = row.item;
+        if (item.type !== "user_message") {
+            continue;
+        }
+        const text = item.text.trim();
+        if (text) {
+            return text;
+        }
+    }
+    return null;
+}
+export class AgentManager {
+    constructor(options) {
+        this.clients = new Map();
+        this.providerEnabled = new Map();
+        this.agents = new Map();
+        this.timelineStore = new InMemoryAgentTimelineStore();
+        this.agentsAwaitingInitialSnapshotPersist = new Set();
+        this.sessionEventTails = new Map();
+        this.foregroundRuns = new ForegroundRunState();
+        this.subscribers = new Set();
+        this.previousStatuses = new Map();
+        // Observed subagents (Claude Task / ultracode fan-out): id -> resolution info
+        // for the stop RPC. These are ephemeral projections, not ManagedAgents. See
+        // projects/observed-subagents/observed-subagents.md.
+        this.observedSubagents = new Map();
+        this.backgroundTasks = new Set();
+        this.ottoToolsEnabled = true;
+        this.ottoToolCatalogFactory = null;
+        /**
+         * Config mutations on one agent serialize through a per-agent promise chain:
+         * the multi-await setters (setAgentPersonality resolves snapshots and applies
+         * prompt + brain across several RPC hops) must not interleave with a racing
+         * set_agent_model/mode/thinking and persist a mixed half-and-half state.
+         */
+        this.agentConfigMutations = new Map();
+        this.idFactory = options?.idFactory ?? (() => randomUUID());
+        this.registry = options?.registry;
+        this.durableTimelineStore = options?.durableTimelineStore;
+        this.onAgentAttention = options?.onAgentAttention;
+        this.onWorkspaceStateMayHaveChanged = options?.onWorkspaceStateMayHaveChanged;
+        this.onPersonalitySpawn = options?.onPersonalitySpawn;
+        this.mcpBaseUrl = options?.mcpBaseUrl ?? null;
+        this.mcpAuthToken = options?.mcpAuthToken ?? null;
+        this.configureOttoTools(options);
+        this.appendSystemPrompt = options.appendSystemPrompt ?? "";
+        this.logger = options.logger.child({ module: "agent", component: "agent-manager" });
+        this.rescueTimeouts = {
+            reloadSessionCloseMs: options.rescueTimeouts?.reloadSessionCloseMs ?? RELOAD_SESSION_CLOSE_TIMEOUT_MS,
+            interruptSessionMs: options.rescueTimeouts?.interruptSessionMs ?? INTERRUPT_SESSION_TIMEOUT_MS,
+        };
+        this.agentStreamCoalescer = new AgentStreamCoalescer({
+            windowMs: options.agentStreamCoalesceWindowMs ?? AGENT_STREAM_COALESCE_DEFAULT_WINDOW_MS,
+            timers: { setTimeout, clearTimeout },
+            onFlush: ({ agentId, item, provider, turnId }) => {
+                const event = this.recordAndDispatchTimelineItem(agentId, item, provider, turnId);
+                this.notifyForegroundTurnWaiters(agentId, event);
+            },
+        });
+        this.updateProviderRegistry({
+            providerDefinitions: options.providerDefinitions ?? {},
+            clients: options.clients ?? {},
+        });
+    }
+    configureOttoTools(options) {
+        this.ottoToolsEnabled = options.ottoToolsEnabled ?? true;
+        this.ottoToolCatalogFactory = options.ottoToolCatalogFactory ?? null;
+    }
+    registerClient(provider, client) {
+        this.clients.set(provider, client);
+    }
+    updateProviderRegistry(input) {
+        for (const [provider, definition] of Object.entries(input.providerDefinitions)) {
+            if (definition) {
+                this.providerEnabled.set(provider, definition.enabled);
+            }
+        }
+        for (const [provider, client] of Object.entries(input.clients)) {
+            if (client) {
+                this.clients.set(provider, client);
+            }
+        }
+        // Live sessions absorb provider-level compaction edits (default level,
+        // hidden selector) so open chats reflect settings changes immediately.
+        for (const agent of this.agents.values()) {
+            if (!agent.session?.applyCompactionConfig)
+                continue;
+            const definition = input.providerDefinitions[agent.provider];
+            if (!definition || definition.compaction === undefined)
+                continue;
+            if (agent.session.applyCompactionConfig(definition.compaction)) {
+                this.emitState(agent);
+            }
+        }
+    }
+    getRegisteredProviderIds() {
+        return Array.from(this.clients.keys());
+    }
+    setAgentAttentionCallback(callback) {
+        this.onAgentAttention = callback;
+    }
+    setAgentArchivedCallback(callback) {
+        this.onAgentArchived = callback;
+    }
+    setMcpBaseUrl(url) {
+        this.mcpBaseUrl = url;
+    }
+    setOttoToolsEnabled(enabled) {
+        this.ottoToolsEnabled = enabled;
+    }
+    setOttoToolCatalogFactory(factory) {
+        this.ottoToolCatalogFactory = factory;
+    }
+    /**
+     * Capability token the daemon's own MCP clients must present to the Agent MCP
+     * endpoint when a daemon password is configured. Read by the per-client
+     * session to authenticate its own MCP connection. Stays in the daemon — never
+     * sent to remote clients.
+     */
+    getMcpAuthToken() {
+        return this.mcpAuthToken;
+    }
+    setAppendSystemPrompt(prompt) {
+        this.appendSystemPrompt = prompt ?? "";
+    }
+    getMetricsSnapshot() {
+        const byLifecycle = {};
+        let withActiveForegroundTurn = 0;
+        let totalItems = 0;
+        let maxItemsPerAgent = 0;
+        for (const agent of this.agents.values()) {
+            byLifecycle[agent.lifecycle] = (byLifecycle[agent.lifecycle] ?? 0) + 1;
+            if (agent.activeForegroundTurnId !== null) {
+                withActiveForegroundTurn++;
+            }
+            if (!this.timelineStore.has(agent.id)) {
+                continue;
+            }
+            const len = this.timelineStore.getItems(agent.id).length;
+            totalItems += len;
+            if (len > maxItemsPerAgent) {
+                maxItemsPerAgent = len;
+            }
+        }
+        return {
+            total: this.agents.size,
+            byLifecycle,
+            withActiveForegroundTurn,
+            timelineStats: {
+                totalItems,
+                maxItemsPerAgent,
+            },
+        };
+    }
+    touchUpdatedAt(agent) {
+        const nowMs = Date.now();
+        const previousMs = agent.updatedAt.getTime();
+        const nextMs = nowMs > previousMs ? nowMs : previousMs + 1;
+        const next = new Date(nextMs);
+        agent.updatedAt = next;
+        return next;
+    }
+    nextStoredUpdatedAt(record) {
+        const previousMs = Date.parse(record.updatedAt);
+        const nowMs = Date.now();
+        const nextMs = nowMs > previousMs ? nowMs : previousMs + 1;
+        return new Date(nextMs).toISOString();
+    }
+    hasInFlightRun(agentId) {
+        const agent = this.agents.get(agentId);
+        if (!agent) {
+            return false;
+        }
+        return (agent.lifecycle === "running" ||
+            Boolean(agent.activeForegroundTurnId) ||
+            this.foregroundRuns.hasPendingRun(agentId));
+    }
+    subscribe(callback, options) {
+        const targetAgentId = options?.agentId == null ? null : validateAgentId(options.agentId, "subscribe");
+        const record = {
+            callback,
+            agentId: targetAgentId,
+        };
+        this.subscribers.add(record);
+        if (options?.replayState !== false) {
+            if (record.agentId) {
+                const agent = this.agents.get(record.agentId);
+                if (agent) {
+                    callback({
+                        type: "agent_state",
+                        agent: { ...agent },
+                    });
+                }
+            }
+            else {
+                // For global subscribers, skip internal agents during replay
+                for (const agent of this.agents.values()) {
+                    if (agent.internal) {
+                        continue;
+                    }
+                    callback({
+                        type: "agent_state",
+                        agent: { ...agent },
+                    });
+                }
+            }
+        }
+        return () => {
+            this.subscribers.delete(record);
+        };
+    }
+    listAgents() {
+        return Array.from(this.agents.values())
+            .filter((agent) => !agent.internal)
+            .map((agent) => Object.assign({}, agent));
+    }
+    async listImportableSessions(options) {
+        const providerEntries = Array.from(this.clients.entries()).filter(([provider, client]) => client.capabilities.supportsSessionListing &&
+            !!client.listImportableSessions &&
+            this.isProviderImportable(provider, options?.providerFilter));
+        const sessionLists = await Promise.all(providerEntries.map(async ([provider, client]) => {
+            try {
+                return (await client.listImportableSessions({
+                    limit: options?.limit,
+                    cwd: options?.cwd,
+                })).map((session) => Object.assign(session, { provider }));
+            }
+            catch (error) {
+                this.logger.warn({ err: error, provider }, "Failed to list importable sessions for provider");
+                return [];
+            }
+        }));
+        const sessions = sessionLists.flat();
+        const limit = options?.limit ?? 20;
+        return sessions
+            .sort((a, b) => b.lastActivityAt.getTime() - a.lastActivityAt.getTime())
+            .slice(0, limit);
+    }
+    isProviderImportable(provider, providerFilter) {
+        if (this.providerEnabled.get(provider) === false) {
+            return false;
+        }
+        if (providerFilter && !providerFilter.has(provider)) {
+            return false;
+        }
+        return true;
+    }
+    async listProviderAvailability() {
+        return Promise.all(Array.from(this.clients.keys()).map((provider) => this.getProviderAvailability(provider)));
+    }
+    async getProviderAvailability(provider) {
+        const client = this.clients.get(provider);
+        if (!client) {
+            return {
+                provider,
+                available: false,
+                error: `No client registered for provider '${provider}'`,
+            };
+        }
+        try {
+            const available = await client.isAvailable();
+            return {
+                provider,
+                available,
+                error: null,
+            };
+        }
+        catch (error) {
+            const message = error instanceof Error ? error.message : String(error);
+            this.logger.warn({ err: error, provider }, "Failed to check provider availability");
+            return {
+                provider,
+                available: false,
+                error: message,
+            };
+        }
+    }
+    async listDraftCommands(config) {
+        const normalizedConfig = await this.normalizeConfig(config, { resolveDefaultModel: false });
+        const client = this.requireClient(normalizedConfig.provider);
+        if (!normalizedConfig.model) {
+            return [];
+        }
+        const available = await client.isAvailable();
+        if (!available) {
+            throw new Error(`Provider '${normalizedConfig.provider}' is not available. Please ensure the CLI is installed.`);
+        }
+        if (client.listCommands) {
+            return await client.listCommands(normalizedConfig);
+        }
+        const session = await client.createSession(normalizedConfig);
+        try {
+            if (!session.listCommands) {
+                throw new Error(`Provider '${normalizedConfig.provider}' does not support listing commands`);
+            }
+            return await session.listCommands();
+        }
+        finally {
+            try {
+                await session.close();
+            }
+            catch (error) {
+                this.logger.warn({ err: error, provider: normalizedConfig.provider }, "Failed to close draft command listing session");
+            }
+        }
+    }
+    async listDraftFeatures(config) {
+        const normalizedConfig = await this.normalizeConfig(config, { resolveDefaultModel: false });
+        const client = this.requireClient(normalizedConfig.provider);
+        if (!normalizedConfig.model) {
+            return [];
+        }
+        const available = await client.isAvailable();
+        if (!available) {
+            throw new Error(`Provider '${normalizedConfig.provider}' is not available. Please ensure the CLI is installed.`);
+        }
+        if (client.listFeatures) {
+            return await client.listFeatures(normalizedConfig);
+        }
+        const session = await client.createSession(normalizedConfig);
+        try {
+            return session.features ?? [];
+        }
+        finally {
+            try {
+                await session.close();
+            }
+            catch (error) {
+                this.logger.warn({ err: error, provider: normalizedConfig.provider }, "Failed to close draft feature listing session");
+            }
+        }
+    }
+    getAgent(id) {
+        const agent = this.agents.get(id);
+        return agent ? { ...agent } : null;
+    }
+    getTimeline(id) {
+        if (!this.observedSubagents.has(id)) {
+            this.requireAgent(id);
+        }
+        return this.timelineStore.getItems(id);
+    }
+    async getTimelineRows(id) {
+        if (!this.observedSubagents.has(id)) {
+            this.requireAgent(id);
+        }
+        if (this.durableTimelineStore) {
+            return await this.durableTimelineStore.getCommittedRows(id);
+        }
+        return this.timelineStore.getRows(id);
+    }
+    fetchTimeline(id, options) {
+        if (!this.observedSubagents.has(id)) {
+            this.requireAgent(id);
+        }
+        return this.timelineStore.fetch(id, options);
+    }
+    /**
+     * Last emitted snapshot for an observed subagent, or null when the id is not
+     * an observed subagent. Lets read paths (timeline fetch) serve observed rows
+     * that have no ManagedAgent or stored record. See projects/observed-subagents/observed-subagents.md.
+     */
+    getObservedSubagentPayload(id) {
+        return this.observedSubagents.get(id)?.lastPayload ?? null;
+    }
+    async createAgent(config, agentId, options) {
+        const resolvedAgentId = validateAgentId(agentId ?? this.idFactory(), "createAgent");
+        const { storedConfig, launchConfig } = await this.prepareSessionConfig(config, resolvedAgentId);
+        this.requireEnabledProvider(storedConfig.provider);
+        const client = await this.requireAvailableClient({
+            provider: storedConfig.provider,
+        });
+        const launchContext = await this.buildLaunchContext(resolvedAgentId, client, options?.env);
+        const providerLaunchConfig = this.resolveProviderLaunchConfig(launchConfig, launchContext);
+        const createOptions = this.buildCreateSessionOptions(options);
+        const session = await client.createSession(providerLaunchConfig, launchContext, createOptions);
+        const managed = this.registerSession(session, storedConfig, resolvedAgentId, {
+            labels: options.labels,
+            initialTitle: options.initialTitle,
+            workspaceId: options.workspaceId,
+        });
+        const spawnedPersonalityId = storedConfig.personalitySnapshot?.personalityId;
+        if (spawnedPersonalityId) {
+            this.onPersonalitySpawn?.(spawnedPersonalityId);
+        }
+        return managed;
+    }
+    buildCreateSessionOptions(options) {
+        return options?.persistSession === undefined
+            ? undefined
+            : { persistSession: options.persistSession };
+    }
+    // Reconstruct an agent from provider persistence. Callers should explicitly
+    // hydrate timeline history after resume.
+    async resumeAgentFromPersistence(handle, overrides, agentId, options) {
+        const resolvedAgentId = validateAgentId(agentId ?? this.idFactory(), "resumeAgentFromPersistence");
+        const metadata = (handle.metadata ?? {});
+        const mergedConfig = {
+            ...metadata,
+            ...overrides,
+            provider: handle.provider,
+        };
+        const { storedConfig, launchConfig } = await this.prepareSessionConfig(mergedConfig, resolvedAgentId);
+        const client = this.requireClient(handle.provider);
+        const available = await client.isAvailable();
+        if (!available) {
+            throw new Error(`Provider '${handle.provider}' is not available. Please ensure the CLI is installed.`);
+        }
+        const launchContext = await this.buildLaunchContext(resolvedAgentId, client);
+        const providerLaunchConfig = this.resolveProviderLaunchConfig(launchConfig, launchContext);
+        const session = await client.resumeSession(handle, providerLaunchConfig, launchContext);
+        return this.registerSession(session, storedConfig, resolvedAgentId, options);
+    }
+    async importProviderSession(input) {
+        const resolvedAgentId = validateAgentId(this.idFactory(), "importProviderSession");
+        this.requireEnabledProvider(input.provider);
+        const client = await this.requireAvailableClient({ provider: input.provider });
+        if (!client.importSession) {
+            throw new Error(`Provider '${input.provider}' does not support importing sessions`);
+        }
+        const { storedConfig, launchConfig } = await this.prepareSessionConfig({
+            provider: input.provider,
+            cwd: input.cwd,
+        }, resolvedAgentId);
+        const launchContext = await this.buildLaunchContext(resolvedAgentId, client);
+        const providerLaunchConfig = this.resolveProviderLaunchConfig(launchConfig, launchContext);
+        const imported = await client.importSession({
+            providerHandleId: input.providerHandleId,
+            cwd: input.cwd,
+        }, { config: providerLaunchConfig, storedConfig, launchContext });
+        const importedConfig = await this.normalizeConfig(stripInternalOttoMcpServer(imported.config));
+        const timelineRows = buildImportedTimelineRows(imported.timeline);
+        const initialTitle = resolveImportedAgentTitle(importedConfig, timelineRows);
+        return this.registerSession(imported.session, importedConfig, resolvedAgentId, {
+            labels: input.labels,
+            workspaceId: input.workspaceId,
+            timelineRows,
+            timelineNextSeq: timelineRows.length + 1,
+            persistence: imported.persistence,
+            historyPrimed: true,
+            initialTitle,
+            publishWhenReady: true,
+        });
+    }
+    // Hot-reload an active agent session with config overrides. By default the
+    // in-memory timeline is preserved (used for voice-mode toggles and similar
+    // config swaps). When `rehydrateFromDisk` is set, the timeline is wiped so a
+    // new epoch is minted and provider history is re-streamed — this is what the
+    // user-facing "Reload agent" action wants when the on-disk session was
+    // mutated outside Otto.
+    async reloadAgentSession(agentId, overrides, options) {
+        let existing = this.requireSessionAgent(agentId);
+        if (this.hasInFlightRun(agentId)) {
+            await this.cancelAgentRun(agentId);
+            existing = this.requireSessionAgent(agentId);
+        }
+        const rehydrateFromDisk = options?.rehydrateFromDisk ?? false;
+        const preservedHistoryPrimed = existing.historyPrimed;
+        const preservedLastUsage = existing.lastUsage;
+        const preservedLastError = existing.lastError;
+        const preservedAttention = existing.attention;
+        const handle = existing.persistence;
+        const provider = handle?.provider ?? existing.provider;
+        const client = this.requireClient(provider);
+        const refreshConfig = {
+            ...existing.config,
+            ...overrides,
+            provider,
+        };
+        const { storedConfig, launchConfig } = await this.prepareSessionConfig(refreshConfig, agentId);
+        const launchContext = await this.buildLaunchContext(agentId, client);
+        const providerLaunchConfig = this.resolveProviderLaunchConfig(launchConfig, launchContext);
+        const session = handle
+            ? await client.resumeSession(handle, providerLaunchConfig, launchContext)
+            : await client.createSession(providerLaunchConfig, launchContext);
+        this.agentStreamCoalescer.flushAndDiscard(agentId);
+        // Remove the existing agent entry before swapping sessions
+        this.agents.delete(agentId);
+        if (existing.unsubscribeSession) {
+            existing.unsubscribeSession();
+            existing.unsubscribeSession = null;
+        }
+        this.foregroundRuns.clearAgent(agentId, existing);
+        await this.closeReloadedSession(existing.session, agentId);
+        if (rehydrateFromDisk) {
+            // Wipe both durable and in-memory timeline so registerSession mints a
+            // new epoch and hydrateTimelineFromProvider re-streams the freshly read
+            // provider history into an empty timeline.
+            await this.deleteCommittedTimeline(agentId);
+            this.timelineStore.delete(agentId);
+        }
+        // Preserve existing labels and timeline during reload.
+        return this.registerSession(session, storedConfig, agentId, {
+            labels: existing.labels,
+            workspaceId: existing.workspaceId,
+            createdAt: existing.createdAt,
+            updatedAt: existing.updatedAt,
+            lastUserMessageAt: existing.lastUserMessageAt,
+            historyPrimed: rehydrateFromDisk ? false : preservedHistoryPrimed,
+            lastUsage: preservedLastUsage,
+            lastError: preservedLastError,
+            attention: preservedAttention,
+        });
+    }
+    async closeReloadedSession(session, agentId) {
+        try {
+            const result = await this.waitWithTimeout({
+                operation: session.close(),
+                timeoutMs: this.rescueTimeouts.reloadSessionCloseMs,
+                onLateError: (error) => {
+                    this.logger.warn({ err: error, agentId }, "Previous session close failed after refresh timeout");
+                },
+            });
+            if (result === "timed_out") {
+                this.logger.warn({ agentId, timeoutMs: this.rescueTimeouts.reloadSessionCloseMs }, "Timed out closing previous session during refresh");
+            }
+        }
+        catch (error) {
+            this.logger.warn({ err: error, agentId }, "Failed to close previous session during refresh");
+        }
+    }
+    async waitWithTimeout(options) {
+        let didTimeOut = false;
+        let timer = null;
+        const operation = options.operation
+            .then(() => "completed")
+            .catch((error) => {
+            if (didTimeOut) {
+                options.onLateError?.(error);
+                return "timed_out";
+            }
+            throw error;
+        });
+        try {
+            return await Promise.race([
+                operation,
+                new Promise((resolvePromise) => {
+                    timer = setTimeout(() => {
+                        didTimeOut = true;
+                        resolvePromise("timed_out");
+                    }, options.timeoutMs);
+                }),
+            ]);
+        }
+        finally {
+            if (timer) {
+                clearTimeout(timer);
+            }
+        }
+    }
+    async closeAgent(agentId) {
+        const agent = this.requireAgent(agentId);
+        this.logger.trace({
+            agentId,
+            provider: agent.provider,
+            sessionId: agent.persistence?.sessionId ?? undefined,
+            turnId: agent.activeForegroundTurnId ?? undefined,
+            lifecycle: agent.lifecycle,
+            activeForegroundTurnId: agent.activeForegroundTurnId,
+            pendingPermissions: agent.pendingPermissions.size,
+        }, "agent.manager.close.start");
+        const closedAgent = this.prepareAgentForClosure(agent, "agent closed");
+        await agent.session.close();
+        this.timelineStore.delete(agentId);
+        await this.persistSnapshot(closedAgent);
+        this.emitClosedAgent(closedAgent, { persist: false });
+        this.logger.trace({
+            agentId,
+            provider: closedAgent.provider,
+            sessionId: closedAgent.persistence?.sessionId ?? undefined,
+        }, "agent.manager.close.complete");
+    }
+    async archiveAgent(agentId) {
+        const agent = this.requireAgent(agentId);
+        if (!this.registry) {
+            throw new Error("Agent storage is not configured");
+        }
+        await this.registry.applySnapshot(agent, {
+            internal: agent.internal,
+        });
+        const stored = await this.registry.get(agentId);
+        if (!stored) {
+            throw new Error(`Agent ${agentId} not found in storage after snapshot`);
+        }
+        const { archivedAt } = await this.markRecordArchived(stored);
+        agent.updatedAt = new Date(archivedAt);
+        await this.closeAgent(agentId);
+        await this.cascadeArchiveChildren(agentId);
+        return { archivedAt };
+    }
+    // Children created via the MCP `create_agent` tool carry the parent-agent-id
+    // label pointing back at the caller. Archiving the parent cascades to those
+    // children so subagent fleets don't outlive their orchestrator. Detached
+    // handoff agents omit this label, so they stand outside the cascade.
+    async cascadeArchiveChildren(parentAgentId) {
+        const registry = this.registry;
+        if (!registry) {
+            return;
+        }
+        const records = await registry.list();
+        for (const record of records) {
+            if (record.archivedAt) {
+                continue;
+            }
+            if (record.labels?.[PARENT_AGENT_ID_LABEL] !== parentAgentId) {
+                continue;
+            }
+            if (this.agents.has(record.id)) {
+                await this.archiveAgent(record.id);
+            }
+            else {
+                await this.markRecordArchived(record);
+                await this.cascadeArchiveChildren(record.id);
+            }
+        }
+    }
+    async markRecordArchived(record) {
+        const registry = this.requireRegistry();
+        const archivedAt = new Date().toISOString();
+        const archivedRecord = buildArchivedAgentRecord(record, { archivedAt, updatedAt: archivedAt });
+        await registry.upsert(archivedRecord);
+        await this.archiveNativeSessionBestEffort(record.provider, record.persistence);
+        if (this.agents.has(record.id)) {
+            this.notifyAgentState(record.id);
+        }
+        else if (!archivedRecord.internal) {
+            this.dispatchArchivedStoredAgent(archivedRecord);
+        }
+        await this.fireAgentArchived(record.id);
+        return archivedRecord;
+    }
+    async fireAgentArchived(agentId) {
+        const callback = this.onAgentArchived;
+        if (!callback) {
+            return;
+        }
+        try {
+            await callback(agentId);
+        }
+        catch (error) {
+            this.logger.warn({ err: error, agentId }, "onAgentArchived callback failed");
+        }
+    }
+    dispatchArchivedStoredAgent(record) {
+        const updatedAt = new Date(record.updatedAt);
+        this.dispatch({
+            type: "agent_state",
+            agent: {
+                id: record.id,
+                provider: record.provider,
+                cwd: record.cwd,
+                workspaceId: record.workspaceId,
+                session: null,
+                capabilities: STORED_AGENT_CAPABILITIES,
+                config: buildStoredAgentConfig(record),
+                runtimeInfo: undefined,
+                lifecycle: "closed",
+                createdAt: new Date(record.createdAt),
+                updatedAt,
+                availableModes: [],
+                features: record.features,
+                currentModeId: record.lastModeId ?? null,
+                pendingPermissions: new Map(),
+                bufferedPermissionResolutions: new Map(),
+                inFlightPermissionResponses: new Set(),
+                pendingReplacement: false,
+                activeForegroundTurnId: null,
+                foregroundTurnWaiters: new Set(),
+                finalizedForegroundTurnIds: new Set(),
+                unsubscribeSession: null,
+                persistence: record.persistence ?? null,
+                historyPrimed: true,
+                lastUserMessageAt: record.lastUserMessageAt ? new Date(record.lastUserMessageAt) : null,
+                lastUsage: undefined,
+                lastError: record.lastError ?? undefined,
+                attention: { requiresAttention: false },
+                internal: record.internal,
+                labels: record.labels,
+            },
+        });
+    }
+    async withAgentConfigLock(agentId, operation) {
+        const previous = this.agentConfigMutations.get(agentId) ?? Promise.resolve();
+        const run = previous.then(operation);
+        const settled = run.then(() => undefined, () => undefined);
+        this.agentConfigMutations.set(agentId, settled);
+        const cleanup = async () => {
+            await settled;
+            if (this.agentConfigMutations.get(agentId) === settled) {
+                this.agentConfigMutations.delete(agentId);
+            }
+        };
+        void cleanup();
+        return run;
+    }
+    async setAgentMode(agentId, modeId) {
+        return this.withAgentConfigLock(agentId, () => this.setAgentModeUnlocked(agentId, modeId));
+    }
+    async setAgentModeUnlocked(agentId, modeId) {
+        const agent = this.requireSessionAgent(agentId);
+        const notice = (await agent.session.setMode(modeId)) ?? null;
+        const currentMode = (await agent.session.getCurrentMode()) ?? modeId;
+        agent.config.modeId = currentMode ?? undefined;
+        agent.currentModeId = currentMode;
+        // Update runtimeInfo to reflect the new mode
+        if (agent.runtimeInfo) {
+            agent.runtimeInfo = { ...agent.runtimeInfo, modeId: currentMode };
+        }
+        this.touchUpdatedAt(agent);
+        this.emitState(agent);
+        return notice;
+    }
+    async setAgentModel(agentId, modelId) {
+        return this.withAgentConfigLock(agentId, () => this.setAgentModelUnlocked(agentId, modelId));
+    }
+    async setAgentModelUnlocked(agentId, modelId) {
+        const agent = this.requireSessionAgent(agentId);
+        const normalizedModelId = typeof modelId === "string" && modelId.trim().length > 0 ? modelId : null;
+        if (agent.session.setModel) {
+            await agent.session.setModel(normalizedModelId);
+        }
+        agent.config.model = normalizedModelId ?? undefined;
+        if (agent.runtimeInfo) {
+            agent.runtimeInfo = { ...agent.runtimeInfo, model: normalizedModelId };
+        }
+        this.touchUpdatedAt(agent);
+        this.emitState(agent);
+    }
+    async setAgentThinkingOption(agentId, thinkingOptionId) {
+        return this.withAgentConfigLock(agentId, () => this.setAgentThinkingOptionUnlocked(agentId, thinkingOptionId));
+    }
+    async setAgentThinkingOptionUnlocked(agentId, thinkingOptionId) {
+        const agent = this.requireSessionAgent(agentId);
+        const normalizedThinkingOptionId = typeof thinkingOptionId === "string" && thinkingOptionId.trim().length > 0
+            ? thinkingOptionId
+            : null;
+        let notice = null;
+        if (agent.session.setThinkingOption) {
+            notice = (await agent.session.setThinkingOption(normalizedThinkingOptionId)) ?? null;
+        }
+        agent.config.thinkingOptionId = normalizedThinkingOptionId ?? undefined;
+        if (agent.runtimeInfo) {
+            agent.runtimeInfo = {
+                ...agent.runtimeInfo,
+                thinkingOptionId: normalizedThinkingOptionId,
+            };
+        }
+        this.touchUpdatedAt(agent);
+        this.emitState(agent);
+        return notice;
+    }
+    /**
+     * Live-switch a running agent's personality (or clear it with null). The
+     * prompt half goes through the session's applyPersonality (providers without
+     * it reject — they cannot change a system prompt mid-conversation); the brain
+     * half (model/mode/effort) rides the existing setters. Identity (name/spinner)
+     * follows automatically: agent_state projects it from config.personalitySnapshot.
+     * The caller resolves the roster personality against the agent's cwd and
+     * guarantees provider match; this method only applies.
+     */
+    async setAgentPersonality(agentId, snapshot) {
+        return this.withAgentConfigLock(agentId, () => this.setAgentPersonalityUnlocked(agentId, snapshot));
+    }
+    async setAgentPersonalityUnlocked(agentId, snapshot) {
+        const agent = this.requireSessionAgent(agentId);
+        const session = agent.session;
+        if (!session.applyPersonality) {
+            throw new Error(`Provider '${agent.config.provider}' does not support switching personality on a running agent`);
+        }
+        if (snapshot && snapshot.provider !== agent.config.provider) {
+            throw new Error(`Personality "${snapshot.name}" targets provider '${snapshot.provider}', but this agent runs '${agent.config.provider}'`);
+        }
+        // Prompt half. The personality prompt only owns config.systemPrompt when
+        // the caller set none at spawn (mirrors applyPersonalityIdentityToConfig);
+        // a caller-authored prompt survives the switch.
+        const outgoingPersonalityPrompt = agent.config.personalitySnapshot?.systemPrompt;
+        const promptIsPersonalityOwned = agent.config.systemPrompt === undefined ||
+            agent.config.systemPrompt === outgoingPersonalityPrompt;
+        const nextSystemPrompt = promptIsPersonalityOwned
+            ? snapshot?.systemPrompt
+            : agent.config.systemPrompt;
+        const daemonAppendSystemPrompt = this.appendSystemPrompt.trim();
+        const personalityUpdate = {
+            personalitySnapshot: snapshot ?? undefined,
+            systemPrompt: nextSystemPrompt,
+            // Same rule as applyDaemonAppendSystemPrompt: a personality with
+            // respectGlobalAppendPrompt === false owns its whole prompt.
+            daemonAppendSystemPrompt: daemonAppendSystemPrompt && snapshot?.respectGlobalAppendPrompt !== false
+                ? daemonAppendSystemPrompt
+                : undefined,
+        };
+        const notices = [];
+        // Brain half first — only when binding a personality; clearing keeps the
+        // brain. Ordering matters for Claude: applyPersonality flags a query
+        // restart, and the brain's setModel/setMode call ensureQuery, which would
+        // then tear down + respawn the CLI synchronously inside this RPC. Brain
+        // first rides the live query; the restart stays lazy (next turn).
+        if (snapshot) {
+            notices.push(...(await this.applyPersonalityBrain(agent, session, snapshot)));
+        }
+        notices.push((await session.applyPersonality(personalityUpdate)) ?? null);
+        // Stored config: personality + prompt persist; daemonAppendSystemPrompt is
+        // deliberately runtime-only (re-derived from daemon settings on resume).
+        agent.config.personalitySnapshot = snapshot ?? undefined;
+        agent.config.systemPrompt = nextSystemPrompt;
+        this.touchUpdatedAt(agent);
+        this.emitState(agent);
+        return notices.find((notice) => notice !== null) ?? null;
+    }
+    /**
+     * Apply a personality's brain fields (model/effort/mode) to a live session and
+     * mirror them onto the managed agent's config/runtimeInfo. Split out of
+     * setAgentPersonality purely to keep that method under the complexity ceiling.
+     */
+    async applyPersonalityBrain(agent, session, snapshot) {
+        const notices = [];
+        // Ordering carries two invariants:
+        // 1. setMode is the fallible step (Claude rejects e.g. "auto" on
+        //    Bedrock/Vertex), so it runs FIRST — a mode failure must not leave a
+        //    half-applied switch (new model + old identity) behind.
+        // 2. Mode and model ride the live query (Claude: ensureQuery + SDK
+        //    setters) and run before setThinkingOption, which flags a query
+        //    restart.
+        if (snapshot.modeId !== undefined) {
+            notices.push((await session.setMode(snapshot.modeId)) ?? null);
+            const currentMode = (await session.getCurrentMode()) ?? snapshot.modeId;
+            agent.config.modeId = currentMode ?? undefined;
+            agent.currentModeId = currentMode;
+            if (agent.runtimeInfo) {
+                agent.runtimeInfo = { ...agent.runtimeInfo, modeId: currentMode };
+            }
+        }
+        if (session.setModel) {
+            await session.setModel(snapshot.model);
+            agent.config.model = snapshot.model;
+            if (agent.runtimeInfo) {
+                agent.runtimeInfo = { ...agent.runtimeInfo, model: snapshot.model };
+            }
+        }
+        if (session.setThinkingOption) {
+            // Always set — a snapshot without an effort (degraded or unspecified)
+            // clears the previous personality's thinking option back to the model
+            // default instead of silently carrying it onto the new model.
+            notices.push((await session.setThinkingOption(snapshot.thinkingOptionId ?? null)) ?? null);
+            agent.config.thinkingOptionId = snapshot.thinkingOptionId;
+            if (agent.runtimeInfo) {
+                agent.runtimeInfo = {
+                    ...agent.runtimeInfo,
+                    thinkingOptionId: snapshot.thinkingOptionId,
+                };
+            }
+        }
+        return notices;
+    }
+    async setAgentFeature(agentId, featureId, value) {
+        return this.withAgentConfigLock(agentId, () => this.setAgentFeatureUnlocked(agentId, featureId, value));
+    }
+    async setAgentFeatureUnlocked(agentId, featureId, value) {
+        const agent = this.requireAgent(agentId);
+        if (!agent.session.setFeature) {
+            throw new Error("Agent session does not support setting features");
+        }
+        await agent.session.setFeature(featureId, value);
+        agent.config.featureValues = { ...agent.config.featureValues, [featureId]: value };
+        this.touchUpdatedAt(agent);
+        this.emitState(agent);
+    }
+    async setTitle(agentId, title) {
+        const agent = this.requireAgent(agentId);
+        const normalizedTitle = title.trim();
+        if (!normalizedTitle) {
+            return;
+        }
+        if (this.agentsAwaitingInitialSnapshotPersist.has(agent.id) &&
+            this.registry &&
+            (await this.registry.get(agent.id)) === null) {
+            return;
+        }
+        this.touchUpdatedAt(agent);
+        await this.persistSnapshot(agent, { title: normalizedTitle });
+        this.emitState(agent, { persist: false });
+    }
+    async setLabels(agentId, labels) {
+        const agent = this.requireAgent(agentId);
+        await this.writeLabels(agent.id, labels);
+    }
+    async writeLabels(agentId, patch) {
+        const liveAgent = this.agents.get(agentId);
+        if (liveAgent) {
+            liveAgent.labels = applyLabelPatch(liveAgent.labels, patch);
+            this.touchUpdatedAt(liveAgent);
+            await this.persistSnapshot(liveAgent);
+            this.emitState(liveAgent, { persist: false });
+            const record = this.registry ? await this.registry.get(agentId) : null;
+            return { record, live: true };
+        }
+        const nextRecord = await this.writeStoredMetadata(agentId, { labels: patch });
+        return { record: nextRecord, live: false };
+    }
+    async writeStoredMetadata(agentId, patch) {
+        const registry = this.requireRegistry();
+        const record = await registry.get(agentId);
+        if (!record) {
+            throw new Error(`Agent not found: ${agentId}`);
+        }
+        const nextRecord = {
+            ...record,
+            ...(patch.title ? { title: patch.title } : {}),
+            ...(patch.labels ? { labels: applyLabelPatch(record.labels, patch.labels) } : {}),
+            updatedAt: this.nextStoredUpdatedAt(record),
+        };
+        await registry.upsert(nextRecord);
+        return nextRecord;
+    }
+    async detachAgent(agentId) {
+        const registry = this.requireRegistry();
+        const liveAgent = this.agents.get(agentId);
+        if (liveAgent) {
+            const previousParentAgentId = getParentAgentIdFromLabels(liveAgent.labels);
+            if (!previousParentAgentId) {
+                await this.persistSnapshot(liveAgent);
+                const record = await registry.get(agentId);
+                if (!record) {
+                    throw new Error(`Agent not found in storage after detach: ${agentId}`);
+                }
+                return { record, live: true, previousParentAgentId: null };
+            }
+            const { record } = await this.writeLabels(agentId, { [PARENT_AGENT_ID_LABEL]: null });
+            if (!record) {
+                throw new Error(`Agent not found in storage after detach: ${agentId}`);
+            }
+            return { record, live: true, previousParentAgentId };
+        }
+        const record = await registry.get(agentId);
+        if (!record) {
+            throw new Error(`Agent not found: ${agentId}`);
+        }
+        const previousParentAgentId = getParentAgentIdFromLabels(record.labels);
+        if (!previousParentAgentId) {
+            return { record, live: false, previousParentAgentId: null };
+        }
+        const result = await this.writeLabels(agentId, { [PARENT_AGENT_ID_LABEL]: null });
+        if (!result.record) {
+            throw new Error(`Agent not found in storage after detach: ${agentId}`);
+        }
+        return { record: result.record, live: false, previousParentAgentId };
+    }
+    notifyAgentState(agentId) {
+        const agent = this.agents.get(agentId);
+        if (!agent || agent.internal) {
+            return;
+        }
+        this.touchUpdatedAt(agent);
+        this.emitState(agent);
+    }
+    async clearAgentAttention(agentId) {
+        const agent = this.requireAgent(agentId);
+        if (agent.attention.requiresAttention) {
+            agent.attention = { requiresAttention: false };
+            await this.persistSnapshot(agent);
+            this.emitState(agent, { persist: false });
+        }
+    }
+    async archiveSnapshot(agentId, archivedAt) {
+        const registry = this.requireRegistry();
+        const liveAgent = this.getAgent(agentId);
+        if (liveAgent) {
+            await this.persistSnapshot(liveAgent, {
+                internal: liveAgent.internal,
+            });
+        }
+        const record = await registry.get(agentId);
+        if (!record) {
+            throw new Error(`Agent not found: ${agentId}`);
+        }
+        const nextRecord = buildArchivedAgentRecord(record, { archivedAt });
+        await registry.upsert(nextRecord);
+        await this.archiveNativeSessionBestEffort(record.provider, record.persistence);
+        if (this.agents.has(agentId)) {
+            this.notifyAgentState(agentId);
+        }
+        else if (!nextRecord.internal) {
+            this.dispatchArchivedStoredAgent(nextRecord);
+        }
+        await this.fireAgentArchived(agentId);
+        return nextRecord;
+    }
+    async unarchiveSnapshot(agentId) {
+        const registry = this.requireRegistry();
+        const record = await registry.get(agentId);
+        if (!record || !record.archivedAt) {
+            return false;
+        }
+        await this.unarchiveNativeSession(record.provider, record.persistence);
+        await registry.upsert({
+            ...record,
+            archivedAt: null,
+            updatedAt: new Date().toISOString(),
+        });
+        if (this.getAgent(agentId)) {
+            this.notifyAgentState(agentId);
+        }
+        return true;
+    }
+    async unarchiveSnapshotByHandle(handle) {
+        const registry = this.requireRegistry();
+        const records = await registry.list();
+        const matched = records.find((record) => record.persistence?.provider === handle.provider &&
+            record.persistence?.sessionId === handle.sessionId);
+        if (!matched) {
+            return;
+        }
+        await this.unarchiveSnapshot(matched.id);
+    }
+    async updateAgentMetadata(agentId, updates) {
+        const liveAgent = this.getAgent(agentId);
+        if (liveAgent) {
+            if (updates.title) {
+                await this.setTitle(agentId, updates.title);
+            }
+            if (updates.labels) {
+                await this.writeLabels(agentId, updates.labels);
+            }
+            return;
+        }
+        await this.writeStoredMetadata(agentId, updates);
+    }
+    async runAgent(agentId, prompt, options) {
+        const events = this.streamAgent(agentId, prompt, options);
+        const timeline = [];
+        let finalText = "";
+        let usage;
+        let canceled = false;
+        for await (const event of events) {
+            if (event.type === "timeline") {
+                timeline.push(event.item);
+            }
+            else if (event.type === "turn_completed") {
+                usage = event.usage;
+            }
+            else if (event.type === "turn_failed") {
+                throw new Error(this.formatTurnFailedMessage(event));
+            }
+            else if (event.type === "turn_canceled") {
+                canceled = true;
+            }
+        }
+        finalText = this.getLastAssistantMessageFromTimeline(timeline) ?? "";
+        const agent = this.requireAgent(agentId);
+        const sessionId = agent.persistence?.sessionId;
+        if (!sessionId) {
+            throw new Error(`Agent ${agentId} has no persistence.sessionId after run completed`);
+        }
+        return {
+            sessionId,
+            finalText,
+            usage,
+            timeline,
+            canceled,
+        };
+    }
+    /**
+     * Try to run a prompt out-of-band — i.e. without allocating a foreground turn
+     * and without canceling any active turn. Returns true when the session
+     * accepted the prompt as a side-effect command (e.g. /goal pause). Events
+     * emitted by the handler flow through dispatchStream so they persist and
+     * broadcast like normal timeline events.
+     */
+    tryRunOutOfBand(agentId, prompt) {
+        const agent = this.requireSessionAgent(agentId);
+        const handler = agent.session.tryHandleOutOfBand?.(prompt);
+        if (!handler) {
+            return false;
+        }
+        const dispatch = (event) => {
+            // Persist timeline items so they show up in fetchAgentTimeline; broadcast
+            // for live subscribers. Other event types are broadcast only.
+            if (event.type === "timeline") {
+                this.touchUpdatedAt(agent);
+                const row = this.recordTimeline(agent.id, event.item);
+                this.dispatchStream(agent.id, event, {
+                    seq: row.seq,
+                    epoch: this.timelineStore.getEpoch(agent.id),
+                    timestamp: row.timestamp,
+                });
+                return;
+            }
+            this.dispatchStream(agent.id, event, { timestamp: new Date().toISOString() });
+        };
+        void (async () => {
+            try {
+                await handler.run({ emit: dispatch });
+            }
+            catch (error) {
+                const text = error instanceof Error ? error.message : "Out-of-band command failed";
+                dispatch({
+                    type: "timeline",
+                    provider: agent.provider,
+                    item: { type: "assistant_message", text: `[Error] ${text}` },
+                });
+            }
+        })();
+        return true;
+    }
+    async appendTimelineItem(agentId, item) {
+        const agent = this.requireAgent(agentId);
+        this.touchUpdatedAt(agent);
+        const row = this.recordTimeline(agentId, item);
+        this.dispatchStream(agentId, {
+            type: "timeline",
+            item,
+            provider: agent.provider,
+        }, {
+            seq: row.seq,
+            epoch: this.timelineStore.getEpoch(agentId),
+            timestamp: row.timestamp,
+        });
+        await this.persistSnapshot(agent);
+    }
+    async emitLiveTimelineItem(agentId, item) {
+        const agent = this.requireAgent(agentId);
+        this.touchUpdatedAt(agent);
+        this.dispatchStream(agentId, {
+            type: "timeline",
+            item,
+            provider: agent.provider,
+        });
+    }
+    streamAgent(agentId, prompt, options) {
+        const existingAgent = this.requireSessionAgent(agentId);
+        this.logger.trace({
+            agentId,
+            provider: existingAgent.provider,
+            sessionId: existingAgent.persistence?.sessionId ?? undefined,
+            turnId: existingAgent.activeForegroundTurnId ?? undefined,
+            lifecycle: existingAgent.lifecycle,
+            activeForegroundTurnId: existingAgent.activeForegroundTurnId,
+            hasPendingForegroundRun: this.foregroundRuns.hasPendingRun(agentId),
+            promptType: typeof prompt === "string" ? "string" : "structured",
+            hasRunOptions: Boolean(options),
+        }, "agent.manager.stream.request");
+        if (existingAgent.activeForegroundTurnId || this.foregroundRuns.hasPendingRun(agentId)) {
+            this.logger.trace({
+                agentId,
+                provider: existingAgent.provider,
+                sessionId: existingAgent.persistence?.sessionId ?? undefined,
+                turnId: existingAgent.activeForegroundTurnId ?? undefined,
+                lifecycle: existingAgent.lifecycle,
+                hasPendingForegroundRun: this.foregroundRuns.hasPendingRun(agentId),
+            }, "agent.manager.stream.reject");
+            throw new Error(`Agent ${agentId} already has an active run`);
+        }
+        const agent = existingAgent;
+        agent.pendingReplacement = false;
+        agent.lastError = undefined;
+        const pendingRun = this.foregroundRuns.createPendingRun(agentId);
+        const streamForwarder = async function* streamForwarder() {
+            let turnId;
+            let turnStream = null;
+            try {
+                const result = await agent.session.startTurn(prompt, options);
+                turnId = result.turnId;
+            }
+            catch (error) {
+                const errorMsg = error instanceof Error ? error.message : "Failed to start turn";
+                await this.handleStreamEvent(agent, {
+                    type: "turn_failed",
+                    provider: agent.provider,
+                    error: errorMsg,
+                });
+                this.finalizeForegroundTurn(agent);
+                this.foregroundRuns.settlePendingRun(agentId, pendingRun.token);
+                throw error;
+            }
+            pendingRun.started = true;
+            agent.activeForegroundTurnId = turnId;
+            agent.lifecycle = "running";
+            this.touchUpdatedAt(agent);
+            this.emitState(agent);
+            this.logger.trace({
+                agentId,
+                provider: agent.provider,
+                sessionId: agent.persistence?.sessionId ?? undefined,
+                turnId,
+                lifecycle: agent.lifecycle,
+                activeForegroundTurnId: agent.activeForegroundTurnId,
+            }, "agent.manager.stream.start");
+            turnStream = this.foregroundRuns.createTurnStream(turnId);
+            this.foregroundRuns.addWaiter(agent, turnStream.waiter);
+            try {
+                for await (const event of turnStream.events(isTurnTerminalEvent)) {
+                    yield event;
+                }
+            }
+            finally {
+                if (turnStream) {
+                    this.foregroundRuns.deleteWaiter(agent, turnStream.waiter);
+                }
+                this.foregroundRuns.settlePendingRun(agentId, pendingRun.token);
+                if (!agent.activeForegroundTurnId) {
+                    await this.refreshRuntimeInfo(agent);
+                }
+            }
+        }.call(this);
+        return streamForwarder;
+    }
+    finalizeForegroundTurn(agent, turnId) {
+        const mutableAgent = agent;
+        if (turnId) {
+            this.foregroundRuns.rememberFinalizedTurn(mutableAgent, turnId);
+        }
+        mutableAgent.activeForegroundTurnId = null;
+        const terminalError = mutableAgent.lastError;
+        const shouldHoldBusyForReplacement = mutableAgent.pendingReplacement && !terminalError;
+        let nextLifecycle;
+        if (shouldHoldBusyForReplacement) {
+            nextLifecycle = "running";
+        }
+        else if (terminalError) {
+            nextLifecycle = "error";
+        }
+        else {
+            nextLifecycle = "idle";
+        }
+        mutableAgent.lifecycle = nextLifecycle;
+        const persistenceHandle = mutableAgent.session.describePersistence() ??
+            (mutableAgent.runtimeInfo?.sessionId
+                ? { provider: mutableAgent.provider, sessionId: mutableAgent.runtimeInfo.sessionId }
+                : null);
+        if (persistenceHandle) {
+            mutableAgent.persistence = attachPersistenceCwd(persistenceHandle, mutableAgent.cwd);
+        }
+        this.logger.trace({
+            agentId: agent.id,
+            provider: agent.provider,
+            sessionId: mutableAgent.persistence?.sessionId ?? undefined,
+            turnId,
+            lifecycle: mutableAgent.lifecycle,
+            terminalError,
+            pendingReplacement: mutableAgent.pendingReplacement,
+        }, "agent.manager.finalize");
+        if (!shouldHoldBusyForReplacement) {
+            this.touchUpdatedAt(mutableAgent);
+            this.emitState(mutableAgent);
+        }
+    }
+    replaceAgentRun(agentId, prompt, options) {
+        const snapshot = this.requireAgent(agentId);
+        if (snapshot.lifecycle !== "running" &&
+            !snapshot.activeForegroundTurnId &&
+            !this.foregroundRuns.hasPendingRun(agentId)) {
+            return this.streamAgent(agentId, prompt, options);
+        }
+        const agent = this.requireSessionAgent(agentId);
+        agent.pendingReplacement = true;
+        agent.lifecycle = "running";
+        this.touchUpdatedAt(agent);
+        this.emitState(agent);
+        return async function* replaceRunForwarder() {
+            try {
+                await this.cancelAgentRun(agentId);
+                const nextRun = this.streamAgent(agentId, prompt, options);
+                for await (const event of nextRun) {
+                    yield event;
+                }
+            }
+            catch (error) {
+                const latest = this.agents.get(agentId);
+                if (latest) {
+                    const latestActive = latest;
+                    latestActive.pendingReplacement = false;
+                    if (!latestActive.activeForegroundTurnId && latestActive.lifecycle === "running") {
+                        latestActive.lifecycle = "idle";
+                        this.touchUpdatedAt(latestActive);
+                        this.emitState(latestActive);
+                    }
+                }
+                throw error;
+            }
+        }.call(this);
+    }
+    async waitForAgentRunStart(agentId, options) {
+        const snapshot = this.getAgent(agentId);
+        if (!snapshot) {
+            throw new Error(`Agent ${agentId} not found`);
+        }
+        const pendingRun = this.foregroundRuns.getPendingRun(agentId);
+        if ((snapshot.lifecycle === "running" || pendingRun?.started) && !snapshot.pendingReplacement) {
+            return;
+        }
+        if (!snapshot.activeForegroundTurnId && !pendingRun && !snapshot.pendingReplacement) {
+            throw new Error(`Agent ${agentId} has no pending run`);
+        }
+        if (options?.signal?.aborted) {
+            throw createAbortError(options.signal, "wait_for_agent_start aborted");
+        }
+        await new Promise((resolvePromise, reject) => {
+            if (options?.signal?.aborted) {
+                reject(createAbortError(options.signal, "wait_for_agent_start aborted"));
+                return;
+            }
+            let unsubscribe = null;
+            let abortHandler = null;
+            const cleanup = () => {
+                if (unsubscribe) {
+                    try {
+                        unsubscribe();
+                    }
+                    catch {
+                        // ignore cleanup errors
+                    }
+                    unsubscribe = null;
+                }
+                if (abortHandler && options?.signal) {
+                    try {
+                        options.signal.removeEventListener("abort", abortHandler);
+                    }
+                    catch {
+                        // ignore cleanup errors
+                    }
+                    abortHandler = null;
+                }
+            };
+            const finishOk = () => {
+                cleanup();
+                resolvePromise();
+            };
+            const finishErr = (error) => {
+                cleanup();
+                reject(error);
+            };
+            if (options?.signal) {
+                abortHandler = () => finishErr(createAbortError(options.signal, "wait_for_agent_start aborted"));
+                options.signal.addEventListener("abort", abortHandler, { once: true });
+            }
+            const checkCurrentState = () => {
+                const current = this.getAgent(agentId);
+                if (!current) {
+                    finishErr(new Error(`Agent ${agentId} not found`));
+                    return true;
+                }
+                const currentPendingRun = this.foregroundRuns.getPendingRun(agentId);
+                if ((current.lifecycle === "running" || currentPendingRun?.started) &&
+                    !current.pendingReplacement) {
+                    finishOk();
+                    return true;
+                }
+                if (current.lifecycle === "error" && !currentPendingRun?.started) {
+                    finishErr(new Error(current.lastError ?? `Agent ${agentId} failed to start`));
+                    return true;
+                }
+                if (!currentPendingRun && !current.activeForegroundTurnId && !current.pendingReplacement) {
+                    finishErr(new Error(`Agent ${agentId} run finished before starting`));
+                    return true;
+                }
+                return false;
+            };
+            unsubscribe = this.subscribe((event) => {
+                if (event.type !== "agent_state" || event.agent.id !== agentId) {
+                    return;
+                }
+                checkCurrentState();
+            }, { agentId, replayState: false });
+            checkCurrentState();
+        });
+    }
+    async respondToPermission(agentId, requestId, response) {
+        const agent = this.requireAgent(agentId);
+        agent.inFlightPermissionResponses.add(requestId);
+        try {
+            const result = await agent.session.respondToPermission(requestId, response);
+            agent.pendingPermissions.delete(requestId);
+            try {
+                await this.refreshSessionState(agent);
+            }
+            catch {
+                // Ignore refresh errors - state sync after permission approval is best effort.
+            }
+            this.touchUpdatedAt(agent);
+            await this.persistSnapshot(agent);
+            this.emitState(agent);
+            const bufferedResolution = agent.bufferedPermissionResolutions.get(requestId);
+            if (bufferedResolution) {
+                agent.bufferedPermissionResolutions.delete(requestId);
+                this.dispatchStream(agent.id, bufferedResolution, { timestamp: new Date().toISOString() });
+            }
+            return result;
+        }
+        finally {
+            agent.inFlightPermissionResponses.delete(requestId);
+            agent.bufferedPermissionResolutions.delete(requestId);
+        }
+    }
+    async cancelAgentRun(agentId) {
+        const agent = this.requireSessionAgent(agentId);
+        const pendingRun = this.foregroundRuns.getPendingRun(agentId);
+        const foregroundTurnId = agent.activeForegroundTurnId;
+        const hasForegroundTurn = Boolean(foregroundTurnId);
+        const isAutonomousRunning = agent.lifecycle === "running" && !hasForegroundTurn && !pendingRun;
+        if (!hasForegroundTurn && !isAutonomousRunning && !pendingRun) {
+            return false;
+        }
+        await this.interruptSession(agent.session, agentId);
+        // The interrupt will produce a turn_canceled/turn_failed event via subscribe(),
+        // which flows through the session event dispatcher and settles the foreground turn waiter.
+        // Wait briefly for the event to propagate if there's an active foreground turn.
+        if (foregroundTurnId) {
+            const waiter = Array.from(agent.foregroundTurnWaiters).find((candidate) => candidate.turnId === foregroundTurnId);
+            const timeout = new Promise((resolvePromise) => setTimeout(resolvePromise, 2000));
+            if (waiter) {
+                await Promise.race([waiter.settledPromise, timeout]);
+            }
+            else if (agent.activeForegroundTurnId === foregroundTurnId) {
+                await Promise.race([
+                    new Promise((resolvePromise) => {
+                        const unsubscribe = this.subscribe((event) => {
+                            if (event.type === "agent_state" &&
+                                event.agent.id === agentId &&
+                                !event.agent.activeForegroundTurnId) {
+                                unsubscribe();
+                                resolvePromise();
+                            }
+                        }, { agentId, replayState: false });
+                    }),
+                    timeout,
+                ]);
+            }
+            // The waiter settling wakes up the streamForwarder generator, but its
+            // finally block (which deletes the pendingForegroundRun) runs asynchronously.
+            // Wait for the pending run to be fully cleaned up so the next streamAgent
+            // call doesn't see a stale entry and reject with "already has an active run".
+            if (pendingRun && !pendingRun.settled) {
+                await Promise.race([pendingRun.settledPromise, timeout]);
+            }
+        }
+        else if (pendingRun) {
+            const timeout = new Promise((resolvePromise) => setTimeout(resolvePromise, 2000));
+            await Promise.race([pendingRun.settledPromise, timeout]);
+        }
+        // If the foreground turn is still stuck after the timeout, force-dispatch a
+        // synthetic turn_canceled so the normal event pipeline cleans up
+        // activeForegroundTurnId, settles waiters, and unblocks the streamForwarder.
+        if (foregroundTurnId && agent.activeForegroundTurnId === foregroundTurnId) {
+            this.logger.warn({ agentId, foregroundTurnId }, "cancelAgentRun: foreground turn still active after timeout, force-canceling");
+            void this.dispatchSessionEvent(agent, {
+                type: "turn_canceled",
+                provider: agent.provider,
+                reason: "interrupted",
+                turnId: foregroundTurnId,
+            });
+            // The synthetic event unblocks the streamForwarder generator, whose finally
+            // block settles the pending foreground run asynchronously. Wait for it.
+            const staleRun = this.foregroundRuns.getPendingRun(agentId);
+            if (staleRun && !staleRun.settled) {
+                await staleRun.settledPromise;
+            }
+        }
+        // Clear any pending permissions that weren't cleaned up by handleStreamEvent.
+        if (agent.pendingPermissions.size > 0) {
+            for (const [requestId] of agent.pendingPermissions) {
+                this.dispatchStream(agent.id, {
+                    type: "permission_resolved",
+                    provider: agent.provider,
+                    requestId,
+                    resolution: { behavior: "deny", message: "Interrupted" },
+                }, { timestamp: new Date().toISOString() });
+            }
+            agent.pendingPermissions.clear();
+            this.touchUpdatedAt(agent);
+            this.emitState(agent);
+        }
+        return true;
+    }
+    async interruptSession(session, agentId) {
+        try {
+            const result = await this.waitWithTimeout({
+                operation: session.interrupt(),
+                timeoutMs: this.rescueTimeouts.interruptSessionMs,
+                onLateError: (error) => {
+                    this.logger.warn({ err: error, agentId }, "Session interrupt failed after timeout during cancel");
+                },
+            });
+            if (result === "timed_out") {
+                this.logger.warn({ agentId, timeoutMs: this.rescueTimeouts.interruptSessionMs }, "Timed out interrupting session during cancel");
+            }
+        }
+        catch (error) {
+            this.logger.error({ err: error, agentId }, "Failed to interrupt session");
+        }
+    }
+    getPendingPermissions(agentId) {
+        const agent = this.requireSessionAgent(agentId);
+        return Array.from(agent.pendingPermissions.values());
+    }
+    peekPendingPermission(agent) {
+        const iterator = agent.pendingPermissions.values().next();
+        return iterator.done ? null : iterator.value;
+    }
+    /**
+     * Hydrates the timeline from provider history if the agent's durable
+     * timeline is empty (e.g., imported agents that have provider history
+     * on disk but no persisted timeline rows). No-ops if already hydrated.
+     */
+    async hydrateTimelineFromProvider(agentId, options) {
+        const agent = this.requireSessionAgent(agentId);
+        await this.hydrateTimelineFromLegacyProviderHistory(agent, options);
+    }
+    async rewind(agentId, messageId, mode) {
+        const agent = this.requireSessionAgent(agentId);
+        const hadActiveRun = Boolean(agent.activeForegroundTurnId) || this.foregroundRuns.hasPendingRun(agentId);
+        if (hadActiveRun) {
+            await this.cancelAgentRun(agentId);
+        }
+        const lock = this.foregroundRuns.createPendingRun(agentId);
+        try {
+            this.logger.info({ agentId, provider: agent.provider, messageId, mode }, "agent.rewind.start");
+            await invokeRewindCapability(agent.session, { messageId, mode });
+            if (mode !== "files") {
+                await this.hydrateTimelineFromProvider(agentId, { force: true, broadcast: true });
+            }
+            await this.refreshRuntimeInfo(agent);
+            await this.persistSnapshot(agent);
+            this.logger.info({ agentId, provider: agent.provider, messageId, mode }, "agent.rewind.complete");
+        }
+        catch (error) {
+            this.logger.warn({ err: error, agentId, provider: agent.provider, messageId, mode }, "agent.rewind.failed");
+            throw error;
+        }
+        finally {
+            this.foregroundRuns.settlePendingRun(agentId, lock.token);
+        }
+    }
+    async deleteCommittedTimeline(agentId) {
+        if (!this.durableTimelineStore) {
+            return;
+        }
+        await this.durableTimelineStore.deleteAgent(agentId);
+    }
+    async getLastAssistantMessage(agentId) {
+        const agent = this.agents.get(agentId);
+        if (!agent) {
+            return null;
+        }
+        return await this.getLastAssistantMessageFromStores(agentId);
+    }
+    getLastAssistantMessageFromTimeline(timeline) {
+        return this.getLastAssistantMessageSegmentFromTimeline(timeline)?.text ?? null;
+    }
+    getLastAssistantMessageSegmentFromTimeline(timeline) {
+        // Collect the last contiguous assistant messages (Claude streams chunks)
+        const chunks = [];
+        let startsAtBeginning = false;
+        for (let i = timeline.length - 1; i >= 0; i--) {
+            const item = timeline[i];
+            if (item.type !== "assistant_message") {
+                if (chunks.length) {
+                    break;
+                }
+                continue;
+            }
+            chunks.push(item.text);
+            startsAtBeginning = i === 0;
+        }
+        if (!chunks.length) {
+            return null;
+        }
+        return {
+            text: chunks.toReversed().join(""),
+            startsAtBeginning,
+        };
+    }
+    async getLastAssistantMessageFromStores(agentId) {
+        const liveTimeline = this.timelineStore.getItems(agentId);
+        const liveSegment = this.getLastAssistantMessageSegmentFromTimeline(liveTimeline);
+        if (!this.durableTimelineStore) {
+            return liveSegment?.text ?? null;
+        }
+        if (!liveSegment) {
+            return await this.durableTimelineStore.getLastAssistantMessage(agentId);
+        }
+        if (!liveSegment.startsAtBeginning) {
+            return liveSegment.text;
+        }
+        const lastDurableItem = await this.durableTimelineStore.getLastItem(agentId);
+        if (lastDurableItem?.type !== "assistant_message") {
+            return liveSegment.text;
+        }
+        const durableMessage = await this.durableTimelineStore.getLastAssistantMessage(agentId);
+        return durableMessage ? `${durableMessage}${liveSegment.text}` : liveSegment.text;
+    }
+    async getLastItemFromStores(agentId) {
+        const lastLiveItem = this.timelineStore.getLastItem(agentId);
+        if (lastLiveItem) {
+            return lastLiveItem;
+        }
+        if (!this.durableTimelineStore) {
+            return null;
+        }
+        return await this.durableTimelineStore.getLastItem(agentId);
+    }
+    async waitForAgentEvent(agentId, options) {
+        const snapshot = this.getAgent(agentId);
+        if (!snapshot) {
+            throw new Error(`Agent ${agentId} not found`);
+        }
+        const pendingForegroundRun = this.foregroundRuns.getPendingRun(agentId);
+        const hasForegroundTurn = Boolean(snapshot.activeForegroundTurnId) || Boolean(pendingForegroundRun);
+        const immediatePermission = this.peekPendingPermission(snapshot);
+        if (immediatePermission) {
+            return {
+                status: snapshot.lifecycle,
+                permission: immediatePermission,
+                lastMessage: await this.getLastAssistantMessage(agentId),
+            };
+        }
+        const initialStatus = snapshot.lifecycle;
+        const initialBusy = isAgentBusy(initialStatus) || hasForegroundTurn;
+        const waitForActive = options?.waitForActive ?? false;
+        if (!waitForActive && !initialBusy) {
+            return {
+                status: initialStatus,
+                permission: null,
+                lastMessage: await this.getLastAssistantMessage(agentId),
+            };
+        }
+        if (waitForActive && !initialBusy && !hasForegroundTurn) {
+            return {
+                status: initialStatus,
+                permission: null,
+                lastMessage: await this.getLastAssistantMessage(agentId),
+            };
+        }
+        if (options?.signal?.aborted) {
+            throw createAbortError(options.signal, "wait_for_agent aborted");
+        }
+        return await new Promise((resolvePromise, reject) => {
+            // Bug #1 Fix: Check abort signal AGAIN inside Promise constructor
+            // to avoid race condition between pre-Promise check and abort listener registration
+            if (options?.signal?.aborted) {
+                reject(createAbortError(options.signal, "wait_for_agent aborted"));
+                return;
+            }
+            let currentStatus = initialStatus;
+            let hasStarted = isAgentBusy(initialStatus) ||
+                Boolean(snapshot.activeForegroundTurnId) ||
+                Boolean(pendingForegroundRun?.started);
+            let terminalStatusOverride = null;
+            let finished = false;
+            // Bug #3 Fix: Declare unsubscribe and abortHandler upfront so cleanup can reference them
+            let unsubscribe = null;
+            let abortHandler = null;
+            const cleanup = () => {
+                // Clean up subscription
+                if (unsubscribe) {
+                    try {
+                        unsubscribe();
+                    }
+                    catch {
+                        // ignore cleanup errors
+                    }
+                    unsubscribe = null;
+                }
+                // Clean up abort listener
+                if (abortHandler && options?.signal) {
+                    try {
+                        options.signal.removeEventListener("abort", abortHandler);
+                    }
+                    catch {
+                        // ignore cleanup errors
+                    }
+                    abortHandler = null;
+                }
+            };
+            const finish = (permission) => {
+                if (finished) {
+                    return;
+                }
+                finished = true;
+                cleanup();
+                void this.getLastAssistantMessage(agentId)
+                    .then((lastMessage) => {
+                    resolvePromise({
+                        status: currentStatus,
+                        permission,
+                        lastMessage,
+                    });
+                    return;
+                })
+                    .catch(reject);
+            };
+            // Bug #3 Fix: Set up abort handler BEFORE subscription
+            // to ensure cleanup handlers exist before callback can fire
+            if (options?.signal) {
+                abortHandler = () => {
+                    cleanup();
+                    reject(createAbortError(options.signal, "wait_for_agent aborted"));
+                };
+                options.signal.addEventListener("abort", abortHandler, { once: true });
+            }
+            // Bug #3 Fix: Now subscribe with cleanup handlers already in place
+            // This prevents race condition if callback fires synchronously with replayState: true
+            unsubscribe = this.subscribe((event) => {
+                if (event.type === "agent_state") {
+                    currentStatus = event.agent.lifecycle;
+                    const pending = this.peekPendingPermission(event.agent);
+                    if (pending) {
+                        finish(pending);
+                        return;
+                    }
+                    if (isAgentBusy(event.agent.lifecycle)) {
+                        hasStarted = true;
+                        return;
+                    }
+                    if (!waitForActive || hasStarted) {
+                        if (terminalStatusOverride) {
+                            currentStatus = terminalStatusOverride;
+                        }
+                        finish(null);
+                    }
+                    return;
+                }
+                if (event.type === "agent_stream") {
+                    if (event.event.type === "permission_requested") {
+                        finish(event.event.request);
+                        return;
+                    }
+                    if (event.event.type === "turn_failed") {
+                        hasStarted = true;
+                        terminalStatusOverride = "error";
+                        return;
+                    }
+                    if (event.event.type === "turn_completed") {
+                        hasStarted = true;
+                    }
+                    if (event.event.type === "turn_canceled") {
+                        hasStarted = true;
+                    }
+                }
+            }, { agentId, replayState: true });
+        });
+    }
+    async registerSession(session, config, agentId, options) {
+        const resolvedAgentId = validateAgentId(agentId, "registerSession");
+        if (this.agents.has(resolvedAgentId)) {
+            throw new Error(`Agent with id ${resolvedAgentId} already exists`);
+        }
+        const initialPersistedTitle = await this.resolveInitialPersistedTitle(resolvedAgentId, config, options?.initialTitle ?? null);
+        const now = new Date();
+        const { durableTimelineHasRows } = await this.initializeAgentTimelineForRegister({
+            agentId: resolvedAgentId,
+            now,
+            options,
+        });
+        const managed = this.buildManagedAgentForRegister({
+            resolvedAgentId,
+            session,
+            config,
+            now,
+            durableTimelineHasRows,
+            options,
+        });
+        this.agents.set(resolvedAgentId, managed);
+        // Initialize previousStatus to track transitions
+        this.previousStatuses.set(resolvedAgentId, managed.lifecycle);
+        await this.refreshRuntimeInfo(managed, { emit: !options?.publishWhenReady });
+        await this.persistSnapshot(managed, {
+            title: initialPersistedTitle,
+        });
+        if (!options?.publishWhenReady) {
+            this.emitState(managed, { persist: false });
+        }
+        await this.refreshSessionState(managed, { emit: !options?.publishWhenReady });
+        managed.lifecycle = "idle";
+        await this.persistSnapshot(managed);
+        this.emitState(managed, { persist: false });
+        this.subscribeToSession(managed);
+        return { ...managed };
+    }
+    async initializeAgentTimelineForRegister(params) {
+        const { agentId, now, options } = params;
+        const explicitTimelineSeed = buildExplicitTimelineSeedForRegister(now, options);
+        const shouldSeedFromDurable = !explicitTimelineSeed &&
+            !this.timelineStore.has(agentId) &&
+            this.durableTimelineStore !== undefined;
+        const durableTimelineSeed = shouldSeedFromDurable
+            ? await this.loadCommittedTimelineSeed(agentId, now)
+            : null;
+        const durableTimelineHasRows = durableTimelineSeed != null && (durableTimelineSeed.nextSeq ?? 1) > 1;
+        const timelineSeed = explicitTimelineSeed ?? durableTimelineSeed;
+        if (timelineSeed || !this.timelineStore.has(agentId)) {
+            this.timelineStore.initialize(agentId, timelineSeed ?? { timestamp: now.toISOString() });
+        }
+        if (options?.timelineRows?.length) {
+            this.enqueueDurableTimelineBulkInsert(agentId, options.timelineRows);
+        }
+        return { durableTimelineHasRows };
+    }
+    buildManagedAgentForRegister(params) {
+        const { resolvedAgentId, session, config, now, durableTimelineHasRows, options } = params;
+        return {
+            id: resolvedAgentId,
+            provider: config.provider,
+            cwd: config.cwd,
+            workspaceId: options?.workspaceId,
+            session,
+            capabilities: session.capabilities,
+            config,
+            runtimeInfo: undefined,
+            lifecycle: "initializing",
+            createdAt: options?.createdAt ?? now,
+            updatedAt: options?.updatedAt ?? now,
+            availableModes: [],
+            currentModeId: null,
+            pendingPermissions: new Map(),
+            bufferedPermissionResolutions: new Map(),
+            inFlightPermissionResponses: new Set(),
+            pendingReplacement: false,
+            activeForegroundTurnId: null,
+            foregroundTurnWaiters: new Set(),
+            finalizedForegroundTurnIds: new Set(),
+            unsubscribeSession: null,
+            persistence: attachPersistenceCwd(options?.persistence ?? session.describePersistence(), config.cwd),
+            historyPrimed: options?.historyPrimed ?? durableTimelineHasRows,
+            lastUserMessageAt: options?.lastUserMessageAt ?? null,
+            lastUsage: options?.lastUsage,
+            lastError: options?.lastError,
+            attention: resolveInitialAttention(options?.attention),
+            internal: config.internal ?? false,
+            observable: config.observable ?? false,
+            labels: options?.labels ?? {},
+        };
+    }
+    async loadCommittedTimelineSeed(agentId, now) {
+        if (!this.durableTimelineStore) {
+            return { timestamp: now.toISOString() };
+        }
+        return {
+            nextSeq: (await this.durableTimelineStore.getLatestCommittedSeq(agentId)) + 1,
+            timestamp: now.toISOString(),
+        };
+    }
+    prepareAgentForClosure(agent, cancelReason) {
+        this.agentStreamCoalescer.flushAndDiscard(agent.id);
+        this.agents.delete(agent.id);
+        this.previousStatuses.delete(agent.id);
+        if (agent.unsubscribeSession) {
+            agent.unsubscribeSession();
+            agent.unsubscribeSession = null;
+        }
+        this.foregroundRuns.cancelWaiters(agent, (turnId) => ({
+            type: "turn_canceled",
+            provider: agent.provider,
+            reason: cancelReason,
+            turnId,
+        }));
+        this.foregroundRuns.settlePendingRun(agent.id);
+        return {
+            ...agent,
+            lifecycle: "closed",
+            session: null,
+            activeForegroundTurnId: null,
+        };
+    }
+    emitClosedAgent(agent, options) {
+        this.emitState(agent, options);
+    }
+    subscribeToSession(agent) {
+        if (agent.unsubscribeSession) {
+            return;
+        }
+        const agentId = agent.id;
+        const unsubscribe = agent.session.subscribe((event) => {
+            this.enqueueSessionEvent(agentId, event);
+        });
+        agent.unsubscribeSession = unsubscribe;
+    }
+    enqueueSessionEvent(agentId, event) {
+        this.logger.trace({
+            agentId,
+            provider: event.provider,
+            sessionId: this.agents.get(agentId)?.persistence?.sessionId ?? undefined,
+            turnId: getAgentStreamEventTurnId(event),
+            event,
+        }, "agent.manager.enqueue");
+        const previous = this.sessionEventTails.get(agentId) ?? Promise.resolve();
+        const next = previous
+            .catch(() => undefined)
+            .then(async () => {
+            const current = this.agents.get(agentId);
+            if (!current) {
+                return;
+            }
+            if (current.session == null) {
+                return;
+            }
+            this.logger.trace({
+                agentId,
+                provider: event.provider,
+                sessionId: current.persistence?.sessionId ?? undefined,
+                turnId: getAgentStreamEventTurnId(event),
+                event,
+            }, "agent.manager.dequeue");
+            await this.dispatchSessionEvent(current, event);
+            return;
+        })
+            .catch((err) => {
+            this.logger.error({ err, agentId, eventType: event.type }, "Failed to process session event");
+        });
+        this.sessionEventTails.set(agentId, next);
+        this.trackBackgroundTask(next);
+        void next.finally(() => {
+            if (this.sessionEventTails.get(agentId) === next) {
+                this.sessionEventTails.delete(agentId);
+            }
+        });
+    }
+    async dispatchSessionEvent(agent, event) {
+        const turnId = getAgentStreamEventTurnId(event);
+        const matchingWaiters = this.foregroundRuns.getMatchingWaiters(agent, turnId);
+        this.logger.trace({
+            agentId: agent.id,
+            provider: event.provider,
+            sessionId: agent.persistence?.sessionId ?? undefined,
+            turnId,
+            matchingWaiterCount: matchingWaiters.length,
+            event,
+        }, "agent.manager.dispatch_session_event");
+        const shouldNotifyWaiters = await this.handleStreamEvent(agent, event);
+        if (!shouldNotifyWaiters) {
+            return;
+        }
+        this.foregroundRuns.notifyWaiters(matchingWaiters, event, {
+            terminal: isTurnTerminalEvent(event),
+        });
+        this.logger.trace({
+            agentId: agent.id,
+            provider: event.provider,
+            sessionId: agent.persistence?.sessionId ?? undefined,
+            turnId,
+            notifiedWaiterCount: matchingWaiters.length,
+            terminal: isTurnTerminalEvent(event),
+            event,
+        }, "agent.manager.notify_waiters");
+    }
+    async resolveInitialPersistedTitle(agentId, config, fallbackTitle) {
+        const existing = await this.registry?.get(agentId);
+        if (existing) {
+            return existing.title ?? null;
+        }
+        const explicitTitle = typeof config.title === "string" && config.title.trim().length > 0
+            ? config.title.trim()
+            : null;
+        return explicitTitle ?? fallbackTitle;
+    }
+    async persistSnapshot(agent, options) {
+        if (!this.registry) {
+            return;
+        }
+        // Don't persist internal agents - they're ephemeral system tasks
+        if (agent.internal) {
+            return;
+        }
+        await this.registry.applySnapshot(agent, options);
+    }
+    requireRegistry() {
+        if (!this.registry) {
+            throw new Error("Agent storage unavailable");
+        }
+        return this.registry;
+    }
+    async refreshSessionState(agent, options) {
+        try {
+            const modes = await agent.session.getAvailableModes();
+            agent.availableModes = modes;
+        }
+        catch {
+            agent.availableModes = [];
+        }
+        try {
+            agent.currentModeId = await agent.session.getCurrentMode();
+        }
+        catch {
+            agent.currentModeId = null;
+        }
+        try {
+            const pending = agent.session.getPendingPermissions();
+            agent.pendingPermissions = new Map(pending.map((request) => [request.id, request]));
+        }
+        catch {
+            agent.pendingPermissions.clear();
+        }
+        this.syncFeaturesFromSession(agent);
+        await this.refreshRuntimeInfo(agent, options);
+    }
+    async refreshRuntimeInfo(agent, options) {
+        try {
+            const newInfo = await agent.session.getRuntimeInfo();
+            const changed = newInfo.model !== agent.runtimeInfo?.model ||
+                newInfo.thinkingOptionId !== agent.runtimeInfo?.thinkingOptionId ||
+                newInfo.sessionId !== agent.runtimeInfo?.sessionId ||
+                newInfo.modeId !== agent.runtimeInfo?.modeId;
+            agent.runtimeInfo = newInfo;
+            if (!agent.persistence && newInfo.sessionId) {
+                agent.persistence = attachPersistenceCwd({ provider: agent.provider, sessionId: newInfo.sessionId }, agent.cwd);
+            }
+            // Emit state if runtimeInfo changed so clients get the updated model
+            if (changed && options?.emit !== false) {
+                this.emitState(agent);
+            }
+        }
+        catch {
+            // Keep existing runtimeInfo if refresh fails.
+        }
+    }
+    async hydrateTimelineFromLegacyProviderHistory(agent, options) {
+        if (agent.historyPrimed && !options?.force) {
+            return;
+        }
+        if (options?.force) {
+            const historyEvents = [];
+            for await (const event of agent.session.streamHistory()) {
+                if (event.type === "timeline") {
+                    if (event.item.type === "user_message" && isSystemInjectedEnvelope(event.item.text)) {
+                        continue;
+                    }
+                    historyEvents.push(event);
+                }
+            }
+            this.agentStreamCoalescer.flushAndDiscard(agent.id);
+            await this.deleteCommittedTimeline(agent.id);
+            this.timelineStore.delete(agent.id);
+            this.timelineStore.initialize(agent.id, { timestamp: new Date().toISOString() });
+            agent.historyPrimed = true;
+            for (const event of historyEvents) {
+                const row = this.recordTimeline(agent.id, event.item, event.timestamp ? { timestamp: event.timestamp } : undefined);
+                if (options?.broadcast) {
+                    this.dispatchStream(agent.id, event, {
+                        seq: row.seq,
+                        epoch: this.timelineStore.getEpoch(agent.id),
+                        timestamp: row.timestamp,
+                    });
+                }
+            }
+            this.touchUpdatedAt(agent);
+            this.emitState(agent);
+            return;
+        }
+        agent.historyPrimed = true;
+        try {
+            for await (const event of agent.session.streamHistory()) {
+                if (event.type !== "timeline") {
+                    continue;
+                }
+                if (event.item.type === "user_message" && isSystemInjectedEnvelope(event.item.text)) {
+                    continue;
+                }
+                this.recordTimeline(agent.id, event.item, event.timestamp ? { timestamp: event.timestamp } : undefined);
+            }
+        }
+        catch {
+            // ignore history failures
+        }
+    }
+    notifyForegroundTurnWaiters(agentId, event) {
+        const turnId = getAgentStreamEventTurnId(event);
+        if (turnId == null) {
+            return;
+        }
+        const agent = this.agents.get(agentId);
+        if (!agent) {
+            return;
+        }
+        this.foregroundRuns.notifyAgentWaiters(agent, event);
+        this.logger.trace({
+            agentId,
+            provider: event.provider,
+            sessionId: agent.persistence?.sessionId ?? undefined,
+            turnId,
+            event,
+        }, "agent.manager.notify_waiters.coalesced");
+    }
+    async handleStreamEvent(agent, event, options) {
+        const eventTurnId = getAgentStreamEventTurnId(event);
+        const isForegroundEvent = Boolean(eventTurnId && agent.activeForegroundTurnId === eventTurnId);
+        this.traceHandleStreamEventStart(agent, event, eventTurnId, isForegroundEvent);
+        if (eventTurnId &&
+            isTurnTerminalEvent(event) &&
+            this.foregroundRuns.hasFinalizedTurn(agent, eventTurnId)) {
+            return false;
+        }
+        // Only update timestamp for live events, not history replay
+        if (!options?.fromHistory) {
+            this.touchUpdatedAt(agent);
+            if (this.agentStreamCoalescer.handle(agent.id, event)) {
+                this.traceCoalescerBuffered(agent, event, eventTurnId);
+                return false;
+            }
+            this.agentStreamCoalescer.flushFor(agent.id);
+        }
+        const flags = { shouldDispatchEvent: true, shouldNotifyWaiters: true };
+        const dispatchPromise = this.dispatchStreamEventByType({
+            agent,
+            event,
+            options,
+            isForegroundEvent,
+            eventTurnId,
+            flags,
+        });
+        if (dispatchPromise) {
+            await dispatchPromise;
+        }
+        if (!options?.fromHistory && isForegroundEvent && isTurnTerminalEvent(event)) {
+            this.finalizeForegroundTurn(agent, eventTurnId);
+        }
+        if (!options?.fromHistory && flags.shouldDispatchEvent) {
+            this.dispatchStream(agent.id, event, { timestamp: new Date().toISOString() });
+        }
+        this.traceHandleStreamEventEnd(agent, event, eventTurnId, flags);
+        return flags.shouldNotifyWaiters;
+    }
+    traceHandleStreamEventStart(agent, event, turnId, isForegroundEvent) {
+        this.logger.trace({
+            agentId: agent.id,
+            provider: event.provider,
+            sessionId: agent.persistence?.sessionId ?? undefined,
+            turnId,
+            lifecycle: agent.lifecycle,
+            activeForegroundTurnId: agent.activeForegroundTurnId,
+            isForegroundEvent,
+            event,
+        }, "agent.manager.handle_stream_event.start");
+    }
+    traceCoalescerBuffered(agent, event, turnId) {
+        this.logger.trace({
+            agentId: agent.id,
+            provider: event.provider,
+            sessionId: agent.persistence?.sessionId ?? undefined,
+            turnId,
+            event,
+        }, "agent.manager.coalescer.buffer");
+    }
+    traceHandleStreamEventEnd(agent, event, turnId, flags) {
+        this.logger.trace({
+            agentId: agent.id,
+            provider: event.provider,
+            sessionId: agent.persistence?.sessionId ?? undefined,
+            turnId,
+            lifecycle: agent.lifecycle,
+            activeForegroundTurnId: agent.activeForegroundTurnId,
+            shouldDispatchEvent: flags.shouldDispatchEvent,
+            shouldNotifyWaiters: flags.shouldNotifyWaiters,
+            event,
+        }, "agent.manager.handle_stream_event.end");
+    }
+    dispatchStreamEventByType(params) {
+        const { agent, event, options, isForegroundEvent, eventTurnId, flags } = params;
+        switch (event.type) {
+            case "thread_started":
+                this.onStreamThreadStarted(agent);
+                return undefined;
+            case "usage_updated":
+                agent.lastUsage = event.usage;
+                this.emitState(agent);
+                return undefined;
+            case "mode_changed":
+                agent.currentModeId = event.currentModeId;
+                agent.availableModes = event.availableModes;
+                if (agent.runtimeInfo) {
+                    agent.runtimeInfo = { ...agent.runtimeInfo, modeId: event.currentModeId };
+                }
+                flags.shouldDispatchEvent = false;
+                this.emitState(agent);
+                return undefined;
+            case "model_changed":
+                agent.runtimeInfo = event.runtimeInfo;
+                if (!agent.persistence && event.runtimeInfo.sessionId) {
+                    agent.persistence = attachPersistenceCwd({ provider: agent.provider, sessionId: event.runtimeInfo.sessionId }, agent.cwd);
+                }
+                agent.currentModeId = event.runtimeInfo.modeId ?? agent.currentModeId;
+                flags.shouldDispatchEvent = false;
+                this.emitState(agent);
+                return undefined;
+            case "thinking_option_changed":
+                if (agent.runtimeInfo) {
+                    agent.runtimeInfo = {
+                        ...agent.runtimeInfo,
+                        thinkingOptionId: event.thinkingOptionId,
+                    };
+                }
+                flags.shouldDispatchEvent = false;
+                this.emitState(agent);
+                return undefined;
+            case "timeline":
+                return this.onStreamTimelineEvent({ agent, event, options, isForegroundEvent, flags });
+            case "observed_subagent_updated":
+                this.onObservedSubagentUpdated(agent, event);
+                flags.shouldDispatchEvent = false;
+                return undefined;
+            case "observed_subagent_timeline":
+                this.onObservedSubagentTimeline(agent, event);
+                flags.shouldDispatchEvent = false;
+                return undefined;
+            case "turn_completed":
+                this.onStreamTurnCompleted({ agent, event, eventTurnId, isForegroundEvent });
+                return undefined;
+            case "turn_failed":
+                return this.onStreamTurnFailed({
+                    agent,
+                    event,
+                    eventTurnId,
+                    isForegroundEvent,
+                    options,
+                });
+            case "turn_canceled":
+                this.onStreamTurnCanceled({ agent, event, eventTurnId, isForegroundEvent, options });
+                return undefined;
+            case "turn_started":
+                this.onStreamTurnStarted({ agent, eventTurnId, isForegroundEvent });
+                return undefined;
+            case "permission_requested":
+                this.onStreamPermissionRequested(agent, event);
+                return undefined;
+            case "permission_resolved":
+                this.onStreamPermissionResolved({ agent, event, options, flags });
+                return undefined;
+            default:
+                return undefined;
+        }
+    }
+    onStreamThreadStarted(agent) {
+        const previousSessionId = agent.persistence?.sessionId ?? null;
+        const handle = agent.session.describePersistence();
+        if (handle) {
+            agent.persistence = attachPersistenceCwd(handle, agent.cwd);
+            if (agent.persistence?.sessionId !== previousSessionId) {
+                this.emitState(agent);
+            }
+        }
+        void this.refreshRuntimeInfo(agent);
+    }
+    async onStreamTimelineEvent(params) {
+        const { agent, event, options, flags } = params;
+        if (event.item.type === "user_message" && isSystemInjectedEnvelope(event.item.text)) {
+            flags.shouldDispatchEvent = false;
+            flags.shouldNotifyWaiters = false;
+            return;
+        }
+        if (options?.fromHistory) {
+            this.recordTimeline(agent.id, event.item, event.timestamp ? { timestamp: event.timestamp } : undefined);
+            flags.shouldDispatchEvent = false;
+            flags.shouldNotifyWaiters = false;
+            return;
+        }
+        this.recordAndDispatchTimelineItem(agent.id, event.item, event.provider, event.turnId);
+        if (event.item.type === "user_message") {
+            agent.lastUserMessageAt = new Date();
+            this.emitState(agent);
+        }
+        flags.shouldDispatchEvent = false;
+        flags.shouldNotifyWaiters = true;
+    }
+    onStreamTurnCompleted(params) {
+        const { agent, event, eventTurnId, isForegroundEvent } = params;
+        this.logger.trace({
+            agentId: agent.id,
+            provider: agent.provider,
+            sessionId: agent.persistence?.sessionId ?? undefined,
+            turnId: eventTurnId,
+            lifecycle: agent.lifecycle,
+            activeForegroundTurnId: agent.activeForegroundTurnId,
+        }, "agent.manager.turn.completed");
+        agent.lastUsage = event.usage;
+        agent.lastError = undefined;
+        if (!isForegroundEvent && agent.lifecycle !== "idle" && !agent.pendingReplacement) {
+            agent.lifecycle = "idle";
+            this.emitState(agent);
+        }
+        void this.refreshRuntimeInfo(agent);
+    }
+    async onStreamTurnFailed(params) {
+        const { agent, event, eventTurnId, isForegroundEvent, options } = params;
+        this.logger.warn({
+            agentId: agent.id,
+            provider: agent.provider,
+            sessionId: agent.persistence?.sessionId ?? undefined,
+            turnId: eventTurnId,
+            lifecycle: agent.lifecycle,
+            activeForegroundTurnId: agent.activeForegroundTurnId,
+            eventTurnId,
+            error: event.error,
+            code: event.code,
+            diagnostic: event.diagnostic,
+        }, "handleStreamEvent: turn_failed");
+        if (!isForegroundEvent) {
+            agent.lifecycle = "error";
+        }
+        agent.lastError = event.error;
+        await this.appendSystemErrorTimelineMessage(agent, event.provider, this.formatTurnFailedMessage(event), options);
+        this.resolvePendingPermissionsForAgent(agent, event.provider, options, "Turn failed");
+        if (!isForegroundEvent) {
+            this.emitState(agent);
+        }
+    }
+    onStreamTurnCanceled(params) {
+        const { agent, event, eventTurnId, isForegroundEvent, options } = params;
+        this.logger.trace({
+            agentId: agent.id,
+            provider: agent.provider,
+            sessionId: agent.persistence?.sessionId ?? undefined,
+            turnId: eventTurnId,
+            lifecycle: agent.lifecycle,
+            activeForegroundTurnId: agent.activeForegroundTurnId,
+            eventTurnId,
+        }, "agent.manager.turn.canceled");
+        if (!isForegroundEvent && !agent.pendingReplacement) {
+            agent.lifecycle = "idle";
+        }
+        agent.lastError = undefined;
+        this.resolvePendingPermissionsForAgent(agent, event.provider, options, "Interrupted");
+        if (!isForegroundEvent) {
+            this.emitState(agent);
+        }
+    }
+    onStreamTurnStarted(params) {
+        const { agent, eventTurnId, isForegroundEvent } = params;
+        this.logger.trace({
+            agentId: agent.id,
+            provider: agent.provider,
+            sessionId: agent.persistence?.sessionId ?? undefined,
+            turnId: eventTurnId,
+            lifecycle: agent.lifecycle,
+            activeForegroundTurnId: agent.activeForegroundTurnId,
+        }, "agent.manager.turn.started");
+        if (!isForegroundEvent) {
+            agent.lifecycle = "running";
+            this.emitState(agent);
+        }
+    }
+    onStreamPermissionRequested(agent, event) {
+        const hadPendingPermissions = agent.pendingPermissions.size > 0;
+        agent.pendingPermissions.set(event.request.id, event.request);
+        if (!hadPendingPermissions && !agent.internal) {
+            this.broadcastAgentAttention(agent, "permission");
+        }
+        this.emitState(agent);
+    }
+    onStreamPermissionResolved(params) {
+        const { agent, event, options, flags } = params;
+        agent.pendingPermissions.delete(event.requestId);
+        if (!options?.fromHistory && agent.inFlightPermissionResponses.has(event.requestId)) {
+            agent.bufferedPermissionResolutions.set(event.requestId, event);
+            flags.shouldDispatchEvent = false;
+            return;
+        }
+        this.emitState(agent);
+    }
+    resolvePendingPermissionsForAgent(agent, provider, options, message) {
+        for (const [requestId] of agent.pendingPermissions) {
+            agent.pendingPermissions.delete(requestId);
+            if (!options?.fromHistory) {
+                this.dispatchStream(agent.id, {
+                    type: "permission_resolved",
+                    provider,
+                    requestId,
+                    resolution: { behavior: "deny", message },
+                });
+            }
+        }
+    }
+    observedSubagentId(parentAgentId, key) {
+        return `${parentAgentId}::sub::${key}`;
+    }
+    emitObservedSubagentState(input) {
+        const payload = toObservedSubagentPayload(input);
+        const entry = this.observedSubagents.get(input.id);
+        if (entry) {
+            entry.lastPayload = payload;
+        }
+        this.dispatch({
+            type: "observed_agent_state",
+            payload,
+        });
+    }
+    onObservedSubagentUpdated(agent, event) {
+        const id = this.observedSubagentId(agent.id, event.update.key);
+        const existing = this.observedSubagents.get(id);
+        const createdAt = existing?.createdAt ?? new Date().toISOString();
+        this.observedSubagents.set(id, {
+            parentAgentId: agent.id,
+            taskId: event.update.taskId ?? existing?.taskId,
+            provider: event.provider,
+            createdAt,
+        });
+        this.emitObservedSubagentState({
+            id,
+            parentAgentId: agent.id,
+            provider: event.provider,
+            cwd: agent.cwd,
+            ...(agent.workspaceId ? { workspaceId: agent.workspaceId } : {}),
+            createdAt,
+            update: event.update,
+        });
+    }
+    onObservedSubagentTimeline(agent, event) {
+        const id = this.observedSubagentId(agent.id, event.key);
+        // Timeline may arrive before the first lifecycle update; materialize the
+        // observed subagent so its pane can open.
+        if (!this.observedSubagents.has(id)) {
+            const createdAt = new Date().toISOString();
+            this.observedSubagents.set(id, {
+                parentAgentId: agent.id,
+                provider: event.provider,
+                createdAt,
+            });
+            this.emitObservedSubagentState({
+                id,
+                parentAgentId: agent.id,
+                provider: event.provider,
+                cwd: agent.cwd,
+                ...(agent.workspaceId ? { workspaceId: agent.workspaceId } : {}),
+                createdAt,
+                update: { key: event.key, status: "running" },
+            });
+        }
+        this.recordAndDispatchTimelineItem(id, event.item, event.provider, event.turnId);
+    }
+    /**
+     * Stop a running observed subagent by resolving it to its owning provider
+     * session's task. See projects/observed-subagents/observed-subagents.md.
+     */
+    async stopObservedSubagent(observedId) {
+        const entry = this.observedSubagents.get(observedId);
+        if (!entry) {
+            // Not a synthetic task-fan-out subagent — check for a real internal
+            // agent (e.g. artifact generation) rendered read-only via `attend:
+            // "observed"`, and stop it the normal way instead.
+            const agent = this.agents.get(observedId);
+            if (agent?.internal) {
+                await this.cancelAgentRun(observedId);
+                return;
+            }
+            throw new Error(`Observed subagent not found: ${observedId}`);
+        }
+        if (!entry.taskId) {
+            throw new Error(`Observed subagent has no task id to stop: ${observedId}`);
+        }
+        const parent = this.agents.get(entry.parentAgentId);
+        const session = parent && "session" in parent ? parent.session : undefined;
+        if (!session?.stopTask) {
+            throw new Error(`Parent session cannot stop observed subagents: ${observedId}`);
+        }
+        await session.stopTask(entry.taskId);
+    }
+    recordAndDispatchTimelineItem(agentId, item, provider, turnId) {
+        const row = this.recordTimeline(agentId, item);
+        const event = {
+            type: "timeline",
+            item,
+            provider,
+            ...(turnId !== undefined ? { turnId } : {}),
+        };
+        this.dispatchStream(agentId, event, {
+            seq: row.seq,
+            epoch: this.timelineStore.getEpoch(agentId),
+            timestamp: row.timestamp,
+        });
+        if (item.type === "tool_call" &&
+            item.status === "completed" &&
+            item.detail?.type === "shell" &&
+            commandMayHaveChangedExternalState(item.detail.command)) {
+            const agent = this.agents.get(agentId);
+            if (agent) {
+                this.onWorkspaceStateMayHaveChanged?.({ cwd: agent.cwd });
+            }
+        }
+        return event;
+    }
+    async appendSystemErrorTimelineMessage(agent, provider, message, options) {
+        if (options?.fromHistory) {
+            return;
+        }
+        const normalized = message.trim();
+        if (!normalized) {
+            return;
+        }
+        const text = `${SYSTEM_ERROR_PREFIX} ${normalized}`;
+        const lastItem = await this.getLastItemFromStores(agent.id);
+        if (lastItem?.type === "assistant_message" && lastItem.text === text) {
+            return;
+        }
+        const item = { type: "assistant_message", text };
+        const row = this.recordTimeline(agent.id, item);
+        this.dispatchStream(agent.id, {
+            type: "timeline",
+            item,
+            provider,
+        }, {
+            seq: row.seq,
+            epoch: this.timelineStore.getEpoch(agent.id),
+            timestamp: row.timestamp,
+        });
+    }
+    formatTurnFailedMessage(event) {
+        const base = event.error.trim();
+        const parts = [base.length > 0 ? base : "Provider run failed"];
+        const code = event.code?.trim();
+        if (code) {
+            parts.push(`code: ${code}`);
+        }
+        const diagnostic = event.diagnostic?.trim();
+        if (diagnostic && diagnostic !== base) {
+            parts.push(diagnostic);
+        }
+        return parts.join("\n\n");
+    }
+    recordTimeline(agentId, item, options) {
+        const row = this.timelineStore.append(agentId, item, options);
+        this.enqueueDurableTimelineAppend(agentId, row);
+        return row;
+    }
+    emitState(agent, options) {
+        // Keep attention as an edge-triggered unread signal, not a level signal.
+        this.checkAndSetAttention(agent);
+        if (options?.persist !== false) {
+            this.enqueueBackgroundPersist(agent);
+        }
+        this.syncFeaturesFromSession(agent);
+        this.logger.trace({
+            agentId: agent.id,
+            provider: agent.provider,
+            sessionId: agent.persistence?.sessionId ?? undefined,
+            turnId: agent.activeForegroundTurnId ?? undefined,
+            lifecycle: agent.lifecycle,
+            activeForegroundTurnId: agent.activeForegroundTurnId,
+            pendingPermissions: agent.pendingPermissions.size,
+            persist: options?.persist !== false,
+        }, "agent.manager.emit_state");
+        this.dispatch({
+            type: "agent_state",
+            agent: { ...agent },
+        });
+    }
+    syncFeaturesFromSession(agent) {
+        if ("session" in agent && agent.session?.features) {
+            agent.features = agent.session.features;
+        }
+    }
+    checkAndSetAttention(agent) {
+        const previousStatus = this.previousStatuses.get(agent.id);
+        const currentStatus = agent.lifecycle;
+        // Track the new status
+        this.previousStatuses.set(agent.id, currentStatus);
+        // Skip attention tracking for internal agents
+        if (agent.internal) {
+            return;
+        }
+        // Skip if already requires attention
+        if (agent.attention.requiresAttention) {
+            return;
+        }
+        // Check if agent transitioned from running to idle (finished)
+        if (previousStatus === "running" && currentStatus === "idle") {
+            agent.attention = {
+                requiresAttention: true,
+                attentionReason: "finished",
+                attentionTimestamp: new Date(),
+            };
+            this.broadcastAgentAttention(agent, "finished");
+            return;
+        }
+        // Check if agent entered error state
+        if (previousStatus !== "error" && currentStatus === "error") {
+            agent.attention = {
+                requiresAttention: true,
+                attentionReason: "error",
+                attentionTimestamp: new Date(),
+            };
+            this.broadcastAgentAttention(agent, "error");
+            return;
+        }
+    }
+    enqueueBackgroundPersist(agent) {
+        const task = this.persistSnapshot(agent).catch((err) => {
+            this.logger.error({ err, agentId: agent.id }, "Failed to persist agent snapshot");
+        });
+        this.trackBackgroundTask(task);
+    }
+    enqueueDurableTimelineAppend(agentId, row) {
+        if (!this.durableTimelineStore) {
+            return;
+        }
+        const task = this.durableTimelineStore
+            .bulkInsert(agentId, [row])
+            .then(() => undefined)
+            .catch((err) => {
+            this.logger.error({ err, agentId, seq: row.seq, itemType: row.item.type }, "Failed to append timeline row to durable store");
+        });
+        this.trackBackgroundTask(task);
+    }
+    enqueueDurableTimelineBulkInsert(agentId, rows) {
+        if (!this.durableTimelineStore || rows.length === 0) {
+            return;
+        }
+        const task = this.durableTimelineStore.bulkInsert(agentId, rows).catch((err) => {
+            this.logger.error({ err, agentId, rowCount: rows.length }, "Failed to seed durable timeline store");
+        });
+        this.trackBackgroundTask(task);
+    }
+    trackBackgroundTask(task) {
+        this.backgroundTasks.add(task);
+        void task.finally(() => {
+            this.backgroundTasks.delete(task);
+        });
+    }
+    /**
+     * Flush any background persistence work (best-effort).
+     * Used by daemon shutdown paths to avoid unhandled rejections after cleanup.
+     */
+    async flush() {
+        this.agentStreamCoalescer.flushAll();
+        // Drain tasks, including tasks spawned while awaiting.
+        while (this.backgroundTasks.size > 0) {
+            const pending = Array.from(this.backgroundTasks);
+            await Promise.allSettled(pending);
+        }
+    }
+    broadcastAgentAttention(agent, reason) {
+        if (isDelegatedAgent(agent)) {
+            return;
+        }
+        this.onAgentAttention?.({
+            agentId: agent.id,
+            provider: agent.provider,
+            reason,
+        });
+    }
+    dispatchStream(agentId, event, metadata) {
+        const agent = this.agents.get(agentId);
+        this.logger.trace({
+            agentId,
+            provider: event.provider,
+            sessionId: agent?.persistence?.sessionId ?? undefined,
+            turnId: getAgentStreamEventTurnId(event),
+            metadata,
+            event,
+        }, "agent.manager.dispatch_stream");
+        this.dispatch({ type: "agent_stream", agentId, event, ...metadata });
+    }
+    dispatch(event) {
+        for (const subscriber of this.subscribers) {
+            if (subscriber.agentId &&
+                event.type === "agent_stream" &&
+                subscriber.agentId !== event.agentId) {
+                continue;
+            }
+            if (subscriber.agentId &&
+                event.type === "agent_state" &&
+                subscriber.agentId !== event.agent.id) {
+                continue;
+            }
+            // Skip internal agents for global subscribers (those without a specific agentId)
+            if (!subscriber.agentId) {
+                if (event.type === "agent_state" && event.agent.internal) {
+                    continue;
+                }
+                if (event.type === "agent_stream") {
+                    const agent = this.agents.get(event.agentId);
+                    // Observable internal agents (e.g. artifact generation) still stream
+                    // so a client that opened their timeline sees messages live; other
+                    // internal agents (branch-name/git-metadata generators) stay silent.
+                    // agent_state above is always filtered, so neither clutters the sidebar.
+                    if (agent?.internal && !agent.observable) {
+                        continue;
+                    }
+                }
+            }
+            subscriber.callback(event);
+        }
+    }
+    async normalizeConfig(config, options = {}) {
+        const normalized = { ...config };
+        // Always resolve cwd to absolute path for consistent history file lookup
+        if (normalized.cwd) {
+            normalized.cwd = resolve(normalized.cwd);
+            try {
+                const cwdStats = await stat(normalized.cwd);
+                if (!cwdStats.isDirectory()) {
+                    throw new Error(`Working directory is not a directory: ${normalized.cwd}`);
+                }
+            }
+            catch (error) {
+                if (error instanceof Error &&
+                    "code" in error &&
+                    error.code === "ENOENT") {
+                    throw new Error(`Working directory does not exist: ${normalized.cwd}`, { cause: error });
+                }
+                if (error instanceof Error) {
+                    throw error;
+                }
+                throw new Error(`Failed to access working directory: ${normalized.cwd}`, { cause: error });
+            }
+        }
+        if (typeof normalized.model === "string") {
+            const trimmed = normalized.model.trim();
+            normalized.model = trimmed.length > 0 && trimmed !== "default" ? trimmed : undefined;
+        }
+        const shouldResolveDefaultModel = options.resolveDefaultModel ?? true;
+        if (shouldResolveDefaultModel && !normalized.model) {
+            const defaultModelId = await this.resolveDefaultModelId(normalized);
+            if (defaultModelId) {
+                normalized.model = defaultModelId;
+            }
+        }
+        if (!normalized.modeId) {
+            try {
+                normalized.modeId =
+                    getAgentProviderDefinition(normalized.provider).defaultModeId ?? undefined;
+            }
+            catch {
+                // Unknown provider
+            }
+        }
+        return normalized;
+    }
+    async resolveDefaultModelId(config) {
+        const client = this.clients.get(config.provider);
+        if (!client) {
+            return undefined;
+        }
+        try {
+            const catalog = await client.fetchCatalog({
+                scope: "workspace",
+                cwd: config.cwd,
+                force: false,
+            });
+            return (catalog.models.find((model) => model.isDefault) ?? catalog.models[0])?.id;
+        }
+        catch {
+            // Provider may not support model listing — leave model undefined.
+            return undefined;
+        }
+    }
+    async prepareSessionConfig(config, agentId) {
+        const storedConfig = await this.normalizeConfig(stripInternalOttoMcpServer(config));
+        const launchConfig = this.applyDaemonAppendSystemPrompt(withRuntimeOttoMcpServer({
+            config: storedConfig,
+            agentId,
+            mcpBaseUrl: this.mcpBaseUrl,
+            mcpAuthToken: this.mcpAuthToken,
+        }));
+        return { storedConfig, launchConfig };
+    }
+    applyDaemonAppendSystemPrompt(config) {
+        const daemonAppendSystemPrompt = this.appendSystemPrompt.trim();
+        const next = { ...config };
+        delete next.daemonAppendSystemPrompt;
+        // A personality with respectGlobalAppendPrompt === false owns its whole
+        // system prompt — the daemon-global append must not stack on top of it.
+        const suppressGlobalAppend = config.personalitySnapshot?.respectGlobalAppendPrompt === false;
+        return daemonAppendSystemPrompt && !suppressGlobalAppend
+            ? {
+                ...next,
+                daemonAppendSystemPrompt,
+            }
+            : next;
+    }
+    async buildLaunchContext(agentId, client, env) {
+        const context = {
+            agentId,
+            env: {
+                ...env,
+                OTTO_AGENT_ID: agentId,
+            },
+        };
+        if (this.ottoToolsEnabled &&
+            client.capabilities.supportsNativeOttoTools &&
+            this.ottoToolCatalogFactory) {
+            context.ottoTools = await this.ottoToolCatalogFactory({ callerAgentId: agentId });
+        }
+        return context;
+    }
+    resolveProviderLaunchConfig(launchConfig, launchContext) {
+        return launchContext.ottoTools ? stripInternalOttoMcpServer(launchConfig) : launchConfig;
+    }
+    async requireAvailableClient(options) {
+        const client = this.clients.get(options.provider);
+        if (!client) {
+            const configuredProviders = this.getConfiguredProviderIds();
+            throw new Error(`Unknown provider '${options.provider}'. Configured providers: ${formatProviderList(configuredProviders)}.`);
+        }
+        let unavailableReason = null;
+        try {
+            const available = await client.isAvailable();
+            if (available) {
+                return client;
+            }
+        }
+        catch (error) {
+            unavailableReason = error instanceof Error ? error.message : String(error);
+        }
+        const availableProviders = (await this.listProviderAvailability())
+            .filter((entry) => entry.available)
+            .map((entry) => entry.provider);
+        const providerList = formatProviderList(availableProviders);
+        const reason = unavailableReason ? ` Reason: ${unavailableReason}.` : "";
+        throw new Error(`Provider '${options.provider}' is not available.${reason} Available providers: ${providerList}. Use one of those providers, or install/configure '${options.provider}'.`);
+    }
+    requireEnabledProvider(provider) {
+        if (this.providerEnabled.get(provider) === false) {
+            throw new Error(`Provider '${provider}' is disabled`);
+        }
+    }
+    getConfiguredProviderIds() {
+        return Array.from(new Set([...this.providerEnabled.keys(), ...this.clients.keys()]));
+    }
+    requireClient(provider) {
+        const client = this.clients.get(provider);
+        if (!client) {
+            throw new Error(`No client registered for provider '${provider}'`);
+        }
+        return client;
+    }
+    async archiveNativeSessionBestEffort(provider, persistence) {
+        if (!persistence)
+            return;
+        const client = this.clients.get(provider);
+        if (!client?.archiveNativeSession)
+            return;
+        try {
+            await client.archiveNativeSession(persistence);
+        }
+        catch (error) {
+            this.logger.warn({ error, provider, sessionId: persistence.sessionId }, "Failed to archive native session (best-effort)");
+        }
+    }
+    async unarchiveNativeSession(provider, persistence) {
+        if (!persistence)
+            return;
+        const client = this.clients.get(provider);
+        if (!client?.unarchiveNativeSession)
+            return;
+        await client.unarchiveNativeSession(persistence);
+    }
+    requireAgent(id) {
+        const normalizedId = validateAgentId(id, "requireAgent");
+        const agent = this.agents.get(normalizedId);
+        if (!agent) {
+            throw new Error(`Unknown agent '${normalizedId}'`);
+        }
+        return agent;
+    }
+    requireSessionAgent(id) {
+        const agent = this.requireAgent(id);
+        if (agent.session === null) {
+            throw new Error(`Agent '${agent.id}' has no managed session`);
+        }
+        return agent;
+    }
+}
+export function commandMayHaveChangedExternalState(command) {
+    const normalized = command.toLowerCase();
+    // Commands that operate on remote state and do NOT trigger local file
+    // watchers. Local git mutations (commit, checkout, merge, rebase, reset,
+    // pull) are already caught by watchers on .git/HEAD and refs/heads/.
+    return (
+    // GitHub PR operations (merge, close, create, edit, comment, review)
+    /\bgh\s+pr\s+(merge|close|create|edit|comment|review)\b/.test(normalized) ||
+        // Pushes to remote — local refs unchanged, but remote state (PR checks,
+        // mergeable status) may shift immediately after.
+        /\bgit\s+push\b/.test(normalized) ||
+        // Fetches update refs/remotes/ which our watchers do not watch, so
+        // ahead/behind counts can drift stale until the next refresh.
+        /\bgit\s+fetch\b/.test(normalized));
+}
+//# sourceMappingURL=agent-manager.js.map