@xopcai/xopc 0.0.321 → 0.0.324

package/dist/src/agent/agent-scope.js

@@ -1,135 +1,51 @@
 import { __esmMin } from "../../_virtual/_rolldown/runtime.js";
 import { init_paths_state, resolveStateDir } from "../config/paths-state.js";
+import { DEFAULT_AGENT_ID, STRICT_AGENT_ID_RE, deriveAgentIdFromDisplayName, init_id, normalizeAgentId, validateAgentIdForNewAgent } from "../agent-catalog/id.js";
+import { AgentCatalogRepository, init_repository } from "../agent-catalog/repository.js";
 import { expandWorkspacePathString, init_workspace_path } from "../config/workspace-path.js";
 import { init_workspace_defaults, resolveDefaultAgentWorkspaceDir } from "../config/workspace-defaults.js";
 import { basename, isAbsolute, join, relative, resolve } from "node:path";
 import fs from "node:fs";
 //#region src/agent/agent-scope.ts
-/**
-* Agent path and list resolution (config is the single source of truth).
-*/
-function normalizeLowercaseStringOrEmpty(s) {
-	return s.trim().toLowerCase();
-}
-/** Path-safe agent id. */
-function normalizeAgentId(value) {
-	const trimmed = (value ?? "").trim();
-	if (!trimmed) return DEFAULT_AGENT_ID;
-	const normalized = normalizeLowercaseStringOrEmpty(trimmed);
-	if (VALID_ID_RE.test(trimmed)) return normalized;
-	return normalized.replace(INVALID_CHARS_RE, "-").replace(LEADING_DASH_RE, "").replace(TRAILING_DASH_RE, "").slice(0, 64) || "main";
-}
-function hashAgentDisplayName(value) {
-	let hash = 2166136261;
-	for (let index = 0; index < value.length; index += 1) {
-		hash ^= value.charCodeAt(index);
-		hash = Math.imul(hash, 16777619);
-	}
-	return (hash >>> 0).toString(36).padStart(7, "0");
-}
-/** Derive a folder-safe id, including for display names with no ASCII characters. */
-function deriveAgentIdFromDisplayName(displayName) {
-	const normalizedName = displayName.trim().normalize("NFKC").toLowerCase();
-	const asciiId = normalizeAgentId(normalizedName);
-	if (asciiId !== "main" || normalizedName === "main") return asciiId;
-	return normalizedName ? `agent-${hashAgentDisplayName(normalizedName)}` : DEFAULT_AGENT_ID;
-}
-/**
-* Validate agent id for new agents (folder-safe path segment).
-* When `explicitId` is set, it must already match {@link STRICT_AGENT_ID_RE} (case-insensitive input, stored lowercase).
-* When omitted, id is derived from `displayNameForDerivation`, with a stable hashed fallback
-* for names that contain no ASCII id characters.
-*/
-function validateAgentIdForNewAgent(explicitId, displayNameForDerivation) {
-	const explicit = explicitId?.trim();
-	if (explicit) {
-		const id = explicit.toLowerCase();
-		if (!STRICT_AGENT_ID_RE.test(id)) return {
-			ok: false,
-			error: "Invalid agent id: use 1–64 characters; letters, digits, underscores, and hyphens only; start with a letter or digit."
-		};
-		if (id === "main") return {
-			ok: false,
-			error: `"${DEFAULT_AGENT_ID}" is reserved`
-		};
-		if (WINDOWS_RESERVED_AGENT_IDS.has(id)) return {
-			ok: false,
-			error: `Agent id "${id}" is reserved (Windows device name).`
-		};
-		return {
-			ok: true,
-			agentId: id
-		};
-	}
-	const agentId = deriveAgentIdFromDisplayName(displayNameForDerivation);
-	if (agentId === "main") return {
-		ok: false,
-		error: "Display name cannot produce a valid agent folder id. Set an explicit Agent id (letters, digits, underscores, hyphens only)."
-	};
-	if (WINDOWS_RESERVED_AGENT_IDS.has(agentId)) return {
-		ok: false,
-		error: `That display name resolves to "${agentId}", which is reserved. Use a different display name or set an explicit Agent id.`
-	};
-	if (!STRICT_AGENT_ID_RE.test(agentId)) return {
-		ok: false,
-		error: "Could not derive a folder-safe agent id from the display name. Set an explicit Agent id (letters, digits, underscores, hyphens only)."
-	};
-	return {
-		ok: true,
-		agentId
-	};
-}
+/** Agent path and list resolution backed by the SQLite Agent catalog. */
 /** Expand `~` and resolve to an absolute path. */
 function resolveUserPath(raw) {
 	return resolve(expandWorkspacePathString(raw.trim()));
 }
