@workerdeck/core 2.9.0 → 2.10.0

package/build/index.d.mts

@@ -1,5 +1,5 @@
 import { McpServerStatus, Options, Query, SDKMessage, SDKSessionInfo, SDKUserMessage, SessionMessage } from "@anthropic-ai/claude-agent-sdk";
-import { ApiMessage, CreateSessionRequest, EngineCapabilities, McpServerConfigWire, McpServerStatusInfo, MessageAttachment, ModelOption, PermissionMode, PermissionRequest, ProfileEngine, ProfileInfo, SdkSessionSummary, SessionEvent, SessionEventBody, SessionInfo, SessionStatus, ToolCallRequestFrame, ToolExecutionBackend, ToolExecutionOutput } from "@workerdeck/protocol";
+import { ApiMessage, ByModel, CostBreakdown, CreateSessionRequest, EngineCapabilities, McpServerConfigWire, McpServerStatusInfo, MessageAttachment, ModelOption, PermissionMode, PermissionRequest, ProfileEngine, ProfileInfo, SdkSessionSummary, SessionEvent, SessionEventBody, SessionInfo, SessionStatus, ToolCallRequestFrame, ToolExecutionBackend, ToolExecutionOutput } from "@workerdeck/protocol";
 import { LanguageModel, LanguageModel as LanguageModel$1, ModelMessage, Tool, Tool as Tool$1, ToolSet, ToolSet as ToolSet$1 } from "ai";
 import { SandboxEngine, SandboxVfs } from "@workerdeck/sandbox";
 import { Readable, Writable } from "node:stream";
