@workerdeck/core 2.2.1 → 2.4.0

package/build/index.d.mts

@@ -139,6 +139,7 @@ type SessionInfoFn = (sdkSessionId: string, options: {
   dir?: string;
 }) => Promise<SDKSessionInfo | undefined>;
 type SessionRunnerConfig = CreateSessionRequest & {
+  epoch?: number;
   queryFn?: QueryFn;
   env?: Record<string, string | undefined>;
   pathToClaudeCodeExecutable?: string;
@@ -189,6 +190,7 @@ declare function truncateResultBlocks(event: SessionEvent): SessionEvent;
 //#endregion
 //#region src/engines/provider/runner.d.ts
 type AiSdkRunnerConfig = Omit<CreateSessionRequest, 'cwd'> & {
+  epoch?: number;
   cwd?: string;
   languageModel: LanguageModel$1;
   tools?: ToolSet$1;
@@ -753,6 +755,7 @@ declare const CODEX_CATALOG: ModelCatalog;
 //#endregion
 //#region src/engines/codex/runner.d.ts
 type CodexRunnerConfig = CreateSessionRequest & {
+  epoch?: number;
   connectFn: AppServerConnectFn;
   env?: Record<string, string | undefined>;
   codexHome?: string;

package/build/index.mjs

@@ -924,6 +924,9 @@ var SessionRunner = class {
 	#numTurns;
 	#input = new InputQueue();
 	#pendingLocalCommands = [];
+	#compactionId;
+	#compactionTurns = 0;
+	#idleWhileCompacting = false;
 	#query;
 	#capabilitiesEmitted = false;
 	#subscriptionType;
@@ -968,6 +971,7 @@ var SessionRunner = class {
 			canBypassPermissions: this.#config.permissionMode === "bypassPermissions" || this.#config.allowDangerouslySkipPermissions === true,
 			apiKeySource: this.#apiKeySource,
 			createdAt: this.createdAt,
+			epoch: this.#config.epoch,
 			lastSeq: this.#log.seq,
 			activityCount: this.#log.activityCount,
 			proseCount: this.#log.proseCount,
@@ -1250,6 +1254,17 @@ var SessionRunner = class {
 			else if (msg.state === "running") this.#setStatus("running");
 			return;
 		}
+		if (msg.type === "system" && msg.subtype === "status") this.#handleCompactionStatus(msg);
+		if (msg.type === "system" && msg.subtype === "compact_boundary") {
+			const meta = msg.compact_metadata;
+			this.#settleCompaction({
+				trigger: meta.trigger,
+				preTokens: meta.pre_tokens,
+				postTokens: meta.post_tokens
+			}, msg.uuid);
+			this.#fetchContextUsage();
+			return;
+		}
 		const body = normalizeSdkMessage(msg);
 		if (body) {
 			this.#emit(body);
@@ -1259,6 +1274,8 @@ var SessionRunner = class {
 				this.#fetchContextUsage();
 			}
 			if (body.type === "turn_result") {
+				this.#compactionTurns += 1;
+				if (this.#compactionTurns > 1) this.#settleCompaction();
 				this.#totalCostUsd = body.totalCostUsd;
 				this.#numTurns = body.numTurns;
 				if (this.#pending.size === 0) this.#setStatus("idle");
@@ -1269,6 +1286,32 @@ var SessionRunner = class {
 			}
 		}
 	}
+	#handleCompactionStatus(msg) {
+		if (msg.status === "compacting") {
+			this.#compactionId ??= randomUUID();
+			this.#compactionTurns = 0;
+			this.#emit({
+				type: "context_compacted",
+				uuid: this.#compactionId,
+				pending: true
+			});
+			this.#setStatus("running");
+			return;
+		}
+		if (msg.compact_result === "failed") this.#settleCompaction({ error: msg.compact_error ?? "the engine reported no reason" });
+	}
+	#settleCompaction(settled = {}, boundaryUuid) {
+		const uuid = this.#compactionId ?? boundaryUuid;
+		if (uuid === void 0) return;
+		this.#compactionId = void 0;
+		this.#emit({
+			type: "context_compacted",
+			uuid,
+			...settled
+		});
+		if (this.#idleWhileCompacting && this.#pending.size === 0) this.#setStatus("idle");
+		this.#idleWhileCompacting = false;
+	}
 	async #fetchToolTitles() {
 		const servers = await this.mcpServers().catch(() => void 0);
 		if (this.#closed || !servers) return;
@@ -1464,6 +1507,11 @@ var SessionRunner = class {
 		}
 	}
 	#setStatus(status, detail) {
