@4pm/cli 1.10.2 → 1.12.0

package/dist/index.js

@@ -28541,8 +28541,14 @@ function selfUnlink(serverUrl, hashcode3) {
   return post(serverUrl, "/machine-links/self-unlink", { hashcode3 });
 }
 async function fetchCliVersion(serverUrl) {
-  const res = await fetch(`${serverUrl}/meta/cli-version`);
-  return unwrap(res);
+  const ctrl = new AbortController();
+  const timer = setTimeout(() => ctrl.abort(), 2e4);
+  try {
+    const res = await fetch(`${serverUrl}/meta/cli-version`, { signal: ctrl.signal });
+    return unwrap(res);
+  } finally {
+    clearTimeout(timer);
+  }
 }
 
 // vendor/@4pm/constants/preferences.ts
@@ -32520,6 +32526,9 @@ function compareSemver(a, b2) {
   }
   return 0;
 }
+function shouldUpdateTo(current2, latest) {
+  return current2 !== latest && compareSemver(current2, latest) <= 0;
+}
 function runningInstallRoot() {
   return dirname2(dirname2(fileURLToPath2(import.meta.url)));
 }
@@ -32572,10 +32581,10 @@ async function updateViaDownload(tarballUrl, checksum, signature) {
     throw new Error(`Failed to extract the update tarball into ${installRoot}: ${String(err)}`);
   }
 }
