akm-cli 0.9.0-beta.45 → 0.9.0-beta.47

package/dist/llm/metadata-enhance.js

@@ -9,8 +9,8 @@
  * transport client in `client.ts`.
  */
 import metadataEnhanceSystemPrompt from "../assets/prompts/metadata-enhance-system.md" with { type: "text" };
-import { chatCompletion, parseJsonResponse } from "./client.js";
-import { tryLlmFeature } from "./feature-gate.js";
+import { parseJsonResponse } from "./client.js";
+import { callStructured } from "./structured-call.js";
 const SYSTEM_PROMPT = metadataEnhanceSystemPrompt;
 /**
  * Use an LLM to enhance a stash entry's metadata: improve description,
@@ -41,34 +41,39 @@ Generate improved metadata for this ${entry.type}. Return JSON with these fields
 - "tags": an array of 3-8 relevant keyword tags
 
 Return ONLY the JSON object, no explanation.`;
-    const runLlm = async () => {
-        const raw = await chatCompletion(config, [
+    // `parse` owns the raw response: the `!raw`/unparseable case ⇒ `{}`, plus the
+    // description/searchHints/tags shaping. `enhanceMetadata` never warns and
+    // never bumps telemetry, so `onError` (gated path only) just swallows to `{}`
+    // — identical to the surrounding control flow's pre-migration behaviour. The
+    // ungated path (akmConfig === undefined) propagates errors via callStructured.
+    return callStructured({
+        feature: "metadata_enhance",
+        akmConfig,
+        config,
+        messages: [
             { role: "system", content: SYSTEM_PROMPT },
             { role: "user", content: userPrompt },
-        ], { signal });
-        const parsed = parseJsonResponse(raw);
-        if (!parsed)
-            return {};
-        const result = {};
-        if (typeof parsed.description === "string" && parsed.description) {
-            result.description = parsed.description;
-        }
-        if (Array.isArray(parsed.searchHints)) {
-            result.searchHints = parsed.searchHints
-                .filter((s) => typeof s === "string" && s.trim().length > 0)
-                .slice(0, 8);
-        }
-        if (Array.isArray(parsed.tags)) {
-            result.tags = parsed.tags.filter((s) => typeof s === "string" && s.trim().length > 0).slice(0, 10);
-        }
-        return result;
-    };
-    // When no akmConfig is provided, bypass the feature gate entirely: run the
-    // LLM call directly and let errors propagate to the caller (pre-gate
-    // behaviour). When akmConfig is present, honour the feature flag and swallow
-    // errors to {} via tryLlmFeature.
-    if (akmConfig === undefined) {
-        return runLlm();
-    }
-    return tryLlmFeature("metadata_enhance", akmConfig, runLlm, {}, { timeoutMs: config.timeoutMs });
+        ],
+        request: { signal, timeoutMs: config.timeoutMs },
+        parse: (raw) => {
+            const parsed = raw ? parseJsonResponse(raw) : undefined;
+            if (!parsed)
+                return {};
+            const result = {};
+            if (typeof parsed.description === "string" && parsed.description) {
+                result.description = parsed.description;
+            }
+            if (Array.isArray(parsed.searchHints)) {
+                result.searchHints = parsed.searchHints
+                    .filter((s) => typeof s === "string" && s.trim().length > 0)
+                    .slice(0, 8);
+            }
+            if (Array.isArray(parsed.tags)) {
+                result.tags = parsed.tags.filter((s) => typeof s === "string" && s.trim().length > 0).slice(0, 10);
+            }
+            return result;
+        },
+        onError: () => ({}),
+        fallback: {},
+    });
 }

package/dist/llm/structured-call.js

@@ -0,0 +1,49 @@
+// 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/.
+import { chatCompletion, isContextSizeError, LlmCallError } from "./client.js";
+import { tryLlmFeature } from "./feature-gate.js";
+/**
+ * Classify a thrown LLM error into one of the three buckets. This is the single
+ * home for the `isContextSizeError -> html -> other` ladder that was previously
+ * inlined at every call site.
+ */
+export function classifyLlmError(err) {
+    const message = err instanceof Error ? err.message : String(err);
+    if (isContextSizeError(message))
+        return "context_limit";
+    if (err instanceof LlmCallError && err.code === "provider_html_error")
+        return "html";
+    return "other";
+}
+export async function callStructured(opts) {
+    const { feature, akmConfig, config, messages, request, parse, onError, fallback, onFallback } = opts;
+    const chat = request?.chat ?? chatCompletion;
+    const chatOptions = {
+        temperature: request?.temperature,
+        timeoutMs: request?.timeoutMs,
+        signal: request?.signal,
+        responseSchema: request?.responseSchema,
+        onRetryAttempt: request?.onRetryAttempt,
+    };
+    // UNGATED: run the chat+parse directly. Errors propagate — no `onError`
+    // funnel — matching the pre-gate behaviour of direct callers.
+    if (akmConfig === undefined) {
+        const raw = await chat(config, messages, chatOptions);
+        return parse(raw);
+    }
+    // GATED: run through `tryLlmFeature`. A throw inside is classified ONCE and
+    // routed to `onError`; `tryLlmFeature` returns `fallback` on disablement/timeout.
+    return tryLlmFeature(feature, akmConfig, async () => {
+        try {
+            const raw = await chat(config, messages, chatOptions);
+            return parse(raw);
+        }
+        catch (err) {
+            return onError(classifyLlmError(err), err);
+        }
+    }, fallback, {
+        timeoutMs: request?.timeoutMs,
+        onFallback,
+    });
+}

