@xopcai/xopc 0.0.306 → 0.0.308

package/dist/src/memory-maintenance/service.js

@@ -3,7 +3,7 @@ import "../user-model/domain.js";
 import { randomUUID } from "node:crypto";
 //#region src/memory-maintenance/service.ts
 init_transaction();
-const ALGORITHM_VERSION = "user-model-maintenance-v1";
+const ALGORITHM_VERSION = "user-model-maintenance-v2";
 function emptyMetrics() {
 	return {
 		scanned: 0,
@@ -32,29 +32,22 @@ function addDecision(db, runId, objectType, objectId, action, reason, before, af
     decision_id, run_id, object_type, object_id, action, reason, before_json, after_json, created_at
   ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)`).run(randomUUID(), runId, objectType, objectId, action, reason, before === void 0 ? null : JSON.stringify(before), after === void 0 ? null : JSON.stringify(after), now);
 }
-function transitionAssertions(db, runId, now, limit, metrics) {
-	const expired = db.prepare(`SELECT assertion_id, status, valid_to FROM user_assertions
-    WHERE status = 'active' AND valid_to IS NOT NULL AND valid_to < ? LIMIT ?`).all(now, limit);
-	metrics.scanned += expired.length;
-	for (const row of expired) {
-		db.prepare("UPDATE user_assertions SET status = 'stale' WHERE assertion_id = ? AND status = 'active'").run(row.assertion_id);
+function transitionAssertions(db, runId, principalId, now, limit, metrics) {
+	const rows = db.prepare(`SELECT a.assertion_id, a.status FROM user_assertions a
+    JOIN user_assertion_slots s ON s.slot_id = a.slot_id
+    WHERE s.principal_id = ? AND a.status IN ('active', 'candidate', 'needs_review')
+      AND ((a.valid_to IS NOT NULL AND a.valid_to < ?)
+        OR (a.review_at IS NOT NULL AND a.review_at <= ?))
+    ORDER BY COALESCE(a.valid_to, a.review_at), a.assertion_id LIMIT ?`).all(principalId, now, now, limit);
+	metrics.scanned += rows.length;
+	for (const row of rows) {
+		db.prepare("UPDATE user_assertions SET status = 'stale' WHERE assertion_id = ?").run(row.assertion_id);
 		db.prepare(`INSERT INTO user_assertion_status_events (
       event_id, assertion_id, from_status, to_status, actor_type, reason, source_run_id, created_at
-    ) VALUES (?, ?, 'active', 'stale', 'maintenance', 'Validity interval ended.', ?, ?)`).run(randomUUID(), row.assertion_id, runId, now);
-		addDecision(db, runId, "assertion", row.assertion_id, "stale", "validity_ended", row, { status: "stale" }, now);
+    ) VALUES (?, ?, ?, 'stale', 'maintenance', 'No current supporting evidence at review time.', ?, ?)`).run(randomUUID(), row.assertion_id, row.status, runId, now);
+		addDecision(db, runId, "assertion", row.assertion_id, "stale", "validity_or_review_ended", row, { status: "stale" }, now);
 		metrics.stale += 1;
 	}
