@musher-dev/musher-sdk 0.1.1 → 0.1.3

package/dist/index.cjs

@@ -641,46 +641,10 @@ var Selection = class {
         result.push(fh);
       }
     };
-    if (this._filter.skills) {
-      for (const name of this._filter.skills) {
-        const skill = this._bundle.skills().find((s) => s.name === name);
-        if (skill) {
-          for (const f of skill.files()) {
-            addFile(f);
-          }
-        }
-      }
-    }
-    if (this._filter.prompts) {
-      for (const name of this._filter.prompts) {
-        const prompt = this._bundle.prompts().find((p) => p.name === name);
-        if (prompt) {
-          for (const f of prompt.files()) {
-            addFile(f);
-          }
-        }
-      }
-    }
-    if (this._filter.toolsets) {
-      for (const name of this._filter.toolsets) {
-        const toolset = this._bundle.toolsets().find((t) => t.name === name);
-        if (toolset) {
-          for (const f of toolset.files()) {
-            addFile(f);
-          }
-        }
-      }
-    }
-    if (this._filter.agentSpecs) {
-      for (const name of this._filter.agentSpecs) {
-        const spec = this._bundle.agentSpecs().find((a) => a.name === name);
-        if (spec) {
-          for (const f of spec.files()) {
-            addFile(f);
-          }
-        }
-      }
-    }
+    this.collectFromCategory(this._bundle.skills(), this._filter.skills, addFile);
+    this.collectFromCategory(this._bundle.prompts(), this._filter.prompts, addFile);
+    this.collectFromCategory(this._bundle.toolsets(), this._filter.toolsets, addFile);
+    this.collectFromCategory(this._bundle.agentSpecs(), this._filter.agentSpecs, addFile);
     if (this._filter.paths) {
       for (const path of this._filter.paths) {
         const fh = this._bundle.file(path);
@@ -691,6 +655,19 @@ var Selection = class {
     }
     return result;
   }
+  collectFromCategory(items, names, addFile) {
+    if (!names) {
+      return;
+    }
+    for (const name of names) {
+      const item = items.find((i) => i.name === name);
+      if (item) {
+        for (const f of item.files()) {
+          addFile(f);
+        }
+      }
+    }
+  }
   skills() {
     const names = this._filter.skills;
     if (!names) {
@@ -1191,41 +1168,19 @@ var BundleCache = class {
   }
   /** Walk manifests, remove expired, collect digests from surviving ones. */
   async cleanManifests(referencedDigests) {
-    const manifestsRoot = (0, import_node_path5.join)(this.cacheDir, "manifests");
-    if (!(0, import_node_fs.existsSync)(manifestsRoot)) {
-      return;
-    }
-    for (const hostId of await safeReaddir(manifestsRoot)) {
-      const hostDir = (0, import_node_path5.join)(manifestsRoot, hostId);
-      if (!await isDir(hostDir)) {
-        continue;
+    await walkCacheTree((0, import_node_path5.join)(this.cacheDir, "manifests"), async (ns, slug, slugDir, file) => {
+      if (!file.endsWith(".json") || file.endsWith(".meta.json")) {
+        return;
       }
-      for (const ns of await safeReaddir(hostDir)) {
-        const nsDir = (0, import_node_path5.join)(hostDir, ns);
-        if (!await isDir(nsDir)) {
-          continue;
-        }
-        for (const slug of await safeReaddir(nsDir)) {
-          const slugDir = (0, import_node_path5.join)(nsDir, slug);
-          if (!await isDir(slugDir)) {
-            continue;
-          }
-          for (const file of await safeReaddir(slugDir)) {
-            if (!file.endsWith(".json") || file.endsWith(".meta.json")) {
-              continue;
-            }
-            const version = file.replace(JSON_EXT_RE, "");
-            const fresh = await this.isFresh(ns, slug, version);
-            if (fresh) {
-              await this.collectDigests((0, import_node_path5.join)(slugDir, file), referencedDigests);
-            } else {
-              await safeRm((0, import_node_path5.join)(slugDir, file));
-              await safeRm((0, import_node_path5.join)(slugDir, `${version}.meta.json`));
-            }
-          }
-        }
+      const version = file.replace(JSON_EXT_RE, "");
+      const fresh = await this.isFresh(ns, slug, version);
+      if (fresh) {
+        await this.collectDigests((0, import_node_path5.join)(slugDir, file), referencedDigests);
+      } else {
+        await safeRm((0, import_node_path5.join)(slugDir, file));
+        await safeRm((0, import_node_path5.join)(slugDir, `${version}.meta.json`));
       }
-    }
+    });
   }
   /** Collect blob digests referenced by a manifest file. */
   async collectDigests(manifestFile, digests) {
@@ -1242,38 +1197,16 @@ var BundleCache = class {
   }
   /** Walk refs and remove expired entries. */
   async cleanRefs() {
-    const refsRoot = (0, import_node_path5.join)(this.cacheDir, "refs");
-    if (!(0, import_node_fs.existsSync)(refsRoot)) {
-      return;
-    }
-    for (const hostId of await safeReaddir(refsRoot)) {
-      const hostDir = (0, import_node_path5.join)(refsRoot, hostId);
-      if (!await isDir(hostDir)) {
-        continue;
+    await walkCacheTree((0, import_node_path5.join)(this.cacheDir, "refs"), async (ns, slug, slugDir, file) => {
+      if (!file.endsWith(".json")) {
+        return;
       }
-      for (const ns of await safeReaddir(hostDir)) {
-        const nsDir = (0, import_node_path5.join)(hostDir, ns);
-        if (!await isDir(nsDir)) {
-          continue;
-        }
-        for (const slug of await safeReaddir(nsDir)) {
-          const slugDir = (0, import_node_path5.join)(nsDir, slug);
-          if (!await isDir(slugDir)) {
-            continue;
-          }
-          for (const file of await safeReaddir(slugDir)) {
-            if (!file.endsWith(".json")) {
-              continue;
-            }
-            const ref = file.replace(JSON_EXT_RE, "");
-            const version = await this.resolveRef(ns, slug, ref);
-            if (version === null) {
-              await safeRm((0, import_node_path5.join)(slugDir, file));
-            }
-          }
-        }
+      const ref = file.replace(JSON_EXT_RE, "");
+      const version = await this.resolveRef(ns, slug, ref);
+      if (version === null) {
+        await safeRm((0, import_node_path5.join)(slugDir, file));
       }
-    }
+    });
   }
   /** Remove blobs not referenced by any surviving manifest. */
   async gcBlobs(referencedDigests) {
@@ -1309,6 +1242,30 @@ function computeHostId(registryUrl) {
     return registryUrl.replace(/[:/]/g, "_");
   }
 }
+async function listSubdirs(parent) {
+  const result = [];
+  for (const name of await safeReaddir(parent)) {
+    const p = (0, import_node_path5.join)(parent, name);
+    if (await isDir(p)) {
+      result.push({ name, path: p });
+    }
+  }
+  return result;
+}
+async function walkCacheTree(root, visitor) {
+  if (!(0, import_node_fs.existsSync)(root)) {
+    return;
+  }
+  for (const host of await listSubdirs(root)) {
+    for (const ns of await listSubdirs(host.path)) {
+      for (const slug of await listSubdirs(ns.path)) {
+        for (const file of await safeReaddir(slug.path)) {
+          await visitor(ns.name, slug.name, slug.path, file);
+        }
+      }
+    }
+  }
+}
 async function isDir(path) {
   try {
     return (await (0, import_promises5.stat)(path)).isDirectory();
@@ -1556,40 +1513,43 @@ var HttpTransport = class {
     const headers = this.buildHeaders();
     let lastError;
     for (let attempt = 0; attempt <= this.config.retries; attempt++) {
-      try {
-        const init = { method, headers };
-        if (options?.body) {
-          init.body = JSON.stringify(options.body);
-        }
-        const response = await this.fetchWithTimeout(url, init);
-        if (!response.ok) {
-          const error = await this.mapError(response);
-          if (response.status === 429 || response.status >= 500) {
-            lastError = error;
-            if (attempt < this.config.retries) {
-              await this.backoff(attempt, error);
-              continue;
-            }
-          }
-          throw error;
-        }
-        const json = await response.json();
-        return this.parse(schema, json);
-      } catch (error) {
-        if (error instanceof ApiError) {
-          throw error;
-        }
-        if (error instanceof SchemaError) {
-          throw error;
-        }
-        lastError = error instanceof Error ? error : new Error(String(error));
-        if (attempt < this.config.retries) {
-          await this.backoff(attempt);
-        }
+      const result = await this.attemptRequest(method, url, headers, schema, options?.body);
+      if (result.ok) {
+        return result.value;
+      }
+      lastError = result.error;
+      if (!result.retryable || attempt >= this.config.retries) {
+        throw lastError;
       }
+      await this.backoff(attempt, lastError);
     }
     throw lastError ?? new NetworkError("Request failed after retries");
   }
+  async attemptRequest(method, url, headers, schema, body) {
+    try {
+      const init = { method, headers };
+      if (body) {
+        init.body = JSON.stringify(body);
+      }
+      const response = await this.fetchWithTimeout(url, init);
+      if (!response.ok) {
+        const error = await this.mapError(response);
+        const retryable = response.status === 429 || response.status >= 500;
+        return { ok: false, error, retryable };
+      }
+      const json = await response.json();
+      return { ok: true, value: this.parse(schema, json) };
+    } catch (error) {
+      if (error instanceof ApiError || error instanceof SchemaError) {
+        return { ok: false, error, retryable: false };
+      }
+      return {
+        ok: false,
+        error: error instanceof Error ? error : new Error(String(error)),
+        retryable: true
+      };
+    }
+  }
   buildUrl(path, params) {
     const base = this.config.baseUrl.replace(TRAILING_SLASH_RE, "");
     const url = new URL(`${base}${path}`);