@@ -24,6 +24,28 @@ type LocalCommandResult = {
 declare function localCommandTranscript(result: LocalCommandResult): string;
 declare function localCommandContext(pending: readonly string[]): string | undefined;
 //#endregion
+//#region src/lib/cost-ledger.d.ts
+type CostFigures = {
+  byModel?: ByModel;
+  reportedCostUsd?: number;
+};
+type CostLedgerState = CostFigures & {
+  lifetime?: CostFigures;
+};
+declare class CostLedger {
+  #private;
+  carry(state: CostLedgerState | undefined): void;
+  carryUnlessRestored(state: CostLedgerState | undefined): void;
+  observeCumulative(byModel: ByModel | undefined, reportedCostUsd: number | undefined): void;
+  observeDelta(byModel: ByModel): void;
+  rollover(): void;
+  get byModel(): ByModel | undefined;
+  get breakdown(): CostBreakdown;
+  get costUsd(): number | undefined;
+  get reportedCostUsd(): number | undefined;
+  snapshot(): CostLedgerState;
+}
+//#endregion
 //#region src/executors/tool-executor.d.ts
 type ToolExecutionResult = {
   status: 'ok';
@@ -117,6 +139,8 @@ interface Runner {
   settleExecution?(executionId: string, result: ToolExecutionResult): boolean;
   park?(): RunnerSnapshot | undefined;
   snapshot?(): RunnerSnapshot | undefined;
+  carryCost?(state: CostLedgerState): void;
+  costState?(): CostLedgerState;
   fail(message: string): void;
   close(reason?: 'client' | 'server' | 'error'): void;
 }
@@ -162,6 +186,8 @@ declare class SessionRunner implements Runner {
   get pendingApprovals(): PermissionRequest[];
   info(): SessionInfo;
   setTitle(title: string | undefined): void;
+  carryCost(state: CostLedgerState): void;
+  costState(): CostLedgerState;
   start(): Promise<void>;
   sendMessage(text: string, attachments?: readonly AttachmentInput[]): void;
   queueLocalCommand(result: LocalCommandResult): void;
@@ -221,7 +247,7 @@ type PendingToolCall = {
   toolCallId: string;
   toolName: string;
   input: unknown;
-  deferred?: boolean;
+  parkable?: boolean;
   expiresAt?: number;
 };
 type AiSdkSessionState = {
@@ -229,12 +255,6 @@ type AiSdkSessionState = {
   pendingToolCalls: PendingToolCall[];
   dispatched: string[];
   numTurns: number;
-  totalUsage: {
-    input: number;
-    output: number;
-    cacheWrite: number;
-    cacheRead: number;
-  };
   turnAccum?: {
     startedAt: number;
     input: number;
@@ -267,6 +287,8 @@ declare class AiSdkRunner implements Runner {
   get pendingApprovals(): PermissionRequest[];
   get vfs(): SandboxVfs | undefined;
   info(): SessionInfo;
+  carryCost(state: CostLedgerState): void;
+  costState(): CostLedgerState;
   start(): Promise<void>;
   park(): RunnerSnapshot | undefined;
   snapshot(): RunnerSnapshot | undefined;
@@ -726,6 +748,10 @@ type AppServerUserInput = {
 } | {
   type: 'localImage';
   path: string;
+} | {
+  type: 'skill';
+  name: string;
+  path: string;
 };
 type AppServerConnection = {
   request(method: string, params?: unknown): Promise<unknown>;
@@ -775,6 +801,8 @@ declare class CodexRunner implements Runner {
   get pendingApprovals(): PermissionRequest[];
   info(): SessionInfo;
   setTitle(title: string | undefined): void;
+  carryCost(state: CostLedgerState): void;
+  costState(): CostLedgerState;
   start(): Promise<void>;
   sendMessage(text: string, attachments?: readonly AttachmentInput[]): void;
   queueLocalCommand(result: LocalCommandResult): void;
@@ -817,5 +845,5 @@ declare class JsonRpcStdioConnection {
 //#region src/engines/provider/adapter.d.ts
 declare const providerAdapter: EngineAdapter;
 //#endregion
-export { AiSdkRunner, type AiSdkRunnerConfig, type AiSdkSessionState, type AppServerConnectFn, type AppServerConnectOptions, type AppServerConnection, type AppServerHistoryTurn, type AppServerItem, type AppServerThreadListResponse, type AppServerThreadSummary, type AppServerTokenUsage, type AppServerTurn, type AppServerUserInput, type AttachmentInput, type AttachmentKind, type BridgeAnswer, BrowserBridgeExecutor, type BrowserBridgeExecutorOptions, CLAUDE_CATALOG, CODEX_CATALOG, type ClaudeAuthProbe, type ClaudeAuthStatus, CodexRunner, type CodexRunnerConfig, type DeferredDispatch, DeferredExecutor, type DeferredExecutorOptions, type EngineAdapter, type EngineAvailability, type EngineRunnerRequest, type EngineSessionOptions, type HistoryFn, type HostFetch, type HostToolDefinition, InputQueue, JsonRpcError, JsonRpcStdioConnection, type LanguageModel, type LocalCommandResult, type McpConnection, type ModelCatalog, type ParkedExecution, type PendingEntry, type PendingKind, type PendingOutcome, PendingRequestRegistry, type PendingToolCall, type PermissionDecision, type QueryFn, QuickJsExecutor, type QuickJsExecutorOptions, type RegisterOptions, type Runner, type RunnerSnapshot, SUPPORTED_ATTACHMENT_TYPES, type SessionEventListener, SessionRunner, type SessionRunnerConfig, type SettledBy, type Tool, type ToolCallOutput, type ToolContext, type ToolContextOptions, type ToolDefinition, type ToolExecutionCall, type ToolExecutionDispatch, type ToolExecutionResult, type ToolExecutor, type ToolSet, type ToolTrust, type WebFetchDigest, type WebFetchFn, type WebFetchOptions, type WebFetchResult, attachmentContentBlocks, attachmentKind, attachmentRef, checkClaudeAuth, claudeAdapter, codexAdapter, connectAppServer, connectMcpTools, createEngineSession, createToolContext, createWebFetch, getEngineAdapter, htmlToMarkdown, isHostAllowed, isPrivateAddress, listCodexSessions, localCommandContext, localCommandTranscript, mcpStatusInfo, modelOptionsFromSdk, normalizeMediaType, normalizeSdkMessage, providerAdapter, replaySlice, resolveBundledClaudeExecutable, resolveBundledCodexExecutable, toApiMessage, toExecutionResult, truncateResultBlocks, withHostTools, withMcpTools };
+export { AiSdkRunner, type AiSdkRunnerConfig, type AiSdkSessionState, type AppServerConnectFn, type AppServerConnectOptions, type AppServerConnection, type AppServerHistoryTurn, type AppServerItem, type AppServerThreadListResponse, type AppServerThreadSummary, type AppServerTokenUsage, type AppServerTurn, type AppServerUserInput, type AttachmentInput, type AttachmentKind, type BridgeAnswer, BrowserBridgeExecutor, type BrowserBridgeExecutorOptions, CLAUDE_CATALOG, CODEX_CATALOG, type ClaudeAuthProbe, type ClaudeAuthStatus, CodexRunner, type CodexRunnerConfig, type CostFigures, CostLedger, type CostLedgerState, type DeferredDispatch, DeferredExecutor, type DeferredExecutorOptions, type EngineAdapter, type EngineAvailability, type EngineRunnerRequest, type EngineSessionOptions, type HistoryFn, type HostFetch, type HostToolDefinition, InputQueue, JsonRpcError, JsonRpcStdioConnection, type LanguageModel, type LocalCommandResult, type McpConnection, type ModelCatalog, type ParkedExecution, type PendingEntry, type PendingKind, type PendingOutcome, PendingRequestRegistry, type PendingToolCall, type PermissionDecision, type QueryFn, QuickJsExecutor, type QuickJsExecutorOptions, type RegisterOptions, type Runner, type RunnerSnapshot, SUPPORTED_ATTACHMENT_TYPES, type SessionEventListener, SessionRunner, type SessionRunnerConfig, type SettledBy, type Tool, type ToolCallOutput, type ToolContext, type ToolContextOptions, type ToolDefinition, type ToolExecutionCall, type ToolExecutionDispatch, type ToolExecutionResult, type ToolExecutor, type ToolSet, type ToolTrust, type WebFetchDigest, type WebFetchFn, type WebFetchOptions, type WebFetchResult, attachmentContentBlocks, attachmentKind, attachmentRef, checkClaudeAuth, claudeAdapter, codexAdapter, connectAppServer, connectMcpTools, createEngineSession, createToolContext, createWebFetch, getEngineAdapter, htmlToMarkdown, isHostAllowed, isPrivateAddress, listCodexSessions, localCommandContext, localCommandTranscript, mcpStatusInfo, modelOptionsFromSdk, normalizeMediaType, normalizeSdkMessage, providerAdapter, replaySlice, resolveBundledClaudeExecutable, resolveBundledCodexExecutable, toApiMessage, toExecutionResult, truncateResultBlocks, withHostTools, withMcpTools };
 //# sourceMappingURL=index.d.mts.map

package/build/index.mjs

@@ -1,7 +1,7 @@
 import { createRequire } from "node:module";
 import { createHash, randomUUID } from "node:crypto";
 import { getSessionInfo, getSessionMessages, listSessions, query } from "@anthropic-ai/claude-agent-sdk";
-import { CHECKLIST_TEXT_MAX, ENGINE_CAPABILITIES, PROTOCOL_VERSION, SUBAGENT_HISTORY, TOOL_RESULT_HEAD_CHARS, contextReading, imagePartRef, parseTodoWriteInput, replayCoalesceKey, replayRetains, sanitizeToolTitle, snapshotRetains, transcriptActivity, transcriptContent, transcriptProse } from "@workerdeck/protocol";
+import { CHECKLIST_TEXT_MAX, ENGINE_CAPABILITIES, PROTOCOL_VERSION, SUBAGENT_HISTORY, TOOL_RESULT_HEAD_CHARS, addTokenUsage, byModelTotalTokens, canonicalModel, contextReading, costOfByModel, emptyTokenUsage, imagePartRef, mergeByModel, parseTodoWriteInput, replayCoalesceKey, replayRetains, sanitizeToolTitle, snapshotRetains, tokenUsageFromWire, totalTokens, transcriptActivity, transcriptContent, transcriptProse } from "@workerdeck/protocol";
 import { ToolLoopAgent, generateText, isStepCount, tool } from "ai";
 import { execFile, spawn } from "node:child_process";
 import { appendFileSync, existsSync, mkdirSync, readFileSync, realpathSync, rmSync, statSync, writeFileSync } from "node:fs";
@@ -273,6 +273,18 @@ function parseUnifiedDiff(diff, path) {
 }
 //#endregion
 //#region src/lib/normalize.ts
+function byModelFromSdk(modelUsage) {
+	if (!modelUsage) return;
+	const out = {};
+	for (const [model, entry] of Object.entries(modelUsage)) out[entry.canonicalModel ?? canonicalModel(model)] = {
+		...emptyTokenUsage(),
+		input: Math.max(0, entry.inputTokens ?? 0),
+		output: Math.max(0, entry.outputTokens ?? 0),
+		cacheWrite5m: Math.max(0, entry.cacheCreationInputTokens ?? 0),
+		cacheRead: Math.max(0, entry.cacheReadInputTokens ?? 0)
+	};
+	return Object.keys(out).length === 0 ? void 0 : out;
+}
 const FAMILY_ORDER = [
 	"fable",
 	"opus",
@@ -445,7 +457,8 @@ function normalizeSdkMessage(msg) {
 			totalCostUsd: msg.total_cost_usd,
 			result: msg.subtype === "success" ? msg.result : void 0,
 			errors: msg.subtype === "success" ? void 0 : msg.errors,
-			usage: msg.usage
+			usage: msg.usage,
+			usageByModel: byModelFromSdk(msg.modelUsage)
 		};
 		case "conversation_reset": return {
 			type: "conversation_reset",
@@ -480,6 +493,157 @@ function resolveApprovalTimeoutMs(session, fallback) {
 	return value === void 0 || value === null || value <= 0 ? void 0 : value;
 }
 //#endregion
+//#region src/lib/cost-ledger.ts
+function emptyBucket() {
+	return {
+		byModel: {},
+		reportedUsd: void 0
+	};
+}
+function bucketOf(figures) {
+	return {
+		byModel: figures.byModel ?? {},
+		reportedUsd: figures.reportedCostUsd
+	};
+}
+function figuresOf(bucket) {
+	return {
+		byModel: Object.keys(bucket.byModel).length === 0 ? void 0 : bucket.byModel,
+		reportedCostUsd: bucket.reportedUsd
+	};
+}
+function addBuckets(into, add) {
+	const reportedUsd = into.reportedUsd === void 0 && add.reportedUsd === void 0 ? void 0 : (into.reportedUsd ?? 0) + (add.reportedUsd ?? 0);
+	return {
+		byModel: mergeByModel(into.byModel, add.byModel),
+		reportedUsd
+	};
+}
+function subtractUsage(from, part) {
+	return {
+		input: Math.max(0, from.input - part.input),
+		output: Math.max(0, from.output - part.output),
+		cacheWrite5m: Math.max(0, from.cacheWrite5m - part.cacheWrite5m),
+		cacheWrite1h: Math.max(0, from.cacheWrite1h - part.cacheWrite1h),
+		cacheRead: Math.max(0, from.cacheRead - part.cacheRead)
+	};
+}
+function subtractBuckets(from, part) {
+	const byModel = {};
+	for (const [model, usage] of Object.entries(from.byModel)) {
+		const taken = part.byModel[model];
+		const rest = taken ? subtractUsage(usage, taken) : usage;
+		if (totalTokens(rest) > 0) byModel[model] = rest;
+	}
+	return {
+		byModel,
+		reportedUsd: from.reportedUsd === void 0 ? void 0 : Math.max(0, from.reportedUsd - (part.reportedUsd ?? 0))
+	};
+}
+function isEmpty(bucket) {
+	return byModelTotalTokens(bucket.byModel) === 0 && !((bucket.reportedUsd ?? 0) > 0);
+}
+function canonicalByModel(byModel) {
+	const out = {};
+	for (const [model, usage] of Object.entries(byModel)) {
+		const key = canonicalModel(model);
+		out[key] = addTokenUsage(out[key] ?? emptyTokenUsage(), usage);
+	}
+	return out;
+}
+function coversUsage(have, need) {
+	return have.input >= need.input && have.output >= need.output && have.cacheWrite5m >= need.cacheWrite5m && have.cacheWrite1h >= need.cacheWrite1h && have.cacheRead >= need.cacheRead;
+}
+function covers(reading, baseline) {
+	let compared = false;
+	if (baseline.reportedUsd !== void 0 && reading.reportedUsd !== void 0) {
+		if (reading.reportedUsd < baseline.reportedUsd) return false;
+		compared = true;
+	}
+	if (byModelTotalTokens(reading.byModel) > 0 && byModelTotalTokens(baseline.byModel) > 0) {
+		const have = canonicalByModel(reading.byModel);
+		for (const [model, need] of Object.entries(canonicalByModel(baseline.byModel))) {
+			if (totalTokens(need) === 0) continue;
+			const got = have[model];
+			if (!got || !coversUsage(got, need)) return false;
+		}
+		compared = true;
+	}
+	return compared;
+}
+var CostLedger = class {
+	#carried = emptyBucket();
+	#pending;
+	#current = emptyBucket();
+	carry(state) {
+		if (!state) return;
+		this.#carried = addBuckets(this.#carried, bucketOf(state));
+	}
+	carryUnlessRestored(state) {
+		if (!state) return;
+		const whole = bucketOf(state);
+		const lifetime = state.lifetime ? bucketOf(state.lifetime) : whole;
+		if (state.lifetime) this.#carried = addBuckets(this.#carried, subtractBuckets(whole, lifetime));
+		this.#pending = addBuckets(this.#pending ?? emptyBucket(), lifetime);
+	}
+	observeCumulative(byModel, reportedCostUsd) {
+		const reading = {
+			byModel: byModel ?? {},
+			reportedUsd: reportedCostUsd
+		};
+		if (this.#pending && !isEmpty(reading)) {
+			if (!covers(reading, this.#pending)) this.#carried = addBuckets(this.#carried, this.#pending);
+			this.#pending = void 0;
+		}
+		if (byModel !== void 0) this.#current = {
+			...this.#current,
+			byModel
+		};
+		if (reportedCostUsd !== void 0) this.#current = {
+			...this.#current,
+			reportedUsd: reportedCostUsd
+		};
+	}
+	observeDelta(byModel) {
+		this.#current = {
+			...this.#current,
+			byModel: mergeByModel(this.#current.byModel, byModel)
+		};
+	}
+	rollover() {
+		this.#carried = addBuckets(this.#carried, this.#lifetime());
+		this.#pending = void 0;
+		this.#current = emptyBucket();
+	}
+	get byModel() {
+		return figuresOf(this.#total()).byModel;
+	}
+	get breakdown() {
+		return costOfByModel(this.byModel ?? {});
+	}
+	get costUsd() {
+		const byModel = this.byModel;
+		if (!byModel) return;
+		const cost = costOfByModel(byModel);
+		return cost.unpriced ? void 0 : cost.total;
+	}
+	get reportedCostUsd() {
+		return this.#total().reportedUsd;
+	}
+	snapshot() {
+		return {
+			...figuresOf(this.#total()),
+			lifetime: figuresOf(this.#lifetime())
+		};
+	}
+	#lifetime() {
+		return addBuckets(this.#pending ?? emptyBucket(), this.#current);
+	}
+	#total() {
+		return addBuckets(this.#carried, this.#lifetime());
+	}
+};
+//#endregion
 //#region src/lib/event-log.ts
 var EventLog = class {
 	#events = [];
@@ -921,7 +1085,7 @@ var SessionRunner = class {
 	#pending = /* @__PURE__ */ new Map();
 	#turnOverWhileBlocked = false;
 	#subagents = new SubagentTracker();
-	#totalCostUsd;
+	#cost = new CostLedger();
 	#numTurns;
 	#input = new InputQueue();
 	#pendingLocalCommands = [];
@@ -986,7 +1150,9 @@ var SessionRunner = class {
 			meta: this.#config.meta,
 			scope: this.#config.scope,
 			title: sessionTitle(this.#config, this.#engineTitle),
-			totalCostUsd: this.#totalCostUsd,
+			totalCostUsd: this.#cost.reportedCostUsd,
+			costUsd: this.#cost.costUsd,
+			usageByModel: this.#cost.byModel,
 			numTurns: this.#numTurns,
 			lastActivityAt: this.#log.lastActivityAt
 		};
@@ -994,6 +1160,12 @@ var SessionRunner = class {
 	setTitle(title) {
 		this.#config = withTitle(this.#config, title);
 	}
+	carryCost(state) {
+		this.#cost.carryUnlessRestored(state);
+	}
+	costState() {
+		return this.#cost.snapshot();
+	}
 	start() {
 		if (this.#started) return this.#runPromise;
 		this.#started = true;
@@ -1277,6 +1449,7 @@ var SessionRunner = class {
 		if (body) {
 			this.#emit(body);
 			if (body.type === "conversation_reset") {
+				this.#cost.rollover();
 				this.#pendingLocalCommands = [];
 				if (body.sdkSessionId) this.#sdkSessionId = body.sdkSessionId;
 				this.#fetchContextUsage();
@@ -1284,7 +1457,10 @@ var SessionRunner = class {
 			if (body.type === "turn_result") {
 				this.#compactionTurns += 1;
 				if (this.#compactionTurns > 1) this.#settleCompaction();
-				this.#totalCostUsd = body.totalCostUsd;
+				this.#cost.observeCumulative(body.usageByModel, body.totalCostUsd);
+				body.totalCostUsd = this.#cost.reportedCostUsd ?? body.totalCostUsd;
+				body.usageByModel = this.#cost.byModel;
+				body.costUsd = this.#cost.costUsd;
 				this.#numTurns = body.numTurns;
 				if (this.#pending.size === 0) this.#setStatus("idle");
 				else this.#turnOverWhileBlocked = true;
@@ -1587,12 +1763,7 @@ var AiSdkRunner = class {
 	#abort;
 	#turnAccum;
 	#numTurns = 0;
-	#totalUsage = {
-		input: 0,
-		output: 0,
-		cacheWrite: 0,
-		cacheRead: 0
-	};
+	#cost = new CostLedger();
 	#started = false;
 	#closed = false;
 	#parked = false;
@@ -1616,10 +1787,15 @@ var AiSdkRunner = class {
 		this.#log.restore(snapshot.events, snapshot.seq, state.lastActivityAt);
 		this.#messages = [...state.messages];
 		this.#pendingLocalCommands = [...state.pendingLocalCommands ?? []];
-		for (const call of state.pendingToolCalls) this.#pendingToolCalls.set(call.toolCallId, call);
+		for (const call of state.pendingToolCalls) {
+			const legacy = call.deferred;
+			this.#pendingToolCalls.set(call.toolCallId, legacy === void 0 ? call : {
+				...call,
+				parkable: call.parkable ?? legacy
+			});
+		}
 		this.#dispatched = new Set(state.dispatched);
 		this.#numTurns = state.numTurns;
-		this.#totalUsage = { ...state.totalUsage };
 		this.#turnAccum = state.turnAccum ? { ...state.turnAccum } : void 0;
 		if (this.#turnAccum && state.parkedAt !== void 0) this.#turnAccum.startedAt += Date.now() - state.parkedAt;
 		this.#permissionMode = state.permissionMode;
@@ -1672,9 +1848,20 @@ var AiSdkRunner = class {
 			scope: this.#config.scope,
 			title: sessionTitle(this.#config),
 			numTurns: this.#numTurns || void 0,
+			costUsd: this.#cost.costUsd,
+			usageByModel: this.#cost.byModel,
 			lastActivityAt: this.#log.lastActivityAt
 		};
 	}
+	carryCost(state) {
+		this.#cost.carry(state);
+	}
+	costState() {
+		return this.#cost.snapshot();
+	}
+	#turnByModel(accum) {
+		return { [this.#modelId() ?? "unknown"]: tokenUsageFromWire(turnUsage(accum)) };
+	}
 	start() {
 		if (this.#started) return this.#turnChain;
 		this.#started = true;
@@ -1712,7 +1899,6 @@ var AiSdkRunner = class {
 			pendingToolCalls: [...this.#pendingToolCalls.values()],
 			dispatched: [...this.#dispatched],
 			numTurns: this.#numTurns,
-			totalUsage: { ...this.#totalUsage },
 			turnAccum: this.#turnAccum ? { ...this.#turnAccum } : void 0,
 			permissionMode: this.#permissionMode,
 			model: this.#modelAlias,
@@ -2090,14 +2276,14 @@ var AiSdkRunner = class {
 			signal: this.#abort?.signal
 		};
 		const profile = executor.describe?.(toolCall) ?? {};
-		call.deferred = profile.deferred === true ? true : void 0;
+		call.parkable = profile.deferred === true ? true : void 0;
 		call.expiresAt = profile.timeoutMs === void 0 ? void 0 : Date.now() + profile.timeoutMs;
 		this.#emit({
 			type: "execution_dispatched",
 			executionId: call.toolCallId,
 			toolName: call.toolName,
 			backend: profile.backend ?? this.#config.executionBackend ?? "server",
-			deferred: call.deferred,
+			deferred: call.parkable,
 			expiresAt: call.expiresAt
 		});
 		const promise = executor.dispatch(toolCall).then((dispatch) => {
@@ -2110,7 +2296,7 @@ var AiSdkRunner = class {
 			});
 		});
 		return {
-			deferred: call.deferred === true,
+			deferred: call.parkable === true,
 			promise
 		};
 	}
@@ -2120,7 +2306,7 @@ var AiSdkRunner = class {
 	}
 	#restingOnDeferred() {
 		if (this.#pendingToolCalls.size === 0) return false;
-		for (const call of this.#pendingToolCalls.values()) if (call.deferred !== true) return false;
+		for (const call of this.#pendingToolCalls.values()) if (call.parkable !== true) return false;
 		return true;
 	}
 	#applyExecutionResult(executionId, result) {
@@ -2358,10 +2544,8 @@ var AiSdkRunner = class {
 			cacheRead: 0
 		};
 		this.#numTurns += 1;
-		this.#totalUsage.input += accum.input;
-		this.#totalUsage.output += accum.output;
-		this.#totalUsage.cacheWrite += accum.cacheWrite;
-		this.#totalUsage.cacheRead += accum.cacheRead;
+		const byModel = this.#turnByModel(accum);
+		this.#cost.observeDelta(byModel);
 		this.#emit({
 			type: "turn_result",
 			subtype: "success",
@@ -2370,7 +2554,9 @@ var AiSdkRunner = class {
 			numTurns: this.#numTurns,
 			totalCostUsd: 0,
 			result: text,
-			usage: turnUsage(accum)
+			usage: turnUsage(accum),
+			usageByModel: this.#cost.byModel,
+			costUsd: this.#cost.costUsd
 		});
 		this.#turnAccum = void 0;
 		this.#setStatus("idle");
@@ -4017,6 +4203,29 @@ function skillInfo(skill) {
 		enabled: skill.enabled !== false
 	};
 }
+const SKILL_MENTION = /(^|[^A-Za-z0-9_$-])\$([a-z0-9][a-z0-9-]*)(?![A-Za-z0-9_-])/g;
+function withSkillItems(input, paths) {
+	const present = new Set(input.flatMap((item) => item.type === "skill" ? [item.name] : []));
+	const added = [];
+	for (const item of input) {
+		if (item.type !== "text") continue;
+		for (const match of item.text.matchAll(SKILL_MENTION)) {
+			const name = match[2];
+			const path = paths.get(name);
+			if (path === void 0 || present.has(name)) continue;
+			present.add(name);
+			added.push({
+				type: "skill",
+				name,
+				path
+			});
+		}
+	}
+	return added.length > 0 ? [...input, ...added] : [...input];
+}
+function mentionsSkill(input) {
+	return input.some((item) => item.type === "text" && /(^|[^A-Za-z0-9_$-])\$[a-z0-9]/.test(item.text));
+}
 function mcpStatusOf(authStatus, update, hasTools) {
 	if (update?.status === "failed") return update.failureReason === "reauthenticationRequired" ? "needs-auth" : "failed";
 	if (update?.status === "cancelled") return "failed";
@@ -4245,7 +4454,7 @@ var CodexRunner = class {
 	#workspaceWrite;
 	#threadLoaded = false;
 	#numTurns = 0;
-	#totalCostUsd;
+	#cost = new CostLedger();
 	#started = false;
 	#closed = false;
 	#imageDir;
@@ -4255,6 +4464,7 @@ var CodexRunner = class {
 	#replayingHistory = false;
 	#skillsFingerprint;
 	#skillsRefresh;
+	#skillPaths = /* @__PURE__ */ new Map();
 	#producedPaths = /* @__PURE__ */ new Set();
 	#mcpStatus = /* @__PURE__ */ new Map();
 	#agents = new CodexAgentTracker();
@@ -4312,7 +4522,9 @@ var CodexRunner = class {
 			meta: this.#config.meta,
 			scope: this.#config.scope,
 			title: sessionTitle(this.#config),
-			totalCostUsd: this.#totalCostUsd,
+			totalCostUsd: this.#cost.reportedCostUsd,
+			costUsd: this.#cost.costUsd,
+			usageByModel: this.#cost.byModel,
 			numTurns: this.#numTurns || void 0,
 			lastActivityAt: this.#log.lastActivityAt,
 			subagents: this.#agents.list(),
@@ -4322,6 +4534,12 @@ var CodexRunner = class {
 	setTitle(title) {
 		this.#config = withTitle(this.#config, title);
 	}
+	carryCost(state) {
+		this.#cost.carry(state);
+	}
+	costState() {
+		return this.#cost.snapshot();
+	}
 	start() {
 		if (this.#started) return this.#turnChain;
 		this.#started = true;
@@ -4478,7 +4696,7 @@ var CodexRunner = class {
 			type: "text",
 			text: context
 		});
-		return parts;
+		return withSkillItems(parts, this.#skillPaths);
 	}
 	queueLocalCommand(result) {
 		if (this.#closed) throw new Error("session is closed");
@@ -4710,11 +4928,14 @@ var CodexRunner = class {
 				const entries = Array.isArray(result?.data) ? result.data : [];
 				const seen = /* @__PURE__ */ new Set();
 				const skills = [];
+				const paths = /* @__PURE__ */ new Map();
 				for (const entry of entries) for (const skill of entry?.skills ?? []) {
 					if (typeof skill?.name !== "string" || seen.has(skill.name)) continue;
 					seen.add(skill.name);
 					skills.push(skillInfo(skill));
+					if (typeof skill.path === "string" && skill.path) paths.set(skill.name, skill.path);
 				}
+				this.#skillPaths = paths;
 				skills.sort((a, b) => a.name.localeCompare(b.name));
 				const fingerprint = JSON.stringify(skills);
 				if (fingerprint === this.#skillsFingerprint) return;
@@ -4866,6 +5087,10 @@ var CodexRunner = class {
 		this.#activeTurn = active;
 		try {
 			const connection = await this.#ensureThread();
+			if (mentionsSkill(turn.input)) {
+				await this.#skillsRefresh;
+				turn.input = withSkillItems(turn.input, this.#skillPaths);
+			}
 			const params = {
 				threadId: this.#sdkSessionId,
 				input: turn.input,
@@ -5413,23 +5638,27 @@ var CodexRunner = class {
 			message: "Turn ended"
 		}, "policy");
 		this.#numTurns += 1;
-		this.#totalCostUsd = 0;
 		const usage = active.sawUsage ? active.usage : void 0;
+		const wire = usage ? {
+			input_tokens: Math.max(0, usage.inputTokens - usage.cachedInputTokens),
+			output_tokens: usage.outputTokens + usage.reasoningOutputTokens,
+			cache_creation_input_tokens: usage.cacheWriteInputTokens ?? 0,
+			cache_read_input_tokens: usage.cachedInputTokens
+		} : void 0;
+		const turnByModel = wire ? { [this.#model ?? this.#resolvedModel ?? "unknown"]: tokenUsageFromWire(wire) } : void 0;
+		if (turnByModel) this.#cost.observeDelta(turnByModel);
 		this.#emit({
 			type: "turn_result",
 			subtype: kind === "success" ? "success" : "error_during_execution",
 			isError: kind !== "success",
 			durationMs: Date.now() - startedAt,
 			numTurns: this.#numTurns,
-			totalCostUsd: 0,
+			totalCostUsd: this.#cost.reportedCostUsd ?? 0,
 			result: kind === "success" ? active.finalText ?? "" : void 0,
 			errors,
-			usage: usage ? {
-				input_tokens: Math.max(0, usage.inputTokens - usage.cachedInputTokens),
-				output_tokens: usage.outputTokens + usage.reasoningOutputTokens,
-				cache_creation_input_tokens: usage.cacheWriteInputTokens ?? 0,
-				cache_read_input_tokens: usage.cachedInputTokens
-			} : void 0
+			usage: wire,
+			usageByModel: this.#cost.byModel,
+			costUsd: this.#cost.costUsd
 		});
 		this.#emitContextUsage(active);
 		this.#setStatus("idle");
@@ -5801,6 +6030,6 @@ function getEngineAdapter(engine) {
 	return ADAPTERS[engine ?? "claude"];
 }
 //#endregion
-export { AiSdkRunner, BrowserBridgeExecutor, CLAUDE_CATALOG, CODEX_CATALOG, CodexRunner, DeferredExecutor, InputQueue, JsonRpcError, JsonRpcStdioConnection, PendingRequestRegistry, QuickJsExecutor, SUPPORTED_ATTACHMENT_TYPES, SessionRunner, attachmentContentBlocks, attachmentKind, attachmentRef, checkClaudeAuth, claudeAdapter, codexAdapter, connectAppServer, connectMcpTools, createEngineSession, createToolContext, createWebFetch, getEngineAdapter, htmlToMarkdown, isHostAllowed, isPrivateAddress, listCodexSessions, localCommandContext, localCommandTranscript, mcpStatusInfo, modelOptionsFromSdk, normalizeMediaType, normalizeSdkMessage, providerAdapter, replaySlice, resolveBundledClaudeExecutable, resolveBundledCodexExecutable, toApiMessage, toExecutionResult, truncateResultBlocks, withHostTools, withMcpTools };
+export { AiSdkRunner, BrowserBridgeExecutor, CLAUDE_CATALOG, CODEX_CATALOG, CodexRunner, CostLedger, DeferredExecutor, InputQueue, JsonRpcError, JsonRpcStdioConnection, PendingRequestRegistry, QuickJsExecutor, SUPPORTED_ATTACHMENT_TYPES, SessionRunner, attachmentContentBlocks, attachmentKind, attachmentRef, checkClaudeAuth, claudeAdapter, codexAdapter, connectAppServer, connectMcpTools, createEngineSession, createToolContext, createWebFetch, getEngineAdapter, htmlToMarkdown, isHostAllowed, isPrivateAddress, listCodexSessions, localCommandContext, localCommandTranscript, mcpStatusInfo, modelOptionsFromSdk, normalizeMediaType, normalizeSdkMessage, providerAdapter, replaySlice, resolveBundledClaudeExecutable, resolveBundledCodexExecutable, toApiMessage, toExecutionResult, truncateResultBlocks, withHostTools, withMcpTools };
 
 //# sourceMappingURL=index.mjs.map