@xopcai/xopc 0.0.387 → 0.0.389

package/dist/src/agent/tools/cli-clarify.d.ts

@@ -1,5 +1,2 @@
 import type { GatewayClarifyRequestFn } from './clarify-tool.js';
-/**
- * stdin/stdout prompts for `clarify` when running the CLI agent (no gateway).
- */
 export declare function createCliReadlineClarifyRequestFn(): GatewayClarifyRequestFn;

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

@@ -1,49 +1,35 @@
+import { normalizeClarificationSubmission } from "../../../packages/gateway-contract/src/clarifications.js";
+import { init_src } from "../../../packages/gateway-contract/src/index.js";
 import * as readline from "node:readline/promises";
 import { stdin, stdout } from "node:process";
 //#region src/agent/tools/cli-clarify.ts
-/**
-* stdin/stdout prompts for `clarify` when running the CLI agent (no gateway).
-*/
+init_src();
 function createCliReadlineClarifyRequestFn() {
-	return async (_context, req) => {
+	return async (_context, request) => {
 		const rl = readline.createInterface({
 			input: stdin,
 			output: stdout
 		});
 		try {
-			const choices = req.choices;
-			if (choices && choices.length >= 2) {
-				stdout.write(`\n${req.question}\n`);
-				choices.forEach((c, i) => stdout.write(`  ${i + 1}) ${c}\n`));
-				if (req.suggestedAnswer) stdout.write(`  (recommended: ${req.suggestedAnswer})\n`);
-				const raw = (await rl.question("Choice (number or exact text): ")).trim();
-				const n = parseInt(raw, 10);
-				if (!Number.isNaN(n) && n >= 1 && n <= choices.length) return {
+			stdout.write(`\n${request.question}\n`);
+			if (request.kind === "approval") {
+				stdout.write(`${JSON.stringify(request.approval)}\n`);
+				return {
 					status: "answered",
-					answer: choices[n - 1]
+					answer: normalizeClarificationSubmission(request, { decision: (await rl.question("Type approve or deny: ")).trim() }).answer
 				};
-				if (raw) return {
-					status: "answered",
-					answer: raw
-				};
-				if (req.suggestedAnswer) return {
-					status: "answered",
-					answer: req.suggestedAnswer
-				};
-				throw new Error("No answer provided");
 			}
-			stdout.write(`\n${req.question}\n`);
-			if (req.suggestedAnswer) stdout.write(`(Press Enter for recommendation: ${req.suggestedAnswer})\n`);
-			const raw = (await rl.question("> ")).trim();
-			if (raw) return {
-				status: "answered",
-				answer: raw
-			};
-			if (req.suggestedAnswer) return {
+			request.choiceDetails?.forEach((choice, index) => stdout.write(`  ${index + 1}) ${choice.label}${choice.description ? ` — ${choice.description}` : ""}${choice.id === request.recommendedChoiceId ? " (recommended)" : ""}\n`));
+			const raw = (await rl.question("Choice number or your answer: ")).trim();
+			const choice = /^\d+$/.test(raw) ? request.choiceDetails?.[Number(raw) - 1] : void 0;
+			const text = choice && request.interactionMode === "compose" ? (await rl.question("Additional information (optional): ")).trim() : choice ? void 0 : raw;
+			return {
 				status: "answered",
-				answer: req.suggestedAnswer
+				answer: normalizeClarificationSubmission(request, { response: {
+					choiceId: choice?.id,
+					text
+				} }).answer
 			};
-			throw new Error("No answer provided");
 		} finally {
 			rl.close();
 		}

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

@@ -8,8 +8,8 @@ import { getSessionMetadata } from "../../storage/sqlite/session-read-repository
 import { patchSessionMetadata } from "../../storage/sqlite/session-repository.js";
 import { getSessionTaskPlan, setSessionTaskPlan } from "../../storage/sqlite/session-task-plan-repository.js";
 import { init_sqlite } from "../../storage/sqlite/index.js";
-import { resolveUserContextSessionAccess } from "../../user-context/access-policy.js";
 import { init_agent_scope, resolveDefaultAgentId } from "../agent-scope.js";
+import { resolveUserContextSessionAccess } from "../../user-context/access-policy.js";
 import { resolveEffectiveAgentConfigForAgent, resolveEffectiveAgentConfigForSession } from "../../config/agent-profile.js";
 import { TaskConversationRepository } from "../../tasks/task-conversation-repository.js";
 import { LOCAL_READ_MAX_CHARS } from "./local-read-budget.js";

package/dist/src/agent/tools/personal-read-tool.js

@@ -1,5 +1,5 @@
-import { LOCAL_READ_MAX_CHARS } from "./local-read-budget.js";
 import { CapabilityDispatcher } from "../../capabilities/runtime/dispatcher.js";
+import { LOCAL_READ_MAX_CHARS } from "./local-read-budget.js";
 import { registerNoteReadCapabilities } from "../../notes/capabilities/read.js";
 import { registerProjectReadCapabilities } from "../../projects/capabilities/read.js";
 import { registerAutomationReadCapabilities } from "../../automations/capabilities/read.js";

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

@@ -12,18 +12,18 @@ declare const PersonalTaskModelSchema: import("@sinclair/typebox").TObject<{
         taskType: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
         requestedAgentId: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
     }>>;
-    command: import("@sinclair/typebox").TUnion<import("@sinclair/typebox").TLiteral<"get" | "answer" | "retry_allocation" | "selection" | "list" | "cancel" | "entry" | "revise" | "submit" | "instruct" | "collaboration">[]>;
+    command: import("@sinclair/typebox").TUnion<import("@sinclair/typebox").TLiteral<"get" | "answer" | "cancel" | "retry_allocation" | "selection" | "list" | "entry" | "revise" | "submit" | "instruct" | "collaboration">[]>;
     requestId: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
+    description: 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>;
     title: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
     taskId: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
     requiredSkills: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TArray<import("@sinclair/typebox").TString>>;
-    idempotencyKey: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
     objective: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
     expectedOutputs: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TArray<import("@sinclair/typebox").TString>>;
     constraints: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TArray<import("@sinclair/typebox").TString>>;
-    expectedVersion: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TInteger>;
-    description: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
     limit: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TInteger>;
     offset: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TInteger>;
     section: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TUnion<import("@sinclair/typebox").TLiteral<string>[]>>;

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

@@ -11,13 +11,13 @@ import { TaskRunRepository } from "../../tasks/task-run-repository.js";
 import { getSessionMetadata } from "../../storage/sqlite/session-read-repository.js";
 import { init_sqlite } from "../../storage/sqlite/index.js";
 import "../../activity/index.js";
+import { CapabilityError } from "../../capabilities/runtime/errors.js";
+import "../../capabilities/runtime/dispatcher.js";
 import { getDefaultAgentId, init_resolve_route } from "../../routing/resolve-route.js";
 import { resolveTaskLocale } from "../../tasks/task-language.js";
 import { TaskReadModelProjector } from "../../tasks/task-read-model-projector.js";
 import { TaskOriginRepository } from "../../tasks/task-origin-repository.js";
 import { TaskConversationRepository } from "../../tasks/task-conversation-repository.js";
-import { CapabilityError } from "../../capabilities/runtime/errors.js";
-import "../../capabilities/runtime/dispatcher.js";
 import { resolveProjectAgentId } from "../../projects/project-agent.js";
 import "../../projects/index.js";
 import { TaskCollaborationRepository } from "../../tasks/task-collaboration-repository.js";

package/dist/src/agent/workspace-runtime/registry.js

@@ -1,5 +1,5 @@
-import { init_agent_session_key, normalizeAgentId } from "../../routing/agent-session-key.js";
 import { init_agent_scope, resolveAgentIdForWorkspacePath } from "../agent-scope.js";
+import { init_agent_session_key, normalizeAgentId } from "../../routing/agent-session-key.js";
 import { SkillManager } from "../skills/skill-manager.js";
 import { SystemPromptBuilder } from "../prompt/service-prompt-builder.js";
 import { UserContextRuntimeRegistry } from "../../user-context/runtime.js";

package/dist/src/agent-catalog/capabilities.js

@@ -1,10 +1,10 @@
 import { AgentEntrySchema, EffectiveAgentConfigSchema } from "../agent-config/schema.js";
 import { resolveEffectiveAgentConfig } from "../agent-config/resolver.js";
 import { init_agent_config } from "../agent-config/index.js";
-import { AgentCatalogRepository, init_repository } from "./repository.js";
-import { init_agent_scope, resolveAgentWorkspaceDir } from "../agent/agent-scope.js";
 import { CapabilityError } from "../capabilities/runtime/errors.js";
 import { defineAtomicCapability, defineReadCapability } from "../capabilities/runtime/dispatcher.js";
+import { AgentCatalogRepository, init_repository } from "./repository.js";
+import { init_agent_scope, resolveAgentWorkspaceDir } from "../agent/agent-scope.js";
 import { AgentCatalogService } from "./service.js";
 import { z } from "zod";
 //#region src/agent-catalog/capabilities.ts

package/dist/src/automations/capabilities/drafts.js

@@ -3,10 +3,10 @@ import { init_src } from "../../../packages/gateway-contract/src/index.js";
 import { init_trust_policy, resolveAutomationSafetyForTrust } from "../../user-context/trust-policy.js";
 import { getUserTrustPolicy } from "../../storage/sqlite/user-trust-repository.js";
 import { init_sqlite } from "../../storage/sqlite/index.js";
-import { init_agent_scope, resolveDefaultAgentId } from "../../agent/agent-scope.js";
 import { CapabilityError } from "../../capabilities/runtime/errors.js";
 import { ExternalEffectNotAppliedError } from "../../capabilities/runtime/external-operations.js";
 import { defineExternalCapability, defineReadCapability } from "../../capabilities/runtime/dispatcher.js";
+import { init_agent_scope, resolveDefaultAgentId } from "../../agent/agent-scope.js";
 import { AutomationCreateCapabilityInputSchema } from "./write.js";
 import { simulateAutomation } from "../draft/automation-draft-validator.js";
 import { AutomationDraftService } from "../draft/automation-draft-service.js";

package/dist/src/automations/capabilities/write.d.ts

@@ -135,6 +135,7 @@ export declare const AutomationCreateCapabilityInputSchema: z.ZodObject<{
         }>;
     }, z.core.$strict>], "kind">;
     id: z.ZodPipe<z.ZodOptional<z.ZodNullable<z.ZodString>>, z.ZodTransform<string, string>>;
+    description: z.ZodOptional<z.ZodString>;
     trigger: z.ZodDiscriminatedUnion<[z.ZodObject<{
         kind: z.ZodLiteral<"manual">;
     }, z.core.$strict>, z.ZodObject<{
@@ -160,7 +161,6 @@ export declare const AutomationCreateCapabilityInputSchema: z.ZodObject<{
         source: z.ZodPipe<z.ZodOptional<z.ZodNullable<z.ZodString>>, z.ZodTransform<string, string>>;
         payloadMatch: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodUnion<readonly [z.ZodString, z.ZodNumber, z.ZodBoolean, z.ZodNull]>>>;
     }, z.core.$strict>], "kind">;
-    description: z.ZodOptional<z.ZodString>;
     delivery: z.ZodDefault<z.ZodObject<{
         notificationPolicy: z.ZodDefault<z.ZodEnum<{
             attention: "attention";
@@ -337,6 +337,7 @@ export declare const AutomationUpdatePatchSchema: z.ZodObject<{
             "memory.weekly_knowledge": "memory.weekly_knowledge";
         }>;
     }, z.core.$strict>], "kind">>;
+    description: z.ZodOptional<z.ZodOptional<z.ZodString>>;
     trigger: z.ZodOptional<z.ZodDiscriminatedUnion<[z.ZodObject<{
         kind: z.ZodLiteral<"manual">;
     }, z.core.$strict>, z.ZodObject<{
@@ -362,7 +363,6 @@ export declare const AutomationUpdatePatchSchema: z.ZodObject<{
         source: z.ZodPipe<z.ZodOptional<z.ZodNullable<z.ZodString>>, z.ZodTransform<string, string>>;
         payloadMatch: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodUnion<readonly [z.ZodString, z.ZodNumber, z.ZodBoolean, z.ZodNull]>>>;
     }, z.core.$strict>], "kind">>;
-    description: z.ZodOptional<z.ZodOptional<z.ZodString>>;
     safety: z.ZodOptional<z.ZodOptional<z.ZodObject<{
         mode: z.ZodEnum<{
             suggest_only: "suggest_only";

package/dist/src/automations/domain/validation.d.ts

@@ -219,8 +219,8 @@ export declare const AutomationStateSchema: z.ZodObject<{
     lastRunStatus: z.ZodOptional<z.ZodEnum<{
         failed: "failed";
         succeeded: "succeeded";
-        cancelled: "cancelled";
         queued: "queued";
+        cancelled: "cancelled";
         running: "running";
         cancelling: "cancelling";
         timeout: "timeout";
@@ -446,8 +446,8 @@ export declare const AutomationSchema: z.ZodObject<{
         lastRunStatus: z.ZodOptional<z.ZodEnum<{
             failed: "failed";
             succeeded: "succeeded";
-            cancelled: "cancelled";
             queued: "queued";
+            cancelled: "cancelled";
             running: "running";
             cancelling: "cancelling";
             timeout: "timeout";
@@ -589,6 +589,7 @@ export declare const CreateAutomationSchema: z.ZodObject<{
             "memory.weekly_knowledge": "memory.weekly_knowledge";
         }>;
     }, z.core.$strict>], "kind">;
+    description: z.ZodOptional<z.ZodString>;
     trigger: z.ZodDiscriminatedUnion<[z.ZodObject<{
         kind: z.ZodLiteral<"manual">;
     }, z.core.$strict>, z.ZodObject<{
@@ -614,7 +615,6 @@ export declare const CreateAutomationSchema: z.ZodObject<{
         source: z.ZodPipe<z.ZodOptional<z.ZodNullable<z.ZodString>>, z.ZodTransform<string, string>>;
         payloadMatch: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodUnion<readonly [z.ZodString, z.ZodNumber, z.ZodBoolean, z.ZodNull]>>>;
     }, z.core.$strict>], "kind">;
-    description: z.ZodOptional<z.ZodString>;
     delivery: z.ZodDefault<z.ZodObject<{
         notificationPolicy: z.ZodDefault<z.ZodEnum<{
             attention: "attention";
@@ -676,8 +676,8 @@ export declare const CreateAutomationSchema: z.ZodObject<{
         lastRunStatus: z.ZodOptional<z.ZodOptional<z.ZodEnum<{
             failed: "failed";
             succeeded: "succeeded";
-            cancelled: "cancelled";
             queued: "queued";
+            cancelled: "cancelled";
             running: "running";
             cancelling: "cancelling";
             timeout: "timeout";
@@ -818,6 +818,7 @@ export declare const UpdateAutomationSchema: z.ZodObject<{
             "memory.weekly_knowledge": "memory.weekly_knowledge";
         }>;
     }, z.core.$strict>], "kind">>;
+    description: z.ZodOptional<z.ZodOptional<z.ZodString>>;
     trigger: z.ZodOptional<z.ZodDiscriminatedUnion<[z.ZodObject<{
         kind: z.ZodLiteral<"manual">;
     }, z.core.$strict>, z.ZodObject<{
@@ -843,7 +844,6 @@ export declare const UpdateAutomationSchema: z.ZodObject<{
         source: z.ZodPipe<z.ZodOptional<z.ZodNullable<z.ZodString>>, z.ZodTransform<string, string>>;
         payloadMatch: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodUnion<readonly [z.ZodString, z.ZodNumber, z.ZodBoolean, z.ZodNull]>>>;
     }, z.core.$strict>], "kind">>;
-    description: z.ZodOptional<z.ZodOptional<z.ZodString>>;
     safety: z.ZodOptional<z.ZodOptional<z.ZodObject<{
         mode: z.ZodEnum<{
             suggest_only: "suggest_only";
@@ -903,8 +903,8 @@ export declare const UpdateAutomationSchema: z.ZodObject<{
         lastRunStatus: z.ZodOptional<z.ZodEnum<{
             failed: "failed";
             succeeded: "succeeded";
-            cancelled: "cancelled";
             queued: "queued";
+            cancelled: "cancelled";
             running: "running";
             cancelling: "cancelling";
             timeout: "timeout";

package/dist/src/automations/draft/automation-draft-validator.d.ts

@@ -130,6 +130,7 @@ export declare function buildAutomationDraftResponse(draft: GeneratedAutomationD
             kind: "system";
             capability: "home.advisor.refresh" | "personal.proactivity.tick" | "memory.temporal_sweep" | "memory.daily_reconciliation" | "memory.weekly_knowledge";
         };
+        description?: string;
         trigger?: {
             kind: "manual";
         } | {
@@ -155,7 +156,6 @@ export declare function buildAutomationDraftResponse(draft: GeneratedAutomationD
             source?: string;
             payloadMatch?: Record<string, string | number | boolean>;
         };
-        description?: string;
         safety?: {
             mode: "suggest_only" | "ask_before_apply" | "auto_apply";
         };
@@ -177,7 +177,7 @@ export declare function buildAutomationDraftResponse(draft: GeneratedAutomationD
             nextRunAtMs?: number;
             runningRunId?: string;
             lastRunAtMs?: number;
-            lastRunStatus?: "failed" | "succeeded" | "cancelled" | "queued" | "running" | "cancelling" | "timeout";
+            lastRunStatus?: "failed" | "succeeded" | "queued" | "cancelled" | "running" | "cancelling" | "timeout";
             lastError?: string;
             consecutiveFailures?: number;
         };

package/dist/src/automations/service/action-executor.js

@@ -1,8 +1,8 @@
 import { createLogger } from "../../utils/logger/index.js";
 import { init_logger } from "../../utils/logger.js";
-import { init_session_key, resolveConversationId } from "../../routing/session-key.js";
 import { normalizeAgentId } from "../../agent-catalog/id.js";
 import { init_agent_scope } from "../../agent/agent-scope.js";
+import { init_session_key, resolveConversationId } from "../../routing/session-key.js";
 import { resolveAutomationTimeoutSeconds } from "../domain/defaults.js";
 //#region src/automations/service/action-executor.ts
 init_agent_scope();

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

@@ -1,9 +1,9 @@
 import { requireXopcDatabase } from "../storage/sqlite/connection.js";
 import { init_sqlite } from "../storage/sqlite/index.js";
 import { AgentCatalogService } from "../agent-catalog/service.js";
-import { ensureStarterAgentsInitialized } from "../agent/starter-agents.js";
 import { cutoverLegacyAgentConfig } from "../agent-catalog/migrations/legacy-config-cutover.js";
 import "../agent-catalog/index.js";
+import { ensureStarterAgentsInitialized } from "../agent/starter-agents.js";
 import { migrateIdentityMarkdownToCatalog } from "../agent-catalog/migrations/identity-markdown-cutover.js";
 import { migrateCloudPublicModelsSync } from "../migrations/cloud-public-models.js";
 import { runBootstrapMigrationsSync } from "../migrations/runner.js";

package/dist/src/capabilities/runtime/dispatcher.js

@@ -1,7 +1,7 @@
 import { SqliteCommitEffectError, init_transaction } from "../../storage/sqlite/transaction.js";
+import { OperationConflictError, executeAtomicOperation } from "./atomic-operations.js";
 import { CapabilityError } from "./errors.js";
 import { executeExternalOperation } from "./external-operations.js";
-import { OperationConflictError, executeAtomicOperation } from "./atomic-operations.js";
 import { createHash } from "node:crypto";
 import { z } from "zod";
 //#region src/capabilities/runtime/dispatcher.ts

package/dist/src/capabilities/runtime/product.js

@@ -1,5 +1,6 @@
 import { CapabilityError } from "./errors.js";
 import { CapabilityDispatcher } from "./dispatcher.js";
+import { registerAgentCapabilities } from "../../agent-catalog/capabilities.js";
 import { registerLocalAppReadCapabilities } from "../../local-apps/capabilities/read.js";
 import { registerNoteReadCapabilities } from "../../notes/capabilities/read.js";
 import { registerNoteWriteCapabilities } from "../../notes/capabilities/write.js";
@@ -18,7 +19,6 @@ import { registerSceneReadCapabilities } from "../../scenes/capabilities/read.js
 import { registerSceneWriteCapabilities } from "../../scenes/capabilities/write.js";
 import { registerSettingsCapability } from "./settings.js";
 import { registerAppContextCapability } from "./app-context.js";
-import { registerAgentCapabilities } from "../../agent-catalog/capabilities.js";
 //#region src/capabilities/runtime/product.ts
 function createProductDispatcher(getNotes, taskWrites) {
 	const dispatcher = new CapabilityDispatcher();

package/dist/src/chat-commands/agent-edit.js

@@ -1,6 +1,6 @@
-import { init_agent_session_key, resolveAgentIdFromConversationId } from "../routing/agent-session-key.js";
 import { normalizeAgentId } from "../agent-catalog/id.js";
 import { init_agent_scope, resolveAgentProfileDir } from "../agent/agent-scope.js";
+import { init_agent_session_key, resolveAgentIdFromConversationId } from "../routing/agent-session-key.js";
 import { WORKSPACE_FILES, init_paths } from "../config/paths.js";
 import { commandRegistry } from "./registry.js";
 import { join } from "node:path";

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

@@ -1,7 +1,7 @@
 import { createLogger } from "../../utils/logger/index.js";
 import { init_logger } from "../../utils/logger.js";
-import { init_agent_session_key, resolveAgentMainConversationId } from "../../routing/agent-session-key.js";
 import { init_agent_scope, resolveDefaultAgentId } from "../../agent/agent-scope.js";
+import { init_agent_session_key, resolveAgentMainConversationId } from "../../routing/agent-session-key.js";
 import { getAgentDefaultModelRef, init_schema } from "../../config/schema.js";
 import { getWorkspacePath } from "../../config/workspace-path-helpers.js";
 import { ExtensionLoader } from "../../extensions/loader.js";

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

@@ -1,8 +1,8 @@
 import { normalizeAgentId, validateAgentIdForNewAgent } from "../../agent-catalog/id.js";
 import { AgentCatalogRepository, init_repository } from "../../agent-catalog/repository.js";
 import { init_agent_scope, resolveAgentDir, resolveAgentWorkspaceDir, resolveDefaultAgentId } from "../../agent/agent-scope.js";
-import { resolveEffectiveAgentConfigForAgent } from "../../config/agent-profile.js";
 import { AgentCatalogService } from "../../agent-catalog/service.js";
+import { resolveEffectiveAgentConfigForAgent } from "../../config/agent-profile.js";
 import { colors } from "../utils/colors.js";
 //#region src/cli/commands/agents.ts
 init_repository();

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

@@ -1,11 +1,11 @@
 import { creditDecimal } from "../../../packages/gateway-contract/src/cloud-credits.js";
 import { init_src } from "../../../packages/gateway-contract/src/index.js";
 import { AgentCatalogRepository, init_repository } from "../../agent-catalog/repository.js";
+import { AgentCatalogService } from "../../agent-catalog/service.js";
 import { getAgentDefaultModelRef, init_schema } from "../../config/schema.js";
 import { CredentialResolver, init_credentials } from "../../auth/credentials.js";
 import { getAllModels, getAvailableModels, getConfiguredProviders, getProviderAuthState, getProviderDisplayName, init_providers, isProviderConfigured, providerSupportsApiKey, providerSupportsOAuth, resolveModel } from "../../providers/index.js";
 import { XopcCloudAccountService } from "../../providers/xopc-cloud-account-service.js";
-import { AgentCatalogService } from "../../agent-catalog/service.js";
 import { listImageProviderSpecs } from "../../../packages/image-providers/src/catalog.js";
 import "../../../packages/image-providers/src/index.js";
 import { loadConfig } from "../../config/loader.js";

package/dist/src/cli/commands/onboard/model.d.ts

@@ -1,7 +1,7 @@
 /**
  * Catalog-driven model configuration for onboarding.
  */
-import type { Config } from '../../../config/schema.js';
+import { type Config } from '../../../config/schema.js';
 import { type XopcCloudCatalogCoordinator } from '../../../providers/xopc-cloud-catalog-coordinator.js';
 import type { CLIContext } from '../../registry.js';
 export declare function setPrimaryModel(config: Config, workspacePath: string, modelRef: string): Promise<Config>;

package/dist/src/cli/commands/onboard/model.js

@@ -1,15 +1,16 @@
 import { AgentCatalogRepository, init_repository } from "../../../agent-catalog/repository.js";
-import { getAgentDefaultModelRef, init_schema } from "../../../config/schema.js";
+import { AgentCatalogService } from "../../../agent-catalog/service.js";
+import { ConfigSchema, getAgentDefaultModelRef, init_schema } from "../../../config/schema.js";
 import { resolveModelsJsonPath } from "../../../config/paths.js";
 import { init_models_json, loadModelsJson, saveModelsJson } from "../../../config/models-json.js";
 import { getApiKeyFromEnv } from "../../../providers/env-keys.js";
 import { getModelRegistry } from "../../../providers/model-registry.js";
 import { CredentialResolver, init_credentials } from "../../../auth/credentials.js";
 import { getAllProviders, getModelsByProvider, getProviderDisplayName, init_providers, providerSupportsApiKey, providerSupportsOAuth } from "../../../providers/index.js";
-import { AgentCatalogService } from "../../../agent-catalog/service.js";
 import { prepareUpdateGlobalDefaults } from "../../../gateway/global-defaults-admin.js";
 import { discoverProviderModels, isProviderApiDiscoverable } from "../../../providers/model-discovery.js";
 import { getXopcCloudCatalogCoordinator } from "../../../providers/xopc-cloud-catalog-coordinator.js";
+import { applyXopcCloudCapabilitySetup } from "../../../gateway/xopc-cloud-capability-setup.js";
 import { getDomesticProviderBaseUrl, getDomesticProviderPreset, getDomesticProviderPresetIds, providerConfigFromDomesticPreset } from "../../../providers/domestic-presets.js";
 import { getProviderHint, getRecommendedModelsForProvider, sortModelsForPicker, sortProvidersForPicker } from "../../../providers/presentation.js";
 import { colors } from "../../utils/colors.js";
@@ -46,7 +47,20 @@ async function setPrimaryModel(config, workspacePath, modelRef) {
 	if (prep.data.changed) service.updateDefaults(prep.data.defaults);
 	const agent = repository.get(catalog.defaultAgentId);
 	if (agent && agent.workspace !== workspacePath) await service.update(catalog.defaultAgentId, { workspace: workspacePath });
-	return config;
+	return modelRef.startsWith("xopc-cloud/") ? setupCloudCapabilities(config) : config;
+}
+/** Return media settings for the onboarding wizard to persist with its other changes. */
+async function setupCloudCapabilities(config) {
+	let nextConfig = ConfigSchema.parse(config);
+	const result = await applyXopcCloudCapabilitySetup({
+		currentConfig: nextConfig,
+		saveConfig: async (next) => {
+			nextConfig = next;
+			return { saved: true };
+		}
+	});
+	if (result.configured === false) throw new Error(result.error);
+	return nextConfig;
 }
 function formatRecommended(provider) {
 	const labels = getRecommendedModelsForProvider(provider, 3).map((m) => m.name || m.id);
@@ -438,6 +452,11 @@ async function setupModel(existingConfig, ctx) {
 			default: true
 		})) {
 			console.log("✅ Keeping:", currentModel);
+			if (currentModel.startsWith("xopc-cloud/")) {
+				if (!await ensureProviderCredential("xopc-cloud", getProviderDisplayName("xopc-cloud"))) throw new Error("XOPC Cloud credentials are unavailable");
+				await refreshOnboardModelCatalogIfNeeded("xopc-cloud", getModelsForProvider("xopc-cloud").length > 0);
+				return setupCloudCapabilities(config);
+			}
 			return config;
 		}
 	}

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

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

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

@@ -1,10 +1,10 @@
-import { getConversationRouting } from "../storage/sqlite/conversation-repository.js";
-import { init_session_key } from "../routing/session-key.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";
+import { init_session_key } from "../routing/session-key.js";
 import { agentExists, getDefaultAgentId, init_resolve_route } from "../routing/resolve-route.js";
 //#region src/config/agent-profile.ts
 init_agent_config();

package/dist/src/config/loader.js

@@ -1,7 +1,7 @@
 import { createLogger } from "../utils/logger/index.js";
 import { init_logger } from "../utils/logger.js";
-import { ConfigSchema, init_schema } from "./schema.js";
 import { init_write_file_atomic, writeTextAtomic } from "../infra/write-file-atomic.js";
+import { ConfigSchema, init_schema } from "./schema.js";
 import { init_paths, resolveConfigPath } from "./paths.js";
 import { init_resolution, setActivePlatformDiscovery } from "../platform/resolution.js";
 import { assertChannelPluginConfigs } from "./validate-channel-configs.js";

package/dist/src/config/models-json.js

@@ -1,6 +1,6 @@
 import { __esmMin } from "../../_virtual/_rolldown/runtime.js";
-import { ComputerProfileSchema, init_src } from "../../packages/computer-control-contract/src/index.js";
 import { init_write_file_atomic, writeTextAtomicSync } from "../infra/write-file-atomic.js";
+import { ComputerProfileSchema, init_src } from "../../packages/computer-control-contract/src/index.js";
 import { init_paths, resolveModelsJsonPath } from "./paths.js";
 import { init_model_policy, isComputerModel } from "../computer/model-policy.js";
 import { assertCurrentModelProvider, init_provider_policy } from "../providers/provider-policy.js";

package/dist/src/config/schema.d.ts

@@ -1146,6 +1146,8 @@ export declare const McpOAuthConfigSchema: z.ZodObject<{
     authServerMetadataUrl: z.ZodOptional<z.ZodString>;
 }, z.core.$strict>;
 export declare const McpServerSchema: z.ZodObject<{
+    displayName: z.ZodOptional<z.ZodString>;
+    xopcOAuthCredentialId: z.ZodOptional<z.ZodString>;
     type: z.ZodOptional<z.ZodEnum<{
         http: "http";
         stdio: "stdio";
@@ -1209,6 +1211,8 @@ export declare const McpServerSchema: z.ZodObject<{
 }, z.core.$catchall<z.ZodUnknown>>;
 export declare const McpConfigSchema: z.ZodOptional<z.ZodObject<{
     servers: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodObject<{
+        displayName: z.ZodOptional<z.ZodString>;
+        xopcOAuthCredentialId: z.ZodOptional<z.ZodString>;
         type: z.ZodOptional<z.ZodEnum<{
             http: "http";
             stdio: "stdio";
@@ -1323,8 +1327,8 @@ export declare const ConfigSchema: z.ZodDefault<z.ZodObject<{
             }>>;
             sensitiveWritePolicy: z.ZodDefault<z.ZodEnum<{
                 allow: "allow";
-                confirm: "confirm";
                 deny: "deny";
+                confirm: "confirm";
             }>>;
             showMemoryReferences: z.ZodDefault<z.ZodBoolean>;
             processingPolicy: z.ZodDefault<z.ZodEnum<{
@@ -1856,6 +1860,8 @@ export declare const ConfigSchema: z.ZodDefault<z.ZodObject<{
     }, z.core.$strip>>;
     mcp: z.ZodOptional<z.ZodObject<{
         servers: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodObject<{
+            displayName: z.ZodOptional<z.ZodString>;
+            xopcOAuthCredentialId: z.ZodOptional<z.ZodString>;
             type: z.ZodOptional<z.ZodEnum<{
                 http: "http";
                 stdio: "stdio";

package/dist/src/config/schema.js

@@ -1,9 +1,9 @@
 import { __esmMin } from "../../_virtual/_rolldown/runtime.js";
-import { DEFAULT_CONTEXT_COMPACTION_POLICY, UserContextConfigSchema, init_config } from "../user-context/config.js";
 import { AgentModelsOverrideSchema, ImageGenerationRouteSchema, ModelRouteSchema } from "../agent-config/schema.js";
 import { resolveEffectiveAgentConfig } from "../agent-config/resolver.js";
 import { init_agent_config } from "../agent-config/index.js";
 import { AgentCatalogRepository, init_repository } from "../agent-catalog/repository.js";
+import { DEFAULT_CONTEXT_COMPACTION_POLICY, UserContextConfigSchema, init_config } from "../user-context/config.js";
 import { TracingConfigSchema, init_config as init_config$1 } from "../observability/config.js";
 import { ComputerConfigSchema, init_config as init_config$2 } from "../computer/config.js";
 import { init_public_url, validatePublicUrl } from "./public-url.js";
@@ -928,6 +928,8 @@ tts: TTSConfigSchema.optional() }).optional();
 		authServerMetadataUrl: z.string().url().optional()
 	}).strict();
 	McpServerSchema = z.object({
+		displayName: z.string().optional(),
+		xopcOAuthCredentialId: z.string().regex(/^mcp_draft_[a-f0-9]{32}$/).optional(),
 		type: z.enum([
 			"stdio",
 			"http",

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

@@ -2,8 +2,8 @@ import { dirname, isAbsolute, join, relative, resolve } from "node:path";
 import { existsSync, lstatSync, readFileSync, readdirSync, realpathSync, statSync } from "node:fs";
 import { createHash } from "node:crypto";
 import { z } from "zod";
-import { validateHeaderName, validateHeaderValue } from "node:http";
 import yaml from "js-yaml";
+import { validateHeaderName, validateHeaderValue } from "node:http";
 //#region src/extensions/agent-plugins/validation.ts
 const PLUGIN_SCHEMA = "https://agent-plugins.org/schemas/1.0.0/plugin.schema.json";
 const MCP_SCHEMA = "https://agent-plugins.org/schemas/1.0.0/mcp.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 { 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 { resolveEffectiveAgentProfile } from "../config/agent-profile.js";
+import { isPathUnderWorkspace, resolveWorkspaceSafePath } from "./workspace-editor-path.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/chat-stream/mapper.js

@@ -1,6 +1,7 @@
 import { parseTurnOutcome } from "../../../packages/gateway-contract/src/turn-outcome.js";
 import { resolveToolActivity } from "../../../packages/gateway-contract/src/tool-activity.js";
 import { isUserTurnDocument } from "../../../packages/gateway-contract/src/user-turn-document.js";
+import { readClarificationPresentation } from "../../../packages/gateway-contract/src/clarifications.js";
 import { init_src } from "../../../packages/gateway-contract/src/index.js";
 import { productDeliveries } from "../../session/compact-history.js";
 import { createPetFeedback } from "./pet-feedback.js";
@@ -98,11 +99,10 @@ var ChatStreamMapper = class {
 				...this.lastAssistantMessageId ? { messageId: this.lastAssistantMessageId } : {}
 			})];
 			case "clarify_request": return [this.make("clarify_request", {
+				...readClarificationPresentation(event),
 				requestId: String(event.requestId ?? ""),
 				kind: event.kind === "approval" ? "approval" : "input",
 				question: String(event.question ?? ""),
-				choices: Array.isArray(event.choices) ? event.choices.filter((x) => typeof x === "string") : void 0,
-				suggestedAnswer: typeof event.suggestedAnswer === "string" ? event.suggestedAnswer : void 0,
 				version: typeof event.version === "number" ? event.version : 1,
 				createdAt: typeof event.createdAt === "number" ? event.createdAt : Date.now(),
 				expiresAt: typeof event.expiresAt === "number" ? event.expiresAt : void 0,