@fro.bot/systematic 3.6.1 → 3.7.0

package/dist/{index-1mb4baxr.js → index-hjbt4p5s.js}

@@ -16355,6 +16355,13 @@ var SECURITY_OVERLAY_FIELDS = [
 ];
 
 // src/lib/config.ts
+var CONFIG_AUTHORITY_FIELD_PATHS = [
+  "bootstrap.enabled",
+  "bootstrap.file",
+  "skills_as_commands",
+  "workflow_guard.debug",
+  "workflow_guard.mode"
+];
 var DEFAULT_CONFIG = {
   disabled_skills: [],
   disabled_agents: [],
@@ -16371,7 +16378,20 @@ var DEFAULT_CONFIG = {
   pi_subagents: { categories: {}, agents: {} },
   skills_as_commands: true
 };
-var SECURITY_OVERLAY_FIELDS2 = new Set(SECURITY_OVERLAY_FIELDS);
+var PROTECTED_OVERLAY_FIELD_PATHS = {
+  agents: {
+    model: "agents.*.model",
+    permission: "agents.*.permission",
+    skills: "agents.*.skills",
+    variant: "agents.*.variant"
+  },
+  categories: {
+    model: "categories.*.model",
+    permission: "categories.*.permission",
+    skills: "categories.*.skills",
+    variant: "categories.*.variant"
+  }
+};
 var PROJECT_PROTECTED_FIELDS = new Set(["workflow_guard"]);
 var CURRENT_SKILL_NAMES_SET = new Set(BUNDLED_SKILL_NAMES);
 var CURRENT_AGENT_NAMES_SET = new Set([
@@ -16383,14 +16403,14 @@ function computeDroppedNames(names, allowedSet) {
   return names.filter((n) => !allowedSet.has(n));
 }
 var MIGRATION_DOCS_URL = "https://fro.bot/systematic/guides/v3-migration/";
-function warnDroppedNames(dropped, field, warned, removalVersion) {
+function warnDroppedNames(dropped, field, warned, removalVersion, warningSink = console.warn) {
   for (const name of dropped) {
     if (warned.has(name))
       continue;
     warned.add(name);
     const displayName = field === "categories" ? `${field}.${name}` : name;
     const removalNote = removalVersion ? ` It was removed in ${removalVersion}.` : "";
-    console.warn(`[systematic] "${displayName}" in \`${field}\` is no longer a bundled name and will be ignored.${removalNote} Remove it from your config to silence this warning. See ${MIGRATION_DOCS_URL} for migration guidance.`);
+    warningSink(`[systematic] "${displayName}" in \`${field}\` is no longer a bundled name and will be ignored.${removalNote} Remove it from your config to silence this warning. See ${MIGRATION_DOCS_URL} for migration guidance.`);
   }
 }
 function resolveConfigPath(dir, basename) {
@@ -16496,16 +16516,91 @@ ${formatted.map((entry) => `  - ${entry}`).join(`
     issues
   });
 }
-function loadConfigSource(filePath, trust) {
-  const rawConfig = loadJsoncFile(filePath);
-  if (!rawConfig)
-    return null;
-  const config2 = trust === "project" ? stripProjectProtectedFields(rawConfig) : rawConfig;
-  const result = SystematicConfigSchema.safeParse(config2);
-  if (!result.success) {
-    throwTopLevelConfigSchemaError(filePath, trust, result.error.issues, config2);
+function loadConfigSource(filePath, trust, invalidSource) {
+  try {
+    const rawConfig = loadJsoncFile(filePath);
+    if (!rawConfig) {
+      return {
+        metadata: { kind: trust, presence: "absent" },
+        source: null
+      };
+    }
+    const protectedFields = collectProjectProtectedFields(rawConfig, trust);
+    const config2 = trust === "project" ? stripProjectProtectedFields(rawConfig) : rawConfig;
+    const result = SystematicConfigSchema.safeParse(config2);
+    if (!result.success) {
+      throwTopLevelConfigSchemaError(filePath, trust, result.error.issues, config2);
+    }
+    return {
+      metadata: { kind: trust, presence: "present" },
+      source: {
+        canonicalPath: resolveConfigSourcePath(filePath),
+        config: config2,
+        path: filePath,
+        protectedFields,
+        trust
+      }
+    };
+  } catch (error51) {
+    if (invalidSource === "throw")
+      throw error51;
+    return {
+      metadata: {
+        errorCode: classifyConfigSourceError(error51),
+        kind: trust,
+        presence: "invalid"
+      },
+      source: null
+    };
   }
-  return { path: filePath, config: config2, trust };
+}
+function classifyConfigSourceError(error51) {
+  if (isConfigSchemaError(error51))
+    return "schema-invalid";
+  if (!(error51 instanceof Error))
+    return "source-invalid";
+  if (error51.message.includes("JSONC parse error"))
+    return "parse-failed";
+  if (error51.message.includes("unable to read file"))
+    return "read-failed";
+  return "source-invalid";
+}
+function isConfigSchemaError(error51) {
+  return isRecord2(error51) && error51._tag === "ConfigSchemaError";
+}
+function resolveConfigSourcePath(filePath) {
+  try {
+    return fs3.realpathSync(filePath);
+  } catch {
+    return path3.resolve(filePath);
+  }
+}
+function collectProjectProtectedFields(rawConfig, trust) {
+  if (trust !== "project")
+    return [];
+  return [
+    ...Object.hasOwn(rawConfig, "workflow_guard") ? [
+      {
+        fieldPath: "workflow_guard",
+        outcome: "blocked",
+        sourceKind: "project"
+      }
+    ] : [],
+    ...collectOverlayProtectedFields(rawConfig.agents, "agents"),
+    ...collectOverlayProtectedFields(rawConfig.categories, "categories")
+  ];
+}
+function collectOverlayProtectedFields(overlayMap, mapKey) {
+  if (!isRecord2(overlayMap))
+    return [];
+  return Object.values(overlayMap).flatMap((value) => isRecord2(value) ? collectProtectedOverlayValue(value, mapKey) : []);
+}
+function collectProtectedOverlayValue(value, mapKey) {
+  return [...SECURITY_OVERLAY_FIELDS].filter((field) => Object.hasOwn(value, field)).map((field) => ({
+    fieldPath: PROTECTED_OVERLAY_FIELD_PATHS[mapKey][field],
+    outcome: "blocked",
+    sourceKind: "project"
+  }));
 }
 function stripProjectProtectedFields(rawConfig) {
   const config2 = { ...rawConfig };
@@ -16532,16 +16627,27 @@ function loadConfig(projectDir, options) {
 }
 function loadConfigWithSources(projectDir, options) {
   const includeProject = options?.includeProject ?? true;
-  const paths = getConfigPaths(projectDir);
-  const userSource = loadConfigSource(paths.userConfig, "user");
-  const projectSource = includeProject ? loadConfigSource(paths.projectConfig, "project") : null;
-  const customSource = paths.customConfig ? loadConfigSource(paths.customConfig, "custom") : null;
+  const invalidSource = options?.invalidSource ?? "throw";
+  const paths = getConfigPaths(projectDir, options);
+  const warningSink = options?.warningSink ?? console.warn;
+  const user = loadConfigSource(paths.userConfig, "user", invalidSource);
+  const project = includeProject ? loadConfigSource(paths.projectConfig, "project", invalidSource) : {
+    metadata: { kind: "project", presence: "absent" },
+    source: null
+  };
+  const custom2 = paths.customConfig ? loadConfigSource(paths.customConfig, "custom", invalidSource) : {
+    metadata: { kind: "custom", presence: "absent" },
+    source: null
+  };
+  const userSource = user.source;
+  const projectSource = project.source;
+  const customSource = custom2.source;
   const sources = [userSource, projectSource, customSource].filter((source) => source !== null);
   const mergedOverlays = mergeOverlaySources(sources);
   const mergedPiSubagentsOverlays = mergePiSubagentsOverlaySources(sources);
   const droppedCategories = Object.keys(mergedOverlays.categories).filter((name) => REMOVED_AGENT_CATEGORIES_SET.has(name));
   const warned = new Set;
-  warnDroppedNames(droppedCategories, "categories", warned, "v3.0.0");
+  warnDroppedNames(droppedCategories, "categories", warned, "v3.0.0", warningSink);
   const droppedCategorySet = new Set(droppedCategories);
   const overlays = droppedCategorySet.size === 0 ? mergedOverlays : {
     ...mergedOverlays,
@@ -16574,9 +16680,9 @@ function loadConfigWithSources(projectDir, options) {
     skills_as_commands: customConfig?.skills_as_commands ?? projectConfig?.skills_as_commands ?? userConfig?.skills_as_commands ?? DEFAULT_CONFIG.skills_as_commands
   };
   const droppedSkills = computeDroppedNames(result.disabled_skills, CURRENT_SKILL_NAMES_SET);
-  warnDroppedNames(droppedSkills, "disabled_skills", warned);
+  warnDroppedNames(droppedSkills, "disabled_skills", warned, undefined, warningSink);
   const droppedAgents = computeDroppedNames(result.disabled_agents, CURRENT_AGENT_NAMES_SET);
-  warnDroppedNames(droppedAgents, "disabled_agents", warned);
+  warnDroppedNames(droppedAgents, "disabled_agents", warned, undefined, warningSink);
   const droppedSkillSet = new Set(droppedSkills);
   const droppedAgentSet = new Set(droppedAgents);
   const effectiveConfig = droppedSkillSet.size === 0 && droppedAgentSet.size === 0 ? result : {
@@ -16584,7 +16690,76 @@ function loadConfigWithSources(projectDir, options) {
     disabled_skills: result.disabled_skills.filter((n) => !droppedSkillSet.has(n)),
     disabled_agents: result.disabled_agents.filter((n) => !droppedAgentSet.has(n))
   };
-  return { config: effectiveConfig, overlays };
+  return {
+    config: effectiveConfig,
+    metadata: buildConfigObservationMetadata({
+      custom: custom2.metadata,
+      project: project.metadata,
+      sources,
+      user: user.metadata
+    }),
+    overlays
+  };
+}
+function buildConfigObservationMetadata(summary) {
+  const authorities = [];
+  const sourceConfigs = new Map;
+  const sourcePaths = new Map;
+  for (const source of summary.sources) {
+    sourceConfigs.set(source.trust, source.config);
+    sourcePaths.set(source.trust, source.canonicalPath);
+  }
+  const firstDefinedSource = (fieldPath, candidates) => {
+    for (const sourceKind of candidates) {
+      const config2 = sourceConfigs.get(sourceKind);
+      if (config2 && hasConfigField(config2, fieldPath)) {
+        return { fieldPath, sourceKind };
+      }
+    }
+    return;
+  };
+  const fieldCandidates = {
+    "bootstrap.enabled": ["custom", "project", "user"],
+    "bootstrap.file": ["custom", "project", "user"],
+    skills_as_commands: ["custom", "project", "user"],
+    "workflow_guard.debug": ["custom", "user"],
+    "workflow_guard.mode": ["custom", "user"]
+  };
+  for (const fieldPath of CONFIG_AUTHORITY_FIELD_PATHS) {
+    const authority = firstDefinedSource(fieldPath, fieldCandidates[fieldPath]);
+    if (authority)
+      authorities.push(authority);
+  }
+  const protectedFields = summary.sources.flatMap((source) => source.protectedFields);
+  const sources = dedupeSourceMetadata([summary.custom, summary.project, summary.user], sourcePaths);
+  return {
+    authorities: sortAuthorities(authorities),
+    protectedFields: sortProtectedFields(protectedFields),
+    sources
+  };
+}
+function dedupeSourceMetadata(metadata, sourcePaths) {
+  const seen = new Set;
+  return metadata.filter((source) => {
+    const identity = sourcePaths.get(source.kind) ?? `missing:${source.kind}`;
+    if (seen.has(identity))
+      return false;
+    seen.add(identity);
+    return true;
+  });
+}
+function hasConfigField(config2, fieldPath) {
+  const [topLevel, nested] = fieldPath.split(".");
+  if (nested === undefined)
+    return config2[topLevel] !== undefined;
+  const value = config2[topLevel];
+  return isRecord2(value) && value[nested] !== undefined;
+}
+function sortAuthorities(authorities) {
+  return [...authorities].sort((left, right) => left.fieldPath === right.fieldPath ? left.sourceKind.localeCompare(right.sourceKind) : left.fieldPath.localeCompare(right.fieldPath));
+}
+function sortProtectedFields(fields) {
+  return [...fields].sort((left, right) => left.fieldPath === right.fieldPath ? left.sourceKind.localeCompare(right.sourceKind) : left.fieldPath.localeCompare(right.fieldPath));
 }
 function mergeOverlaySources(sources) {
   const result = {
@@ -16622,7 +16797,7 @@ function mergeOverlayMap(target, source, mapKey) {
   }
 }
 function rejectProjectSecurityOverlay(sourcePath, keyPath, value) {
-  for (const field of SECURITY_OVERLAY_FIELDS2) {
+  for (const field of SECURITY_OVERLAY_FIELDS) {
     if (Object.hasOwn(value, field)) {
       throw new Error(`Invalid Systematic config in ${sourcePath}: ${keyPath}.${field} is only valid in user config or OPENCODE_CONFIG_DIR config`);
     }
@@ -16630,7 +16805,7 @@ function rejectProjectSecurityOverlay(sourcePath, keyPath, value) {
 }
 function preserveSecurityFields(previous, next) {
   const result = { ...next };
-  for (const field of SECURITY_OVERLAY_FIELDS2) {
+  for (const field of SECURITY_OVERLAY_FIELDS) {
     if (Object.hasOwn(previous, field)) {
       result[field] = previous[field];
     }
@@ -16698,11 +16873,12 @@ function overlayValues(overlays) {
 function throwInvalidOverlay(sourcePath, keyPath) {
   throw new Error(`Invalid Systematic config in ${sourcePath}: ${keyPath} must be an object`);
 }
-function getConfigPaths(projectDir) {
-  const homeDir = os.homedir();
-  const customConfigDir = process.env.OPENCODE_CONFIG_DIR?.trim();
+function getConfigPaths(projectDir, options) {
+  const homeDir = options?.homeDir ?? os.homedir();
+  const userConfigDir = options?.userConfigDir ?? path3.join(homeDir, ".config/opencode");
+  const customConfigDir = options !== undefined && Object.hasOwn(options, "customConfigDir") ? options.customConfigDir?.trim() : process.env.OPENCODE_CONFIG_DIR?.trim();
   const result = {
-    userConfig: resolveConfigPath(path3.join(homeDir, ".config/opencode"), "systematic"),
+    userConfig: resolveConfigPath(userConfigDir, "systematic"),
     projectConfig: resolveConfigPath(path3.join(projectDir, ".opencode"), "systematic"),
     userDir: path3.join(homeDir, ".config/opencode/systematic"),
     projectDir: path3.join(projectDir, ".opencode/systematic"),
@@ -16788,4 +16964,136 @@ function extractCommandFrontmatter(content) {
   };
 }
 
-export { __require, parseFrontmatter, isRecord, walkDir, extractFrontmatterFromContent, findSkillsInDir, parse2 as parse, parseTree2 as parseTree, modify, applyEdits, exports_external, AgentOverlaySchema, CategoryOverlaySchema, loadConfig, loadConfigWithSources, getConfigPaths, findAgentsInDir, extractAgentFrontmatter, findCommandsInDir, extractCommandFrontmatter };
+// src/lib/discovered-skills.ts
+import fs4 from "fs";
+import path4 from "path";
+var SKILL_NAME_REGEX = /^[a-z0-9]+(-[a-z0-9]+)*$/;
+function isValidSkillName(name) {
+  return name.length >= 1 && name.length <= 64 && SKILL_NAME_REGEX.test(name);
+}
+function findGitWorktreeRoot(startDir) {
+  let current = path4.resolve(startDir);
+  while (true) {
+    try {
+      if (fs4.existsSync(path4.join(current, ".git"))) {
+        return current;
+      }
+    } catch {
+      return null;
+    }
+    const parent = path4.dirname(current);
+    if (parent === current)
+      return null;
+    current = parent;
+  }
+}
+function upWalk(targets, start, stop) {
+  const results = [];
+  let current = path4.resolve(start);
+  const resolvedStop = stop === undefined ? undefined : path4.resolve(stop);
+  while (true) {
+    for (const target of targets) {
+      const candidate = path4.join(current, target);
+      try {
+        if (fs4.existsSync(candidate)) {
+          results.push(candidate);
+        }
+      } catch {}
+    }
+    if (resolvedStop !== undefined && current === resolvedStop)
+      break;
+    const parent = path4.dirname(current);
+    if (parent === current)
+      break;
+    current = parent;
+  }
+  return results;
+}
+function uniqueStrings(values) {
+  return Array.from(new Set(values));
+}
+function buildOpencodeConfigDirs(startDir, homeDir, gitRoot, globalConfigDir, opencodeConfigDirOverride) {
+  const dirs = [globalConfigDir];
+  dirs.push(...upWalk([".opencode"], startDir, gitRoot ?? startDir));
+  dirs.push(...upWalk([".opencode"], homeDir, homeDir));
+  if (opencodeConfigDirOverride !== undefined) {
+    dirs.push(opencodeConfigDirOverride);
+  }
+  return uniqueStrings(dirs);
+}
+function globSkillFiles(rootDir, subdirNames) {
+  const results = [];
+  for (const subdirName of subdirNames) {
+    const scanRoot = path4.join(rootDir, subdirName);
+    try {
+      if (!fs4.existsSync(scanRoot))
+        continue;
+      const entries = walkDir(scanRoot, {
+        maxDepth: 10,
+        filter: (entry) => entry.name === "SKILL.md"
+      });
+      for (const entry of entries) {
+        results.push(entry.path);
+      }
+    } catch {}
+  }
+  return results;
+}
+function toDiscoveredSkill(skillPath, rootId, onIssue) {
+  let content;
+  try {
+    content = fs4.readFileSync(skillPath, "utf8");
+  } catch {
+    onIssue?.("read-failed");
+    return;
+  }
+  if (parseFrontmatter(content).parseError) {
+    onIssue?.("source-invalid");
+    return;
+  }
+  const frontmatter = extractFrontmatterFromContent(content);
+  const name = frontmatter.name;
+  if (!name || !isValidSkillName(name)) {
+    onIssue?.("source-invalid");
+    return;
+  }
+  return {
+    name,
+    description: frontmatter.description,
+    frontmatter,
+    body: parseFrontmatter(content).body,
+    skillPath,
+    root: rootId
+  };
+}
+function discoverSkills(options) {
+  const { startDir, homeDir, configDir, onIssue, opencodeConfigDirOverride } = options;
+  const globalConfigDir = configDir ?? path4.join(homeDir, ".config/opencode");
+  const gitRoot = findGitWorktreeRoot(startDir);
+  const byName = new Map;
+  function upsertAll(skillPaths, rootId) {
+    for (const skillPath of skillPaths) {
+      const skill = toDiscoveredSkill(skillPath, rootId, onIssue);
+      if (skill)
+        byName.set(skill.name, skill);
+    }
+  }
+  upsertAll(globSkillFiles(homeDir, [".claude/skills"]), "global-claude");
+  upsertAll(globSkillFiles(homeDir, [".agents/skills"]), "global-agents");
+  const externalLevels = upWalk([".claude", ".agents"], startDir, gitRoot ?? startDir);
+  for (const levelDir of externalLevels) {
+    const isClaudeDir = path4.basename(levelDir) === ".claude";
+    const parentDir = path4.dirname(levelDir);
+    const subdirGlob = isClaudeDir ? ".claude/skills" : ".agents/skills";
+    const rootId = isClaudeDir ? "project-claude" : "project-agents";
+    upsertAll(globSkillFiles(parentDir, [subdirGlob]), rootId);
+  }
+  const configDirs = buildOpencodeConfigDirs(startDir, homeDir, gitRoot, globalConfigDir, opencodeConfigDirOverride);
+  for (const dir of configDirs) {
+    const rootId = dir === globalConfigDir ? "global-opencode-config" : "project-opencode";
+    upsertAll(globSkillFiles(dir, ["skill", "skills"]), rootId);
+  }
+  return Array.from(byName.values());
+}
+
+export { __require, parseFrontmatter, isRecord, extractString, findSkillsInDir, parse2 as parse, parseTree2 as parseTree, modify, applyEdits, exports_external, AgentOverlaySchema, CategoryOverlaySchema, loadConfig, loadConfigWithSources, getConfigPaths, findAgentsInDir, extractAgentFrontmatter, findCommandsInDir, extractCommandFrontmatter, discoverSkills };