craftar 0.33.0 → 0.34.1

package/dist/cli.js

@@ -1,14 +1,14 @@
 import { Command } from "commander";
 import pc from "picocolors";
 import path from "node:path";
-import { promises as fs } from "node:fs";
+import { promises as fs, statSync } from "node:fs";
 import YAML from "yaml";
 import { importClaudeCode } from "./importers/claude-code.js";
 import { parsePreferKiro } from "./importers/prefer-kiro.js";
 import { planPromote, applyPromote, UnheldError } from "./importers/drift-promote.js";
 import { providedRefs } from "./importers/provided.js";
 import { holdsBaseCitations, rendersServers } from "./core/mcp-server.js";
-import { classifyForge } from "./core/remote.js";
+import { assertNotCacheTree, classifyForge } from "./core/remote.js";
 import { forget, listWorkspaces, prune, readRegistry, register, registryFile } from "./core/registry.js";
 import { forgeWorkspaces, planAll, nextSync, impactOf, concerned, refineRegistryState, countStates, countStatesObject, NEXT_SYNC_STATES } from "./core/impact.js";
 import { runDoctor } from "./core/doctor.js";
@@ -16,7 +16,7 @@ import { launchRefusal, pinOf } from "./core/mcp-protocol.js";
 import { serve } from "./mcp.js";
 import { pruneCache } from "./core/cache.js";
 import { resolveHome } from "./core/home-lock.js";
-import { loadWorkspace, readWorkspaceConfig, plan, readLock, status, apply, unsetDeclared, unsetRefusal, unsetRefused, agentsMdOverBudget, agentsMdRefusal, resolveForge, resolveForgeSource, WORKSPACE_FILE, LOCAL_FILE } from "./core/sync.js";
+import { loadWorkspace, loadForgeSource, readWorkspaceConfig, plan, readLock, status, apply, unsetDeclared, unsetRefusal, unsetRefused, agentsMdOverBudget, agentsMdRefusal, resolveForge, resolveForgeSource, WORKSPACE_FILE, LOCAL_FILE } from "./core/sync.js";
 import { sectionKey } from "./core/resolve.js";
 import { catalogueContext, listRecipes, listIngredients, checkType, withLoadWarnings } from "./core/catalogue.js";
 import { canonicalValue } from "./core/sections.js";
@@ -30,7 +30,10 @@ import { applyBasePromotion, planBasePromotion, proveBasePromotion } from "./cor
 import { fingerprintDir } from "./core/fingerprint.js";
 import { hunkAt, planFrom, applyPlan, writeUnified, checkRecipeCascade, rewriteRecipes, pruneCandidates, pruneRecipes, note, } from "./core/unify.js";
 import { checkParamWrites, writeParamFile } from "./core/param-writes.js";
-import { checkInitFlags, initLine, planInit } from "./core/init.js";
+import { checkInitFlags, checkLocalKeys, initLine, planInit, forgeSource } from "./core/init.js";
+import { profileName } from "./core/new-profile.js";
+import { newProfileGate } from "./core/new-profile-gate.js";
+import { writeNewProfile, reproveFromDisk, NewProfileRaceLost, NewProfileLateFailure } from "./core/new-profile-write.js";
 import { askInit, askClone, confirmInit, againLine, NOT_CLONED_REFUSED } from "./core/init-flow.js";
 import { findGit, cloneRepos, listRepos, planClone } from "./core/clone.js";
 import { byHand, profileRepos } from "./core/repos.js";
