@xopcai/xopc 0.0.385 → 0.0.387

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

@@ -1,11 +1,17 @@
 import { createLogger } from "../../utils/logger/index.js";
 import { init_logger } from "../../utils/logger.js";
+import { getSqliteDatabase, init_transaction, runSqliteWriteTransaction } from "../../storage/sqlite/transaction.js";
+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 { consumeClarificationResume, init_clarification_wait_repository, supersedeActiveClarification } from "../../storage/sqlite/clarification-wait-repository.js";
+import { TaskRunRepository, init_task_run_repository } from "../../tasks/task-run-repository.js";
+import { consumeClarificationResume, getActiveClarification, init_clarification_wait_repository, supersedeActiveClarification } from "../../storage/sqlite/clarification-wait-repository.js";
 import { replaceLatestSessionTurnAndQueueInput, validateLatestSessionTurnTarget } from "../../storage/sqlite/session-turn-replace-repository.js";
-import { cancelConnectionObjective, consumeConnectionResume, init_connection_wait_repository, invalidateConnectionResumeIntent, publishConnectionWait, reconcileConnectionWaits } from "../../storage/sqlite/connection-wait-repository.js";
+import { cancelConnectionObjective, consumeConnectionResume, getActiveConnectionWait, getConnectionWait, hasPendingConnectionMessages, init_connection_wait_repository, interruptedConnectionMessage, publishConnectionWait, reconcileConnectionWaits } from "../../storage/sqlite/connection-wait-repository.js";
+import { appendTranscriptEntry, init_transcript_repository } from "../../storage/sqlite/transcript-repository.js";
 import { init_sqlite } from "../../storage/sqlite/index.js";
+import { emitSessionTranscriptUpdate } from "../../session/transcript-events.js";
 import { summarizeSourceContext } from "../../agent/source-context/types.js";
+import { TaskApplicationService } from "../../tasks/task-application-service.js";
 import { injectSourceContextsIntoUserMessage } from "../../agent/source-context/injector.js";
 import { deleteMediaUrisNoLongerReferenced } from "../../media/session-references.js";
 import { fitSourceContextsToBudget } from "../../agent/source-context/budget.js";
@@ -14,11 +20,37 @@ import { isDeepStrictEqual } from "node:util";
 //#region src/gateway/service/session-input-coordinator.ts
 init_session_input_repository();
 init_connection_wait_repository();
+init_transaction();
+init_transcript_repository();
+init_session_instance_repository();
 init_clarification_wait_repository();
 init_sqlite();
 init_logger();
+init_task_run_repository();
 const log = createLogger("SessionInputCoordinator");
 const MAX_PENDING_INPUTS = 10;
