akm-cli 0.9.0-rc.8 → 0.9.0

package/dist/commands/env/env.js

@@ -10,13 +10,10 @@
  * them all the same. For a single sensitive value used on its own for
  * authentication (a token, key, or cert), use the `secret` type instead.
  *
- * Single keys can be managed with `akm env set <ref> KEY` (value read from stdin
- * or `--from-env`/`--from-file`, never argv) and `akm env unset <ref> KEY...`,
- * which do a minimal line-level edit that preserves existing comments and key
- * order (see `setEnvKey` / `unsetEnvKeys`). You can also just edit the `.env`
- * file with your own editor. Values are quoted/escaped only when necessary and
- * round-trip through `dotenv`; the shell-load safety guarantee still lives on
- * the READ path (see `buildShellExportScript` + `akm env export`).
+ * akm does not manage individual keys — edit the `.env` file with your own
+ * editor. Values are quoted/escaped only when necessary and round-trip
+ * through `dotenv`; the shell-load safety guarantee lives on the READ path
+ * (see `buildShellExportScript` + `akm env export`).
  *
  * Invariant: nothing from an env file except key NAMES may be written to
  * stdout, returned through the indexer, the `akm show` renderer, or any
@@ -27,20 +24,18 @@
  * are:
  *
  *   - `akm env run <ref> -- <command>` — values injected into the child
