@xopcai/xopc 0.0.180 → 0.0.188

package/dist/src/gateway/hono/lib/config-payload.d.ts

@@ -41,8 +41,8 @@ export declare function buildSafeWebConfigPayload(service: GatewayService, optio
                 root: string;
             };
             models: {
-                defaultRole: string;
-                roles: Record<string, {
+                defaultRole?: string;
+                roles?: Record<string, {
                     model: string;
                     fallbacks?: string[];
                     description?: string;
@@ -65,7 +65,7 @@ export declare function buildSafeWebConfigPayload(service: GatewayService, optio
                 };
             };
             tools: {
-                builtin: Record<string, {
+                builtin?: Record<string, {
                     mode: "allow" | "confirm" | "deny";
                     scope?: "workspace" | "readonly" | "unrestricted";
                     limits?: {
@@ -106,9 +106,9 @@ export declare function buildSafeWebConfigPayload(service: GatewayService, optio
                 }[];
             };
             boundaries: {
-                requiresConfirmation: string[];
-                forbidden: string[];
-                escalation: string[];
+                requiresConfirmation?: string[];
+                forbidden?: string[];
+                escalation?: string[];
             };
         }[];
         capabilityPresets: Record<string, {
@@ -142,7 +142,7 @@ export declare function buildSafeWebConfigPayload(service: GatewayService, optio
                 };
             };
             tools?: {
-                builtin: Record<string, {
+                builtin?: Record<string, {
                     mode: "allow" | "confirm" | "deny";
                     scope?: "workspace" | "readonly" | "unrestricted";
                     limits?: {
@@ -183,9 +183,9 @@ export declare function buildSafeWebConfigPayload(service: GatewayService, optio
                 }[];
             };
             boundaries?: {
-                requiresConfirmation: string[];
-                forbidden: string[];
-                escalation: string[];
+                requiresConfirmation?: string[];
+                forbidden?: string[];
+                escalation?: string[];
             };
             runtime?: {
                 maxTurns?: number;
@@ -280,29 +280,6 @@ export declare function buildSafeWebConfigPayload(service: GatewayService, optio
         dialogPolicy: unknown;
         dialogTimeoutSeconds: number;
     };
-    goals: {
-        maxTurns: number;
-        checklistMode: boolean;
-        checklistDecomposePolicy: "empty_only" | "supplement_existing";
-        maxConsecutiveParseFailures: number;
-        judgeTimeoutMs: number;
-        checklistHistoryChars: number;
-        notifications: {
-            enabled: boolean;
-            includeLinkedSessions: boolean;
-            channels: string[];
-            events: ("done" | "blocked" | "needs_input" | "queue_failed" | "queue_retry" | "queue_succeeded" | "queue_skipped")[];
-            targets: {
-                channel: string;
-                chatId: string;
-                accountId?: string;
-                threadId?: string | number;
-                silent?: boolean;
-                events?: ("done" | "blocked" | "needs_input" | "queue_failed" | "queue_retry" | "queue_succeeded" | "queue_skipped")[];
-            }[];
-        };
-        judgeModelRef?: string;
-    };
     session: {
         dmScope: "main" | "per-peer" | "per-channel-peer" | "per-account-channel-peer";
         storage: {
@@ -311,6 +288,9 @@ export declare function buildSafeWebConfigPayload(service: GatewayService, optio
         };
     };
     userContext: {
+        preferences: {
+            responseLanguage: "auto" | "zh-CN" | "en";
+        };
         memory: {
             retention: {
                 compaction: {
@@ -362,11 +342,11 @@ export declare function buildSafeWebConfigPayload(service: GatewayService, optio
     stt: unknown;
     tts: unknown;
     voice: {
-        languageMode?: "auto" | "manual";
+        languageMode?: "manual" | "auto";
         language?: "en" | "zh";
         input?: {
             refinement?: {
-                mode: "off" | "custom" | "light" | "punctuation";
+                mode: "off" | "light" | "custom" | "punctuation";
                 model?: string;
                 customInstruction?: string;
             };

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

@@ -1,15 +1,15 @@
 import { ContextCompactionPolicySchema, init_config } from "../../../user-context/config.js";
 import { init_agent_scope, listAgentEntries, normalizeAgentId, resolveDefaultAgentId } from "../../../agent/agent-scope.js";
 import { resolveModelsJsonPath } from "../../../config/paths.js";
+import { buildChannelCatalogForConfig, buildChannelCatalogFromSnapshot, getChannelSetupStatus, init_channel_catalog_service } from "../../../channels/catalog/channel-catalog-service.js";
 import { init_models_json, loadModelsJson } from "../../../config/models-json.js";
 import { CredentialResolver, init_credentials } from "../../../auth/credentials.js";
-import { buildChannelCatalogForConfig, buildChannelCatalogFromSnapshot, getChannelSetupStatus, init_channel_catalog_service } from "../../../channels/catalog/channel-catalog-service.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 { resolveGoalsConfigForWeb, resolveSessionConfigForWeb, resolveUpdateConfigForWeb } from "../../../config/web-patch.js";
+import { resolveSessionConfigForWeb, resolveUpdateConfigForWeb } from "../../../config/web-patch.js";
 import { GENERIC_MASKED_SECRET, maskSecretLength } from "./mask-secret-length.js";
 import { safeToolsWebForGet } from "../../config-tools-web.js";
 import { buildSafeProvidersConfigForWeb } from "./safe-providers-config.js";
@@ -176,9 +176,11 @@ async function buildSafeWebConfigPayload(service, options = {}) {
 			skillsStoreBaseUrl: config.gateway?.skillsStoreBaseUrl ?? "https://store.xopc.ai"
 		},
 		browser: buildSafeBrowserConfigForWeb(config.browser),
-		goals: resolveGoalsConfigForWeb(config),
 		session: resolveSessionConfigForWeb(config),
-		userContext: { memory: { retention: { compaction: ContextCompactionPolicySchema.parse(config.userContext?.memory.retention?.compaction) } } },
+		userContext: {
+			preferences: config.userContext?.preferences ?? { responseLanguage: "auto" },
+			memory: { retention: { compaction: ContextCompactionPolicySchema.parse(config.userContext?.memory.retention?.compaction) } }
+		},
 		tui: { defaultAgent: config.tui?.defaultAgent ?? "coder" },
 		tunnel: {
 			enabled: config.tunnel?.enabled === true,

package/dist/src/gateway/hono/middleware/strict-rate-limit.d.ts

@@ -12,6 +12,10 @@ export declare function createStrictRateLimitMiddleware(deps: StrictRateLimitDep
     error: string;
     code: string;
 }, 429, "json">>;
+export declare function createChatRateLimitMiddleware(deps: StrictRateLimitDeps): import("hono").MiddlewareHandler<any, string, {}, Response & import("hono").TypedResponse<{
+    error: string;
+    code: string;
+}, 429, "json">>;
 export declare function createXopcCloudPollRateLimitMiddleware(deps: StrictRateLimitDeps): import("hono").MiddlewareHandler<any, string, {}, Response & import("hono").TypedResponse<{
     error: string;
     code: string;

package/dist/src/gateway/hono/middleware/strict-rate-limit.js

@@ -63,6 +63,13 @@ function createStrictRateLimitMiddleware(deps) {
 		reason: "strict_rate_limit_exceeded"
 	});
 }
+function createChatRateLimitMiddleware(deps) {
+	return createClientRateLimitMiddleware(deps, {
+		limiter: () => buckets.chatApi(),
+		exceededMessage: "Chat API rate limit exceeded",
+		reason: "chat_rate_limit_exceeded"
+	});
+}
 function createXopcCloudPollRateLimitMiddleware(deps) {
 	return createClientRateLimitMiddleware(deps, {
 		limiter: () => buckets.xopcCloudPoll(),
@@ -78,4 +85,4 @@ function createChannelRateLimitMiddleware(deps) {
 	});
 }
 //#endregion
-export { createChannelRateLimitMiddleware, createStrictRateLimitMiddleware, createXopcCloudPollRateLimitMiddleware };
+export { createChannelRateLimitMiddleware, createChatRateLimitMiddleware, createStrictRateLimitMiddleware, createXopcCloudPollRateLimitMiddleware };

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

@@ -4,9 +4,8 @@ import "../../../activity/index.js";
 const ACTIVITY_OBJECT_KINDS = new Set([
 	"project",
 	"note",
-	"work_item",
 	"session",
-	"goal",
+	"task",
 	"workflow_run",
 	"automation"
 ]);

package/dist/src/gateway/hono/routes/agent-stream.js

@@ -1,12 +1,10 @@
-import { createGatewayRouteLogger, logRouteWarn } from "../lib/route-logger.js";
-import { createAgentResumeHandler, createAgentSSEHandler, createEventsSSEHandler, createSendHandler } from "../sse.js";
+import { validateWebchatAttachments, validateWebchatContent } from "../../chat-limits.js";
+import { createAgentResumeHandler, createEventsSSEHandler, createSendHandler } from "../sse.js";
 //#region src/gateway/hono/routes/agent-stream.ts
-const log = createGatewayRouteLogger("AgentStream");
 function registerAgentStreamRoutes(authenticated, deps) {
-	const { service, strictRateLimitMiddleware, sseConfig } = deps;
-	authenticated.post("/api/agent", strictRateLimitMiddleware, createAgentSSEHandler(sseConfig));
-	authenticated.post("/api/agent/resume", strictRateLimitMiddleware, createAgentResumeHandler(sseConfig));
-	authenticated.post("/api/agent/abort", strictRateLimitMiddleware, async (c) => {
+	const { service, chatRateLimitMiddleware, sseConfig } = deps;
+	authenticated.post("/api/agent/resume", chatRateLimitMiddleware, createAgentResumeHandler(sseConfig));
+	authenticated.post("/api/agent/abort", chatRateLimitMiddleware, async (c) => {
 		const body = await c.req.json().catch(() => null);
 		const runId = body && typeof body === "object" && typeof body.runId === "string" ? body.runId.trim() : "";
 		if (!runId) return c.json({
@@ -16,53 +14,156 @@ function registerAgentStreamRoutes(authenticated, deps) {
 				message: "Missing runId"
 			}
 		}, 400);
-		const aborted = service.abortAgentRun(runId);
+		const result = await service.abortAgentRun(runId);
 		return c.json({
 			ok: true,
-			payload: { aborted }
+			payload: result
 		});
 	});
-	authenticated.post("/api/agent/steer", strictRateLimitMiddleware, async (c) => {
+	authenticated.get("/api/sessions/:sessionKey/input-state", (c) => {
+		const sessionKey = (c.req.param("sessionKey") ?? "").trim();
+		if (!sessionKey) return c.json({
+			ok: false,
+			error: {
+				code: "BAD_REQUEST",
+				message: "Missing sessionKey"
+			}
+		}, 400);
+		return c.json({
+			ok: true,
+			payload: service.getSessionInputState(sessionKey)
+		});
+	});
+	authenticated.post("/api/sessions/:sessionKey/inputs", chatRateLimitMiddleware, async (c) => {
+		const sessionKey = (c.req.param("sessionKey") ?? "").trim();
 		const body = await c.req.json().catch(() => null);
-		if (!body || typeof body !== "object") return c.json({
+		if (!body || !sessionKey) return c.json({
 			ok: false,
 			error: {
 				code: "BAD_REQUEST",
-				message: "Invalid JSON body"
+				message: "Invalid request"
 			}
 		}, 400);
-		const sessionKey = typeof body.sessionKey === "string" ? body.sessionKey.trim() : "";
-		const message = typeof body.message === "string" ? body.message : "";
-		if (!sessionKey) return c.json({
+		const attachments = Array.isArray(body.attachments) ? body.attachments : void 0;
+		const content = typeof body.content === "string" ? body.content : "";
+		const contentError = validateWebchatContent(content);
+		if (contentError) return c.json({
 			ok: false,
 			error: {
 				code: "BAD_REQUEST",
-				message: "Missing sessionKey"
+				message: contentError
+			}
+		}, 400);
+		const attachmentError = validateWebchatAttachments(attachments);
+		if (attachmentError) return c.json({
+			ok: false,
+			error: {
+				code: "BAD_REQUEST",
+				message: attachmentError
+			}
+		}, 400);
+		const delivery = body.delivery === "next" || body.delivery === "steer" ? body.delivery : null;
+		if (!delivery) return c.json({
+			ok: false,
+			error: {
+				code: "BAD_REQUEST",
+				message: "Missing delivery"
 			}
 		}, 400);
-		const result = await service.steerWebchatAgent(sessionKey, message);
-		if (result.ok === false) {
-			logRouteWarn(log, c, `Agent steer failed: ${result.code}`, "gateway.route.agent", {
-				sessionKey,
-				code: result.code
-			});
-			const code = result.code;
-			const status = code === "BAD_REQUEST" ? 400 : code === "NO_ACTIVE_RUN" ? 409 : 500;
-			const msg = code === "NO_ACTIVE_RUN" ? "No active agent run for this session" : code === "STEER_FAILED" ? "Steer failed" : "Message required";
-			return c.json({
+		const result = await service.submitSessionInput({
+			sessionKey,
+			clientMessageId: typeof body.clientMessageId === "string" ? body.clientMessageId : "",
+			delivery,
+			content,
+			attachments,
+			thinking: typeof body.thinking === "string" ? body.thinking : void 0
+		});
+		if (result.ok === false) return c.json({
+			ok: false,
+			error: {
+				code: result.code,
+				message: "Input was not accepted"
+			}
+		}, result.code === "QUEUE_FULL" ? 409 : 400);
+		return c.json({
+			ok: true,
+			payload: result
+		}, 202);
+	});
+	authenticated.patch("/api/sessions/:sessionKey/inputs/:inputId", chatRateLimitMiddleware, async (c) => {
+		const sessionKey = (c.req.param("sessionKey") ?? "").trim();
+		const inputId = c.req.param("inputId")?.trim() ?? "";
+		const body = await c.req.json().catch(() => null);
+		if (!body || typeof body.version !== "number") return c.json({
+			ok: false,
+			error: {
+				code: "BAD_REQUEST",
+				message: "Missing version"
+			}
+		}, 400);
+		const attachments = Array.isArray(body.attachments) ? body.attachments : void 0;
+		if (body.content !== void 0) {
+			const contentError = validateWebchatContent(body.content);
+			if (contentError) return c.json({
 				ok: false,
 				error: {
-					code,
-					message: msg
+					code: "BAD_REQUEST",
+					message: contentError
 				}
-			}, status);
+			}, 400);
 		}
-		return c.json({
-			ok: true,
-			payload: { steered: true }
+		const attachmentError = validateWebchatAttachments(attachments);
+		if (attachmentError) return c.json({
+			ok: false,
+			error: {
+				code: "BAD_REQUEST",
+				message: attachmentError
+			}
+		}, 400);
+		const result = await service.updateSessionInput(sessionKey, inputId, {
+			version: body.version,
+			content: typeof body.content === "string" ? body.content : void 0,
+			attachments,
+			thinking: typeof body.thinking === "string" ? body.thinking : void 0,
+			position: typeof body.position === "number" ? body.position : void 0
 		});
+		return result.ok ? c.json({
+			ok: true,
+			payload: result.state
+		}) : c.json({
+			ok: false,
+			error: {
+				code: "CONFLICT",
+				message: "Input changed"
+			},
+			payload: result.state
+		}, 409);
+	});
+	authenticated.delete("/api/sessions/:sessionKey/inputs/:inputId", chatRateLimitMiddleware, (c) => {
+		const sessionKey = (c.req.param("sessionKey") ?? "").trim();
+		const inputId = c.req.param("inputId")?.trim() ?? "";
+		const version = Number(c.req.query("version"));
+		if (!Number.isFinite(version)) return c.json({
+			ok: false,
+			error: {
+				code: "BAD_REQUEST",
+				message: "Missing version"
+			}
+		}, 400);
+		const result = service.removeSessionInput(sessionKey, inputId, version);
+		return result.ok ? c.json({
+			ok: true,
+			payload: result.state
+		}) : c.json({
+			ok: false,
+			error: {
+				code: "CONFLICT",
+				message: "Input changed"
+			},
+			payload: result.state
+		}, 409);
 	});
-	authenticated.post("/api/clarify/:requestId", strictRateLimitMiddleware, async (c) => {
+	authenticated.post("/api/clarify/:requestId", chatRateLimitMiddleware, async (c) => {
 		const requestId = c.req.param("requestId")?.trim() ?? "";
 		if (!requestId) return c.json({
 			ok: false,
@@ -94,7 +195,7 @@ function registerAgentStreamRoutes(authenticated, deps) {
 			payload: { received: true }
 		});
 	});
-	authenticated.post("/api/send", strictRateLimitMiddleware, createSendHandler(sseConfig));
+	authenticated.post("/api/send", chatRateLimitMiddleware, createSendHandler(sseConfig));
 	authenticated.get("/api/events", createEventsSSEHandler(sseConfig));
 }
 //#endregion

package/dist/src/gateway/hono/routes/auth-registry-extensions.js

@@ -1,8 +1,8 @@
 import { getAllModels, getAvailableModels, init_providers } from "../../../providers/index.js";
 import { ActivationPlanner } from "../../../extensions/activation-planner.js";
 import { mergeActivationContext } from "../../../extensions/activation-context.js";
-import { fetchRegistry, listExtensions, searchExtensions } from "../../../extensions/marketplace.js";
 import { buildWhenContextSnapshot } from "../../../extensions/when-context.js";
+import { fetchRegistry, listExtensions, searchExtensions } from "../../../extensions/marketplace.js";
 import { createOAuthHandler } from "../oauth.js";
 import { createOAuthAsyncHandler } from "../oauth-async.js";
 import { extensionAssetMimeType } from "../lib/extension-assets.js";

package/dist/src/gateway/hono/routes/capability-presets.js

@@ -1,6 +1,6 @@
 import { CapabilityPresetSchema, init_schema } from "../../../agent-manifest/schema.js";
 import { init_agent_scope, normalizeAgentId } from "../../../agent/agent-scope.js";
-import { listCapabilityPresets, prepareCreateCapabilityPreset, prepareDeleteCapabilityPreset, prepareUpdateCapabilityPreset } from "../../capability-presets-admin.js";
+import { listCapabilityPresets, prepareCreateCapabilityPreset, prepareDeleteCapabilityPreset, prepareUpdateCapabilityPreset, previewCapabilityPresetUpdate } from "../../capability-presets-admin.js";
 //#region src/gateway/hono/routes/capability-presets.ts
 init_schema();
 init_agent_scope();
@@ -139,6 +139,32 @@ function registerCapabilityPresetsRoutes(authenticated, deps) {
 			payload: listCapabilityPresets(service.currentConfig)
 		});
 	});
+	authenticated.post("/api/capability-presets/:id/preview", strictRateLimitMiddleware, async (c) => {
+		const id = normalizeAgentId(c.req.param("id") ?? "");
+		let raw;
+		try {
+			raw = await c.req.json();
+		} catch {
+			return c.json({
+				ok: false,
+				error: { message: "Invalid JSON" }
+			}, 400);
+		}
+		const body = parseUpdateBody(raw);
+		if (isParseError(body)) return c.json({
+			ok: false,
+			error: { message: body.error }
+		}, 400);
+		const preview = previewCapabilityPresetUpdate(service.currentConfig, id, body);
+		if (preview.ok === false) return c.json({
+			ok: false,
+			error: { message: preview.error }
+		}, preview.status ?? 400);
+		return c.json({
+			ok: true,
+			payload: preview.data
+		});
+	});
 	authenticated.delete("/api/capability-presets/:id", strictRateLimitMiddleware, async (c) => {
 		const id = normalizeAgentId(c.req.param("id") ?? "");
 		const prep = prepareDeleteCapabilityPreset(service.currentConfig, id);

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

@@ -6,7 +6,7 @@ function registerComposerHistoryRoutes(authenticated, deps) {
 	authenticated.get("/api/composer-history", (c) => {
 		return c.json({ items: listComposerInputHistory() });
 	});
-	authenticated.post("/api/composer-history", deps.strictRateLimitMiddleware, async (c) => {
+	authenticated.post("/api/composer-history", deps.chatRateLimitMiddleware, async (c) => {
 		const body = await c.req.json().catch(() => null);
 		const text = body && typeof body === "object" && typeof body.text === "string" ? body.text.trim() : "";
 		if (!text) return c.json({ error: "text is required" }, 400);

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

@@ -1,6 +1,6 @@
 /**
  * `PATCH /api/config` — tail sections that are each <50 lines:
- *   update / goals / session / gateway.{skillsMarketplaceProvider,
+ *   update / session / gateway.{skillsMarketplaceProvider,
  *   skillsStoreBaseUrl} / providers / providersConfig / stt / tts / tools /
  *   userContext.memory.retention.compaction / tunnel / bindings / mcp.
  *

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

@@ -1,10 +1,10 @@
 import { ContextCompactionPolicySchema, init_config } from "../../../../user-context/config.js";
 import { BindingsConfigSchema, BrowserConfigSchema, McpConfigSchema, VoiceConfigSchema, init_schema } from "../../../../config/schema.js";
 import { CredentialResolver, init_credentials } from "../../../../auth/credentials.js";
+import { canonicalizeConfiguredMcpServer } from "../../../../config/mcp-config-normalize.js";
 import { setTuiDefaultAgentConfig } from "../../../../commands/agents.config.js";
 import { mergeTunnelConfigPatch } from "../../../../tunnel/tunnel-config.js";
-import { canonicalizeConfiguredMcpServer } from "../../../../config/mcp-config-normalize.js";
-import { mergeGatewaySkillsMarketplacePatch, mergeGoalsConfigPatch, mergeSessionConfigPatch, mergeUpdateConfigPatch } from "../../../../config/web-patch.js";
+import { mergeGatewaySkillsMarketplacePatch, mergeSessionConfigPatch, mergeUpdateConfigPatch } from "../../../../config/web-patch.js";
 import { assertGatewayAuthConfigured, resolveGatewayAuth } from "../../../auth.js";
 import { isMaskedSecretPatchValue } from "../../lib/mask-secret-length.js";
 import { applyToolsWebPatch } from "../../../config-tools-web.js";
@@ -20,11 +20,6 @@ async function applyMiscPatch(config, body) {
 		const updateResult = mergeUpdateConfigPatch(config, body.update);
 		if (updateResult.ok === false) return patchError(updateResult.message);
 	}
-	if (body.goals !== void 0) {
-		if (typeof body.goals !== "object" || body.goals === null || Array.isArray(body.goals)) return patchError("goals must be an object");
-		const goalsResult = mergeGoalsConfigPatch(config, body.goals);
-		if (goalsResult.ok === false) return patchError(goalsResult.message);
-	}
 	if (body.session !== void 0) {
 		if (typeof body.session !== "object" || body.session === null || Array.isArray(body.session)) return patchError("session must be an object");
 		const sessionResult = mergeSessionConfigPatch(config, body.session);

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

@@ -1,9 +1,11 @@
 import { listConnectorLearningJobs } from "../../../storage/sqlite/connector-learning-repository.js";
 import { decideConnectorApproval, getConnectorApproval, listConnectorApprovals, listConnectorConnections } from "../../../storage/sqlite/connector-repository.js";
+import { getConnectorAccount } from "../../../storage/sqlite/connector-account-repository.js";
 import { getConnectorSyncPolicy, upsertConnectorSyncPolicy } from "../../../storage/sqlite/connector-sync-policy-repository.js";
 import "../../../storage/sqlite/index.js";
 import { init_agent_scope, resolveDefaultAgentId } from "../../../agent/agent-scope.js";
 import { resolveComposioApiKey } from "../../../connectors/composio-sessions.js";
+import { getConnectorLearningPlan } from "../../../connectors/learning-recipes.js";
 import { listComposioConnectorCatalog } from "../../../connectors/composio-catalog.js";
 import { createConnectorSetupSecretRequest, submitConnectorSetupSecret } from "../../../connectors/setup-secrets.js";
 import { configureComposioApiKey, executeComposioTool, getComposioInstallationPolicy, getComposioToolkitScope, inspectComposioConnectorHealth, listComposioConnections, listComposioTools, refreshComposioConnection, revokeComposioConnection, setComposioToolkitScope, updateComposioConnection, updateComposioInstallationPolicy } from "../../../connectors/composio.js";
@@ -19,7 +21,6 @@ import { buildConnectedPeopleGraph } from "../../../knowledge/people-graph.js";
 import "../../../knowledge/index.js";
 import { ingestLocalFolderSource } from "../../../connectors/connected-source-ingestion.js";
 import { previewConnectorDefinition, testConnectorInstance } from "../../../connectors/health.js";
-import { getConnectorLearningPlan } from "../../../connectors/learning-recipes.js";
 import { setConnectorEnabled } from "../../../connectors/lifecycle.js";
 import { projectComposioConnectionStatus } from "../../../connectors/runtime-status.js";
 //#region src/gateway/hono/routes/connectors.ts
@@ -98,33 +99,31 @@ function registerConnectorRoutes(authenticated, deps) {
 			payload: { jobs: listConnectorLearningJobs({ limit: 100 }) }
 		});
 	});
-	authenticated.get("/api/connectors/composio/connections/:id/sync-policy", (c) => {
-		const connection = listConnectorConnections({ principalId: "local-owner" }).find((item) => item.id === c.req.param("id"));
-		if (!connection) return c.json({
+	authenticated.get("/api/connectors/composio/accounts/:id/sync-policy", (c) => {
+		const account = getConnectorAccount(c.req.param("id"));
+		if (!account || account.principalId !== "local-owner") return c.json({
 			ok: false,
-			error: "Connector connection not found."
+			error: "Connector account not found."
 		}, 404);
-		const defaultInterval = defaultConnectorSyncInterval(connection.connectorId);
-		const policy = getConnectorSyncPolicy(connection.id) ?? {
-			connectionId: connection.id,
+		const policy = getConnectorSyncPolicy(account.id) ?? {
+			accountId: account.id,
 			scanEnabled: true,
 			proactiveEnabled: false,
-			intervalMinutes: defaultInterval,
+			intervalMinutes: defaultConnectorSyncInterval(account.connectorId),
 			allowedScenarioKeys: [],
 			revision: 0,
-			updatedAt: connection.updatedAt
+			updatedAt: account.updatedAt
 		};
 		return c.json({
 			ok: true,
 			payload: { policy }
 		});
 	});
-	authenticated.patch("/api/connectors/composio/connections/:id/sync-policy", strictRateLimitMiddleware, async (c) => {
-		const connectionId = c.req.param("id");
-		const connection = listConnectorConnections({ principalId: "local-owner" }).find((item) => item.id === connectionId);
-		if (!connection) return c.json({
+	authenticated.patch("/api/connectors/composio/accounts/:id/sync-policy", strictRateLimitMiddleware, async (c) => {
+		const account = getConnectorAccount(c.req.param("id"));
+		if (!account || account.principalId !== "local-owner") return c.json({
 			ok: false,
-			error: "Connector connection not found."
+			error: "Connector account not found."
 		}, 404);
 		const body = await c.req.json().catch(() => ({}));
 		const row = body && typeof body === "object" && !Array.isArray(body) ? body : {};
@@ -150,17 +149,18 @@ function registerConnectorRoutes(authenticated, deps) {
 			ok: false,
 			error: "allowedScenarioKeys contains an unknown scenario."
 		}, 400);
-		const previous = getConnectorSyncPolicy(connectionId);
+		const previous = getConnectorSyncPolicy(account.id);
 		const policy = upsertConnectorSyncPolicy({
-			connectionId,
-			defaultIntervalMinutes: defaultConnectorSyncInterval(connection.connectorId),
+			accountId: account.id,
+			defaultIntervalMinutes: defaultConnectorSyncInterval(account.connectorId),
 			...typeof row.scanEnabled === "boolean" ? { scanEnabled: row.scanEnabled } : {},
 			...typeof row.proactiveEnabled === "boolean" ? { proactiveEnabled: row.proactiveEnabled } : {},
 			...typeof row.intervalMinutes === "number" ? { intervalMinutes: row.intervalMinutes } : {},
 			...allowedScenarioKeys ? { allowedScenarioKeys } : {}
 		});
-		if (!policy.scanEnabled) service.setConnectorLearningPaused(connectionId, true);
-		else if (previous?.scanEnabled === false) {
+		const connectionId = account.currentConnectionId;
+		if (connectionId && !policy.scanEnabled) service.setConnectorLearningPaused(connectionId, true);
+		else if (connectionId && previous?.scanEnabled === false) {
 			if (service.setConnectorLearningPaused(connectionId, false) === 0) service.requestConnectorLearning(connectionId, {
 				mode: "incremental",
 				reason: "schedule"
@@ -171,9 +171,14 @@ function registerConnectorRoutes(authenticated, deps) {
 			payload: { policy }
 		});
 	});
-	authenticated.post("/api/connectors/composio/connections/:id/learning", strictRateLimitMiddleware, async (c) => {
+	authenticated.post("/api/connectors/composio/accounts/:id/learning", strictRateLimitMiddleware, async (c) => {
 		try {
 			await listComposioConnections();
+			const account = getConnectorAccount(c.req.param("id"));
+			if (!account || account.principalId !== "local-owner" || !account.currentConnectionId) return c.json({
+				ok: false,
+				error: "Connector account has no usable authorization."
+			}, 409);
 			const config = service.currentConfig;
 			if (!config.userContext.memory.sources.includes("connectedSources")) {
 				config.userContext.memory.sources = [...config.userContext.memory.sources, "connectedSources"];
@@ -183,10 +188,10 @@ function registerConnectorRoutes(authenticated, deps) {
 					error: saved.error
 				}, 500);
 			}
-			const job = service.requestConnectorLearning(c.req.param("id"), { reason: "manual" });
+			const job = service.requestConnectorLearning(account.currentConnectionId, { reason: "manual" });
 			if (!job) return c.json({
 				ok: false,
-				error: "The connection is not active or does not support learning."
+				error: "The account is not active or does not support learning."
 			}, 409);
 			return c.json({
 				ok: true,
@@ -199,15 +204,17 @@ function registerConnectorRoutes(authenticated, deps) {
 			}, 400);
 		}
 	});
-	authenticated.post("/api/connectors/composio/connections/:id/learning/pause", strictRateLimitMiddleware, (c) => {
-		const changed = service.setConnectorLearningPaused(c.req.param("id"), true);
+	authenticated.post("/api/connectors/composio/accounts/:id/learning/pause", strictRateLimitMiddleware, (c) => {
+		const account = getConnectorAccount(c.req.param("id"));
+		const changed = account?.currentConnectionId ? service.setConnectorLearningPaused(account.currentConnectionId, true) : 0;
 		return c.json({
 			ok: true,
 			payload: { changed }
 		});
 	});
-	authenticated.post("/api/connectors/composio/connections/:id/learning/resume", strictRateLimitMiddleware, (c) => {
-		const changed = service.setConnectorLearningPaused(c.req.param("id"), false);
+	authenticated.post("/api/connectors/composio/accounts/:id/learning/resume", strictRateLimitMiddleware, (c) => {
+		const account = getConnectorAccount(c.req.param("id"));
+		const changed = account?.currentConnectionId ? service.setConnectorLearningPaused(account.currentConnectionId, false) : 0;
 		return c.json({
 			ok: true,
 			payload: { changed }
@@ -248,9 +255,7 @@ function registerConnectorRoutes(authenticated, deps) {
 	});
 	authenticated.delete("/api/connectors/composio/connections/:id", strictRateLimitMiddleware, async (c) => {
 		try {
-			const connectionId = c.req.param("id");
-			await revokeComposioConnection(connectionId);
-			service.setConnectorLearningPaused(connectionId, true);
+			await revokeComposioConnection(c.req.param("id"));
 			return c.json({
 				ok: true,
 				payload: { revoked: true }