@4pm/cli 1.19.3 → 1.19.7

package/dist/index.js

@@ -37503,9 +37503,10 @@ var activityHeartbeatSchema = external_exports.object({
 });
 
 // src/core/scaffold.ts
-import { cp, mkdir, rm, writeFile } from "fs/promises";
+import { cp, mkdir, mkdtemp, rm, writeFile } from "fs/promises";
 import { existsSync as existsSync4 } from "fs";
 import { execFile as execFile2 } from "child_process";
+import { tmpdir as tmpdir2 } from "os";
 import { dirname as dirname3, join as join6, resolve } from "path";
 import { fileURLToPath as fileURLToPath3 } from "url";
 import { promisify as promisify2 } from "util";
@@ -37595,7 +37596,7 @@ function submodulesOf(repos) {
   const primary = singleRepo(repos);
   return repos.filter((r) => r !== primary && !!r.url && !!(r.subdir ?? "").trim());
 }
-async function attachSubmodules(root, submodules, emit) {
+async function attachSubmodules(root, submodules, emit, createMissingBranch = false) {
   if (submodules.length === 0) return;
   if (!existsSync4(join6(root, ".git"))) return;
   let added = 0;
@@ -37610,8 +37611,33 @@ async function attachSubmodules(root, submodules, emit) {
       }
       continue;
     }
+    const abs = join6(root, dir2);
+    if (existsSync4(abs)) {
+      emit("submodule", `Removing placeholder ${dir2} before attaching the submodule\u2026`);
+      await rm(abs, { recursive: true, force: true });
+    }
     emit("submodule", `Adding submodule ${sub.url} \u2192 ${dir2}\u2026`);
     const b2 = (sub.branch ?? "").trim();
+    if (b2 && createMissingBranch && !await ensureRemoteBranch(sub.url, b2, emit)) {
+      try {
+        await run2("git", ["submodule", "add", sub.url, dir2], { cwd: root, timeout: 12e4 });
+        await run2("git", ["config", "-f", ".gitmodules", `submodule.${dir2}.branch`, b2], { cwd: root, timeout: 3e4 });
+        try {
+          await run2("git", ["checkout", "-b", b2], { cwd: join6(root, dir2), timeout: 3e4 });
+          await run2("git", ["push", "-u", "origin", b2], { cwd: join6(root, dir2), timeout: 12e4 });
+        } catch (pushErr) {
+          const pmsg = pushErr instanceof Error ? pushErr.message : String(pushErr);
+          emit("git-branch-push-failed", `Submodule ${dir2}: branch "${b2}" created locally but the push failed: ${pmsg}`);
+        }
+        added++;
+        continue;
+      } catch (err) {
+        const msg = err instanceof Error ? err.message : String(err);
+        if (!/already exists|already registered|in the index/i.test(msg)) {
+          throw new Error(`git submodule add ${dir2} failed: ${msg}`);
+        }
+      }
+    }
     try {
       await run2("git", ["submodule", "add", ...b2 ? ["-b", b2] : [], sub.url, dir2], { cwd: root, timeout: 12e4 });
       added++;
@@ -37632,8 +37658,13 @@ async function attachSubmodules(root, submodules, emit) {
 }
 async function commitAndPushSubmodules(root, submodules, emit) {
   const dirs = submodules.map((s3) => (s3.subdir ?? "").trim()).filter(Boolean);
+  const addPaths = [
+    ...existsSync4(join6(root, ".gitmodules")) ? [".gitmodules"] : [],
+    ...dirs.filter((d) => existsSync4(join6(root, d)))
+  ];
+  if (addPaths.length === 0) return;
   emit("submodule", "Committing .gitmodules\u2026");
-  await run2("git", ["add", ".gitmodules", ...dirs], { cwd: root, timeout: 6e4 });
+  await run2("git", ["add", ...addPaths], { cwd: root, timeout: 6e4 });
   const staged = (await run2("git", ["diff", "--cached", "--name-only"], { cwd: root, timeout: 3e4 })).stdout.trim();
   if (!staged) return;
   const commitArgs = ["commit", "-m", "chore: add git submodules (4PM)"];
@@ -37654,6 +37685,31 @@ function cloneArgs(url, dest, branch) {
   const b2 = (branch ?? "").trim();
   return b2 ? ["clone", "-b", b2, url, dest] : ["clone", url, dest];
 }
+async function remoteHasBranch(url, branch) {
+  try {
+    const { stdout } = await run2("git", ["ls-remote", "--heads", url, branch], { timeout: 3e4 });
+    return stdout.trim().length > 0;
+  } catch {
+    return false;
+  }
+}
+async function ensureRemoteBranch(url, branch, emit) {
+  if (await remoteHasBranch(url, branch)) return true;
+  const tmp = await mkdtemp(join6(tmpdir2(), "4pm-branch-"));
+  try {
+    emit("git", `Branch "${branch}" not found on ${url} \u2014 creating it from the default branch\u2026`);
+    await run2("git", ["clone", "--depth", "1", url, tmp], { timeout: 12e4 });
+    await run2("git", ["checkout", "-b", branch], { cwd: tmp, timeout: 3e4 });
+    await run2("git", ["push", "-u", "origin", branch], { cwd: tmp, timeout: 12e4 });
+    return true;
+  } catch (err) {
+    const msg = err instanceof Error ? err.message : String(err);
+    emit("git-branch-push-failed", `Could not create branch "${branch}" on ${url}: ${msg}`);
+    return false;
+  } finally {
+    await rm(tmp, { recursive: true, force: true });
+  }
+}
 async function updateRepo(dir2, branch, emit) {
   const b2 = (branch ?? "").trim();
   emit("git", `Updating repository (fetch + ${b2 ? `checkout ${b2} + ` : ""}fast-forward pull)\u2026`);
@@ -37683,6 +37739,20 @@ async function provisionRepo(target, repo, emit, opts = {}) {
     }
     return;
   }
+  const b2 = (repo.branch ?? "").trim();
+  if (b2 && opts.createMissingBranch && !await remoteHasBranch(repo.url, b2)) {
+    emit("git", `Cloning ${repo.url} (default branch) to create "${b2}"\u2026`);
+    await run2("git", ["clone", repo.url, target], { timeout: 12e4 });
+    await run2("git", ["checkout", "-b", b2], { cwd: target, timeout: 3e4 });
+    try {
+      await run2("git", ["push", "-u", "origin", b2], { cwd: target, timeout: 12e4 });
+      emit("git", `Created and pushed branch "${b2}".`);
+    } catch (err) {
+      const msg = err instanceof Error ? err.message : String(err);
+      emit("git-branch-push-failed", `Branch "${b2}" created locally but the push failed: ${msg} \u2014 push it when credentials are available.`);
+    }
+    return;
+  }
   emit("git", `Cloning ${repo.url}\u2026`);
   await run2("git", cloneArgs(repo.url, target, repo.branch), { timeout: 12e4 });
 }
@@ -37716,9 +37786,9 @@ async function scaffoldProject(payload, profileDir2, onProgress) {
     const repo = singleRepo(reposOf(payload.spec));
     if (!repo) throw new Error("A project must declare one repo (ADR-0314).");
     emit("git", "Cloning repository\u2026");
-    await provisionRepo(target, repo, emit);
+    await provisionRepo(target, repo, emit, { createMissingBranch: true });
     await scaffoldRepo(target, payload.projectName, payload.spec, emit);
-    await attachSubmodules(target, submodulesOf(reposOf(payload.spec)), emit);
+    await attachSubmodules(target, submodulesOf(reposOf(payload.spec)), emit, true);
     emit("version", "Writing .4pm/.4pm.json\u2026");
     await writeTemplateMarker(target);
     onProgress?.({ projectId: payload.projectId, step: "done", message: "Scaffold complete.", done: true });

package/package.json

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