akm-cli 0.10.261012-beta → 0.10.261013-beta

package/dist/indexer/walk/walker.js

@@ -11,7 +11,6 @@
 import fs from "node:fs";
 import path from "node:path";
 import { isRelevantAssetFile } from "../../core/asset/asset-placement.js";
-import { WORKFLOW_EXTENSIONS } from "../../core/recognition-util.js";
 import { spawnSync } from "../../runtime.js";
 import { buildFileContext } from "./file-context.js";
 const ALWAYS_SKIP_DIRS = new Set([".git"]);
@@ -124,13 +123,11 @@ function walkStashGit(stashRoot, options) {
     for (const relFile of files) {
         const absPath = path.join(stashRoot, relFile);
         try {
-            // lstat, not stat: a tracked symlink must not be dereferenced. statSync
-            // follows the link, so a target outside stashRoot would be read and
-            // indexed. The manual walk below already skips symlinks for exactly this
-            // reason; the two walkers have to agree regardless of whether the stash
-            // happens to sit inside a git repo.
+            // A file that is a symlink to a file anywhere is indexed like any other
+            // file: installing a bundle is the trust decision. git lists a symlinked
+            // directory as one entry, so directory symlinks are never descended.
             const stat = fs.lstatSync(absPath);
-            if (stat.isFile() || (stat.isSymbolicLink() && isOwnedWorkflowSymlink(stashRoot, absPath, options))) {
+            if (stat.isFile() || (stat.isSymbolicLink() && isFileOrFileSymlink(absPath))) {
                 results.push(buildFileContext(stashRoot, absPath));
             }
         }
@@ -191,8 +188,11 @@ export function walkMarkdownFiles(root) {
         }
         for (const entry of entries) {
             const full = path.join(current, entry.name);
-            if (entry.isSymbolicLink())
+            if (entry.isSymbolicLink()) {
+                if (entry.name.toLowerCase().endsWith(".md") && isFileOrFileSymlink(full))
+                    files.push(full);
                 continue;
+            }
             if (entry.isDirectory()) {
                 stack.push(full);
             }
@@ -225,11 +225,10 @@ function walkStashManual(stashRoot, options) {
                 continue;
             const fullPath = path.join(current, entry.name);
             if (entry.isSymbolicLink()) {
-                // Native workflow components arbitrate file symlinks explicitly in the
-                // drain before reading them. Directory symlinks remain unfollowed.
-                if (isOwnedWorkflowSymlink(stashRoot, fullPath, options)) {
+                // A file symlink is indexed like any other file; a directory symlink
+                // is never descended (no cycles).
+                if (isFileOrFileSymlink(fullPath))
                     results.push(buildFileContext(stashRoot, fullPath));
-                }
                 continue;
             }
             if (entry.isDirectory()) {
@@ -245,15 +244,12 @@ function walkStashManual(stashRoot, options) {
     }
     return { files: results, complete };
 }
-function isOwnedWorkflowSymlink(stashRoot, candidatePath, options) {
-    const adapterId = options.workflowSymlinkAdapter;
-    if (!adapterId)
-        return false;
-    const relativePath = path.relative(path.resolve(stashRoot), path.resolve(candidatePath)).replaceAll("\\", "/");
-    if (!relativePath || relativePath.startsWith("../") || path.posix.isAbsolute(relativePath))
-        return false;
-    if (adapterId === "akm" && !relativePath.startsWith("workflows/"))
+/** True for a regular file, or a symlink whose target is a regular file. */
+export function isFileOrFileSymlink(filePath) {
+    try {
+        return fs.statSync(filePath).isFile();
+    }
+    catch {
         return false;
-    const extension = path.posix.extname(relativePath).toLowerCase();
-    return WORKFLOW_EXTENSIONS.includes(extension);
+    }
 }

package/dist/integrations/agent/engine-resolution.js

@@ -4,12 +4,12 @@
 import fs from "node:fs";
 import os from "node:os";
 import path from "node:path";
-import { resolveSecret } from "../../core/config/config.js";
+import { liftRetiredSecretRef, resolveSecret } from "../../core/config/config.js";
 import { deepMergeConfig } from "../../core/config/deep-merge.js";
-import { SECRET_STORE_REFERENCE_PATTERN } from "../../core/config/schema/primitives.js";
 import { ConfigError } from "../../core/errors.js";
 import { formatExtraParamsIssue, validateExtraParams } from "../../core/extra-params.js";
 import { collectSensitiveValues } from "../../core/redaction.js";
+import { isRefToken } from "../../core/ref-token.js";
 import { resolveSecretFromStore } from "../../sources/snapshot-fetchers/secret-seam.js";
 import { getHarness } from "../harnesses/index.js";
 import { resolveOpencodeBin } from "../harnesses/opencode/version.js";
@@ -68,7 +68,7 @@ export function lookupApiKeyFileValue(filePath) {
 /** Best-effort, non-throwing read of a secret-store credential for redaction and health. */
 export function lookupApiKeySecretRefValue(ref) {
     try {
-        return resolveSecret(ref, resolveSecretFromStore);
+        return resolveSecret(liftRetiredSecretRef(ref) ?? ref, resolveSecretFromStore);
     }
     catch {
         return undefined;
@@ -95,7 +95,7 @@ function resolveCredential(name, engine, config) {
         if (explicit)
             return { names: [explicit], required: true };
         // A secret-store reference is carried as `apiKeySecretRef` instead.
-        if (SECRET_STORE_REFERENCE_PATTERN.test(engine.apiKey))
+        if (isRefToken(engine.apiKey))
             return undefined;
         throw new ConfigError(`Engine "${name}" has an invalid symbolic apiKey reference.`, "INVALID_CONFIG_FILE");
     }
@@ -138,7 +138,9 @@ export function resolveLlmCredentialValue(engine, credential, apiKeyFile, apiKey
         return envValue;
     if (apiKeyFile !== undefined)
         return readApiKeyFile(engine, apiKeyFile);
-    return apiKeySecretRef !== undefined ? resolveSecret(apiKeySecretRef, resolveSecretFromStore) : undefined;
+    return apiKeySecretRef !== undefined
+        ? resolveSecret(liftRetiredSecretRef(apiKeySecretRef) ?? apiKeySecretRef, resolveSecretFromStore)
+        : undefined;
 }
 /**
  * Non-throwing credential-presence check for `akm health` and improve's
@@ -193,7 +195,7 @@ export function collectEngineCredentialValues(config, envSource = process.env) {
             if (value)
                 values.add(value);
         }
-        if (engine.apiKey !== undefined && SECRET_STORE_REFERENCE_PATTERN.test(engine.apiKey)) {
+        if (engine.apiKey !== undefined && isRefToken(engine.apiKey)) {
             const value = lookupApiKeySecretRefValue(engine.apiKey);
             if (value)
                 values.add(value);
@@ -237,7 +239,7 @@ export function resolveLlmEngineUse(config, layers) {
         if (connection[key] === undefined)
             delete connection[key];
     }
-    const apiKeySecretRef = engine.apiKey !== undefined && SECRET_STORE_REFERENCE_PATTERN.test(engine.apiKey) ? engine.apiKey : undefined;
+    const apiKeySecretRef = engine.apiKey !== undefined && isRefToken(engine.apiKey) ? engine.apiKey : undefined;
     return {
         engine: name,
         connection: connection,

package/dist/integrations/agent/runner-dispatch.js

@@ -33,7 +33,10 @@ const OPERATIONAL_OPTIONS = [
     "clearTimeoutFn",
     "onEvent",
 ];
-/** Every value that can reach one dispatch and must never be echoed back: credentials and secret-looking env. */
+/**
+ * Every value that can reach one dispatch and must never be echoed back: credentials and unsafe passthrough env.
+ * `opts.env` is configuration; a caller's secret values are redacted through its own sensitive set.
+ */
 export function collectDispatchSensitiveValues(runner, opts, envSource = opts.envSource ?? process.env) {
     const values = [];
     if (runner.kind === "llm") {
@@ -49,10 +52,6 @@ export function collectDispatchSensitiveValues(runner, opts, envSource = opts.en
                 values.push(envSource[name]);
         }
     }
-    for (const [name, value] of Object.entries(opts.env ?? {})) {
-        if (!isEnvPassthroughValueSafeToExpose(name, value))
-            values.push(value);
-    }
     return collectSensitiveValues(values);
 }
 function redactResult(result, sensitiveValues) {

package/dist/integrations/agent/runner.js

@@ -41,6 +41,8 @@ function isRecord(value) {
 /**
  * Read a journaled runner back. Tolerant: unknown keys are kept and missing
  * profile defaults are filled in; only a shape nothing could dispatch is refused.
+ * Credentials stay as stored (a 0.9.x plan's `secret://<name>` included) because the
+ * unit input hash covers them; they are read as `${ref}` where they are resolved.
  */
 export function decodeFrozenRunnerSpec(value) {
     if (!isRecord(value) || typeof value.engine !== "string") {

package/dist/llm/client.js

@@ -359,7 +359,7 @@ async function chatCompletionAttemptOnce(config, messages, options, timeoutMs, i
             throw new Error(formatExtraParamsIssue("LLM extraParams", issue));
     }
     const headers = { "Content-Type": "application/json" };
-    // Resolve ONLY a whole-string reference ($VAR/${VAR} or secret://<name>).
+    // Resolve ONLY a whole-string reference ($VAR/${VAR} or ${ref}).
     // The execution boundary normally hands us a materialized credential after
     // resolving the reference upstream, so re-running the substitution over a
     // literal key mangled any credential containing `$` — `sk-live$ecret` lost

package/dist/llm/embedders/remote.js

@@ -10,9 +10,10 @@
 import { abortableDelay, backoffDelay, fetchWithTimeout, isHttpUrl, readBodyWithByteCap } from "../../core/common.js";
 import { concurrentMap } from "../../core/concurrent.js";
 import { resolveSecret } from "../../core/config/config.js";
-import { ENV_REFERENCE_PATTERN, SECRET_STORE_REFERENCE_PATTERN } from "../../core/config/schema/primitives.js";
+import { ENV_REFERENCE_PATTERN } from "../../core/config/schema/primitives.js";
 import { defaultConcurrencyForEndpoint } from "../../core/loopback.js";
 import { redactErrorBody, redactSensitiveText } from "../../core/redaction.js";
+import { isRefToken } from "../../core/ref-token.js";
 import { warnVerbose } from "../../core/warn.js";
 import { resolveSecretFromStore } from "../../sources/snapshot-fetchers/secret-seam.js";
 /**
@@ -845,7 +846,7 @@ export function hasRemoteEndpoint(config) {
 /**
  * Describe WHERE an `embedding.apiKey` came from, never its value — the
  * actionable outcome of the #953 field gap: `resolveSecret` throws on an
- * unresolvable `secret://` reference, so a keyless request can only mean
+ * unresolvable `${ref}` reference, so a keyless request can only mean
  * `embedding.apiKey` was absent from the config the run actually loaded (a
  * different config root, scope, or a config edited after the run started).
  * A default-level progress line naming the credential's SOURCE (this
@@ -855,7 +856,7 @@ export function hasRemoteEndpoint(config) {
 export function describeEmbeddingCredential(apiKey) {
     if (!apiKey)
         return "none configured";
-    if (SECRET_STORE_REFERENCE_PATTERN.test(apiKey))
+    if (isRefToken(apiKey))
         return `${apiKey} (store)`;
     if (ENV_REFERENCE_PATTERN.test(apiKey))
         return `${apiKey} (env)`;

package/dist/output/renderers.js

@@ -213,10 +213,9 @@ const agentMdRenderer = {
             action: "Dispatch using the prompt below verbatim. Use modelHint and toolPolicy if present.",
             description: asNonEmptyString(parsedMd.data.description),
             prompt: parsedMd.content,
-            // `tools` is self-declared frontmatter. The provenance CEILING that decides
-            // whether this self-declared policy is honoured is applied at the show
-            // layer (`akmShowUnified`), which knows whether the source is the operator's
-            // own writable stash vs a read-only third-party source (07 P1-D).
+            // `tools` is self-declared frontmatter and is passed through as-is. The
+            // host's `execution.allowedTools` caps it at dispatch (agent execution),
+            // so `show` does not filter it by source.
             ...(toolPolicy !== undefined ? { toolPolicy } : {}),
             ...(modelHint !== undefined ? { modelHint } : {}),
         };

package/dist/output/shapes/helpers.js

@@ -376,7 +376,6 @@ export function shapeShowOutput(result, detail, shape = "human") {
             "run",
             "setup",
             "cwd",
-            "activeRun",
             "toolPolicy",
             "modelHint",
             "agent",
@@ -418,7 +417,6 @@ export function shapeShowOutput(result, detail, shape = "human") {
         "run",
         "setup",
         "cwd",
-        "activeRun",
         "keys",
         "links",
         "evidence",

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

@@ -177,7 +177,7 @@ export function formatEnvListPlain(r) {
     // Multi-env listing: { envs: [{ ref, path, keys }, ...] }
     const envs = Array.isArray(r.envs) ? r.envs : [];
     if (envs.length === 0) {
-        return "No env files. Create one with `akm env create <name>`, then edit the .env file directly.";
+        return "No env files. Create one with `akm env create env/<name>`, then edit the .env file directly.";
     }
     const lines = [];
     for (const v of envs) {
@@ -580,14 +580,24 @@ export function formatBundleRenamePlain(r) {
     const proposalRefs = Number(state.proposalRefs ?? 0);
     const proposalTargets = Number(state.proposalTargets ?? 0);
     const taskHistoryRefs = Number(state.taskHistoryRefs ?? 0);
+    const workflowRunRefs = Number(state.workflowRunRefs ?? 0);
+    const activeWorkflowRuns = Array.isArray(r.activeWorkflowRuns)
+        ? r.activeWorkflowRuns
+        : [];
     const entries = Number(index.entries ?? 0);
     const contentRefs = Array.isArray(r.contentRefs) ? r.contentRefs : [];
     const nativeSchedulerRows = Array.isArray(r.nativeSchedulerRows) ? r.nativeSchedulerRows : [];
     const verb = applied ? "Renamed" : "Would rename";
     const lines = [
         `${verb} bundle "${oldId}" to "${newId}" (${entries} index entries, ${schedulerRefs} scheduler ref(s), ` +
-            `${proposalRefs + proposalTargets} proposal reference(s), ${taskHistoryRefs} task-history row(s)).`,
+            `${proposalRefs + proposalTargets} proposal reference(s), ${taskHistoryRefs} task-history row(s), ` +
+            `${workflowRunRefs} workflow run(s)).`,
     ];
+    if (activeWorkflowRuns.length > 0) {
+        lines.push("Active and blocked workflow runs keep the old bundle name in their frozen plan; continue them (`akm workflow run <id>`, after `akm workflow resume <id>` for a blocked one) or abandon them (`akm workflow abandon <id>`):");
+        for (const run of activeWorkflowRuns)
+            lines.push(`  - ${run.id} (${run.workflowRef}, ${run.status})`);
+    }
     if (!applied) {
         lines.push("Re-run without --dry-run to apply. It also re-syncs native scheduler bindings under the new name.");
         if (nativeSchedulerRows.length > 0) {

package/dist/output/text/show-directives.js

@@ -43,36 +43,24 @@ export function appendShowDirectives(lines, r) {
         lines.push(`  - If this asset does not contain what you need, run \`akm feedback '${assetRef ?? "<ref>"}' --negative\` and search for a different asset.`);
     }
     if (assetType === "skill" || assetType === "knowledge") {
-        const activeRun = r.activeRun;
-        if (activeRun) {
-            lines.unshift("Read this reference, follow the active unit's instructions, and return the result to the workflow runner. Step completion is automatic.");
-            lines.unshift(`WORKFLOW ACTIVE — schema shown as reference (run: ${activeRun.runId})`);
-            lines.unshift("---");
-            lines.unshift("");
-            // Still show feedback line at the end but skip the APPLY directive
-            lines.push("");
-            lines.push(`Run \`akm feedback ${assetRef ? `'${assetRef}'` : "<ref>"} --positive\` if the step succeeds, or \`--negative\` if this schema did not help.`);
+        // Show the APPLY directive. Branch on whether this
+        // skill primarily teaches CLI commands (shell output) vs YAML schema.
+        const preApplyLines = [...lines];
+        lines.push("");
+        lines.push("---");
+        if (isCommandOutputSkill(preApplyLines)) {
+            lines.push("APPLY (only if no workflow step is required for this task):");
+            lines.push("  1. Identify the output file from README.md (typically commands.txt).");
+            lines.push("  2. Write the exact command syntax from the code blocks above — replace every placeholder (`<name>`, `<value>`) with a real, concrete value from your task context. Do not write placeholder text.");
+            lines.push("  3. Each command should be on a single line (no backslash line continuation unless the verifier expects it).");
+            lines.push(`Run \`akm feedback ${assetRef ? `'${assetRef}'` : "<ref>"} --positive\` after the task succeeds, or \`--negative\` if this reference did not contain the needed command syntax.`);
         }
         else {
-            // No active workflow: show the APPLY directive. Branch on whether this
-            // skill primarily teaches CLI commands (shell output) vs YAML schema.
-            const preApplyLines = [...lines];
-            lines.push("");
-            lines.push("---");
-            if (isCommandOutputSkill(preApplyLines)) {
-                lines.push("APPLY (only if no workflow step is required for this task):");
-                lines.push("  1. Identify the output file from README.md (typically commands.txt).");
-                lines.push("  2. Write the exact command syntax from the code blocks above — replace every placeholder (`<name>`, `<value>`) with a real, concrete value from your task context. Do not write placeholder text.");
-                lines.push("  3. Each command should be on a single line (no backslash line continuation unless the verifier expects it).");
-                lines.push(`Run \`akm feedback ${assetRef ? `'${assetRef}'` : "<ref>"} --positive\` after the task succeeds, or \`--negative\` if this reference did not contain the needed command syntax.`);
-            }
-            else {
-                lines.push("APPLY (only if no workflow step is required for this task):");
-                lines.push("  1. Identify the target file from README.md — write or edit it. If the file does not yet exist, CREATE it with the full structure from this schema.");
-                lines.push("  2. Add/edit the fields shown above using the exact field names from this schema.");
-                lines.push("  3. COPY the exact YAML structure and field names from the code blocks above — do not substitute synonyms or invent nesting. Replace every placeholder value with a real, concrete value from your task context. Do not leave any field as null, empty, or a placeholder.");
-                lines.push(`Run \`akm feedback ${assetRef ? `'${assetRef}'` : "<ref>"} --positive\` after the task succeeds, or \`--negative\` if the task fails after following this guidance.`);
-            }
+            lines.push("APPLY (only if no workflow step is required for this task):");
+            lines.push("  1. Identify the target file from README.md — write or edit it. If the file does not yet exist, CREATE it with the full structure from this schema.");
+            lines.push("  2. Add/edit the fields shown above using the exact field names from this schema.");
+            lines.push("  3. COPY the exact YAML structure and field names from the code blocks above — do not substitute synonyms or invent nesting. Replace every placeholder value with a real, concrete value from your task context. Do not leave any field as null, empty, or a placeholder.");
+            lines.push(`Run \`akm feedback ${assetRef ? `'${assetRef}'` : "<ref>"} --positive\` after the task succeeds, or \`--negative\` if the task fails after following this guidance.`);
         }
     }
     else if (assetType === "workflow") {

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

@@ -12,7 +12,7 @@
 export function formatWorkflowListPlain(result) {
     const runs = Array.isArray(result.runs) ? result.runs : [];
     if (runs.length === 0) {
-        return "No workflow runs in the current working scope. Start one with `akm workflow run workflows/<name>` or author one with `akm workflow create <name>`.";
+        return "No workflow runs. Start one with `akm workflow run workflows/<name>` or author one with `akm workflow create <name>`.";
     }
     return runs
         .map((run) => {
@@ -56,6 +56,40 @@ function renderChildNode(child, depth, lines) {
     for (const grandchild of nested)
         renderChildNode(grandchild, depth + 1, lines);
 }
+/**
+ * The `show` orchestration projection as text lines: the exec argv (JSON, so
+ * word boundaries survive), cwd, env refs and the bundle-qualified ref each
+ * token resolved to. Shared by `workflow plan` steps and `status --units`.
+ */
+function renderOrchestrationLines(value, prefix) {
+    if (typeof value !== "object" || value === null)
+        return [];
+    const orchestration = value;
+    const lines = [];
+    const exec = typeof orchestration.exec === "object" && orchestration.exec !== null
+        ? orchestration.exec
+        : undefined;
+    if (exec) {
+        if (Array.isArray(exec.command))
+            lines.push(`${prefix}argv: ${JSON.stringify(exec.command)}`);
+        if (typeof exec.cwd === "string")
+            lines.push(`${prefix}cwd: ${exec.cwd}`);
+    }
+    if (Array.isArray(orchestration.env) && orchestration.env.length > 0) {
+        lines.push(`${prefix}env: ${orchestration.env.join(", ")}`);
+    }
+    const refs = Array.isArray(orchestration.refs) ? orchestration.refs : [];
+    for (const ref of refs) {
+        const written = ref.in === "argv" || ref.in === "cwd" ? `\${${String(ref.ref)}}` : String(ref.ref);
+        lines.push(`${prefix}ref: ${written} -> ${String(ref.resolved)} (${String(ref.in)})`);
+    }
+    const unresolved = Array.isArray(orchestration.unresolved)
+        ? orchestration.unresolved
+        : [];
+    for (const ref of unresolved)
+        lines.push(`${prefix}ref: ${String(ref.ref)} -> not found (${String(ref.in)})`);
+    return lines;
+}
 export function formatWorkflowStatusPlain(result) {
     const run = typeof result.run === "object" && result.run !== null ? result.run : undefined;
     const workflow = typeof result.workflow === "object" && result.workflow !== null
@@ -111,6 +145,7 @@ export function formatWorkflowStatusPlain(result) {
             if (typeof unit.failureReason === "string" && unit.failureReason.trim()) {
                 lines.push(`    failure_reason: ${unit.failureReason}`);
             }
+            lines.push(...renderOrchestrationLines(unit.orchestration, "    "));
             if (typeof unit.diagnostic === "string" && unit.diagnostic.trim()) {
                 const diagLines = unit.diagnostic.split("\n");
                 lines.push(`    diagnostic: ${diagLines[0]}`);
@@ -147,12 +182,6 @@ export function formatWorkflowRunPlain(result) {
     if (!run)
         return null;
     const lines = [];
-    // #919: `workflow run <ref>` silently resuming an existing active run (the
-    // #485 concurrency guard) is now announced up front, with the escape hatch.
-    if (result.resumed === true) {
-        lines.push(`resuming existing run ${String(run.id ?? "unknown")} for ${String(run.workflowRef ?? "this ref")}; ` +
-            `pass --new to start a fresh run`);
-    }
     lines.push(`run: ${String(run.id ?? "unknown")}`, `status: ${String(run.status ?? "unknown")}`);
     // Creation-time notices (e.g. the implicit engine fallback) must survive the
     // text renderer: JSON/YAML pass them through, and dropping them here would
@@ -252,6 +281,7 @@ function renderPlanStepLines(step, ordinal, lines, prefix = "  ") {
     if (inputBindings.length > 0) {
         lines.push(`${detailPrefix}with: ${formatInputBindingsList(inputBindings)}`);
     }
+    lines.push(...renderOrchestrationLines(step.orchestration, detailPrefix));
     if (via === "child") {
         const childSteps = Array.isArray(expansion.steps) ? expansion.steps : [];
         for (const [index, childStep] of childSteps.entries()) {