@xopcai/xopc 0.0.384 → 0.0.386

package/dist/src/session/store.js

@@ -9,12 +9,13 @@ import "./types.js";
 import { estimateTokensFromMessages } from "../storage/sqlite/row-mappers.js";
 import { getSessionMetadata } from "../storage/sqlite/session-read-repository.js";
 import { deleteSessionRecord, ensureSessionRecord, findConversationIdByTranscriptId, getGlobalSessionStats, listSessionMetadata, listSessionsByAgent, patchSessionMetadata, resetSessionRecord } from "../storage/sqlite/session-repository.js";
-import { appendCompactionBoundaryIfUnchanged, appendTranscriptEntry, listCompactionBoundaries, loadCompactionSourceSnapshot, loadLlmMessagesForSession, loadTranscriptHistoryRowsForSession, loadTranscriptRowsForSession, paginateTranscriptMessages, replaceTranscriptRows, restoreBeforeCompactionBoundary, searchSessionTranscript } from "../storage/sqlite/transcript-repository.js";
+import { appendCompactionBoundaryIfUnchanged, appendTranscriptEntry, archiveFailedModelAttempts, init_transcript_repository, listCompactionBoundaries, loadCompactionSourceSnapshot, loadLlmMessagesForSession, loadTranscriptHistoryRowsForSession, loadTranscriptRowsForSession, paginateTranscriptMessages, replaceTranscriptRows, restoreBeforeCompactionBoundary, searchSessionTranscript } from "../storage/sqlite/transcript-repository.js";
 import { getSessionConfig, setSessionConfig } from "../storage/sqlite/config-repository.js";
 import { init_sqlite } from "../storage/sqlite/index.js";
 import { init_agent_session_key, resolveAgentIdFromConversationId } from "../routing/agent-session-key.js";
 import { resolveUserContextSessionAccess } from "../user-context/access-policy.js";
 import { resolveEffectiveAgentProfile } from "../config/agent-profile.js";
+import { ACCEPTANCE_REPAIR_READ_TOOLS, canResumeAfterModelFailure } from "../agent/orchestration/turn-recovery.js";
 import { DurableState } from "../storage/sqlite/durable-state.js";
 import { transcriptRowsToClientHistory } from "./client-history.js";
 import { SessionCompactor } from "../agent/memory/compaction.js";
@@ -34,6 +35,7 @@ init_agent_session_key();
 init_logger();
 init_sqlite();
 init_session_context_for_llm();
