akm-cli 0.10.261016-beta → 0.10.261018-beta

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

@@ -30476,6 +30476,7 @@ function modelWorkConfig() {
   }
   const config2 = {
     ...user,
+    plugins: [...Array.isArray(user?.plugins) ? user.plugins : [], WITHOUT_BROWSER_PLUGIN],
     agents: { ...asRecord(user?.agents), [MODEL_WORK_AGENT]: MODEL_WORK_AGENT_DEFINITION }
   };
   const legacy = asRecord(user?.agent);
@@ -30508,7 +30509,7 @@ function withEnvReferences(content) {
     return replaced(true);
   }
 }
-var MODEL_WORK_AGENT = "akm-model-work", MODEL_WORK_AGENT_DEFINITION, CONFIG_CONTENT_ENV = "OPENCODE_CONFIG_CONTENT", NO_FREE_MODELS, opencodeBuilder;
+var MODEL_WORK_AGENT = "akm-model-work", MODEL_WORK_AGENT_DEFINITION, CONFIG_CONTENT_ENV = "OPENCODE_CONFIG_CONTENT", WITHOUT_BROWSER_PLUGIN = "-opencode.browser", NO_FREE_MODELS, opencodeBuilder;
 var init_agent_builder = __esm(() => {
   init_common();
   init_warn();
@@ -32114,13 +32115,22 @@ function improveStrategyDefault(out, defaults, improve) {
   out.improve = { ...isRecord(improve) ? improve : {} };
   out.improve.strategy ??= defaults.improveStrategy;
 }
-function dropJudgeEngine(out, conversion) {
+function dropJudgeEngine(out, conversion, target, defaultEngine, judge) {
   const workflow = out.workflow;
-  if (!isRecord(workflow) || !("judgeEngine" in workflow))
-    return;
-  delete workflow.judgeEngine;
-  conversion.changed = true;
-  conversion.notes.push("workflow.judgeEngine: a gate's judge is the default connection or harness now; it is dropped.");
+  const named = isRecord(workflow) && "judgeEngine" in workflow;
+  const engine = named ? str(workflow.judgeEngine) : defaultEngine;
+  if (named) {
+    delete workflow.judgeEngine;
+    conversion.changed = true;
+  }
+  const became = engine === undefined ? undefined : target(engine);
+  const stays = became !== undefined && judge !== undefined && isDeepStrictEqual(became, judge);
+  const kind = judge === undefined ? undefined : ("connection" in judge) ? "connection" : "harness";
+  if (named) {
+    conversion.notes.push(stays ? `workflow.judgeEngine: "${engine}" is the default ${kind}, where a gate's judge runs now; the setting is dropped.` : `workflow.judgeEngine${engine === undefined ? "" : ` "${engine}"`}: dropped. A gate's judge runs on the default connection, else the default harness, so a judge that ran on another engine has moved; to keep it, make that engine the default.`);
+  } else if (became !== undefined && judge !== undefined && !stays) {
+    conversion.notes.push(`workflow: with no workflow.judgeEngine, a gate's judge ran on the default engine "${engine}"; it is model work now and runs on the default ${kind}, "${"connection" in judge ? judge.connection : judge.harness}".`);
+  }
 }
 function convertIndexEngines(out, conversion, retarget) {
   const index = out.index;
@@ -32187,6 +32197,8 @@ function foldModelsOverlay(modelsOverlay, fold) {
   const writtenHarnesses = written.harnesses;
   const configNames = (own2, base, name, alias) => hasModel(own2[name], alias) || hasModel(base[name], alias);
   const platformOf = (name) => String((mergedHarnesses[name] ?? inheritedHarnesses[name])?.platform ?? name);
+  const columnOf = (name) => renamed.sdkHarness.includes(name) ? "opencode-sdk" : platformOf(name);
+  const notedOwn = new Set;
   let folded = false;
   for (const { alias, column, profile } of overlayRows(modelsOverlay)) {
     const p = typeof profile === "string" ? { model: profile } : isRecord(profile) ? profile : {};
@@ -32198,13 +32210,18 @@ function foldModelsOverlay(modelsOverlay, fold) {
       continue;
     }
     const candidates = column === "*" ? [...new Set([...Object.keys(mergedConnections), ...Object.keys(inheritedConnections)])] : column === "opencode-sdk" ? [...renamed.runtime] : renamed.connection(column) !== undefined ? [renamed.connection(column)] : (column in writtenConnections) || (column in inheritedConnections) ? [column] : [];
-    const harnessNamed = [...new Set([...Object.keys(mergedHarnesses), ...Object.keys(inheritedHarnesses)])].filter((name) => platformOf(name) === column);
+    const harnessNamed = [...new Set([...Object.keys(mergedHarnesses), ...Object.keys(inheritedHarnesses)])].filter((name) => columnOf(name) === column);
     if (candidates.length === 0 && harnessNamed.length === 0) {
       notes2.push(`${where}: names no configured connection or harness, so it is not carried over.`);
       continue;
     }
     const connectionNames = candidates.filter((name) => !configNames(writtenConnections, inheritedConnections, name, alias) && !(column === "*" && hasModel(mergedConnections[name], alias)));
-    const harnessNames = harnessNamed.filter((name) => !configNames(writtenHarnesses, inheritedHarnesses, name, alias));
+    const unnamed = harnessNamed.filter((name) => !configNames(writtenHarnesses, inheritedHarnesses, name, alias));
+    const harnessNames = unnamed.filter((name) => !ownModels.harnesses.has(name));
+    for (const name of unnamed.filter((n) => ownModels.harnesses.has(n) && !notedOwn.has(`${column}:${n}`))) {
+      notedOwn.add(`${column}:${name}`);
+      notes2.push(`models.json (${column === "*" ? "all" : column}): harness "${name}" has a model of its own, which names every alias, so the column is not carried over.`);
+    }
     if (connectionNames.length === 0 && harnessNames.length === 0) {
       const keptByConfig = candidates.some((name) => configNames(writtenConnections, inheritedConnections, name, alias)) || harnessNamed.some((name) => configNames(writtenHarnesses, inheritedHarnesses, name, alias));
       if (keptByConfig)
@@ -32264,15 +32281,23 @@ function implicitKeyVariables(name, defaults) {
   const own2 = `AKM_ENGINE_${name.toUpperCase().replaceAll("-", "_")}_API_KEY`;
   return name === str(defaults.llmEngine) ? [own2, "AKM_LLM_API_KEY"] : [own2];
 }
-function runtimeEngine(name, engine, converted, conversion) {
-  converted.runtimes.set(name, str(engine.llmEngine));
-  conversion.notes.push(`engines.${name}: opencode-sdk is akm's own runtime now, with no entry of its own; its model, timeout and workspace are dropped.`);
-}
-function agentEngineToHarness(name, engine, converted) {
-  const harness = { platform: engine.platform };
+function runtimeEngine(name, engine, llmEngine, converted, conversion) {
+  converted.runtimes.set(name, llmEngine);
+  const dropped = ["model", "timeoutMs", "workspace", "bin", "agent"].filter((key) => engine[key] !== undefined);
+  const gone = dropped.length === 0 ? "" : `; its ${dropped.join(", ")} ${dropped.length === 1 ? "is" : "are"} dropped`;
+  conversion.notes.push(`engines.${name}: opencode-sdk over llmEngine "${llmEngine}" is akm's own runtime over connection "${llmEngine}" now, with no entry of its own${gone}.`);
+}
+function agentEngineToHarness(name, engine, converted, conversion) {
+  const sdk = engine.platform === "opencode-sdk";
+  const harness = { platform: sdk ? "opencode" : engine.platform };
+  if (sdk)
+    converted.sdkHarnesses.add(name);
   for (const key of ["bin", "args", "workspace", "agent", "timeoutMs"])
-    if (engine[key] !== undefined)
+    if (engine[key] !== undefined && !(sdk && key === "args"))
       harness[key] = engine[key];
+  if (sdk && engine.args !== undefined) {
+    conversion.notes.push(`engines.${name}: args is dropped. 0.9 did not pass it to OpenCode, and the opencode harness would pass it in place of \`run\`.`);
+  }
   const model = str(engine.model);
   if (model !== undefined)
     converted.ownModelOf.push({ kind: "harnesses", engine: name, model });
@@ -32323,6 +32348,7 @@ function convertEngines(engines, defaults, env, conversion) {
     connections: {},
     harnesses: {},
     runtimes: new Map,
+    sdkHarnesses: new Set,
     keyHolders: [],
     ownModelOf: []
   };
@@ -32332,12 +32358,13 @@ function convertEngines(engines, defaults, env, conversion) {
     const unknown2 = Object.keys(engine).filter((k) => !(engine.kind === "agent" ? AGENT_ENGINE_KEYS : LLM_ENGINE_KEYS).has(k));
     if (unknown2.length > 0)
       conversion.notes.push(`engines.${name}: dropped ${unknown2.join(", ")}, which akm does not read.`);
+    const llmEngine = str(engine.llmEngine);
     if (engine.kind !== "agent")
       llmEngineToConnection(name, engine, defaults, env, converted, conversion);
-    else if (engine.platform === "opencode-sdk")
-      runtimeEngine(name, engine, converted, conversion);
+    else if (engine.platform === "opencode-sdk" && llmEngine !== undefined)
+      runtimeEngine(name, engine, llmEngine, converted, conversion);
     else
-      agentEngineToHarness(name, engine, converted);
+      agentEngineToHarness(name, engine, converted, conversion);
   }
   return converted;
 }
@@ -32355,11 +32382,21 @@ function renameMap(names, taken, from) {
   }
   return (name) => moved.get(name) ?? name;
 }
+function agentWorkMoved(defaultEngine, runtimes, harness) {
+  if (defaultEngine !== undefined) {
+    return runtimes.has(defaultEngine) && harness !== undefined ? `Agent work ran on akm's own runtime (engines.${defaultEngine}); with the harness "${harness}" configured it now runs there. Remove that harness to keep agent work on akm's runtime.` : undefined;
+  }
+  const ran = "Without defaults.engine, agent work ran on your own OpenCode (the implicit fallback), when it was installed";
+  return harness !== undefined ? `${ran}; with the harness "${harness}" configured it now runs there.` : `${ran}; it now runs on akm's own runtime. To keep it on your OpenCode, enable the harness: \`akm setup --harness opencode\`.`;
+}
 function nameDefaults(defaults, converted, conversion, written) {
-  const { connections, harnesses, runtimes, keyHolders } = converted;
-  const defaultEngine = str(defaults.engine);
+  const { connections, harnesses, runtimes, sdkHarnesses, keyHolders } = converted;
+  const implicit = sdkHarnesses.has(IMPLICIT_AGENT_ENGINE) || runtimes.has(IMPLICIT_AGENT_ENGINE);
+  const defaultEngine = str(defaults.engine) ?? (implicit ? IMPLICIT_AGENT_ENGINE : undefined);
+  const modelWorkEngine = str(defaults.llmEngine);
   const runtimeLlm = defaultEngine === undefined ? undefined : runtimes.get(defaultEngine);
-  const defaultConnection = [str(defaults.llmEngine), defaultEngine, runtimeLlm].find((n) => n !== undefined && (n in connections));
+  const modelWorkRuntimeLlm = modelWorkEngine === undefined ? undefined : runtimes.get(modelWorkEngine);
+  const defaultConnection = [modelWorkEngine, modelWorkRuntimeLlm, defaultEngine, runtimeLlm].find((n) => n !== undefined && (n in connections));
   const defaultHarness = defaultEngine !== undefined && defaultEngine in harnesses && Object.keys(harnesses).length > 1 ? defaultEngine : undefined;
   const connectionName = renameMap(Object.keys(connections), Object.keys(written.connections), defaultConnection);
   const harnessName = renameMap(Object.keys(harnesses), Object.keys(written.harnesses), defaultHarness);
@@ -32368,9 +32405,16 @@ function nameDefaults(defaults, converted, conversion, written) {
     connections: renamed(connections, connectionName),
     harnesses: renamed(harnesses, harnessName)
   };
-  const defaultHarnessName = "default" in named.harnesses ? "default" : Object.keys(named.harnesses).length === 1 ? Object.keys(named.harnesses)[0] : undefined;
-  if (defaultHarnessName !== undefined && (defaultEngine === undefined || runtimes.has(defaultEngine))) {
-    conversion.notes.push(`Agent work ran on akm's own runtime${defaultEngine === undefined ? "" : ` (engines.${defaultEngine})`}; with the harness "${defaultHarnessName}" configured it now runs there. Remove that harness to keep agent work on akm's runtime.`);
+  const defaultHarnessName = defaultName(named.harnesses);
+  const hasEngines = Object.keys(connections).length + Object.keys(harnesses).length + runtimes.size > 0;
+  const moved = hasEngines ? agentWorkMoved(defaultEngine, runtimes, defaultHarnessName) : undefined;
+  if (moved !== undefined)
+    conversion.notes.push(moved);
+  if (modelWorkEngine !== undefined && modelWorkEngine in harnesses) {
+    const now = harnessName(modelWorkEngine);
+    if (defaultName({ ...named.connections, ...written.connections }) !== undefined || defaultHarnessName !== now) {
+      conversion.notes.push(`defaults.llmEngine "${modelWorkEngine}" named an agent engine, which ran akm's model work. Model work now runs on the default connection, else the default harness; to keep it on the harness "${now}", set improve.harness to it.`);
+    }
   }
   for (const [kind, rename] of [
     ["connections", connectionName],
@@ -32382,10 +32426,9 @@ function nameDefaults(defaults, converted, conversion, written) {
     conversion.notes.push(`engines.default is now ${kind}.${aside}, and "default" names another engine: an engine: default key is rewritten by \`akm migrate apply\` where it can be, but a script or scheduled command that passes --engine default now reaches the new "default"; change it to the name ${aside}.`);
   }
   const target = (engine) => {
-    if (runtimes.has(engine)) {
-      const runtime = runtimes.get(engine);
-      return runtime !== undefined && runtime in connections ? { connection: connectionName(runtime) } : undefined;
-    }
+    const runtime = runtimes.get(engine);
+    if (runtime !== undefined)
+      return runtime in connections ? { connection: connectionName(runtime) } : undefined;
     if (engine in harnesses)
       return { harness: harnessName(engine) };
     if (engine in connections)
@@ -32397,7 +32440,7 @@ function nameDefaults(defaults, converted, conversion, written) {
     connection: connectionName(engine),
     field
   }));
-  return { defaultConnection, defaultHarness, connectionName, harnessName, ...named, keys, target };
+  return { defaultEngine, defaultConnection, defaultHarness, connectionName, harnessName, ...named, keys, target };
 }
 function mergeWritten(out, naming) {
   for (const [name, harness] of Object.entries(naming.harnesses)) {
@@ -32416,6 +32459,19 @@ function ownModelsOf(converted, naming) {
   }
   return ownModels;
 }
+function modelWorkTarget(defaults, naming, merged, inherited, conversion) {
+  const connection = defaultName({ ...inherited?.connections, ...merged.connections });
+  if (connection !== undefined)
+    return { connection };
+  const harness = defaultName({ ...inherited?.harnesses, ...merged.harnesses });
+  const entry = harness === undefined ? undefined : merged.harnesses[harness];
+  if (harness === undefined || !isRecord(entry))
+    return;
+  if (str(defaults.llmEngine) === undefined && harness in naming.harnesses && entry.modelWork === undefined) {
+    conversion.notes.push(`harnesses.${harness}: akm's own model work (improve, index passes, extraction, judges) now runs on this harness, the default for it with no connection. Without defaults.llmEngine, 0.9 ran none of it unless a setting named an engine (a workflow gate's judge ran on defaults.engine). To keep the 0.9 behaviour, set \`modelWork: false\` on this harness: a call that names it still runs there, but a workflow gate's judge then needs a connection (\`akm setup --endpoint URL\`).`);
+  }
+  return entry.modelWork === false ? undefined : { harness };
+}
 function convertEngineConfig(raw, options = {}) {
   const out = structuredClone(raw);
   const engines = asDict(out.engines);
@@ -32438,7 +32494,8 @@ function convertEngineConfig(raw, options = {}) {
     written: { connections: asDict(out.connections), harnesses: asDict(out.harnesses) },
     inherited: { connections: options.inherited?.connections ?? {}, harnesses: options.inherited?.harnesses ?? {} },
     renamed: {
-      runtime: [...converted.runtimes.values()].filter((name) => name !== undefined && (name in converted.connections)).map((name) => naming.connectionName(name)),
+      runtime: [...converted.runtimes.values()].filter((name) => (name in converted.connections)).map((name) => naming.connectionName(name)),
+      sdkHarness: [...converted.sdkHarnesses].map((name) => naming.harnessName(name)),
       connection: (engine) => (engine in converted.connections) ? naming.connectionName(engine) : undefined
     }
   });
@@ -32448,7 +32505,8 @@ function convertEngineConfig(raw, options = {}) {
   if (isRecord(improve))
     moveStrategyExecution(improve, conversion, retarget);
   improveStrategyDefault(out, defaults, improve);
-  dropJudgeEngine(out, conversion);
+  const judge = modelWorkTarget(defaults, naming, merged, options.inherited, conversion);
+  dropJudgeEngine(out, conversion, naming.target, naming.defaultEngine, judge);
   convertIndexEngines(out, conversion, retarget);
   const config2 = {};
   let placed = false;
@@ -32479,7 +32537,7 @@ function convertEngineConfig(raw, options = {}) {
     targets
   };
 }
-var LLM_ENGINE_KEYS, AGENT_ENGINE_KEYS, CARRIED;
+var LLM_ENGINE_KEYS, AGENT_ENGINE_KEYS, CARRIED, defaultName = (entries) => ("default" in entries) ? "default" : Object.keys(entries).length === 1 ? Object.keys(entries)[0] : undefined, IMPLICIT_AGENT_ENGINE = "opencode-sdk";
 var init_convert_engines = __esm(() => {
   init_common();
   init_convert_engine_references();
@@ -34568,6 +34626,27 @@ function isMarkdownFenceClosing(line, fence) {
     return false;
   return /^[\t ]*$/.test(line.slice(cursor));
 }
+function fencedCodeIdentifiers(line) {
+  const cleaned = line.replace(/(["'`])((?:\\.|(?!\1).)*)\1(\s*:)?/g, (match, _quote, body, colon, offset) => {
+    if (colon)
+      return /^\s*["'`]/.test(line.slice(offset + match.length)) ? ` ${body} ` : ` ${body}: `;
+    return /^\/[\w./-]+$/.test(body) ? ` ${body} ` : " ";
+  }).replace(/([A-Za-z_][A-Za-z0-9_.-]*\s*[:=]\s*)((?:[Bb]earer|[Bb]asic|[Tt]oken|[Dd]igest)\s+\S+|\S+)/g, (_match, name, value) => /^[!(]*[A-Za-z_][\w$]*(?:\.[A-Za-z_][\w$]*)+[()\]}]*[,;]?$/.test(value) ? `${name} ${value}` : name).replace(/(?<![\w.-])[A-Za-z0-9+/=]{20,}(?![\w.-])/g, (run) => /[a-z]/.test(run) && /[A-Z]/.test(run) && /\d/.test(run) ? " " : run);
+  const words = [];
+  for (let token of cleaned.match(/--?[A-Za-z][A-Za-z0-9-]*|[A-Za-z_][A-Za-z0-9_.-]*/g) ?? []) {
+    token = token.replace(/[.-]+$/, "");
+    const bare = token.replace(/^-+/, "");
+    if (bare.length < 2)
+      continue;
+    if (bare.length >= TOKEN_LIKE_MIN_LENGTH && /\d/.test(bare))
+      continue;
+    words.push(token);
+    const parts = bare.split(/[_.-]|(?<=[a-z0-9])(?=[A-Z])/).filter((part) => part.length > 1);
+    if (parts.length > 1)
+      words.push(...parts);
+  }
+  return words.join(" ");
+}
 function stripMarkdownHtmlComments(line, state) {
   let cursor = 0;
   let visible = "";
@@ -34733,6 +34812,7 @@ function projectMarkdownContent(body, truncationInfo) {
   const innerBlock = findInnerFrontmatterBlock(lines);
   const start = innerBlock && isFrontmatterShaped(lines, innerBlock) ? innerBlock.close + 1 : 0;
   const projected = [];
+  const fenced = [];
   forEachVisibleMarkdownLine(lines, start, (_index, visible) => {
     let trimmed = visible.trim();
     if (!trimmed || /^(-{3,}|\*{3,}|_{3,}|=+)$/.test(trimmed))
@@ -34750,15 +34830,19 @@ function projectMarkdownContent(body, truncationInfo) {
     trimmed = trimmed.replace(/\s+/g, " ").trim();
     if (trimmed)
       projected.push(trimmed);
+  }, (_index, fencedLine) => {
+    const identifiers = fencedCodeIdentifiers(fencedLine);
+    if (identifiers)
+      fenced.push(identifiers);
   });
-  const text2 = projected.join(" ").replace(/\s+/g, " ").trim();
+  const text2 = [...projected, ...fenced].join(" ").replace(/\s+/g, " ").trim();
   if (!text2)
     return;
   if (truncationInfo)
     truncationInfo.truncated = text2.length > MARKDOWN_CONTENT_MAX_CHARS;
   return truncateUnicodeSafe(text2, MARKDOWN_CONTENT_MAX_CHARS);
 }
-function forEachVisibleMarkdownLine(lines, start, visit3) {
+function forEachVisibleMarkdownLine(lines, start, visit3, visitFenced) {
   let fence;
   const htmlComment = { inComment: false };
   for (let index = start;index < lines.length; index += 1) {
@@ -34766,6 +34850,8 @@ function forEachVisibleMarkdownLine(lines, start, visit3) {
     if (fence) {
       if (isMarkdownFenceClosing(rawLine, fence))
         fence = undefined;
+      else
+        visitFenced?.(index, rawLine);
       continue;
     }
     const leadingFence = htmlComment.inComment ? undefined : parseMarkdownFenceOpening(rawLine);
@@ -34936,7 +35022,7 @@ function extractDirTagsFromName(name) {
   }
   return Array.from(tags);
 }
-var SCOPE_KEYS, KNOWN_QUALITY_VALUES, warnedUnknownQualityValues, COMMENT_TAGS, MARKDOWN_CONTENT_MAX_CHARS = 1e6, MAX_MARKDOWN_LINK_NESTING = 32, markdownFragmentContentByEntry, markdownFragmentProjectionEntries;
+var SCOPE_KEYS, KNOWN_QUALITY_VALUES, warnedUnknownQualityValues, COMMENT_TAGS, MARKDOWN_CONTENT_MAX_CHARS = 1e6, TOKEN_LIKE_MIN_LENGTH = 20, MAX_MARKDOWN_LINK_NESTING = 32, markdownFragmentContentByEntry, markdownFragmentProjectionEntries;
 var init_metadata = __esm(() => {
   init_asset_ref();
   init_frontmatter();