@xopcai/xopc 0.0.231 → 0.0.232

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

@@ -21,7 +21,7 @@ import { clearBootstrapSnapshot } from "./bootstrap/bootstrap-cache.js";
 import { resolveBootstrapContextSync } from "./bootstrap/bootstrap-files.js";
 import { loadProjectAgentsContextFile } from "./bootstrap/project-agents-context.js";
 import { parseExternalToolRef } from "./external-tools/refs.js";
-import { mcpToolPolicyId, resolveMcpToolPolicy } from "./mcp/bundle-mcp-policy.js";
+import { mcpToolPolicyId } from "./mcp/bundle-mcp-policy.js";
 import { disposeAllSessionMcpRuntimes, retireSessionMcpRuntimeForSessionKey } from "./mcp/bundle-mcp-runtime.js";
 import { createSkillConfigManager, isSkillEnabled, resolveSkillConfig } from "./skills/config.js";
 import { isValidSkillEnvVarName } from "./skills/required-env-vars.js";
@@ -40,7 +40,6 @@ import { WorkspaceRuntimeRegistry } from "./workspace-runtime/registry.js";
 import { runTurnUnderstandingReview } from "./background-review/run-background-review.js";
 import { BackgroundReviewCoordinator } from "./background-review/coordinator.js";
 import { maybeRequestChannelExecApproval } from "../channels/exec-approval-runtime.js";
-import { checkBoundary } from "../agent-runtime/boundary-guard.js";
 import { SkillFilesystemWatcher } from "./skills/filesystem-watcher.js";
 import { ProjectTrustStore, hasTrustRequiringProjectResources } from "../project-trust/trust-store.js";
 import { createAgentTurnPolicy } from "./orchestration/agent-turn-policy.js";
@@ -186,12 +185,6 @@ var AgentManager = class {
 		if (absolutePath === null || absolutePath === "") this.sessionWorkspaceOverrides.delete(sessionKey);
 		else this.sessionWorkspaceOverrides.set(sessionKey, absolutePath);
 	}
