@xopcai/xopc 0.0.426 → 0.0.428

package/dist/src/browser/setup/service.js

@@ -1,10 +1,12 @@
 import { createLogger } from "../../utils/logger/index.js";
 import { init_logger } from "../../utils/logger.js";
 import { getBrowserTabBinding } from "../../storage/sqlite/browser-tab-binding-repository.js";
+import { getSessionMetadata, init_session_read_repository } from "../../storage/sqlite/session-read-repository.js";
 import "../../../packages/browser-control-contract/src/index.js";
-import { createBrowserSetup, findBrowserSetup, readBrowserSetup, saveBrowserSetup } from "./repository.js";
+import { createBrowserSetup, findBrowserSetup, listConversationBrowserSetups, readBrowserSetup, saveBrowserSetup } from "./repository.js";
 import { createHash, randomUUID } from "node:crypto";
 //#region src/browser/setup/service.ts
+init_session_read_repository();
 init_logger();
 const log = createLogger("BrowserSetup");
 const VERSION = "1";
@@ -20,9 +22,21 @@ const browserConfigRevision = (config) => createHash("sha256").update(JSON.strin
 /** Setup writes use host-authorized interactive turns or existing owner grants. */
 var BrowserSetupService = class {
 	preparing = /* @__PURE__ */ new Set();
+	preparationSettled = /* @__PURE__ */ new Map();
 	constructor(deps) {
 		this.deps = deps;
 	}
+	scopeCurrent(setup) {
+		const metadata = getSessionMetadata(setup.conversationId);
+		return setup.transcriptId ? metadata?.transcriptId === setup.transcriptId && metadata.agentId === setup.agentId : !metadata;
+	}
+	async cancelConversation(conversationId) {
+		const setups = listConversationBrowserSetups(conversationId).map((setup) => this.cancel(setup));
+		await Promise.all(setups.map(async (setup) => {
+			await this.preparationSettled.get(setup.id);
+			await this.release(readBrowserSetup(setup.id));
+		}));
+	}
 	policyRevision(agentId) {
 		return this.deps.policyRevision?.(agentId) ?? String(this.deps.canUseBrowser(agentId));
 	}
@@ -47,13 +61,14 @@ var BrowserSetupService = class {
 		};
 		const attempt = setup.attempt ? (({ observation: _observation, ...summary }) => summary)(setup.attempt) : void 0;
 		const endpoint = setup.attempt ? this.endpoints().find((e) => e.endpointId === setup.attempt.endpointId) : void 0;
-		const changed = setup.configRevision !== browserConfigRevision(this.deps.getConfig()) || Boolean(setup.attempt && (setup.attempt.policyRevision !== this.policyRevision(setup.agentId) || !this.deps.canUseBrowser(setup.agentId) || endpoint && (endpoint.principalId !== setup.attempt.principalId || endpoint.appVersion !== setup.attempt.appVersion)));
+		const changed = !this.scopeCurrent(setup) || setup.configRevision !== browserConfigRevision(this.deps.getConfig()) || Boolean(setup.attempt && (setup.attempt.policyRevision !== this.policyRevision(setup.agentId) || !this.deps.canUseBrowser(setup.agentId) || endpoint && (endpoint.principalId !== setup.attempt.principalId || endpoint.appVersion !== setup.attempt.appVersion)));
 		return {
 			...setup,
 			attempt: setup.attempt ? attempt : void 0,
 			sceneId: "browser",
 			skillName: "configure-xopc",
 			resourceVersion: VERSION,
+			interactionPath: `/configuration/browser/${setup.id}?conversationId=${encodeURIComponent(setup.conversationId)}`,
 			stale: changed,
 			toolPermission: this.deps.canUseBrowser(setup.agentId) ? "allowed" : "denied",
 			currentDriverKind: this.deps.getConfig().browser.driver.kind,
@@ -141,6 +156,7 @@ var BrowserSetupService = class {
 			"open",
 			"begin_verification"
 		].includes(command)) {
+			if (!this.scopeCurrent(setup)) throw new Error("SETUP_SCOPE_CHANGED: Start a new setup in the current conversation.");
 			if (!context.canConfigure) throw new Error("SETUP_INTERACTIVE_REQUIRED: Continue in an authorized interactive conversation.");
 			if (!Number.isInteger(args.expectedRevision) || args.expectedRevision !== setup.revision) throw new Error("SETUP_CONFLICT: Read the current progress.");
 			if (!this.deps.canUseBrowser(context.agentId)) throw new Error("AGENT_BROWSER_DENIED: Review this Agent tool permission in settings.");
@@ -173,7 +189,7 @@ var BrowserSetupService = class {
 	}
 	approve(setup, principalId, revision) {
 		this.revision(setup, revision);
-		if (setup.state === "cancelled" || setup.state === "verifying" || setup.state === "completed") throw new Error("SETUP_STATE_CHANGED");
+		if (!this.scopeCurrent(setup) || setup.state === "cancelled" || setup.state === "verifying" || setup.state === "completed") throw new Error("SETUP_STATE_CHANGED");
 		if (setup.configRevision !== browserConfigRevision(this.deps.getConfig())) throw new Error("CONFIG_CHANGED: Review the current configuration before approving.");
 		return saveBrowserSetup({
 			...setup,
@@ -185,7 +201,7 @@ var BrowserSetupService = class {
 		if (setup.revision !== revision) throw new Error("SETUP_CONFLICT: Read the current progress.");
 	}
 	async prepare(setup) {
-		if (!setup.approvedBy || setup.state === "cancelled" || setup.state === "verifying" || setup.state === "completed") throw new Error("OWNER_APPROVAL_REQUIRED");
+		if (!this.scopeCurrent(setup) || !setup.approvedBy || setup.state === "cancelled" || setup.state === "verifying" || setup.state === "completed") throw new Error("OWNER_APPROVAL_REQUIRED");
 		if (setup.attempt && !setup.attempt.released) throw new Error("CONTROL_RELEASE_REQUIRED");
 		if (this.preparing.has(setup.id)) return readBrowserSetup(setup.id);
 		if (["waiting_extension", "ready_for_verification"].includes(setup.state) && !setup.error) return this.recheck(setup);
@@ -196,17 +212,22 @@ var BrowserSetupService = class {
 			state: "needs_attention",
 			error: "BROWSER_BUSY: Release existing browser sessions and wait for other runs before switching the shared driver."
 		}, setup.revision);
+		let settled;
+		this.preparationSettled.set(setup.id, new Promise((resolve) => {
+			settled = resolve;
+		}));
 		this.preparing.add(setup.id);
-		let current = saveBrowserSetup({
-			...setup,
-			state: "preparing",
-			error: void 0,
-			operation: {
-				key: setup.operation?.key ?? randomUUID(),
-				startedAt: Date.now()
-			}
-		}, setup.revision);
+		let current = setup;
 		try {
+			current = saveBrowserSetup({
+				...setup,
+				state: "preparing",
+				error: void 0,
+				operation: {
+					key: setup.operation?.key ?? randomUUID(),
+					startedAt: Date.now()
+				}
+			}, setup.revision);
 			const next = structuredClone(config);
 			next.browser.enabled = true;
 			next.browser.driver = { kind: "extension" };
@@ -243,6 +264,8 @@ var BrowserSetupService = class {
 			}, current.revision);
 		} finally {
 			this.preparing.delete(setup.id);
+			this.preparationSettled.delete(setup.id);
+			settled();
 		}
 	}
 	async recheck(setup) {
@@ -266,12 +289,12 @@ var BrowserSetupService = class {
 		}, setup.revision);
 	}
 	async open(setup, action) {
-		if (!setup.approvedBy || setup.state === "cancelled") throw new Error("OWNER_APPROVAL_REQUIRED");
+		if (!this.scopeCurrent(setup) || !setup.approvedBy || setup.state === "cancelled") throw new Error("OWNER_APPROVAL_REQUIRED");
 		return this.deps.open(action);
 	}
 	begin(setup, endpointId, origin, revision) {
 		this.revision(setup, revision);
-		if (!setup.approvedBy || setup.state !== "ready_for_verification") throw new Error("SETUP_NOT_READY");
+		if (!this.scopeCurrent(setup) || !setup.approvedBy || setup.state !== "ready_for_verification") throw new Error("SETUP_NOT_READY");
 		if (setup.configRevision !== browserConfigRevision(this.deps.getConfig())) throw new Error("CONFIG_CHANGED");
 		if (setup.attempt && !setup.attempt.released) throw new Error("CONTROL_RELEASE_REQUIRED");
 		if (!this.deps.canUseBrowser(setup.agentId)) throw new Error("AGENT_BROWSER_DENIED: Enable browser_use for this Agent and start a refreshed turn.");
@@ -331,7 +354,7 @@ var BrowserSetupService = class {
 		const [prefix, setupId, attemptId] = taskKey.split(":");
 		if (prefix !== "browser-setup" || !setupId) return false;
 		const setup = readBrowserSetup(setupId);
-		return Boolean(setup?.approvedBy && setup.state === "verifying" && setup.attempt?.id === attemptId && setup.attempt.fixtureUrl === url && Date.now() <= setup.attempt.expiresAt && setup.configRevision === browserConfigRevision(this.deps.getConfig()));
+		return Boolean(setup && this.scopeCurrent(setup) && setup.approvedBy && setup.state === "verifying" && setup.attempt?.id === attemptId && setup.attempt.fixtureUrl === url && Date.now() <= setup.attempt.expiresAt && setup.configRevision === browserConfigRevision(this.deps.getConfig()));
 	}
 	/** Called only by the real Agent browser tool, before its normal runtime/policy path. */
 	beforeAction(conversationId, agentId, input) {
@@ -344,7 +367,7 @@ var BrowserSetupService = class {
 		].includes(setup.state)) return void 0;
 		const a = setup.attempt;
 		if (!(input.action === "close")) {
-			if (setup.state !== "verifying") throw new Error("VERIFICATION_STOPPED: Close the verification session first.");
+			if (!this.scopeCurrent(setup) || setup.state !== "verifying") throw new Error("VERIFICATION_STOPPED: Close the verification session first.");
 			if (Date.now() > a.expiresAt || a.actions >= MAX_ACTIONS) throw new Error("VERIFICATION_BUDGET_EXCEEDED: Close the verification session.");
 			if (setup.configRevision !== browserConfigRevision(this.deps.getConfig()) || a.policyRevision !== this.policyRevision(setup.agentId)) throw new Error("CONFIG_CHANGED: Close the verification session.");
 			const endpoint = this.endpoints().find((e) => e.endpointId === a.endpointId);
@@ -381,7 +404,7 @@ var BrowserSetupService = class {
 		if (input.action === "close" && result.ok && result.receipt.action === "close" && result.receipt.verified) {
 			a.released = true;
 			delete a.observation;
-			const complete = setup.state === "verifying" && setup.configRevision === browserConfigRevision(this.deps.getConfig()) && Date.now() <= a.expiresAt && a.policyRevision === this.policyRevision(setup.agentId) && this.deps.canUseBrowser(setup.agentId) && a.read && a.clicked && a.filled;
+			const complete = this.scopeCurrent(setup) && setup.state === "verifying" && setup.configRevision === browserConfigRevision(this.deps.getConfig()) && Date.now() <= a.expiresAt && a.policyRevision === this.policyRevision(setup.agentId) && this.deps.canUseBrowser(setup.agentId) && a.read && a.clicked && a.filled;
 			return saveBrowserSetup({
 				...setup,
 				attempt: a,

package/dist/src/browser/setup/types.d.ts

@@ -3,6 +3,7 @@ export type SetupState = 'plan_ready' | 'preparing' | 'waiting_extension' | 'rea
 export interface BrowserSetup {
     id: string;
     conversationId: string;
+    transcriptId?: string;
     agentId: string;
     revision: number;
     state: SetupState;

package/dist/src/channels/attachments/voice-stt-webchat.js

@@ -1,9 +1,9 @@
 import { createLogger } from "../../utils/logger/index.js";
 import { init_logger } from "../../utils/logger.js";
-import { decodeInboundAttachmentBase64, readInboundAttachmentBuffer } from "./inbound-persist.js";
 import { transcribe } from "../../voice/stt/transcribe-core.js";
 import { isSTTAvailable } from "../../voice/stt/availability.js";
 import "../../voice/stt/index.js";
+import { decodeInboundAttachmentBase64, readInboundAttachmentBuffer } from "./inbound-persist.js";
 //#region src/channels/attachments/voice-stt-webchat.ts
 init_logger();
 const STT_MAX_BYTES = 25 * 1024 * 1024;

package/dist/src/channels/index.js

@@ -1,9 +1,9 @@
 import { parseFrontmatterBlock } from "../markdown/frontmatter.js";
+import { compileAllowlist, evaluateAccess, hasBotMention, removeBotMention, resolveAllowlistMatch, resolveAllowlistMatchSimple, resolveDmPolicy, resolveGroupPolicy } from "./security.js";
 import { getChannelPlugin, getChannelRegistryVersion, listChannelPlugins, syncChannelPluginsFromManager } from "./plugins/registry.js";
 import { findFenceSpanAt, isSafeFenceBreak, parseFenceSpans } from "../markdown/fences.js";
 import { chunkText } from "../markdown/chunk.js";
 import { chunkMarkdownIR, markdownToIR, markdownToIRWithMeta } from "../markdown/ir.js";
-import { compileAllowlist, evaluateAccess, hasBotMention, removeBotMention, resolveAllowlistMatch, resolveAllowlistMatchSimple, resolveDmPolicy, resolveGroupPolicy } from "./security.js";
 import { renderMarkdownWithMarkers } from "../markdown/render.js";
 import { convertMarkdownTables } from "../markdown/tables.js";
 import { buildCodeSpanIndex, createInlineCodeState } from "../markdown/code-spans.js";

package/dist/src/channels/manager.d.ts

@@ -50,6 +50,7 @@ export declare class ChannelManager {
     listDeferConnectChannelIds(cfg: Config): string[];
     send(msg: OutboundMessage, options?: {
         skipPersist?: boolean;
+        requireDelivery?: boolean;
     }): Promise<void>;
     replayPendingOutboundMessages(): Promise<void>;
     startStream(channel: string, chatId: string, accountId?: string, opts?: {

package/dist/src/channels/outbound-sender.d.ts

@@ -46,6 +46,7 @@ export declare class ChannelOutboundSender {
     replayPending(): Promise<void>;
     send(msg: OutboundMessage, options?: {
         skipPersist?: boolean;
+        requireDelivery?: boolean;
     }): Promise<void>;
     private applyTtsIfNeeded;
 }

package/dist/src/channels/outbound-sender.js

@@ -51,6 +51,7 @@ var ChannelOutboundSender = class {
 			if (this.hooks) {
 				const hookResult = await this.hooks.runMessageSending(processedMsg.chat_id, processedMsg.content ?? "", processedMsg.channel);
 				if (!hookResult.send) {
+					if (options?.requireDelivery) throw new Error("Channel delivery was blocked by policy.");
 					if (queueId) this.persistStore.ack(queueId);
 					return;
 				}
@@ -66,6 +67,7 @@ var ChannelOutboundSender = class {
 			}
 			const plugin = this.opts.registry.get(processedMsg.channel);
 			if (!plugin?.outbound) {
+				if (options?.requireDelivery) throw new Error("The requested channel is unavailable.");
 				log.error({ channel: processedMsg.channel }, "Unknown channel or no outbound adapter");
 				if (queueId) this.persistStore.ack(queueId);
 				return;
@@ -79,6 +81,7 @@ var ChannelOutboundSender = class {
 				const err = result && !result.success ? result.error : void 0;
 				await this.hooks.runMessageSent(processedMsg.chat_id, processedMsg.content ?? "", result?.success ?? false, err, processedMsg.channel);
 			}
+			if (options?.requireDelivery && !result?.success) throw new Error("Channel delivery did not succeed.");
 			if (!result) {
 				if (queueId) this.persistStore.ack(queueId);
 				return;

package/dist/src/channels/pairing/pairing-service.js

@@ -1,9 +1,9 @@
-import { resolveDmPolicy } from "../security.js";
 import { resolveStandardAllowFromPath, resolveStandardPairingPath } from "./paths.js";
 import { readAllowFromIdsSync, removeAllowFromIdSync } from "./allow-from-file.js";
 import "./pairing-constants.js";
 import { PAIRING_PENDING_TTL_MS, approvePairingBySenderIdSync, approvePairingCodeSync, dismissPairingBySenderIdSync, listPendingPairingRequestsSync } from "./pairing-store.js";
 import { broadcastPairingEvent } from "./pairing-events.js";
+import { resolveDmPolicy } from "../security.js";
 //#region src/channels/pairing/pairing-service.ts
 const pairingResolvers = /* @__PURE__ */ new Map();
 function registerPairingChannelResolver(channel, resolver) {

package/dist/src/channels/weixin/account-identity.d.ts

@@ -0,0 +1,2 @@
+/** An opaque login revision; never expose the channel credential or silently rebind a recipient. */
+export declare function weixinAccountIdentityRevision(accountId: string): string | undefined;

package/dist/src/channels/weixin/account-identity.js

@@ -0,0 +1,15 @@
+import { loadWeixinAccount } from "../../../extensions/weixin/src/auth/accounts.js";
+import { createHash } from "node:crypto";
+//#region src/channels/weixin/account-identity.ts
+/** An opaque login revision; never expose the channel credential or silently rebind a recipient. */
+function weixinAccountIdentityRevision(accountId) {
+	const account = loadWeixinAccount(accountId);
+	if (!account?.token?.trim()) return;
+	return createHash("sha256").update(JSON.stringify([
+		account.userId ?? "",
+		account.token.trim(),
+		account.baseUrl?.trim() || "https://ilinkai.weixin.qq.com"
+	])).digest("hex");
+}
+//#endregion
+export { weixinAccountIdentityRevision };

package/dist/src/chat-commands/builtins/config.js

@@ -2,11 +2,11 @@ import { createLogger } from "../../utils/logger/index.js";
 import { init_logger } from "../../utils/logger.js";
 import { init_paths, resolveConfigPath } from "../../config/paths.js";
 import { ConfigSchema, init_schema } from "../../config/schema.js";
+import { resolveAllowlistMatchSimple } from "../../channels/security.js";
 import { commandRegistry } from "../registry.js";
 import { parseConfigValue } from "../config-value.js";
 import { getConfigValueAtPath, parseConfigPath, setConfigValueAtPath, unsetConfigValueAtPath } from "../config-paths.js";
 import { loadConfig, saveConfig } from "../../config/loader.js";
-import { resolveAllowlistMatchSimple } from "../../channels/security.js";
 //#region src/chat-commands/builtins/config.ts
 init_schema();
 init_paths();

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

@@ -1,7 +1,7 @@
-import { buildChannelCatalogForConfig } from "../../channels/catalog/channel-catalog-service.js";
-import { loadConfig, saveConfig } from "../../config/loader.js";
 import { listChannelPairingState } from "../../channels/pairing/pairing-service.js";
 import { approveChannelPairingFromCli } from "../../channels/pairing/approve-cli.js";
+import { buildChannelCatalogForConfig } from "../../channels/catalog/channel-catalog-service.js";
+import { loadConfig, saveConfig } from "../../config/loader.js";
 import { formatExamples, register } from "../registry.js";
 import { colors } from "../utils/colors.js";
 import { Command } from "commander";

package/dist/src/cli/commands/doctor/checks/channel-pairing-pending.js

@@ -1,5 +1,5 @@
-import { loadConfig } from "../../../../config/loader.js";
 import { collectPairingPendingIssues } from "../../../../channels/pairing/pairing-service.js";
+import { loadConfig } from "../../../../config/loader.js";
 import { existsSync } from "node:fs";
 //#region src/cli/commands/doctor/checks/channel-pairing-pending.ts
 function hasEnabledChannel(cfg) {

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

@@ -1,6 +1,6 @@
+import { resolveMcpSetupConfig } from "../../agent/mcp/effective-server.js";
 import { getNativePiAgentDir, prepareNativeMcpConfig } from "../../agent/mcp/native-mcp.js";
 import { loadConfig } from "../../config/loader.js";
-import { resolveMcpSetupConfig } from "../../agent/mcp/effective-server.js";
 import { register } from "../registry.js";
 import { createGatewayHttpClientFromConfig } from "../../mcp/gateway-http-client.js";
 import { createCapabilityMcpServer } from "../../mcp/capability-server.js";

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

@@ -1168,6 +1168,7 @@ export declare const McpServerSchema: z.ZodObject<{
         http: "http";
         stdio: "stdio";
         "streamable-http": "streamable-http";
+        sse: "sse";
     }>>;
     command: z.ZodOptional<z.ZodString>;
     args: z.ZodOptional<z.ZodArray<z.ZodString>>;
@@ -1255,6 +1256,7 @@ export declare const McpConfigSchema: z.ZodOptional<z.ZodObject<{
             http: "http";
             stdio: "stdio";
             "streamable-http": "streamable-http";
+            sse: "sse";
         }>>;
         command: z.ZodOptional<z.ZodString>;
         args: z.ZodOptional<z.ZodArray<z.ZodString>>;
@@ -1968,6 +1970,7 @@ export declare const ConfigSchema: z.ZodDefault<z.ZodObject<{
                 http: "http";
                 stdio: "stdio";
                 "streamable-http": "streamable-http";
+                sse: "sse";
             }>>;
             command: z.ZodOptional<z.ZodString>;
             args: z.ZodOptional<z.ZodArray<z.ZodString>>;

package/dist/src/config/schema.js

@@ -960,7 +960,8 @@ tts: TTSConfigSchema.optional() }).optional();
 		type: z.enum([
 			"stdio",
 			"http",
-			"streamable-http"
+			"streamable-http",
+			"sse"
 		]).optional(),
 		command: z.string().min(1).optional(),
 		args: z.array(z.string()).optional(),
@@ -988,7 +989,7 @@ tts: TTSConfigSchema.optional() }).optional();
 			code: "custom",
 			message: "stdio requires command"
 		});
-		if ((value.type === "http" || value.type === "streamable-http") && !value.url) ctx.addIssue({
+		if ((value.type === "http" || value.type === "streamable-http" || value.type === "sse") && !value.url) ctx.addIssue({
 			code: "custom",
 			message: "HTTP requires url"
 		});

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

@@ -1,9 +1,9 @@
 import { init_paths_state, resolveStateDir } from "../../config/paths-state.js";
 import { pluginName, pluginServerId } from "./validation.js";
 import { CredentialResolver, init_credentials } from "../../auth/credentials.js";
-import { createNativeMcpCredentials } from "../../agent/mcp/credential-store.js";
 import { pluginCredentialProviderPrefix } from "./auth.js";
 import { pluginOAuthCredentialId } from "./mcp-adapter.js";
+import { createNativeMcpCredentials } from "../../agent/mcp/credential-store.js";
 import { getNativePiAgentDir } from "../../agent/mcp/native-mcp.js";
 import { join } from "node:path";
 import { existsSync, rmSync } from "node:fs";

package/dist/src/extensions/agent-plugins/setup.d.ts

@@ -31,6 +31,7 @@ declare const schema: z.ZodObject<{
             connected: "connected";
             oauth_required: "oauth_required";
             token_required: "token_required";
+            auth_unknown: "auth_unknown";
         }>;
         toolCount: z.ZodOptional<z.ZodNumber>;
         authorizationId: z.ZodOptional<z.ZodString>;
@@ -118,7 +119,7 @@ export declare class PluginSetupService {
         id: string;
         name: string;
     }>>>;
-    authorization(id: string, owner: string, server: string, config: Config): Promise<import("./cli-authorization.js").PluginCliAuthorization | import("../../agent/mcp/connection-setup.js").McpAuthorization>;
+    authorization(id: string, owner: string, server: string, config: Config): Promise<import("../../agent/mcp/connection-setup.js").McpAuthorization | import("./cli-authorization.js").PluginCliAuthorization>;
     redirect(id: string, owner: string, server: string, url: string, config: Config): boolean;
     private config;
     startPrepare(id: string, owner: string, revision: number, config: Config, workspace: string, idempotencyKey?: string): PluginSetupJob;

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

@@ -5,14 +5,14 @@ import { pluginAuthorizations, pluginPermissionIssueSchema } from "./setup-contr
 import { preparePluginResources } from "./resources.js";
 import { pluginName, pluginServerId } from "./validation.js";
 import { AgentPluginStore } from "./store.js";
-import { connectionFingerprint, matchingReusableConnection } from "./connection-reuse.js";
-import { createNativeMcpCredentials } from "../../agent/mcp/credential-store.js";
 import { readPluginAuthBinding, savePluginAuthBinding, savePluginOAuthReference } from "./auth.js";
 import { pluginConfigMissing, readPluginUserConfig, savePluginUserConfig } from "./user-config.js";
 import { materializePluginServers } from "./mcp-adapter.js";
+import { connectionFingerprint, matchingReusableConnection } from "./connection-reuse.js";
+import { createNativeMcpCredentials } from "../../agent/mcp/credential-store.js";
 import { getNativePiAgentDir } from "../../agent/mcp/native-mcp.js";
-import { cancelPluginCliAuthorizations, getPluginCliAuthorization, inspectPluginCliAuthorization, startPluginCliAuthorization } from "./cli-authorization.js";
 import { cancelMcpAuthorization, getMcpAuthorization, probeMcpConnection, startMcpAuthorization, submitMcpRedirect } from "../../agent/mcp/connection-setup.js";
+import { cancelPluginCliAuthorizations, getPluginCliAuthorization, inspectPluginCliAuthorization, startPluginCliAuthorization } from "./cli-authorization.js";
 import { join } from "node:path";
 import { existsSync, readFileSync } from "node:fs";
 import { randomUUID } from "node:crypto";
@@ -28,6 +28,7 @@ const connection = z.object({
 		"connected",
 		"oauth_required",
 		"token_required",
+		"auth_unknown",
 		"error",
 		"skipped"
 	]),

package/dist/src/extensions/api.js

@@ -1,8 +1,8 @@
 import { createLogger } from "../utils/logger/index.js";
 import { init_logger } from "../utils/logger.js";
 import { getProviderRegistry, init_plugin_registry } from "../providers/plugin-registry.js";
-import { registerMarketplaceAdapter, unregisterMarketplaceAdapter } from "../agent/skills/marketplace/registry.js";
 import { registerMediaUnderstandingProvider } from "../media-understanding/registry.js";
+import { registerMarketplaceAdapter, unregisterMarketplaceAdapter } from "../agent/skills/marketplace/registry.js";
 import { registerSpeechProvider } from "../voice/tts/speech-registry.js";
 import { HOOK_EXECUTION_MODES } from "./types/hooks.js";
 import { commandRegistry } from "../chat-commands/registry.js";

package/dist/src/gateway/agent-builtin-tools.d.ts

@@ -277,4 +277,4 @@ export declare const GATEWAY_BUILTIN_TOOLS: readonly [{
         readonly zh: "使用已验证的参数执行选定的外部工具。";
     };
 }];
-export declare const GATEWAY_BUILTIN_TOOL_IDS: ("automation" | "find" | "image" | "knowledge_search" | "knowledge_get" | "knowledge_write" | "user_context_search" | "user_context_get" | "user_context_update" | "web_search" | "web_fetch" | "browser_use" | "grep" | "session_search" | "read_file" | "list_dir" | "write_file" | "apply_patch" | "exec_command" | "update_plan" | "todo" | "web_extract" | "clarify" | "xopc_tool_execute" | "tool_manual" | "session_status" | "read_media" | "xopc_tool_search" | "xopc_tool_describe" | "phone_use" | "skill_view" | "skills_list" | "image_generate" | "skill_manage" | "skills_marketplace_search" | "computer_use" | "send_message" | "text_to_speech" | "execute_code" | "send_media" | "create_share" | "memory_maintenance" | "delegate_task" | "skill_install" | "create_desktop_pet")[];
+export declare const GATEWAY_BUILTIN_TOOL_IDS: ("automation" | "find" | "image" | "knowledge_search" | "knowledge_get" | "knowledge_write" | "user_context_search" | "user_context_get" | "user_context_update" | "web_search" | "web_fetch" | "browser_use" | "grep" | "session_search" | "read_file" | "list_dir" | "write_file" | "apply_patch" | "exec_command" | "update_plan" | "todo" | "web_extract" | "clarify" | "xopc_tool_execute" | "tool_manual" | "session_status" | "read_media" | "xopc_tool_search" | "xopc_tool_describe" | "phone_use" | "skill_view" | "skills_list" | "image_generate" | "skill_manage" | "skills_marketplace_search" | "computer_use" | "send_message" | "text_to_speech" | "execute_code" | "send_media" | "create_share" | "memory_maintenance" | "skill_install" | "delegate_task" | "create_desktop_pet")[];

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

@@ -3,8 +3,8 @@ import { AgentCatalogRepository, init_repository } from "../agent-catalog/reposi
 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 { 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/device-routes.js

@@ -1,5 +1,5 @@
-import { getTunnelService } from "../tunnel/tunnel-service.js";
 import { resolveReverseProxyPublicUrl } from "./public-url.js";
+import { getTunnelService } from "../tunnel/tunnel-service.js";
 import { getTailscaleExposureState } from "./tailscale-lifecycle.js";
 import crypto from "node:crypto";
 //#region src/gateway/device-routes.ts

package/dist/src/gateway/hono/app.js

@@ -3,9 +3,9 @@ import { init_logger } from "../../utils/logger.js";
 import { resolveAllowedBrowserOrigins, resolveGatewayServiceListenPort } from "../host.js";
 import { listDevices } from "../../storage/sqlite/device-access-repository.js";
 import { ENDPOINT_MAX_FILE_BYTES, init_src } from "../../../packages/endpoint-tools-protocol/src/index.js";
+import { resolveReverseProxyPublicUrl } from "../public-url.js";
 import { resolveGatewayEffectiveHost } from "../../config/gateway-bind.js";
 import { loadTunnelState } from "../../tunnel/tunnel-state.js";
-import { resolveReverseProxyPublicUrl } from "../public-url.js";
 import { maxSessionInputRequestBodyBytes } from "../chat-limits.js";
 import { BROWSER_EXTENSION_ID } from "../../browser/extension-identity.js";
 import { isLoopbackIpAddress, isTrustedProxyAddress } from "../client-ip.js";

package/dist/src/gateway/hono/lib/config-payload.js

@@ -7,9 +7,9 @@ import { init_models_json, loadModelsJson } from "../../../config/models-json.js
 import { CredentialResolver, init_credentials } from "../../../auth/credentials.js";
 import { getProviderRegistry, init_plugin_registry } from "../../../providers/plugin-registry.js";
 import { getAllProviders, init_providers, isProviderConfigured } from "../../../providers/index.js";
+import { normalizeConfiguredMcpServers } from "../../../config/mcp-config-normalize.js";
 import { resolveShareConfig } from "../../../share/share-config.js";
 import { maskTunnelSecretForWeb } from "../../../tunnel/env.js";
-import { normalizeConfiguredMcpServers } from "../../../config/mcp-config-normalize.js";
 import { buildChannelCatalogForConfig, buildChannelCatalogFromSnapshot, getChannelSetupStatus } from "../../../channels/catalog/channel-catalog-service.js";
 import { resolveSessionConfigForWeb, resolveUpdateConfigForWeb } from "../../../config/web-patch.js";
 import { GENERIC_MASKED_SECRET, maskSecretLength } from "./mask-secret-length.js";

package/dist/src/gateway/hono/oauth-async.js

@@ -3,9 +3,9 @@ import { init_logger } from "../../utils/logger.js";
 import { isLoopbackHost } from "../host.js";
 import { getOAuthProviderInterfaces, init_registry } from "../../auth/oauth/registry.js";
 import { CredentialResolver, init_credentials } from "../../auth/credentials.js";
-import { resolveReverseProxyPublicUrl } from "../public-url.js";
 import { buildCapabilityPlansForConfig } from "../../capabilities/readiness/from-config.js";
 import "../../capabilities/readiness/index.js";
+import { resolveReverseProxyPublicUrl } from "../public-url.js";
 import { applyXopcCloudCapabilitySetup } from "../xopc-cloud-capability-setup.js";
 import { Hono } from "hono";
 //#region src/gateway/hono/oauth-async.ts

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

@@ -1,5 +1,5 @@
-import { buildChannelCatalogForConfig, buildChannelCatalogFromSnapshot, getChannelSetupStatus } from "../../../channels/catalog/channel-catalog-service.js";
 import { approveChannelPairing, approveChannelPairingBySender, dismissChannelPairingPending, listChannelPairingState, listChannelPairingSummary, revokeChannelPairingPaired } from "../../../channels/pairing/pairing-service.js";
+import { buildChannelCatalogForConfig, buildChannelCatalogFromSnapshot, getChannelSetupStatus } from "../../../channels/catalog/channel-catalog-service.js";
 //#region src/gateway/hono/routes/channels.ts
 function channelIdParam(raw) {
 	return (raw ?? "").trim().toLowerCase();

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

@@ -1,8 +1,8 @@
 import { enumerateLanGatewayCandidates } from "../../host.js";
 import { getTunnelService } from "../../../tunnel/tunnel-service.js";
+import { withGatewayConfigWriteLock } from "../lib/config-write-lock.js";
 import { VOICE_SETTING_SCOPES, voiceSettingsRevisions } from "../lib/voice-settings-revisions.js";
 import { buildSafeWebConfigPayload } from "../lib/config-payload.js";
-import { withGatewayConfigWriteLock } from "../lib/config-write-lock.js";
 import { applyChannelsPatch } from "./config-patch/channels.js";
 import { applyGatewayPatch } from "./config-patch/gateway.js";
 import { applyMiscPatch, validateGatewayAfterPatch } from "./config-patch/misc.js";

package/dist/src/gateway/hono/routes/lazy-bundles.js

@@ -465,7 +465,7 @@ const AUTHENTICATED_LAZY_ROUTE_BUNDLES = [
 	},
 	{
 		id: "mcp",
-		match: (path) => path === "/api/mcp/servers" || /^\/api\/mcp\/servers\/[^/]+$/.test(path) || path === "/api/mcp/drafts" || /^\/api\/mcp\/drafts\/[^/]+(?:\/(?:probe|commit|tools|auth(?:\/redirect)?))?$/.test(path) || /^\/api\/mcp\/servers\/[^/]+\/(tools|probe|auth)$/.test(path) || /^\/api\/mcp\/auth\/[^/]+(?:\/redirect)?$/.test(path),
+		match: (path) => path === "/api/mcp/servers" || /^\/api\/mcp\/servers\/[^/]+$/.test(path) || path === "/api/mcp/drafts" || /^\/api\/mcp\/drafts\/[^/]+(?:\/(?:probe|commit|tools|auth(?:\/redirect)?))?$/.test(path) || /^\/api\/mcp\/servers\/[^/]+\/(tools|probe|auth)$/.test(path) || /^\/api\/mcp\/auth\/[^/]+(?:\/redirect)?$/.test(path) || /^\/api\/mcp\/setup\/[^/]+$/.test(path) || /^\/api\/mcp\/setup\/conversations\/[^/]+$/.test(path),
 		load: async () => {
 			const { registerMcpRoutes } = await import("./mcp.js");
 			return { register: registerMcpRoutes };

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

@@ -1,14 +1,51 @@
 import { getWorkspacePath } from "../../../config/workspace-path-helpers.js";
 import { isManagedConnectorServer } from "../../../connectors/materialize.js";
-import { loadMergedMcpConfig } from "../../../agent/mcp/config.js";
 import { resolveMcpSetupConfig } from "../../../agent/mcp/effective-server.js";
+import { loadMergedMcpConfig } from "../../../agent/mcp/config.js";
 import { discoverMcpTools } from "../../../agent/mcp/tool-catalog.js";
 import { cancelMcpAuthorization, getMcpAuthorization, probeMcpConnection, startMcpAuthorization, submitMcpRedirect } from "../../../agent/mcp/connection-setup.js";
-import { getGatewayPrincipal } from "../../security/gateway-principal.js";
 import { McpConnectionDrafts, McpDraftError, mcpConfigRevision } from "../../../agent/mcp/connection-drafts.js";
 import { withGatewayConfigWriteLock } from "../lib/config-write-lock.js";
+import { getGatewayPrincipal } from "../../security/gateway-principal.js";
 //#region src/gateway/hono/routes/mcp.ts
 function registerMcpRoutes(app, deps) {
+	const secureSetup = (handler) => async (c) => {
+		const principal = getGatewayPrincipal(c);
+		if (principal.kind !== "owner" || !principal.scopes.includes("gateway.admin")) return c.json({
+			ok: false,
+			error: "Owner administration is required."
+		}, 403);
+		c.header("Cache-Control", "no-store");
+		try {
+			return c.json({
+				ok: true,
+				payload: await handler(c)
+			});
+		} catch (error) {
+			return c.json({
+				ok: false,
+				error: error instanceof McpDraftError ? error.message : "MCP setup could not be completed."
+			}, error instanceof McpDraftError ? error.status : 500);
+		}
+	};
+	app.get("/api/mcp/setup/conversations/:id", secureSetup(async (c) => deps.service.mcpSetup.currentForConversation(c.req.param("id"))));
+	app.get("/api/mcp/setup/:id", secureSetup((c) => deps.service.mcpSetup.interact(c.req.param("id"), "get")));
+	app.post("/api/mcp/setup/:id", deps.strictRateLimitMiddleware, secureSetup(async (c) => {
+		const body = await c.req.json().catch(() => null);
+		if (!body || ![
+			"advance",
+			"authorize",
+			"token",
+			"cancel",
+			"approve",
+			"retry_delivery"
+		].includes(body.action) || !Number.isSafeInteger(body.expectedVersion) || Object.keys(body).some((key) => ![
+			"action",
+			"value",
+			"expectedVersion"
+		].includes(key)) || body.value !== void 0 && (body.action !== "token" || typeof body.value !== "string" && (!body.value || typeof body.value !== "object" || Array.isArray(body.value) || Object.values(body.value).some((value) => typeof value !== "string")))) throw new McpDraftError(400, "Invalid MCP setup action.");
+		return deps.service.mcpSetup.interact(c.req.param("id"), body.action, body.value, body.expectedVersion, getGatewayPrincipal(c).principalId);
+	}));
 	const drafts = new McpConnectionDrafts({
 		readConfig: () => deps.service.currentConfig,
 		saveConfig: (config, expected) => deps.service.saveConfig(config, expected)

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

@@ -4,11 +4,11 @@ import { init_session_key, resolveConversationId } from "../../../routing/sessio
 import { agentExists, getDefaultAgentId, init_resolve_route } from "../../../routing/resolve-route.js";
 import { CapabilityError } from "../../../capabilities/runtime/errors.js";
 import "../../../capabilities/runtime/dispatcher.js";
+import { resolveReverseProxyPublicUrl } from "../../public-url.js";
+import { createProductDispatcher } from "../../../capabilities/runtime/product.js";
 import { resolveGatewayEffectiveHost } from "../../../config/gateway-bind.js";
 import { getShareStore } from "../../../share/share-store.js";
 import { resolveShareUrl } from "../../../share/share-url.js";
-import { resolveReverseProxyPublicUrl } from "../../public-url.js";
-import { createProductDispatcher } from "../../../capabilities/runtime/product.js";
 import { getGatewayPrincipal } from "../../security/gateway-principal.js";
 import { capabilityHttpContext, capabilityHttpError } from "../../../capabilities/adapters/http.js";
 import { NoteShareService, NoteShareVersionConflictError } from "../../../share/note-share-service.js";