@xopcai/xopc 0.0.422 → 0.0.424

package/dist/src/agent/embedded/session-tool-result-guard.js

@@ -1,11 +1,11 @@
 import { init_string_coerce, normalizeOptionalString } from "../../utils/string-coerce.js";
+import { formatContextLimitTruncationNotice } from "./tool-result-context-guard.js";
+import { resolveLiveToolResultMaxChars, truncateToolResultMessage } from "./tool-result-truncation.js";
 import { emitSessionTranscriptUpdate } from "../../session/transcript-events.js";
 import { sanitizeSearchInfo } from "../tools/search/search-info.js";
 import { extractToolCallsFromAssistant, extractToolResultId } from "../transcript/tool-call-id.js";
 import { makeMissingToolResult, sanitizeToolCallInputs } from "../transcript/session-transcript-repair.js";
 import { boundedJsonUtf8Bytes, firstEnumerableOwnKeys, jsonUtf8BytesOrInfinity } from "../../infra/json-utf8-bytes.js";
-import { formatContextLimitTruncationNotice } from "./tool-result-context-guard.js";
-import { resolveLiveToolResultMaxChars, truncateToolResultMessage } from "./tool-result-truncation.js";
 //#region src/agent/embedded/session-tool-result-guard.ts
 init_string_coerce();
 /**

package/dist/src/agent/embedded/tool-result-truncation.js

@@ -1,6 +1,6 @@
 import { init_string_coerce, normalizeLowercaseStringOrEmpty } from "../../utils/string-coerce.js";
-import { isDataBatchResult, renderDataBatch } from "../data-acquisition/render.js";
 import { formatContextLimitTruncationNotice } from "./tool-result-context-guard.js";
+import { isDataBatchResult, renderDataBatch } from "../data-acquisition/render.js";
 //#region src/agent/embedded/tool-result-truncation.ts
 init_string_coerce();
 const MAX_TOOL_RESULT_CONTEXT_SHARE = .3;

package/dist/src/agent/inbound/attachment-pipeline.js

@@ -1,7 +1,7 @@
 import { stripRuntimeUserMessageEnvelope } from "../../../packages/gateway-contract/src/user-message-display.js";
 import { init_src } from "../../../packages/gateway-contract/src/index.js";
-import { extractProfileAgentId } from "../../config/agent-profile.js";
 import { readAgentMessageContent } from "../memory/agent-message-access.js";
+import { extractProfileAgentId } from "../../config/agent-profile.js";
 import { isPersonalConversation } from "../../personal-agent/repository.js";
 import { mimeTypeFromMediaPath } from "../../media/store.js";
 import { readMediaReference } from "../../media/media-reference.js";

package/dist/src/agent/memory/compaction.js

@@ -2,9 +2,9 @@ import { createLogger } from "../../utils/logger/index.js";
 import { init_logger } from "../../utils/logger.js";
 import { init_compaction_types, isCompactionHandover } from "../../session/compaction-types.js";
 import { buildSessionContextForLlm, init_session_context_for_llm, isTranscriptCompactionEntry } from "../../session/session-context-for-llm.js";
+import { estimateMessagesTokens, estimateTextTokens } from "./context-budget.js";
 import { getModelUsageOrigin, init_model_usage, isProviderUsageScopeError } from "../../providers/model-usage.js";
 import { completeWithResolvedCredentials } from "../../providers/model-call.js";
-import { estimateMessagesTokens, estimateTextTokens } from "./context-budget.js";
 import { applyCompactionHandoverDelta, consolidateCompactionHandover, handoverForPrompt, renderCompactionHandover } from "./compaction-ledger.js";
 import { estimateCompactionSourceTokens, planCompactionSource } from "./compaction-source-planner.js";
 import { serializeMessageForCompaction } from "./compaction-serializer.js";

package/dist/src/agent/memory/context-budget.js

@@ -1,5 +1,5 @@
-import { readAgentMessageContent } from "./agent-message-access.js";
 import { getToolResultTextLength, truncateToolResultMessage } from "../embedded/tool-result-truncation.js";
+import { readAgentMessageContent } from "./agent-message-access.js";
 //#region src/agent/memory/context-budget.ts
 const MESSAGE_OVERHEAD_TOKENS = 12;
 const REQUEST_OVERHEAD_TOKENS = 256;

package/dist/src/agent/memory/context-recovery.js

@@ -1,7 +1,7 @@
 import { createLogger } from "../../utils/logger/index.js";
 import { init_logger } from "../../utils/logger.js";
-import { stripTrailingErrorAssistantMessages } from "../orchestration/llm-turn-retry.js";
 import { evaluateContextBudget, projectContextForModel, stringifyMessagesForBudget } from "./context-budget.js";
+import { stripTrailingErrorAssistantMessages } from "../orchestration/llm-turn-retry.js";
 //#region src/agent/memory/context-recovery.ts
 init_logger();
 const log = createLogger("ContextRecovery");

package/dist/src/agent/memory/user-message-text.js

@@ -1,5 +1,5 @@
-import { extractTextContent } from "../context/workspace.js";
 import { readAgentMessageContent } from "./agent-message-access.js";
+import { extractTextContent } from "../context/workspace.js";
 //#region src/agent/memory/user-message-text.ts
 /** Plain text from a user-role agent message (string or parts array). */
 function extractAgentUserPlainText(message) {

package/dist/src/agent/service/btw-query.js

@@ -1,6 +1,6 @@
+import { readAgentMessageContent } from "../memory/agent-message-access.js";
 import { init_providers, resolveModel } from "../../providers/index.js";
 import { completeWithResolvedCredentials, createResolvedModelStream, resolveModelCallApiKey } from "../../providers/model-call.js";
-import { readAgentMessageContent } from "../memory/agent-message-access.js";
 //#region src/agent/service/btw-query.ts
 init_providers();
 function textFromCompleteContent(content) {

package/dist/src/agent/service/direct-turn-helpers.js

@@ -1,5 +1,5 @@
-import { getClarificationResumeInput } from "../../storage/sqlite/clarification-wait-repository.js";
 import { getConnectionResumeInput, init_connection_wait_repository } from "../../storage/sqlite/connection-wait-repository.js";
+import { getClarificationResumeInput } from "../../storage/sqlite/clarification-wait-repository.js";
 import { isPersonalConversation } from "../../personal-agent/repository.js";
 import { phoneResumeForRun } from "../../phone/assistance.js";
 import { resolveImageHandlingStrategy } from "../image/vision-detection.js";

package/dist/src/agent/service/process-direct-streaming.js

@@ -1,12 +1,12 @@
 import { parseUserTurnDocument, renderUserTurnDocument } from "../../../packages/gateway-contract/src/user-turn-document.js";
 import { init_src } from "../../../packages/gateway-contract/src/index.js";
 import { init_session_input_repository, listTaskUpdateTriggers } from "../../storage/sqlite/session-input-repository.js";
-import { getClarificationResumeInput } from "../../storage/sqlite/clarification-wait-repository.js";
 import { getConnectionResumeInput, init_connection_wait_repository } from "../../storage/sqlite/connection-wait-repository.js";
+import { readAgentMessageContent } from "../memory/agent-message-access.js";
+import { getClarificationResumeInput } from "../../storage/sqlite/clarification-wait-repository.js";
 import { init_agent_scope, resolveDefaultAgentId } from "../agent-scope.js";
 import { init_model_usage, modelUsageOriginFromTurn, withModelUsageOrigin } from "../../providers/model-usage.js";
 import { init_agent_session_key, resolveAgentMainConversationId } from "../../routing/agent-session-key.js";
-import { readAgentMessageContent } from "../memory/agent-message-access.js";
 import { phoneResumeForRun } from "../../phone/assistance.js";
 import { abortEmbeddedRun } from "../embedded/runs.js";
 import { clearPendingTranscriptUserMessage, setPendingTranscriptUserMessage } from "../inbound/attachment-pipeline.js";

package/dist/src/agent/source-context/types.d.ts

@@ -44,6 +44,7 @@ export interface AgentSourceContext {
     capturedAt?: number;
     documentId?: string;
     fileKind?: 'file' | 'directory';
+    interactionCapabilities?: import('@xopcai/gateway-contract').InteractionCapabilities;
     appContext?: AppContextEnvelope;
     appContextGrant?: AppContextGrant;
 }

package/dist/src/agent/tools/clarify-tool.js

@@ -1,7 +1,32 @@
+import { clarifyToolInputV2Schema } from "../../../packages/gateway-contract/src/clarification-questions.js";
+import { normalizeClarificationQuestion } from "../../../packages/gateway-contract/src/clarifications.js";
+import { init_src } from "../../../packages/gateway-contract/src/index.js";
 import { Type } from "@sinclair/typebox";
 //#region src/agent/tools/clarify-tool.ts
+init_src();
+const ChoiceSchema = Type.Object({
+	id: Type.String(),
+	label: Type.String(),
+	description: Type.Optional(Type.String())
+}, { additionalProperties: false });
+const QuestionSchema = Type.Union([Type.Object({
+	id: Type.String(),
+	header: Type.String(),
+	question: Type.String(),
+	type: Type.Literal("text")
+}, { additionalProperties: false }), Type.Object({
+	id: Type.String(),
+	header: Type.String(),
+	question: Type.String(),
+	type: Type.Literal("single_choice"),
+	choices: Type.Array(ChoiceSchema, {
+		minItems: 2,
+		maxItems: 10
+	}),
+	recommendedChoiceId: Type.Optional(Type.String())
+}, { additionalProperties: false })]);
 const ClarifySchema = Type.Object({
-	question: Type.String({ description: "The question to ask the user. Be specific and concise." }),
+	question: Type.Optional(Type.String({ description: "The question to ask the user. Be specific and concise." })),
 	interactionMode: Type.Optional(Type.Union([Type.Literal("quick"), Type.Literal("compose")], { description: "quick submits a choice immediately; compose lets the user select and add details before submitting." })),
 	choiceDetails: Type.Optional(Type.Array(Type.Object({
 		id: Type.String(),
@@ -12,8 +37,17 @@ const ClarifySchema = Type.Object({
 		maxItems: 10,
 		description: "Answer choices with stable unique IDs and optional descriptions."
 	})),
-	recommendedChoiceId: Type.Optional(Type.String())
-}, { additionalProperties: false });
+	recommendedChoiceId: Type.Optional(Type.String()),
+	schemaVersion: Type.Optional(Type.Literal(2)),
+	questions: Type.Optional(Type.Array(QuestionSchema, {
+		minItems: 1,
+		maxItems: 3,
+		description: "Independent questions answered together. Only supported by capable Web/Electron main chats. Never use for approvals."
+	}))
+}, {
+	additionalProperties: false,
+	anyOf: [{ required: ["question"] }, { required: ["schemaVersion", "questions"] }]
+});
 function waitForAbort(signal) {
 	return new Promise((_, reject) => {
 		if (!signal) return;
@@ -40,12 +74,16 @@ function createClarifyTool(deps) {
 				}],
 				details: { answer: "" }
 			};
-			const payload = {
+			const batch = params?.schemaVersion === 2 ? clarifyToolInputV2Schema.parse(params) : void 0;
+			const payload = normalizeClarificationQuestion(batch ? {
+				...batch,
+				question: batch.questions.map((q) => q.header).join(" / ")
+			} : {
 				interactionMode: p.interactionMode,
 				choiceDetails: p.choiceDetails,
 				recommendedChoiceId: p.recommendedChoiceId,
 				question: p.question
-			};
+			});
 			try {
 				const result = await Promise.race([askUser(payload), waitForAbort(signal)]);
 				if (result.status === "waiting") return {

package/dist/src/agent/tools/cli-clarify.js

@@ -6,6 +6,7 @@ import { stdin, stdout } from "node:process";
 init_src();
 function createCliReadlineClarifyRequestFn() {
 	return async (_context, request) => {
+		if (request.schemaVersion === 2) throw new Error("CLARIFICATION_VERSION_UNSUPPORTED: CLI supports single questions");
 		const rl = readline.createInterface({
 			input: stdin,
 			output: stdout

package/dist/src/agent/tools/dataBatch.js

@@ -1,8 +1,8 @@
 import { createLogger } from "../../utils/logger/index.js";
 import { init_logger } from "../../utils/logger.js";
+import { renderDataBatch } from "../data-acquisition/render.js";
 import { DataBatchSchema } from "../data-acquisition/schema.js";
 import { acquireData } from "../data-acquisition/service.js";
-import { renderDataBatch } from "../data-acquisition/render.js";
 import { AsyncLocalStorage } from "node:async_hooks";
 //#region src/agent/tools/dataBatch.ts
 init_logger();

package/dist/src/agent/tools/personal-task-tool.d.ts

@@ -14,6 +14,7 @@ declare const PersonalTaskModelSchema: import("@sinclair/typebox").TObject<{
     }>>;
     requestId: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
     description: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
+    questionId: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
     expectedVersion: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TInteger>;
     idempotencyKey: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
     instruction: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
@@ -33,7 +34,6 @@ declare const PersonalTaskModelSchema: import("@sinclair/typebox").TObject<{
     baselineResultId: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
     supersedesEntryIds: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TArray<import("@sinclair/typebox").TString>>;
     bodyOffset: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TInteger>;
-    questionId: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
     command: import("@sinclair/typebox").TString;
     sourceRefs: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TArray<import("@sinclair/typebox").TObject<{
         kind: import("@sinclair/typebox").TUnion<import("@sinclair/typebox").TLiteral<string>[]>;

package/dist/src/agent/tools/phone-use-tool.js

@@ -106,7 +106,7 @@ function createPhoneUseTool(deps) {
 		name: "phone_use",
 		label: "Phone",
 		parameters: Schema,
-		description: "Use an authorized Android phone via local ADB or a configured cloud connection. Load tool_manual for phone_use before first use. Discover registered devices, appAccess and allowedApps first. Use the defaultDeviceId returned by discover unless the user explicitly names a different phone. A phone-control conversation may bind its own defaultDeviceId. Match an explicitly named phone to its unique registered name and deviceId; ask when ambiguous and never silently switch phones; open with mode observe/control and optional authorized appPackage, observe native UI text, then discover the effective executionMode. In collaborative mode, plan with the main Agent and run one small goal at a time. In direct mode, delegate the full authorized phone goal to run and let the phone model plan locally. Keep the same taskId across fragments. Do not silently change mode or retry budget exhaustion. Inspect feedback.outcome, outputs and nextAction. Use set_mode only for an explicit user mode change; applyCurrent pauses and requires inspection/handback. Device and model configuration live in Phone Use settings. Connections originate from the Gateway host; cloud credentials are configured in phone management. Mock mode only supports the explicitly requested settings-about emulator test. Never silently switch phones, execute shell commands, bypass app restrictions, or repeat a dispatch with unknown outcome. Request user assistance for login, CAPTCHA or an effect not already authorized. Use request_user with reason when manual assistance is needed; it saves the current task and ends this turn until explicit handback. A plain pause does not request assistance; resume re-observes. Inspect readings for information source and verification; screenshot readings are unverified observations, never proof of completion. Inspect verified, verificationLevel and stopReason before claiming success. Close finishes this task and releases operation control while keeping the phone connected. Do not close or disconnect a phone to resolve PHONE_DEVICE_BUSY; report executionStarted=false and the occupying conversation to the user, and wait for user action. Raw screenshots never enter the chat transcript.",
+		description: "Use an authorized Android phone via local ADB or a configured cloud connection. Load tool_manual for phone_use before first use. Discover registered devices, appAccess and allowedApps first. Use the defaultDeviceId returned by discover unless the user explicitly names a different phone. A phone-control conversation may bind its own defaultDeviceId. Match an explicitly named phone to its unique registered name and deviceId; ask when ambiguous and never silently switch phones; open with mode observe/control and optional authorized appPackage, observe native UI text, then discover the effective executionMode. In collaborative mode, plan with the main Agent and run one small goal at a time. In direct mode, delegate the full authorized phone goal to run and let the phone model plan locally. Keep the same taskId across fragments. Do not silently change mode or retry budget exhaustion. Inspect feedback.outcome, outputs and nextAction. Use set_mode only for an explicit user mode change; applyCurrent pauses and requires inspection/handback. Device and model configuration live in Phone Use settings. Connections originate from the Gateway host; cloud credentials are configured in phone management. Mock mode only supports the explicitly requested settings-about emulator test. Never silently switch phones, execute shell commands, bypass app restrictions, or repeat a dispatch with unknown outcome. Request user assistance for login, CAPTCHA or an effect not already authorized. Use request_user with reason when manual assistance is needed; it saves the current task and ends this turn until explicit handback. Explain the required user action in a normal chat reply and direct the user to the existing phone entry. Do not create approval cards or auto-open the phone. The user can click Done, continue task or explicitly confirm completion in chat. A plain pause does not request assistance; resume re-observes. Inspect readings for information source and verification; screenshot readings are unverified observations, never proof of completion. Inspect verified, verificationLevel and stopReason before claiming success. Close finishes this task and releases operation control while keeping the phone connected. Do not close or disconnect a phone to resolve PHONE_DEVICE_BUSY; report executionStarted=false and the occupying conversation to the user, and wait for user action. Raw screenshots never enter the chat transcript.",
 		async execute(_id, raw, signal, onUpdate) {
 			const { owner, ...context } = deps.context();
 			const runId = getEmbeddedExecutionRunId();
@@ -137,7 +137,7 @@ function createPhoneUseTool(deps) {
 					deviceId: report.deviceId,
 					reason: report.message,
 					nextAction: "user_takeover",
-					message: "请接管手机，完成登录、验证码等操作后点击“已完成，继续任务”，原任务会从当前页面继续。"
+					message: "请通过聊天顶部的手机入口完成所需操作，完成后点击“完成，继续任务”或返回聊天告诉我继续。"
 				};
 				onUpdate({
 					content: [{

package/dist/src/agent/tools/session-search-tool.js

@@ -1,10 +1,10 @@
 import { createLogger } from "../../utils/logger/index.js";
 import { init_logger } from "../../utils/logger.js";
 import { init_fts, sessionSearchTerms } from "../../storage/sqlite/fts.js";
+import { readAgentMessageContent } from "../memory/agent-message-access.js";
 import { init_providers, resolveModel } from "../../providers/index.js";
 import { completeWithResolvedCredentials } from "../../providers/model-call.js";
 import { FORGOTTEN_HISTORY_EXCERPT, forgottenHistoryEntries, projectUnadmittedForgottenFields } from "../../memory-learning/forgotten-history.js";
-import { readAgentMessageContent } from "../memory/agent-message-access.js";
 import "./local-read-budget.js";
 import { Type } from "@sinclair/typebox";
 //#region src/agent/tools/session-search-tool.ts

package/dist/src/bootstrap/application-state.js

@@ -1,10 +1,10 @@
-import { requireXopcDatabase } from "../storage/sqlite/connection.js";
-import "../storage/sqlite/index.js";
+import { init_connection, requireXopcDatabase } from "../storage/sqlite/connection.js";
 import { AgentCatalogRepository, init_repository } from "../agent-catalog/repository.js";
 import { AgentCatalogService } from "../agent-catalog/service.js";
 import { ensureStarterAgentsInitialized } from "../agent/starter-agents.js";
 //#region src/bootstrap/application-state.ts
 init_repository();
+init_connection();
 /** Initialize current application state without importing retired configuration. */
 function bootstrapApplicationStateSync() {
 	requireXopcDatabase();

package/dist/src/cli/commands/gateway/run-foreground.js

@@ -38,7 +38,7 @@ async function runGatewayFromCliOptions(options, ctx) {
 	if (tailscaleOverride && tailscaleOverride !== "off") process.env.XOPC_GATEWAY_TAILSCALE_MODE = tailscaleOverride;
 	if (options.tailscaleResetOnExit === true) process.env.XOPC_GATEWAY_TAILSCALE_RESET_ON_EXIT = "1";
 	const [{ loadConfig }, { resolveConfigPath }, { runGatewayLoop }, gatewayPorts, bootstrap] = await Promise.all([
-		import("../../../config/index.js"),
+		import("../../../config/loader.js"),
 		import("../../../config/paths.js"),
 		import("../../../gateway/run-loop.js"),
 		import("../../../gateway/ports.js"),
@@ -120,7 +120,7 @@ async function runGatewayFromCliOptions(options, ctx) {
 		configPath: ctx.configPath || resolveConfigPath(),
 		port,
 		start: async () => {
-			const { GatewayServer } = await import("../../../gateway/index.js");
+			const { GatewayServer } = await import("../../../gateway/server.js");
 			const server = new GatewayServer({
 				bindHost: listenPlan.bindHost,
 				bind: listenPlan.bindMode,

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/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/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/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/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/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/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/tunnel.js

@@ -216,6 +216,7 @@ function registerTunnelRoutes(authenticated, deps) {
 		}
 	});
 	authenticated.post("/api/tunnel/start", tunnelMutationLimit, async (c) => {
+		const recoverActiveLease = (await c.req.json().catch(() => ({})))?.recoverActiveLease === true;
 		let token;
 		try {
 			token = requireTunnelGatewayToken(deps.service.getResolvedAuth());
@@ -244,7 +245,7 @@ function registerTunnelRoutes(authenticated, deps) {
 		}
 		const port = config.gateway.port ?? 18790;
 		try {
-			await tunnel.start(port, token);
+			await tunnel.start(port, token, { recoverActiveLease });
 			setTunnelEnabledInConfig(config, true);
 			const saved = await deps.service.saveConfig(config);
 			if (!saved.saved) {
@@ -291,6 +292,12 @@ function registerTunnelRoutes(authenticated, deps) {
 		setTunnelEnabledInConfig(config, false);
 		const saved = await deps.service.saveConfig(config);
 		if (!saved.saved) return c.json({ error: saved.error ?? "Failed to save tunnel state" }, 500);
+		if (release && !released) return c.json({
+			ok: false,
+			released: false,
+			code: "TUNNEL_RELEASE_FAILED",
+			error: "Cloud lease release was not confirmed. Retry or recover the connection."
+		}, 502);
 		return c.json({
 			ok: true,
 			released

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";