@xopcai/xopc 0.0.385 → 0.0.386

package/dist/src/connectors/connection-recovery-service.js

@@ -6,7 +6,7 @@ import { getSessionInputState, init_session_input_repository } from "../storage/
 import { init_request_repository, personalRequestForWait } from "../personal-agent/request-repository.js";
 import { getConnectorAccount, init_connector_account_repository } from "../storage/sqlite/connector-account-repository.js";
 import { getConnectorConnection, getConnectorInstallation, init_connector_repository, listConnectorConnections, upsertConnectorInstallation } from "../storage/sqlite/connector-repository.js";
-import { cancelConnectionObjective, getActiveConnectionWait, getConnectionWait, init_connection_wait_repository, listConnectionWaitsToCheck, publishConnectionWait, queueConnectionResolution, reconcileConnectionWaits, updateConnectionWait } from "../storage/sqlite/connection-wait-repository.js";
+import { cancelConnectionObjective, getActiveConnectionWait, getConnectionWait, hasPendingConnectionMessages, init_connection_wait_repository, interruptedConnectionMessage, listConnectionWaitsToCheck, publishConnectionWait, queueConnectionResolution, reconcileConnectionWaits, updateConnectionWait } from "../storage/sqlite/connection-wait-repository.js";
 import { init_session_repository } from "../storage/sqlite/session-repository.js";
 import { canAccessConnectorAccount, currentAccountConnections } from "./account-access.js";
 import { getCliAdapter } from "./cli/adapterRegistry.js";
