@qduc/term2 0.11.1 → 0.12.0

package/dist/services/conversation/run-item-normalizer.js

@@ -0,0 +1,245 @@
+const clone = (value) => {
+    try {
+        return structuredClone(value);
+    }
+    catch {
+        return JSON.parse(JSON.stringify(value));
+    }
+};
+const asRecord = (value) => value && typeof value === 'object' && !Array.isArray(value) ? value : null;
+const rawItem = (value) => {
+    const record = asRecord(value);
+    return record ? asRecord(record.rawItem) ?? record : null;
+};
+const getString = (value) => (typeof value === 'string' && value ? value : undefined);
+const cloneRecord = (value) => {
+    const record = asRecord(value);
+    return record ? clone(record) : undefined;
+};
+const extractTextParts = (content) => {
+    if (typeof content === 'string')
+        return content;
+    if (!Array.isArray(content))
+        return '';
+    return content
+        .filter((part) => {
+        const record = asRecord(part);
+        const type = getString(record?.type);
+        return (type === 'output_text' || type === 'text') && typeof record?.text === 'string';
+    })
+        .map((part) => String(part.text))
+        .join('');
+};
+const extractReasoningParts = (content) => {
+    if (!Array.isArray(content))
+        return '';
+    return content
+        .filter((part) => {
+        const record = asRecord(part);
+        const type = getString(record?.type);
+        return (type === 'reasoning_text' || type === 'reasoning') && typeof record?.text === 'string';
+    })
+        .map((part) => String(part.text))
+        .join('');
+};
+const getProviderMetadata = (item) => {
+    const raw = rawItem(item);
+    const providerData = cloneRecord(raw?.providerData) ?? cloneRecord(raw?.provider_data) ?? cloneRecord(asRecord(item)?.providerData);
+    const reasoning = getString(raw?.reasoning) ?? getString(asRecord(item)?.reasoning);
+    const reasoningContent = getString(raw?.reasoning_content) ??
+        getString(asRecord(item)?.reasoning_content) ??
+        getString(providerData?.reasoning_content);
+    const reasoningDetails = raw?.reasoning_details ?? asRecord(item)?.reasoning_details ?? providerData?.reasoning_details;
+    const metadata = providerData ? clone(providerData) : {};
+    if (reasoning)
+        metadata.reasoning = reasoning;
+    if (reasoningContent)
+        metadata.reasoning_content = reasoningContent;
+    if (reasoningDetails != null)
+        metadata.reasoning_details = clone(reasoningDetails);
+    return Object.keys(metadata).length > 0 ? metadata : undefined;
+};
+const getReasoningText = (item) => {
+    const raw = rawItem(item);
+    if (!raw)
+        return '';
+    const direct = getString(raw.text) ??
+        getString(raw.delta) ??
+        getString(raw.summary) ??
+        getString(raw.reasoning_content) ??
+        getString(asRecord(item)?.reasoning_content);
+    if (direct)
+        return direct;
+    const fromMetadata = getString(getProviderMetadata(item)?.reasoning_content);
+    if (fromMetadata)
+        return fromMetadata;
+    return (extractReasoningParts(raw.rawContent) ||
+        extractReasoningParts(asRecord(item)?.rawContent) ||
+        extractReasoningParts(raw.content) ||
+        extractTextParts(raw.content));
+};
+const getProviderItemId = (item) => {
+    const raw = rawItem(item);
+    return getString(raw?.id) ?? getString(asRecord(item)?.id);
+};
+const makeReasoningItem = (item) => {
+    const text = getReasoningText(item);
+    const providerMetadata = getProviderMetadata(item);
+    const providerItemId = getProviderItemId(item);
+    const raw = rawItem(item);
+    const sequence = typeof raw?.index === 'number' ? raw.index : undefined;
+    if (!text && !providerMetadata)
+        return null;
+    return {
+        type: 'reasoning',
+        text,
+        ...(providerMetadata ? { providerMetadata } : {}),
+        ...(providerItemId ? { providerItemId } : {}),
+        ...(sequence !== undefined ? { sequence } : {}),
+    };
+};
+const pushAssistantMessageItems = (target, item) => {
+    const text = extractTextParts(rawItem(item)?.content);
+    const providerMetadata = getProviderMetadata(item);
+    const providerItemId = getProviderItemId(item);
+    const reasoningText = getString(providerMetadata?.reasoning_content);
+    if (reasoningText)
+        target.push({ type: 'reasoning', text: reasoningText, ...(providerMetadata ? { providerMetadata } : {}) });
+    if (!text)
+        return;
+    const assistantTextItem = {
+        type: 'assistant_text',
+        text,
+        ...(providerMetadata ? { providerMetadata } : {}),
+        ...(providerItemId ? { providerItemId } : {}),
+    };
+    target.push(assistantTextItem);
+};
+const getCallId = (raw, item) => {
+    const outer = asRecord(item);
+    return (getString(outer?.callId) ??
+        getString(outer?.call_id) ??
+        getString(outer?.tool_call_id) ??
+        getString(outer?.toolCallId) ??
+        getString(outer?.id) ??
+        getString(raw.callId) ??
+        getString(raw.call_id) ??
+        getString(raw.tool_call_id) ??
+        getString(raw.toolCallId) ??
+        getString(raw.id) ??
+        'unknown-call');
+};
+const toolResultItemTypes = new Set([
+    'function_call_result',
+    'function_call_output',
+    'function_call_output_result',
+    'tool_call_output_item',
+    'tool_result',
+    'shell_call_output',
+    'tool_call_output',
+    'tool_call_result',
+    'local_shell_call_output',
+    'computer_call_output',
+    'computer_call_result',
+    'apply_patch_call_output',
+]);
+const pushToolCallItem = (target, item) => {
+    const raw = rawItem(item);
+    if (!raw)
+        return;
+    const providerMetadata = getProviderMetadata(item);
+    const reasoningText = getString(providerMetadata?.reasoning_content);
+    if (reasoningText)
+        target.push({ type: 'reasoning', text: reasoningText, ...(providerMetadata ? { providerMetadata } : {}) });
+    const toolCallItem = {
+        type: 'tool_call',
+        callId: getCallId(raw, item),
+        toolName: getString(raw.name) ?? getString(asRecord(item)?.name) ?? 'unknown',
+        arguments: raw.arguments ??
+            raw.args ??
+            raw.operation ??
+            asRecord(item)?.arguments ??
+            asRecord(item)?.args ??
+            asRecord(item)?.operation,
+        providerItem: clone(raw),
+    };
+    target.push(toolCallItem);
+};
+const pushToolResultItem = (target, item) => {
+    const raw = rawItem(item);
+    if (!raw)
+        return;
+    const outer = asRecord(item);
+    const providerItem = {
+        ...raw,
+        ...(getString(raw.id) || !getString(outer?.id) ? {} : { id: outer?.id }),
+    };
+    const toolResultItem = {
+        type: 'tool_result',
+        callId: getCallId(raw, item),
+        toolName: getString(raw.name) ??
+            getString(asRecord(item)?.name) ??
+            (raw.type === 'apply_patch_call_output' ? 'apply_patch' : 'unknown'),
+        status: typeof raw.is_error === 'boolean' && raw.is_error ? 'failed' : 'completed',
+        output: raw.output ?? asRecord(item)?.output,
+        providerItem: clone(providerItem),
+    };
+    target.push(toolResultItem);
+};
+const isCanonicalItem = (item) => {
+    const record = asRecord(item);
+    return ((record?.type === 'tool_call' && typeof record.callId === 'string' && typeof record.toolName === 'string') ||
+        (record?.type === 'tool_result' && typeof record.callId === 'string' && typeof record.toolName === 'string'));
+};
+/**
+ * Recognizes both the raw `StreamedModelTurnOutput` `provider_opaque` shape
+ * (`{ type: 'provider_opaque', provider, item }`, produced by e.g.
+ * `openai-responses-model.ts`'s `toTurnOutput`) and the identically-shaped
+ * already-persisted `ProviderOpaqueItem`, so re-normalizing an already
+ * canonical opaque item is idempotent. The payload is stored and cloned
+ * verbatim — no per-provider-item-variant schema.
+ */
+const asProviderOpaqueItem = (value) => {
+    const record = asRecord(value);
+    if (!record || record.type !== 'provider_opaque')
+        return null;
+    const provider = getString(record.provider);
+    const payload = asRecord(record.item);
+    if (!provider || !payload)
+        return null;
+    return { type: 'provider_opaque', provider, item: clone(payload) };
+};
+/** Converts raw provider run items to serializable domain items at the conversation boundary. */
+export function normalizeRunItem(item) {
+    if (isCanonicalItem(item))
+        return [item];
+    const providerOpaque = asProviderOpaqueItem(item);
+    if (providerOpaque)
+        return [providerOpaque];
+    const raw = rawItem(item);
+    if (!raw)
+        return [];
+    if (isCanonicalItem(raw))
+        return [raw];
+    const outer = asRecord(item);
+    const role = getString(raw.role) ?? getString(outer?.role);
+    const type = getString(raw.type) ?? getString(outer?.type) ?? '';
+    if (type === 'reasoning') {
+        const reasoning = makeReasoningItem(item);
+        return reasoning ? [reasoning] : [];
+    }
+    const normalized = [];
+    if (role === 'assistant' && type === 'message')
+        pushAssistantMessageItems(normalized, item);
+    else if (type === 'function_call' || type === 'apply_patch_call')
+        pushToolCallItem(normalized, item);
+    else if (toolResultItemTypes.has(type))
+        pushToolResultItem(normalized, item);
+    return normalized;
+}
+export function normalizeRunItems(items) {
+    if (!Array.isArray(items))
+        return [];
+    return items.flatMap(normalizeRunItem);
+}
+//# sourceMappingURL=run-item-normalizer.js.map

