@xopcai/xopc 0.0.284 → 0.0.286

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

@@ -1,6 +1,8 @@
 import { createLogger } from "../../utils/logger/index.js";
 import { init_logger } from "../../utils/logger.js";
 import { getAgentDefaultModelRef, init_schema } from "../../config/schema.js";
+import { init_agent_scope, resolveDefaultAgentId } from "../../agent/agent-scope.js";
+import { init_agent_session_key, resolveAgentMainConversationId } from "../../routing/agent-session-key.js";
 import { loadConfig } from "../../config/loader.js";
 import { ExtensionLoader } from "../../extensions/loader.js";
 import "../../extensions/index.js";
@@ -8,10 +10,10 @@ import { MessageBus, MessageBusShutdownError } from "../../infra/bus/queue.js";
 import "../../infra/bus/index.js";
 import { AgentService } from "../../agent/service.js";
 import "../../agent/index.js";
-import { getWorkspacePath } from "../../config/workspace-path-helpers.js";
-import "../../config/index.js";
 import { formatExamples, register } from "../registry.js";
 import { getContextWithOpts } from "../context.js";
+import { getWorkspacePath } from "../../config/workspace-path-helpers.js";
+import "../../config/index.js";
 import { getXopcCloudCatalogCoordinator } from "../../providers/xopc-cloud-catalog-coordinator.js";
 import { listSessions } from "./agent/sessions.js";
 import { renderStreamToTerminal } from "./agent/stream-renderer.js";
@@ -19,6 +21,8 @@ import { startInteractiveChat } from "./agent/interactive.js";
 import { join } from "path";
 import { Command } from "commander";
 //#region src/cli/commands/agent.ts
+init_agent_session_key();
+init_agent_scope();
 init_schema();
 init_logger();
 const log = createLogger("AgentCommand");
@@ -53,7 +57,7 @@ function createAgentCommand(_ctx) {
 			workspace,
 			session: options.session
 		}, "Starting agent");
