@fro.bot/systematic 3.15.0 → 3.16.0

package/dist/index.js

@@ -1,21 +1,25 @@
 // @bun
 import {
+  parseFrontmatter,
+  string,
+  array,
+  object,
+  record,
+  _enum,
   AgentOverlaySchema,
   CategoryOverlaySchema,
-  __require,
-  discoverSkills,
-  exports_external,
-  extractAgentFrontmatter,
-  extractCommandFrontmatter,
-  findAgentsInDir,
-  findCommandsInDir,
-  findSkillsInDir,
-  isDiscoverableMarkdown,
   isRecord,
+  resolveRouting,
   loadConfig,
   loadConfigWithSources,
-  parseFrontmatter
-} from "./index-0stf3ag0.js";
+  isDiscoverableMarkdown,
+  findAgentsInDir,
+  extractAgentFrontmatter,
+  findCommandsInDir,
+  extractCommandFrontmatter,
+  findSkillsInDir,
+  discoverSkills
+} from "./index-ae6mhwth.js";
 
 // src/index.ts
 import { createHash as createHash4 } from "crypto";
@@ -479,7 +483,7 @@ function loadSkillAsCommand(loaded) {
     config.subtask = loaded.subtask;
   return config;
 }
-function collectAgents(dir, disabledAgents, nativeAgents, overlays) {
+function collectAgents(dir, disabledAgents, nativeAgents, overlays, rawOverlays) {
   const agents = {};
   const agentList = findAgentsInDir(dir);
   const disabledSet = new Set(disabledAgents);
@@ -494,12 +498,16 @@ function collectAgents(dir, disabledAgents, nativeAgents, overlays) {
       continue;
     const config = loadAgentAsConfig(agentInfo);
     if (config) {
-      agents[agentInfo.name] = applyAgentOverlays(config, agentInfo, overlays);
+      agents[agentInfo.name] = applyAgentOverlays(config, agentInfo, overlays, rawOverlays);
     }
   }
   return agents;
 }
-function applyAgentOverlays(config, agentInfo, overlays) {
+var EMPTY_PI_SUBAGENTS_OVERLAYS = {
+  agents: {},
+  categories: {}
+};
+function applyAgentOverlays(config, agentInfo, overlays, rawOverlays) {
   const id = agentInfo.category ? `${agentInfo.category}/${agentInfo.name}` : agentInfo.name;
   const categoryOverlay = agentInfo.category ? overlays.categoriesByKey.get(agentInfo.category) : undefined;
   const exactOverlay = overlays.agentsByTargetId.get(id);
@@ -509,15 +517,40 @@ function applyAgentOverlays(config, agentInfo, overlays) {
   if (hasPermissionOverlay && isRecord(config.permission)) {
     addPermissionRules(permissionRules, config.permission);
   }
-  applyAgentOverlay(result, categoryOverlay?.value, permissionRules);
-  applyAgentOverlay(result, exactOverlay?.value, permissionRules);
+  const routing = resolveRouting({
+    overlays: rawOverlays,
+    piSubagentsOverlays: EMPTY_PI_SUBAGENTS_OVERLAYS,
+    target: { agentKey: agentInfo.name, category: agentInfo.category ?? "" },
+    harness: "opencode"
+  });
+  applyAgentOverlayPass(result, categoryOverlay?.value, permissionRules, routing, "category");
+  applyAgentOverlayPass(result, exactOverlay?.value, permissionRules, routing, "agent");
   applyPermissionOverlay(result, permissionRules, hasPermissionOverlay);
   return result;
 }
-function applyAgentOverlay(target, overlay, permissionRules) {
+function applyAgentOverlayPass(target, overlay, permissionRules, routing, level) {
+  if (routing.source.model?.level === level) {
+    applyRoutingModel(target, routing.model);
+  }
+  if (routing.source.qualifier?.level === level) {
+    target.variant = routing.qualifier;
+  }
   if (overlay === undefined)
     return;
-  applyOverlayObjectWithVariantClearing(target, overlay, permissionRules);
+  applyOverlayObjectFields(target, overlay);
+  if (isRecord(overlay.permission)) {
+    addPermissionRules(permissionRules, overlay.permission);
+  }
+  if (Array.isArray(overlay.skills)) {
+    addManagedSkillRules(permissionRules, overlay.skills);
+  }
+}
+function applyRoutingModel(target, model) {
+  if (model === null) {
+    delete target.model;
+  } else if (model !== undefined) {
+    target.model = model;
+  }
 }
 function applyPermissionOverlay(target, permissionRules, hasPermissionOverlay) {
   if (!hasPermissionOverlay)
@@ -533,8 +566,6 @@ function overlayControlsPermission(overlay) {
   return overlay !== undefined && (Object.hasOwn(overlay, "permission") || Object.hasOwn(overlay, "skills"));
 }
 var OVERLAY_ASSIGN_FIELDS = [
-  "model",
-  "variant",
   "temperature",
   "top_p",
   "mode",
@@ -542,27 +573,12 @@ var OVERLAY_ASSIGN_FIELDS = [
   "steps",
   "hidden"
 ];
-function applyOverlayObjectWithVariantClearing(target, overlay, permissionRules) {
-  const overlayHasModel = Object.hasOwn(overlay, "model");
-  const overlayHasVariant = Object.hasOwn(overlay, "variant");
-  if (overlayHasModel && !overlayHasVariant) {
-    delete target.variant;
-  }
+function applyOverlayObjectFields(target, overlay) {
   for (const field of OVERLAY_ASSIGN_FIELDS) {
     if (Object.hasOwn(overlay, field)) {
-      if (field === "model" && overlay[field] === null) {
-        delete target[field];
-      } else {
-        target[field] = overlay[field];
-      }
+      target[field] = overlay[field];
     }
   }
-  if (isRecord(overlay.permission)) {
-    addPermissionRules(permissionRules, overlay.permission);
-  }
-  if (Array.isArray(overlay.skills)) {
-    addManagedSkillRules(permissionRules, overlay.skills);
-  }
 }
 function createPermissionRuleAccumulator() {
   return new Map;
@@ -705,7 +721,7 @@ function createConfigHandler(deps) {
       enabledSkills: enabledSkillNames
     });
     const resolvedOverlays = resolveAgentOverlaySet(validatedOverlays);
-    const bundledAgents = collectAgents(bundledAgentsDir, systematicConfig.disabled_agents, nativeAgents, resolvedOverlays);
+    const bundledAgents = collectAgents(bundledAgentsDir, systematicConfig.disabled_agents, nativeAgents, resolvedOverlays, overlays);
     const bundledCommands = collectCommands(bundledCommandsDir, systematicConfig.disabled_commands);
     const discoveredSkillCommands = systematicConfig.skills_as_commands !== false ? collectDiscoveredSkillsAsCommands(directory, homeDir, opencodeConfigDir, opencodeConfigDirOverride, systematicConfig.disabled_commands) : {};
     const bundledAgentKeys = new Set(Object.keys(bundledAgents));
@@ -731,14 +747,14 @@ function registerSkillsPaths(config, skillsDir) {
   };
 }
 function removeSystematicSkillPaths(paths) {
-  return paths.filter((path5) => !isSystematicSkillPath(path5));
+  return paths.filter((path) => !isSystematicSkillPath(path));
 }
-function isSystematicSkillPath(path5) {
-  const normalizedPath = normalizePath(path5);
+function isSystematicSkillPath(path) {
+  const normalizedPath = normalizePath(path);
   return normalizedPath.endsWith("/.config/opencode/systematic/skills") || normalizedPath.endsWith("/.cache/opencode/systematic/skills") || normalizedPath.endsWith("/.local/share/opencode/systematic/skills") || normalizedPath.endsWith("/.opencode/systematic/skills") || /(?:^|\/)\.cache\/opencode\/packages\/@fro\.bot\/systematic@[^/]+\/node_modules\/@fro\.bot\/systematic\/skills(?:$|\/)/u.test(normalizedPath);
 }
-function normalizePath(path5) {
-  return path5.replaceAll("\\", "/").replace(/\/+$/u, "");
+function normalizePath(path) {
+  return path.replaceAll("\\", "/").replace(/\/+$/u, "");
 }
 
 // src/lib/opencode-operation-observer.ts
@@ -1655,10 +1671,10 @@ function createQuestionAttestation(options = {}) {
   const disabledSessions = new Set;
   let challengeCounter = 0;
   function expireChallenges(now) {
-    for (const [challengeId, challenge2] of challenges) {
-      if ((challenge2.state === "pending" || challenge2.state === "bound") && now - challenge2.createdAt > maxChallengeAgeMs) {
-        challenge2.state = "expired";
-        const key = bindingKey(challenge2, challenge2.resourceDigest);
+    for (const [challengeId, challenge] of challenges) {
+      if ((challenge.state === "pending" || challenge.state === "bound") && now - challenge.createdAt > maxChallengeAgeMs) {
+        challenge.state = "expired";
+        const key = bindingKey(challenge, challenge.resourceDigest);
         if (activeByBinding.get(key) === challengeId)
           activeByBinding.delete(key);
       }
@@ -1675,17 +1691,17 @@ function createQuestionAttestation(options = {}) {
   function findBindChallenge(input) {
     return "challengeId" in input ? findChallengeById(input.challengeId) : findChallengeByScope(input);
   }
-  function bindStateRejection(challenge2, input) {
-    if (challenge2.state === "expired")
+  function bindStateRejection(challenge, input) {
+    if (challenge.state === "expired")
       return "challenge-expired";
-    if (challenge2.state === "denied" || challenge2.state === "consumed") {
+    if (challenge.state === "denied" || challenge.state === "consumed") {
       return "challenge-consumed";
     }
-    if ("sessionId" in input && input.sessionId !== undefined && input.sessionId !== challenge2.sessionId) {
+    if ("sessionId" in input && input.sessionId !== undefined && input.sessionId !== challenge.sessionId) {
       return "call-session-mismatch";
     }
-    if (challenge2.state === "bound") {
-      return challenge2.requestId === input.requestId ? "already-bound" : "substitution";
+    if (challenge.state === "bound") {
+      return challenge.requestId === input.requestId ? "already-bound" : "substitution";
     }
     return seenRequestIds.has(input.requestId) ? "replay" : null;
   }
@@ -1693,23 +1709,23 @@ function createQuestionAttestation(options = {}) {
     const challengeId = challengeByRequest.get(requestId);
     return challengeId === undefined ? null : challenges.get(challengeId) ?? null;
   }
-  function replyStateRejection(challenge2, input) {
-    if (challenge2.sessionId !== input.sessionId)
+  function replyStateRejection(challenge, input) {
+    if (challenge.sessionId !== input.sessionId)
       return "substitution";
-    if (challenge2.state === "expired")
+    if (challenge.state === "expired")
       return "challenge-expired";
-    if (challenge2.state !== "bound" || challenge2.requestId !== input.requestId) {
+    if (challenge.state !== "bound" || challenge.requestId !== input.requestId) {
       return "replay";
     }
     return null;
   }
-  function rejectStateRejection(challenge2, input) {
-    if (challenge2.sessionId !== input.sessionId)
+  function rejectStateRejection(challenge, input) {
+    if (challenge.sessionId !== input.sessionId)
       return "substitution";
-    if (challenge2.state === "denied" || challenge2.state === "consumed") {
+    if (challenge.state === "denied" || challenge.state === "consumed") {
       return "already-consumed";
     }
-    if (challenge2.state === "expired")
+    if (challenge.state === "expired")
       return "challenge-expired";
     return null;
   }
@@ -1721,37 +1737,37 @@ function createQuestionAttestation(options = {}) {
     const parsed = parseBinding(input);
     return parsed === null ? null : findChallengeByScope(parsed);
   }
-  function projectionBase(challenge2, status2) {
+  function projectionBase(challenge, status) {
     return {
-      status: status2,
-      challengeId: challenge2.challengeId,
-      purpose: challenge2.purpose,
-      sessionId: challenge2.sessionId,
-      resourceDigest: challenge2.resourceDigest,
-      transitionKey: challenge2.transition,
-      ...challenge2.requestId === undefined ? {} : { requestId: challenge2.requestId }
+      status,
+      challengeId: challenge.challengeId,
+      purpose: challenge.purpose,
+      sessionId: challenge.sessionId,
+      resourceDigest: challenge.resourceDigest,
+      transitionKey: challenge.transition,
+      ...challenge.requestId === undefined ? {} : { requestId: challenge.requestId }
     };
   }
-  function projectChallenge(challenge2) {
-    const attestation = challenge2.requestId === undefined ? undefined : attestations.get(challenge2.requestId);
+  function projectChallenge(challenge) {
+    const attestation = challenge.requestId === undefined ? undefined : attestations.get(challenge.requestId);
     if (attestation !== undefined) {
-      const status2 = attestation.purpose === "session-disablement" && attestation.consumption === "consumed" ? "disabled" : "attested";
+      const status = attestation.purpose === "session-disablement" && attestation.consumption === "consumed" ? "disabled" : "attested";
       return {
-        ...projectionBase(challenge2, status2),
+        ...projectionBase(challenge, status),
         consumption: attestation.consumption
       };
     }
-    if (challenge2.state === "pending" || challenge2.state === "bound") {
-      return projectionBase(challenge2, challenge2.state);
+    if (challenge.state === "pending" || challenge.state === "bound") {
+      return projectionBase(challenge, challenge.state);
     }
-    if (challenge2.state === "denied") {
-      return projectionBase(challenge2, "denied");
+    if (challenge.state === "denied") {
+      return projectionBase(challenge, "denied");
     }
     return { status: "unknown", reasonCode: "challenge-expired" };
   }
-  function removeActiveChallenge(challenge2) {
-    const key = bindingKey(challenge2, challenge2.resourceDigest);
-    if (activeByBinding.get(key) === challenge2.challengeId) {
+  function removeActiveChallenge(challenge) {
+    const key = bindingKey(challenge, challenge.resourceDigest);
+    if (activeByBinding.get(key) === challenge.challengeId) {
       activeByBinding.delete(key);
     }
   }
@@ -1800,20 +1816,20 @@ function createQuestionAttestation(options = {}) {
       if (parsed === null)
         return rejected("invalid-input");
       expireChallenges(readNow(clock));
-      const challenge2 = findBindChallenge(parsed);
-      if (challenge2 === null)
+      const challenge = findBindChallenge(parsed);
+      if (challenge === null)
         return rejected("unknown-challenge");
-      const stateRejection = bindStateRejection(challenge2, parsed);
+      const stateRejection = bindStateRejection(challenge, parsed);
       if (stateRejection !== null)
         return rejected(stateRejection);
-      challenge2.state = "bound";
-      challenge2.callId = parsed.callId;
-      challenge2.requestId = parsed.requestId;
-      challengeByRequest.set(parsed.requestId, challenge2.challengeId);
+      challenge.state = "bound";
+      challenge.callId = parsed.callId;
+      challenge.requestId = parsed.requestId;
+      challengeByRequest.set(parsed.requestId, challenge.challengeId);
       seenRequestIds.add(parsed.requestId);
       return {
         status: "bound",
-        challengeId: challenge2.challengeId,
+        challengeId: challenge.challengeId,
         requestId: parsed.requestId
       };
     } catch {
@@ -1826,32 +1842,32 @@ function createQuestionAttestation(options = {}) {
       if (parsed === null)
         return rejected("invalid-input");
       expireChallenges(readNow(clock));
-      const challenge2 = requestChallenge(parsed.requestId);
-      if (challenge2 === null) {
+      const challenge = requestChallenge(parsed.requestId);
+      if (challenge === null) {
         const replay = seenRequestIds.has(parsed.requestId);
         seenRequestIds.add(parsed.requestId);
         return rejected(replay ? "replay" : "unknown-request");
       }
-      const stateRejection = replyStateRejection(challenge2, parsed);
+      const stateRejection = replyStateRejection(challenge, parsed);
       if (stateRejection !== null)
         return rejected(stateRejection);
       if (classifyQuestionAnswer(parsed.answer) !== "affirmative") {
-        challenge2.state = "denied";
-        removeActiveChallenge(challenge2);
+        challenge.state = "denied";
+        removeActiveChallenge(challenge);
         return rejected("non-affirmative");
       }
       const attestation = {
-        purpose: challenge2.purpose,
-        sessionId: challenge2.sessionId,
-        resourceDigest: challenge2.resourceDigest,
-        transitionKey: challenge2.transition,
+        purpose: challenge.purpose,
+        sessionId: challenge.sessionId,
+        resourceDigest: challenge.resourceDigest,
+        transitionKey: challenge.transition,
         requestId: parsed.requestId,
         answer: "affirmed",
         timestamp: readNow(clock),
         consumption: "available"
       };
-      challenge2.state = "consumed";
-      removeActiveChallenge(challenge2);
+      challenge.state = "consumed";
+      removeActiveChallenge(challenge);
       attestations.set(parsed.requestId, attestation);
       return { status: "accepted", attestation: cloneAttestation(attestation) };
     } catch {
@@ -1864,17 +1880,17 @@ function createQuestionAttestation(options = {}) {
       if (parsed === null)
         return rejected("invalid-input");
       expireChallenges(readNow(clock));
-      const challenge2 = requestChallenge(parsed.requestId);
-      if (challenge2 === null) {
+      const challenge = requestChallenge(parsed.requestId);
+      if (challenge === null) {
         const replay = seenRequestIds.has(parsed.requestId);
         seenRequestIds.add(parsed.requestId);
         return rejected(replay ? "replay" : "unknown-request");
       }
-      const stateRejection = rejectStateRejection(challenge2, parsed);
+      const stateRejection = rejectStateRejection(challenge, parsed);
       if (stateRejection !== null)
         return rejected(stateRejection);
-      challenge2.state = "denied";
-      removeActiveChallenge(challenge2);
+      challenge.state = "denied";
+      removeActiveChallenge(challenge);
       return { status: "rejected", reasonCode: "rejected" };
     } catch {
       return rejected("invalid-input");
@@ -1924,10 +1940,10 @@ function createQuestionAttestation(options = {}) {
       ])) {
         return { status: "unknown", reasonCode: "invalid-input" };
       }
-      const challenge2 = statusChallenge(input);
-      if (challenge2 === null)
+      const challenge = statusChallenge(input);
+      if (challenge === null)
         return { status: "unknown", reasonCode: "unknown-challenge" };
-      return projectChallenge(challenge2);
+      return projectChallenge(challenge);
     } catch {
       return { status: "unknown", reasonCode: "invalid-input" };
     }
@@ -1941,9 +1957,9 @@ function createQuestionAttestation(options = {}) {
       const sessionId = input.sessionId;
       if (disabledSessions.has(sessionId))
         return { status: "disabled", sessionId };
-      for (const challenge2 of challenges.values()) {
-        if (challenge2.sessionId === sessionId && challenge2.purpose === "session-disablement" && (challenge2.state === "pending" || challenge2.state === "bound")) {
-          return { status: challenge2.state, sessionId };
+      for (const challenge of challenges.values()) {
+        if (challenge.sessionId === sessionId && challenge.purpose === "session-disablement" && (challenge.state === "pending" || challenge.state === "bound")) {
+          return { status: challenge.state, sessionId };
         }
       }
       return { status: "enabled", sessionId };
@@ -3862,10 +3878,10 @@ function createReceiptLedger(options = {}) {
     return { status: "consumed", receipt: cloneEnvelope2(stored.envelope) };
   }
   function recoverReceipt(input, operationTargetIdentity) {
-    const markerResult2 = getMintMarker(input);
-    if (markerResult2.status !== "valid")
-      return markerResult2;
-    const marker = markerResult2.marker;
+    const markerResult = getMintMarker(input);
+    if (markerResult.status !== "valid")
+      return markerResult;
+    const marker = markerResult.marker;
     if (marker.sessionSalt !== sessionSalt)
       return { status: "rejected", category: "salt-mismatch" };
     if (marker.envelope.schemaVersion === 1 && operationTargetIdentity !== undefined) {
@@ -4990,8 +5006,8 @@ var Language = class _Language {
     if (input instanceof Uint8Array) {
       binary2 = input;
     } else if (globalThis.process?.versions.node) {
-      const fs22 = await import("fs/promises");
-      binary2 = await fs22.readFile(input);
+      const fs2 = await import("fs/promises");
+      binary2 = await fs2.readFile(input);
     } else {
       const response = await fetch(input);
       if (!response.ok) {
@@ -5042,11 +5058,11 @@ async function Module2(moduleArg = {}) {
   }, "quit_");
   var _scriptName = import.meta.url;
   var scriptDirectory = "";
-  function locateFile(path6) {
+  function locateFile(path) {
     if (Module["locateFile"]) {
-      return Module["locateFile"](path6, scriptDirectory);
+      return Module["locateFile"](path, scriptDirectory);
     }
-    return scriptDirectory + path6;
+    return scriptDirectory + path;
   }
   __name(locateFile, "locateFile");
   var readAsync, readBinary;
@@ -9744,23 +9760,23 @@ function createWorkflowGuard(options) {
     return recoveryUnitProgressionReason(progression);
   }
   function recoveryUnitProgressionReason(progression) {
-    const epoch2 = progression.epoch;
+    const epoch = progression.epoch;
     const unit = progression.unit;
-    if (!epoch2)
+    if (!epoch)
       return "invalid-recovery";
     if (!unit) {
-      return epoch2.state === "completed" ? "invalid-recovery" : undefined;
+      return epoch.state === "completed" ? "invalid-recovery" : undefined;
     }
-    const declarationFailure = recoveryUnitDeclarationReason(epoch2, unit);
+    const declarationFailure = recoveryUnitDeclarationReason(epoch, unit);
     if (declarationFailure)
       return declarationFailure;
-    return unit.resourceScopes.some((scope) => !unit.requiredOperations.includes(scope.operation)) ? "invalid-recovery" : recoveryCompletedPairReason(epoch2, unit);
+    return unit.resourceScopes.some((scope) => !unit.requiredOperations.includes(scope.operation)) ? "invalid-recovery" : recoveryCompletedPairReason(epoch, unit);
   }
-  function recoveryUnitDeclarationReason(epoch2, unit) {
-    return unit.epochId === epoch2.epochId && unit.epochDigest === epoch2.epochDigest && unit.unitDigest === options.ledger.digestIdentity("unit", unit.unitId) && unit.family === epoch2.family ? undefined : "invalid-recovery";
+  function recoveryUnitDeclarationReason(epoch, unit) {
+    return unit.epochId === epoch.epochId && unit.epochDigest === epoch.epochDigest && unit.unitDigest === options.ledger.digestIdentity("unit", unit.unitId) && unit.family === epoch.family ? undefined : "invalid-recovery";
   }
-  function recoveryCompletedPairReason(epoch2, unit) {
-    return epoch2.state === "completed" && unit.state !== "completed" ? "invalid-recovery" : undefined;
+  function recoveryCompletedPairReason(epoch, unit) {
+    return epoch.state === "completed" && unit.state !== "completed" ? "invalid-recovery" : undefined;
   }
   function recoveryBoundaryReason(envelope) {
     if (envelope.canonical.workspaceDigest !== options.ledger.digestIdentity("workspace", currentWorkspaceIdentity)) {
@@ -9857,8 +9873,8 @@ function createWorkflowGuard(options) {
     }
     return;
   }
-  function recoveryEpochCompletionReason(epoch2, matching) {
-    if (epoch2?.state !== "completed")
+  function recoveryEpochCompletionReason(epoch, matching) {
+    if (epoch?.state !== "completed")
       return;
     return matching.length > 0 && matching.every((envelope) => envelope.canonical.consumption === "consumed") ? undefined : "invalid-recovery";
   }
@@ -10291,18 +10307,18 @@ function isWorkflowGuardBlockedError(value) {
   return typeof candidate.reasonCode === "string" && REASON_CODES.has(candidate.reasonCode);
 }
 var startToolShape = {
-  expected_operations: exports_external.array(exports_external.enum(OPERATIONS)).optional(),
-  resource_scopes: exports_external.record(exports_external.string(), exports_external.string()).optional()
+  expected_operations: array(_enum(OPERATIONS)).optional(),
+  resource_scopes: record(string(), string()).optional()
 };
-var completeToolShape = { target: exports_external.enum(["unit", "epoch"]) };
+var completeToolShape = { target: _enum(["unit", "epoch"]) };
 var controlToolShape = {
-  mode: exports_external.enum(["protected", "disabled", "unavailable"])
+  mode: _enum(["protected", "disabled", "unavailable"])
 };
 var statusToolShape = {};
-var startToolSchema = exports_external.object(startToolShape).strict();
-var completeToolSchema = exports_external.object(completeToolShape).strict();
-var controlToolSchema = exports_external.object(controlToolShape).strict();
-var statusToolSchema = exports_external.object(statusToolShape).strict();
+var startToolSchema = object(startToolShape).strict();
+var completeToolSchema = object(completeToolShape).strict();
+var controlToolSchema = object(controlToolShape).strict();
+var statusToolSchema = object(statusToolShape).strict();
 function isRecord7(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
@@ -10453,13 +10469,13 @@ function validationForCandidate(candidatePath, options, targetPath = candidatePa
 }
 function deriveFileTarget(rawPath, baseDirectory, parentTargetRoot, options, realPath, allowParentFastPath = true) {
   const resolvedPath = path6.resolve(baseDirectory, rawPath);
-  const canonicalPath2 = canonicalFileTarget(resolvedPath, realPath);
-  if (!canonicalPath2)
+  const canonicalPath = canonicalFileTarget(resolvedPath, realPath);
+  if (!canonicalPath)
     return unavailableOperationTarget();
-  const parentResult = allowParentFastPath && !path6.isAbsolute(rawPath) ? trustedParentTarget(parentTargetRoot, canonicalPath2) : undefined;
+  const parentResult = allowParentFastPath && !path6.isAbsolute(rawPath) ? trustedParentTarget(parentTargetRoot, canonicalPath) : undefined;
   if (parentResult)
     return parentResult;
-  return validationForCandidate(path6.dirname(canonicalPath2), options, canonicalPath2);
+  return validationForCandidate(path6.dirname(canonicalPath), options, canonicalPath);
 }
 function sharedTargetRoot(targets, extraRoots = []) {
   const roots = [...extraRoots];
@@ -11057,7 +11073,7 @@ function createSessionRuntime(options, operationObservers, recoveredOperationCon
     return classifyQuestionAnswer(answer) === "affirmative" ? answer : "no";
   }
   function challengeForTransition(sessionID, target) {
-    const existing = [...pendingQuestionChallenges.values()].find((pending2) => pending2.purpose === "transition" && pending2.transition === target);
+    const existing = [...pendingQuestionChallenges.values()].find((pending) => pending.purpose === "transition" && pending.transition === target);
     if (existing)
       return existing;
     const resource = questionResource(target);
@@ -11079,7 +11095,7 @@ function createSessionRuntime(options, operationObservers, recoveredOperationCon
     return pending;
   }
   function challengeForDisablement(sessionID) {
-    const existing = [...pendingQuestionChallenges.values()].find((pending2) => pending2.purpose === "session-disablement");
+    const existing = [...pendingQuestionChallenges.values()].find((pending) => pending.purpose === "session-disablement");
     if (existing)
       return existing;
     const resource = `session/${sessionID}`;
@@ -11253,14 +11269,14 @@ function createSessionRuntime(options, operationObservers, recoveredOperationCon
     }
     return;
   }
-  function candidateAgreesWithOwnIdentity(salt, digest2) {
+  function candidateAgreesWithOwnIdentity(salt, digest) {
     try {
       const probe = createReceiptLedger({
         capabilityFlags: ["workflow-guard"],
         registrationIdentity: options.registrationIdentity,
         sessionSalt: salt
       });
-      return probe.metadata.registrationDigest === digest2;
+      return probe.metadata.registrationDigest === digest;
     } catch {
       return false;
     }
@@ -12465,7 +12481,7 @@ function createSessionRuntime(options, operationObservers, recoveredOperationCon
       return;
     }
   }
-  function buildOperationObservation(host, pending, after2, current, output, operation = operationCandidate(host.tool), remoteAfter) {
+  function buildOperationObservation(host, pending, after, current, output, operation = operationCandidate(host.tool), remoteAfter) {
     if (!current.epoch || !current.unit || !isLocalOperationTool(host.tool)) {
       return;
     }
@@ -12489,10 +12505,10 @@ function createSessionRuntime(options, operationObservers, recoveredOperationCon
       },
       after: {
         workspaceIdentity: options.workspaceIdentity,
-        repositoryIdentity: after2.repositoryRevisionDigest,
-        worktreeIdentity: after2.worktreeRevisionDigest,
+        repositoryIdentity: after.repositoryRevisionDigest,
+        worktreeIdentity: after.worktreeRevisionDigest,
         ...localOperation(operation) ? { operationTargetIdentity: pending.targetIdentity } : {},
-        commitClosure: after2.commitClosure,
+        commitClosure: after.commitClosure,
         ...remoteAfter ? {
           resourceIdentity: remoteAfter.resourceIdentity,
           resourceRevisionIdentity: remoteAfter.resourceRevisionIdentity,
@@ -13093,7 +13109,7 @@ function createSkillTool(options) {
       return cachedDescription;
     },
     args: {
-      name: exports_external.string().describe((() => {
+      name: string().describe((() => {
         if (cachedParameterHint == null) {
           cachedParameterHint = buildParameterHint();
         }

package/dist/lib/agent-resolver.d.ts

@@ -1,7 +1,7 @@
 /** Runtime persona catalog for `systematic_delegate`. Pi has no agent-discovery of its own, so category is dropped when flattening `agents/<category>/<name>.md` into this catalog. */
 /** A single resolved persona entry in the flattened catalog. */
 export interface AgentCatalogEntry {
-    /** Flat persona name (category dropped). */
+    /** Flat persona name (category dropped). Used for dispatch matching (`resolveAgent`); may differ from `key` if frontmatter `name` and the file stem diverge. */
     name: string;
     /** Human-readable description, used in tool description/parameter hints. */
     description: string;
@@ -9,6 +9,12 @@ export interface AgentCatalogEntry {
     body: string;
     /** Raw comma-separated `tools:` frontmatter value, if declared. Undefined = not declared. */
     toolsSource: string | undefined;
+    /** The agent's source file stem (filename without `.md`), used to key into `agents.<key>` overlays for routing (distinct from the display `name`). */
+    key: string;
+    /** The agent's category (source subdirectory name), used to key into `categories.<category>` overlays. `''` when the file has no category subdirectory -- the same no-category sentinel `config-handler.ts` and `pi-subagents-export.ts` use. */
+    category: string;
+    /** Qualified `category/key` id, mirroring `agent-overlays.ts`'s target-id convention, for callers that want a single stable identity. */
+    id: string;
 }
 /** Fails closed if the same persona name appears under more than one category. */
 export declare function buildAgentCatalog(agentsDir: string): AgentCatalogEntry[];

package/dist/lib/capability-snapshot.d.ts

@@ -3,7 +3,7 @@ declare const CAPABILITY_SNAPSHOT_COMMAND: 'systematic capabilities';
 declare const CAPABILITY_SOURCE_IDS: readonly ['config:custom', 'config:global', 'config:project', 'config:user', 'discovery:agents', 'discovery:skills', 'host:runtime', 'package'];
 declare const CONFIG_SOURCE_KINDS: readonly ['custom', 'project', 'user'];
 declare const CONFIG_AUTHORITY_FIELD_PATHS: readonly ['bootstrap.enabled', 'bootstrap.file', 'skills_as_commands', 'workflow_guard.debug', 'workflow_guard.mode'];
-declare const CONFIG_PROTECTED_FIELD_PATHS: readonly ['workflow_guard', 'agents.*.model', 'agents.*.permission', 'agents.*.skills', 'agents.*.variant', 'categories.*.model', 'categories.*.permission', 'categories.*.skills', 'categories.*.variant'];
+declare const CONFIG_PROTECTED_FIELD_PATHS: readonly ['workflow_guard', 'profiles', 'agents.*.model', 'agents.*.permission', 'agents.*.skills', 'agents.*.variant', 'agents.*.opencode', 'agents.*.pi', 'categories.*.model', 'categories.*.permission', 'categories.*.skills', 'categories.*.variant', 'categories.*.opencode', 'categories.*.pi'];
 declare const CONFIG_SOURCE_ERROR_CODES: readonly ['parse-failed', 'read-failed', 'schema-invalid', 'source-invalid'];
 declare const CAPABILITY_SOURCE_PRESENCE: readonly ['absent', 'invalid', 'present'];
 declare const CAPABILITY_STATUSES: readonly ['available', 'unknown', 'unavailable'];