+init_transcript_repository();
 const log = createLogger("SessionStore");
 const INDEX_VERSION = "1.0";
 function isTranscriptMessageRole(row, role) {
@@ -270,23 +272,44 @@ var SessionStore = class {
 		requireXopcDatabase();
 		return loadTranscriptHistoryRowsForSession(key);
 	}
-	async prepareModelFallback(key, rowsBeforeAttempt) {
+	async prepareModelFallback(key, rowsBeforeAttempt, options) {
 		return this.runStoreMutation(async () => {
 			requireXopcDatabase();
 			const currentRows = loadTranscriptRowsForSession(key);
 			if (!transcriptPrefixMatches(rowsBeforeAttempt, currentRows)) return "unsafe";
-			let preparedRows = currentRows;
+			let preparedRows = [...currentRows];
 			let removedError = false;
-			if (isErrorAssistantRow(preparedRows.at(-1))) {
-				preparedRows = preparedRows.slice(0, -1);
+			for (let index = preparedRows.length - 1; index >= rowsBeforeAttempt.length; index--) if (isErrorAssistantRow(preparedRows[index])) {
+				preparedRows.splice(index, 1);
 				removedError = true;
 			}
 			const appendedRows = preparedRows.slice(rowsBeforeAttempt.length);
-			if (appendedRows.length === 1 && isTranscriptMessageRole(appendedRows[0], "user") || removedError && appendedRows.length === 0 && isTranscriptMessageRole(preparedRows.at(-1), "user")) {
-				if (removedError) replaceTranscriptRows(key, preparedRows);
+			const tail = preparedRows.findLast((row) => "role" in row && [
+				"user",
+				"assistant",
+				"toolResult"
+			].includes(String(row.role)));
+			const onlyRecoveryMetadata = appendedRows.every((row) => "type" in row && row.type === "custom" && [
+				"coding_run_started",
+				"coding_verification",
+				"codemode-store",
+				"xopc-tool-discovery-state"
+			].includes(String(row.customType)));
+			if (removedError && options?.resumeTaskContinuation && onlyRecoveryMetadata && canResumeAfterModelFailure(preparedRows, { allowFailedReadTools: ACCEPTANCE_REPAIR_READ_TOOLS })) {
+				archiveFailedModelAttempts(key, rowsBeforeAttempt.length);
+				return "prompt";
+			}
+			if (appendedRows.some((row) => isTranscriptMessageRole(row, "user")) && appendedRows.filter((row) => isTranscriptMessageRole(row, "user")).length === 1 && (isTranscriptMessageRole(tail, "user") || isTranscriptMessageRole(tail, "toolResult")) && canResumeAfterModelFailure(preparedRows, { allowFailedReadTools: ACCEPTANCE_REPAIR_READ_TOOLS }) || appendedRows.length === 1 && isTranscriptMessageRole(appendedRows[0], "user") || removedError && appendedRows.length === 0 && isTranscriptMessageRole(preparedRows.at(-1), "user") || removedError && onlyRecoveryMetadata && (isTranscriptMessageRole(tail, "user") || isTranscriptMessageRole(tail, "toolResult")) && canResumeAfterModelFailure(preparedRows, { allowFailedReadTools: ACCEPTANCE_REPAIR_READ_TOOLS })) {
+				if (removedError) archiveFailedModelAttempts(key, rowsBeforeAttempt.length);
 				return "resume";
 			}
 			if (!removedError && appendedRows.length === 0) return "prompt";
+			if (!removedError && appendedRows.every((row) => "type" in row && row.type === "custom" && [
+				"coding_run_started",
+				"coding_verification",
+				"codemode-store",
+				"xopc-tool-discovery-state"
+			].includes(String(row.customType)))) return "prompt";
 			return "unsafe";
 		});
 	}

package/dist/src/storage/sqlite/connection-wait-repository.d.ts

@@ -21,6 +21,9 @@ export declare function requireSessionConnection(input: {
     status: 'connection_required' | 'skipped' | 'objective_conflict';
     waitId?: string;
 };
+/** Pending messages may revise the goal; controls cannot become a competing model execution. */
+export declare function interruptedConnectionMessage(wait: ConnectionWait): SessionInput | undefined;
+export declare function hasPendingConnectionMessages(wait: ConnectionWait, includeControls?: boolean): boolean;
 /** The input and the wait transition commit together, using the existing queue's unique key. */
 export declare function queueConnectionResolution(wait: ConnectionWait, resolution: 'continued' | 'skipped', resolvePersonal?: (wait: ConnectionWait, resolution: 'continued' | 'skipped') => unknown): ConnectionWait;
 export declare function consumeConnectionResume(input: SessionInput): boolean;
@@ -29,9 +32,11 @@ export declare function connectionBindings(conversationId: string): ConnectionNe
 export declare function connectorObjectiveScope(conversationId: string): string | undefined;
 export declare function bindObjectiveAccount(conversationId: string, connectorId: string, accountId: string): void;
 export declare function connectionBinding(conversationId: string, connectorId: string): string | undefined;
-/** New input wins over an outstanding auto-resume intent, including an already queued resume. */
+/** Explicit objective changes invalidate an outstanding auto-resume intent. */
 export declare function invalidateConnectionResumeIntent(conversationId: string): void;
 export declare function reviseCurrentConnectionObjective(conversationId: string, summary: string | undefined): void;
-export declare function cancelConnectionObjective(conversationId: string): void;
+export declare function cancelConnectionObjective(conversationId: string, expectedWaitId?: string, expectedObjectiveRevision?: number): void;
 export declare function getConnectionResumeInput(conversationId: string, runId: string): SessionInput | undefined;
 export declare function listConnectionWaitsToCheck(): ConnectionWait[];
+/** A queued wait has not crossed consumeConnectionResume's execution boundary. */
+export declare function reconcileConnectionWaits(afterRestart?: boolean): string[];

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

@@ -73,7 +73,7 @@ function requireSessionConnection(input) {
 		const origin = originId ? getSessionInputById(input.conversationId, originId) : void 0;
 		const originRunId = input.origin?.runId ?? runtime.activeRunId;
 		if (!transcriptId || !origin || !originRunId || origin.expectedTranscriptId && origin.expectedTranscriptId !== transcriptId) throw new Error("Connection recovery requires a queued chat execution.");
-		const resumed = origin.payload ? getConnectionWait(origin.payload.waitId) : void 0;
+		const resumed = origin.kind === "connection_resume" && origin.payload ? getConnectionWait(origin.payload.waitId) : void 0;
 		if (resumed?.resolution === "skipped") return { status: "skipped" };
 		const active = getActiveConnectionWait(input.conversationId);
 		if (active) {
@@ -162,11 +162,23 @@ function requireSessionConnection(input) {
 		};
 	});
 }
+/** Pending messages may revise the goal; controls cannot become a competing model execution. */
+function interruptedConnectionMessage(wait) {
+	return getSessionInputState(wait.conversationId).inputs.find((input) => input.status === "interrupted" && input.kind === "message" && input.payload?.connectionBarrier && input.payload.waitId === wait.id && input.payload.objectiveRevision === wait.objectiveRevision);
+}
+function hasPendingConnectionMessages(wait, includeControls = false) {
+	return Boolean(interruptedConnectionMessage(wait)) || getSessionInputState(wait.conversationId).inputs.some((input) => input.id !== wait.originInputId && input.kind === "message" && (includeControls || !input.payload?.connectionAction) && [
+		"queued",
+		"running",
+		"injecting"
+	].includes(input.status));
+}
 /** The input and the wait transition commit together, using the existing queue's unique key. */
 function queueConnectionResolution(wait, resolution, resolvePersonal) {
 	return runSqliteWriteTransaction(() => {
 		const current = getConnectionWait(wait.id);
 		if (!current || current.version !== wait.version || current.status !== "open") throw new Error("WAIT_CHANGED");
+		if (resolution === "continued" && hasPendingConnectionMessages(wait)) return current;
 		if (resolvePersonal?.(wait, resolution)) return updateConnectionWait({
 			...wait,
 			status: "closed",
@@ -203,15 +215,18 @@ function queueConnectionResolution(wait, resolution, resolvePersonal) {
 			...wait,
 			status: "queued",
 			resolution,
-			queuedInputId: input.id
+			queuedInputId: input.id,
+			checking: void 0,
+			recoveryError: void 0
 		}, wait.version);
 	});
 }
 function consumeConnectionResume(input) {
 	if (input.kind !== "connection_resume") return true;
 	return runSqliteWriteTransaction(() => {
-		const wait = input.payload ? getConnectionWait(input.payload.waitId) : void 0;
+		const wait = input.kind === "connection_resume" && input.payload ? getConnectionWait(input.payload.waitId) : void 0;
 		if (!wait || wait.status !== "queued" || wait.queuedInputId !== input.id || wait.objectiveRevision !== input.payload?.objectiveRevision) return false;
+		if (hasPendingConnectionMessages(wait, true)) return false;
 		if (readCurrentTranscriptId(getSqliteDatabase(), input.conversationId) !== wait.transcriptId) return false;
 		if (wait.taskRunId) {
 			const runs = new TaskRunRepository();
@@ -243,7 +258,8 @@ function consumeConnectionResume(input) {
 		}
 		updateConnectionWait({
 			...wait,
-			status: "closed"
+			status: "closed",
+			checking: void 0
 		}, wait.version);
 		return true;
 	});
@@ -286,7 +302,7 @@ function connectionBindings(conversationId) {
 	const state = getSessionInputState(conversationId);
 	const input = state.activeInputId ? getSessionInputById(conversationId, state.activeInputId) : void 0;
 	if (!input) return [];
-	const wait = input.payload ? getConnectionWait(input.payload.waitId) : void 0;
+	const wait = input.kind === "connection_resume" && input.payload ? getConnectionWait(input.payload.waitId) : void 0;
 	const stored = getSqliteDatabase().prepare(`SELECT connector_id, account_id FROM connector_objective_accounts
     WHERE conversation_id = ? AND transcript_id = ? AND objective_id = ?`).all(conversationId, readCurrentTranscriptId(getSqliteDatabase(), conversationId) ?? "", wait?.objectiveId ?? input.id);
 	return (wait?.needs ?? stored.map((row) => ({
@@ -314,7 +330,7 @@ function connectorObjectiveScope(conversationId) {
 	const input = state.activeInputId ? getSessionInputById(conversationId, state.activeInputId) : void 0;
 	if (!input) return void 0;
 	const active = getActiveConnectionWait(conversationId);
-	const wait = input.payload ? getConnectionWait(input.payload.waitId) : active?.originInputId === input.id ? active : void 0;
+	const wait = input.kind === "connection_resume" && input.payload ? getConnectionWait(input.payload.waitId) : active?.originInputId === input.id ? active : void 0;
 	return JSON.stringify([
 		readCurrentTranscriptId(getSqliteDatabase(), conversationId),
 		wait?.objectiveId ?? input.id,
@@ -326,7 +342,7 @@ function bindObjectiveAccount(conversationId, connectorId, accountId) {
 	const state = getSessionInputState(conversationId);
 	const input = state.activeInputId ? getSessionInputById(conversationId, state.activeInputId) : void 0;
 	if (!input) return;
-	const wait = input.payload ? getConnectionWait(input.payload.waitId) : void 0;
+	const wait = input.kind === "connection_resume" && input.payload ? getConnectionWait(input.payload.waitId) : void 0;
 	db.prepare(`INSERT OR IGNORE INTO connector_objective_accounts
     (conversation_id, transcript_id, objective_id, connector_id, account_id) VALUES (?, ?, ?, ?, ?)`).run(conversationId, readCurrentTranscriptId(db, conversationId) ?? "", wait?.objectiveId ?? input.id, connectorId, accountId);
 }
@@ -334,7 +350,7 @@ function connectionBinding(conversationId, connectorId) {
 	const matches = connectionBindings(conversationId).filter((need) => need.target.type === "connector" && need.target.connectorId === connectorId);
 	return matches.length === 1 ? matches[0].connectionId : void 0;
 }
-/** New input wins over an outstanding auto-resume intent, including an already queued resume. */
+/** Explicit objective changes invalidate an outstanding auto-resume intent. */
 function invalidateConnectionResumeIntent(conversationId) {
 	const wait = getActiveConnectionWait(conversationId);
 	if (!wait) return;
@@ -345,6 +361,8 @@ function invalidateConnectionResumeIntent(conversationId) {
 			status: "open",
 			intent: void 0,
 			queuedInputId: void 0,
+			checking: void 0,
+			recoveryError: void 0,
 			objectiveRevision: wait.objectiveRevision + 1,
 			scopeConfirmedAt: void 0,
 			reviewRequired: true
@@ -372,32 +390,46 @@ function reviseCurrentConnectionObjective(conversationId, summary) {
 			},
 			status: "open",
 			resolution: void 0,
+			checking: void 0,
+			recoveryError: void 0,
 			intent: void 0,
 			queuedInputId: void 0,
 			scopeConfirmedAt: void 0,
 			reviewRequired: true,
 			objectiveRevision: wait.objectiveRevision + 1
 		}, wait.version);
+		getSqliteDatabase().prepare(`UPDATE session_inputs SET payload_json = json_set(payload_json, '$.objectiveRevision', ?),
+      version = version + 1, updated_at_ms = ? WHERE conversation_id = ? AND kind = 'message'
+      AND status IN ('queued','running','injecting') AND json_extract(payload_json, '$.connectionBarrier') = 1
+      AND json_extract(payload_json, '$.waitId') = ?`).run(wait.objectiveRevision + 1, Date.now(), conversationId, wait.id);
 	});
 	publishConnectionWait(conversationId);
 }
-function cancelConnectionObjective(conversationId) {
-	const wait = getActiveConnectionWait(conversationId);
+function cancelConnectionObjective(conversationId, expectedWaitId, expectedObjectiveRevision) {
+	const runtime = getSessionInputState(conversationId);
+	const executing = runtime.activeInputId ? getSessionInputById(conversationId, runtime.activeInputId) : void 0;
+	const wait = getActiveConnectionWait(conversationId) ?? (expectedWaitId && executing?.kind === "connection_resume" && executing.payload?.waitId === expectedWaitId ? getConnectionWait(expectedWaitId) : void 0);
 	if (!wait) return;
+	if (expectedWaitId && wait.id !== expectedWaitId) return;
+	if (expectedObjectiveRevision !== void 0 && wait.objectiveRevision !== expectedObjectiveRevision) return;
 	runSqliteWriteTransaction(() => {
 		if (wait.queuedInputId) setSessionInputStatus(wait.queuedInputId, "cancelled");
 		const personalRequest = personalRequestForWait(wait.id);
 		const runs = new TaskRunRepository();
-		const taskRunId = wait.taskRunId ?? (personalRequest?.taskId ? runs.getActiveRoot(personalRequest.taskId)?.id : void 0);
+		const personalTaskWait = personalRequest?.taskId ? getSqliteDatabase().prepare(`SELECT task_run_id FROM task_waits
+      WHERE task_id = ? AND json_extract(condition_json, '$.connectionWaitId') = ? LIMIT 1`).get(personalRequest.taskId, wait.id) : void 0;
+		const taskRunId = wait.taskRunId ?? personalRequest?.parameters.taskRunId ?? personalTaskWait?.task_run_id;
 		if (taskRunId) {
 			const run = runs.get(taskRunId);
-			if (run?.status === "waiting") {
-				for (const taskWait of runs.listActiveWaits(run.taskId)) if (taskWait.condition.connectionWaitId === wait.id) runs.resolveWait({
-					waitId: taskWait.id,
-					actor: { kind: "system" },
-					resolution: { cancelled: true }
-				});
-				runs.finalize({
+			if (run && [
+				"queued",
+				"running",
+				"waiting",
+				"verifying",
+				"cancelled"
+			].includes(run.status)) {
+				runs.resolveCancelledRunWaits(run.id, { kind: "system" });
+				if (run.status !== "cancelled") runs.finalize({
 					runId: run.id,
 					expectedVersion: run.version,
 					receipt: {
@@ -420,7 +452,8 @@ function cancelConnectionObjective(conversationId) {
 			...wait,
 			status: "closed",
 			resolution: "cancelled",
-			intent: void 0
+			intent: void 0,
+			checking: void 0
 		}, wait.version);
 		if (personalRequest && personalRequest.state !== "cancelled") updatePersonalRequest(personalRequest, { state: "cancelled" });
 	});
@@ -439,6 +472,77 @@ function listConnectionWaitsToCheck() {
     JOIN sessions session ON session.active_transcript_id = wait.transcript_id
     WHERE wait.status = 'open'`).all().map((row) => JSON.parse(row.data_json)).filter((wait) => wait.principalId === "local-owner" && wait.intent && wait.intent.validUntil > Date.now());
 }
+/** A queued wait has not crossed consumeConnectionResume's execution boundary. */
+function reconcileConnectionWaits(afterRestart = false) {
+	if (!isXopcDatabaseOpen()) return [];
+	return runSqliteWriteTransaction((db) => {
+		const rows = db.prepare(`SELECT wait.data_json FROM session_connection_waits wait
+      JOIN sessions session ON session.active_transcript_id = wait.transcript_id
+      WHERE wait.status IN ('open', 'queued')`).all();
+		const wake = /* @__PURE__ */ new Set();
+		for (const row of rows) {
+			const wait = JSON.parse(row.data_json);
+			if (wait.status === "open") {
+				if (afterRestart && wait.checking) {
+					updateConnectionWait({
+						...wait,
+						checking: void 0,
+						lastAction: void 0,
+						recoveryError: "restart_interrupted"
+					}, wait.version);
+					log.info({
+						conversationId: wait.conversationId,
+						waitId: wait.id,
+						phase: "restart_reconcile"
+					}, "Interrupted connection check preserved for recovery");
+					publishConnectionWait(wait.conversationId);
+				}
+				continue;
+			}
+			const input = wait.queuedInputId ? getSessionInputById(wait.conversationId, wait.queuedInputId) : void 0;
+			const matches = input?.kind === "connection_resume" && input.payload?.waitId === wait.id && input.payload.objectiveRevision === wait.objectiveRevision && input.expectedTranscriptId === wait.transcriptId;
+			if (matches && input.status === "running") continue;
+			if (matches && (input.status === "queued" || input.status === "interrupted")) {
+				if (input.status === "interrupted") {
+					setSessionInputStatus(input.id, "queued");
+					updateConnectionWait({
+						...wait,
+						checking: void 0,
+						recoveryError: "restart_interrupted"
+					}, wait.version);
+					log.info({
+						conversationId: wait.conversationId,
+						waitId: wait.id,
+						inputId: input.id,
+						phase: "restart_reconcile"
+					}, "Unconsumed connection continuation requeued");
+					publishConnectionWait(wait.conversationId);
+				}
+				wake.add(wait.conversationId);
+				continue;
+			}
+			updateConnectionWait({
+				...wait,
+				status: "open",
+				queuedInputId: void 0,
+				intent: void 0,
+				checking: void 0,
+				recoveryError: "restart_interrupted",
+				resolution: void 0,
+				objectiveRevision: wait.objectiveRevision + 1
+			}, wait.version);
+			log.warn({
+				conversationId: wait.conversationId,
+				waitId: wait.id,
+				inputId: wait.queuedInputId,
+				inputStatus: input?.status,
+				phase: "resume_reconcile"
+			}, "Unavailable connection continuation preserved for retry");
+			publishConnectionWait(wait.conversationId);
+		}
+		return [...wake];
+	});
+}
 var log, events;
 var init_connection_wait_repository = __esmMin((() => {
 	init_logger();
@@ -455,4 +559,4 @@ var init_connection_wait_repository = __esmMin((() => {
 }));
 //#endregion
 init_connection_wait_repository();
-export { bindObjectiveAccount, cancelConnectionObjective, connectionBinding, connectionBindings, connectorObjectiveScope, consumeConnectionResume, getActiveConnectionWait, getConnectionResumeInput, getConnectionWait, init_connection_wait_repository, invalidateConnectionResumeIntent, isConnectionSuspended, listConnectionWaitsToCheck, onConnectionWaitChanged, publishConnectionWait, queueConnectionResolution, requireSessionConnection, reviseCurrentConnectionObjective, updateConnectionWait };
+export { bindObjectiveAccount, cancelConnectionObjective, connectionBinding, connectionBindings, connectorObjectiveScope, consumeConnectionResume, getActiveConnectionWait, getConnectionResumeInput, getConnectionWait, hasPendingConnectionMessages, init_connection_wait_repository, interruptedConnectionMessage, invalidateConnectionResumeIntent, isConnectionSuspended, listConnectionWaitsToCheck, onConnectionWaitChanged, publishConnectionWait, queueConnectionResolution, reconcileConnectionWaits, requireSessionConnection, reviseCurrentConnectionObjective, updateConnectionWait };

package/dist/src/storage/sqlite/index.d.ts

@@ -38,3 +38,4 @@ export { appendConnectorExecutionAudit, claimConnectorWebhookDelivery, completeC
 export { getConnectorAccount, listConnectorAccounts, refreshConnectorAccountCurrent, reconcileConnectorAccount, } from './connector-account-repository.js';
 export { getConnectorSyncPolicy, getConnectorSyncPolicyForConnection, listConnectorSyncPolicies, upsertConnectorSyncPolicy, type ConnectorSyncPolicy, } from './connector-sync-policy-repository.js';
 export { getUserTrustPolicy, setUserTrustPolicy, } from './user-trust-repository.js';
+export { createResearchCheckpoint, getResearchCheckpoint, claimResearchCheckpoint, saveResearchCheckpoint, recordResearchEvidence, recordResearchSearch, finishResearchCheckpoint, type StoredResearchCheckpoint, } from './research-checkpoint-repository.js';

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

@@ -42,6 +42,7 @@ import { deleteSessionConfig, getSessionConfig, hasSessionConfig, init_config_re
 import { createObjectLinkRecord, deleteObjectLinkRecord, getActivityEventRecord, init_activity_repository, listActivityRecords, listObjectActivityRecords, listObjectLinkRecords, listProjectActivityRecords, recordActivityEvent } from "./activity-repository.js";
 import { getConnectorSyncPolicy, getConnectorSyncPolicyForConnection, init_connector_sync_policy_repository, listConnectorSyncPolicies, upsertConnectorSyncPolicy } from "./connector-sync-policy-repository.js";
 import { getUserTrustPolicy, init_user_trust_repository, setUserTrustPolicy } from "./user-trust-repository.js";
+import { claimResearchCheckpoint, createResearchCheckpoint, finishResearchCheckpoint, getResearchCheckpoint, init_research_checkpoint_repository, recordResearchEvidence, recordResearchSearch, saveResearchCheckpoint } from "./research-checkpoint-repository.js";
 //#region src/storage/sqlite/index.ts
 var init_sqlite = __esmMin((() => {
 	init_paths();
@@ -84,7 +85,8 @@ var init_sqlite = __esmMin((() => {
 	init_connector_account_repository();
 	init_connector_sync_policy_repository();
 	init_user_trust_repository();
+	init_research_checkpoint_repository();
 }));
 //#endregion
 init_sqlite();
-export { COMPOSER_INPUT_HISTORY_LIMIT, DatabaseSchemaMigrationGapError, DatabaseSchemaTooNewError, DatabaseSchemaTooOldError, SCHEMA_META_SCHEMA_VERSION_KEY, SidebarLayoutConflictError, XOPC_DB_BASELINE_SCHEMA_VERSION, XOPC_DB_FILENAME, XOPC_DB_SCHEMA_VERSION, acknowledgeHomeAttention, appendCompactionBoundaryIfUnchanged, appendComposerInputHistory, appendConnectorExecutionAudit, appendMediaToAssistantTranscriptEntry, appendTranscriptEntry, applyPendingMigrations, authenticateDeviceAccessToken, bindEndpointPrincipal, buildDefaultSessionMetadata, buildGlobalSessionStats, buildRefreshProofMessage, cancelQueuedSessionInput, claimConnectorWebhookDelivery, claimContextExtractionRun, claimKnowledgeSourceItems, claimNextConnectorLearningJob, claimNextSessionInput, classifyStoredRow, clearComposerInputHistory, clearGatewayIdentityForTest, closeXopcDatabase, completeConnectorWebhookDelivery, completeKnowledgeSourceItemSynthesis, consumeClarificationApproval, consumeClarificationResume, consumeConnectorApproval, countKnowledgeSourceItems, createClarificationWait, createCollaborationRule, createConnectorApproval, createContextEvidence, createDevice, createDevicePairingSetup, createEndpointPrincipal, createObjectLinkRecord, decideConnectorApproval, deleteBrowserTabBinding, deleteBrowserTabBindingsByEndpoint, deleteBrowserTabBindingsByPrincipal, deleteConnectorConnection, deleteConnectorInstallation, deleteEndpointSessionBinding, deleteEndpointSessionBindingsByPrincipal, deleteKnowledgeSourceItems, deleteNoteAgentContextRecord, deleteNoteRecord, deleteObjectLinkRecord, deleteSessionConfig, deleteSessionRecord, discoverSqlMigrations, enqueueConnectorLearningJob, ensureSessionRecord, ensureXopcDatabaseSchema, estimateTokensFromMessages, extractFtsContent, findConversationIdByTranscriptId, findLatestAssistantTranscriptEntryId, findSessionInput, finishContextExtractionRun, finishEndpointToolInvocationAudit, finishKnowledgeSyncRun, finishSessionInputRun, getActiveClarification, getActivityEventRecord, getBrowserTabBinding, getBrowserTabBindingById, getCachedConnectorCatalogEntry, getClarification, getClarificationResumeInput, getClarificationSnapshot, getCollaborationRule, getConnectorAccount, getConnectorApproval, getConnectorConnection, getConnectorInstallation, getConnectorSyncPolicy, getConnectorSyncPolicyForConnection, getContextExtractionRun, getCurrentTranscriptId, getDevice, getEndpointPrincipal, getEndpointSessionBinding, getGlobalSessionStats, getInteractionState, getKnowledgeConsumerWatermark, getKnowledgeSourceCursor, getKnowledgeSourceItem, getNoteAgentContextRecord, getNoteRecord, getOrCreateGatewayIdentity, getSessionConfig, getSessionInputById, getSessionInputState, getSessionMetadata, getSessionTaskPlan, getSidebarLayout, getSqliteDatabase, getUserPeopleIndexState, getUserPerson, getUserTrustPolicy, getXopcDatabase, hasSessionConfig, incrementSessionStatsOnAppend, init_sqlite, insertSessionInput, inspectSchemaMigrationStatus, isClarificationSuspended, isDevicePairingSetupActive, isHomeAttentionAcknowledged, isXopcDatabaseOpen, issueDeviceTokenPair, listActiveSessionInputExecutions, listActiveSessionInputRuns, listActivityRecords, listCachedConnectorCatalogEntries, listCollaborationRules, listCompactionBoundaries, listComposerInputHistory, listConnectorAccounts, listConnectorActionMetadata, listConnectorApprovals, listConnectorConnections, listConnectorExecutionAudit, listConnectorInstallations, listConnectorLearningJobs, listConnectorSyncPolicies, listContextExtractionOutputs, listContextExtractionRuns, listDevices, listEndpointPrincipals, listEndpointToolInvocationAuditPage, listKnowledgeSourceChanges, listKnowledgeSourceItems, listKnowledgeSyncRuns, listNoteRecords, listObjectActivityRecords, listObjectLinkRecords, listProjectActivityRecords, listRegisteredMigrationTargets, listSessionMetadata, listSessionsByAgent, listTaskUpdateRunIds, listTaskUpdateTriggers, listUserPeople, loadCompactionSourceSnapshot, loadLlmMessagesForSession, loadTranscriptHistoryRowsForSession, loadTranscriptRows, loadTranscriptRowsForSession, mergeUserPeople, metadataToSessionInsert, mutateQueuedSessionInput, openXopcDatabase, paginateTranscriptMessages, patchSessionMetadata, pruneBoundedKnowledgeSourceItems, readSchemaVersion, readSchemaVersionForTest, reconcileConnectorAccount, recordActivityEvent, recoverSessionInputState, recoverStaleConnectorLearningJobs, refreshConnectorAccountCurrent, releaseConnectorWebhookDelivery, replaceConnectorCatalogEntries, replaceLatestSessionTurnAndQueueInput, replaceSidebarLayout, replaceTranscriptRows, replaceUserPeopleIndex, requireXopcDatabase, resetSessionRecord, resetXopcDatabaseSingletonForTest, resolveClarification, resolveMigrationsDir, resolveSessionAgentId, resolveXopcDatabasePath, restoreBeforeCompactionBoundary, revokeDevice, revokeEndpointPrincipal, rotateDeviceRefreshToken, runSqliteWriteTransaction, searchSessionTranscript, sessionConfigRowToConfig, sessionRowToMetadata, setBrowserTabBinding, setCollaborationRuleStatus, setConnectorLearningPaused, setEndpointSessionBinding, setInteractionState, setKnowledgeConsumerWatermark, setKnowledgeSourceCursor, setKnowledgeSourceItemSynthesisStatus, setSessionConfig, setSessionInputStatus, setSessionTaskPlan, setUserTrustPolicy, signGatewayPayload, sortBySidebarLayout, startEndpointToolInvocationAudit, startKnowledgeSyncRun, summarizeUserPeople, supersedeActiveClarification, touchEndpointPrincipal, transcriptEntryRowToStoredRow, updateConnectorLearningJob, updateInteractionStateFromMessage, updateSessionConfig, updateSessionStats, updateUserPerson, upsertConnectorActionMetadata, upsertConnectorCatalogEntry, upsertConnectorConnection, upsertConnectorInstallation, upsertConnectorSyncPolicy, upsertKnowledgeSourceItems, upsertNoteAgentContextRecord, upsertNoteRecord, validateLatestSessionTurnTarget };
+export { COMPOSER_INPUT_HISTORY_LIMIT, DatabaseSchemaMigrationGapError, DatabaseSchemaTooNewError, DatabaseSchemaTooOldError, SCHEMA_META_SCHEMA_VERSION_KEY, SidebarLayoutConflictError, XOPC_DB_BASELINE_SCHEMA_VERSION, XOPC_DB_FILENAME, XOPC_DB_SCHEMA_VERSION, acknowledgeHomeAttention, appendCompactionBoundaryIfUnchanged, appendComposerInputHistory, appendConnectorExecutionAudit, appendMediaToAssistantTranscriptEntry, appendTranscriptEntry, applyPendingMigrations, authenticateDeviceAccessToken, bindEndpointPrincipal, buildDefaultSessionMetadata, buildGlobalSessionStats, buildRefreshProofMessage, cancelQueuedSessionInput, claimConnectorWebhookDelivery, claimContextExtractionRun, claimKnowledgeSourceItems, claimNextConnectorLearningJob, claimNextSessionInput, claimResearchCheckpoint, classifyStoredRow, clearComposerInputHistory, clearGatewayIdentityForTest, closeXopcDatabase, completeConnectorWebhookDelivery, completeKnowledgeSourceItemSynthesis, consumeClarificationApproval, consumeClarificationResume, consumeConnectorApproval, countKnowledgeSourceItems, createClarificationWait, createCollaborationRule, createConnectorApproval, createContextEvidence, createDevice, createDevicePairingSetup, createEndpointPrincipal, createObjectLinkRecord, createResearchCheckpoint, decideConnectorApproval, deleteBrowserTabBinding, deleteBrowserTabBindingsByEndpoint, deleteBrowserTabBindingsByPrincipal, deleteConnectorConnection, deleteConnectorInstallation, deleteEndpointSessionBinding, deleteEndpointSessionBindingsByPrincipal, deleteKnowledgeSourceItems, deleteNoteAgentContextRecord, deleteNoteRecord, deleteObjectLinkRecord, deleteSessionConfig, deleteSessionRecord, discoverSqlMigrations, enqueueConnectorLearningJob, ensureSessionRecord, ensureXopcDatabaseSchema, estimateTokensFromMessages, extractFtsContent, findConversationIdByTranscriptId, findLatestAssistantTranscriptEntryId, findSessionInput, finishContextExtractionRun, finishEndpointToolInvocationAudit, finishKnowledgeSyncRun, finishResearchCheckpoint, finishSessionInputRun, getActiveClarification, getActivityEventRecord, getBrowserTabBinding, getBrowserTabBindingById, getCachedConnectorCatalogEntry, getClarification, getClarificationResumeInput, getClarificationSnapshot, getCollaborationRule, getConnectorAccount, getConnectorApproval, getConnectorConnection, getConnectorInstallation, getConnectorSyncPolicy, getConnectorSyncPolicyForConnection, getContextExtractionRun, getCurrentTranscriptId, getDevice, getEndpointPrincipal, getEndpointSessionBinding, getGlobalSessionStats, getInteractionState, getKnowledgeConsumerWatermark, getKnowledgeSourceCursor, getKnowledgeSourceItem, getNoteAgentContextRecord, getNoteRecord, getOrCreateGatewayIdentity, getResearchCheckpoint, getSessionConfig, getSessionInputById, getSessionInputState, getSessionMetadata, getSessionTaskPlan, getSidebarLayout, getSqliteDatabase, getUserPeopleIndexState, getUserPerson, getUserTrustPolicy, getXopcDatabase, hasSessionConfig, incrementSessionStatsOnAppend, init_sqlite, insertSessionInput, inspectSchemaMigrationStatus, isClarificationSuspended, isDevicePairingSetupActive, isHomeAttentionAcknowledged, isXopcDatabaseOpen, issueDeviceTokenPair, listActiveSessionInputExecutions, listActiveSessionInputRuns, listActivityRecords, listCachedConnectorCatalogEntries, listCollaborationRules, listCompactionBoundaries, listComposerInputHistory, listConnectorAccounts, listConnectorActionMetadata, listConnectorApprovals, listConnectorConnections, listConnectorExecutionAudit, listConnectorInstallations, listConnectorLearningJobs, listConnectorSyncPolicies, listContextExtractionOutputs, listContextExtractionRuns, listDevices, listEndpointPrincipals, listEndpointToolInvocationAuditPage, listKnowledgeSourceChanges, listKnowledgeSourceItems, listKnowledgeSyncRuns, listNoteRecords, listObjectActivityRecords, listObjectLinkRecords, listProjectActivityRecords, listRegisteredMigrationTargets, listSessionMetadata, listSessionsByAgent, listTaskUpdateRunIds, listTaskUpdateTriggers, listUserPeople, loadCompactionSourceSnapshot, loadLlmMessagesForSession, loadTranscriptHistoryRowsForSession, loadTranscriptRows, loadTranscriptRowsForSession, mergeUserPeople, metadataToSessionInsert, mutateQueuedSessionInput, openXopcDatabase, paginateTranscriptMessages, patchSessionMetadata, pruneBoundedKnowledgeSourceItems, readSchemaVersion, readSchemaVersionForTest, reconcileConnectorAccount, recordActivityEvent, recordResearchEvidence, recordResearchSearch, recoverSessionInputState, recoverStaleConnectorLearningJobs, refreshConnectorAccountCurrent, releaseConnectorWebhookDelivery, replaceConnectorCatalogEntries, replaceLatestSessionTurnAndQueueInput, replaceSidebarLayout, replaceTranscriptRows, replaceUserPeopleIndex, requireXopcDatabase, resetSessionRecord, resetXopcDatabaseSingletonForTest, resolveClarification, resolveMigrationsDir, resolveSessionAgentId, resolveXopcDatabasePath, restoreBeforeCompactionBoundary, revokeDevice, revokeEndpointPrincipal, rotateDeviceRefreshToken, runSqliteWriteTransaction, saveResearchCheckpoint, searchSessionTranscript, sessionConfigRowToConfig, sessionRowToMetadata, setBrowserTabBinding, setCollaborationRuleStatus, setConnectorLearningPaused, setEndpointSessionBinding, setInteractionState, setKnowledgeConsumerWatermark, setKnowledgeSourceCursor, setKnowledgeSourceItemSynthesisStatus, setSessionConfig, setSessionInputStatus, setSessionTaskPlan, setUserTrustPolicy, signGatewayPayload, sortBySidebarLayout, startEndpointToolInvocationAudit, startKnowledgeSyncRun, summarizeUserPeople, supersedeActiveClarification, touchEndpointPrincipal, transcriptEntryRowToStoredRow, updateConnectorLearningJob, updateInteractionStateFromMessage, updateSessionConfig, updateSessionStats, updateUserPerson, upsertConnectorActionMetadata, upsertConnectorCatalogEntry, upsertConnectorConnection, upsertConnectorInstallation, upsertConnectorSyncPolicy, upsertKnowledgeSourceItems, upsertNoteAgentContextRecord, upsertNoteRecord, validateLatestSessionTurnTarget };

package/dist/src/storage/sqlite/migrations/250_research_checkpoints.sql

@@ -0,0 +1,15 @@
+CREATE TABLE research_checkpoints (
+  id TEXT PRIMARY KEY,
+  conversation_id TEXT NOT NULL REFERENCES sessions(conversation_id) ON DELETE CASCADE,
+  workspace TEXT NOT NULL,
+  goal TEXT NOT NULL,
+  checkpoint_json TEXT NOT NULL CHECK(json_valid(checkpoint_json)),
+  status TEXT NOT NULL CHECK(status IN ('running','partial','completed','failed','cancelled')),
+  attempts INTEGER NOT NULL DEFAULT 0,
+  stop_reason TEXT,
+  summary TEXT NOT NULL DEFAULT '',
+  lease_token TEXT,
+  lease_expires_at INTEGER,
+  updated_at INTEGER NOT NULL
+);
+CREATE INDEX research_checkpoints_conversation ON research_checkpoints(conversation_id, updated_at);

package/dist/src/storage/sqlite/migrations/runner.d.ts

@@ -3,7 +3,7 @@ import type { ApplyMigrationsOptions } from './types.js';
 /** Baseline schema version applied from schema.sql on first open. */
 export declare const XOPC_DB_BASELINE_SCHEMA_VERSION = 165;
 /** Latest schema version this release supports (increment when adding migrations). */
-export declare const XOPC_DB_SCHEMA_VERSION = 249;
+export declare const XOPC_DB_SCHEMA_VERSION = 250;
 export declare function resolveMigrationsDir(override?: string): string;
 /**
  * Apply sequential SQL migrations from (currentVersion + 1) through targetVersion.

package/dist/src/storage/sqlite/migrations/runner.js

@@ -59,7 +59,7 @@ function applySingleMigration(db, migration, discardOldScenes = false) {
 function applyPendingMigrations(db, options = {}) {
 	db.function("xopc_memory_search_text", { deterministic: true }, (value) => memorySearchText(String(value ?? "")));
 	db.function("xopc_operation_id", () => currentOperationId() ?? null);
-	const targetVersion = options.targetVersion ?? 249;
+	const targetVersion = options.targetVersion ?? 250;
 	let currentVersion = readSchemaVersion(db);
 	if (currentVersion > targetVersion) throw new DatabaseSchemaTooNewError(currentVersion, targetVersion);
 	if (!options.migrationsDir && currentVersion < 165) throw new DatabaseSchemaTooOldError(currentVersion, 165);
@@ -97,7 +97,7 @@ function applyPendingMigrations(db, options = {}) {
 }
 /** Inspect schema version without mutating the database. */
 function inspectSchemaMigrationStatus(db, options = {}) {
-	const appVersion = options.targetVersion ?? 249;
+	const appVersion = options.targetVersion ?? 250;
 	const dbVersion = readSchemaVersion(db);
 	if (dbVersion > appVersion) return {
 		dbVersion,
@@ -140,7 +140,7 @@ var init_runner = __esmMin((() => {
 	init_errors();
 	log = createLogger("Sqlite:Migrations");
 	XOPC_DB_BASELINE_SCHEMA_VERSION = 165;
-	XOPC_DB_SCHEMA_VERSION = 249;
+	XOPC_DB_SCHEMA_VERSION = 250;
 }));
 //#endregion
 init_runner();

package/dist/src/storage/sqlite/research-checkpoint-repository.d.ts

@@ -0,0 +1,24 @@
+import type { SearchCacheEntry } from '../../agent/tools/search/cache.js';
+import { type ResearchCheckpoint, type ResearchCheckpointUpdate, type ResearchEvidence } from '../../agent/orchestration/research-checkpoint.js';
+export interface StoredResearchCheckpoint {
+    id: string;
+    conversationId: string;
+    workspace: string;
+    goal: string;
+    checkpoint: ResearchCheckpoint;
+    status: 'running' | 'partial' | 'completed' | 'failed' | 'cancelled';
+    attempts: number;
+    stopReason?: string;
+    summary: string;
+    leaseToken?: string;
+    leaseExpiresAt?: number;
+}
+export declare function getResearchCheckpoint(id: string, conversationId: string, workspace: string): StoredResearchCheckpoint | undefined;
+export declare function createResearchCheckpoint(conversationId: string, workspace: string, goal: string): StoredResearchCheckpoint;
+/** Lease ownership fences late tool callbacks and competing resume requests. */
+export declare function claimResearchCheckpoint(record: StoredResearchCheckpoint, timeoutMs: number, now?: number): StoredResearchCheckpoint;
+export declare function saveResearchCheckpoint(record: StoredResearchCheckpoint, update: ResearchCheckpointUpdate): ResearchCheckpoint;
+export declare function recordResearchEvidence(record: StoredResearchCheckpoint, evidence: ResearchEvidence): void;
+export declare function finishResearchCheckpoint(record: StoredResearchCheckpoint, status: StoredResearchCheckpoint['status'], stopReason: string, summary: string): void;
+/** Keep successful public search results with the same task lease and a bounded envelope. */
+export declare function recordResearchSearch(record: StoredResearchCheckpoint, entry: SearchCacheEntry): void;

package/dist/src/storage/sqlite/research-checkpoint-repository.js

@@ -0,0 +1,91 @@
+import { __esmMin } from "../../../_virtual/_rolldown/runtime.js";
+import { getSqliteDatabase, init_transaction, runSqliteWriteTransaction } from "./transaction.js";
+import { init_research_checkpoint, mergeResearchCheckpoint } from "../../agent/orchestration/research-checkpoint.js";
+import { randomUUID } from "node:crypto";
+//#region src/storage/sqlite/research-checkpoint-repository.ts
+function decode(row) {
+	return {
+		id: row.id,
+		conversationId: row.conversation_id,
+		workspace: row.workspace,
+		goal: row.goal,
+		checkpoint: JSON.parse(row.checkpoint_json),
+		status: row.status,
+		attempts: row.attempts,
+		stopReason: row.stop_reason ?? void 0,
+		summary: row.summary,
+		leaseToken: row.lease_token ?? void 0,
+		leaseExpiresAt: row.lease_expires_at ?? void 0
+	};
+}
+function getResearchCheckpoint(id, conversationId, workspace) {
+	const row = getSqliteDatabase().prepare("SELECT * FROM research_checkpoints WHERE id = ? AND conversation_id = ? AND workspace = ?").get(id, conversationId, workspace);
+	return row ? decode(row) : void 0;
+}
+function createResearchCheckpoint(conversationId, workspace, goal) {
+	const id = randomUUID();
+	const checkpoint = {
+		findings: [],
+		evidence: [],
+		nextSteps: [goal.slice(0, 500)]
+	};
+	runSqliteWriteTransaction((db) => db.prepare(`INSERT INTO research_checkpoints
+    (id, conversation_id, workspace, goal, checkpoint_json, status, updated_at) VALUES (?, ?, ?, ?, ?, 'partial', ?)`).run(id, conversationId, workspace, goal, JSON.stringify(checkpoint), Date.now()));
+	return getResearchCheckpoint(id, conversationId, workspace);
+}
+/** Lease ownership fences late tool callbacks and competing resume requests. */
+function claimResearchCheckpoint(record, timeoutMs, now = Date.now()) {
+	return runSqliteWriteTransaction((db) => {
+		const token = randomUUID();
+		if (!db.prepare(`UPDATE research_checkpoints SET status = 'running', attempts = attempts + 1,
+      lease_token = ?, lease_expires_at = ?, updated_at = ? WHERE id = ? AND conversation_id = ? AND workspace = ?
+      AND status != 'completed' AND (lease_token IS NULL OR lease_expires_at <= ?)`).run(token, now + timeoutMs, now, record.id, record.conversationId, record.workspace, now).changes) throw new Error("Research checkpoint is complete or already running");
+		return getResearchCheckpoint(record.id, record.conversationId, record.workspace);
+	});
+}
+function mutate(record, transform) {
+	return runSqliteWriteTransaction((db) => {
+		const current = getResearchCheckpoint(record.id, record.conversationId, record.workspace);
+		if (!current || !record.leaseToken || current.leaseToken !== record.leaseToken || current.status !== "running" || (current.leaseExpiresAt ?? 0) <= Date.now()) throw new Error("Research checkpoint lease expired");
+		const checkpoint = transform(current.checkpoint);
+		db.prepare("UPDATE research_checkpoints SET checkpoint_json = ?, updated_at = ? WHERE id = ? AND lease_token = ?").run(JSON.stringify(checkpoint), Date.now(), record.id, record.leaseToken);
+		return checkpoint;
+	});
+}
+function saveResearchCheckpoint(record, update) {
+	return mutate(record, (current) => mergeResearchCheckpoint(current, update));
+}
+function recordResearchEvidence(record, evidence) {
+	mutate(record, (current) => ({
+		...current,
+		evidence: [...current.evidence.filter((item) => item.toolCallId !== evidence.toolCallId || item.runId !== evidence.runId), {
+			...evidence,
+			excerpt: evidence.excerpt.slice(0, 2e3)
+		}].slice(-30)
+	}));
+}
+function finishResearchCheckpoint(record, status, stopReason, summary) {
+	if (!runSqliteWriteTransaction((db) => db.prepare(`UPDATE research_checkpoints SET status = ?, stop_reason = ?, summary = ?,
+    lease_token = NULL, lease_expires_at = NULL, updated_at = ? WHERE id = ? AND lease_token = ?`).run(status, stopReason, summary.slice(0, 8e3), Date.now(), record.id, record.leaseToken ?? "")).changes) throw new Error("Research checkpoint lease was replaced");
+}
+/** Keep successful public search results with the same task lease and a bounded envelope. */
+function recordResearchSearch(record, entry) {
+	mutate(record, (current) => {
+		const searches = [...(current.searches ?? []).filter((item) => item.key !== entry.key), entry].slice(-20);
+		while (searches.length && JSON.stringify({
+			...current,
+			searches
+		}).length > 2e5) searches.shift();
+		return {
+			...current,
+			searches
+		};
+	});
+}
+var init_research_checkpoint_repository = __esmMin((() => {
+	init_research_checkpoint();
+	init_transaction();
+}));
+//#endregion
+init_research_checkpoint_repository();
+export { claimResearchCheckpoint, createResearchCheckpoint, finishResearchCheckpoint, getResearchCheckpoint, init_research_checkpoint_repository, recordResearchEvidence, recordResearchSearch, saveResearchCheckpoint };

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

@@ -28,7 +28,7 @@ function ensureXopcDatabaseSchema(db, options = {}) {
 		currentVersion = 165;
 	}
 	applyPendingMigrations(db, {
-		targetVersion: 249,
+		targetVersion: 250,
 		databasePath: fresh ? void 0 : options.databasePath
 	});
 }

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

@@ -3,7 +3,7 @@ import { sessionCommandIdentity } from "../../../packages/gateway-contract/src/s
 import { init_src } from "../../../packages/gateway-contract/src/index.js";
 import { init_session_input_repository, insertSessionInput } from "./session-input-repository.js";
 import { init_clarification_wait_repository, supersedeActiveClarification } from "./clarification-wait-repository.js";
-import { init_connection_wait_repository, invalidateConnectionResumeIntent } from "./connection-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 { init_config_repository, setSessionConfig } from "./config-repository.js";
@@ -113,7 +113,8 @@ function acceptSessionCommand(input) {
 			expectedTranscriptId: transcriptId
 		});
 		if (inputId) {
-			invalidateConnectionResumeIntent(conversationId);
+			const control = input.preparedInput?.payload;
+			if (control?.connectionAction === "cancel") cancelConnectionObjective(conversationId, control.waitId, control.objectiveRevision);
 			supersedeActiveClarification(conversationId);
 		}
 		const receipt = {

package/dist/src/storage/sqlite/session-input-repository.d.ts

@@ -8,10 +8,26 @@ export type SessionInputPayload = {
     waitId: string;
     objectiveRevision: number;
     resolution: 'continued' | 'skipped';
+    connectionAction?: never;
+    connectionBarrier?: never;
 } | {
     waitId: string;
     objectiveRevision: number;
     resolution: 'answered' | 'agent_decide' | 'cancelled';
+    connectionAction?: never;
+    connectionBarrier?: never;
+} | {
+    waitId: string;
+    objectiveRevision: number;
+    connectionAction: 'continue' | 'cancel';
+    resolution?: never;
+    connectionBarrier?: never;
+} | {
+    waitId: string;
+    objectiveRevision: number;
+    connectionBarrier: true;
+    connectionAction?: never;
+    resolution?: never;
 };
 export type SessionInput = {
     id: string;