- *     process env (never via a shell), see `injectIntoEnv` / `loadEnv`. This is
- *     the primary path and the only one safe for AI agents (no values ever
- *     reach stdout). For an interactive shell, `akm env run <ref> -- $SHELL`.
+ *     process env (never via a shell), see `loadEnv` (loaded by
+ *     `env-binding.ts#resolveEnvBinding`, then merged into the child env by
+ *     `env-cli.ts`). This is the primary path and the only one safe for AI
+ *     agents (no values ever reach stdout). For an interactive shell, `akm
+ *     env run <ref> -- $SHELL`.
  *   - `akm env export <ref> --out <file>` — write parse-then-reserialized safe
  *     `export KEY='value'` lines to a file (mode 0600) for `source`-ing. Values
  *     are re-emitted single-quoted so a raw `.env` containing `X=$(cmd)` cannot
  *     execute on load. `export` never prints values to stdout (would leak into
  *     an agent's context); `path` prints only the file path.
  *
- * Value parsing is delegated to the `dotenv` package, and `dotenv` is also the
- * serialisation oracle for `env set` (`setEnvKey`): a written value is only
- * committed if `dotenv.parse` reads it back exactly, and the whole edit is
- * re-parsed to confirm no other key was disturbed. We never hand-roll a
- * quoting representation we cannot read back.
+ * Value parsing is delegated to the `dotenv` package.
  *
  * Secret-token substitution: env VALUES may embed `${secret:NAME}` tokens, which
  * are replaced at `env run` time with the value of the sibling `secret:NAME`
@@ -54,7 +49,7 @@ import fs from "node:fs";
 import path from "node:path";
 import dotenv from "dotenv";
 import { writeFileAtomic } from "../../core/common.js";
-import { UsageError } from "../../core/errors.js";
+import { sensitiveMarkerPath } from "./marker-path.js";
 /** Matches a KEY=value assignment line, capturing only the key. */
 const ASSIGN_RE = /^\s*(?:export\s+)?([A-Za-z_][A-Za-z0-9_]*)\s*=/;
 /** Scan lines and return KEY names in file order, without duplicates. */
@@ -101,21 +96,6 @@ export function loadEnv(envPath) {
     const buf = fs.readFileSync(envPath);
     return dotenv.parse(buf);
 }
-/**
- * Load an env file and assign its values into `target` (defaults to
- * `process.env`). Returns the list of keys that were set so the caller can
- * log/observe without touching values.
- *
- * Existing keys in `target` are overwritten — callers who want to preserve
- * pre-existing environment variables should filter before calling.
- */
-export function injectIntoEnv(envPath, target = process.env) {
-    const env = loadEnv(envPath);
-    for (const [key, value] of Object.entries(env)) {
-        target[key] = value;
-    }
-    return Object.keys(env);
-}
 /**
  * Serialise an env file's values as a POSIX shell script of `export KEY='value'`
  * lines, with single-quote escaping (`'\''`). Every line is an assignment of a
@@ -214,142 +194,11 @@ export function removeEnv(envPath) {
     if (!fs.existsSync(envPath))
         return false;
     fs.rmSync(envPath);
-    const marker = `${envPath}.sensitive`;
+    const marker = sensitiveMarkerPath(envPath, "env");
     if (fs.existsSync(marker))
         fs.rmSync(marker);
     return true;
 }
-/** A valid env KEY name (same grammar as the assignment scanner). */
-export const ENV_KEY_RE = /^[A-Za-z_][A-Za-z0-9_]*$/;
-/**
- * Build a `KEY=value` assignment line whose value is GUARANTEED to round-trip
- * through `dotenv.parse` — dotenv is the serialisation oracle, so we never
- * write a representation we cannot read back. Candidate representations are
- * tried in order of readability (bare → double-quoted → single-quoted) and the
- * first one `dotenv.parse` recovers exactly is used. If a value contains
- * characters no inline representation can round-trip (e.g. both quote styles),
- * we throw rather than silently corrupt the file.
- */
-function serializeEnvAssignment(key, value) {
-    const candidates = [];
-    // Bare — only for simple values (no whitespace/quotes/#/$/control chars).
-    if (/^[A-Za-z0-9_@%+=:,./-]*$/.test(value))
-        candidates.push(`${key}=${value}`);
-    // Double-quoted — dotenv expands \n \r \t inside double quotes.
-    const dq = value
-        .replace(/\\/g, "\\\\")
-        .replace(/"/g, '\\"')
-        .replace(/\n/g, "\\n")
-        .replace(/\r/g, "\\r")
-        .replace(/\t/g, "\\t");
-    candidates.push(`${key}="${dq}"`);
-    // Single-quoted — dotenv takes the content literally (no escapes/expansion).
-    candidates.push(`${key}='${value}'`);
-    for (const line of candidates) {
-        try {
-            if (dotenv.parse(line)[key] === value)
-                return line;
-        }
-        catch {
-            // Not parseable as written; try the next representation.
-        }
-    }
-    throw new UsageError(`Value for "${key}" cannot be stored inline in a .env file (it contains characters dotenv cannot round-trip). ` +
-        "Edit the .env file directly, or choose a different value.");
-}
-/**
- * Assert (using `dotenv.parse` as the oracle) that `after` set `key` to
- * `expected` and left every other key from `before` byte-identical. This
- * catches a line-level edit accidentally disturbing a quoted/multiline value.
- */
-function assertEnvEditSafe(before, after, key) {
-    for (const [k, v] of Object.entries(before)) {
-        if (k !== key && after[k] !== v) {
-            throw new UsageError(`Editing "${key}" would disturb "${k}" (the .env file has a value layout dotenv could not safely round-trip). ` +
-                "Edit the .env file directly.");
-        }
-    }
-}
-/**
- * Set (create or update) a single `KEY=value` entry in an env file, preserving
- * the file's existing lines, comments, and key order. The first existing
- * assignment of `key` is replaced in place; otherwise the entry is appended.
- * Creates the file (and parent dirs) if absent. The value is never logged.
- *
- * The serialised value and the whole resulting file are verified with
- * `dotenv.parse` before the write commits.
- */
-export function setEnvKey(envPath, key, value) {
-    ensureParentDir(envPath);
-    const existing = fs.existsSync(envPath) ? fs.readFileSync(envPath, "utf8") : "";
-    const assignment = serializeEnvAssignment(key, value);
-    const keyLineRe = new RegExp(`^\\s*(?:export\\s+)?${key}\\s*=`);
-    const lines = existing.split(/\r?\n/);
-    let replaced = false;
-    const out = lines.map((line) => {
-        if (!replaced && keyLineRe.test(line)) {
-            replaced = true;
-            return assignment;
-        }
-        return line;
-    });
-    if (!replaced) {
-        while (out.length > 0 && out[out.length - 1] === "")
-            out.pop();
-        out.push(assignment);
-    }
-    let content = out.join("\n");
-    if (!content.endsWith("\n"))
-        content += "\n";
-    // Verify the edit with dotenv before committing it.
-    const after = dotenv.parse(content);
-    if (after[key] !== value) {
-        throw new UsageError(`Could not set "${key}" reliably (the .env file has a value layout dotenv could not round-trip). ` +
-            "Edit the .env file directly.");
-    }
-    assertEnvEditSafe(dotenv.parse(existing), after, key);
-    writeFileAtomic(envPath, content, 0o600);
-}
-/**
- * Remove one or more `KEY=value` entries from an env file, preserving all other
- * lines and comments. Returns which keys were present (removed) vs. absent.
- *
- * The result is verified with `dotenv.parse`: the removed keys are gone and
- * every surviving key is byte-identical to before.
- */
-export function unsetEnvKeys(envPath, keys) {
-    if (!fs.existsSync(envPath))
-        return { removed: [], missing: keys };
-    const text = fs.readFileSync(envPath, "utf8");
-    const before = dotenv.parse(text);
-    const present = new Set(Object.keys(before));
-    const toRemove = new Set(keys);
-    const out = text.split(/\r?\n/).filter((line) => {
-        const m = line.match(ASSIGN_RE);
-        return !(m && toRemove.has(m[1]));
-    });
-    let content = out.join("\n");
-    if (content.length > 0 && !content.endsWith("\n"))
-        content += "\n";
-    // Verify with dotenv: removed keys gone, survivors unchanged.
-    const after = dotenv.parse(content);
-    for (const k of toRemove) {
-        if (k in after) {
-            throw new UsageError(`Could not remove "${k}" reliably (the .env file has a value layout dotenv could not round-trip). ` +
-                "Edit the .env file directly.");
-        }
-    }
-    for (const [k, v] of Object.entries(before)) {
-        if (!toRemove.has(k) && after[k] !== v) {
-            throw new UsageError(`Removing those keys would disturb "${k}" (multiline/quoted value). Edit the .env file directly.`);
-        }
-    }
-    writeFileAtomic(envPath, content, 0o600);
-    return {
-        removed: keys.filter((k) => present.has(k)),
-        missing: keys.filter((k) => !present.has(k)),
-    };
-}
 function ensureParentDir(filePath) {
     const dir = path.dirname(filePath);
     if (!fs.existsSync(dir))

package/dist/commands/env/marker-path.js

@@ -0,0 +1,6 @@
+// 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/.
+export function sensitiveMarkerPath(assetPath, type) {
+    return type === "env" ? assetPath.replace(/\.env$/, ".sensitive") : `${assetPath}.sensitive`;
+}

package/dist/commands/env/secret-cli.js

@@ -11,9 +11,20 @@
  *
  * `akm secret` manages whole-file secrets under each stash's secrets/ directory.
  * Unlike env files (.env key/value), the ENTIRE file is the secret value. The bytes
- * are NEVER written to stdout or structured output. Values reach a command only
- * via `akm secret run` (injected into a child env var) or `akm secret path`
- * (the Docker /run/secrets + `_FILE` convention).
+ * are NEVER written to stdout or structured output. The only value-use path is
+ * `akm secret run` (injected into a child env var).
+ *
+ * `secret path` and `secret remove` were REMOVED in 0.9.0 (R-027 / D-49): an
+ * audit found `path` resolved the ref through the read-side, all-sources
+ * resolver while `remove` resolved it through the write-target resolver, so
+ * `akm secret path <ref>` and `akm secret remove <ref>` could silently name
+ * two DIFFERENT files when a ref existed in more than one stash — inspect one,
+ * delete the other. The owner's ruling was to drop both subcommands rather
+ * than reconcile the resolvers. A ref's file lives at `<bundle>/secrets/<name>`
+ * (matching the ref exactly, e.g. `secrets/deploy-key` -> `secrets/deploy-key`
+ * under a bundle root — `akm bundle list` prints each configured bundle's root
+ * path); locate or delete it directly, or consume its value without touching
+ * disk via `akm secret run <ref> <VAR> -- <command>`.
  */
 import { spawnSync } from "node:child_process";
 import fs from "node:fs";
@@ -23,12 +34,13 @@ import { getStringArg } from "../../cli/parse-args.js";
 import { defineGroupCommand, defineJsonCommand, output } from "../../cli/shared.js";
 import { deriveCanonicalAssetName } from "../../core/asset/asset-placement.js";
 import { loadConfig } from "../../core/config/config.js";
-import { commitEnvSecretWrite, makeSecretRef, resolveSecretPath, resolveSecretWriteTarget, writeTargetDisplaySource, } from "../../core/env-secret-ref.js";
+import { makeSecretRef, resolveSecretPath, resolveSecretWriteTarget, withEnvSecretWrite, } from "../../core/env-secret-ref.js";
 import { ConfigError, NotFoundError, UsageError } from "../../core/errors.js";
 import { appendEvent } from "../../core/events.js";
 import { resolveSourceEntries } from "../../indexer/search/search-source.js";
 import { readStdin } from "../../runtime.js";
 import { buildChildEnv } from "./child-env.js";
+import { sensitiveMarkerPath } from "./marker-path.js";
 function parseKeyListFlag(raw) {
     if (raw === undefined)
         return undefined;
@@ -57,7 +69,7 @@ function listSecretsRecursive() {
                 if (entry.name.endsWith(".lock") || entry.name.endsWith(".sensitive"))
                     continue;
                 // A sibling `<name>.sensitive` marker suppresses listing.
-                if (fs.existsSync(`${full}.sensitive`))
+                if (fs.existsSync(sensitiveMarkerPath(full, "secret")))
                     continue;
                 const canonical = deriveCanonicalAssetName("secret", secretsDir, full);
                 if (!canonical)
@@ -72,7 +84,7 @@ function listSecretsRecursive() {
 const secretListCommand = defineJsonCommand({
     meta: {
         name: "list",
-        description: "List all secrets across all stashes by name (the file contents are never shown)",
+        description: "List all secrets across all bundles by name (the file contents are never shown)",
     },
     async run() {
         output("secret-list", { secrets: listSecretsRecursive() });
@@ -86,7 +98,7 @@ const secretSetCommand = defineJsonCommand({
     args: {
         ref: {
             type: "positional",
-            description: "Secret ref (flat name, e.g. secret:deploy-key or just deploy-key; use --path for a subdirectory)",
+            description: "Secret ref (flat name, e.g. secrets/deploy-key or just deploy-key; use --path for a subdirectory)",
             required: true,
         },
         path: {
@@ -97,15 +109,14 @@ const secretSetCommand = defineJsonCommand({
         "from-env": { type: "string", description: "Read the value from the named environment variable" },
         target: {
             type: "string",
-            description: "Override the write destination. Accepts a source name from your config; falls back to defaultWriteTarget then the working stash.",
+            description: "Override the write destination. Accepts a source name from your config; falls back to defaultWriteTarget then the working bundle.",
         },
     },
     async run({ args }) {
         const { setSecret } = await import("./secret.js");
-        const { name, absPath, target } = resolveSecretWriteTarget(args.ref, args.target, {
+        const { name, absPath, target, ref } = resolveSecretWriteTarget(args.ref, args.target, {
             subPath: getStringArg(args, "path"),
         });
-        const displaySource = writeTargetDisplaySource(target);
         const fromEnv = args["from-env"];
         const fromFile = args["from-file"];
         if (fromEnv !== undefined && fromFile !== undefined) {
@@ -139,25 +150,8 @@ const secretSetCommand = defineJsonCommand({
             // byte-exact storage of multi-line material (PEM keys, certs).
             value = Buffer.from(stdinBuf.toString("utf8").replace(/\n$/, ""), "utf8");
         }
-        setSecret(absPath, value);
-        commitEnvSecretWrite(target, { type: "secret", name }, "Update", [absPath]);
-        output("secret-set", { ref: makeSecretRef(name, displaySource) });
-    },
-});
-const secretPathCommand = defineJsonCommand({
-    meta: {
-        name: "path",
-        description: "Print the absolute secret file path for the Docker `_FILE` convention, e.g. `MY_SECRET_FILE=$(akm secret path secret:deploy-key)`.",
-    },
-    args: {
-        ref: { type: "positional", description: "Secret ref", required: true },
-    },
-    async run({ args }) {
-        const { name, absPath, source } = resolveSecretPath(args.ref);
-        if (!fs.existsSync(absPath)) {
-            throw new NotFoundError(`Secret not found: ${makeSecretRef(name, source)}`);
-        }
-        process.stdout.write(`${absPath}\n`);
+        withEnvSecretWrite(target, { type: "secret", name }, "Update", [absPath], () => setSecret(absPath, value));
+        output("secret-set", { ref });
     },
 });
 const secretRunCommand = defineJsonCommand({
@@ -224,52 +218,28 @@ const secretRunCommand = defineJsonCommand({
             }
             throw err;
         }
-        process.exit(result.status ?? 0);
-    },
-});
-const secretRemoveCommand = defineJsonCommand({
-    meta: { name: "remove", description: "Remove a secret (and its .sensitive marker, if any)" },
-    args: {
-        ref: { type: "positional", description: "Secret ref", required: true },
-        yes: { type: "boolean", alias: "y", description: "Skip confirmation prompt", default: false },
-        target: {
-            type: "string",
-            description: "Override the write destination. Accepts a source name from your config; falls back to defaultWriteTarget then the working stash.",
-        },
-    },
-    async run({ args }) {
-        const { name, absPath, target } = resolveSecretWriteTarget(args.ref, args.target);
-        const displaySource = writeTargetDisplaySource(target);
-        const { confirmDestructive } = await import("../../cli/confirm.js");
-        const confirmed = await confirmDestructive(`Remove secret "${args.ref}"? This cannot be undone.`, {
-            yes: args.yes === true,
-        });
-        if (!confirmed) {
-            process.stderr.write("Aborted.\n");
-            return;
-        }
-        const { removeSecret } = await import("./secret.js");
-        if (!fs.existsSync(absPath)) {
-            throw new NotFoundError(`Secret not found: ${makeSecretRef(name, displaySource)}`);
-        }
-        const removed = removeSecret(absPath);
-        commitEnvSecretWrite(target, { type: "secret", name }, "Remove", [absPath, `${absPath}.sensitive`]);
-        output("secret-remove", { ref: makeSecretRef(name, displaySource), removed });
+        // R-067: was `process.exit(result.status ?? 0)`, unconditional even on
+        // the success path — it skipped the `finally { await
+        // disposeDispatchResources(); }` cleanup in src/cli.ts's `runCommand`.
+        // Setting `process.exitCode` and returning still exits with the child's
+        // exact status once the event loop drains, but lets cleanup run first —
+        // same pattern `emitJsonError` (src/cli/shared.ts) already established.
+        process.exitCode = result.status ?? 0;
+        return;
     },
 });
 export const secretCommand = defineGroupCommand({
     meta: {
         name: "secret",
-        description: "Manage secrets — a single sensitive value used on its own for authentication (an API token, a PEM private key, a TLS cert), one value per file. Names are visible; the file contents are the value and never appear in structured output. For a group of related configuration loaded together, use `akm env`.",
+        description: "Manage secrets — one standalone sensitive value per file (an API token, a PEM private key, a TLS cert).\n\n" +
+            "Names are visible; the file contents are the value and never appear in structured output. For a group of related configuration loaded together, use `akm env`. A secret's file lives at `<bundle>/secrets/<name>` (`akm bundle list` shows bundle roots) — read or delete it there directly, or consume its value without writing it anywhere via `akm secret run <ref> <VAR> -- <command>`.",
     },
     subCommands: {
         list: secretListCommand,
-        path: secretPathCommand,
         run: secretRunCommand,
         set: secretSetCommand,
-        remove: secretRemoveCommand,
-    },
-    defaultRun() {
-        output("secret-list", { secrets: listSecretsRecursive() });
     },
+    // No `defaultRun`: bare `akm secret` is a usage error (exit 2), the canonical
+    // bare-group behavior — owner ruling 12. Run `akm secret list` for what the
+    // bare form used to print.
 });

package/dist/commands/env/secret.js

@@ -14,20 +14,26 @@
  *
  * Invariant: a secret's bytes must never be written to stdout, returned
  * through the indexer / `akm show` renderer, or any structured output channel.
- * The supported value-use paths are:
+ * The supported value-use path is:
  *
  *   - `akm secret run <ref> <VAR> -- <cmd>` — value injected into the child
  *     process env as `VAR=<value>` (see `readValue`).
- *   - `akm secret path <ref>` — print the file path so a command can read it
- *     itself (Docker `/run/secrets` + `_FILE` convention).
+ *
+ * `akm secret path <ref>` (print the file path for the Docker `/run/secrets` +
+ * `_FILE` convention) was removed in 0.9.0 alongside `akm secret remove` — an
+ * audit found the two resolved a ref through different stash-selection logic
+ * and could silently target different files. A ref's file still lives at
+ * `<stash>/secrets/<name>`; locate or delete it there directly.
  *
  * Values are stored as raw bytes (no quoting, multi-line allowed) so they
  * round-trip byte-exact, unlike env values which forbid literal newlines.
  */
+import { createHash } from "node:crypto";
 import fs from "node:fs";
 import path from "node:path";
-import { writeFileAtomic } from "../../core/common.js";
+import { safeRealpath, writeFileAtomic } from "../../core/common.js";
 import { createLockPayload, probeLock, reclaimStaleLock, releaseLock, tryAcquireLockSync, } from "../../core/file-lock.js";
+import { getDataDir } from "../../core/paths.js";
 import { sleepSync } from "../../runtime.js";
 // ── Write-lock helper ─────────────────────────────────────────────────────────
 /**
@@ -37,7 +43,9 @@ import { sleepSync } from "../../runtime.js";
  * throw rather than silently proceeding.
  */
 export function withSecretLock(secretPath, fn) {
-    const lockPath = `${secretPath}.lock`;
+    const lockPath = secretLockPath(secretPath);
+    const lockDir = path.dirname(lockPath);
+    fs.mkdirSync(lockDir, { recursive: true, mode: 0o700 });
     const deadline = Date.now() + 5000;
     let ownership;
     while (!ownership) {
@@ -49,10 +57,8 @@ export function withSecretLock(secretPath, fn) {
             continue;
         }
         if (Date.now() > deadline) {
-            const holderHint = probe.state === "held"
-                ? ` Lock file ${lockPath} is held by live PID ${probe.holderPid}.`
-                : ` Lock file ${lockPath} could not be inspected.`;
-            throw new Error(`Could not acquire secret lock for ${secretPath} after 5s.${holderHint} Retry once any other akm secret operation finishes, or remove the stale lock file.`);
+            const holderHint = probe.state === "held" ? ` It is held by live PID ${probe.holderPid}.` : "";
+            throw new Error(`Could not acquire the secret write lock after 5s.${holderHint} Retry once any other akm secret operation finishes.`);
         }
         sleepSync(10);
     }
@@ -63,6 +69,12 @@ export function withSecretLock(secretPath, fn) {
         releaseLock(ownership);
     }
 }
+export function secretLockPath(secretPath, platform = process.platform) {
+    const canonical = safeRealpath(secretPath);
+    const identity = platform === "win32" ? canonical.toLowerCase() : canonical;
+    const key = createHash("sha256").update(identity).digest("hex");
+    return path.join(getDataDir(), "secret-locks", `${key}.lock`);
+}
 // ── Atomic byte write ──────────────────────────────────────────────────────────
 function ensureParentDir(filePath) {
     const dir = path.dirname(filePath);
@@ -71,38 +83,8 @@ function ensureParentDir(filePath) {
 }
 // ── Public API ──────────────────────────────────────────────────────────────
 /**
- * Walk a `secrets/` directory and return the POSIX-relative names of every
- * secret file. Lock files (`*.lock`), sensitive markers (`*.sensitive`), and
- * secrets with a sibling `<name>.sensitive` marker are excluded. The file
- * bodies are NEVER read.
- */
-export function listNames(secretsRoot) {
-    if (!fs.existsSync(secretsRoot))
-        return [];
-    const names = [];
-    const walk = (dir) => {
-        for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
-            const full = path.join(dir, entry.name);
-            if (entry.isDirectory()) {
-                walk(full);
-                continue;
-            }
-            if (!entry.isFile())
-                continue;
-            if (entry.name.endsWith(".lock") || entry.name.endsWith(".sensitive"))
-                continue;
-            // A sibling `<name>.sensitive` marker suppresses listing.
-            if (fs.existsSync(`${full}.sensitive`))
-                continue;
-            names.push(path.relative(secretsRoot, full).split(path.sep).join("/"));
-        }
-    };
-    walk(secretsRoot);
-    return names.sort();
-}
-/**
- * Read a secret's raw bytes. Internal use only (for `secret run` / `secret
- * path`). Callers MUST NOT write the returned value to stdout or any log.
+ * Read a secret's raw bytes. Internal use only (for `secret run`). Callers
+ * MUST NOT write the returned value to stdout or any log.
  */
 export function readValue(secretPath) {
     return fs.readFileSync(secretPath);
@@ -112,24 +94,9 @@ export function readValue(secretPath) {
  * mode 0600 under a write-lock. No quoting; multi-line / binary allowed.
  */
 export function setSecret(secretPath, value) {
-    ensureParentDir(secretPath);
     withSecretLock(secretPath, () => {
+        ensureParentDir(secretPath);
         // Mode 0600: secrets must never be world-readable, even transiently.
         writeFileAtomic(secretPath, value, 0o600);
     });
 }
-/**
- * Remove a secret file (and its `.sensitive` marker, if present). Returns true
- * if the secret existed.
- */
-export function removeSecret(secretPath) {
-    return withSecretLock(secretPath, () => {
-        if (!fs.existsSync(secretPath))
-            return false;
-        fs.rmSync(secretPath);
-        const marker = `${secretPath}.sensitive`;
-        if (fs.existsSync(marker))
-            fs.rmSync(marker);
-        return true;
-    });
-}