akm-cli 0.9.0-beta.53 → 0.9.0-beta.55

package/dist/core/config/config-schema.js

@@ -846,6 +846,12 @@ export const AkmConfigShape = {
     semanticSearchMode: z.enum(["off", "auto"]).default("auto"),
     embedding: EmbeddingConnectionConfigSchema.optional(),
     index: IndexConfigSchema.optional(),
+    // The `installed[]` shape is OWNED by the registry (`InstalledStashEntry`):
+    // its `source` is the 4-value `InstallKind` produced by the registry ref
+    // parser, and installed entries never carry the extra passthrough keys. The
+    // schema still validates entries at runtime, but its OUTPUT type is pinned to
+    // the domain type so config consumers get the registry `InstalledStashEntry`
+    // (not a looser schema-local mirror) — the single-source-of-truth boundary.
     installed: z.array(InstalledStashEntrySchema).optional(),
     registries: z.array(RegistryConfigEntrySchema).optional(),
     sources: z.array(SourceConfigEntrySchema).optional(),

package/dist/core/config/config.js

@@ -278,7 +278,19 @@ export function loadConfig() {
     warnIfProjectConfigPresent(process.cwd());
     return loadUserConfig();
 }
+let saveConfigOverride;
+/** TEST-ONLY. Swap the implementation of `saveConfig`; pass undefined to restore. */
+export function _setSaveConfigForTests(fake) {
+    saveConfigOverride = fake;
+}
 export function saveConfig(config) {
+    if (saveConfigOverride) {
+        saveConfigOverride(config);
+        return;
+    }
+    saveConfigReal(config);
+}
+function saveConfigReal(config) {
     cachedConfig = undefined;
     const configPath = getConfigPath();
     const dir = path.dirname(configPath);

package/dist/core/deep-merge.js

@@ -0,0 +1,38 @@
+// 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/.
+/**
+ * Generic recursive object merge, extracted from the setup wizard (it is not
+ * setup-specific). Plain objects merge key-by-key; arrays and scalars replace
+ * wholesale. Used to apply a partial `--file` config over the existing config
+ * without dropping sibling subkeys.
+ */
+/** True for non-null, non-array plain objects. */
+export function isPlainObject(value) {
+    return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+/**
+ * Recursively merge `incoming` into `base`: plain objects merge key-by-key,
+ * while arrays and scalars replace wholesale. A partial input therefore only
+ * updates the keys it carries and never drops sibling subkeys (e.g. a file
+ * containing `{ output: { format: "text" } }` leaves `output.detail` intact).
+ *
+ * `base` is treated as immutable — a fresh object graph is returned.
+ */
+export function deepMergeConfig(base, incoming) {
+    if (!isPlainObject(incoming))
+        return incoming;
+    const baseObj = isPlainObject(base) ? base : {};
+    const out = { ...baseObj };
+    for (const [key, value] of Object.entries(incoming)) {
+        if (value === undefined)
+            continue;
+        if (isPlainObject(value) && isPlainObject(baseObj[key])) {
+            out[key] = deepMergeConfig(baseObj[key], value);
+        }
+        else {
+            out[key] = value;
+        }
+    }
+    return out;
+}

package/dist/core/events.js

@@ -25,9 +25,10 @@
  * - `ts` is ISO-8601 (UTC, millisecond precision).
  */
 import path from "node:path";
+import { insertEvent, readStateEvents } from "../storage/repositories/events-repository.js";
 import { rethrowIfTestIsolationError } from "./errors.js";
 import { getDataDir } from "./paths.js";
-import { insertEvent, openStateDatabase, readStateEvents, withStateDb } from "./state-db.js";
+import { openStateDatabase, withStateDb } from "./state-db.js";
 import { error } from "./warn.js";
 /**
  * Legacy events.jsonl path — used only by the migration script

package/dist/core/logs-db.js

@@ -37,11 +37,9 @@
  *
  * @module logs-db
  */
-import fs from "node:fs";
 import path from "node:path";
-import { openDatabase } from "../storage/database.js";
 import { runMigrations as runSqliteMigrations } from "../storage/engines/sqlite-migrations.js";
-import { applyStandardPragmas } from "../storage/sqlite-pragmas.js";
+import { openManagedDatabase } from "../storage/managed-db.js";
 import { getDataDir } from "./paths.js";
 // ── Path helper ──────────────────────────────────────────────────────────────
 /**
@@ -72,16 +70,13 @@ export function getLogsDbPath() {
  */
 export function openLogsDatabase(dbPath) {
     const resolvedPath = dbPath ?? getLogsDbPath();
-    const dir = path.dirname(resolvedPath);
-    if (!fs.existsSync(dir)) {
-        fs.mkdirSync(dir, { recursive: true });
-    }
-    const db = openDatabase(resolvedPath);
-    // PRAGMAs must run before any DDL or DML. foreignKeys:false preserves this
-    // opener's historical behaviour — logs.db has never enforced foreign keys.
-    applyStandardPragmas(db, { dataDir: dir, foreignKeys: false });
-    runMigrations(db);
-    return db;
+    // foreignKeys:false preserves this opener's historical behaviour — logs.db
+    // has never enforced foreign keys.
+    return openManagedDatabase({
+        path: resolvedPath,
+        pragmas: { dataDir: path.dirname(resolvedPath), foreignKeys: false },
+        init: runMigrations,
+    });
 }
 // ── Migrations ───────────────────────────────────────────────────────────────
 /**

package/dist/core/paths.js

@@ -115,8 +115,8 @@ export function getConfigPath() {
     return path.join(getConfigDir(), "config.json");
 }
 // ── Cache directory ──────────────────────────────────────────────────────────
-export function getCacheDir() {
-    const override = process.env.AKM_CACHE_DIR?.trim();
+export function getCacheDir(env = process.env) {
+    const override = env.AKM_CACHE_DIR?.trim();
     if (override)
         return override;
     // Explicit XDG/platform overrides win before the transient-stash isolation
@@ -125,13 +125,13 @@ export function getCacheDir() {
     // as set, so the AKM_STASH_DIR transient rule does not silently move cache
     // writes away from where they pointed them.
     if (IS_WINDOWS) {
-        const localAppData = process.env.LOCALAPPDATA?.trim();
+        const localAppData = env.LOCALAPPDATA?.trim();
         if (localAppData)
             return path.join(localAppData, "akm");
-        const userProfile = process.env.USERPROFILE?.trim();
+        const userProfile = env.USERPROFILE?.trim();
         if (userProfile)
             return path.join(userProfile, "AppData", "Local", "akm");
-        const appData = process.env.APPDATA?.trim();
+        const appData = env.APPDATA?.trim();
         if (appData) {
             // Heuristic fallback: APPDATA points to %APPDATA% (Roaming), so
             // navigate to the sibling "Local" directory. This is typically
@@ -141,7 +141,7 @@ export function getCacheDir() {
         }
     }
     else {
-        const xdgCacheHome = process.env.XDG_CACHE_HOME?.trim();
+        const xdgCacheHome = env.XDG_CACHE_HOME?.trim();
         if (xdgCacheHome)
             return path.join(xdgCacheHome, "akm");
     }
@@ -150,7 +150,7 @@ export function getCacheDir() {
     // into `${AKM_STASH_DIR}/.akm/cache` so that config backups, registry-index
     // cache, and other regenerable artifacts do not pollute the user's host
     // ~/.cache/akm directory.
-    const stashOverride = process.env.AKM_STASH_DIR?.trim();
+    const stashOverride = env.AKM_STASH_DIR?.trim();
     if (stashOverride && isTransientStashPath(stashOverride)) {
         return path.join(stashOverride, ".akm", "cache");
     }
@@ -158,7 +158,7 @@ export function getCacheDir() {
         // None of LOCALAPPDATA / USERPROFILE / APPDATA were set above.
         throw new ConfigError("Unable to determine cache directory. Set LOCALAPPDATA, USERPROFILE, or APPDATA.", "CONFIG_DIR_UNRESOLVABLE");
     }
-    const home = process.env.HOME?.trim();
+    const home = env.HOME?.trim();
     if (!home)
         return path.join("/tmp", "akm-cache");
     return path.join(home, ".cache", "akm");
@@ -257,17 +257,17 @@ export function getTaskHistoryDir() {
     return path.join(getCacheDir(), "tasks", "history");
 }
 // ── Default stash directory ──────────────────────────────────────────────────
-export function getDefaultStashDir() {
-    const override = process.env.AKM_STASH_DIR?.trim();
+export function getDefaultStashDir(env = process.env) {
+    const override = env.AKM_STASH_DIR?.trim();
     if (override)
         return override;
     if (IS_WINDOWS) {
-        const userProfile = process.env.USERPROFILE?.trim();
+        const userProfile = env.USERPROFILE?.trim();
         if (userProfile)
             return path.join(userProfile, "Documents", "akm");
         return path.join("C:\\", "akm");
     }
-    const home = process.env.HOME?.trim();
+    const home = env.HOME?.trim();
     if (!home) {
         throw new ConfigError("Unable to determine default stash directory. Set HOME.", "STASH_DIR_NOT_FOUND");
     }
@@ -294,7 +294,7 @@ export function getDefaultStashDir() {
  * is fine even though `~/.local` is refused). This catches fat-finger
  * `--dir /` or `--dir ~` without preventing legitimate nested use.
  */
-export function assertSafeStashDir(stashDir) {
+export function assertSafeStashDir(stashDir, env = process.env) {
     const resolved = path.resolve(stashDir);
     // Filesystem root — POSIX and Windows drive roots.
     if (resolved === "/" || /^[A-Za-z]:[\\/]?$/.test(resolved)) {
@@ -334,7 +334,7 @@ export function assertSafeStashDir(stashDir) {
     // under bun test (which isolates HOME to a tempdir while os.homedir()
     // still returns the real user's home).
     const candidateHomes = new Set();
-    const envHome = (process.env.HOME ?? process.env.USERPROFILE)?.trim();
+    const envHome = (env.HOME ?? env.USERPROFILE)?.trim();
     if (envHome)
         candidateHomes.add(path.resolve(envHome));
     try {