pi-subagents 0.70.0 → 0.70.1

package/src/agents/agents.js

@@ -510,7 +510,6 @@ function cloneOverrideBase(agent) {
         ...(!agent.extensionsFromDefault && agent.extensions ? { extensions: [...agent.extensions] } : {}),
         ...(agent.subagentOnlyExtensions ? { subagentOnlyExtensions: [...agent.subagentOnlyExtensions] } : {}),
         ...(agent.mutationTools ? { mutationTools: [...agent.mutationTools] } : {}),
-        ...(agent.completionGuard !== undefined ? { completionGuard: agent.completionGuard } : {}),
         ...(agent.toolBudget !== undefined ? { toolBudget: agent.toolBudget } : {}),
     };
 }
@@ -541,7 +540,6 @@ function cloneOverrideValue(override) {
         ...(override.extensions !== undefined ? { extensions: override.extensions === false ? false : [...override.extensions] } : {}),
         ...(override.subagentOnlyExtensions !== undefined ? { subagentOnlyExtensions: override.subagentOnlyExtensions === false ? false : [...override.subagentOnlyExtensions] } : {}),
         ...(override.mutationTools !== undefined ? { mutationTools: override.mutationTools === false ? false : [...override.mutationTools] } : {}),
-        ...(override.completionGuard !== undefined ? { completionGuard: override.completionGuard } : {}),
         ...(override.toolBudget !== undefined ? { toolBudget: override.toolBudget === false ? false : { ...override.toolBudget, ...(Array.isArray(override.toolBudget.block) ? { block: [...override.toolBudget.block] } : {}) } } : {}),
     };
 }
@@ -804,14 +802,6 @@ function parseBuiltinOverrideEntry(name, value, filePath) {
             throw new Error(`Builtin override '${name}' in '${filePath}' has invalid 'disabled'; expected a boolean.`);
         }
     }