-async function updateToLatest(serverUrl) {
+async function updateToLatest(serverUrl, force = false) {
   if (CLI_VERSION.startsWith("0.0.0")) return { action: "dev-build", version: CLI_VERSION };
   const meta = await fetchCliVersion(serverUrl);
-  if (compareSemver(CLI_VERSION, meta.latest) >= 0) {
+  if (!force && !shouldUpdateTo(CLI_VERSION, meta.latest)) {
     return { action: "already-latest", version: CLI_VERSION };
   }
   console.log(t("update.updating", { from: CLI_VERSION, to: meta.latest }));
@@ -32593,7 +32602,7 @@ async function updateToLatest(serverUrl) {
     return { action: "failed", error: String(err), toVersion: meta.latest };
   }
   const installed = readInstalledVersion();
-  if (compareSemver(installed, meta.latest) < 0) {
+  if (shouldUpdateTo(installed, meta.latest)) {
     return {
       action: "failed",
       error: `update ran but the installed version is still ${installed} (expected ${meta.latest}) \u2014 it did not apply to the running install at ${runningInstallRoot()}.`,
@@ -32612,7 +32621,7 @@ async function checkAndUpdate(serverUrl, autoUpdate) {
     return { action: "none" };
   }
   const mandatory = compareSemver(CLI_VERSION, meta.minSupported) < 0;
-  const outdated = compareSemver(CLI_VERSION, meta.latest) < 0;
+  const outdated = shouldUpdateTo(CLI_VERSION, meta.latest);
   if (!outdated) return { action: "none" };
   if (!mandatory && !autoUpdate) {
     console.warn(t("update.newVersionAutoUpdateOff", { latest: meta.latest, current: CLI_VERSION }));
@@ -32644,7 +32653,7 @@ async function checkAndUpdate(serverUrl, autoUpdate) {
     return { action: "none" };
   }
   const installed = readInstalledVersion();
-  if (compareSemver(installed, meta.latest) < 0) {
+  if (shouldUpdateTo(installed, meta.latest)) {
     const msg = t("update.notApplied", { installed, expected: meta.latest });
     if (mandatory) {
       console.error(msg);
@@ -37003,6 +37012,10 @@ var workerToolCopySchema = external_exports.object({
   /** Target machine-link ids to queue the manifest for (pushed on their next connect). */
   targetLinkIds: external_exports.array(external_exports.string().uuid()).min(1).max(200)
 });
+var adminPoolToolsCopySchema = external_exports.object({
+  sourceUserId: external_exports.string().uuid(),
+  targetUserIds: external_exports.array(external_exports.string().uuid()).min(1).max(200)
+});
 var workerToolInstallSchema = external_exports.object({
   /** Catalog id or npm package name (validated npm-name shape on the cli). */
   name: external_exports.string().trim().min(1).max(214),
@@ -37610,8 +37623,20 @@ async function writeTemplateMarker(target) {
   const marker = { templateVersion: PROJECT_TEMPLATE.version, scaffoldedAt: (/* @__PURE__ */ new Date()).toISOString() };
   await writeFile(join6(dir2, ".4pm.json"), JSON.stringify(marker, null, 2) + "\n", "utf8");
 }
+function readSpecField(spec, key) {
+  const fields = spec.fields;
+  if (Array.isArray(fields)) {
+    const f2 = fields.find(
+      (x) => !!x && typeof x.id === "string" && x.id === key
+    );
+    if (f2 && typeof f2.value === "string") return f2.value;
+  }
+  return typeof spec[key] === "string" ? spec[key] : "";
+}
 async function aiInit(target, spec, emit) {
-  emit("ai-init", "AI init: subagents, README, CLAUDE.md\u2026");
+  const guideFile = readSpecField(spec, "ai_guide_file") === "AGENT.md" ? "AGENT.md" : "CLAUDE.md";
+  const guideInstructions = readSpecField(spec, "ai_guide_instructions").trim();
+  emit("ai-init", `AI init: subagents, README, ${guideFile}\u2026`);
   const subagents = Array.isArray(spec.subagents) ? spec.subagents : [];
   if (subagents.length > 0) {
     await mkdir(join6(target, ".claude", "agents"), { recursive: true });
@@ -37634,14 +37659,12 @@ ${(sa.description || "").trim()}
 ${specJson}`
   );
   await generateFile(
-    join6(target, "CLAUDE.md"),
-    `Write a CLAUDE.md (Markdown only, no preamble) with guidance/conventions for AI agents working in this project, derived from its spec JSON:
-${specJson}`
-  );
-  await generateFile(
-    join6(target, "AGENT.md"),
-    `Write an AGENT.md (Markdown only, no preamble) with guidance/conventions for AI agents working in this project, derived from its spec JSON:
-${specJson}`
+    join6(target, guideFile),
+    `Write a ${guideFile} (Markdown only, no preamble) with guidance/conventions for AI agents working in this project, derived from its spec JSON:
+${specJson}` + (guideInstructions ? `
+Also incorporate these additional instructions/content:
+${guideInstructions}
+` : "")
   );
 }
 async function generateFile(path, prompt) {
@@ -38282,6 +38305,12 @@ function sleep(ms2) {
     t2.unref?.();
   });
 }
+function extractToolError(out) {
+  const lines = out.split(/\r?\n/).map((l) => l.trim()).filter((l) => l && !/^npm warn\b/i.test(l));
+  const errLines = lines.filter((l) => /npm error|npm err!|ERR_|ELIFECYCLE|unsupported engine|e404|etarget/i.test(l));
+  const msg = (errLines.length ? errLines : lines).slice(-3).join(" \xB7 ");
+  return msg.length > 500 ? `${msg.slice(0, 500)}\u2026` : msg;
+}
 function classifyToolFailure(code, out) {
   if (code === 124) return { reason: "timeout", retryable: true };
   const t2 = out.toLowerCase();
@@ -38421,8 +38450,10 @@ async function runWorkerToolOp(op, name, manager, onLine, timeoutMs = TOOL_INSTA
     return { ok: false, exitCode: 1, error: resolved.error ?? "Invalid package." };
   }
   onLine(`$ ${manager} ${opArgs(op, manager, resolved.pkg).join(" ")}`);
-  const { code } = await run3(manager, opArgs(op, manager, resolved.pkg), onLine, timeoutMs);
-  return { ok: code === 0, exitCode: code, error: code === 0 ? void 0 : `${manager} exited ${code}` };
+  const { code, out } = await run3(manager, opArgs(op, manager, resolved.pkg), onLine, timeoutMs);
+  if (code === 0) return { ok: true, exitCode: code };
+  const detail = extractToolError(out);
+  return { ok: false, exitCode: code, error: detail ? `${manager} exited ${code}: ${detail}` : `${manager} exited ${code}` };
 }
 function setToolAutoUpdate(profileDir2, name, enabled) {
   const resolved = resolvePackage(name, "update");
@@ -38456,7 +38487,8 @@ async function installPinned(name, version, manager, onLine, timeoutMs = TOOL_IN
     if (code === 0) return { ok: true };
     const { reason, retryable } = classifyToolFailure(code, out);
     if (!retryable || attempt === TOOL_INSTALL_MAX_ATTEMPTS) {
-      return { ok: false, error: `${manager} exited ${code}`, reason, retryable };
+      const detail = extractToolError(out);
+      return { ok: false, error: detail ? `${manager} exited ${code}: ${detail}` : `${manager} exited ${code}`, reason, retryable };
     }
     const base = TOOL_RETRY_BASE_MS * 3 ** (attempt - 1);
     const wait = Math.round(base * (0.8 + Math.random() * 0.4));
@@ -38592,7 +38624,7 @@ var UpdateScheduler = class {
     if (this.forcedPending) {
       if (this.bus.busy !== null) return;
       this.forcedPending = false;
-      await this.runUpdate();
+      await this.runUpdate(true);
       return;
     }
     const p2 = this.policy;
@@ -38608,15 +38640,16 @@ var UpdateScheduler = class {
     if (this.bus.busy !== null) return;
     this.lastDoneDateKey = clock.dateKey;
     this.pendingDateKey = null;
-    await this.runUpdate();
+    await this.runUpdate(false);
   }
-  /** Check + update, then re-exec the new binary on success (keeps `.cre`/profile). */
-  async runUpdate() {
+  /** Check + update, then re-exec the new binary on success (keeps `.cre`/profile). `force` installs the
+   *  server's latest unconditionally (an operator push) vs. the conditional daily-scheduled update. */
+  async runUpdate(force) {
     this.updating = true;
     try {
       await this.updateFlaggedTools();
       this.bus.log(t("update.scheduledChecking"));
-      const result = await updateToLatest(this.serverUrl);
+      const result = await updateToLatest(this.serverUrl, force);
       if (result.action === "already-latest") {
         logger.info("update.scheduled.latest", { version: result.version });
         return;
@@ -42201,7 +42234,10 @@ function handleToolsChannels(ctx, message, payload) {
           ctx.send(WsChannels.TOOLS_DONE, {
             opId,
             ok: restoreFailed.length === 0,
-            exitCode: restoreFailed.length === 0 ? 0 : 1
+            exitCode: restoreFailed.length === 0 ? 0 : 1,
+            // Name the tools that failed + their classified reason so the web card shows more than a
+            // bare "failed" (the real per-tool npm/pnpm error already streamed in the log above).
+            error: restoreFailed.length === 0 ? void 0 : restoreFailed.map((f2) => `${f2.name} (${f2.reason})`).join(", ")
           });
           await ctx.reportWorkerTools(restoreTrigger, restoreFailed);
         }).catch(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@4pm/cli",
-  "version": "1.10.2",
+  "version": "1.12.0",
   "private": false,
   "description": "4PM CLI — drives Claude/Codex CLIs on AI worker machines (Node + TypeScript)",
   "license": "LicenseRef-4PM-Source-Available",