@xopcai/xopc 0.0.230 → 0.0.232

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/tools/write.js

@@ -1,9 +1,10 @@
 import { checkFileSafety } from "../prompt/safety.js";
 import { isBareProfileMarkdownFileName, resolvePathUnderWorkspace, resolveProfileMarkdownPathIfBareName } from "./tool-paths.js";
 import { appendProductDeliveryText } from "../../../packages/gateway-contract/src/product-delivery.js";
+import { fileResourceId, fileSpaceId } from "../../files/file-service.js";
 import { evaluateFilePolicy } from "../sandbox/exec-policy.js";
-import { basename, dirname } from "path";
-import { mkdir, writeFile } from "fs/promises";
+import { basename, dirname, relative, sep } from "path";
+import { mkdir, realpath, writeFile } from "fs/promises";
 import { Type } from "@sinclair/typebox";
 //#region src/agent/tools/write.ts
 const MAX_FILE_SIZE = 10 * 1024 * 1024;
@@ -59,30 +60,26 @@ function createWriteFileTool(workspace, options) {
 				const target = writesProfileFile ? resolveProfileMarkdownPathIfBareName(p.path, options.profileMarkdownRoot) : resolvePathUnderWorkspace(p.path, workspace);
 				await mkdir(dirname(target), { recursive: true });
 				await writeFile(target, p.content, "utf-8");
-				const delivery = {
+				const delivery = writesProfileFile ? void 0 : await Promise.all([realpath(workspace), realpath(target)]).then(([root, canonicalTarget]) => ({
 					version: 1,
 					operation: "updated",
 					primary: {
 						kind: "file",
-						id: target,
+						id: fileResourceId(fileSpaceId(root), relative(root, canonicalTarget).split(sep).join("/")),
 						title: basename(target),
 						summary: `${contentBytes} bytes written`,
-						capabilities: [
-							"preview",
-							"reveal",
-							"share"
-						]
+						capabilities: ["preview", "share"]
 					}
-				};
+				}));
 				return {
 					content: [{
 						type: "text",
-						text: appendProductDeliveryText(`File written: ${target}`, delivery)
+						text: delivery ? appendProductDeliveryText(`File written: ${target}`, delivery) : `File written: ${target}`
 					}],
 					details: {
 						size: contentBytes,
 						path: target,
-						delivery
+						...delivery ? { delivery } : {}
 					}
 				};
 			} catch (error) {

package/dist/src/agent/tools/xopc-use-tool.js

@@ -11,10 +11,10 @@ import { TaskRunRepository } from "../../tasks/task-run-repository.js";
 import { TaskReadModelProjector } from "../../tasks/task-read-model-projector.js";
 import { TaskCommandSchema, TaskContextInputSchema } from "../../../packages/gateway-contract/src/tasks.js";
 import { appendProductDeliveryText } from "../../../packages/gateway-contract/src/product-delivery.js";
-import { CreateAutomationSchema, UpdateAutomationSchema } from "../../automations/domain/validation.js";
-import "../../automations/index.js";
 import { isValidProjectAgentId, normalizeProjectAgentId, resolveProjectAgentId } from "../../projects/project-agent.js";
 import "../../projects/index.js";
+import { CreateAutomationSchema, UpdateAutomationSchema } from "../../automations/domain/validation.js";
+import "../../automations/index.js";
 import { TaskContextRepository } from "../../tasks/task-context-repository.js";
 import { TaskDependencyError, TaskDependencyService } from "../../tasks/task-dependency-service.js";
 import { TaskApplicationService } from "../../tasks/task-application-service.js";

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 };

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

@@ -0,0 +1,11 @@
+import { type AgentDefaults, type AgentEntry, type EffectiveAgentConfig } from './schema.js';
+export type AgentConfigSource = 'system' | 'global' | 'agent';
+export interface ResolveEffectiveAgentConfigResult {
+    config: EffectiveAgentConfig;
+    sources: Record<string, AgentConfigSource>;
+}
+export declare function resolveEffectiveAgentConfig(params: {
+    defaults: AgentDefaults;
+    agent: AgentEntry;
+    defaultWorkspace?: (agentId: string) => string;
+}): ResolveEffectiveAgentConfigResult;

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