@@ -54,7 +57,7 @@ process.stdout.on("error", (e) => { if (e.code === "EPIPE")
  */
 const DIFF_EXIT_CODE_FETCH_MODE = "sync";
 const program = new Command();
-program.name("craftar").description("Craft, sync and convert AI-coding workspace harnesses.").version("0.33.0");
+program.name("craftar").description("Craft, sync and convert AI-coding workspace harnesses.").version("0.34.1");
 const SAVE_PLAN_GATE = { what: "plan", who: "unify", outside: "save plans outside the Forge", never: "unify never overwrites" };
 const REPORT_GATE = { what: "report", who: "import", outside: "write the report outside the Forge", never: "import never overwrites" };
 program
@@ -73,8 +76,10 @@ program
     // import writes a local Forge; a URL would become a directory named after it (spec 13 §4.4).
     if (classifyForge(o.forge) === "url")
         fail("--forge takes a directory; to read a remote Forge, run inside a workspace that names it");
+    // A cache tree is refused first: it reads only the real paths of --forge and of the cache, nothing of the workspace.
+    await assertNotCacheTree(path.resolve(o.forge), craftarHome()).catch((e) => fail(e instanceof Error ? e.message : String(e)));
     // Spec 29 §4.2: the report's path is refused before the import reads anything, so a refusal leaves the Forge untouched.
-    // Spec 29 §4.3: PK5, before anything is read.
+    // Spec 29 §4.3: PK5, before the workspace is read.
     const preferKiro = o.preferKiro === undefined ? undefined : parsePreferKiro(o.preferKiro);
     const reportAbs = o.report === undefined ? null : await gateOutsideForge(o.report, o.forge, REPORT_GATE);
     const r = await importClaudeCode({ workspaceRoot: o.workspace, forgeRoot: o.forge, profileName: o.profile, writeWorkspaceConfig: o.writeConfig, report: reportAbs !== null, preferKiro });
@@ -294,13 +299,15 @@ async function runCloneStep(root, profile, entries, git, again) {
 /* ---------------------------------------------------------------- init */
 program
     .command("init")
-    .description("Start a workspace from a Forge and a profile: write a craftar.yaml proved to resolve and plan, then run the first sync; with --clone, clone the profile's repositories into the workspace (after the first sync, or with --no-sync after writing craftar.yaml); in a terminal, asks for the Forge and the profile not given as flags; refused when craftar.yaml already exists")
+    .description("Start a workspace from a Forge and a profile: write a craftar.yaml proved to resolve and plan, then run the first sync; with --new-profile, create the profile in the Forge directory first (recipes and targets from --like and the recipe/target flags), then start the workspace on it — nothing is committed; with --clone, clone the profile's repositories into the workspace (after the first sync, or with --no-sync after writing craftar.yaml); in a terminal, asks for the Forge and the profile not given as flags; refused when craftar.yaml already exists")
     .option("--forge <dir|url>", "the Forge: a directory (written relative to the workspace) or a git URL; asked for in a terminal when omitted")
     .option("--profile <name>", "the client profile in the Forge; asked for in a terminal when omitted")
+    .option("--new-profile <name>", "create this profile in the Forge directory (recipes and targets from --like and the recipe flags), then start the workspace on it; nothing is committed")
+    .option("--like <profile>", "with --new-profile: start the new profile's recipes and targets from this profile's — nothing else of it is copied")
     .option("--ref <ref>", "branch, tag or full SHA of a remote Forge")
-    .option("--targets <a,b>", "targets to write in craftar.yaml (claude-code, kiro, agents-md); omitted, the workspace follows the profile's")
-    .option("--add-recipe <name>", "add a recipe to the profile's (repeatable)", collect, [])
-    .option("--remove-recipe <name>", "remove a recipe of the profile's (repeatable)", collect, [])
+    .option("--targets <a,b>", "targets to write in craftar.yaml, or of the new profile with --new-profile (claude-code, kiro, agents-md); omitted, the workspace follows the profile's")
+    .option("--add-recipe <name>", "add a recipe to the profile's, or to the new profile's with --new-profile (repeatable)", collect, [])
+    .option("--remove-recipe <name>", "remove a recipe from the profile's, or from the new profile's with --new-profile (repeatable)", collect, [])
     .option("--replace", "let --add-recipe take a slot another recipe holds", false)
     .option("--no-sync", "write craftar.yaml only, and say what the first sync would do")
     .option("--clone", "after the first sync, clone the profile's repositories (its repos list) into the workspace")
@@ -310,7 +317,8 @@ program
     .action(async (o, cmd) => {
     const root = path.resolve(o.workspace);
     // N1: craftar.yaml already exists
-    const n1 = () => fail(`${WORKSPACE_FILE} already exists in ${root} — change recipes with craftar add recipe / remove recipe, or edit it`);
+    const n1Text = `${WORKSPACE_FILE} already exists in ${root} — change recipes with craftar add recipe / remove recipe, or edit it`;
+    const n1 = () => fail(n1Text);
     const file = path.join(root, WORKSPACE_FILE);
     if (await exists(file))
         n1();
@@ -351,15 +359,29 @@ program
     if (o.clone === true && git === null) {
         fail("cloning needs git — install it, or leave the clone out");
     }
+    // P1–P4: --new-profile checks (before anything is read)
+    if (o.newProfile !== undefined && o.profile !== undefined) {
+        fail("pass --profile or --new-profile, not both");
+    }
+    if (o.like !== undefined && o.newProfile === undefined) {
+        fail("--like goes with --new-profile");
+    }
+    if (o.newProfile !== undefined) {
+        profileName(o.newProfile);
+    }
+    if (o.newProfile !== undefined && o.forge !== undefined && classifyForge(o.forge) === "url") {
+        fail("a new profile is written into a Forge directory — clone the Forge, pass that directory as --forge, then commit and push the profile");
+    }
     // Mode: flags when both given; else interactive when both streams are TTYs; else N2
-    const bothGiven = o.forge !== undefined && o.profile !== undefined;
+    // --new-profile counts as --profile for bothGiven and N2
+    const bothGiven = o.forge !== undefined && (o.profile !== undefined || o.newProfile !== undefined);
     const isTTY = process.stdin.isTTY && process.stdout.isTTY;
     if (!bothGiven && !isTTY) {
         // N2: refuse with our message
-        if (o.forge === undefined && o.profile === undefined) {
+        if (o.forge === undefined && o.profile === undefined && o.newProfile === undefined) {
             fail("--forge and --profile are required when craftar init does not run in a terminal — pass them, or run craftar init in a terminal to be asked");
         }
-        else if (o.profile === undefined) {
+        else if (o.profile === undefined && o.newProfile === undefined) {
             fail("--profile is required when craftar init does not run in a terminal — pass it, or run craftar init in a terminal to be asked");
         }
         else {
@@ -375,6 +397,8 @@ program
         const result = await askInit(root, {
             forge: o.forge,
             profile: o.profile,
+            newProfile: o.newProfile,
+            like: o.like,
             ref: o.ref,
             targets: o.targets === undefined ? undefined : o.targets.split(",").map((t) => t.trim()),
             addRecipes: o.addRecipe,
@@ -387,6 +411,32 @@ program
         input = result.input;
         answers = result.answers;
     }
+    else if (o.newProfile !== undefined) {
+        // --forge and --new-profile given (flags mode with new profile)
+        // N10 (spec 38 §4.2): the one check, before the load — --new-profile counts as --profile there
+        checkLocalKeys(local.keys, {
+            ref: o.ref !== undefined,
+            recipes: o.addRecipe.length > 0 || o.removeRecipe.length > 0,
+            targets: o.targets !== undefined,
+        });
+        // Load the Forge
+        const loaded = await loadForgeSource(root, forgeSource(root, o.forge), o.ref ?? null, { ...load(o, "sync") });
+        // Gate: P5-P8
+        await newProfileGate(loaded.forge, resolveHome(process.env.CRAFTAR_HOME || undefined), o.newProfile);
+        // Build input
+        input = {
+            forge: o.forge,
+            profile: o.newProfile,
+            newProfile: { name: o.newProfile, like: o.like },
+            ref: o.ref,
+            targets: o.targets === undefined ? undefined : o.targets.split(",").map((t) => t.trim()),
+            addRecipes: o.addRecipe,
+            removeRecipes: o.removeRecipe,
+            replace: o.replace,
+            clone: o.clone === true,
+            loaded,
+        };
+    }
     else {
         input = {
             forge: o.forge,
@@ -399,7 +449,7 @@ program
             clone: o.clone === true,
         };
     }
-    const init = await planInit(root, input, { ...load(o, "sync"), local });
+    let init = await planInit(root, input, { ...load(o, "sync"), local });
     // Interactive mode: when o.clone is undefined, ask about cloning between planInit and confirmInit
     // --clone typed: planInit has checked C3–C5 and returned the entries, in either mode
     let cloneEntries = o.clone === true ? init.repos : [];
@@ -422,26 +472,84 @@ program
         if (confirm === "cancelled")
             fail("init cancelled — nothing written");
     }
-    const { ws, plan: p } = init;
+    let { ws, plan: p } = init;
+    const forgeRoot = ws.forge.root;
     const workspaceGiven = cmd.getOptionValueSource("workspace") === "cli";
     const again = () => {
         if (answers !== null) {
             console.log(againLine(answers, { workspace: workspaceGiven ? o.workspace : undefined, sync: o.sync, offline: o.offline, clone: cloneEntries.length > 0 }));
         }
     };
+    // When init.newProfile: write the profile, then reprove from disk
+    let journal = [];
+    // Step 1's notes are printed after the initLine line (spec 38), so keep them before reprove
+    const step1Notes = init.notes;
+    if (init.newProfile) {
+        try {
+            journal = await writeNewProfile(forgeRoot, init);
+        }
+        catch (e) {
+            if (e instanceof NewProfileRaceLost) {
+                // P7's first message, no recover lines
+                fail(e.message);
+            }
+            if (e instanceof NewProfileLateFailure) {
+                fail(lateFailure(e, forgeRoot, e.journal, "init"));
+            }
+            throw e;
+        }
+        // Reprove from disk (step 4)
+        try {
+            init = await reproveFromDisk(root, input.forge, init, { ...load(o, "sync") }, journal, input.ref);
+        }
+        catch (e) {
+            if (e instanceof NewProfileLateFailure) {
+                fail(lateFailure(e, forgeRoot, e.journal, "init"));
+            }
+            throw e;
+        }
+        // Update ws and p from the second init
+        ws = init.ws;
+        p = init.plan;
+        // Print the profile creation lines
+        console.log(pc.bold(`craftar init — created profile ${ws.config.profile} in ${forgeRoot}`));
+        console.log(`  + profiles/${ws.config.profile}/profile.yaml   (not committed — commit it in the Forge, on a branch, before anyone else syncs)`);
+    }
     // Every refusal is above: only now does the directory, and craftar.yaml, come to exist
-    await fs.mkdir(root, { recursive: true });
-    try {
-        await fs.writeFile(file, init.text, { flag: "wx" });
+    // When journal is not empty: mkdir inside the try, with late failure handling
+    if (journal.length > 0) {
+        try {
+            await fs.mkdir(root, { recursive: true });
+        }
+        catch (e) {
+            fail(lateFailure(e, forgeRoot, journal, "init"));
+        }
+        try {
+            await fs.writeFile(file, init.text, { flag: "wx" });
+        }
+        catch (e) {
+            if (e.code === "EEXIST") {
+                // N1's text, then lateFailure
+                fail(`${n1Text}\n${lateFailure(e, forgeRoot, journal, "init")}`);
+            }
+            fail(lateFailure(e, forgeRoot, journal, "init"));
+        }
     }
-    catch (e) {
-        if (e.code === "EEXIST")
-            n1();
-        throw e;
+    else {
+        // No journal: existing behaviour unchanged
+        await fs.mkdir(root, { recursive: true });
+        try {
+            await fs.writeFile(file, init.text, { flag: "wx" });
+        }
+        catch (e) {
+            if (e.code === "EEXIST")
+                n1();
+            throw e;
+        }
     }
     console.log(pc.bold(`craftar init — wrote ${WORKSPACE_FILE} in ${root}`));
     console.log(`  ${initLine(init)}`);
-    for (const n of init.notes)
+    for (const n of step1Notes)
         console.log(`  note ${n}`);
     const unset = unsetDeclared(p);
     const cloning = cloneEntries.length > 0;
@@ -1966,8 +2074,8 @@ forge
         fail("pass exactly one of --take, --plan or --save-plan");
     if (o.take !== undefined && o.take !== "base" && o.take !== "variant")
         fail(`--take must be "base" or "variant"`);
-    // Never through the cache: a tree there is clean and tracked, so gitUnheld would pass and the edit
-    // would be lost at the next cleanup without reaching the remote (spec 13 §4.4).
+    // Never through the cache: the URL form is refused by refuseRemote and the directory form by assertNotCacheTree;
+    // a tree there is clean and tracked, so gitUnheld would pass and the edit would be lost at the next cleanup without reaching the remote (spec 13 §4.4).
     const f = await resolveForge({
         forge: o.forge,
         workspace: o.workspace,
@@ -1984,6 +2092,7 @@ forge
         fail(`${ref} has no variant for profile ${o.profile}`);
     // Only when about to write — --save-plan touches nothing inside the Forge, so it is exempt.
     if (!o.savePlan) {
+        await assertNotCacheTree(f.root, craftarHome()).catch((e) => fail(e instanceof Error ? e.message : String(e)));
         if (f.commit === null) {
             // `gitHead` (and so `f.commit`) is also `null` for a real git repo with no commits yet —
             // that is not "not a git repository" (Ruling 22), so tell the two apart before wording it.
@@ -2448,12 +2557,13 @@ forge
     .option("--dry-run", "run every check and the first impact pass, print what would be written, and write nothing", false)
     .option("--json", "machine-readable output", false)
     .action(async (ref, o) => {
-    // Never through the cache, as `forge unify` (spec 13 §4.4).
+    // Never through the cache, as `forge unify` (spec 13 §4.4): the URL form is refused by refuseRemote and the directory form by assertNotCacheTree.
     const f = await resolveForge({
         forge: o.forge,
         workspace: o.workspace,
         refuseRemote: (url) => `the Forge of this workspace is remote (${url}) — clone it and pass --forge <dir>`,
     });
+    await assertNotCacheTree(f.root, craftarHome()).catch((e) => fail(e instanceof Error ? e.message : String(e)));
     // P2 (spec 29 §4.4): git is the undo, so it must be there, hold a commit and be clean — before anything is planned.
     if (f.commit === null) {
         if (await gitIsRepo(f.root))
@@ -3001,6 +3111,7 @@ function unheldMessage(command, root, unheld) {
  * The message for a `forge unify` failure after writing began (Ruling 33): the original error, the
  * Forge-relative paths already touched, and the git commands that undo them — `checkout` for what
  * git tracks, `clean` for files unify created (checkout refuses a path git does not know).
+ * For created paths, directories get `clean -fd`, files (or missing paths) get `clean -f`.
  */
 function lateFailure(e, root, journal, command = "unify") {
     const msg = errorText(e);
@@ -3009,15 +3120,35 @@ function lateFailure(e, root, journal, command = "unify") {
     const rel = (abs) => path.relative(root, abs).split(path.sep).join("/");
     const quote = (p) => (/^[\w./-]+$/.test(p) ? p : `"${p}"`);
     const restore = [...new Set(journal.filter((j) => !j.created).map((j) => rel(j.abs)))];
-    const created = [...new Set(journal.filter((j) => j.created).map((j) => rel(j.abs)))];
+    const created = [...new Set(journal.filter((j) => j.created).map((j) => j.abs))];
+    // For created paths, check if they are directories
+    const createdDirs = [];
+    const createdFiles = [];
+    for (const abs of created) {
+        try {
+            const st = statSync(abs);
+            if (st.isDirectory()) {
+                createdDirs.push(rel(abs));
+            }
+            else {
+                createdFiles.push(rel(abs));
+            }
+        }
+        catch {
+            // Path doesn't exist, treat as file
+            createdFiles.push(rel(abs));
+        }
+    }
     const lines = [msg, `${command} had already started changing the Forge (${root}) when this failed:`];
-    for (const p of [...restore, ...created])
+    for (const p of [...restore, ...createdDirs, ...createdFiles])
         lines.push(`  ${p}`);
     lines.push("recover with:");
     if (restore.length)
         lines.push(`  git -C ${quote(root)} checkout -- ${restore.map(quote).join(" ")}`);
-    if (created.length)
-        lines.push(`  git -C ${quote(root)} clean -f -- ${created.map(quote).join(" ")}`);
+    if (createdDirs.length)
+        lines.push(`  git -C ${quote(root)} clean -fd -- ${createdDirs.map(quote).join(" ")}`);
+    if (createdFiles.length)
+        lines.push(`  git -C ${quote(root)} clean -f -- ${createdFiles.map(quote).join(" ")}`);
     return lines.join("\n");
 }
 /** ` [1 evolution · 2 block]` in the fixed class order, zero counts omitted; empty for a variant without hunks (spec 08 §4.2). */