@markusylisiurunen/tau 0.2.66 → 0.2.68

package/dist/core/cli.js

@@ -1,17 +1,5 @@
-import { z } from "zod";
 import { parsePersonaReference } from "./persona_reference.js";
-import { REASONING_LEVELS, ReasoningEffortSchema, RiskLevelSchema, } from "./types.js";
-export const CliOptionsSchema = z.object({
-    help: z.boolean(),
-    debug: z.boolean(),
-    loadPath: z.string().optional(),
-    personaId: z.string().optional(),
-    reasoningOverride: ReasoningEffortSchema.optional(),
-    riskLevel: RiskLevelSchema.optional(),
-    sandbox: z.boolean(),
-    caffeinated: z.boolean(),
-    noAgentContextFiles: z.boolean(),
-});
+import { REASONING_LEVELS, RiskLevelSchema, } from "./types.js";
 export class CliError extends Error {
     constructor(message) {
         super(message);
@@ -35,17 +23,39 @@ export function parsePersonaString(raw, personas) {
         reasoning: personaId ? parsed.reasoning : undefined,
     };
 }
-function parseRiskLevel(raw) {
+function parsePersonaOption(raw, personas) {
+    const parsedReference = parsePersonaReference(raw);
+    if (parsedReference.error === "missing-reasoning") {
+        throw new CliError("missing reasoning level after ':' in --persona");
+    }
+    if (parsedReference.error === "invalid-reasoning") {
+        const allowed = REASONING_LEVELS.join(", ");
+        throw new CliError(`invalid reasoning level '${parsedReference.rawReasoning}'. allowed levels: ${allowed}`);
+    }
+    if (!parsedReference.personaId) {
+        throw new CliError("missing persona id in --persona");
+    }
+    const personaId = resolvePersonaId(parsedReference.personaId, personas);
+    if (!personaId) {
+        const available = personas.map((p) => p.id).join(", ");
+        throw new CliError(`unknown persona '${parsedReference.personaId}'. available personas: ${available}`);
+    }
+    return {
+        personaId,
+        reasoningOverride: parsedReference.reasoning,
+    };
+}
+function parseRiskOption(raw) {
     const normalized = raw.trim();
     if (!normalized) {
         throw new CliError("missing value for --risk");
     }
     const parsed = RiskLevelSchema.safeParse(normalized);
-    if (parsed.success) {
-        return parsed.data;
+    if (!parsed.success) {
+        const allowed = RiskLevelSchema.options.join(", ");
+        throw new CliError(`invalid risk level '${raw}'. allowed levels: ${allowed}`);
     }
-    const allowed = RiskLevelSchema.options.join(", ");
-    throw new CliError(`invalid risk level '${raw}'. allowed levels: ${allowed}`);
+    return parsed.data;
 }
 function parseValue(arg, argv, index) {
     const eqIndex = arg.indexOf("=");
@@ -83,9 +93,9 @@ export function parseCliArgs(argv, personas) {
             continue;
         }
         if (arg === "--load" || arg === "-l" || arg.startsWith("--load=") || arg.startsWith("-l=")) {
-            const { value, nextIndex } = parseValue(arg, argv, i);
-            i = nextIndex;
-            loadPath = value;
+            const parsed = parseValue(arg, argv, i);
+            loadPath = parsed.value;
+            i = parsed.nextIndex;
             continue;
         }
         if (arg === "--no-agent-context-files") {
@@ -104,34 +114,17 @@ export function parseCliArgs(argv, personas) {
             arg === "-p" ||
             arg.startsWith("--persona=") ||
             arg.startsWith("-p=")) {
-            const { value, nextIndex } = parseValue(arg, argv, i);
-            i = nextIndex;
-            const parsedReference = parsePersonaReference(value);
-            if (parsedReference.error === "missing-reasoning") {
-                throw new CliError("missing reasoning level after ':' in --persona");
-            }
-            if (parsedReference.error === "invalid-reasoning") {
-                const allowed = [...REASONING_LEVELS].join(", ");
-                throw new CliError(`invalid reasoning level '${parsedReference.rawReasoning}'. allowed levels: ${allowed}`);
-            }
-            if (!parsedReference.personaId) {
-                throw new CliError("missing persona id in --persona");
-            }
-            const resolvedPersonaId = resolvePersonaId(parsedReference.personaId, personas);
-            if (!resolvedPersonaId) {
-                const available = personas.map((p) => p.id).join(", ");
-                throw new CliError(`unknown persona '${parsedReference.personaId}'. available personas: ${available}`);
-            }
-            personaId = resolvedPersonaId;
-            if (parsedReference.reasoning !== undefined) {
-                reasoningOverride = parsedReference.reasoning;
-            }
+            const parsed = parseValue(arg, argv, i);
+            const persona = parsePersonaOption(parsed.value, personas);
+            personaId = persona.personaId;
+            reasoningOverride = persona.reasoningOverride;
+            i = parsed.nextIndex;
             continue;
         }
         if (arg === "--risk" || arg === "-r" || arg.startsWith("--risk=") || arg.startsWith("-r=")) {
-            const { value, nextIndex } = parseValue(arg, argv, i);
-            i = nextIndex;
-            riskLevel = parseRiskLevel(value);
+            const parsed = parseValue(arg, argv, i);
+            riskLevel = parseRiskOption(parsed.value);
+            i = parsed.nextIndex;
             continue;
         }
         if (arg.startsWith("-")) {
@@ -139,7 +132,7 @@ export function parseCliArgs(argv, personas) {
         }
         throw new CliError(`unexpected argument: ${arg}`);
     }
-    const options = {
+    return {
         help,
         debug,
         loadPath,
@@ -150,7 +143,6 @@ export function parseCliArgs(argv, personas) {
         caffeinated,
         noAgentContextFiles,
     };
-    return CliOptionsSchema.parse(options);
 }
 export function printHelp(personas) {
     const personaList = personas.map((p) => p.id).join(", ");

package/dist/core/cli.js.map

@@ -1 +1 @@
-{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../src/core/cli.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../src/core/cli.ts"],"names":[],"mappings":"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"}

package/dist/core/config/content_loader.js

@@ -1,5 +1,4 @@
 import { basename, join } from "node:path";
-import { getModels, getProviders } from "@mariozechner/pi-ai";
 import { z } from "zod";
 import { personas as builtinPersonas } from "../personas.js";
 import { parseSubagentLaunchModelList } from "../subagents/launch_model.js";
@@ -15,32 +14,23 @@ import { WAIT_FOR_AGENT_TOOL } from "../tools/wait_for_agent.js";
 import { WRITE_TOOL } from "../tools/write.js";
 import { ReasoningEffortSchema, RiskLevelSchema } from "../types.js";
 import { formatZodError } from "../utils/zod.js";
-import { createDefaultConfigDeps } from "./deps.js";
 import { parseMarkdownFrontMatter } from "./markdown_frontmatter.js";
-import { resolveConfigLevels } from "./paths.js";
 import { loadSkillsContent as loadCanonicalSkillsContent } from "./skills_loader.js";
 import { buildVirtualBundle } from "./virtual_bundle.js";
-function isKnownProvider(value) {
-    return getProviders().includes(value);
-}
 const SubagentNameSchema = z
     .string()
     .trim()
     .min(1)
     .max(64)
     .regex(/^[a-z0-9]+(?:-[a-z0-9]+)*$/);
-const StringListSchema = z.array(z.string());
-const TrimmedNonEmptyStringListSchema = StringListSchema.transform((list) => list.map((item) => item.trim())).refine((list) => list.every(Boolean), {
-    message: "entries must be non-empty strings",
-});
 const SubagentSpecSchema = z
     .object({
     provider: z.string().trim().min(1).optional(),
     model: z.string().trim().min(1).optional(),
     reasoning: ReasoningEffortSchema.optional(),
-    tools: StringListSchema.optional(),
+    tools: z.array(z.string()).optional(),
     riskLevel: RiskLevelSchema.optional(),
-    launchModels: StringListSchema.optional(),
+    launchModels: z.array(z.string()).optional(),
     systemPrompt: z.string().trim().min(1).optional(),
     description: z.string().trim().min(1).optional(),
 })
@@ -57,6 +47,12 @@ const SubagentSpecSchema = z
 });
 const SUBAGENT_TOOL_NAME_SET = new Set(SUBAGENT_TOOL_NAMES);
 const SubagentConfigInputSchema = z.record(SubagentNameSchema, z.union([z.literal(false), SubagentSpecSchema]));
+const TrimmedNonEmptyStringListSchema = z
+    .array(z.string())
+    .transform((list) => list.map((item) => item.trim()))
+    .refine((list) => list.every(Boolean), {
+    message: "entries must be non-empty strings",
+});
 function parseSubagentTools(toolsRaw) {
     if (toolsRaw === undefined) {
         return {};
@@ -100,7 +96,7 @@ function cloneSubagentPersonaConfig(config) {
         ...(config.launchModels ? { launchModels: [...config.launchModels] } : {}),
     };
 }
-function parseSubagentConfig(subagentsRaw) {
+function parseSubagentConfig(subagentsRaw, modelResolver) {
     if (subagentsRaw === undefined) {
         return {};
     }
@@ -142,7 +138,9 @@ function parseSubagentConfig(subagentsRaw) {
         if (toolsResult.error) {
             return { error: `subagent ${validatedName}: ${toolsResult.error}` };
         }
-        const launchModelsResult = parseSubagentLaunchModelList(specRaw.launchModels);
+        const launchModelsResult = parseSubagentLaunchModelList(specRaw.launchModels, {
+            resolveModel: modelResolver,
+        });
         if (launchModelsResult.error) {
             return {
                 error: `subagent ${validatedName}: launchModels ${launchModelsResult.error}`,
@@ -156,7 +154,7 @@ function parseSubagentConfig(subagentsRaw) {
             : undefined;
         let modelObj;
         if (provider && model) {
-            modelObj = resolveModel(provider, model);
+            modelObj = modelResolver(provider, model);
             if (!modelObj) {
                 return {
                     error: `subagent ${validatedName}: failed to resolve model "${provider}:${model}"`,
@@ -213,10 +211,47 @@ function parsePersonaTools(toolsRaw) {
     }
     return { tools: selected };
 }
-function resolveModel(provider, modelId) {
-    if (!isKnownProvider(provider))
-        return undefined;
-    return getModels(provider).find((m) => m.id === modelId);
+function resolvePersonaModels(persona, modelResolver) {
+    const resolvedPersonaModel = modelResolver(persona.model.provider, persona.model.id);
+    if (!resolvedPersonaModel) {
+        return {
+            error: `failed to resolve model "${persona.model.provider}:${persona.model.id}"`,
+        };
+    }
+    if (!persona.subagents) {
+        return {
+            persona: {
+                ...persona,
+                model: resolvedPersonaModel,
+            },
+        };
+    }
+    const resolvedSubagents = {};
+    for (const [name, config] of Object.entries(persona.subagents)) {
+        if (!config?.model) {
+            if (config) {
+                resolvedSubagents[name] = cloneSubagentPersonaConfig(config);
+            }
+            continue;
+        }
+        const resolvedSubagentModel = modelResolver(config.model.provider, config.model.id);
+        if (!resolvedSubagentModel) {
+            return {
+                error: `subagent ${name}: failed to resolve model "${config.model.provider}:${config.model.id}"`,
+            };
+        }
+        resolvedSubagents[name] = {
+            ...cloneSubagentPersonaConfig(config),
+            model: resolvedSubagentModel,
+        };
+    }
+    return {
+        persona: {
+            ...persona,
+            model: resolvedPersonaModel,
+            subagents: resolvedSubagents,
+        },
+    };
 }
 function mergeById(base, overlay, overlay2) {
     const map = new Map();
@@ -296,9 +331,10 @@ function loadJsonEntries(dir, deps, listFiles) {
     return loadEntries(dir, deps, listFiles);
 }
 function resolveContentContext(options) {
-    const deps = options?.deps ?? createDefaultConfigDeps();
-    const levels = options?.levels ?? resolveConfigLevels(deps, { cwd: options?.cwd });
-    return { deps, levels };
+    return {
+        deps: options.deps,
+        levels: options.levels,
+    };
 }
 const personaFrontMatterSchema = z
     .object({
@@ -340,7 +376,7 @@ const DEFAULT_SUBAGENT_TOOLS = [
     WAIT_FOR_AGENT_TOOL,
     TERMINATE_AGENT_TOOL,
 ];
-function parsePersona(file, content, source, basePersonasById) {
+function parsePersona(file, content, source, modelResolver, basePersonasById) {
     const markdownResult = parseMarkdownFrontMatter(content);
     if (!markdownResult.ok) {
         return { error: `${file}: ${markdownResult.message}. skipped.` };
@@ -365,7 +401,7 @@ function parsePersona(file, content, source, basePersonasById) {
     if (extendsId && !basePersona) {
         return { error: `${file}: extends "${extendsId}" not found. skipped.` };
     }
-    const modelObj = resolveModel(provider, model);
+    const modelObj = modelResolver(provider, model);
     if (!modelObj) {
         return { error: `${file}: failed to load model "${provider}:${model}". skipped.` };
     }
@@ -398,7 +434,7 @@ function parsePersona(file, content, source, basePersonasById) {
         }
     }
     // Parse subagents
-    const subagentsResult = parseSubagentConfig(subagentsRaw);
+    const subagentsResult = parseSubagentConfig(subagentsRaw, modelResolver);
     if (subagentsResult.error) {
         return { error: `${file}: ${subagentsResult.error}. skipped.` };
     }
@@ -537,9 +573,8 @@ function parseTheme(entry, scope) {
 }
 export async function loadUserPersonas(args) {
     const { deps, levels } = resolveContentContext({
-        deps: args?.deps,
-        levels: args?.levels,
-        cwd: args?.cwd,
+        deps: args.deps,
+        levels: args.levels,
     });
     const globalLevel = levels.find((level) => level.scope === "global");
     if (!globalLevel) {
@@ -548,9 +583,9 @@ export async function loadUserPersonas(args) {
     const personasDir = globalLevel.personasDir;
     const { entries, errors } = loadMarkdownEntries(personasDir, deps, listMarkdownFiles);
     const personas = [];
-    const basePersonasById = args?.basePersonasById ?? new Map(builtinPersonas.map((p) => [p.id.toLowerCase(), p]));
+    const basePersonasById = args.basePersonasById ?? new Map(builtinPersonas.map((p) => [p.id.toLowerCase(), p]));
     for (const file of entries) {
-        const result = parsePersona(file.path, file.content, "user", basePersonasById);
+        const result = parsePersona(file.path, file.content, "user", args.modelResolver, basePersonasById);
         if (result.persona) {
             personas.push(result.persona);
         }
@@ -562,9 +597,8 @@ export async function loadUserPersonas(args) {
 }
 export async function loadProjectPersonas(args) {
     const { deps, levels } = resolveContentContext({
-        deps: args?.deps,
-        levels: args?.levels,
-        cwd: args?.cwd,
+        deps: args.deps,
+        levels: args.levels,
     });
     const projectLevels = levels.filter((level) => level.scope === "project");
     if (projectLevels.length === 0) {
@@ -572,13 +606,13 @@ export async function loadProjectPersonas(args) {
     }
     const personas = [];
     const errors = [];
-    const basePersonasById = args?.basePersonasById ?? new Map(builtinPersonas.map((p) => [p.id.toLowerCase(), p]));
+    const basePersonasById = args.basePersonasById ?? new Map(builtinPersonas.map((p) => [p.id.toLowerCase(), p]));
     // Parent-first order, closest directory wins on conflicts.
     for (const level of projectLevels) {
         const { entries, errors: entryErrors } = loadMarkdownEntries(level.personasDir, deps, listMarkdownFiles);
         errors.push(...entryErrors);
         for (const file of entries) {
-            const result = parsePersona(file.path, file.content, "project", basePersonasById);
+            const result = parsePersona(file.path, file.content, "project", args.modelResolver, basePersonasById);
             if (result.persona) {
                 personas.push(result.persona);
             }
@@ -591,9 +625,8 @@ export async function loadProjectPersonas(args) {
 }
 export async function loadUserPrompts(args) {
     const { deps, levels } = resolveContentContext({
-        deps: args?.deps,
-        levels: args?.levels,
-        cwd: args?.cwd,
+        deps: args.deps,
+        levels: args.levels,
     });
     const globalLevel = levels.find((level) => level.scope === "global");
     if (!globalLevel) {
@@ -615,9 +648,8 @@ export async function loadUserPrompts(args) {
 }
 export async function loadProjectPrompts(args) {
     const { deps, levels } = resolveContentContext({
-        deps: args?.deps,
-        levels: args?.levels,
-        cwd: args?.cwd,
+        deps: args.deps,
+        levels: args.levels,
     });
     const projectLevels = levels.filter((level) => level.scope === "project");
     if (projectLevels.length === 0) {
@@ -643,9 +675,8 @@ export async function loadProjectPrompts(args) {
 }
 export async function loadUserThemes(args) {
     const { deps, levels } = resolveContentContext({
-        deps: args?.deps,
-        levels: args?.levels,
-        cwd: args?.cwd,
+        deps: args.deps,
+        levels: args.levels,
     });
     const globalLevel = levels.find((level) => level.scope === "global");
     if (!globalLevel) {
@@ -666,9 +697,8 @@ export async function loadUserThemes(args) {
 }
 export async function loadProjectThemes(args) {
     const { deps, levels } = resolveContentContext({
-        deps: args?.deps,
-        levels: args?.levels,
-        cwd: args?.cwd,
+        deps: args.deps,
+        levels: args.levels,
     });
     const projectLevels = levels.filter((level) => level.scope === "project");
     if (projectLevels.length === 0) {
@@ -697,25 +727,59 @@ export async function loadSkillsContent(config, options) {
 }
 export async function loadAllContent(config, options) {
     const { deps, levels } = resolveContentContext({
-        deps: options?.deps,
-        levels: options?.levels,
-        cwd: options?.cwd,
+        deps: options.deps,
+        levels: options.levels,
     });
-    const virtualBundle = buildVirtualBundle(config ?? {}, deps);
+    const virtualBundle = buildVirtualBundle(config ?? {});
     try {
-        const basePersonasById = new Map(builtinPersonas.map((p) => [p.id.toLowerCase(), p]));
+        const modelResolverResult = {
+            resolveModel: options.modelResolver,
+            errors: [],
+        };
+        const builtinPersonaErrors = [];
+        const resolvedBuiltinPersonas = [];
+        for (const persona of builtinPersonas) {
+            const resolved = resolvePersonaModels(persona, modelResolverResult.resolveModel);
+            if (resolved.persona) {
+                resolvedBuiltinPersonas.push(resolved.persona);
+            }
+            else if (resolved.error) {
+                builtinPersonaErrors.push(`builtin persona '${persona.id}': ${resolved.error}`);
+            }
+        }
+        const resolvedVirtualBundlePersonas = virtualBundle.personas === builtinPersonas ? [...resolvedBuiltinPersonas] : [];
+        if (resolvedVirtualBundlePersonas.length === 0) {
+            for (const persona of virtualBundle.personas) {
+                const resolved = resolvePersonaModels(persona, modelResolverResult.resolveModel);
+                if (resolved.persona) {
+                    resolvedVirtualBundlePersonas.push(resolved.persona);
+                }
+                else if (resolved.error) {
+                    builtinPersonaErrors.push(`builtin persona '${persona.id}': ${resolved.error}`);
+                }
+            }
+        }
+        const basePersonasById = new Map(resolvedBuiltinPersonas.map((persona) => [persona.id.toLowerCase(), persona]));
         const userPersonasResult = await loadUserPersonas({
             basePersonasById,
+            modelResolver: modelResolverResult.resolveModel,
+            deps,
+            levels,
+        });
+        const projectPersonasResult = await loadProjectPersonas({
+            basePersonasById,
+            modelResolver: modelResolverResult.resolveModel,
             deps,
             levels,
         });
-        const projectPersonasResult = await loadProjectPersonas({ basePersonasById, deps, levels });
         const userPromptsResult = await loadUserPrompts({ deps, levels });
         const projectPromptsResult = await loadProjectPrompts({ deps, levels });
         const skillsResult = await loadSkillsContent(config, { deps, levels });
         const userThemesResult = await loadUserThemes({ deps, levels });
         const projectThemesResult = await loadProjectThemes({ deps, levels });
         const allErrors = [
+            ...modelResolverResult.errors,
+            ...builtinPersonaErrors,
             ...userPersonasResult.errors,
             ...projectPersonasResult.errors,
             ...userPromptsResult.errors,
@@ -727,7 +791,7 @@ export async function loadAllContent(config, options) {
         const skills = skillsResult.skills;
         // Precedence: virtual bundle < global < nearest .tau levels.
         const defaultLaunchModels = config?.subagents?.defaultLaunchModels;
-        const personas = mergeById(virtualBundle.personas, userPersonasResult.personas, projectPersonasResult.personas).map((persona) => withDefaultSubagentLaunchModels(persona, defaultLaunchModels));
+        const personas = mergeById(resolvedVirtualBundlePersonas, userPersonasResult.personas, projectPersonasResult.personas).map((persona) => withDefaultSubagentLaunchModels(persona, defaultLaunchModels));
         return {
             personas,
             prompts: mergeById(virtualBundle.prompts, userPromptsResult.prompts, projectPromptsResult.prompts),