-		let sessionKey = options.session || "agent:main:main";
+		let conversationId = options.session || resolveAgentMainConversationId({ agentId: resolveDefaultAgentId(config) });
 		if (options.session) {
 			const { getSessionIndex } = await import("../utils/session.js");
 			const session = await (await getSessionIndex()).getSessionMetadata(options.session);
@@ -121,16 +125,16 @@ function createAgentCommand(_ctx) {
 		process.on("SIGTERM", shutdown);
 		if (options.message) {
 			const oneShotModel = options.model?.trim();
-			if (oneShotModel) await agent.switchModelForSession(sessionKey, oneShotModel);
-			await renderStreamToTerminal(agent, options.message, sessionKey);
-			if (oneShotModel) await agent.resetSessionModelToAgentDefault(sessionKey);
+			if (oneShotModel) await agent.switchModelForSession(conversationId, oneShotModel);
+			await renderStreamToTerminal(agent, options.message, conversationId);
+			if (oneShotModel) await agent.resetSessionModelToAgentDefault(conversationId);
 			await shutdown();
 		} else if (options.interactive) {
 			const interactiveModel = options.model?.trim();
-			if (interactiveModel) await agent.switchModelForSession(sessionKey, interactiveModel);
+			if (interactiveModel) await agent.switchModelForSession(conversationId, interactiveModel);
 			await startInteractiveChat(agent, {
 				workspace,
-				sessionKey,
+				conversationId,
 				continuingSession: !!options.session
 			});
 		} else {

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

@@ -1,4 +1,4 @@
-import { inspectSchemaMigrationStatus } from "../../../../storage/sqlite/migrations/runner.js";
+import { init_runner, inspectSchemaMigrationStatus } from "../../../../storage/sqlite/migrations/runner.js";
 import { requireXopcDatabase } from "../../../../storage/sqlite/connection.js";
 import { getSqliteDatabase } from "../../../../storage/sqlite/transaction.js";
 import "../../../../storage/sqlite/index.js";
@@ -6,6 +6,7 @@ import { init_loader, loadConfig } from "../../../../config/loader.js";
 import { existsSync } from "node:fs";
 //#region src/cli/commands/doctor/checks/database-schema.ts
 init_loader();
+init_runner();
 async function checkDatabaseSchema(ctx) {
 	if (!existsSync(ctx.configPath)) return {
 		id: "database-schema",
@@ -52,7 +53,7 @@ async function checkDatabaseSchema(ctx) {
 		id: "database-schema",
 		label: "Database schema",
 		status: "pass",
-		message: `SQLite schema v${status.dbVersion} (current release v174).`,
+		message: `SQLite schema v${status.dbVersion} (current release v178).`,
 		hints: []
 	};
 }

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

@@ -1,6 +1,6 @@
 import { requireXopcDatabase } from "../../../../storage/sqlite/connection.js";
 import { getSqliteDatabase } from "../../../../storage/sqlite/transaction.js";
-import { getCurrentSessionId, listSessionMetadata } from "../../../../storage/sqlite/session-repository.js";
+import { getCurrentTranscriptId, listSessionMetadata } from "../../../../storage/sqlite/session-repository.js";
 import "../../../../storage/sqlite/index.js";
 import { init_loader, loadConfig } from "../../../../config/loader.js";
 import { existsSync } from "node:fs";
@@ -39,18 +39,18 @@ async function checkSessionIntegrity(ctx) {
 	for (const failure of integrityFailures) issues.push(`database integrity: ${failure}`);
 	const { items } = listSessionMetadata({ limit: 1e5 });
 	for (const session of items) {
-		const sessionId = getCurrentSessionId(session.key);
-		if (!sessionId) {
+		const transcriptId = getCurrentTranscriptId(session.key);
+		if (!transcriptId) {
 			issues.push(`missing transcript for ${session.key}`);
 			continue;
 		}
-		if (sessionId !== session.sessionId) issues.push(`session id mismatch for ${session.key}`);
-		if (!db.prepare(`SELECT session_id FROM transcripts WHERE session_id = ? AND status = 'active'`).get(sessionId)?.session_id) issues.push(`active transcript row missing for ${session.key}`);
+		if (transcriptId !== session.transcriptId) issues.push(`session id mismatch for ${session.key}`);
+		if (!db.prepare(`SELECT transcript_id FROM transcripts WHERE transcript_id = ? AND status = 'active'`).get(transcriptId)?.transcript_id) issues.push(`active transcript row missing for ${session.key}`);
 	}
-	const orphanTranscripts = db.prepare(`SELECT t.session_id FROM transcripts t
-       LEFT JOIN sessions s ON s.session_id = t.session_id
-       WHERE t.status = 'active' AND s.session_key IS NULL`).all();
-	for (const row of orphanTranscripts) issues.push(`orphan active transcript ${row.session_id}`);
+	const orphanTranscripts = db.prepare(`SELECT t.transcript_id FROM transcripts t
+       LEFT JOIN sessions s ON s.active_transcript_id = t.transcript_id
+       WHERE t.status = 'active' AND s.conversation_id IS NULL`).all();
+	for (const row of orphanTranscripts) issues.push(`orphan active transcript ${row.transcript_id}`);
 	if (issues.length === 0) return {
 		id: "session-integrity",
 		label: "Sessions",

package/dist/src/cli/commands/gateway/lifecycle.js

@@ -1,7 +1,7 @@
 import { init_paths, resolveConfigPath } from "../../../config/paths.js";
 import { loadConfig } from "../../../config/loader.js";
-import { isRestartEnabled } from "../../../config/commands.flags.js";
 import "../../../config/index.js";
+import { isRestartEnabled } from "../../../config/commands.flags.js";
 import { resolveGatewayService } from "../../../daemon/service.js";
 import { authorizeGatewaySigusr1Restart, writeGatewayRestartIntentSync } from "../../../infra/restart.js";
 import { findVerifiedGatewayListenerPidsOnPortSync, formatGatewayPidList, signalVerifiedGatewayPidSync } from "../../../infra/gateway-processes.js";

package/dist/src/cli/commands/gateway/run-foreground.js

@@ -1,4 +1,7 @@
+import { init_process_diagnostics, installProcessDiagnostics } from "../../../infra/process-diagnostics.js";
+import { dirname, join } from "node:path";
 //#region src/cli/commands/gateway/run-foreground.ts
+init_process_diagnostics();
 async function ensureGatewayReady(configPath, workspacePath, port) {
 	const { initWorkspace } = await import("../../utils/init-workspace.js");
 	const result = await initWorkspace({
@@ -20,6 +23,7 @@ async function ensureGatewayReady(configPath, workspacePath, port) {
 	}
 }
 async function runGatewayFromCliOptions(options, ctx) {
+	installProcessDiagnostics(process.env.XOPC_GATEWAY_DIAGNOSTIC_PATH ?? join(process.env.XOPC_LOG_DIR ?? join(dirname(ctx.configPath), "logs"), "gateway-process.log"));
 	const tailscaleModes = new Set([
 		"off",
 		"serve",

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

@@ -1,19 +1,68 @@
-import { closeXopcDatabase, isXopcDatabaseOpen, openXopcDatabase } from "../../storage/sqlite/connection.js";
+import { closeXopcDatabase, init_connection, isXopcDatabaseOpen, openXopcDatabase } from "../../storage/sqlite/connection.js";
 import { register } from "../registry.js";
 import { isImportSource } from "../../imports/sources.js";
+import { scanProduct } from "../../imports/inventory.js";
+import { importSelection, listImportSources } from "../../imports/productImport.js";
 import { createRuntimeImportService, recoverCapabilityImports } from "../../imports/runtime.js";
-import { importProduct, listImportSources } from "../../imports/productImport.js";
+import { randomUUID } from "node:crypto";
 import { Command } from "commander";
 //#region src/cli/commands/import.ts
+init_connection();
 function createImportCommand() {
-	return new Command("import").description("Import skills, context and projects from another AI app").argument("[source]", "codex or claude-code; omit to list detected apps").action(async (source) => {
-		const selected = source && isImportSource(source) ? source : void 0;
-		if (source && !selected) throw new Error("Unsupported import source");
+	return new Command("import").description("Select skills, context and projects to import from another AI app").argument("[source]", "codex or claude-code; omit to list detected apps").option("--inventory <id>", "Previously scanned inventory").option("--items <ids>", "Explicit comma-separated candidate IDs").option("--request-id <id>", "Unique request ID; reuse when retrying a network request").option("--retry-of <id>", "Retry failed items from this run").action(async (source, options) => {
+		const selectedSource = source && isImportSource(source) ? source : void 0;
+		if (source && !selectedSource) throw new Error("Unsupported import source");
+		if ((options.inventory || options.items || options.requestId || options.retryOf) && (!options.inventory || !options.items || !options.requestId)) throw new Error("--inventory, --items and --request-id must be provided together");
 		const opened = !isXopcDatabaseOpen();
 		if (opened) openXopcDatabase();
 		try {
 			await recoverCapabilityImports();
-			console.log(JSON.stringify(selected ? await importProduct(createRuntimeImportService("gateway-owner"), selected) : listImportSources("gateway-owner"), null, 2));
+			const service = createRuntimeImportService("gateway-owner");
+			if (options.inventory) {
+				console.log(JSON.stringify(await importSelection(service, {
+					inventoryId: options.inventory,
+					candidateIds: options.items.split(",").map((s) => s.trim()),
+					requestId: options.requestId,
+					retryOf: options.retryOf
+				}), null, 2));
+				return;
+			}
+			if (!selectedSource) {
+				console.log(JSON.stringify(listImportSources("gateway-owner"), null, 2));
+				return;
+			}
+			const inventory = await scanProduct(service, selectedSource);
+			if (!process.stdin.isTTY || !process.stdout.isTTY) {
+				console.log(JSON.stringify(inventory, null, 2));
+				console.error("No content imported. Submit --inventory, --items and --request-id to import an explicit selection.");
+				return;
+			}
+			const { checkbox, confirm } = await import("@inquirer/prompts");
+			const ids = await checkbox({
+				message: "Select content to import (projects and rules are not selected by default)",
+				choices: inventory.candidates.map((item) => ({
+					name: `${item.kind}: ${item.name} — ${item.displayPath}${item.targetName && item.targetName !== item.name ? ` → ${item.targetName}` : ""}`,
+					value: item.id,
+					checked: item.scope === "user" && item.suggested,
+					disabled: item.status === "blocked" || item.status === "existing" && item.kind !== "project" ? item.reason ?? "Already available" : false
+				}))
+			});
+			const selected = new Set(ids);
+			for (const item of inventory.candidates) {
+				if (selected.has(item.id) && item.parentId) selected.add(item.parentId);
+				if (item.kind === "skill" && item.suggested && item.parentId && ids.includes(item.parentId)) selected.add(item.id);
+			}
+			if (!selected.size) return;
+			const summary = inventory.candidates.filter((i) => selected.has(i.id)).map((i) => `${i.kind}: ${i.name} — ${i.displayPath}`).join("\n");
+			if (!await confirm({
+				message: `Import these ${selected.size} items?\n${summary}`,
+				default: false
+			})) return;
+			console.log(JSON.stringify(await importSelection(service, {
+				inventoryId: inventory.id,
+				candidateIds: [...selected],
+				requestId: randomUUID()
+			}), null, 2));
 		} finally {
 			if (opened) closeXopcDatabase();
 		}
@@ -22,7 +71,7 @@ function createImportCommand() {
 register({
 	id: "import",
 	name: "import",
-	description: "Import from other AI apps",
+	description: "Select content from other AI apps",
 	factory: createImportCommand,
 	metadata: { category: "utility" }
 });

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

@@ -53,14 +53,14 @@ function createLogsCommand(_ctx) {
 			process.exit(1);
 		}
 	});
-	command.command("query").description("Query log entries").option("-l, --level <level>", "Filter by level (trace|debug|info|warn|error|fatal)").option("-m, --module <module>", "Filter by module").option("-e, --extension <ext>", "Filter by extension").option("-q, --search <text>", "Text search").option("--session-id <id>", "Filter by session ID").option("--request-id <id>", "Filter by request ID").option("--from <date>", "Start date (ISO 8601)").option("--to <date>", "End date (ISO 8601)").option("-n, --limit <number>", "Number of results", "50").option("--json", "Output as JSON").action(async (options) => {
+	command.command("query").description("Query log entries").option("-l, --level <level>", "Filter by level (trace|debug|info|warn|error|fatal)").option("-m, --module <module>", "Filter by module").option("-e, --extension <ext>", "Filter by extension").option("-q, --search <text>", "Text search").option("--transcript-id <id>", "Filter by transcript ID").option("--request-id <id>", "Filter by request ID").option("--from <date>", "Start date (ISO 8601)").option("--to <date>", "End date (ISO 8601)").option("-n, --limit <number>", "Number of results", "50").option("--json", "Output as JSON").action(async (options) => {
 		try {
 			const entries = await queryLogs({
 				levels: options.level ? [options.level] : void 0,
 				module: options.module,
 				extension: options.extension,
 				q: options.search,
-				sessionId: options.sessionId,
+				transcriptId: options.transcriptId,
 				requestId: options.requestId,
 				from: options.from,
 				to: options.to,
@@ -80,7 +80,7 @@ function createLogsCommand(_ctx) {
 				const timestamp = new Date(entry.timestamp).toLocaleTimeString();
 				const levelColor = getLevelColor(entry.level);
 				const module = entry.module ? `[${entry.module}]` : "";
-				const session = entry.sessionId ? `{session:${entry.sessionId.slice(0, 8)}}` : "";
+				const session = entry.transcriptId ? `{session:${entry.transcriptId.slice(0, 8)}}` : "";
 				console.log(`${timestamp} ${levelColor(entry.level)} ${module} ${session} ${entry.message}`);
 				if (entry.requestId) console.log(`   ↳ requestId: ${entry.requestId}`);
 				if (entry.userId) console.log(`   ↳ userId: ${entry.userId}`);

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

@@ -2,9 +2,9 @@ import { getAgentDefaultModelRef, init_schema } from "../../config/schema.js";
 import { loadConfig, saveConfig } from "../../config/loader.js";
 import { CredentialResolver, init_credentials } from "../../auth/credentials.js";
 import { getAllModels, getAvailableModels, getConfiguredProviders, getProviderAuthState, getProviderDisplayName, init_providers, isProviderConfigured, providerSupportsApiKey, providerSupportsOAuth, resolveModel } from "../../providers/index.js";
-import "../../config/index.js";
 import { formatExamples, register } from "../registry.js";
 import { getContextWithOpts } from "../context.js";
+import "../../config/index.js";
 import { prepareUpdateGlobalDefaults } from "../../gateway/global-defaults-admin.js";
 import { disconnectProvider } from "../../providers/provider-disconnect.js";
 import { colors } from "../utils/colors.js";

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

@@ -2,8 +2,8 @@ import { init_paths_state, resolveStateDir } from "../../config/paths-state.js";
 import { ConfigSchema, init_schema } from "../../config/schema.js";
 import { saveConfig } from "../../config/loader.js";
 import { resolveGatewayLocalClientHost } from "../../config/gateway-bind.js";
-import "../../config/index.js";
 import { formatExamples, register } from "../registry.js";
+import "../../config/index.js";
 import { provisionEagerRuntimes } from "../../runtime-tools/bootstrap.js";
 import { colors } from "../utils/colors.js";
 import { initWorkspace } from "../utils/init-workspace.js";

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

@@ -1,6 +1,6 @@
 import { loadConfig, saveConfig } from "../../config/loader.js";
-import "../../config/index.js";
 import { formatExamples, register } from "../registry.js";
+import "../../config/index.js";
 import { PLATFORM_RUNTIME_PROFILE, PLATFORM_RUNTIME_PROVIDER, PlatformRuntimeClient, discoverPlatform } from "../../platform/client.js";
 import "../../platform/index.js";
 import { getProfile, upsertAuthProfile } from "../../auth/profiles/profiles.js";

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

@@ -1,7 +1,7 @@
 import { createLogger } from "../../utils/logger/index.js";
 import { init_logger } from "../../utils/logger.js";
-import { createProfile, deleteProfile, getCurrentProfile, getSwitchCommand, listProfiles, resolveProfileStateDir } from "../../config/profile.js";
 import { formatExamples, register } from "../registry.js";
+import { createProfile, deleteProfile, getCurrentProfile, getSwitchCommand, listProfiles, resolveProfileStateDir } from "../../config/profile.js";
 import { colors } from "../utils/colors.js";
 import { Command } from "commander";
 import Table from "cli-table3";

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

@@ -145,20 +145,20 @@ function createProjectCommand(ctx) {
 			console.log(`Archived project ${project.name}`);
 		});
 	}));
-	cmd.addCommand(new Command("attach-session").description("Attach a session to a project").argument("<session-key>", "Session key").argument("<project>", "Project id or slug").action(async (sessionKey, projectRef) => {
+	cmd.addCommand(new Command("attach-session").description("Attach a session to a project").argument("<session-key>", "Session key").argument("<project>", "Project id or slug").action(async (conversationId, projectRef) => {
 		await withProjects(ctx, (projects) => {
 			const project = resolveProject(projects, projectRef);
 			if (!project) {
 				console.error(`Project not found: ${projectRef}`);
 				process.exit(1);
 			}
-			projects.attachSession(sessionKey, project.id);
+			projects.attachSession(conversationId, project.id);
 			console.log(`Attached session to ${project.name}`);
 		});
 	}));
-	cmd.addCommand(new Command("detach-session").description("Detach a session from its project").argument("<session-key>", "Session key").action(async (sessionKey) => {
+	cmd.addCommand(new Command("detach-session").description("Detach a session from its project").argument("<session-key>", "Session key").action(async (conversationId) => {
 		await withProjects(ctx, (projects) => {
-			projects.detachSession(sessionKey);
+			projects.detachSession(conversationId);
 			console.log("Detached session from project.");
 		});
 	}));
@@ -169,7 +169,7 @@ function createProjectCommand(ctx) {
 				console.error(`Project not found: ${projectRef}`);
 				process.exit(1);
 			}
-			const keys = projects.listSessionKeys(project.id, Number(options.limit) || 20);
+			const keys = projects.listConversationIds(project.id, Number(options.limit) || 20);
 			if (!keys.length) {
 				console.log("No sessions.");
 				return;

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

@@ -3,15 +3,15 @@ import { prepareTuiStartup, runTuiFromCliOptions } from "./tui-runner.js";
 import { Command } from "commander";
 //#region src/cli/commands/resume.ts
 function createResumeCommand(ctx) {
-	return new Command("resume").description("Resume a previous TUI session").argument("[sessionKey]", "Session key to resume directly").addHelpText("after", formatExamples([
+	return new Command("resume").description("Resume a previous TUI session").argument("[conversationId]", "Session key to resume directly").addHelpText("after", formatExamples([
 		"xopc resume                                  # Choose a session interactively",
 		"xopc resume agent:main:tui-...               # Resume a specific session",
 		"xopc resume --gateway --url http://host:3120 # Choose a remote session"
-	])).option("--url <url>", "Gateway URL (default: http://localhost:3120)").option("--token <token>", "Gateway bearer token").option("--password-env <name>", "Environment variable holding the gateway password").option("--workdir <dir>", "Workspace directory for the resumed TUI session").option("--no-cwd", "Do not use the launch directory as the resumed TUI session workspace").option("--local", "Run in embedded mode (no gateway required)").option("--gateway", "Force gateway mode even without an explicit URL or credential").option("--theme <name>", "Theme: auto, dark, light, or custom name from ~/.xopc/themes/").option("--thinking <level>", "Thinking level override").action(async (sessionKey, options) => {
+	])).option("--url <url>", "Gateway URL (default: http://localhost:3120)").option("--token <token>", "Gateway bearer token").option("--password-env <name>", "Environment variable holding the gateway password").option("--workdir <dir>", "Workspace directory for the resumed TUI session").option("--no-cwd", "Do not use the launch directory as the resumed TUI session workspace").option("--local", "Run in embedded mode (no gateway required)").option("--gateway", "Force gateway mode even without an explicit URL or credential").option("--theme <name>", "Theme: auto, dark, light, or custom name from ~/.xopc/themes/").option("--thinking <level>", "Thinking level override").action(async (conversationId, options) => {
 		prepareTuiStartup(ctx.configPath);
 		await runTuiFromCliOptions(options, {
-			session: sessionKey,
-			openSessionPickerOnStart: sessionKey === void 0
+			session: conversationId,
+			openSessionPickerOnStart: conversationId === void 0
 		});
 	});
 }

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

@@ -1,14 +1,14 @@
 import { createLogger } from "../../utils/logger/index.js";
 import { init_logger } from "../../utils/logger.js";
-import { isXopcDatabaseOpen, openXopcDatabase } from "../../storage/sqlite/connection.js";
+import { init_connection, isXopcDatabaseOpen, openXopcDatabase } from "../../storage/sqlite/connection.js";
 import { loadConfig, saveConfig } from "../../config/loader.js";
 import { resolveGatewayEffectiveHost } from "../../config/gateway-bind.js";
 import { ensureFrpcBinary } from "../../tunnel/frpc-binary.js";
 import { resolveTunnelBrokerUrl, resolveTunnelRegistrationSecret } from "../../tunnel/env.js";
 import { loadTunnelState } from "../../tunnel/tunnel-state.js";
 import { getTunnelService } from "../../tunnel/tunnel-service.js";
-import "../../config/index.js";
 import { formatExamples, register } from "../registry.js";
+import "../../config/index.js";
 import { resolveGatewayAuth } from "../../gateway/auth.js";
 import { requireTunnelGatewayToken } from "../../tunnel/auth-policy.js";
 import { TUNNEL_RISK_SUMMARY_LINES, TunnelConsentError, assertTunnelMayStart, hasValidTunnelConsent } from "../../tunnel/consent.js";
@@ -17,6 +17,7 @@ import { applyTunnelConsentToConfig, mergeTunnelConfigPatch, setTunnelEnabledInC
 import "../../tunnel/index.js";
 import { Command } from "commander";
 //#region src/cli/commands/tunnel.ts
+init_connection();
 init_logger();
 const log = createLogger("TunnelCommand");
 function isInteractive() {

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

@@ -1,7 +1,7 @@
 import { PACKAGE_VERSION, init_package_version } from "../../package-version.js";
 import { loadConfig } from "../../config/loader.js";
-import "../../config/index.js";
 import { formatExamples, register } from "../registry.js";
+import "../../config/index.js";
 import { acquireUpdateLock } from "../../infra/update-lock.js";
 import { normalizeUpdateChannel } from "../../infra/update-channels.js";
 import { compareSemver, resolveNpmChannelTag } from "../../infra/update-check.js";

package/dist/src/cli/extension-cli-register.js

@@ -4,9 +4,9 @@ import { ExtensionLoader } from "../extensions/loader.js";
 import "../extensions/index.js";
 import { MessageBus } from "../infra/bus/queue.js";
 import "../infra/bus/index.js";
+import { createDefaultContext } from "./registry.js";
 import { getWorkspacePath } from "../config/workspace-path-helpers.js";
 import "../config/index.js";
-import { createDefaultContext } from "./registry.js";
 import { registerExtensionCliProgram } from "../extensions/sdk/channel-helpers.js";
 import { join } from "path";
 //#region src/cli/extension-cli-register.ts

package/dist/src/config/agent-profile.d.ts

@@ -17,8 +17,8 @@ export interface EffectiveAgentProfile {
     tools: EffectiveAgentTools;
     params: Record<string, unknown>;
 }
-export declare function extractProfileAgentId(sessionKey: string | undefined | null, config: Config): string;
+export declare function extractProfileAgentId(conversationId: string | undefined | null, config: Config): string;
 export declare function resolveEffectiveAgentConfigForAgent(config: Config, agentId: string): ResolveEffectiveAgentConfigResult;
-export declare function resolveEffectiveAgentConfigForSession(config: Config, sessionKey: string | undefined | null): ResolveEffectiveAgentConfigResult;
+export declare function resolveEffectiveAgentConfigForSession(config: Config, conversationId: string | undefined | null): ResolveEffectiveAgentConfigResult;
 export declare function resolveEffectiveAgentProfile(config: Config, agentId: string): EffectiveAgentProfile;
-export declare function resolveEffectiveAgentProfileForSession(config: Config, sessionKey: string | undefined | null): EffectiveAgentProfile;
+export declare function resolveEffectiveAgentProfileForSession(config: Config, conversationId: string | undefined | null): EffectiveAgentProfile;

package/dist/src/config/agent-profile.js

@@ -1,7 +1,8 @@
 import { resolveEffectiveAgentConfig } from "../agent-config/resolver.js";
 import { init_agent_config } from "../agent-config/index.js";
 import { init_agent_scope, normalizeAgentId, resolveAgentWorkspaceDir } from "../agent/agent-scope.js";
-import { init_session_key, parseSessionKey } from "../routing/session-key.js";
+import { getConversationRouting } from "../storage/sqlite/conversation-repository.js";
+import { init_session_key } from "../routing/session-key.js";
 import { agentExists, getDefaultAgentId, init_resolve_route } from "../routing/resolve-route.js";
 //#region src/config/agent-profile.ts
 init_agent_config();
@@ -12,15 +13,14 @@ function findAgent(config, agentId) {
 	const id = normalizeAgentId(agentId);
 	return config.agents.list.find((agent) => agent.enabled !== false && normalizeAgentId(agent.id) === id);
 }
-function extractProfileAgentId(sessionKey, config) {
-	const parsed = parseSessionKey(sessionKey ?? "");
-	if (!parsed) return getDefaultAgentId(config);
-	const id = parsed.agentId;
-	if (id === "subagent" || id.startsWith("subagent:") || !agentExists(id, config)) return getDefaultAgentId(config);
-	return id.toLowerCase();
+function extractProfileAgentId(conversationId, config) {
+	if (!conversationId) return getDefaultAgentId(config);
+	const routing = getConversationRouting(conversationId);
+	if (!routing || !agentExists(routing.agentId, config)) throw new Error(`Conversation agent is unavailable: ${conversationId}`);
+	return routing.agentId;
 }
 function resolveEffectiveAgentConfigForAgent(config, agentId) {
-	const agent = findAgent(config, agentId) ?? findAgent(config, getDefaultAgentId(config));
+	const agent = findAgent(config, agentId);
 	if (!agent) throw new Error(`No enabled agent found for "${agentId}"`);
 	return resolveEffectiveAgentConfig({
 		agent,
@@ -28,8 +28,8 @@ function resolveEffectiveAgentConfigForAgent(config, agentId) {
 		defaultWorkspace: (id) => resolveAgentWorkspaceDir(config, id)
 	});
 }
-function resolveEffectiveAgentConfigForSession(config, sessionKey) {
-	return resolveEffectiveAgentConfigForAgent(config, extractProfileAgentId(sessionKey, config));
+function resolveEffectiveAgentConfigForSession(config, conversationId) {
+	return resolveEffectiveAgentConfigForAgent(config, extractProfileAgentId(conversationId, config));
 }
 function resolveEffectiveAgentProfile(config, agentId) {
 	const resolved = resolveEffectiveAgentConfigForAgent(config, agentId);
@@ -51,8 +51,8 @@ function resolveEffectiveAgentProfile(config, agentId) {
 		params: {}
 	};
 }
-function resolveEffectiveAgentProfileForSession(config, sessionKey) {
-	return resolveEffectiveAgentProfile(config, extractProfileAgentId(sessionKey, config));
+function resolveEffectiveAgentProfileForSession(config, conversationId) {
+	return resolveEffectiveAgentProfile(config, extractProfileAgentId(conversationId, config));
 }
 //#endregion
 export { extractProfileAgentId, resolveAgentWorkspaceDir, resolveEffectiveAgentConfigForAgent, resolveEffectiveAgentConfigForSession, resolveEffectiveAgentProfile, resolveEffectiveAgentProfileForSession };

package/dist/src/config/index.js

@@ -13,10 +13,10 @@ import { clearConfigValueCache, getAllowedCommands, getCacheStats, init_resolve_
 import { CustomModelSchema, ImageGenerationCapabilitiesSchema, ImageGenerationModelSchema, ImageGenerationProviderSchema, ModelOverrideSchema, ModelsJsonSchema, OpenAICompatSchema, OpenAICompletionsCompatSchema, OpenAIResponsesCompatSchema, OpenRouterRoutingSchema, ProviderConfigSchema, VercelGatewayRoutingSchema, getDefaultModelValues, init_models_json, loadModelsJson, modelsJsonExists, saveModelsJson, validateModelsConfig } from "./models-json.js";
 import { canonicalizeConfiguredMcpServer, isKnownCliMcpTypeAlias, normalizeConfiguredMcpServers, resolveXopcMcpTransportAlias } from "./mcp-config-normalize.js";
 import { formatThinkingLevels, listThinkingLevels, normalizeElevatedMode, normalizeReasoningLevel, normalizeThinkLevel, normalizeVerboseLevel, thinkLevelToNumber } from "../agent/transcript/thinking-types.js";
-import { diffConfigPaths } from "./diff.js";
 import { getWorkspacePath } from "./workspace-path-helpers.js";
 import { listAgentProfileMarkdownDirs, listAgentWorkspaceDirs } from "./workspace-dirs.js";
 import { ProfileManager, createProfile, deleteProfile, getCurrentProfile, getProfileManager, getProfileNameFromDir, getSwitchCommand, listProfiles, resolveProfileStateDir } from "./profile.js";
+import { diffConfigPaths } from "./diff.js";
 import { BASE_RELOAD_RULES, buildReloadPlan, matchReloadRule } from "./rules.js";
 import { ConfigHotReloader } from "./reload.js";
 //#region src/config/index.ts

package/dist/src/config/models-json.d.ts

@@ -286,8 +286,8 @@ export declare const CustomModelSchema: z.ZodObject<{
         max: "max";
     }> & z.core.$partial, z.ZodNullable<z.ZodString>>>;
     input: z.ZodOptional<z.ZodArray<z.ZodEnum<{
-        image: "image";
         text: "text";
+        image: "image";
     }>>>;
     contextWindow: z.ZodOptional<z.ZodNumber>;
     maxTokens: z.ZodOptional<z.ZodNumber>;
@@ -349,8 +349,8 @@ export declare const ModelOverrideSchema: z.ZodObject<{
         max: "max";
     }> & z.core.$partial, z.ZodNullable<z.ZodString>>>;
     input: z.ZodOptional<z.ZodArray<z.ZodEnum<{
-        image: "image";
         text: "text";
+        image: "image";
     }>>>;
     contextWindow: z.ZodOptional<z.ZodNumber>;
     maxTokens: z.ZodOptional<z.ZodNumber>;
@@ -440,8 +440,8 @@ export declare const ProviderConfigSchema: z.ZodObject<{
             max: "max";
         }> & z.core.$partial, z.ZodNullable<z.ZodString>>>;
         input: z.ZodOptional<z.ZodArray<z.ZodEnum<{
-            image: "image";
             text: "text";
+            image: "image";
         }>>>;
         contextWindow: z.ZodOptional<z.ZodNumber>;
         maxTokens: z.ZodOptional<z.ZodNumber>;
@@ -503,8 +503,8 @@ export declare const ProviderConfigSchema: z.ZodObject<{
             max: "max";
         }> & z.core.$partial, z.ZodNullable<z.ZodString>>>;
         input: z.ZodOptional<z.ZodArray<z.ZodEnum<{
-            image: "image";
             text: "text";
+            image: "image";
         }>>>;
         contextWindow: z.ZodOptional<z.ZodNumber>;
         maxTokens: z.ZodOptional<z.ZodNumber>;
@@ -675,8 +675,8 @@ export declare const ModelsJsonSchema: z.ZodObject<{
                 max: "max";
             }> & z.core.$partial, z.ZodNullable<z.ZodString>>>;
             input: z.ZodOptional<z.ZodArray<z.ZodEnum<{
-                image: "image";
                 text: "text";
+                image: "image";
             }>>>;
             contextWindow: z.ZodOptional<z.ZodNumber>;
             maxTokens: z.ZodOptional<z.ZodNumber>;
@@ -738,8 +738,8 @@ export declare const ModelsJsonSchema: z.ZodObject<{
                 max: "max";
             }> & z.core.$partial, z.ZodNullable<z.ZodString>>>;
             input: z.ZodOptional<z.ZodArray<z.ZodEnum<{
-                image: "image";
                 text: "text";
+                image: "image";
             }>>>;
             contextWindow: z.ZodOptional<z.ZodNumber>;
             maxTokens: z.ZodOptional<z.ZodNumber>;

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

@@ -2193,10 +2193,10 @@ export declare const ConfigSchema: z.ZodDefault<z.ZodObject<{
                 realtime: z.ZodOptional<z.ZodString>;
             }, z.core.$strict>;
             capabilities: z.ZodRecord<z.ZodEnum<{
+                shares: "shares";
                 models: "models";
                 connectors: "connectors";
                 tunnels: "tunnels";
-                shares: "shares";
                 managedRuntime: "managedRuntime";
                 runtimeFleet: "runtimeFleet";
                 traceUpload: "traceUpload";

package/dist/src/connectors/catalog.js

@@ -1,7 +1,8 @@
-import { isXopcDatabaseOpen } from "../storage/sqlite/connection.js";
+import { init_connection, isXopcDatabaseOpen } from "../storage/sqlite/connection.js";
 import { getCachedConnectorCatalogEntry } from "../storage/sqlite/connector-repository.js";
 import { listConnectorProviderDefinitions, listConnectorProviders } from "./providers.js";
 //#region src/connectors/catalog.ts
+init_connection();
 const CONNECTOR_BY_ID = new Map(listConnectorProviderDefinitions().map((connector) => [connector.id, connector]));
 function listConnectorCatalog() {
 	return listConnectorProviderDefinitions().sort((left, right) => left.displayName.localeCompare(right.displayName));

package/dist/src/connectors/composio-sessions.d.ts

@@ -56,7 +56,7 @@ export declare class ComposioSessionsAdapter {
         action: ConnectorActionMetadata;
         args?: Record<string, unknown>;
         agentId?: string;
-        sessionKey?: string;
+        conversationId?: string;
         confirmed?: boolean;
     }): Promise<{
         decision: 'allowed';

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

@@ -311,7 +311,7 @@ var ComposioSessionsAdapter = class {
 				connectorId: input.installation.connectorId,
 				principalId: input.context.principalId,
 				agentId: input.agentId,
-				sessionKey: input.sessionKey,
+				conversationId: input.conversationId,
 				actionId: input.action.actionId,
 				scope: input.action.scope,
 				decision: evaluation.decision,
@@ -341,7 +341,7 @@ var ComposioSessionsAdapter = class {
 				connectorId: input.installation.connectorId,
 				principalId: input.context.principalId,
 				agentId: input.agentId,
-				sessionKey: input.sessionKey,
+				conversationId: input.conversationId,
 				actionId: input.action.actionId,
 				scope: input.action.scope,
 				decision: "allowed",
@@ -360,7 +360,7 @@ var ComposioSessionsAdapter = class {
 				connectorId: input.installation.connectorId,
 				principalId: input.context.principalId,
 				agentId: input.agentId,
-				sessionKey: input.sessionKey,
+				conversationId: input.conversationId,
 				actionId: input.action.actionId,
 				scope: input.action.scope,
 				decision: "allowed",