akm-cli 0.9.0-rc.1 → 0.9.0-rc.13

package/dist/indexer/walk/matchers.js

@@ -8,12 +8,8 @@
  * one heuristic. The public `*Matcher` exports compose those facts into the
  * `MatchResult` shape expected by the rest of the indexer.
  */
-import { defaultRendererRegistry } from "../../core/asset/asset-registry.js";
-import { SCRIPT_EXTENSIONS } from "../../core/asset/asset-spec.js";
-import { looksLikeWorkflow } from "../../workflows/parser.js";
-import { looksLikeWorkflowProgram } from "../../workflows/program/parser.js";
-import { WORKFLOW_PROGRAM_RENDERER_NAME } from "../../workflows/program/project.js";
-import { registerMatcher } from "./file-context.js";
+import { SCRIPT_EXTENSIONS } from "../../core/recognition-util.js";
+import { presentationFor } from "../../core/type-presentation.js";
 // ---------------------------------------------------------------------------
 // Private data
 // ---------------------------------------------------------------------------
@@ -38,6 +34,18 @@ const DIR_TYPE_MAP = [
         type: "knowledge",
         test: (ext) => ext === ".md",
     },
+    {
+        // R-045 / Q-18 second half (owner ruling 11) — stash-resident `instruction`
+        // assets live under `instructions/`, mirroring the `knowledge` rule. This
+        // is a walker discovery rule for FILES ON DISK under a stash's
+        // `instructions/` dir; it is unrelated to the adapter-emitted root
+        // CLAUDE.md/AGENTS.md instruction docs (`tool-dir-shared.ts`), which are
+        // synthesized by format-family adapters, carry `ownsPresentation: true`,
+        // and never pass through this matcher at all.
+        dir: "instructions",
+        type: "instruction",
+        test: (ext) => ext === ".md",
+    },
     {
         dir: "workflows",
         type: "workflow",
@@ -69,7 +77,10 @@ const DIR_TYPE_MAP = [
     {
         dir: "tasks",
         type: "task",
-        test: (ext) => ext === ".md",
+        // Tasks migrated from `.md` to `.yml` in 0.8.0 (commit 031c659f updated
+        // the placement specs, renderers, and the task-linter, but missed this
+        // matcher — tasks/*.yml were unrecognized until this fix).
+        test: (ext) => ext === ".yml",
     },
     {
         // #561 — agent session assets live under `sessions/<harness>/<id>.md`.
@@ -100,6 +111,9 @@ const TYPED_DIR_DOC_FILES = new Set(["readme.md"]);
 function isTypedDirDocFile(fileName) {
     return TYPED_DIR_DOC_FILES.has(fileName.toLowerCase());
 }
+function isNestedSkillResource(ctx) {
+    return ctx.ancestorDirs[0] === "skills" && ctx.ancestorDirs.length > 1 && ctx.fileName !== "SKILL.md";
+}
 // ---------------------------------------------------------------------------
 // Private helpers
 // ---------------------------------------------------------------------------
@@ -121,7 +135,7 @@ function matchDirectoryHint(dirName, ctx, specificity) {
     return null;
 }
 function classifyByExtension(ctx) {
-    if (ctx.fileName === "SKILL.md" && !ctx.ancestorDirs.includes("wikis")) {
+    if (ctx.fileName === "SKILL.md") {
         return { type: "skill", specificity: 25 };
     }
     if (SCRIPT_EXTENSIONS.has(ctx.ext)) {
@@ -130,6 +144,8 @@ function classifyByExtension(ctx) {
     return null;
 }
 function classifyByDirectory(ctx) {
+    if (isNestedSkillResource(ctx))
+        return null;
     for (const dir of ctx.ancestorDirs) {
         const result = matchDirectoryHint(dir, ctx, 10);
         if (result)
@@ -139,6 +155,8 @@ function classifyByDirectory(ctx) {
 }
 function classifyByParentDirHint(ctx) {
     const { parentDir, ext, fileName } = ctx;
+    if (isNestedSkillResource(ctx))
+        return null;
     if (parentDir === "skills" && (fileName === "SKILL.md" || ext === ".md")) {
         return { type: "skill", specificity: 15 };
     }
@@ -160,10 +178,15 @@ function classifyBySmartMd(ctx) {
         return { type: "knowledge", specificity: 5 };
     }
     const body = ctx.content();
-    if (looksLikeWorkflow(body)) {
+    const fm = ctx.frontmatter();
+    // Recognition is frontmatter `type: workflow` or residence under `workflows/`
+    // (workflow-format-unification, spec §2.5) — no content sniffing. The
+    // directory rule is `classifyByDirectory`/`classifyByParentDirHint`'s job;
+    // this only catches a workflow living OUTSIDE `workflows/` that still
+    // declares its type explicitly.
+    if (fm && fm.type === "workflow") {
         return { type: "workflow", specificity: 19 };
     }
-    const fm = ctx.frontmatter();
     if (fm) {
         if ("toolPolicy" in fm || "tools" in fm) {
             return { type: "agent", specificity: 20 };
@@ -180,45 +203,6 @@ function classifyBySmartMd(ctx) {
     }
     return { type: "knowledge", specificity: 5 };
 }
-/** YAML workflow *programs* (redesign addendum, R1): `.yaml`/`.yml` files. */
-const WORKFLOW_PROGRAM_EXTENSIONS = new Set([".yaml", ".yml"]);
-/**
- * Classify YAML workflow programs. Two claims, mirroring the markdown rules:
- *
- *   - any `.yaml`/`.yml` under a `workflows/` dir (the directory rule —
- *     specificity 15 when `workflows` is the immediate parent, 10 for a
- *     deeper ancestor, same ladder as `matchDirectoryHint`);
- *   - anywhere else, a content probe via `looksLikeWorkflowProgram`
- *     (`version: 1` + `steps:` at column 0) at specificity 19, the same
- *     level as `classifyBySmartMd`'s `looksLikeWorkflow` claim.
- *
- * The fact does NOT go through `toMatchResult` — the workflow TYPE maps to
- * the markdown renderer by default, so this classifier names the
- * `workflow-program-yaml` renderer on its result directly.
- */
-function classifyByWorkflowProgram(ctx) {
-    if (!WORKFLOW_PROGRAM_EXTENSIONS.has(ctx.ext))
-        return null;
-    if (isTypedDirDocFile(ctx.fileName))
-        return null;
-    if (ctx.parentDir === "workflows")
-        return { type: "workflow", specificity: 15 };
-    if (ctx.ancestorDirs.includes("workflows"))
-        return { type: "workflow", specificity: 10 };
-    if (looksLikeWorkflowProgram(ctx.content()))
-        return { type: "workflow", specificity: 19 };
-    return null;
-}
-function classifyByWiki(ctx) {
-    if (ctx.ext !== ".md")
-        return null;
-    const idx = ctx.ancestorDirs.indexOf("wikis");
-    if (idx < 0)
-        return null;
-    if (idx + 1 >= ctx.ancestorDirs.length)
-        return null;
-    return { type: "wiki", specificity: 20 };
-}
 // ---------------------------------------------------------------------------
 // Adapter: MatchFact → MatchResult
 // ---------------------------------------------------------------------------
@@ -226,7 +210,10 @@ function toMatchResult(ctx, classify) {
     const fact = classify(ctx);
     if (!fact)
         return null;
-    const renderer = defaultRendererRegistry.rendererNameFor(fact.type);
+    // Renderer name resolved via TYPE_PRESENTATION (core leaf), so matchers.ts
+    // carries no edge into the taxonomy SCC (chunk-3 cutover enabler).
+    // TYPE_PRESENTATION.renderer is the single source of truth for renderer names.
+    const renderer = presentationFor(fact.type).renderer;
     if (!renderer)
         return null;
     return {
@@ -251,26 +238,8 @@ export function parentDirHintMatcher(ctx) {
 export function smartMdMatcher(ctx) {
     return toMatchResult(ctx, classifyBySmartMd);
 }
-export function wikiMatcher(ctx) {
-    return toMatchResult(ctx, classifyByWiki);
-}
-export function workflowProgramMatcher(ctx) {
-    const fact = classifyByWorkflowProgram(ctx);
-    if (!fact)
-        return null;
-    // Named directly (not via rendererNameFor) — see classifyByWorkflowProgram.
-    return { type: fact.type, specificity: fact.specificity, renderer: WORKFLOW_PROGRAM_RENDERER_NAME };
-}
-const builtinMatchers = [
-    extensionMatcher,
-    directoryMatcher,
-    parentDirHintMatcher,
-    smartMdMatcher,
-    wikiMatcher,
-    workflowProgramMatcher,
-];
-export function registerBuiltinMatchers() {
-    for (const matcher of builtinMatchers) {
-        registerMatcher(matcher);
-    }
-}
+// The four matcher functions above are consumed directly by the akm adapter's
+// synchronous `recognizeMatch()` (`core/adapter/adapters/akm-adapter.ts`, which
+// holds the same registration-order array for tie-breaking). The chunk-3 cutover
+// removed the file-context matcher registry, so there is no `registerBuiltinMatchers`
+// glue any more — recognition is adapter-driven, not registry-driven.

package/dist/indexer/walk/path-resolver.js

@@ -3,19 +3,25 @@
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
 import fs from "node:fs";
 import path from "node:path";
-import { parseAssetRef } from "../../core/asset/asset-ref.js";
-import { resolveAssetPathFromName, TYPE_DIRS } from "../../core/asset/asset-spec.js";
+import { assetPathForName, stashDirFor } from "../../core/asset/asset-placement.js";
+import { parseRefInput } from "../../core/asset/resolve-ref.js";
 import { isWithin } from "../../core/common.js";
 import { resolveSourcesForOrigin } from "../../registry/origin-resolve.js";
 import { lookup } from "../indexer.js";
 import { resolveSourceEntries } from "../search/search-source.js";
 function normalizeRef(ref) {
-    return typeof ref === "string" ? parseAssetRef(ref) : ref;
+    // String inputs use the current `[bundle//]conceptId` grammar.
+    return typeof ref === "string" ? parseRefInput(ref) : ref;
 }
 function buildDiskCandidates(sourcePath, ref, preserveDirectNameFallback) {
-    const typeDir = path.join(sourcePath, TYPE_DIRS[ref.type] ?? `${ref.type}s`);
+    const placementStashDir = stashDirFor(ref.type);
+    // Opaque adapter conceptIds are index-resolved. Core cannot infer their
+    // adapter-owned serialization or path extension before indexing.
+    if (placementStashDir === undefined)
+        return [];
+    const typeDir = path.join(sourcePath, placementStashDir);
     const candidates = [
-        resolveAssetPathFromName(ref.type, typeDir, ref.name),
+        assetPathForName(ref.type, typeDir, ref.name),
         path.join(sourcePath, ref.type, `${ref.name}.md`),
         path.join(sourcePath, ref.type, ref.name),
     ];

package/dist/indexer/walk/walker.js

@@ -10,10 +10,11 @@
  */
 import fs from "node:fs";
 import path from "node:path";
-import { isRelevantAssetFile } from "../../core/asset/asset-spec.js";
+import { isRelevantAssetFile } from "../../core/asset/asset-placement.js";
 import { spawnSync } from "../../runtime.js";
 import { buildFileContext } from "./file-context.js";
-const SKIP_DIRS = new Set([".git", "node_modules", "bin", ".cache"]);
+const ALWAYS_SKIP_DIRS = new Set([".git"]);
+const AKM_SKIP_DIRS = new Set(["node_modules", "bin", ".cache"]);
 /**
  * Walk a type root directory and return files grouped by their parent directory.
  *
@@ -60,23 +61,26 @@ export function walkStash(typeRoot, assetType) {
  *
  * If the directory is a git repo, uses `git ls-files` to respect .gitignore.
  * Otherwise falls back to a manual walk that skips .git, node_modules, bin,
- * .cache, dot-directories, and .stash.json files.
+ * .cache, dot-directories, and the legacy metadata sidecar.
  */
-export function walkStashFlat(stashRoot) {
+export function walkStashFlat(stashRoot, options = {}) {
+    return walkStashFlatWithStatus(stashRoot, options).files;
+}
+export function walkStashFlatWithStatus(stashRoot, options = {}) {
     if (!fs.existsSync(stashRoot))
-        return [];
+        return { files: [], complete: false };
     // Try git-based walk first (respects .gitignore)
-    const gitResult = walkStashGit(stashRoot);
+    const gitResult = walkStashGit(stashRoot, options);
     if (gitResult)
         return gitResult;
     // Fallback: manual walk
-    return walkStashManual(stashRoot);
+    return walkStashManual(stashRoot, options);
 }
 /**
  * Walk using `git ls-files` to respect .gitignore.
  * Returns null if the directory is not a git repo or git fails.
  */
-function walkStashGit(stashRoot) {
+function walkStashGit(stashRoot, options) {
     // Quick check: is this a git repo? Look for .git in this dir or parents.
     if (!isInsideGitRepo(stashRoot))
         return null;
@@ -87,21 +91,35 @@ function walkStashGit(stashRoot) {
     // result.success is false if the process exited non-zero OR git was not found
     if (!result.success)
         return null;
+    // `--cached` includes tracked files deleted from the worktree. They are not
+    // scan failures and must not make an otherwise complete snapshot look stale.
+    const deletedResult = spawnSync(["git", "ls-files", "--deleted", "-z", "--", "."], { cwd: stashRoot });
+    if (!deletedResult.success)
+        return null;
+    const deletedStdout = Buffer.isBuffer(deletedResult.stdout)
+        ? deletedResult.stdout.toString("utf8")
+        : String(deletedResult.stdout ?? "");
+    const deletedFiles = new Set(deletedStdout.split("\0").filter(Boolean));
+    // Data-hygiene filename skips: the legacy metadata sidecar (never indexed as
+    // content — Chunk-8 folds it into the bundle format) plus git dot-files.
     const SKIP_FILES = new Set([".stash.json", ".gitignore", ".gitattributes"]);
     const stdout = Buffer.isBuffer(result.stdout) ? result.stdout.toString("utf8") : String(result.stdout ?? "");
     const files = stdout
         .split("\0")
         .filter((f) => f.length > 0)
+        .filter((f) => !deletedFiles.has(f))
         .filter((f) => !f.startsWith("..") && !path.isAbsolute(f))
         .filter((f) => {
         const dirParts = path
             .dirname(f)
             .split(/[\\/]+/)
             .filter(Boolean);
-        return !dirParts.some((part) => SKIP_DIRS.has(part) || part.startsWith("."));
+        return !dirParts.some((part) => ALWAYS_SKIP_DIRS.has(part) ||
+            (!options.includeAllDirectories && (AKM_SKIP_DIRS.has(part) || part.startsWith("."))));
     })
         .filter((f) => !SKIP_FILES.has(path.basename(f)));
     const results = [];
+    let complete = true;
     for (const relFile of files) {
         const absPath = path.join(stashRoot, relFile);
         try {
@@ -111,9 +129,10 @@ function walkStashGit(stashRoot) {
         }
         catch {
             // File may have been deleted since git ls-files ran
+            complete = false;
         }
     }
-    return results;
+    return { files: results, complete };
 }
 /**
  * Check if a directory is inside a git repository by walking up to find .git.
@@ -174,14 +193,22 @@ export function* walkMarkdownFiles(root) {
     }
 }
 /** Manual walk for non-git directories. */
-function walkStashManual(stashRoot) {
+function walkStashManual(stashRoot, options) {
     const results = [];
+    let complete = true;
     const stack = [stashRoot];
     while (stack.length > 0) {
         const current = stack.pop();
         if (!current)
             continue;
-        const entries = fs.readdirSync(current, { withFileTypes: true });
+        let entries;
+        try {
+            entries = fs.readdirSync(current, { withFileTypes: true });
+        }
+        catch {
+            complete = false;
+            continue;
+        }
         for (const entry of entries) {
             if (entry.name === ".stash.json")
                 continue;
@@ -191,7 +218,8 @@ function walkStashManual(stashRoot) {
                 continue;
             }
             if (entry.isDirectory()) {
-                if (SKIP_DIRS.has(entry.name) || entry.name.startsWith("."))
+                if (ALWAYS_SKIP_DIRS.has(entry.name) ||
+                    (!options.includeAllDirectories && (AKM_SKIP_DIRS.has(entry.name) || entry.name.startsWith("."))))
                     continue;
                 stack.push(fullPath);
             }
@@ -200,5 +228,5 @@ function walkStashManual(stashRoot) {
             }
         }
     }
-    return results;
+    return { files: results, complete };
 }

package/dist/integrations/agent/builder-shared.js

@@ -14,6 +14,13 @@
  * their previous home in `builders.ts`.
  */
 import { UsageError } from "../../core/errors.js";
+import { resolveModel } from "./model-aliases.js";
+/** Resolve a raw dispatch model once, while preserving frozen/lowered models verbatim. */
+export function resolveDispatchModel(request, profile, platform) {
+    if (!request.model || request.modelIsExact)
+        return request.model;
+    return resolveModel(request.model, platform, profile.modelAliases, profile.globalModelAliases);
+}
 /**
  * Guard against values that start with `--`, which would be mis-interpreted as
  * CLI flags by the spawned process when used as flag values (model, systemPrompt).

package/dist/integrations/agent/builders.js

@@ -14,50 +14,11 @@
  */
 import { ConfigError } from "../../core/errors.js";
 import { HARNESS_REGISTRY } from "../harnesses/index.js";
-// Types + shared validation helpers live in the leaf module `builder-shared.ts`
-// so per-harness builders (harnesses/claude/agent-builder.ts) can depend on them
-// without importing this file back — avoiding an init-order cycle through
-// BUILTIN_BUILDERS (#563). Re-exported here so existing `agent/builders` import
-// sites keep working.
-import { assertNotFlag } from "./builder-shared.js";
-import { resolveModel } from "./model-aliases.js";
-import { getBuiltinAgentProfile } from "./profiles.js";
-export { assertNotFlag, normalizeTools } from "./builder-shared.js";
-// ── Platform builders ─────────────────────────────────────────────────────────
-// The OpenCode builder was migrated to its harness directory in #564
-// (`harnesses/opencode/agent-builder.ts`) and the Claude Code builder in #563
-// (`harnesses/claude/agent-builder.ts`). Both are imported back into
-// BUILTIN_BUILDERS below so platform routing is unchanged.
-/**
- * Default builder — used for custom profiles and any platform without a
- * dedicated builder. Passes systemPrompt and model via the same flags as
- * the builtin builders so custom profiles benefit from agent asset metadata.
- * Tools are omitted — no standard cross-platform flag exists.
- */
-const defaultBuilder = {
-    platform: "default",
-    build(profile, req) {
-        assertNotFlag(req.systemPrompt, "systemPrompt");
-        assertNotFlag(req.model, "model");
-        const args = [...profile.args];
-        if (req.systemPrompt) {
-            args.push("--system-prompt", req.systemPrompt);
-        }
-        if (req.model) {
-            const resolved = resolveModel(req.model, profile.name, profile.modelAliases, profile.globalModelAliases);
-            args.push("--model", resolved);
-        }
-        args.push("--");
-        args.push(req.prompt);
-        return { argv: [profile.bin, ...args] };
-    },
-};
 // ── Registry ──────────────────────────────────────────────────────────────────
 /**
  * DERIVED from `HARNESS_REGISTRY` (P0.5 registry-drift fix): each harness that
- * owns an `agentBuilder` is registered under its canonical id, its
- * `<id>-headless` profile variant, and every alias. Previously this was a
- * hand-maintained map that could (and did) drift from the harness registry.
+ * owns an `agentBuilder` is registered under its canonical id. Named engines
+ * are schema-validated to canonical harness ids before reaching this boundary.
  */
 const BUILTIN_BUILDERS = (() => {
     const registry = {};
@@ -65,32 +26,18 @@ const BUILTIN_BUILDERS = (() => {
         if (!harness.agentBuilder)
             continue;
         registry[harness.id] = harness.agentBuilder;
-        registry[`${harness.id}-headless`] = harness.agentBuilder;
-        for (const alias of harness.aliases)
-            registry[alias] = harness.agentBuilder;
     }
     return Object.freeze(registry);
 })();
 /**
  * Return the builder for the given platform name.
  *
- * A *custom* profile (unknown platform) falls back to the default builder —
- * that generic `--system-prompt`/`--model`/`--` shape is the documented
- * contract for user-defined wrappers. A *known built-in agent CLI* with no
- * dedicated builder is a loud `ConfigError` instead: the default flag shape
- * is wrong for those CLIs (aider, for one, treats positionals as file names),
- * so the old silent fallback produced a broken command that "ran" and failed
- * downstream. As of the P2 harness-adapter integration every built-in profile
- * has a registry-derived builder, so this branch only fires if a future
- * builtin profile ships without one. Custom builders injected via tests can
- * be passed as `registry`.
+ * Unknown platforms are rejected: there is no safe generic CLI flag shape.
+ * Custom builders injected by tests can be passed as `registry`.
  */
 export function getCommandBuilder(platform, registry = BUILTIN_BUILDERS) {
     const found = registry[platform];
     if (found)
         return found;
-    if (getBuiltinAgentProfile(platform)) {
-        throw new ConfigError(`agent dispatch for "${platform}" is not supported yet: no command builder exists for this CLI, and the generic flag shape would produce a broken command.`, "INVALID_CONFIG_FILE", 'Use an "opencode" or "claude" profile, or — if your CLI is flag-compatible with one of those — set `profiles.agent.<name>.commandBuilder` to "opencode" or "claude".');
-    }
-    return defaultBuilder;
+    throw new ConfigError(`Agent platform "${platform}" has no registered command builder.`, "INVALID_CONFIG_FILE", "Select a canonical agent platform in engines.<name>.platform.");
 }

package/dist/integrations/agent/config.js

@@ -1,147 +1,7 @@
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
-import { ConfigError } from "../../core/errors.js";
-import { BUILTIN_AGENT_PROFILE_NAMES, getBuiltinAgentProfile, listBuiltinAgentProfiles, } from "./profiles.js";
-/**
- * Default hard timeout for an agent CLI (60s — matches the value used in
- * `docs/configuration.md`).
- */
+/** Default hard timeout for an agent CLI when neither engine nor call overrides it. */
 export const DEFAULT_AGENT_TIMEOUT_MS = 60_000;
-/**
- * Resolve the effective `AgentProfile` for `name` by merging the optional
- * user override (`profiles.agent[name]`) on top of the built-in profile (if
- * any). Returns `undefined` when neither yields a usable profile.
- */
-export function resolveAgentProfile(name, overrides, globalModelAliases) {
-    const builtin = getBuiltinAgentProfile(name);
-    const platform = overrides?.platform;
-    // For opencode-sdk profiles, allow synthesizing without a built-in.
-    const sdkMode = platform === "opencode-sdk";
-    if (!builtin && !overrides?.bin && !sdkMode)
-        return undefined;
-    const base = builtin ??
-        {
-            name,
-            bin: overrides?.bin ?? name,
-            args: [],
-            stdio: "captured",
-            envPassthrough: [],
-            parseOutput: "text",
-            ...(sdkMode ? { sdkMode: true } : {}),
-        };
-    if (!overrides) {
-        return globalModelAliases ? { ...base, globalModelAliases } : base;
-    }
-    // Per-profile aliases from config extend (and shadow) the built-in
-    // profile's own entries. (Previously always used base.modelAliases, so the
-    // documented `profiles.agent.<name>.modelAliases` config was silently
-    // dropped — same bug class as the timeoutMs override below.)
-    const modelAliases = overrides.modelAliases || base.modelAliases ? { ...base.modelAliases, ...overrides.modelAliases } : undefined;
-    return {
-        name,
-        bin: overrides.bin ?? base.bin,
-        args: overrides.args ?? base.args,
-        stdio: base.stdio,
-        env: base.env,
-        envPassthrough: base.envPassthrough,
-        // Honor a user-configured `profiles.agent.<name>.timeoutMs` override; fall
-        // back to the built-in profile's value. (Previously always used base, so
-        // the documented config override was silently ignored — callers had to pass
-        // a CLI flag like `--timeout-ms`.) runAgent (spawn.ts) reads profile.timeoutMs
-        // when no per-call timeout is supplied, so this makes the config knob work.
-        timeoutMs: overrides.timeoutMs ?? base.timeoutMs,
-        parseOutput: base.parseOutput,
-        ...(sdkMode ? { sdkMode: true } : {}),
-        model: overrides.model ?? base.model,
-        endpoint: base.endpoint,
-        apiKey: base.apiKey,
-        commandBuilder: base.commandBuilder,
-        modelAliases,
-        ...(globalModelAliases ? { globalModelAliases } : {}),
-    };
-}
-/**
- * Resolve the runnable profile for `name`, or `undefined` if none is
- * available (no built-in and no user override). Threads the config-root
- * `modelAliases` tier table onto the resolved profile.
- */
-export function resolveProfileFromConfig(name, config) {
-    return resolveAgentProfile(name, config?.profiles?.agent?.[name], config?.modelAliases);
-}
-/**
- * Return the names of every agent profile available in `config` — built-ins
- * plus any user-defined entries under `profiles.agent`. Sorted, deduplicated.
- */
-export function listAgentProfileNames(config) {
-    const seen = new Set(BUILTIN_AGENT_PROFILE_NAMES);
-    for (const name of Object.keys(config?.profiles?.agent ?? {}))
-        seen.add(name);
-    return [...seen].sort();
-}
-/**
- * Resolve the default agent profile name. Order: explicit `requested` arg →
- * `config.defaults.agent` → undefined.
- */
-export function resolveDefaultProfileName(config, requested) {
-    if (requested?.trim())
-        return requested.trim();
-    const def = config?.defaults?.agent;
-    if (typeof def === "string" && def.trim())
-        return def.trim();
-    return undefined;
-}
-/**
- * Throw a stable `ConfigError` when the caller needs an agent profile but
- * none can be resolved.
- */
-export function requireAgentProfile(config, requested) {
-    if (!config) {
-        throw new ConfigError("agent commands are disabled: no agent configuration in config.json.", "INVALID_CONFIG_FILE", "Run `akm setup` to detect and configure an agent CLI, or add an entry under `profiles.agent` and set `defaults.agent`.");
-    }
-    const name = resolveDefaultProfileName(config, requested);
-    if (!name) {
-        throw new ConfigError("agent commands require a profile: pass --profile or set `defaults.agent` in config.json.", "INVALID_CONFIG_FILE", `Available profiles: ${listAgentProfileNames(config).join(", ")}.`);
-    }
-    const profile = resolveProfileFromConfig(name, config);
-    if (!profile) {
-        throw new ConfigError(`agent profile "${name}" is not built-in and has no \`bin\` override.`, "INVALID_CONFIG_FILE", `Define profiles.agent."${name}".bin in config.json, or pick one of: ${listAgentProfileNames(config).join(", ")}.`);
-    }
-    return profile;
-}
-/**
- * Resolve the agent profile bound to a named improve process. Reads from
- * `profiles.improve.default.processes.<processName>` for the profile binding,
- * then falls back to `defaults.agent`.
- */
-export function resolveProcessAgentProfile(processName, config) {
-    const processEntry = config?.profiles?.improve?.default?.processes;
-    const entry = processEntry?.[processName];
-    const profileName = entry?.profile;
-    const profile = requireAgentProfile(config, profileName);
-    let resolvedTimeoutMs;
-    if (entry?.timeoutMs === null) {
-        resolvedTimeoutMs = null;
-    }
-    else if (typeof entry?.timeoutMs === "number") {
-        resolvedTimeoutMs = entry.timeoutMs;
-    }
-    else if (profile.timeoutMs !== undefined) {
-        resolvedTimeoutMs = profile.timeoutMs;
-    }
-    return { profile, timeoutMs: resolvedTimeoutMs };
-}
-/**
- * Convenience: list every fully-resolved profile (built-ins merged with
- * user overrides). Used by setup detection to enumerate candidates.
- */
-export function listResolvedAgentProfiles(config) {
-    const resolved = [];
-    const builtins = listBuiltinAgentProfiles();
-    for (const name of listAgentProfileNames(config)) {
-        const profile = resolveProfileFromConfig(name, config) ?? builtins[name];
-        if (profile)
-            resolved.push(profile);
-    }
-    return resolved;
-}
+/** Default hard timeout for direct LLM calls when no engine/use override exists. */
+export const DEFAULT_LLM_TIMEOUT_MS = 600_000;

package/dist/integrations/agent/detect.js

@@ -15,7 +15,7 @@
  */
 import fs from "node:fs";
 import path from "node:path";
-import { listResolvedAgentProfiles } from "./config.js";
+import { getBuiltinAgentProfile, listBuiltinAgentProfiles } from "./profiles.js";
 /**
  * Default PATH lookup. Walks `process.env.PATH` and returns the first
  * existing executable file. Returns `undefined` when the bin is not on
@@ -71,7 +71,22 @@ export function _setAgentDetectForTests(fakes) {
 export function detectAgentCliProfiles(agent, whichFn = defaultWhich) {
     if (detectOverrides?.detectAgentCliProfiles)
         return detectOverrides.detectAgentCliProfiles(agent, whichFn);
-    const profiles = listResolvedAgentProfiles(agent);
+    const profilesByName = new Map(Object.values(listBuiltinAgentProfiles()).map((profile) => [profile.name, profile]));
+    for (const [name, engine] of Object.entries(agent?.engines ?? {})) {
+        if (engine.kind !== "agent")
+            continue;
+        const builtin = getBuiltinAgentProfile(engine.platform);
+        profilesByName.set(name, {
+            name,
+            platform: engine.platform,
+            bin: engine.bin ?? builtin?.bin ?? (engine.platform === "opencode-sdk" ? "opencode" : engine.platform),
+            args: engine.args ?? builtin?.args ?? [],
+            stdio: "captured",
+            envPassthrough: builtin?.envPassthrough ?? [],
+            parseOutput: "text",
+        });
+    }
+    const profiles = [...profilesByName.values()];
     return profiles.map((profile) => probeProfile(profile, whichFn));
 }
 function probeProfile(profile, whichFn) {