@xopcai/xopc 0.0.422 → 0.0.424

package/dist/src/gateway/next-turn-suggestions/snapshot.js

@@ -1,10 +1,10 @@
 import { getSqliteDatabase, init_transaction } from "../../storage/sqlite/transaction.js";
 import { getSessionInputState, init_session_input_repository } from "../../storage/sqlite/session-input-repository.js";
-import { getActiveClarification } from "../../storage/sqlite/clarification-wait-repository.js";
 import { buildSessionContextForLlm, init_session_context_for_llm } from "../../session/session-context-for-llm.js";
 import { getActiveConnectionWait, init_connection_wait_repository } from "../../storage/sqlite/connection-wait-repository.js";
 import { getSessionMetadata } from "../../storage/sqlite/session-read-repository.js";
 import { getCurrentTranscriptId, init_session_repository } from "../../storage/sqlite/session-repository.js";
+import { getActiveClarification } from "../../storage/sqlite/clarification-wait-repository.js";
 import { createHash } from "node:crypto";
 //#region src/gateway/next-turn-suggestions/snapshot.ts
 init_session_repository();

package/dist/src/gateway/ports.js

@@ -132,7 +132,7 @@ function listPortListenersViaNetstat(port) {
 			"TCP"
 		], {
 			encoding: "utf-8",
-			shell: true,
+			windowsHide: true,
 			timeout: 5e3
 		});
 	} catch {
@@ -171,6 +171,11 @@ async function forceFreePortAndWait(port, opts = {}) {
 	const sigtermTimeoutMs = Math.min(Math.max(opts.sigtermTimeoutMs ?? 700, 0), timeoutMs);
 	const listeners = listPortListeners(port);
 	const killed = [...listeners];
+	if (listeners.length === 0) return {
+		killed,
+		waitedMs: 0,
+		escalatedToSigkill: false
+	};
 	for (const proc of listeners) try {
 		process.kill(proc.pid, "SIGTERM");
 		log.info({ pid: proc.pid }, "Sent SIGTERM");

package/dist/src/gateway/run-loop.js

@@ -1,5 +1,4 @@
 import { loadConfig } from "../config/loader.js";
-import "../config/index.js";
 import { isRestartEnabled } from "../config/commands.flags.js";
 import { restartGatewayProcessWithFreshPid } from "./respawn.js";
 import { acquireGatewayLock } from "./lock.js";

package/dist/src/gateway/service/agent-runner.js

@@ -3,10 +3,10 @@ import { init_logger } from "../../utils/logger.js";
 import { init_transaction, runSqliteWriteTransaction } from "../../storage/sqlite/transaction.js";
 import { readClarificationPresentation } from "../../../packages/gateway-contract/src/clarifications.js";
 import { init_src } from "../../../packages/gateway-contract/src/index.js";
-import { listActiveSessionInputExecutions, listActiveSessionInputRuns } from "../../storage/sqlite/session-input-repository.js";
+import { findSessionInputByRunId, init_session_input_repository, listActiveSessionInputExecutions, listActiveSessionInputRuns } from "../../storage/sqlite/session-input-repository.js";
 import { TaskRepository, init_task_repository } from "../../tasks/task-repository.js";
-import { createClarificationWait, getClarification, getClarificationSnapshot, resolveClarification, supersedeActiveClarification } from "../../storage/sqlite/clarification-wait-repository.js";
 import { init_connection_wait_repository, onConnectionWaitChanged } from "../../storage/sqlite/connection-wait-repository.js";
+import { createClarificationWait, getClarification, getClarificationSnapshot, resolveClarification, supersedeActiveClarification } from "../../storage/sqlite/clarification-wait-repository.js";
 import "../../storage/sqlite/index.js";
 import { AgentRunCancelledError } from "../../agent/orchestration/run-termination.js";
 import { isPersonalConversation } from "../../personal-agent/repository.js";
@@ -24,6 +24,7 @@ import { SessionInputCoordinator } from "./session-input-coordinator.js";
 import crypto from "node:crypto";
 //#region src/gateway/service/agent-runner.ts
 init_src();
+init_session_input_repository();
 init_connection_wait_repository();
 init_logger();
 init_transaction();
@@ -325,7 +326,7 @@ var GatewayAgentRunner = class {
 	}
 	answerClarificationText(conversationId, text, idempotencyKey) {
 		const wait = getClarificationSnapshot(conversationId)?.clarification;
-		if (!wait || wait.kind === "approval" || wait.status !== "open" || !text.trim()) return false;
+		if (!wait || wait.schemaVersion === 2 || wait.kind === "approval" || wait.status !== "open" || !text.trim()) return false;
 		return this.resolveClarificationResponse({
 			id: wait.id,
 			expectedVersion: wait.version,
@@ -376,6 +377,10 @@ var GatewayAgentRunner = class {
 	*/
 	async requestClarification(opts) {
 		const { conversationId, request, publishStreamFor } = opts;
+		if (request.schemaVersion === 2) {
+			const capable = findSessionInputByRunId(conversationId, opts.runId)?.contextSnapshots?.some((context) => context.kind === "device_context" && context.interactionCapabilities?.clarificationVersions.includes(2));
+			if (process.env.XOPC_CLARIFY_MULTI_QUESTION === "false" || !capable || this.externalStreamBySession.has(conversationId) || new TaskConversationRepository().resolveActiveExecutionSession(conversationId)) throw new Error("CLARIFICATION_VERSION_UNSUPPORTED: use single-question clarify in this environment");
+		}
 		const taskSession = request.kind !== "approval" ? new TaskConversationRepository().resolveActiveExecutionSession(conversationId) : void 0;
 		if (taskSession?.runId) return {
 			status: "waiting",

package/dist/src/gateway/service/run-gateway-agent.js

@@ -5,9 +5,9 @@ import { parseTurnOutcome } from "../../../packages/gateway-contract/src/turn-ou
 import { init_src } from "../../../packages/gateway-contract/src/index.js";
 import { findSessionInputByRunId, init_session_input_repository, listTaskUpdateTriggers } from "../../storage/sqlite/session-input-repository.js";
 import { TaskRunRepository, init_task_run_repository } from "../../tasks/task-run-repository.js";
+import { getConnectionResumeInput, init_connection_wait_repository, isConnectionSuspended } from "../../storage/sqlite/connection-wait-repository.js";
 import { isClarificationSuspended } from "../../storage/sqlite/clarification-wait-repository.js";
 import { updateInteractionStateFromMessage } from "../../storage/sqlite/interaction-state-repository.js";
-import { getConnectionResumeInput, init_connection_wait_repository, isConnectionSuspended } from "../../storage/sqlite/connection-wait-repository.js";
 import "../../storage/sqlite/index.js";
 import { getConversationRouting } from "../../storage/sqlite/conversation-repository.js";
 import { init_session_key } from "../../routing/session-key.js";

package/dist/src/gateway/service/session-input-coordinator.js

@@ -4,10 +4,10 @@ import { getSqliteDatabase, init_transaction, runSqliteWriteTransaction } from "
 import { init_session_instance_repository, readCurrentTranscriptId } from "../../storage/sqlite/session-instance-repository.js";
 import { SessionInstanceChangedError, cancelQueuedSessionInput, claimNextSessionInput, findSessionInput, findSessionInputByRunId, finishSessionInputRun, getSessionInputById, getSessionInputState, init_session_input_repository, insertSessionInput, mutateQueuedSessionInput, recoverSessionInputState, setSessionInputStatus } from "../../storage/sqlite/session-input-repository.js";
 import { TaskRunRepository, init_task_run_repository } from "../../tasks/task-run-repository.js";
-import { consumeClarificationResume, getActiveClarification, supersedeActiveClarification } from "../../storage/sqlite/clarification-wait-repository.js";
-import { replaceLatestSessionTurnAndQueueInput, validateLatestSessionTurnTarget } from "../../storage/sqlite/session-turn-replace-repository.js";
 import { cancelConnectionObjective, consumeConnectionResume, getActiveConnectionWait, getConnectionWait, hasPendingConnectionMessages, init_connection_wait_repository, interruptedConnectionMessage, publishConnectionWait, reconcileConnectionWaits } from "../../storage/sqlite/connection-wait-repository.js";
 import { appendTranscriptEntry } from "../../storage/sqlite/transcript-repository.js";
+import { consumeClarificationResume, getActiveClarification, supersedeActiveClarification } from "../../storage/sqlite/clarification-wait-repository.js";
+import { replaceLatestSessionTurnAndQueueInput, validateLatestSessionTurnTarget } from "../../storage/sqlite/session-turn-replace-repository.js";
 import "../../storage/sqlite/index.js";
 import { emitSessionTranscriptUpdate } from "../../session/transcript-events.js";
 import { consumePhoneAssistance, finishPhoneAssistance, phoneAssistance, queuePhoneAssistance, reconcilePhoneAssistance } from "../../phone/assistance.js";
@@ -50,9 +50,10 @@ function connectionInputPayload(wait, control) {
 	};
 }
 function sameAppContext(input, existing) {
-	const identity = (sources) => sources?.filter((source) => source.kind === "app_context").map((source) => ({
+	const identity = (sources) => sources?.filter((source) => source.kind === "app_context" || source.kind === "device_context").map((source) => ({
 		snapshot: source.appContext,
-		principal: source.appContextGrant?.principal.principalId
+		principal: source.appContextGrant?.principal.principalId,
+		interactionCapabilities: source.interactionCapabilities
 	})) ?? [];
 	return isDeepStrictEqual(input.origin, existing.origin) && isDeepStrictEqual(identity(input.sourceContexts), identity(existing.contextSnapshots));
 }

package/dist/src/phone/assistance.js

@@ -251,6 +251,9 @@ function phoneAssistanceReport(wait) {
 	return {
 		...wait.checkpoint.report,
 		assistanceId: wait.id,
+		assistanceVersion: wait.version,
+		transcriptId: wait.transcriptId,
+		hasPendingTask: true,
 		reconnectRequired: true,
 		mock: false,
 		mode: "control",

package/dist/src/phone/contracts.d.ts

@@ -376,6 +376,10 @@ export type PhoneReading = {
 };
 export type PhoneReport = {
     assistanceId?: string;
+    assistanceVersion?: number;
+    transcriptId?: string;
+    revision?: number;
+    hasPendingTask?: boolean;
     reconnectRequired?: boolean;
     sessionId: string;
     deviceId: string;

package/dist/src/phone/runtime.d.ts

@@ -92,6 +92,10 @@ export declare class PhoneRuntime {
         report: {
             nextExecutionMode: "collaborative" | "direct";
             assistanceId?: string;
+            assistanceVersion?: number;
+            transcriptId?: string;
+            revision?: number;
+            hasPendingTask?: boolean;
             reconnectRequired?: boolean;
             sessionId: string;
             deviceId: string;
@@ -159,7 +163,9 @@ export declare class PhoneRuntime {
     };
     liveVideo(owner: string, id: string, context: ExecutionContext): Promise<PhoneInteractiveSession>;
     private openLiveVideo;
-    disconnectVideo(owner: string, id: string, client: string, epoch?: number): Promise<void>;
+    disconnectVideo(owner: string, id: string, _client: string, _epoch?: number): Promise<void>;
+    private clearExpiredHuman;
+    private expireHuman;
     liveFrame(owner: string, id: string, context: ExecutionContext, signal: AbortSignal): Promise<{
         frame: Buffer<ArrayBuffer>;
         height: number;

package/dist/src/phone/runtime.js

@@ -330,6 +330,8 @@ var PhoneRuntime = class {
 			modelRequests: session.report.modelRequests - session.segmentUsage.modelRequests,
 			activeDurationMs: session.segmentUsage.activeDurationMs + (session.budget?.elapsedMs ?? 0)
 		}, session.report.feedback);
+		session.report.revision = (session.report.revision ?? 0) + 1;
+		session.report.hasPendingTask = Boolean(session.taskPending);
 		session.report.updatedAt = Date.now();
 		if (session.report.task) updatePhoneCheckpoint(session.report.owner, this.checkpoint(session));
 		this.repository.report(session.report);
@@ -1665,15 +1667,7 @@ var PhoneRuntime = class {
 						this.stopDevice(session.device.id);
 						continue;
 					}
-					if (session.human && Date.now() > (session.humanExpiresAt ?? 0)) {
-						session.human = void 0;
-						session.report.controlOwner = "none";
-						session.report.controlEpoch++;
-						session.report.status = "paused";
-						session.report.stopReason = "control_disconnected";
-						this.publish(session);
-						session.stream?.revoke().catch(() => this.stop(session.report.owner, "cancel"));
-					}
+					if (session.human && Date.now() > (session.humanExpiresAt ?? 0)) this.expireHuman(session).catch(() => this.stop(session.report.owner, "cancel"));
 					if (Date.now() - session.viewedAt > 3e4) session.frames.clear();
 				} catch {
 					session.frames.clear();
@@ -1776,28 +1770,39 @@ var PhoneRuntime = class {
 			throw error;
 		}
 	}
-	async disconnectVideo(owner, id, client, epoch) {
+	async disconnectVideo(owner, id, _client, _epoch) {
 		const session = this.sessions.get(owner);
 		if (!session || session.report.sessionId !== id) return;
-		if (session.human === client && (epoch === void 0 || session.report.controlEpoch === epoch)) {
-			session.human = void 0;
-			session.report.controlOwner = "none";
-			session.report.controlEpoch++;
-			session.report.status = "paused";
-			session.report.stopReason = "control_disconnected";
-			this.publish(session);
-			try {
-				await session.stream?.revoke();
-			} catch {
-				await this.stop(owner, "cancel");
-			}
-		}
 		if (session.stream?.viewerCount === 0) {
 			const stream = session.stream;
 			session.stream = void 0;
 			await stream.close();
 		}
 	}
+	async clearExpiredHuman(session) {
+		if (!session.human || Date.now() <= (session.humanExpiresAt ?? 0)) return;
+		session.human = void 0;
+		session.report.controlOwner = "none";
+		session.report.controlEpoch++;
+		session.report.status = "paused";
+		session.report.stopReason = "control_disconnected";
+		session.report.handoff = "acquiring";
+		this.publish(session);
+		try {
+			await session.stream?.revoke();
+		} catch (error) {
+			await this.stop(session.report.owner, "cancel");
+			throw error;
+		} finally {
+			session.report.handoff = "idle";
+			this.publish(session);
+		}
+	}
+	expireHuman(session) {
+		const work = session.commands.catch(() => {}).then(() => this.clearExpiredHuman(session));
+		session.commands = work.catch(() => {});
+		return work;
+	}
 	async liveFrame(owner, id, context, signal) {
 		const session = this.liveSession(owner, id, context);
 		if (terminal.has(session.report.status)) {
@@ -1857,6 +1862,7 @@ var PhoneRuntime = class {
 			if (terminal.has(session.report.status)) throw new PhoneError("PHONE_OPEN_REQUIRED", "Phone session ended", 409);
 			this.guard(session, context, input.op === "handback");
 			if (session.switching) throw new PhoneError("PHONE_SESSION_BUSY", "Phone execution mode is changing", 409);
+			await this.clearExpiredHuman(session);
 			if (input.epoch !== session.report.controlEpoch) throw new PhoneError("PHONE_CONTROL_CHANGED", "Control changed. Refresh before trying again.", 409);
 			if (session.human && session.human !== client) throw new PhoneError("PHONE_CONTROL_BUSY", "Another browser window controls this phone", 409);
 			if (input.op === "cancel") {
@@ -1992,7 +1998,8 @@ var PhoneRuntime = class {
 		if (!session) throw new PhoneError("PHONE_OPEN_REQUIRED", "Reconnect the phone before continuing", 409);
 		this.guard(session, context);
 		if (session.report.controlOwner === "agent" && session.report.status === "ready") return;
-		await this.liveControl(owner, session.report.sessionId, context, session.human ?? `phone-user:${owner}`, {
+		if (session.human) throw new PhoneError("PHONE_CONTROL_BUSY", "Another client is operating the phone. End manual control before continuing.", 409);
+		await this.liveControl(owner, session.report.sessionId, context, `phone-user:${owner}`, {
 			op: "handback",
 			epoch: session.report.controlEpoch,
 			operationId: randomUUID()

package/dist/src/routing/agent-session-key.js

@@ -1,9 +1,9 @@
 import { __esmMin } from "../../_virtual/_rolldown/runtime.js";
 import { validateConversationId } from "../../packages/gateway-contract/src/conversation-identity.js";
 import { init_src } from "../../packages/gateway-contract/src/index.js";
+import { init_string_coerce, normalizeLowercaseStringOrEmpty } from "../utils/string-coerce.js";
 import { DEFAULT_ACCOUNT_ID, init_account_id, normalizeAccountId, normalizeOptionalAccountId } from "./account-id.js";
 import { init_conversation_repository, requireConversation, resolveRoutedConversation } from "../storage/sqlite/conversation-repository.js";
-import { init_string_coerce, normalizeLowercaseStringOrEmpty } from "../utils/string-coerce.js";
 //#region src/routing/agent-session-key.ts
 function normalizeMainKey(value) {
 	return normalizeLowercaseStringOrEmpty(value) || "main";

package/dist/src/session/session-context-for-llm.js

@@ -298,6 +298,7 @@ function buildSessionContextForLlm(rows) {
 			continue;
 		}
 		if (isTranscriptCustomMessageEntry(r)) {
+			if (r.customType === "clarification_answers") continue;
 			if (r.customType === "task_allocation_status" && isRoutineTaskAllocationStatus(r.details)) continue;
 			if (r.customType === "personal_request_status" || r.customType === "connection_control_status") continue;
 			if (r.customType === "personal_proactive_message") {

package/dist/src/session/session-title.js

@@ -1,12 +1,12 @@
 import { createLogger } from "../utils/logger/index.js";
 import { init_logger } from "../utils/logger.js";
+import { readAgentMessageContent } from "../agent/memory/agent-message-access.js";
 import { getConversationRouting } from "../storage/sqlite/conversation-repository.js";
 import { isCronConversationId } from "../routing/agent-session-key.js";
 import { init_session_key } from "../routing/session-key.js";
 import { init_providers, resolveModel } from "../providers/index.js";
 import { completeWithResolvedCredentials } from "../providers/model-call.js";
 import { stripRuntimeContextFromUserMessage } from "./user-message-display.js";
-import { readAgentMessageContent } from "../agent/memory/agent-message-access.js";
 //#region src/session/session-title.ts
 init_session_key();
 init_providers();

package/dist/src/storage/sqlite/clarification-wait-repository.js

@@ -5,6 +5,8 @@ import { init_src } from "../../../packages/gateway-contract/src/index.js";
 import { init_session_instance_repository, readCurrentTranscriptId } from "./session-instance-repository.js";
 import { bumpSessionInputRevision, getSessionInputById, getSessionInputState, init_session_input_repository, insertSessionInput } from "./session-input-repository.js";
 import { TaskRunRepository, init_task_run_repository } from "../../tasks/task-run-repository.js";
+import { appendTranscriptEntry } from "./transcript-repository.js";
+import { estimateTextTokens } from "../../agent/memory/context-budget.js";
 import { randomUUID } from "node:crypto";
 //#region src/storage/sqlite/clarification-wait-repository.ts
 init_src();
@@ -16,7 +18,8 @@ init_transaction();
 const APPROVAL_TTL_MS = 10 * 6e4;
 const STALE_CONTEXT_MS = 1440 * 6e4;
 function rowToWait(row) {
-	return JSON.parse(row.data_json);
+	const wait = JSON.parse(row.data_json);
+	return wait.schemaVersion === 2 ? normalizeClarificationQuestion(wait) : wait;
 }
 function getRow(id) {
 	return getSqliteDatabase().prepare(`SELECT id, conversation_id, transcript_id, status, version, data_json
@@ -176,6 +179,8 @@ function createClarificationWait(input) {
 			kind: input.kind,
 			status: "open",
 			question: input.question.trim(),
+			schemaVersion: input.schemaVersion,
+			questions: input.questions,
 			interactionMode: input.interactionMode,
 			choiceDetails: input.choiceDetails,
 			recommendedChoiceId: input.recommendedChoiceId,
@@ -232,10 +237,12 @@ function resolveClarification(input) {
 		let normalized;
 		try {
 			if (input.action === "answer") normalized = normalizeClarificationSubmission(wait, {
+				schemaVersion: input.schemaVersion,
+				answers: input.answers,
 				response: input.response,
 				decision: input.decision
 			});
-			else if (input.response !== void 0 || input.decision !== void 0) return {
+			else if (input.response !== void 0 || input.decision !== void 0 || input.answers !== void 0) return {
 				ok: false,
 				code: "INVALID"
 			};
@@ -245,13 +252,28 @@ function resolveClarification(input) {
 				code: "INVALID"
 			};
 		}
+		if (wait.schemaVersion === 2 && normalized && estimateTextTokens(normalized.answer) > 2e3) return {
+			ok: false,
+			code: "INVALID"
+		};
+		if (wait.schemaVersion === 2 !== (input.schemaVersion === 2)) return {
+			ok: false,
+			code: "INVALID"
+		};
+		const responseIdentity = JSON.stringify({
+			schemaVersion: wait.schemaVersion ?? 1,
+			action: input.action,
+			answers: normalized?.answers,
+			response: normalized?.response,
+			decision: normalized?.decision
+		});
 		if (input.action === "agent_decide" && wait.kind === "approval") return {
 			ok: false,
 			code: "INVALID"
 		};
 		const resolution = input.action === "answer" ? "answered" : input.action === "agent_decide" ? "agent_decide" : "cancelled";
 		if (wait.responseIdempotencyKey === input.idempotencyKey) {
-			if (wait.resolution !== resolution || normalized && wait.answer !== normalized.answer) return {
+			if (wait.resolution !== resolution || (wait.schemaVersion === 2 ? wait.responseIdentity !== responseIdentity : normalized && wait.answer !== normalized.answer)) return {
 				ok: false,
 				code: "CONFLICT",
 				clarification: wait
@@ -279,6 +301,7 @@ function resolveClarification(input) {
 				status: "cancelled",
 				resolution,
 				responseIdempotencyKey: input.idempotencyKey,
+				responseIdentity,
 				resolvedAt: now,
 				updatedAt: now
 			}, wait.version);
@@ -298,10 +321,14 @@ function resolveClarification(input) {
 			};
 		}
 		const answer = input.action === "agent_decide" ? "Use your best judgment and continue without additional user input." : normalized.answer;
+		const resumeInputId = randomUUID();
 		const queued = writeWait({
 			...wait,
 			status: "queued",
 			response: normalized?.response,
+			answers: normalized?.answers,
+			responseIdentity,
+			resumeInputId,
 			decision: normalized?.decision,
 			answer,
 			resolution,
@@ -324,7 +351,7 @@ function resolveClarification(input) {
 		].filter(Boolean).join("\n");
 		const origin = getSessionInputById(wait.conversationId, wait.originInputId);
 		insertSessionInput({
-			id: randomUUID(),
+			id: resumeInputId,
 			conversationId: wait.conversationId,
 			expectedTranscriptId: wait.transcriptId,
 			clientMessageId: input.idempotencyKey,
@@ -347,6 +374,20 @@ function resolveClarification(input) {
 				source: "internal"
 			}
 		});
+		if (wait.schemaVersion === 2) appendTranscriptEntry(wait.conversationId, {
+			role: "custom",
+			customType: "clarification_answers",
+			display: true,
+			content: answer,
+			details: {
+				waitId: wait.id,
+				schemaVersion: 2,
+				questions: wait.questions,
+				answers: normalized?.answers,
+				resolution
+			},
+			timestamp: now
+		}, { transcriptId: wait.transcriptId });
 		return {
 			ok: true,
 			clarification: queued,

package/dist/src/storage/sqlite/index.js

@@ -15,9 +15,14 @@ import { createCollaborationRule, getCollaborationRule, listCollaborationRules,
 import { createContextEvidence } from "./context-evidence-repository.js";
 import { getUserPeopleIndexState, getUserPerson, listUserPeople, mergeUserPeople, replaceUserPeopleIndex, summarizeUserPeople, updateUserPerson } from "./user-people-repository.js";
 import { cancelQueuedSessionInput, claimNextSessionInput, findSessionInput, finishSessionInputRun, getSessionInputById, getSessionInputState, init_session_input_repository, insertSessionInput, listActiveSessionInputExecutions, listActiveSessionInputRuns, listTaskUpdateRunIds, listTaskUpdateTriggers, mutateQueuedSessionInput, recoverSessionInputState, setSessionInputStatus } from "./session-input-repository.js";
-import { consumeClarificationApproval, consumeClarificationResume, createClarificationWait, getActiveClarification, getClarification, getClarificationResumeInput, getClarificationSnapshot, isClarificationSuspended, resolveClarification, supersedeActiveClarification } from "./clarification-wait-repository.js";
 import { buildDefaultSessionMetadata, init_session_metadata } from "./session-metadata.js";
 import { buildGlobalSessionStats, classifyStoredRow, estimateTokensFromMessages, extractFtsContent, init_row_mappers, metadataToSessionInsert, sessionConfigRowToConfig, sessionRowToMetadata, transcriptEntryRowToStoredRow } from "./row-mappers.js";
+import { getConnectorAccount, init_connector_account_repository, listConnectorAccounts, reconcileConnectorAccount, refreshConnectorAccountCurrent } from "./connector-account-repository.js";
+import { appendConnectorExecutionAudit, claimConnectorWebhookDelivery, completeConnectorWebhookDelivery, consumeConnectorApproval, createConnectorApproval, decideConnectorApproval, deleteConnectorConnection, deleteConnectorInstallation, getCachedConnectorCatalogEntry, getConnectorApproval, getConnectorConnection, getConnectorInstallation, init_connector_repository, listCachedConnectorCatalogEntries, listConnectorActionMetadata, listConnectorApprovals, listConnectorConnections, listConnectorExecutionAudit, listConnectorInstallations, releaseConnectorWebhookDelivery, replaceConnectorCatalogEntries, upsertConnectorActionMetadata, upsertConnectorCatalogEntry, upsertConnectorConnection, upsertConnectorInstallation } from "./connector-repository.js";
+import { getSessionMetadata } from "./session-read-repository.js";
+import { deleteSessionRecord, ensureSessionRecord, findConversationIdByTranscriptId, getCurrentTranscriptId, getGlobalSessionStats, incrementSessionStatsOnAppend, init_session_repository, listSessionMetadata, listSessionsByAgent, patchSessionMetadata, resetSessionRecord, resolveSessionAgentId, updateSessionStats } from "./session-repository.js";
+import { appendCompactionBoundaryIfUnchanged, appendMediaToAssistantTranscriptEntry, appendTranscriptEntry, findLatestAssistantTranscriptEntryId, listCompactionBoundaries, loadCompactionSourceSnapshot, loadLlmMessagesForSession, loadTranscriptHistoryRowsForSession, loadTranscriptRows, loadTranscriptRowsForSession, paginateTranscriptMessages, replaceTranscriptRows, restoreBeforeCompactionBoundary, searchSessionTranscript } from "./transcript-repository.js";
+import { consumeClarificationApproval, consumeClarificationResume, createClarificationWait, getActiveClarification, getClarification, getClarificationResumeInput, getClarificationSnapshot, isClarificationSuspended, resolveClarification, supersedeActiveClarification } from "./clarification-wait-repository.js";
 import { replaceLatestSessionTurnAndQueueInput, validateLatestSessionTurnTarget } from "./session-turn-replace-repository.js";
 import { acknowledgeHomeAttention, isHomeAttentionAcknowledged } from "./home-attention-repository.js";
 import { claimNextConnectorLearningJob, enqueueConnectorLearningJob, listConnectorLearningJobs, recoverStaleConnectorLearningJobs, setConnectorLearningPaused, updateConnectorLearningJob } from "./connector-learning-repository.js";
@@ -25,13 +30,8 @@ import { COMPOSER_INPUT_HISTORY_LIMIT, appendComposerInputHistory, clearComposer
 import { bindEndpointPrincipal, createEndpointPrincipal, getEndpointPrincipal, listEndpointPrincipals, revokeEndpointPrincipal, touchEndpointPrincipal } from "./endpoint-principal-repository.js";
 import { finishEndpointToolInvocationAudit, listEndpointToolInvocationAuditPage, startEndpointToolInvocationAudit } from "./endpoint-tool-invocation-repository.js";
 import { getInteractionState, setInteractionState, updateInteractionStateFromMessage } from "./interaction-state-repository.js";
-import { getConnectorAccount, init_connector_account_repository, listConnectorAccounts, reconcileConnectorAccount, refreshConnectorAccountCurrent } from "./connector-account-repository.js";
-import { appendConnectorExecutionAudit, claimConnectorWebhookDelivery, completeConnectorWebhookDelivery, consumeConnectorApproval, createConnectorApproval, decideConnectorApproval, deleteConnectorConnection, deleteConnectorInstallation, getCachedConnectorCatalogEntry, getConnectorApproval, getConnectorConnection, getConnectorInstallation, init_connector_repository, listCachedConnectorCatalogEntries, listConnectorActionMetadata, listConnectorApprovals, listConnectorConnections, listConnectorExecutionAudit, listConnectorInstallations, releaseConnectorWebhookDelivery, replaceConnectorCatalogEntries, upsertConnectorActionMetadata, upsertConnectorCatalogEntry, upsertConnectorConnection, upsertConnectorInstallation } from "./connector-repository.js";
-import { getSessionMetadata } from "./session-read-repository.js";
-import { deleteSessionRecord, ensureSessionRecord, findConversationIdByTranscriptId, getCurrentTranscriptId, getGlobalSessionStats, incrementSessionStatsOnAppend, init_session_repository, listSessionMetadata, listSessionsByAgent, patchSessionMetadata, resetSessionRecord, resolveSessionAgentId, updateSessionStats } from "./session-repository.js";
 import { getSessionTaskPlan, setSessionTaskPlan } from "./session-task-plan-repository.js";
 import { SidebarLayoutConflictError, getSidebarLayout, replaceSidebarLayout, sortBySidebarLayout } from "./sidebar-layout-repository.js";
-import { appendCompactionBoundaryIfUnchanged, appendMediaToAssistantTranscriptEntry, appendTranscriptEntry, findLatestAssistantTranscriptEntryId, listCompactionBoundaries, loadCompactionSourceSnapshot, loadLlmMessagesForSession, loadTranscriptHistoryRowsForSession, loadTranscriptRows, loadTranscriptRowsForSession, paginateTranscriptMessages, replaceTranscriptRows, restoreBeforeCompactionBoundary, searchSessionTranscript } from "./transcript-repository.js";
 import { deleteNoteRecord, getNoteRecord, listNoteRecords, upsertNoteRecord } from "./notes-repository.js";
 import { deleteNoteAgentContextRecord, getNoteAgentContextRecord, upsertNoteAgentContextRecord } from "./note-agent-context-repository.js";
 import { claimKnowledgeSourceItems, completeKnowledgeSourceItemSynthesis, countKnowledgeSourceItems, deleteKnowledgeSourceItems, finishKnowledgeSyncRun, getKnowledgeConsumerWatermark, getKnowledgeSourceCursor, getKnowledgeSourceItem, listKnowledgeSourceChanges, listKnowledgeSourceItems, listKnowledgeSyncRuns, pruneBoundedKnowledgeSourceItems, setKnowledgeConsumerWatermark, setKnowledgeSourceCursor, setKnowledgeSourceItemSynthesisStatus, startKnowledgeSyncRun, upsertKnowledgeSourceItems } from "./knowledge-repository.js";

package/dist/src/storage/sqlite/session-creation-repository.js

@@ -2,10 +2,10 @@ import { getSqliteDatabase, init_transaction, runSqliteWriteTransaction } from "
 import { sessionCommandIdentity } from "../../../packages/gateway-contract/src/session-input-command.js";
 import { init_src } from "../../../packages/gateway-contract/src/index.js";
 import { init_session_input_repository, insertSessionInput } from "./session-input-repository.js";
-import { supersedeActiveClarification } from "./clarification-wait-repository.js";
 import { cancelConnectionObjective, init_connection_wait_repository } from "./connection-wait-repository.js";
 import { getSessionMetadata } from "./session-read-repository.js";
 import { init_session_repository } from "./session-repository.js";
+import { supersedeActiveClarification } from "./clarification-wait-repository.js";
 import { setSessionConfig } from "./config-repository.js";
 import { createConversation, init_conversation_repository } from "./conversation-repository.js";
 import { createHash, randomUUID } from "node:crypto";

package/dist/src/storage/sqlite/session-repository.js

@@ -3,10 +3,10 @@ import { getSqliteDatabase, init_transaction, runSqliteWriteTransaction } from "
 import { validateConversationId, validateTranscriptId } from "../../../packages/gateway-contract/src/conversation-identity.js";
 import { init_src } from "../../../packages/gateway-contract/src/index.js";
 import { init_session_instance_repository, readCurrentTranscriptId } from "./session-instance-repository.js";
-import { TaskRunRepository, init_task_run_repository } from "../../tasks/task-run-repository.js";
 import { buildDefaultSessionMetadata, init_session_metadata } from "./session-metadata.js";
 import { init_timestamps, optionalTimestampToMs } from "./timestamps.js";
 import { buildGlobalSessionStats, init_row_mappers, metadataToSessionInsert, sessionRowToMetadata } from "./row-mappers.js";
+import { TaskRunRepository, init_task_run_repository } from "../../tasks/task-run-repository.js";
 import { cancelConnectionObjective, init_connection_wait_repository } from "./connection-wait-repository.js";
 import { init_changes, notifyUserContextChange } from "../../user-context/changes.js";
 import { SESSION_PURPOSE_SQL, SESSION_SOURCE_SQL, init_session_identity_sql } from "./session-identity-sql.js";

package/dist/src/tasks/home-query-service.js

@@ -1,7 +1,7 @@
 import { TaskRepository, init_task_repository } from "./task-repository.js";
 import { TaskRunRepository, init_task_run_repository } from "./task-run-repository.js";
-import { isHomeAttentionAcknowledged } from "../storage/sqlite/home-attention-repository.js";
 import { listConnectorApprovals } from "../storage/sqlite/connector-repository.js";
+import { isHomeAttentionAcknowledged } from "../storage/sqlite/home-attention-repository.js";
 import "../storage/sqlite/index.js";
 import { TaskReadModelProjector } from "./task-read-model-projector.js";
 import "../automations/domain/defaults.js";

package/dist/src/tasks/task-allocation-repository.js

@@ -1,6 +1,6 @@
 import { afterSqliteCommit, getSqliteDatabase, init_transaction, runSqliteWriteTransaction } from "../storage/sqlite/transaction.js";
-import { enqueueTaskChangedEvent, init_task_change_events } from "./task-change-events.js";
 import { init_task_allocation_status, isRoutineTaskAllocationStatus } from "../session/task-allocation-status.js";
+import { enqueueTaskChangedEvent, init_task_change_events } from "./task-change-events.js";
 import { appendTranscriptEntry } from "../storage/sqlite/transcript-repository.js";
 import { emitSessionTranscriptUpdate } from "../session/transcript-events.js";
 import { resolveTaskLocale } from "./task-language.js";

package/dist/src/tui/backends/embedded-backend.js

@@ -5,8 +5,8 @@ import { openXopcDatabase } from "../../storage/sqlite/connection.js";
 import { canonicalSessionCommand, sessionInputCommandSchema } from "../../../packages/gateway-contract/src/session-input-command.js";
 import { init_src } from "../../../packages/gateway-contract/src/index.js";
 import { cancelQueuedSessionInput, claimNextSessionInput, finishSessionInputRun, getSessionInputById, getSessionInputState, init_session_input_repository, setSessionInputStatus } from "../../storage/sqlite/session-input-repository.js";
-import { appendComposerInputHistory, listComposerInputHistory } from "../../storage/sqlite/composer-input-history-repository.js";
 import { getSessionMetadata } from "../../storage/sqlite/session-read-repository.js";
+import { appendComposerInputHistory, listComposerInputHistory } from "../../storage/sqlite/composer-input-history-repository.js";
 import "../../storage/sqlite/index.js";
 import { normalizeAgentId } from "../../agent-catalog/id.js";
 import { init_agent_scope, listAgentEntries } from "../../agent/agent-scope.js";

package/dist/src/tunnel/broker-client.d.ts

@@ -24,6 +24,9 @@ export declare class TunnelBrokerClient {
     constructor(baseUrl: string);
     private apiUrl;
     register(input: BrokerRegisterInput): Promise<TunnelRegistration>;
+    /** Explicit takeover requires a separately signed recovery audience. */
+    recover(input: BrokerRegisterInput): Promise<TunnelRegistration>;
+    private requestRegistration;
     heartbeat(tunnelId: string, tunnelToken: string): Promise<void>;
     deregister(tunnelId: string, tunnelToken: string): Promise<void>;
 }

package/dist/src/tunnel/broker-client.js

@@ -50,7 +50,14 @@ var TunnelBrokerClient = class {
 		return `${this.baseUrl.replace(/\/+$/, "")}${path.startsWith("/") ? path : `/${path}`}`;
 	}
 	async register(input) {
-		const url = this.apiUrl("/tunnels/register");
+		return this.requestRegistration(input, false);
+	}
+	/** Explicit takeover requires a separately signed recovery audience. */
+	async recover(input) {
+		return this.requestRegistration(input, true);
+	}
+	async requestRegistration(input, recovering) {
+		const url = this.apiUrl(recovering ? "/tunnels/recover" : "/tunnels/register");
 		const res = await fetch(url, {
 			redirect: "error",
 			signal: AbortSignal.timeout(15e3),
@@ -59,7 +66,10 @@ var TunnelBrokerClient = class {
 				"Content-Type": "application/json",
 				"X-Registration-Secret": input.registrationSecret
 			},
-			body: JSON.stringify(createTunnelRegistrationProof(input))
+			body: JSON.stringify(createTunnelRegistrationProof({
+				...input,
+				brokerUrl: recovering ? url : this.baseUrl
+			}))
 		});
 		if (!res.ok) {
 			log.error({
@@ -68,6 +78,7 @@ var TunnelBrokerClient = class {
 			}, "Tunnel register failed");
 			const body = await res.json().catch(() => null);
 			if (res.status === 403 && body?.code === "REGISTRATION_DENIED" && body.error === "Active lease ownership proof required") throw new TunnelRecoveryProofRejectedError();
+			if (recovering && res.status === 404) throw new TunnelBrokerError(404, "Immediate recovery requires an updated cloud tunnel broker");
 			if (res.status === 401) throw new TunnelRegistrationKeyRejectedError();
 			throw new TunnelBrokerError(res.status, `Tunnel register failed: ${res.status}`);
 		}
@@ -92,10 +103,7 @@ var TunnelBrokerClient = class {
 			method: "DELETE",
 			headers: { "X-Tunnel-Token": tunnelToken }
 		});
-		if (!res.ok && res.status !== 404) log.warn({
-			tunnelId,
-			status: res.status
-		}, "Tunnel deregister returned non-OK");
+		if (!res.ok) throw new TunnelBrokerError(res.status, `Tunnel deregister failed: ${res.status}`);
 	}
 };
 function resolveBrokerApiBase(brokerUrl) {