-	const reviewDue = db.prepare(`SELECT assertion_id, status, review_at FROM user_assertions
-    WHERE status = 'active' AND review_at IS NOT NULL AND review_at <= ? LIMIT ?`).all(now, Math.max(0, limit - expired.length));
-	metrics.scanned += reviewDue.length;
-	for (const row of reviewDue) {
-		db.prepare("UPDATE user_assertions SET status = 'needs_review' WHERE assertion_id = ? AND status = 'active'").run(row.assertion_id);
-		db.prepare(`INSERT INTO user_assertion_status_events (
-      event_id, assertion_id, from_status, to_status, actor_type, reason, source_run_id, created_at
-    ) VALUES (?, ?, 'active', 'needs_review', 'maintenance', 'Scheduled review became due.', ?, ?)`).run(randomUUID(), row.assertion_id, runId, now);
-		addDecision(db, runId, "assertion", row.assertion_id, "needs_review", "review_due", row, { status: "needs_review" }, now);
-		metrics.needsReview += 1;
-	}
 }
 function transitionPriorities(db, runId, principalId, now, limit, metrics) {
 	const rows = db.prepare(`SELECT priority_id, status, valid_to FROM user_priority_windows
@@ -68,7 +61,7 @@ function transitionPriorities(db, runId, principalId, now, limit, metrics) {
 }
 function transitionKnowledge(db, runId, principalId, now, limit, metrics) {
 	const expired = db.prepare(`SELECT knowledge_id, status, expires_at FROM knowledge_items
-    WHERE principal_id = ? AND status = 'active' AND expires_at IS NOT NULL AND expires_at < ? LIMIT ?`).all(principalId, now, limit);
+    WHERE principal_id = ? AND status IN ('active', 'candidate') AND expires_at IS NOT NULL AND expires_at < ? LIMIT ?`).all(principalId, now, limit);
 	metrics.scanned += expired.length;
 	for (const row of expired) {
 		db.prepare("UPDATE knowledge_items SET status = 'stale', updated_at = ? WHERE knowledge_id = ?").run(now, row.knowledge_id);
@@ -76,12 +69,12 @@ function transitionKnowledge(db, runId, principalId, now, limit, metrics) {
 		metrics.stale += 1;
 	}
 	const reviewDue = db.prepare(`SELECT knowledge_id, status, review_at FROM knowledge_items
-    WHERE principal_id = ? AND status = 'active' AND review_at IS NOT NULL AND review_at <= ? LIMIT ?`).all(principalId, now, Math.max(0, limit - expired.length));
+    WHERE principal_id = ? AND status IN ('active', 'candidate', 'needs_review') AND review_at IS NOT NULL AND review_at <= ? LIMIT ?`).all(principalId, now, Math.max(0, limit - expired.length));
 	metrics.scanned += reviewDue.length;
 	for (const row of reviewDue) {
-		db.prepare("UPDATE knowledge_items SET status = 'needs_review', updated_at = ? WHERE knowledge_id = ?").run(now, row.knowledge_id);
-		addDecision(db, runId, "knowledge", row.knowledge_id, "needs_review", "review_due", row, { status: "needs_review" }, now);
-		metrics.needsReview += 1;
+		db.prepare("UPDATE knowledge_items SET status = 'stale', updated_at = ? WHERE knowledge_id = ?").run(now, row.knowledge_id);
+		addDecision(db, runId, "knowledge", row.knowledge_id, "stale", "review_due", row, { status: "stale" }, now);
+		metrics.stale += 1;
 	}
 }
 function reconcileEvidence(db, runId, principalId, now, limit, evidenceThreshold, metrics) {
@@ -89,7 +82,10 @@ function reconcileEvidence(db, runId, principalId, now, limit, evidenceThreshold
     FROM user_assertions a
     JOIN user_assertion_slots s ON s.slot_id = a.slot_id
     JOIN user_assertion_evidence ae ON ae.assertion_id = a.assertion_id AND ae.relation = 'contradicts'
-    WHERE s.principal_id = ? AND a.status = 'active' LIMIT ?`).all(principalId, limit);
+    JOIN context_evidence e ON e.evidence_id = ae.evidence_id
+    WHERE s.principal_id = ? AND a.status = 'active'
+      AND e.trust_level = 'owner' AND e.source_type IN ('conversation', 'user')
+      AND e.observed_at > a.observed_at AND ae.confidence >= 0.7 LIMIT ?`).all(principalId, limit);
 	metrics.scanned += contradicted.length;
 	for (const row of contradicted) {
 		db.prepare("UPDATE user_assertions SET status = 'needs_review' WHERE assertion_id = ?").run(row.assertion_id);
@@ -99,16 +95,31 @@ function reconcileEvidence(db, runId, principalId, now, limit, evidenceThreshold
 		addDecision(db, runId, "assertion", row.assertion_id, "needs_review", "contradictory_evidence", row, { status: "needs_review" }, now);
 		metrics.needsReview += 1;
 	}
-	const candidates = db.prepare(`SELECT a.assertion_id, a.status, COUNT(DISTINCT
-      e.source_type || ':' || COALESCE(e.source_instance_id, '') || ':' || e.source_ref
-    ) AS evidence_count
+	const candidates = db.prepare(`SELECT a.assertion_id, a.status,
+      MIN(COUNT(DISTINCT COALESCE(e.content_hash, e.source_ref)),
+        COUNT(DISTINCT e.source_type || ':' || COALESCE(e.source_instance_id, '') || ':' ||
+          COALESCE(e.source_item_id, e.source_ref))) AS evidence_count
     FROM user_assertions a
     JOIN user_assertion_slots s ON s.slot_id = a.slot_id
     JOIN user_assertion_evidence ae ON ae.assertion_id = a.assertion_id AND ae.relation = 'supports'
     JOIN context_evidence e ON e.evidence_id = ae.evidence_id AND e.trust_level = 'owner'
     WHERE s.principal_id = ? AND a.status = 'candidate'
       AND a.authority IN ('user_observed', 'system_inferred')
-    GROUP BY a.assertion_id HAVING evidence_count >= ? LIMIT ?`).all(principalId, evidenceThreshold, limit);
+      AND a.confidence >= 0.7 AND ae.confidence >= 0.7
+      AND a.sensitivity = 'normal' AND a.consequence IN ('low', 'medium')
+      AND a.disclosure_policy != 'ask_before_reference'
+      AND e.source_type IN ('conversation', 'user', 'connector')
+      AND (a.valid_from IS NULL OR a.valid_from <= ?)
+      AND (a.valid_to IS NULL OR a.valid_to >= ?)
+      AND (a.review_at IS NULL OR a.review_at > ?)
+      AND NOT EXISTS (SELECT 1 FROM user_assertion_evidence bad
+        WHERE bad.assertion_id = a.assertion_id AND bad.relation = 'contradicts')
+      AND (s.cardinality = 'multiple' OR NOT EXISTS (
+        SELECT 1 FROM user_assertions other WHERE other.slot_id = a.slot_id
+          AND other.assertion_id != a.assertion_id AND other.status IN ('active', 'conflicted')
+          AND other.normalized_value != a.normalized_value
+          AND (other.valid_to IS NULL OR other.valid_to >= ?)))
+    GROUP BY a.assertion_id HAVING evidence_count >= ? ORDER BY a.recorded_at LIMIT ?`).all(principalId, now, now, now, now, evidenceThreshold, limit);
 	metrics.scanned += candidates.length;
 	for (const row of candidates) {
 		db.prepare("UPDATE user_assertions SET status = 'active' WHERE assertion_id = ? AND status = 'candidate'").run(row.assertion_id);
@@ -119,6 +130,24 @@ function reconcileEvidence(db, runId, principalId, now, limit, evidenceThreshold
 		metrics.activated += 1;
 	}
 }
+function activateKnowledge(db, runId, principalId, now, limit, metrics) {
+	const rows = db.prepare(`SELECT knowledge_id FROM knowledge_items
+    WHERE principal_id = ? AND record_class = 'memory' AND status = 'candidate'
+      AND origin_class IN ('owner', 'agent', 'system') AND confidence >= 0.7
+      AND derived_from_recalled_context = 0
+      AND (valid_from IS NULL OR valid_from <= ?) AND (valid_to IS NULL OR valid_to >= ?)
+      AND (expires_at IS NULL OR expires_at >= ?) AND (review_at IS NULL OR review_at > ?)
+    ORDER BY created_at, knowledge_id LIMIT ?`).all(principalId, now, now, now, now, limit);
+	metrics.scanned += rows.length;
+	for (const row of rows) {
+		db.prepare("UPDATE knowledge_items SET status = 'active', updated_at = ? WHERE knowledge_id = ?").run(now, row.knowledge_id);
+		db.prepare(`INSERT INTO knowledge_item_status_events
+      (event_id, knowledge_id, from_status, to_status, actor_type, reason, created_at)
+      VALUES (?, ?, 'candidate', 'active', 'maintenance', 'Eligible scoped memory activated automatically.', ?)`).run(randomUUID(), row.knowledge_id, now);
+		addDecision(db, runId, "knowledge", row.knowledge_id, "activated", "eligible_scoped_memory", { status: "candidate" }, { status: "active" }, now);
+		metrics.activated += 1;
+	}
+}
 function repairIndexes(db, runId, now, metrics) {
 	const assertionMissing = db.prepare(`SELECT COUNT(*) AS count FROM user_assertions a
     LEFT JOIN user_assertions_fts f ON f.assertion_id = a.assertion_id
@@ -178,11 +207,12 @@ function runMemoryMaintenance(input) {
 	});
 	try {
 		runSqliteWriteTransaction((db) => {
-			transitionAssertions(db, runId, now, limit, metrics);
+			transitionAssertions(db, runId, principalId, now, limit, metrics);
 			transitionPriorities(db, runId, principalId, now, limit, metrics);
 			transitionKnowledge(db, runId, principalId, now, limit, metrics);
 			if (input.jobType === "daily_reconciliation" || input.jobType === "manual_repair") {
 				reconcileEvidence(db, runId, principalId, now, limit, evidenceThreshold, metrics);
+				activateKnowledge(db, runId, principalId, now, limit, metrics);
 				repairIndexes(db, runId, now, metrics);
 			}
 			if (input.jobType === "weekly_knowledge" || input.jobType === "manual_repair") archiveOldKnowledge(db, runId, principalId, now - (input.staleRetentionDays ?? 30) * 24 * 60 * 60 * 1e3, now, limit, metrics);

package/dist/src/migrations/memory-config.d.ts

@@ -0,0 +1,2 @@
+import type { Migration } from './types.js';
+export declare const memoryConfigMigration: Migration;

package/dist/src/migrations/memory-config.js

@@ -0,0 +1,77 @@
+import { init_lock, isGatewayConfigLockedByAnotherProcessSync } from "../gateway/lock.js";
+import { existsSync, readFileSync } from "node:fs";
+//#region src/migrations/memory-config.ts
+init_lock();
+const id = "automatic-memory-config";
+function normalizeKnowledgeMemoryConfigInput(input) {
+	if (!input || typeof input !== "object" || Array.isArray(input)) return input;
+	const memory = input;
+	if (!Array.isArray(memory.sources)) return input;
+	const oldSources = memory.sources.filter((source) => typeof source === "string");
+	const visibilityScopes = new Set([
+		"session",
+		"workspace",
+		"project"
+	]);
+	const normalized = { ...memory };
+	if (!Array.isArray(normalized.readScopes)) normalized.readScopes = oldSources.filter((source) => visibilityScopes.has(source));
+	if (!Array.isArray(normalized.contentSources)) normalized.contentSources = [
+		...oldSources.some((source) => visibilityScopes.has(source)) ? ["memory"] : [],
+		...oldSources.includes("workspace") ? ["local_import"] : [],
+		...oldSources.includes("connector") ? ["connector"] : []
+	];
+	delete normalized.sources;
+	return normalized;
+}
+function convertedConfig(ctx) {
+	if (!existsSync(ctx.configPath)) return null;
+	const config = JSON.parse(readFileSync(ctx.configPath, "utf8"));
+	const userContext = config.userContext;
+	if (!userContext || typeof userContext !== "object" || Array.isArray(userContext)) return null;
+	const context = userContext;
+	let changed = false;
+	for (const key of ["userModel", "knowledgeMemory"]) {
+		const section = context[key];
+		if (!section || typeof section !== "object" || Array.isArray(section)) continue;
+		const memory = section;
+		if (memory.writePolicy === "confirm") {
+			memory.writePolicy = "allow";
+			changed = true;
+		}
+		if (key === "knowledgeMemory" && Array.isArray(memory.sources)) {
+			context[key] = normalizeKnowledgeMemoryConfigInput(memory);
+			changed = true;
+		}
+	}
+	if (!changed) return null;
+	return config;
+}
+function item(status) {
+	return {
+		id,
+		title: "Automatic memory configuration",
+		kind: "config",
+		safety: "auto",
+		status,
+		message: "Enable automatic ordinary memory and separate visibility scopes from content sources."
+	};
+}
+const memoryConfigMigration = {
+	id,
+	kind: "config",
+	safety: "auto",
+	detect: (ctx) => convertedConfig(ctx) ? item("planned") : null,
+	apply: (ctx) => {
+		if (isGatewayConfigLockedByAnotherProcessSync(ctx.configPath)) return {
+			...item("skipped"),
+			message: "Deferred knowledge memory config migration until the running gateway restarts."
+		};
+		const config = convertedConfig(ctx);
+		return config ? {
+			...item("applied"),
+			details: { config }
+		} : item("not_needed");
+	}
+};
+//#endregion
+export { memoryConfigMigration };

package/dist/src/migrations/runner.js

@@ -3,7 +3,7 @@ import { init_logger } from "../utils/logger.js";
 import { ConfigSchema, init_schema } from "../config/schema.js";
 import { listRegisteredMigrations } from "./registry.js";
 import { conversationRoutingConfigMigration } from "./conversation-routing-config.js";
-import { knowledgeMemoryReadPolicyConfigMigration } from "./knowledge-memory-read-policy-config.js";
+import { memoryConfigMigration } from "./memory-config.js";
 import { dirname, join } from "node:path";
 import { existsSync, mkdirSync, readFileSync, renameSync, writeFileSync } from "node:fs";
 //#region src/migrations/runner.ts
@@ -12,7 +12,7 @@ init_logger();
 const log = createLogger("Migrations");
 const MIGRATION_LEDGER_FILENAME = "migrations.json";
 const CONFIG_BACKUP_COUNT = 10;
-const CORE_MIGRATIONS = [conversationRoutingConfigMigration, knowledgeMemoryReadPolicyConfigMigration];
+const CORE_MIGRATIONS = [conversationRoutingConfigMigration, memoryConfigMigration];
 function listAllMigrations() {
 	return [...CORE_MIGRATIONS, ...listRegisteredMigrations().map((entry) => entry.migration)];
 }

package/dist/src/notifications/planner.js

@@ -162,7 +162,7 @@ function workDiscoveryPlan(eventType, payload) {
 	const event = payload;
 	const completed = eventType === "work-discovery.completed";
 	if (typeof event.runId !== "string" || !event.runId || typeof event.conversationId !== "string" || !event.conversationId || event.status !== (completed ? "completed" : "failed")) return null;
-	const type = completed ? "work_discovery.review_ready" : "work_discovery.failed";
+	const type = completed ? "work_discovery.completed" : "work_discovery.failed";
 	return {
 		dedupeKey: `${type}:${event.runId}`,
 		notification: {
@@ -174,15 +174,15 @@ function workDiscoveryPlan(eventType, payload) {
 			},
 			priority: completed ? "normal" : "high",
 			title: completed ? {
-				en: "Understanding ready for review",
-				zh: "用户理解已可确认"
+				en: "Understanding updated",
+				zh: "用户理解已更新"
 			} : {
 				en: "Understanding needs attention",
 				zh: "用户理解需要处理"
 			},
 			body: completed ? {
-				en: "Review what xopc learned about your work.",
-				zh: "查看并确认 xopc 对你工作的理解。"
+				en: "See what xopc learned. You can edit or delete it anytime.",
+				zh: "理解已自动整理，可随时查看、修改或删除。"
 			} : {
 				en: "Open user understanding to review or retry.",
 				zh: "打开用户理解，查看详情或重试。"

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

@@ -19,7 +19,7 @@ export declare class NotificationService {
     persistGatewayEvent(type: string, payload: unknown): {
         schemaVersion: 1;
         id: string;
-        type: "work_discovery.failed" | "chat.completed" | "chat.failed" | "task.needs_input" | "task.blocked" | "task.failed" | "task.completed" | "automation.completed" | "automation.failed" | "proactive.insight" | "work_discovery.review_ready";
+        type: "work_discovery.completed" | "work_discovery.failed" | "chat.completed" | "chat.failed" | "task.needs_input" | "task.blocked" | "task.failed" | "task.completed" | "automation.completed" | "automation.failed" | "proactive.insight";
         priority: "normal" | "high";
         title: {
             en: string;
@@ -56,7 +56,7 @@ export declare class NotificationService {
     persistPlan(plan: NotificationPlan): {
         schemaVersion: 1;
         id: string;
-        type: "work_discovery.failed" | "chat.completed" | "chat.failed" | "task.needs_input" | "task.blocked" | "task.failed" | "task.completed" | "automation.completed" | "automation.failed" | "proactive.insight" | "work_discovery.review_ready";
+        type: "work_discovery.completed" | "work_discovery.failed" | "chat.completed" | "chat.failed" | "task.needs_input" | "task.blocked" | "task.failed" | "task.completed" | "automation.completed" | "automation.failed" | "proactive.insight";
         priority: "normal" | "high";
         title: {
             en: string;

package/dist/src/notifications/service.js

@@ -40,7 +40,7 @@ function preferenceAllows(type, preferences) {
 		case "automation.completed": return preferences.automationCompleted;
 		case "automation.failed": return preferences.automationFailed;
 		case "proactive.insight": return preferences.proactiveInsight;
-		case "work_discovery.review_ready":
+		case "work_discovery.completed":
 		case "work_discovery.failed": return true;
 	}
 }

package/dist/src/proactive/follow-ups.js

@@ -1,6 +1,6 @@
 import { getSqliteDatabase, init_transaction, runSqliteWriteTransaction } from "../storage/sqlite/transaction.js";
+import { getConnectorConnection, init_connector_repository } from "../storage/sqlite/connector-repository.js";
 import { listKnowledgeSourceItems } from "../storage/sqlite/knowledge-repository.js";
-import { getConnectorConnection } from "../storage/sqlite/connector-repository.js";
 import { sourceFreshness } from "./source-freshness.js";
 import { emailFields, readMailThread } from "./mail-thread.js";
 import { authorizedConnectedSource } from "./execution/authorization.js";
@@ -12,6 +12,7 @@ import { ProactiveEventService } from "./service.js";
 import { randomUUID } from "node:crypto";
 import { z } from "zod";
 //#region src/proactive/follow-ups.ts
+init_connector_repository();
 init_transaction();
 const COMMUNICATION_SCENARIO = "communication_follow_up";
 const CreateSchema = z.object({

package/dist/src/storage/sqlite/connection-wait-repository.d.ts

@@ -21,6 +21,9 @@ export declare function requireSessionConnection(input: {
 export declare function queueConnectionResolution(wait: ConnectionWait, resolution: 'continued' | 'skipped'): ConnectionWait;
 export declare function consumeConnectionResume(input: SessionInput): boolean;
 export declare function connectionBindings(conversationId: string): ConnectionNeed[];
+/** Changes to the objective or transcript invalidate an outstanding action approval. */
+export declare function connectorObjectiveScope(conversationId: string): string | undefined;
+export declare function bindObjectiveAccount(conversationId: string, connectorId: string, accountId: string): void;
 export declare function connectionBinding(conversationId: string, connectorId: string): string | undefined;
 /** New input wins over an outstanding auto-resume intent, including an already queued resume. */
 export declare function invalidateConnectionResumeIntent(conversationId: string): void;

package/dist/src/storage/sqlite/connection-wait-repository.js

@@ -6,6 +6,9 @@ import { getSqliteDatabase, init_transaction, runSqliteWriteTransaction } from "
 import { init_session_instance_repository, readCurrentTranscriptId } from "./session-instance-repository.js";
 import { bumpSessionInputRevision, getSessionInputById, getSessionInputState, init_session_input_repository, insertSessionInput, setSessionInputStatus } from "./session-input-repository.js";
 import { TaskRunRepository, init_task_run_repository } from "../../tasks/task-run-repository.js";
+import { getConnectorAccount, init_connector_account_repository } from "./connector-account-repository.js";
+import { getConnectorConnection, init_connector_repository } from "./connector-repository.js";
+import { getSessionMetadata, init_session_repository } from "./session-repository.js";
 import { randomUUID } from "node:crypto";
 import { EventEmitter } from "node:events";
 //#region src/storage/sqlite/connection-wait-repository.ts
@@ -222,9 +225,64 @@ function consumeConnectionResume(input) {
 }
 function connectionBindings(conversationId) {
 	if (!isXopcDatabaseOpen()) return [];
+	let metadata = getSessionMetadata(conversationId);
+	if (metadata?.sessionType === "workflow-subagent" && metadata.parentConversationId) metadata = getSessionMetadata(metadata.parentConversationId);
+	const workflowAccounts = metadata?.sessionType === "workflow-run" ? metadata.customData?.connectorAccounts : void 0;
+	if (workflowAccounts && typeof workflowAccounts === "object" && !Array.isArray(workflowAccounts)) return Object.entries(workflowAccounts).flatMap(([connectorId, ids]) => Array.isArray(ids) ? ids.flatMap((id) => {
+		if (typeof id !== "string") return [];
+		const account = getConnectorAccount(id);
+		return [{
+			key: `${connectorId}:${id}`,
+			connectorId,
+			accountId: id,
+			connectionId: account?.currentConnectionId,
+			label: account?.label ?? connectorId,
+			capabilities: []
+		}];
+	}) : []);
 	const state = getSessionInputState(conversationId);
 	const input = state.activeInputId ? getSessionInputById(conversationId, state.activeInputId) : void 0;
-	return input?.payload ? getConnectionWait(input.payload.waitId)?.needs ?? [] : [];
+	if (!input) return [];
+	const wait = input.payload ? getConnectionWait(input.payload.waitId) : void 0;
+	const stored = getSqliteDatabase().prepare(`SELECT connector_id, account_id FROM connector_objective_accounts
+    WHERE conversation_id = ? AND transcript_id = ? AND objective_id = ?`).all(conversationId, readCurrentTranscriptId(getSqliteDatabase(), conversationId) ?? "", wait?.objectiveId ?? input.id);
+	return (wait?.needs ?? stored.map((row) => ({
+		key: `${row.connector_id}:${row.account_id}`,
+		connectorId: row.connector_id,
+		accountId: row.account_id,
+		label: getConnectorAccount(row.account_id)?.label ?? row.connector_id,
+		capabilities: []
+	}))).map((need) => {
+		const accountId = need.accountId ?? (need.connectionId ? getConnectorConnection(need.connectionId)?.accountId : void 0);
+		const account = accountId ? getConnectorAccount(accountId) : void 0;
+		return {
+			...need,
+			accountId,
+			connectionId: account?.currentConnectionId ?? need.connectionId
+		};
+	});
+}
+/** Changes to the objective or transcript invalidate an outstanding action approval. */
+function connectorObjectiveScope(conversationId) {
+	const state = getSessionInputState(conversationId);
+	const input = state.activeInputId ? getSessionInputById(conversationId, state.activeInputId) : void 0;
+	if (!input) return void 0;
+	const active = getActiveConnectionWait(conversationId);
+	const wait = input.payload ? getConnectionWait(input.payload.waitId) : active?.originInputId === input.id ? active : void 0;
+	return JSON.stringify([
+		readCurrentTranscriptId(getSqliteDatabase(), conversationId),
+		wait?.objectiveId ?? input.id,
+		wait?.objectiveRevision ?? 0
+	]);
+}
+function bindObjectiveAccount(conversationId, connectorId, accountId) {
+	const db = getSqliteDatabase();
+	const state = getSessionInputState(conversationId);
+	const input = state.activeInputId ? getSessionInputById(conversationId, state.activeInputId) : void 0;
+	if (!input) return;
+	const wait = input.payload ? getConnectionWait(input.payload.waitId) : void 0;
+	db.prepare(`INSERT OR IGNORE INTO connector_objective_accounts
+    (conversation_id, transcript_id, objective_id, connector_id, account_id) VALUES (?, ?, ?, ?, ?)`).run(conversationId, readCurrentTranscriptId(db, conversationId) ?? "", wait?.objectiveId ?? input.id, connectorId, accountId);
 }
 function connectionBinding(conversationId, connectorId) {
 	const matches = connectionBindings(conversationId).filter((need) => need.connectorId === connectorId);
@@ -334,15 +392,18 @@ function listConnectionWaitsToCheck() {
 }
 var log, events;
 var init_connection_wait_repository = __esmMin((() => {
+	init_connector_account_repository();
+	init_connector_repository();
 	init_logger();
 	init_task_run_repository();
 	init_connection();
 	init_transaction();
 	init_session_instance_repository();
+	init_session_repository();
 	init_session_input_repository();
 	log = createLogger("Connectors:Wait");
 	events = new EventEmitter();
 }));
 //#endregion
 init_connection_wait_repository();
-export { cancelConnectionObjective, connectionBinding, connectionBindings, consumeConnectionResume, getActiveConnectionWait, getConnectionResumeInput, getConnectionWait, init_connection_wait_repository, invalidateConnectionResumeIntent, isConnectionSuspended, listConnectionWaitsToCheck, onConnectionWaitChanged, publishConnectionWait, queueConnectionResolution, requireSessionConnection, reviseCurrentConnectionObjective, updateConnectionWait };
+export { bindObjectiveAccount, cancelConnectionObjective, connectionBinding, connectionBindings, connectorObjectiveScope, consumeConnectionResume, getActiveConnectionWait, getConnectionResumeInput, getConnectionWait, init_connection_wait_repository, invalidateConnectionResumeIntent, isConnectionSuspended, listConnectionWaitsToCheck, onConnectionWaitChanged, publishConnectionWait, queueConnectionResolution, requireSessionConnection, reviseCurrentConnectionObjective, updateConnectionWait };

package/dist/src/storage/sqlite/connector-account-repository.d.ts

@@ -1,5 +1,10 @@
 import type { ConnectorAccount } from '../../connectors/types.js';
 export declare function getConnectorAccount(id: string): ConnectorAccount | undefined;
+export declare function updateConnectorAccount(id: string, patch: {
+    label?: string;
+    enabled?: boolean;
+    allowedAgentIds?: string[] | null;
+}): ConnectorAccount;
 export declare function listConnectorAccounts(options?: {
     principalId?: string;
     connectorId?: string;
@@ -7,6 +12,7 @@ export declare function listConnectorAccounts(options?: {
 export declare function refreshConnectorAccountCurrent(accountId: string): ConnectorAccount | undefined;
 export declare function reconcileConnectorAccount(input: {
     connectionId: string;
+    backendId?: string;
     identityKey: string;
     identity: Record<string, unknown>;
 }): ConnectorAccount;

package/dist/src/storage/sqlite/connector-account-repository.js

@@ -1,6 +1,6 @@
+import { __esmMin } from "../../../_virtual/_rolldown/runtime.js";
 import { getSqliteDatabase, init_transaction, runSqliteWriteTransaction } from "./transaction.js";
 //#region src/storage/sqlite/connector-account-repository.ts
-init_transaction();
 function parseIdentity(value) {
 	try {
 		const parsed = JSON.parse(value);
@@ -15,8 +15,12 @@ function fromRow(row) {
 		connectorId: row.connector_id,
 		principalId: row.principal_id,
 		identityKey: row.identity_key ?? void 0,
+		backendId: row.backend_id ?? void 0,
 		identity: parseIdentity(row.identity_json),
 		currentConnectionId: row.current_connection_id ?? void 0,
+		label: row.label ?? void 0,
+		enabled: row.enabled === 1,
+		allowedAgentIds: row.allowed_agent_ids_json === null ? null : JSON.parse(row.allowed_agent_ids_json),
 		createdAt: row.created_at,
 		updatedAt: row.updated_at
 	};
@@ -74,6 +78,13 @@ function getConnectorAccount(id) {
 	const row = getSqliteDatabase().prepare("SELECT * FROM connector_accounts WHERE id = ?").get(id);
 	return row ? fromRow(row) : void 0;
 }
+function updateConnectorAccount(id, patch) {
+	const account = getConnectorAccount(id);
+	if (!account) throw new Error("Connector account not found.");
+	getSqliteDatabase().prepare(`UPDATE connector_accounts
+    SET label = ?, enabled = ?, allowed_agent_ids_json = ?, updated_at = ? WHERE id = ?`).run(patch.label === void 0 ? account.label ?? null : patch.label.trim() || null, patch.enabled ?? account.enabled ? 1 : 0, patch.allowedAgentIds === void 0 ? account.allowedAgentIds === null ? null : JSON.stringify(account.allowedAgentIds) : patch.allowedAgentIds === null ? null : JSON.stringify([...new Set(patch.allowedAgentIds)]), (/* @__PURE__ */ new Date()).toISOString(), id);
+	return getConnectorAccount(id);
+}
 function listConnectorAccounts(options = {}) {
 	const clauses = [];
 	const values = [];
@@ -109,13 +120,26 @@ function refreshConnectorAccountCurrent(accountId) {
 function reconcileConnectorAccount(input) {
 	const now = (/* @__PURE__ */ new Date()).toISOString();
 	return getConnectorAccount(runSqliteWriteTransaction((db) => {
-		const connection = db.prepare("SELECT account_id, connector_id, principal_id FROM connector_connections WHERE id = ?").get(input.connectionId);
+		const connection = db.prepare(`SELECT c.account_id, c.connector_id, c.principal_id, a.backend_id FROM connector_connections c
+       JOIN connector_accounts a ON a.id = c.account_id WHERE c.id = ?`).get(input.connectionId);
 		if (!connection?.account_id) throw new Error(`Connector connection not found: ${input.connectionId}`);
 		const targetId = db.prepare(`
       SELECT id FROM connector_accounts
-      WHERE principal_id = ? AND connector_id = ? AND identity_key = ?
-    `).get(connection.principal_id, connection.connector_id, input.identityKey)?.id ?? connection.account_id;
+      WHERE principal_id = ? AND connector_id = ? AND identity_key = ? AND backend_id IS ?
+    `).get(connection.principal_id, connection.connector_id, input.identityKey, input.backendId ?? connection.backend_id)?.id ?? connection.account_id;
 		if (targetId !== connection.account_id) {
+			db.prepare(`UPDATE connector_installations SET selected_account_ids_json = (
+        SELECT json_group_array(DISTINCT CASE WHEN value = ? THEN ? ELSE value END)
+        FROM json_each(connector_installations.selected_account_ids_json))
+        WHERE json_type(selected_account_ids_json) = 'array'
+        AND EXISTS (SELECT 1 FROM json_each(selected_account_ids_json) WHERE value = ?)`).run(connection.account_id, targetId, connection.account_id);
+			db.prepare(`INSERT OR IGNORE INTO connector_objective_accounts
+        SELECT conversation_id, transcript_id, objective_id, connector_id, ?
+        FROM connector_objective_accounts WHERE account_id = ?`).run(targetId, connection.account_id);
+			const source = getConnectorAccount(connection.account_id);
+			const target = getConnectorAccount(targetId);
+			const agents = source.allowedAgentIds === null ? target.allowedAgentIds : target.allowedAgentIds === null ? source.allowedAgentIds : target.allowedAgentIds.filter((id) => source.allowedAgentIds.includes(id));
+			db.prepare(`UPDATE connector_accounts SET enabled = ?, allowed_agent_ids_json = ?, label = COALESCE(label, ?) WHERE id = ?`).run(source.enabled && target.enabled ? 1 : 0, agents === null ? null : JSON.stringify(agents), source.label ?? null, targetId);
 			mergeAccountSourceData(db, connection.connector_id, connection.account_id, targetId);
 			if (db.prepare("SELECT 1 FROM connector_sync_policies WHERE account_id = ?").get(targetId)) db.prepare("DELETE FROM connector_sync_policies WHERE account_id = ?").run(connection.account_id);
 			else db.prepare("UPDATE connector_sync_policies SET account_id = ? WHERE account_id = ?").run(targetId, connection.account_id);
@@ -133,11 +157,15 @@ function reconcileConnectorAccount(input) {
 		if (!primary) throw new Error(`Connector account has no authorizations: ${targetId}`);
 		db.prepare(`
       UPDATE connector_accounts
-      SET identity_key = ?, identity_json = ?, current_connection_id = ?, updated_at = ?
+      SET identity_key = ?, identity_json = ?, current_connection_id = ?, updated_at = ?, backend_id = ?
       WHERE id = ?
-    `).run(input.identityKey, JSON.stringify(input.identity), primary.id, now, targetId);
+    `).run(input.identityKey, JSON.stringify(input.identity), primary.id, now, input.backendId ?? connection.backend_id, targetId);
 		return targetId;
 	}));
 }
+var init_connector_account_repository = __esmMin((() => {
+	init_transaction();
+}));
 //#endregion
-export { getConnectorAccount, listConnectorAccounts, reconcileConnectorAccount, refreshConnectorAccountCurrent };
+init_connector_account_repository();
+export { getConnectorAccount, init_connector_account_repository, listConnectorAccounts, reconcileConnectorAccount, refreshConnectorAccountCurrent, updateConnectorAccount };

package/dist/src/storage/sqlite/connector-repository.js

@@ -1,7 +1,7 @@
+import { __esmMin } from "../../../_virtual/_rolldown/runtime.js";
 import { getSqliteDatabase, init_transaction, runSqliteWriteTransaction } from "./transaction.js";
 import { randomUUID } from "node:crypto";
 //#region src/storage/sqlite/connector-repository.ts
-init_transaction();
 function parseStringArray(value) {
 	try {
 		const parsed = JSON.parse(value);
@@ -27,7 +27,7 @@ function installationFromRow(row) {
 		allowedAgentIds: parseStringArray(row.allowed_agent_ids_json),
 		maxScope: row.max_scope,
 		confirmationPolicy: row.confirmation_policy,
-		selectedConnectionIds: parseStringArray(row.selected_connection_ids_json),
+		selectedAccountIds: row.selected_account_ids_json === "null" ? null : parseStringArray(row.selected_account_ids_json),
 		createdAt: row.created_at,
 		updatedAt: row.updated_at
 	};
@@ -101,6 +101,7 @@ function catalogFromRow(row) {
 function approvalFromRow(row) {
 	return {
 		id: row.id,
+		waitId: row.wait_id ?? void 0,
 		principalId: row.principal_id,
 		connectorId: row.connector_id,
 		connectionId: row.connection_id ?? void 0,
@@ -129,9 +130,9 @@ function createConnectorApproval(input) {
       INSERT INTO connector_approvals (
         id, principal_id, connector_id, connection_id, agent_id, conversation_id, action_id,
         scope, arguments_hash, arguments_preview_json, status, expires_at, created_at,
-        decided_at, consumed_at
-      ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
-    `).run(record.id, record.principalId, record.connectorId, record.connectionId ?? null, record.agentId ?? null, record.conversationId ?? null, record.actionId, record.scope, record.argumentsHash, JSON.stringify(record.argumentsPreview), record.status, record.expiresAt, record.createdAt, record.decidedAt ?? null, record.consumedAt ?? null);
+        decided_at, consumed_at, wait_id
+      ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+    `).run(record.id, record.principalId, record.connectorId, record.connectionId ?? null, record.agentId ?? null, record.conversationId ?? null, record.actionId, record.scope, record.argumentsHash, JSON.stringify(record.argumentsPreview), record.status, record.expiresAt, record.createdAt, record.decidedAt ?? null, record.consumedAt ?? null, record.waitId ?? null);
 	});
 	return record;
 }
@@ -223,7 +224,7 @@ function upsertConnectorInstallation(input) {
 		db.prepare(`
       INSERT INTO connector_installations (
         id, connector_id, principal_id, enabled, allowed_agent_ids_json, max_scope,
-        confirmation_policy, selected_connection_ids_json, created_at, updated_at
+        confirmation_policy, selected_account_ids_json, created_at, updated_at
       ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
       ON CONFLICT(id) DO UPDATE SET
         connector_id = excluded.connector_id,
@@ -232,9 +233,9 @@ function upsertConnectorInstallation(input) {
         allowed_agent_ids_json = excluded.allowed_agent_ids_json,
         max_scope = excluded.max_scope,
         confirmation_policy = excluded.confirmation_policy,
-        selected_connection_ids_json = excluded.selected_connection_ids_json,
+        selected_account_ids_json = excluded.selected_account_ids_json,
         updated_at = excluded.updated_at
-    `).run(input.id, input.connectorId, input.principalId, input.enabled ? 1 : 0, JSON.stringify(input.allowedAgentIds), input.maxScope, input.confirmationPolicy, JSON.stringify(input.selectedConnectionIds), input.createdAt ?? now, input.updatedAt ?? now);
+    `).run(input.id, input.connectorId, input.principalId, input.enabled ? 1 : 0, JSON.stringify(input.allowedAgentIds), input.maxScope, input.confirmationPolicy, JSON.stringify(input.selectedAccountIds), input.createdAt ?? now, input.updatedAt ?? now);
 		return getConnectorInstallation(input.id);
 	});
 }
@@ -251,7 +252,7 @@ function deleteConnectorInstallation(id) {
 function upsertConnectorConnection(input) {
 	const now = (/* @__PURE__ */ new Date()).toISOString();
 	return runSqliteWriteTransaction((db) => {
-		const accountId = input.accountId ?? `account:${input.id}`;
+		const accountId = db.prepare("SELECT account_id FROM connector_connections WHERE id = ?").get(input.id)?.account_id ?? input.accountId ?? `account:${input.id}`;
 		db.prepare(`
       INSERT INTO connector_accounts (
         id, connector_id, principal_id, identity_json, current_connection_id, created_at, updated_at
@@ -400,5 +401,9 @@ function releaseConnectorWebhookDelivery(id, error) {
     `).run(message.slice(0, 500), id);
 	});
 }
+var init_connector_repository = __esmMin((() => {
+	init_transaction();
+}));
 //#endregion
-export { appendConnectorExecutionAudit, claimConnectorWebhookDelivery, completeConnectorWebhookDelivery, consumeConnectorApproval, createConnectorApproval, decideConnectorApproval, deleteConnectorConnection, deleteConnectorInstallation, getCachedConnectorCatalogEntry, getConnectorApproval, getConnectorConnection, getConnectorInstallation, listCachedConnectorCatalogEntries, listConnectorActionMetadata, listConnectorApprovals, listConnectorConnections, listConnectorExecutionAudit, listConnectorInstallations, releaseConnectorWebhookDelivery, replaceConnectorCatalogEntries, upsertConnectorActionMetadata, upsertConnectorCatalogEntry, upsertConnectorConnection, upsertConnectorInstallation };
+init_connector_repository();
+export { appendConnectorExecutionAudit, claimConnectorWebhookDelivery, completeConnectorWebhookDelivery, consumeConnectorApproval, createConnectorApproval, decideConnectorApproval, deleteConnectorConnection, deleteConnectorInstallation, getCachedConnectorCatalogEntry, getConnectorApproval, getConnectorConnection, getConnectorInstallation, init_connector_repository, listCachedConnectorCatalogEntries, listConnectorActionMetadata, listConnectorApprovals, listConnectorConnections, listConnectorExecutionAudit, listConnectorInstallations, releaseConnectorWebhookDelivery, replaceConnectorCatalogEntries, upsertConnectorActionMetadata, upsertConnectorCatalogEntry, upsertConnectorConnection, upsertConnectorInstallation };