akm-cli 0.9.0-beta.6 → 0.9.0-rc.0

package/dist/indexer/search/ranking.js

@@ -1,8 +1,68 @@
 // 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 fs from "node:fs";
+import { makeAssetRef } from "../../core/asset/asset-ref.js";
+import { getStateDbPath } from "../../core/state-db.js";
+import { openDatabase } from "../../storage/database.js";
 import { getUtilityScoresByIds } from "../db/db.js";
-import { applyScoreContributors, applyUtilityContributors } from "./ranking-contributors.js";
+import { applyContributorAblation, applyScoreContributors, applyUtilityContributors, defaultRankingContributors, defaultUtilityRankingContributors, } from "./ranking-contributors.js";
+/**
+ * R2 — best-effort load of `asset_salience.rank_score` from state.db for the
+ * ranked items. Fail-open: any error (state.db locked by a concurrent improve
+ * run, missing table, unreadable path) returns an empty map, which makes the
+ * salience contributor a no-op — byte-identical to pre-R2 ranking.
+ *
+ * Deliberately NOT `openStateDatabase()`: that helper runs migrations and sets
+ * a 30 s busy timeout — too heavy for a search hot path. This opens read-only,
+ * never creates or migrates state.db (missing file / missing table = empty
+ * map), and caps lock waits at 250 ms so a concurrent improve run can only
+ * ever cost the search a quarter second, not a stall.
+ */
+export function loadSalienceRankScores(items) {
+    const result = new Map();
+    if (items.length === 0)
+        return result;
+    try {
+        const dbPath = getStateDbPath();
+        if (!fs.existsSync(dbPath))
+            return result; // improve loop has never run here
+        const idByRef = new Map();
+        for (const item of items) {
+            idByRef.set(makeAssetRef(item.entry.type, item.entry.name), item.id);
+        }
+        const stateDb = openDatabase(dbPath, { readonly: true });
+        try {
+            try {
+                stateDb.exec("PRAGMA busy_timeout = 250");
+            }
+            catch {
+                // pragma failure on a readonly handle is fine — default timeout applies
+            }
+            const refs = [...idByRef.keys()];
+            const CHUNK = 500;
+            for (let i = 0; i < refs.length; i += CHUNK) {
+                const chunk = refs.slice(i, i + CHUNK);
+                const placeholders = chunk.map(() => "?").join(",");
+                const rows = stateDb
+                    .prepare(`SELECT asset_ref, rank_score FROM asset_salience WHERE asset_ref IN (${placeholders})`)
+                    .all(...chunk);
+                for (const row of rows) {
+                    const id = idByRef.get(row.asset_ref);
+                    if (id !== undefined)
+                        result.set(id, row.rank_score);
+                }
+            }
+        }
+        finally {
+            stateDb.close();
+        }
+    }
+    catch {
+        // Fail open — search must never break because state.db is unavailable.
+    }
+    return result;
+}
 export function normalizeFtsScores(results) {
     const ftsScoreMap = new Map();
     if (results.length === 0)
@@ -20,6 +80,7 @@ export function normalizeFtsScores(results) {
 export function combineSearchScores(options) {
     const FTS_WEIGHT = 0.7;
     const VEC_WEIGHT = 0.3;
+    const excludeTypeSet = options.excludeTypes && options.excludeTypes.length > 0 ? new Set(options.excludeTypes) : null;
     const scored = [];
     const seenIds = new Set();
     for (const [id, { score: ftsScore, result }] of options.ftsScoreMap) {
@@ -42,6 +103,9 @@ export function combineSearchScores(options) {
             continue;
         if (options.typeFilter && found.entry.type !== options.typeFilter)
             continue;
+        // #627 — drop vector-only neighbors whose type is excluded on the default path.
+        if (excludeTypeSet?.has(found.entry.type))
+            continue;
         scored.push({
             id,
             entry: found.entry,
@@ -63,19 +127,31 @@ export function applyRankingRules(options) {
         graphContext: options.graphContext,
         projectContext: options.projectContext,
     };
+    // Eval/debug only: AKM_ABLATE_CONTRIBUTORS lets the ablation harness drop
+    // named contributors to measure their effect. Resolved once per query;
+    // a no-op (full lists) when the env var is unset — see applyContributorAblation.
+    const ablateEnv = process.env.AKM_ABLATE_CONTRIBUTORS;
+    const activeScoreContributors = applyContributorAblation(defaultRankingContributors, ablateEnv);
+    const activeUtilityContributors = applyContributorAblation(defaultUtilityRankingContributors, ablateEnv);
     for (const item of options.items) {
-        applyScoreContributors(item, rankingContext);
+        applyScoreContributors(item, rankingContext, activeScoreContributors);
     }
     const { global: utilScoresMap, scoped: scopedUtilScoresMap } = getUtilityScoresByIds(options.db, options.items.map((item) => item.id), options.scopeKey);
+    // R2 — compose the improve loop's salience into user-facing ranking.
+    // undefined = load from state.db (default); null = explicitly disabled.
+    const salienceRankScores = options.salienceRankScores === null
+        ? new Map()
+        : (options.salienceRankScores ?? loadSalienceRankScores(options.items));
     const utilityContext = {
         ...rankingContext,
         utilityScores: utilScoresMap,
         scopedUtilityScores: scopedUtilScoresMap,
         utilityDecayConfig: options.utilityDecayConfig,
         positiveFeedbackCounts: options.positiveFeedbackCounts,
+        salienceRankScores,
     };
     for (const item of options.items) {
-        applyUtilityContributors(item, utilityContext);
+        applyUtilityContributors(item, utilityContext, activeUtilityContributors);
     }
     return options.items;
 }

package/dist/indexer/search/search-fields.js

@@ -11,6 +11,12 @@
  *  - hints: searchHints + examples + usage + intent fields
  *  - content: TOC headings (lowest-weight catch-all)
  */
+// NOTE (R5): the collapse detector's frozen canary queries are built from the
+// same surface this function indexes (name tokens / tags / description) and
+// scored via FTS against it. Changing what buildSearchFields includes shifts
+// the detector's recall baseline for ALL existing canary sets — coordinate
+// with src/commands/improve/collapse-detector.ts (buildCanaryQuery) and expect
+// operators to re-mint via `akm improve canary --refresh` after such a change.
 export function buildSearchFields(entry) {
     const name = entry.name.replace(/[-_]/g, " ").toLowerCase();
     const description = (entry.description ?? "").toLowerCase();

package/dist/indexer/search/search-source.js

@@ -10,8 +10,6 @@ import { resolveSourceProviderFactory } from "../../sources/provider-factory.js"
 // before resolveEntryContentDir() runs.
 import "../../sources/providers/index.js";
 import { warn } from "../../core/warn.js";
-import { ensureGitMirror, getCachePaths, parseGitRepoUrl } from "../../sources/providers/git.js";
-import { ensureWebsiteMirror } from "../../sources/website-ingest.js";
 // Legacy "context-hub" / "github" type aliases are normalized to "git" at
 // config-load time (see src/config.ts), so this set only contains the canonical
 // type.
@@ -169,14 +167,26 @@ export function getWritableStashDirs(overrideStashDir, existingConfig) {
 }
 /**
  * Find which source a file path belongs to.
+ *
+ * Longest-matching-prefix wins: a source nested inside another (e.g. `akm add
+ * ./sub` where `./sub` lives under the primary stash — which is always
+ * `sources[0]`) is the more specific owner and must win over the enclosing
+ * source regardless of array order. A first-match-in-order scan would
+ * misattribute every asset under the nested source to the primary stash,
+ * corrupting origin / editability / provenance decisions for the affected files.
  */
 export function findSourceForPath(filePath, sources) {
     const resolved = path.resolve(filePath);
+    let best;
+    let bestLen = -1;
     for (const source of sources) {
-        if (resolved.startsWith(path.resolve(source.path) + path.sep))
-            return source;
+        const base = path.resolve(source.path);
+        if (resolved.startsWith(base + path.sep) && base.length > bestLen) {
+            best = source;
+            bestLen = base.length;
+        }
     }
-    return undefined;
+    return best;
 }
 /**
  * Return the primary stash source (first entry in the list).
@@ -261,31 +271,32 @@ function isValidDirectory(dir) {
 export async function ensureSourceCaches(config, options) {
     const cfg = config ?? loadConfig();
     const force = options?.force === true;
-    const entries = getSources(cfg);
-    for (const entry of entries) {
-        if (!GIT_STASH_TYPES.has(entry.type) || !entry.url || entry.enabled === false)
+    // Polymorphic refresh: walk every enabled source through its registered
+    // provider and call `sync()`. Every cache-backed kind (git, website, npm)
+    // refreshes the same way — a bad source warns and is skipped without
+    // aborting the others. The git content/-subdir layout convention stays in
+    // resolveEntryContentDir.
+    for (const entry of getSources(cfg)) {
+        if (entry.enabled === false)
+            continue;
+        const factory = resolveSourceProviderFactory(entry.type);
+        if (!factory)
             continue;
+        let provider;
         try {
-            const repo = parseGitRepoUrl(entry.url);
-            const cachePaths = getCachePaths(repo.canonicalUrl);
-            await ensureGitMirror(repo, cachePaths, {
-                requireRepoDir: true,
-                writable: entry.writable === true,
-                force,
-            });
+            provider = factory(entry);
         }
         catch (err) {
-            warn(`Warning: failed to refresh git mirror for "${entry.url}": ${err instanceof Error ? err.message : String(err)}`);
+            warn(`Warning: failed to construct ${entry.type} source provider for "${entry.name ?? entry.url ?? entry.path}": ${err instanceof Error ? err.message : String(err)}`);
+            continue;
         }
-    }
-    for (const entry of entries) {
-        if (entry.type !== "website" || !entry.url || entry.enabled === false)
+        if (!provider.sync)
             continue;
         try {
-            await ensureWebsiteMirror(entry, { requireStashDir: true, force });
+            await provider.sync({ force });
         }
         catch (err) {
-            warn(`Warning: failed to refresh website stash for "${entry.url}": ${err instanceof Error ? err.message : String(err)}`);
+            warn(`Warning: failed to refresh ${provider.kind} source "${provider.name}": ${err instanceof Error ? err.message : String(err)}`);
         }
     }
 }

package/dist/indexer/search/semantic-status.js

@@ -4,8 +4,12 @@
 import fs from "node:fs";
 import { writeFileAtomic } from "../../core/common.js";
 import { getCacheDir, getSemanticStatusPath } from "../../core/paths.js";
+import { DETERMINISTIC_EMBED_MODEL_ID, isDeterministicEmbedEnabled } from "../../llm/embedders/deterministic.js";
 import { DEFAULT_LOCAL_MODEL } from "../../llm/embedders/local.js";
 export function deriveSemanticProviderFingerprint(embedding) {
+    if (isDeterministicEmbedEnabled()) {
+        return `deterministic:${DETERMINISTIC_EMBED_MODEL_ID}`;
+    }
     if (embedding?.endpoint) {
         return `remote:${embedding.endpoint}|${embedding.model}|${embedding.dimension ?? "default"}`;
     }

package/dist/indexer/walk/matchers.js

@@ -78,6 +78,15 @@ const DIR_TYPE_MAP = [
         type: "session",
         test: (ext) => ext === ".md",
     },
+    {
+        // Durable stash-level facts live under `facts/<category>/<name>.md`.
+        // classifyByDirectory walks every ancestor dir, so nested category
+        // subdirs still match. Without this entry a fact file would fall through
+        // to classifyBySmartMd and be mistyped as `knowledge`.
+        dir: "facts",
+        type: "fact",
+        test: (ext) => ext === ".md",
+    },
 ];
 const COMMAND_PLACEHOLDER_RE = /\$ARGUMENTS|\$[123]\b/;
 // Files that should never be treated as the typed asset for the surrounding

package/dist/indexer/walk/walker.js

@@ -148,20 +148,28 @@ function isInsideGitRepo(dir) {
  * read (e.g. permission errors).
  */
 export function* walkMarkdownFiles(root) {
-    let entries;
-    try {
-        entries = fs.readdirSync(root, { withFileTypes: true });
-    }
-    catch {
-        return;
-    }
-    for (const entry of entries) {
-        const full = path.join(root, entry.name);
-        if (entry.isDirectory()) {
-            yield* walkMarkdownFiles(full);
+    const stack = [root];
+    while (stack.length > 0) {
+        const current = stack.pop();
+        if (!current)
+            continue;
+        let entries;
+        try {
+            entries = fs.readdirSync(current, { withFileTypes: true });
         }
-        else if (entry.isFile() && entry.name.toLowerCase().endsWith(".md")) {
-            yield full;
+        catch {
+            continue;
+        }
+        for (const entry of entries) {
+            const full = path.join(current, entry.name);
+            if (entry.isSymbolicLink())
+                continue;
+            if (entry.isDirectory()) {
+                stack.push(full);
+            }
+            else if (entry.isFile() && entry.name.toLowerCase().endsWith(".md")) {
+                yield full;
+            }
         }
     }
 }

package/dist/integrations/agent/builders.js

@@ -12,8 +12,8 @@
  * Adding a new platform: implement `AgentCommandBuilder`, add to
  * `BUILTIN_BUILDERS`. Nothing else changes.
  */
-import { claudeBuilder } from "../harnesses/claude/agent-builder.js";
-import { opencodeBuilder } from "../harnesses/opencode/agent-builder.js";
+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
@@ -21,6 +21,7 @@ import { opencodeBuilder } from "../harnesses/opencode/agent-builder.js";
 // 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
@@ -43,7 +44,7 @@ const defaultBuilder = {
             args.push("--system-prompt", req.systemPrompt);
         }
         if (req.model) {
-            const resolved = resolveModel(req.model, profile.name, profile.modelAliases);
+            const resolved = resolveModel(req.model, profile.name, profile.modelAliases, profile.globalModelAliases);
             args.push("--model", resolved);
         }
         args.push("--");
@@ -52,17 +53,42 @@ const defaultBuilder = {
     },
 };
 // ── Registry ──────────────────────────────────────────────────────────────────
-const BUILTIN_BUILDERS = {
-    opencode: opencodeBuilder,
-    "opencode-headless": opencodeBuilder,
-    claude: claudeBuilder,
-    "claude-headless": claudeBuilder,
-};
 /**
- * Return the builder for the given platform name, falling back to the default
- * builder for unknown platforms. Custom builders injected via tests can be
- * passed as `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.
+ */
+const BUILTIN_BUILDERS = (() => {
+    const registry = {};
+    for (const harness of HARNESS_REGISTRY) {
+        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 (codex, gemini, aider + their `-headless` variants) 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.
+ * Custom builders injected via tests can be passed as `registry`.
  */
 export function getCommandBuilder(platform, registry = BUILTIN_BUILDERS) {
-    return registry[platform] ?? defaultBuilder;
+    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;
 }

package/dist/integrations/agent/config.js

@@ -1,9 +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 { VALID_HARNESS_IDS } from "../../core/config/config.js";
 import { ConfigError } from "../../core/errors.js";
-import { warn } from "../../core/warn.js";
 import { BUILTIN_AGENT_PROFILE_NAMES, getBuiltinAgentProfile, listBuiltinAgentProfiles, } from "./profiles.js";
 /**
  * Default hard timeout for an agent CLI (60s — matches the value used in
@@ -15,7 +13,7 @@ export const DEFAULT_AGENT_TIMEOUT_MS = 60_000;
  * 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) {
+export function resolveAgentProfile(name, overrides, globalModelAliases) {
     const builtin = getBuiltinAgentProfile(name);
     const platform = overrides?.platform;
     // For opencode-sdk profiles, allow synthesizing without a built-in.
@@ -32,8 +30,14 @@ export function resolveAgentProfile(name, overrides) {
             parseOutput: "text",
             ...(sdkMode ? { sdkMode: true } : {}),
         };
-    if (!overrides)
-        return base;
+    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,
@@ -41,22 +45,29 @@ export function resolveAgentProfile(name, overrides) {
         stdio: base.stdio,
         env: base.env,
         envPassthrough: base.envPassthrough,
-        timeoutMs: base.timeoutMs,
+        // 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: base.modelAliases,
+        modelAliases,
+        ...(globalModelAliases ? { globalModelAliases } : {}),
     };
 }
 /**
  * Resolve the runnable profile for `name`, or `undefined` if none is
- * available (no built-in and no user override).
+ * 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]);
+    return resolveAgentProfile(name, config?.profiles?.agent?.[name], config?.modelAliases);
 }
 /**
  * Return the names of every agent profile available in `config` — built-ins
@@ -134,53 +145,3 @@ export function listResolvedAgentProfiles(config) {
     }
     return resolved;
 }
-/**
- * Parse the v2 `profiles.agent` map (AgentProfileConfigV2 shape with required
- * `platform` field). Returns a map of profile name → AgentProfileConfigV2.
- */
-export function parseAgentProfilesMapV2(value) {
-    if (typeof value !== "object" || value === null || Array.isArray(value))
-        return undefined;
-    const out = {};
-    // Derives from the canonical harness-id source of truth (#565).
-    const VALID_PLATFORMS = VALID_HARNESS_IDS;
-    for (const [name, raw] of Object.entries(value)) {
-        if (typeof raw !== "object" || raw === null || Array.isArray(raw)) {
-            warn(`[akm] Ignoring profiles.agent["${name}"]: expected an object.`);
-            continue;
-        }
-        const obj = raw;
-        if (!VALID_PLATFORMS.includes(obj.platform)) {
-            warn(`[akm] Ignoring profiles.agent["${name}"]: missing or invalid "platform" (must be one of: ${VALID_PLATFORMS.join(", ")}).`);
-            continue;
-        }
-        const profile = {
-            platform: obj.platform,
-        };
-        if (typeof obj.bin === "string" && obj.bin.trim())
-            profile.bin = obj.bin.trim();
-        if (Array.isArray(obj.args) && obj.args.every((a) => typeof a === "string")) {
-            profile.args = obj.args;
-        }
-        if (typeof obj.workspace === "string" && obj.workspace.trim())
-            profile.workspace = obj.workspace.trim();
-        if (typeof obj.model === "string" && obj.model.trim())
-            profile.model = obj.model.trim();
-        out[name] = profile;
-    }
-    return Object.keys(out).length > 0 ? out : undefined;
-}
-/**
- * Stub kept for source-compat with callers that previously used the v1 agent
- * config parser. After 0.8.0 there is no separate `agent` block to parse — the
- * loaded `AkmConfig` already carries the agent data on `profiles.agent` and
- * `defaults.agent`. This function is a no-op alias for those callers.
- *
- * @deprecated v0.8.0 — the unified `AkmConfig` IS the agent config. Use the
- * profile/defaults accessors above instead.
- */
-export function parseAgentConfig(_value) {
-    // No-op: there is no separate agent block in 0.8.0. Callers should pass
-    // their loaded `AkmConfig` directly to `requireAgentProfile` etc.
-    return undefined;
-}

package/dist/integrations/agent/detect.js

@@ -55,6 +55,11 @@ export function defaultWhich(bin, envSource = process.env) {
     }
     return undefined;
 }
+let detectOverrides;
+/** TEST-ONLY. Swap the detection implementations; pass undefined to restore. */
+export function _setAgentDetectForTests(fakes) {
+    detectOverrides = fakes;
+}
 /**
  * Probe every resolvable agent profile (built-ins plus user overrides)
  * for an installed CLI.
@@ -64,6 +69,8 @@ export function defaultWhich(bin, envSource = process.env) {
  * @param whichFn  Binary lookup. Tests should inject a stub.
  */
 export function detectAgentCliProfiles(agent, whichFn = defaultWhich) {
+    if (detectOverrides?.detectAgentCliProfiles)
+        return detectOverrides.detectAgentCliProfiles(agent, whichFn);
     const profiles = listResolvedAgentProfiles(agent);
     return profiles.map((profile) => probeProfile(profile, whichFn));
 }
@@ -87,6 +94,8 @@ function probeProfile(profile, whichFn) {
  *      writing `agent.default`.
  */
 export function pickDefaultAgentProfile(results, existingDefault) {
+    if (detectOverrides?.pickDefaultAgentProfile)
+        return detectOverrides.pickDefaultAgentProfile(results, existingDefault);
     if (existingDefault) {
         const match = results.find((r) => r.name === existingDefault && r.available);
         if (match)

package/dist/integrations/agent/index.js

@@ -1,26 +1,10 @@
 // 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/.
-/**
- * Internal entry point for the `agent` integration. CLI-only project — no
- * public exports map. Other akm modules import from this barrel for the
- * sake of grouping imports.
- *
- * Surface:
- *   • Types: AgentProfile, AgentConfig, AgentRunResult, AgentFailureReason.
- *   • Profiles: getBuiltinAgentProfile, listBuiltinAgentProfiles, BUILTIN_AGENT_PROFILE_NAMES.
- *   • Config: parseAgentConfig, resolveProfileFromConfig, requireAgentProfile, listResolvedAgentProfiles, listAgentProfileNames.
- *   • Spawn: runAgent. Builders: getCommandBuilder, AgentCommandBuilder, AgentDispatchRequest — platform-specific argv construction.
- *   • Detection: detectAgentCliProfiles, pickDefaultAgentProfile, defaultWhich.
- */
-// The OpenCode SDK runner moved to its harness directory in #564
-// (`harnesses/opencode-sdk/`). Re-exported here so existing `agent/index`
-// import sites keep working.
-export { runAgentSdk } from "../harnesses/opencode-sdk/index.js";
 export { getCommandBuilder } from "./builders.js";
-export { DEFAULT_AGENT_TIMEOUT_MS, listAgentProfileNames, listResolvedAgentProfiles, parseAgentConfig, requireAgentProfile, resolveAgentProfile, resolveDefaultProfileName, resolveProfileFromConfig, } from "./config.js";
-export { defaultWhich, detectAgentCliProfiles, pickDefaultAgentProfile } from "./detect.js";
+export { DEFAULT_AGENT_TIMEOUT_MS, listAgentProfileNames, listResolvedAgentProfiles, requireAgentProfile, resolveAgentProfile, resolveDefaultProfileName, resolveProfileFromConfig, } from "./config.js";
+export { _setAgentDetectForTests, defaultWhich, detectAgentCliProfiles, pickDefaultAgentProfile } from "./detect.js";
 export { listBuiltinModelAliases, resolveModel } from "./model-aliases.js";
 export { BUILTIN_AGENT_PROFILE_NAMES, getBuiltinAgentProfile, listBuiltinAgentProfiles, } from "./profiles.js";
-export { buildProposePrompt, buildReflectPrompt, buildSchemaRepairPrompt, extractDraftConfidence, parseAgentProposalPayload, stripJsonFences, } from "./prompts.js";
+export { buildProposePrompt, buildReflectPrompt, buildSchemaRepairPrompt, extractDraftConfidence, parseAgentProposalPayload, } from "./prompts.js";
 export { runAgent } from "./spawn.js";

package/dist/integrations/agent/model-aliases.js

@@ -39,13 +39,18 @@ const BUILTIN_ALIASES = [
  *
  * @param model   Raw alias ("opus") or exact model ID ("claude-opus-4-7").
  * @param platform Builder platform name ("claude", "opencode", ...).
- * @param custom  Profile-level aliases from config.json — take priority over builtins.
+ * @param custom  Profile-level aliases from config.json — take priority over globals and builtins.
+ * @param global  Config-root `modelAliases` tier table (alias → platform → model, `"*"` fallback).
  * @returns Resolved model string, or `model` verbatim when no alias matches.
  */
-export function resolveModel(model, platform, custom) {
+export function resolveModel(model, platform, custom, global) {
     const key = model.toLowerCase();
     if (custom?.[key])
         return custom[key];
+    const tier = global?.[key];
+    const fromGlobal = tier?.[platform] ?? tier?.["*"];
+    if (fromGlobal)
+        return fromGlobal;
     const entry = BUILTIN_ALIASES.find((a) => a.alias === key);
     return entry?.platforms[platform] ?? model;
 }

package/dist/integrations/agent/profiles.js

@@ -1,7 +1,13 @@
 // 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/.
-const COMMON_PASSTHROUGH = ["HOME", "PATH", "USER", "LANG", "LC_ALL", "TERM", "TMPDIR"];
+// AKM_EVENT_SOURCE carries usage-event provenance (improve/task) so that akm
+// invocations a spawned agent makes are recorded as machine traffic, not user
+// demand (DRIFT-6). Without it in the passthrough whitelist, buildChildEnv drops
+// the stamp at the agent boundary — e.g. `akm wiki ingest` spawns an agent whose
+// `akm curate/show/search` tool-calls then log source='user', silently inflating
+// every lane's read-back (GRR). It is a provenance tag, never a secret.
+const COMMON_PASSTHROUGH = ["HOME", "PATH", "USER", "LANG", "LC_ALL", "TERM", "TMPDIR", "AKM_EVENT_SOURCE"];
 /**
  * Built-in profiles for the five agent CLIs the v1 spec calls out
  * explicitly. The fields here are conservative defaults — every value is