package/dist/services/conversation/run-item-normalizer.js.map

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

package/dist/services/conversation/user-turn-item.d.ts

@@ -0,0 +1,14 @@
+import type { ProviderInputItem } from '../../contracts/provider-input.js';
+import { type UserTurn } from '../../types/user-turn.js';
+/**
+ * The provider representation of one user turn.
+ *
+ * Text-only turns keep the plain string content that providers accept
+ * everywhere; a turn carrying images becomes a content-part list. This is the
+ * single shape for user input, whether the turn opens a conversation, resumes
+ * one, or is steered into a turn already running.
+ */
+export declare function userTurnToProviderItem(input: string | UserTurn, { steering }?: {
+    steering?: boolean;
+}): ProviderInputItem;
+//# sourceMappingURL=user-turn-item.d.ts.map

package/dist/services/conversation/user-turn-item.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"user-turn-item.d.ts","sourceRoot":"","sources":["../../../source/services/conversation/user-turn-item.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AAC3E,OAAO,EAAqB,KAAK,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAG5E;;;;;;;GAOG;AACH,wBAAgB,sBAAsB,CACpC,KAAK,EAAE,MAAM,GAAG,QAAQ,EACxB,EAAE,QAAgB,EAAE,GAAE;IAAE,QAAQ,CAAC,EAAE,OAAO,CAAA;CAAO,GAChD,iBAAiB,CAiBnB"}