@@ -78,7 +78,7 @@ var ConnectionRecoveryService = class {
 			drainPersonalRequestResults(this.deps.onPersonalRequestDelivered);
 			for (const conversationId of reconcileConnectionWaits()) this.deps.drain(conversationId);
 			for (const wait of listConnectionWaitsToCheck()) {
-				if (this.busy.has(wait.conversationId)) continue;
+				if (this.busy.has(wait.conversationId) || interruptedConnectionMessage(wait)) continue;
 				await this.act(wait.conversationId, {
 					waitId: wait.id,
 					expectedTranscriptId: wait.transcriptId,
@@ -97,6 +97,53 @@ var ConnectionRecoveryService = class {
 	get adapter() {
 		return this.deps.adapter ?? new ComposioSessionsAdapter();
 	}
+	cancelObjective(target) {
+		const wait = getConnectionWait(target.id);
+		if (!wait || wait.objectiveRevision !== target.objectiveRevision || wait.resolution !== "cancelled") return;
+		this.checks.get(wait.id)?.abort(/* @__PURE__ */ new Error("Connection objective cancelled"));
+		const request = personalRequestForWait(wait.id);
+		if (request) cancelPersonalRequest(request);
+	}
+	async continueObjective(target, idempotencyKey) {
+		const wait = getConnectionWait(target.id);
+		if (!wait || wait.status === "closed" || wait.objectiveRevision !== target.objectiveRevision || wait.transcriptId !== target.transcriptId) return;
+		if (wait.status === "queued") {
+			if (!wait.intent || wait.intent.validUntil <= Date.now() || wait.reviewRequired) {
+				updateConnectionWait({
+					...wait,
+					reviewRequired: false,
+					scopeConfirmedAt: Date.now(),
+					intent: {
+						objectiveRevision: wait.objectiveRevision,
+						validUntil: Date.now() + INTENT_TTL
+					}
+				}, wait.version);
+				publishConnectionWait(wait.conversationId);
+			}
+			return;
+		}
+		if (wait.checking) {
+			updateConnectionWait({
+				...wait,
+				checking: void 0,
+				reviewRequired: false,
+				scopeConfirmedAt: Date.now(),
+				intent: {
+					objectiveRevision: wait.objectiveRevision,
+					validUntil: Date.now() + INTENT_TTL
+				}
+			}, wait.version);
+			publishConnectionWait(wait.conversationId);
+			return;
+		}
+		await this.act(wait.conversationId, {
+			waitId: wait.id,
+			expectedTranscriptId: wait.transcriptId,
+			expectedVersion: wait.version,
+			idempotencyKey,
+			action: "confirm_scope"
+		});
+	}
 	markChecking(wait, phase) {
 		const next = updateConnectionWait({
 			...wait,
@@ -223,13 +270,19 @@ var ConnectionRecoveryService = class {
 		const review = wait.reviewRequired || Date.now() - wait.createdAt > INTENT_TTL && !wait.scopeConfirmedAt;
 		const { intent: _intent, checkpoint: _checkpoint, ...visible } = wait;
 		const runtime = getSessionInputState(wait.conversationId);
+		const blockedInput = interruptedConnectionMessage(wait);
+		const deferred = wait.status === "open" && ready && !review && !wait.checking && !wait.recoveryError && Boolean(wait.intent && wait.intent.validUntil > Date.now()) && hasPendingConnectionMessages(wait);
 		return {
 			...visible,
 			needs,
 			timeRange: wait.checkpoint.timeRange,
-			phase: wait.status === "queued" ? "queued" : wait.checking || wait.recoveryError ? "needs_connection" : ready ? review ? "review_scope" : "ready" : "needs_connection",
-			recoveryStage: wait.checking ? wait.checking.phase === "connection" ? "checking_connection" : "checking_tools" : wait.status === "queued" ? "queued" : void 0,
-			queueBlocked: wait.status === "queued" && Boolean(runtime.activeInputId && runtime.activeInputId !== wait.queuedInputId)
+			phase: wait.status === "queued" || deferred ? "queued" : wait.checking || wait.recoveryError ? "needs_connection" : ready ? review ? "review_scope" : "ready" : "needs_connection",
+			recoveryStage: wait.checking ? wait.checking.phase === "connection" ? "checking_connection" : "checking_tools" : wait.status === "queued" || deferred ? "queued" : void 0,
+			queueBlocked: deferred || wait.status === "queued" && Boolean(runtime.activeInputId && runtime.activeInputId !== wait.queuedInputId),
+			...blockedInput ? {
+				blockedInputId: blockedInput.id,
+				queueBlocked: true
+			} : {}
 		};
 	}
 	async ensureInstallation(wait, connectorId) {
@@ -359,6 +412,14 @@ var ConnectionRecoveryService = class {
 			wait.needs = await this.boundedCheck(wait.id, () => this.checkCapabilities(wait, verified));
 			const ready = this.view(wait, verified).needs.every((need) => need.phase === "ready");
 			if (getConnectionWait(wait.id)?.version !== wait.version) return false;
+			if (hasPendingConnectionMessages(wait, true)) {
+				updateConnectionWait({
+					...wait,
+					checking: void 0,
+					lastCheckedAt: Date.now()
+				}, wait.version);
+				return true;
+			}
 			if (ready && wait.intent && wait.intent.validUntil > Date.now() && wait.intent.objectiveRevision === wait.objectiveRevision) {
 				updateConnectionWait({
 					...wait,

package/dist/src/discussions/action-tasks.d.ts

@@ -1,7 +1,7 @@
 export declare function meetingActionTasks(id: string): {
     actionId: string;
     taskId: string;
-    phase: "backlog" | "ready" | "active" | "review" | "closed";
+    phase: "review" | "backlog" | "ready" | "active" | "closed";
     resolution: "cancelled" | "done" | "duplicate" | "wont_do";
     deleted: boolean;
 }[];
@@ -10,7 +10,7 @@ export declare function convertMeetingAction(id: string, actionId: string, organ
     existing: boolean;
     actionId: string;
     taskId: string;
-    phase: "backlog" | "ready" | "active" | "review" | "closed";
+    phase: "review" | "backlog" | "ready" | "active" | "closed";
     resolution: "cancelled" | "done" | "duplicate" | "wont_do";
     deleted: boolean;
 } | {

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" | "send_media" | "create_share" | "memory_maintenance" | "delegate_task" | "skill_install" | "execute_code" | "create_desktop_pet")[];

package/dist/src/gateway/hono/routes/projects.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?: {
@@ -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?: {

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

@@ -9,10 +9,10 @@ import { TaskRunRepository, init_task_run_repository } from "../../../tasks/task
 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/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

@@ -4,6 +4,7 @@ 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 { 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";
@@ -30,6 +31,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,7 +67,15 @@ 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;
 	if (webchatConversationId) {
@@ -158,6 +168,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)) {

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;