@@ -0,0 +1,113 @@
+import { __esmMin } from "../../_virtual/_rolldown/runtime.js";
+import { AgentDefaultsSchema, AgentEntrySchema, EffectiveAgentConfigSchema, init_schema } from "./schema.js";
+//#region src/agent-config/resolver.ts
+function unique(values) {
+	return [...new Set(values.map((value) => value.trim()).filter(Boolean))];
+}
+function resolveSkills(defaults, override) {
+	if (!override) return structuredClone(defaults);
+	if (override.mode === "replace") return {
+		mode: "selected",
+		include: unique(override.include).sort()
+	};
+	const additions = new Set(unique(override.add));
+	const removals = new Set(unique(override.remove));
+	if (defaults.mode === "selected") {
+		const include = new Set(defaults.include);
+		for (const skill of additions) include.add(skill);
+		for (const skill of removals) include.delete(skill);
+		return {
+			mode: "selected",
+			include: [...include].sort()
+		};
+	}
+	const exclude = new Set(defaults.exclude);
+	for (const skill of additions) exclude.delete(skill);
+	for (const skill of removals) exclude.add(skill);
+	return {
+		mode: "all-enabled",
+		exclude: [...exclude].sort()
+	};
+}
+function clearSources(path, sources) {
+	for (const sourcePath of Object.keys(sources)) if (sourcePath === path || sourcePath.startsWith(`${path}.`)) delete sources[sourcePath];
+}
+function markObjectSources(value, source, basePath, sources) {
+	if (!value || typeof value !== "object" || Array.isArray(value)) {
+		sources[basePath] = source;
+		return;
+	}
+	for (const [key, child] of Object.entries(value)) markObjectSources(child, source, basePath ? `${basePath}.${key}` : key, sources);
+}
+function resolveEffectiveAgentConfig(params) {
+	const defaults = AgentDefaultsSchema.parse(params.defaults);
+	const agent = AgentEntrySchema.parse(params.agent);
+	const sources = {};
+	markObjectSources(defaults, "global", "", sources);
+	const intents = structuredClone(defaults.models.intents);
+	for (const [intent, route] of Object.entries(agent.models?.intents ?? {})) if (route === null) {
+		delete intents[intent];
+		clearSources(`models.intents.${intent}`, sources);
+	} else if (route !== void 0) {
+		intents[intent] = structuredClone(route);
+		markObjectSources(route, "agent", `models.intents.${intent}`, sources);
+	}
+	const models = {
+		chat: structuredClone(agent.models?.chat ?? defaults.models.chat),
+		intents,
+		...agent.models?.imageUnderstanding === null ? {} : agent.models?.imageUnderstanding ? { imageUnderstanding: structuredClone(agent.models.imageUnderstanding) } : defaults.models.imageUnderstanding ? { imageUnderstanding: structuredClone(defaults.models.imageUnderstanding) } : {},
+		...agent.models?.imageGeneration === null ? {} : agent.models?.imageGeneration ? { imageGeneration: structuredClone(agent.models.imageGeneration) } : defaults.models.imageGeneration ? { imageGeneration: structuredClone(defaults.models.imageGeneration) } : {}
+	};
+	if (agent.models?.chat) markObjectSources(agent.models.chat, "agent", "models.chat", sources);
+	if (agent.models && Object.hasOwn(agent.models, "imageUnderstanding")) {
+		clearSources("models.imageUnderstanding", sources);
+		if (agent.models.imageUnderstanding) markObjectSources(agent.models.imageUnderstanding, "agent", "models.imageUnderstanding", sources);
+	}
+	if (agent.models && Object.hasOwn(agent.models, "imageGeneration")) {
+		clearSources("models.imageGeneration", sources);
+		if (agent.models.imageGeneration) markObjectSources(agent.models.imageGeneration, "agent", "models.imageGeneration", sources);
+	}
+	const tools = {
+		...structuredClone(defaults.tools),
+		...structuredClone(agent.tools ?? {})
+	};
+	for (const [tool, policy] of Object.entries(agent.tools ?? {})) markObjectSources(policy, "agent", `tools.${tool}`, sources);
+	const skills = resolveSkills(defaults.skills, agent.skills);
+	if (agent.skills) {
+		clearSources("skills", sources);
+		markObjectSources(skills, "agent", "skills", sources);
+	}
+	const workflows = {
+		...structuredClone(defaults.workflows),
+		...structuredClone(agent.workflows ?? {})
+	};
+	if (agent.workflows) markObjectSources(agent.workflows, "agent", "workflows", sources);
+	const runtime = {
+		...structuredClone(defaults.runtime),
+		...structuredClone(agent.runtime ?? {})
+	};
+	if (agent.runtime) markObjectSources(agent.runtime, "agent", "runtime", sources);
+	const workspace = agent.workspace ?? params.defaultWorkspace?.(agent.id) ?? `~/.xopc/workspace/${agent.id}`;
+	sources.workspace = agent.workspace ? "agent" : "system";
+	if (agent.profile) markObjectSources(agent.profile, "agent", "profile", sources);
+	return {
+		config: EffectiveAgentConfigSchema.parse({
+			id: agent.id,
+			enabled: agent.enabled,
+			workspace,
+			...agent.profile ? { profile: structuredClone(agent.profile) } : {},
+			models,
+			skills,
+			tools,
+			workflows,
+			runtime
+		}),
+		sources
+	};
+}
+var init_resolver = __esmMin((() => {
+	init_schema();
+}));
+//#endregion
+init_resolver();
+export { init_resolver, resolveEffectiveAgentConfig };