@4pm/cli 1.5.42 → 1.8.4

package/dist/index.js

@@ -28635,6 +28635,37 @@ function isValidRoleSet(roles) {
   return true;
 }
 
+// vendor/@4pm/constants/worker-pool.ts
+var AiJob = {
+  /** Spec field/section/subagent suggest (one-shot). */
+  SPEC_SUGGEST: "spec-suggest",
+  /** Spec review — advisory (one-shot). */
+  SPEC_REVIEW: "spec-review",
+  /** Spec compose + create verdict (one-shot). */
+  SPEC_COMPOSE: "spec-compose",
+  /** Generators: WBS/est/proposal/feasibility/report (one-shot). */
+  DOC_GENERATE: "doc-generate",
+  /** Console prompt — full agent. */
+  CONSOLE_AGENT: "console-agent",
+  /** Git merge / AI conflict resolve — full agent. */
+  GIT_MERGE: "git-merge",
+  /** Graph add-link/add-code/delete-unused advice (one-shot). */
+  GRAPH_SUGGEST: "graph-suggest",
+  /** Subagent/skill content generate (one-shot). */
+  AGENTS_GENERATE: "agents-generate",
+  /** Template "Analyze impact" report — read-only agent. */
+  ANALYZE_IMPACT: "analyze-impact",
+  /** Template "Update" → branch + PR — write-capable agent. */
+  TEMPLATE_UPDATE: "template-update",
+  /** Autonomous-mode self-spawn — full agent. */
+  AUTONOMOUS: "autonomous",
+  /** Memo → community post compose (vision) — full agent. */
+  MEMO_COMPOSE: "memo-compose",
+  /** Outbound input review — the reviewer cli (one-shot). */
+  OUTBOUND_REVIEW: "outbound-review"
+};
+var AI_JOBS = Object.values(AiJob);
+
 // vendor/@4pm/constants/worker-tools.ts
 var WORKER_TOOL_CATALOG = [
   { id: "git", label: "Git", category: "vcs", versionArg: "--version", installPackage: null, installable: false, updatable: false },
@@ -29636,7 +29667,7 @@ async function checkAndUpdate(serverUrl, autoUpdate) {
 init_wrapper();
 import { randomUUID as randomUUID2 } from "crypto";
 import { basename as basename7, join as join28 } from "path";
-import { existsSync as existsSync15, mkdirSync as mkdirSync7 } from "fs";
+import { existsSync as existsSync16, mkdirSync as mkdirSync7 } from "fs";
 
 // vendor/@4pm/utils/helpers.ts
 function backoffJitterMs(attempt, baseMs = 500, maxMs = 1e4) {
@@ -33828,7 +33859,15 @@ var dispatchCommandRequestSchema = external_exports.object({
    * "AI settings" modal (per-user localStorage), layered over the profile default by the cli.
    * Only meaningful with `ai:true`.
    */
-  aiConfig: aiRunConfigSchema.optional()
+  aiConfig: aiRunConfigSchema.optional(),
+  /**
+   * AI job (ADR-0284): which of the 13 AI functions this dispatch is — the caller stamps it (the
+   * end user never picks). With `pick:"idle"` it drives the job-aware routing over the project's
+   * worker-routing table (pools before lone machines → job priority → member index, with
+   * exhaustion failover). Absent ⇒ the flat idle pool (backward compatible). Ignored with an
+   * explicit `machineLinkId`.
+   */
+  job: external_exports.enum(AI_JOBS).optional()
 }).superRefine((v, ctx) => {
   if (v.machineLinkId == null === (v.pick == null)) {
     ctx.addIssue({
@@ -38100,29 +38139,54 @@ function resolveInRoot5(root, relPath) {
   const target = resolve6(base, relPath || ".");
   return target === base || target.startsWith(base + sep7) ? target : null;
 }
+function looksBinary(buf) {
+  return buf.subarray(0, 8e3).includes(0);
+}
+function cappedBase64(buf) {
+  if (!buf || buf.byteLength > FS_TRANSFER_MAX_BYTES) return "";
+  return buf.toString("base64");
+}
 async function gitDiff(root, path) {
   const target = resolveInRoot5(root, path);
   if (!target) {
-    return { path, oldContent: "", newContent: "" };
+    return { path, oldContent: "", newContent: "", isBinary: false };
   }
   const dir2 = dirname6(target);
   const base = basename5(target);
-  let newContent = "";
+  let newBuf = null;
   try {
-    newContent = await readFile5(target, "utf8");
+    newBuf = await readFile5(target);
   } catch {
   }
-  let oldContent = "";
+  let oldBuf = null;
   try {
     const { stdout } = await run4("git", ["show", `HEAD:./${base}`], {
       cwd: dir2,
       timeout: 15e3,
-      maxBuffer: 4 * 1024 * 1024
+      maxBuffer: FS_TRANSFER_MAX_BYTES + 1024,
+      encoding: "buffer"
     });
-    oldContent = stdout;
+    oldBuf = stdout;
   } catch {
   }
-  return { path: target, oldContent, newContent };
+  const sample = newBuf ?? oldBuf;
+  if (sample && looksBinary(sample)) {
+    return {
+      path: target,
+      oldContent: "",
+      newContent: "",
+      isBinary: true,
+      contentType: guessMime(target),
+      oldContentBase64: cappedBase64(oldBuf),
+      newContentBase64: cappedBase64(newBuf)
+    };
+  }
+  return {
+    path: target,
+    oldContent: oldBuf ? oldBuf.toString("utf8") : "",
+    newContent: newBuf ? newBuf.toString("utf8") : "",
+    isBinary: false
+  };
 }
 
 // src/core/git-env.ts
@@ -38574,7 +38638,7 @@ function handleMiscChannels(ctx, message, payload) {
 }
 
 // src/core/ws-client/handlers/project.ts
-import { mkdirSync as mkdirSync6, rmSync as rmSync6 } from "fs";
+import { existsSync as existsSync13, mkdirSync as mkdirSync6, renameSync, rmSync as rmSync6 } from "fs";
 import { join as join20 } from "path";
 
 // src/core/scaffold.ts
@@ -38597,6 +38661,10 @@ async function provisionRepos(target, repos, emit, opts = {}) {
   for (const repo of repos) {
     if (repo.primary) {
       if (opts.clonePrimary && repo.url) {
+        if (existsSync12(join19(target, ".git"))) {
+          emit("git", `Primary repo already present \u2014 skipping clone.`);
+          continue;
+        }
         emit("git", `Cloning ${repo.url}\u2026`);
         await run9("git", ["clone", repo.url, target], { timeout: 12e4 });
         continue;
@@ -38612,6 +38680,10 @@ async function provisionRepos(target, repos, emit, opts = {}) {
     }
     const dir2 = join19(target, subDirName(repo));
     if (repo.url) {
+      if (existsSync12(join19(dir2, ".git"))) {
+        emit("git", `Sub-repo ${subDirName(repo)} already present \u2014 skipping clone.`);
+        continue;
+      }
       emit("git", `Cloning sub-repo ${repo.url}\u2026`);
       await run9("git", ["clone", repo.url, dir2], { timeout: 12e4 });
     } else {
@@ -38727,12 +38799,19 @@ function handleProjectChannels(ctx, message, payload) {
   switch (message.channel) {
     case WsChannels.PHYSIC_SYNC: {
       const sync = payload;
-      if (sync.oldName) {
-        const oldRoot = ctx.physicFolderPath(sync.oldName);
+      const oldName = sync.oldName;
+      const oldPath = oldName ? join20(ctx.profileDir, oldName) : null;
+      const newPath = join20(ctx.profileDir, sync.newName);
+      if (oldName) {
+        const oldRoot = ctx.physicFolderPath(oldName);
         if (oldRoot) void uninstallCron(oldRoot).catch(() => void 0);
       }
-      if (sync.oldName) rmSync6(join20(ctx.profileDir, sync.oldName), { recursive: true, force: true });
-      mkdirSync6(join20(ctx.profileDir, sync.newName), { recursive: true });
+      if (oldPath && oldName !== sync.newName && existsSync13(oldPath) && !existsSync13(newPath)) {
+        renameSync(oldPath, newPath);
+      } else {
+        if (oldPath && oldName !== sync.newName && existsSync13(oldPath)) rmSync6(oldPath, { recursive: true, force: true });
+        mkdirSync6(newPath, { recursive: true });
+      }
       ctx.physicRoot = ctx.physicFolderPath(sync.newName);
       ctx.bus.setProject(sync.newName);
       ctx.bus.log(t("project.folderSynced", { name: sync.newName }));
@@ -39523,7 +39602,7 @@ async function buildGraph(root, mode) {
 
 // src/core/rag.ts
 import { readFile as readFile12, writeFile as writeFile10, statfs as statfs2, mkdir as mkdir10 } from "fs/promises";
-import { existsSync as existsSync13 } from "fs";
+import { existsSync as existsSync14 } from "fs";
 import { execFile as execFile10, spawn as spawn9 } from "child_process";
 import { totalmem as totalmem2, cpus as cpus2 } from "os";
 import { join as join26 } from "path";
@@ -39616,7 +39695,7 @@ async function ragStatus(root) {
   const modelPresent = modelName.length > 0;
   return {
     installed: fastembed && sqliteVec && modelPresent,
-    installing: existsSync13(join26(root, RAG_REL, ".installing")),
+    installing: existsSync14(join26(root, RAG_REL, ".installing")),
     python: { found: py.found, version: py.version },
     deps: { pip, fastembed, sqliteVec },
     model: { present: modelPresent, name: modelName },
@@ -39627,7 +39706,7 @@ async function ragStatus(root) {
   };
 }
 async function readIndexMeta(root) {
-  const indexing = existsSync13(join26(root, RAG_REL, ".indexing"));
+  const indexing = existsSync14(join26(root, RAG_REL, ".indexing"));
   try {
     const m = JSON.parse(await readFile12(join26(root, RAG_REL, ".index.json"), "utf8"));
     return {
@@ -39702,8 +39781,8 @@ async function ensureEngine(root) {
 async function ragReindex(root) {
   const py = await detectPython();
   if (!py.found) return { ok: false, started: false, error: "python3 not found" };
-  if (!existsSync13(join26(root, RAG_REL, ".installed"))) return { ok: false, started: false, error: "RAG is not installed" };
-  if (existsSync13(join26(root, RAG_REL, ".indexing"))) return { ok: true, started: true };
+  if (!existsSync14(join26(root, RAG_REL, ".installed"))) return { ok: false, started: false, error: "RAG is not installed" };
+  if (existsSync14(join26(root, RAG_REL, ".indexing"))) return { ok: true, started: true };
   await ensureEngine(root);
   const script = `
 set +e
@@ -39723,7 +39802,7 @@ rm -f "${RAG_REL}/.indexing"
 async function ragQuery(root, queryText, k = 8) {
   const py = await detectPython();
   if (!py.found) return { results: [], error: "python3 not found" };
-  if (!existsSync13(join26(root, RAG_REL, "index.db"))) return { results: [], error: "no index \u2014 reindex first" };
+  if (!existsSync14(join26(root, RAG_REL, "index.db"))) return { results: [], error: "no index \u2014 reindex first" };
   await ensureEngine(root);
   try {
     const { stdout } = await run10(
@@ -39743,7 +39822,7 @@ async function ragInstall(root, model) {
   }
   const py = await detectPython();
   if (!py.found) return { ok: false, started: false, error: "python3 not found on the worker" };
-  if (existsSync13(join26(root, RAG_REL, ".installing"))) return { ok: true, started: true };
+  if (existsSync14(join26(root, RAG_REL, ".installing"))) return { ok: true, started: true };
   try {
     await mkdir10(join26(root, RAG_REL), { recursive: true });
   } catch {
@@ -39772,7 +39851,7 @@ rm -f "${RAG_REL}/.installing"
 }
 
 // src/core/config-sync.ts
-import { existsSync as existsSync14, readFileSync as readFileSync15 } from "fs";
+import { existsSync as existsSync15, readFileSync as readFileSync15 } from "fs";
 import { join as join27 } from "path";
 var SERVER_MANAGED_KEYS = [
   "physicPath",
@@ -39791,7 +39870,7 @@ var SERVER_MANAGED_KEYS = [
 ];
 function readConfigText(profileDir2) {
   const path = join27(profileDir2, "config.json");
-  if (existsSync14(path)) {
+  if (existsSync15(path)) {
     try {
       return readFileSync15(path, "utf8");
     } catch {
@@ -40644,7 +40723,7 @@ var WsClient = class {
   /** Create the physic folder at an absolute path if missing (best-effort). */
   ensurePhysicFolderPath(folder) {
     try {
-      if (!existsSync15(folder)) {
+      if (!existsSync16(folder)) {
         mkdirSync7(folder, { recursive: true });
         this.bus.log(t("project.createdFolder", { folder }));
       }
@@ -40674,7 +40753,7 @@ var WsClient = class {
       projects: [],
       version: CLI_VERSION,
       physicPath,
-      physicPathExists: physicPath ? existsSync15(physicPath) : void 0,
+      physicPathExists: physicPath ? existsSync16(physicPath) : void 0,
       // Real coarse state (ADR-0152): !paused and a recent tick (was hard-coded false).
       autonomousRunning: physicPath ? isAutonomousRunning(physicPath) : false,
       // The machine-user AI-run limit (0 = unlimited) + profile count so a dispatch can resolve the
@@ -43309,7 +43388,7 @@ var src_default = Yoga;
 
 // ../../node_modules/.pnpm/ink@5.2.1_@types+react@18.3.31_react@18.3.1/node_modules/ink/build/reconciler.js
 var import_react_reconciler = __toESM(require_react_reconciler(), 1);
-var import_constants10 = __toESM(require_constants2(), 1);
+var import_constants11 = __toESM(require_constants2(), 1);
 import process3 from "process";
 
 // ../../node_modules/.pnpm/ansi-regex@6.2.2/node_modules/ansi-regex/index.js
@@ -44551,7 +44630,7 @@ var reconciler_default = (0, import_react_reconciler.default)({
   scheduleTimeout: setTimeout,
   cancelTimeout: clearTimeout,
   noTimeout: -1,
-  getCurrentEventPriority: () => import_constants10.DefaultEventPriority,
+  getCurrentEventPriority: () => import_constants11.DefaultEventPriority,
   beforeActiveInstanceBlur() {
   },
   afterActiveInstanceBlur() {
@@ -46993,7 +47072,7 @@ var import_react21 = __toESM(require_react(), 1);
 var import_react26 = __toESM(require_react(), 1);
 
 // src/core/input-history.ts
-import { existsSync as existsSync17, readFileSync as readFileSync18, writeFileSync as writeFileSync10 } from "fs";
+import { existsSync as existsSync18, readFileSync as readFileSync18, writeFileSync as writeFileSync10 } from "fs";
 import { join as join31 } from "path";
 var MAX_HISTORY = 200;
 function historyPath(profileDir2) {
@@ -47001,7 +47080,7 @@ function historyPath(profileDir2) {
 }
 function loadInputHistory(profileDir2) {
   const path = historyPath(profileDir2);
-  if (!existsSync17(path)) return [];
+  if (!existsSync18(path)) return [];
   try {
     const data = JSON.parse(readFileSync18(path, "utf8"));
     return Array.isArray(data) ? data.filter((x) => typeof x === "string") : [];

package/package.json

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