package/dist/services/conversation/user-turn-item.js

@@ -0,0 +1,27 @@
+import { normalizeUserTurn } from '../../types/user-turn.js';
+import { withSteeringNotice } from '../../prompts/steering-notice.js';
+/**
+ * The provider representation of one user turn.
+ *
+ * Text-only turns keep the plain string content that providers accept
+ * everywhere; a turn carrying images becomes a content-part list. This is the
+ * single shape for user input, whether the turn opens a conversation, resumes
+ * one, or is steered into a turn already running.
+ */
+export function userTurnToProviderItem(input, { steering = false } = {}) {
+    const turn = normalizeUserTurn(input);
+    const images = turn.images ?? [];
+    const rawText = turn.text ?? '';
+    const text = steering ? withSteeringNotice(rawText) : rawText;
+    if (images.length === 0) {
+        return { role: 'user', type: 'message', content: text };
+    }
+    const content = [];
+    if (text)
+        content.push({ type: 'input_text', text });
+    for (const image of images) {
+        content.push({ type: 'input_image', image: `data:${image.mimeType};base64,${image.data}`, detail: 'auto' });
+    }
+    return { role: 'user', type: 'message', content };
+}
+//# sourceMappingURL=user-turn-item.js.map

package/dist/services/conversation/user-turn-item.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"user-turn-item.js","sourceRoot":"","sources":["../../../source/services/conversation/user-turn-item.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAiB,MAAM,0BAA0B,CAAC;AAC5E,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AAEtE;;;;;;;GAOG;AACH,MAAM,UAAU,sBAAsB,CACpC,KAAwB,EACxB,EAAE,QAAQ,GAAG,KAAK,EAAE,GAA2B,EAAE;IAEjD,MAAM,IAAI,GAAG,iBAAiB,CAAC,KAAK,CAAC,CAAC;IACtC,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,IAAI,EAAE,CAAC;IACjC,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC;IAChC,MAAM,IAAI,GAAG,QAAQ,CAAC,CAAC,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;IAE9D,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACxB,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IAC1D,CAAC;IAED,MAAM,OAAO,GAAc,EAAE,CAAC;IAC9B,IAAI,IAAI;QAAE,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC,CAAC;IACrD,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QAC3B,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,aAAa,EAAE,KAAK,EAAE,QAAQ,KAAK,CAAC,QAAQ,WAAW,KAAK,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IAC9G,CAAC;IAED,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAuB,CAAC;AACzE,CAAC"}

