@xopcai/xopc 0.0.385 → 0.0.387

package/dist/src/gateway/agent-builtin-tools.d.ts

@@ -277,4 +277,4 @@ export declare const GATEWAY_BUILTIN_TOOLS: readonly [{
         readonly zh: "使用已验证的参数执行选定的外部工具。";
     };
 }];
-export declare const GATEWAY_BUILTIN_TOOL_IDS: ("automation" | "workflow" | "find" | "image" | "knowledge_search" | "knowledge_get" | "knowledge_write" | "user_context_search" | "user_context_get" | "user_context_update" | "web_search" | "web_fetch" | "browser_use" | "grep" | "session_search" | "read_file" | "list_dir" | "write_file" | "apply_patch" | "exec_command" | "update_plan" | "todo" | "clarify" | "xopc_tool_execute" | "web_extract" | "read_media" | "xopc_tool_search" | "xopc_tool_describe" | "image_generate" | "skills_list" | "skill_view" | "skill_manage" | "skills_marketplace_search" | "computer_use" | "send_message" | "text_to_speech" | "send_media" | "create_share" | "session_status" | "memory_maintenance" | "tool_manual" | "delegate_task" | "skill_install" | "execute_code" | "create_desktop_pet")[];
+export declare const GATEWAY_BUILTIN_TOOL_IDS: ("automation" | "workflow" | "find" | "image" | "knowledge_search" | "knowledge_get" | "knowledge_write" | "user_context_search" | "user_context_get" | "user_context_update" | "web_search" | "web_fetch" | "browser_use" | "grep" | "session_search" | "read_file" | "list_dir" | "write_file" | "apply_patch" | "exec_command" | "update_plan" | "todo" | "clarify" | "xopc_tool_execute" | "web_extract" | "tool_manual" | "session_status" | "read_media" | "xopc_tool_search" | "xopc_tool_describe" | "image_generate" | "skills_list" | "skill_view" | "skill_manage" | "skills_marketplace_search" | "computer_use" | "send_message" | "text_to_speech" | "execute_code" | "send_media" | "create_share" | "memory_maintenance" | "delegate_task" | "skill_install" | "create_desktop_pet")[];

package/dist/src/gateway/agents-admin.js

@@ -1,10 +1,10 @@
 import { normalizeAgentId, validateAgentIdForNewAgent } from "../agent-catalog/id.js";
 import { AgentCatalogRepository, init_repository } from "../agent-catalog/repository.js";
 import { init_agent_scope, listAgentEntries, resolveAgentProfileDir, resolveAgentWorkspaceDir, resolveDefaultAgentId, resolveUserPath } from "../agent/agent-scope.js";
-import { AGENT_PROFILE_MARKDOWN_SYSTEM_FILES, REQUIRED_AGENT_PROFILE_MARKDOWN_FILE_SET } from "../agent/context/workspace.js";
-import { AgentCatalogService } from "../agent-catalog/service.js";
 import { resolveEffectiveAgentProfile } from "../config/agent-profile.js";
+import { AGENT_PROFILE_MARKDOWN_SYSTEM_FILES, REQUIRED_AGENT_PROFILE_MARKDOWN_FILE_SET } from "../agent/context/workspace.js";
 import { isPathUnderWorkspace, resolveWorkspaceSafePath } from "./workspace-editor-path.js";
+import { AgentCatalogService } from "../agent-catalog/service.js";
 import { GATEWAY_BUILTIN_TOOL_IDS } from "./agent-builtin-tools.js";
 import { resolve } from "node:path";
 import { mkdir, readFile, realpath, stat, unlink, writeFile } from "node:fs/promises";

package/dist/src/gateway/hono/lib/config-payload.js

@@ -1,7 +1,7 @@
+import { ContextPlanningConfigSchema, KnowledgeMemoryConfigSchema, UserModelConfigSchema, init_config } from "../../../user-context/config.js";
 import { normalizeAgentId } from "../../../agent-catalog/id.js";
 import { AgentCatalogRepository, init_repository } from "../../../agent-catalog/repository.js";
 import { init_agent_scope, listAgentEntries, resolveDefaultAgentId } from "../../../agent/agent-scope.js";
