@qduc/term2 0.11.0 → 0.12.0

package/dist/services/runtime-setting-router.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runtime-setting-router.d.ts","sourceRoot":"","sources":["../../source/services/runtime-setting-router.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACtE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AAI3E,MAAM,WAAW,uCAAuC;IACtD,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACvC,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;CACrC;AAED,MAAM,WAAW,wBAAwB;IACvC,mBAAmB,EAAE,uCAAuC,CAAC;IAC7D,eAAe,EAAE,eAAe,CAAC;IACjC,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAClC,kBAAkB,EAAE,CAAC,MAAM,EAAE,sBAAsB,KAAK,IAAI,CAAC;IAC7D,cAAc,EAAE,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,KAAK,IAAI,CAAC;CACpD;AAED,wBAAgB,yBAAyB,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,wBAAwB,GAAG,IAAI,CAuE3G"}
+{"version":3,"file":"runtime-setting-router.d.ts","sourceRoot":"","sources":["../../source/services/runtime-setting-router.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACtE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AAI3E,MAAM,WAAW,uCAAuC;IACtD,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACvC,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;CACrC;AAED,MAAM,WAAW,wBAAwB;IACvC,mBAAmB,EAAE,uCAAuC,CAAC;IAC7D,eAAe,EAAE,eAAe,CAAC;IACjC,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAClC,kBAAkB,EAAE,CAAC,MAAM,EAAE,sBAAsB,KAAK,IAAI,CAAC;IAC7D,cAAc,EAAE,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,KAAK,IAAI,CAAC;CACpD;AAED,MAAM,MAAM,yBAAyB,GAAG,QAAQ,CAAC;IAC/C,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,OAAO,CAAC;IACf,WAAW,EAAE,SAAS,GAAG,SAAS,CAAC;CACpC,CAAC,CAAC;AAEH;;;;GAIG;AACH,qBAAa,gCAAgC;;IAG3C,YAAY,IAAI,EAAE,wBAAwB,EAEzC;IAED,KAAK,CAAC,OAAO,EAAE,SAAS,yBAAyB,EAAE,GAAG;QAAE,WAAW,EAAE,SAAS,MAAM,EAAE,CAAA;KAAE,CAYvF;IAED,KAAK,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAKvB;IAED,mBAAmB,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,IAAI,CAErD;CACF;AAED,wBAAgB,yBAAyB,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,wBAAwB,GAAG,IAAI,CAuE3G"}

package/dist/services/runtime-setting-router.js

@@ -1,5 +1,38 @@
 import { setTrimConfig } from '../utils/output/output-trim.js';
 import { planModeNotice } from './mode-notices.js';
+/**
+ * Owns the application effects of conversation-related settings. Menu code
+ * only translates input into changes; this service applies the effective
+ * settings transaction and then updates the live conversation/runtime.
+ */
+export class ConversationConfigurationService {
+    #deps;
+    constructor(deps) {
+        this.#deps = deps;
+    }
+    apply(changes) {
+        const runtime = changes.filter((change) => change.persistence === 'runtime');
+        if (runtime.length > 0) {
+            this.#deps.settingsService.setDynamicTransaction(runtime.map(({ key, value }) => ({ key, value })));
+            for (const change of runtime) {
+                this.applyRuntimeSetting(change.key, change.value);
+            }
+        }
+        for (const change of changes.filter((item) => item.persistence === 'restart')) {
+            this.#deps.settingsService.setPersistentDynamic(change.key, change.value);
+        }
+        return { restartOnly: changes.filter((change) => change.persistence === 'restart').map((change) => change.key) };
+    }
+    reset(key) {
+        this.#deps.settingsService.reset(key);
+        if (this.#deps.settingsService.isRuntimeModifiable(key)) {
+            this.applyRuntimeSetting(key, this.#deps.settingsService.getDynamic(key));
+        }
+    }
+    applyRuntimeSetting(key, value) {
+        applyRuntimeSettingChange(key, value, this.#deps);
+    }
+}
 export function applyRuntimeSettingChange(key, value, deps) {
     if (key === 'agent.model') {
         deps.setModel(String(value));

package/dist/services/runtime-setting-router.js.map

@@ -1 +1 @@
-{"version":3,"file":"runtime-setting-router.js","sourceRoot":"","sources":["../../source/services/runtime-setting-router.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAC/D,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAenD,MAAM,UAAU,yBAAyB,CAAC,GAAW,EAAE,KAAc,EAAE,IAA8B;IACnG,IAAI,GAAG,KAAK,aAAa,EAAE,CAAC;QAC1B,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;QAC7B,OAAO;IACT,CAAC;IAED,IAAI,GAAG,KAAK,uBAAuB,EAAE,CAAC;QACpC,IAAI,CAAC,kBAAkB,CAAC,KAA+B,CAAC,CAAC;QACzD,OAAO;IACT,CAAC;IAED,IAAI,GAAG,KAAK,mBAAmB,EAAE,CAAC;QAChC,IAAI,KAAK,IAAI,IAAI,EAAE,CAAC;YAClB,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;YAC/B,OAAO;QACT,CAAC;QAED,MAAM,OAAO,GAAG,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAClE,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;QACpE,OAAO;IACT,CAAC;IAED,IAAI,GAAG,KAAK,gBAAgB,EAAE,CAAC;QAC7B,IAAI,CAAC,mBAAmB,CAAC,cAAc,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;QACvD,OAAO;IACT,CAAC;IAED,IAAI,GAAG,KAAK,iBAAiB,EAAE,CAAC;QAC9B,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,eAAe,CAAC,GAAG,CAAS,aAAa,CAAC,CAAC,CAAC;QAC/D,OAAO;IACT,CAAC;IAED,IACE,GAAG,KAAK,kBAAkB;QAC1B,GAAG,KAAK,qBAAqB;QAC7B,GAAG,KAAK,qBAAqB;QAC7B,GAAG,KAAK,wBAAwB;QAChC,GAAG,KAAK,kBAAkB;QAC1B,GAAG,KAAK,qBAAqB;QAC7B,GAAG,KAAK,kBAAkB;QAC1B,GAAG,KAAK,qBAAqB;QAC7B,GAAG,KAAK,mBAAmB;QAC3B,GAAG,KAAK,sBAAsB;QAC9B,GAAG,KAAK,6BAA6B,EACrC,CAAC;QACD,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,eAAe,CAAC,GAAG,CAAS,aAAa,CAAC,CAAC,CAAC;QAC/D,OAAO;IACT,CAAC;IAED,IAAI,GAAG,KAAK,gBAAgB,IAAI,GAAG,KAAK,cAAc,IAAI,GAAG,KAAK,sBAAsB,EAAE,CAAC;QACzF,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,eAAe,CAAC,GAAG,CAAS,aAAa,CAAC,CAAC,CAAC;QAC/D,OAAO;IACT,CAAC;IAED,IAAI,GAAG,KAAK,cAAc,EAAE,CAAC;QAC3B,IAAI,CAAC,mBAAmB,CAAC,eAAe,CAAC,cAAc,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACzE,OAAO;IACT,CAAC;IAED,IAAI,GAAG,KAAK,uBAAuB,EAAE,CAAC;QACpC,OAAO;IACT,CAAC;IAED,IAAI,GAAG,KAAK,sBAAsB,EAAE,CAAC;QACnC,aAAa,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAC3C,OAAO;IACT,CAAC;IAED,IAAI,GAAG,KAAK,sBAAsB,EAAE,CAAC;QACnC,aAAa,CAAC,EAAE,aAAa,EAAE,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IAClD,CAAC;AACH,CAAC"}
+{"version":3,"file":"runtime-setting-router.js","sourceRoot":"","sources":["../../source/services/runtime-setting-router.ts"],"names":[],"mappings":"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"}

package/dist/services/service-interfaces.d.ts

@@ -1,3 +1,4 @@
+import type { SettingKey, SettingValue } from './settings/settings-schema.js';
 export type SessionTrafficContext = {
     sessionId: string;
     sessionStartedAt: string;
@@ -38,9 +39,19 @@ export interface ProviderTrafficResponse {
     modelWrapperClass?: string;
     transport?: 'websocket';
 }
+export interface ProviderTrafficClosedResponse {
+    requestId: string;
+    provider: string;
+    model: string;
+    outcome: 'consumer_closed' | 'aborted';
+    eventCount: number;
+    modelClass?: string;
+    modelWrapperClass?: string;
+}
 export interface IProviderTraffic {
     recordRequestStart(input: ProviderTrafficRequest): void;
     recordResponseReceived(input: ProviderTrafficResponse): Promise<void>;
+    recordResponseClosed(input: ProviderTrafficClosedResponse): void;
     recordRequestFailed(input: {
         requestId: string;
         provider: string;
@@ -57,10 +68,16 @@ export interface ISessionContextService {
     getContext(): SessionTrafficContext | null;
 }
 export interface ISettingsService {
-    get<T = any>(key: string): T;
-    set(key: string, value: any, options?: {
+    get<K extends SettingKey>(key: K): SettingValue<K>;
+    getDynamic(key: string): unknown;
+    set<K extends SettingKey>(key: K, value: SettingValue<K>, options?: {
+        persist?: boolean;
+    }): void;
+    setDynamic(key: string, value: unknown, options?: {
         persist?: boolean;
     }): void;
+    setPersistent<K extends SettingKey>(key: K, value: SettingValue<K>): void;
+    setPersistentDynamic(key: string, value: unknown): void;
     onChange?: (listener: (key?: string) => void) => () => void;
 }
 export interface ISSHService {

package/dist/services/service-interfaces.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"service-interfaces.d.ts","sourceRoot":"","sources":["../../source/services/service-interfaces.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"service-interfaces.d.ts","sourceRoot":"","sources":["../../source/services/service-interfaces.ts"],"names":[],"mappings":"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"}

package/dist/services/session/background-task-control.d.ts

@@ -0,0 +1,123 @@
+import type { ConversationAgentClient } from '../conversation-agent-client.js';
+import type { BackgroundShellJob } from '../shell/background-shell-registry.js';
+import type { ForegroundShellLeaseDetails, ForegroundShellTransferResult } from '../shell/background-shell-registry.js';
+import type { SubagentCancelAcknowledgement, SubagentRunHandle, SubagentRunStatus } from '../subagents/types.js';
+import type { ForegroundSubagentCandidate } from '../subagents/nested-runner.js';
+import type { BackgroundSubagentNotificationPort } from '../subagents/subagent-notification-store.js';
+export type BackgroundTaskControlTarget = {
+    kind: 'subagent';
+    id: string;
+} | {
+    kind: 'shell';
+    id: string;
+};
+export type ForegroundTaskControlTarget = {
+    kind: 'shell';
+    callId: string;
+} | {
+    kind: 'subagent';
+    runId: string;
+};
+export type BackgroundTaskControlDetails = {
+    kind: 'subagent';
+    id: string;
+    name?: string;
+    role: string;
+    task: string;
+    taskPreview: string;
+    status: Exclude<SubagentRunStatus['status'], 'not_found'>;
+    startedAt: number;
+    elapsedMs: number;
+    lastToolName?: string;
+    lastToolAt?: number;
+    toolCounts: Record<string, number>;
+    turnHistory?: SubagentRunStatus['turnHistory'];
+    currentText?: string;
+    pendingToolCounts?: Record<string, number>;
+} | {
+    kind: 'shell';
+    id: string;
+    command: string;
+    status: BackgroundShellJob<unknown>['status'];
+    startedAt: number;
+    completedAt?: number;
+    output?: string;
+    error?: string;
+};
+export type BackgroundTaskStopResult = {
+    ok: true;
+    details: BackgroundTaskControlDetails;
+} | {
+    ok: false;
+    code: 'not_found' | 'not_active' | 'unavailable';
+};
+/** A live root-shell call which has not yet been made visible as background work. */
+export type ForegroundShellTaskControlDetails = {
+    kind: 'shell';
+    callId: string;
+    jobId: string;
+    command: string;
+    status: 'running';
+    startedAt: number;
+};
+export type ForegroundSubagentTaskControlDetails = ForegroundSubagentCandidate & {
+    kind: 'subagent';
+    status: 'running';
+};
+/** Legacy singular foreground candidate: the root-shell transfer surface. */
+export type ForegroundTaskControlDetails = ForegroundShellTaskControlDetails;
+export type ForegroundTransferCandidate = ForegroundShellTaskControlDetails | ForegroundSubagentTaskControlDetails;
+export type MoveForegroundToBackgroundResult = {
+    ok: true;
+    details: BackgroundTaskControlDetails;
+} | {
+    ok: false;
+    code: 'not_found' | 'not_active' | 'unavailable' | 'capacity';
+};
+export interface BackgroundTaskControlPort {
+    listDetails(): readonly BackgroundTaskControlDetails[];
+    getDetails(target: BackgroundTaskControlTarget): BackgroundTaskControlDetails | null;
+    requestStop(target: BackgroundTaskControlTarget): BackgroundTaskStopResult;
+    getForegroundTransferCandidate(): ForegroundShellTaskControlDetails | null;
+    listForegroundTransferCandidates(): readonly ForegroundTransferCandidate[];
+    moveForegroundToBackground(target: ForegroundTaskControlTarget): MoveForegroundToBackgroundResult;
+}
+/** The small root-client capability this control surface needs. */
+type BackgroundTaskControlClient = Pick<ConversationAgentClient, 'getBackgroundSubagentStatus' | 'listBackgroundSubagentStatuses' | 'requestBackgroundSubagentStop' | 'getBackgroundShellJob' | 'listBackgroundShellJobs' | 'requestBackgroundShellStop' | 'getForegroundShellTransferCandidate' | 'moveForegroundShellToBackground' | 'listForegroundSubagentCandidates' | 'moveForegroundSubagent'> & {
+    getBackgroundSubagentStatus?: (runId: string) => SubagentRunStatus;
+    listBackgroundSubagentStatuses?: () => SubagentRunStatus[];
+    requestBackgroundSubagentStop?: (runId: string) => SubagentCancelAcknowledgement;
+    getBackgroundShellJob?: (jobId: string) => BackgroundShellJob<unknown> | undefined;
+    listBackgroundShellJobs?: () => BackgroundShellJob<unknown>[];
+    requestBackgroundShellStop?: (jobId: string) => boolean;
+    getForegroundShellTransferCandidate?: () => ForegroundShellLeaseDetails | undefined;
+    moveForegroundShellToBackground?: (callId: string) => ForegroundShellTransferResult | undefined;
+    listForegroundSubagentCandidates?: () => ForegroundSubagentCandidate[];
+    moveForegroundSubagent?: (runId: string) => SubagentRunHandle | undefined;
+};
+/**
+ * UI-facing control surface for conversation-owned background work.
+ *
+ * Registries remain the authority for liveness and cancellation. This module
+ * hides their different identifier and outcome conventions, and owns the
+ * companion main-agent notification so callers cannot stop work without
+ * informing the next planning step.
+ */
+export declare class BackgroundTaskControl implements BackgroundTaskControlPort {
+    #private;
+    constructor({ client, notifications, onNotification, onTaskChange, }: {
+        client: BackgroundTaskControlClient;
+        notifications: BackgroundSubagentNotificationPort;
+        onNotification?: () => void;
+        onTaskChange?: () => void;
+    });
+    /** Lists live registry entries first, followed by retained terminal entries. */
+    listDetails(): readonly BackgroundTaskControlDetails[];
+    getDetails(target: BackgroundTaskControlTarget): BackgroundTaskControlDetails | null;
+    requestStop(target: BackgroundTaskControlTarget): BackgroundTaskStopResult;
+    getForegroundTransferCandidate(): ForegroundShellTaskControlDetails | null;
+    listForegroundTransferCandidates(): readonly ForegroundTransferCandidate[];
+    moveForegroundToBackground(target: ForegroundTaskControlTarget): MoveForegroundToBackgroundResult;
+}
+export {};
+//# sourceMappingURL=background-task-control.d.ts.map

package/dist/services/session/background-task-control.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"background-task-control.d.ts","sourceRoot":"","sources":["../../../source/services/session/background-task-control.ts"],"names":[],"mappings":"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"}

package/dist/services/session/background-task-control.js

@@ -0,0 +1,183 @@
+/**
+ * UI-facing control surface for conversation-owned background work.
+ *
+ * Registries remain the authority for liveness and cancellation. This module
+ * hides their different identifier and outcome conventions, and owns the
+ * companion main-agent notification so callers cannot stop work without
+ * informing the next planning step.
+ */
+export class BackgroundTaskControl {
+    #client;
+    #notifications;
+    #onNotification;
+    #onTaskChange;
+    constructor({ client, notifications, onNotification, onTaskChange, }) {
+        this.#client = client;
+        this.#notifications = notifications;
+        this.#onNotification = onNotification;
+        this.#onTaskChange = onTaskChange;
+    }
+    /** Lists live registry entries first, followed by retained terminal entries. */
+    listDetails() {
+        const subagents = this.#client.listBackgroundSubagentStatuses?.() ?? [];
+        const shells = this.#client.listBackgroundShellJobs?.() ?? [];
+        const details = [
+            ...subagents.map((status) => this.#subagentDetails(status)).filter(isDefined),
+            ...shells.map((job) => this.#shellDetails(job)),
+        ];
+        return details.sort((a, b) => Number(isTerminal(a)) - Number(isTerminal(b)));
+    }
+    getDetails(target) {
+        if (target.kind === 'subagent') {
+            const status = this.#client.getBackgroundSubagentStatus?.(target.id);
+            return status ? this.#subagentDetails(status) : null;
+        }
+        const job = this.#client.getBackgroundShellJob?.(target.id);
+        return job ? this.#shellDetails(job) : null;
+    }
+    requestStop(target) {
+        const before = this.getDetails(target);
+        if (!before)
+            return { ok: false, code: this.#isAvailable(target) ? 'not_found' : 'unavailable' };
+        if (target.kind === 'subagent') {
+            const acknowledged = this.#client.requestBackgroundSubagentStop?.(target.id);
+            if (!acknowledged)
+                return { ok: false, code: 'unavailable' };
+            if (!acknowledged.ok)
+                return { ok: false, code: 'not_active' };
+            const details = { ...before, status: 'cancelling' };
+            this.#notifyStop(target, details);
+            return { ok: true, details };
+        }
+        const stopped = this.#client.requestBackgroundShellStop?.(target.id);
+        if (stopped === undefined)
+            return { ok: false, code: 'unavailable' };
+        if (!stopped)
+            return { ok: false, code: 'not_active' };
+        const details = { ...before, status: 'cancelling' };
+        this.#notifyStop(target, details);
+        return { ok: true, details };
+    }
+    getForegroundTransferCandidate() {
+        const candidate = this.#client.getForegroundShellTransferCandidate?.();
+        return candidate ? this.#foregroundShellDetails(candidate) : null;
+    }
+    listForegroundTransferCandidates() {
+        const shell = this.getForegroundTransferCandidate();
+        const subagents = this.#client.listForegroundSubagentCandidates?.() ?? [];
+        return [
+            ...(shell ? [shell] : []),
+            ...subagents.map((candidate) => ({ ...candidate, kind: 'subagent', status: 'running' })),
+        ];
+    }
+    moveForegroundToBackground(target) {
+        if (target.kind === 'subagent')
+            return this.#moveForegroundSubagent(target.runId);
+        const before = this.getForegroundTransferCandidate();
+        if (!before || before.callId !== target.callId) {
+            return { ok: false, code: this.#client.getForegroundShellTransferCandidate ? 'not_found' : 'unavailable' };
+        }
+        const move = this.#client.moveForegroundShellToBackground;
+        if (!move)
+            return { ok: false, code: 'unavailable' };
+        let adopted;
+        try {
+            adopted = move(target.callId);
+        }
+        catch (error) {
+            if (error instanceof Error && error.name === 'BackgroundShellRegistryCapacityError') {
+                return { ok: false, code: 'capacity' };
+            }
+            return { ok: false, code: 'not_active' };
+        }
+        if (!adopted)
+            return { ok: false, code: 'not_active' };
+        const job = this.#client.getBackgroundShellJob?.(adopted.jobId);
+        if (!job)
+            return { ok: false, code: 'not_active' };
+        const details = this.#shellDetails(job);
+        const queued = this.#notifications.enqueueUserControl({
+            action: 'background',
+            target: { kind: 'shell', id: adopted.jobId },
+            details: { kind: 'shell', id: adopted.jobId, command: details.command },
+        });
+        if (queued)
+            this.#onNotification?.();
+        this.#onTaskChange?.();
+        return { ok: true, details };
+    }
+    #moveForegroundSubagent(runId) {
+        const candidate = (this.#client.listForegroundSubagentCandidates?.() ?? []).find((item) => item.runId === runId);
+        if (!candidate) {
+            return { ok: false, code: this.#client.listForegroundSubagentCandidates ? 'not_found' : 'unavailable' };
+        }
+        const move = this.#client.moveForegroundSubagent;
+        if (!move)
+            return { ok: false, code: 'unavailable' };
+        let adopted;
+        try {
+            adopted = move(runId);
+        }
+        catch (error) {
+            if (error instanceof Error && error.name === 'SubagentRegistryError')
+                return { ok: false, code: 'capacity' };
+            return { ok: false, code: 'not_active' };
+        }
+        if (!adopted)
+            return { ok: false, code: 'not_active' };
+        const details = this.getDetails({ kind: 'subagent', id: adopted.runId });
+        if (!details)
+            return { ok: false, code: 'not_active' };
+        const queued = this.#notifications.enqueueUserControl({
+            action: 'background',
+            target: { kind: 'subagent', id: adopted.runId },
+            details: { kind: 'subagent', id: adopted.runId, role: adopted.role, task: adopted.task },
+        });
+        if (queued)
+            this.#onNotification?.();
+        this.#onTaskChange?.();
+        return { ok: true, details };
+    }
+    #isAvailable(target) {
+        return target.kind === 'subagent'
+            ? typeof this.#client.getBackgroundSubagentStatus === 'function'
+            : typeof this.#client.getBackgroundShellJob === 'function';
+    }
+    #notifyStop(target, details) {
+        const queued = this.#notifications.enqueueUserControl({ action: 'stop', target, details });
+        if (queued)
+            this.#onNotification?.();
+        // The lifecycle projection intentionally stays compact and does not grow a
+        // transient `cancelling` state. Wake its observer so a control-aware UI can
+        // re-read this port immediately, then wait for the normal terminal event.
+        this.#onTaskChange?.();
+    }
+    #subagentDetails(status) {
+        if (status.status === 'not_found')
+            return null;
+        const { runId, ...details } = status;
+        return {
+            kind: 'subagent',
+            id: runId,
+            ...details,
+            status: status.status,
+        };
+    }
+    #shellDetails(job) {
+        const { id, result, ...details } = job;
+        const output = result && typeof result === 'object' && 'output' in result && typeof result.output === 'string'
+            ? result.output
+            : undefined;
+        return { kind: 'shell', id, ...details, ...(output === undefined ? {} : { output }) };
+    }
+    #foregroundShellDetails(candidate) {
+        return { kind: 'shell', ...candidate };
+    }
+}
+function isDefined(value) {
+    return value !== null;
+}
+function isTerminal(details) {
+    return details.status !== 'running' && details.status !== 'waiting_for_answer' && details.status !== 'cancelling';
+}
+//# sourceMappingURL=background-task-control.js.map

package/dist/services/session/background-task-control.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"background-task-control.js","sourceRoot":"","sources":["../../../source/services/session/background-task-control.ts"],"names":[],"mappings":"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"}

package/dist/services/session/continuation-call-id-resolver.d.ts

@@ -1,6 +1,6 @@
 export type ResponseCycleCallIdResolutionInput = {
-    runState: unknown;
-    primaryInterruption: unknown;
+    interruptionCallIds: readonly string[];
+    completedResultCallIds: readonly string[];
     fallbackCallIds: readonly string[];
     conversationHistory: readonly unknown[];
     preserveFallback?: boolean;
@@ -8,15 +8,22 @@ export type ResponseCycleCallIdResolutionInput = {
 /**
  * Resolves the tool-result IDs required to resume the current response cycle.
  *
- * The SDK keeps some completed tool outputs in its private generated-item
- * state. This boundary contains that shape interpretation so the turn
- * workflow only has to provide the current run state and conversation history.
+ * The turn workflow provides IDs from RunState's public interruption API and
+ * the session-owned current-turn tool ledger.
  */
-export declare const resolveResponseCycleCallIds: ({ runState, primaryInterruption, fallbackCallIds, conversationHistory, preserveFallback, }: ResponseCycleCallIdResolutionInput) => string[];
+export declare const resolveResponseCycleCallIds: ({ interruptionCallIds, completedResultCallIds, fallbackCallIds, conversationHistory, preserveFallback, }: ResponseCycleCallIdResolutionInput) => string[];
+/**
+ * Collects the tool-call ids known to the current provider response chain.
+ *
+ * Terminal turns contribute calls through conversation history. Interrupted
+ * turns have not committed their generated items yet, so their calls must come
+ * from the session-owned current-turn ledger.
+ */
+export declare const collectKnownToolCallIds: (conversationHistory: readonly unknown[], currentTurnCallIds?: readonly string[]) => string[];
 export type AbortedApprovalCallIdResolutionInput = {
-    runState: unknown;
-    primaryInterruption: unknown;
+    interruptionCallIds: readonly string[];
+    completedResultCallIds: readonly string[];
 };
 /** Resolves tool-result IDs that must be replayed while resolving an aborted approval. */
-export declare const resolveAbortedApprovalCallIds: ({ runState, primaryInterruption, }: AbortedApprovalCallIdResolutionInput) => string[];
+export declare const resolveAbortedApprovalCallIds: ({ interruptionCallIds, completedResultCallIds, }: AbortedApprovalCallIdResolutionInput) => string[];
 //# sourceMappingURL=continuation-call-id-resolver.d.ts.map

package/dist/services/session/continuation-call-id-resolver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"continuation-call-id-resolver.d.ts","sourceRoot":"","sources":["../../../source/services/session/continuation-call-id-resolver.ts"],"names":[],"mappings":"AA2CA,MAAM,MAAM,kCAAkC,GAAG;IAC/C,QAAQ,EAAE,OAAO,CAAC;IAClB,mBAAmB,EAAE,OAAO,CAAC;IAC7B,eAAe,EAAE,SAAS,MAAM,EAAE,CAAC;IACnC,mBAAmB,EAAE,SAAS,OAAO,EAAE,CAAC;IACxC,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,2BAA2B,+FAMrC,kCAAkC,KAAG,MAAM,EAgC7C,CAAC;AAEF,MAAM,MAAM,oCAAoC,GAAG;IACjD,QAAQ,EAAE,OAAO,CAAC;IAClB,mBAAmB,EAAE,OAAO,CAAC;CAC9B,CAAC;AAEF,0FAA0F;AAC1F,eAAO,MAAM,6BAA6B,uCAGvC,oCAAoC,KAAG,MAAM,EAe/C,CAAC"}
+{"version":3,"file":"continuation-call-id-resolver.d.ts","sourceRoot":"","sources":["../../../source/services/session/continuation-call-id-resolver.ts"],"names":[],"mappings":"AASA,MAAM,MAAM,kCAAkC,GAAG;IAC/C,mBAAmB,EAAE,SAAS,MAAM,EAAE,CAAC;IACvC,sBAAsB,EAAE,SAAS,MAAM,EAAE,CAAC;IAC1C,eAAe,EAAE,SAAS,MAAM,EAAE,CAAC;IACnC,mBAAmB,EAAE,SAAS,OAAO,EAAE,CAAC;IACxC,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,2BAA2B,6GAMrC,kCAAkC,KAAG,MAAM,EA6B7C,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,uBAAuB,wBACb,SAAS,OAAO,EAAE,uBACnB,SAAS,MAAM,EAAE,KACpC,MAAM,EAWR,CAAC;AAEF,MAAM,MAAM,oCAAoC,GAAG;IACjD,mBAAmB,EAAE,SAAS,MAAM,EAAE,CAAC;IACvC,sBAAsB,EAAE,SAAS,MAAM,EAAE,CAAC;CAC3C,CAAC;AAEF,0FAA0F;AAC1F,eAAO,MAAM,6BAA6B,qDAGvC,oCAAoC,KAAG,MAAM,EAW/C,CAAC"}

package/dist/services/session/continuation-call-id-resolver.js

@@ -1,55 +1,25 @@
-import { asRecord, getCallIdFromObject, getMethod } from '../interruption-info.js';
-import { callIdOf } from '../tool-execution-ledger.js';
-const CONTINUATION_TOOL_RESULT_TYPES = new Set([
-    'function_call_result',
-    'function_call_output',
-    'function_call_output_result',
-    'tool_call_output_item',
-]);
+import { asRecord, getCallIdFromObject } from '../interruption-info.js';
+import { getToolCallId } from '../../lib/chained-input-filter.js';
 const addCallId = (callIds, value) => {
     if (typeof value === 'string' && value.length > 0) {
         callIds.add(value);
     }
 };
-const getGeneratedToolResultCallIds = (runState, consumedCallIds = new Set()) => {
-    const generatedItems = asRecord(runState)?._generatedItems;
-    if (!Array.isArray(generatedItems)) {
-        return [];
-    }
-    const callIds = new Set();
-    for (const item of generatedItems) {
-        const raw = asRecord(item)?.rawItem;
-        const typeSource = asRecord(raw) ?? asRecord(item);
-        const type = typeof typeSource?.type === 'string' ? typeSource.type : '';
-        if (!CONTINUATION_TOOL_RESULT_TYPES.has(type)) {
-            continue;
-        }
-        const callId = callIdOf(item);
-        if (callId && !consumedCallIds.has(callId)) {
-            callIds.add(callId);
-        }
-    }
-    return [...callIds];
-};
 /**
  * Resolves the tool-result IDs required to resume the current response cycle.
  *
- * The SDK keeps some completed tool outputs in its private generated-item
- * state. This boundary contains that shape interpretation so the turn
- * workflow only has to provide the current run state and conversation history.
+ * The turn workflow provides IDs from RunState's public interruption API and
+ * the session-owned current-turn tool ledger.
  */
-export const resolveResponseCycleCallIds = ({ runState, primaryInterruption, fallbackCallIds, conversationHistory, preserveFallback = false, }) => {
+export const resolveResponseCycleCallIds = ({ interruptionCallIds, completedResultCallIds, fallbackCallIds, conversationHistory, preserveFallback = false, }) => {
     const callIds = new Set();
     if (preserveFallback) {
         for (const callId of fallbackCallIds) {
             addCallId(callIds, callId);
         }
     }
-    const interruptions = getMethod(runState, 'getInterruptions')?.();
-    if (Array.isArray(interruptions)) {
-        for (const interruption of interruptions) {
-            addCallId(callIds, getCallIdFromObject(interruption));
-        }
+    for (const callId of interruptionCallIds) {
+        addCallId(callIds, callId);
     }
     const consumedCallIds = new Set();
     for (const item of conversationHistory) {
@@ -59,25 +29,41 @@ export const resolveResponseCycleCallIds = ({ runState, primaryInterruption, fal
             addCallId(consumedCallIds, getCallIdFromObject(item));
         }
     }
-    for (const callId of getGeneratedToolResultCallIds(runState, consumedCallIds)) {
-        addCallId(callIds, callId);
+    for (const callId of completedResultCallIds) {
+        if (!consumedCallIds.has(callId)) {
+            addCallId(callIds, callId);
+        }
     }
-    addCallId(callIds, getCallIdFromObject(primaryInterruption));
     return callIds.size > 0 ? [...callIds] : [...fallbackCallIds];
 };
+/**
+ * Collects the tool-call ids known to the current provider response chain.
+ *
+ * Terminal turns contribute calls through conversation history. Interrupted
+ * turns have not committed their generated items yet, so their calls must come
+ * from the session-owned current-turn ledger.
+ */
+export const collectKnownToolCallIds = (conversationHistory, currentTurnCallIds = []) => {
+    const callIds = new Set();
+    for (const item of conversationHistory) {
+        // Any `*_call` item counts — function calls, shell calls, computer calls —
+        // so a non-function tool is never mistaken for an orphan.
+        addCallId(callIds, getToolCallId(item));
+    }
+    for (const callId of currentTurnCallIds) {
+        addCallId(callIds, callId);
+    }
+    return [...callIds];
+};
 /** Resolves tool-result IDs that must be replayed while resolving an aborted approval. */
-export const resolveAbortedApprovalCallIds = ({ runState, primaryInterruption, }) => {
+export const resolveAbortedApprovalCallIds = ({ interruptionCallIds, completedResultCallIds, }) => {
     const callIds = new Set();
-    const interruptions = getMethod(runState, 'getInterruptions')?.();
-    if (Array.isArray(interruptions)) {
-        for (const interruption of interruptions) {
-            addCallId(callIds, getCallIdFromObject(interruption));
-        }
+    for (const callId of interruptionCallIds) {
+        addCallId(callIds, callId);
     }
-    for (const callId of getGeneratedToolResultCallIds(runState)) {
+    for (const callId of completedResultCallIds) {
         addCallId(callIds, callId);
     }
-    addCallId(callIds, getCallIdFromObject(primaryInterruption));
     return [...callIds];
 };
 //# sourceMappingURL=continuation-call-id-resolver.js.map

package/dist/services/session/continuation-call-id-resolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"continuation-call-id-resolver.js","sourceRoot":"","sources":["../../../source/services/session/continuation-call-id-resolver.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"continuation-call-id-resolver.js","sourceRoot":"","sources":["../../../source/services/session/continuation-call-id-resolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AACxE,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAElE,MAAM,SAAS,GAAG,CAAC,OAAoB,EAAE,KAAc,EAAQ,EAAE;IAC/D,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAClD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IACrB,CAAC;AACH,CAAC,CAAC;AAUF;;;;;GAKG;AACH,MAAM,CAAC,MAAM,2BAA2B,GAAG,CAAC,EAC1C,mBAAmB,EACnB,sBAAsB,EACtB,eAAe,EACf,mBAAmB,EACnB,gBAAgB,GAAG,KAAK,GACW,EAAY,EAAE;IACjD,MAAM,OAAO,GAAG,IAAI,GAAG,EAAU,CAAC;IAElC,IAAI,gBAAgB,EAAE,CAAC;QACrB,KAAK,MAAM,MAAM,IAAI,eAAe,EAAE,CAAC;YACrC,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QAC7B,CAAC;IACH,CAAC;IAED,KAAK,MAAM,MAAM,IAAI,mBAAmB,EAAE,CAAC;QACzC,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IAC7B,CAAC;IAED,MAAM,eAAe,GAAG,IAAI,GAAG,EAAU,CAAC;IAC1C,KAAK,MAAM,IAAI,IAAI,mBAAmB,EAAE,CAAC;QACvC,MAAM,MAAM,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;QAC9B,MAAM,IAAI,GAAG,MAAM,EAAE,IAAI,CAAC;QAC1B,IAAI,IAAI,KAAK,eAAe,IAAI,IAAI,KAAK,WAAW,EAAE,CAAC;YACrD,SAAS,CAAC,eAAe,EAAE,mBAAmB,CAAC,IAAI,CAAC,CAAC,CAAC;QACxD,CAAC;IACH,CAAC;IAED,KAAK,MAAM,MAAM,IAAI,sBAAsB,EAAE,CAAC;QAC5C,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC;YACjC,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QAC7B,CAAC;IACH,CAAC;IAED,OAAO,OAAO,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,eAAe,CAAC,CAAC;AAChE,CAAC,CAAC;AAEF;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,uBAAuB,GAAG,CACrC,mBAAuC,EACvC,kBAAkB,GAAsB,EAAE,EAChC,EAAE;IACZ,MAAM,OAAO,GAAG,IAAI,GAAG,EAAU,CAAC;IAClC,KAAK,MAAM,IAAI,IAAI,mBAAmB,EAAE,CAAC;QACvC,2EAA2E;QAC3E,0DAA0D;QAC1D,SAAS,CAAC,OAAO,EAAE,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC;IAC1C,CAAC;IACD,KAAK,MAAM,MAAM,IAAI,kBAAkB,EAAE,CAAC;QACxC,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IAC7B,CAAC;IACD,OAAO,CAAC,GAAG,OAAO,CAAC,CAAC;AACtB,CAAC,CAAC;AAOF,0FAA0F;AAC1F,MAAM,CAAC,MAAM,6BAA6B,GAAG,CAAC,EAC5C,mBAAmB,EACnB,sBAAsB,GACe,EAAY,EAAE;IACnD,MAAM,OAAO,GAAG,IAAI,GAAG,EAAU,CAAC;IAClC,KAAK,MAAM,MAAM,IAAI,mBAAmB,EAAE,CAAC;QACzC,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IAC7B,CAAC;IAED,KAAK,MAAM,MAAM,IAAI,sBAAsB,EAAE,CAAC;QAC5C,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IAC7B,CAAC;IAED,OAAO,CAAC,GAAG,OAAO,CAAC,CAAC;AACtB,CAAC,CAAC"}