@xopcai/xopc 0.0.432 → 0.0.434

package/dist/src/gateway/lock.js

@@ -1,7 +1,7 @@
 import path from "node:path";
-import fsSync from "node:fs";
+import fs from "node:fs";
 import { createHash } from "node:crypto";
-import fs from "node:fs/promises";
+import fs$1 from "node:fs/promises";
 import net from "node:net";
 import { homedir } from "os";
 //#region src/gateway/lock.ts
@@ -29,7 +29,7 @@ function resolveGatewayLockPath(configPath) {
 function isGatewayConfigLockedByAnotherProcessSync(configPath, currentPid = process.pid) {
 	const lockPath = resolveGatewayLockPath(configPath);
 	try {
-		const parsed = JSON.parse(fsSync.readFileSync(lockPath, "utf8"));
+		const parsed = JSON.parse(fs.readFileSync(lockPath, "utf8"));
 		if (typeof parsed.pid !== "number" || parsed.pid === currentPid || parsed.configPath !== configPath) return false;
 		if (!isPidAlive(parsed.pid)) return false;
 		if (process.platform !== "linux" || !Number.isFinite(parsed.startTime)) return true;
@@ -69,7 +69,7 @@ function isPidAlive(pid) {
 function readLinuxStartTime(pid) {
 	if (process.platform !== "linux") return null;
 	try {
-		const raw = fsSync.readFileSync(`/proc/${pid}/stat`, "utf8").trim();
+		const raw = fs.readFileSync(`/proc/${pid}/stat`, "utf8").trim();
 		const closeParen = raw.lastIndexOf(")");
 		if (closeParen < 0) return null;
 		const fields = raw.slice(closeParen + 1).trim().split(/\s+/);
@@ -81,7 +81,7 @@ function readLinuxStartTime(pid) {
 }
 async function readLockPayload(lockPath) {
 	try {
-		const raw = await fs.readFile(lockPath, "utf8");
+		const raw = await fs$1.readFile(lockPath, "utf8");
 		const parsed = JSON.parse(raw);
 		if (typeof parsed.pid !== "number") return null;
 		if (typeof parsed.createdAt !== "string") return null;
@@ -117,11 +117,11 @@ async function acquireGatewayLock(configPath, opts = {}) {
 	const staleMs = opts.staleMs ?? DEFAULT_STALE_MS;
 	const port = opts.port;
 	const lockPath = resolveGatewayLockPath(configPath);
-	await fs.mkdir(path.dirname(lockPath), { recursive: true });
+	await fs$1.mkdir(path.dirname(lockPath), { recursive: true });
 	const startedAt = Date.now();
 	let lastPayload = null;
 	while (Date.now() - startedAt < timeoutMs) try {
-		const handle = await fs.open(lockPath, "wx");
+		const handle = await fs$1.open(lockPath, "wx");
 		const startTime = process.platform === "linux" ? readLinuxStartTime(process.pid) : null;
 		const payload = {
 			pid: process.pid,
@@ -136,7 +136,7 @@ async function acquireGatewayLock(configPath, opts = {}) {
 			configPath,
 			release: async () => {
 				await handle.close().catch(() => void 0);
-				await fs.rm(lockPath, { force: true });
+				await fs$1.rm(lockPath, { force: true });
 				console.log(`[GatewayLock] Lock released: lockPath=${lockPath}`);
 			}
 		};
@@ -147,7 +147,7 @@ async function acquireGatewayLock(configPath, opts = {}) {
 		const ownerStatus = ownerPid ? await resolveOwnerStatus(ownerPid, lastPayload, port) : "unknown";
 		if (ownerStatus === "dead" && ownerPid) {
 			console.warn(`[GatewayLock] Cleaning up stale gateway lock: pid=${ownerPid}`);
-			await fs.rm(lockPath, { force: true });
+			await fs$1.rm(lockPath, { force: true });
 			continue;
 		}
 		if (ownerStatus !== "alive") {
@@ -157,14 +157,14 @@ async function acquireGatewayLock(configPath, opts = {}) {
 				stale = Number.isFinite(createdAt) ? Date.now() - createdAt > staleMs : false;
 			}
 			if (!stale) try {
-				const st = await fs.stat(lockPath);
+				const st = await fs$1.stat(lockPath);
 				stale = Date.now() - st.mtimeMs > staleMs;
 			} catch {
 				stale = false;
 			}
 			if (stale) {
 				console.warn(`[GatewayLock] Removing stale lock file: lockPath=${lockPath}`);
-				await fs.rm(lockPath, { force: true });
+				await fs$1.rm(lockPath, { force: true });
 				continue;
 			}
 		}

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

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

package/dist/src/gateway/mobile-privacy.js

@@ -1,9 +1,9 @@
 import { getProviderRegistry, init_plugin_registry } from "../providers/plugin-registry.js";
 import { PROVIDER_META, getAvailableModels, init_providers } from "../providers/index.js";
-import { resolveSpeechProviderChain } from "../voice/tts/factory.js";
-import { mergeTtsConfigFromAppConfig } from "../voice/tts/merge-config.js";
 import { resolveSTTProviderChain } from "../voice/stt/factory.js";
 import { mergeSttConfigFromAppConfig } from "../voice/stt/config.js";
+import { resolveSpeechProviderChain } from "../voice/tts/factory.js";
+import { mergeTtsConfigFromAppConfig } from "../voice/tts/merge-config.js";
 import { getVoiceProviderMetadata } from "../voice/metadata/registry.js";
 import "../voice/metadata/index.js";
 import { getImageGenerationCatalog } from "./image-generation-setup.js";

package/dist/src/gateway/ports.js

@@ -1,6 +1,6 @@
 import { createLogger } from "../utils/logger/index.js";
 import { init_logger } from "../utils/logger.js";
-import fsSync from "node:fs";
+import fs from "node:fs";
 import { execFileSync } from "node:child_process";
 import net from "node:net";
 //#region src/gateway/ports.ts
@@ -54,7 +54,7 @@ function listPortListenersViaProc(port) {
 	for (const procFile of ["/proc/net/tcp", "/proc/net/tcp6"]) {
 		let content;
 		try {
-			content = fsSync.readFileSync(procFile, "utf-8");
+			content = fs.readFileSync(procFile, "utf-8");
 		} catch {
 			continue;
 		}
@@ -68,7 +68,7 @@ function listPortListenersViaProc(port) {
 	if (inodeSet.size === 0) return results;
 	let pidDirs;
 	try {
-		pidDirs = fsSync.readdirSync("/proc").filter((name) => /^\d+$/.test(name));
+		pidDirs = fs.readdirSync("/proc").filter((name) => /^\d+$/.test(name));
 	} catch {
 		return results;
 	}
@@ -76,14 +76,14 @@ function listPortListenersViaProc(port) {
 		const fdDir = `/proc/${pidStr}/fd`;
 		let fds;
 		try {
-			fds = fsSync.readdirSync(fdDir);
+			fds = fs.readdirSync(fdDir);
 		} catch {
 			continue;
 		}
 		for (const fd of fds) {
 			let target;
 			try {
-				target = fsSync.readlinkSync(`${fdDir}/${fd}`);
+				target = fs.readlinkSync(`${fdDir}/${fd}`);
 			} catch {
 				continue;
 			}
@@ -93,7 +93,7 @@ function listPortListenersViaProc(port) {
 			if (!results.some((p) => p.pid === pid)) {
 				let command;
 				try {
-					command = fsSync.readFileSync(`/proc/${pidStr}/comm`, "utf-8").trim();
+					command = fs.readFileSync(`/proc/${pidStr}/comm`, "utf-8").trim();
 				} catch {}
 				results.push({
 					pid,

package/dist/src/gateway/provider-model-setup.js

@@ -1,9 +1,9 @@
 import { getProviderSetupProfile, init_profiles, isInteractiveOnlyProvider } from "../providers/setup/profiles.js";
 import { getModelCatalogStore, init_model_catalog_store } from "../providers/model-catalog-store.js";
 import { getAllModels, getAllProviders, getModelsByProvider, getProviderDisplayName, init_providers, isProviderConfigured, isProviderConfiguredSync, providerSupportsOAuth } from "../providers/index.js";
+import { getImageGenerationProvider } from "../agent/image/generation/provider-registry.js";
 import { listSttProvidersForApi } from "../voice/stt/list-providers.js";
 import { listGlobalDefaults } from "./global-defaults-admin.js";
-import { getImageGenerationProvider } from "../agent/image/generation/provider-registry.js";
 import { getRecommendedModelsForProvider } from "../providers/presentation.js";
 import { listTtsProvidersForApi } from "../voice/tts/list-providers.js";
 import { readSetupVoiceState } from "../providers/setup/voice.js";

package/dist/src/gateway/server.js

@@ -1,5 +1,5 @@
-import { ensureXopcCliOnPath } from "../infra/path-env.js";
 import { resolveGatewayBindHost, resolveGatewayListenHosts } from "../config/gateway-bind.js";
+import { ensureXopcCliOnPath } from "../infra/path-env.js";
 import { resolveGatewayListenPlan } from "./listen.js";
 import { GatewayService } from "./service.js";
 import { handleSiteShareUpgrade } from "../share/site-share-router.js";

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

@@ -8,11 +8,11 @@ import { TaskRepository, init_task_repository } from "../../tasks/task-repositor
 import { init_connection_wait_repository, onConnectionWaitChanged } from "../../storage/sqlite/connection-wait-repository.js";
 import { createClarificationWait, getClarification, getClarificationSnapshot, resolveClarification, supersedeActiveClarification } from "../../storage/sqlite/clarification-wait-repository.js";
 import "../../storage/sqlite/index.js";
+import { AgentRunCancelledError } from "../../agent/orchestration/run-termination.js";
 import { isPersonalConversation } from "../../personal-agent/repository.js";
-import { TaskCollaborationRepository } from "../../tasks/task-collaboration-repository.js";
 import { TaskConversationRepository } from "../../tasks/task-conversation-repository.js";
+import { TaskCollaborationRepository } from "../../tasks/task-collaboration-repository.js";
 import { TaskApplicationService } from "../../tasks/task-application-service.js";
-import { AgentRunCancelledError } from "../../agent/orchestration/run-termination.js";
 import { reserveEmbeddedRunCancellation } from "../../agent/embedded/runs.js";
 import { EphemeralClarificationWaiter } from "../ephemeral-clarification-waiter.js";
 import { completePhoneAssistanceFromUser, preparePhoneContinuation } from "../../phone/assistance-service.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/config-coordinator.js

@@ -3,12 +3,12 @@ import { init_logger } from "../../utils/logger.js";
 import { getModelRegistry } from "../../providers/model-registry.js";
 import { init_providers } from "../../providers/index.js";
 import { configureTracing } from "../../observability/runtime.js";
+import { evictAllEmbeddedSessionRunners } from "../../agent/embedded/session-runner.js";
+import { reloadImageGenerationProviders } from "../../agent/image/generation/provider-registry.js";
 import { loadConfig, saveConfig } from "../../config/loader.js";
 import { ConfigHotReloader } from "../../config/reload.js";
 import "../../config/index.js";
 import { computeExtensionActivationPatch } from "../../extensions/bundled-extension-activation.js";
-import { reloadImageGenerationProviders } from "../../agent/image/generation/provider-registry.js";
-import { evictAllEmbeddedSessionRunners } from "../../agent/embedded/session-runner.js";
 import { sanitizeTunnelConfig } from "../../tunnel/tunnel-config.js";
 import { isDeepStrictEqual } from "node:util";
 //#region src/gateway/service/config-coordinator.ts

package/dist/src/gateway/service/marketplace-service.js

@@ -3,12 +3,12 @@ import { createLogger } from "../../utils/logger/index.js";
 import { init_logger } from "../../utils/logger.js";
 import { init_agent_scope, resolveDefaultAgentId } from "../../agent/agent-scope.js";
 import { init_paths, resolveExtensionsDir } from "../../config/paths.js";
-import { createSkillConfigManager } from "../../agent/skills/config.js";
-import { resolveWorkspaceSkillsDir, resolveWorkspaceSkillsLockPath } from "../../agent/skills/workspace-skills-dir.js";
 import { getExtensionLockfileManager } from "../../extensions/lockfile.js";
 import { AgentPluginStore } from "../../extensions/agent-plugins/store.js";
 import { removeSkillsLockEntry } from "../../agent/skills/hub-lock.js";
 import { deleteManagedSkill, installSkillFromZip, listManagedSkillDirs } from "../../agent/skills/managed-store.js";
+import { createSkillConfigManager } from "../../agent/skills/config.js";
+import { resolveWorkspaceSkillsDir, resolveWorkspaceSkillsLockPath } from "../../agent/skills/workspace-skills-dir.js";
 import { normalizeSkillInstallTarget } from "../../agent/skills/install-target.js";
 import { pluginSkillPreview, withPluginSkillCatalog } from "../../extensions/agent-plugins/skill-catalog.js";
 import { isAgentPluginArchive, withAgentPluginArchive } from "../../extensions/agent-plugins/sources.js";

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

@@ -11,15 +11,15 @@ import { updateInteractionStateFromMessage } from "../../storage/sqlite/interact
 import "../../storage/sqlite/index.js";
 import { getConversationRouting } from "../../storage/sqlite/conversation-repository.js";
 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 { prependEnvelopeTimestamp } from "../../channels/envelope-timestamp.js";
-import { recordPersonalPerformance } from "../../personal-agent/performance.js";
-import "../chat-limits.js";
 import { isPhoneAssistanceSuspended } from "../../phone/assistance.js";
-import { resolveAgentTurnTimeoutMs } from "../../agent/orchestration/run-agent-turn-with-timeout.js";
-import { formatAgentRunErrorForClient } from "../../agent/client-error-format.js";
 import { resolveExecutionContext } from "../../tasks/execution-context.js";
 import { TaskRunCoordinator } from "../../tasks/task-run-coordinator.js";
+import { recordPersonalPerformance } from "../../personal-agent/performance.js";
+import { formatAgentRunErrorForClient } from "../../agent/client-error-format.js";
+import "../chat-limits.js";
+import { prependEnvelopeTimestamp } from "../../channels/envelope-timestamp.js";
 import { ChatStreamMapper } from "../chat-stream/mapper.js";
 import { markdownNotificationPreview } from "../../notifications/plain-text.js";
 import { resolveWebchatConversationId } from "../resolve-webchat-session-key.js";

package/dist/src/gateway/service/session-command-service.js

@@ -1,10 +1,10 @@
 import { getSessionMetadata } from "../../storage/sqlite/session-read-repository.js";
 import { init_session_repository } from "../../storage/sqlite/session-repository.js";
+import { resolveEffectiveAgentConfigForAgent, resolveEffectiveAgentConfigForSession } from "../../config/agent-profile.js";
+import { init_providers, resolveModel } from "../../providers/index.js";
 import { getPersonalAgentByConversation } from "../../personal-agent/repository.js";
 import { resolveProjectAgentId } from "../../projects/project-agent.js";
-import { resolveEffectiveAgentConfigForAgent, resolveEffectiveAgentConfigForSession } from "../../config/agent-profile.js";
 import "../../projects/index.js";
-import { init_providers, resolveModel } from "../../providers/index.js";
 import { getModelThinking } from "../../providers/model-thinking.js";
 import { withModelConfigLock } from "../../session/model-config-lock.js";
 import { SessionCommandError, acceptSessionCommand, getSessionPreparation, matchSessionInputReceipt, sessionCommandHash } from "../../storage/sqlite/session-creation-repository.js";

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";
@@ -10,15 +11,16 @@ import { consumeClarificationResume, getActiveClarification, supersedeActiveClar
 import { replaceLatestSessionTurnAndQueueInput, validateLatestSessionTurnTarget } from "../../storage/sqlite/session-turn-replace-repository.js";
 import "../../storage/sqlite/index.js";
 import { emitSessionTranscriptUpdate } from "../../session/transcript-events.js";
+import { consumePhoneAssistance, finishPhoneAssistance, phoneAssistance, queuePhoneAssistance, reconcilePhoneAssistance } from "../../phone/assistance.js";
 import { summarizeSourceContext } from "../../agent/source-context/types.js";
 import { TaskApplicationService } from "../../tasks/task-application-service.js";
-import { consumePhoneAssistance, finishPhoneAssistance, phoneAssistance, queuePhoneAssistance, reconcilePhoneAssistance } from "../../phone/assistance.js";
 import { injectSourceContextsIntoUserMessage } from "../../agent/source-context/injector.js";
 import { deleteMediaUrisNoLongerReferenced } from "../../media/session-references.js";
 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;