-    if ("completionGuard" in input) {
-        if (typeof input.completionGuard === "boolean") {
-            override.completionGuard = input.completionGuard;
-        }
-        else {
-            throw new Error(`Builtin override '${name}' in '${filePath}' has invalid 'completionGuard'; expected a boolean.`);
-        }
-    }
     if ("toolBudget" in input) {
         if (input.toolBudget === false) {
             override.toolBudget = false;
@@ -1263,8 +1253,6 @@ function applyBuiltinOverride(agent, override, meta) {
         else
             next.mutationTools = [...override.mutationTools];
     }
-    if (override.completionGuard !== undefined)
-        next.completionGuard = override.completionGuard;
     if (override.toolBudget !== undefined) {
         if (override.toolBudget === false)
             delete next.toolBudget;
@@ -1331,6 +1319,43 @@ function applyCustomAgentOverrides(agents, userSettings, projectSettings, userSe
         return withUserOverride;
     });
 }
+function runtimeAgentOverrides(settings) {
+    const overrides = {};
+    for (const [name, override] of Object.entries(settings.overrides)) {
+        const narrowed = {};
+        if (override.model !== undefined)
+            narrowed.model = override.model;
+        if (override.defaultProvider !== undefined)
+            narrowed.defaultProvider = override.defaultProvider;
+        if (override.fast !== undefined)
+            narrowed.fast = override.fast;
+        if (override.thinking !== undefined)
+            narrowed.thinking = override.thinking;
+        if (Object.keys(narrowed).length > 0)
+            overrides[name] = narrowed;
+    }
+    return { ...settings, overrides };
+}
+/**
+ * Runtime-registered agents keep their extension-owned definition (prompt,
+ * tools, context, budgets, and every other launch field) but follow the same
+ * model-tier settings as every other agent: `subagents.defaultModel`,
+ * `defaultProvider`, `defaultThinking`, and the `model`, `defaultProvider`,
+ * `fast`, and `thinking` fields of `agentOverrides.<name>`, user then project,
+ * provider-scoped overrides included. Other override fields are ignored for
+ * runtime agents. A definition `model` still wins over `defaultModel`.
+ */
+export function applyRuntimeAgentSettings(agents, context) {
+    if (agents.length === 0)
+        return agents;
+    const sources = getAgentDiscoverySources(context.cwd, context.preferredModelProvider);
+    const { user, project } = settingsForScope(sources, context.scope);
+    const defaultProvider = resolveSubagentDefaultProvider(user, project, sources.projectSettingsPath);
+    const defaultModel = resolveSubagentDefaultModel(user, project, sources.userSettingsPath, sources.projectSettingsPath, defaultProvider);
+    const defaultThinking = resolveSubagentDefaultThinking(user, project, sources.projectSettingsPath);
+    const withDefaults = applySubagentDefaultThinking(applySubagentDefaultModel(agents, defaultModel, defaultProvider), defaultThinking);
+    return applyCustomAgentOverrides(withDefaults, runtimeAgentOverrides(user), runtimeAgentOverrides(project), sources.userSettingsPath, sources.projectSettingsPath);
+}
 export function buildBuiltinOverrideConfig(base, draft) {
     const override = {};
     if (draft.machine !== base.machine)
@@ -1387,9 +1412,6 @@ export function buildBuiltinOverrideConfig(base, draft) {
     }
     if (!arraysEqual(draft.mutationTools, base.mutationTools))
         override.mutationTools = draft.mutationTools ? [...draft.mutationTools] : false;
-    if ((draft.completionGuard !== false) !== (base.completionGuard !== false)) {
-        override.completionGuard = draft.completionGuard !== false;
-    }
     if (JSON.stringify(draft.toolBudget) !== JSON.stringify(base.toolBudget))
         override.toolBudget = draft.toolBudget ?? false;
     return Object.keys(override).length > 0 ? override : undefined;
@@ -1741,7 +1763,7 @@ function parseAgentRunnerFrontmatter(raw, agentName) {
 function validateExternalRunnerProfile(frontmatter, agentName, runner) {
     if (runner?.type !== "external-cli" && runner?.type !== "external-job")
         return;
-    const unsupported = ["tools", "excludeTools", "allowNestedSubagents", "allowedAgents", "model", "thinking", "extensions", "subagentOnlyExtensions", "mutationTools", "maxSubagentDepth", "completionGuard", "skills", "skill", "skillPath", "toolBudget", "permission", "permissions"]
+    const unsupported = ["tools", "excludeTools", "allowNestedSubagents", "allowedAgents", "model", "thinking", "extensions", "subagentOnlyExtensions", "mutationTools", "maxSubagentDepth", "skills", "skill", "skillPath", "toolBudget", "permission", "permissions"]
         .filter((field) => frontmatter[field] !== undefined);
     if (unsupported.length > 0) {
         throw new Error(`Agent '${agentName}' uses runner.type='${runner.type}' and declares unsupported Pi-only fields: ${unsupported.join(", ")}.`);
@@ -1946,11 +1968,6 @@ function loadAgentsFromDefinitionFiles(files, source, discoveryPriority, package
                 assertJsonSchemaObject(parsed, `Agent '${localName}' outputSchema`);
                 outputSchema = parsed;
             }
-            const completionGuard = frontmatter.completionGuard === "false"
-                ? false
-                : frontmatter.completionGuard === "true"
-                    ? true
-                    : undefined;
             const maxSubagentDepth = Number.isInteger(parsedMaxSubagentDepth) && parsedMaxSubagentDepth >= 0
                 ? parsedMaxSubagentDepth
                 : undefined;
@@ -2002,7 +2019,6 @@ function loadAgentsFromDefinitionFiles(files, source, discoveryPriority, package
                 defaultProgress: frontmatter.defaultProgress === "true",
                 interactive: frontmatter.interactive === "true",
                 ...(maxSubagentDepth !== undefined ? { maxSubagentDepth } : {}),
-                ...(completionGuard !== undefined ? { completionGuard } : {}),
                 ...(toolBudget !== undefined ? { toolBudget } : {}),
                 ...(permissions !== undefined ? { permissions } : {}),
                 ...(memory !== undefined ? { memory } : {}),
@@ -2540,6 +2556,7 @@ function buildAllDiscovery(sources, includeChains, settingsScope) {
         ],
         chains,
         chainDiagnostics: [...packageChainDiagnostics, ...(sources.userChains?.diagnostics ?? []), ...projectChainDiagnostics],
+        cwd: sources.cwd,
         userDir: sources.userDir,
         projectDir: sources.projectAgentsDir,
         userChainDir: sources.userChainDir,