@xopcai/xopc 0.0.423 → 0.0.424

package/dist/src/cli/commands/profile.js

@@ -1,7 +1,7 @@
 import { createLogger } from "../../utils/logger/index.js";
 import { init_logger } from "../../utils/logger.js";
-import { createProfile, deleteProfile, getCurrentProfile, getSwitchCommand, listProfiles, resolveProfileStateDir } from "../../config/profile.js";
 import { formatExamples, register } from "../registry.js";
+import { createProfile, deleteProfile, getCurrentProfile, getSwitchCommand, listProfiles, resolveProfileStateDir } from "../../config/profile.js";
 import { colors } from "../utils/colors.js";
 import { Command } from "commander";
 import Table from "cli-table3";

package/dist/src/cli/commands/tunnel.js

@@ -7,8 +7,8 @@ import { resolveTunnelBrokerUrl, resolveTunnelRegistrationSecret } from "../../t
 import { loadTunnelState } from "../../tunnel/tunnel-state.js";
 import { getTunnelService } from "../../tunnel/tunnel-service.js";
 import { loadConfig, saveConfig } from "../../config/loader.js";
-import "../../config/index.js";
 import { formatExamples, register } from "../registry.js";
+import "../../config/index.js";
 import { resolveGatewayAuth } from "../../gateway/auth.js";
 import { requireTunnelGatewayToken } from "../../tunnel/auth-policy.js";
 import { TUNNEL_RISK_SUMMARY_LINES, TunnelConsentError, assertTunnelMayStart, hasValidTunnelConsent } from "../../tunnel/consent.js";

package/dist/src/cli/commands/update.js

@@ -1,7 +1,7 @@
 import { PACKAGE_VERSION, init_package_version } from "../../package-version.js";
 import { loadConfig } from "../../config/loader.js";
-import "../../config/index.js";
 import { formatExamples, register } from "../registry.js";
+import "../../config/index.js";
 import { acquireUpdateLock } from "../../infra/update-lock.js";
 import { normalizeUpdateChannel } from "../../infra/update-channels.js";
 import { compareSemver, resolveNpmChannelTag } from "../../infra/update-check.js";

package/dist/src/cli/extension-cli-register.js

@@ -6,8 +6,8 @@ import { loadConfig } from "../config/loader.js";
 import { MessageBus } from "../infra/bus/queue.js";
 import "../infra/bus/index.js";
 import { bootstrapApplicationStateSync } from "../bootstrap/application-state.js";
-import "../config/index.js";
 import { createDefaultContext } from "./registry.js";
+import "../config/index.js";
 import { registerExtensionCliProgram } from "../extensions/sdk/channel-helpers.js";
 import { join } from "path";
 //#region src/cli/extension-cli-register.ts

package/dist/src/cli/utils/init-workspace-core.js

@@ -1,6 +1,6 @@
 import { AgentCatalogRepository, init_repository } from "../../agent-catalog/repository.js";
-import { AgentCatalogService } from "../../agent-catalog/service.js";
 import { ConfigSchema, init_schema } from "../../config/schema.js";
+import { AgentCatalogService } from "../../agent-catalog/service.js";
 import { readConfigFileSnapshot } from "../../config/config-file.js";
 import { saveConfig } from "../../config/loader.js";
 import { ensureStarterAgentsInitialized } from "../../agent/starter-agents.js";

package/dist/src/computer/diagnostics.d.ts