package/dist/services/conversation-agent-client.d.ts

@@ -1,18 +1,38 @@
-import type { AgentInputItem, RunState } from '@openai/agents';
-import type { JsonSchemaDefinition } from '@openai/agents';
-import type { ModelSettingsReasoningEffort } from '@openai/agents-core/model';
+import type { ProviderInput, ProviderInputItem } from '../contracts/provider-input.js';
+import type { JsonSchemaDefinition } from '../contracts/model-types.js';
+import type { ContinuationHandle } from '../contracts/continuation-handle.js';
 import type { ReasoningEffortSetting } from '../contracts/conversation.js';
 import type { ConversationEvent } from './conversation/conversation-events.js';
 import type { AgentStream } from './agent-stream.js';
+import type { ProviderHistorySnapshot } from './conversation/conversation-store.js';
+import type { SteerOutcome } from './agent-runtime/application-run-loop.js';
+import type { SubagentCancelAcknowledgement, SubagentRunStatus } from './subagents/types.js';
+import type { BackgroundShellJob } from './shell/background-shell-registry.js';
+import type { ForegroundShellLeaseDetails, ForegroundShellTransferResult } from './shell/background-shell-registry.js';
+import type { BackgroundSubagentApprovalPauseSink } from './subagents/foreground-subagent-lease.js';
+import type { ForegroundSubagentCandidate } from './subagents/nested-runner.js';
+import type { NestedToolCompatibilityState } from './session/nested-tool-compatibility-state.js';
 export type AgentClientRunOptions = {
     previousResponseId?: string | null;
     sessionId?: string;
     toolResultCallIds?: readonly string[];
+    knownToolCallIds?: readonly string[];
+    /** Immutable, out-of-band authoritative history for provider compatibility seams. */
+    providerHistorySnapshot?: ProviderHistorySnapshot;
+    /** Provider continuity epoch frozen while this request is planned. */
+    providerContinuityLineage?: number;
+    /** Internal public-hook correlation for the logical foreground turn. */
+    hookTurnId?: string;
+    /**
+     * End the continuation once the approved tool's result is recorded, without
+     * a further model call. See `ApplicationRunLoopOptions.stopAfterApprovalResolution`.
+     */
+    stopAfterApprovalResolution?: boolean;
 };
 export type AgentClientChatOptions = {
     model?: string;
     provider?: string;
-    reasoningEffort?: ModelSettingsReasoningEffort | 'default';
+    reasoningEffort?: ReasoningEffortSetting | null;
     instructions?: string;
 };
 export type AgentClientChatJsonOptions = AgentClientChatOptions & {
@@ -33,21 +53,72 @@ export interface SubagentEventSinkHost {
      * background (async) subagent activity is still observed while idle.
      */
     setBackgroundSubagentEventSink?(sink: ((event: ConversationEvent) => void) | null): void;
+    /** Conversation-scoped lifecycle sink for root background shell jobs. */
+    setBackgroundShellEventSink?(sink: ((event: ConversationEvent) => void) | null): void;
+    /** Session-owned queue/control sink for adopted subagent approval pauses. */
+    setBackgroundSubagentApprovalPauseSink?(sink: BackgroundSubagentApprovalPauseSink | null): void;
     /** Optional hook to cancel live async subagent runs when the parent turn ends. */
     cancelSubagentRuns?(): void;
 }
 export interface ConversationAgentClient extends ShellAutoApprovalAgentClient {
-    startStream(userInput: string | AgentInputItem | AgentInputItem[], options?: AgentClientRunOptions): Promise<AgentStream>;
-    continueRunStream(state: RunState<any, any>, options?: AgentClientRunOptions): Promise<AgentStream>;
+    startStream(userInput: ProviderInput, options?: AgentClientRunOptions): Promise<AgentStream>;
+    continueRunStream(state: ContinuationHandle, options?: AgentClientRunOptions): Promise<AgentStream>;
     abort(): void;
+    /**
+     * Mark where a turn begins and ends. Without them the client sees only
+     * streams, and a turn's first stream is indistinguishable from a retry of its
+     * last — so a steer cannot survive the gaps between them.
+     */
+    openTurn?(): void;
+    closeTurn?(): void;
+    /** Admit a user message into the running turn at its next request boundary. */
+    steer?(items: readonly ProviderInputItem[], options?: {
+        id?: string;
+    }): Promise<SteerOutcome>;
+    /** Drop a still-waiting steer. False when it was already admitted. */
+    retractSteer?(id: string): boolean;
+    /** Replace a waiting steer's items in place, keeping its position. */
+    editSteer?(id: string, items: readonly ProviderInputItem[]): boolean;
     setModel(model: string): void;
     addToolInterceptor(interceptor: ToolInterceptor): () => void;
+    /** Conversation-scoped lifecycle sink for root background shell jobs. */
+    setBackgroundShellEventSink?(sink: ((event: ConversationEvent) => void) | null): void;
     /**
      * Cancel conversation-bound background (async) subagent runs. Only an
      * explicit user interrupt, conversation disposal, or shutdown may call this;
      * ordinary turn aborts must not.
      */
     cancelBackgroundRuns?(): void;
+    /** Cancel root shell jobs without ending the conversation session. */
+    cancelBackgroundShellJobs?(): void;
+    /** Cancel and settle root shell jobs during session shutdown. */
+    disposeBackgroundShellJobs?(): Promise<void>;
+    /** Narrow background-task controls; registries remain owned by the root client. */
+    getBackgroundSubagentStatus?(runId: string): SubagentRunStatus;
+    listBackgroundSubagentStatuses?(): SubagentRunStatus[];
+    requestBackgroundSubagentStop?(runId: string): SubagentCancelAcknowledgement;
+    /** Foreground candidates that may be transferred without restarting. */
+    listForegroundSubagentCandidates?(): ForegroundSubagentCandidate[];
+    getForegroundSubagentCandidate?(runId: string): ForegroundSubagentCandidate | undefined;
+    /** Atomically adopts one foreground child into the background registry. */
+    moveForegroundSubagent?(runId: string): {
+        runId: string;
+        role: string;
+        name?: string;
+        status: 'running';
+        task: string;
+    } | undefined;
+    /** Exact compatibility state shared with nested execution. */
+    getNestedToolCompatibilityState?(): NestedToolCompatibilityState | undefined;
+    /** Cancel and await adopted leases before detaching background sinks. */
+    disposeBackgroundSubagents?(): Promise<void>;
+    getBackgroundShellJob?(jobId: string): BackgroundShellJob<unknown> | undefined;
+    listBackgroundShellJobs?(): BackgroundShellJob<unknown>[];
+    requestBackgroundShellStop?(jobId: string): boolean;
+    /** The currently running root shell call that can be detached from its turn. */
+    getForegroundShellTransferCandidate?(): ForegroundShellLeaseDetails | undefined;
+    /** Atomically adopts a root shell call into the session background registry. */
+    moveForegroundShellToBackground?(callId: string): ForegroundShellTransferResult | undefined;
     clearConversations?(): void;
     getProvider?(): string;
     supportsConversationChaining?(): boolean;

package/dist/services/conversation-agent-client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"conversation-agent-client.d.ts","sourceRoot":"","sources":["../../source/services/conversation-agent-client.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"conversation-agent-client.d.ts","sourceRoot":"","sources":["../../source/services/conversation-agent-client.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AACvF,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACxE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qCAAqC,CAAC;AAC9E,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AAC3E,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AAC/E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,sCAAsC,CAAC;AACpF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AAC5E,OAAO,KAAK,EAAE,6BAA6B,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAC7F,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,sCAAsC,CAAC;AAC/E,OAAO,KAAK,EAAE,2BAA2B,EAAE,6BAA6B,EAAE,MAAM,sCAAsC,CAAC;AACvH,OAAO,KAAK,EAAE,mCAAmC,EAAE,MAAM,0CAA0C,CAAC;AACpG,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,8BAA8B,CAAC;AAChF,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,8CAA8C,CAAC;AAEjG,MAAM,MAAM,qBAAqB,GAAG;IAClC,kBAAkB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,iBAAiB,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IACtC,gBAAgB,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IACrC,qFAAqF;IACrF,uBAAuB,CAAC,EAAE,uBAAuB,CAAC;IAClD,sEAAsE;IACtE,yBAAyB,CAAC,EAAE,MAAM,CAAC;IACnC,wEAAwE;IACxE,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB;;;OAGG;IACH,2BAA2B,CAAC,EAAE,OAAO,CAAC;CACvC,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG;IACnC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,eAAe,CAAC,EAAE,sBAAsB,GAAG,IAAI,CAAC;IAChD,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,0BAA0B,GAAG,sBAAsB,GAAG;IAChE,UAAU,EAAE,oBAAoB,CAAC;CAClC,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;AAE7G,MAAM,WAAW,4BAA4B;IAC3C,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,sBAAsB,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IACzE,QAAQ,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,0BAA0B,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;CACnF;AAED,MAAM,WAAW,iBAAiB;IAChC,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;CACxD;AAED,MAAM,WAAW,qBAAqB;IACpC,oBAAoB,CAAC,IAAI,EAAE,CAAC,CAAC,KAAK,EAAE,iBAAiB,KAAK,IAAI,CAAC,GAAG,IAAI,GAAG,IAAI,CAAC;IAC9E;;;OAGG;IACH,8BAA8B,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,KAAK,EAAE,iBAAiB,KAAK,IAAI,CAAC,GAAG,IAAI,GAAG,IAAI,CAAC;IACzF,yEAAyE;IACzE,2BAA2B,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,KAAK,EAAE,iBAAiB,KAAK,IAAI,CAAC,GAAG,IAAI,GAAG,IAAI,CAAC;IACtF,6EAA6E;IAC7E,sCAAsC,CAAC,CAAC,IAAI,EAAE,mCAAmC,GAAG,IAAI,GAAG,IAAI,CAAC;IAChG,kFAAkF;IAClF,kBAAkB,CAAC,IAAI,IAAI,CAAC;CAC7B;AAED,MAAM,WAAW,uBAAwB,SAAQ,4BAA4B;IAC3E,WAAW,CAAC,SAAS,EAAE,aAAa,EAAE,OAAO,CAAC,EAAE,qBAAqB,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;IAC7F,iBAAiB,CAAC,KAAK,EAAE,kBAAkB,EAAE,OAAO,CAAC,EAAE,qBAAqB,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;IACpG,KAAK,IAAI,IAAI,CAAC;IACd;;;;OAIG;IACH,QAAQ,CAAC,IAAI,IAAI,CAAC;IAClB,SAAS,CAAC,IAAI,IAAI,CAAC;IACnB,+EAA+E;IAC/E,KAAK,CAAC,CAAC,KAAK,EAAE,SAAS,iBAAiB,EAAE,EAAE,OAAO,CAAC,EAAE;QAAE,EAAE,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;IAC9F,sEAAsE;IACtE,YAAY,CAAC,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC;IACnC,sEAAsE;IACtE,SAAS,CAAC,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,iBAAiB,EAAE,GAAG,OAAO,CAAC;IACrE,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,kBAAkB,CAAC,WAAW,EAAE,eAAe,GAAG,MAAM,IAAI,CAAC;IAC7D,yEAAyE;IACzE,2BAA2B,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,KAAK,EAAE,iBAAiB,KAAK,IAAI,CAAC,GAAG,IAAI,GAAG,IAAI,CAAC;IAEtF;;;;OAIG;IACH,oBAAoB,CAAC,IAAI,IAAI,CAAC;IAC9B,sEAAsE;IACtE,yBAAyB,CAAC,IAAI,IAAI,CAAC;IACnC,iEAAiE;IACjE,0BAA0B,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAE7C,mFAAmF;IACnF,2BAA2B,CAAC,CAAC,KAAK,EAAE,MAAM,GAAG,iBAAiB,CAAC;IAC/D,8BAA8B,CAAC,IAAI,iBAAiB,EAAE,CAAC;IACvD,6BAA6B,CAAC,CAAC,KAAK,EAAE,MAAM,GAAG,6BAA6B,CAAC;IAC7E,wEAAwE;IACxE,gCAAgC,CAAC,IAAI,2BAA2B,EAAE,CAAC;IACnE,8BAA8B,CAAC,CAAC,KAAK,EAAE,MAAM,GAAG,2BAA2B,GAAG,SAAS,CAAC;IACxF,2EAA2E;IAC3E,sBAAsB,CAAC,CACrB,KAAK,EAAE,MAAM,GACZ;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,SAAS,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,GAAG,SAAS,CAAC;IAC/F,8DAA8D;IAC9D,+BAA+B,CAAC,IAAI,4BAA4B,GAAG,SAAS,CAAC;IAC7E,yEAAyE;IACzE,0BAA0B,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7C,qBAAqB,CAAC,CAAC,KAAK,EAAE,MAAM,GAAG,kBAAkB,CAAC,OAAO,CAAC,GAAG,SAAS,CAAC;IAC/E,uBAAuB,CAAC,IAAI,kBAAkB,CAAC,OAAO,CAAC,EAAE,CAAC;IAC1D,0BAA0B,CAAC,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC;IACpD,gFAAgF;IAChF,mCAAmC,CAAC,IAAI,2BAA2B,GAAG,SAAS,CAAC;IAChF,gFAAgF;IAChF,+BAA+B,CAAC,CAAC,MAAM,EAAE,MAAM,GAAG,6BAA6B,GAAG,SAAS,CAAC;IAE5F,kBAAkB,CAAC,IAAI,IAAI,CAAC;IAC5B,WAAW,CAAC,IAAI,MAAM,CAAC;IACvB,4BAA4B,CAAC,IAAI,OAAO,CAAC;IACzC,WAAW,CAAC,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACrC,kBAAkB,CAAC,CAAC,MAAM,CAAC,EAAE,sBAAsB,GAAG,IAAI,CAAC;IAC3D,gBAAgB,CAAC,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,IAAI,CAAC;IAC9C,cAAc,CAAC,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC7C"}

package/dist/services/cost/model-cost.d.ts

@@ -0,0 +1,147 @@
+/**
+ * Provider-neutral model-request cost accounting.
+ *
+ * Owns pricing arithmetic, coverage rules, formatting, and accumulation for
+ * the session-cost feature. This module is pure and deterministic: it has no
+ * settings/provider imports, never performs network access, and returns typed
+ * unpriced results rather than throwing or guessing for unsupported inputs.
+ *
+ * Costs are accumulated and persisted as integer USD micros (1/1_000_000 of a
+ * USD). Provider decimal charges are converted without binary floating-point
+ * arithmetic; each model request is rounded exactly once, then integers are
+ * added.
+ */
+import type { NormalizedUsage } from '../../utils/ai/token-usage.js';
+/** Where a request's USD charge came from. */
+export type CostSource = 'provider' | 'catalog';
+/** Billing service tier of a model request. */
+export type ServiceTier = 'standard' | 'flex' | 'batch' | 'unknown';
+/** Why a dispatched request has no priceable amount. */
+export type UnpricedReason = 'missing_usage' | 'unknown_provider' | 'unknown_model' | 'unknown_tier' | 'ambiguous_usage';
+/** Outcome of a dispatched model request. */
+export type CostOutcome = 'completed' | 'failed' | 'cancelled';
+/** One cost record per dispatched model request. */
+export interface ModelRequestCost {
+    /** Stable run-local request id; guards against duplicate accounting. */
+    requestId: string;
+    provider: string;
+    model: string;
+    serviceTier: ServiceTier;
+    outcome: CostOutcome;
+    /** Normalized usage when the provider reported any. */
+    usage?: NormalizedUsage;
+    /** Integer USD micros when the request is priced. */
+    usdMicros?: number;
+    source?: CostSource;
+    /** Catalog provenance when priced from the vendored catalog. */
+    pricingVersion?: string;
+    unpricedReason?: UnpricedReason;
+}
+/** Immutable coverage summary for the session. */
+export interface SessionCostSummary {
+    /** Sum of priced request charges in integer USD micros. */
+    knownUsdMicros: number;
+    pricedRequests: number;
+    unpricedRequests: number;
+    state: 'exact' | 'estimated' | 'partial' | 'unavailable';
+}
+/** Non-overlapping per-million-token rates in USD. */
+export interface CatalogPrice {
+    inputPerMTok: number;
+    outputPerMTok: number;
+    /** Uncached-input rate when the provider distinguishes cache reads. */
+    cacheReadPerMTok?: number;
+    /** Cache-write/creation rate when the provider charges cache creation separately. */
+    cacheWritePerMTok?: number;
+}
+/**
+ * Result of a provider-scoped pricing lookup. The cost module consumes the
+ * typed failure so it can report why a request is unpriced.
+ */
+export type PricingLookupResult = {
+    found: true;
+    price: CatalogPrice;
+} | {
+    found: false;
+    reason: Extract<UnpricedReason, 'unknown_provider' | 'unknown_model' | 'unknown_tier'>;
+};
+export interface ModelCostInput {
+    requestId: string;
+    provider: string;
+    model: string;
+    serviceTier: ServiceTier;
+    outcome: CostOutcome;
+    usage?: NormalizedUsage;
+    /** Provider-reported charge in integer USD micros (wins over a decimal). */
+    providerUsdMicros?: number;
+    /** Provider-reported charge as a decimal USD number/string. */
+    providerUsd?: number | string;
+    /** Provider-scoped pricing lookup; returns a typed miss for unknown targets. */
+    getPrice: (provider: string, model: string, tier: ServiceTier) => PricingLookupResult;
+    /** Catalog provenance for catalog-priced requests. */
+    pricingVersion?: string;
+}
+/**
+ * Convert a decimal USD charge into integer micros without binary
+ * floating-point arithmetic. Decimal strings are parsed exactly (BigInt);
+ * numeric inputs are first rendered as a plain decimal string, which is exact
+ * for the finite decimal range providers and tests use.
+ */
+export declare function parseUsdMicros(value: number | string | undefined): number | undefined;
+/** Billable token dimensions after normalizing a provider usage record. */
+export interface BillableTokens {
+    uncachedInputTokens: number;
+    cachedInputTokens: number;
+    cacheWriteTokens: number;
+    outputTokens: number;
+}
+export type BillableTokensResult = BillableTokens | 'missing' | 'ambiguous';
+/**
+ * Map normalized usage onto the non-overlapping billing dimensions.
+ *
+ * `prompt_tokens` is the full prompt including cache reads, so cached input is
+ * subtracted from it to derive the uncached share. Cache-creation tokens are
+ * charged from `cache_creation_tokens` only — never inferred from
+ * `total_tokens`. Reasoning tokens are a subset of output tokens and are not
+ * billed a second time.
+ *
+ * Returns `'missing'` when there is no usage and `'ambiguous'` when usage
+ * cannot be fully mapped (e.g. uncached input or output tokens are unknown).
+ */
+export declare function resolveBillableTokens(usage: NormalizedUsage | null | undefined): BillableTokensResult;
+/**
+ * Compute the cost record for one completed model request. Provider-reported
+ * charges win over catalog estimates; unsupported inputs produce typed
+ * unpriced records rather than guesses.
+ */
+export declare function computeModelCost(input: ModelCostInput): ModelRequestCost;
+/** Produce the session coverage summary from the accumulated request records. */
+export declare function summarizeCost(records: readonly ModelRequestCost[]): SessionCostSummary;
+/**
+ * Format integer micros as USD.
+ *
+ * - two decimals at or above one cent (rounded once);
+ * - enough precision below one cent that a positive cost is never `$0.00`;
+ * - a locale-independent `.` separator;
+ * - exactly `$0.00` for zero.
+ */
+export declare function formatUsdMicros(usdMicros: number): string;
+export interface SessionCostAccumulator {
+    /** Add one request record, ignoring duplicate request ids. */
+    addRecord(record: ModelRequestCost): void;
+    /** Add several records, ignoring duplicate request ids. */
+    addRecords(records: readonly ModelRequestCost[]): void;
+    reset(): void;
+    getSummary(): SessionCostSummary;
+}
+/**
+ * Session-scoped cost accumulator. Emits an immutable summary after every
+ * add/reset so the status bar is reactive without reading a mutated object
+ * during an unrelated render. Duplicate delivery of the same request record
+ * (identified by its run-local request id) is ignored so a record is never
+ * double-counted.
+ */
+export declare function createSessionCostAccumulator(options?: {
+    onUpdate?: (summary: SessionCostSummary) => void;
+}): SessionCostAccumulator;
+//# sourceMappingURL=model-cost.d.ts.map

package/dist/services/cost/model-cost.d.ts.map

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