@4pm/cli 1.19.6 → 1.19.9

package/dist/index.js

@@ -37191,7 +37191,6 @@ var toolRuleSchema = external_exports.string().min(1).max(500);
 var agentToolsPermissionsSchema = external_exports.object({
   defaultMode: external_exports.enum(["default", "acceptEdits", "plan", "bypassPermissions"]),
   allow: external_exports.array(toolRuleSchema).max(500),
-  ask: external_exports.array(toolRuleSchema).max(500),
   deny: external_exports.array(toolRuleSchema).max(500)
 });
 var agentToolsReadQuerySchema = external_exports.object({
@@ -37611,6 +37610,11 @@ async function attachSubmodules(root, submodules, emit, createMissingBranch = fa
       }
       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)) {
@@ -37653,8 +37657,13 @@ async function attachSubmodules(root, submodules, emit, createMissingBranch = fa
 }
 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)"];
@@ -37671,6 +37680,50 @@ async function commitAndPushSubmodules(root, submodules, emit) {
     emit("submodule-push-failed", `Submodules committed locally but the push failed: ${msg}`);
   }
 }
+function providerSlug(url) {
+  const provider = /github\.com/i.test(url) ? "gh" : /gitlab\.com/i.test(url) ? "glab" : null;
+  const m2 = /(?:github|gitlab)\.com[/:]+([^/]+\/.+?)(?:\.git)?\/?$/i.exec(url);
+  return { provider, slug: m2?.[1] ?? "" };
+}
+async function commitAndOpenPr(root, repo, emit) {
+  emit("commit", "Committing the scaffolded project\u2026");
+  await run2("git", ["add", "-A"], { cwd: root, timeout: 6e4 });
+  const staged = (await run2("git", ["diff", "--cached", "--name-only"], { cwd: root, timeout: 3e4 })).stdout.trim();
+  if (!staged) {
+    emit("commit", "Nothing to commit \u2014 skipping the pull request.");
+    return;
+  }
+  const commitArgs = ["commit", "-m", "chore: scaffold project (4PM)"];
+  try {
+    await run2("git", commitArgs, { cwd: root, timeout: 6e4 });
+  } catch {
+    await run2("git", ["-c", "user.name=4PM", "-c", "user.email=noreply@4pm.app", ...commitArgs], { cwd: root, timeout: 6e4 });
+  }
+  const branch = (repo.branch ?? "").trim();
+  emit("push", "Pushing the scaffold branch\u2026");
+  try {
+    await run2("git", ["push", "-u", "origin", ...branch ? [branch] : ["HEAD"]], { cwd: root, timeout: 12e4 });
+  } catch (err) {
+    const msg = err instanceof Error ? err.message : String(err);
+    emit("push-failed", `Scaffold committed locally but the push failed: ${msg} \u2014 push it from the Git tab when credentials are available.`);
+    return;
+  }
+  const { provider, slug } = providerSlug(repo.url ?? "");
+  if (!provider) {
+    emit("pr", "Unknown git host \u2014 skipping the pull request.");
+    return;
+  }
+  emit("pr", `Opening a pull request via ${provider}\u2026`);
+  try {
+    const args = provider === "glab" ? ["mr", "create", "--fill", ...slug ? ["-R", slug] : []] : ["pr", "create", "--fill", ...slug ? ["-R", slug] : []];
+    const { stdout } = await run2(provider, args, { cwd: root, timeout: 12e4 });
+    const link2 = stdout.trim().split(/\s+/).find((s3) => /^https?:\/\//.test(s3)) ?? stdout.trim().split("\n").pop() ?? "";
+    emit("pr", `Pull request opened${link2 ? `: ${link2}` : "."}`);
+  } catch (err) {
+    const msg = err instanceof Error ? err.message : String(err);
+    emit("pr-failed", `Could not open a pull request (${provider}): ${msg}`);
+  }
+}
 function cloneArgs(url, dest, branch) {
   const b2 = (branch ?? "").trim();
   return b2 ? ["clone", "-b", b2, url, dest] : ["clone", url, dest];
@@ -37777,18 +37830,20 @@ async function scaffoldProject(payload, profileDir2, onProgress) {
     if (!repo) throw new Error("A project must declare one repo (ADR-0314).");
     emit("git", "Cloning repository\u2026");
     await provisionRepo(target, repo, emit, { createMissingBranch: true });
-    await scaffoldRepo(target, payload.projectName, payload.spec, emit);
+    await scaffoldRepo(target, payload.projectName, payload.spec, emit, { resetClaude: true });
     await attachSubmodules(target, submodulesOf(reposOf(payload.spec)), emit, true);
     emit("version", "Writing .4pm/.4pm.json\u2026");
     await writeTemplateMarker(target);
+    await commitAndOpenPr(target, repo, emit);
     onProgress?.({ projectId: payload.projectId, step: "done", message: "Scaffold complete.", done: true });
     return { ok: true, path: target };
   } catch (err) {
     return { ok: false, error: err instanceof Error ? err.message : String(err), step: lastStep };
   }
 }
-async function scaffoldRepo(dir2, label, spec, emit) {
+async function scaffoldRepo(dir2, label, spec, emit, opts = {}) {
   await mkdir(dir2, { recursive: true });
+  if (opts.resetClaude) await resetTemplateManagedClaude(dir2, label, emit);
   emit("copy", `Copying the sample template into ${label}\u2026`);
   await cp(sampleDir(), dir2, { recursive: true, force: false, errorOnExist: false });
   if (spec) {
@@ -37797,6 +37852,13 @@ async function scaffoldRepo(dir2, label, spec, emit) {
     await aiInit(dir2, spec, emit);
   }
 }
+async function resetTemplateManagedClaude(dir2, label, emit) {
+  const claude = join6(dir2, ".claude");
+  if (!existsSync4(claude)) return;
+  emit("copy", `Resetting template .claude config in ${label}\u2026`);
+  await rm(join6(claude, "settings.json"), { force: true });
+  await rm(join6(claude, "skills"), { recursive: true, force: true });
+}
 async function writeTemplateMarker(target) {
   const dir2 = join6(target, ".4pm");
   await mkdir(dir2, { recursive: true });
@@ -37844,15 +37906,20 @@ ${specJson}`
 ${specJson}` + (guideInstructions ? `
 Also incorporate these additional instructions/content:
 ${guideInstructions}
-` : "")
+` : ""),
+    guideInstructions
   );
 }
-async function generateFile(path, prompt) {
+async function generateFile(path, prompt, fallback) {
   try {
     const text = await aiGenerate(prompt);
-    if (text.trim()) await writeFile(path, text.trim() + "\n", "utf8");
+    if (text.trim()) {
+      await writeFile(path, text.trim() + "\n", "utf8");
+      return;
+    }
   } catch {
   }
+  if (fallback && fallback.trim()) await writeFile(path, fallback.trim() + "\n", "utf8");
 }
 async function addProject(payload, profileDir2, onProgress) {
   let lastStep = "start";
@@ -42350,7 +42417,8 @@ async function gitRepos(root) {
   if (!top || !(top === base || top.startsWith(base + sep8))) return { repos: [] };
   const repos = [];
   const rootRemote = (await git(base, ["remote", "get-url", "origin"])).trim();
-  repos.push({ subdir: "", name: "", remote: rootRemote || null });
+  const rootBranch = (await git(base, ["rev-parse", "--abbrev-ref", "HEAD"])).trim();
+  repos.push({ subdir: "", name: "", remote: rootRemote || null, branch: rootBranch || null });
   const subOut = await git(base, ["submodule", "status"]);
   for (const line of subOut.split("\n")) {
     const m2 = line.trim().match(/^[-+U ]?[0-9a-f]{7,40}\s+(\S+)/);
@@ -42359,7 +42427,8 @@ async function gitRepos(root) {
     const abs = resolve8(base, subPath);
     if (!(abs === base || abs.startsWith(base + sep8))) continue;
     const remote = (await git(abs, ["remote", "get-url", "origin"])).trim();
-    repos.push({ subdir: subPath, name: subPath, remote: remote || null });
+    const branch = (await git(abs, ["rev-parse", "--abbrev-ref", "HEAD"])).trim();
+    repos.push({ subdir: subPath, name: subPath, remote: remote || null, branch: branch || null });
   }
   return { repos };
 }
@@ -43029,7 +43098,6 @@ import { dirname as dirname8, join as join26 } from "path";
 var SHARED_REL = ".claude/settings.json";
 var LOCAL_REL = ".claude/settings.local.json";
 var SECRETS_DENY = "Read(./project.secrets.json)";
-var MODES = ["default", "acceptEdits", "plan", "bypassPermissions"];
 function fileFor(root, scope) {
   return join26(root, scope === "shared" ? SHARED_REL : LOCAL_REL);
 }
@@ -43043,9 +43111,8 @@ async function readSettingsObject(path) {
 }
 function normalizePermissions(raw) {
   const p2 = raw && typeof raw === "object" ? raw : {};
-  const mode = MODES.includes(p2.defaultMode) ? p2.defaultMode : "default";
   const list = (v2) => Array.isArray(v2) ? v2.filter((x) => typeof x === "string") : [];
-  return { defaultMode: mode, allow: list(p2.allow), ask: list(p2.ask), deny: list(p2.deny) };
+  return { defaultMode: "bypassPermissions", allow: list(p2.allow), deny: list(p2.deny) };
 }
 async function readAgentTools(root, scope) {
   const obj = await readSettingsObject(fileFor(root, scope));

package/dist/project-sample/.claude/settings.json

@@ -8,7 +8,6 @@
   "permissions": {
     "defaultMode": "bypassPermissions",
     "allow": [],
-    "ask": [],
     "deny": []
   },
   "enableAllProjectMcpServers": true

package/package.json

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