@zeroxyz/cli 1.14.0 → 1.14.1

package/dist/index.js

@@ -78576,7 +78576,7 @@ init_esm_shims();
 
 // package.json
 var package_default = {
-  version: "1.14.0"};
+  version: "1.14.1"};
 
 // src/app.ts
 init_esm_shims();
@@ -149881,6 +149881,7 @@ var SKILL_DIRS = [".claude/skills", ".agents/skills"];
 var CLAUDE_SETTINGS_PATH = ".claude/settings.json";
 var CODEX_HOOKS_PATH = ".codex/hooks.json";
 var CLI_VERSION = package_default.version;
+var installStepTimeoutMs = () => Number(process.env.ZERO_INIT_STEP_TIMEOUT_MS ?? 12e4);
 var STANDALONE = "standalone";
 var unique = (items) => [...new Set(items)];
 var buildSelection = (standalone, matrixIds) => {
@@ -149903,7 +149904,13 @@ var commandOutput = (result) => {
   return chunks.join("\n").trim();
 };
 var commandErrorDetail = (result, fallback2) => {
-  if (result.error) return result.error.message;
+  if (result.error) {
+    const code = result.error.code;
+    if (code === "ETIMEDOUT") {
+      return `${fallback2} timed out after ${installStepTimeoutMs() / 1e3}s (is it waiting for interactive input?)`;
+    }
+    return result.error.message;
+  }
   const output = commandOutput(result);
   if (output.length > 0) return truncateError(output);
   if (result.signal) return `${fallback2} exited via signal ${result.signal}`;
@@ -149945,7 +149952,8 @@ var installAgentPlugin = (entry, method, options) => {
     const result = spawnSync(step.command, step.args, {
       encoding: "utf8",
       stdio: "pipe",
-      env: process.env
+      env: process.env,
+      timeout: installStepTimeoutMs()
     });
     if (result.status === 0) continue;
     const detail = commandErrorDetail(result, step.label);
@@ -150083,9 +150091,13 @@ var buildHookTargets = (entries) => {
 };
 var runStandaloneInit = async (appContext, options = {}) => {
   const verbose = options.verbose ?? false;
+  const includeDefaultSkillDirs = options.includeDefaultSkillDirs ?? true;
+  const requireHookScripts = options.requireHookScripts ?? true;
   options.onStep?.("fetch");
   console.log("");
-  console.log(`  ${color.boldCyan("Installing standalone Zero fallback")}`);
+  console.log(
+    `  ${color.boldCyan(options.title ?? "Installing standalone Zero fallback")}`
+  );
   console.log("");
   console.log(color.gray("  \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500"));
   console.log("");
@@ -150095,33 +150107,39 @@ var runStandaloneInit = async (appContext, options = {}) => {
   const hookScriptNames = unique(
     hookTargets.flatMap((target) => fragmentScriptNames(target.fragment))
   );
-  if (hookScriptNames.length === 0) {
+  if (hookScriptNames.length === 0 && requireHookScripts) {
     throw new Error(
       "the agent matrix declared no standalone hook scripts to install"
     );
   }
-  const skillMd = await fetchText(`${webBase}/SKILL.md`);
-  if (verbose) {
-    stepInfo(`fetched ${webBase}/SKILL.md`);
-  }
-  options.onStep?.("skill");
   const skillsDirs = unique([
-    ...SKILL_DIRS.map((dir) => join(home, dir)),
+    ...includeDefaultSkillDirs ? SKILL_DIRS.map((dir) => join(home, dir)) : [],
     ...(options.skillsDir ?? []).map((dir) => expandHome(dir, home))
   ]);
-  const skillsInstalled = installSkill(skillsDirs, skillMd, verbose);
-  if (skillsInstalled.length === 0) {
-    throw new Error("could not write the Zero skill to any skills directory");
+  let skillsInstalled = [];
+  if (skillsDirs.length > 0) {
+    const skillMd = await fetchText(`${webBase}/SKILL.md`);
+    if (verbose) {
+      stepInfo(`fetched ${webBase}/SKILL.md`);
+    }
+    options.onStep?.("skill");
+    skillsInstalled = installSkill(skillsDirs, skillMd, verbose);
+    if (skillsInstalled.length === 0) {
+      throw new Error("could not write the Zero skill to any skills directory");
+    }
+    stepSuccess("Skill installed", `${skillsInstalled.length} locations`);
   }
-  stepSuccess("Skill installed", `${skillsInstalled.length} locations`);
   options.onStep?.("hooks");
-  const hookScriptsInstalled = await installHookScripts(
-    home,
-    hookScriptNames,
-    webBase,
-    verbose
-  );
-  stepSuccess("Hook scripts installed", "~/.zero/hooks");
+  let hookScriptsInstalled = [];
+  if (hookScriptNames.length > 0) {
+    hookScriptsInstalled = await installHookScripts(
+      home,
+      hookScriptNames,
+      webBase,
+      verbose
+    );
+    stepSuccess("Hook scripts installed", "~/.zero/hooks");
+  }
   options.onStep?.("settings");
   const registeredFiles = /* @__PURE__ */ new Set();
   for (const target of hookTargets) {
@@ -150183,7 +150201,6 @@ var runInit = async (appContext, options = {}) => {
       entries.map((entry) => entry.id)
     );
     const requestedAgents = selection.requestedAgents;
-    console.log(`  Requested agents: ${requestedAgents.join(", ")}`);
     if (dryRun) stepInfo("dry run: no plugin commands or file writes will run");
     const detections = selection.kind === "standalone" ? [] : selection.pluginAgents.flatMap((id) => {
       const entry = entryById.get(id);
@@ -150198,7 +150215,10 @@ var runInit = async (appContext, options = {}) => {
     console.log("");
     const fallbackSkillDirs = [];
     const standaloneOnlyAgents = [];
+    const standaloneNeedAgents = [];
+    const hasStandaloneBits = (entry) => (entry.standalone?.skills ?? []).length > 0 || Boolean(entry.standalone?.hooks?.merge);
     const pluginResults = [];
+    let undetectedCount = 0;
     for (const detection of detections) {
       const { entry, present, exeCallable, method } = detection;
       if (present && exeCallable && method) {
@@ -150210,12 +150230,14 @@ var runInit = async (appContext, options = {}) => {
           stepSkip(`${entry.name}: ${statusLabel(result2)}`, result2.detail);
         } else {
           stepWarn(`${entry.name}: ${statusLabel(result2)}`, result2.detail);
+          if (hasStandaloneBits(entry)) standaloneNeedAgents.push(entry);
         }
         continue;
       }
       if (present && !method) {
-        if ((entry.standalone?.skills ?? []).length > 0) {
+        if (hasStandaloneBits(entry)) {
           standaloneOnlyAgents.push(entry);
+          standaloneNeedAgents.push(entry);
         } else {
           const result2 = {
             agent: entry.id,
@@ -150236,13 +150258,26 @@ var runInit = async (appContext, options = {}) => {
         detail
       };
       pluginResults.push(result);
-      stepSkip(`${entry.name}: ${statusLabel(result)}`, result.detail);
+      if (present) {
+        stepSkip(`${entry.name}: ${statusLabel(result)}`, result.detail);
+      } else if (verbose) {
+        stepSkip(`${entry.name}: not detected`, result.detail);
+      } else {
+        undetectedCount += 1;
+      }
       if (present && !exeCallable) {
         for (const dir of entry.standalone?.skills ?? []) {
           fallbackSkillDirs.push(join(home, dir));
         }
+        if (hasStandaloneBits(entry)) standaloneNeedAgents.push(entry);
       }
     }
+    if (undetectedCount > 0) {
+      stepSkip(
+        `${undetectedCount} other supported ${undetectedCount === 1 ? "harness" : "harnesses"} not detected`,
+        "run with --verbose to list them"
+      );
+    }
     const standaloneOnlyDirs = unique(
       standaloneOnlyAgents.flatMap(
         (entry) => (entry.standalone?.skills ?? []).map((dir) => join(home, dir))
@@ -150304,39 +150339,55 @@ var runInit = async (appContext, options = {}) => {
       console.log(
         "  Standalone fallback not used: at least one harness plugin install succeeded."
       );
-      if (standaloneOnlyDirs.length > 0) {
-        currentStep = "skill";
-        if (dryRun) {
-          for (const dir of standaloneOnlyDirs) {
+      if (standaloneNeedAgents.length > 0) {
+        const needNames = standaloneNeedAgents.map((entry) => entry.id).join(", ");
+        const needDirs = unique(
+          standaloneNeedAgents.flatMap(
+            (entry) => (entry.standalone?.skills ?? []).map((dir) => join(home, dir))
+          )
+        );
+        const needTargets = buildHookTargets(standaloneNeedAgents);
+        if (!fallbackAllowed) {
+          stepSkip(
+            `--no-fallback: skipping standalone install for ${needNames}`
+          );
+        } else if (dryRun) {
+          for (const dir of needDirs) {
             stepInfo(`would install/update ${join(dir, "zero")}`);
           }
+          for (const target of needTargets) {
+            stepInfo(
+              `would register standalone hooks in ~/${target.relativePath}`
+            );
+          }
         } else {
-          const skillMd = await fetchText(
-            `${appContext.env.ZERO_WEB_URL}/SKILL.md`
-          );
-          const installed = installSkill(standaloneOnlyDirs, skillMd, verbose);
-          standaloneResult = {
-            ...standaloneResult,
-            skillsInstalled: installed
-          };
+          standaloneResult = await runStandaloneInit(appContext, {
+            verbose,
+            skillsDir: unique([...options.skillsDir ?? [], ...needDirs]),
+            includeDefaultSkillDirs: false,
+            hookTargets: needTargets,
+            requireHookScripts: false,
+            title: `Installing standalone Zero for: ${needNames}`,
+            onStep: (step) => {
+              currentStep = step;
+            }
+          });
         }
       }
     }
     for (const entry of standaloneOnlyAgents) {
+      const what = entry.standalone?.hooks?.merge ? "standalone skill + hooks" : "standalone skill";
       const result = {
         agent: entry.id,
         displayName: entry.name,
         status: dryRun ? "would_install" : "installed",
-        detail: "standalone skill (no plugin for this harness)"
+        detail: `${what} (no plugin for this harness)`
       };
       pluginResults.push(result);
       if (dryRun) {
-        stepSkip(
-          `${entry.name}: would install standalone skill`,
-          result.detail
-        );
+        stepSkip(`${entry.name}: would install ${what}`, result.detail);
       } else {
-        stepSuccess(`${entry.name}: standalone skill installed`, result.detail);
+        stepSuccess(`${entry.name}: ${what} installed`, result.detail);
       }
     }
     currentStep = "complete";
@@ -150369,6 +150420,13 @@ var runInit = async (appContext, options = {}) => {
     });
     sectionDivider();
     console.log(`  ${color.boldGreen("Zero init complete.")}`);
+    const skillPath = standaloneResult.skillsInstalled[0];
+    if (skillPath) {
+      console.log(`  ${color.dim(`Skill installed at: ${skillPath}`)}`);
+      console.log(
+        `  ${color.dim("Agents: read that file now to use Zero in this session \u2014 future sessions load it automatically.")}`
+      );
+    }
     console.log(
       `  ${color.dim("Next: sign in with `zero auth login` \u2014 it prints a URL to approve in your browser.")}`
     );

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@zeroxyz/cli",
-	"version": "1.14.0",
+	"version": "1.14.1",
 	"type": "module",
 	"bin": {
 		"zero": "dist/index.js",