akm-cli 0.0.20 → 0.0.21

package/dist/asset-spec.js

@@ -65,6 +65,12 @@ export function isRelevantAssetFile(assetType, fileName) {
 export function deriveCanonicalAssetName(assetType, typeRoot, filePath) {
     return ASSET_SPECS[assetType].toCanonicalName(typeRoot, filePath);
 }
+export function deriveCanonicalAssetNameFromStashRoot(assetType, stashRoot, filePath) {
+    const relPath = toPosix(path.relative(stashRoot, filePath));
+    const firstSegment = relPath.split("/").filter(Boolean)[0];
+    const typeRoot = firstSegment === TYPE_DIRS[assetType] ? path.join(stashRoot, firstSegment) : stashRoot;
+    return deriveCanonicalAssetName(assetType, typeRoot, filePath);
+}
 export function resolveAssetPathFromName(assetType, typeRoot, name) {
     return ASSET_SPECS[assetType].toAssetPath(typeRoot, name);
 }

package/dist/metadata.js

@@ -1,6 +1,6 @@
 import fs from "node:fs";
 import path from "node:path";
-import { deriveCanonicalAssetName, isRelevantAssetFile, TYPE_DIRS } from "./asset-spec";
+import { deriveCanonicalAssetName, deriveCanonicalAssetNameFromStashRoot, isRelevantAssetFile } from "./asset-spec";
 import { isAssetType } from "./common";
 import { buildFileContext, buildRenderContext, getRenderer, runMatchers } from "./file-context";
 import { parseFrontmatter, toStringOrUndefined } from "./frontmatter";
@@ -204,8 +204,6 @@ export function generateMetadata(dirPath, assetType, files, typeRoot = dirPath)
     }
     return { entries };
 }
-/** Set of all known type directory names (e.g. "scripts", "skills", "agents") */
-const TYPE_DIR_NAMES = new Set(Object.values(TYPE_DIRS));
 /**
  * Generate metadata for files using the matcher system instead of a fixed asset type.
  *
@@ -227,11 +225,9 @@ export function generateMetadataFlat(stashRoot, files) {
         // If the file lives under a known type directory, use that as the root
         // for canonical naming so names don't include the type prefix.
         // e.g. scripts/deploy.sh → "deploy.sh" not "scripts/deploy.sh"
-        const firstAncestor = ctx.ancestorDirs[0];
-        const effectiveRoot = firstAncestor && TYPE_DIR_NAMES.has(firstAncestor) ? path.join(stashRoot, firstAncestor) : stashRoot;
         const ext = path.extname(file).toLowerCase();
         const baseName = path.basename(file, ext);
-        const canonicalName = deriveCanonicalAssetName(assetType, effectiveRoot, file) ?? baseName;
+        const canonicalName = deriveCanonicalAssetNameFromStashRoot(assetType, stashRoot, file) ?? baseName;
         const entry = {
             name: canonicalName,
             type: assetType,

package/dist/stash-resolve.js

@@ -1,13 +1,25 @@
 import fs from "node:fs";
 import path from "node:path";
-import { isRelevantAssetFile, resolveAssetPathFromName, TYPE_DIRS } from "./asset-spec";
+import { deriveCanonicalAssetNameFromStashRoot, isRelevantAssetFile, resolveAssetPathFromName, TYPE_DIRS, } from "./asset-spec";
 import { hasErrnoCode, isWithin } from "./common";
 import { NotFoundError, UsageError } from "./errors";
+import { runMatchers } from "./file-context";
+import { walkStashFlat } from "./walker";
 /**
  * Resolve an asset path from a stash directory, type, and name.
  */
 export function resolveAssetPath(stashDir, type, name) {
-    return resolveInTypeDir(stashDir, TYPE_DIRS[type], type, name);
+    try {
+        return resolveInTypeDir(stashDir, TYPE_DIRS[type], type, name);
+    }
+    catch (error) {
+        if (!(error instanceof NotFoundError))
+            throw error;
+        const fallback = resolveByCanonicalName(stashDir, type, name);
+        if (fallback)
+            return fallback;
+        throw error;
+    }
 }
 /**
  * Try to resolve an asset path within a specific type directory.
@@ -53,3 +65,21 @@ function readTypeRootStat(root, type, name) {
         throw error;
     }
 }
+function resolveByCanonicalName(stashDir, type, name) {
+    const normalizedName = name.replace(/\\/g, "/");
+    for (const ctx of walkStashFlat(stashDir)) {
+        const match = runMatchers(ctx);
+        if (!match || match.type !== type)
+            continue;
+        const canonicalName = deriveCanonicalAssetNameFromStashRoot(type, stashDir, ctx.absPath);
+        if (canonicalName !== normalizedName)
+            continue;
+        const realTarget = fs.realpathSync(ctx.absPath);
+        const resolvedRoot = fs.realpathSync(stashDir);
+        if (!isWithin(realTarget, resolvedRoot)) {
+            throw new UsageError("Ref resolves outside the stash root.");
+        }
+        return realTarget;
+    }
+    return undefined;
+}

package/dist/stash-search.js

@@ -1,6 +1,6 @@
 import fs from "node:fs";
 import path from "node:path";
-import { deriveCanonicalAssetName, TYPE_DIRS } from "./asset-spec";
+import { deriveCanonicalAssetNameFromStashRoot } from "./asset-spec";
 import { loadConfig } from "./config";
 import { closeDatabase, getAllEntries, getEntryById, getEntryCount, getMeta, openDatabase, searchFts, searchVec, } from "./db";
 import { UsageError } from "./errors";
@@ -303,8 +303,7 @@ function substringSearch(query, searchType, limit, stashDir, sources, config) {
 // ── Hit building ────────────────────────────────────────────────────────────
 function buildDbHit(input) {
     const entryStashDir = findSourceForPath(input.path, input.sources)?.path ?? input.defaultStashDir;
-    const typeRoot = path.join(entryStashDir, TYPE_DIRS[input.entry.type]);
-    const canonical = deriveCanonicalAssetName(input.entry.type, typeRoot, input.path);
+    const canonical = deriveCanonicalAssetNameFromStashRoot(input.entry.type, entryStashDir, input.path);
     // Guard against path traversal when the file is outside the expected type root
     // (e.g. source detection fell back to defaultStashDir for a file from another source)
     const refName = canonical && !canonical.startsWith("../") && !canonical.startsWith("..\\") ? canonical : input.entry.name;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "akm-cli",
-  "version": "0.0.20",
+  "version": "0.0.21",
   "type": "module",
   "description": "CLI tool to search, open, and run extension assets from an akm stash directory.",
   "keywords": [