@4pm/cli 1.8.4-b → 1.9.0-b

package/dist/index.js

@@ -29506,17 +29506,38 @@ MCowBQYDK2VwAyEARlfzjaFhe5bhRrMp/ZuH6sVqg/S7f8B1dliuF21iDTw=
 `;
 
 // src/version.ts
+import { execFileSync } from "child_process";
 import { readFileSync as readFileSync4 } from "fs";
 import { dirname, join as join4 } from "path";
 import { fileURLToPath } from "url";
+function gitDescribeVersion(cwd2) {
+  try {
+    const out = execFileSync("git", ["describe", "--tags", "--match", "cli-v*"], {
+      cwd: cwd2,
+      timeout: 3e3,
+      stdio: ["ignore", "pipe", "ignore"]
+    }).toString().trim();
+    const stripped = out.replace(/^cli-v/, "");
+    return stripped || null;
+  } catch {
+    return null;
+  }
+}
 function readCliVersion() {
+  const envVersion = process.env.FOURPM_CLI_VERSION?.trim();
+  if (envVersion) return envVersion.replace(/^cli-v/, "");
+  let version = "0.0.0";
   try {
     const here = dirname(fileURLToPath(import.meta.url));
     const pkg = JSON.parse(readFileSync4(join4(here, "..", "package.json"), "utf8"));
-    return pkg.version ?? "0.0.0";
+    version = pkg.version ?? "0.0.0";
+    if (version === "0.0.0") {
+      const dev = gitDescribeVersion(here);
+      if (dev) version = dev;
+    }
   } catch {
-    return "0.0.0";
   }
+  return version;
 }
 var CLI_VERSION = readCliVersion();
 
@@ -33965,6 +33986,14 @@ var issueProvisioningTokenRequestSchema = external_exports.object({
   /** TTL seconds (0/absent ⇒ a default short TTL applied server-side). */
   ttlSec: external_exports.number().int().min(0).max(2592e3).optional()
 });
+var provisionRequestSchema = external_exports.object({
+  mode: external_exports.enum(["sync", "force"]).optional().default("sync")
+});
+var provisionForUserRequestSchema = external_exports.object({
+  userId: external_exports.string().uuid(),
+  projectId: external_exports.string().uuid(),
+  mode: external_exports.enum(["sync", "force"]).optional().default("sync")
+});
 var listWorkersQuerySchema = baseRequestSchema.extend({
   status: external_exports.enum(["online", "offline"]).optional(),
   /** Only workers whose live CPU/memory/disk usage % ≥ the given threshold (0–100). */
@@ -34240,7 +34269,13 @@ var repoSpecSchema = external_exports.object({
   /** Clone url — `https` or `ssh` (required; ADR-0172). */
   url: external_exports.string().max(500).regex(GIT_URL_RE, "must be an https or ssh git url"),
   /** Sub-repo subfolder under the target root (empty ⇒ derived from role/name). */
-  subdir: external_exports.string().max(120).optional().default("")
+  subdir: external_exports.string().max(120).optional().default(""),
+  /**
+   * Primary branch to clone / check out (ADR-0292). Empty ⇒ the repo's default branch. The
+   * worker clones with `-b <branch>` and the on-demand "update repos" action checks it out +
+   * fast-forward pulls it.
+   */
+  branch: external_exports.string().max(200).optional().default("")
 });
 function repoName(url) {
   const last = (url || "").trim().replace(/\/+$/, "").split(/[/:]/).pop() ?? "";
@@ -34368,7 +34403,7 @@ var activityHeartbeatSchema = external_exports.object({
 });
 
 // src/core/scaffold.ts
-import { cp, mkdir, writeFile } from "fs/promises";
+import { cp, mkdir, readdir, rename, rm, writeFile } from "fs/promises";
 import { existsSync as existsSync4 } from "fs";
 import { execFile as execFile2 } from "child_process";
 import { dirname as dirname3, join as join6, resolve } from "path";
@@ -34457,16 +34492,47 @@ function subDirName(repo) {
   const raw = (repo.subdir || repo.role || repoName(repo.url ?? "") || "repo").trim();
   return raw.replace(/[^\w.-]+/g, "-").replace(/^-+|-+$/g, "") || "repo";
 }
+function cloneArgs(url, dest, branch) {
+  const b = (branch ?? "").trim();
+  return b ? ["clone", "-b", b, url, dest] : ["clone", url, dest];
+}
+async function updateRepo(dir2, label, branch, emit) {
+  const b = (branch ?? "").trim();
+  emit("git", `Updating ${label} (fetch + ${b ? `checkout ${b} + ` : ""}fast-forward pull)\u2026`);
+  await run2("git", ["fetch", "origin", "--prune"], { cwd: dir2, timeout: 12e4 });
+  if (b) await run2("git", ["checkout", b], { cwd: dir2, timeout: 6e4 });
+  await run2("git", ["pull", "--ff-only"], { cwd: dir2, timeout: 12e4 });
+}
 async function provisionRepos(target, repos, emit, opts = {}) {
+  const mode = opts.mode ?? "clone";
+  const subDirsToKeep = new Set(repos.filter((r) => !r.primary && r.url).map((r) => subDirName(r)));
   for (const repo of repos) {
     if (repo.primary) {
       if (opts.clonePrimary && repo.url) {
         if (existsSync4(join6(target, ".git"))) {
-          emit("git", `Primary repo already present \u2014 skipping clone.`);
+          if (mode === "sync") {
+            await updateRepo(target, "primary repo", repo.branch, emit);
+          } else if (mode === "force") {
+            emit("git", `Re-cloning ${repo.url} (force)\u2026`);
+            const tmp = `${target}.4pm-reclone`;
+            await rm(tmp, { recursive: true, force: true });
+            await run2("git", cloneArgs(repo.url, tmp, repo.branch), { timeout: 12e4 });
+            for (const entry of await readdir(target)) {
+              if (subDirsToKeep.has(entry)) continue;
+              await rm(join6(target, entry), { recursive: true, force: true });
+            }
+            for (const entry of await readdir(tmp)) {
+              if (subDirsToKeep.has(entry)) continue;
+              await rename(join6(tmp, entry), join6(target, entry));
+            }
+            await rm(tmp, { recursive: true, force: true });
+          } else {
+            emit("git", `Primary repo already present \u2014 skipping clone.`);
+          }
           continue;
         }
         emit("git", `Cloning ${repo.url}\u2026`);
-        await run2("git", ["clone", repo.url, target], { timeout: 12e4 });
+        await run2("git", cloneArgs(repo.url, target, repo.branch), { timeout: 12e4 });
         continue;
       }
       emit("git", "Initializing the primary repo\u2026");
@@ -34481,11 +34547,19 @@ async function provisionRepos(target, repos, emit, opts = {}) {
     const dir2 = join6(target, subDirName(repo));
     if (repo.url) {
       if (existsSync4(join6(dir2, ".git"))) {
-        emit("git", `Sub-repo ${subDirName(repo)} already present \u2014 skipping clone.`);
+        if (mode === "sync") {
+          await updateRepo(dir2, `sub-repo ${subDirName(repo)}`, repo.branch, emit);
+        } else if (mode === "force") {
+          emit("git", `Re-cloning sub-repo ${repo.url} (force)\u2026`);
+          await rm(dir2, { recursive: true, force: true });
+          await run2("git", cloneArgs(repo.url, dir2, repo.branch), { timeout: 12e4 });
+        } else {
+          emit("git", `Sub-repo ${subDirName(repo)} already present \u2014 skipping clone.`);
+        }
         continue;
       }
       emit("git", `Cloning sub-repo ${repo.url}\u2026`);
-      await run2("git", ["clone", repo.url, dir2], { timeout: 12e4 });
+      await run2("git", cloneArgs(repo.url, dir2, repo.branch), { timeout: 12e4 });
     } else {
       emit("git", `Initializing sub-repo ${subDirName(repo)}\u2026`);
       await mkdir(dir2, { recursive: true });
@@ -34590,11 +34664,14 @@ async function addProject(payload, profileDir2, onProgress) {
     const target = join6(root, payload.projectName);
     await mkdir(target, { recursive: true });
     const repos = payload.repos ?? [];
-    if (repos.length > 0) await provisionRepos(target, repos, emit, { clonePrimary: true });
+    const mode = payload.mode ?? "clone";
+    if (repos.length > 0) await provisionRepos(target, repos, emit, { clonePrimary: true, mode });
     onProgress?.({ projectId: payload.projectId, step: "done", message: "Project added.", done: true });
     return { ok: true, path: target };
   } catch (err) {
-    return { ok: false, error: err instanceof Error ? err.message : String(err), step: lastStep };
+    const message = err instanceof Error ? err.message : String(err);
+    onProgress?.({ projectId: payload.projectId, step: "error", message: `Failed: ${message}`, done: true });
+    return { ok: false, error: message, step: lastStep };
   }
 }
 
@@ -35082,7 +35159,7 @@ function decryptPayload(key, payloadBase64, nonceBase64) {
 import { spawn as spawn2 } from "child_process";
 
 // src/common/logger/logger.ts
-import { appendFile, mkdir as mkdir2, readdir, unlink } from "fs/promises";
+import { appendFile, mkdir as mkdir2, readdir as readdir2, unlink } from "fs/promises";
 import { readdirSync as readdirSync2, readFileSync as readFileSync6, statSync } from "fs";
 import { join as join7 } from "path";
 var LEVEL_ORDER = { error: 0, warn: 1, info: 2, debug: 3 };
@@ -35142,7 +35219,7 @@ var CliLogger = class {
   async cleanupOldLogs() {
     const dir2 = this.dir;
     if (!dir2) return;
-    const files = await readdir(dir2).catch(() => []);
+    const files = await readdir2(dir2).catch(() => []);
     const cutoff = Date.now() - this.retentionDays * DAY_MS;
     for (const file of files) {
       const match = /^cli-(\d{4}-\d{2}-\d{2})\.jsonl$/.exec(file);
@@ -38123,7 +38200,7 @@ function rejectByReview(ctx, commandId, origin, prompt, reasons) {
 }
 
 // src/core/fs-browse.ts
-import { readdir as readdir2 } from "fs/promises";
+import { readdir as readdir3 } from "fs/promises";
 import { resolve as resolve2, sep as sep2 } from "path";
 async function listDir(path, root) {
   if (!root) return { path: "", entries: [] };
@@ -38131,7 +38208,7 @@ async function listDir(path, root) {
   const requested = resolve2(base, path && path.trim() ? path : ".");
   const target = requested === base || requested.startsWith(base + sep2) ? requested : base;
   try {
-    const dirents = await readdir2(target, { withFileTypes: true });
+    const dirents = await readdir3(target, { withFileTypes: true });
     const entries2 = dirents.map((d) => ({
       name: d.name,
       type: d.isDirectory() ? "dir" : "file"
@@ -38199,7 +38276,7 @@ async function writeWorkerFile(root, relPath, content) {
 }
 
 // src/core/fs-mutate.ts
-import { mkdir as mkdir4, writeFile as writeFile4, rename, rm, stat } from "fs/promises";
+import { mkdir as mkdir4, writeFile as writeFile4, rename as rename2, rm as rm2, stat } from "fs/promises";
 import { basename as basename3, dirname as dirname5, resolve as resolve5, sep as sep5 } from "path";
 var MAX_BYTES3 = 2 * 1024 * 1024;
 function resolveInRoot3(root, rel) {
@@ -38254,14 +38331,14 @@ async function mutateFs(root, req) {
         if (to !== resolve5(root) && !to.startsWith(resolve5(root) + sep5)) return escaped(req.to ?? "");
         if (await exists(to)) return { ok: false, path: to, error: "destination already exists" };
         await mkdir4(dirname5(to), { recursive: true });
-        await rename(from, to);
+        await rename2(from, to);
         return { ok: true, path: to };
       }
       case "delete": {
         const target = resolveInRoot3(root, req.path ?? "");
         if (!target) return escaped(req.path ?? "");
         if (target === resolve5(root)) return { ok: false, path: target, error: "cannot delete the project root" };
-        await rm(target, { recursive: true, force: true });
+        await rm2(target, { recursive: true, force: true });
         return { ok: true, path: target };
       }
       default:
@@ -38486,7 +38563,7 @@ ${stderr}`;
 
 // src/core/git-ssh-key.ts
 import { execFile as execFile8 } from "child_process";
