@xopcai/xopc 0.0.332 → 0.0.333

package/dist/src/capabilities/store-connector.js

@@ -1,10 +1,65 @@
 import { getCliAdapter } from "../connectors/cli/adapterRegistry.js";
-import { downloadConnectorStoreZipBuffer, fetchStoreConnectorPackageDetail, listConnectorPackages, resolveSkillsStoreBaseUrl } from "../agent/skills/marketplace/adapters/store/store-api-client.js";
+import { listConnectorInstances } from "../connectors/instances.js";
 import { installConnectorDefinition } from "../connectors/install.js";
+import { downloadConnectorStoreZipBuffer, fetchStoreConnectorPackageDetail, listConnectorPackages, resolveSkillsStoreBaseUrl } from "../agent/skills/marketplace/adapters/store/store-api-client.js";
 import { createHash } from "node:crypto";
 import { isIP } from "node:net";
 import AdmZip from "adm-zip";
 //#region src/capabilities/store-connector.ts
+const STORE_CONNECTOR_CANDIDATE_PREFIX = "store-connector:";
+function storeConnectorCandidateRef(packageName, version) {
+	return `${STORE_CONNECTOR_CANDIDATE_PREFIX}${encodeURIComponent(packageName)}:${encodeURIComponent(version)}`;
+}
+function parseStoreConnectorCandidateRef(ref) {
+	if (!ref.startsWith(STORE_CONNECTOR_CANDIDATE_PREFIX)) return void 0;
+	const parts = ref.slice(16).split(":");
+	if (parts.length !== 2) return void 0;
+	try {
+		const packageName = decodeURIComponent(parts[0]);
+		const version = decodeURIComponent(parts[1]);
+		return packageName && version ? {
+			packageName,
+			version
+		} : void 0;
+	} catch {
+		return;
+	}
+}
+function manifestCapabilities(value) {
+	if (!value || typeof value !== "object" || Array.isArray(value)) return ["connector.tools"];
+	const manifest = value;
+	if (!Array.isArray(manifest.provides)) return ["connector.tools"];
+	const values = manifest.provides.flatMap((entry) => {
+		if (typeof entry === "string" && entry.trim()) return [entry.trim()];
+		if (!entry || typeof entry !== "object" || Array.isArray(entry)) return [];
+		const id = entry.id;
+		return typeof id === "string" && id.trim() ? [id.trim()] : [];
+	});
+	return values.length ? [...new Set(values)].slice(0, 20) : ["connector.tools"];
+}
+async function searchStoreConnectorInstallCandidates(config, query, limit = 5) {
+	const result = await listStoreConnectors(config, {
+		q: query,
+		page: 1,
+		pageSize: Math.min(10, Math.max(1, limit)),
+		sort: "downloads"
+	});
+	const installed = new Set(listConnectorInstances(config).map((instance) => instance.connectorId));
+	return result.items.filter((item) => item.type === "connector" && !installed.has(item.name) && typeof item.latestVersion === "string" && item.latestVersion).slice(0, limit).map((item) => ({
+		candidateRef: storeConnectorCandidateRef(item.name, item.latestVersion),
+		source: "store",
+		packageName: item.name,
+		version: item.latestVersion,
+		label: (() => {
+			const manifest = item.connectorManifest;
+			if (!manifest || typeof manifest !== "object" || Array.isArray(manifest)) return item.name;
+			const displayName = manifest.displayName;
+			return typeof displayName === "string" && displayName.trim() ? displayName.trim() : item.name;
+		})(),
+		summary: item.description,
+		capabilities: manifestCapabilities(item.connectorManifest)
+	}));
+}
 function asRecord(value, label) {
 	if (!value || typeof value !== "object" || Array.isArray(value)) throw new Error(`${label} must be an object.`);
 	return value;
@@ -308,15 +363,26 @@ async function getStoreConnectorInstallPlan(config, packageName, version) {
 		version: detail.latestVersion.version,
 		permissions: definition.permissions ?? {},
 		requiresRestart: false,
+		reviewHash: createHash("sha256").update(JSON.stringify({
+			packageName: detail.name,
+			version: detail.latestVersion.version,
+			sha256: actualSha256,
+			permissions: definition.permissions ?? {},
+			capabilities: definition.capabilities,
+			auth: definition.auth,
+			setup: definition.setup,
+			runtime: definition.runtime
+		})).digest("hex"),
 		definition
 	};
 }