-import { ContextPlanningConfigSchema, KnowledgeMemoryConfigSchema, UserModelConfigSchema, init_config } from "../../../user-context/config.js";
 import { resolveModelsJsonPath } from "../../../config/paths.js";
 import { init_models_json, loadModelsJson } from "../../../config/models-json.js";
 import { CredentialResolver, init_credentials } from "../../../auth/credentials.js";

package/dist/src/gateway/hono/routes/agent-stream.js

@@ -1,7 +1,7 @@
 import { parseUserTurnDocument, userTurnDocumentRefIds } from "../../../../packages/gateway-contract/src/user-turn-document.js";
 import { init_src } from "../../../../packages/gateway-contract/src/index.js";
-import { validateWebchatAttachments, validateWebchatContent } from "../../chat-limits.js";
 import { parseTurnContextRefs } from "../../../agent/source-context/types.js";
+import { validateWebchatAttachments, validateWebchatContent } from "../../chat-limits.js";
 import { replaceLatestSessionTurn } from "./session-input-handler.js";
 import { handleSessionCommand, handleSessionInputReceipt, handleSessionPreparationRetry } from "./session-command-handler.js";
 //#region src/gateway/hono/routes/agent-stream.ts

package/dist/src/gateway/hono/routes/config-patch/misc.js

@@ -1,10 +1,10 @@
-import { BindingsSchema, init_binding_schema } from "../../../../routing/binding-schema.js";
-import { AgentCatalogService } from "../../../../agent-catalog/service.js";
 import { ContextPlanningConfigSchema, HomeIntelligenceConfigSchema, KnowledgeMemoryConfigSchema, UserContextConfigSchema, UserModelConfigSchema, init_config } from "../../../../user-context/config.js";
+import { BindingsSchema, init_binding_schema } from "../../../../routing/binding-schema.js";
 import { ComputerConfigSchema, init_config as init_config$1 } from "../../../../computer/config.js";
 import { BrowserConfigSchema, McpConfigSchema, VoiceConfigSchema, init_schema } from "../../../../config/schema.js";
 import { CredentialResolver, init_credentials } from "../../../../auth/credentials.js";
 import { canonicalizeConfiguredMcpServer } from "../../../../config/mcp-config-normalize.js";
+import { AgentCatalogService } from "../../../../agent-catalog/service.js";
 import { mergeGatewaySkillsMarketplacePatch, mergeSessionConfigPatch, mergeUpdateConfigPatch } from "../../../../config/web-patch.js";
 import { assertGatewayAuthConfigured, resolveGatewayAuth } from "../../../auth.js";
 import { isMaskedSecretPatchValue } from "../../lib/mask-secret-length.js";

package/dist/src/gateway/hono/routes/connectors.js