+		if (status === "idle" && this.#compactionId !== void 0) {
+			this.#idleWhileCompacting = true;
+			return;
+		}
+		this.#idleWhileCompacting = false;
 		if (this.#status === status && this.#statusDetail === detail) return;
 		if (this.#status === "closed" || this.#status === "failed") return;
 		this.#status = status;
@@ -1595,6 +1643,7 @@ var AiSdkRunner = class {
 			model: this.#modelId(),
 			permissionMode: this.#permissionMode,
 			createdAt: this.createdAt,
+			epoch: this.#config.epoch,
 			lastSeq: this.#log.seq,
 			activityCount: this.#log.activityCount,
 			proseCount: this.#log.proseCount,
@@ -1771,7 +1820,7 @@ var AiSdkRunner = class {
 				behavior: "allow",
 				resolvedBy: source
 			});
-			this.#dispatchSingle(approval.toolCallId);
+			this.#dispatchSingle(approval.toolCallId, decision.updatedInput);
 		} else {
 			const message = decision.message ?? "Permission denied by user";
 			this.#emit({
@@ -1824,7 +1873,21 @@ var AiSdkRunner = class {
 		this.#turnChain = run.then(() => void 0, () => void 0);
 		await run;
 	}
+	#cancelPendingApprovals(message) {
+		for (const [requestId, { timer }] of this.#pendingApprovals) {
+			clearTimeout(timer);
+			this.#emit({
+				type: "permission_resolved",
+				requestId,
+				behavior: "deny",
+				resolvedBy: "client",
+				message
+			});
+		}
+		this.#pendingApprovals.clear();
+	}
 	async interrupt() {
+		this.#cancelPendingApprovals("interrupted");
 		if (this.#abort) this.#abort.abort();
 		else if (this.#pendingToolCalls.size > 0) {
 			const accum = this.#turnAccum ?? {
@@ -1972,15 +2035,32 @@ var AiSdkRunner = class {
 		if (anyAwaiting) this.#setStatus("awaiting_approval");
 		if (anyDeferred) Promise.allSettled(inFlight).then(() => this.#announceParked());
 	}
-	#dispatchSingle(toolCallId) {
+	#dispatchSingle(toolCallId, updatedInput) {
 		const executor = this.#config.executor;
 		if (!executor) return;
 		const call = this.#pendingToolCalls.get(toolCallId);
 		if (!call || this.#dispatched.has(toolCallId)) return;
+		if (updatedInput !== void 0) this.#amendToolInput(call, updatedInput);
 		this.#dispatched.add(toolCallId);
 		const dispatched = this.#dispatchCall(executor, call);
 		if (dispatched.deferred) dispatched.promise.then(() => this.#announceParked());
 	}
+	#amendToolInput(call, input) {
+		call.input = input;
+		for (let i = this.#messages.length - 1; i >= 0; i--) {
+			const message = this.#messages[i];
+			if (message.role !== "assistant" || !Array.isArray(message.content) || !message.content.some((part) => callsTool(part, call.toolCallId))) continue;
+			const content = message.content.map((part) => callsTool(part, call.toolCallId) ? {
+				...part,
+				input
+			} : part);
+			this.#messages[i] = {
+				...message,
+				content
+			};
+			return;
+		}
+	}
 	#dispatchCall(executor, call) {
 		const toolCall = {
 			executionId: call.toolCallId,
@@ -2324,6 +2404,9 @@ function textValue(output) {
 function errorText(error) {
 	return error instanceof Error ? error.message : String(error);
 }
+function callsTool(part, toolCallId) {
+	return part.type === "tool-call" && part.toolCallId === toolCallId;
+}
 //#endregion
 //#region src/engines/claude/auth.ts
 function resolveBundledClaudeExecutable() {
@@ -4196,6 +4279,7 @@ var CodexRunner = class {
 			permissionMode: this.#permissionMode,
 			canBypassPermissions: true,
 			createdAt: this.createdAt,
+			epoch: this.#config.epoch,
 			lastSeq: this.#log.seq,
 			activityCount: this.#log.activityCount,
 			proseCount: this.#log.proseCount,
@@ -5015,6 +5099,16 @@ var CodexRunner = class {
 			this.#emitToolUse(id, `mcp__${item.server}__${item.tool}`, item.arguments, agent);
 			return;
 		}
+		if (item.type === "contextCompaction" && !active.toolUseEmitted.has(id)) {
+			active.toolUseEmitted.add(id);
+			this.#emit({
+				type: "context_compacted",
+				uuid: id,
+				pending: true,
+				parentToolUseId: agent?.toolUseId ?? null
+			});
+			return;
+		}
 		if (item.type === "collabAgentToolCall" && !active.toolUseEmitted.has(id)) {
 			active.toolUseEmitted.add(id);
 			this.#emitToolUse(id, CODEX_COLLAB_TOOL, collabInput(item), agent);