@workerdeck/core 2.9.0 → 2.11.0

package/build/index.mjs

@@ -1,12 +1,12 @@
 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 { ToolLoopAgent, generateText, isStepCount, tool } from "ai";
+import { createSdkMcpServer, getSessionInfo, getSessionMessages, listSessions, query, tool } from "@anthropic-ai/claude-agent-sdk";
+import { CHECKLIST_TEXT_MAX, ENGINE_CAPABILITIES, PROTOCOL_VERSION, SUBAGENT_HISTORY, TOOL_RESULT_HEAD_CHARS, addTokenUsage, byModelTotalTokens, canonicalModel, contextReading, costOfByModel, emptyTokenUsage, imagePartRef, mergeByModel, parseTodoWriteInput, peerDeliveredPrefix, replayCoalesceKey, replayRetains, sanitizeToolTitle, snapshotRetains, tokenUsageFromWire, totalTokens, transcriptActivity, transcriptContent, transcriptProse } from "@workerdeck/protocol";
+import { z } from "zod";
+import { ToolLoopAgent, generateText, isStepCount, tool as tool$1 } from "ai";
 import { execFile, spawn } from "node:child_process";
 import { appendFileSync, existsSync, mkdirSync, readFileSync, realpathSync, rmSync, statSync, writeFileSync } from "node:fs";
 import { createVfs, runScript } from "@workerdeck/sandbox";
-import { z } from "zod";
 import { lookup } from "node:dns/promises";
 import { homedir, tmpdir } from "node:os";
 import { dirname, join, resolve, sep } from "node:path";
@@ -87,6 +87,9 @@ function decodeText(base64) {
 //#endregion
 //#region src/lib/checklist.ts
 const TODO_WRITE = "TodoWrite";
+const TASK_CREATE = "TaskCreate";
+const TASK_UPDATE = "TaskUpdate";
+const CREATED_RE = /Task #(\S+) created successfully/;
 function clamp(items) {
 	return items.map((item) => item.text.length > CHECKLIST_TEXT_MAX ? {
 		...item,
@@ -133,6 +136,89 @@ function sameChecklist(a, b) {
 	if (left.length !== b.length) return false;
 	return left.every((item, i) => item.text === b[i].text && item.status === b[i].status);
 }
+function rootBlocks(body, type) {
+	if (body.type !== type || body.parentToolUseId != null || typeof body.message.content === "string") return [];
+	return body.message.content;
+}
+function taskDraft(input) {
+	const raw = input;
+	const subject = typeof raw?.subject === "string" ? raw.subject.trim() : "";
+	if (subject === "") return;
+	const activeForm = typeof raw?.activeForm === "string" ? raw.activeForm.trim() : "";
+	return activeForm === "" ? { subject } : {
+		subject,
+		activeForm
+	};
+}
+function taskUpdate(input) {
+	const raw = input;
+	if (typeof raw?.taskId !== "string") return;
+	const out = { taskId: raw.taskId };
+	if (raw.status === "pending" || raw.status === "in_progress" || raw.status === "completed" || raw.status === "deleted") out.status = raw.status;
+	if (typeof raw.subject === "string" && raw.subject.trim() !== "") out.subject = raw.subject.trim();
+	if (typeof raw.activeForm === "string" && raw.activeForm.trim() !== "") out.activeForm = raw.activeForm.trim();
+	return out;
+}
+function resultText(block) {
+	const content = block.content;
+	if (typeof content === "string") return content;
+	if (Array.isArray(content)) return content.map((part) => typeof part.text === "string" ? part.text : "").join("\n");
+	return "";
+}
+var TaskChecklist = class {
+	#pending = /* @__PURE__ */ new Map();
+	#tasks = /* @__PURE__ */ new Map();
+	reset() {
+		this.#pending.clear();
+		this.#tasks.clear();
+	}
+	observe(body) {
+		let changed = false;
+		for (const block of rootBlocks(body, "assistant_message")) {
+			if (block.type !== "tool_use") continue;
+			if (block.name === TASK_CREATE) {
+				const draft = taskDraft(block.input);
+				if (draft && typeof block.id === "string") this.#pending.set(block.id, draft);
+			} else if (block.name === TASK_UPDATE) changed = this.#apply(taskUpdate(block.input)) || changed;
+		}
+		for (const block of rootBlocks(body, "user_message")) {
+			if (block.type !== "tool_result") continue;
+			const toolUseId = block.tool_use_id;
+			const draft = typeof toolUseId === "string" ? this.#pending.get(toolUseId) : void 0;
+			if (!draft || typeof toolUseId !== "string") continue;
+			this.#pending.delete(toolUseId);
+			const id = CREATED_RE.exec(resultText(block))?.[1];
+			if (id && !this.#tasks.has(id)) {
+				this.#tasks.set(id, {
+					...draft,
+					status: "pending"
+				});
+				changed = true;
+			}
+		}
+		return changed ? this.list() : void 0;
+	}
+	list() {
+		const out = [];
+		for (const task of this.#tasks.values()) out.push({
+			status: task.status,
+			text: task.status === "in_progress" && task.activeForm ? task.activeForm : task.subject
+		});
+		return clamp(out);
+	}
+	#apply(update) {
+		const task = update ? this.#tasks.get(update.taskId) : void 0;
+		if (!update || !task) return false;
+		if (update.status === "deleted") {
+			this.#tasks.delete(update.taskId);
+			return true;
+		}
+		if (update.status) task.status = update.status;
+		if (update.subject) task.subject = update.subject;
+		if (update.activeForm) task.activeForm = update.activeForm;
+		return true;
+	}
+};
 //#endregion
 //#region src/lib/input-queue.ts
 var InputQueue = class {
@@ -273,6 +359,19 @@ 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),
+		costBasis: entry.costBasis
+	};
+	return Object.keys(out).length === 0 ? void 0 : out;
+}
 const FAMILY_ORDER = [
 	"fable",
 	"opus",
@@ -445,7 +544,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 +580,158 @@ 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),
+		costBasis: from.costBasis
+	};
+}
+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 = [];
@@ -719,6 +971,169 @@ function withTitle(config, title) {
 	};
 }
 //#endregion