@@ -6,9 +6,9 @@ import { getConnectorAccount, init_connector_account_repository, listConnectorAc
 import { decideConnectorApproval, getConnectorApproval, listConnectorApprovals, listConnectorConnections } from "../../../storage/sqlite/connector-repository.js";
 import { getConnectorSyncPolicy, upsertConnectorSyncPolicy } from "../../../storage/sqlite/connector-sync-policy-repository.js";
 import { init_sqlite } from "../../../storage/sqlite/index.js";
+import { listUnderstandingSourceGrants, revokeUnderstandingSourceGrant } from "../../../user-context/sources/repository.js";
 import { AgentCatalogRepository, init_repository } from "../../../agent-catalog/repository.js";
 import { init_agent_scope, resolveDefaultAgentId } from "../../../agent/agent-scope.js";
-import { listUnderstandingSourceGrants, revokeUnderstandingSourceGrant } from "../../../user-context/sources/repository.js";
 import { activateComposioBackend, addComposioBackend, ensureComposioBackend, getComposioBackend, listComposioBackends, removeComposioBackend } from "../../../connectors/composio-backends.js";
 import { getAuthorizationAttempt } from "../../../connectors/authorization-attempts.js";
 import { ComposioSessionsAdapter, resolveComposioApiKey } from "../../../connectors/composio-sessions.js";

package/dist/src/gateway/hono/routes/context-sources.js

@@ -2,9 +2,9 @@ import { getSqliteDatabase, init_transaction } from "../../../storage/sqlite/tra
 import { getConnectorAccount } from "../../../storage/sqlite/connector-account-repository.js";
 import { countKnowledgeSourceItems, deleteKnowledgeSourceItems } from "../../../storage/sqlite/knowledge-repository.js";
 import { init_sqlite } from "../../../storage/sqlite/index.js";
-import { init_agent_scope, resolveDefaultAgentId } from "../../../agent/agent-scope.js";
 import { getActiveUnderstandingConsent } from "../../../user-context/sources/consent-repository.js";
 import { getUnderstandingSourceGrant, listUnderstandingSourceGrants, listUnderstandingSourceRuns, revokeUnderstandingSourceGrant, updateUnderstandingSourceGrantPolicies } from "../../../user-context/sources/repository.js";
+import { init_agent_scope, resolveDefaultAgentId } from "../../../agent/agent-scope.js";
 import { listUserModelObservations } from "../../../user-model/observation-repository.js";
 import "../../../user-model/index.js";
 import { listConnectedContentCandidates, readConnectedContent } from "../../../connectors/content-enrichment.js";

package/dist/src/gateway/hono/routes/notes.js

@@ -1,9 +1,9 @@
 import { NoteDeleteOutputSchema, NoteGetOutputSchema, ProductReadContracts } from "../../../../packages/gateway-contract/src/capabilities.js";
 import { init_src } from "../../../../packages/gateway-contract/src/index.js";
-import { CapabilityError } from "../../../capabilities/runtime/errors.js";
-import "../../../capabilities/runtime/dispatcher.js";
 import { init_session_key, resolveConversationId } from "../../../routing/session-key.js";
 import { agentExists, getDefaultAgentId, init_resolve_route } from "../../../routing/resolve-route.js";
+import { CapabilityError } from "../../../capabilities/runtime/errors.js";
+import "../../../capabilities/runtime/dispatcher.js";
 import { resolveGatewayEffectiveHost } from "../../../config/gateway-bind.js";
 import { getShareStore } from "../../../share/share-store.js";
 import { resolveShareUrl } from "../../../share/share-url.js";

package/dist/src/gateway/hono/routes/projects.js

@@ -7,12 +7,12 @@ import { loadTranscriptRowsForSession } from "../../../storage/sqlite/transcript
 import { init_sqlite } from "../../../storage/sqlite/index.js";
 import { ActivityService } from "../../../activity/service.js";
 import "../../../activity/index.js";
-import { CapabilityError } from "../../../capabilities/runtime/errors.js";
-import "../../../capabilities/runtime/dispatcher.js";
 import { listKnowledgeItems, writeKnowledgeItem } from "../../../knowledge-memory/repository.js";
 import "../../../knowledge-memory/index.js";
 import { resolveEffectiveAgentProfile } from "../../../config/agent-profile.js";
 import { TaskReadModelProjector } from "../../../tasks/task-read-model-projector.js";
+import { CapabilityError } from "../../../capabilities/runtime/errors.js";
+import "../../../capabilities/runtime/dispatcher.js";
 import { ProjectWorkspaceConflictError, ProjectWorkspaceMissingError } from "../../../projects/workspace-project.js";
 import { inferProjectExecutionMode, inferProjectKind } from "../../../projects/project-kind.js";
 import { ProjectDeletionBlockedError, ProjectWorkspaceInUseError } from "../../../projects/project-service.js";
@@ -20,9 +20,9 @@ import { resolveProjectAgentId } from "../../../projects/project-agent.js";
 import { inferSuggestedProjectDefaultAgentId } from "../../../projects/project-agent-suggestion.js";
 import { buildProjectLoopOverview } from "../../../projects/project-loop.js";
 import "../../../projects/index.js";
+import { defineTaskContract } from "../../../tasks/task-contract-definition.js";
 import { TaskApplicationService } from "../../../tasks/task-application-service.js";
 import { createProductDispatcher } from "../../../capabilities/runtime/product.js";
-import { defineTaskContract } from "../../../tasks/task-contract-definition.js";
 import { ProjectOperatingViewService, summarizeProjectOperatingView } from "../../../tasks/project-operating-view-service.js";
 import "../../../tasks/index.js";
 import { parseActivityIncludeRelated, parseActivityQuery } from "./activity.js";

package/dist/src/gateway/hono/routes/session-input-handler.d.ts

@@ -57,6 +57,14 @@ export declare function submitSessionInput(c: Context, deps: AuthenticatedRouteD
                     waitId: string;
                     objectiveRevision: number;
                     resolution: "answered" | "agent_decide" | "cancelled";
+                } | {
+                    waitId: string;
+                    objectiveRevision: number;
+                    connectionAction: "continue" | "cancel";
+                } | {
+                    waitId: string;
+                    objectiveRevision: number;
+                    connectionBarrier: true;
                 };
                 attachments?: import("hono/dist/types/utils/types.js").JSONValue[];
                 contextRefs?: {
@@ -74,7 +82,7 @@ export declare function submitSessionInput(c: Context, deps: AuthenticatedRouteD
                 }[];
                 contextSnapshots?: {
                     refId?: string;
-                    kind: import("../../../agent/source-context/types.js").SessionSourceBinding["kind"] | "task" | "file" | "session" | "browser_tab" | "browser_page" | "app_context" | "user_assertion" | "device_context";
+                    kind: import("../../../agent/source-context/types.js").SessionSourceBinding["kind"] | "result" | "task" | "file" | "session" | "browser_tab" | "browser_page" | "app_context" | "user_assertion" | "device_context";
                     sourceId: string;
                     version: string;
                     title: string;
@@ -208,6 +216,14 @@ export declare function replaceLatestSessionTurn(c: Context, deps: Authenticated
                     waitId: string;
                     objectiveRevision: number;
                     resolution: "answered" | "agent_decide" | "cancelled";
+                } | {
+                    waitId: string;
+                    objectiveRevision: number;
+                    connectionAction: "continue" | "cancel";
+                } | {
+                    waitId: string;
+                    objectiveRevision: number;
+                    connectionBarrier: true;
                 };
                 attachments?: import("hono/dist/types/utils/types.js").JSONValue[];
                 contextRefs?: {
@@ -225,7 +241,7 @@ export declare function replaceLatestSessionTurn(c: Context, deps: Authenticated
                 }[];
                 contextSnapshots?: {
                     refId?: string;
-                    kind: import("../../../agent/source-context/types.js").SessionSourceBinding["kind"] | "task" | "file" | "session" | "browser_tab" | "browser_page" | "app_context" | "user_assertion" | "device_context";
+                    kind: import("../../../agent/source-context/types.js").SessionSourceBinding["kind"] | "result" | "task" | "file" | "session" | "browser_tab" | "browser_page" | "app_context" | "user_assertion" | "device_context";
                     sourceId: string;
                     version: string;
                     title: string;

package/dist/src/gateway/hono/routes/session-input-handler.js

@@ -5,17 +5,17 @@ import { endpointContextSchema } from "../../../../packages/gateway-contract/src
 import { parseUserTurnDocument, userTurnDocumentRefIds } from "../../../../packages/gateway-contract/src/user-turn-document.js";
 import { init_src } from "../../../../packages/gateway-contract/src/index.js";
 import { endpointTurnClaimSchema, init_src as init_src$1 } from "../../../../packages/endpoint-tools-protocol/src/index.js";
+import { init_providers, resolveModel } from "../../../providers/index.js";
 import { CapabilityError } from "../../../capabilities/runtime/errors.js";
 import "../../../capabilities/runtime/dispatcher.js";
-import { init_providers, resolveModel } from "../../../providers/index.js";
 import { getModelThinking } from "../../../providers/model-thinking.js";
+import { parseTurnContextRefs } from "../../../agent/source-context/types.js";
 import { validateWebchatAttachments, validateWebchatContent } from "../../chat-limits.js";
 import { isTaskDestructiveCommand } from "../../../session/reset-triggers.js";
 import { parseSlashCommand } from "../../../chat-commands/command-parse.js";
 import { commandRegistry } from "../../../chat-commands/registry.js";
 import "../../../chat-commands/index.js";
 import { isVoiceLikeAttachment } from "../../../channels/attachments/voice-stt-webchat.js";
-import { parseTurnContextRefs } from "../../../agent/source-context/types.js";
 import { deviceTurnSourceContext, endpointClaimBelongsToPrincipal } from "../../../endpoint-tools/turn-context.js";
 import { withModelConfigLock } from "../../../session/model-config-lock.js";
 import { getGatewayPrincipal } from "../../security/gateway-principal.js";

package/dist/src/gateway/hono/routes/tasks.js

@@ -6,13 +6,13 @@ import { hasGatewayScope, init_gateway_scopes } from "../../security/gateway-sco
 import { enqueueTaskChangedEvent, init_task_change_events } from "../../../tasks/task-change-events.js";
 import { TaskRepository, init_task_repository } from "../../../tasks/task-repository.js";
 import { TaskRunRepository, init_task_run_repository } from "../../../tasks/task-run-repository.js";
+import { TaskConversationRepository } from "../../../tasks/task-conversation-repository.js";
 import { CapabilityError } from "../../../capabilities/runtime/errors.js";
 import "../../../capabilities/runtime/dispatcher.js";
-import { TaskConversationRepository } from "../../../tasks/task-conversation-repository.js";
+import { TaskCollaborationRepository } from "../../../tasks/task-collaboration-repository.js";
 import { TaskCriterionReviewRepository } from "../../../tasks/task-criterion-review-repository.js";
 import { TaskContextMutationOutputSchema } from "../../../tasks/capabilities/relations.js";
 import { TaskDeleteOutputSchema } from "../../../tasks/capabilities/management.js";
-import { TaskCollaborationRepository } from "../../../tasks/task-collaboration-repository.js";
 import { TaskMutationOutputSchema } from "../../../tasks/capabilities/write.js";
 import { createProductDispatcher } from "../../../capabilities/runtime/product.js";
 import { ProjectOperatingViewService } from "../../../tasks/project-operating-view-service.js";

package/dist/src/gateway/image-generation-setup.js

@@ -1,11 +1,11 @@
 import { normalizeAgentId } from "../agent-catalog/id.js";
 import { AgentCatalogRepository, init_repository } from "../agent-catalog/repository.js";
 import { init_agent_scope } from "../agent/agent-scope.js";
-import { AgentCatalogService } from "../agent-catalog/service.js";
 import { resolveEffectiveAgentConfigForAgent } from "../config/agent-profile.js";
 import { ConfigSchema, init_schema } from "../config/schema.js";
 import { fetchWithTimeoutGuarded } from "../media-shared/http/provider-http.js";
 import "../media-shared/http/index.js";
+import { AgentCatalogService } from "../agent-catalog/service.js";
 import { getImageGenerationProvider, listImageGenerationProvidersSummary } from "../agent/image/generation/provider-registry.js";
 //#region src/gateway/image-generation-setup.ts
 init_repository();

package/dist/src/gateway/lock.js

@@ -1,8 +1,8 @@
 import path from "node:path";
 import fs from "node:fs";
 import { createHash } from "node:crypto";
-import fs$1 from "node:fs/promises";
 import net from "node:net";
+import fs$1 from "node:fs/promises";
 import { homedir } from "os";
 //#region src/gateway/lock.ts
 /**

package/dist/src/gateway/media-access.js

@@ -1,6 +1,6 @@
 import { TaskRepository, init_task_repository } from "../tasks/task-repository.js";
-import { FileServiceError } from "../files/file-service.js";
 import { resolveMediaReference } from "../media/media-reference.js";
+import { FileServiceError } from "../files/file-service.js";
 import { pendingTranscriptReferencesMediaUri } from "../agent/inbound/attachment-pipeline.js";
 import { TaskContextRepository } from "../tasks/task-context-repository.js";
 import { messagesReferenceMediaUri, taskResultReferencesMediaUri } from "../media/session-references.js";

package/dist/src/gateway/service/agent-runner.d.ts

@@ -14,6 +14,8 @@ import type { AgentSourceContext, TurnContextRef } from '../../agent/source-cont
 import { SessionInputCoordinator, type ReplaceLatestTurnInput, type SubmitSessionInput } from './session-input-coordinator.js';
 export interface GatewayAgentRunnerOptions {
     validateConnectionResume?: (input: import('../../storage/sqlite/session-input-repository.js').SessionInput) => Promise<boolean>;
+    continueConnection?: (wait: import('@xopcai/gateway-contract').ConnectionWait, idempotencyKey: string) => Promise<void>;
+    cancelConnection?: (wait: import('@xopcai/gateway-contract').ConnectionWait) => void;
     bus: MessageBus;
     sessionIndex: SessionIndex;
     /** Resolved lazily — the runner is constructed before AgentService exists. */

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

@@ -6,9 +6,11 @@ import { TaskRepository, init_task_repository } from "../../tasks/task-repositor
 import { createClarificationWait, getClarification, getClarificationSnapshot, init_clarification_wait_repository, resolveClarification, supersedeActiveClarification } from "../../storage/sqlite/clarification-wait-repository.js";
 import { init_connection_wait_repository, onConnectionWaitChanged } from "../../storage/sqlite/connection-wait-repository.js";
 import { init_sqlite } from "../../storage/sqlite/index.js";
+import { AgentRunCancelledError } from "../../agent/orchestration/run-termination.js";
 import { isPersonalConversation } from "../../personal-agent/repository.js";
 import { TaskConversationRepository } from "../../tasks/task-conversation-repository.js";
 import { TaskCollaborationRepository } from "../../tasks/task-collaboration-repository.js";
+import { reserveEmbeddedRunCancellation } from "../../agent/embedded/runs.js";
 import { TaskApplicationService } from "../../tasks/task-application-service.js";
 import { EphemeralClarificationWaiter } from "../ephemeral-clarification-waiter.js";
 import { describeActiveExecution } from "./active-execution.js";
@@ -65,10 +67,12 @@ var GatewayAgentRunner = class {
 		});
 		this.inputs = new SessionInputCoordinator({
 			beforeExecute: opts.validateConnectionResume,
+			continueConnection: opts.continueConnection,
+			cancelConnection: opts.cancelConnection,
 			prioritizeInput: (input) => (input.origin.type !== "system" || input.origin.source === "cli") && isPersonalConversation(input.conversationId),
-			interrupt: async (conversationId, runId) => {
+			interrupt: async (conversationId, runId, reason) => {
 				const execution = this.activeExecutionBySession.get(conversationId);
-				if (execution && execution.kind !== "chat") return;
+				if (reason !== "connection_cancel" && execution && execution.kind !== "chat") return;
 				await this.abortAgentRun(runId);
 			},
 			sessionExists: async (conversationId) => Boolean(await opts.sessionIndex.getSessionMetadata(conversationId)),
@@ -187,29 +191,38 @@ var GatewayAgentRunner = class {
 	}
 	async *runAgent(message, channel, chatId, origin, attachments, thinking, runOptions) {
 		const trackedRunId = runOptions?.runId;
+		const cancellation = channel === "webchat" && trackedRunId ? reserveEmbeddedRunCancellation({
+			conversationId: chatId,
+			runId: trackedRunId
+		}) : void 0;
 		if (trackedRunId) {
+			if (channel === "webchat" && !this.runAbortControllers.has(trackedRunId)) this.runAbortControllers.set(trackedRunId, new AbortController());
 			let resolve = () => {};
 			this.runCompletions.set(trackedRunId, new Promise((done) => {
 				resolve = done;
 			}));
 			this.resolveRunCompletions.set(trackedRunId, resolve);
 		}
-		const iter = runGatewayAgent({
-			config: this.opts.getConfig(),
-			agentService: this.opts.getAgentService(),
-			bus: this.opts.bus,
-			runAbortControllers: this.runAbortControllers,
-			activeWebchatRunBySession: this.activeWebchatRunBySession,
-			activeExecutionBySession: this.activeExecutionBySession,
-			sessionIndex: this.opts.sessionIndex,
-			emit: this.opts.emit,
-			publishRealtime: this.opts.publishRealtime,
-			completeRealtimeTopic: this.opts.completeRealtimeTopic
-		}, message, channel, chatId, origin, attachments, thinking, runOptions);
 		try {
-			return yield* iter;
+			return yield* runGatewayAgent({
+				config: this.opts.getConfig(),
+				agentService: this.opts.getAgentService(),
+				bus: this.opts.bus,
+				runAbortControllers: this.runAbortControllers,
+				activeWebchatRunBySession: this.activeWebchatRunBySession,
+				activeExecutionBySession: this.activeExecutionBySession,
+				sessionIndex: this.opts.sessionIndex,
+				emit: this.opts.emit,
+				publishRealtime: this.opts.publishRealtime,
+				completeRealtimeTopic: this.opts.completeRealtimeTopic
+			}, message, channel, chatId, origin, attachments, thinking, cancellation ? {
+				...runOptions,
+				signal: runOptions?.signal ? AbortSignal.any([runOptions.signal, cancellation.signal]) : cancellation.signal
+			} : runOptions);
 		} finally {
+			cancellation?.release();
 			if (trackedRunId) {
+				this.runAbortControllers.delete(trackedRunId);
 				this.resolveRunCompletions.get(trackedRunId)?.();
 				this.resolveRunCompletions.delete(trackedRunId);
 				this.runCompletions.delete(trackedRunId);
@@ -258,9 +271,9 @@ var GatewayAgentRunner = class {
 				data: { runId }
 			}).catch(() => {});
 		}
-		c.abort();
+		c.abort(new AgentRunCancelledError());
 		const { abortEmbeddedRun } = await import("../../agent/embedded/runs.js");
-		await Promise.all(keysToMark.map((conversationId) => abortEmbeddedRun(conversationId).catch(() => false)));
+		await Promise.all(keysToMark.map((conversationId) => abortEmbeddedRun(conversationId, "user_cancelled", runId).catch(() => false)));
 		await completion;
 		return {
 			aborted: true,

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

@@ -3,7 +3,8 @@ import { createLogger } from "../../utils/logger/index.js";
 import { init_logger } from "../../utils/logger.js";
 import { parseTurnOutcome } from "../../../packages/gateway-contract/src/turn-outcome.js";
 import { init_src } from "../../../packages/gateway-contract/src/index.js";
-import { init_session_input_repository, listTaskUpdateTriggers } from "../../storage/sqlite/session-input-repository.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 { init_clarification_wait_repository, 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";
@@ -12,6 +13,7 @@ import { getConversationRouting } from "../../storage/sqlite/conversation-reposi
 import { init_session_key } from "../../routing/session-key.js";
 import { resolveAgentTurnTimeoutMs } from "../../agent/orchestration/run-agent-turn-with-timeout.js";
 import { isPersonalConversation } from "../../personal-agent/repository.js";
+import { recordPersonalPerformance } from "../../personal-agent/performance.js";
 import { resolveExecutionContext } from "../../tasks/execution-context.js";
 import { TaskRunCoordinator } from "../../tasks/task-run-coordinator.js";
 import { formatAgentRunErrorForClient } from "../../agent/client-error-format.js";
@@ -30,6 +32,7 @@ init_clarification_wait_repository();
 init_src();
 init_logger();
 init_session_key();
+init_task_run_repository();
 init_sqlite();
 init_session_input_repository();
 const log = createLogger("Gateway:Service");
@@ -65,9 +68,19 @@ async function* runGatewayAgent(deps, message, channel, chatId, origin, attachme
 		if (!meta) throw new Error("Session not found; submit a start input command first");
 		webchatTranscriptId = meta?.transcriptId;
 		webchatMetadata = meta;
-		runAbortControllers.set(runId, new AbortController());
+		if (!runAbortControllers.has(runId)) runAbortControllers.set(runId, new AbortController());
+		if (runAbortControllers.get(runId).signal.aborted || runOptions?.signal?.aborted || runOptions?.taskRunId && new TaskRunRepository().get(runOptions.taskRunId)?.status === "cancelled") {
+			runAbortControllers.delete(runId);
+			completeRealtimeTopic(`run:${runId}`);
+			return {
+				status: "aborted",
+				summary: "Interrupted before startup"
+			};
+		}
 	}
 	const streamConversationId = webchatConversationId ?? chatId;
+	const personalTurn = channel === "webchat" && isPersonalConversation(streamConversationId);
+	const inputId = personalTurn ? findSessionInputByRunId(streamConversationId, runId)?.id : void 0;
 	if (webchatConversationId) {
 		if (!webchatMetadata) throw new Error("Session metadata is unavailable");
 		if (!getConversationRouting(webchatConversationId)) throw new Error("Resolved webchat session key is invalid");
@@ -139,6 +152,14 @@ async function* runGatewayAgent(deps, message, channel, chatId, origin, attachme
 					inputToTextMs: queueMs + latencyMs,
 					queueMs
 				}, "Gateway first response text ready");
+				if (personalTurn) recordPersonalPerformance({
+					phase: "first_text",
+					conversationId: streamConversationId,
+					inputId,
+					runId,
+					durationMs: queueMs + latencyMs,
+					status: "success"
+				});
 			}
 			if (taskRun) captureTaskEvent(event);
 			if (channel === "webchat") publishRealtime(`run:${runId}`, event.type, event);
@@ -158,6 +179,7 @@ async function* runGatewayAgent(deps, message, channel, chatId, origin, attachme
 			const prepared = await agentService.prepareInboundAttachments(conversationId, cappedAttachments);
 			const runAbort = runAbortControllers.get(runId);
 			if (!runAbort) throw new Error("run abort controller missing for webchat");
+			if (runOptions?.taskRunId && new TaskRunRepository().get(runOptions.taskRunId)?.status === "cancelled") runAbort.abort();
 			const mergedSignal = runOptions?.signal ? AbortSignal.any([runOptions.signal, runAbort.signal]) : runAbort.signal;
 			agentService.beginInboundTurn(conversationId);
 			if (!activeWebchatRunBySession.has(conversationId)) {
@@ -368,6 +390,14 @@ async function* runGatewayAgent(deps, message, channel, chatId, origin, attachme
 		}
 		throw error;
 	} finally {
+		if (personalTurn) recordPersonalPerformance({
+			phase: "turn_complete",
+			conversationId: streamConversationId,
+			inputId,
+			runId,
+			durationMs: Math.max(0, runStartedAtMs - inputReceivedAtMs) + performance.now() - runStartedMonotonic,
+			status: terminalStatus === "success" ? "success" : terminalStatus === "cancelled" ? "cancelled" : "error"
+		});
 		if (taskRun) try {
 			taskRun.finalize({
 				status: taskRunStatus,

package/dist/src/gateway/service/session-input-coordinator.d.ts

@@ -1,4 +1,5 @@
 import type { TurnOrigin } from '@xopcai/endpoint-tools-protocol';
+import type { ConnectionWait } from '@xopcai/gateway-contract';
 import { type SessionInput } from '../../storage/sqlite/session-input-repository.js';
 import type { UserTurnAttachment } from '../user-turn-input.js';
 import { type AgentSourceContext, type TurnContextRef } from '../../agent/source-context/types.js';
@@ -26,12 +27,15 @@ export declare class SessionInputCoordinator {
     private readonly resumeAfter;
     private readonly draining;
     private readonly submissionTails;
+    private readonly pendingConnectionStops;
     constructor(deps: {
         prioritizeInput?: (input: SubmitSessionInput) => boolean;
-        interrupt?: (conversationId: string, runId: string) => Promise<void>;
+        interrupt?: (conversationId: string, runId: string, reason?: 'connection_cancel') => Promise<void>;
         coalesceWindowMs?: number;
         onInputReceived?: (conversationId: string) => void;
         beforeExecute?: (input: SessionInput) => Promise<boolean>;
+        continueConnection?: (wait: ConnectionWait, idempotencyKey: string) => Promise<void>;
+        cancelConnection?: (wait: ConnectionWait) => void;
         sessionExists: (conversationId: string) => Promise<boolean>;
         execute: (input: {
             inputReceivedAtMs?: number;
@@ -54,7 +58,9 @@ export declare class SessionInputCoordinator {
     });
     isAcceptingInput(conversationId: string): boolean;
     snapshot(conversationId: string): SessionInputState;
+    private connectionTarget;
     prepareInput(input: SubmitSessionInput): Promise<{
+        payload?: import("../../storage/sqlite/session-input-repository.js").SessionInputPayload;
         status: "queued";
         requestedDelivery: SessionInputDelivery;
         effectiveDelivery: "next";
@@ -98,6 +104,9 @@ export declare class SessionInputCoordinator {
     }>;
     private submitLocked;
     drain(conversationId: string): Promise<void>;
+    private requestConnectionStop;
+    private completeConnectionCancellation;
+    private executeConnectionControl;
     update(conversationId: string, id: string, body: {
         version: number;
         content?: string;