@@ -15,8 +15,8 @@ export type ComputerFailurePhase = z.infer<typeof ComputerFailurePhaseSchema>;
 export declare const ComputerFailureCategorySchema: z.ZodEnum<{
     permission: "permission";
     target: "target";
-    cancelled: "cancelled";
     unknown: "unknown";
+    cancelled: "cancelled";
     model: "model";
     observation: "observation";
     budget: "budget";
@@ -29,8 +29,8 @@ export declare const ComputerFailureSchema: z.ZodObject<{
     category: z.ZodEnum<{
         permission: "permission";
         target: "target";
-        cancelled: "cancelled";
         unknown: "unknown";
+        cancelled: "cancelled";
         model: "model";
         observation: "observation";
         budget: "budget";
@@ -125,8 +125,8 @@ export declare const ComputerSessionReportSchema: z.ZodObject<{
         category: z.ZodEnum<{
             permission: "permission";
             target: "target";
-            cancelled: "cancelled";
             unknown: "unknown";
+            cancelled: "cancelled";
             model: "model";
             observation: "observation";
             budget: "budget";

package/dist/src/computer/evaluation.d.ts

@@ -50,8 +50,8 @@ export declare const ComputerEvaluationRunSchema: z.ZodObject<{
         category: z.ZodEnum<{
             permission: "permission";
             target: "target";
-            cancelled: "cancelled";
             unknown: "unknown";
+            cancelled: "cancelled";
             model: "model";
             observation: "observation";
             budget: "budget";
@@ -106,7 +106,7 @@ export declare function isAutonomousComputerSuccess(run: ComputerEvaluationRun):
 /** Export measured runtime values only; an executor must supply independent safety and oracle evidence. */
 export declare function computerReportMeasurements(report: ComputerSessionReport): {
     failure?: {
-        category: "permission" | "target" | "cancelled" | "unknown" | "model" | "observation" | "budget" | "transport" | "native" | "no_progress" | "harness";
+        category: "permission" | "target" | "unknown" | "cancelled" | "model" | "observation" | "budget" | "transport" | "native" | "no_progress" | "harness";
         phase: "open" | "executor" | "model" | "observe" | "dispatch" | "release" | "frame_upload" | "oracle";
         errorCode: string;
         dispatch: "unknown" | "completed" | "started" | "notStarted";

package/dist/src/config/agent-profile.js

@@ -1,6 +1,6 @@
+import { normalizeAgentId } from "../agent-catalog/id.js";
 import { resolveEffectiveAgentConfig } from "../agent-config/resolver.js";
 import { init_agent_config } from "../agent-config/index.js";
-import { normalizeAgentId } from "../agent-catalog/id.js";
 import { AgentCatalogRepository, init_repository } from "../agent-catalog/repository.js";
 import { init_agent_scope, resolveAgentWorkspaceDir } from "../agent/agent-scope.js";
 import { getConversationRouting } from "../storage/sqlite/conversation-repository.js";

package/dist/src/config/index.js

@@ -14,9 +14,9 @@ import { applyConfigOverrides, getConfigOverrides, resetConfigOverrides, setConf
 import { canonicalizeConfiguredMcpServer, normalizeConfiguredMcpServers } from "./mcp-config-normalize.js";
 import { formatThinkingLevels, listThinkingLevels, normalizeElevatedMode, normalizeReasoningLevel, normalizeThinkLevel, normalizeVerboseLevel, thinkLevelToNumber } from "../agent/transcript/thinking-types.js";
 import { loadConfig, saveConfig } from "./loader.js";
-import { diffConfigPaths } from "./diff.js";
 import { listAgentProfileMarkdownDirs, listAgentWorkspaceDirs } from "./workspace-dirs.js";
 import { ProfileManager, createProfile, deleteProfile, getCurrentProfile, getProfileManager, getProfileNameFromDir, getSwitchCommand, listProfiles, resolveProfileStateDir } from "./profile.js";
+import { diffConfigPaths } from "./diff.js";
 import { BASE_RELOAD_RULES, buildReloadPlan, matchReloadRule } from "./rules.js";
 import { ConfigHotReloader } from "./reload.js";
 //#region src/config/index.ts

package/dist/src/connectors/learning-coordinator.js

@@ -1,8 +1,8 @@
 import { createLogger } from "../utils/logger/index.js";
 import { init_logger } from "../utils/logger.js";
-import { claimNextConnectorLearningJob, enqueueConnectorLearningJob, listConnectorLearningJobs, recoverStaleConnectorLearningJobs, setConnectorLearningPaused, updateConnectorLearningJob } from "../storage/sqlite/connector-learning-repository.js";
 import { getConnectorAccount, reconcileConnectorAccount } from "../storage/sqlite/connector-account-repository.js";
 import { getConnectorInstallation, listConnectorConnections, upsertConnectorConnection } from "../storage/sqlite/connector-repository.js";
+import { claimNextConnectorLearningJob, enqueueConnectorLearningJob, listConnectorLearningJobs, recoverStaleConnectorLearningJobs, setConnectorLearningPaused, updateConnectorLearningJob } from "../storage/sqlite/connector-learning-repository.js";
 import { pruneBoundedKnowledgeSourceItems } from "../storage/sqlite/knowledge-repository.js";
 import { getConnectorSyncPolicyForConnection } from "../storage/sqlite/connector-sync-policy-repository.js";
 import "../storage/sqlite/index.js";

package/dist/src/execution-environments/local-worktree-manager.js

@@ -8,8 +8,8 @@ import { assertManagedWorktreePath, assertNoNestedRegisteredWorktrees, readDirec
 import { dirname, resolve } from "node:path";
 import { existsSync } from "node:fs";
 import { randomUUID } from "node:crypto";
-import { mkdir, rm, stat } from "node:fs/promises";
 import lockfile from "proper-lockfile";
+import { mkdir, rm, stat } from "node:fs/promises";
 //#region src/execution-environments/local-worktree-manager.ts
 init_logger();
 const log = createLogger("ExecutionEnvironment:LocalWorktree");

package/dist/src/extensions/agent-plugins/skill-catalog.js

@@ -1,7 +1,7 @@
-import { parseFrontmatter } from "../../markdown/frontmatter.js";
 import { containedPath } from "./contained-path.js";
 import "./validation.js";
 import { AgentPluginStore } from "./store.js";
+import { parseFrontmatter } from "../../markdown/frontmatter.js";
 import { createSkillConfigManager } from "../../agent/skills/config.js";
 import { parseSkillLocalizations } from "../../agent/skills/parse-skill-metadata.js";
 import { buildSkillMarkdownPreviewFromRaw } from "../../agent/skills/skill-markdown-preview-from-raw.js";

package/dist/src/extensions/agent-plugins/validation.js

@@ -9,8 +9,8 @@ import { dirname, join, resolve } from "node:path";
 import { existsSync, lstatSync, readFileSync, readdirSync, realpathSync, statSync } from "node:fs";
 import { createHash } from "node:crypto";
 import { z } from "zod";
-import yaml from "js-yaml";
 import { validateHeaderName, validateHeaderValue } from "node:http";
+import yaml from "js-yaml";
 //#region src/extensions/agent-plugins/validation.ts
 init_schema();
 const PLUGIN_SCHEMA = "https://agent-plugins.org/schemas/1.0.0/plugin.schema.json";

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

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

package/dist/src/gateway/ephemeral-clarification-waiter.js

@@ -6,6 +6,7 @@ init_src();
 var EphemeralClarificationWaiter = class {
 	pending = /* @__PURE__ */ new Map();
 	start(input) {
+		if (input.request.schemaVersion === 2) return Promise.reject(/* @__PURE__ */ new Error("CLARIFICATION_VERSION_UNSUPPORTED: ephemeral runs support single questions"));
 		const request = normalizeClarificationQuestion(input.request);
 		const requestId = crypto.randomUUID();
 		const expiresAt = request.kind === "approval" ? Date.now() + 10 * 6e4 : void 0;

package/dist/src/gateway/global-defaults-admin.js

@@ -1,8 +1,8 @@
 import { AgentDefaultsSchema } from "../agent-config/schema.js";
 import { init_agent_config } from "../agent-config/index.js";
 import { AgentCatalogRepository, init_repository } from "../agent-catalog/repository.js";
-import { AgentCatalogService } from "../agent-catalog/service.js";
 import { validatePhoneModelChange } from "../phone/model-adapter.js";
+import { AgentCatalogService } from "../agent-catalog/service.js";
 import { validateComputerModelChange } from "../computer/model-config.js";
 import { GATEWAY_BUILTIN_TOOLS } from "./agent-builtin-tools.js";
 import { isDeepStrictEqual } from "node:util";

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

@@ -1,6 +1,6 @@
+import { normalizeAgentId } from "../../../agent-catalog/id.js";
 import { AgentEntrySchema, AgentModelsOverrideSchema, AgentProfileSchema, RuntimePolicySchema, SkillOverrideSchema, ToolPoliciesSchema } from "../../../agent-config/schema.js";
 import { init_agent_config } from "../../../agent-config/index.js";
-import { normalizeAgentId } from "../../../agent-catalog/id.js";
 import { init_agent_scope } from "../../../agent/agent-scope.js";
 import { getVoiceModelsConfig } from "../../../config/voice.js";
 import { createGatewayAgent, deleteAgentAvatarFile, deleteGatewayAgent, getGatewayAgentEffectiveConfig, listAgentProfileFiles, listGatewayAgents, readAgentAvatarFile, readAgentProfileFile, resolveAgentAvatarImage, updateGatewayAgent, writeAgentAvatarFromBase64, writeAgentProfileFile } from "../../agents-admin.js";

package/dist/src/gateway/hono/routes/composer-history.js

@@ -1,8 +1,8 @@
 import { conversationIdSchema } from "../../../../packages/gateway-contract/src/conversation-identity.js";
 import { init_src } from "../../../../packages/gateway-contract/src/index.js";
-import { appendComposerInputHistory, clearComposerInputHistory, listComposerInputHistory } from "../../../storage/sqlite/composer-input-history-repository.js";
 import { getSessionMetadata } from "../../../storage/sqlite/session-read-repository.js";
 import { init_session_repository } from "../../../storage/sqlite/session-repository.js";
+import { appendComposerInputHistory, clearComposerInputHistory, listComposerInputHistory } from "../../../storage/sqlite/composer-input-history-repository.js";
 import "../../../storage/sqlite/index.js";
 //#region src/gateway/hono/routes/composer-history.ts
 init_src();

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

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

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

@@ -1,9 +1,9 @@
 import { createLogger } from "../../../utils/logger/index.js";
 import { init_logger } from "../../../utils/logger.js";
 import { hasGatewayScope } from "../../security/gateway-scopes.js";
-import { listConnectorLearningJobs } from "../../../storage/sqlite/connector-learning-repository.js";
 import { getConnectorAccount, init_connector_account_repository, listConnectorAccounts, updateConnectorAccount } from "../../../storage/sqlite/connector-account-repository.js";
 import { decideConnectorApproval, getConnectorApproval, listConnectorApprovals, listConnectorConnections } from "../../../storage/sqlite/connector-repository.js";
+import { listConnectorLearningJobs } from "../../../storage/sqlite/connector-learning-repository.js";
 import { getConnectorSyncPolicy, upsertConnectorSyncPolicy } from "../../../storage/sqlite/connector-sync-policy-repository.js";
 import "../../../storage/sqlite/index.js";
 import { AgentCatalogRepository, init_repository } from "../../../agent-catalog/repository.js";

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

@@ -1,7 +1,7 @@
 import { HomeAdviceMetricsSchema, HomeAdvisorRefreshRequestSchema, HomeOpportunityActionRequestSchema, HomeOpportunityFeedbackRequestSchema, HomeOpportunityFeedbackUndoRequestSchema, HomeOpportunityHistoryResponseSchema } from "../../../../packages/gateway-contract/src/home.js";
 import { init_src } from "../../../../packages/gateway-contract/src/index.js";
-import { acknowledgeHomeAttention } from "../../../storage/sqlite/home-attention-repository.js";
 import { decideConnectorApproval } from "../../../storage/sqlite/connector-repository.js";
+import { acknowledgeHomeAttention } from "../../../storage/sqlite/home-attention-repository.js";
 import "../../../storage/sqlite/index.js";
 import { HomeQueryService, buildHomeWorkbench, decisionFromTask } from "../../../tasks/home-query-service.js";
 import { resumeApprovedConnectorAction } from "../../../connectors/approval-resume.js";

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

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

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

@@ -1,7 +1,6 @@
 import { resolveStateDir } from "../../../config/paths-state.js";
 import { getSessionMetadata, init_session_read_repository } from "../../../storage/sqlite/session-read-repository.js";
 import { AgentCatalogRepository, init_repository } from "../../../agent-catalog/repository.js";
-import { AgentCatalogService } from "../../../agent-catalog/service.js";
 import { init_paths } from "../../../config/paths.js";
 import { resolveEffectiveAgentConfigForAgent } from "../../../config/agent-profile.js";
 import { getModelRegistry, init_model_registry } from "../../../providers/model-registry.js";
@@ -10,6 +9,7 @@ import { phoneAllowsApp } from "../../../phone/app-access.js";
 import { managedPhoneAdbPath } from "../../../runtime-tools/phone-dependency-catalog.js";
 import { phoneModelProfile } from "../../../phone/model-adapter.js";
 import { getPhoneRuntime } from "../../../phone/runtime.js";
+import { AgentCatalogService } from "../../../agent-catalog/service.js";
 import { PhoneSetupService } from "../../../phone/setup/service.js";
 import { PhoneDependencyManager, probePhoneAdb } from "../../../runtime-tools/phone-dependencies.js";
 import { createHash } from "node:crypto";

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

@@ -1,6 +1,8 @@
 import { createLogger } from "../../../utils/logger/index.js";
 import { init_logger } from "../../../utils/logger.js";
 import { setDevicePhoneAccess } from "../../../storage/sqlite/device-access-repository.js";
+import { getSessionMetadata } from "../../../storage/sqlite/session-read-repository.js";
+import { init_session_repository } from "../../../storage/sqlite/session-repository.js";
 import { MOCK_PHONE_MODEL, PhoneActionSchema, PhoneConfigSchema, PhoneDeviceSchema, PhoneError, PhoneExecutionModeSchema, PhoneInputSchema, init_contracts } from "../../../phone/contracts.js";
 import { createConversation, init_conversation_repository } from "../../../storage/sqlite/conversation-repository.js";
 import { getDefaultAgentId, init_resolve_route } from "../../../routing/resolve-route.js";
@@ -20,6 +22,7 @@ import { z } from "zod";
 import { Hono } from "hono";
 import { bodyLimit } from "hono/body-limit";
 //#region src/gateway/hono/routes/phone.ts
+init_session_repository();
 init_resolve_route();
 init_model_registry();
 init_providers();
@@ -66,7 +69,7 @@ function registerPhoneRoutes(parent, deps, runtime = getPhoneRuntime()) {
 			const body = await c.res.clone().json();
 			const report = body.payload?.report;
 			if (report && body.payload) {
-				const { sessionId, deviceId, deviceName, status, mode, controlOwner, controlEpoch, handoff, assistanceId, reconnectRequired, stopReason, currentAction, updatedAt } = report;
+				const { sessionId, deviceId, deviceName, status, mode, controlOwner, controlEpoch, handoff, assistanceId, reconnectRequired, stopReason, currentAction, updatedAt, revision, hasPendingTask, assistanceVersion, transcriptId } = report;
 				body.payload = {
 					ownControl: body.payload.ownControl,
 					textInput: body.payload.textInput,
@@ -83,7 +86,11 @@ function registerPhoneRoutes(parent, deps, runtime = getPhoneRuntime()) {
 						reconnectRequired,
 						stopReason,
 						currentAction,
-						updatedAt
+						updatedAt,
+						revision,
+						hasPendingTask,
+						assistanceVersion,
+						transcriptId
 					}
 				};
 				c.res = c.json(body);
@@ -147,18 +154,29 @@ function registerPhoneRoutes(parent, deps, runtime = getPhoneRuntime()) {
 			return wait && ["open", "queued"].includes(wait.status) ? {
 				...report,
 				assistanceId: wait.id,
+				assistanceVersion: wait.version,
+				transcriptId: wait.transcriptId,
+				hasPendingTask: true,
 				...wait.status === "open" && report.controlOwner !== "human" ? { status: "needs_user" } : {}
 			} : report;
 		});
 	};
 	const liveStatus = (owner, id, context, client) => {
 		const state = runtime.liveStatus(owner, id, context, client);
+		state.report.transcriptId = getSessionMetadata(owner)?.transcriptId;
 		const wait = phoneAssistance(owner);
+		if (!wait || !["open", "queued"].includes(wait.status)) {
+			state.report.assistanceId = void 0;
+			state.report.assistanceVersion = void 0;
+		}
 		return wait && ["open", "queued"].includes(wait.status) ? {
 			...state,
 			report: {
 				...state.report,
 				assistanceId: wait.id,
+				assistanceVersion: wait.version,
+				transcriptId: wait.transcriptId,
+				hasPendingTask: true,
 				...wait.status === "open" && state.report.controlOwner !== "human" ? { status: "needs_user" } : {}
 			}
 		} : state;
@@ -436,6 +454,7 @@ function registerPhoneRoutes(parent, deps, runtime = getPhoneRuntime()) {
 		operationId: z.string().uuid(),
 		epoch: z.number().int().positive(),
 		assistanceId: z.string().uuid().optional(),
+		assistanceVersion: z.number().int().positive().optional(),
 		op: z.enum([
 			"takeover",
 			"release",
@@ -492,12 +511,17 @@ function registerPhoneRoutes(parent, deps, runtime = getPhoneRuntime()) {
 			authorizePhoneAccess(principal, true);
 			access = "control";
 		} catch {}
+		const assistance = phoneAssistance(id);
 		const payload = {
 			available: Boolean(report),
 			access,
-			needsUser: Boolean(report && access !== "none" && report.status === "needs_user")
+			needsUser: Boolean(report && access !== "none" && (assistance?.status === "open" || report.status === "needs_user"))
 		};
 		if (report && access !== "none") {
+			if (assistance?.status === "open") payload.assistance = {
+				id: assistance.id,
+				version: assistance.version
+			};
 			payload.deviceName = report.deviceName;
 			payload.taskState = report.status;
 			payload.updatedAt = report.updatedAt;
@@ -583,7 +607,7 @@ function registerPhoneRoutes(parent, deps, runtime = getPhoneRuntime()) {
 		}).strict().parse(await c.req.json());
 		const initial = await conversationPhone(address, id);
 		const principal = getGatewayPrincipal(c);
-		const client = `${principal.principalId}:${clientId}${address.startsWith("device:") || principal.kind === "device" && purpose !== "control" ? ":viewer" : ""}`;
+		const client = `${principal.principalId}:${clientId}${address.startsWith("device:") || purpose === "view" || principal.kind === "device" && purpose !== "control" ? ":viewer" : ""}`;
 		const native = principal.kind === "device";
 		const interactive = native ? purpose === "control" : purpose !== "view" && !address.startsWith("device:");
 		if (native && (!expectedTranscriptId || expectedTranscriptId !== initial.transcriptId)) throw new PhoneError("PHONE_BINDING_CHANGED", "Conversation changed; refresh the phone", 409);
@@ -628,12 +652,12 @@ function registerPhoneRoutes(parent, deps, runtime = getPhoneRuntime()) {
 		let owner = c.req.param("conversationId");
 		const id = c.req.param("sessionId");
 		const actor = getGatewayPrincipal(c);
-		const { clientId, assistanceId, expectedTranscriptId, ...input } = liveControlInput.parse(await c.req.json());
+		const { clientId, assistanceId, assistanceVersion, expectedTranscriptId, ...input } = liveControlInput.parse(await c.req.json());
 		const requestedWait = phoneAssistance(owner);
 		const allowRecovery = assistanceId && requestedWait?.id === assistanceId && requestedWait.checkpoint.report.sessionId === id && ["takeover", "handback"].includes(input.op);
 		const { context, transcriptId, owner: resolvedOwner } = await conversationPhone(owner, allowRecovery ? void 0 : id);
 		owner = resolvedOwner;
-		if (getGatewayPrincipal(c).kind === "device" && (!expectedTranscriptId || expectedTranscriptId !== transcriptId)) throw new PhoneError("PHONE_BINDING_CHANGED", "Conversation changed; refresh the phone", 409);
+		if (getGatewayPrincipal(c).kind === "device" && !expectedTranscriptId || expectedTranscriptId && expectedTranscriptId !== transcriptId) throw new PhoneError("PHONE_BINDING_CHANGED", "Conversation changed; refresh the phone", 409);
 		const wait = phoneAssistance(owner);
 		if (assistanceId && (!wait || wait.id !== assistanceId || ![
 			"open",
@@ -641,6 +665,7 @@ function registerPhoneRoutes(parent, deps, runtime = getPhoneRuntime()) {
 			"resuming",
 			"completed"
 		].includes(wait.status))) throw new PhoneError("PHONE_ASSISTANCE_CHANGED", "The phone task changed. Refresh before continuing.", 409);
+		if (assistanceVersion !== void 0 && wait?.status === "open" && wait.version !== assistanceVersion) throw new PhoneError("PHONE_ASSISTANCE_CHANGED", "The phone assistance request changed. Refresh before continuing.", 409);
 		if (input.op === "handback" && assistanceId && wait?.status !== "open") {
 			service.resumePhoneAssistance(owner, assistanceId);
 			return c.json({

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

@@ -6,12 +6,12 @@ import { loadTranscriptRowsForSession } from "../../../storage/sqlite/transcript
 import "../../../storage/sqlite/index.js";
 import { ActivityService } from "../../../activity/service.js";
 import "../../../activity/index.js";
-import { CapabilityError } from "../../../capabilities/runtime/errors.js";
-import "../../../capabilities/runtime/dispatcher.js";
 import { listKnowledgeItems, writeKnowledgeItem } from "../../../knowledge-memory/repository.js";
 import "../../../knowledge-memory/index.js";
 import { resolveEffectiveAgentProfile } from "../../../config/agent-profile.js";
 import { TaskReadModelProjector } from "../../../tasks/task-read-model-projector.js";
+import { CapabilityError } from "../../../capabilities/runtime/errors.js";
+import "../../../capabilities/runtime/dispatcher.js";
 import { ProjectWorkspaceConflictError, ProjectWorkspaceMissingError } from "../../../projects/workspace-project.js";
 import { inferProjectExecutionMode, inferProjectKind } from "../../../projects/project-kind.js";
 import { ProjectDeletionBlockedError, ProjectWorkspaceInUseError } from "../../../projects/project-service.js";

package/dist/src/gateway/hono/routes/public-gateway.js

@@ -37,7 +37,8 @@ function registerPublicGatewayRoutes(app, service) {
 		const health = service.getHealth();
 		return c.json({
 			status: health.ready ? "ok" : "starting",
-			ready: health.ready
+			ready: health.ready,
+			clarificationVersions: process.env.XOPC_CLARIFY_MULTI_QUESTION === "false" ? [1] : [1, 2]
 		});
 	});
 	app.post("/api/connectors/composio/webhook", async (c) => {

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

@@ -115,6 +115,7 @@ async function handleSessionCommand(c, deps, materialize = false) {
 			if (!("input" in command)) return [];
 			const endpoint = command.origin.type === "endpoint" ? deps.service.endpointTools.registry.get(command.origin.endpointId) : void 0;
 			const contexts = endpoint ? [deviceTurnSourceContext(endpoint, command.input.endpointContext, deps.service.endpointTools.contexts?.view(endpoint.endpointId), deps.service.endpointTools.locations?.list(endpoint.endpointId, id.data))] : [];
+			if (contexts[0] && command.input.interactionCapabilities) contexts[0].interactionCapabilities = command.input.interactionCapabilities;
 			contexts.push(...(command.input.browserContexts ?? []).map(browserPageContextToAgentContext));
 			if (command.input.appContext) contexts.push(await deps.service.prepareSessionAppContext(command.input.appContext, principal, id.data, command.clientMessageId));
 			return contexts;

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

@@ -98,6 +98,9 @@ export declare function submitSessionInput(c: Context, deps: AuthenticatedRouteD
                     capturedAt?: number;
                     documentId?: string;
                     fileKind?: "file" | "directory";
+                    interactionCapabilities?: {
+                        clarificationVersions: (1 | 2)[];
+                    };
                     appContext?: {
                         version: 1;
                         clientInstanceId: string;
@@ -257,6 +260,9 @@ export declare function replaceLatestSessionTurn(c: Context, deps: Authenticated
                     capturedAt?: number;
                     documentId?: string;
                     fileKind?: "file" | "directory";
+                    interactionCapabilities?: {
+                        clarificationVersions: (1 | 2)[];
+                    };
                     appContext?: {
                         version: 1;
                         clientInstanceId: string;

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

@@ -5,9 +5,9 @@ import { endpointContextSchema } from "../../../../packages/gateway-contract/src
 import { parseUserTurnDocument, userTurnDocumentRefIds } from "../../../../packages/gateway-contract/src/user-turn-document.js";
 import { init_src } from "../../../../packages/gateway-contract/src/index.js";
 import { endpointTurnClaimSchema, init_src as init_src$1 } from "../../../../packages/endpoint-tools-protocol/src/index.js";
+import { init_providers, resolveModel } from "../../../providers/index.js";
 import { CapabilityError } from "../../../capabilities/runtime/errors.js";
 import "../../../capabilities/runtime/dispatcher.js";
-import { init_providers, resolveModel } from "../../../providers/index.js";
 import { getModelThinking } from "../../../providers/model-thinking.js";
 import { parseTurnContextRefs } from "../../../agent/source-context/types.js";
 import { validateWebchatAttachments, validateWebchatContent } from "../../chat-limits.js";

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

@@ -6,9 +6,9 @@ import { hasGatewayScope } from "../../security/gateway-scopes.js";
 import { enqueueTaskChangedEvent, init_task_change_events } from "../../../tasks/task-change-events.js";
 import { TaskRepository, init_task_repository } from "../../../tasks/task-repository.js";
 import { TaskRunRepository, init_task_run_repository } from "../../../tasks/task-run-repository.js";
+import { TaskConversationRepository } from "../../../tasks/task-conversation-repository.js";
 import { CapabilityError } from "../../../capabilities/runtime/errors.js";
 import "../../../capabilities/runtime/dispatcher.js";
-import { TaskConversationRepository } from "../../../tasks/task-conversation-repository.js";
 import { TaskCollaborationRepository } from "../../../tasks/task-collaboration-repository.js";
 import { TaskCriterionReviewRepository } from "../../../tasks/task-criterion-review-repository.js";
 import { TaskContextMutationOutputSchema } from "../../../tasks/capabilities/relations.js";

package/dist/src/gateway/hono/routes/user-model-refresh.js

@@ -1,5 +1,5 @@
-import { listConnectorLearningJobs } from "../../../storage/sqlite/connector-learning-repository.js";
 import { getConnectorAccount } from "../../../storage/sqlite/connector-account-repository.js";
+import { listConnectorLearningJobs } from "../../../storage/sqlite/connector-learning-repository.js";
 import "../../../storage/sqlite/index.js";
 import { getWorkDiscoveryRun } from "../../../work-discovery/repository.js";
 import { getConnectorUnderstandingSourceRun } from "../../../user-context/sources/repository.js";

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

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

package/dist/src/gateway/next-turn-suggestions/snapshot.js

@@ -1,10 +1,10 @@
 import { getSqliteDatabase, init_transaction } from "../../storage/sqlite/transaction.js";
 import { getSessionInputState, init_session_input_repository } from "../../storage/sqlite/session-input-repository.js";
-import { getActiveClarification } from "../../storage/sqlite/clarification-wait-repository.js";
 import { buildSessionContextForLlm, init_session_context_for_llm } from "../../session/session-context-for-llm.js";
 import { getActiveConnectionWait, init_connection_wait_repository } from "../../storage/sqlite/connection-wait-repository.js";
 import { getSessionMetadata } from "../../storage/sqlite/session-read-repository.js";
 import { getCurrentTranscriptId, init_session_repository } from "../../storage/sqlite/session-repository.js";
+import { getActiveClarification } from "../../storage/sqlite/clarification-wait-repository.js";
 import { createHash } from "node:crypto";
 //#region src/gateway/next-turn-suggestions/snapshot.ts
 init_session_repository();

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

@@ -3,10 +3,10 @@ import { init_logger } from "../../utils/logger.js";
 import { init_transaction, runSqliteWriteTransaction } from "../../storage/sqlite/transaction.js";
 import { readClarificationPresentation } from "../../../packages/gateway-contract/src/clarifications.js";
 import { init_src } from "../../../packages/gateway-contract/src/index.js";
-import { listActiveSessionInputExecutions, listActiveSessionInputRuns } from "../../storage/sqlite/session-input-repository.js";
+import { findSessionInputByRunId, init_session_input_repository, listActiveSessionInputExecutions, listActiveSessionInputRuns } from "../../storage/sqlite/session-input-repository.js";
 import { TaskRepository, init_task_repository } from "../../tasks/task-repository.js";
-import { createClarificationWait, getClarification, getClarificationSnapshot, resolveClarification, supersedeActiveClarification } from "../../storage/sqlite/clarification-wait-repository.js";
 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";
@@ -24,6 +24,7 @@ import { SessionInputCoordinator } from "./session-input-coordinator.js";
 import crypto from "node:crypto";
 //#region src/gateway/service/agent-runner.ts
 init_src();
+init_session_input_repository();
 init_connection_wait_repository();
 init_logger();
 init_transaction();
@@ -325,7 +326,7 @@ var GatewayAgentRunner = class {
 	}
 	answerClarificationText(conversationId, text, idempotencyKey) {
 		const wait = getClarificationSnapshot(conversationId)?.clarification;
-		if (!wait || wait.kind === "approval" || wait.status !== "open" || !text.trim()) return false;
+		if (!wait || wait.schemaVersion === 2 || wait.kind === "approval" || wait.status !== "open" || !text.trim()) return false;
 		return this.resolveClarificationResponse({
 			id: wait.id,
 			expectedVersion: wait.version,
@@ -376,6 +377,10 @@ var GatewayAgentRunner = class {
 	*/
 	async requestClarification(opts) {
 		const { conversationId, request, publishStreamFor } = opts;
+		if (request.schemaVersion === 2) {
+			const capable = findSessionInputByRunId(conversationId, opts.runId)?.contextSnapshots?.some((context) => context.kind === "device_context" && context.interactionCapabilities?.clarificationVersions.includes(2));
+			if (process.env.XOPC_CLARIFY_MULTI_QUESTION === "false" || !capable || this.externalStreamBySession.has(conversationId) || new TaskConversationRepository().resolveActiveExecutionSession(conversationId)) throw new Error("CLARIFICATION_VERSION_UNSUPPORTED: use single-question clarify in this environment");
+		}
 		const taskSession = request.kind !== "approval" ? new TaskConversationRepository().resolveActiveExecutionSession(conversationId) : void 0;
 		if (taskSession?.runId) return {
 			status: "waiting",

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

@@ -5,9 +5,9 @@ import { parseTurnOutcome } from "../../../packages/gateway-contract/src/turn-ou
 import { init_src } from "../../../packages/gateway-contract/src/index.js";
 import { findSessionInputByRunId, init_session_input_repository, listTaskUpdateTriggers } from "../../storage/sqlite/session-input-repository.js";
 import { TaskRunRepository, init_task_run_repository } from "../../tasks/task-run-repository.js";
+import { getConnectionResumeInput, init_connection_wait_repository, isConnectionSuspended } from "../../storage/sqlite/connection-wait-repository.js";
 import { 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";
 import "../../storage/sqlite/index.js";
 import { getConversationRouting } from "../../storage/sqlite/conversation-repository.js";
 import { init_session_key } from "../../routing/session-key.js";