-	/** Merged `thinkingDefault` for this session's agent id (defaults + `agents.list`). */
-	getThinkingDefaultForSession(sessionKey) {
-		const cfg = this.mergedConfig();
-		if (!cfg) return;
-		return resolveEffectiveAgentProfileForSession(cfg, sessionKey).thinkingDefault;
-	}
 	pickDefaultModelRef() {
 		const cfg = this.mergedConfig();
 		return getAgentDefaultModelRef(cfg)?.trim() || getDefaultModelSync(cfg);
@@ -243,7 +236,7 @@ var AgentManager = class {
 			toolExecutorConfig: { resolveTimeoutMs: (toolName) => {
 				const config = this.mergedConfig();
 				const sessionKey = this.config.getCurrentContext?.()?.sessionKey;
-				return resolveEffectiveAgentProfileForSession(config, sessionKey).manifest.tools.builtin[toolName]?.limits?.timeoutMs;
+				return resolveEffectiveAgentProfileForSession(config, sessionKey).config.tools[toolName]?.timeoutMs;
 			} },
 			getConfig: () => this.mergedConfig(),
 			getPrimaryModel: () => this.resolveModelStringToModel(this.pickDefaultModelRef()),
@@ -410,7 +403,7 @@ var AgentManager = class {
 		const rt = this.workspaceRuntimes.getOrCreate(resolvedWorkspacePath, instance.effectiveProfile.agentId);
 		const contextFiles = this.resolveContextFilesForSession(instance.sessionKey, instance.effectiveProfile);
 		const modelRef = instance.effectiveProfile.primaryModelRef?.trim() || this.defaultModel;
-		const thinkingLevel = instance.agent.state.thinkingLevel ?? instance.effectiveProfile.thinkingDefault ?? this.config.thinkingLevel ?? "medium";
+		const thinkingLevel = instance.agent.state.thinkingLevel ?? this.config.thinkingLevel ?? "medium";
 		return rt.systemPromptBuilder.build(contextFiles, {
 			externalMemoryInstructions: rt.memoryManager.buildExternalSystemPrompt(),
 			workspaceOverride: resolvedWorkspacePath,
@@ -520,10 +513,11 @@ var AgentManager = class {
 			status: rt.skillManager.getStatus()
 		};
 	}
-	buildAgentSkillAvailability(profile, workspaceDir, registeredToolNames) {
+	buildAgentSkillAvailability(unresolvedProfile, workspaceDir, registeredToolNames) {
 		const cfg = this.config.config;
+		const rt = this.workspaceRuntimes.getOrCreate(workspaceDir, unresolvedProfile.agentId);
+		const profile = this.materializeSkillAllowlist(unresolvedProfile, rt);
 		const entry = Array.isArray(cfg.agents?.list) ? cfg.agents.list.find((a) => a && a.enabled !== false && a.id.toLowerCase() === profile.agentId.toLowerCase()) : void 0;
-		const rt = this.workspaceRuntimes.getOrCreate(workspaceDir, profile.agentId);
 		const skillsConfig = createSkillConfigManager(resolveStateDir()).load();
 		const lock = loadSkillsLock();
 		const workspaceLock = loadSkillsLock(resolveWorkspaceSkillsLockPath(workspaceDir));
@@ -560,11 +554,19 @@ var AgentManager = class {
 			loadedAt: rt.skillManager.getLoadedAt(),
 			diagnostics: rt.skillManager.getDiagnostics(),
 			status: rt.skillManager.getStatus(),
-			...entry?.skills?.mode === "allowlist" ? { agentAllowlist: [...entry.skills.allow ?? []] } : {},
+			...entry?.skills?.mode === "replace" ? { agentAllowlist: [...entry.skills.include] } : {},
 			...profile.skillsAllowlist !== void 0 ? { effectiveAllowlist: [...profile.skillsAllowlist] } : {},
 			skills
 		};
 	}
+	materializeSkillAllowlist(profile, runtime) {
+		if (profile.skillsAllowlist !== void 0 || profile.skillsDenylist.length === 0) return profile;
+		const denied = new Set(profile.skillsDenylist.map((name) => name.toLowerCase()));
+		return {
+			...profile,
+			skillsAllowlist: runtime.skillManager.getSkills().map((skill) => skill.name).filter((name) => !denied.has(name.toLowerCase()))
+		};
+	}
 	getAgentSkillAvailability(agentId) {
 		const profile = resolveEffectiveAgentProfile(this.config.config, agentId);
 		return this.buildAgentSkillAvailability(profile, profile.resolvedWorkspacePath);
@@ -621,7 +623,7 @@ var AgentManager = class {
 				sessionKey: instance.sessionKey,
 				modelRef: instance.effectiveProfile.primaryModelRef?.trim() || this.defaultModel,
 				agentId: instance.effectiveProfile.agentId,
-				thinkingLevel: instance.effectiveProfile.thinkingDefault ?? this.config.thinkingLevel ?? "medium",
+				thinkingLevel: this.config.thinkingLevel ?? "medium",
 				activeProjectContext: this.composeDynamicProjectContext(instance.activeProjectContext, instance.activeSelfVerifyContext)
 			});
 			instance.agent.state.systemPrompt = newPrompt;
@@ -697,7 +699,7 @@ var AgentManager = class {
 				sessionKey: instance.sessionKey,
 				modelRef: instance.effectiveProfile.primaryModelRef?.trim() || this.defaultModel,
 				agentId: instance.effectiveProfile.agentId,
-				thinkingLevel: instance.effectiveProfile.thinkingDefault ?? this.config.thinkingLevel ?? "medium",
+				thinkingLevel: this.config.thinkingLevel ?? "medium",
 				activeProjectContext: this.composeDynamicProjectContext(instance.activeProjectContext, instance.activeSelfVerifyContext)
 			});
 			instance.agent.state.systemPrompt = newPrompt;
@@ -718,9 +720,10 @@ var AgentManager = class {
 			log.debug({ sessionKey }, "Reusing existing agent instance");
 			return existing.agent;
 		}
-		const profile = resolveEffectiveAgentProfileForSession(cfg, sessionKey);
+		let profile = resolveEffectiveAgentProfileForSession(cfg, sessionKey);
 		const resolvedPath = targetPath;
 		const rt = this.workspaceRuntimes.getOrCreate(resolvedPath, profile.agentId);
+		profile = this.materializeSkillAllowlist(profile, rt);
 		if (isMemorySubsystemEnabled(cfg)) rt.memoryManager.initializeAll(sessionKey, {
 			workspace: resolvedPath,
 			agentId: profile.agentId
@@ -828,7 +831,7 @@ var AgentManager = class {
 		const rt = this.workspaceRuntimes.getOrCreate(resolvedWorkspacePath, instance.effectiveProfile.agentId);
 		const contextFiles = this.resolveContextFilesForSession(sessionKey, instance.effectiveProfile);
 		const modelRef = instance.effectiveProfile.primaryModelRef?.trim() || this.defaultModel;
-		const thinkingLevel = instance.effectiveProfile.thinkingDefault ?? this.config.thinkingLevel ?? "medium";
+		const thinkingLevel = this.config.thinkingLevel ?? "medium";
 		const activeProjectContext = buildExecutionScopeContextForPrompt(sessionKey);
 		const activeSelfVerifyContext = this.getSelfVerifyPromptContext(sessionKey, instance.effectiveProfile.agentId);
 		instance.agent.state.systemPrompt = rt.systemPromptBuilder.build(contextFiles, {
@@ -929,7 +932,7 @@ var AgentManager = class {
 			getSkillManager: () => rt.skillManager
 		});
 		const registeredToolNames = tools.map((t) => t.name);
-		const thinkingLevel = profile.thinkingDefault ?? this.config.thinkingLevel ?? "medium";
+		const thinkingLevel = this.config.thinkingLevel ?? "medium";
 		const turnPolicy = this.buildAgentTurnPolicy(sessionKey, profile);
 		agent = new Agent({
 			initialState: {
@@ -968,11 +971,11 @@ var AgentManager = class {
 	}
 	buildAgentTurnPolicy(sessionKey, profile) {
 		return createAgentTurnPolicy({
-			maxTurns: profile.manifest.runtime?.maxTurns,
-			maxToolFailures: profile.manifest.runtime?.maxToolFailuresPerTurn,
+			maxTurns: profile.config.runtime.maxTurns,
+			maxToolFailures: profile.config.runtime.maxToolFailuresPerTurn,
 			resolveToolLimit: (toolName, args) => {
 				const policy = this.resolveToolPolicy(profile, toolName, args);
-				const maxCalls = policy?.limits?.maxCallsPerTurn;
+				const maxCalls = policy?.maxCallsPerTurn;
 				return policy && maxCalls ? {
 					id: policy.id,
 					maxCalls
@@ -982,22 +985,7 @@ var AgentManager = class {
 				const toolName = toolCall.name;
 				const policy = this.resolveToolPolicy(profile, toolName, args);
 				const detail = JSON.stringify(args ?? {});
-				const boundary = checkBoundary({
-					manifest: profile.manifest,
-					action: policy?.id ?? toolName,
-					detail
-				});
-				if (boundary.decision === "deny") return {
-					block: true,
-					terminate: true,
-					reason: `Blocked by boundary rule: ${boundary.matchedRule}`
-				};
-				if (boundary.decision === "escalate") return {
-					block: true,
-					terminate: true,
-					reason: `Escalation required by boundary rule: ${boundary.matchedRule}`
-				};
-				if (policy?.mode === "confirm" || boundary.decision === "confirm") {
+				if (policy?.mode === "ask") {
 					if (!await this.requestToolConfirmation(sessionKey, policy?.id ?? toolName, detail)) return {
 						block: true,
 						terminate: true,
@@ -1039,7 +1027,7 @@ var AgentManager = class {
 	}
 	resolveToolPolicy(profile, toolName, args) {
 		if (toolName !== "xopc_tool_execute") {
-			const policy = profile.manifest.tools.builtin[toolName];
+			const policy = profile.config.tools[toolName];
 			return policy ? {
 				id: toolName,
 				...policy
@@ -1048,10 +1036,7 @@ var AgentManager = class {
 		const parsed = parseExternalToolRef(typeof args?.toolRef === "string" ? args.toolRef : "", "mcp");
 		if (!parsed) return void 0;
 		const id = mcpToolPolicyId(parsed.namespace, parsed.toolName);
-		const policy = resolveMcpToolPolicy({
-			serverId: parsed.namespace,
-			policyToolId: id
-		}, profile.manifest.tools.mcp);
+		const policy = profile.config.tools[id];
 		return policy ? {
 			id,
 			...policy
@@ -1075,7 +1060,7 @@ var AgentManager = class {
 		const rt = this.workspaceRuntimes.getOrCreate(resolvedWorkspacePath, instance.effectiveProfile.agentId);
 		const contextFiles = this.resolveContextFilesForSession(instance.sessionKey, instance.effectiveProfile);
 		const modelRef = instance.effectiveProfile.primaryModelRef?.trim() || this.defaultModel;
-		const thinkingLevel = instance.agent.state.thinkingLevel ?? instance.effectiveProfile.thinkingDefault ?? this.config.thinkingLevel ?? "medium";
+		const thinkingLevel = instance.agent.state.thinkingLevel ?? this.config.thinkingLevel ?? "medium";
 		instance.agent.state.systemPrompt = rt.systemPromptBuilder.build(contextFiles, {
 			externalMemoryInstructions: rt.memoryManager.buildExternalSystemPrompt(),
 			workspaceOverride: resolvedWorkspacePath,
@@ -1113,7 +1098,7 @@ var AgentManager = class {
 			const resolvedWorkspacePath = this.getResolvedWorkspaceForSession(sessionKey);
 			const rt = this.workspaceRuntimes.getOrCreate(resolvedWorkspacePath, instance.effectiveProfile.agentId);
 			const contextFiles = this.resolveContextFilesForSession(sessionKey, instance.effectiveProfile);
-			const thinkingLevel = instance.agent.state.thinkingLevel ?? instance.effectiveProfile.thinkingDefault ?? this.config.thinkingLevel ?? "medium";
+			const thinkingLevel = instance.agent.state.thinkingLevel ?? this.config.thinkingLevel ?? "medium";
 			const activeProjectContext = buildExecutionScopeContextForPrompt(sessionKey);
 			const activeSelfVerifyContext = this.getSelfVerifyPromptContext(sessionKey, instance.effectiveProfile.agentId);
 			instance.agent.state.systemPrompt = rt.systemPromptBuilder.build(contextFiles, {

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

@@ -11,9 +11,9 @@ import { createExtensionAwareStreamFn } from "../../providers/extension-stream-b
 import { extractTextContent } from "../context/workspace.js";
 import { readAgentMessageContent } from "../memory/agent-message-access.js";
 import { resolveAgentTurnTimeoutMs, runAgentTurnWithTimeout } from "../orchestration/run-agent-turn-with-timeout.js";
-import { resolveTypedModelRef } from "../../config/agent-typed-models.js";
 import { claimRegisteredExtraction } from "../../user-context/extraction/registry.js";
 import { isAssistantTurnAborted, isAssistantTurnFailed } from "../orchestration/llm-turn-retry.js";
+import { resolveModelIntentRef } from "../../config/agent-model-intents.js";
 import { emptyUnderstandingReview, executeUnderstandingInterpretation } from "../../user-context/extraction/executor.js";
 import { parseSemanticUnderstanding } from "../../user-context/extraction/semantic.js";
 import { UNDERSTANDING_INTERPRETER_SYSTEM_PROMPT, buildUnderstandingInterpreterPrompt } from "./prompts.js";
@@ -95,20 +95,15 @@ function resolveInterpreterRuntime(params) {
 	let model;
 	if (config) {
 		const agentId = extractProfileAgentId(params.sessionKey, config);
-		for (const role of ["understanding", "small"]) {
-			const ref = resolveTypedModelRef(config, agentId, role);
-			if (!ref) continue;
-			try {
-				model = resolveModel(ref);
-				break;
-			} catch (err) {
-				log.debug({
-					err,
-					agentId,
-					role,
-					modelRef: ref
-				}, "Configured understanding model could not be resolved");
-			}
+		const ref = resolveModelIntentRef(config, agentId, "understanding");
+		if (ref) try {
+			model = resolveModel(ref);
+		} catch (err) {
+			log.debug({
+				err,
+				agentId,
+				modelRef: ref
+			}, "Configured understanding model could not be resolved");
 		}
 	}
 	model ??= params.mainAgent.state.model;

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

@@ -61,7 +61,7 @@ async function runEmbeddedTurnForSession(params) {
 		const systemPrompt = agent.state.systemPrompt ?? "";
 		const thinkingLevel = params.thinkingOverride ?? agent.state.thinkingLevel;
 		const workspaceDir = agentManager.getResolvedWorkspaceForSession(sessionKey);
-		const promptCachePolicy = resolvePromptCachePolicy(config ? resolveEffectiveAgentProfileForSession(config, sessionKey).manifest.runtime?.promptCache : void 0);
+		const promptCachePolicy = resolvePromptCachePolicy(config ? resolveEffectiveAgentProfileForSession(config, sessionKey).config.runtime.promptCache : void 0);
 		let userMessageForTurn = userMessage;
 		if (params.applyStartupContext !== false) {
 			userMessageForTurn = await applyStartupContextToUserMessage({

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

@@ -1,6 +1,6 @@
 import { resolveEffectiveAgentProfileForSession } from "../../config/agent-profile.js";
 import { externalToolRef, parseExternalToolRef } from "./refs.js";
-import { isMcpCatalogToolDenied, mcpToolPolicyId, resolveMcpToolPolicy } from "../mcp/bundle-mcp-policy.js";
+import { mcpToolPolicyId } from "../mcp/bundle-mcp-policy.js";
 import { getOrCreateSessionMcpRuntime } from "../mcp/bundle-mcp-runtime.js";
 //#region src/agent/external-tools/mcp-provider.ts
 function policyToolId(tool) {
@@ -90,22 +90,12 @@ var McpToolProvider = class {
 		const sessionKey = this.deps.getSessionKey();
 		const profile = cfg && sessionKey ? resolveEffectiveAgentProfileForSession(cfg, sessionKey) : void 0;
 		const policyName = policyToolId(tool);
-		return !(resolveMcpToolPolicy({
-			serverId: tool.safeServerName,
-			policyToolId: policyName
-		}, profile?.manifest.tools.mcp)?.scope === "readonly" && tool.annotations?.readOnlyHint !== true) && !profile?.tools.denied.has(policyName) && !isMcpCatalogToolDenied({
-			serverId: tool.safeServerName,
-			policyToolId: policyName
-		}, profile?.manifest.tools.mcp);
+		return !profile?.tools.denied.has(policyName);
 	}
 	executionSignal(tool, signal) {
 		const cfg = this.deps.getConfig();
 		const sessionKey = this.deps.getSessionKey();
-		const profile = cfg && sessionKey ? resolveEffectiveAgentProfileForSession(cfg, sessionKey) : void 0;
-		const timeoutMs = resolveMcpToolPolicy({
-			serverId: tool.safeServerName,
-			policyToolId: policyToolId(tool)
-		}, profile?.manifest.tools.mcp)?.limits?.timeoutMs;
+		const timeoutMs = (cfg && sessionKey ? resolveEffectiveAgentProfileForSession(cfg, sessionKey) : void 0)?.config.tools[policyToolId(tool)]?.timeoutMs;
 		if (!timeoutMs) return signal;
 		const timeoutSignal = AbortSignal.timeout(timeoutMs);
 		return signal ? AbortSignal.any([signal, timeoutSignal]) : timeoutSignal;

package/dist/src/agent/image/generation/runtime.js

@@ -169,7 +169,7 @@ function toCapabilityCandidate(provider) {
 function buildNoImageGenerationModelConfiguredMessage(cfg, deps) {
 	return buildNoCapabilityModelConfiguredMessage({
 		capabilityLabel: "image-generation",
-		modelConfigKey: "imageGenerationModel",
+		modelConfigKey: "imageGeneration",
 		providers: (deps.listProviders ?? listImageGenerationProviders)(cfg).map(toCapabilityCandidate),
 		getProviderEnvVars: deps.getProviderEnvVars ?? ((id) => PROVIDER_ENV_MAP[id])
 	});

package/dist/src/agent/image/tool-model-config.js

@@ -1,6 +1,6 @@
 import { getAgentDefaultImageModelConfig, getAgentDefaultModelRef, init_schema, parseModelRef } from "../../config/schema.js";
 import { init_agent_scope, resolveDefaultAgentId } from "../agent-scope.js";
-import { resolveEffectiveAgentManifestForAgent } from "../../config/agent-profile.js";
+import { resolveEffectiveAgentConfigForAgent } from "../../config/agent-profile.js";
 import { getDefaultModelSync, getModelsByProvider, init_providers, isProviderConfiguredSync, resolveModel } from "../../providers/index.js";
 import { resolveAgentModelFallbackValues, resolveAgentModelPrimaryValue } from "../../config/model-input.js";
 import { buildCapabilityPlansForConfig } from "../../capabilities/readiness/from-config.js";
@@ -37,13 +37,13 @@ function resolveEffectiveModelsConfig(params) {
 	if (!params.cfg) return;
 	try {
 		const agentId = params.agentId?.trim() || resolveDefaultAgentId(params.cfg);
-		return resolveEffectiveAgentManifestForAgent(params.cfg, agentId).models;
+		return resolveEffectiveAgentConfigForAgent(params.cfg, agentId).config.models;
 	} catch {
 		return;
 	}
 }
 function resolveConfiguredImageModelConfig(params) {
-	return coerceToolModelConfig(resolveEffectiveModelsConfig(params)?.imageModel ?? (params.cfg ? getAgentDefaultImageModelConfig(params.cfg) : void 0));
+	return coerceToolModelConfig(resolveEffectiveModelsConfig(params)?.imageUnderstanding ?? (params.cfg ? getAgentDefaultImageModelConfig(params.cfg) : void 0));
 }
 function modelRefSupportsImage(modelRef) {
 	try {
@@ -70,27 +70,26 @@ function addCandidate(candidates, seen, entry) {
 }
 function collectRoleImageModelCandidates(params) {
 	const models = resolveEffectiveModelsConfig(params);
-	const roles = models?.roles ?? {};
-	const roleIds = Object.keys(roles);
-	if (roleIds.length === 0) return [];
-	const orderedRoleIds = [...models?.defaultRole && roles[models.defaultRole] ? [models.defaultRole] : [], ...roleIds.filter((roleId) => roleId !== models?.defaultRole)];
+	const routes = models ? {
+		chat: models.chat,
+		...models.intents
+	} : {};
+	const roleIds = Object.keys(routes);
 	const seen = /* @__PURE__ */ new Set();
 	const candidates = [];
-	for (const roleId of orderedRoleIds) {
-		const role = roles[roleId];
+	for (const roleId of roleIds) {
+		const role = routes[roleId];
 		if (!role) continue;
-		const refs = [role.model, ...role.fallbacks ?? []];
+		const refs = [role.primary, ...role.fallbacks];
 		for (const ref of refs) addCandidate(candidates, seen, {
 			ref,
-			roleId,
-			...role.description ? { roleDescription: role.description } : {}
+			roleId
 		});
 	}
 	return candidates;
 }
 function resolveDefaultModelRefForAgent(params) {
-	const models = resolveEffectiveModelsConfig(params);
-	const ref = (models?.defaultRole ? models.roles?.[models.defaultRole] : void 0)?.model?.trim();
+	const ref = resolveEffectiveModelsConfig(params)?.chat.primary.trim();
 	if (ref) {
 		const parsed = parseModelRef(ref);
 		if (parsed) return parsed;

package/dist/src/agent/mcp/bundle-mcp-policy.d.ts

@@ -1,10 +1 @@
-import type { AgentManifest, ToolPolicy } from '../../agent-manifest/schema.js';
 export declare function mcpToolPolicyId(serverId: string, toolName: string): string;
-export declare function resolveMcpToolPolicy(identity: {
-    serverId: string;
-    policyToolId: string;
-}, policy: AgentManifest['tools']['mcp']): ToolPolicy | undefined;
-export declare function isMcpCatalogToolDenied(identity: {
-    serverId: string;
-    policyToolId: string;
-}, policy: AgentManifest['tools']['mcp']): boolean;

package/dist/src/agent/mcp/bundle-mcp-policy.js

@@ -1,18 +1,6 @@
-import { sanitizeServerName } from "./bundle-mcp-names.js";
 //#region src/agent/mcp/bundle-mcp-policy.ts
 function mcpToolPolicyId(serverId, toolName) {
 	return `mcp:${encodeURIComponent(serverId)}:${encodeURIComponent(toolName)}`;
 }
-function resolveMcpToolPolicy(identity, policy) {
-	const toolPolicy = policy?.tools?.[identity.policyToolId];
-	if (toolPolicy) return toolPolicy;
-	const directServerPolicy = policy?.servers?.[identity.serverId];
-	if (directServerPolicy) return directServerPolicy;
-	const usedNames = /* @__PURE__ */ new Set();
-	for (const [serverId, serverPolicy] of Object.entries(policy?.servers ?? {})) if (sanitizeServerName(serverId, usedNames) === identity.serverId) return serverPolicy;
-}
-function isMcpCatalogToolDenied(identity, policy) {
-	return resolveMcpToolPolicy(identity, policy)?.mode === "deny";
-}
 //#endregion
-export { isMcpCatalogToolDenied, mcpToolPolicyId, resolveMcpToolPolicy };
+export { mcpToolPolicyId };

package/dist/src/agent/mcp/bundle-mcp-runtime.js

@@ -2,12 +2,12 @@ import { createLogger } from "../../utils/logger/index.js";
 import { init_logger } from "../../utils/logger.js";
 import { resolveGlobalSingleton } from "../../utils/global-singleton.js";
 import { init_string_coerce, normalizeOptionalString } from "../../utils/string-coerce.js";
-import { sanitizeServerName } from "./bundle-mcp-names.js";
 import { redactSensitiveUrlLikeString } from "../../utils/redact-sensitive-url.js";
 import { loadEmbeddedMcpConfig } from "./embedded-mcp.js";
 import { resolveConnectorSecretReferences } from "../../connectors/secret-store.js";
 import { isMcpConfigRecord } from "./mcp-config-shared.js";
 import { resolveMcpTransport } from "./mcp-transport.js";
+import { sanitizeServerName } from "./bundle-mcp-names.js";
 import crypto from "node:crypto";
 import Ajv2020 from "ajv/dist/2020.js";
 import { Client } from "@modelcontextprotocol/sdk/client/index.js";

package/dist/src/agent/mcp/index.js

@@ -1,4 +1,4 @@
-import { isMcpCatalogToolDenied, mcpToolPolicyId, resolveMcpToolPolicy } from "./bundle-mcp-policy.js";
+import { mcpToolPolicyId } from "./bundle-mcp-policy.js";
 import { loadMergedBundleMcpConfig } from "./bundle-mcp-config.js";
 import { loadEmbeddedMcpConfig } from "./embedded-mcp.js";
 import { McpAuthorizationRequiredError, isMcpAuthorizationError } from "./oauth/mcp-oauth-errors.js";
@@ -9,4 +9,4 @@ import "./bundle-mcp-tools.js";
 import { McpOAuthSession } from "./oauth/mcp-oauth-session.js";
 import { McpOAuthManager, getMcpOAuthManager } from "./oauth/mcp-oauth-manager.js";
 import "./oauth/index.js";
-export { McpAuthorizationRequiredError, McpOAuthManager, McpOAuthSession, McpOAuthStore, XopcMcpOAuthClientProvider, __testing, canonicalMcpServerUrl, createSessionMcpRuntime, disposeAllSessionMcpRuntimes, disposeSessionMcpRuntime, getMcpOAuthManager, getOrCreateSessionMcpRuntime, getSessionMcpRuntimeManager, isMcpAuthorizationError, isMcpCatalogToolDenied, loadEmbeddedMcpConfig, loadMergedBundleMcpConfig, mcpOAuthServerKey, mcpToolPolicyId, resolveMcpToolPolicy, retireSessionMcpRuntime, retireSessionMcpRuntimeForSessionKey };
+export { McpAuthorizationRequiredError, McpOAuthManager, McpOAuthSession, McpOAuthStore, XopcMcpOAuthClientProvider, __testing, canonicalMcpServerUrl, createSessionMcpRuntime, disposeAllSessionMcpRuntimes, disposeSessionMcpRuntime, getMcpOAuthManager, getOrCreateSessionMcpRuntime, getSessionMcpRuntimeManager, isMcpAuthorizationError, loadEmbeddedMcpConfig, loadMergedBundleMcpConfig, mcpOAuthServerKey, mcpToolPolicyId, retireSessionMcpRuntime, retireSessionMcpRuntimeForSessionKey };

package/dist/src/agent/media-generation/runtime-shared.d.ts

@@ -90,7 +90,7 @@ export declare function throwCapabilityGenerationFailure(params: ThrowCapability
 export interface BuildNoCapabilityModelConfiguredMessageParams {
     /** Display label, e.g. "image-generation". */
     capabilityLabel: string;
-    /** Config key path, e.g. "imageGenerationModel". */
+    /** Config key path, e.g. "agents.defaults.models.imageGeneration". */
     modelConfigKey: string;
     providers: ReadonlyArray<CapabilityProviderCandidate>;
     /** Optional env-var lookup, e.g. (id) => PROVIDER_ENV_MAP[id]. */

package/dist/src/agent/media-generation/runtime-shared.js

@@ -190,7 +190,7 @@ function throwCapabilityGenerationFailure(params) {
 	});
 }
 function buildNoCapabilityModelConfiguredMessage(params) {
-	const lines = [`No ${params.capabilityLabel} model configured. Add a manifest/runtime model policy for ${params.modelConfigKey} or pass modelOverride at call site.`];
+	const lines = [`No ${params.capabilityLabel} model configured. Set agents.defaults.models.${params.modelConfigKey} or pass modelOverride at call site.`];
 	if (params.providers.length > 0) {
 		lines.push("Registered providers:");
 		for (const p of params.providers) {

package/dist/src/agent/memory/create-memory-manager.js

@@ -2,7 +2,7 @@ import { isMemorySubsystemEnabled } from "./memory-config.js";
 import { BuiltinMemoryProvider } from "./builtin-provider.js";
 import { MemoryManager } from "./manager.js";
 import { loadMemoryPluginProviders } from "./plugin-discovery.js";
-import { buildMemoryRuntime } from "../../agent-runtime/memory-runtime.js";
+import { buildMemoryRuntime } from "./runtime.js";
 //#region src/agent/memory/create-memory-manager.ts
 function createMemoryManagerFromConfig(config) {
 	const routing = resolveMemoryManagerOptions(config);

package/dist/src/agent/memory/manager.d.ts

@@ -1,5 +1,5 @@
 import type { AgentTool } from '@earendil-works/pi-agent-core';
-import type { MemoryRuntime } from '../../agent-runtime/memory-runtime.js';
+import type { MemoryRuntime } from './runtime.js';
 import type { MemoryProvider, MemoryProviderInitOptions } from './provider.js';
 import type { UnderstandingCandidate } from './understanding/types.js';
 import type { MemoryDeleteRequest, MemoryListRequest, MemoryReadRequest, MemoryReadResult, MemorySearchRequest, MemorySearchResult, MemoryUpdateRequest, MemoryWriteRequest, MemoryWriteResult, MemoryRecord, MemorySignal, MemoryKind } from './types.js';

package/dist/src/{agent-runtime/memory-runtime.d.ts → agent/memory/runtime.d.ts}

@@ -1,4 +1,4 @@
-import type { UserContextConfig } from '../user-context/config.js';
+import type { UserContextConfig } from '../../user-context/config.js';
 export type MemorySource = 'session' | 'agentProfile' | 'understanding' | 'workspace';
 export type MemoryWriteTarget = 'agentProfile' | 'understanding' | 'workspace';
 export type MemoryWriteDecision = 'allow' | 'confirm' | 'deny';

package/dist/src/{agent-runtime/memory-runtime.js → agent/memory/runtime.js}

@@ -1,5 +1,4 @@
-//#region src/agent-runtime/memory-runtime.ts
-const READ_ONLY_MODES = new Set(["readOnly"]);
+//#region src/agent/memory/runtime.ts
 function normalizeConfidence(value) {
 	if (typeof value !== "number" || !Number.isFinite(value)) return .5;
 	return Math.max(0, Math.min(1, value));
@@ -16,7 +15,7 @@ function buildMemoryRuntime(userContext) {
 				decision: "deny",
 				reason: "memory is disabled"
 			};
-			if (READ_ONLY_MODES.has(memory.mode)) return {
+			if (memory.mode === "readOnly") return {
 				decision: "deny",
 				reason: "memory is read-only"
 			};

package/dist/src/agent/orchestration/agent-orchestrator.d.ts

@@ -21,8 +21,6 @@ export interface AgentOrchestratorConfig {
     /** Per-session hydration (workspace override + model override) before the agent runs. */
     sessionHydrator: SessionHydrator;
     getThinkingDefault: () => ThinkLevel | undefined;
-    /** Per-session default from merged `agents.list` / defaults (optional). */
-    getThinkingDefaultForSession?: (sessionKey: string) => ThinkLevel | undefined;
     /** Default workspace root when no per-session resolver is set. */
     workspaceRoot: string;
     /** Per-agent workspace root for attachments (optional; defaults to `workspaceRoot`). */
@@ -45,7 +43,6 @@ export declare class AgentOrchestrator {
     private sessionConfigStore;
     private sessionHydrator;
     private getThinkingDefault;
-    private getThinkingDefaultForSession?;
     private enqueueAutoTitle?;
     private getConfig?;
     private onEmbeddedStreamEvent?;

package/dist/src/agent/orchestration/agent-orchestrator.js

@@ -24,7 +24,6 @@ var AgentOrchestrator = class {
 	sessionConfigStore;
 	sessionHydrator;
 	getThinkingDefault;
-	getThinkingDefaultForSession;
 	enqueueAutoTitle;
 	getConfig;
 	onEmbeddedStreamEvent;
@@ -36,7 +35,6 @@ var AgentOrchestrator = class {
 		this.sessionConfigStore = config.sessionConfigStore;
 		this.sessionHydrator = config.sessionHydrator;
 		this.getThinkingDefault = config.getThinkingDefault;
-		this.getThinkingDefaultForSession = config.getThinkingDefaultForSession;
 		this.enqueueAutoTitle = config.enqueueAutoTitle;
 		this.getConfig = config.getConfig;
 		this.onEmbeddedStreamEvent = config.onEmbeddedStreamEvent;
@@ -70,7 +68,7 @@ var AgentOrchestrator = class {
 				this.agentManager.getOrCreateAgent(sessionKey);
 				this.agentManager.applyTurnChannelSystemPrompt(sessionKey, channelSystemPrompt);
 			}
-			const thinkingDefault = this.getThinkingDefaultForSession?.(sessionKey) ?? this.getThinkingDefault();
+			const thinkingDefault = this.getThinkingDefault();
 			const thinkingLevel = await resolveEffectiveThinkingLevel(this.sessionConfigStore, sessionKey, null, thinkingDefault);
 			this.agentManager.setThinkingLevel(sessionKey, thinkingLevel);
 			const persistedAttachments = await persistInboundAttachments(msg.attachments);

package/dist/src/agent/orchestration/run-agent-turn-with-timeout.js

@@ -1,4 +1,4 @@
-import { resolveEffectiveAgentManifestForSession } from "../../config/agent-profile.js";
+import { resolveEffectiveAgentConfigForSession } from "../../config/agent-profile.js";
 //#region src/agent/orchestration/run-agent-turn-with-timeout.ts
 /** Minimum per-turn timeout (1 minute). */
 const MIN_AGENT_TURN_TIMEOUT_MS = 6e4;
@@ -20,7 +20,7 @@ function isAgentTurnUnsettledError(err) {
 }
 function resolveAgentTurnTimeoutMs(config, sessionKey) {
 	if (!config) return DEFAULT_AGENT_TURN_TIMEOUT_MS;
-	const configured = resolveEffectiveAgentManifestForSession(config, sessionKey).runtime?.timeoutMs;
+	const configured = resolveEffectiveAgentConfigForSession(config, sessionKey).config.runtime.timeoutMs;
 	if (!configured) return DEFAULT_AGENT_TURN_TIMEOUT_MS;
 	return Math.min(MAX_AGENT_TURN_TIMEOUT_MS, Math.max(MIN_AGENT_TURN_TIMEOUT_MS, configured));
 }

package/dist/src/agent/service.js

@@ -283,7 +283,6 @@ var AgentService = class {
 			sessionHydrator: this.sessionHydrator,
 			getConfig: () => this.effectiveAppConfig(),
 			getThinkingDefault: () => void 0,
-			getThinkingDefaultForSession: (sessionKey) => this.agentManager.getThinkingDefaultForSession(sessionKey),
 			workspaceRoot: this.workspaceDir,
 			getWorkspaceRootForSession: (sessionKey) => this.agentManager.getResolvedWorkspaceForSession(sessionKey),
 			getAgentInternalStorageRootForSession: (sessionKey) => resolveAgentHomeDir(this.config.config, extractProfileAgentId(sessionKey, this.config.config)),

package/dist/src/agent/starter-agents.js

@@ -8,7 +8,7 @@ init_paths();
 init_agent_scope();
 const STARTER_AGENTS_INITIALIZED_VERSION = 1;
 function denyTools(names) {
-	return { builtin: Object.fromEntries(names.map((name) => [name, { mode: "deny" }])) };
+	return Object.fromEntries(names.map((name) => [name, { mode: "deny" }]));
 }
 function identity(params) {
 	return `# IDENTITY.md - Who Am I?\n\n- **Name:** ${params.name}\n- **Description:** ${params.description}\n- **Language:** en\n- **Creature:** ${params.creature}\n- **Emoji:** ${params.emoji}\n- **Avatar:**\n`;
@@ -158,13 +158,6 @@ function ensureStarterAgentsInitialized(cfg) {
 		if (hasAgentEntry(next, starter.id)) continue;
 		next = applyAgentConfig(next, {
 			agentId: starter.id,
-			identity: {
-				name: starter.displayName,
-				description: starter.description,
-				role: starter.role,
-				language: "en",
-				tone: "direct"
-			},
 			...starter.tools ? { tools: starter.tools } : {}
 		});
 	}

package/dist/src/agent/tools/executor.d.ts

@@ -18,7 +18,7 @@ import type { ToolConcurrencyController as ToolConcurrencyControllerType } from
 export interface ToolExecutorConfig {
     /** Default per-tool timeout when the tool does not declare its own `timeoutMs`. */
     defaultTimeoutMs: number;
-    /** Per-session policy override resolved from the effective agent manifest. */
+    /** Per-session policy resolved from global defaults and agent overrides. */
     resolveTimeoutMs?: (toolName: string) => number | undefined;
     /** Max retry attempts for tools opted into retry via `idempotent: true`. */
     maxRetries: number;

package/dist/src/agent/tools/workflow-tool.js

@@ -143,11 +143,7 @@ function resolveDefinitionId(params, catalog, config, sessionKey) {
 		catalog.load(name);
 		return name;
 	}
-	const configuredDefault = config ? (() => {
-		const policy = resolveEffectiveAgentProfileForSession(config, sessionKey).manifest.workflows;
-		const intent = params.intent?.trim().toLowerCase();
-		return (intent ? policy.suggested?.find((entry) => entry.intent.toLowerCase() === intent)?.workflow : void 0) ?? policy.default;
-	})() : void 0;
+	const configuredDefault = config ? resolveEffectiveAgentProfileForSession(config, sessionKey).config.workflows.default : void 0;
 	if (configuredDefault) {
 		catalog.load(configuredDefault);
 		return configuredDefault;

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

@@ -0,0 +1,2 @@
+export * from './schema.js';
+export * from './resolver.js';

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

@@ -0,0 +1,11 @@
+import { __esmMin } from "../../_virtual/_rolldown/runtime.js";
+import { AgentDefaultsSchema, AgentEntrySchema, AgentModelsDefaultsSchema, AgentModelsOverrideSchema, AgentProfileSchema, AgentsConfigSchema, DEFAULT_AGENT_MODEL_REF, EffectiveAgentConfigSchema, ImageGenerationRouteSchema, ModelIntentSchema, ModelRefSchema, ModelRouteSchema, RuntimePolicySchema, SkillDefaultsSchema, SkillOverrideSchema, ToolModeSchema, ToolPoliciesSchema, ToolPolicySchema, WorkflowPolicySchema, init_schema } from "./schema.js";
+import { init_resolver, resolveEffectiveAgentConfig } from "./resolver.js";
+//#region src/agent-config/index.ts
+var init_agent_config = __esmMin((() => {
+	init_schema();
+	init_resolver();
+}));
+//#endregion
+init_agent_config();
+export { AgentDefaultsSchema, AgentEntrySchema, AgentModelsDefaultsSchema, AgentModelsOverrideSchema, AgentProfileSchema, AgentsConfigSchema, DEFAULT_AGENT_MODEL_REF, EffectiveAgentConfigSchema, ImageGenerationRouteSchema, ModelIntentSchema, ModelRefSchema, ModelRouteSchema, RuntimePolicySchema, SkillDefaultsSchema, SkillOverrideSchema, ToolModeSchema, ToolPoliciesSchema, ToolPolicySchema, WorkflowPolicySchema, init_agent_config, resolveEffectiveAgentConfig };