@qduc/term2 0.17.0 → 0.19.0

package/dist/services/retry/retry-event-presenter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"retry-event-presenter.d.ts","sourceRoot":"","sources":["../../../source/services/retry/retry-event-presenter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAC9D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAGhF,MAAM,MAAM,wBAAwB,GAAG;IACrC,OAAO,EAAE,iBAAiB,CAAC;IAC3B,mBAAmB,EAAE,MAAM,CAAC;IAC5B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,MAAM,EAAE,SAAS,GAAG,cAAc,CAAC;IACnC,KAAK,EAAE,OAAO,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,KAAK,EAAE,iBAAiB,CAAC;IACzB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAChC,CAAC;AAEF,qBAAa,mBAAmB;IAC9B,OAAO,CAAC,KAAK,EAAE,wBAAwB,GAAG,iBAAiB,CAsI1D;CACF"}
+{"version":3,"file":"retry-event-presenter.d.ts","sourceRoot":"","sources":["../../../source/services/retry/retry-event-presenter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAC9D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAIhF,MAAM,MAAM,wBAAwB,GAAG;IACrC,OAAO,EAAE,iBAAiB,CAAC;IAC3B,mBAAmB,EAAE,MAAM,CAAC;IAC5B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,MAAM,EAAE,SAAS,GAAG,cAAc,CAAC;IACnC,KAAK,EAAE,OAAO,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,KAAK,EAAE,iBAAiB,CAAC;IACzB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAChC,CAAC;AAEF,qBAAa,mBAAmB;IAC9B,OAAO,CAAC,KAAK,EAAE,wBAAwB,GAAG,iBAAiB,CA+I1D;CACF"}

package/dist/services/retry/retry-event-presenter.js

@@ -1,4 +1,5 @@
 import { describeError } from '../../utils/error-helpers.js';
+import { classifyProviderFailure } from './provider-failure-classification.js';
 export class RetryEventPresenter {
     present(input) {
         const { failure, maxTransientRetries, maxModelRetries, source, error } = input;
@@ -26,6 +27,7 @@ export class RetryEventPresenter {
                 return { event, logMessage, logFields };
             }
             case 'transient': {
+                const providerFailure = classifyProviderFailure(error);
                 const toolName = source === 'continuation' ? 'continuation' : 'turn';
                 const event = {
                     type: 'retry',
@@ -34,6 +36,9 @@ export class RetryEventPresenter {
                     maxRetries: maxTransientRetries,
                     errorMessage,
                     retryType: 'upstream',
+                    errorKind: providerFailure.errorKind,
+                    delayMs: failure.delayMs,
+                    ...(providerFailure.retryAfterMs !== undefined ? { retryAfterMs: providerFailure.retryAfterMs } : {}),
                 };
                 const logMessage = source === 'continuation'
                     ? 'Transient error in continuation, retrying'
@@ -44,23 +49,28 @@ export class RetryEventPresenter {
                     retryAttempt: failure.attempt,
                     maxRetries: maxTransientRetries,
                     errorMessage,
+                    errorKind: providerFailure.errorKind,
                     delayMs: failure.delayMs,
                 };
                 return { event, logMessage, logFields };
             }
             case 'chain_recovery': {
+                const isConnectionInterrupted = failure.cause === 'connection_interrupted';
+                const retryType = isConnectionInterrupted ? 'connection_interrupted' : 'conversation_state';
                 const event = {
                     type: 'retry',
                     toolName: 'conversation',
                     attempt: failure.attempt,
                     maxRetries: maxTransientRetries,
                     errorMessage,
-                    retryType: 'conversation_state',
+                    retryType,
                 };
-                const logMessage = 'Provider rejected conversation continuity, rebuilding full history';
+                const logMessage = isConnectionInterrupted
+                    ? 'Connection interrupted before a terminal response event, rebuilding full history'
+                    : 'Provider rejected conversation continuity, rebuilding full history';
                 const logFields = {
-                    eventType: 'retry.conversation_state',
-                    retryType: 'conversation_state',
+                    eventType: isConnectionInterrupted ? 'retry.connection_interrupted' : 'retry.conversation_state',
+                    retryType,
                     retryAttempt: failure.attempt,
                     maxRetries: maxTransientRetries,
                     errorMessage,

package/dist/services/retry/retry-event-presenter.js.map

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

package/dist/services/retry/retry-recovery-budget.d.ts

@@ -0,0 +1,51 @@
+/**
+ * One bounded capability shared by provider transport retries and session
+ * recovery. The owner is deliberately the retry/session layer: providers can
+ * consume claims, but cannot extend or reset the envelope.
+ */
+export declare const RETRY_RECOVERY_LIMITS: {
+    readonly maxRecoveryTimeMs: 90000;
+    readonly maxPhysicalAttempts: 3;
+    readonly maxAutomaticReplays: 1;
+};
+export type RetryRecoveryBudgetOptions = {
+    now?: () => number;
+    maxRecoveryTimeMs?: number;
+    maxPhysicalAttempts?: number;
+    maxAutomaticReplays?: number;
+};
+export declare class RetryRecoveryBudget {
+    #private;
+    readonly maxRecoveryTimeMs: number;
+    readonly maxPhysicalAttempts: number;
+    readonly maxAutomaticReplays: number;
+    constructor(options?: RetryRecoveryBudgetOptions);
+    get startedAt(): number | undefined;
+    get physicalAttempts(): number;
+    get automaticReplays(): number;
+    get elapsedMs(): number;
+    /** Starts the recovery clock only after a retryable failure is observed. */
+    noteRetryableFailure(): void;
+    get deadlineExceeded(): boolean;
+    /**
+     * Claim one physical dispatch made because recovery is in progress.
+     * Ordinary first attempts and successful tool-loop continuations are not
+     * recovery work; their callers must not spend this budget on them.
+     */
+    claimPhysicalAttempt(): boolean;
+    /** Claim exactly once before an automatic full-history turn replay. */
+    claimAutomaticReplay(): boolean;
+    remainingMs(): number | undefined;
+}
+/**
+ * Raised when a provider wrapper tried to start another physical request after
+ * the shared recovery envelope was exhausted. Keeping the triggering failure
+ * as a cause lets the classifier retain its useful provider/status details
+ * without making the budget error itself look like a new provider failure.
+ */
+export declare class RetryRecoveryBudgetExhaustedError extends Error {
+    readonly cause: unknown;
+    constructor(cause?: unknown);
+}
+export declare const isRetryRecoveryBudgetExhaustedError: (error: unknown) => error is RetryRecoveryBudgetExhaustedError;
+//# sourceMappingURL=retry-recovery-budget.d.ts.map

package/dist/services/retry/retry-recovery-budget.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"retry-recovery-budget.d.ts","sourceRoot":"","sources":["../../../source/services/retry/retry-recovery-budget.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,eAAO,MAAM,qBAAqB;aAChC,iBAAiB,EAAE,KAAM;aACzB,mBAAmB,EAAE,CAAC;aACtB,mBAAmB,EAAE,CAAC;CACd,CAAC;AAEX,MAAM,MAAM,0BAA0B,GAAG;IACvC,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;IACnB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B,CAAC;AAEF,qBAAa,mBAAmB;;IAC9B,QAAQ,CAAC,iBAAiB,EAAE,MAAM,CAAC;IACnC,QAAQ,CAAC,mBAAmB,EAAE,MAAM,CAAC;IACrC,QAAQ,CAAC,mBAAmB,EAAE,MAAM,CAAC;IAMrC,YAAY,OAAO,GAAE,0BAA+B,EAKnD;IAED,IAAI,SAAS,IAAI,MAAM,GAAG,SAAS,CAElC;IAED,IAAI,gBAAgB,IAAI,MAAM,CAE7B;IAED,IAAI,gBAAgB,IAAI,MAAM,CAE7B;IAED,IAAI,SAAS,IAAI,MAAM,CAEtB;IAED,4EAA4E;IAC5E,oBAAoB,IAAI,IAAI,CAE3B;IAED,IAAI,gBAAgB,IAAI,OAAO,CAE9B;IAED;;;;OAIG;IACH,oBAAoB,IAAI,OAAO,CAI9B;IAED,uEAAuE;IACvE,oBAAoB,IAAI,OAAO,CAI9B;IAED,WAAW,IAAI,MAAM,GAAG,SAAS,CAGhC;CACF;AAED;;;;;GAKG;AACH,qBAAa,iCAAkC,SAAQ,KAAK;IAC1D,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;IAExB,YAAY,KAAK,CAAC,EAAE,OAAO,EAI1B;CACF;AAED,eAAO,MAAM,mCAAmC,UAAW,OAAO,KAAG,KAAK,IAAI,iCAC1B,CAAC"}

package/dist/services/retry/retry-recovery-budget.js

@@ -0,0 +1,84 @@
+/**
+ * One bounded capability shared by provider transport retries and session
+ * recovery. The owner is deliberately the retry/session layer: providers can
+ * consume claims, but cannot extend or reset the envelope.
+ */
+export const RETRY_RECOVERY_LIMITS = {
+    maxRecoveryTimeMs: 90_000,
+    maxPhysicalAttempts: 3,
+    maxAutomaticReplays: 1,
+};
+export class RetryRecoveryBudget {
+    maxRecoveryTimeMs;
+    maxPhysicalAttempts;
+    maxAutomaticReplays;
+    #now;
+    #startedAt;
+    #physicalAttempts = 0;
+    #automaticReplays = 0;
+    constructor(options = {}) {
+        this.#now = options.now ?? (() => performance.now());
+        this.maxRecoveryTimeMs = options.maxRecoveryTimeMs ?? RETRY_RECOVERY_LIMITS.maxRecoveryTimeMs;
+        this.maxPhysicalAttempts = options.maxPhysicalAttempts ?? RETRY_RECOVERY_LIMITS.maxPhysicalAttempts;
+        this.maxAutomaticReplays = options.maxAutomaticReplays ?? RETRY_RECOVERY_LIMITS.maxAutomaticReplays;
+    }
+    get startedAt() {
+        return this.#startedAt;
+    }
+    get physicalAttempts() {
+        return this.#physicalAttempts;
+    }
+    get automaticReplays() {
+        return this.#automaticReplays;
+    }
+    get elapsedMs() {
+        return this.#startedAt === undefined ? 0 : Math.max(0, this.#now() - this.#startedAt);
+    }
+    /** Starts the recovery clock only after a retryable failure is observed. */
+    noteRetryableFailure() {
+        if (this.#startedAt === undefined)
+            this.#startedAt = this.#now();
+    }
+    get deadlineExceeded() {
+        return this.#startedAt !== undefined && this.elapsedMs >= this.maxRecoveryTimeMs;
+    }
+    /**
+     * Claim one physical dispatch made because recovery is in progress.
+     * Ordinary first attempts and successful tool-loop continuations are not
+     * recovery work; their callers must not spend this budget on them.
+     */
+    claimPhysicalAttempt() {
+        if (this.#physicalAttempts >= this.maxPhysicalAttempts || this.deadlineExceeded)
+            return false;
+        this.#physicalAttempts++;
+        return true;
+    }
+    /** Claim exactly once before an automatic full-history turn replay. */
+    claimAutomaticReplay() {
+        if (this.#automaticReplays >= this.maxAutomaticReplays || this.deadlineExceeded)
+            return false;
+        this.#automaticReplays++;
+        return true;
+    }
+    remainingMs() {
+        if (this.#startedAt === undefined)
+            return undefined;
+        return Math.max(0, this.maxRecoveryTimeMs - this.elapsedMs);
+    }
+}
+/**
+ * Raised when a provider wrapper tried to start another physical request after
+ * the shared recovery envelope was exhausted. Keeping the triggering failure
+ * as a cause lets the classifier retain its useful provider/status details
+ * without making the budget error itself look like a new provider failure.
+ */
+export class RetryRecoveryBudgetExhaustedError extends Error {
+    cause;
+    constructor(cause) {
+        super('Retry recovery budget exhausted', { cause });
+        this.name = 'RetryRecoveryBudgetExhaustedError';
+        this.cause = cause;
+    }
+}
+export const isRetryRecoveryBudgetExhaustedError = (error) => error instanceof RetryRecoveryBudgetExhaustedError;
+//# sourceMappingURL=retry-recovery-budget.js.map

package/dist/services/retry/retry-recovery-budget.js.map

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

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

@@ -74,26 +74,80 @@ export interface ProviderTrafficClosedResponse {
     requestId: string;
     provider: string;
     model: string;
-    outcome: 'consumer_closed' | 'aborted';
+    /**
+     * `'failed'` is a stream that ended because a raw transport `error`/`close`
+     * frame was observed before any terminal response event — distinct from
+     * `'consumer_closed'`, which is this application choosing to stop reading a
+     * still-live stream. Without the distinction, an abnormal WebSocket close
+     * (e.g. close code 1006) is indistinguishable from ordinary cleanup.
+     */
+    outcome: 'consumer_closed' | 'aborted' | 'failed';
     eventCount: number;
     modelClass?: string;
     modelWrapperClass?: string;
     /**
      * A stream that ends without a terminal event leaves no payload to
      * summarize, so the retained transcript and its timings are the only record
-     * of what the model was doing when it was cut off.
+     * of what the model was doing when it was cut off. Bounded (no raw event
+     * payload) for `'failed'`, since a transport failure is not the deliberate
+     * client abort that full transcript retention is for.
      */
-    diagnostics?: ProviderTrafficStreamDiagnostics;
+    diagnostics?: ProviderTrafficStreamDiagnostics | ProviderTrafficBoundedStreamDiagnostics;
 }
+/**
+ * Fixed, bounded classification of a Responses WebSocket frame's progress
+ * kind. Closed union on purpose — see `aborted-stream-recorder.ts`.
+ */
+export type ProviderTrafficProgressCategory = 'text' | 'reasoning' | 'tool' | 'usage' | 'heartbeat_or_unknown';
 export interface ProviderTrafficStreamDiagnostics {
     durationMs: number;
     firstEventMs?: number;
     lastEventMs?: number;
     maxGapMs?: number;
     responseId?: string;
+    /** Present only when a raw transport `close` frame was observed. */
+    closeCode?: number;
+    closeReason?: string;
     eventTypeCounts: Record<string, number>;
+    progressCategoryCounts: Record<ProviderTrafficProgressCategory, number>;
+    /** Content-free count of raw tool-argument delta frames. */
+    toolArgumentDeltaFrames: number;
+    /** Sum of raw tool-argument delta string lengths. */
+    toolArgumentDeltaCharacters: number;
+    /** Raw function-call item starts observed before argument deltas. */
+    toolCallStartFrames: number;
     events: unknown[];
 }
+/**
+ * A mechanically fixed-size/fixed-cardinality view of stream progress,
+ * distinct from {@link ProviderTrafficStreamDiagnostics}: every field here is
+ * either a single number (including content-free tool-argument growth counts)
+ * or a `Record` with a closed, hard-coded key set
+ * (`progressCategoryCounts`), so its serialized size cannot grow no matter
+ * how many frames, or how novel/hostile their `type` strings, a stream sends.
+ *
+ * This is why it is a distinct interface rather than
+ * `Omit<ProviderTrafficStreamDiagnostics, 'events'>`: that would still expose
+ * `eventTypeCounts` (keyed by raw, provider-supplied `type` strings with no
+ * enforced vocabulary — unbounded key cardinality) and `closeReason` (free
+ * text the server chooses). Used where the caller must retain progress
+ * evidence about a stream without retaining anything unbounded or
+ * provider-authored — in particular a genuine transport failure, which is not
+ * a deliberate client abort and can carry an unbounded number of frames.
+ */
+export interface ProviderTrafficBoundedStreamDiagnostics {
+    durationMs: number;
+    firstEventMs?: number;
+    lastEventMs?: number;
+    maxGapMs?: number;
+    /** Numeric WebSocket close code (RFC 6455 §7.4); never free text. */
+    closeCode?: number;
+    eventCount: number;
+    progressCategoryCounts: Record<ProviderTrafficProgressCategory, number>;
+    toolArgumentDeltaFrames: number;
+    toolArgumentDeltaCharacters: number;
+    toolCallStartFrames: number;
+}
 /**
  * What a transport-liveness guard observed while receiving a response, in the
  * same clock it judges expiry with.
@@ -124,6 +178,16 @@ export interface IProviderTraffic {
         wsAttempt?: number;
         wsMaxAttempts?: number;
         receiveTiming?: ProviderTrafficReceiveTiming;
+        host?: string;
+        timeoutMs?: number;
+        phase?: string;
+        physicalAttempt?: number;
+        /**
+         * Bounded category/counter/timing evidence of stream progress observed
+         * before the failure, when a stream had already started delivering
+         * frames. Absent when the failure happened before any frame arrived.
+         */
+        diagnostics?: ProviderTrafficBoundedStreamDiagnostics;
     }): void;
 }
 export interface ISessionContextService {

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-check-in-scheduler.d.ts

@@ -1,5 +1,7 @@
 import type { BackgroundCheckInDueEvent } from '../conversation/conversation-events.js';
 import type { BackgroundTask } from '../subagents/subagent-notification-store.js';
+import type { SubagentRunStatus } from '../subagents/types.js';
+import type { BackgroundShellJob } from '../shell/background-shell-registry.js';
 /** Current values of `agent.backgroundCheckIn.*`, read fresh on every tick. */
 export interface BackgroundCheckInSettings {
     enabled: boolean;
@@ -12,6 +14,9 @@ export interface BackgroundCheckInSchedulerDeps {
     /** Deliver a due check-in through the same pipeline as any other background event. */
     emit: (event: BackgroundCheckInDueEvent) => void;
     getSettings: () => BackgroundCheckInSettings;
+    getSubagentStatus?: (runId: string) => SubagentRunStatus | undefined;
+    getShellJob?: (jobId: string) => BackgroundShellJob<unknown> | undefined;
+    getShellOutputTail?: (jobId: string, maxBytes?: number) => string | undefined;
     now?: () => number;
     setInterval?: (callback: () => void, delay: number) => ReturnType<typeof setInterval>;
     clearInterval?: (timer: ReturnType<typeof setInterval>) => void;

package/dist/services/session/background-check-in-scheduler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"background-check-in-scheduler.d.ts","sourceRoot":"","sources":["../../../source/services/session/background-check-in-scheduler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,wCAAwC,CAAC;AACxF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,6CAA6C,CAAC;AAElF,+EAA+E;AAC/E,MAAM,WAAW,yBAAyB;IACxC,OAAO,EAAE,OAAO,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,kBAAkB,EAAE,MAAM,CAAC;CAC5B;AAED,MAAM,WAAW,8BAA8B;IAC7C,gFAAgF;IAChF,eAAe,EAAE,MAAM,SAAS,cAAc,EAAE,CAAC;IACjD,sFAAsF;IACtF,IAAI,EAAE,CAAC,KAAK,EAAE,yBAAyB,KAAK,IAAI,CAAC;IACjD,WAAW,EAAE,MAAM,yBAAyB,CAAC;IAC7C,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,IAAI,EAAE,KAAK,EAAE,MAAM,KAAK,UAAU,CAAC,OAAO,WAAW,CAAC,CAAC;IACtF,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE,UAAU,CAAC,OAAO,WAAW,CAAC,KAAK,IAAI,CAAC;IAChE;;;;OAIG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AA6BD;;;;;;;;;;;GAWG;AACH,qBAAa,0BAA0B;;IASrC,YAAY,IAAI,EAAE,8BAA8B,EAS/C;IAED,wEAAwE;IACxE,IAAI,IAAI,IAAI,CA2BX;IAED,OAAO,IAAI,IAAI,CAId;CACF"}
+{"version":3,"file":"background-check-in-scheduler.d.ts","sourceRoot":"","sources":["../../../source/services/session/background-check-in-scheduler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,wCAAwC,CAAC;AACxF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,6CAA6C,CAAC;AAClF,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC/D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,uCAAuC,CAAC;AAQhF,+EAA+E;AAC/E,MAAM,WAAW,yBAAyB;IACxC,OAAO,EAAE,OAAO,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,kBAAkB,EAAE,MAAM,CAAC;CAC5B;AAED,MAAM,WAAW,8BAA8B;IAC7C,gFAAgF;IAChF,eAAe,EAAE,MAAM,SAAS,cAAc,EAAE,CAAC;IACjD,sFAAsF;IACtF,IAAI,EAAE,CAAC,KAAK,EAAE,yBAAyB,KAAK,IAAI,CAAC;IACjD,WAAW,EAAE,MAAM,yBAAyB,CAAC;IAC7C,iBAAiB,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,iBAAiB,GAAG,SAAS,CAAC;IACrE,WAAW,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,kBAAkB,CAAC,OAAO,CAAC,GAAG,SAAS,CAAC;IACzE,kBAAkB,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,KAAK,MAAM,GAAG,SAAS,CAAC;IAC9E,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,IAAI,EAAE,KAAK,EAAE,MAAM,KAAK,UAAU,CAAC,OAAO,WAAW,CAAC,CAAC;IACtF,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE,UAAU,CAAC,OAAO,WAAW,CAAC,KAAK,IAAI,CAAC;IAChE;;;;OAIG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAuGD;;;;;;;;;;;GAWG;AACH,qBAAa,0BAA0B;;IAYrC,YAAY,IAAI,EAAE,8BAA8B,EAY/C;IAED,wEAAwE;IACxE,IAAI,IAAI,IAAI,CAmCX;IAED,OAAO,IAAI,IAAI,CAId;CACF"}

package/dist/services/session/background-check-in-scheduler.js

@@ -1,3 +1,5 @@
+import { truncatePreview } from '../subagents/utils.js';
+import { BACKGROUND_SHELL_QUIET_AFTER_MS, BACKGROUND_SUBAGENT_QUIET_AFTER_MS, normalizeBackgroundTaskActivity, } from '../background-task-activity.js';
 const DEFAULT_TICK_MS = 30_000;
 function checkInKey(target) {
     return `${target.kind}:${target.id}`;
@@ -5,16 +7,77 @@ function checkInKey(target) {
 function taskTarget(task) {
     return task.kind === 'shell' ? { kind: 'shell', id: task.jobId } : { kind: 'subagent', id: task.runId };
 }
-function taskDetails(task) {
-    return task.kind === 'shell'
-        ? { kind: 'shell', id: task.jobId, command: task.command }
-        : {
-            kind: 'subagent',
-            id: task.runId,
-            ...(task.name !== undefined ? { name: task.name } : {}),
-            role: task.role,
-            task: task.task,
+function taskDetails(task, deps, now) {
+    if (task.kind === 'shell') {
+        const job = deps.getShellJob?.(task.jobId);
+        const rawTail = deps.getShellOutputTail?.(task.jobId, 400)?.trim();
+        const outputTail = rawTail && rawTail.length > 0 ? rawTail : undefined;
+        return {
+            kind: 'shell',
+            id: task.jobId,
+            command: task.command,
+            ...(job?.lastObservation || job?.lastActivityAt !== undefined
+                ? {
+                    activity: normalizeBackgroundTaskActivity({
+                        status: job?.status ?? task.status,
+                        ...(job?.lastObservation === undefined
+                            ? { lastActivityAt: job?.lastActivityAt }
+                            : { lastObservation: job.lastObservation }),
+                        now,
+                        quietAfterMs: BACKGROUND_SHELL_QUIET_AFTER_MS,
+                    }),
+                }
+                : {}),
+            ...(job?.status ? { status: job.status } : {}),
+            ...(job?.lastObservation ? { lastObservation: job.lastObservation } : {}),
+            ...(outputTail ? { outputTail } : {}),
         };
+    }
+    const subagentStatus = deps.getSubagentStatus?.(task.runId);
+    const narrative = subagentStatus?.currentText?.trim() ||
+        (subagentStatus?.turnHistory && subagentStatus.turnHistory.length > 0
+            ? subagentStatus.turnHistory[subagentStatus.turnHistory.length - 1]?.text?.trim()
+            : undefined);
+    const latestNarrative = narrative ? truncatePreview(narrative) : undefined;
+    return {
+        kind: 'subagent',
+        id: task.runId,
+        ...(task.name !== undefined ? { name: task.name } : {}),
+        role: task.role,
+        task: task.task,
+        ...(subagentStatus?.lastObservation || subagentStatus?.lastActivityAt !== undefined
+            ? {
+                activity: normalizeBackgroundTaskActivity({
+                    status: subagentStatus.status,
+                    activityState: subagentStatus.status === 'awaiting_approval' || subagentStatus.status === 'waiting_for_answer'
+                        ? 'waiting'
+                        : subagentStatus.activityState,
+                    waitingReason: subagentStatus.status === 'awaiting_approval'
+                        ? 'approval'
+                        : subagentStatus.status === 'waiting_for_answer'
+                            ? 'answer'
+                            : subagentStatus.waitingReason,
+                    ...(subagentStatus.lastObservation === undefined
+                        ? { lastActivityAt: subagentStatus.lastActivityAt }
+                        : { lastObservation: subagentStatus.lastObservation }),
+                    now,
+                    quietAfterMs: BACKGROUND_SUBAGENT_QUIET_AFTER_MS,
+                }),
+            }
+            : {}),
+        ...(subagentStatus?.activityState ? { activityState: subagentStatus.activityState } : {}),
+        ...(subagentStatus?.waitingReason ? { waitingReason: subagentStatus.waitingReason } : {}),
+        ...(subagentStatus?.toolCounts && Object.keys(subagentStatus.toolCounts).length > 0
+            ? { toolCounts: subagentStatus.toolCounts }
+            : {}),
+        ...(subagentStatus?.lastToolName
+            ? { lastToolName: subagentStatus.lastToolName }
+            : task.lastTool?.label
+                ? { lastToolName: task.lastTool.label }
+                : {}),
+        ...(subagentStatus?.lastObservation ? { lastObservation: subagentStatus.lastObservation } : {}),
+        ...(latestNarrative ? { latestNarrative } : {}),
+    };
 }
 /**
  * Periodically checks whether any still-running background task (shell job or
@@ -32,6 +95,9 @@ export class BackgroundCheckInScheduler {
     #getRunningTasks;
     #emit;
     #getSettings;
+    #getSubagentStatus;
+    #getShellJob;
+    #getShellOutputTail;
     #now;
     #clearInterval;
     #timer;
@@ -40,6 +106,9 @@ export class BackgroundCheckInScheduler {
         this.#getRunningTasks = deps.getRunningTasks;
         this.#emit = deps.emit;
         this.#getSettings = deps.getSettings;
+        this.#getSubagentStatus = deps.getSubagentStatus;
+        this.#getShellJob = deps.getShellJob;
+        this.#getShellOutputTail = deps.getShellOutputTail;
         this.#now = deps.now ?? (() => Date.now());
         const setIntervalFn = deps.setInterval ?? setInterval;
         this.#clearInterval = deps.clearInterval ?? clearInterval;
@@ -74,7 +143,11 @@ export class BackgroundCheckInScheduler {
                 target,
                 checkInIndex,
                 elapsedMs: now - task.startedAt,
-                details: taskDetails(task),
+                details: taskDetails(task, {
+                    getSubagentStatus: this.#getSubagentStatus,
+                    getShellJob: this.#getShellJob,
+                    getShellOutputTail: this.#getShellOutputTail,
+                }, now),
             });
         }
     }

package/dist/services/session/background-check-in-scheduler.js.map

@@ -1 +1 @@
-{"version":3,"file":"background-check-in-scheduler.js","sourceRoot":"","sources":["../../../source/services/session/background-check-in-scheduler.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"background-check-in-scheduler.js","sourceRoot":"","sources":["../../../source/services/session/background-check-in-scheduler.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EACL,+BAA+B,EAC/B,kCAAkC,EAClC,+BAA+B,GAChC,MAAM,gCAAgC,CAAC;AA6BxC,MAAM,eAAe,GAAG,MAAM,CAAC;AAO/B,SAAS,UAAU,CAAC,MAA2C;IAC7D,OAAO,GAAG,MAAM,CAAC,IAAI,IAAI,MAAM,CAAC,EAAE,EAAE,CAAC;AACvC,CAAC;AAED,SAAS,UAAU,CAAC,IAAoB;IACtC,OAAO,IAAI,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE,EAAE,IAAI,CAAC,KAAK,EAAE,CAAC;AAC1G,CAAC;AAED,SAAS,WAAW,CAClB,IAAoB,EACpB,IAIC,EACD,GAAW;IAEX,IAAI,IAAI,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;QAC1B,MAAM,GAAG,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC3C,MAAM,OAAO,GAAG,IAAI,CAAC,kBAAkB,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE,IAAI,EAAE,CAAC;QACnE,MAAM,UAAU,GAAG,OAAO,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC;QACvE,OAAO;YACL,IAAI,EAAE,OAAO;YACb,EAAE,EAAE,IAAI,CAAC,KAAK;YACd,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,GAAG,CAAC,GAAG,EAAE,eAAe,IAAI,GAAG,EAAE,cAAc,KAAK,SAAS;gBAC3D,CAAC,CAAC;oBACE,QAAQ,EAAE,+BAA+B,CAAC;wBACxC,MAAM,EAAE,GAAG,EAAE,MAAM,IAAI,IAAI,CAAC,MAAM;wBAClC,GAAG,CAAC,GAAG,EAAE,eAAe,KAAK,SAAS;4BACpC,CAAC,CAAC,EAAE,cAAc,EAAE,GAAG,EAAE,cAAc,EAAE;4BACzC,CAAC,CAAC,EAAE,eAAe,EAAE,GAAG,CAAC,eAAe,EAAE,CAAC;wBAC7C,GAAG;wBACH,YAAY,EAAE,+BAA+B;qBAC9C,CAAC;iBACH;gBACH,CAAC,CAAC,EAAE,CAAC;YACP,GAAG,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC9C,GAAG,CAAC,GAAG,EAAE,eAAe,CAAC,CAAC,CAAC,EAAE,eAAe,EAAE,GAAG,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACzE,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACtC,CAAC;IACJ,CAAC;IAED,MAAM,cAAc,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC5D,MAAM,SAAS,GACb,cAAc,EAAE,WAAW,EAAE,IAAI,EAAE;QACnC,CAAC,cAAc,EAAE,WAAW,IAAI,cAAc,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC;YACnE,CAAC,CAAC,cAAc,CAAC,WAAW,CAAC,cAAc,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE;YACjF,CAAC,CAAC,SAAS,CAAC,CAAC;IACjB,MAAM,eAAe,GAAG,SAAS,CAAC,CAAC,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAE3E,OAAO;QACL,IAAI,EAAE,UAAU;QAChB,EAAE,EAAE,IAAI,CAAC,KAAK;QACd,GAAG,CAAC,IAAI,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACvD,IAAI,EAAE,IAAI,CAAC,IAAI;QACf,IAAI,EAAE,IAAI,CAAC,IAAI;QACf,GAAG,CAAC,cAAc,EAAE,eAAe,IAAI,cAAc,EAAE,cAAc,KAAK,SAAS;YACjF,CAAC,CAAC;gBACE,QAAQ,EAAE,+BAA+B,CAAC;oBACxC,MAAM,EAAE,cAAc,CAAC,MAAM;oBAC7B,aAAa,EACX,cAAc,CAAC,MAAM,KAAK,mBAAmB,IAAI,cAAc,CAAC,MAAM,KAAK,oBAAoB;wBAC7F,CAAC,CAAC,SAAS;wBACX,CAAC,CAAC,cAAc,CAAC,aAAa;oBAClC,aAAa,EACX,cAAc,CAAC,MAAM,KAAK,mBAAmB;wBAC3C,CAAC,CAAC,UAAU;wBACZ,CAAC,CAAC,cAAc,CAAC,MAAM,KAAK,oBAAoB;4BAChD,CAAC,CAAC,QAAQ;4BACV,CAAC,CAAC,cAAc,CAAC,aAAa;oBAClC,GAAG,CAAC,cAAc,CAAC,eAAe,KAAK,SAAS;wBAC9C,CAAC,CAAC,EAAE,cAAc,EAAE,cAAc,CAAC,cAAc,EAAE;wBACnD,CAAC,CAAC,EAAE,eAAe,EAAE,cAAc,CAAC,eAAe,EAAE,CAAC;oBACxD,GAAG;oBACH,YAAY,EAAE,kCAAkC;iBACjD,CAAC;aACH;YACH,CAAC,CAAC,EAAE,CAAC;QACP,GAAG,CAAC,cAAc,EAAE,aAAa,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,cAAc,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACzF,GAAG,CAAC,cAAc,EAAE,aAAa,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,cAAc,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACzF,GAAG,CAAC,cAAc,EAAE,UAAU,IAAI,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC,MAAM,GAAG,CAAC;YACjF,CAAC,CAAC,EAAE,UAAU,EAAE,cAAc,CAAC,UAAU,EAAE;YAC3C,CAAC,CAAC,EAAE,CAAC;QACP,GAAG,CAAC,cAAc,EAAE,YAAY;YAC9B,CAAC,CAAC,EAAE,YAAY,EAAE,cAAc,CAAC,YAAY,EAAE;YAC/C,CAAC,CAAC,IAAI,CAAC,QAAQ,EAAE,KAAK;gBACtB,CAAC,CAAC,EAAE,YAAY,EAAE,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE;gBACvC,CAAC,CAAC,EAAE,CAAC;QACP,GAAG,CAAC,cAAc,EAAE,eAAe,CAAC,CAAC,CAAC,EAAE,eAAe,EAAE,cAAc,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC/F,GAAG,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,eAAe,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KAChD,CAAC;AACJ,CAAC;AAED;;;;;;;;;;;GAWG;AACH,MAAM,OAAO,0BAA0B;IACrC,gBAAgB,CAAkC;IAClD,KAAK,CAA6C;IAClD,YAAY,CAAkC;IAC9C,kBAAkB,CAAoD;IACtE,YAAY,CAA8D;IAC1E,mBAAmB,CAA4D;IAC/E,IAAI,CAAe;IACnB,cAAc,CAAkD;IAChE,MAAM,CAA6C;IACnD,SAAS,GAAG,IAAI,GAAG,EAA2B,CAAC;IAE/C,YAAY,IAAoC;QAC9C,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,eAAe,CAAC;QAC7C,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC;QACvB,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,WAAW,CAAC;QACrC,IAAI,CAAC,kBAAkB,GAAG,IAAI,CAAC,iBAAiB,CAAC;QACjD,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,WAAW,CAAC;QACrC,IAAI,CAAC,mBAAmB,GAAG,IAAI,CAAC,kBAAkB,CAAC;QACnD,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;QAC3C,MAAM,aAAa,GAAG,IAAI,CAAC,WAAW,IAAI,WAAW,CAAC;QACtD,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,aAAa,IAAI,aAAa,CAAC;QAC1D,IAAI,CAAC,MAAM,GAAG,aAAa,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,IAAI,CAAC,MAAM,IAAI,eAAe,CAAC,CAAC;QAC/E,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,CAAC;IACxB,CAAC;IAED,wEAAwE;IACxE,IAAI;QACF,MAAM,QAAQ,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;QACrC,MAAM,YAAY,GAAG,IAAI,CAAC,gBAAgB,EAAE,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC;QACzF,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;QACnF,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,EAAE,CAAC;YACxC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC;gBAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACrD,CAAC;QACD,IAAI,CAAC,QAAQ,CAAC,OAAO;YAAE,OAAO;QAE9B,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;QACxB,KAAK,MAAM,IAAI,IAAI,YAAY,EAAE,CAAC;YAChC,MAAM,MAAM,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC;YAChC,MAAM,GAAG,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC;YAC/B,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YACzC,MAAM,KAAK,GAAG,CAAC,QAAQ,EAAE,aAAa,IAAI,IAAI,CAAC,SAAS,CAAC,GAAG,QAAQ,CAAC,UAAU,CAAC;YAChF,IAAI,GAAG,GAAG,KAAK;gBAAE,SAAS;YAC1B,MAAM,YAAY,GAAG,CAAC,QAAQ,EAAE,YAAY,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;YACvD,IAAI,YAAY,GAAG,QAAQ,CAAC,kBAAkB;gBAAE,SAAS;YACzD,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,aAAa,EAAE,GAAG,EAAE,YAAY,EAAE,YAAY,EAAE,CAAC,CAAC;YAC5E,IAAI,CAAC,KAAK,CAAC;gBACT,IAAI,EAAE,yBAAyB;gBAC/B,MAAM;gBACN,YAAY;gBACZ,SAAS,EAAE,GAAG,GAAG,IAAI,CAAC,SAAS;gBAC/B,OAAO,EAAE,WAAW,CAClB,IAAI,EACJ;oBACE,iBAAiB,EAAE,IAAI,CAAC,kBAAkB;oBAC1C,WAAW,EAAE,IAAI,CAAC,YAAY;oBAC9B,kBAAkB,EAAE,IAAI,CAAC,mBAAmB;iBAC7C,EACD,GAAG,CACJ;aACF,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,OAAO;QACL,IAAI,IAAI,CAAC,MAAM,KAAK,SAAS;YAAE,OAAO;QACtC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACjC,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC;IAC1B,CAAC;CACF"}

package/dist/services/session/continuation-recovery-handler.d.ts

@@ -19,6 +19,7 @@ export type ContinuationRecoveryHandlerDeps = {
     retryEventPresenter: RetryEventPresenter;
     resolveRetryLimit: () => number;
     toolTracker: SessionToolTracker;
+    provider?: string;
 };
 export type ContinuationRecoveryResult = {
     kind: 'stale';

package/dist/services/session/continuation-recovery-handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"continuation-recovery-handler.d.ts","sourceRoot":"","sources":["../../../source/services/session/continuation-recovery-handler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAChF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AAC3E,OAAO,KAAK,EAAE,iCAAiC,EAAE,MAAM,6BAA6B,CAAC;AACrF,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAC;AAC7E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AAC7E,OAAO,KAAK,EAAE,WAAW,EAAiB,MAAM,6BAA6B,CAAC;AAC9E,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAEpE,MAAM,MAAM,+BAA+B,GAAG;IAC5C,aAAa,CAAC,EAAE,MAAM,IAAI,CAAC;IAC3B,MAAM,EAAE,eAAe,CAAC;IACxB,SAAS,EAAE,MAAM,CAAC;IAClB,eAAe,EAAE,eAAe,CAAC;IACjC,eAAe,EAAE,sBAAsB,CAAC;IACxC,cAAc,EAAE,iCAAiC,CAAC;IAClD,gBAAgB,EAAE,uBAAuB,CAAC;IAC1C,mBAAmB,EAAE,mBAAmB,CAAC;IACzC,iBAAiB,EAAE,MAAM,MAAM,CAAC;IAChC,WAAW,EAAE,kBAAkB,CAAC;CACjC,CAAC;AAEF,MAAM,MAAM,0BAA0B,GAClC;IAAE,IAAI,EAAE,OAAO,CAAA;CAAE,GACjB;IAAE,IAAI,EAAE,YAAY,CAAA;CAAE,GACtB;IAAE,IAAI,EAAE,QAAQ,CAAA;CAAE,GAClB;IACE,IAAI,EAAE,aAAa,CAAC;IACpB,WAAW,EAAE,WAAW,CAAC;IACzB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,yBAAyB,CAAC,EAAE,OAAO,CAAC;CACrC,CAAC;AAEN,qBAAa,2BAA2B;IAC1B,OAAO,CAAC,QAAQ,CAAC,IAAI;IAAjC,YAA6B,IAAI,EAAE,+BAA+B,EAAI;IAE/D,MAAM,CAAC,GAAG,EAAE;QACjB,KAAK,EAAE,OAAO,CAAC;QACf,KAAK,EAAE,iBAAiB,CAAC;KAC1B,GAAG,cAAc,CAAC,iBAAiB,EAAE,0BAA0B,EAAE,IAAI,CAAC,CAyFtE;CACF"}
+{"version":3,"file":"continuation-recovery-handler.d.ts","sourceRoot":"","sources":["../../../source/services/session/continuation-recovery-handler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAChF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AAC3E,OAAO,KAAK,EAAE,iCAAiC,EAAE,MAAM,6BAA6B,CAAC;AACrF,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAC;AAC7E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AAC7E,OAAO,KAAK,EAAE,WAAW,EAAiB,MAAM,6BAA6B,CAAC;AAC9E,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAIpE,MAAM,MAAM,+BAA+B,GAAG;IAC5C,aAAa,CAAC,EAAE,MAAM,IAAI,CAAC;IAC3B,MAAM,EAAE,eAAe,CAAC;IACxB,SAAS,EAAE,MAAM,CAAC;IAClB,eAAe,EAAE,eAAe,CAAC;IACjC,eAAe,EAAE,sBAAsB,CAAC;IACxC,cAAc,EAAE,iCAAiC,CAAC;IAClD,gBAAgB,EAAE,uBAAuB,CAAC;IAC1C,mBAAmB,EAAE,mBAAmB,CAAC;IACzC,iBAAiB,EAAE,MAAM,MAAM,CAAC;IAChC,WAAW,EAAE,kBAAkB,CAAC;IAChC,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,0BAA0B,GAClC;IAAE,IAAI,EAAE,OAAO,CAAA;CAAE,GACjB;IAAE,IAAI,EAAE,YAAY,CAAA;CAAE,GACtB;IAAE,IAAI,EAAE,QAAQ,CAAA;CAAE,GAClB;IACE,IAAI,EAAE,aAAa,CAAC;IACpB,WAAW,EAAE,WAAW,CAAC;IACzB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,yBAAyB,CAAC,EAAE,OAAO,CAAC;CACrC,CAAC;AAEN,qBAAa,2BAA2B;IAC1B,OAAO,CAAC,QAAQ,CAAC,IAAI;IAAjC,YAA6B,IAAI,EAAE,+BAA+B,EAAI;IAE/D,MAAM,CAAC,GAAG,EAAE;QACjB,KAAK,EAAE,OAAO,CAAC;QACf,KAAK,EAAE,iBAAiB,CAAC;KAC1B,GAAG,cAAc,CAAC,iBAAiB,EAAE,0BAA0B,EAAE,IAAI,CAAC,CAqItE;CACF"}

package/dist/services/session/continuation-recovery-handler.js

@@ -1,3 +1,5 @@
+import { classifyProviderFailure } from '../retry/provider-failure-classification.js';
+import { skipsAutomaticReplayClaim } from '../retry/committed-tool-continuation.js';
 export class ContinuationRecoveryHandler {
     deps;
     constructor(deps) {
@@ -7,10 +9,12 @@ export class ContinuationRecoveryHandler {
         const { error, state } = ctx;
         const maxTransientRetries = this.deps.resolveRetryLimit();
         const retryStream = state.lastStream;
+        const committedToolContinuation = this.deps.toolTracker.inspectCommittedToolContinuation?.();
         const classified = this.deps.retryClassifier.classify({
             error,
             retryCounts: state.retryCounts,
             stream: retryStream,
+            committedToolContinuation,
             maxTransientRetries,
         });
         if (classified.kind === 'chain_recovery') {
@@ -19,6 +23,13 @@ export class ContinuationRecoveryHandler {
         if (classified.kind === 'unrecoverable') {
             return { kind: 'terminated' };
         }
+        // model_retry (hallucination/parsing/behavior detection) has its own
+        // pre-existing maxModelRetries cap and must not draw against or be capped
+        // by the shared transport-recovery envelope; see the matching comment in
+        // initial-turn-recovery-handler.ts.
+        if (classified.kind === 'transient' || classified.kind === 'chain_recovery') {
+            state.recoveryBudget.noteRetryableFailure();
+        }
         const presentation = this.deps.retryEventPresenter.present({
             failure: classified,
             maxTransientRetries,
@@ -49,6 +60,37 @@ export class ContinuationRecoveryHandler {
             stream: retryStream,
         };
         const transientDelayMs = classified.kind === 'transient' || classified.kind === 'chain_recovery' ? classified.delayMs : undefined;
+        // Only retry_fresh draws against the automatic-replay budget; replay_turn
+        // comes exclusively from model_retry, excluded for the reason above.
+        if (plan.kind === 'retry_fresh' &&
+            ((!skipsAutomaticReplayClaim(classified, committedToolContinuation) &&
+                !state.recoveryBudget.claimAutomaticReplay()) ||
+                !state.recoveryBudget.claimPhysicalAttempt())) {
+            // Refusing the plan must still settle open tool calls truthfully and
+            // clear the provider chain, exactly like an ordinary termination does --
+            // see the matching comment in initial-turn-recovery-handler.ts.
+            const terminateResult = this.deps.recoveryExecutor.apply({
+                plan: { kind: 'terminate', events: [] },
+                state: recoveryState,
+                retryCounts: state.retryCounts,
+            });
+            if (terminateResult.kind === 'terminated') {
+                for (const event of terminateResult.events) {
+                    yield event;
+                }
+            }
+            const providerName = this.deps.provider ?? 'provider';
+            yield {
+                type: 'retry_exhausted',
+                provider: providerName,
+                errorKind: classifyProviderFailure(error).errorKind,
+                attempts: state.recoveryBudget.physicalAttempts,
+                maxAttempts: state.recoveryBudget.maxPhysicalAttempts,
+                message: `Could not reach ${providerName} after ${state.recoveryBudget.physicalAttempts} attempts. No model response was received.`,
+                canRetry: true,
+            };
+            return { kind: 'terminated' };
+        }
         const recoveryResult = this.deps.recoveryExecutor.apply({
             plan,
             state: recoveryState,