akm-cli 0.8.6 → 0.8.14

package/dist/cli/config-migrate.js

@@ -3,12 +3,12 @@
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
 import fs from "node:fs";
 import path from "node:path";
-import { stripJsonComments } from "../core/config";
-import { unifiedDiff, withConfigLock, writeConfigAtomic } from "../core/config-io";
-import { migrateConfigShape } from "../core/config-migration";
-import { getCacheDir, getConfigPath } from "../core/paths";
-import { warn } from "../core/warn";
-export { migrateConfigShape } from "../core/config-migration";
+import { stripJsonComments } from "../core/config/config.js";
+import { unifiedDiff, withConfigLock, writeConfigAtomic } from "../core/config/config-io.js";
+import { migrateConfigShape } from "../core/config/config-migration.js";
+import { getCacheDir, getConfigPath } from "../core/paths.js";
+import { warn } from "../core/warn.js";
+export { migrateConfigShape } from "../core/config/config-migration.js";
 const PROJECT_CONFIG_RELATIVE_PATH = path.join(".akm", "config.json");
 function backupConfigFile(configPath) {
     if (!fs.existsSync(configPath))

package/dist/cli/config-validate.js

@@ -9,10 +9,10 @@
  * Exits non-zero on errors so it composes well in CI hooks.
  */
 import fs from "node:fs";
-import { parseConfigText } from "../core/config-io";
-import { validateConfigShape } from "../core/config-schema";
-import { ConfigError } from "../core/errors";
-import { getConfigPath } from "../core/paths";
+import { parseConfigText } from "../core/config/config-io.js";
+import { validateConfigShape } from "../core/config/config-schema.js";
+import { ConfigError } from "../core/errors.js";
+import { getConfigPath } from "../core/paths.js";
 export async function runConfigValidate() {
     const configPath = getConfigPath();
     if (!fs.existsSync(configPath)) {

package/dist/cli/confirm.js

@@ -7,7 +7,7 @@
  * ## Usage
  *
  * ```ts
- * import { confirmDestructive } from "../cli/confirm";
+ * import { confirmDestructive } from "../cli/confirm.js";
  *
  * async function run({ args }) {
  *   const yes = await confirmDestructive(
@@ -26,7 +26,7 @@
  * accidental destruction in scripts that forget to pass `-y`.
  *
  * This is intentionally stricter than many CLIs that silently proceed in
- * non-TTY mode. The rationale: vault keys, sources, and proposals cannot be
+ * non-TTY mode. The rationale: secrets, sources, and proposals cannot be
  * recovered after deletion, so the cost of requiring `--yes` in scripts is
  * low and the cost of accidental deletion is high.
  *
@@ -36,7 +36,7 @@
  * output. The auto-migration banner is similarly exempt from `--quiet`.
  */
 import * as p from "@clack/prompts";
-import { UsageError } from "../core/errors";
+import { UsageError } from "../core/errors.js";
 /**
  * Prompt the user to confirm a destructive action.
  *

package/dist/cli/parse-args.js

@@ -7,7 +7,7 @@
  * These were extracted from `src/cli.ts` to eliminate repetition and keep the
  * main CLI file focused on command definitions and routing.
  */
-import { UsageError } from "../core/errors";
+import { UsageError } from "../core/errors.js";
 // ── Subcommand detection ─────────────────────────────────────────────────────
 /**
  * Return true when `args._[0]` is a member of `validSet`.

package/dist/cli/shared.js

@@ -7,11 +7,14 @@
  *
  * Exported: output, runWithJsonErrors, parseAllFlagValues, emitJsonError
  */
+import { defineCommand } from "citty";
 import { stringify as yamlStringify } from "yaml";
-import { ConfigError, NotFoundError, UsageError } from "../core/errors";
-import { getOutputMode } from "../output/context";
-import { shapeForCommand } from "../output/shapes";
-import { formatPlain, outputJsonl } from "../output/text";
+import { assertNever } from "../core/assert.js";
+import { AkmError } from "../core/errors.js";
+import { getOutputMode } from "../output/context.js";
+import { DEFAULT_TEMPLATE, deliverRendered, escapeHtml, renderHtml, resolveTemplatePath } from "../output/html-render.js";
+import { shapeForCommand } from "../output/shapes.js";
+import { formatPlain, outputJsonl } from "../output/text.js";
 // ── Exit codes ───────────────────────────────────────────────────────────────
 /**
  * Canonical process exit-code table for the akm CLI. Single source of truth —
@@ -22,6 +25,7 @@ import { formatPlain, outputJsonl } from "../output/text";
  *   1  general / not-found
  *   2  usage error
  *   4  health warn (health command only)
+ *  70  internal / unclassified (sysexits EX_SOFTWARE — akm threw unexpectedly)
  *  78  config error
  */
 export const EXIT_CODES = {
@@ -29,17 +33,35 @@ export const EXIT_CODES = {
     GENERAL: 1,
     USAGE: 2,
     HEALTH_WARN: 4,
+    // sysexits.h EX_SOFTWARE. Distinct from GENERAL(1) so scripts can tell an
+    // expected "not found" outcome from akm itself throwing an unexpected error.
+    INTERNAL: 70,
     CONFIG: 78,
 };
 // ── Helpers ──────────────────────────────────────────────────────────────────
+/**
+ * Map a thrown value to a process exit code.
+ *
+ * Known, classified errors (instances of `AkmError`) are dispatched through an
+ * exhaustive switch on the `kind` discriminant — `assertNever` makes a missing
+ * case a compile-time error, so adding a new error class can't silently inherit
+ * the wrong code. Anything that is NOT an `AkmError` is treated as a genuinely
+ * unexpected internal failure and maps to INTERNAL(70) rather than GENERAL(1),
+ * so callers can distinguish "akm threw" from a normal not-found outcome.
+ */
 function classifyExitCode(error) {
-    if (error instanceof UsageError)
-        return EXIT_CODES.USAGE;
-    if (error instanceof ConfigError)
-        return EXIT_CODES.CONFIG;
-    if (error instanceof NotFoundError)
-        return EXIT_CODES.GENERAL;
-    return EXIT_CODES.GENERAL;
+    if (!(error instanceof AkmError))
+        return EXIT_CODES.INTERNAL;
+    switch (error.kind) {
+        case "usage":
+            return EXIT_CODES.USAGE;
+        case "config":
+            return EXIT_CODES.CONFIG;
+        case "not-found":
+            return EXIT_CODES.GENERAL;
+        default:
+            return assertNever(error.kind, "classifyExitCode");
+    }
 }
 function extractHint(error) {
     if (error instanceof Error && "hint" in error && typeof error.hint === "function") {
@@ -55,9 +77,9 @@ export function emitJsonError(error) {
     const message = error instanceof Error ? error.message : String(error);
     const hint = extractHint(error);
     const exitCode = classifyExitCode(error);
-    const code = error instanceof UsageError || error instanceof ConfigError || error instanceof NotFoundError
-        ? error.code
-        : undefined;
+    // Classified akm errors carry a stable machine-readable `code`; unexpected
+    // internal errors have none.
+    const code = error instanceof AkmError ? error.code : undefined;
     console.error(JSON.stringify({ ok: false, error: message, ...(code ? { code } : {}), hint }, null, 2));
     process.exit(exitCode);
 }
@@ -74,7 +96,26 @@ export async function runWithJsonErrors(fn) {
     }
 }
 /**
- * Render a command result according to the active output mode (json/jsonl/yaml/text).
+ * Define a citty command whose `run` body is automatically wrapped in
+ * `runWithJsonErrors`, so the handler emits a byte-identical JSON error
+ * envelope (stdout/stderr/exit-code) on throw without the boilerplate. A
+ * command without a `run` (a pure subcommand group) is passed through
+ * unchanged.
+ */
+export function defineJsonCommand(def) {
+    const { run, ...rest } = def;
+    if (!run)
+        return defineCommand({ ...rest });
+    return defineCommand({
+        ...rest,
+        run: (context) => runWithJsonErrors(() => run(context)),
+    });
+}
+/**
+ * Render a command result according to the active output mode
+ * (json/jsonl/yaml/text/md/html). When `--output <path>` is set, the rendered
+ * document is written to that file instead of stdout (jsonl excepted — it is
+ * a line-streaming protocol and always goes to stdout).
  */
 export function output(command, result) {
     const mode = getOutputMode();
@@ -85,14 +126,14 @@ export function output(command, result) {
     }
     switch (mode.format) {
         case "json":
-            console.log(JSON.stringify(shaped, null, 2));
+            deliverRendered(JSON.stringify(shaped, null, 2), mode.outputPath);
             return;
         case "yaml":
-            console.log(yamlStringify(shaped));
+            deliverRendered(yamlStringify(shaped), mode.outputPath);
             return;
         case "text": {
             const plain = formatPlain(command, shaped, mode.detail);
-            console.log(plain ?? JSON.stringify(shaped, null, 2));
+            deliverRendered(plain ?? JSON.stringify(shaped, null, 2), mode.outputPath);
             return;
         }
         case "md":
@@ -100,8 +141,20 @@ export function output(command, result) {
             // per-run / window-compare table renderings. Commands that don't
             // implement an md renderer fall back to the JSON envelope so
             // pipelines never get an empty stdout.
-            console.log(JSON.stringify(shaped, null, 2));
+            deliverRendered(JSON.stringify(shaped, null, 2), mode.outputPath);
             return;
+        case "html": {
+            // Generic fallback: render the JSON envelope inside the dark-mode
+            // default template. Commands with a bespoke HTML template (`akm health`)
+            // intercept before reaching output(), same as the `md` intercept.
+            const html = renderHtml(resolveTemplatePath(DEFAULT_TEMPLATE), {
+                "%%COMMAND%%": escapeHtml(command),
+                "%%CONTENT_JSON%%": escapeHtml(JSON.stringify(shaped, null, 2)),
+                "%%GENERATED_AT%%": new Date().toISOString(),
+            });
+            deliverRendered(html, mode.outputPath);
+            return;
+        }
     }
 }
 /**

package/dist/cli-node.mjs

@@ -0,0 +1,26 @@
+#!/usr/bin/env node
+// 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/.
+
+// Node entry wrapper for akm.
+//
+// The primary entry `dist/cli.js` carries a `#!/usr/bin/env bun` shebang and,
+// when run under Node, relies on a text-import loader hook for its embedded
+// `.md`/`.xml` assets (Bun loads those natively; Node needs a hook). Those
+// imports are static and hoisted, so the hook MUST be registered before the
+// module graph is evaluated — i.e. before `cli.js` is imported. This wrapper
+// does exactly that: register the hook, then dynamically import the real CLI.
+//
+// Bun users never touch this file; it exists solely so `node dist/cli-node.mjs`
+// (and the `test:node-smoke` script / Node CI matrix) can run akm end-to-end.
+
+import { register } from "node:module";
+
+register("./text-import-hook.mjs", import.meta.url);
+
+// cli.js gates its startup block on `import.meta.main`, which is false when we
+// `import()` it here. Opt in explicitly so the CLI actually runs `runMain`.
+process.env.AKM_NODE_ENTRY = "1";
+
+await import("./cli.js");