+function connectionControl(input, wait) {
+	if (input.attachments?.length || input.contextRefs?.length || input.sourceContexts?.some((source) => source.kind !== "device_context") || input.origin.type === "system" && input.origin.source !== "cli") return void 0;
+	const text = input.content.trim().toLowerCase().replace(/[。.!！?？]+$/u, "").trim();
+	if (/^(?:继续|继续看下|继续看看|继续这个目标|继续原目标|continue|resume)$/u.test(text)) {
+		if (text !== "继续原目标" && (hasPendingConnectionMessages(wait) || getActiveClarification(wait.conversationId))) return void 0;
+		return "continue";
+	}
+	if (/^(?:取消这个目标|取消原目标|取消当前目标|cancel this objective|cancel the original objective)$/u.test(text)) return "cancel";
+}
+function connectionInputPayload(wait, control) {
+	if (!wait) return void 0;
+	if (control) return {
+		waitId: wait.id,
+		objectiveRevision: wait.objectiveRevision,
+		connectionAction: control
+	};
+	if (wait.status !== "closed") return {
+		waitId: wait.id,
+		objectiveRevision: wait.objectiveRevision,
+		connectionBarrier: true
+	};
+}
 function sameAppContext(input, existing) {
 	const identity = (sources) => sources?.filter((source) => source.kind === "app_context").map((source) => ({
 		snapshot: source.appContext,
@@ -40,7 +72,7 @@ function steeringText(content, contexts) {
 	}, contexts).content[0].text;
 }
 function contextRefsMatchFrozenSnapshot(requested, frozen) {
-	const editable = frozen?.filter((ref) => ref.kind === "note" || ref.kind === "task" || ref.kind === "file" || ref.kind === "session" || ref.kind === "browser_tab" || ref.kind === "user_assertion") ?? [];
+	const editable = frozen?.filter((ref) => ref.kind === "result" || ref.kind === "note" || ref.kind === "task" || ref.kind === "file" || ref.kind === "session" || ref.kind === "browser_tab" || ref.kind === "user_assertion") ?? [];
 	if (requested.length !== editable.length) return false;
 	return requested.every((ref, index) => {
 		const snapshot = editable[index];
@@ -52,6 +84,7 @@ var SessionInputCoordinator = class {
 	resumeAfter = /* @__PURE__ */ new Map();
 	draining = /* @__PURE__ */ new Set();
 	submissionTails = /* @__PURE__ */ new Map();
+	pendingConnectionStops = /* @__PURE__ */ new Set();
 	constructor(deps) {
 		this.deps = deps;
 	}
@@ -61,9 +94,15 @@ var SessionInputCoordinator = class {
 	snapshot(conversationId) {
 		return getSessionInputState(conversationId);
 	}
+	connectionTarget(conversationId, runtime = this.snapshot(conversationId)) {
+		const active = runtime.activeInputId ? getSessionInputById(conversationId, runtime.activeInputId) : void 0;
+		return getActiveConnectionWait(conversationId) ?? (active?.kind === "connection_resume" && active.payload ? getConnectionWait(active.payload.waitId) : void 0);
+	}
 	async prepareInput(input) {
 		const attachments = await this.deps.prepareAttachments(input.conversationId, input.attachments);
 		const contexts = fitSourceContextsToBudget([...await this.deps.prepareContexts(input.conversationId, input.contextRefs) ?? [], ...input.sourceContexts ?? []]);
+		const wait = this.connectionTarget(input.conversationId);
+		const payload = connectionInputPayload(wait, wait?.principalId === "local-owner" ? connectionControl(input, wait) : void 0);
 		return {
 			status: "queued",
 			requestedDelivery: input.delivery,
@@ -71,10 +110,11 @@ var SessionInputCoordinator = class {
 			content: input.content.trim(),
 			attachments,
 			contextRefs: contexts.map(summarizeSourceContext),
-			interruptRequested: input.interrupt !== false && this.deps.prioritizeInput?.(input) === true,
+			interruptRequested: !wait && input.interrupt !== false && this.deps.prioritizeInput?.(input) === true,
 			contextSnapshots: contexts,
 			thinking: input.thinking,
-			origin: input.origin
+			origin: input.origin,
+			...payload ? { payload } : {}
 		};
 	}
 	async dispatchAcceptedInput(conversationId, inputId) {
@@ -84,6 +124,11 @@ var SessionInputCoordinator = class {
 			const row = getSessionInputById(conversationId, inputId);
 			const state = this.snapshot(input.conversationId);
 			if (!row || row.status !== "queued") return;
+			if (row.payload?.connectionAction === "cancel") this.completeConnectionCancellation(row);
+			if (row.payload?.connectionAction || this.connectionTarget(row.conversationId, state)) {
+				this.requestConnectionStop(row);
+				return;
+			}
 			if (row.interruptRequested) {
 				this.prioritizeAcceptedInput(row, state);
 				return;
@@ -158,6 +203,7 @@ var SessionInputCoordinator = class {
 			const remaining = (this.pendingSubmissions.get(conversationId) ?? 1) - 1;
 			if (remaining) this.pendingSubmissions.set(conversationId, remaining);
 			else this.pendingSubmissions.delete(conversationId);
+			this.drain(conversationId);
 		}
 	}
 	async submit(input) {
@@ -303,27 +349,36 @@ var SessionInputCoordinator = class {
 			};
 		}
 		const runtime = this.snapshot(conversationId);
-		const priority = input.interrupt !== false && this.deps.prioritizeInput?.(input) === true;
-		const canSteer = !priority && input.delivery === "steer" && runtime.activeRunId !== void 0 && !attachments?.length && canSteerContexts(runtime, input.origin, sourceContexts);
+		const wait = this.connectionTarget(conversationId, runtime);
+		const control = wait?.principalId === "local-owner" ? connectionControl(input, wait) : void 0;
+		const payload = connectionInputPayload(wait, control);
+		const priority = !wait && input.interrupt !== false && this.deps.prioritizeInput?.(input) === true;
+		const canSteer = !wait && !priority && input.delivery === "steer" && runtime.activeRunId !== void 0 && !attachments?.length && canSteerContexts(runtime, input.origin, sourceContexts);
 		const effectiveDelivery = canSteer ? "steer" : "next";
-		const row = insertSessionInput({
-			expectedTranscriptId: input.expectedTranscriptId,
-			id: crypto.randomUUID(),
-			conversationId,
-			clientMessageId,
-			requestedDelivery: input.delivery,
-			interruptRequested: priority,
-			effectiveDelivery,
-			status: canSteer ? "injecting" : "queued",
-			content,
-			attachments,
-			contextRefs: sourceContexts?.map(summarizeSourceContext),
-			contextSnapshots: sourceContexts,
-			thinking: input.thinking,
-			origin: input.origin,
-			targetRunId: canSteer ? runtime.activeRunId : void 0
+		const row = runSqliteWriteTransaction(() => {
+			const row = insertSessionInput({
+				expectedTranscriptId: input.expectedTranscriptId ?? (payload ? wait?.transcriptId : void 0),
+				id: crypto.randomUUID(),
+				conversationId,
+				clientMessageId,
+				requestedDelivery: input.delivery,
+				interruptRequested: priority,
+				effectiveDelivery,
+				status: canSteer ? "injecting" : "queued",
+				content,
+				attachments,
+				contextRefs: sourceContexts?.map(summarizeSourceContext),
+				contextSnapshots: sourceContexts,
+				thinking: input.thinking,
+				origin: input.origin,
+				targetRunId: canSteer ? runtime.activeRunId : void 0,
+				...payload ? { payload } : {}
+			});
+			if (control === "cancel") cancelConnectionObjective(conversationId, wait?.id, wait?.objectiveRevision);
+			return row;
 		});
-		invalidateConnectionResumeIntent(conversationId);
+		if (control === "cancel") this.completeConnectionCancellation(row);
+		this.requestConnectionStop(row);
 		supersedeActiveClarification(conversationId);
 		if (priority) {
 			this.prioritizeAcceptedInput(row, runtime);
@@ -364,6 +419,7 @@ var SessionInputCoordinator = class {
 		this.draining.add(conversationId);
 		try {
 			while (true) {
+				if (this.isAcceptingInput(conversationId)) return;
 				const delay = (this.resumeAfter.get(conversationId) ?? 0) - Date.now();
 				if (delay > 0) {
 					await new Promise((resolve) => setTimeout(resolve, delay));
@@ -375,7 +431,15 @@ var SessionInputCoordinator = class {
 				if (!input) return;
 				let allowed;
 				try {
-					allowed = (!this.deps.beforeExecute || await this.deps.beforeExecute(input)) && consumeConnectionResume(input) && consumeClarificationResume(input);
+					allowed = !this.deps.beforeExecute || await this.deps.beforeExecute(input);
+					const wait = input.kind === "connection_resume" && input.payload ? getConnectionWait(input.payload.waitId) : void 0;
+					if (allowed && wait?.status === "queued" && wait.queuedInputId === input.id && (this.isAcceptingInput(conversationId) || hasPendingConnectionMessages(wait, true))) {
+						finishSessionInputRun(conversationId, runId, "interrupted");
+						setSessionInputStatus(input.id, "queued");
+						this.publish(conversationId);
+						continue;
+					}
+					allowed = allowed && consumeConnectionResume(input) && consumeClarificationResume(input);
 				} catch (err) {
 					log.warn({
 						err,
@@ -397,7 +461,7 @@ var SessionInputCoordinator = class {
 				this.publish(conversationId);
 				let result;
 				try {
-					result = await this.deps.execute({
+					result = input.payload?.connectionAction ? await this.executeConnectionControl(input) : await this.deps.execute({
 						inputReceivedAtMs: input.createdAtMs,
 						runId,
 						taskRunId: input.taskRunId,
@@ -420,7 +484,37 @@ var SessionInputCoordinator = class {
 						inputId: input.id
 					}, "Session input execution failed");
 				}
-				const terminal = result.status === "suspended" ? "suspended" : result.status === "ok" ? "completed" : result.status === "aborted" ? "cancelled" : "failed";
+				const cancelledWait = input.kind === "connection_resume" && input.payload ? getConnectionWait(input.payload.waitId) : void 0;
+				const cancelled = cancelledWait?.resolution === "cancelled" && cancelledWait.objectiveRevision === input.payload?.objectiveRevision;
+				if (cancelled && input.taskRunId) {
+					const run = new TaskRunRepository().get(input.taskRunId);
+					if (run && [
+						"queued",
+						"running",
+						"waiting",
+						"verifying"
+					].includes(run.status)) new TaskApplicationService().completeRun({
+						runId: run.id,
+						expectedRunVersion: run.version,
+						actor: { kind: "user" },
+						terminalCode: "cancelled_by_user",
+						suppressAttention: true,
+						receipt: {
+							status: "cancelled",
+							summary: "Connection objective cancelled",
+							changes: [],
+							evidence: [],
+							verification: {
+								status: "unverified",
+								checks: []
+							},
+							remainingWork: [],
+							needsUser: false,
+							completionVerdict: "not_achieved"
+						}
+					});
+				}
+				const terminal = cancelled ? "cancelled" : result.status === "suspended" ? "suspended" : result.status === "ok" ? "completed" : result.status === "aborted" ? "cancelled" : "failed";
 				finishSessionInputRun(conversationId, runId, terminal, terminal === "failed" ? result.summary : void 0);
 				this.publish(conversationId);
 			}
@@ -428,6 +522,94 @@ var SessionInputCoordinator = class {
 			this.draining.delete(conversationId);
 		}
 	}
+	requestConnectionStop(input) {
+		const target = input.payload;
+		if (target?.connectionAction !== "cancel" || !this.deps.interrupt) return;
+		const wait = getConnectionWait(target.waitId);
+		if (!wait || wait.resolution !== "cancelled" || wait.objectiveRevision !== target.objectiveRevision || wait.transcriptId !== input.expectedTranscriptId) return;
+		const runtime = this.snapshot(input.conversationId);
+		const active = runtime.activeInputId ? getSessionInputById(input.conversationId, runtime.activeInputId) : void 0;
+		if (!runtime.activeRunId || active?.kind !== "connection_resume" || !active.payload) return;
+		const sameVersion = active.payload.waitId === target.waitId && active.payload.objectiveRevision === target.objectiveRevision;
+		const parent = getConnectionWait(active.payload.waitId);
+		const sameExecution = wait.originInputId === active.id && parent?.objectiveId === wait.objectiveId;
+		if (!sameVersion && !sameExecution || this.pendingConnectionStops.has(runtime.activeRunId)) return;
+		const runId = runtime.activeRunId;
+		this.pendingConnectionStops.add(runId);
+		this.deps.emit("session.input-interrupt", {
+			conversationId: input.conversationId,
+			runId,
+			inputId: input.id
+		});
+		this.deps.interrupt(input.conversationId, runId, "connection_cancel").catch((err) => {
+			log.warn({
+				err,
+				conversationId: input.conversationId,
+				runId
+			}, "Connection cancellation saved; execution stop was not confirmed");
+		}).finally(() => {
+			this.pendingConnectionStops.delete(runId);
+		});
+	}
+	completeConnectionCancellation(input) {
+		const wait = input.payload ? getConnectionWait(input.payload.waitId) : void 0;
+		if (wait?.objectiveRevision !== input.payload?.objectiveRevision || wait?.resolution !== "cancelled") return;
+		try {
+			this.deps.cancelConnection?.(wait);
+		} catch (err) {
+			log.warn({
+				err,
+				conversationId: input.conversationId,
+				waitId: wait.id
+			}, "Connection cancellation saved; domain cleanup will retry with its control");
+		}
+	}
+	async executeConnectionControl(input) {
+		const target = input.payload;
+		if (!target?.connectionAction) throw new Error("Connection control is required");
+		let wait = getConnectionWait(target.waitId);
+		if (target.connectionAction === "cancel" && wait?.objectiveRevision === target.objectiveRevision) this.deps.cancelConnection?.(wait);
+		if (target.connectionAction === "continue" && wait?.objectiveRevision === target.objectiveRevision) try {
+			await this.deps.continueConnection?.(wait, `connection-control:${input.id}`);
+		} catch (err) {
+			log.warn({
+				err,
+				conversationId: input.conversationId,
+				waitId: target.waitId
+			}, "Connection control preserved for current status feedback");
+		}
+		wait = getConnectionWait(target.waitId);
+		const zh = /[\u3400-\u9fff]/u.test(input.content);
+		const summary = !wait || wait.objectiveRevision !== target.objectiveRevision ? zh ? "原目标已发生变化，请查看当前目标状态。" : "The original objective changed. Check the current objective status." : target.connectionAction === "cancel" ? zh ? "已取消原目标。" : "The original objective was cancelled." : interruptedConnectionMessage(wait) ? zh ? "原目标已保留。请重新发送重启时中断的补充要求，或移除中断的消息后继续。" : "The original objective is saved. Resend the interrupted message or remove it before continuing." : wait.resolution === "cancelled" ? zh ? "原目标已取消。" : "The original objective was cancelled." : wait.status === "closed" ? zh ? "原目标已交给执行流程，无需重复继续。" : "The original objective has already been handed to execution. No additional continuation is needed." : wait.status === "queued" ? zh ? "原目标已准备好，正在等待执行，无需重复继续。" : "The original objective is queued. No additional continuation is needed." : wait.intent ? zh ? "原目标已保留，完成连接和能力检查后会自动继续。" : "The original objective is saved and will continue automatically after connection and capability checks." : zh ? "原目标已保留，请查看连接操作区完成所需操作。" : "The original objective is saved. Complete the required action in the connection panel.";
+		const persisted = runSqliteWriteTransaction(() => {
+			const runtime = this.snapshot(input.conversationId);
+			if (runtime.activeInputId !== input.id || runtime.activeRunId !== input.runId || readCurrentTranscriptId(getSqliteDatabase(), input.conversationId) !== input.expectedTranscriptId) return false;
+			appendTranscriptEntry(input.conversationId, {
+				role: "user",
+				content: input.content,
+				timestamp: input.createdAtMs
+			});
+			appendTranscriptEntry(input.conversationId, {
+				role: "custom",
+				customType: "connection_control_status",
+				content: summary,
+				details: {
+					inputId: input.id,
+					waitId: target.waitId,
+					objectiveRevision: target.objectiveRevision
+				},
+				display: true,
+				timestamp: Date.now()
+			});
+			finishSessionInputRun(input.conversationId, input.runId, "completed");
+			return true;
+		});
+		if (persisted) emitSessionTranscriptUpdate({ conversationId: input.conversationId });
+		return {
+			status: persisted ? "ok" : "aborted",
+			summary: persisted ? summary : ""
+		};
+	}
 	async update(conversationId, id, body) {
 		const attachments = body.attachments === void 0 ? void 0 : await this.deps.prepareAttachments(conversationId, body.attachments);
 		let sourceContexts;
@@ -464,6 +646,10 @@ var SessionInputCoordinator = class {
 	}
 	remove(conversationId, id, version) {
 		const ok = cancelQueuedSessionInput(conversationId, id, version);
+		if (ok) {
+			publishConnectionWait(conversationId);
+			this.drain(conversationId);
+		}
 		return {
 			ok,
 			state: ok ? this.publish(conversationId) : this.snapshot(conversationId)
@@ -480,6 +666,7 @@ var SessionInputCoordinator = class {
 	}
 	recover() {
 		const interrupted = recoverSessionInputState();
+		new TaskRunRepository().reconcileCancelledRuns();
 		for (const conversationId of new Set([...interrupted, ...reconcileConnectionWaits(true)])) {
 			this.publish(conversationId);
 			this.drain(conversationId);

package/dist/src/gateway/service.d.ts

@@ -155,6 +155,7 @@ export declare class GatewayService {
     }>;
     withSessionInputSubmission<T>(conversationId: string, operation: () => Promise<T>): Promise<T>;
     prepareSessionCommandInput(input: Parameters<GatewayAgentRunner['inputs']['prepareInput']>[0]): Promise<{
+        payload?: import("../storage/sqlite/session-input-repository.js").SessionInputPayload;
         status: "queued";
         requestedDelivery: import("../storage/sqlite/session-input-repository.js").SessionInputDelivery;
         effectiveDelivery: "next";

package/dist/src/gateway/service.js

@@ -20,13 +20,13 @@ import { getSessionMetadata } from "../storage/sqlite/session-read-repository.js
 import { init_session_repository, listSessionMetadata, patchSessionMetadata } from "../storage/sqlite/session-repository.js";
 import { getSessionConfig, init_config_repository } from "../storage/sqlite/config-repository.js";
 import { init_sqlite } from "../storage/sqlite/index.js";
-import { normalizeAgentId } from "../agent-catalog/id.js";
-import { init_agent_scope, listAgentEntries, resolveAgentWorkspaceDir, resolveDefaultAgentId } from "../agent/agent-scope.js";
 import { listKnowledgeItems } from "../knowledge-memory/repository.js";
 import { init_config, resolveKnowledgeReadPolicy } from "../user-context/config.js";
 import { init_agent_session_key, resolveAgentMainConversationId } from "../routing/agent-session-key.js";
 import { init_session_key, resolveConversationId, sanitizeSegment } from "../routing/session-key.js";
 import "../knowledge-memory/index.js";
+import { normalizeAgentId } from "../agent-catalog/id.js";
+import { init_agent_scope, listAgentEntries, resolveAgentWorkspaceDir, resolveDefaultAgentId } from "../agent/agent-scope.js";
 import { getDefaultAgentId, init_resolve_route } from "../routing/resolve-route.js";
 import { resolveEffectiveAgentProfileForSession } from "../config/agent-profile.js";
 import { getAgentDefaultModelRef, init_schema } from "../config/schema.js";
@@ -38,12 +38,15 @@ import { AI_USAGE_RETENTION_MS, markStaleAiUsageEventsUnknown, pruneAiUsageEvent
 import { getWorkspacePath } from "../config/workspace-path-helpers.js";
 import { getPersonalAgentByConversation } from "../personal-agent/repository.js";
 import { onSessionTranscriptUpdate } from "../session/transcript-events.js";
+import { TaskAllocationRepository } from "../tasks/task-allocation-repository.js";
+import { stopPersonalResultPreparations } from "../personal-agent/result-reader.js";
 import { TaskConversationRepository } from "../tasks/task-conversation-repository.js";
 import { getEmbeddedExecutionSession } from "../agent/embedded/execution-context.js";
 import { DomainOutboxDispatcher } from "../infra/domain-outbox-dispatcher.js";
 import { ProjectService } from "../projects/project-service.js";
 import { resolveProjectAgentId } from "../projects/project-agent.js";
 import "../projects/index.js";
+import { onTaskResultQueued } from "../tasks/task-result-delivery-repository.js";
 import { runMemoryMaintenance } from "../memory-maintenance/service.js";
 import "../memory-maintenance/index.js";
 import { RealtimeExtensionBrowserProvider } from "../browser/providers/realtime-extension.js";
@@ -52,14 +55,19 @@ import { buildNoteAgentContext } from "../notes/agent-context.js";
 import { NotesStore } from "../notes/store.js";
 import { NotesService } from "../notes/service.js";
 import { LocalAppService } from "../local-apps/service.js";
-import { onTaskResultQueued } from "../tasks/task-result-delivery-repository.js";
+import { buildResultAgentContext } from "../agent/source-context/result-context.js";
+import { buildTaskAgentContext } from "../agent/source-context/task-context.js";
+import { buildUserAssertionAgentContext } from "../agent/source-context/user-assertion-context.js";
+import { assertTaskHandoffAccess, getTaskHandoff } from "../tasks/task-handoff.js";
 import { TaskApplicationService } from "../tasks/task-application-service.js";
 import { AutomationService } from "../automations/service/automation-service.js";
 import { TaskSignalService } from "../tasks/task-signal-service.js";
 import { createProductDispatcher } from "../capabilities/runtime/product.js";
 import "../automations/index.js";
+import { assertTaskExecutorReady } from "../tasks/task-execution-capabilities.js";
 import { TaskRunDispatcher } from "../tasks/task-run-dispatcher.js";
 import "../tasks/index.js";
+import { drainPersonalResultReads } from "../personal-agent/result-read-continuations.js";
 import { areExtensionsGloballyDisabled } from "../extensions/discover-extensions.js";
 import { SessionIndex } from "../session/manager.js";
 import "../session/index.js";
@@ -79,12 +87,6 @@ import { ChannelManager } from "../channels/manager.js";
 import { ChatPreviewService } from "../chat-previews/service.js";
 import "../chat-previews/index.js";
 import "../config/index.js";
-import { DiscussionService } from "../discussions/service.js";
-import { DiscussionOrganizer } from "../discussions/organizer.js";
-import { DiscussionLiveWorker } from "../discussions/live-worker.js";
-import { DiscussionOrganizerWorker } from "../discussions/organizer-worker.js";
-import { DiscussionSealer } from "../discussions/sealer.js";
-import "../discussions/index.js";
 import { ManagedComposioEventPoller } from "../connectors/composio-managed-events.js";
 import { startConnectedKnowledgeCoordinator } from "../knowledge/coordinator.js";
 import "../knowledge/index.js";
@@ -92,12 +94,14 @@ import { PersonalReplyComposer } from "../personal-agent/reply-composer.js";
 import { ConnectionRecoveryService } from "../connectors/connection-recovery-service.js";
 import { startConnectorLearningCoordinator } from "../connectors/learning-coordinator.js";
 import { startConnectorSupervisor } from "../connectors/supervisor.js";
+import { DiscussionService } from "../discussions/service.js";
+import { DiscussionOrganizer } from "../discussions/organizer.js";
+import { DiscussionLiveWorker } from "../discussions/live-worker.js";
+import { DiscussionOrganizerWorker } from "../discussions/organizer-worker.js";
+import { DiscussionSealer } from "../discussions/sealer.js";
+import "../discussions/index.js";
 import { EndpointToolRuntime } from "../endpoint-tools/runtime.js";
 import "../endpoint-tools/index.js";
-import { HomeCapabilityPreflightService } from "../home-intelligence/capability-preflight.js";
-import { HomeAdviceGenerator } from "../home-intelligence/generator.js";
-import { HomeIntelligenceHost } from "../home-intelligence/host.js";
-import { HomeSnapshotBuilder } from "../home-intelligence/snapshot.js";
 import { assertGatewayAuthConfigured, extractToken, resolveGatewayAuth, validateToken } from "./auth.js";
 import { prepareAutomationAgentSession } from "./automation-agent-session.js";
 import { stopTailscaleExposure } from "./tailscale-lifecycle.js";
@@ -106,11 +110,9 @@ import { reconcileHomeIntelligenceAutomation } from "./home-intelligence-automat
 import { PersonalProactivityService } from "../personal-agent/proactivity/service.js";
 import { reconcilePersonalProactivityAutomation } from "../personal-agent/proactivity/automation.js";
 import { createBackgroundTask } from "../infra/background-task.js";
-import { buildTaskAgentContext } from "../agent/source-context/task-context.js";
 import { buildFileAgentContext } from "../agent/source-context/file-context.js";
 import { buildSessionAgentContext } from "../agent/source-context/session-context.js";
 import { buildBrowserTabAgentContext } from "../agent/source-context/browser-tab.js";
-import { buildUserAssertionAgentContext } from "../agent/source-context/user-assertion-context.js";
 import { WorkDiscoveryService } from "../work-discovery/service.js";
 import { buildVoiceMemoryContext } from "../voice/realtime/memory-context.js";
 import { buildVoicePersonaContext } from "../voice/realtime/persona-context.js";
@@ -160,6 +162,10 @@ import { TaskMainUpdateDecisionService } from "../tasks/task-main-update-decisio
 import { selectTaskMainUpdateAttempt, submitAndConfirmTaskMainUpdate } from "../tasks/task-main-update-input.js";
 import { checkAppContextAccess, prepareAppContext } from "./service/app-context-access.js";
 import { applyAutomaticVoiceLanguage, inferProductLanguageFromEnvironment, initializeVoiceDefaults } from "../voice/language-profile.js";
+import { HomeAdviceGenerator } from "../home-intelligence/generator.js";
+import { HomeIntelligenceHost } from "../home-intelligence/host.js";
+import { HomeSnapshotBuilder } from "../home-intelligence/snapshot.js";
+import { HomeCapabilityPreflightService } from "../home-intelligence/capability-preflight.js";
 import crypto from "node:crypto";
 //#region src/gateway/service.ts
 init_session_repository();
@@ -515,6 +521,8 @@ var GatewayService = class {
 		});
 		this.chatPreviews = new ChatPreviewService({ localApps: this.localApps });
 		this.agentRunner = new GatewayAgentRunner({
+			continueConnection: (wait, idempotencyKey) => this.connectionRecovery.continueObjective(wait, idempotencyKey),
+			cancelConnection: (wait) => this.connectionRecovery.cancelObjective(wait),
 			validateConnectionResume: async (input) => {
 				for (const source of input.contextSnapshots ?? []) if (source.kind === "app_context") await checkAppContextAccess(source, this.appContextDispatcher(), this.auth);
 				return this.connectionRecovery.preflight(input);
@@ -525,6 +533,7 @@ var GatewayService = class {
 			getChannelManager: () => this.channelManager,
 			getConfig: () => this.config,
 			resolveTurnContext: async (ref, conversationId) => {
+				if (ref.kind === "result") return buildResultAgentContext(conversationId, ref.sourceId, ref.expectedVersion);
 				if (ref.kind === "task") return buildTaskAgentContext(new TaskRepository().get(ref.sourceId), ref.expectedVersion);
 				if (ref.kind === "user_assertion") {
 					const metadata = await this.sessionIndex.getSessionMetadata(conversationId);
@@ -773,6 +782,18 @@ var GatewayService = class {
 					requestedAgentId
 				})).conversationId;
 			},
+			validateExecutor: (taskId, agentId) => {
+				const allocation = new TaskAllocationRepository().get(taskId);
+				if (!allocation || !agentId) return;
+				const handoff = getTaskHandoff(taskId);
+				if (handoff) assertTaskHandoffAccess(handoff);
+				assertTaskExecutorReady(taskId, allocation.origin_conversation_id, agentId, {
+					ownAgentId: getSessionMetadata(allocation.origin_conversation_id)?.agentId ?? "",
+					getConfig: () => this.config,
+					getAgentSkillAvailability: (id) => this.agentService.getAgentSkillAvailability(id),
+					getAgentToolAvailability: (id, tool) => this.agentService.getAgentToolAvailability(id, tool)
+				});
+			},
 			runAgent: async (runId, conversationId, message) => {
 				for (const adapter of this.sceneHost?.http.activationAdapters.list() ?? []) if (adapter.executeTask && await adapter.executeTask(runId, conversationId)) {
 					this.ensureAgentService();
@@ -912,6 +933,17 @@ var GatewayService = class {
 			if (reply) this.emit("personal.reply.delivered", reply);
 		};
 		await new TaskResultDeliveryService().drain(notify);
+		await drainPersonalResultReads({
+			isAvailable: (conversationId) => !this.stopping && !this.agentRunner.hasActiveRun(conversationId) && !this.agentRunner.inputs.isAcceptingInput(conversationId) && !this.voiceRealtime.hasConversation(conversationId),
+			submit: async (input) => (await this.agentRunner.submitSessionInput({
+				...input,
+				delivery: "next",
+				origin: {
+					type: "system",
+					source: "task_update"
+				}
+			})).ok
+		});
 		new PersonalReplyComposer().drain(async (conversationId, deliveryId) => {
 			const reply = personalReplyNotification(conversationId, deliveryId);
 			notify(conversationId, deliveryId);
@@ -975,7 +1007,7 @@ var GatewayService = class {
 				conversation
 			};
 		}
-		const peerId = `task-${sanitizeSegment(task.id) || Date.now()}`;
+		const peerId = `task-${sanitizeSegment(task.id) || Date.now()}${options.runId ? `-${sanitizeSegment(options.runId)}` : ""}`;
 		const conversationId = resolveConversationId({
 			agentId,
 			source: "webchat",
@@ -1575,6 +1607,7 @@ var GatewayService = class {
 			this.taskRunDispatchTimer = null;
 		}
 		await this.sessionPreparations.stop();
+		await stopPersonalResultPreparations();
 		setPairingBroadcastSink(null);
 		this.stopRealtimeLogBridge?.();
 		this.stopRealtimeLogBridge = null;

package/dist/src/gateway/session-context-summary.js

@@ -11,8 +11,8 @@ import { effectiveWorkspacePathForSession } from "../session/session-workspace.j
 import { ProjectStore } from "../projects/project-store.js";
 import { TaskOriginRepository } from "../tasks/task-origin-repository.js";
 import { TaskConversationRepository } from "../tasks/task-conversation-repository.js";
-import { runExec } from "../infra/exec.js";
 import { TaskCollaborationRepository } from "../tasks/task-collaboration-repository.js";
+import { runExec } from "../infra/exec.js";
 import { isSessionSourceBinding } from "../agent/source-context/types.js";
 import { realpath, stat } from "node:fs/promises";
 //#region src/gateway/session-context-summary.ts

package/dist/src/gateway/xopc-cloud-capability-setup.js

@@ -1,8 +1,8 @@
 import { AgentCatalogRepository, init_repository } from "../agent-catalog/repository.js";
-import { AgentCatalogService } from "../agent-catalog/service.js";
 import { getModelCatalogStore, init_model_catalog_store } from "../providers/model-catalog-store.js";
 import { getAvailableModels, init_providers } from "../providers/index.js";
 import { compareCatalogModels } from "../providers/model-catalog-ranking.js";
+import { AgentCatalogService } from "../agent-catalog/service.js";
 import { prepareUpdateGlobalDefaults } from "./global-defaults-admin.js";
 //#region src/gateway/xopc-cloud-capability-setup.ts
 init_repository();

package/dist/src/home-intelligence/host.js

@@ -1,10 +1,10 @@
 import { createLogger } from "../utils/logger/index.js";
 import { init_logger } from "../utils/logger.js";
+import { HomeAdviceBudgetExceededError, isHomeProseLocalized } from "./generator.js";
 import { homePatternKey } from "./strategy.js";
+import { HomeAdvicePolicy } from "./policy.js";
 import { HomeIntelligenceRepository } from "./repository.js";
 import { HomeOpportunityApplicationService } from "./application-service.js";
-import { HomeAdvicePolicy } from "./policy.js";
-import { HomeAdviceBudgetExceededError, isHomeProseLocalized } from "./generator.js";
 import { buildHomeOpportunityNotification } from "./notification.js";
 import { createHash } from "node:crypto";
 //#region src/home-intelligence/host.ts

package/dist/src/local-apps/service.js

@@ -5,10 +5,10 @@ import { currentOperationId, init_operation_context } from "../infra/operation-c
 import { afterSqliteCommit, init_transaction, runSqliteWriteTransaction } from "../storage/sqlite/transaction.js";
 import { ExtensionCapabilityBindingsSchema, extensionCapabilityPermissions } from "../../packages/gateway-contract/src/extension-capabilities.js";
 import { init_src } from "../../packages/gateway-contract/src/index.js";
-import { CapabilityError } from "../capabilities/runtime/errors.js";
 import { init_paths, resolveExtensionsDir } from "../config/paths.js";
 import { slugifyProjectName } from "../projects/project-store.js";
 import { LocalAppStore } from "./store.js";
+import { CapabilityError } from "../capabilities/runtime/errors.js";
 import { DomainOutboxDispatcher } from "../infra/domain-outbox-dispatcher.js";
 import { validateLocalAppCapabilityContracts } from "./capabilities/contracts.js";
 import { buildLocalAppFixGuidance } from "./fix-guidance.js";

package/dist/src/media/session-references.js

@@ -66,7 +66,7 @@ function isMediaUriReferencedByLiveSession(uri) {
        UNION ALL
        SELECT 1 AS referenced FROM task_result_deliveries d
        JOIN sessions s ON s.conversation_id = d.conversation_id
-       WHERE d.status IN ('pending', 'delivered') AND d.payload_json LIKE ? ESCAPE '\\'
+       WHERE d.status IN ('pending', 'delivered', 'stale') AND d.payload_json LIKE ? ESCAPE '\\'
        LIMIT 1`).get(`%${escaped}%`, `%${escaped}%`)?.referenced === 1;
 }
 async function deleteMediaUris(uris) {

package/dist/src/personal-agent/communication.js

@@ -18,6 +18,7 @@ const PERSONAL_COMMUNICATION_RULES = [
 ];
 const PERSONAL_WORKER_RESULT_GUIDANCE = [
 	"## Result for the originating conversation",
+	"For ordinary Tasks when publish_task_result is available, use it before completion to review the actual result. Connected Requests use their own structured result tool instead. When files were published, finalArtifactIds must select the exact final artifact IDs from publication receipts, including [] for a text-only result. Exclude intermediate, obsolete and failed files; publication history is not the final delivery manifest.",
 	"Provide a complete, evidence-grounded result for the originating conversation. The personal assistant may synthesize its final reply from your report. Match the user’s language and requested depth; preserve requested content, relevant sources, verified data cutoffs, uncertainty, and partial failures. Distinguish reported findings from verified facts. Do not invent a friendly opening or assume a new user request.",
 	"Keep internal planning, Agent names, tool logs, and task progress links out of the result unless the user specifically requested them or they are necessary to explain a blocker. Never substitute a progress page, a plan, or a promise for the requested result. Publish required files through the available artifact tools; do not repeat the same attachments or send the user to a Task page to collect them."
 ].join("\n");