package/dist/output/shapes/passthrough.js

@@ -23,7 +23,6 @@ const PASSTHROUGH_COMMANDS = [
     "agent-result",
     "clone",
     "config",
-    "db-backups",
     "disable",
     "enable",
     "env-create",

package/dist/registry/providers/skills-sh.js

@@ -2,46 +2,12 @@
 // 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/.
 import { fetchWithRetry } from "../../core/common.js";
-import { rethrowIfTestIsolationError } from "../../core/errors.js";
-import { closeDatabase, getRegistryIndexCache, openDatabase, upsertRegistryIndexCache } from "../../indexer/db/db.js";
 import { md5Hex } from "../../runtime.js";
+import { fetchCachedJson } from "../../storage/repositories/registry-cache.js";
 import { registerProvider } from "../factory.js";
 // ── Constants ───────────────────────────────────────────────────────────────
 /** Per-query cache TTL in milliseconds (15 minutes). */
 const QUERY_CACHE_TTL_MS = 15 * 60 * 1000;
-// ── Cache DB lifecycle ────────────────────────────────────────────────────────
-/**
- * RAII-style lifecycle helper for the registry cache DB. Opens the DB (treating
- * a failed open exactly like the legacy fall-through: the bun-test isolation
- * guard is re-thrown, any other failure yields `db = undefined`), runs `fn`,
- * and guarantees the DB is closed in a `finally` after `fn` has fully settled
- * (the await is required: the callbacks are async, and closing before they
- * settle would tear the DB down mid-write).
- */
-async function withRegistryCacheDb(fn) {
-    let db;
-    try {
-        db = openDatabase();
-    }
-    catch (err) {
-        // Never mask the bun-test isolation guard as "DB unavailable".
-        rethrowIfTestIsolationError(err);
-        db = undefined;
-    }
-    try {
-        return await fn(db);
-    }
-    finally {
-        if (db) {
-            try {
-                closeDatabase(db);
-            }
-            catch {
-                /* ignore */
-            }
-        }
-    }
-}
 // ── Provider class ──────────────────────────────────────────────────────────
 class SkillsShProvider {
     type = "skills-sh";
@@ -66,131 +32,39 @@ class SkillsShProvider {
             return { hits: [], warnings: [`Registry ${label}: ${message}`] };
         }
     }
-    // ── v1-spec §3.1 surface ────────────────────────────────────────────────
-    async searchKits(q) {
-        const result = await this.search({
-            query: q.text,
-            limit: q.limit ?? 20,
-            includeAssets: false,
-        });
-        return result.hits.map((hit) => ({
-            id: hit.id,
-            title: hit.title,
-            summary: hit.description,
-            installRef: hit.installRef,
-            score: hit.score,
-        }));
-    }
-    async searchAssets(q) {
-        const result = await this.search({
-            query: q.text,
-            limit: q.limit ?? 20,
-            includeAssets: true,
-        });
-        return (result.assetHits ?? []).map((hit) => ({
-            kitId: hit.stash.id,
-            type: hit.assetType,
-            name: hit.assetName,
-            summary: hit.description,
-            cloneRef: hit.action.replace(/^akm add\s+/, ""),
-        }));
-    }
-    /**
-     * skills.sh has no `getKit` API — every entry corresponds to a GitHub
-     * repository whose metadata we already include in the search result. We
-     * synthesize a manifest from the search hit when the caller knows the stash
-     * id; if not present in the most recent results, return null.
-     */
-    async getKit(id) {
-        if (!id.startsWith("skills-sh:"))
-            return null;
-        const slug = id.slice("skills-sh:".length);
-        // Best-effort: the API gives us search-by-name; extract the leaf segment.
-        const segments = slug.split("/").filter(Boolean);
-        const leaf = segments[segments.length - 1] ?? slug;
-        const result = await this.search({ query: leaf, limit: 50, includeAssets: false });
-        const match = result.hits.find((hit) => hit.id === id);
-        if (!match)
-            return null;
-        return { id: match.id, installRef: match.installRef };
-    }
-    /**
-     * skills.sh entries are always GitHub repositories. Claim only refs whose
-     * parsed source is `github`; defer everything else (npm tarballs, local
-     * paths, raw git URLs) to other registries.
-     */
-    canHandle(ref) {
-        return ref.source === "github";
-    }
     async fetchSkills(query, limit) {
         // Build a stable DB cache key for this query
         const dbCacheKey = this.queryDbCacheKey(query, limit);
-        return withRegistryCacheDb(async (db) => {
-            // ── Step 1: Try DB cache (index.db) ───────────────────────────────────
-            let dbCacheResult;
-            try {
-                if (db) {
-                    dbCacheResult = getRegistryIndexCache(db, dbCacheKey, QUERY_CACHE_TTL_MS);
-                }
-            }
-            catch (err) {
-                // Never mask the bun-test isolation guard as "DB unavailable" — see
-                // rethrowIfTestIsolationError in src/core/errors.ts. Without this,
-                // a leaky test silently gets a cold cache + fresh fetch instead of
-                // the loud TEST_ISOLATION_MISSING failure the guard intends.
-                rethrowIfTestIsolationError(err);
-                // index.db not available yet (pre-migration install or test env) — fall through
-            }
-            if (dbCacheResult) {
+        const baseUrl = this.config.url.replace(/\/+$/, "");
+        const url = `${baseUrl}/api/search?q=${encodeURIComponent(query)}&limit=${limit}`;
+        return fetchCachedJson({
+            cacheKey: dbCacheKey,
+            ttlMs: QUERY_CACHE_TTL_MS,
+            // A fresh hit returns even an empty array; a stale fallback only when
+            // non-empty. Corrupt cache JSON is swallowed and treated as a miss.
+            parseCache: (json, { stale }) => {
                 try {
-                    const parsed = JSON.parse(dbCacheResult.indexJson);
-                    if (Array.isArray(parsed)) {
-                        const entries = parsed.filter(isValidSkillsEntry);
-                        return entries;
-                    }
+                    const parsed = JSON.parse(json);
+                    if (!Array.isArray(parsed))
+                        return undefined;
+                    const entries = parsed.filter(isValidSkillsEntry);
+                    if (stale && entries.length === 0)
+                        return undefined;
+                    return entries;
                 }
                 catch {
-                    /* corrupt DB entry — fall through */
+                    return undefined;
                 }
-            }
-            // ── Step 2: Fetch from API ─────────────────────────────────────────────
-            const baseUrl = this.config.url.replace(/\/+$/, "");
-            const url = `${baseUrl}/api/search?q=${encodeURIComponent(query)}&limit=${limit}`;
-            try {
+            },
+            fetchFresh: async () => {
                 const response = await fetchWithRetry(url, undefined, { timeout: 10_000, retries: 1 });
                 if (!response.ok) {
                     throw new Error(`HTTP ${response.status}`);
                 }
                 const data = (await response.json());
                 const entries = parseSkillsResponse(data);
-                // Write to DB cache (primary)
-                if (db) {
-                    try {
-                        upsertRegistryIndexCache(db, dbCacheKey, JSON.stringify(entries));
-                    }
-                    catch {
-                        /* best-effort */
-                    }
-                }
-                return entries;
-            }
-            catch (err) {
-                // Fetch failed — use stale DB cache if available
-                if (dbCacheResult) {
-                    try {
-                        const parsed = JSON.parse(dbCacheResult.indexJson);
-                        if (Array.isArray(parsed)) {
-                            const entries = parsed.filter(isValidSkillsEntry);
-                            if (entries.length > 0)
-                                return entries;
-                        }
-                    }
-                    catch {
-                        /* ignore */
-                    }
-                }
-                throw err;
-            }
+                return { value: entries, cacheJson: JSON.stringify(entries) };
+            },
         });
     }
     mapToHits(entries) {

package/dist/registry/providers/static-index.js

@@ -2,10 +2,10 @@
 // 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/.
 import { fetchWithRetry, jsonWithByteCap, toErrorMessage } from "../../core/common.js";
-import { rethrowIfTestIsolationError } from "../../core/errors.js";
-import { closeDatabase, getRegistryIndexCache, openDatabase, upsertRegistryIndexCache } from "../../indexer/db/db.js";
 import { asString } from "../../integrations/github.js";
+import { fetchCachedJson } from "../../storage/repositories/registry-cache.js";
 import { registerProvider } from "../factory.js";
+import { buildInstallRef } from "../resolve.js";
 // ── Constants ───────────────────────────────────────────────────────────────
 /** Cache TTL in milliseconds (1 hour). */
 const CACHE_TTL_MS = 60 * 60 * 1000;
@@ -30,51 +30,6 @@ class StaticIndexProvider {
         }
         return { hits, assetHits, warnings: warnings.length > 0 ? warnings : undefined };
     }
-    // ── v1-spec §3.1 surface ────────────────────────────────────────────────
-    async searchKits(q) {
-        const result = await this.search({
-            query: q.text,
-            limit: q.limit ?? 20,
-            includeAssets: false,
-        });
-        return result.hits.map(hitToKitResult);
-    }
-    async searchAssets(q) {
-        const result = await this.search({
-            query: q.text,
-            limit: q.limit ?? 20,
-            includeAssets: true,
-        });
-        return (result.assetHits ?? []).map(assetHitToPreview);
-    }
-    async getKit(id) {
-        const allKits = await this.loadAllKits([]);
-        const found = allKits.find(({ stash }) => stash.id === id);
-        if (!found)
-            return null;
-        const installRef = buildInstallRef(found.stash.source, found.stash.ref);
-        return {
-            id: found.stash.id,
-            installRef,
-            assets: found.stash.assets?.map((asset) => ({
-                kitId: found.stash.id,
-                type: asset.type,
-                name: asset.name,
-                summary: asset.description,
-                cloneRef: installRef,
-            })),
-        };
-    }
-    /**
-     * Static-index doesn't own a URL prefix — any `ParsedRegistryRef` could
-     * theoretically be backed by an entry in some static-index registry. We
-     * therefore claim every ref. The orchestrator picks the first matching
-     * provider, and `static-index` is registered first by `index.ts`, so this
-     * is effectively the default catch-all.
-     */
-    canHandle(_ref) {
-        return true;
-    }
     // ── Internals ───────────────────────────────────────────────────────────
     async loadAllKits(warnings) {
         const allKits = [];
@@ -94,84 +49,17 @@ class StaticIndexProvider {
         return allKits;
     }
 }
-function hitToKitResult(hit) {
-    return {
-        id: hit.id,
-        title: hit.title,
-        summary: hit.description,
-        installRef: hit.installRef,
-        score: hit.score,
-    };
-}
-function assetHitToPreview(hit) {
-    return {
-        kitId: hit.stash.id,
-        type: hit.assetType,
-        name: hit.assetName,
-        summary: hit.description,
-        cloneRef: hit.action.replace(/^akm add\s+/, ""),
-    };
-}
 // ── Self-register ───────────────────────────────────────────────────────────
 registerProvider("static-index", (config) => new StaticIndexProvider(config));
 // ── Index loading with cache ────────────────────────────────────────────────
-/**
- * RAII-style lifecycle helper for the registry cache DB. Opens the DB (treating
- * a failed open exactly like the legacy fall-through: the bun-test isolation
- * guard is re-thrown, any other failure yields `db = undefined`), runs `fn`,
- * and guarantees the DB is closed in a `finally` after `fn` has fully settled
- * (the await is required: the callbacks are async, and closing before they
- * settle would tear the DB down mid-write).
- */
-async function withRegistryCacheDb(fn) {
-    let db;
-    try {
-        db = openDatabase();
-    }
-    catch (err) {
-        // Never mask the bun-test isolation guard as "DB unavailable".
-        rethrowIfTestIsolationError(err);
-        db = undefined;
-    }
-    try {
-        return await fn(db);
-    }
-    finally {
-        if (db) {
-            try {
-                closeDatabase(db);
-            }
-            catch {
-                /* ignore */
-            }
-        }
-    }
-}
 async function loadIndex(entry) {
-    return withRegistryCacheDb(async (db) => {
-        // ── Step 1: Try DB cache (index.db) ─────────────────────────────────────
-        let dbCacheResult;
-        try {
-            if (db) {
-                dbCacheResult = getRegistryIndexCache(db, entry.url, CACHE_TTL_MS);
-            }
-        }
-        catch (err) {
-            // Never mask the bun-test isolation guard as "DB unavailable" — see
-            // rethrowIfTestIsolationError in src/core/errors.ts. Without this, a
-            // leaky test silently gets a cold cache instead of the loud
-            // TEST_ISOLATION_MISSING failure the guard intends.
-            rethrowIfTestIsolationError(err);
-            // index.db read failed (pre-migration install or test env) — fall through
-        }
-        if (dbCacheResult) {
-            const index = parseRegistryIndex(JSON.parse(dbCacheResult.indexJson));
-            if (index) {
-                return index;
-            }
-        }
-        // ── Step 2: Fetch fresh index from remote ────────────────────────────────
-        try {
+    return fetchCachedJson({
+        cacheKey: entry.url,
+        ttlMs: CACHE_TTL_MS,
+        // Both the fresh hit and the stale fallback parse identically; a corrupt
+        // cache row lets JSON.parse throw out of the load (legacy behaviour).
+        parseCache: (json) => parseRegistryIndex(JSON.parse(json)) ?? undefined,
+        fetchFresh: async () => {
             const response = await fetchWithRetry(entry.url, undefined, { timeout: 10_000 });
             if (!response.ok) {
                 throw new Error(`HTTP ${response.status}`);
@@ -180,31 +68,13 @@ async function loadIndex(entry) {
             // responses from a compromised server would OOM us.
             const data = await jsonWithByteCap(response, 50 * 1024 * 1024);
             const index = parseRegistryIndex(data);
-            if (index) {
-                // Write to DB cache (primary)
-                if (db) {
-                    try {
-                        const etag = response.headers.get("etag") ?? undefined;
-                        const lastModified = response.headers.get("last-modified") ?? undefined;
-                        upsertRegistryIndexCache(db, entry.url, JSON.stringify(index), { etag, lastModified });
-                    }
-                    catch {
-                        /* best-effort */
-                    }
-                }
-                return index;
-            }
-            throw new Error("Invalid registry index format");
-        }
-        catch (err) {
-            // Fetch failed — use stale DB cache if available
-            if (dbCacheResult) {
-                const index = parseRegistryIndex(JSON.parse(dbCacheResult.indexJson));
-                if (index)
-                    return index;
+            if (!index) {
+                throw new Error("Invalid registry index format");
             }
-            throw err;
-        }
+            const etag = response.headers.get("etag") ?? undefined;
+            const lastModified = response.headers.get("last-modified") ?? undefined;
+            return { value: index, cacheJson: JSON.stringify(index), cacheOpts: { etag, lastModified } };
+        },
     });
 }
 export function isCacheExpired(mtimeMs) {
@@ -431,15 +301,3 @@ function asStringArray(value) {
     const filtered = value.filter((v) => typeof v === "string");
     return filtered.length > 0 ? filtered : undefined;
 }
-function buildInstallRef(source, ref) {
-    switch (source) {
-        case "npm":
-            return `npm:${ref}`;
-        case "git":
-            return `git+${ref}`;
-        case "local":
-            return `file:${ref}`;
-        default:
-            return `github:${ref}`;
-    }
-}

package/dist/registry/resolve.js

@@ -70,6 +70,19 @@ export function parseRegistryRef(rawRef) {
     }
     return parseGithubShorthand(ref, ref);
 }
+/** Inverse of {@link parseRegistryRef}: build the install ref for a source kind. */
+export function buildInstallRef(source, ref) {
+    switch (source) {
+        case "npm":
+            return `npm:${ref}`;
+        case "git":
+            return `git+${ref}`;
+        case "local":
+            return `file:${ref}`;
+        case "github":
+            return `github:${ref}`;
+    }
+}
 /**
  * Known prefixes that `parseRegistryRef` handles as installable sources.
  * Anything with a colon that doesn't start with one of these is likely a
@@ -105,16 +118,16 @@ function detectRegistrySearchId(ref) {
     return lines.join("\n");
 }
 export async function resolveRegistryArtifact(parsed) {
-    if (parsed.source === "npm") {
-        return resolveNpmArtifact(parsed);
-    }
-    if (parsed.source === "local") {
-        return resolveLocalArtifact(parsed);
-    }
-    if (parsed.source === "git") {
-        return resolveGitArtifact(parsed);
+    switch (parsed.source) {
+        case "npm":
+            return resolveNpmArtifact(parsed);
+        case "local":
+            return resolveLocalArtifact(parsed);
+        case "git":
+            return resolveGitArtifact(parsed);
+        case "github":
+            return resolveGithubArtifact(parsed);
     }
-    return resolveGithubArtifact(parsed);
 }
 function parseNpmRef(input, originalRef) {
     const trimmed = input.trim();