-import { readFile as readFile6, rm as rm2, mkdir as mkdir6 } from "fs/promises";
+import { readFile as readFile6, rm as rm3, mkdir as mkdir6 } from "fs/promises";
 import { join as join18 } from "path";
 import { promisify as promisify8 } from "util";
 var run8 = promisify8(execFile8);
@@ -38520,8 +38597,8 @@ async function configureGit(key) {
 async function generate(profileDir2) {
   const { dir: dir2, key, pub } = keyPaths(profileDir2);
   await mkdir6(dir2, { recursive: true });
-  await rm2(key, { force: true });
-  await rm2(pub, { force: true });
+  await rm3(key, { force: true });
+  await rm3(pub, { force: true });
   await run8("ssh-keygen", ["-t", "ed25519", "-f", key, "-N", "", "-C", "4pm-deploy-key"], {
     timeout: 15e3
   });
@@ -38530,8 +38607,8 @@ async function generate(profileDir2) {
 }
 async function remove(profileDir2) {
   const { key, pub } = keyPaths(profileDir2);
-  await rm2(key, { force: true });
-  await rm2(pub, { force: true });
+  await rm3(key, { force: true });
+  await rm3(pub, { force: true });
   await run8("git", ["config", "--global", "--unset", "core.sshCommand"], { timeout: 5e3 }).catch(
     () => void 0
   );
@@ -38553,7 +38630,7 @@ async function manageSshKey(op, profileDir2) {
 }
 
 // src/core/git-history.ts
-import { readdir as readdir3 } from "fs/promises";
+import { readdir as readdir4 } from "fs/promises";
 import { execFile as execFile9 } from "child_process";
 import { resolve as resolve8, sep as sep8 } from "path";
 import { promisify as promisify9 } from "util";
@@ -38594,13 +38671,13 @@ async function gitRepos(root) {
   };
   await add(base);
   try {
-    const lvl1 = await readdir3(base, { withFileTypes: true });
+    const lvl1 = await readdir4(base, { withFileTypes: true });
     for (const d of lvl1) {
       if (!d.isDirectory() || d.name === ".git" || d.name === "node_modules") continue;
       const p1 = resolve8(base, d.name);
       await add(p1);
       try {
-        const lvl2 = await readdir3(p1, { withFileTypes: true });
+        const lvl2 = await readdir4(p1, { withFileTypes: true });
         for (const d2 of lvl2) {
           if (!d2.isDirectory() || d2.name === ".git" || d2.name === "node_modules") continue;
           await add(resolve8(p1, d2.name));
@@ -39130,7 +39207,7 @@ function handleToolsChannels(ctx, message, payload) {
 }
 
 // src/core/agents.ts
-import { readFile as readFile7, writeFile as writeFile6, mkdir as mkdir7, readdir as readdir4, rm as rm3 } from "fs/promises";
+import { readFile as readFile7, writeFile as writeFile6, mkdir as mkdir7, readdir as readdir5, rm as rm4 } from "fs/promises";
 import { join as join21 } from "path";
 var AGENTS_REL = ".claude/agents";
 var SKILLS_REL = ".claude/skills";
@@ -39155,7 +39232,7 @@ async function listAgents(root) {
   const subagents = [];
   const skills = [];
   try {
-    for (const e of await readdir4(join21(root, AGENTS_REL), { withFileTypes: true })) {
+    for (const e of await readdir5(join21(root, AGENTS_REL), { withFileTypes: true })) {
       if (!e.isFile() || !e.name.endsWith(".md") || MEMORY_DIRS.has(e.name)) continue;
       const fm = frontmatter(await readText2(join21(root, AGENTS_REL, e.name)));
       subagents.push({ name: e.name.replace(/\.md$/, ""), description: fm.description });
@@ -39163,7 +39240,7 @@ async function listAgents(root) {
   } catch {
   }
   try {
-    for (const e of await readdir4(join21(root, SKILLS_REL), { withFileTypes: true })) {
+    for (const e of await readdir5(join21(root, SKILLS_REL), { withFileTypes: true })) {
       if (!e.isDirectory()) continue;
       const fm = frontmatter(await readText2(join21(root, SKILLS_REL, e.name, "SKILL.md")));
       skills.push({ name: e.name, description: fm.description });
@@ -39193,8 +39270,8 @@ async function writeAgent(root, req) {
   if (!n) return { ok: false, error: "invalid name" };
   try {
     if (req.action === "delete") {
-      if (req.kind === "subagent") await rm3(itemPath(root, "subagent", n), { force: true });
-      else await rm3(join21(root, SKILLS_REL, n), { recursive: true, force: true });
+      if (req.kind === "subagent") await rm4(itemPath(root, "subagent", n), { force: true });
+      else await rm4(join21(root, SKILLS_REL, n), { recursive: true, force: true });
       return { ok: true };
     }
     if (req.content === void 0) return { ok: false, error: "content is required" };
@@ -39315,7 +39392,7 @@ async function writeAgentTools(root, scope, permissions) {
 
 // src/core/packages.ts
 import { createHash as createHash4 } from "crypto";
-import { readFile as readFile10, writeFile as writeFile9, mkdir as mkdir9, readdir as readdir5, rm as rm4, stat as stat3 } from "fs/promises";
+import { readFile as readFile10, writeFile as writeFile9, mkdir as mkdir9, readdir as readdir6, rm as rm5, stat as stat3 } from "fs/promises";
 import { dirname as dirname9, join as join24, relative } from "path";
 var AGENTS_REL2 = ".claude/agents";
 var SKILLS_REL2 = ".claude/skills";
@@ -39335,7 +39412,7 @@ async function listFilesRel(dir2) {
   async function walk2(d) {
     let entries2;
     try {
-      entries2 = await readdir5(d, { withFileTypes: true });
+      entries2 = await readdir6(d, { withFileTypes: true });
     } catch {
       return;
     }
@@ -39488,11 +39565,11 @@ async function removePackage(root, slug) {
     const entry = manifest[n];
     if (!entry) return { ok: false, error: "not installed" };
     if (entry.kind === "subagent") {
-      await rm4(join24(root, AGENTS_REL2, `${n}.md`), { force: true });
-      await rm4(join24(root, AGENTS_REL2, "short-memory", `${n}.md`), { force: true });
-      await rm4(join24(root, AGENTS_REL2, "long-memory", `${n}.md`), { force: true });
+      await rm5(join24(root, AGENTS_REL2, `${n}.md`), { force: true });
+      await rm5(join24(root, AGENTS_REL2, "short-memory", `${n}.md`), { force: true });
+      await rm5(join24(root, AGENTS_REL2, "long-memory", `${n}.md`), { force: true });
     } else {
-      await rm4(join24(root, SKILLS_REL2, n), { recursive: true, force: true });
+      await rm5(join24(root, SKILLS_REL2, n), { recursive: true, force: true });
     }
     delete manifest[n];
     await writeManifest(root, manifest);
@@ -39503,7 +39580,7 @@ async function removePackage(root, slug) {
 }
 
 // src/core/graph.ts
-import { readFile as readFile11, readdir as readdir6 } from "fs/promises";
+import { readFile as readFile11, readdir as readdir7 } from "fs/promises";
 import { join as join25, relative as relative2, dirname as dirname10, resolve as resolve9, extname as extname2, basename as basename6 } from "path";
 var MAX_FILES = 2e3;
 var MAX_NODES = 3e3;
@@ -39516,7 +39593,7 @@ async function walk(root, accept) {
     const dir2 = stack.pop();
     let entries2;
     try {
-      entries2 = await readdir6(dir2, { withFileTypes: true });
+      entries2 = await readdir7(dir2, { withFileTypes: true });
     } catch {
       continue;
     }

package/package.json

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