@qduc/term2 0.14.0 → 0.16.0

package/dist/services/retry/upstream-retry-policy.js

@@ -12,14 +12,24 @@ const RATE_LIMIT_MESSAGE_PATTERNS = ['rate limit', 'too many requests', 'rate_li
 const getMessage = (error) => {
     if (typeof error === 'string')
         return error;
-    if (error && typeof error === 'object' && 'message' in error) {
-        return String(error.message ?? '');
+    if (error && typeof error === 'object') {
+        const msg = error.message;
+        if (typeof msg === 'string')
+            return msg;
+        const nested = error.error?.message;
+        if (typeof nested === 'string')
+            return nested;
     }
     return '';
 };
 const parseStatus = (value) => {
-    const status = typeof value === 'number' ? value : parseInt(String(value), 10);
-    return Number.isInteger(status) ? status : undefined;
+    if (typeof value === 'number' && Number.isInteger(value))
+        return value;
+    if (typeof value === 'string') {
+        const parsed = parseInt(value, 10);
+        return Number.isInteger(parsed) && String(parsed) === value.trim() ? parsed : undefined;
+    }
+    return undefined;
 };
 const getHeadersSource = (source) => {
     if (!source || typeof source !== 'object')
@@ -99,20 +109,43 @@ export function classifyUpstreamRetryableError(error) {
     if (!error || typeof error !== 'object') {
         return { retryable: false };
     }
-    const status = parseStatus(error.status ?? error.statusCode);
+    const rawStatus = error.status ??
+        error.statusCode ??
+        error.code ??
+        error.error?.status ??
+        error.error?.statusCode ??
+        error.error?.code;
+    const status = parseStatus(rawStatus);
     if (status !== undefined) {
         return {
             retryable: status === 429 || status >= 500,
             status,
-            retryAfterMs: getRetryAfterMs(error),
+            retryAfterMs: getRetryAfterMs(error) ?? getRetryAfterMs(error.error),
             reason: 'generic-status',
         };
     }
+    const rawCode = String(error.code ?? error.error?.code ?? '').toLowerCase();
+    const rawType = String(error.metadata?.error_type ??
+        error.error?.metadata?.error_type ??
+        error.type ??
+        error.error?.type ??
+        '').toLowerCase();
+    if (rawCode.includes('rate_limit') ||
+        rawCode.includes('too_many_requests') ||
+        rawType.includes('rate_limit') ||
+        rawType.includes('too_many_requests')) {
+        return {
+            retryable: true,
+            status: 429,
+            retryAfterMs: getRetryAfterMs(error) ?? getRetryAfterMs(error.error),
+            reason: 'rate-limit-code',
+        };
+    }
     const message = getMessage(error).toLowerCase();
     const retryable = RATE_LIMIT_MESSAGE_PATTERNS.some((pattern) => message.includes(pattern));
     return {
         retryable,
-        retryAfterMs: getRetryAfterMs(error),
+        retryAfterMs: getRetryAfterMs(error) ?? getRetryAfterMs(error.error),
         ...(retryable ? { reason: 'rate-limit-message' } : {}),
     };
 }

package/dist/services/retry/upstream-retry-policy.js.map

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

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,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"}
+{"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,CAkBvF;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,CA+E3G"}

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

@@ -1,5 +1,5 @@
 import { setTrimConfig } from '../utils/output/output-trim.js';
-import { planModeNotice } from './mode-notices.js';
+import { planModeNotice, runtimeModeNotice } from './mode-notices.js';
 /**
  * Owns the application effects of conversation-related settings. Menu code
  * only translates input into changes; this service applies the effective
@@ -13,10 +13,16 @@ export class ConversationConfigurationService {
     apply(changes) {
         const runtime = changes.filter((change) => change.persistence === 'runtime');
         if (runtime.length > 0) {
+            const planWas = Boolean(this.#deps.settingsService.get('app.planMode'));
             this.#deps.settingsService.setDynamicTransaction(runtime.map(({ key, value }) => ({ key, value })));
             for (const change of runtime) {
                 this.applyRuntimeSetting(change.key, change.value);
             }
+            const planIs = Boolean(this.#deps.settingsService.get('app.planMode'));
+            const planKeyExplicit = runtime.some((change) => change.key === 'app.planMode');
+            if (!planKeyExplicit && planWas !== planIs) {
+                this.#deps.conversationService.queueModeNotice(planModeNotice(planIs));
+            }
         }
         for (const change of changes.filter((item) => item.persistence === 'restart')) {
             this.#deps.settingsService.setPersistentDynamic(change.key, change.value);
@@ -73,7 +79,12 @@ export function applyRuntimeSettingChange(key, value, deps) {
         deps.setModel(deps.settingsService.get('agent.model'));
         return;
     }
-    if (key === 'app.mentorMode' || key === 'app.liteMode' || key === 'app.orchestratorMode') {
+    if (key === 'app.mentorMode' || key === 'app.orchestratorMode') {
+        deps.setModel(deps.settingsService.get('agent.model'));
+        deps.conversationService.queueModeNotice(runtimeModeNotice(key === 'app.mentorMode' ? 'mentor' : 'orchestrator', Boolean(value)));
+        return;
+    }
+    if (key === 'app.liteMode') {
         deps.setModel(deps.settingsService.get('agent.model'));
         return;
     }

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":"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"}
+{"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,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAqBtE;;;;GAIG;AACH,MAAM,OAAO,gCAAgC;IAClC,KAAK,CAA2B;IAEzC,YAAY,IAA8B;QACxC,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;IACpB,CAAC;IAED,KAAK,CAAC,OAA6C;QACjD,MAAM,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,WAAW,KAAK,SAAS,CAAC,CAAC;QAC7E,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACvB,MAAM,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC;YACxE,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,qBAAqB,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC;YACpG,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;gBAC7B,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;YACrD,CAAC;YACD,MAAM,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC;YACvE,MAAM,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,KAAK,cAAc,CAAC,CAAC;YAChF,IAAI,CAAC,eAAe,IAAI,OAAO,KAAK,MAAM,EAAE,CAAC;gBAC3C,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,eAAe,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC;YACzE,CAAC;QACH,CAAC;QACD,KAAK,MAAM,MAAM,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,KAAK,SAAS,CAAC,EAAE,CAAC;YAC9E,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,oBAAoB,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;QAC5E,CAAC;QACD,OAAO,EAAE,WAAW,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,WAAW,KAAK,SAAS,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC;IACnH,CAAC;IAED,KAAK,CAAC,GAAW;QACf,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACtC,IAAI,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,mBAAmB,CAAC,GAAG,CAAC,EAAE,CAAC;YACxD,IAAI,CAAC,mBAAmB,CAAC,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC;QAC5E,CAAC;IACH,CAAC;IAED,mBAAmB,CAAC,GAAW,EAAE,KAAc;QAC7C,yBAAyB,CAAC,GAAG,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;IACpD,CAAC;CACF;AAED,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,CAAC,aAAa,CAAC,CAAC,CAAC;QACvD,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,CAAC,aAAa,CAAC,CAAC,CAAC;QACvD,OAAO;IACT,CAAC;IAED,IAAI,GAAG,KAAK,gBAAgB,IAAI,GAAG,KAAK,sBAAsB,EAAE,CAAC;QAC/D,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC;QACvD,IAAI,CAAC,mBAAmB,CAAC,eAAe,CACtC,iBAAiB,CAAC,GAAG,KAAK,gBAAgB,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,cAAc,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC,CACxF,CAAC;QACF,OAAO;IACT,CAAC;IAED,IAAI,GAAG,KAAK,cAAc,EAAE,CAAC;QAC3B,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC;QACvD,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"}

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

@@ -1,4 +1,34 @@
 import type { SettingKey, SettingValue } from './settings/settings-schema.js';
+/**
+ * Structured metadata contract for application log records (Contract 07, C7.5).
+ *
+ * Callers pass arbitrary diagnostic keys — `RuntimeLogSchema` passes them
+ * through to the winston record — but the fields that drive log behavior are
+ * typed explicitly so misuse fails at compile time instead of silently
+ * corrupting records: `eventType` gates redaction and category filtering,
+ * `correlationId` is the explicit per-call override that beats the ambient
+ * process-wide id, and the canonical record fields feed
+ * `buildRuntimeLogRecord`. Values are `unknown`-typed (never `any`) so
+ * consumers must narrow before reading.
+ */
+export type LogMetadataContract = {
+    eventType?: string;
+    correlationId?: string;
+    traceId?: string;
+    sessionId?: string;
+    provider?: string;
+    model?: string;
+    messageId?: string;
+    category?: string;
+    phase?: string;
+    direction?: string;
+    requestId?: string;
+    toolName?: string;
+    toolCallId?: string;
+    errorCode?: string;
+    errorMessage?: string;
+    [key: string]: unknown;
+};
 export type SessionTrafficContext = {
     sessionId: string;
     sessionStartedAt: string;
@@ -9,11 +39,11 @@ export type SessionTrafficContext = {
     firstUserMessagePreview?: string;
 };
 export interface ILoggingService {
-    info(message: string, meta?: any): void;
-    warn(message: string, meta?: any): void;
-    error(message: string, meta?: any): void;
-    debug(message: string, meta?: any): void;
-    security(message: string, meta?: any): void;
+    info(message: string, meta?: LogMetadataContract): void;
+    warn(message: string, meta?: LogMetadataContract): void;
+    error(message: string, meta?: LogMetadataContract): void;
+    debug(message: string, meta?: LogMetadataContract): void;
+    security(message: string, meta?: LogMetadataContract): void;
     setCorrelationId(id: string | undefined): void;
     getCorrelationId(): string | undefined;
     clearCorrelationId(): void;
@@ -38,6 +68,7 @@ export interface ProviderTrafficResponse {
     modelClass?: string;
     modelWrapperClass?: string;
     transport?: 'websocket';
+    receiveTiming?: ProviderTrafficReceiveTiming;
 }
 export interface ProviderTrafficClosedResponse {
     requestId: string;
@@ -63,6 +94,22 @@ export interface ProviderTrafficStreamDiagnostics {
     eventTypeCounts: Record<string, number>;
     events: unknown[];
 }
+/**
+ * What a transport-liveness guard observed while receiving a response, in the
+ * same clock it judges expiry with.
+ *
+ * The budgets travel with the measurements because they are user-configurable:
+ * a latency logged without the deadline it was measured against cannot be read
+ * back later as margin.
+ */
+export interface ProviderTrafficReceiveTiming {
+    frameCount: number;
+    firstFrameBudgetMs: number;
+    interFrameBudgetMs: number;
+    firstFrameMs?: number;
+    maxInterFrameMs?: number;
+    waitedMs?: number;
+}
 export interface IProviderTraffic {
     recordRequestStart(input: ProviderTrafficRequest): void;
     recordResponseReceived(input: ProviderTrafficResponse): Promise<void>;
@@ -76,6 +123,7 @@ export interface IProviderTraffic {
         modelWrapperClass?: string;
         wsAttempt?: number;
         wsMaxAttempts?: number;
+        receiveTiming?: ProviderTrafficReceiveTiming;
     }): void;
 }
 export interface ISessionContextService {
@@ -95,18 +143,53 @@ export interface ISettingsService {
     setPersistentDynamic(key: string, value: unknown): void;
     onChange?: (listener: (key?: string) => void) => () => void;
 }
+/**
+ * Per-invocation options for a remote command. Absent options preserve the
+ * pre-existing behavior: no timeout is armed and no abort listener is
+ * attached. Both `timeoutMs` and `signal` are opt-in containment/cancellation
+ * levers, not default watchdogs.
+ */
+export interface SSHCommandOptions {
+    /** Remote working directory the command runs in (`cd <cwd> && <cmd>`). */
+    cwd?: string;
+    /**
+     * Opt-in wall-clock bound on how long the caller waits for settlement.
+     * When the bound elapses, the pending promise rejects with a typed
+     * `SSHTransportError` of kind `'timeout'`; no default is applied when the
+     * option is absent. The remote process is NOT killed or replayed — its
+     * effect is reported as `'unknown'`.
+     */
+    timeoutMs?: number;
+    /**
+     * Opt-in cancellation signal. Aborting settles the pending promise with a
+     * typed `SSHTransportError` of kind `'aborted'`; a signal that is already
+     * aborted before dispatch rejects with `remoteEffect: 'none'` and sends no
+     * command. No default signal is applied when the option is absent.
+     */
+    signal?: AbortSignal;
+}
+export interface SSHCommandResult {
+    stdout: string;
+    stderr: string;
+    exitCode: number | null;
+    timedOut: boolean;
+}
 export interface ISSHService {
     connect(): Promise<void>;
     disconnect(): Promise<void>;
     isConnected(): boolean;
-    executeCommand(cmd: string, opts?: {
-        cwd?: string;
-    }): Promise<{
-        stdout: string;
-        stderr: string;
-        exitCode: number | null;
-        timedOut: boolean;
-    }>;
+    /**
+     * Resolves with the remote result on terminal channel close. Rejects with a
+     * typed {@link SSHTransportError} (from `source/services/ssh-service.ts`) on
+     * pre-dispatch failure (`'not_connected'`, pre-aborted `'aborted'`), exec
+     * dispatch failure (`'exec_failed'`), transport drop while in flight
+     * (`'connection_error'`, `'connection_end'`, `'connection_close'`,
+     * `'channel_error'`), explicit disconnect (`'explicit_disconnect'`),
+     * mid-flight abort (`'aborted'`), or elapsed `timeoutMs` (`'timeout'`).
+     * Transport-level settlement never claims a safe blind replay: the error
+     * carries `remoteEffect: 'unknown'` when the remote process may have run.
+     */
+    executeCommand(cmd: string, opts?: SSHCommandOptions): Promise<SSHCommandResult>;
     readFile(path: string): Promise<string>;
     writeFile(path: string, content: string): Promise<void>;
     mkdir(path: string, opts?: {

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

@@ -0,0 +1,44 @@
+import type { BackgroundCheckInDueEvent } from '../conversation/conversation-events.js';
+import type { BackgroundTask } from '../subagents/subagent-notification-store.js';
+/** Current values of `agent.backgroundCheckIn.*`, read fresh on every tick. */
+export interface BackgroundCheckInSettings {
+    enabled: boolean;
+    intervalMs: number;
+    maxCheckInsPerTask: number;
+}
+export interface BackgroundCheckInSchedulerDeps {
+    /** Snapshot of currently tracked background tasks, unified across executors. */
+    getRunningTasks: () => readonly BackgroundTask[];
+    /** Deliver a due check-in through the same pipeline as any other background event. */
+    emit: (event: BackgroundCheckInDueEvent) => void;
+    getSettings: () => BackgroundCheckInSettings;
+    now?: () => number;
+    setInterval?: (callback: () => void, delay: number) => ReturnType<typeof setInterval>;
+    clearInterval?: (timer: ReturnType<typeof setInterval>) => void;
+    /**
+     * Poll granularity, independent of the configurable per-task `intervalMs`.
+     * Coarser than the default 5-minute interval so a runtime change to
+     * `intervalMs` takes effect without restarting a timer.
+     */
+    tickMs?: number;
+}
+/**
+ * Periodically checks whether any still-running background task (shell job or
+ * async subagent) is due a proactive check-in, and emits one `background_
+ * check_in_due` event per due task through the existing settlement-
+ * notification pipeline (see docs/plans/background-work-control/agent-checkin.md).
+ *
+ * Owns no execution state of its own — `getRunningTasks` reads the unified
+ * task snapshot the notification store already maintains. Per-task due time
+ * and check-in count live only here, keyed by `${kind}:${id}`, and are
+ * dropped the moment a task leaves the running snapshot (settled or evicted),
+ * so a reused id after a task's lifecycle epoch bumps starts a fresh count.
+ */
+export declare class BackgroundCheckInScheduler {
+    #private;
+    constructor(deps: BackgroundCheckInSchedulerDeps);
+    /** Exposed for tests; production callers rely on the internal timer. */
+    tick(): void;
+    dispose(): void;
+}
+//# sourceMappingURL=background-check-in-scheduler.d.ts.map

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

@@ -0,0 +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"}

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

@@ -0,0 +1,88 @@
+const DEFAULT_TICK_MS = 30_000;
+function checkInKey(target) {
+    return `${target.kind}:${target.id}`;
+}
+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,
+        };
+}
+/**
+ * Periodically checks whether any still-running background task (shell job or
+ * async subagent) is due a proactive check-in, and emits one `background_
+ * check_in_due` event per due task through the existing settlement-
+ * notification pipeline (see docs/plans/background-work-control/agent-checkin.md).
+ *
+ * Owns no execution state of its own — `getRunningTasks` reads the unified
+ * task snapshot the notification store already maintains. Per-task due time
+ * and check-in count live only here, keyed by `${kind}:${id}`, and are
+ * dropped the moment a task leaves the running snapshot (settled or evicted),
+ * so a reused id after a task's lifecycle epoch bumps starts a fresh count.
+ */
+export class BackgroundCheckInScheduler {
+    #getRunningTasks;
+    #emit;
+    #getSettings;
+    #now;
+    #clearInterval;
+    #timer;
+    #progress = new Map();
+    constructor(deps) {
+        this.#getRunningTasks = deps.getRunningTasks;
+        this.#emit = deps.emit;
+        this.#getSettings = deps.getSettings;
+        this.#now = deps.now ?? (() => Date.now());
+        const setIntervalFn = deps.setInterval ?? setInterval;
+        this.#clearInterval = deps.clearInterval ?? clearInterval;
+        this.#timer = setIntervalFn(() => this.tick(), deps.tickMs ?? DEFAULT_TICK_MS);
+        this.#timer.unref?.();
+    }
+    /** Exposed for tests; production callers rely on the internal timer. */
+    tick() {
+        const settings = this.#getSettings();
+        const runningTasks = this.#getRunningTasks().filter((task) => task.status === 'running');
+        const liveKeys = new Set(runningTasks.map((task) => checkInKey(taskTarget(task))));
+        for (const key of this.#progress.keys()) {
+            if (!liveKeys.has(key))
+                this.#progress.delete(key);
+        }
+        if (!settings.enabled)
+            return;
+        const now = this.#now();
+        for (const task of runningTasks) {
+            const target = taskTarget(task);
+            const key = checkInKey(target);
+            const progress = this.#progress.get(key);
+            const dueAt = (progress?.lastCheckInAt ?? task.startedAt) + settings.intervalMs;
+            if (now < dueAt)
+                continue;
+            const checkInIndex = (progress?.checkInCount ?? 0) + 1;
+            if (checkInIndex > settings.maxCheckInsPerTask)
+                continue;
+            this.#progress.set(key, { lastCheckInAt: now, checkInCount: checkInIndex });
+            this.#emit({
+                type: 'background_check_in_due',
+                target,
+                checkInIndex,
+                elapsedMs: now - task.startedAt,
+                details: taskDetails(task),
+            });
+        }
+    }
+    dispose() {
+        if (this.#timer === undefined)
+            return;
+        this.#clearInterval(this.#timer);
+        this.#timer = undefined;
+    }
+}
+//# sourceMappingURL=background-check-in-scheduler.js.map

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

@@ -0,0 +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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"}

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

@@ -38,6 +38,12 @@ export type BackgroundTaskControlDetails = {
     turnHistory?: SubagentRunStatus['turnHistory'];
     currentText?: string;
     pendingToolCounts?: Record<string, number>;
+    model?: {
+        provider: string;
+        id: string;
+        contextWindow?: number;
+    };
+    latestUsage?: SubagentRunStatus['latestUsage'];
 } | {
     kind: 'shell';
     id: string;

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

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

@@ -1,4 +1,5 @@
 import { BACKGROUND_SHELL_QUIET_AFTER_MS, BACKGROUND_SUBAGENT_QUIET_AFTER_MS, normalizeBackgroundTaskActivity, } from './background-task-liveness.js';
+import { getCatalogModel } from '../../providers/model-catalog/catalog.js';
 export { BACKGROUND_SHELL_QUIET_AFTER_MS, BACKGROUND_SUBAGENT_QUIET_AFTER_MS } from './background-task-liveness.js';
 /**
  * UI-facing control surface for conversation-owned background work.
@@ -52,7 +53,13 @@ export class BackgroundTaskControl {
             const details = {
                 ...before,
                 status: 'cancelling',
-                activity: { ...before.activity, state: 'cancelling', lastActivityAt: this.#now() },
+                activity: normalizeBackgroundTaskActivity({
+                    status: 'cancelling',
+                    activityState: 'cancelling',
+                    lastObservation: { kind: 'stop_requested', at: this.#now() },
+                    now: this.#now(),
+                    quietAfterMs: target.kind === 'subagent' ? BACKGROUND_SUBAGENT_QUIET_AFTER_MS : BACKGROUND_SHELL_QUIET_AFTER_MS,
+                }),
             };
             this.#notifyStop(target, details);
             return { ok: true, details };
@@ -65,7 +72,13 @@ export class BackgroundTaskControl {
         const details = {
             ...before,
             status: 'cancelling',
-            activity: { ...before.activity, state: 'cancelling', lastActivityAt: this.#now() },
+            activity: normalizeBackgroundTaskActivity({
+                status: 'cancelling',
+                activityState: 'cancelling',
+                lastObservation: { kind: 'stop_requested', at: this.#now() },
+                now: this.#now(),
+                quietAfterMs: BACKGROUND_SHELL_QUIET_AFTER_MS,
+            }),
         };
         this.#notifyStop(target, details);
         return { ok: true, details };
@@ -166,7 +179,7 @@ export class BackgroundTaskControl {
     #subagentDetails(status) {
         if (status.status === 'not_found')
             return null;
-        const { runId, activityState, waitingReason, lastActivityAt, ...details } = status;
+        const { runId, activityState, waitingReason, lastActivityAt, lastObservation, model, ...details } = status;
         return {
             kind: 'subagent',
             id: runId,
@@ -180,14 +193,26 @@ export class BackgroundTaskControl {
                     : status.status === 'waiting_for_answer'
                         ? 'answer'
                         : waitingReason,
-                lastActivityAt: lastActivityAt ?? status.startedAt,
+                ...(lastObservation === undefined
+                    ? { lastActivityAt: lastActivityAt ?? status.startedAt }
+                    : { lastObservation }),
                 now: this.#now(),
                 quietAfterMs: BACKGROUND_SUBAGENT_QUIET_AFTER_MS,
             }),
+            ...(model === undefined
+                ? {}
+                : {
+                    model: {
+                        ...model,
+                        ...(getCatalogModel(model.provider, model.id)?.contextWindow === undefined
+                            ? {}
+                            : { contextWindow: getCatalogModel(model.provider, model.id)?.contextWindow }),
+                    },
+                }),
         };
     }
     #shellDetails(job) {
-        const { id, result, lastActivityAt, ...details } = job;
+        const { id, result, lastActivityAt, lastObservation, ...details } = job;
         const output = result && typeof result === 'object' && 'output' in result && typeof result.output === 'string'
             ? result.output
             : undefined;
@@ -197,7 +222,7 @@ export class BackgroundTaskControl {
             ...details,
             activity: normalizeBackgroundTaskActivity({
                 status: job.status,
-                lastActivityAt: lastActivityAt ?? job.startedAt,
+                ...(lastObservation === undefined ? { lastActivityAt: lastActivityAt ?? job.startedAt } : { lastObservation }),
                 now: this.#now(),
                 quietAfterMs: BACKGROUND_SHELL_QUIET_AFTER_MS,
             }),
@@ -212,6 +237,9 @@ function isDefined(value) {
     return value !== null;
 }
 function isTerminal(details) {
-    return details.status !== 'running' && details.status !== 'waiting_for_answer' && details.status !== 'cancelling';
+    return (details.status !== 'running' &&
+        details.status !== 'awaiting_approval' &&
+        details.status !== 'waiting_for_answer' &&
+        details.status !== 'cancelling');
 }
 //# sourceMappingURL=background-task-control.js.map