akm-cli 0.10.261019 → 0.10.261021

package/dist/core/common.js

@@ -495,7 +495,10 @@ export async function fetchWithTimeout(url, opts, timeoutMs = 30_000, signal) {
     try {
         if (controller.signal.aborted)
             throw controller.signal.reason ?? new Error(`Request aborted: ${url}`);
-        return await fetch(url, { ...opts, signal: controller.signal });
+        // `timeout: false` turns off Bun's independent five-minute socket-idle timer,
+        // which would otherwise cut a longer AKM deadline short. The AbortController
+        // signal (deadline + caller cancel) remains the only bound on the request.
+        return await fetch(url, { ...opts, signal: controller.signal, timeout: false });
     }
     catch (err) {
         if (err instanceof DOMException && err.name === "AbortError") {

package/dist/indexer/passes/metadata.js

@@ -875,9 +875,9 @@ function isMarkdownFenceClosing(line, fence) {
  * Version of what {@link projectMarkdownContent} indexes. It is part of every
  * directory's index fingerprint, so bumping it makes the next `akm index`
  * re-project every directory once instead of keeping the old text for
- * unchanged files. 2: identifiers from fenced code (akm#1260).
+ * unchanged files. 3: count each fenced identifier once per document (akm#1284).
  */
-export const CONTENT_PROJECTION_VERSION = 2;
+export const CONTENT_PROJECTION_VERSION = 3;
 /** At or above this length a token with a digit reads as a key or hash, not a name. */
 const TOKEN_LIKE_MIN_LENGTH = 20;
 /**
@@ -1114,7 +1114,7 @@ export function projectMarkdownContent(body, truncationInfo) {
     const innerBlock = findInnerFrontmatterBlock(lines);
     const start = innerBlock && isFrontmatterShaped(lines, innerBlock) ? innerBlock.close + 1 : 0;
     const projected = [];
-    const fenced = [];
+    const fenced = new Map();
     forEachVisibleMarkdownLine(lines, start, (_index, visible) => {
         let trimmed = visible.trim();
         if (!trimmed || /^(-{3,}|\*{3,}|_{3,}|=+)$/.test(trimmed))
@@ -1135,11 +1135,13 @@ export function projectMarkdownContent(body, truncationInfo) {
             projected.push(trimmed);
     }, (_index, fencedLine) => {
         const identifiers = fencedCodeIdentifiers(fencedLine);
-        if (identifiers)
-            fenced.push(identifiers);
+        for (const identifier of identifiers.split(/\s+/)) {
+            if (identifier)
+                fenced.set(identifier.toLowerCase(), identifier);
+        }
     });
     // Fenced identifiers follow the prose, so a head-truncated embedding input keeps the prose first.
-    const text = [...projected, ...fenced].join(" ").replace(/\s+/g, " ").trim();
+    const text = [...projected, ...fenced.values()].join(" ").replace(/\s+/g, " ").trim();
     if (!text)
         return undefined;
     if (truncationInfo)

package/dist/indexer/walk/matchers.js

@@ -194,6 +194,16 @@ function classifyByParentDirHint(ctx) {
     }
     return matchDirectoryHint(parentDir, ctx, 15);
 }
+/**
+ * The type a file's location declares, from the same directory rules the
+ * indexer applies: parent-directory hint (specificity 15) over the outermost
+ * typed ancestor (10), each honouring the rule's extension predicate, the
+ * `README.md` documentation exception and nested skill resources. `undefined`
+ * when no directory rule claims the file. Path fields only; no bytes are read.
+ */
+export function declaredTypeForPath(ctx) {
+    return (classifyByParentDirHint(ctx) ?? classifyByDirectory(ctx))?.type;
+}
 function classifyBySmartMd(ctx) {
     if (ctx.ext !== ".md")
         return null;

package/dist/output/text/command-format.js

@@ -680,11 +680,15 @@ function formatUpgradePluginLines(r) {
     }
     const plugins = Array.isArray(r.plugins) ? r.plugins : [];
     for (const p of plugins) {
-        if (p.outcome === "current" || p.outcome === "skipped")
+        if ((p.outcome === "current" || p.outcome === "skipped") &&
+            (r.updateAvailable === undefined || !p.channel) &&
+            !p.channelMismatch &&
+            !p.targetChannel)
             continue;
         const versions = p.from && p.to && p.from !== p.to ? ` v${p.from} → v${p.to}` : "";
+        const channel = p.channel ? ` [channel ${p.channel}${p.channelMismatch ? "; differs from CLI" : ""}]` : "";
         const note = p.message ? ` (${p.message})` : "";
-        lines.push(`${HARNESS_LABELS[String(p.harness)] ?? p.harness} plugin ${p.outcome}${versions}${note}`);
+        lines.push(`${HARNESS_LABELS[String(p.harness)] ?? p.harness} plugin ${p.outcome}${versions}${channel}${note}`);
     }
     return lines;
 }
@@ -698,8 +702,11 @@ function formatUpgradeHead(r) {
     if (r.upgraded === true) {
         return `akm upgraded: v${r.currentVersion} → v${r.newVersion}`;
     }
+    if (r.targetChannel && r.latestVersion && r.latestVersion !== r.currentVersion && r.updateAvailable === false) {
+        return `akm v${r.currentVersion} → v${r.latestVersion} requires --allow-downgrade (run 'akm upgrade --channel ${r.targetChannel} --allow-downgrade' to install)`;
+    }
     if (r.updateAvailable === true) {
-        return `akm v${r.currentVersion} → v${r.latestVersion} available (run 'akm upgrade${r.channel === "next" ? " --next" : ""}' to install)`;
+        return `akm v${r.currentVersion} → v${r.latestVersion} available (run 'akm upgrade${r.targetChannel ? ` --channel ${r.targetChannel}` : r.channel === "next" ? " --next" : ""}' to install)`;
     }
     if (r.updateAvailable === false && r.latestVersion) {
         return `akm v${r.currentVersion} is already the latest version`;

package/dist/scripts/akm-migrate-node.js

@@ -34812,7 +34812,7 @@ function projectMarkdownContent(body, truncationInfo) {
   const innerBlock = findInnerFrontmatterBlock(lines);
   const start = innerBlock && isFrontmatterShaped(lines, innerBlock) ? innerBlock.close + 1 : 0;
   const projected = [];
-  const fenced = [];
+  const fenced = new Map;
   forEachVisibleMarkdownLine(lines, start, (_index, visible) => {
     let trimmed = visible.trim();
     if (!trimmed || /^(-{3,}|\*{3,}|_{3,}|=+)$/.test(trimmed))
@@ -34832,10 +34832,12 @@ function projectMarkdownContent(body, truncationInfo) {
       projected.push(trimmed);
   }, (_index, fencedLine) => {
     const identifiers = fencedCodeIdentifiers(fencedLine);
-    if (identifiers)
-      fenced.push(identifiers);
+    for (const identifier of identifiers.split(/\s+/)) {
+      if (identifier)
+        fenced.set(identifier.toLowerCase(), identifier);
+    }
   });
-  const text2 = [...projected, ...fenced].join(" ").replace(/\s+/g, " ").trim();
+  const text2 = [...projected, ...fenced.values()].join(" ").replace(/\s+/g, " ").trim();
   if (!text2)
     return;
   if (truncationInfo)
@@ -37169,12 +37171,24 @@ function keyLooksSecret(key) {
   const lower = key.toLowerCase();
   return SECRET_KEY_HINTS.some((hint) => lower.includes(hint));
 }
+function segmentLooksSecret(seg) {
+  if (SECRET_VALUE_PREFIX.test(seg))
+    return true;
+  const eq = seg.indexOf("=");
+  if (eq > 0 && keyLooksSecret(seg.slice(0, eq)) && seg.length - eq > 8)
+    return true;
+  if (seg.length >= 32 && !UUID.test(seg) && /^[A-Za-z0-9+_=-]+$/.test(seg) && /\d/.test(seg) && /[a-zA-Z]/.test(seg))
+    return true;
+  return seg.length >= 20 && /^[A-Za-z0-9]+$/.test(seg) && /[a-z]/.test(seg) && /[A-Z]/.test(seg) && /\d/.test(seg);
+}
 function valueLooksSecret(value) {
   const s = value.trim();
   if (s.length < 20 || /\s/.test(s))
     return false;
   if (SECRET_VALUE_PREFIX.test(s))
     return true;
+  if (PATH_LIKE.test(s))
+    return s.split(/[/\\?&#]/).some(segmentLooksSecret);
   const classes = [/[a-z]/, /[A-Z]/, /[0-9]/, /[^A-Za-z0-9]/].filter((re) => re.test(s)).length;
   if (s.length >= 24 && classes >= 3)
     return true;
@@ -37216,7 +37230,7 @@ function walkSecretShaped(params, hit) {
   for (const [k, v] of Object.entries(params))
     walk(v, k, k);
 }
-var SECRET_KEY_HINTS, SECRET_VALUE_PREFIX, MOVE_TO_ENV;
+var SECRET_KEY_HINTS, SECRET_VALUE_PREFIX, PATH_LIKE, UUID, MOVE_TO_ENV;
 var init_param_secrets = __esm(() => {
   SECRET_KEY_HINTS = [
     "secret",
@@ -37237,6 +37251,8 @@ var init_param_secrets = __esm(() => {
     "client_secret"
   ];
   SECRET_VALUE_PREFIX = /^(sk-|rk-|ghp_|gho_|ghu_|ghs_|ghr_|github_pat_|xox[baprs]-|AKIA|ASIA|AIza|ya29\.|-----BEGIN)/;
+  PATH_LIKE = /^(\/|\.{1,2}[\\/]|~[\\/]|[A-Za-z]:[\\/]|\\\\)|^[\w.-]+[\\/][^?#]*\.[A-Za-z0-9]{1,8}$/;
+  UUID = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
   MOVE_TO_ENV = "Workflow params are copied verbatim into every native unit execution context and returned in `akm workflow run` and " + "`akm workflow status` output — move secrets to an env binding (`env:` ref), whose value native execution resolves " + "only at dispatch instead of storing it as a run param.";
 });
 
@@ -41922,10 +41938,10 @@ var init_marked_esm = __esm(() => {
 
 // src/core/asset/markdown-link-targets.ts
 function markdownLinkTargets(body, references) {
-  const tokens = markdown.lexer(body);
+  const tokens2 = markdown.lexer(body);
   const definitions = new Map;
   if (references) {
-    markdown.walkTokens(tokens, (token) => {
+    markdown.walkTokens(tokens2, (token) => {
       if (token.type !== "def")
         return;
       const definition = /^\s*\[([^\]]+)\]:\s*(\S+)/.exec(token.raw);
@@ -41934,7 +41950,7 @@ function markdownLinkTargets(body, references) {
     });
   }
   const targets = [];
-  markdown.walkTokens(tokens, (token) => {
+  markdown.walkTokens(tokens2, (token) => {
     if (token.type !== "link" && token.type !== "image")
       return;
     const inline = /^!?\[[\s\S]*\]\(/.test(token.raw);
@@ -62448,7 +62464,7 @@ var require_HTMLParser = __commonJS((exports, module) => {
       }
     }
     htmlparser.testTokenizer = function(input2, initialState, lastStartTag, charbychar) {
-      var tokens = [];
+      var tokens2 = [];
       switch (initialState) {
         case "PCDATA state":
           tokenizer = data_state;
@@ -62470,16 +62486,16 @@ var require_HTMLParser = __commonJS((exports, module) => {
         flushText();
         switch (t) {
           case 1:
-            if (tokens.length > 0 && tokens[tokens.length - 1][0] === "Character") {
-              tokens[tokens.length - 1][1] += value;
+            if (tokens2.length > 0 && tokens2[tokens2.length - 1][0] === "Character") {
+              tokens2[tokens2.length - 1][1] += value;
             } else
-              tokens.push(["Character", value]);
+              tokens2.push(["Character", value]);
             break;
           case 4:
-            tokens.push(["Comment", value]);
+            tokens2.push(["Comment", value]);
             break;
           case 5:
-            tokens.push([
+            tokens2.push([
               "DOCTYPE",
               value,
               arg3 === undefined ? null : arg3,
@@ -62500,10 +62516,10 @@ var require_HTMLParser = __commonJS((exports, module) => {
             var token = ["StartTag", value, attrs];
             if (arg4)
               token.push(true);
-            tokens.push(token);
+            tokens2.push(token);
             break;
           case 3:
-            tokens.push(["EndTag", value]);
+            tokens2.push(["EndTag", value]);
             break;
           case -1:
             break;
@@ -62517,7 +62533,7 @@ var require_HTMLParser = __commonJS((exports, module) => {
         }
         this.parse("", true);
       }
-      return tokens;
+      return tokens2;
     };
     return htmlparser;
   }
@@ -68891,18 +68907,25 @@ function sourceFacts(counts) {
   const entries = Object.entries(counts);
   return entries.length === 0 ? "-" : entries.map(([k, v]) => `${k}=${v}`).join(" ");
 }
+function tokens(n, a) {
+  return a.calls > 0 && a.usageCalls === 0 ? "unknown" : int(n);
+}
+function usageCoverage(a) {
+  return a.usageCalls === undefined ? "-" : `${a.usageCalls}/${a.calls}`;
+}
 function llmRows(group) {
   return Object.entries(group).map(([name, a]) => [
     name,
     int(a.calls),
     int(a.failures),
-    int(a.promptTokens),
-    int(a.completionTokens),
-    int(a.totalTokens),
+    tokens(a.promptTokens, a),
+    tokens(a.completionTokens, a),
+    tokens(a.totalTokens, a),
+    usageCoverage(a),
     ms(a.totalDurationMs)
   ]);
 }
-var LLM_HEADERS = ["name", "calls", "failed", "prompt", "completion", "total", "time"];
+var LLM_HEADERS = ["name", "calls", "failed", "prompt", "completion", "total", "calls with usage", "time"];
 function buildMetricsView(r, detail) {
   const brief = detail === "brief";
   const cut = (items) => brief ? items.slice(0, BRIEF_LIST_LIMIT) : items;
@@ -68916,7 +68939,8 @@ function buildMetricsView(r, detail) {
         ["shows", int(usage.totals.shows)],
         ["curates", int(usage.totals.curates)],
         ["selects", int(usage.totals.selects)],
-        ["select rate", pct(usage.selectRate)],
+        ["searches with hits", int(usage.totals.searchesWithHits)],
+        ["selects per search with hits", fixed(usage.selectsPerSearch, 2)],
         [
           "zero-result searches",
           `${usage.totals.zeroResultSearches} (${pct(searches === 0 ? null : usage.totals.zeroResultSearches / searches)})`
@@ -69023,10 +69047,11 @@ function buildMetricsView(r, detail) {
       facts: [
         ["calls", int(llm.calls)],
         ["failed", int(llm.failures)],
-        ["prompt tokens", int(llm.promptTokens)],
-        ["completion tokens", int(llm.completionTokens)],
-        ["reasoning tokens", int(llm.reasoningTokens)],
-        ["total tokens", int(llm.totalTokens)],
+        ["calls with token usage", usageCoverage(llm)],
+        ["prompt tokens", tokens(llm.promptTokens, llm)],
+        ["completion tokens", tokens(llm.completionTokens, llm)],
+        ["reasoning tokens", llm.calls > 0 && llm.reasoningCalls === 0 ? "unknown" : tokens(llm.reasoningTokens, llm)],
+        ["total tokens", tokens(llm.totalTokens, llm)],
         ["time", ms(llm.totalDurationMs)]
       ],
       tables: [
@@ -70528,11 +70553,12 @@ function formatUpgradePluginLines(r) {
   }
   const plugins = Array.isArray(r.plugins) ? r.plugins : [];
   for (const p of plugins) {
-    if (p.outcome === "current" || p.outcome === "skipped")
+    if ((p.outcome === "current" || p.outcome === "skipped") && (r.updateAvailable === undefined || !p.channel) && !p.channelMismatch && !p.targetChannel)
       continue;
     const versions = p.from && p.to && p.from !== p.to ? ` v${p.from} → v${p.to}` : "";
+    const channel = p.channel ? ` [channel ${p.channel}${p.channelMismatch ? "; differs from CLI" : ""}]` : "";
     const note = p.message ? ` (${p.message})` : "";
-    lines.push(`${HARNESS_LABELS[String(p.harness)] ?? p.harness} plugin ${p.outcome}${versions}${note}`);
+    lines.push(`${HARNESS_LABELS[String(p.harness)] ?? p.harness} plugin ${p.outcome}${versions}${channel}${note}`);
   }
   return lines;
 }
@@ -70547,8 +70573,11 @@ function formatUpgradeHead(r) {
   if (r.upgraded === true) {
     return `akm upgraded: v${r.currentVersion} → v${r.newVersion}`;
   }
+  if (r.targetChannel && r.latestVersion && r.latestVersion !== r.currentVersion && r.updateAvailable === false) {
+    return `akm v${r.currentVersion} → v${r.latestVersion} requires --allow-downgrade (run 'akm upgrade --channel ${r.targetChannel} --allow-downgrade' to install)`;
+  }
   if (r.updateAvailable === true) {
-    return `akm v${r.currentVersion} → v${r.latestVersion} available (run 'akm upgrade${r.channel === "next" ? " --next" : ""}' to install)`;
+    return `akm v${r.currentVersion} → v${r.latestVersion} available (run 'akm upgrade${r.targetChannel ? ` --channel ${r.targetChannel}` : r.channel === "next" ? " --next" : ""}' to install)`;
   }
   if (r.updateAvailable === false && r.latestVersion) {
     return `akm v${r.currentVersion} is already the latest version`;
@@ -72913,15 +72942,15 @@ var SHELL_ASSIGNMENT_WORD = /^[A-Za-z_][A-Za-z0-9_]*=/;
 function shellStableV2Executable(executable) {
   return executable === "akm" || executable.includes("/");
 }
-function skipEnvAssignmentPrefix(tokens) {
-  if (tokens[0] !== "env")
-    return { tokens, envWrapped: false };
+function skipEnvAssignmentPrefix(tokens2) {
+  if (tokens2[0] !== "env")
+    return { tokens: tokens2, envWrapped: false };
   let index = 1;
-  while (index < tokens.length && SHELL_ASSIGNMENT_WORD.test(tokens[index]))
+  while (index < tokens2.length && SHELL_ASSIGNMENT_WORD.test(tokens2[index]))
     index += 1;
-  if (index >= tokens.length)
-    return { tokens, envWrapped: false };
-  return { tokens: tokens.slice(index), envWrapped: true };
+  if (index >= tokens2.length)
+    return { tokens: tokens2, envWrapped: false };
+  return { tokens: tokens2.slice(index), envWrapped: true };
 }
 var KNOWN_PROMPT_REF_FAMILIES = new Set([
   "agents",
@@ -73353,16 +73382,16 @@ function migratedObject(data) {
     const command = exactString(data.command, "command", true).trim();
     if (/['"\\]/.test(command))
       return "shell-quoting-changes-v2-whitespace-split-semantics";
-    const tokens = command.split(/\s+/).filter(Boolean);
-    if (tokens.length === 0 || tokens.some((token) => !SAFE_V2_COMMAND_TOKEN.test(token))) {
+    const tokens2 = command.split(/\s+/).filter(Boolean);
+    if (tokens2.length === 0 || tokens2.some((token) => !SAFE_V2_COMMAND_TOKEN.test(token))) {
       return "shell-operators-change-v2-literal-argv-semantics";
     }
-    const { tokens: targetTokens, envWrapped } = skipEnvAssignmentPrefix(tokens);
+    const { tokens: targetTokens, envWrapped } = skipEnvAssignmentPrefix(tokens2);
     const executable = targetTokens[0];
     if (SHELL_ASSIGNMENT_WORD.test(executable) || !envWrapped && !shellStableV2Executable(executable)) {
       return "shell-command-resolution-changes-v2-literal-argv-semantics";
     }
-    output2.run = tokens.join(" ");
+    output2.run = tokens2.join(" ");
     addSharedNonPromptOverrides(data, akm);
   }
   output2.akm = akm;

package/dist/scripts/akm-migrate.js

@@ -34811,7 +34811,7 @@ function projectMarkdownContent(body, truncationInfo) {
   const innerBlock = findInnerFrontmatterBlock(lines);
   const start = innerBlock && isFrontmatterShaped(lines, innerBlock) ? innerBlock.close + 1 : 0;
   const projected = [];
-  const fenced = [];
+  const fenced = new Map;
   forEachVisibleMarkdownLine(lines, start, (_index, visible) => {
     let trimmed = visible.trim();
     if (!trimmed || /^(-{3,}|\*{3,}|_{3,}|=+)$/.test(trimmed))
@@ -34831,10 +34831,12 @@ function projectMarkdownContent(body, truncationInfo) {
       projected.push(trimmed);
   }, (_index, fencedLine) => {
     const identifiers = fencedCodeIdentifiers(fencedLine);
-    if (identifiers)
-      fenced.push(identifiers);
+    for (const identifier of identifiers.split(/\s+/)) {
+      if (identifier)
+        fenced.set(identifier.toLowerCase(), identifier);
+    }
   });
-  const text2 = [...projected, ...fenced].join(" ").replace(/\s+/g, " ").trim();
+  const text2 = [...projected, ...fenced.values()].join(" ").replace(/\s+/g, " ").trim();
   if (!text2)
     return;
   if (truncationInfo)
@@ -37168,12 +37170,24 @@ function keyLooksSecret(key) {
   const lower = key.toLowerCase();
   return SECRET_KEY_HINTS.some((hint) => lower.includes(hint));
 }
+function segmentLooksSecret(seg) {
+  if (SECRET_VALUE_PREFIX.test(seg))
+    return true;
+  const eq = seg.indexOf("=");
+  if (eq > 0 && keyLooksSecret(seg.slice(0, eq)) && seg.length - eq > 8)
+    return true;
+  if (seg.length >= 32 && !UUID.test(seg) && /^[A-Za-z0-9+_=-]+$/.test(seg) && /\d/.test(seg) && /[a-zA-Z]/.test(seg))
+    return true;
+  return seg.length >= 20 && /^[A-Za-z0-9]+$/.test(seg) && /[a-z]/.test(seg) && /[A-Z]/.test(seg) && /\d/.test(seg);
+}
 function valueLooksSecret(value) {
   const s = value.trim();
   if (s.length < 20 || /\s/.test(s))
     return false;
   if (SECRET_VALUE_PREFIX.test(s))
     return true;
+  if (PATH_LIKE.test(s))
+    return s.split(/[/\\?&#]/).some(segmentLooksSecret);
   const classes = [/[a-z]/, /[A-Z]/, /[0-9]/, /[^A-Za-z0-9]/].filter((re) => re.test(s)).length;
   if (s.length >= 24 && classes >= 3)
     return true;
@@ -37215,7 +37229,7 @@ function walkSecretShaped(params, hit) {
   for (const [k, v] of Object.entries(params))
     walk(v, k, k);
 }
-var SECRET_KEY_HINTS, SECRET_VALUE_PREFIX, MOVE_TO_ENV;
+var SECRET_KEY_HINTS, SECRET_VALUE_PREFIX, PATH_LIKE, UUID, MOVE_TO_ENV;
 var init_param_secrets = __esm(() => {
   SECRET_KEY_HINTS = [
     "secret",
@@ -37236,6 +37250,8 @@ var init_param_secrets = __esm(() => {
     "client_secret"
   ];
   SECRET_VALUE_PREFIX = /^(sk-|rk-|ghp_|gho_|ghu_|ghs_|ghr_|github_pat_|xox[baprs]-|AKIA|ASIA|AIza|ya29\.|-----BEGIN)/;
+  PATH_LIKE = /^(\/|\.{1,2}[\\/]|~[\\/]|[A-Za-z]:[\\/]|\\\\)|^[\w.-]+[\\/][^?#]*\.[A-Za-z0-9]{1,8}$/;
+  UUID = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
   MOVE_TO_ENV = "Workflow params are copied verbatim into every native unit execution context and returned in `akm workflow run` and " + "`akm workflow status` output \u2014 move secrets to an env binding (`env:` ref), whose value native execution resolves " + "only at dispatch instead of storing it as a run param.";
 });
 
@@ -41921,10 +41937,10 @@ var init_marked_esm = __esm(() => {
 
 // src/core/asset/markdown-link-targets.ts
 function markdownLinkTargets(body, references) {
-  const tokens = markdown.lexer(body);
+  const tokens2 = markdown.lexer(body);
   const definitions = new Map;
   if (references) {
-    markdown.walkTokens(tokens, (token) => {
+    markdown.walkTokens(tokens2, (token) => {
       if (token.type !== "def")
         return;
       const definition = /^\s*\[([^\]]+)\]:\s*(\S+)/.exec(token.raw);
@@ -41933,7 +41949,7 @@ function markdownLinkTargets(body, references) {
     });
   }
   const targets = [];
-  markdown.walkTokens(tokens, (token) => {
+  markdown.walkTokens(tokens2, (token) => {
     if (token.type !== "link" && token.type !== "image")
       return;
     const inline = /^!?\[[\s\S]*\]\(/.test(token.raw);
@@ -62447,7 +62463,7 @@ var require_HTMLParser = __commonJS((exports, module) => {
       }
     }
     htmlparser.testTokenizer = function(input2, initialState, lastStartTag, charbychar) {
-      var tokens = [];
+      var tokens2 = [];
       switch (initialState) {
         case "PCDATA state":
           tokenizer = data_state;
@@ -62469,16 +62485,16 @@ var require_HTMLParser = __commonJS((exports, module) => {
         flushText();
         switch (t) {
           case 1:
-            if (tokens.length > 0 && tokens[tokens.length - 1][0] === "Character") {
-              tokens[tokens.length - 1][1] += value;
+            if (tokens2.length > 0 && tokens2[tokens2.length - 1][0] === "Character") {
+              tokens2[tokens2.length - 1][1] += value;
             } else
-              tokens.push(["Character", value]);
+              tokens2.push(["Character", value]);
             break;
           case 4:
-            tokens.push(["Comment", value]);
+            tokens2.push(["Comment", value]);
             break;
           case 5:
-            tokens.push([
+            tokens2.push([
               "DOCTYPE",
               value,
               arg3 === undefined ? null : arg3,
@@ -62499,10 +62515,10 @@ var require_HTMLParser = __commonJS((exports, module) => {
             var token = ["StartTag", value, attrs];
             if (arg4)
               token.push(true);
-            tokens.push(token);
+            tokens2.push(token);
             break;
           case 3:
-            tokens.push(["EndTag", value]);
+            tokens2.push(["EndTag", value]);
             break;
           case -1:
             break;
@@ -62516,7 +62532,7 @@ var require_HTMLParser = __commonJS((exports, module) => {
         }
         this.parse("", true);
       }
-      return tokens;
+      return tokens2;
     };
     return htmlparser;
   }
@@ -68889,18 +68905,25 @@ function sourceFacts(counts) {
   const entries = Object.entries(counts);
   return entries.length === 0 ? "-" : entries.map(([k, v]) => `${k}=${v}`).join(" ");
 }
+function tokens(n, a) {
+  return a.calls > 0 && a.usageCalls === 0 ? "unknown" : int(n);
+}
+function usageCoverage(a) {
+  return a.usageCalls === undefined ? "-" : `${a.usageCalls}/${a.calls}`;
+}
 function llmRows(group) {
   return Object.entries(group).map(([name, a]) => [
     name,
     int(a.calls),
     int(a.failures),
-    int(a.promptTokens),
-    int(a.completionTokens),
-    int(a.totalTokens),
+    tokens(a.promptTokens, a),
+    tokens(a.completionTokens, a),
+    tokens(a.totalTokens, a),
+    usageCoverage(a),
     ms(a.totalDurationMs)
   ]);
 }
-var LLM_HEADERS = ["name", "calls", "failed", "prompt", "completion", "total", "time"];
+var LLM_HEADERS = ["name", "calls", "failed", "prompt", "completion", "total", "calls with usage", "time"];
 function buildMetricsView(r, detail) {
   const brief = detail === "brief";
   const cut = (items) => brief ? items.slice(0, BRIEF_LIST_LIMIT) : items;
@@ -68914,7 +68937,8 @@ function buildMetricsView(r, detail) {
         ["shows", int(usage.totals.shows)],
         ["curates", int(usage.totals.curates)],
         ["selects", int(usage.totals.selects)],
-        ["select rate", pct(usage.selectRate)],
+        ["searches with hits", int(usage.totals.searchesWithHits)],
+        ["selects per search with hits", fixed(usage.selectsPerSearch, 2)],
         [
           "zero-result searches",
           `${usage.totals.zeroResultSearches} (${pct(searches === 0 ? null : usage.totals.zeroResultSearches / searches)})`
@@ -69021,10 +69045,11 @@ function buildMetricsView(r, detail) {
       facts: [
         ["calls", int(llm.calls)],
         ["failed", int(llm.failures)],
-        ["prompt tokens", int(llm.promptTokens)],
-        ["completion tokens", int(llm.completionTokens)],
-        ["reasoning tokens", int(llm.reasoningTokens)],
-        ["total tokens", int(llm.totalTokens)],
+        ["calls with token usage", usageCoverage(llm)],
+        ["prompt tokens", tokens(llm.promptTokens, llm)],
+        ["completion tokens", tokens(llm.completionTokens, llm)],
+        ["reasoning tokens", llm.calls > 0 && llm.reasoningCalls === 0 ? "unknown" : tokens(llm.reasoningTokens, llm)],
+        ["total tokens", tokens(llm.totalTokens, llm)],
         ["time", ms(llm.totalDurationMs)]
       ],
       tables: [
@@ -70526,11 +70551,12 @@ function formatUpgradePluginLines(r) {
   }
   const plugins = Array.isArray(r.plugins) ? r.plugins : [];
   for (const p of plugins) {
-    if (p.outcome === "current" || p.outcome === "skipped")
+    if ((p.outcome === "current" || p.outcome === "skipped") && (r.updateAvailable === undefined || !p.channel) && !p.channelMismatch && !p.targetChannel)
       continue;
     const versions = p.from && p.to && p.from !== p.to ? ` v${p.from} \u2192 v${p.to}` : "";
+    const channel = p.channel ? ` [channel ${p.channel}${p.channelMismatch ? "; differs from CLI" : ""}]` : "";
     const note = p.message ? ` (${p.message})` : "";
-    lines.push(`${HARNESS_LABELS[String(p.harness)] ?? p.harness} plugin ${p.outcome}${versions}${note}`);
+    lines.push(`${HARNESS_LABELS[String(p.harness)] ?? p.harness} plugin ${p.outcome}${versions}${channel}${note}`);
   }
   return lines;
 }
@@ -70545,8 +70571,11 @@ function formatUpgradeHead(r) {
   if (r.upgraded === true) {
     return `akm upgraded: v${r.currentVersion} \u2192 v${r.newVersion}`;
   }
+  if (r.targetChannel && r.latestVersion && r.latestVersion !== r.currentVersion && r.updateAvailable === false) {
+    return `akm v${r.currentVersion} \u2192 v${r.latestVersion} requires --allow-downgrade (run 'akm upgrade --channel ${r.targetChannel} --allow-downgrade' to install)`;
+  }
   if (r.updateAvailable === true) {
-    return `akm v${r.currentVersion} \u2192 v${r.latestVersion} available (run 'akm upgrade${r.channel === "next" ? " --next" : ""}' to install)`;
+    return `akm v${r.currentVersion} \u2192 v${r.latestVersion} available (run 'akm upgrade${r.targetChannel ? ` --channel ${r.targetChannel}` : r.channel === "next" ? " --next" : ""}' to install)`;
   }
   if (r.updateAvailable === false && r.latestVersion) {
     return `akm v${r.currentVersion} is already the latest version`;
@@ -72876,15 +72905,15 @@ var SHELL_ASSIGNMENT_WORD = /^[A-Za-z_][A-Za-z0-9_]*=/;
 function shellStableV2Executable(executable) {
   return executable === "akm" || executable.includes("/");
 }
-function skipEnvAssignmentPrefix(tokens) {
-  if (tokens[0] !== "env")
-    return { tokens, envWrapped: false };
+function skipEnvAssignmentPrefix(tokens2) {
+  if (tokens2[0] !== "env")
+    return { tokens: tokens2, envWrapped: false };
   let index = 1;
-  while (index < tokens.length && SHELL_ASSIGNMENT_WORD.test(tokens[index]))
+  while (index < tokens2.length && SHELL_ASSIGNMENT_WORD.test(tokens2[index]))
     index += 1;
-  if (index >= tokens.length)
-    return { tokens, envWrapped: false };
-  return { tokens: tokens.slice(index), envWrapped: true };
+  if (index >= tokens2.length)
+    return { tokens: tokens2, envWrapped: false };
+  return { tokens: tokens2.slice(index), envWrapped: true };
 }
 var KNOWN_PROMPT_REF_FAMILIES = new Set([
   "agents",
@@ -73316,16 +73345,16 @@ function migratedObject(data) {
     const command = exactString(data.command, "command", true).trim();
     if (/['"\\]/.test(command))
       return "shell-quoting-changes-v2-whitespace-split-semantics";
-    const tokens = command.split(/\s+/).filter(Boolean);
-    if (tokens.length === 0 || tokens.some((token) => !SAFE_V2_COMMAND_TOKEN.test(token))) {
+    const tokens2 = command.split(/\s+/).filter(Boolean);
+    if (tokens2.length === 0 || tokens2.some((token) => !SAFE_V2_COMMAND_TOKEN.test(token))) {
       return "shell-operators-change-v2-literal-argv-semantics";
     }
-    const { tokens: targetTokens, envWrapped } = skipEnvAssignmentPrefix(tokens);
+    const { tokens: targetTokens, envWrapped } = skipEnvAssignmentPrefix(tokens2);
     const executable = targetTokens[0];
     if (SHELL_ASSIGNMENT_WORD.test(executable) || !envWrapped && !shellStableV2Executable(executable)) {
       return "shell-command-resolution-changes-v2-literal-argv-semantics";
     }
-    output2.run = tokens.join(" ");
+    output2.run = tokens2.join(" ");
     addSharedNonPromptOverrides(data, akm);
   }
   output2.akm = akm;