impel-cli 0.15.1 → 0.15.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "impel-cli",
-  "version": "0.15.1",
+  "version": "0.15.3",
   "description": "Configure Claude Code and Codex CLI to talk to Impel's gateway, authenticated by an Impel Personal Access Token",
   "type": "module",
   "bin": {

package/src/agents.js

@@ -29,6 +29,7 @@ const NATIVE_AGENT_TOOL_NAMES = [
 const SAFE_AGENT_ID_RE = /^[A-Za-z0-9_.:-]{1,160}$/u;
 const SAFE_SCOPE_PARAM_RE = /^[A-Za-z0-9_.:-]{1,160}$/u;
 const MAX_CATALOG_ITEMS = 500;
+const RETRYABLE_AGENT_CATALOG_ERROR = /request timed out|fetch failed|ECONNRESET|ETIMEDOUT|EAI_AGAIN|network error/iu;
 const RESERVED_AGENT_NAMES = Object.freeze({
   claude: new Set(["explore", "general-purpose", "plan"]),
   codex: new Set(["default", "explorer", "worker"]),
@@ -540,7 +541,14 @@ export async function syncAgentProfiles({
     .map((profile) => ({ ...profile, skipped: true, reason: "fresh" }));
   if (pending.length === 0) return skipped;
 
-  const catalog = await fetchCatalog({ gatewayUrl, credential, tenantId: normalizedTenant });
+  let catalog;
+  try {
+    catalog = await fetchCatalog({ gatewayUrl, credential, tenantId: normalizedTenant });
+  } catch (error) {
+    if (!RETRYABLE_AGENT_CATALOG_ERROR.test(String(error?.message || error))) throw error;
+    logger.log("Agents: catalog request failed transiently; retrying once…");
+    catalog = await fetchCatalog({ gatewayUrl, credential, tenantId: normalizedTenant });
+  }
   const results = [];
   for (const profile of pending) {
     const result = syncAgentProfile({

package/src/skills.js

@@ -34,6 +34,7 @@ export const SKILLS_FALLBACK_GATEWAY_URL = "https://gateway.useimpel.ai";
 // and Claude both exit non-zero when a marketplace/plugin is already present, so
 // these must not be reported as real failures.
 const BENIGN_OUTPUT = /already (exist|install|add|present|configur)|up[ -]?to[ -]?date|no changes|nothing to (do|update)/i;
+const TRANSIENT_SKILL_OUTPUT = /timed? out|timeout of \d+ms exceeded|ECONNRESET|ETIMEDOUT|EAI_AGAIN|network error|failed to download/i;
 
 const CLIENT_SPECS = {
   claude: {
@@ -74,6 +75,27 @@ export function resolveMarketplaceName(marketplace) {
   return typeof name === "string" && name.trim() ? name.trim() : null;
 }
 
+/** Resolve a marketplace name from Claude or Codex `marketplace list --json`. */
+export function resolveConfiguredMarketplaceName(output, sourceUrl) {
+  let payload;
+  try {
+    payload = JSON.parse(String(output || ""));
+  } catch {
+    return null;
+  }
+  const marketplaces = Array.isArray(payload)
+    ? payload
+    : payload?.marketplaces;
+  if (!Array.isArray(marketplaces)) return null;
+  const normalizedSource = String(sourceUrl || "").replace(/\/+$/u, "");
+  const marketplace = marketplaces.find((candidate) => {
+    const source = candidate?.url || candidate?.marketplaceSource?.source;
+    return typeof source === "string"
+      && source.replace(/\/+$/u, "") === normalizedSource;
+  });
+  return resolveMarketplaceName(marketplace);
+}
+
 /**
  * Resolve the gateway URL for skill serving. Reuses the CLI's configured gateway
  * (the caller passes `config.gatewayUrl`), then the env/default from config.js,
@@ -258,6 +280,18 @@ function isBenign(result) {
   return result.ok || BENIGN_OUTPUT.test(`${result.stdout}\n${result.stderr}`);
 }
 
+async function runSkillCommandWithRetry(run, bin, args, env) {
+  const first = await run(bin, args, env);
+  if (
+    first.ok
+    || first.missing
+    || !TRANSIENT_SKILL_OUTPUT.test(`${first.stdout}\n${first.stderr}`)
+  ) {
+    return first;
+  }
+  return run(bin, args, env);
+}
+
 /** Fetch the marketplace.json and return its registered name, or null on any failure. */
 export async function fetchMarketplaceName(url, fetchImpl = fetch) {
   const controller = new AbortController();
@@ -317,13 +351,51 @@ export async function syncSkills({
 
     const manifestUrl = marketplaceUrl(gatewayUrl, client);
     const sourceUrl = marketplaceSourceUrl(gatewayUrl, client);
-    const marketplaceName = await fetchMarketplaceName(manifestUrl, fetchImpl);
-    const commands = buildSkillCommands({ client, marketplaceSourceUrl: sourceUrl, marketplaceName });
+    let marketplaceName = await fetchMarketplaceName(manifestUrl, fetchImpl);
 
     logger.log(`Skills: syncing ${SKILL_PLUGIN_NAME} for ${displayLabel}…`);
     const failures = [];
+    const registerCommand = buildSkillCommands({
+      client,
+      marketplaceSourceUrl: sourceUrl,
+      marketplaceName,
+    })[0];
+    const registerResult = await runSkillCommandWithRetry(
+      run,
+      spec.bin,
+      registerCommand.args,
+      env,
+    );
+    if (registerResult.missing) {
+      failures.push({ phase: registerCommand.phase, reason: `\`${spec.bin}\` disappeared mid-sync` });
+    } else if (!isBenign(registerResult)) {
+      failures.push({
+        phase: registerCommand.phase,
+        reason: firstLine(registerResult.stderr) || `exit ${registerResult.status}`,
+      });
+    }
+
+    // The public manifest fetch is deliberately best-effort and can time out.
+    // Once either client has registered the marketplace, its local JSON index
+    // gives us the same dynamic name so refreshes can still use
+    // PLUGIN@MARKETPLACE.
+    if (!marketplaceName && !registerResult.missing) {
+      const listed = await run(spec.bin, ["plugin", "marketplace", "list", "--json"], env);
+      if (listed.ok) marketplaceName = resolveConfiguredMarketplaceName(listed.stdout, sourceUrl);
+    }
+
+    const commands = registerResult.missing ? [] : buildSkillCommands({
+      client,
+      marketplaceSourceUrl: sourceUrl,
+      marketplaceName,
+    }).slice(1);
     for (const command of commands) {
-      const result = await run(spec.bin, command.args, env);
+      const result = await runSkillCommandWithRetry(
+        run,
+        spec.bin,
+        command.args,
+        env,
+      );
       if (result.missing) {
         failures.push({ phase: command.phase, reason: `\`${spec.bin}\` disappeared mid-sync` });
         break;