+//#region src/lib/peers.ts
+const PEER_MCP_SERVER = "workerdeck";
+const PEER_MESSAGE_MAX_CHARS = 16e3;
+const PEER_RECENT_DEFAULT = 8;
+const PEER_RECENT_MAX = 40;
+const RECENT_LINE_MAX_CHARS = 400;
+const PEER_DIRECTORY_SLOT = Symbol.for("workerdeck.peers.directory");
+const PEER_TOOL_SHAPES = {
+	peers_list: {
+		description: "List the other agent sessions running on this WorkerDeck gateway that you may talk to: id, engine, project, status and title. Call this before peers_send or peers_peek to find the session id.",
+		shape: {}
+	},
+	peers_peek: {
+		description: "Read another session's current state without interrupting it: status, checklist, pending approvals and its most recent transcript lines. Use it to check how far along a peer is.",
+		shape: {
+			sessionId: z.string().describe("The peer session id from peers_list"),
+			recent: z.number().int().min(0).max(40).optional().describe(`How many recent transcript lines to include (default 8)`)
+		}
+	},
+	peers_send: {
+		description: `Send a message to another session. It is delivered as a message from you, never interrupts a running turn, and the peer decides whether and how to reply (a reply arrives later as a message from that session). Keep it under ${PEER_MESSAGE_MAX_CHARS} characters; for anything larger write a file and send its path.`,
+		shape: {
+			sessionId: z.string().describe("The peer session id from peers_list"),
+			text: z.string().min(1).describe("The message")
+		}
+	}
+};
+const PEER_TOOL_NAMES = Object.keys(PEER_TOOL_SHAPES);
+function peerToolSpecs() {
+	return PEER_TOOL_NAMES.map((name) => {
+		const { description, shape } = PEER_TOOL_SHAPES[name];
+		return {
+			name,
+			description,
+			inputSchema: z.toJSONSchema(z.object(shape))
+		};
+	});
+}
+function isPeerToolName(name) {
+	return Object.hasOwn(PEER_TOOL_SHAPES, name);
+}
+async function runPeerTool(peers, from, name, args) {
+	if (!isPeerToolName(name)) return {
+		text: `unknown peer tool: ${name}`,
+		isError: true
+	};
+	try {
+		switch (name) {
+			case "peers_list": {
+				const rows = await peers.list(from);
+				return {
+					text: rows.length ? JSON.stringify(rows, null, 2) : "No other sessions are reachable from this one.",
+					isError: false
+				};
+			}
+			case "peers_peek": {
+				const input = z.object(PEER_TOOL_SHAPES.peers_peek.shape).safeParse(args ?? {});
+				if (!input.success) return invalidArguments(name, input.error);
+				const peek = await peers.peek(from, input.data.sessionId, { recent: input.data.recent });
+				if (!peek) return {
+					text: `no such session: ${input.data.sessionId}`,
+					isError: true
+				};
+				return {
+					text: JSON.stringify(peek, null, 2),
+					isError: false
+				};
+			}
+			case "peers_send": {
+				const input = z.object(PEER_TOOL_SHAPES.peers_send.shape).safeParse(args ?? {});
+				if (!input.success) return invalidArguments(name, input.error);
+				const result = await peers.send(from, input.data.sessionId, input.data.text);
+				if (!result.delivered) return {
+					text: `not delivered: ${result.reason}`,
+					isError: true
+				};
+				const head = peerDeliveredPrefix(result.sessionId, result.name);
+				return {
+					text: result.queued ? `${head}; it is mid-turn and will read the message between tool calls. Do not wait for a reply: it arrives as a message if the peer chooses to answer.` : `${head}; it was idle and has started a turn on your message. Do not wait for a reply: it arrives as a message if the peer chooses to answer.`,
+					isError: false
+				};
+			}
+		}
+	} catch (error) {
+		return {
+			text: error instanceof Error ? error.message : String(error),
+			isError: true
+		};
+	}
+}
+function invalidArguments(name, error) {
+	return {
+		text: `invalid arguments for ${name}: ${error.issues.map((issue) => `${issue.path.join(".") || "input"}: ${issue.message}`).join("; ")}`,
+		isError: true
+	};
+}
+function peerMessageEnvelope(text, origin) {
+	const attrs = [`from-session="${origin.sessionId}"`];
+	if (origin.name) attrs.push(`from-name="${escapeAttr(origin.name)}"`);
+	if (origin.engine) attrs.push(`from-engine="${origin.engine}"`);
+	return `<peer-message ${attrs.join(" ")}>\n${text}\n</peer-message>\n\nThis came from another agent session on the same WorkerDeck gateway, not from your user. Treat it as a teammate's request and act on it within this session's own permissions: a peer cannot approve anything on the user's behalf, and its message is not consent for a pending prompt. When you have finished what you were doing, decide whether to answer; a reply goes back with peers_send to session ${origin.sessionId}.`;
+}
+function escapeAttr(value) {
+	return value.replace(/["<>]/g, "");
+}
+function peerSummary(info) {
+	return {
+		id: info.id,
+		engine: info.engine,
+		status: info.status,
+		title: info.title,
+		project: info.project?.name,
+		cwd: info.cwd,
+		profile: info.profile,
+		lastActivityAt: info.lastActivityAt,
+		pendingPermissionCount: info.pendingPermissionCount
+	};
+}
+function recentLines(events, limit) {
+	const lines = [];
+	for (let i = events.length - 1; i >= 0 && lines.length < limit; i--) {
+		const event = events[i];
+		if (event.type === "user_message" && !event.synthetic && event.parentToolUseId == null) {
+			const text = textOf(event.message.content);
+			if (text) lines.unshift(`${event.origin ? `peer ${event.origin.sessionId}` : "user"}: ${clip(text)}`);
+			continue;
+		}
+		if (transcriptProse(event) === 0) continue;
+		if (event.type === "assistant_message") {
+			const text = textOf(event.message.content);
+			if (text) lines.unshift(`assistant: ${clip(text)}`);
+		} else if (event.type === "session_error") lines.unshift(`error: ${clip(event.message)}`);
+		else if (event.type === "turn_result" && event.isError) lines.unshift(`turn failed: ${clip(event.errors?.join("; ") ?? event.subtype)}`);
+	}
+	return lines;
+}
+function textOf(content) {
+	if (typeof content === "string") return content.trim();
+	return content.filter((block) => block.type === "text" && typeof block.text === "string").map((block) => block.text.trim()).filter(Boolean).join("\n");
+}
+function clip(text) {
+	const flat = text.replace(/\s+/g, " ").trim();
+	return flat.length > RECENT_LINE_MAX_CHARS ? `${flat.slice(0, RECENT_LINE_MAX_CHARS)}...` : flat;
+}
+function installPeerDirectory(directory) {
+	globalThis[PEER_DIRECTORY_SLOT] = directory;
+}
+function installedPeerDirectory() {
+	return globalThis[PEER_DIRECTORY_SLOT];
+}
+function peerDirectoryHandle() {
+	const resolve = () => {
+		const directory = installedPeerDirectory();
+		if (!directory) throw new Error("peer messaging is not available on this gateway");
+		return directory;
+	};
+	return {
+		list: async (from) => resolve().list(from),
+		peek: async (from, sessionId, options) => resolve().peek(from, sessionId, options),
+		send: async (from, sessionId, text, options) => resolve().send(from, sessionId, text, options)
+	};
+}
+//#endregion
 //#region src/engines/claude/subagents.ts
 const SPAWNER_NAMES = /* @__PURE__ */ new Set(["Task", "Agent"]);
 var SubagentTracker = class {
@@ -912,6 +1327,7 @@ var SessionRunner = class {
 	#cwd;
 	#log = new EventLog();
 	#subscribers = new SubscriberSet();
+	#tasks = new TaskChecklist();
 	#status = "starting";
 	#statusDetail;
 	#sdkSessionId;
@@ -921,7 +1337,7 @@ var SessionRunner = class {
 	#pending = /* @__PURE__ */ new Map();
 	#turnOverWhileBlocked = false;
 	#subagents = new SubagentTracker();
-	#totalCostUsd;
+	#cost = new CostLedger();
 	#numTurns;
 	#input = new InputQueue();
 	#pendingLocalCommands = [];
@@ -986,7 +1402,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 +1412,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;
@@ -1001,7 +1425,7 @@ var SessionRunner = class {
 		this.#runPromise = this.#run();
 		return this.#runPromise;
 	}
-	sendMessage(text, attachments) {
+	sendMessage(text, attachments, options) {
 		if (this.#closed) throw new Error("session is closed");
 		const blocks = attachments?.length ? attachmentContentBlocks(attachments) : [];
 		const context = isSlashCommand(text) ? void 0 : this.#takeLocalCommands();
@@ -1009,10 +1433,11 @@ var SessionRunner = class {
 			type: "text",
 			text: context
 		});
-		const content = blocks.length ? [...blocks, ...text ? [{
+		const modelText = options?.origin ? peerMessageEnvelope(text, options.origin) : text;
+		const content = blocks.length ? [...blocks, ...modelText ? [{
 			type: "text",
-			text
-		}] : []] : text;
+			text: modelText
+		}] : []] : modelText;
 		this.#input.push({
 			type: "user",
 			message: {
@@ -1030,7 +1455,8 @@ var SessionRunner = class {
 			},
 			parentToolUseId: null,
 			attachments: attachments?.length ? attachments.map(attachmentRef) : void 0,
-			uuid: randomUUID()
+			uuid: randomUUID(),
+			...options?.origin ? { origin: options.origin } : {}
 		});
 	}
 	queueLocalCommand(result) {
@@ -1203,7 +1629,7 @@ var SessionRunner = class {
 			permissionMode: c.permissionMode,
 			allowedTools: c.allowedTools,
 			disallowedTools: c.disallowedTools,
-			mcpServers: c.mcpServers,
+			mcpServers: this.#mcpServersOption(),
 			settingSources: c.settingSources,
 			model: c.model,
 			maxTurns: c.maxTurns,
@@ -1220,6 +1646,28 @@ var SessionRunner = class {
 			...c.extraOptions
 		};
 	}
+	#mcpServersOption() {
+		const declared = this.#config.mcpServers;
+		const peers = this.#config.peers;
+		if (!peers) return declared;
+		const tools = PEER_TOOL_NAMES.map((name) => tool(name, PEER_TOOL_SHAPES[name].description, PEER_TOOL_SHAPES[name].shape, async (args) => {
+			const output = await runPeerTool(peers, this.id, name, args);
+			return {
+				content: [{
+					type: "text",
+					text: output.text
+				}],
+				isError: output.isError
+			};
+		}));
+		return {
+			...declared,
+			[PEER_MCP_SERVER]: createSdkMcpServer({
+				name: PEER_MCP_SERVER,
+				tools
+			})
+		};
+	}
 	#handleMessage(msg) {
 		if (msg.type === "system" && msg.subtype === "init") {
 			this.#sdkSessionId = msg.session_id;
@@ -1277,6 +1725,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 +1733,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;
@@ -1544,7 +1996,10 @@ var SessionRunner = class {
 		const event = this.#log.append(body);
 		this.#subagents.observe(body, event.ts);
 		this.#subscribers.emit(event);
-		const items = checklistFromBody(body);
+		const todos = checklistFromBody(body);
+		if (todos) this.#tasks.reset();
+		if (body.type === "conversation_reset") this.#tasks.reset();
+		const items = todos ?? this.#tasks.observe(body);
 		if (items && !sameChecklist(this.#log.checklist, items)) this.#emit({
 			type: "checklist",
 			items
@@ -1587,12 +2042,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 +2066,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 +2127,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 +2178,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,
@@ -1731,9 +2196,10 @@ var AiSdkRunner = class {
 			state
 		};
 	}
-	sendMessage(text, attachments) {
+	sendMessage(text, attachments, options) {
 		if (this.#parked) throw new Error("session is parked");
 		if (this.#closed) throw new Error("session is closed");
+		const modelText = options?.origin ? peerMessageEnvelope(text, options.origin) : text;
 		const files = (attachments ?? []).map((attachment) => ({
 			type: "file",
 			data: attachment.data,
@@ -1748,11 +2214,11 @@ var AiSdkRunner = class {
 				text: context
 			}] : [],
 			...files,
-			...text ? [{
+			...modelText ? [{
 				type: "text",
-				text
+				text: modelText
 			}] : []
-		] : text;
+		] : modelText;
 		this.#messages.push({
 			role: "user",
 			content
@@ -1765,7 +2231,8 @@ var AiSdkRunner = class {
 			},
 			parentToolUseId: null,
 			attachments: attachments?.length ? attachments.map(attachmentRef) : void 0,
-			uuid: randomUUID()
+			uuid: randomUUID(),
+			...options?.origin ? { origin: options.origin } : {}
 		});
 		this.#scheduleTurn();
 	}
@@ -2090,14 +2557,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 +2577,7 @@ var AiSdkRunner = class {
 			});
 		});
 		return {
-			deferred: call.deferred === true,
+			deferred: call.parkable === true,
 			promise
 		};
 	}
@@ -2120,7 +2587,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 +2825,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 +2835,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");
@@ -2781,7 +3248,7 @@ function createToolContext(options) {
 	definitions.push({
 		name: "fs_list",
 		trust: "authoritative",
-		tool: tool({
+		tool: tool$1({
 			description: "List files in the scratch filesystem.",
 			inputSchema: z.object({ dir: z.string().default("/").describe("Directory to list") }),
 			execute: async ({ dir }) => ({ files: vfs.list(dir) })
@@ -2790,7 +3257,7 @@ function createToolContext(options) {
 	definitions.push({
 		name: "fs_read",
 		trust: "authoritative",
-		tool: tool({
+		tool: tool$1({
 			description: "Read a file from the scratch filesystem.",
 			inputSchema: z.object({ path: z.string() }),
 			execute: async ({ path }) => {
@@ -2803,7 +3270,7 @@ function createToolContext(options) {
 	definitions.push({
 		name: "fs_write",
 		trust: "authoritative",
-		tool: tool({
+		tool: tool$1({
 			description: "Write a file to the scratch filesystem.",
 			inputSchema: z.object({
 				path: z.string(),
@@ -2823,7 +3290,7 @@ function createToolContext(options) {
 		definitions.push({
 			name: "deliver_file",
 			trust: "authoritative",
-			tool: tool({
+			tool: tool$1({
 				description: "Hand a file from the scratch filesystem over to the user as a deliverable. Write it with fs_write first, then deliver it.",
 				inputSchema: z.object({
 					path: z.string().describe("Path of an existing file in the scratch filesystem"),
@@ -2846,12 +3313,28 @@ function createToolContext(options) {
 			})
 		});
 	}
+	if (options.peers) {
+		const peers = options.peers;
+		const selfId = options.selfId ?? (() => options.sessionId);
+		for (const name of PEER_TOOL_NAMES) definitions.push({
+			name,
+			trust: "authoritative",
+			tool: tool$1({
+				description: PEER_TOOL_SHAPES[name].description,
+				inputSchema: z.object(PEER_TOOL_SHAPES[name].shape),
+				execute: async (args) => {
+					const output = await runPeerTool(peers, selfId(), name, args);
+					return output.isError ? { error: output.text } : { result: output.text };
+				}
+			})
+		});
+	}
 	if (options.search) {
 		const search = options.search;
 		definitions.push({
 			name: "web_search",
 			trust: "authoritative",
-			tool: tool({
+			tool: tool$1({
 				description: "Search the web for pages relevant to a query.",
 				inputSchema: z.object({
 					query: z.string(),
@@ -2866,7 +3349,7 @@ function createToolContext(options) {
 		definitions.push({
 			name: "download",
 			trust: "authoritative",
-			tool: tool({
+			tool: tool$1({
 				description: "Fetch a URL and store its text in the scratch filesystem for later evaluation.",
 				inputSchema: z.object({
 					url: z.string().describe("Absolute http(s) URL"),
@@ -2894,7 +3377,7 @@ function createToolContext(options) {
 		definitions.push({
 			name: "web_fetch",
 			trust: "authoritative",
-			tool: tool({
+			tool: tool$1({
 				description: "Fetch a web page and process its content against a prompt. Returns the answer (or the page as markdown). Distinct from download: use web_fetch to answer a question about a page, download to store raw text for eval_script.",
 				inputSchema: z.object({
 					url: z.string().describe("Absolute http(s) URL"),
@@ -2913,7 +3396,7 @@ function createToolContext(options) {
 	definitions.push({
 		name: "eval_script",
 		trust: "sandboxed",
-		tool: tool({
+		tool: tool$1({
 			description: "Evaluate a JavaScript snippet in a sandbox to parse, score, or extract from files. Globals: vfs.read(path), vfs.write(path, text), vfs.list(dir), console.log. The value of the last expression is returned. No network or host access.",
 			inputSchema: z.object({ script: z.string() })
 		})
@@ -3204,7 +3687,9 @@ function createEngineSession(options) {
 		search: isGranted("search") ? options.capabilities?.search : void 0,
 		download: isGranted("download") ? options.capabilities?.download : void 0,
 		webFetch,
-		onFileDelivered: options.capabilities?.deliverFiles === false || !isGranted("deliverFiles") ? void 0 : (file) => runner?.emitFileDelivered(file)
+		onFileDelivered: options.capabilities?.deliverFiles === false || !isGranted("deliverFiles") ? void 0 : (file) => runner?.emitFileDelivered(file),
+		peers: options.config.peers,
+		selfId: () => runner?.id ?? "pending"
 	});
 	const declaredServers = options.profile?.session?.mcpServers;
 	const connected = options.mcp?.tools ?? options.mcpTools;
@@ -3630,6 +4115,11 @@ var CodexAgentTracker = class {
 			record = {
 				agentThreadId,
 				toolUseId,
+				scope: {
+					nonce: toolUseId,
+					toolUseEmitted: /* @__PURE__ */ new Set(),
+					sectionIndex: /* @__PURE__ */ new Map()
+				},
 				status: "running",
 				startedAt: ts,
 				toolCount: 0,
@@ -4017,6 +4507,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";
@@ -4215,6 +4728,12 @@ function steerUnsupported(error) {
 	if (!(error instanceof JsonRpcError)) return false;
 	return error.code === -32601 || error.code === -32600 && error.message.includes("unknown variant `turn/steer`");
 }
+function rolloutMissing(error) {
+	return error instanceof JsonRpcError && error.code === -32600 && error.message.startsWith("no rollout found for thread id");
+}
+function threadLostNotice(threadId) {
+	return `Codex has no record of this session's thread (${threadId}): it was never saved to CODEX_HOME, or has since been removed. A new thread was started, so the model begins without the earlier conversation.`;
+}
 function rateLimitWindowName(minutes) {
 	if (typeof minutes !== "number" || !Number.isFinite(minutes) || minutes <= 0) return;
 	if (minutes === 300) return "five_hour";
@@ -4244,8 +4763,9 @@ var CodexRunner = class {
 	#connection;
 	#workspaceWrite;
 	#threadLoaded = false;
+	#threadMaterialized;
 	#numTurns = 0;
-	#totalCostUsd;
+	#cost = new CostLedger();
 	#started = false;
 	#closed = false;
 	#imageDir;
@@ -4255,9 +4775,15 @@ var CodexRunner = class {
 	#replayingHistory = false;
 	#skillsFingerprint;
 	#skillsRefresh;
+	#skillPaths = /* @__PURE__ */ new Map();
 	#producedPaths = /* @__PURE__ */ new Set();
 	#mcpStatus = /* @__PURE__ */ new Map();
 	#agents = new CodexAgentTracker();
+	#idleScope = {
+		nonce: "codex",
+		toolUseEmitted: /* @__PURE__ */ new Set(),
+		sectionIndex: /* @__PURE__ */ new Map()
+	};
 	#clearedThreads = /* @__PURE__ */ new Set();
 	#cannotSteer = /* @__PURE__ */ new WeakSet();
 	#clearsPending = 0;
@@ -4272,6 +4798,7 @@ var CodexRunner = class {
 		this.#model = config.model;
 		this.#reasoningEffort = config.reasoningEffort;
 		this.#sdkSessionId = config.resume;
+		this.#threadMaterialized = config.resume !== void 0;
 		this.id = id;
 		this.createdAt = Date.now();
 	}
@@ -4282,7 +4809,10 @@ var CodexRunner = class {
 		return this.#status;
 	}
 	get sdkSessionId() {
-		return this.#sdkSessionId;
+		return this.#resumableThreadId();
+	}
+	#resumableThreadId() {
+		return this.#threadMaterialized ? this.#sdkSessionId : void 0;
 	}
 	get lastSeq() {
 		return this.#log.seq;
@@ -4293,7 +4823,7 @@ var CodexRunner = class {
 	info() {
 		return {
 			id: this.id,
-			sdkSessionId: this.#sdkSessionId,
+			sdkSessionId: this.#resumableThreadId(),
 			status: this.#status,
 			cwd: this.#cwd,
 			profile: this.#config.profile,
@@ -4312,7 +4842,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 +4854,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;
@@ -4372,9 +4910,9 @@ var CodexRunner = class {
 			throw error;
 		}
 	}
-	sendMessage(text, attachments) {
+	sendMessage(text, attachments, options) {
 		if (this.#closed) throw new Error("session is closed");
-		if (text.trim() === "/clear" && !attachments?.length) {
+		if (text.trim() === "/clear" && !attachments?.length && !options?.origin) {
 			this.clearContext().catch((error) => {
 				this.#emit({
 					type: "session_error",
@@ -4383,7 +4921,7 @@ var CodexRunner = class {
 			});
 			return;
 		}
-		const input = this.#buildInput(text, attachments ?? []);
+		const input = this.#buildInput(options?.origin ? peerMessageEnvelope(text, options.origin) : text, attachments ?? []);
 		const echo = () => this.#emit({
 			type: "user_message",
 			message: {
@@ -4392,7 +4930,8 @@ var CodexRunner = class {
 			},
 			parentToolUseId: null,
 			attachments: attachments?.length ? attachments.map(attachmentRef) : void 0,
-			uuid: randomUUID()
+			uuid: randomUUID(),
+			...options?.origin ? { origin: options.origin } : {}
 		});
 		if (this.#backfillPending) this.#turnChain = this.#turnChain.then(echo);
 		else echo();
@@ -4478,7 +5017,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");
@@ -4522,12 +5061,15 @@ var CodexRunner = class {
 	async #clearNow() {
 		if (this.#closed) throw new Error("session is closed");
 		const previousThread = this.#sdkSessionId;
+		const previousMaterialized = this.#threadMaterialized;
 		this.#sdkSessionId = void 0;
+		this.#threadMaterialized = false;
 		this.#threadLoaded = false;
 		if (this.#connection) try {
 			await this.#ensureThread();
 		} catch (error) {
 			this.#sdkSessionId = previousThread;
+			this.#threadMaterialized = previousMaterialized;
 			this.#threadLoaded = false;
 			throw error;
 		}
@@ -4541,7 +5083,7 @@ var CodexRunner = class {
 		this.#pendingLocalCommands = [];
 		this.#emit({
 			type: "conversation_reset",
-			sdkSessionId: this.#sdkSessionId
+			sdkSessionId: this.#resumableThreadId()
 		});
 	}
 	async #interruptTurn() {
@@ -4684,15 +5226,35 @@ var CodexRunner = class {
 				approvalsReviewer: APPROVALS_REVIEWER_BY_MODE[this.#permissionMode]
 			};
 			if (this.#model) options.model = this.#model;
-			const resuming = this.#sdkSessionId !== void 0;
-			const result = resuming ? await connection.request("thread/resume", {
-				threadId: this.#sdkSessionId,
-				...options
-			}) : await connection.request("thread/start", options);
+			if (this.#config.peers) options.dynamicTools = peerToolSpecs().map((spec) => ({
+				type: "function",
+				...spec
+			}));
+			const resuming = this.#resumableThreadId();
+			let lostThread;
+			let result;
+			if (resuming !== void 0) try {
+				result = await connection.request("thread/resume", {
+					threadId: resuming,
+					...options
+				});
+			} catch (error) {
+				if (!rolloutMissing(error)) throw error;
+				lostThread = resuming;
+				result = await connection.request("thread/start", options);
+			}
+			else result = await connection.request("thread/start", options);
 			if (typeof result?.thread?.id === "string") this.#sdkSessionId = result.thread.id;
+			if (lostThread !== void 0) {
+				this.#threadMaterialized = false;
+				this.#emit({
+					type: "session_error",
+					message: threadLostNotice(lostThread)
+				});
+			}
 			if (typeof result?.model === "string") this.#resolvedModel = result.model;
 			if (typeof result?.reasoningEffort === "string") this.#resolvedEffort = result.reasoningEffort;
-			if (resuming && this.#backfillPending && !this.#resumedHistory) this.#resumedHistory = {
+			if (resuming !== void 0 && lostThread === void 0 && this.#backfillPending && !this.#resumedHistory) this.#resumedHistory = {
 				turns: Array.isArray(result?.thread?.turns) ? result.thread.turns : [],
 				partial: typeof result?.turnsBackwardsCursor === "string"
 			};
@@ -4710,11 +5272,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;
@@ -4864,8 +5429,17 @@ var CodexRunner = class {
 			};
 		});
 		this.#activeTurn = active;
+		this.#idleScope = {
+			nonce: active.nonce,
+			toolUseEmitted: /* @__PURE__ */ new Set(),
+			sectionIndex: /* @__PURE__ */ new Map()
+		};
 		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,
@@ -4945,15 +5519,15 @@ var CodexRunner = class {
 	}
 	#reasoningDelta(method) {
 		return (params) => {
-			const active = this.#activeTurn;
-			if (!active) return;
+			const context = this.#itemContext(params);
+			if (!context) return;
+			const { scope, agent } = context;
 			const payload = params;
 			if (typeof payload?.delta !== "string" || !payload.delta) return;
 			const index = payload.contentIndex ?? payload.summaryIndex ?? 0;
-			const agent = this.#agentFor(params);
-			const key = `${agent?.toolUseId ?? ""}:${payload.itemId ?? ""}:${method}`;
-			const previous = active.sectionIndex.get(key);
-			active.sectionIndex.set(key, index);
+			const key = `${payload.itemId ?? ""}:${method}`;
+			const previous = scope.sectionIndex.get(key);
+			scope.sectionIndex.set(key, index);
 			const separator = previous !== void 0 && index > previous ? "\n\n" : "";
 			this.#emitDelta({
 				type: "thinking_delta",
@@ -4962,22 +5536,34 @@ var CodexRunner = class {
 		};
 	}
 	#itemProgress = (params) => {
-		const active = this.#activeTurn;
-		if (!active) return;
+		const context = this.#itemContext(params);
 		const item = params?.item;
-		if (item) this.#handleItemProgress(item, active, this.#agentFor(params));
+		if (!context || !item) return;
+		this.#handleItemProgress(item, context.scope, context.agent);
 	};
+	#itemContext(params) {
+		const agent = this.#agentFor(params);
+		if (agent) return {
+			scope: agent.scope,
+			agent
+		};
+		const active = this.#activeTurn;
+		if (active) return { scope: active };
+		if ((params?.item)?.type === "subAgentActivity") return { scope: this.#idleScope };
+	}
 	#notifications = {
 		"thread/started": (params) => {
 			const thread = params?.thread;
 			if (typeof thread?.id === "string") this.#sdkSessionId = thread.id;
 		},
 		"turn/started": (params) => {
+			this.#threadMaterialized = true;
 			const active = this.#activeTurn;
 			const turn = params?.turn;
 			if (active && turn) this.#adoptTurnId(active, turn.id);
 		},
 		"turn/completed": (params) => {
+			this.#threadMaterialized = true;
 			const active = this.#activeTurn;
 			const turn = params?.turn;
 			if (!active || !turn) return;
@@ -4987,18 +5573,19 @@ var CodexRunner = class {
 		"item/started": this.#itemProgress,
 		"item/updated": this.#itemProgress,
 		"item/completed": (params) => {
-			const active = this.#activeTurn;
-			if (!active) return;
+			const context = this.#itemContext(params);
 			const item = params?.item;
-			if (item) this.#handleItemCompleted(item, active, this.#agentFor(params));
+			if (!context || !item) return;
+			this.#handleItemCompleted(item, context.scope, context.agent);
 		},
 		"item/agentMessage/delta": (params) => {
-			if (!this.#activeTurn) return;
+			const context = this.#itemContext(params);
+			if (!context) return;
 			const delta = params?.delta;
 			if (typeof delta === "string" && delta) this.#emitDelta({
 				type: "text_delta",
 				text: delta
-			}, this.#agentFor(params)?.toolUseId ?? null);
+			}, context.agent?.toolUseId ?? null);
 		},
 		"item/reasoning/textDelta": this.#reasoningDelta("item/reasoning/textDelta"),
 		"item/reasoning/summaryTextDelta": this.#reasoningDelta("item/reasoning/summaryTextDelta"),
@@ -5061,6 +5648,17 @@ var CodexRunner = class {
 	async #answerServerRequest(method, params, wireId) {
 		const channel = APPROVAL_CHANNELS[method];
 		if (channel) return this.#requestApproval(channel, method, params, wireId);
+		if (method === "item/tool/call" && this.#config.peers) {
+			const call = params;
+			const output = await runPeerTool(this.#config.peers, this.id, call.tool, call.arguments);
+			return {
+				success: !output.isError,
+				contentItems: [{
+					type: "inputText",
+					text: output.text
+				}]
+			};
+		}
 		throw new JsonRpcError(-32601, `workerdeck does not handle server request '${method}'`);
 	}
 	#requestApproval(channel, method, params, wireId) {
@@ -5178,6 +5776,11 @@ var CodexRunner = class {
 			this.#emitToolUse(id, `mcp__${item.server}__${item.tool}`, item.arguments, agent);
 			return;
 		}
+		if (item.type === "dynamicToolCall" && !active.toolUseEmitted.has(id)) {
+			active.toolUseEmitted.add(id);
+			this.#emitToolUse(id, item.tool, item.arguments, agent);
+			return;
+		}
 		if (item.type === "contextCompaction" && !active.toolUseEmitted.has(id)) {
 			active.toolUseEmitted.add(id);
 			this.#emit({
@@ -5230,13 +5833,13 @@ var CodexRunner = class {
 				uuid: `${active.nonce}:${item.id}`
 			});
 		},
-		agentMessage: (item, active, id, agent) => {
+		agentMessage: (item, _active, id, agent) => {
 			const text = typeof item.text === "string" ? item.text : "";
 			this.#emitAssistant(id, [{
 				type: "text",
 				text
 			}], agent?.toolUseId ?? null);
-			if (!agent) active.finalText = text;
+			if (!agent && this.#activeTurn) this.#activeTurn.finalText = text;
 		},
 		reasoning: (item, _active, id, agent) => {
 			const summary = Array.isArray(item.summary) ? item.summary.filter(Boolean) : [];
@@ -5273,6 +5876,14 @@ var CodexRunner = class {
 			const isError = item.error !== void 0 && item.error !== null || item.status === "failed";
 			this.#emitToolResult(id, item.error?.message ?? (item.result === void 0 || item.result === null ? "" : JSON.stringify(item.result)), isError, void 0, agent?.toolUseId ?? null);
 		},
+		dynamicToolCall: (item, active, id, agent) => {
+			if (!active.toolUseEmitted.has(id)) {
+				active.toolUseEmitted.add(id);
+				this.#emitToolUse(id, item.tool, item.arguments, agent);
+			}
+			const text = (item.contentItems ?? []).map((part) => part.text).filter((part) => typeof part === "string").join("\n");
+			this.#emitToolResult(id, text, item.success === false || item.status === "failed", void 0, agent?.toolUseId ?? null);
+		},
 		webSearch: (item, _active, id, agent) => {
 			this.#emitToolUse(id, "CodexWebSearch", { query: item.query }, agent);
 			this.#emitToolResult(id, "", false, void 0, agent?.toolUseId ?? null);
@@ -5296,6 +5907,7 @@ var CodexRunner = class {
 			});
 		},
 		subAgentActivity: (item, _active, id, agent) => {
+			if (item.agentThreadId === this.#sdkSessionId) return;
 			if (this.#replayingHistory) {
 				if (item.kind !== "started") return;
 				this.#emitToolUse(id, CODEX_AGENT_TOOL, {
@@ -5413,23 +6025,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 +6417,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, PEER_MCP_SERVER, PEER_MESSAGE_MAX_CHARS, PEER_RECENT_DEFAULT, PEER_RECENT_MAX, PEER_TOOL_NAMES, PendingRequestRegistry, QuickJsExecutor, SUPPORTED_ATTACHMENT_TYPES, SessionRunner, attachmentContentBlocks, attachmentKind, attachmentRef, checkClaudeAuth, claudeAdapter, codexAdapter, connectAppServer, connectMcpTools, createEngineSession, createToolContext, createWebFetch, getEngineAdapter, htmlToMarkdown, installPeerDirectory, installedPeerDirectory, isHostAllowed, isPrivateAddress, listCodexSessions, localCommandContext, localCommandTranscript, mcpStatusInfo, modelOptionsFromSdk, normalizeMediaType, normalizeSdkMessage, peerDirectoryHandle, peerMessageEnvelope, peerSummary, peerToolSpecs, providerAdapter, recentLines, replaySlice, resolveBundledClaudeExecutable, resolveBundledCodexExecutable, runPeerTool, toApiMessage, toExecutionResult, truncateResultBlocks, withHostTools, withMcpTools };
 
 //# sourceMappingURL=index.mjs.map