@xopcai/xopc 0.0.433 → 0.0.435

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

@@ -11,6 +11,7 @@ import { getAllModels, init_providers, isProviderConfiguredSync } from "../../..
 import { normalizePhoneAppAccess, phoneAppAccess } from "../../../phone/app-access.js";
 import { cancelPhoneAssistance, pendingPhoneAssistance, phoneAssistance, phoneAssistanceReport } from "../../../phone/assistance.js";
 import { resolveAdbPath } from "../../../phone/adb-driver.js";
+import { resolveHdcVideoTools } from "../../../phone/hdc-video-tools.js";
 import { createPhoneModel } from "../../../phone/model-adapter.js";
 import { getPhoneRuntime, phoneExecutionContext } from "../../../phone/runtime.js";
 import { registerPhoneSetupRoutes } from "./phone-setup.js";
@@ -72,6 +73,7 @@ function registerPhoneRoutes(parent, deps, runtime = getPhoneRuntime()) {
 				body.payload = {
 					ownControl: body.payload.ownControl,
 					textInput: body.payload.textInput,
+					media: body.payload.media,
 					report: {
 						sessionId,
 						deviceId,
@@ -270,12 +272,18 @@ function registerPhoneRoutes(parent, deps, runtime = getPhoneRuntime()) {
 			config: service.currentConfig.phone,
 			defaultDeviceId: runtime.repository.defaultDevice(),
 			runner: "gateway-local",
-			agentId: getDefaultAgentId()
+			agentId: getDefaultAgentId(),
+			hdcVideo: { available: Boolean(resolveHdcVideoTools(service.currentConfig.phone)) }
 		}
 	}));
 	app.patch("/api/phone/settings", strictRateLimitMiddleware, async (c) => {
 		const config = PhoneConfigSchema.parse(await c.req.json());
-		if (!config.enabled || config.adbPath !== service.currentConfig.phone.adbPath) await runtime.shutdown();
+		const videoChanged = [
+			"devecoPath",
+			"javaHome",
+			"sdkJar"
+		].some((key) => config.hdcVideo?.[key] !== service.currentConfig.phone.hdcVideo?.[key]);
+		if (!config.enabled || config.adbPath !== service.currentConfig.phone.adbPath || config.hdcPath !== service.currentConfig.phone.hdcPath || videoChanged) await runtime.shutdown();
 		const next = structuredClone(service.currentConfig);
 		next.phone = config;
 		if (!(await service.saveConfig(next)).saved) throw new PhoneError("PHONE_CONFIG_SAVE_FAILED", "Unable to save Phone Use settings");
@@ -286,10 +294,11 @@ function registerPhoneRoutes(parent, deps, runtime = getPhoneRuntime()) {
 		});
 	});
 	app.get("/api/phone/devices", async (c) => {
+		const platform = z.enum(["android", "harmonyos"]).optional().parse(c.req.query("platform"));
 		let discovery = [];
 		let diagnostic;
 		try {
-			discovery = await runtime.discover(service.currentConfig, c.req.raw.signal);
+			discovery = await runtime.discover(service.currentConfig, c.req.raw.signal, platform);
 		} catch (error) {
 			diagnostic = error instanceof PhoneError ? error.code : "PHONE_ADB_UNAVAILABLE";
 		}
@@ -304,7 +313,10 @@ function registerPhoneRoutes(parent, deps, runtime = getPhoneRuntime()) {
 		});
 	});
 	app.get("/api/phone/apps", async (c) => {
-		const input = z.object({ serial: z.string().min(1).max(200) }).strict().parse(c.req.query());
+		const input = z.object({
+			serial: z.string().min(1).max(200),
+			platform: z.enum(["android", "harmonyos"]).optional()
+		}).strict().parse(c.req.query());
 		const applications = await runtime.applications(input, service.currentConfig, c.req.raw.signal);
 		c.header("Cache-Control", "no-store");
 		return c.json({
@@ -330,8 +342,8 @@ function registerPhoneRoutes(parent, deps, runtime = getPhoneRuntime()) {
 	});
 	app.post("/api/phone/devices", strictRateLimitMiddleware, async (c) => {
 		const input = deviceInput.parse(await c.req.json());
-		if (!(await runtime.discover(service.currentConfig, c.req.raw.signal)).some((device) => device.serial === input.serial && device.state === "device")) throw new PhoneError("PHONE_DEVICE_OFFLINE", "Choose a connected and authorized ADB device");
-		const wireless = runtime.wireless.known(input.serial);
+		if (!(await runtime.discover(service.currentConfig, c.req.raw.signal, input.platform ?? "android")).some((device) => device.serial === input.serial && (device.platform ?? "android") === (input.platform ?? "android") && device.state === "device")) throw new PhoneError("PHONE_DEVICE_OFFLINE", "Choose a connected and authorized USB device");
+		const wireless = input.platform === "harmonyos" ? void 0 : runtime.wireless.known(input.serial);
 		if (wireless) input.serial = (await runtime.wireless.connect(resolveAdbPath(service.currentConfig.phone.adbPath), wireless, c.req.raw.signal, wireless)).device.serial;
 		const device = runtime.repository.save({
 			...input,
@@ -346,7 +358,10 @@ function registerPhoneRoutes(parent, deps, runtime = getPhoneRuntime()) {
 	app.patch("/api/phone/devices/:id", strictRateLimitMiddleware, async (c) => {
 		const id = c.req.param("id");
 		const previous = runtime.repository.get(id);
-		const patch = deviceInput.omit({ serial: true }).partial().parse(await c.req.json());
+		const patch = deviceInput.omit({
+			serial: true,
+			platform: true
+		}).partial().parse(await c.req.json());
 		const next = normalizePhoneAppAccess({
 			...previous,
 			...patch,

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

@@ -4,6 +4,7 @@ import { conversationIdSchema } from "../../../../packages/gateway-contract/src/
 import { sessionInputCommandSchema, sessionMaterializeCommandSchema } from "../../../../packages/gateway-contract/src/session-input-command.js";
 import { parseUserTurnDocument, userTurnDocumentRefIds } from "../../../../packages/gateway-contract/src/user-turn-document.js";
 import { init_src } from "../../../../packages/gateway-contract/src/index.js";
+import { SessionInputControlConflict, init_session_input_control_repository } from "../../../storage/sqlite/session-input-control-repository.js";
 import { endpointTurnClaimSchema, init_src as init_src$1 } from "../../../../packages/endpoint-tools-protocol/src/index.js";
 import { validateWebchatAttachments, validateWebchatContent } from "../../chat-limits.js";
 import { parseSlashCommand } from "../../../chat-commands/command-parse.js";
@@ -17,11 +18,19 @@ import { browserPageContextToAgentContext } from "../../../agent/source-context/
 import { receiveSessionCommand, sessionCommandSnapshot } from "../../service/session-command-service.js";
 import { z } from "zod";
 //#region src/gateway/hono/routes/session-command-handler.ts
+init_session_input_control_repository();
 init_src();
 init_src$1();
 init_logger();
 const log = createLogger("Gateway:SessionCommand");
 function commandError(c, error) {
+	if (error instanceof SessionInputControlConflict) return c.json({
+		ok: false,
+		error: {
+			code: "CONTROL_CHANGED",
+			message: error.message
+		}
+	}, 409);
 	if (error instanceof SessionCommandError) {
 		const status = error.code === "BAD_REQUEST" ? 400 : error.code === "SESSION_DELETED" ? 410 : error.code === "FORBIDDEN" ? 403 : error.code === "NOT_FOUND" ? 404 : 409;
 		return c.json({

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

@@ -0,0 +1,3 @@
+import type { Hono } from 'hono';
+import type { AuthenticatedRouteDeps } from './deps.js';
+export declare function registerSessionInputControlRoutes(authenticated: Hono, { service, chatRateLimitMiddleware }: AuthenticatedRouteDeps): void;

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

@@ -0,0 +1,37 @@
+import { sessionInputControlCommandSchema } from "../../../../packages/gateway-contract/src/session-input-command.js";
+import { init_src } from "../../../../packages/gateway-contract/src/index.js";
+import { SessionInputControlConflict, init_session_input_control_repository } from "../../../storage/sqlite/session-input-control-repository.js";
+//#region src/gateway/hono/routes/session-input-control.ts
+init_src();
+init_session_input_control_repository();
+function registerSessionInputControlRoutes(authenticated, { service, chatRateLimitMiddleware }) {
+	authenticated.post("/api/sessions/:conversationId/input-control", chatRateLimitMiddleware, async (c) => {
+		const command = sessionInputControlCommandSchema.safeParse(await c.req.json().catch(() => null));
+		if (!command.success) return c.json({
+			ok: false,
+			error: {
+				code: "BAD_REQUEST",
+				message: "Invalid input control"
+			}
+		}, 400);
+		try {
+			const state = await service.controlSessionInputs(c.req.param("conversationId"), command.data);
+			return c.json({
+				ok: true,
+				payload: state
+			}, state.control.phase === "stopping" ? 202 : 200);
+		} catch (error) {
+			if (!(error instanceof SessionInputControlConflict)) throw error;
+			return c.json({
+				ok: false,
+				error: {
+					code: "CONFLICT",
+					message: error.message
+				},
+				payload: service.getSessionInputState(c.req.param("conversationId"))
+			}, 409);
+		}
+	});
+}
+//#endregion
+export { registerSessionInputControlRoutes };

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

@@ -27,6 +27,12 @@ export declare function submitSessionInput(c: Context, deps: AuthenticatedRouteD
         ok: true;
         effectiveDelivery: import("../../../storage/sqlite/session-input-repository.js").SessionInputDelivery;
         state: {
+            control: {
+                paused: boolean;
+                version: number;
+                phase: "idle" | "running" | "stopping";
+                reviewRequired: boolean;
+            };
             preparation?: {
                 operationId: string;
                 revision: number;
@@ -189,6 +195,12 @@ export declare function replaceLatestSessionTurn(c: Context, deps: Authenticated
         ok: true;
         effectiveDelivery: "next";
         state: {
+            control: {
+                paused: boolean;
+                version: number;
+                phase: "idle" | "running" | "stopping";
+                reviewRequired: boolean;
+            };
             preparation?: {
                 operationId: string;
                 revision: number;

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

@@ -4,6 +4,7 @@ import { browserPageContextsInputSchema } from "../../../../packages/gateway-con
 import { endpointContextSchema } from "../../../../packages/gateway-contract/src/session-input-command.js";
 import { parseUserTurnDocument, userTurnDocumentRefIds } from "../../../../packages/gateway-contract/src/user-turn-document.js";
 import { init_src } from "../../../../packages/gateway-contract/src/index.js";
+import { SessionInputControlConflict, init_session_input_control_repository } from "../../../storage/sqlite/session-input-control-repository.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";
@@ -21,6 +22,7 @@ import { withModelConfigLock } from "../../../session/model-config-lock.js";
 import { getGatewayPrincipal } from "../../security/gateway-principal.js";
 import { browserPageContextToAgentContext } from "../../../agent/source-context/browser-page.js";
 //#region src/gateway/hono/routes/session-input-handler.ts
+init_session_input_control_repository();
 init_src();
 init_src$1();
 init_providers();
@@ -252,6 +254,15 @@ async function submitSessionInput(c, deps, conversationId, options) {
 				conversationId
 			}
 		}, 202);
+	}).catch((error) => {
+		if (!(error instanceof SessionInputControlConflict)) throw error;
+		return c.json({
+			ok: false,
+			error: {
+				code: "CONTROL_CHANGED",
+				message: error.message
+			}
+		}, 409);
 	});
 }
 async function replaceLatestSessionTurn(c, deps, conversationId, targetTurnId) {
@@ -363,6 +374,8 @@ async function replaceLatestSessionTurn(c, deps, conversationId, targetTurnId) {
 		const result = await deps.service.replaceLatestSessionTurn({
 			conversationId,
 			targetTurnId,
+			expectedTranscriptId: typeof body.expectedTranscriptId === "string" ? body.expectedTranscriptId : void 0,
+			controlVersion: typeof body.controlVersion === "number" ? body.controlVersion : void 0,
 			clientMessageId: typeof body.clientMessageId === "string" ? body.clientMessageId : "",
 			delivery: "next",
 			content,
@@ -392,6 +405,15 @@ async function replaceLatestSessionTurn(c, deps, conversationId, targetTurnId) {
 				conversationId
 			}
 		}, 202);
+	}).catch((error) => {
+		if (!(error instanceof SessionInputControlConflict)) throw error;
+		return c.json({
+			ok: false,
+			error: {
+				code: "CONTROL_CHANGED",
+				message: error.message
+			}
+		}, 409);
 	});
 }
 //#endregion

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

@@ -122,6 +122,7 @@ function registerSessionsRoutes(authenticated, deps) {
 				includePinned: true,
 				includeConversationId,
 				rootConversationsOnly: true,
+				excludeAutomationRuns: true,
 				sortBy: "updatedAt",
 				sortOrder: "desc"
 			});
@@ -141,6 +142,7 @@ function registerSessionsRoutes(authenticated, deps) {
 			includePinned: true,
 			includeConversationId,
 			rootConversationsOnly: true,
+			excludeAutomationRuns: true,
 			sortBy: "updatedAt",
 			sortOrder: "desc"
 		});
@@ -161,6 +163,7 @@ function registerSessionsRoutes(authenticated, deps) {
 			includePinned: true,
 			includeConversationId,
 			rootConversationsOnly: true,
+			excludeAutomationRuns: true,
 			sortBy: "updatedAt",
 			sortOrder: "desc"
 		})).items, pinnedLayout, (session) => session.key);
@@ -277,6 +280,7 @@ function registerSessionsRoutes(authenticated, deps) {
 			sources: query.sources?.split(","),
 			purposes: query.purposes?.split(","),
 			activity: query.activity,
+			excludeAutomationRuns: query.excludeAutomationRuns === "true",
 			agentId: query.agentId,
 			excludeArchived: query.excludeArchived === "true"
 		});

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

@@ -76,7 +76,7 @@ var GatewayAgentRunner = class {
 			prioritizeInput: (input) => (input.origin.type !== "system" || input.origin.source === "cli") && isPersonalConversation(input.conversationId),
 			interrupt: async (conversationId, runId, reason) => {
 				const execution = this.activeExecutionBySession.get(conversationId);
-				if (reason !== "connection_cancel" && execution && execution.kind !== "chat") return;
+				if (reason !== "connection_cancel" && reason !== "user_stop" && execution && execution.kind !== "chat") return;
 				await this.abortAgentRun(runId);
 			},
 			sessionExists: async (conversationId) => Boolean(await opts.sessionIndex.getSessionMetadata(conversationId)),
@@ -137,7 +137,7 @@ var GatewayAgentRunner = class {
 				if (contexts.some((context) => context === null)) throw new Error("A referenced source is unavailable or has changed; select it again");
 				return fitSourceContextsToBudget(contexts.filter((context) => context !== null));
 			},
-			steer: (conversationId, content) => opts.getAgentService().turnDispatcher.steerWebchatSession(conversationId, content),
+			steer: (conversationId, content, runId) => opts.getAgentService().turnDispatcher.steerWebchatSession(conversationId, content, runId),
 			emit: (type, payload) => {
 				opts.emit(type, payload);
 				if (type === "session.input-interrupt") opts.publishRealtime("sessions", type, payload);
@@ -239,10 +239,11 @@ var GatewayAgentRunner = class {
 		return this.inputs.submit(input);
 	}
 	replaceLatestSessionTurn(input) {
-		return this.inputs.replaceLatestTurn(input, async () => {
+		return this.inputs.replaceLatestTurn(input, async (allowAbort) => {
 			const activeRunId = this.activeWebchatRunBySession.get(input.conversationId) ?? this.inputs.snapshot(input.conversationId).activeRunId;
-			if (activeRunId) await this.abortAgentRun(activeRunId);
+			if (activeRunId && allowAbort) await this.abortAgentRun(activeRunId);
 			const { evictEmbeddedSessionRunner } = await import("../../agent/embedded/session-runner.js");
+			if (!allowAbort && (this.activeWebchatRunBySession.has(input.conversationId) || this.inputs.snapshot(input.conversationId).activeRunId)) return;
 			evictEmbeddedSessionRunner(input.conversationId, "gateway_user_turn_replaced");
 			this.opts.getAgentService().evictSessionAgent(input.conversationId);
 		});

package/dist/src/gateway/service/config-coordinator.d.ts

@@ -341,6 +341,12 @@ export declare class GatewayConfigCoordinator {
             maxSessionDurationMs: number;
             idleDisconnectMs: number;
             adbPath?: string;
+            hdcPath?: string;
+            hdcVideo?: {
+                sdkJar?: string;
+                devecoPath?: string;
+                javaHome?: string;
+            };
         };
         tools: {
             web?: {

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

@@ -1,3 +1,4 @@
+import type { SessionInputControlCommand } from '@xopcai/gateway-contract';
 import { type PhoneAssistance } from '../../phone/assistance.js';
 import type { TurnOrigin } from '@xopcai/endpoint-tools-protocol';
 import type { ConnectionWait } from '@xopcai/gateway-contract';
@@ -6,6 +7,7 @@ import type { UserTurnAttachment } from '../user-turn-input.js';
 import { type AgentSourceContext, type TurnContextRef } from '../../agent/source-context/types.js';
 import { type SessionInputDelivery, type SessionInputState } from '../../storage/sqlite/index.js';
 export type SubmitSessionInput = {
+    controlVersion?: number;
     expectedTranscriptId?: string;
     conversationId: string;
     clientMessageId: string;
@@ -31,7 +33,7 @@ export declare class SessionInputCoordinator {
     private readonly pendingConnectionStops;
     constructor(deps: {
         prioritizeInput?: (input: SubmitSessionInput) => boolean;
-        interrupt?: (conversationId: string, runId: string, reason?: 'connection_cancel') => Promise<void>;
+        interrupt?: (conversationId: string, runId: string, reason?: 'connection_cancel' | 'user_stop') => Promise<void>;
         coalesceWindowMs?: number;
         onInputReceived?: (conversationId: string) => void;
         beforeExecute?: (input: SessionInput) => Promise<boolean>;
@@ -55,9 +57,10 @@ export declare class SessionInputCoordinator {
         }>;
         prepareAttachments: (conversationId: string, attachments?: UserTurnAttachment[]) => Promise<UserTurnAttachment[] | undefined>;
         prepareContexts: (conversationId: string, contextRefs?: TurnContextRef[]) => Promise<AgentSourceContext[] | undefined>;
-        steer: (conversationId: string, content: string) => Promise<boolean>;
+        steer: (conversationId: string, content: string, runId?: string) => Promise<boolean>;
         emit: (type: string, payload: unknown) => void;
     });
+    control(conversationId: string, command: SessionInputControlCommand): Promise<SessionInputState>;
     isAcceptingInput(conversationId: string): boolean;
     snapshot(conversationId: string): SessionInputState;
     resumePhone(conversationId: string, waitId: string): void;
@@ -97,7 +100,7 @@ export declare class SessionInputCoordinator {
         ok: false;
         code: 'BAD_REQUEST' | 'QUEUE_FULL' | 'CONTEXT_UNAVAILABLE' | 'SESSION_CHANGED';
     }>;
-    replaceLatestTurn(input: ReplaceLatestTurnInput, beforeReplace: () => Promise<void>): Promise<{
+    replaceLatestTurn(input: ReplaceLatestTurnInput, beforeReplace: (allowAbort: boolean) => Promise<void>): Promise<{
         ok: true;
         effectiveDelivery: 'next';
         state: SessionInputState;

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

@@ -2,6 +2,7 @@ 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 { SessionInputControlConflict, acceptSessionInputControl, hasSessionInputControlOperation, init_session_input_control_repository, readSessionInputControl } from "../../storage/sqlite/session-input-control-repository.js";
 import { SessionInstanceChangedError, cancelQueuedSessionInput, claimNextSessionInput, findSessionInput, findSessionInputByRunId, finishSessionInputRun, getSessionInputById, getSessionInputState, init_session_input_repository, insertSessionInput, mutateQueuedSessionInput, recoverSessionInputState, setSessionInputStatus } from "../../storage/sqlite/session-input-repository.js";
 import { TaskRunRepository, init_task_run_repository } from "../../tasks/task-run-repository.js";
 import { cancelConnectionObjective, consumeConnectionResume, getActiveConnectionWait, getConnectionWait, hasPendingConnectionMessages, init_connection_wait_repository, interruptedConnectionMessage, publishConnectionWait, reconcileConnectionWaits } from "../../storage/sqlite/connection-wait-repository.js";
@@ -19,6 +20,7 @@ import { fitSourceContextsToBudget } from "../../agent/source-context/budget.js"
 import crypto from "node:crypto";
 import { isDeepStrictEqual } from "node:util";
 //#region src/gateway/service/session-input-coordinator.ts
+init_session_input_control_repository();
 init_session_input_repository();
 init_connection_wait_repository();
 init_transaction();
@@ -87,6 +89,36 @@ var SessionInputCoordinator = class {
 	constructor(deps) {
 		this.deps = deps;
 	}
+	async control(conversationId, command) {
+		if (!await this.deps.sessionExists(conversationId)) throw new SessionInputControlConflict("Conversation not found");
+		const replay = hasSessionInputControlOperation(conversationId, command.operationId);
+		if (!replay && command.turnId) {
+			if (!validateLatestSessionTurnTarget(conversationId, command.turnId).ok) throw new SessionInputControlConflict("Only the latest user turn can be edited");
+		}
+		const row = command.inputId ? getSessionInputById(conversationId, command.inputId) : void 0;
+		if (!replay && command.action === "steer" && (!row || row.attachments?.length || row.contextRefs?.length || !canSteerContexts(this.snapshot(conversationId), row.origin, row.contextSnapshots))) throw new SessionInputControlConflict("This input cannot steer the active reply");
+		const accepted = acceptSessionInputControl(conversationId, command);
+		this.publish(conversationId);
+		if (command.action === "steer") {
+			if (!accepted.replay && row) try {
+				if (!await this.deps.steer(conversationId, steeringText(row.content, row.contextSnapshots), accepted.runId)) setSessionInputStatus(row.id, "interrupted", {
+					effectiveDelivery: "next",
+					targetRunId: null,
+					error: "Current reply ended before steering"
+				});
+			} catch (err) {
+				log.warn({
+					err,
+					conversationId,
+					inputId: row.id
+				}, "Steering delivery is awaiting confirmation");
+			}
+			return this.publish(conversationId);
+		}
+		if (accepted.runId) await this.deps.interrupt?.(conversationId, accepted.runId, "user_stop");
+		if ((command.action === "resume" || command.action === "send") && !accepted.replay) this.drain(conversationId);
+		return this.publish(conversationId);
+	}
 	isAcceptingInput(conversationId) {
 		return (this.pendingSubmissions.get(conversationId) ?? 0) > 0;
 	}
@@ -127,7 +159,7 @@ var SessionInputCoordinator = class {
 		await this.runSubmissionExclusive(input.conversationId, async () => {
 			const row = getSessionInputById(conversationId, inputId);
 			const state = this.snapshot(input.conversationId);
-			if (!row || row.status !== "queued") return;
+			if (!row || row.status !== "queued" || state.control.paused) return;
 			if (row.payload?.connectionAction === "cancel") this.completeConnectionCancellation(row);
 			if (row.payload?.connectionAction || this.connectionTarget(row.conversationId, state)) {
 				this.requestConnectionStop(row);
@@ -143,7 +175,7 @@ var SessionInputCoordinator = class {
 				targetRunId: state.activeRunId
 			});
 			try {
-				if (!await this.deps.steer(row.conversationId, steeringText(row.content, row.contextSnapshots))) setSessionInputStatus(row.id, "queued", {
+				if (!await this.deps.steer(row.conversationId, steeringText(row.content, row.contextSnapshots), state.activeRunId)) setSessionInputStatus(row.id, "queued", {
 					effectiveDelivery: "next",
 					targetRunId: null
 				});
@@ -276,10 +308,18 @@ var SessionInputCoordinator = class {
 					code: "CONTEXT_UNAVAILABLE"
 				};
 			}
-			await beforeReplace();
+			const controlState = readSessionInputControl(conversationId);
+			if (input.controlVersion !== void 0 && input.controlVersion !== controlState.version) throw new SessionInputControlConflict("Queue control changed");
+			if ((controlState.paused || input.controlVersion !== void 0) && controlState.phase !== "idle") return {
+				ok: false,
+				code: "SESSION_BUSY"
+			};
+			await beforeReplace(input.controlVersion === void 0);
 			const result = replaceLatestSessionTurnAndQueueInput({
 				conversationId,
 				targetTurnId,
+				expectedTranscriptId: input.expectedTranscriptId,
+				controlVersion: input.controlVersion,
 				clientMessageId,
 				content,
 				attachments,
@@ -391,8 +431,8 @@ var SessionInputCoordinator = class {
 		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 priority = !runtime.control.paused && !wait && input.interrupt !== false && this.deps.prioritizeInput?.(input) === true;
+		const canSteer = !runtime.control.paused && !wait && !priority && input.delivery === "steer" && runtime.activeRunId !== void 0 && !attachments?.length && canSteerContexts(runtime, input.origin, sourceContexts);
 		const effectiveDelivery = canSteer ? "steer" : "next";
 		const row = runSqliteWriteTransaction(() => {
 			const row = insertSessionInput({
@@ -428,7 +468,7 @@ var SessionInputCoordinator = class {
 			};
 		}
 		if (canSteer) {
-			if (!await this.deps.steer(conversationId, steeringText(content, sourceContexts))) {
+			if (!await this.deps.steer(conversationId, steeringText(content, sourceContexts), runtime.activeRunId)) {
 				setSessionInputStatus(row.id, "queued", {
 					effectiveDelivery: "next",
 					targetRunId: null
@@ -478,6 +518,7 @@ var SessionInputCoordinator = class {
 						this.publish(conversationId);
 						continue;
 					}
+					allowed = allowed && readSessionInputControl(conversationId).phase !== "stopping";
 					allowed = allowed && consumeConnectionResume(input) && consumeClarificationResume(input) && consumePhoneAssistance(input);
 				} catch (err) {
 					log.warn({

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

@@ -194,6 +194,7 @@ export declare class GatewayService {
         ok: false;
         code: "BAD_REQUEST" | "TARGET_NOT_FOUND" | "NOT_LATEST" | "SESSION_BUSY" | "CONTEXT_UNAVAILABLE";
     }>;
+    controlSessionInputs(...args: Parameters<GatewayAgentRunner['inputs']['control']>): Promise<import("../storage/sqlite/session-input-repository.js").SessionInputState>;
     getSessionInputState(...args: Parameters<GatewayAgentRunner['getSessionInputState']>): import("../storage/sqlite/session-input-repository.js").SessionInputState;
     updateSessionInput(...args: Parameters<GatewayAgentRunner['updateSessionInput']>): Promise<{
         ok: boolean;

package/dist/src/gateway/service.js

@@ -103,6 +103,10 @@ 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 { deliverAutomationCompletion } from "./automation-completion-delivery.js";
@@ -166,10 +170,6 @@ 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();
@@ -331,7 +331,7 @@ var GatewayService = class {
 					type: "system",
 					source: "internal"
 				},
-				content: `MCP configuration is saved. This is the automatic continuation, not the setup turn. Use tool_search with the exact query mcp__${goal.serverId.replace(/-/g, "_")} to discover this server’s native tools, then complete the original user objective. A natural-language tool search may miss the service; retry with this exact namespace before reporting unavailable tools. If the user only requested a connection, explain available uses without reading account data. After the actual result or accurate blocker, give one or two relevant example requests grounded in the discovered tools, and link the trusted management route ${goal.channel ? `${goal.channel.origin}/#/capabilities/connectors?tab=connected` : "/capabilities/connectors?tab=connected"}. Do not repeat configuration, request secrets, or treat this status as extra write permission. Setup data: ${JSON.stringify({
+				content: `MCP configuration is saved. This is the automatic continuation, not the setup turn. Use tool_search with the exact query mcp__${goal.serverId.replace(/-/g, "_")} to discover this server’s native tools, then complete the original user objective. A natural-language tool search may miss the service; retry with this exact namespace before reporting unavailable tools. If the user only requested a connection, summarize the discovered capabilities in plain language and recommend three concrete example requests, including the information the user needs to provide, without reading account data or running business tools. Clearly separate a successful connection check from a completed business task; never invent a test result. If the user requested a task, complete it first, then give one or two relevant example requests grounded in the discovered tools, and link the trusted management route ${goal.channel ? `${goal.channel.origin}/#/capabilities/connectors?tab=connected` : "/capabilities/connectors?tab=connected"}. Do not repeat configuration, request secrets, or treat this status as extra write permission. Setup data: ${JSON.stringify({
 					serverId: goal.serverId,
 					originalObjective: goal.purpose,
 					objective: goal.objective
@@ -1169,6 +1169,9 @@ var GatewayService = class {
 	replaceLatestSessionTurn(...args) {
 		return this.agentRunner.replaceLatestSessionTurn(...args);
 	}
+	controlSessionInputs(...args) {
+		return this.agentRunner.inputs.control(...args);
+	}
 	getSessionInputState(...args) {
 		return this.agentRunner.getSessionInputState(...args);
 	}

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/personal-agent/capability-service.js

@@ -23,7 +23,7 @@ function personalCapabilities(conversationId, query, accountId) {
 				version: 1,
 				summary: "Connected app discovery",
 				requiredTools: [
-					"xopc_tool_search",
+					"tool_search",
 					"xopc_tool_describe",
 					"xopc_tool_execute"
 				]

package/dist/src/personal-agent/request-access.d.ts

@@ -1,3 +1,5 @@
 import { type PersonalRequest } from './request-repository.js';
+/** Pin one tool call to its worker assignment; an account grant cannot revive a superseded call. */
+export declare function createPersonalRequestExecutionAuthorizer(conversationId: string, request: PersonalRequest): () => void;
 /** Revalidate both owner and executor; collaboration cannot grant account access. */
 export declare function assertPersonalRequestAccountAccess(request: PersonalRequest): void;

package/dist/src/personal-agent/request-access.js

@@ -1,16 +1,36 @@
 import { getSqliteDatabase, init_transaction } from "../storage/sqlite/transaction.js";
 import { init_session_instance_repository, readCurrentTranscriptId } from "../storage/sqlite/session-instance-repository.js";
-import { getPersonalRequest, init_request_repository } from "./request-repository.js";
+import { TaskRunRepository, init_task_run_repository } from "../tasks/task-run-repository.js";
+import { getPersonalRequest, init_request_repository, personalRequestForExecution } from "./request-repository.js";
 import { getConnectorAccount, init_connector_account_repository } from "../storage/sqlite/connector-account-repository.js";
 import { getConnectorConnection, getConnectorInstallation, init_connector_repository } from "../storage/sqlite/connector-repository.js";
 import { canAccessConnectorAccount } from "../connectors/account-access.js";
 import { connectorPrincipalForSession } from "../connectors/principal.js";
+import { TaskConversationRepository } from "../tasks/task-conversation-repository.js";
 //#region src/personal-agent/request-access.ts
 init_connector_account_repository();
 init_connector_repository();
 init_session_instance_repository();
 init_transaction();
+init_task_run_repository();
 init_request_repository();
+/** Pin one tool call to its worker assignment; an account grant cannot revive a superseded call. */
+function createPersonalRequestExecutionAuthorizer(conversationId, request) {
+	const conversations = new TaskConversationRepository();
+	const runs = new TaskRunRepository();
+	const expected = conversations.resolveActiveExecutionSession(conversationId);
+	const transcriptId = readCurrentTranscriptId(getSqliteDatabase(), conversationId);
+	const authorize = () => {
+		const current = conversations.resolveActiveExecutionSession(conversationId);
+		const state = request.taskId ? conversations.getState(request.taskId) : void 0;
+		const currentRequest = personalRequestForExecution(conversationId);
+		const run = request.taskId ? runs.getActiveRoot(request.taskId) : void 0;
+		if (!expected || !expected.runId || !current || !run || !transcriptId || expected.taskId !== request.taskId || expected.agentId !== request.executorAgentId || current.id !== expected.id || current.runId !== expected.runId || current.taskId !== expected.taskId || current.agentId !== expected.agentId || current.assignmentEpoch !== expected.assignmentEpoch || state?.status !== "active" || state.activeConversationId !== conversationId || state.currentExecutorAgentId !== expected.agentId || state.assignmentEpoch !== expected.assignmentEpoch || run.id !== expected.runId || run.conversationId !== conversationId || request.parameters.taskRunId && request.parameters.taskRunId !== run.id || currentRequest?.requestId !== request.requestId || currentRequest.taskId !== expected.taskId || currentRequest.parameters.taskRunId && currentRequest.parameters.taskRunId !== run.id || readCurrentTranscriptId(getSqliteDatabase(), conversationId) !== transcriptId) throw new Error("Personal request execution identity changed");
+		assertPersonalRequestAccountAccess(request);
+	};
+	authorize();
+	return authorize;
+}
 /** Revalidate both owner and executor; collaboration cannot grant account access. */
 function assertPersonalRequestAccountAccess(request) {
 	const current = getPersonalRequest(request.requestId);
@@ -28,4 +48,4 @@ function assertPersonalRequestAccountAccess(request) {
 	if (!principal.isLocalOwner || !installation || !connection || account?.connectorId !== request.connectorId || !canAccessConnectorAccount(connection, installation, principal.agentId) || !canAccessConnectorAccount(connection, installation, request.executorAgentId)) throw new Error("Selected account authorization no longer permits this Personal request");
 }
 //#endregion
-export { assertPersonalRequestAccountAccess };
+export { assertPersonalRequestAccountAccess, createPersonalRequestExecutionAuthorizer };

package/dist/src/personal-agent/request-service.js

@@ -50,7 +50,7 @@ function requestAssessment(request, accountId) {
 		version: 1,
 		summary: request.objective.slice(0, 300),
 		requiredTools: [
-			"xopc_tool_search",
+			"tool_search",
 			"xopc_tool_describe",
 			"xopc_tool_execute"
 		],
@@ -222,7 +222,7 @@ function startPersonalRequest(request, accountId) {
 					version: 1,
 					summary: request.objective.slice(0, 300),
 					requiredTools: [
-						"xopc_tool_search",
+						"tool_search",
 						"xopc_tool_describe",
 						"xopc_tool_execute"
 					],

package/dist/src/personal-agent/specialist-capabilities.d.ts

@@ -1,5 +1,7 @@
 import type { EffectiveAgentConfig } from '../agent-config/index.js';
 import type { Config } from '../config/schema.js';
+/** Legacy allowlists keep their discovery permission; explicit denies still win. */
+export declare function allowsPersonalAgentTool(config: EffectiveAgentConfig, name: string): boolean;
 export declare function getAvailablePersonalAgentTools(config: EffectiveAgentConfig, deps: {
     getConfig?: () => Config | undefined;
 }): string[];