acpx 0.9.0 → 0.10.0

package/dist/{live-checkpoint-D5d-K9s1.js → live-checkpoint-CuFft_Nd.js}

@@ -3,12 +3,12 @@ import { fileURLToPath } from "node:url";
 import path from "node:path";
 import fs$1 from "node:fs/promises";
 import os from "node:os";
+import { randomUUID } from "node:crypto";
 import { execFile, spawn } from "node:child_process";
 import { Readable, Writable } from "node:stream";
 import { ClientSideConnection, PROTOCOL_VERSION } from "@agentclientprotocol/sdk";
 import readline from "node:readline/promises";
 import { promisify } from "node:util";
-import { randomUUID } from "node:crypto";
 //#region src/errors.ts
 var AcpxOperationalError = class extends Error {
 	outputCode;
@@ -827,6 +827,104 @@ function resourceBlockDisplayText(block) {
 	return "text" in block.resource && typeof block.resource.text === "string" ? block.resource.text : block.resource.uri;
 }
 //#endregion
+//#region src/acp/jsonrpc.ts
+function asRecord$4(value) {
+	if (!value || typeof value !== "object" || Array.isArray(value)) return null;
+	return value;
+}
+function hasValidId(value) {
+	return value === null || typeof value === "string" || typeof value === "number" && Number.isFinite(value);
+}
+function isErrorObject(value) {
+	const record = asRecord$4(value);
+	return !!record && typeof record.code === "number" && Number.isFinite(record.code) && typeof record.message === "string";
+}
+function hasResultOrError(value) {
+	const hasResult = Object.hasOwn(value, "result");
+	const hasError = Object.hasOwn(value, "error");
+	if (hasResult && hasError) return false;
+	if (!hasResult && !hasError) return false;
+	if (hasError && !isErrorObject(value.error)) return false;
+	return true;
+}
+function hasMethod(value) {
+	return typeof value.method === "string" && value.method.length > 0;
+}
+function isJsonRpcRequest(value) {
+	return hasMethod(value) && Object.hasOwn(value, "id") && hasValidId(value.id);
+}
+function isJsonRpcNotificationRecord(value) {
+	return hasMethod(value) && !Object.hasOwn(value, "id");
+}
+function isJsonRpcResponse(value) {
+	if (hasMethod(value) || !Object.hasOwn(value, "id") || !hasValidId(value.id)) return false;
+	return hasResultOrError(value);
+}
+function isAcpJsonRpcMessage(value) {
+	const record = asRecord$4(value);
+	if (!record || record.jsonrpc !== "2.0") return false;
+	return isJsonRpcNotificationRecord(record) || isJsonRpcRequest(record) || isJsonRpcResponse(record);
+}
+function isJsonRpcNotification(message) {
+	return Object.hasOwn(message, "method") && typeof message.method === "string" && !Object.hasOwn(message, "id");
+}
+function isSessionUpdateNotification(message) {
+	return isJsonRpcNotification(message) && message.method === "session/update";
+}
+function extractSessionUpdateNotification(message) {
+	if (!isSessionUpdateNotification(message)) return;
+	const params = asRecord$4(message.params);
+	if (!params) return;
+	const sessionId = typeof params.sessionId === "string" ? params.sessionId : null;
+	if (!sessionId) return;
+	const update = asRecord$4(params.update);
+	if (!update || typeof update.sessionUpdate !== "string") return;
+	return {
+		sessionId,
+		update
+	};
+}
+function parsePromptStopReason(message) {
+	if (!Object.hasOwn(message, "id") || !Object.hasOwn(message, "result")) return;
+	const record = asRecord$4(message.result);
+	if (!record) return;
+	return typeof record.stopReason === "string" ? record.stopReason : void 0;
+}
+function parseJsonRpcErrorMessage(message) {
+	if (!Object.hasOwn(message, "error")) return;
+	const errorRecord = asRecord$4(message.error);
+	if (!errorRecord || typeof errorRecord.message !== "string") return;
+	return errorRecord.message;
+}
+//#endregion
+//#region src/session/event-log.ts
+const DEFAULT_EVENT_SEGMENT_MAX_BYTES = 64 * 1024 * 1024;
+function sessionBaseDir$1() {
+	return path.join(os.homedir(), ".acpx", "sessions");
+}
+function safeSessionId(sessionId) {
+	return encodeURIComponent(sessionId);
+}
+function sessionEventActivePath(sessionId) {
+	return path.join(sessionBaseDir$1(), `${safeSessionId(sessionId)}.stream.ndjson`);
+}
+function sessionEventSegmentPath(sessionId, segment) {
+	return path.join(sessionBaseDir$1(), `${safeSessionId(sessionId)}.stream.${segment}.ndjson`);
+}
+function sessionEventLockPath(sessionId) {
+	return path.join(sessionBaseDir$1(), `${safeSessionId(sessionId)}.stream.lock`);
+}
+function defaultSessionEventLog(sessionId) {
+	return {
+		active_path: sessionEventActivePath(sessionId),
+		segment_count: 5,
+		max_segment_bytes: DEFAULT_EVENT_SEGMENT_MAX_BYTES,
+		max_segments: 5,
+		last_write_at: void 0,
+		last_write_error: null
+	};
+}
+//#endregion
 //#region src/acp/agent-session-id.ts
 const AGENT_SESSION_ID_META_KEYS = ["agentSessionId", "sessionId"];
 function normalizeAgentSessionId(value) {
@@ -890,177 +988,18 @@ function serializeSessionRecordForDisk(record) {
 		updated_at: canonical.updated_at,
 		cumulative_token_usage: canonical.cumulative_token_usage,
 		request_token_usage: canonical.request_token_usage,
-		acpx: canonical.acpx
-	};
-}
-//#endregion
-//#region src/perf-metrics.ts
-const counters = /* @__PURE__ */ new Map();
-const gauges = /* @__PURE__ */ new Map();
-const timings = /* @__PURE__ */ new Map();
-function hrNow() {
-	return process.hrtime.bigint();
-}
-function durationMs(start) {
-	return Number(process.hrtime.bigint() - start) / 1e6;
-}
-function roundMetric(value) {
-	return Number(value.toFixed(3));
-}
-function incrementPerfCounter(name, delta = 1) {
-	counters.set(name, (counters.get(name) ?? 0) + delta);
-}
-function setPerfGauge(name, value) {
-	gauges.set(name, value);
-}
-function recordPerfDuration(name, durationMsValue) {
-	const next = timings.get(name) ?? {
-		count: 0,
-		totalMs: 0,
-		maxMs: 0
-	};
-	next.count += 1;
-	next.totalMs += durationMsValue;
-	next.maxMs = Math.max(next.maxMs, durationMsValue);
-	timings.set(name, next);
-}
-async function measurePerf(name, run) {
-	const startedAt = hrNow();
-	try {
-		return await run();
-	} finally {
-		recordPerfDuration(name, durationMs(startedAt));
-	}
-}
-function startPerfTimer(name) {
-	const startedAt = hrNow();
-	return () => {
-		const elapsedMs = durationMs(startedAt);
-		recordPerfDuration(name, elapsedMs);
-		return elapsedMs;
-	};
-}
-function getPerfMetricsSnapshot() {
-	return {
-		counters: Object.fromEntries(counters.entries()),
-		gauges: Object.fromEntries(gauges.entries()),
-		timings: Object.fromEntries([...timings.entries()].map(([name, bucket]) => [name, {
-			count: bucket.count,
-			totalMs: roundMetric(bucket.totalMs),
-			maxMs: roundMetric(bucket.maxMs)
-		}]))
-	};
-}
-function resetPerfMetrics() {
-	counters.clear();
-	gauges.clear();
-	timings.clear();
-}
-function formatPerfMetric(name, durationMsValue) {
-	return `${name}=${roundMetric(durationMsValue)}ms`;
-}
-//#endregion
-//#region src/persisted-key-policy.ts
-const SNAKE_CASE_KEY = /^[a-z][a-z0-9_]*$/;
-const ZED_TAG_KEYS = new Set([
-	"User",
-	"Agent",
-	"Resume",
-	"Text",
-	"Mention",
-	"Image",
-	"Audio",
-	"Thinking",
-	"RedactedThinking",
-	"ToolUse"
-]);
-const MAP_OBJECT_PATHS = new Set(["request_token_usage", "messages.Agent.tool_results"]);
-const OPAQUE_VALUE_PATHS = new Set([
-	"agent_capabilities",
-	"messages.Agent.content.ToolUse.input",
-	"acpx.desired_config_options",
-	"acpx.config_options"
-]);
-function isRecord(value) {
-	return !!value && typeof value === "object" && !Array.isArray(value);
-}
-function joinPath(path) {
-	return path.join(".");
-}
-function isAllowedKey(path, key) {
-	if (ZED_TAG_KEYS.has(key)) return true;
-	return false;
-}
-function shouldSkipKeyRule(path) {
-	return MAP_OBJECT_PATHS.has(joinPath(path));
-}
-function shouldSkipDescend(path) {
-	return OPAQUE_VALUE_PATHS.has(joinPath(path)) || isToolResultOutputPath(path);
-}
-function isToolResultOutputTail(path, toolResultsIndex) {
-	return toolResultsIndex !== -1 && toolResultsIndex + 2 === path.length - 1;
-}
-function isToolResultOutputPath(path) {
-	if (path.length < 5 || path[path.length - 1] !== "output") return false;
-	const toolResultsIndex = path.lastIndexOf("tool_results");
-	if (!isToolResultOutputTail(path, toolResultsIndex)) return false;
-	return path.slice(0, toolResultsIndex + 1).join(".") === "messages.Agent.tool_results";
-}
-function collectViolations(value, path, violations) {
-	if (Array.isArray(value)) {
-		for (const entry of value) collectViolations(entry, path, violations);
-		return;
-	}
-	if (!isRecord(value)) return;
-	const skipKeyRule = shouldSkipKeyRule(path);
-	for (const [key, child] of Object.entries(value)) collectKeyViolation(child, key, path, skipKeyRule, violations);
-}
-function collectKeyViolation(child, key, path, skipKeyRule, violations) {
-	if (!skipKeyRule && !SNAKE_CASE_KEY.test(key) && !isAllowedKey(path, key)) violations.push(`${joinPath(path)}.${key}`.replace(/^\./, ""));
-	const childPath = [...path, key];
-	if (!shouldSkipDescend(childPath)) collectViolations(child, childPath, violations);
-}
-function findPersistedKeyPolicyViolations(value) {
-	const violations = [];
-	collectViolations(value, [], violations);
-	return violations;
-}
-function assertPersistedKeyPolicy(value) {
-	const violations = findPersistedKeyPolicyViolations(value);
-	if (violations.length === 0) return;
-	throw new Error(`Persisted key policy violation (expected snake_case keys): ${violations.join(", ")}`);
-}
-//#endregion
-//#region src/session/event-log.ts
-const DEFAULT_EVENT_SEGMENT_MAX_BYTES = 64 * 1024 * 1024;
-function sessionBaseDir$1() {
-	return path.join(os.homedir(), ".acpx", "sessions");
-}
-function safeSessionId(sessionId) {
-	return encodeURIComponent(sessionId);
-}
-function sessionEventActivePath(sessionId) {
-	return path.join(sessionBaseDir$1(), `${safeSessionId(sessionId)}.stream.ndjson`);
-}
-function sessionEventSegmentPath(sessionId, segment) {
-	return path.join(sessionBaseDir$1(), `${safeSessionId(sessionId)}.stream.${segment}.ndjson`);
-}
-function sessionEventLockPath(sessionId) {
-	return path.join(sessionBaseDir$1(), `${safeSessionId(sessionId)}.stream.lock`);
-}
-function defaultSessionEventLog(sessionId) {
-	return {
-		active_path: sessionEventActivePath(sessionId),
-		segment_count: 5,
-		max_segment_bytes: DEFAULT_EVENT_SEGMENT_MAX_BYTES,
-		max_segments: 5,
-		last_write_at: void 0,
-		last_write_error: null
+		acpx: canonical.acpx,
+		imported_from: canonical.importedFrom ? {
+			record_id: canonical.importedFrom.recordId,
+			cwd_original: canonical.importedFrom.cwdOriginal,
+			exported_by: canonical.importedFrom.exportedBy,
+			exported_at: canonical.importedFrom.exportedAt
+		} : void 0
 	};
 }
 //#endregion
 //#region src/session/persistence/parse.ts
-function asRecord$4(value) {
+function asRecord$3(value) {
 	if (!value || typeof value !== "object" || Array.isArray(value)) return;
 	return value;
 }
@@ -1072,7 +1011,7 @@ function isStringArray(value) {
 }
 function parseTokenUsage(raw) {
 	if (raw === void 0 || raw === null) return;
-	const record = asRecord$4(raw);
+	const record = asRecord$3(raw);
 	if (!record) return null;
 	const usage = {};
 	for (const field of [
@@ -1093,7 +1032,7 @@ function isNonNegativeFiniteNumber(value) {
 }
 function parseRequestTokenUsage(raw) {
 	if (raw === void 0 || raw === null) return;
-	const record = asRecord$4(raw);
+	const record = asRecord$3(raw);
 	if (!record) return null;
 	const usage = {};
 	for (const [key, value] of Object.entries(record)) {
@@ -1104,25 +1043,25 @@ function parseRequestTokenUsage(raw) {
 	return usage;
 }
 function isSessionMessageImage(raw) {
-	const record = asRecord$4(raw);
+	const record = asRecord$3(raw);
 	if (!record || typeof record.source !== "string") return false;
 	if (record.size === void 0 || record.size === null) return true;
-	const size = asRecord$4(record.size);
+	const size = asRecord$3(record.size);
 	return !!size && isFiniteNumber(size.width) && isFiniteNumber(size.height);
 }
 function isSessionMessageAudio(raw) {
-	const record = asRecord$4(raw);
+	const record = asRecord$3(raw);
 	return !!record && typeof record.source === "string" && typeof record.mime_type === "string";
 }
 function isFiniteNumber(value) {
 	return typeof value === "number" && Number.isFinite(value);
 }
 function isUserContent(raw) {
-	const record = asRecord$4(raw);
+	const record = asRecord$3(raw);
 	if (!record) return false;
 	if (typeof record.Text === "string") return true;
 	if (record.Mention !== void 0) {
-		const mention = asRecord$4(record.Mention);
+		const mention = asRecord$3(record.Mention);
 		return !!mention && typeof mention.uri === "string" && typeof mention.content === "string";
 	}
 	if (record.Image !== void 0) return isSessionMessageImage(record.Image);
@@ -1130,7 +1069,7 @@ function isUserContent(raw) {
 	return false;
 }
 function isToolUse(raw) {
-	const record = asRecord$4(raw);
+	const record = asRecord$3(raw);
 	return !!record && hasStringFields(record, [
 		"id",
 		"name",
@@ -1144,18 +1083,18 @@ function isOptionalString(value) {
 	return value === void 0 || value === null || typeof value === "string";
 }
 function isToolResultContent(raw) {
-	const record = asRecord$4(raw);
+	const record = asRecord$3(raw);
 	if (!record) return false;
 	if (typeof record.Text === "string") return true;
 	if (record.Image !== void 0) return isSessionMessageImage(record.Image);
 	return false;
 }
 function isToolResult(raw) {
-	const record = asRecord$4(raw);
+	const record = asRecord$3(raw);
 	return !!record && typeof record.tool_use_id === "string" && typeof record.tool_name === "string" && typeof record.is_error === "boolean" && isToolResultContent(record.content);
 }
 function isAgentContent(raw) {
-	const record = asRecord$4(raw);
+	const record = asRecord$3(raw);
 	if (!record) return false;
 	if (typeof record.Text === "string") return true;
 	if (record.Thinking !== void 0) return isThinkingContent(record.Thinking);
@@ -1164,21 +1103,21 @@ function isAgentContent(raw) {
 	return false;
 }
 function isThinkingContent(raw) {
-	const thinking = asRecord$4(raw);
+	const thinking = asRecord$3(raw);
 	return !!thinking && typeof thinking.text === "string" && isOptionalString(thinking.signature);
 }
 function isUserMessage$1(raw) {
-	const record = asRecord$4(raw);
+	const record = asRecord$3(raw);
 	if (!record || record.User === void 0) return false;
-	const user = asRecord$4(record.User);
+	const user = asRecord$3(record.User);
 	return !!user && typeof user.id === "string" && Array.isArray(user.content) && user.content.every((entry) => isUserContent(entry));
 }
 function isAgentMessage$1(raw) {
-	const record = asRecord$4(raw);
+	const record = asRecord$3(raw);
 	if (!record || record.Agent === void 0) return false;
-	const agent = asRecord$4(record.Agent);
+	const agent = asRecord$3(record.Agent);
 	if (!agent || !Array.isArray(agent.content) || !agent.content.every(isAgentContent)) return false;
-	const toolResults = asRecord$4(agent.tool_results);
+	const toolResults = asRecord$3(agent.tool_results);
 	if (!toolResults) return false;
 	return Object.values(toolResults).every(isToolResult);
 }
@@ -1209,7 +1148,7 @@ function hasValidConversationCore(record) {
 	return Array.isArray(record.messages) && record.messages.every(isConversationMessage) && typeof record.updated_at === "string";
 }
 function parseAcpxState(raw) {
-	const record = asRecord$4(raw);
+	const record = asRecord$3(raw);
 	if (!record) return;
 	const state = {};
 	assignBooleanTrue(state, "reset_on_next_ensure", record.reset_on_next_ensure);
@@ -1230,7 +1169,7 @@ function assignStringState(state, key, value) {
 	if (typeof value === "string") state[key] = value;
 }
 function assignDesiredConfigOptions(state, raw) {
-	const desiredConfigOptions = asRecord$4(raw);
+	const desiredConfigOptions = asRecord$3(raw);
 	if (!desiredConfigOptions) return;
 	const parsed = Object.fromEntries(Object.entries(desiredConfigOptions).filter((entry) => {
 		const [, value] = entry;
@@ -1239,7 +1178,7 @@ function assignDesiredConfigOptions(state, raw) {
 	if (Object.keys(parsed).length > 0) state.desired_config_options = parsed;
 }
 function assignParsedSessionOptions(state, raw) {
-	const sessionOptions = asRecord$4(raw);
+	const sessionOptions = asRecord$3(raw);
 	if (!sessionOptions) return;
 	const parsedSessionOptions = {};
 	assignSessionOptionModel(parsedSessionOptions, sessionOptions.model);
@@ -1262,11 +1201,11 @@ function assignSessionOptionSystemPrompt(options, value) {
 		options.system_prompt = value;
 		return;
 	}
-	const appendRecord = asRecord$4(value);
+	const appendRecord = asRecord$3(value);
 	if (appendRecord && typeof appendRecord.append === "string" && appendRecord.append.length > 0) options.system_prompt = { append: appendRecord.append };
 }
 function parseEventLog(raw, sessionId) {
-	const record = asRecord$4(raw);
+	const record = asRecord$3(raw);
 	if (!record || !hasValidEventLogCore(record)) return defaultSessionEventLog(sessionId);
 	return {
 		active_path: record.active_path,
@@ -1283,6 +1222,27 @@ function hasValidEventLogCore(record) {
 function isPositiveInteger(value) {
 	return typeof value === "number" && Number.isInteger(value) && value > 0;
 }
+function parseImportedFrom(raw) {
+	if (raw == null) return;
+	const record = asRecord$3(raw);
+	if (!record || typeof record.record_id !== "string" || typeof record.cwd_original !== "string" || typeof record.exported_by !== "string" || typeof record.exported_at !== "string") return null;
+	return {
+		recordId: record.record_id,
+		cwdOriginal: record.cwd_original,
+		exportedBy: record.exported_by,
+		exportedAt: record.exported_at
+	};
+}
+function parseSessionRecordMetadata(record) {
+	const lastRequestId = normalizeOptionalString(record.last_request_id);
+	if (lastRequestId === null) return null;
+	const importedFrom = parseImportedFrom(record.imported_from);
+	if (importedFrom === null) return null;
+	return {
+		lastRequestId,
+		importedFrom
+	};
+}
 function normalizeOptionalName(value) {
 	if (value == null) return;
 	if (typeof value !== "string") return null;
@@ -1315,7 +1275,7 @@ function normalizeOptionalSignal(value) {
 	return Symbol("invalid");
 }
 function parseSessionRecord(raw) {
-	const record = asRecord$4(raw);
+	const record = asRecord$3(raw);
 	if (!record) return null;
 	if (record.schema !== "acpx.session.v1") return null;
 	const optionals = validSessionOptionals({
@@ -1334,8 +1294,8 @@ function parseSessionRecord(raw) {
 	const conversation = parseConversationRecord(record);
 	if (!conversation) return null;
 	const eventLog = parseEventLog(record.event_log, record.acpx_record_id);
-	const lastRequestId = normalizeOptionalString(record.last_request_id);
-	if (lastRequestId === null) return null;
+	const metadata = parseSessionRecordMetadata(record);
+	if (!metadata) return null;
 	return {
 		schema: SESSION_RECORD_SCHEMA,
 		acpxRecordId: record.acpx_record_id,
@@ -1347,7 +1307,7 @@ function parseSessionRecord(raw) {
 		createdAt: record.created_at,
 		lastUsedAt: record.last_used_at,
 		lastSeq: record.last_seq,
-		lastRequestId,
+		lastRequestId: metadata.lastRequestId,
 		eventLog,
 		closed: optionals.closed,
 		closedAt: optionals.closedAt,
@@ -1359,13 +1319,14 @@ function parseSessionRecord(raw) {
 		lastAgentExitAt: optionals.lastAgentExitAt,
 		lastAgentDisconnectReason: optionals.lastAgentDisconnectReason,
 		protocolVersion: typeof record.protocol_version === "number" ? record.protocol_version : void 0,
-		agentCapabilities: asRecord$4(record.agent_capabilities),
+		agentCapabilities: asRecord$3(record.agent_capabilities),
 		title: conversation.title,
 		messages: conversation.messages,
 		updated_at: conversation.updated_at,
 		cumulative_token_usage: conversation.cumulative_token_usage,
 		request_token_usage: conversation.request_token_usage,
-		acpx: parseAcpxState(record.acpx)
+		acpx: parseAcpxState(record.acpx),
+		importedFrom: metadata.importedFrom
 	};
 }
 function hasValidSessionRecordCore(record) {
@@ -1398,14 +1359,151 @@ function hasInvalidExitStatus(options) {
 	return typeof options.lastAgentExitCode === "symbol" || typeof options.lastAgentExitSignal === "symbol";
 }
 //#endregion
+//#region src/perf-metrics.ts
+const counters = /* @__PURE__ */ new Map();
+const gauges = /* @__PURE__ */ new Map();
+const timings = /* @__PURE__ */ new Map();
+function hrNow() {
+	return process.hrtime.bigint();
+}
+function durationMs(start) {
+	return Number(process.hrtime.bigint() - start) / 1e6;
+}
+function roundMetric(value) {
+	return Number(value.toFixed(3));
+}
+function incrementPerfCounter(name, delta = 1) {
+	counters.set(name, (counters.get(name) ?? 0) + delta);
+}
+function setPerfGauge(name, value) {
+	gauges.set(name, value);
+}
+function recordPerfDuration(name, durationMsValue) {
+	const next = timings.get(name) ?? {
+		count: 0,
+		totalMs: 0,
+		maxMs: 0
+	};
+	next.count += 1;
+	next.totalMs += durationMsValue;
+	next.maxMs = Math.max(next.maxMs, durationMsValue);
+	timings.set(name, next);
+}
+async function measurePerf(name, run) {
+	const startedAt = hrNow();
+	try {
+		return await run();
+	} finally {
+		recordPerfDuration(name, durationMs(startedAt));
+	}
+}
+function startPerfTimer(name) {
+	const startedAt = hrNow();
+	return () => {
+		const elapsedMs = durationMs(startedAt);
+		recordPerfDuration(name, elapsedMs);
+		return elapsedMs;
+	};
+}
+function getPerfMetricsSnapshot() {
+	return {
+		counters: Object.fromEntries(counters.entries()),
+		gauges: Object.fromEntries(gauges.entries()),
+		timings: Object.fromEntries([...timings.entries()].map(([name, bucket]) => [name, {
+			count: bucket.count,
+			totalMs: roundMetric(bucket.totalMs),
+			maxMs: roundMetric(bucket.maxMs)
+		}]))
+	};
+}
+function resetPerfMetrics() {
+	counters.clear();
+	gauges.clear();
+	timings.clear();
+}
+function formatPerfMetric(name, durationMsValue) {
+	return `${name}=${roundMetric(durationMsValue)}ms`;
+}
+//#endregion
+//#region src/persisted-key-policy.ts
+const SNAKE_CASE_KEY = /^[a-z][a-z0-9_]*$/;
+const ZED_TAG_KEYS = new Set([
+	"User",
+	"Agent",
+	"Resume",
+	"Text",
+	"Mention",
+	"Image",
+	"Audio",
+	"Thinking",
+	"RedactedThinking",
+	"ToolUse"
+]);
+const MAP_OBJECT_PATHS = new Set(["request_token_usage", "messages.Agent.tool_results"]);
+const OPAQUE_VALUE_PATHS = new Set([
+	"agent_capabilities",
+	"messages.Agent.content.ToolUse.input",
+	"acpx.desired_config_options",
+	"acpx.config_options"
+]);
+function isRecord(value) {
+	return !!value && typeof value === "object" && !Array.isArray(value);
+}
+function joinPath(path) {
+	return path.join(".");
+}
+function isAllowedKey(path, key) {
+	if (ZED_TAG_KEYS.has(key)) return true;
+	return false;
+}
+function shouldSkipKeyRule(path) {
+	return MAP_OBJECT_PATHS.has(joinPath(path));
+}
+function shouldSkipDescend(path) {
+	return OPAQUE_VALUE_PATHS.has(joinPath(path)) || isToolResultOutputPath(path);
+}
+function isToolResultOutputTail(path, toolResultsIndex) {
+	return toolResultsIndex !== -1 && toolResultsIndex + 2 === path.length - 1;
+}
+function isToolResultOutputPath(path) {
+	if (path.length < 5 || path[path.length - 1] !== "output") return false;
+	const toolResultsIndex = path.lastIndexOf("tool_results");
+	if (!isToolResultOutputTail(path, toolResultsIndex)) return false;
+	return path.slice(0, toolResultsIndex + 1).join(".") === "messages.Agent.tool_results";
+}
+function collectViolations(value, path, violations) {
+	if (Array.isArray(value)) {
+		for (const entry of value) collectViolations(entry, path, violations);
+		return;
+	}
+	if (!isRecord(value)) return;
+	const skipKeyRule = shouldSkipKeyRule(path);
+	for (const [key, child] of Object.entries(value)) collectKeyViolation(child, key, path, skipKeyRule, violations);
+}
+function collectKeyViolation(child, key, path, skipKeyRule, violations) {
+	if (!skipKeyRule && !SNAKE_CASE_KEY.test(key) && !isAllowedKey(path, key)) violations.push(`${joinPath(path)}.${key}`.replace(/^\./, ""));
+	const childPath = [...path, key];
+	if (!shouldSkipDescend(childPath)) collectViolations(child, childPath, violations);
+}
+function findPersistedKeyPolicyViolations(value) {
+	const violations = [];
+	collectViolations(value, [], violations);
+	return violations;
+}
+function assertPersistedKeyPolicy(value) {
+	const violations = findPersistedKeyPolicyViolations(value);
+	if (violations.length === 0) return;
+	throw new Error(`Persisted key policy violation (expected snake_case keys): ${violations.join(", ")}`);
+}
+//#endregion
 //#region src/session/persistence/index.ts
 const SESSION_INDEX_SCHEMA = "acpx.session-index.v1";
-function asRecord$3(value) {
+function asRecord$2(value) {
 	if (!value || typeof value !== "object" || Array.isArray(value)) return;
 	return value;
 }
 function parseIndexEntry(raw) {
-	const record = asRecord$3(raw);
+	const record = asRecord$2(raw);
 	if (!record) return;
 	if (!hasRequiredIndexEntryFields(record)) return;
 	if (record.name !== void 0 && typeof record.name !== "string") return;
@@ -1449,7 +1547,7 @@ async function readSessionIndex(sessionDir) {
 	const filePath = sessionIndexPath(sessionDir);
 	try {
 		const payload = await fs$1.readFile(filePath, "utf8");
-		const record = asRecord$3(JSON.parse(payload));
+		const record = asRecord$2(JSON.parse(payload));
 		if (!record || record.schema !== SESSION_INDEX_SCHEMA || !Array.isArray(record.files)) return;
 		const files = record.files.filter((entry) => typeof entry === "string");
 		if (files.length !== record.files.length || !Array.isArray(record.entries)) return;
@@ -2642,76 +2740,6 @@ function buildAgentSpawnOptions(cwd, authCredentials) {
 	};
 }
 //#endregion
-//#region src/acp/jsonrpc.ts
-function asRecord$2(value) {
-	if (!value || typeof value !== "object" || Array.isArray(value)) return null;
-	return value;
-}
-function hasValidId(value) {
-	return value === null || typeof value === "string" || typeof value === "number" && Number.isFinite(value);
-}
-function isErrorObject(value) {
-	const record = asRecord$2(value);
-	return !!record && typeof record.code === "number" && Number.isFinite(record.code) && typeof record.message === "string";
-}
-function hasResultOrError(value) {
-	const hasResult = Object.hasOwn(value, "result");
-	const hasError = Object.hasOwn(value, "error");
-	if (hasResult && hasError) return false;
-	if (!hasResult && !hasError) return false;
-	if (hasError && !isErrorObject(value.error)) return false;
-	return true;
-}
-function hasMethod(value) {
-	return typeof value.method === "string" && value.method.length > 0;
-}
-function isJsonRpcRequest(value) {
-	return hasMethod(value) && Object.hasOwn(value, "id") && hasValidId(value.id);
-}
-function isJsonRpcNotificationRecord(value) {
-	return hasMethod(value) && !Object.hasOwn(value, "id");
-}
-function isJsonRpcResponse(value) {
-	if (hasMethod(value) || !Object.hasOwn(value, "id") || !hasValidId(value.id)) return false;
-	return hasResultOrError(value);
-}
-function isAcpJsonRpcMessage(value) {
-	const record = asRecord$2(value);
-	if (!record || record.jsonrpc !== "2.0") return false;
-	return isJsonRpcNotificationRecord(record) || isJsonRpcRequest(record) || isJsonRpcResponse(record);
-}
-function isJsonRpcNotification(message) {
-	return Object.hasOwn(message, "method") && typeof message.method === "string" && !Object.hasOwn(message, "id");
-}
-function isSessionUpdateNotification(message) {
-	return isJsonRpcNotification(message) && message.method === "session/update";
-}
-function extractSessionUpdateNotification(message) {
-	if (!isSessionUpdateNotification(message)) return;
-	const params = asRecord$2(message.params);
-	if (!params) return;
-	const sessionId = typeof params.sessionId === "string" ? params.sessionId : null;
-	if (!sessionId) return;
-	const update = asRecord$2(params.update);
-	if (!update || typeof update.sessionUpdate !== "string") return;
-	return {
-		sessionId,
-		update
-	};
-}
-function parsePromptStopReason(message) {
-	if (!Object.hasOwn(message, "id") || !Object.hasOwn(message, "result")) return;
-	const record = asRecord$2(message.result);
-	if (!record) return;
-	return typeof record.stopReason === "string" ? record.stopReason : void 0;
-}
-function parseJsonRpcErrorMessage(message) {
-	if (!Object.hasOwn(message, "error")) return;
-	const errorRecord = asRecord$2(message.error);
-	if (!errorRecord || typeof errorRecord.message !== "string") return;
-	return errorRecord.message;
-}
-//#endregion
 //#region src/acp/session-control-errors.ts
 const SESSION_CONTROL_UNSUPPORTED_ACP_CODES = new Set([-32601, -32602]);
 function asRecord$1(value) {
@@ -5064,7 +5092,7 @@ function restoreOriginalSessionState(params) {
 async function connectAndLoadSession(options) {
 	const record = options.record;
 	const client = options.client;
-	const sameSessionOnly = requiresSameSession(options.resumePolicy);
+	const sameSessionOnly = requiresSameSession(options.resumePolicy) || Boolean(record.importedFrom);
 	const originalSessionId = record.acpSessionId;
 	const originalAgentSessionId = record.agentSessionId;
 	const desiredModeId = getDesiredModeId(record.acpx);
@@ -5440,6 +5468,6 @@ var LiveSessionCheckpoint = class {
 	}
 };
 //#endregion
-export { getPerfMetricsSnapshot as $, parsePromptStopReason as A, EXIT_CODES as At, normalizeName as B, QueueProtocolError as Bt, applyConversation as C, formatErrorMessage as Ct, extractSessionUpdateNotification as D, isAcpResourceNotFoundError as Dt, AcpClient as E, extractAcpError as Et, findSession as F, PERMISSION_MODES as Ft, DEFAULT_EVENT_SEGMENT_MAX_BYTES as G, resolveSessionRecord as H, findSessionByDirectoryWalk as I, PERMISSION_POLICY_ACTIONS as It, sessionEventActivePath as J, defaultSessionEventLog as K, isoNow$2 as L, SESSION_RECORD_SCHEMA as Lt, DEFAULT_HISTORY_LIMIT as M, OUTPUT_ERROR_CODES as Mt, absolutePath as N, OUTPUT_ERROR_ORIGINS as Nt, isAcpJsonRpcMessage as O, toAcpErrorPayload as Ot, findGitRepositoryRoot as P, OUTPUT_FORMATS as Pt, formatPerfMetric as Q, listSessions as R, AgentSpawnError as Rt, sessionOptionsFromRecord as S, exitCodeForOutputErrorCode as St, reconcileAgentSessionId as T, normalizeOutputError as Tt, writeSessionRecord as U, pruneSessions as V, parseSessionRecord as W, sessionEventSegmentPath as X, sessionEventLockPath as Y, assertPersistedKeyPolicy as Z, recordPromptSubmission as _, withTimeout as _t, applyRequestedModelIfAdvertised as a, startPerfTimer as at, mergeSessionOptions as b, normalizeAgentName$1 as bt, setDesiredConfigOption as c, PromptInputValidationError as ct, syncAdvertisedModelState as d, parsePromptSource as dt, incrementPerfCounter as et, applyConfigOptionsToRecord as f, promptToDisplayText as ft, recordClientOperation as g, withInterrupt as gt, createSessionConversation as h, TimeoutError as ht, connectAndLoadSession as i, setPerfGauge as it, permissionModeSatisfies as j, NON_INTERACTIVE_PERMISSION_POLICIES as jt, parseJsonRpcErrorMessage as k, AUTH_POLICIES as kt, setDesiredModeId as l, isPromptInput as lt, cloneSessionConversation as m, InterruptedError as mt, runPromptTurn as n, recordPerfDuration as nt, assertRequestedModelSupported as o, serializeSessionRecordForDisk as ot, cloneSessionAcpxState as p, textPrompt as pt, sessionBaseDir$1 as q, withConnectedSession as r, resetPerfMetrics as rt, setCurrentModelId as s, normalizeRuntimeSessionId as st, LiveSessionCheckpoint as t, measurePerf as tt, setDesiredModelId as u, mergePromptSourceWithText as ut, recordSessionUpdate as v, DEFAULT_AGENT_NAME as vt, applyLifecycleSnapshotToRecord as w, isRetryablePromptError as wt, persistSessionOptions as x, resolveAgentCommand as xt, trimConversationForRuntime as y, listBuiltInAgents as yt, listSessionsForAgent as z, QueueConnectionError as zt };
+export { defaultSessionEventLog as $, findGitRepositoryRoot as A, EXIT_CODES as At, assertPersistedKeyPolicy as B, QueueConnectionError as Bt, applyConversation as C, formatErrorMessage as Ct, permissionModeSatisfies as D, isAcpResourceNotFoundError as Dt, AcpClient as E, extractAcpError as Et, listSessionsForAgent as F, PERMISSION_MODES as Ft, recordPerfDuration as G, getPerfMetricsSnapshot as H, normalizeName as I, PERMISSION_POLICY_ACTIONS as It, startPerfTimer as J, resetPerfMetrics as K, pruneSessions as L, SESSION_RECORD_SCHEMA as Lt, findSessionByDirectoryWalk as M, OUTPUT_ERROR_CODES as Mt, isoNow$2 as N, OUTPUT_ERROR_ORIGINS as Nt, DEFAULT_HISTORY_LIMIT as O, toAcpErrorPayload as Ot, listSessions as P, OUTPUT_FORMATS as Pt, DEFAULT_EVENT_SEGMENT_MAX_BYTES as Q, resolveSessionRecord as R, AcpxOperationalError as Rt, sessionOptionsFromRecord as S, exitCodeForOutputErrorCode as St, reconcileAgentSessionId as T, normalizeOutputError as Tt, incrementPerfCounter as U, formatPerfMetric as V, QueueProtocolError as Vt, measurePerf as W, serializeSessionRecordForDisk as X, parseSessionRecord as Y, normalizeRuntimeSessionId as Z, recordPromptSubmission as _, withTimeout as _t, applyRequestedModelIfAdvertised as a, isAcpJsonRpcMessage as at, mergeSessionOptions as b, normalizeAgentName$1 as bt, setDesiredConfigOption as c, PromptInputValidationError as ct, syncAdvertisedModelState as d, parsePromptSource as dt, sessionBaseDir$1 as et, applyConfigOptionsToRecord as f, promptToDisplayText as ft, recordClientOperation as g, withInterrupt as gt, createSessionConversation as h, TimeoutError as ht, connectAndLoadSession as i, extractSessionUpdateNotification as it, findSession as j, NON_INTERACTIVE_PERMISSION_POLICIES as jt, absolutePath as k, AUTH_POLICIES as kt, setDesiredModeId as l, isPromptInput as lt, cloneSessionConversation as m, InterruptedError as mt, runPromptTurn as n, sessionEventLockPath as nt, assertRequestedModelSupported as o, parseJsonRpcErrorMessage as ot, cloneSessionAcpxState as p, textPrompt as pt, setPerfGauge as q, withConnectedSession as r, sessionEventSegmentPath as rt, setCurrentModelId as s, parsePromptStopReason as st, LiveSessionCheckpoint as t, sessionEventActivePath as tt, setDesiredModelId as u, mergePromptSourceWithText as ut, recordSessionUpdate as v, DEFAULT_AGENT_NAME as vt, applyLifecycleSnapshotToRecord as w, isRetryablePromptError as wt, persistSessionOptions as x, resolveAgentCommand as xt, trimConversationForRuntime as y, listBuiltInAgents as yt, writeSessionRecord as z, AgentSpawnError as zt };
 
-//# sourceMappingURL=live-checkpoint-D5d-K9s1.js.map
+//# sourceMappingURL=live-checkpoint-CuFft_Nd.js.map