@xopcai/xopc 0.0.425 → 0.0.427

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

@@ -3,8 +3,7 @@ import { getSessionMetadata, init_session_read_repository } from "../../../stora
 import { AgentCatalogRepository, init_repository } from "../../../agent-catalog/repository.js";
 import { init_paths } from "../../../config/paths.js";
 import { resolveEffectiveAgentConfigForAgent } from "../../../config/agent-profile.js";
-import { getModelRegistry, init_model_registry } from "../../../providers/model-registry.js";
-import { init_providers, isProviderConfiguredSync } from "../../../providers/index.js";
+import { getAllModels, init_providers, isProviderConfiguredSync, resolveModel } from "../../../providers/index.js";
 import { phoneAllowsApp } from "../../../phone/app-access.js";
 import { managedPhoneAdbPath } from "../../../runtime-tools/phone-dependency-catalog.js";
 import { phoneModelProfile } from "../../../phone/model-adapter.js";
@@ -17,9 +16,15 @@ import { z } from "zod";
 //#region src/gateway/hono/routes/phone-setup.ts
 init_repository();
 init_paths();
-init_model_registry();
 init_providers();
 init_session_read_repository();
+function resolvePhoneSetupModel(ref) {
+	try {
+		return resolveModel(ref);
+	} catch {
+		return;
+	}
+}
 function createPhoneSetupService(service) {
 	const runtime = getPhoneRuntime();
 	const manager = () => new PhoneDependencyManager({
@@ -37,14 +42,15 @@ function createPhoneSetupService(service) {
 	};
 	return new PhoneSetupService({
 		runtime,
-		models: () => getModelRegistry().getAll().filter((model) => phoneModelProfile(model)).map((model) => ({
+		models: () => getAllModels().filter((model) => phoneModelProfile(model)).map((model) => ({
 			ref: `${model.provider}/${model.id}`,
 			name: model.name,
 			configured: isProviderConfiguredSync(model.provider)
 		})),
-		setModel: async (agentId, ref) => {
+		setModel: async (agentId, ref, mutation) => {
+			mutation?.check();
 			requireIdle();
-			const model = getModelRegistry().resolve(ref);
+			const model = resolvePhoneSetupModel(ref);
 			if (!model || !phoneModelProfile(model) || !isProviderConfiguredSync(model.provider)) throw new Error("PHONE_SETUP_MODEL_REQUIRED: Choose a compatible model with configured credentials.");
 			const repository = new AgentCatalogRepository();
 			const agent = repository.get(agentId);
@@ -55,30 +61,39 @@ function createPhoneSetupService(service) {
 					primary: ref,
 					fallbacks: []
 				}
-			} }, agent.revision);
+			} }, agent.revision, mutation?.check);
 			service.refreshAgentCatalog();
 		},
-		configure: async (enabled) => {
+		configure: async (enabled, mutation) => {
+			mutation?.check();
 			requireIdle();
 			const config = service.currentConfig;
 			const next = structuredClone(config);
 			next.phone.enabled = enabled;
-			if (!(await service.saveConfig(next, config)).saved) throw new Error("PHONE_SETUP_CONFIG_CONFLICT");
+			if (!(await service.saveConfig(next, config, mutation?.check)).saved) throw new Error("PHONE_SETUP_CONFIG_CONFLICT");
 		},
-		install: async (kind, repair) => {
+		install: async (kind, repair, mutation) => {
+			mutation?.check();
 			if (kind === "adb") requireIdle();
 			const config = service.currentConfig;
-			await manager().install(kind, { repair });
+			await manager().install(kind, {
+				repair,
+				signal: mutation?.signal,
+				beforeCommit: mutation?.check
+			});
+			mutation?.check();
 			if (kind === "adb" && config.phone.adbPath) {
 				const path = managedPhoneAdbPath(resolveStateDir());
 				await probePhoneAdb(path);
+				mutation?.check();
 				const next = structuredClone(config);
 				next.phone.adbPath = path;
-				if (!(await service.saveConfig(next, config)).saved) throw new Error("PHONE_SETUP_CONFIG_CONFLICT");
+				if (!(await service.saveConfig(next, config, mutation?.check)).saved) throw new Error("PHONE_SETUP_CONFIG_CONFLICT");
 			}
 		},
-		registerLocal: async (serial, name) => {
+		registerLocal: async (serial, name, mutation) => {
 			const discovered = (await runtime.discover(service.currentConfig)).find((phone) => phone.serial === serial && phone.state === "device");
+			mutation?.check();
 			if (!discovered) throw new Error("PHONE_SETUP_DEVICE_OFFLINE: Select an online discovered local phone.");
 			if (!runtime.repository.list().some((phone) => phone.serial === serial)) runtime.repository.save({
 				serial,
@@ -91,7 +106,7 @@ function createPhoneSetupService(service) {
 		revision: (context, deviceId) => {
 			const agent = resolveEffectiveAgentConfigForAgent(context.agentId).config;
 			const device = runtime.repository.list().find((device) => device.id === deviceId);
-			const model = agent.models.phoneUse?.primary ? getModelRegistry().resolve(agent.models.phoneUse.primary) : void 0;
+			const model = agent.models.phoneUse?.primary ? resolvePhoneSetupModel(agent.models.phoneUse.primary) : void 0;
 			return createHash("sha256").update(JSON.stringify([
 				service.currentConfig.phone,
 				agent.models.phoneUse,
@@ -119,7 +134,7 @@ function createPhoneSetupService(service) {
 			const resolved = resolveEffectiveAgentConfigForAgent(context.agentId);
 			const agent = resolved.config;
 			const ref = agent.models.phoneUse?.primary;
-			const model = ref ? getModelRegistry().resolve(ref) : void 0;
+			const model = ref ? resolvePhoneSetupModel(ref) : void 0;
 			const dependencies = await new PhoneDependencyManager({
 				stateDir: resolveStateDir(),
 				config: config.runtimeTools,
@@ -177,10 +192,13 @@ function registerPhoneSetupRoutes(app, deps) {
 			"get",
 			"recheck",
 			"source",
+			"set_model",
 			"begin_verification",
 			"release",
 			"cancel"
 		]),
+		modelRef: z.string().min(1).max(500).optional(),
+		replaceExisting: z.boolean().optional(),
 		source: z.enum(["local", "aliyun"]).optional(),
 		deviceId: z.string().uuid().optional(),
 		expectedRevision: z.number().int().positive().optional()
@@ -204,7 +222,18 @@ function registerPhoneSetupRoutes(app, deps) {
 		const setup = deps.service.phoneSetup;
 		try {
 			let payload;
-			if (body.action === "source") {
+			if (body.action === "set_model") {
+				if (!body.setupId || !body.modelRef || !body.expectedRevision) throw new Error("Choose a compatible model and refresh current progress");
+				payload = await setup.command("set_model", {
+					setupId: body.setupId,
+					modelRef: body.modelRef,
+					expectedRevision: body.expectedRevision,
+					replaceExisting: body.replaceExisting
+				}, {
+					...context,
+					canConfigure: true
+				});
+			} else if (body.action === "source") {
 				if (!body.setupId || !body.source || !body.expectedRevision) throw new Error("Choose a source and refresh current progress");
 				payload = await setup.source(context, body.setupId, body.source, body.expectedRevision);
 			} else if (body.action === "begin_verification") {

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

@@ -6,8 +6,7 @@ import { init_session_repository } from "../../../storage/sqlite/session-reposit
 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";
-import { getModelRegistry, init_model_registry } from "../../../providers/model-registry.js";
-import { init_providers, isProviderConfiguredSync } from "../../../providers/index.js";
+import { getAllModels, init_providers, isProviderConfiguredSync } from "../../../providers/index.js";
 import { normalizePhoneAppAccess, phoneAppAccess } from "../../../phone/app-access.js";
 import { cancelPhoneAssistance, pendingPhoneAssistance, phoneAssistance, phoneAssistanceReport } from "../../../phone/assistance.js";
 import { resolveAdbPath } from "../../../phone/adb-driver.js";
@@ -24,7 +23,6 @@ import { bodyLimit } from "hono/body-limit";
 //#region src/gateway/hono/routes/phone.ts
 init_session_repository();
 init_resolve_route();
-init_model_registry();
 init_providers();
 init_contracts();
 init_logger();
@@ -398,7 +396,7 @@ function registerPhoneRoutes(parent, deps, runtime = getPhoneRuntime()) {
 	});
 	app.get("/api/phone/models", (c) => c.json({
 		ok: true,
-		payload: { models: [...getModelRegistry().getAll().flatMap((model) => {
+		payload: { models: [...getAllModels().flatMap((model) => {
 			const profile = phoneModelProfile(model);
 			return profile ? [{
 				id: `${model.provider}/${model.id}`,

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

@@ -19,9 +19,9 @@ import { resolveProjectAgentId } from "../../../projects/project-agent.js";
 import { inferSuggestedProjectDefaultAgentId } from "../../../projects/project-agent-suggestion.js";
 import { buildProjectLoopOverview } from "../../../projects/project-loop.js";
 import "../../../projects/index.js";
-import { defineTaskContract } from "../../../tasks/task-contract-definition.js";
 import { TaskApplicationService } from "../../../tasks/task-application-service.js";
 import { createProductDispatcher } from "../../../capabilities/runtime/product.js";
+import { defineTaskContract } from "../../../tasks/task-contract-definition.js";
 import { ProjectOperatingViewService, summarizeProjectOperatingView } from "../../../tasks/project-operating-view-service.js";
 import "../../../tasks/index.js";
 import { parseActivityIncludeRelated, parseActivityQuery } from "./activity.js";

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

@@ -1,10 +1,10 @@
 import { getModelCatalogStore, init_model_catalog_store } from "../../../providers/model-catalog-store.js";
 import { listGlobalDefaults, prepareUpdateGlobalDefaults, updateGlobalDefaults } from "../../global-defaults-admin.js";
+import { withGatewayConfigWriteLock } from "../lib/config-write-lock.js";
 import { completeXopcCloudModelRoutes } from "../../xopc-cloud-capability-setup.js";
 import { applySetupVoice } from "../../../providers/setup/voice.js";
 import { loadProviderSetupSnapshot } from "../../provider-model-setup.js";
 import { SetupConflictError, applyProviderSetup, previewProviderSetup } from "../../../providers/setup/engine.js";
-import { withGatewayConfigWriteLock } from "../lib/config-write-lock.js";
 import { isDeepStrictEqual } from "node:util";
 import { z } from "zod";
 //#region src/gateway/hono/routes/provider-setup.ts

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

@@ -25,6 +25,28 @@ function secretsEqual(actual, expected) {
 	return timingSafeEqual(createHash("sha256").update(actual).digest(), createHash("sha256").update(expected).digest());
 }
 function registerPublicGatewayRoutes(app, service) {
+	app.get("/mcp-setup/callback/:id", (c) => {
+		c.header("Cache-Control", "no-store");
+		c.header("Referrer-Policy", "no-referrer");
+		try {
+			const incoming = new URL(c.req.url);
+			if (incoming.search.length > 8192 || [...incoming.searchParams.keys()].some((key) => ![
+				"code",
+				"state",
+				"iss",
+				"error",
+				"error_description"
+			].includes(key) || incoming.searchParams.getAll(key).length !== 1)) return c.text("Invalid authorization response.", 400);
+			const origin = service.currentConfig.gateway.publicUrl;
+			if (!origin) return c.text("Secure callback is unavailable.", 400);
+			const target = new URL(`/mcp-setup/callback/${encodeURIComponent(c.req.param("id"))}`, origin);
+			target.search = incoming.search;
+			const path = service.mcpSetup.relayCallback(c.req.param("id"), target.href);
+			return c.redirect(path, 303);
+		} catch {
+			return c.text("Authorization response was rejected. Return to the secure connection page and check its status.", 400);
+		}
+	});
 	app.get("/health", (c) => {
 		const health = service.getHealth();
 		return c.json({

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

@@ -8,8 +8,8 @@ import { endpointTurnClaimSchema, init_src as init_src$1 } from "../../../../pac
 import { init_providers, resolveModel } from "../../../providers/index.js";
 import { CapabilityError } from "../../../capabilities/runtime/errors.js";
 import "../../../capabilities/runtime/dispatcher.js";
-import { getModelThinking } from "../../../providers/model-thinking.js";
 import { parseTurnContextRefs } from "../../../agent/source-context/types.js";
+import { getModelThinking } from "../../../providers/model-thinking.js";
 import { validateWebchatAttachments, validateWebchatContent } from "../../chat-limits.js";
 import { isTaskDestructiveCommand } from "../../../session/reset-triggers.js";
 import { parseSlashCommand } from "../../../chat-commands/command-parse.js";

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

@@ -2,6 +2,7 @@ import { getClientIpFromHeaders } from "../../security/loopback.js";
 import { loadCompactionSourceSnapshot } from "../../../storage/sqlite/transcript-repository.js";
 import "../../../storage/sqlite/index.js";
 import { FileServiceError } from "../../../files/file-service.js";
+import { resolveReverseProxyPublicUrl } from "../../public-url.js";
 import { resolveGatewayEffectiveHost } from "../../../config/gateway-bind.js";
 import { SHARE_CONFIG_DEFAULTS } from "../../../share/share-types.js";
 import { resolveSiteShareConfig } from "../../../share/site-share-config.js";
@@ -13,7 +14,6 @@ import { SessionShareService, SessionShareSnapshotConflictError } from "../../..
 import { HostedPublicationPublisher, HostedSessionShareBuilder, HostedShareAuthorizationError, HostedShareBindingStore, HostedShareRemoteError } from "../../../share/hosted-session-share.js";
 import { HostedStaticSitePublicationBuilder } from "../../../share/hosted-static-site-publication.js";
 import { publishHostedStaticSite } from "../../../share/hosted-static-site-publish.js";
-import { resolveReverseProxyPublicUrl } from "../../public-url.js";
 import { audienceDefaults, cleanupStagedSite, decideShareKind, forgetStagedSite, makeDescription, makeTitle, probeShareTarget, rememberStagedSite, stageSingleHtmlAsSite } from "../../../share/share-auto.js";
 import { deleteThumbnail, placeholderSvg, readThumbnail, scheduleThumbnail, thumbnailContentType, thumbnailExists } from "../../../share/share-thumbnail.js";
 import { getGatewayFileSpaceService } from "../../file-space-service.js";

package/dist/src/gateway/hono/routes/site-shares.js

@@ -1,8 +1,8 @@
+import { resolveReverseProxyPublicUrl } from "../../public-url.js";
 import { resolveGatewayEffectiveHost } from "../../../config/gateway-bind.js";
 import { resolveSiteShareConfig } from "../../../share/site-share-config.js";
 import { getSiteShareStore } from "../../../share/site-share-store.js";
 import { resolveSiteShareUrl } from "../../../share/share-url.js";
-import { resolveReverseProxyPublicUrl } from "../../public-url.js";
 import { getGatewayPrincipal } from "../../security/gateway-principal.js";
 import { createHash } from "node:crypto";
 //#region src/gateway/hono/routes/site-shares.ts

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

@@ -9,10 +9,10 @@ import { TaskRunRepository, init_task_run_repository } from "../../../tasks/task
 import { TaskConversationRepository } from "../../../tasks/task-conversation-repository.js";
 import { CapabilityError } from "../../../capabilities/runtime/errors.js";
 import "../../../capabilities/runtime/dispatcher.js";
-import { TaskCollaborationRepository } from "../../../tasks/task-collaboration-repository.js";
 import { TaskCriterionReviewRepository } from "../../../tasks/task-criterion-review-repository.js";
 import { TaskContextMutationOutputSchema } from "../../../tasks/capabilities/relations.js";
 import { TaskDeleteOutputSchema } from "../../../tasks/capabilities/management.js";
+import { TaskCollaborationRepository } from "../../../tasks/task-collaboration-repository.js";
 import { TaskMutationOutputSchema } from "../../../tasks/capabilities/write.js";
 import { createProductDispatcher } from "../../../capabilities/runtime/product.js";
 import { ProjectOperatingViewService } from "../../../tasks/project-operating-view-service.js";

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

@@ -1,8 +1,8 @@
 import { TaskRepository, init_task_repository } from "../tasks/task-repository.js";
 import { resolveMediaReference } from "../media/media-reference.js";
+import { TaskContextRepository } from "../tasks/task-context-repository.js";
 import { FileServiceError } from "../files/file-service.js";
 import { pendingTranscriptReferencesMediaUri } from "../agent/inbound/attachment-pipeline.js";
-import { TaskContextRepository } from "../tasks/task-context-repository.js";
 import { messagesReferenceMediaUri, taskResultReferencesMediaUri } from "../media/session-references.js";
 //#region src/gateway/media-access.ts
 init_task_repository();

package/dist/src/gateway/service/agent-runner.d.ts

@@ -14,6 +14,7 @@ import type { UserTurnAttachment, UserTurnInput } from '../user-turn-input.js';
 import type { AgentSourceContext, TurnContextRef } from '../../agent/source-context/types.js';
 import { SessionInputCoordinator, type ReplaceLatestTurnInput, type SubmitSessionInput } from './session-input-coordinator.js';
 export interface GatewayAgentRunnerOptions {
+    afterConnectionResume?: (input: import('../../storage/sqlite/session-input-repository.js').SessionInput, status: string) => Promise<void>;
     validateConnectionResume?: (input: import('../../storage/sqlite/session-input-repository.js').SessionInput) => Promise<boolean>;
     continueConnection?: (wait: import('@xopcai/gateway-contract').ConnectionWait, idempotencyKey: string) => Promise<void>;
     cancelConnection?: (wait: import('@xopcai/gateway-contract').ConnectionWait) => void;

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

@@ -12,8 +12,8 @@ import { AgentRunCancelledError } from "../../agent/orchestration/run-terminatio
 import { isPersonalConversation } from "../../personal-agent/repository.js";
 import { TaskConversationRepository } from "../../tasks/task-conversation-repository.js";
 import { TaskCollaborationRepository } from "../../tasks/task-collaboration-repository.js";
-import { reserveEmbeddedRunCancellation } from "../../agent/embedded/runs.js";
 import { TaskApplicationService } from "../../tasks/task-application-service.js";
+import { reserveEmbeddedRunCancellation } from "../../agent/embedded/runs.js";
 import { EphemeralClarificationWaiter } from "../ephemeral-clarification-waiter.js";
 import { completePhoneAssistanceFromUser, preparePhoneContinuation } from "../../phone/assistance-service.js";
 import { describeActiveExecution } from "./active-execution.js";
@@ -96,6 +96,8 @@ var GatewayAgentRunner = class {
 						break;
 					}
 				}
+				const persisted = findSessionInputByRunId(input.conversationId, input.runId);
+				if (persisted?.clientMessageId.startsWith("mcp-setup:")) await opts.afterConnectionResume?.(persisted, result?.status ?? "error");
 				return result;
 			},
 			onInputReceived: (conversationId) => {

package/dist/src/gateway/service/config-coordinator.d.ts

@@ -692,7 +692,7 @@ export declare class GatewayConfigCoordinator {
         commands?: {
             restart?: boolean;
         };
-    }): Promise<{
+    }, beforeCommit?: () => void): Promise<{
         saved: boolean;
         error?: string;
         persisted?: boolean;

package/dist/src/gateway/service/config-coordinator.js

@@ -99,7 +99,7 @@ var GatewayConfigCoordinator = class {
 			error: result.error
 		};
 	}
-	async saveConfig(config, expectedConfig = this.opts.getConfig()) {
+	async saveConfig(config, expectedConfig = this.opts.getConfig(), beforeCommit) {
 		const candidate = structuredClone(config), expected = structuredClone(expectedConfig);
 		return this.queueConfigWrite(async () => {
 			if (!isDeepStrictEqual(this.opts.getConfig(), expected)) return {
@@ -107,6 +107,7 @@ var GatewayConfigCoordinator = class {
 				conflict: true,
 				error: "Configuration changed before saving. Please retry."
 			};
+			beforeCommit?.();
 			return this.persistConfig(candidate);
 		});
 	}

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

@@ -14,9 +14,9 @@ import { init_session_key } from "../../routing/session-key.js";
 import { resolveAgentTurnTimeoutMs } from "../../agent/orchestration/run-agent-turn-with-timeout.js";
 import { isPersonalConversation } from "../../personal-agent/repository.js";
 import { isPhoneAssistanceSuspended } from "../../phone/assistance.js";
-import { recordPersonalPerformance } from "../../personal-agent/performance.js";
 import { resolveExecutionContext } from "../../tasks/execution-context.js";
 import { TaskRunCoordinator } from "../../tasks/task-run-coordinator.js";
+import { recordPersonalPerformance } from "../../personal-agent/performance.js";
 import { formatAgentRunErrorForClient } from "../../agent/client-error-format.js";
 import "../chat-limits.js";
 import { prependEnvelopeTimestamp } from "../../channels/envelope-timestamp.js";

package/dist/src/gateway/service/sessions-api.js

@@ -189,7 +189,8 @@ var GatewaySessionsApi = class {
 		});
 		return performSessionReset(key, {
 			sessionIndex: this.opts.sessionIndex,
-			getAgentService: this.opts.getAgentService
+			getAgentService: this.opts.getAgentService,
+			cancelConfigurationSetups: (conversationId) => this.opts.getAgentService().cancelConfigurationSetups(conversationId)
 		});
 	}
 	deleteMany(keys) {

package/dist/src/gateway/service.d.ts

@@ -1,4 +1,5 @@
 import { BrowserSetupService } from '../browser/setup/service.js';
+import { McpConversationSetup } from '../agent/mcp/conversation-setup.js';
 import type { ClarificationSubmission } from '@xopcai/gateway-contract';
 import { PhoneStreamGateway } from '../phone/stream-gateway.js';
 import { WorkDiscoveryService } from '../work-discovery/service.js';
@@ -60,6 +61,8 @@ export declare class GatewayService {
     readonly phoneStreams: PhoneStreamGateway;
     readonly voiceRealtime: VoiceRealtimeRuntime;
     getConfig(): Config;
+    private _mcpSetup?;
+    get mcpSetup(): McpConversationSetup;
     getModelCatalogSync(): ModelCatalogSyncService;
     private _phoneSetup?;
     get phoneSetup(): import("../phone/setup/service.js").PhoneSetupService;
@@ -246,7 +249,7 @@ export declare class GatewayService {
     }>;
     afterWeixinCredentialsPersisted(): Promise<void>;
     afterFeishuCredentialsPersisted(): Promise<void>;
-    saveConfig(config: Config, expectedConfig?: Config): Promise<{
+    saveConfig(config: Config, expectedConfig?: Config, beforeCommit?: () => void): Promise<{
         saved: boolean;
         error?: string;
         persisted?: boolean;
@@ -361,6 +364,7 @@ export declare class GatewayService {
     /** Process a message directly through the agent (for CLI mode). */
     processDirect(content: string, conversationId?: string): Promise<string>;
     emit(type: string, payload: unknown): void;
+    private deliverWeixinAutomation;
     private handleAutomationRunCompleted;
     private startSessionTranscriptEventIngestion;
     ingestAutomationEvent(event: AutomationEvent, options?: {

package/dist/src/gateway/service.js

@@ -41,24 +41,22 @@ import { TaskAllocationRepository } from "../tasks/task-allocation-repository.js
 import { stopPersonalResultPreparations } from "../personal-agent/result-reader.js";
 import { TaskConversationRepository } from "../tasks/task-conversation-repository.js";
 import { getEmbeddedExecutionSession } from "../agent/embedded/execution-context.js";
-import { DomainOutboxDispatcher } from "../infra/domain-outbox-dispatcher.js";
-import { ProjectService } from "../projects/project-service.js";
-import { resolveProjectAgentId } from "../projects/project-agent.js";
-import "../projects/index.js";
-import { onTaskResultQueued } from "../tasks/task-result-delivery-repository.js";
-import { runMemoryMaintenance } from "../memory-maintenance/service.js";
-import "../memory-maintenance/index.js";
-import { RealtimeExtensionBrowserProvider } from "../browser/providers/realtime-extension.js";
-import { drainEmbeddedSessionRunnerShutdowns, evictAllEmbeddedSessionRunners } from "../agent/embedded/session-runner.js";
 import { buildNoteAgentContext } from "../notes/agent-context.js";
 import { NotesStore } from "../notes/store.js";
+import { DomainOutboxDispatcher } from "../infra/domain-outbox-dispatcher.js";
 import { NotesService } from "../notes/service.js";
 import { LocalAppService } from "../local-apps/service.js";
+import { ProjectService } from "../projects/project-service.js";
+import { resolveProjectAgentId } from "../projects/project-agent.js";
 import { buildResultAgentContext } from "../agent/source-context/result-context.js";
 import { buildTaskAgentContext } from "../agent/source-context/task-context.js";
 import { buildUserAssertionAgentContext } from "../agent/source-context/user-assertion-context.js";
+import "../projects/index.js";
 import { assertTaskHandoffAccess, getTaskHandoff } from "../tasks/task-handoff.js";
+import { onTaskResultQueued } from "../tasks/task-result-delivery-repository.js";
 import { TaskApplicationService } from "../tasks/task-application-service.js";
+import { setPairingBroadcastSink } from "../channels/pairing/pairing-events.js";
+import { weixinPrivateIdentity } from "../agent/mcp/weixin-setup-scope.js";
 import { AutomationService } from "../automations/service/automation-service.js";
 import { TaskSignalService } from "../tasks/task-signal-service.js";
 import { createProductDispatcher } from "../capabilities/runtime/product.js";
@@ -66,6 +64,10 @@ import "../automations/index.js";
 import { assertTaskExecutorReady } from "../tasks/task-execution-capabilities.js";
 import { TaskRunDispatcher } from "../tasks/task-run-dispatcher.js";
 import "../tasks/index.js";
+import { runMemoryMaintenance } from "../memory-maintenance/service.js";
+import "../memory-maintenance/index.js";
+import { RealtimeExtensionBrowserProvider } from "../browser/providers/realtime-extension.js";
+import { drainEmbeddedSessionRunnerShutdowns, evictAllEmbeddedSessionRunners } from "../agent/embedded/session-runner.js";
 import { drainPersonalResultReads } from "../personal-agent/result-read-continuations.js";
 import { areExtensionsGloballyDisabled } from "../extensions/discover-extensions.js";
 import { SessionIndex } from "../session/manager.js";
@@ -80,7 +82,6 @@ import "../infra/bus/index.js";
 import { collectMediaUrisFromMessages, deleteMediaUris } from "../media/session-references.js";
 import { AgentService } from "../agent/service.js";
 import { bootstrapApplicationStateSync } from "../bootstrap/application-state.js";
-import { setPairingBroadcastSink } from "../channels/pairing/pairing-events.js";
 import { registerClarificationChannelRuntime } from "./clarify-runtime.js";
 import { ChannelManager } from "../channels/manager.js";
 import { ChatPreviewService } from "../chat-previews/service.js";
@@ -110,6 +111,8 @@ import { getGatewayFileSpaceService } from "./file-space-service.js";
 import { reconcileHomeIntelligenceAutomation } from "./home-intelligence-automation-reconciler.js";
 import { createPhoneSetupService } from "./hono/routes/phone-setup.js";
 import { BrowserSetupService } from "../browser/setup/service.js";
+import { McpConversationSetup } from "../agent/mcp/conversation-setup.js";
+import { withGatewayConfigWriteLock } from "./hono/lib/config-write-lock.js";
 import { PhoneStreamGateway } from "../phone/stream-gateway.js";
 import { PersonalProactivityService } from "../personal-agent/proactivity/service.js";
 import { reconcilePersonalProactivityAutomation } from "../personal-agent/proactivity/automation.js";
@@ -298,6 +301,43 @@ var GatewayService = class {
 	getConfig() {
 		return this.config;
 	}
+	_mcpSetup;
+	get mcpSetup() {
+		return this._mcpSetup ??= new McpConversationSetup({
+			readConfig: () => this.currentConfig,
+			changed: (conversationId) => this.emit("session.mcp-setup.changed", { conversationId }),
+			deliver: (destination, text, setupId) => this.channelManager.send({
+				channel: "weixin",
+				chat_id: destination.peerId,
+				content: text,
+				type: "message",
+				metadata: {
+					accountId: destination.accountId,
+					mcpSetupId: setupId,
+					strictWeixinIdentity: true
+				}
+			}, {
+				skipPersist: true,
+				requireDelivery: true
+			}),
+			saveConfig: (next, expected) => this.saveConfig(next, expected),
+			withConfigLock: (operation) => withGatewayConfigWriteLock(this, operation),
+			resume: async (goal) => (await this.agentRunner.submitSessionInput({
+				conversationId: goal.conversationId,
+				expectedTranscriptId: goal.transcriptId,
+				clientMessageId: `mcp-setup:${goal.id}`,
+				delivery: "next",
+				origin: {
+					type: "system",
+					source: "internal"
+				},
+				content: `MCP configuration is saved. Discover the newly available native MCP tools and complete the original user objective. If the user only requested a connection, explain available uses without reading account data. After the actual result or accurate blocker, give one or two relevant example requests grounded in the discovered tools, and link the trusted management route ${goal.channel ? `${goal.channel.origin}/#/capabilities/connectors?tab=connected` : "/capabilities/connectors?tab=connected"}. Do not repeat configuration, request secrets, or treat this status as extra write permission. Setup data: ${JSON.stringify({
+					serverId: goal.serverId,
+					originalObjective: goal.purpose
+				})}`
+			})).ok
+		});
+	}
 	getModelCatalogSync() {
 		return this.modelCatalogSync;
 	}
@@ -549,9 +589,11 @@ var GatewayService = class {
 		});
 		this.chatPreviews = new ChatPreviewService({ localApps: this.localApps });
 		this.agentRunner = new GatewayAgentRunner({
+			afterConnectionResume: (input, status) => this.mcpSetup.completeContinuation(input, status === "ok" ? this.agentService.getLastAssistantPlainText(input.conversationId) : "连接已保存，但后续读取未完成。请在原微信私聊查看状态或重试；尚未验证业务结果。"),
 			continueConnection: (wait, idempotencyKey) => this.connectionRecovery.continueObjective(wait, idempotencyKey),
 			cancelConnection: (wait) => this.connectionRecovery.cancelObjective(wait),
 			validateConnectionResume: async (input) => {
+				if (!this.mcpSetup.permitsContinuation(input)) return false;
 				for (const source of input.contextSnapshots ?? []) if (source.kind === "app_context") await checkAppContextAccess(source, this.appContextDispatcher(), this.auth);
 				return this.connectionRecovery.preflight(input);
 			},
@@ -661,6 +703,7 @@ var GatewayService = class {
 			getConfig: () => this.config,
 			setConfig: (next) => {
 				this.config = next;
+				this._mcpSetup?.reconcileWeixinScopes();
 			},
 			getAgentService: () => this.ensureAgentService(),
 			getChannelManager: () => this.channelManager,
@@ -723,6 +766,7 @@ var GatewayService = class {
 			getAutomationService: () => this.automationService,
 			getBrowserAutomationService: () => this.browserAutomations,
 			getBrowserSetupService: () => this.browserSetup,
+			getMcpSetupService: () => this.mcpSetup,
 			getPhoneSetupService: () => this.phoneSetup,
 			canConfigureEndpoint: (endpointId) => this.realtime.canConfigureEndpoint(endpointId),
 			emitBrowserEvent: (type, payload) => this.emit(type, payload),
@@ -765,6 +809,7 @@ var GatewayService = class {
 			switchModelForSession: (sk, id) => this._agentService.switchModelForSession(sk, id)
 		});
 		this.automationService.setDeps({
+			getConfig: () => this.config,
 			agentService: this._agentService,
 			getDefaultAgentId: () => getDefaultAgentId(),
 			isAgentAvailable: (id) => listAgentEntries().some((agent) => agent.id === id && agent.enabled !== false),
@@ -798,6 +843,7 @@ var GatewayService = class {
 				};
 			},
 			executeSystemAction: (input) => this.executeSystemAutomationAction(input),
+			onWeixinRunCompleted: (conversationId, principalId, run) => this.deliverWeixinAutomation(conversationId, principalId, run),
 			onRunCompleted: (run, context) => this.handleAutomationRunCompleted(run, context)
 		});
 		return this._agentService;
@@ -856,6 +902,7 @@ var GatewayService = class {
 		return this.notificationService;
 	}
 	taskRunDispatch = createBackgroundTask(async () => {
+		await this._mcpSetup?.resumePending();
 		new TaskSignalService().tick();
 		this.notesService.flushCommittedEffects();
 		this.projects.flushCommittedEffects();
@@ -1281,6 +1328,7 @@ var GatewayService = class {
 			this.realtime.broker.publish("logs", "log.entry", entry);
 		});
 		setPairingBroadcastSink((type, payload) => {
+			if (type === "channels.pairing.revoked" && payload.channel === "weixin") this.mcpSetup.revokeWeixinRequests(payload.accountId, payload.senderId);
 			this.emit(type, payload);
 		});
 		log.debug("Starting gateway service...");
@@ -1433,6 +1481,7 @@ var GatewayService = class {
 		await trace.measure("sessions.initialize", () => this.sessionIndex.initialize());
 		log.debug("Session manager initialized");
 		this.automationService.setDeps({
+			getConfig: () => this.config,
 			agentService: this.agentService,
 			getDefaultAgentId: () => getDefaultAgentId(),
 			isAgentAvailable: (id) => listAgentEntries().some((agent) => agent.id === id && agent.enabled !== false),
@@ -1466,6 +1515,7 @@ var GatewayService = class {
 				};
 			},
 			executeSystemAction: (input) => this.executeSystemAutomationAction(input),
+			onWeixinRunCompleted: (conversationId, principalId, run) => this.deliverWeixinAutomation(conversationId, principalId, run),
 			onRunCompleted: (run, context) => this.handleAutomationRunCompleted(run, context),
 			onEvent: (event) => this.projectAutomationEvent(event),
 			onReliabilityAttention: (input) => this.emit("automation.attention.required", input)
@@ -1555,6 +1605,10 @@ var GatewayService = class {
 	markGatewayReady() {
 		if (this.readiness.isReady()) return;
 		this.readiness.markReady();
+		this.mcpSetup.resumePending(true).catch((err) => log.warn({
+			err,
+			phase: "mcp_setup_resume"
+		}, "MCP setup continuation could not be queued"));
 		this.startupTrace?.mark("ready");
 		this.schedulePostReadySidecars();
 	}
@@ -1619,6 +1673,7 @@ var GatewayService = class {
 		await flushTracing();
 		if (!this.running) return;
 		this.stopping = true;
+		this._mcpSetup?.dispose();
 		const { getPhoneRuntime } = await import("../phone/runtime.js");
 		await getPhoneRuntime().shutdown();
 		this.phoneStreams.close();
@@ -1718,8 +1773,8 @@ var GatewayService = class {
 	afterFeishuCredentialsPersisted() {
 		return this.configCoordinator.afterFeishuCredentialsPersisted();
 	}
-	saveConfig(config, expectedConfig) {
-		return this.configCoordinator.saveConfig(config, expectedConfig);
+	saveConfig(config, expectedConfig, beforeCommit) {
+		return this.configCoordinator.saveConfig(config, expectedConfig, beforeCommit);
 	}
 	async syncVoiceLanguage(language) {
 		const mode = this.config.voice?.languageMode ?? "auto";
@@ -2004,6 +2059,25 @@ var GatewayService = class {
 		}
 		this.createNotificationService().handleGatewayEvent(type, notificationPayload);
 	}
+	async deliverWeixinAutomation(conversationId, principalId, run) {
+		const destination = weixinPrivateIdentity(conversationId, this.currentConfig);
+		if (!destination || destination.principalId !== principalId) throw new Error("The original Weixin notification identity is unavailable or revoked.");
+		await this.channelManager.send({
+			channel: "weixin",
+			chat_id: destination.peerId,
+			content: `${run.automationName} · ${run.status}\n${run.summary ?? run.error ?? "运行结束，无可用结果。"}`,
+			type: "message",
+			metadata: {
+				accountId: destination.accountId,
+				conversationId,
+				automationRunId: run.id,
+				strictWeixinIdentity: true
+			}
+		}, {
+			skipPersist: true,
+			requireDelivery: true
+		});
+	}
 	async handleAutomationRunCompleted(run, context) {
 		deliverAutomationCompletion(run, context, this.createNotificationService(), (type, payload) => this.emit(type, payload));
 	}