-async function installStoreConnector(config, packageName, input, version) {
+async function installStoreConnector(config, packageName, input, version, reviewHash) {
 	const plan = await getStoreConnectorInstallPlan(config, packageName, version);
+	if (!reviewHash || reviewHash !== plan.reviewHash) throw new Error(reviewHash ? "Connector package changed after review; inspect it again." : "Connector capability review is required.");
 	return {
 		instance: await installConnectorDefinition(config, plan.definition, input),
 		plan
 	};
 }
 //#endregion
-export { getStoreConnectorInstallPlan, installStoreConnector, listStoreConnectors };
+export { getStoreConnectorInstallPlan, installStoreConnector, listStoreConnectors, parseStoreConnectorCandidateRef, searchStoreConnectorInstallCandidates, storeConnectorCandidateRef };

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

@@ -1,5 +1,5 @@
-import { loadConfig, saveConfig } from "../../config/loader.js";
 import { getStoreConnectorInstallPlan, installStoreConnector, listStoreConnectors } from "../../capabilities/store-connector.js";
+import { loadConfig, saveConfig } from "../../config/loader.js";
 import { register } from "../registry.js";
 import { confirm } from "@inquirer/prompts";
 import { Command } from "commander";
@@ -52,7 +52,8 @@ function createConnectorsCommand(ctx) {
 	command.command("install <packageName>").description("Verify and install a connector capability from xopc-store").option("--version <version>", "Install an exact version").option("--secret <KEY=VALUE>", "Provide a required secret; repeat for multiple values", (value, previous = []) => [...previous, value], []).option("--config-value <KEY=VALUE>", "Provide a connector config value; repeat for multiple values", (value, previous = []) => [...previous, value], []).option("-y, --yes", "Skip the interactive confirmation", false).action(async (packageName, options) => {
 		try {
 			const config = loadConfig(ctx.configPath);
-			printPlan(await getStoreConnectorInstallPlan(config, packageName, options.version));
+			const plan = await getStoreConnectorInstallPlan(config, packageName, options.version);
+			printPlan(plan);
 			if (!options.yes && process.stdin.isTTY) {
 				if (!await confirm({
 					message: "Install this connector?",
@@ -65,7 +66,7 @@ function createConnectorsCommand(ctx) {
 			const { instance } = await installStoreConnector(config, packageName, {
 				secrets: parsePairs(options.secret, "--secret"),
 				config: parsePairs(options.configValue, "--config-value")
-			}, options.version);
+			}, options.version, plan.reviewHash);
 			await saveConfig(config, ctx.configPath);
 			console.log(`Installed ${instance.displayName} (${instance.instanceId}).`);
 		} catch (error) {

package/dist/src/cli/commands/doctor/checks/automation-integrity.d.ts

@@ -0,0 +1,2 @@
+import type { CheckResult, DoctorContext } from '../types.js';
+export declare function checkAutomationIntegrity(ctx: DoctorContext): Promise<CheckResult>;

package/dist/src/cli/commands/doctor/checks/automation-integrity.js

@@ -0,0 +1,55 @@
+import { requireXopcDatabase } from "../../../../storage/sqlite/connection.js";
+import { getSqliteDatabase } from "../../../../storage/sqlite/transaction.js";
+import { init_sqlite } from "../../../../storage/sqlite/index.js";
+import { existsSync } from "node:fs";
+//#region src/cli/commands/doctor/checks/automation-integrity.ts
+init_sqlite();
+async function checkAutomationIntegrity(ctx) {
+	if (!ctx.options.deep) return {
+		id: "automation-integrity",
+		label: "Automations",
+		status: "skip",
+		message: "Deep mode off; automation scan skipped.",
+		hints: ["Run: xopc doctor --deep"]
+	};
+	if (!existsSync(ctx.configPath)) return {
+		id: "automation-integrity",
+		label: "Automations",
+		status: "skip",
+		message: "No config file; skipped.",
+		hints: []
+	};
+	requireXopcDatabase();
+	const db = getSqliteDatabase();
+	const issues = [];
+	const orphanResults = db.prepare(`SELECT r.run_id FROM automation_results r
+    LEFT JOIN automation_runs ar ON ar.run_id = r.run_id WHERE ar.run_id IS NULL LIMIT 20`).all();
+	for (const row of orphanResults) issues.push(`orphan result ${row.run_id}`);
+	const orphanResultDeliveries = db.prepare(`SELECT d.run_id, d.destination_key FROM automation_result_deliveries d
+    LEFT JOIN automation_results r ON r.run_id = d.run_id WHERE r.run_id IS NULL LIMIT 20`).all();
+	for (const row of orphanResultDeliveries) issues.push(`orphan result delivery ${row.run_id}/${row.destination_key}`);
+	const orphanEventRuns = db.prepare(`SELECT d.event_id, d.automation_id, d.run_id FROM automation_event_deliveries d
+    LEFT JOIN automation_runs r ON r.run_id = d.run_id
+    WHERE d.run_id IS NOT NULL AND r.run_id IS NULL LIMIT 20`).all();
+	for (const row of orphanEventRuns) issues.push(`orphan event delivery run ${row.event_id}/${row.automation_id}/${row.run_id}`);
+	const expiredLeases = db.prepare(`SELECT
+    (SELECT COUNT(*) FROM automation_events WHERE projection_status = 'projecting' AND projection_lease_until_ms <= ?) +
+    (SELECT COUNT(*) FROM automation_event_deliveries WHERE lease_owner IS NOT NULL AND lease_until_ms <= ?) +
+    (SELECT COUNT(*) FROM automation_result_deliveries WHERE status = 'delivering' AND lease_until_ms <= ?) AS count`).get(Date.now(), Date.now(), Date.now());
+	if (expiredLeases.count > 0) issues.push(`${expiredLeases.count} expired automation lease(s) awaiting recovery`);
+	return issues.length === 0 ? {
+		id: "automation-integrity",
+		label: "Automations",
+		status: "pass",
+		message: "Automation state graph OK.",
+		hints: []
+	} : {
+		id: "automation-integrity",
+		label: "Automations",
+		status: "warn",
+		message: `${issues.length} automation integrity issue(s).`,
+		hints: issues
+	};
+}
+//#endregion
+export { checkAutomationIntegrity };

package/dist/src/cli/commands/doctor/checks/database-relations.d.ts

@@ -0,0 +1,2 @@
+import type { CheckResult, DoctorContext } from '../types.js';
+export declare function checkDatabaseRelations(ctx: DoctorContext): Promise<CheckResult>;

package/dist/src/cli/commands/doctor/checks/database-relations.js

@@ -0,0 +1,81 @@
+import { requireXopcDatabase } from "../../../../storage/sqlite/connection.js";
+import { getSqliteDatabase } from "../../../../storage/sqlite/transaction.js";
+import { init_sqlite } from "../../../../storage/sqlite/index.js";
+import { existsSync } from "node:fs";
+//#region src/cli/commands/doctor/checks/database-relations.ts
+init_sqlite();
+const IMPLICIT_RELATION_CHECKS = [
+	["session active transcript", `SELECT COUNT(*) AS count FROM sessions s
+    LEFT JOIN transcripts t ON t.transcript_id = s.active_transcript_id
+    WHERE t.transcript_id IS NULL`],
+	["session project", `SELECT COUNT(*) AS count FROM sessions s
+    LEFT JOIN projects p ON p.project_id = s.project_id
+    WHERE s.project_id IS NOT NULL AND p.project_id IS NULL`],
+	["queued session input", `SELECT COUNT(*) AS count FROM session_inputs i
+    LEFT JOIN sessions s ON s.conversation_id = i.conversation_id
+    WHERE s.conversation_id IS NULL`],
+	["discussion action task", `SELECT COUNT(*) AS count FROM discussion_action_tasks a
+    LEFT JOIN tasks t ON t.task_id = a.task_id
+    WHERE t.task_id IS NULL`],
+	["workflow event run", `SELECT COUNT(*) AS count FROM workflow_events e
+    LEFT JOIN workflow_runs r ON r.run_id = e.run_id
+    WHERE r.run_id IS NULL`],
+	["local app active release", `SELECT COUNT(*) AS count FROM local_apps a
+    LEFT JOIN local_app_releases r ON r.release_id = a.active_release_id
+    WHERE a.active_release_id IS NOT NULL AND r.release_id IS NULL`],
+	["automation run owner", `SELECT COUNT(*) AS count FROM automation_runs r
+    LEFT JOIN automations a ON a.automation_id = r.automation_id
+    WHERE a.automation_id IS NULL`],
+	["automation run event", `SELECT COUNT(*) AS count FROM automation_run_events e
+    LEFT JOIN automation_runs r ON r.run_id = e.run_id
+    WHERE r.run_id IS NULL`],
+	["automation event delivery owner", `SELECT COUNT(*) AS count FROM automation_event_deliveries d
+    LEFT JOIN automations a ON a.automation_id = d.automation_id
+    WHERE a.automation_id IS NULL`]
+];
+async function checkDatabaseRelations(ctx) {
+	if (!ctx.options.deep) return {
+		id: "database-relations",
+		label: "Database relations",
+		status: "skip",
+		message: "Deep mode off; relation scan skipped.",
+		hints: ["Run: xopc doctor --deep"]
+	};
+	if (!existsSync(ctx.configPath)) return {
+		id: "database-relations",
+		label: "Database relations",
+		status: "skip",
+		message: "No config file; skipped.",
+		hints: []
+	};
+	requireXopcDatabase();
+	const db = getSqliteDatabase();
+	const issues = [];
+	const tables = new Set(db.prepare(`SELECT name FROM sqlite_master WHERE type = 'table'`).all().map((row) => row.name));
+	for (const table of tables) {
+		const escaped = table.replaceAll("\"", "\"\"");
+		const foreignKeys = db.prepare(`PRAGMA foreign_key_list("${escaped}")`).all();
+		for (const foreignKey of foreignKeys) if (!tables.has(foreignKey.table)) issues.push(`missing foreign-key target ${table} -> ${foreignKey.table}`);
+	}
+	const violations = db.prepare("PRAGMA foreign_key_check").all();
+	for (const violation of violations.slice(0, 20)) issues.push(`foreign-key violation ${violation.table} row ${violation.rowid ?? "?"} -> ${violation.parent}`);
+	for (const [label, sql] of IMPLICIT_RELATION_CHECKS) {
+		const row = db.prepare(sql).get();
+		if (row.count > 0) issues.push(`${row.count} orphan ${label} record(s)`);
+	}
+	return issues.length === 0 ? {
+		id: "database-relations",
+		label: "Database relations",
+		status: "pass",
+		message: "Foreign-key and core implicit relations OK.",
+		hints: []
+	} : {
+		id: "database-relations",
+		label: "Database relations",
+		status: "warn",
+		message: `${issues.length} database relation issue(s).`,
+		hints: issues.slice(0, 20)
+	};
+}
+//#endregion
+export { checkDatabaseRelations };

package/dist/src/cli/commands/doctor/checks/database-schema.js

@@ -53,7 +53,7 @@ async function checkDatabaseSchema(ctx) {
 		id: "database-schema",
 		label: "Database schema",
 		status: "pass",
-		message: `SQLite schema v${status.dbVersion} (current release v208).`,
+		message: `SQLite schema v${status.dbVersion} (current release v222).`,
 		hints: []
 	};
 }

package/dist/src/cli/commands/doctor/flow.js

@@ -3,6 +3,7 @@ import { checkNodeVersion } from "./checks/node-version.js";
 import { checkConfigHealth } from "./checks/config-health.js";
 import { checkStateIntegrity } from "./checks/state-integrity.js";
 import { checkDatabaseSchema } from "./checks/database-schema.js";
+import { checkDatabaseRelations } from "./checks/database-relations.js";
 import { checkProviderAuth } from "./checks/provider-auth.js";
 import { checkChannelConfig } from "./checks/channel-config.js";
 import { checkChannelPairingPending } from "./checks/channel-pairing-pending.js";
@@ -16,6 +17,7 @@ import { checkChannelPlugins } from "./checks/channel-plugins.js";
 import { checkMigrations } from "./checks/migrations.js";
 import { checkImageProviders } from "./checks/image-providers.js";
 import { checkToolRuntimes } from "./checks/tool-runtimes.js";
+import { checkAutomationIntegrity } from "./checks/automation-integrity.js";
 //#region src/cli/commands/doctor/flow.ts
 const DOCTOR_CHECKS = [
 	checkVersionUpdate,
@@ -25,6 +27,7 @@ const DOCTOR_CHECKS = [
 	checkConfigHealth,
 	checkStateIntegrity,
 	checkDatabaseSchema,
+	checkDatabaseRelations,
 	checkProviderAuth,
 	checkImageProviders,
 	checkChannelConfig,
@@ -33,7 +36,8 @@ const DOCTOR_CHECKS = [
 	checkWorkspaceStatus,
 	checkGatewayService,
 	checkGatewayHealth,
-	checkSessionIntegrity
+	checkSessionIntegrity,
+	checkAutomationIntegrity
 ];
 /**
 * Headless data collection — used by both CLI and gateway API.

package/dist/src/cli/commands/extension-marketplace.js

@@ -1,7 +1,7 @@
 import { init_paths, resolveExtensionsDir } from "../../config/paths.js";
+import { downloadExtensionStoreZipBuffer, resolveExtensionZipDownloadUrl, resolveExtensionsStoreBaseUrl, verifyStoreArtifactSha256 } from "../../agent/skills/marketplace/adapters/store/store-api-client.js";
 import { computeExtensionDirectoryIntegrity, getExtensionLockfileManager } from "../../extensions/lockfile.js";
 import { AgentPluginStore } from "../../extensions/agent-plugins/store.js";
-import { downloadExtensionStoreZipBuffer, resolveExtensionZipDownloadUrl, resolveExtensionsStoreBaseUrl, verifyStoreArtifactSha256 } from "../../agent/skills/marketplace/adapters/store/store-api-client.js";
 import { loadConfig } from "../../config/loader.js";
 import { getContextWithOpts } from "../context.js";
 import { peekExtensionManifestFromStoreZip } from "../../extensions/install.js";

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

@@ -1,10 +1,10 @@
 import { resolveStateDir } from "../../config/paths-state.js";
 import { init_paths, resolveBundledSkillsDir, resolveSkillsLockPath } from "../../config/paths.js";
+import { loadSkillsLock } from "../../agent/skills/hub-lock.js";
 import { findInstallSpec, hasBinary, installSkill } from "../../agent/skills/installer.js";
 import { createSkillConfigManager, isSkillEnabled } from "../../agent/skills/config.js";
 import { formatScanSummary, scanSkillDirectory } from "../../agent/skills/scanner.js";
 import { createSkillLoader } from "../../agent/skills/index.js";
-import { loadSkillsLock } from "../../agent/skills/hub-lock.js";
 import { pullSkillFromSource, updateSkillFromLock } from "../../agent/skills/hub-pull.js";
 import { ProjectTrustStore } from "../../project-trust/trust-store.js";
 import { loadConfig } from "../../config/loader.js";

package/dist/src/connectors/approval-resume.js

@@ -9,7 +9,7 @@ async function resumeApprovedConnectorAction(approval, recovery) {
 	if (!wait || wait.id !== approval.waitId || wait.principalId !== approval.principalId || wait.agentId !== approval.agentId || wait.status !== "open") return false;
 	try {
 		return (await recovery.act(wait.conversationId, {
-			action: "continue",
+			action: "check",
 			waitId: wait.id,
 			expectedTranscriptId: wait.transcriptId,
 			expectedVersion: wait.version,

package/dist/src/connectors/cli/store.js

@@ -93,7 +93,7 @@ function commitCliIdentity(attempt, identity) {
 			}
 		});
 		db.prepare(`UPDATE connector_accounts SET runtime_instance_id = ?, identity_key = ?, identity_json = ?,
-      enabled = 1, label = COALESCE(label, ?), current_connection_id = ?, updated_at = ? WHERE id = ?`).run(attempt.instance_id, identity.key, JSON.stringify(identity.identity), identity.label, connectionId, (/* @__PURE__ */ new Date()).toISOString(), accountId);
+      enabled = 1, label = COALESCE(label, ?), current_connection_id = ?, updated_at = ? WHERE id = ?`).run(attempt.instance_id, identity.key, JSON.stringify(identity.identity), identity.label, connectionId, Date.now(), accountId);
 		db.prepare("UPDATE connector_connections SET status = 'disabled' WHERE account_id = ? AND id <> ? AND provider = 'cli'").run(accountId, connectionId);
 		updateCliAuthorization(attempt.id, {
 			phase: "succeeded",

package/dist/src/connectors/composio-backends.js

@@ -1,19 +1,29 @@
 import { getSqliteDatabase, init_transaction, runSqliteWriteTransaction } from "../storage/sqlite/transaction.js";
+import { init_timestamps, optionalTimestampToIso, timestampToIso } from "../storage/sqlite/timestamps.js";
 import { CredentialResolver, init_credentials } from "../auth/credentials.js";
 import { randomUUID } from "node:crypto";
 //#region src/connectors/composio-backends.ts
 init_credentials();
+init_timestamps();
 init_transaction();
+function fromRow(row) {
+	return {
+		...row,
+		verified_at: optionalTimestampToIso(row.verified_at) ?? null,
+		created_at: timestampToIso(row.created_at)
+	};
+}
 function listComposioBackends() {
-	return getSqliteDatabase().prepare("SELECT * FROM connector_backends ORDER BY created_at").all();
+	return getSqliteDatabase().prepare("SELECT * FROM connector_backends ORDER BY created_at").all().map(fromRow);
 }
 function getComposioBackend(id) {
-	return id ? getSqliteDatabase().prepare("SELECT * FROM connector_backends WHERE id = ?").get(id) : getSqliteDatabase().prepare("SELECT * FROM connector_backends WHERE active = 1").get();
+	const row = id ? getSqliteDatabase().prepare("SELECT * FROM connector_backends WHERE id = ?").get(id) : getSqliteDatabase().prepare("SELECT * FROM connector_backends WHERE active = 1").get();
+	return row ? fromRow(row) : void 0;
 }
 function addComposioBackend(input) {
 	const id = input.id ?? randomUUID();
 	getSqliteDatabase().prepare(`INSERT INTO connector_backends(id, mode, label, credential_ref, credential_source, created_at)
-    VALUES (?, ?, ?, ?, ?, ?)`).run(id, input.mode, input.label, input.credentialRef ?? null, input.credentialSource ?? "stored", (/* @__PURE__ */ new Date()).toISOString());
+    VALUES (?, ?, ?, ?, ?, ?)`).run(id, input.mode, input.label, input.credentialRef ?? null, input.credentialSource ?? "stored", Date.now());
 	return getComposioBackend(id);
 }
 function activateComposioBackend(id) {
@@ -59,7 +69,7 @@ async function resolveBackendKey(backend, resolver = new CredentialResolver()) {
 	return null;
 }
 function markComposioBackendVerified(id) {
-	getSqliteDatabase().prepare("UPDATE connector_backends SET verified_at = ? WHERE id = ?").run((/* @__PURE__ */ new Date()).toISOString(), id);
+	getSqliteDatabase().prepare("UPDATE connector_backends SET verified_at = ? WHERE id = ?").run(Date.now(), id);
 }
 //#endregion
 export { activateComposioBackend, addComposioBackend, ensureComposioBackend, getComposioBackend, listComposioBackends, markComposioBackendVerified, removeComposioBackend, resolveBackendKey };

package/dist/src/connectors/composio-managed-events.d.ts

@@ -21,11 +21,14 @@ export declare class ManagedComposioEventPoller {
     private syncing?;
     constructor(input: {
         getConfig: () => Config;
-        triggerAutomation: (event: {
+        ingestEvent: (event: {
+            id: string;
             type: string;
             source: string;
             payload: Record<string, unknown>;
-        }) => Promise<unknown>;
+            dedupeKey: string;
+            trust: 'connector';
+        }) => unknown;
         requestLearning: (toolkit: string) => void;
         setLearningPaused: (connectionId: string, paused: boolean) => void;
         client?: ManagedEventClient;

package/dist/src/connectors/composio-managed-events.js

@@ -89,9 +89,12 @@ var ManagedComposioEventPoller = class {
 			await appendComposioTriggerEvent(config, payload);
 			const toolkit = normalized.toolkit ?? event.toolkit;
 			if (toolkit) this.input.requestLearning(toolkit);
-			await this.input.triggerAutomation({
+			this.input.ingestEvent({
+				id: `connector:composio:${event.id}`,
 				type: `connector.${normalized.trigger ?? normalized.type}`,
 				source: toolkit ? `composio:${toolkit}` : "composio",
+				dedupeKey: event.id,
+				trust: "connector",
 				payload: {
 					...normalized.data,
 					connectorId: toolkit ? `composio-${toolkit}` : "composio",

package/dist/src/connectors/connection-recovery-service.d.ts

@@ -8,11 +8,12 @@ export type ConnectionAction = {
     expectedTranscriptId: string;
     expectedVersion: number;
     idempotencyKey: string;
-    action: 'connect' | 'check' | 'continue' | 'skip' | 'cancel' | 'select_account' | 'confirm_scope' | 'replace_source' | 'submit_callback';
+    action: 'install_complete' | 'connect' | 'check' | 'skip' | 'cancel' | 'select_account' | 'confirm_scope' | 'replace_source' | 'submit_callback';
     needKey?: string;
     accountId?: string;
     candidateRef?: string;
     callbackUrl?: string;
+    instanceId?: string;
 };
 /** Authorization lives at click time. Chat history contains only immutable explanations. */
 export declare class ConnectionRecoveryService {

package/dist/src/connectors/connection-recovery-service.js

@@ -16,8 +16,8 @@ import { getInstalledConnectorDefinition, listConnectorInstances } from "./insta
 import { describeCliAction, verifyCliConnection } from "./cli/runtime.js";
 import { connectorPrincipalForSession } from "./principal.js";
 import { capabilityActions, isToolInputSchema, missingConnectionCapabilities } from "./connection-capabilities.js";
-import { resolveConnectionCandidate } from "./connection-candidates.js";
 import { installConnector } from "./install.js";
+import { resolveConnectionCandidate } from "./connection-candidates.js";
 import { persistConfigMutation } from "../config/config-mutation.js";
 import { HostPluginMcpRecovery } from "./plugin-mcp-recovery.js";
 import { randomUUID } from "node:crypto";
@@ -108,6 +108,32 @@ var ConnectionRecoveryService = class {
 					...availability.reason || need.capabilityError ? { reason: availability.reason ?? need.capabilityError } : {}
 				};
 			}
+			if (need.target.type === "store-connector") {
+				const target = need.target;
+				const instance = listConnectorInstances(this.deps.getConfig()).find((item) => item.connectorId === target.connectorId);
+				const definition = instance ? getInstalledConnectorDefinition(this.deps.getConfig(), instance.instanceId) : void 0;
+				const digestMatches = definition?.provenance?.packageName === target.packageName && definition.provenance.sha256 === target.sha256 && definition.version === target.version;
+				const unhealthy = instance && (!instance.enabled || [
+					"failed",
+					"disabled",
+					"not_configured",
+					"unauthorized",
+					"degraded"
+				].includes(instance.status) || [
+					"missing",
+					"expired",
+					"unauthorized"
+				].includes(instance.authStatus ?? ""));
+				const phase = !instance ? "install" : !digestMatches || unhealthy ? "blocked" : "ready";
+				return {
+					...need,
+					...instance ? { connectionId: instance.instanceId } : {},
+					phase,
+					accounts: [],
+					alternatives: [],
+					...phase === "blocked" ? { reason: !digestMatches ? "The installed Connector does not match the reviewed Store package." : "Connector setup is incomplete. Review its settings and try again." } : {}
+				};
+			}
 			const id = need.target.connectorId;
 			const instance = listConnectorInstances(this.deps.getConfig()).find((instance) => instance.connectorId === id);
 			const installation = getConnectorInstallation(`${id}-${wait.principalId}`);
@@ -193,7 +219,7 @@ var ConnectionRecoveryService = class {
 			}))
 		}, verified).needs;
 		return Promise.all(wait.needs.map(async (need) => {
-			if (need.target.type === "plugin-mcp") return need;
+			if (need.target.type === "plugin-mcp" || need.target.type === "store-connector") return need;
 			if (views.find((view) => view.key === need.key)?.phase !== "ready") return {
 				...need,
 				capabilityError: void 0
@@ -370,6 +396,50 @@ var ConnectionRecoveryService = class {
 					intent: void 0
 				}, "skipped");
 				this.deps.drain(conversationId);
+			} else if (action.action === "install_complete") {
+				const need = wait.needs.find((need) => need.key === action.needKey);
+				if (!need || need.target.type !== "store-connector" || !action.instanceId) throw new Error("Unknown Store Connector installation.");
+				const instance = listConnectorInstances(this.deps.getConfig()).find((item) => item.instanceId === action.instanceId);
+				const definition = instance ? getInstalledConnectorDefinition(this.deps.getConfig(), instance.instanceId) : void 0;
+				if (!instance || instance.connectorId !== need.target.connectorId || !instance.enabled || definition?.provenance?.packageName !== need.target.packageName || definition.provenance.sha256 !== need.target.sha256 || definition.version !== need.target.version) throw new Error("The installed Connector does not match the reviewed package.");
+				if ([
+					"failed",
+					"disabled",
+					"not_configured",
+					"unauthorized",
+					"degraded"
+				].includes(instance.status) || [
+					"missing",
+					"expired",
+					"unauthorized"
+				].includes(instance.authStatus ?? "")) throw new Error("Connector setup is incomplete. Finish setup before continuing.");
+				wait = updateConnectionWait({
+					...wait,
+					needs: wait.needs.map((item) => item.key === need.key ? {
+						...item,
+						connectionId: instance.instanceId,
+						unavailable: false,
+						capabilityError: void 0
+					} : item),
+					intent: {
+						objectiveRevision: wait.objectiveRevision,
+						validUntil: Date.now() + INTENT_TTL
+					}
+				}, wait.version);
+				const view = this.view(wait);
+				if (view.phase === "ready") {
+					queueConnectionResolution({
+						...wait,
+						needs: view.needs.map(({ phase: _phase, accounts: _accounts, reason: _reason, alternatives: _alternatives, ...item }) => item)
+					}, "continued");
+					log.info({
+						conversationId,
+						waitId: wait.id,
+						objectiveRevision: wait.objectiveRevision,
+						phase: "resume_queued"
+					}, "Connector installation continuation queued");
+					this.deps.drain(conversationId);
+				}
 			} else if (action.action === "connect") {
 				const need = wait.needs.find((need) => need.key === action.needKey);
 				if (!need) throw new Error("Unknown connection requirement.");
@@ -498,6 +568,18 @@ var ConnectionRecoveryService = class {
 				if (!latest || latest.version !== wait.version || latest.status !== "open") throw new Error("WAIT_CHANGED");
 				let needs = wait.needs.map((need) => {
 					if (need.target.type === "plugin-mcp") return need;
+					if (need.target.type === "store-connector") {
+						const selected = this.view({
+							...wait,
+							needs
+						}).needs.find((item) => item.key === need.key);
+						return selected?.phase === "ready" ? {
+							...need,
+							connectionId: selected.connectionId,
+							unavailable: false,
+							capabilityError: void 0
+						} : need;
+					}
 					const id = need.target.connectorId;
 					const authorized = fresh.find((item) => item.providerConnectionId === need.attempt?.connectionId && item.status === "active" && item.connectorId === id && (!need.accountId || item.accountId === need.accountId));
 					return authorized ? {
@@ -540,7 +622,10 @@ var ConnectionRecoveryService = class {
 					needs
 				}, verified);
 				if (getConnectionWait(wait.id)?.version !== wait.version) throw new Error("WAIT_CHANGED");
-				const explicitContinue = action.action === "continue" || action.action === "confirm_scope";
+				const readyWithoutReview = this.view({
+					...wait,
+					needs
+				}, verified).phase === "ready";
 				wait = updateConnectionWait({
 					...wait,
 					needs,
@@ -548,7 +633,7 @@ var ConnectionRecoveryService = class {
 						scopeConfirmedAt: Date.now(),
 						reviewRequired: false
 					} : {},
-					...needs.some((need) => need.capabilityError) ? { intent: void 0 } : explicitContinue ? { intent: {
+					...needs.some((need) => need.capabilityError) ? { intent: void 0 } : readyWithoutReview || action.action === "confirm_scope" ? { intent: {
 						objectiveRevision: wait.objectiveRevision,
 						validUntil: Date.now() + INTENT_TTL
 					} } : {}

package/dist/src/discussions/analyzer.js

@@ -188,7 +188,7 @@ async function analyzeDiscussion(input) {
 			maxTokens: 8e3,
 			temperature: .1,
 			signal: input.signal
-		})).content)));
+		}, void 0, { operation: "discussion.analyze" })).content)));
 		validateDiscussionEvidence(organization, new Set(batch.map((segment) => segment.sequence)));
 		organization.chapters = [{
 			title: organization.title,
@@ -234,7 +234,7 @@ async function analyzeDiscussion(input) {
 			maxTokens: 2e3,
 			temperature: 0,
 			signal: input.signal
-		});
+		}, void 0, { operation: "discussion.analyze" });
 		const parsed = MeetingChangesSchema.parse(parseJsonObject(extractText(response.content)));
 		if (parsed.changes.some((change) => change.fromId === change.toId || !earlier.some((item) => item.id === change.fromId) || !later.some((item) => item.id === change.toId))) throw new Error("Invalid meeting change evidence");
 		getSqliteDatabase().prepare("INSERT OR REPLACE INTO discussion_analysis_chunks (discussion_id,input_hash,result_json) VALUES (?,?,?)").run(input.discussionId, cacheKey, JSON.stringify(parsed));
@@ -260,7 +260,7 @@ async function analyzeDiscussion(input) {
 				maxTokens: 2e3,
 				temperature: .1,
 				signal: input.signal
-			});
+			}, void 0, { operation: "discussion.analyze" });
 			return z.object({
 				title: z.string().min(1).max(200),
 				summary: z.string().min(1).max(2e3)
@@ -295,7 +295,7 @@ async function enrichLiveDiscussion(input) {
 		maxTokens: 400,
 		temperature: .1,
 		signal: input.signal
-	});
+	}, void 0, { operation: "discussion.analyze" });
 	return {
 		modelRef,
 		...LiveEnrichmentSchema.parse(parseJsonObject(extractText(response.content)))

package/dist/src/extensions/update.js

@@ -1,8 +1,8 @@
 import { createLogger } from "../utils/logger/index.js";
 import { init_logger } from "../utils/logger.js";
 import { init_paths, resolveBundledExtensionsDir, resolveExtensionsDir } from "../config/paths.js";
-import { computeExtensionDirectoryIntegrity, getExtensionLockfileManager } from "./lockfile.js";
 import { downloadExtensionStoreZipBuffer, resolveExtensionZipDownloadUrl, resolveExtensionsStoreBaseUrl, verifyStoreArtifactSha256 } from "../agent/skills/marketplace/adapters/store/store-api-client.js";
+import { computeExtensionDirectoryIntegrity, getExtensionLockfileManager } from "./lockfile.js";
 import { loadConfig } from "../config/loader.js";
 import { commitStagedExtensionInstall, finalizeStagedExtensionInstall, rollbackStagedExtensionInstall, stageExtensionNpm, stageExtensionStoreZip } from "./install-transaction.js";
 import { findExtension } from "./marketplace.js";