-function listAgentEntries(cfg) {
-	const list = cfg.agents?.list;
-	if (!Array.isArray(list)) return [];
-	return list.filter((e) => Boolean(e && typeof e === "object"));
+function listAgentEntries() {
+	return catalog.snapshot().agents;
 }
-function resolveDefaultAgentId(cfg) {
-	const explicit = cfg.agents?.default?.trim();
-	if (explicit) return normalizeAgentId(explicit);
-	const agents = listAgentEntries(cfg);
-	if (agents.length === 0) return DEFAULT_AGENT_ID;
-	const chosen = agents.find((entry) => entry.default === true)?.id?.trim() ?? agents[0]?.id?.trim();
-	return chosen ? normalizeAgentId(chosen) : DEFAULT_AGENT_ID;
+function resolveDefaultAgentId() {
+	return catalog.getSettings().defaultAgentId;
 }
-function resolveAgentEntry(cfg, agentId) {
+function resolveAgentEntry(agentId) {
 	const id = normalizeAgentId(agentId);
-	return listAgentEntries(cfg).find((e) => normalizeAgentId(e.id) === id);
+	return listAgentEntries().find((entry) => entry.id === id);
 }
-/**
-* Markdown workspace root for an agent.
-*/
-function resolveAgentWorkspaceDir(cfg, agentId) {
+/** Markdown workspace root for an Agent. */
+function resolveAgentWorkspaceDir(agentId) {
 	const id = normalizeAgentId(agentId);
-	const workspace = resolveAgentEntry(cfg, id)?.workspace;
-	const configured = (typeof workspace === "string" ? workspace : workspace?.root)?.trim();
+	const configured = resolveAgentEntry(id)?.workspace?.trim();
 	if (configured) return resolveUserPath(configured);
-	if (id === resolveDefaultAgentId(cfg)) return resolveDefaultAgentWorkspaceDir(process.env);
+	if (id === resolveDefaultAgentId()) return resolveDefaultAgentWorkspaceDir(process.env);
 	return join(resolveStateDir(process.env), `workspace-${id}`);
 }
-/**
-* Internal agent state dir: credentials, `agent.json`, pid, inbox (`…/agent/`).
-*/
-function resolveAgentDir(cfg, agentId) {
-	const id = normalizeAgentId(agentId);
-	return join(resolveStateDir(process.env), "agents", id, "agent");
+/** Internal Agent state dir: credentials, `agent.json`, pid, inbox (`…/agent/`). */
+function resolveAgentDir(agentId) {
+	return join(resolveStateDir(process.env), "agents", normalizeAgentId(agentId), "agent");
 }
 /** Parent of `sessions/` and `agent/`: `<stateDir>/agents/<id>/`. */
-function resolveAgentHomeDir(cfg, agentId) {
+function resolveAgentHomeDir(agentId) {
 	return join(resolveStateDir(process.env), "agents", normalizeAgentId(agentId));
 }
 /** Profile Markdown + gateway avatar files: `<stateDir>/agents/<id>/profile/`. */
-function resolveAgentProfileDir(cfg, agentId) {
-	return join(resolveAgentHomeDir(cfg, agentId), "profile");
+function resolveAgentProfileDir(agentId) {
+	return join(resolveAgentHomeDir(agentId), "profile");
 }
 /** Resolved path for a single profile Markdown basename (e.g. `SOUL.md`). */
-function resolveAgentProfileMarkdownPath(cfg, agentId, filename) {
+function resolveAgentProfileMarkdownPath(agentId, filename) {
 	const base = basename(filename.trim().replace(/\\/g, "/"));
-	return join(resolveAgentProfileDir(cfg, agentId), base);
+	return join(resolveAgentProfileDir(agentId), base);
 }
 function normalizePathForComparison(input) {
 	const resolved = resolve(resolveUserPath(input));
@@ -137,94 +53,56 @@ function normalizePathForComparison(input) {
 	try {
 		normalized = fs.realpathSync.native(resolved);
 	} catch {}
-	if (process.platform === "win32") return normalized.toLowerCase();
-	return normalized;
+	return process.platform === "win32" ? normalized.toLowerCase() : normalized;
 }
 function isPathWithinRoot(candidatePath, rootPath) {
 	const rel = relative(rootPath, candidatePath);
 	return rel === "" || !rel.startsWith("..") && !isAbsolute(rel);
 }
 /** Agent ids whose workspace root contains `workspacePath` (longest match first). */
-function resolveAgentIdsByWorkspacePath(cfg, workspacePath) {
+function resolveAgentIdsByWorkspacePath(workspacePath) {
 	const normalizedWorkspacePath = normalizePathForComparison(workspacePath);
-	const entries = listAgentEntries(cfg);
+	const entries = listAgentEntries();
 	const matches = [];
-	for (let index = 0; index < entries.length; index += 1) {
-		const entry = entries[index];
-		const id = normalizeAgentId(entry.id);
-		const workspaceDir = normalizePathForComparison(resolveAgentWorkspaceDir(cfg, id));
-		if (!isPathWithinRoot(normalizedWorkspacePath, workspaceDir)) continue;
-		matches.push({
-			id,
+	entries.forEach((entry, order) => {
+		const workspaceDir = normalizePathForComparison(resolveAgentWorkspaceDir(entry.id));
+		if (isPathWithinRoot(normalizedWorkspacePath, workspaceDir)) matches.push({
+			id: entry.id,
 			workspaceDir,
-			order: index
+			order
 		});
-	}
-	const defaultId = resolveDefaultAgentId(cfg);
-	if (!entries.some((e) => normalizeAgentId(e.id) === defaultId)) {
-		const workspaceDir = normalizePathForComparison(resolveAgentWorkspaceDir(cfg, defaultId));
+	});
+	const defaultId = resolveDefaultAgentId();
+	if (!entries.some((entry) => entry.id === defaultId)) {
+		const workspaceDir = normalizePathForComparison(resolveAgentWorkspaceDir(defaultId));
 		if (isPathWithinRoot(normalizedWorkspacePath, workspaceDir)) matches.push({
 			id: defaultId,
 			workspaceDir,
 			order: entries.length
 		});
 	}
-	matches.sort((left, right) => {
-		const workspaceLengthDelta = right.workspaceDir.length - left.workspaceDir.length;
-		if (workspaceLengthDelta !== 0) return workspaceLengthDelta;
-		return left.order - right.order;
-	});
+	matches.sort((left, right) => right.workspaceDir.length - left.workspaceDir.length || left.order - right.order);
 	return matches.map((entry) => entry.id);
 }
-/** Best-matching agent id for cwd, or `undefined` when no workspace contains the path. */
-function resolveAgentIdByWorkspacePath(cfg, workspacePath) {
-	return resolveAgentIdsByWorkspacePath(cfg, workspacePath)[0];
+/** Best-matching Agent id for cwd, or `undefined` when no workspace contains the path. */
+function resolveAgentIdByWorkspacePath(workspacePath) {
+	return resolveAgentIdsByWorkspacePath(workspacePath)[0];
 }
-/**
-* Find the agent id whose resolved markdown workspace matches `resolvedWorkspacePath`.
-* Falls back to {@link resolveDefaultAgentId} when no list entry matches.
-*/
-function resolveAgentIdForWorkspacePath(cfg, resolvedWorkspacePath) {
-	return resolveAgentIdByWorkspacePath(cfg, resolvedWorkspacePath) ?? resolveDefaultAgentId(cfg);
+/** Resolve an Agent from a workspace, falling back to the catalog default. */
+function resolveAgentIdForWorkspacePath(resolvedWorkspacePath) {
+	return resolveAgentIdByWorkspacePath(resolvedWorkspacePath) ?? resolveDefaultAgentId();
 }
-function getDefaultWorkspacePath(cfg) {
-	return resolveAgentWorkspaceDir(cfg, resolveDefaultAgentId(cfg));
+function getDefaultWorkspacePath() {
+	return resolveAgentWorkspaceDir(resolveDefaultAgentId());
 }
-var DEFAULT_AGENT_ID, VALID_ID_RE, INVALID_CHARS_RE, LEADING_DASH_RE, TRAILING_DASH_RE, STRICT_AGENT_ID_RE, WINDOWS_RESERVED_AGENT_IDS;
+var catalog;
 var init_agent_scope = __esmMin((() => {
+	init_id();
+	init_repository();
 	init_paths_state();
-	init_workspace_path();
 	init_workspace_defaults();
-	DEFAULT_AGENT_ID = "main";
-	VALID_ID_RE = /^[a-z0-9][a-z0-9_-]{0,63}$/i;
-	INVALID_CHARS_RE = /[^a-z0-9_-]+/g;
-	LEADING_DASH_RE = /^-+/;
-	TRAILING_DASH_RE = /-+$/;
-	STRICT_AGENT_ID_RE = /^[a-z0-9][a-z0-9_-]{0,63}$/;
-	WINDOWS_RESERVED_AGENT_IDS = new Set([
-		"con",
-		"prn",
-		"aux",
-		"nul",
-		"com1",
-		"com2",
-		"com3",
-		"com4",
-		"com5",
-		"com6",
-		"com7",
-		"com8",
-		"com9",
-		"lpt1",
-		"lpt2",
-		"lpt3",
-		"lpt4",
-		"lpt5",
-		"lpt6",
-		"lpt7",
-		"lpt8",
-		"lpt9"
-	]);
+	init_workspace_path();
+	catalog = new AgentCatalogRepository();
 }));
 //#endregion
 init_agent_scope();

package/dist/src/agent/background-review/run-background-review.js

@@ -3,12 +3,12 @@ import { init_logger } from "../../utils/logger.js";
 import { finishContextExtractionRun } from "../../storage/sqlite/context-extraction-repository.js";
 import { getSessionMetadata } from "../../storage/sqlite/session-read-repository.js";
 import { loadCompactionSourceSnapshot } from "../../storage/sqlite/transcript-repository.js";
-import "../../storage/sqlite/index.js";
+import { init_sqlite } from "../../storage/sqlite/index.js";
+import { extractTextContent } from "../context/workspace.js";
 import { extractProfileAgentId } from "../../config/agent-profile.js";
 import { init_sync_provider_auth, resolveProviderApiKeySync } from "../../auth/sync-provider-auth.js";
 import { getApiKeySync, init_providers, resolveModel } from "../../providers/index.js";
 import { createExtensionAwareStreamFn } from "../../providers/extension-stream-bridge.js";
-import { extractTextContent } from "../context/workspace.js";
 import { listUserAssertions } from "../../user-model/repository.js";
 import { readAgentMessageContent } from "../memory/agent-message-access.js";
 import { isAssistantTurnAborted, isAssistantTurnFailed } from "../orchestration/llm-turn-retry.js";
@@ -23,6 +23,7 @@ import { Agent } from "@earendil-works/pi-agent-core";
 //#region src/agent/background-review/run-background-review.ts
 init_sync_provider_auth();
 init_providers();
+init_sqlite();
 init_logger();
 const log = createLogger("UserModelInterpreter");
 function isReviewMessage(value) {
@@ -96,7 +97,7 @@ function resolveInterpreterRuntime(params) {
 	const processingPolicy = config?.userContext.userModel.processingPolicy ?? "remote_allowed";
 	let model;
 	if (config) {
-		const agentId = extractProfileAgentId(params.conversationId, config);
+		const agentId = extractProfileAgentId(params.conversationId);
 		const ref = resolveModelIntentRef(config, agentId, "understanding");
 		if (ref) try {
 			model = resolveModel(ref);
@@ -188,7 +189,7 @@ async function executeReview(params) {
 	}
 	try {
 		const config = params.getConfig();
-		const agentId = config ? extractProfileAgentId(params.conversationId, config) : "main";
+		const agentId = config ? extractProfileAgentId(params.conversationId) : "main";
 		const write = config?.userContext.userModel.writePolicy ?? "deny";
 		const result = executeUserModelInterpretation({
 			interpretation,

package/dist/src/agent/bootstrap/filter-bootstrap-files.js

@@ -1,6 +1,6 @@
+import { DEFAULT_AGENTS_FILENAME, DEFAULT_IDENTITY_FILENAME, DEFAULT_SOUL_FILENAME, DEFAULT_TOOLS_FILENAME } from "../context/workspace.js";
 import { isCronConversationId, isSubagentConversationId } from "../../routing/agent-session-key.js";
 import { init_session_key } from "../../routing/session-key.js";
-import { DEFAULT_AGENTS_FILENAME, DEFAULT_IDENTITY_FILENAME, DEFAULT_SOUL_FILENAME, DEFAULT_TOOLS_FILENAME } from "../context/workspace.js";
 //#region src/agent/bootstrap/filter-bootstrap-files.ts
 init_session_key();
 const MINIMAL_BOOTSTRAP_ALLOWLIST = new Set([

package/dist/src/agent/commands/command-registry.js

@@ -1,4 +1,6 @@
 import { resolveStateDir } from "../../config/paths-state.js";
+import { redactSensitiveOutput } from "../../utils/logger/redact.js";
+import { init_logger } from "../../utils/logger.js";
 import { init_global_singleton, resolveGlobalSingleton } from "../../utils/global-singleton.js";
 import { init_paths } from "../../config/paths.js";
 import { spawnProcess } from "../../process/run-process.js";
@@ -11,6 +13,7 @@ import { createHash, randomUUID } from "node:crypto";
 //#region src/agent/commands/command-registry.ts
 init_paths();
 init_global_singleton();
+init_logger();
 const DEFAULT_COMMAND_TIMEOUT_MS = 30 * 6e4;
 const MAX_COMMAND_TIMEOUT_MS = 240 * 6e4;
 const MAX_LOG_BYTES = 8 * 1024 * 1024;
@@ -56,7 +59,7 @@ var CommandRegistry = class {
 			isolation: input.isolation?.mode ?? "host",
 			...launch.containerName ? { containerName: launch.containerName } : {},
 			id,
-			command: input.command,
+			command: redactSensitiveOutput(input.command),
 			cwd: input.cwd,
 			status: "running",
 			exitCode: null,
@@ -82,8 +85,9 @@ var CommandRegistry = class {
 		let closed = false;
 		let containerCleanup;
 		const append = (stream, chunk) => {
-			const value = String(chunk);
-			result.totalOutputBytes += Buffer.byteLength(value);
+			const raw = String(chunk);
+			const value = redactSensitiveOutput(raw);
+			result.totalOutputBytes += Buffer.byteLength(raw);
 			result.captureTruncated ||= result[stream].length + value.length > limit || result.aggregatedOutput.length + value.length > limit;
 			result[stream] = (result[stream] + value).slice(-limit);
 			result.aggregatedOutput = (result.aggregatedOutput + value).slice(-limit);

package/dist/src/agent/context/coordinator.js

@@ -30,7 +30,7 @@ var ExecutionContextCoordinator = class {
 		if (!config || !config.userContext.contextPlanning.enabled || !access.userModel && !access.knowledge) return empty();
 		await this.options.ensureMemoryReady(conversationId);
 		const task = assembleTaskContext(conversationId, extractAgentUserPlainText(userMessage));
-		const agentId = extractProfileAgentId(conversationId, config);
+		const agentId = extractProfileAgentId(conversationId);
 		const workspaceId = this.options.getWorkspaceIdForSession(conversationId);
 		const projectId = this.options.getProjectIdForSession(conversationId);
 		const maxKnowledge = Math.min(config.userContext.contextPlanning.maxKnowledge, task.allocation.maxResults);

package/dist/src/agent/context/execution-context.js

@@ -1,5 +1,5 @@
 import { getSqliteDatabase, init_transaction } from "../../storage/sqlite/transaction.js";
-import { listCollaborationRules } from "../../storage/sqlite/collaboration-rule-repository.js";
+import { init_collaboration_rule_repository, listCollaborationRules } from "../../storage/sqlite/collaboration-rule-repository.js";
 import { searchKnowledgeItems } from "../../knowledge-memory/repository.js";
 import "../../knowledge-memory/index.js";
 import { retrievalLexicalSimilarity } from "../../retrieval/textFeatures.js";
@@ -11,6 +11,7 @@ import { buildUserContextBlock } from "../memory/context-fence.js";
 import { randomUUID } from "node:crypto";
 //#region src/agent/context/execution-context.ts
 init_transaction();
+init_collaboration_rule_repository();
 function scopeVisible(scope, context) {
 	if (scope.type === "global") return true;
 	return scope.id === {

package/dist/src/agent/context/execution-scope.js

@@ -1,12 +1,13 @@
 import { isXopcDatabaseOpen } from "../../storage/sqlite/connection.js";
 import { TaskRepository, init_task_repository } from "../../tasks/task-repository.js";
 import { getSessionMetadata } from "../../storage/sqlite/session-read-repository.js";
-import "../../storage/sqlite/index.js";
+import { init_sqlite } from "../../storage/sqlite/index.js";
 import { sanitizeForPromptLiteral } from "../prompt/sanitize-for-prompt.js";
 import { TaskConversationRepository } from "../../tasks/task-conversation-repository.js";
 import { TaskReadModelProjector } from "../../tasks/task-read-model-projector.js";
 import { buildActiveProjectContextForPrompt } from "./project-context.js";
 //#region src/agent/context/execution-scope.ts
+init_sqlite();
 init_task_repository();
 const MAX_OBJECTIVE_TEXT = 1200;
 const MAX_CRITERIA = 12;

package/dist/src/agent/context/workspace-seed.d.ts

@@ -2,7 +2,6 @@
  * Seed profile Markdown files into `agents/<agentId>/profile/` (and optionally `git init` the Markdown workspace).
  * Resolution order per file: `XOPC_TEMPLATE_PATH` or repo `docs/reference/templates`, then bundled `./workspace-templates/`.
  */
-import type { Config } from '../../config/schema.js';
 /** Marker in bundled/reference `IDENTITY.md` templates; replaced on agent creation when a display name is known. */
 export declare const IDENTITY_NAME_PLACEHOLDER = "_(pick something you like)_";
 export type SeedWorkspaceProfileMarkdownOptions = {
@@ -18,4 +17,4 @@ export declare function seedAgentProfileMarkdownFiles(profileDir: string, markdo
 /**
  * Ensure default (`main`) agent has reference profile Markdown templates (missing files only).
  */
-export declare function seedMainAgentProfileMarkdown(cfg: Config): void;
+export declare function seedMainAgentProfileMarkdown(): void;

package/dist/src/agent/context/workspace-seed.js

@@ -105,9 +105,9 @@ function ensureGitRepo(markdownWorkspaceDir, isBrandNew) {
 /**
 * Ensure default (`main`) agent has reference profile Markdown templates (missing files only).
 */
-function seedMainAgentProfileMarkdown(cfg) {
-	const agentId = resolveDefaultAgentId(cfg);
-	seedAgentProfileMarkdownFiles(resolveAgentProfileDir(cfg, agentId), resolveAgentWorkspaceDir(cfg, agentId), { displayName: agentId });
+function seedMainAgentProfileMarkdown() {
+	const agentId = resolveDefaultAgentId();
+	seedAgentProfileMarkdownFiles(resolveAgentProfileDir(agentId), resolveAgentWorkspaceDir(agentId), { displayName: agentId });
 }
 //#endregion
 export { IDENTITY_NAME_PLACEHOLDER, seedAgentProfileMarkdownFiles, seedMainAgentProfileMarkdown };

package/dist/src/agent/context/workspace-state.js

@@ -44,7 +44,7 @@ function resolveWorkspaceStatePathForMarkdownWorkspace(markdownWorkspaceDir) {
 }
 /** Resolve workspace state path from config + agent id. */
 function resolveAgentWorkspaceStatePath(config, agentId) {
-	return resolveWorkspaceStatePath(config, agentId);
+	return resolveWorkspaceStatePath(agentId);
 }
 /** Record profile Markdown seed time (idempotent). */
 function markProfileMarkdownSeeded(statePath) {

package/dist/src/agent/embedded/run-for-session.js

@@ -109,7 +109,7 @@ async function runEmbeddedTurnForSession(params) {
 		const systemPrompt = appendDynamicPromptSection([agent.state.systemPrompt ?? "", params.presentation === "voice" ? voicePresentationPrompt : ""].filter(Boolean).join("\n\n"), params.dynamicSystemContext ?? "");
 		const thinkingLevel = params.thinkingOverride ?? agent.state.thinkingLevel;
 		const workspaceDir = agentManager.getResolvedWorkspaceForSession(conversationId);
-		const promptCachePolicy = resolvePromptCachePolicy(config ? resolveEffectiveAgentProfileForSession(config, conversationId).config.runtime.promptCache : void 0);
+		const promptCachePolicy = resolvePromptCachePolicy(config ? resolveEffectiveAgentProfileForSession(conversationId).config.runtime.promptCache : void 0);
 		let userMessageForTurn = userMessage;
 		if (params.applyStartupContext !== false) {
 			userMessageForTurn = await applyStartupContextToUserMessage({
@@ -191,7 +191,7 @@ async function runEmbeddedTurnForSession(params) {
 			try {
 				const turnResult = await runWithEmbeddedExecutionSession(conversationId, () => runXopcEmbeddedTurn({
 					conversationId,
-					verifyChanges: config ? resolveEffectiveAgentProfileForSession(config, conversationId).agentId === "coder" : false,
+					verifyChanges: config ? resolveEffectiveAgentProfileForSession(conversationId).agentId === "coder" : false,
 					runId,
 					userMessage: userMessageForTurn,
 					images: params.llmImages,

package/dist/src/agent/embedded/run-turn.js

@@ -1,6 +1,6 @@
 import { createLogger } from "../../utils/logger/index.js";
 import { init_logger } from "../../utils/logger.js";
-import { getClarification, getClarificationResumeInput, isClarificationSuspended } from "../../storage/sqlite/clarification-wait-repository.js";
+import { getClarification, getClarificationResumeInput, init_clarification_wait_repository, isClarificationSuspended } from "../../storage/sqlite/clarification-wait-repository.js";
 import { getConnectionResumeInput, init_connection_wait_repository, isConnectionSuspended } from "../../storage/sqlite/connection-wait-repository.js";
 import { runWithEmbeddedExecutionSession } from "./execution-context.js";
 import { isComputerControlActive, isComputerLeaseTool, stopComputerControl } from "../../computer/control-guard.js";
@@ -27,6 +27,7 @@ import { withDelegationScope } from "../orchestration/delegation-scope.js";
 import { createAssistantMessageEventStream, getCurrentSystemPrompt, getCurrentTools, isRecoverableLength } from "@earendil-works/pi-ai";
 //#region src/agent/embedded/run-turn.ts
 init_connection_wait_repository();
+init_clarification_wait_repository();
 init_logger();
 const log = createLogger("EmbeddedRun");
 const LOG_PREVIEW_MAX_CHARS = 300;

package/dist/src/agent/embedded/sqlite-hydrating-session-manager.js

@@ -1,11 +1,12 @@
 import { requireXopcDatabase } from "../../storage/sqlite/connection.js";
 import { ensureSessionRecord } from "../../storage/sqlite/session-repository.js";
 import { loadTranscriptRowsForSession } from "../../storage/sqlite/transcript-repository.js";
-import "../../storage/sqlite/index.js";
+import { init_sqlite } from "../../storage/sqlite/index.js";
 import { storedRowsToFileEntries } from "../../session/stored-rows-to-file-entries.js";
 import { repairAssistantUsageInSessionManager } from "./session-manager-init.js";
 import { SessionManager } from "@earendil-works/pi-coding-agent";
 //#region src/agent/embedded/sqlite-hydrating-session-manager.ts
+init_sqlite();
 /**
 * Open an in-memory pi SessionManager hydrated from the SQLite transcript.
 * File persistence is disabled; writes flow through the tool-result guard into SQLite.

package/dist/src/agent/embedded/transcript-runtime.d.ts

@@ -3,6 +3,7 @@ import { SessionManager } from '@earendil-works/pi-coding-agent';
 import type { Api, Model } from '@earendil-works/pi-ai';
 import { type CompactionExecutionOptions, type CompactionResult } from '../memory/compaction.js';
 import type { SessionStore } from '../../session/store.js';
+import type { TranscriptSourceEntry } from '../../storage/sqlite/transcript-repository.js';
 export interface EmbeddedTranscriptRuntime {
     readonly runtimeId: string;
     readonly transcriptId: string;
@@ -32,6 +33,8 @@ export declare class InMemoryTranscriptRuntime implements EmbeddedTranscriptRunt
     loadMessages(): Promise<AgentMessage[]>;
     captureBaseline(): void;
     loadConversationMessages(): AgentMessage[];
+    loadBaselineMessages(): AgentMessage[];
+    loadConversationRows(): TranscriptSourceEntry['row'][];
     private sourceEntries;
     compact(_messages: AgentMessage[], model: Model<Api>, instructions?: string, force?: boolean, options?: CompactionExecutionOptions): Promise<CompactionResult>;
 }

package/dist/src/agent/embedded/transcript-runtime.js

@@ -49,6 +49,12 @@ var InMemoryTranscriptRuntime = class {
 	loadConversationMessages() {
 		return this.sessionManager.getBranch().slice(this.baselineEntryCount).flatMap((entry) => entry.type === "message" ? [entry.message] : []);
 	}
+	loadBaselineMessages() {
+		return buildSessionContextForLlm(this.sourceEntries().slice(0, this.baselineEntryCount).map((entry) => entry.row));
+	}
+	loadConversationRows() {
+		return structuredClone(this.sourceEntries().slice(this.baselineEntryCount).map((entry) => entry.row));
+	}
 	sourceEntries() {
 		return this.sessionManager.getBranch().flatMap((entry, index) => {
 			const compaction = this.compactionRows.get(entry.id);

package/dist/src/agent/external-tools/cliProvider.js

@@ -4,7 +4,7 @@ import { getSessionInputState, init_session_input_repository } from "../../stora
 import { getConnectorAccount, init_connector_account_repository } from "../../storage/sqlite/connector-account-repository.js";
 import { appendConnectorExecutionAudit, consumeConnectorApproval, createConnectorApproval, getConnectorApproval, getConnectorConnection, getConnectorInstallation, init_connector_repository } from "../../storage/sqlite/connector-repository.js";
 import { connectorObjectiveScope, init_connection_wait_repository, publishConnectionWait, requireSessionConnection } from "../../storage/sqlite/connection-wait-repository.js";
-import "../../storage/sqlite/index.js";
+import { init_sqlite } from "../../storage/sqlite/index.js";
 import { CapabilityError } from "../../capabilities/runtime/errors.js";
 import { ExternalEffectNotAppliedError, executeExternalOperation } from "../../capabilities/runtime/external-operations.js";
 import "../../capabilities/runtime/dispatcher.js";
@@ -23,6 +23,7 @@ import { join } from "node:path";
 import { randomUUID } from "node:crypto";
 import { writeFile } from "node:fs/promises";
 //#region src/agent/external-tools/cliProvider.ts
+init_sqlite();
 init_connector_account_repository();
 init_connector_repository();
 init_connection_wait_repository();
@@ -202,7 +203,10 @@ var CliToolProvider = class {
 				summary: `Confirm ${action.id}`,
 				needs: [{
 					key: `${item.instance.connectorId}:${connection.accountId}`,
-					connectorId: item.instance.connectorId,
+					target: {
+						type: "connector",
+						connectorId: item.instance.connectorId
+					},
 					accountId: connection.accountId,
 					connectionId: connection.id,
 					label: item.instance.displayName,

package/dist/src/agent/external-tools/composio-provider.js

@@ -4,7 +4,7 @@ import { getSessionInputState, init_session_input_repository } from "../../stora
 import { getConnectorAccount } from "../../storage/sqlite/connector-account-repository.js";
 import { consumeConnectorApproval, createConnectorApproval, getConnectorApproval, getConnectorConnection, getConnectorInstallation, listConnectorActionMetadata, listConnectorConnections, listConnectorInstallations, upsertConnectorActionMetadata, upsertConnectorInstallation } from "../../storage/sqlite/connector-repository.js";
 import { bindObjectiveAccount, connectionBinding, connectionBindings, connectorObjectiveScope, init_connection_wait_repository, publishConnectionWait, requireSessionConnection } from "../../storage/sqlite/connection-wait-repository.js";
-import "../../storage/sqlite/index.js";
+import { init_sqlite } from "../../storage/sqlite/index.js";
 import { CapabilityError } from "../../capabilities/runtime/errors.js";
 import { ExternalEffectNotAppliedError, executeExternalOperation } from "../../capabilities/runtime/external-operations.js";
 import { connectorArgumentsHash, connectorArgumentsPreview } from "../../connectors/approval.js";
@@ -22,6 +22,7 @@ import { ExternalToolSearchError } from "./search-error.js";
 //#region src/agent/external-tools/composio-provider.ts
 init_session_input_repository();
 init_connection_wait_repository();
+init_sqlite();
 init_logger();
 const CONNECTION_ARGUMENT = "xopcAccountId";
 const log = createLogger("ComposioToolProvider");
@@ -260,7 +261,7 @@ var ComposioToolProvider = class {
 		}).filter((connection) => connection.status === "active" && fresh.some((item) => item.id === connection.id) && canAccessConnectorAccount(connection, resolved.installation, available.agentId)));
 		const boundConnection = available.context ? connectionBinding(available.context.conversationId, resolved.installation.connectorId) : void 0;
 		const requestedAccount = typeof executionArgs[CONNECTION_ARGUMENT] === "string" ? executionArgs[CONNECTION_ARGUMENT] : boundConnection ? getConnectorConnection(boundConnection)?.accountId : void 0;
-		const bindings = available.context ? connectionBindings(available.context.conversationId).filter((need) => need.connectorId === resolved.installation.connectorId) : [];
+		const bindings = available.context ? connectionBindings(available.context.conversationId).filter((need) => need.target.type === "connector" && need.target.connectorId === resolved.installation.connectorId) : [];
 		if (bindings.length > 1 && !requestedAccount) return textResult({
 			status: "account_selection_required",
 			accounts: bindings,
@@ -277,7 +278,10 @@ var ComposioToolProvider = class {
 				summary: `Continue ${action.actionId} using ${toolkit}`,
 				needs: [{
 					key: `${resolved.installation.connectorId}:default`,
-					connectorId: resolved.installation.connectorId,
+					target: {
+						type: "connector",
+						connectorId: resolved.installation.connectorId
+					},
 					accountId: requestedAccount,
 					label: getConnectorDefinition(resolved.installation.connectorId)?.displayName ?? toolkit,
 					capabilities: [action.actionId]
@@ -388,7 +392,10 @@ var ComposioToolProvider = class {
 				summary: `Confirm ${action.actionId}`,
 				needs: [{
 					key: `${resolved.installation.connectorId}:${connection.accountId}`,
-					connectorId: resolved.installation.connectorId,
+					target: {
+						type: "connector",
+						connectorId: resolved.installation.connectorId
+					},
 					accountId: connection.accountId,
 					connectionId: connection.id,
 					label: toolkit,

package/dist/src/agent/external-tools/endpoint-provider.js

@@ -1,7 +1,7 @@
-import { COMPUTER_CONTROL_TOOL, init_src } from "../../../packages/computer-control-contract/src/index.js";
-import { BROWSER_CONTROL_ENDPOINT_TOOL_NAME } from "../../../packages/browser-control-contract/src/index.js";
 import { executeExternalOperation } from "../../capabilities/runtime/external-operations.js";
 import { canonicalCapabilityJson } from "../../capabilities/runtime/dispatcher.js";
+import { COMPUTER_CONTROL_TOOL, init_src } from "../../../packages/computer-control-contract/src/index.js";
+import { BROWSER_CONTROL_ENDPOINT_TOOL_NAME } from "../../../packages/browser-control-contract/src/index.js";
 import { externalToolRef, parseExternalToolRef } from "./refs.js";
 import { createHash } from "node:crypto";
 //#region src/agent/external-tools/endpoint-provider.ts