@rsaglobaltech/specgate 0.20.0 → 0.22.0

package/dist/scripts/cli/commands/spec/DraftCommand.js

@@ -57,6 +57,9 @@ exports.draftReport = draftReport;
 exports.moduleStatus = moduleStatus;
 exports.briefProgress = briefProgress;
 exports.draftNextCommand = draftNextCommand;
+exports.openFindings = openFindings;
+exports.nextScenario = nextScenario;
+exports.reserveScenarioRange = reserveScenarioRange;
 exports.pasteLine = pasteLine;
 const fs = __importStar(require("node:fs"));
 const path = __importStar(require("node:path"));
@@ -69,10 +72,13 @@ const project_root_1 = require("../../../lib/project-root");
 const DraftChecklist_1 = require("../../../../packages/core/src/domain/DraftChecklist");
 const ChangeWorkspace_1 = require("../../../../packages/core/src/infrastructure/ChangeWorkspace");
 const ChangeTemplates_1 = require("../../../../packages/core/src/domain/ChangeTemplates");
+const IdsAcrossBranches_1 = require("../../../../packages/core/src/infrastructure/IdsAcrossBranches");
 const DiskLanguageRepository_1 = require("../../../../packages/core/src/infrastructure/DiskLanguageRepository");
 const drafting_guide_1 = require("../../../draft/drafting-guide");
 const confined_agent_1 = require("../../../draft/confined-agent");
 const brief_setup_1 = require("../../../draft/brief-setup");
+const brief_check_1 = require("../../../draft/brief-check");
+const BriefCards_1 = require("../../../../packages/core/src/domain/BriefCards");
 const GherkinTags_1 = require("../../../../packages/core/src/domain/GherkinTags");
 const DerivedMatrixSources_1 = require("../../../../packages/core/src/infrastructure/DerivedMatrixSources");
 const CHANGES = path.join("docs", "specs", "changes");
@@ -84,11 +90,13 @@ function draftModuleOf(changeId) {
     return changeId.startsWith("draft-") ? changeId.slice("draft-".length) : `--check ${changeId}`;
 }
 function usage() {
-    return ("Usage:\n" +
+    return ("Same as specgate propose --from-brief: a module of your brief becomes a draft change.\n\n" +
+        "Usage:\n" +
         "  specgate draft                       your brief's modules, and the one to do next\n" +
         "  specgate draft <module>              open that module's draft — or check it, once it exists\n" +
         '  specgate draft <module> --agent "claude -p"\n' +
         "                                       have your agent write it, then check it\n" +
+        "  specgate draft --check               the brief rules (B1–B11) on the brief, before drafting\n" +
         "  specgate draft --check <change-id>   the checklist on any change\n" +
         "  specgate draft --new-brief           write docs/brief.md to fill in, when you have none\n" +
         '  specgate draft --agent "claude -p"   have your agent propose the brief\'s front matter\n\n' +
@@ -107,11 +115,20 @@ function usage() {
         "                                                D9 every scenario passes the harness gate's rules\n" +
         "                                                D10 no id the project already uses\n" +
         "                                                D12 an actor can get the ids it acts on\n\n" +
-        "Without a brief, D3 and D6 cannot run, and the report says so.\n");
+        "Without a brief, D3 and D6 cannot run, and the report says so.\n\n" +
+        "The brief rules (ADR-0038) — errors stop a draft, warnings are for you:\n" +
+        "  B1 front matter fields in the shape Specgate reads   B5 a vague word in a rule\n" +
+        "  B2 the brief, and each module section, says something B6 a promised quantity with no number\n" +
+        "  B3 a section per module, a module per section         B7 a framework or database in a rule\n" +
+        "  B4 every module has rules, and examples              B8 more than 7 rules or 3 questions\n" +
+        "                                                        B9 a declared actor never mentioned\n" +
+        "                                                        B10 a rule that names a non-goal\n" +
+        "                                                        B11 a condition after the rule (EARS)\n");
 }
 function parseArgs(argv) {
     const o = {
         check: "",
+        checkBrief: false,
         module: "",
         brief: "",
         maxRequirements: 25,
@@ -129,8 +146,14 @@ function parseArgs(argv) {
                 throw new Error(`${a} needs a value`);
             return v;
         };
-        if (a === "--check")
-            o.check = value();
+        if (a === "--check") {
+            // `--check <change-id>` checks a draft; `--check` alone, the brief.
+            const next = argv[i + 1];
+            if (next === undefined || next.startsWith("-"))
+                o.checkBrief = true;
+            else
+                o.check = value();
+        }
         else if (a === "--brief")
             o.brief = value();
         else if (a === "--max-requirements")
@@ -157,6 +180,9 @@ function parseArgs(argv) {
     if (o.check && o.module) {
         throw new Error("give a module or --check <change-id>, not both");
     }
+    if (o.checkBrief && (o.module || o.agent || o.newBrief)) {
+        throw new Error("--check only checks the brief: run it on its own");
+    }
     if (o.module && !ChangeWorkspace_1.CHANGE_ID_RE.test(o.module)) {
         throw new Error(`"${o.module}" is not a module name: use lowercase words and dashes, e.g. bookings`);
     }
@@ -340,11 +366,17 @@ function briefProgress(projectDir) {
     const modules = (0, DraftChecklist_1.briefModules)(text).map((m) => moduleStatus(projectDir, m));
     if (modules.length === 0)
         return null;
-    return { brief: exports.DEFAULT_BRIEF, modules, next: modules.find((m) => m.state !== "archived") };
+    // A ready draft is reviewed and then applied (ADR-0035): the next module to
+    // draft is the first that is neither archived nor ready.
+    return {
+        brief: exports.DEFAULT_BRIEF,
+        modules,
+        next: modules.find((m) => m.state !== "archived" && m.state !== "ready"),
+    };
 }
 /** What to run for this module, given where it stands. */
 function draftNextCommand(s) {
-    return s.state === "ready" ? `specgate change archive ${s.change}` : `specgate draft ${s.module}`;
+    return s.state === "ready" ? "specgate apply" : `specgate propose --from-brief ${s.module}`;
 }
 /** `➜ claude -p … is drafting catalogo…`, and why a flag was added. */
 function agentLine(command, doing, added) {
@@ -421,7 +453,8 @@ function nextScenario(projectDir) {
             const full = path.join(dir, e.name);
             if (e.isDirectory())
                 walk(full);
-            else if (e.name.endsWith(".md") || e.name.endsWith(".feature")) {
+            // change.yaml holds a change's reserved scenario range (REQ-157).
+            else if (e.name.endsWith(".md") || e.name.endsWith(".feature") || e.name === "change.yaml") {
                 for (const m of fs.readFileSync(full, "utf8").matchAll(/\bSCN-(\d+)\b/g)) {
                     max = Math.max(max, Number(m[1]));
                 }
@@ -430,11 +463,19 @@ function nextScenario(projectDir) {
     };
     walk(path.join(projectDir, "docs", "specs"));
     walk(path.join(projectDir, "features"));
+    max = Math.max(max, (0, IdsAcrossBranches_1.highestOnOtherBranches)(projectDir, "SCN"));
     for (const m of (readIf(path.join(projectDir, "spec.md")) || "").matchAll(/\bSCN-(\d+)\b/g)) {
         max = Math.max(max, Number(m[1]));
     }
     return `SCN-${String(max + 1).padStart(3, "0")}`;
 }
+/** Three scenario ids per requirement id, from the next free one (REQ-157). */
+function reserveScenarioRange(projectDir, reqRange) {
+    const first = nextScenario(projectDir);
+    const reqs = Number(reqRange[1].slice(4)) - Number(reqRange[0].slice(4)) + 1;
+    const last = Number(first.slice(4)) + Math.max(1, reqs) * 3 - 1;
+    return [first, `SCN-${String(last).padStart(3, "0")}`];
+}
 /** The one line to paste into any agent. */
 function pasteLine(module) {
     return `Draft the ${module} module: follow ${CHANGES.split(path.sep).join("/")}/draft-${module}/DRAFTING.md`;
@@ -456,11 +497,23 @@ function proposalFor(module, changeId, brief) {
         "",
     ].join("\n");
 }
+/** The module's section of the brief, for `DRAFTING.md`; undefined when it has none. */
+function moduleCards(briefText, module) {
+    const section = (0, BriefCards_1.moduleSection)(briefText, module);
+    if (!section)
+        return undefined;
+    return {
+        source: section.source,
+        values: (0, BriefCards_1.cardValues)(section),
+        questions: section.questions.map((q) => q.text),
+    };
+}
 /** Open `draft-<module>`: the change, linked to the brief, with its guide. */
 function openDraft(projectDir, module, brief, o) {
     const changeId = `draft-${module}`;
     const dir = path.join(projectDir, CHANGES, changeId);
     const reqRange = (0, ChangeWorkspace_1.reserveReqRange)(projectDir, o.reserve);
+    const scnRange = reserveScenarioRange(projectDir, reqRange);
     const config = {
         ...ChangeWorkspace_1.DEFAULT_CONFIG,
         created: new Date().toISOString().slice(0, 10),
@@ -480,12 +533,14 @@ function openDraft(projectDir, module, brief, o) {
         changeId,
         brief,
         reqRange,
-        firstScenario: nextScenario(projectDir),
+        firstScenario: scnRange[0],
+        lastScenario: scnRange[1],
         maxRequirements: o.maxRequirements,
         actors: (0, DraftChecklist_1.actorSurfaces)(briefText),
+        cards: moduleCards(briefText, module),
     }));
     write(path.join("specs", module, "spec.md"), (0, ChangeTemplates_1.templateDelta)(module, reqRange[0], (0, DiskLanguageRepository_1.phrases)(projectDir)));
-    write("change.yaml", `${(0, ChangeWorkspace_1.renderConfig)(config).trimEnd()}\nbrief: ${brief}\n`);
+    write("change.yaml", `${(0, ChangeWorkspace_1.renderConfig)(config).trimEnd()}\nscn_range: [${scnRange[0]}, ${scnRange[1]}]\nbrief: ${brief}\n`);
     write("proposal.md", proposalFor(module, changeId, brief));
     return { changeId, reqRange, created };
 }
@@ -512,6 +567,12 @@ function nextFor(s) {
     return s ? draftNextCommand(s) : "specgate status";
 }
 class DraftCommand extends command_1.BaseCommand {
+    /** How the person called it, for the header: `draft`, or `propose --from-brief`. */
+    verb;
+    constructor(args = [], verb = "draft") {
+        super(args);
+        this.verb = verb;
+    }
     execute() {
         const io0 = (0, agent_1.agentIo)((0, agent_1.wantsJson)(this.args));
         let o;
@@ -519,11 +580,14 @@ class DraftCommand extends command_1.BaseCommand {
             o = parseArgs(this.args);
         }
         catch (err) {
+            // `parseArgs` throws Errors.
             io0.usage({ draft: null }, [
                 (0, diagnostics_1.error)("draft_usage", err.message, { fix: "specgate draft --help" }),
             ]);
         }
         const opts = o;
+        if (opts.checkBrief)
+            return this.checkBrief(opts);
         if (opts.check)
             return this.check(opts);
         if (opts.module)
@@ -539,7 +603,7 @@ class DraftCommand extends command_1.BaseCommand {
         const io = (0, agent_1.agentIo)(opts.json);
         io.fail({ draft: null }, [
             (0, diagnostics_1.error)("draft_no_brief", `No plan or brief at ${rel}.`, {
-                fix: `Save your plan or brief as ${exports.DEFAULT_BRIEF} — any markdown — then run \`specgate draft\`. ` +
+                fix: `Save your plan or brief as ${exports.DEFAULT_BRIEF} — any markdown — then run \`specgate propose --from-brief\`. ` +
                     "Somewhere else: --brief <file>.",
             }),
         ]);
@@ -556,14 +620,14 @@ class DraftCommand extends command_1.BaseCommand {
         // (a) No brief: what one is, and how to get one.
         if (text === undefined) {
             if (!opts.json) {
-                process.stdout.write(ui.header("draft") + `${(0, brief_setup_1.noBriefExplanation)(rel)}\n`);
+                process.stdout.write(ui.header(this.verb) + `${(0, brief_setup_1.noBriefExplanation)(rel)}\n`);
                 process.exitCode = 1;
                 return;
             }
             io.fail({ draft: null }, [
                 (0, diagnostics_1.error)("draft_no_brief", `No plan or brief at ${rel}.`, {
-                    fix: `Save your plan or brief as ${rel} — any markdown — then run \`specgate draft\`. ` +
-                        "No plan yet: `specgate draft --new-brief` writes one to fill in. Somewhere else: --brief <file>.",
+                    fix: `Save your plan or brief as ${rel} — any markdown — then run \`specgate propose --from-brief\`. ` +
+                        "No plan yet: `specgate propose --from-brief --new-brief` writes one to fill in. Somewhere else: --brief <file>.",
                 }),
             ]);
         }
@@ -579,49 +643,75 @@ class DraftCommand extends command_1.BaseCommand {
                     frontMatter: null,
                     guide: brief_setup_1.BRIEF_SETUP_FILE,
                     prompt: brief_setup_1.BRIEF_SETUP_PASTE,
-                    next: 'specgate draft --agent "claude -p"',
+                    next: 'specgate propose --from-brief --agent "claude -p"',
                 },
-            }, () => process.stdout.write(ui.header("draft", rel) +
+            }, () => process.stdout.write(ui.header(this.verb, rel) +
                 (0, brief_setup_1.frontMatterExplanation)(rel) +
                 "\n" +
                 ui.section("Or let your agent propose it") +
                 "  Paste this into Claude Code, Cursor, Codex…\n\n" +
                 ui.quote(brief_setup_1.BRIEF_SETUP_PASTE) +
-                ui.next('specgate draft --agent "claude -p"', "Specgate calls your agent for you — then review the four fields and run specgate draft again")));
+                ui.next('specgate propose --from-brief --agent "claude -p"', "Specgate calls your agent for you — then review the four fields and run specgate propose --from-brief again")));
             return;
         }
         // (c) A front matter with problems: each in plain words, with its fix.
         const problems = (0, brief_setup_1.checkFrontMatter)(brief.text);
         if (problems.length > 0) {
             io.emit({
-                draft: { brief: rel, frontMatter: "invalid", next: `edit ${rel}, then specgate draft` },
+                draft: {
+                    brief: rel,
+                    frontMatter: "invalid",
+                    next: `edit ${rel}, then specgate propose --from-brief`,
+                },
                 status: problems.map((p) => (0, diagnostics_1.error)(p.code, p.message, { fix: p.fix })),
             }, () => {
                 const out = process.stdout;
-                out.write(ui.header("draft", rel));
+                out.write(ui.header(this.verb, rel));
                 out.write(`  The front matter at the top of ${rel} needs ${problems.length} fix(es):\n\n`);
                 for (const p of problems)
                     out.write(ui.fail(p.message) + ui.fix(p.fix));
-                out.write(ui.next("specgate draft", `once they are fixed in ${rel}`));
+                out.write(ui.next("specgate propose --from-brief", `once they are fixed in ${rel}`));
             });
             process.exitCode = 1;
             return;
         }
+        // (c') The body: an empty brief, a module without its section or cards.
+        const findings = (0, brief_check_1.checkBrief)(brief.text, rel);
+        const errors = findings.filter((d) => d.severity === "error");
+        if (errors.length > 0) {
+            io.emit({
+                draft: { brief: rel, ready: false, next: "specgate propose --from-brief --check" },
+                status: findings,
+            }, () => {
+                const out = process.stdout;
+                out.write(ui.header(this.verb, rel));
+                out.write(`  ${rel} needs ${errors.length} fix(es) before a module is drafted:\n\n`);
+                writeBriefFindings(errors);
+                out.write(ui.next("specgate propose --from-brief --check", `once they are fixed in ${rel}`));
+            });
+            process.exitCode = 1;
+            return;
+        }
+        const warnings = findings.filter((d) => d.severity === "warning").length;
         // (d) Ready: the modules, where each stands, what is next.
         const modules = (0, DraftChecklist_1.briefModules)(brief.text);
         const states = modules.map((m) => moduleStatus(projectDir, m, rel));
         const pending = states.find((s) => s.state !== "archived");
         const next = nextFor(pending);
         const product = /^product:\s*(.+)$/m.exec((0, brief_setup_1.frontMatter)(brief.text) || "");
-        io.emit({ draft: { brief: rel, modules: states, next } }, () => {
+        io.emit({ draft: { brief: rel, modules: states, next }, status: findings }, () => {
             const out = process.stdout;
-            out.write(ui.header("draft", rel));
+            out.write(ui.header(this.verb, rel));
             if (product)
                 out.write(ui.kv("Product", ui.bold(product[1].trim()), 10));
             const archived = states.filter((s) => s.state === "archived").length;
             out.write(ui.kv("Progress", ui.progress(archived, states.length, "archived"), 10));
             out.write("\n" + ui.section("Modules"));
             out.write(ui.table(states.map((s) => [`${ICON[s.state]()} ${s.module}`, ui.muted(describe(s))])));
+            if (warnings > 0) {
+                out.write("\n" +
+                    ui.info(`${warnings} warning(s) on the brief's wording ${ui.muted("— specgate propose --from-brief --check")}`));
+            }
             out.write(pending
                 ? ui.next(next)
                 : "\n" +
@@ -629,29 +719,60 @@ class DraftCommand extends command_1.BaseCommand {
                     ui.next(next, "what to build first"));
         });
     }
+    /** `--check`: the brief rules on the brief, writing nothing (ADR-0038). */
+    checkBrief(opts) {
+        const io = (0, agent_1.agentIo)(opts.json);
+        const projectDir = (0, project_root_1.resolveProjectDir)(opts.projectDir);
+        const brief = this.brief(projectDir, opts);
+        const findings = (0, brief_check_1.checkBrief)(brief.text, brief.rel);
+        const errors = findings.filter((d) => d.severity === "error").length;
+        const warnings = findings.filter((d) => d.severity === "warning").length;
+        const first = (0, DraftChecklist_1.briefModules)(brief.text).find((m) => moduleStatus(projectDir, m, brief.rel).state !== "archived");
+        const next = errors > 0
+            ? "specgate propose --from-brief --check"
+            : first
+                ? `specgate propose --from-brief ${first}`
+                : "specgate propose --from-brief";
+        io.emit({
+            draft: { brief: brief.rel, ready: errors === 0, errors, warnings, next },
+            status: findings,
+        }, () => {
+            const out = process.stdout;
+            out.write(ui.header(`${this.verb} --check`, brief.rel));
+            writeBriefFindings(findings);
+            out.write(errors > 0
+                ? (findings.length ? "\n" : "") +
+                    ui.fail(`${ui.bold(`${errors} error(s) to fix before drafting`)} ${ui.muted("— each says how")}`)
+                : (findings.length ? "\n" : "") +
+                    ui.ok(ui.bold("Ready to draft") +
+                        (warnings ? ui.muted(` — ${warnings} warning(s) for you to judge`) : "")));
+            out.write(ui.next(next, errors > 0 ? `once they are fixed in ${brief.rel}` : "the first module"));
+        });
+        process.exitCode = errors > 0 ? 1 : 0;
+    }
     /** `--new-brief`: the template, never over a brief that exists. */
     newBrief(opts, file, rel) {
         const io = (0, agent_1.agentIo)(opts.json);
         if (fs.existsSync(file)) {
             io.fail({ draft: null }, [
                 (0, diagnostics_1.error)("draft_brief_exists", `${rel} already exists — nothing was written.`, {
-                    fix: "Edit it, then run `specgate draft`; it says what the top of the brief still needs.",
+                    fix: "Edit it, then run `specgate propose --from-brief`; it says what the top of the brief still needs.",
                 }),
             ]);
         }
         fs.mkdirSync(path.dirname(file), { recursive: true });
         fs.writeFileSync(file, brief_setup_1.BRIEF_TEMPLATE, "utf8");
-        io.emit({ draft: { brief: rel, written: true, next: "specgate draft" } }, () => process.stdout.write(ui.header("draft --new-brief") +
+        io.emit({ draft: { brief: rel, written: true, next: "specgate propose --from-brief --check" } }, () => process.stdout.write(ui.header(`${this.verb} --new-brief`) +
             ui.ok(`Wrote ${rel} — a brief to fill in.`) +
             "\n  Fill it in, in your own words:\n" +
             "    1. The four fields at the top — product, surfaces, actors, modules.\n" +
             "       Each has an example in the comment above it.\n" +
-            "    2. The sections below — what the product is, who uses it and how, what\n" +
-            "       each one must be able to do, the rules and numbers you already know,\n" +
-            "       what you don't know yet, and what is out of scope.\n\n" +
-            "  Have a plan or an email already? Paste it under the four fields instead\n" +
-            "  of the sections — Specgate reads it as it is.\n" +
-            ui.next("specgate draft", "it checks the four fields and says what is next")));
+            "    2. Why — the problem, and a success you can measure.\n" +
+            "    3. Per module, a section: its Rules, an Example per rule, and the\n" +
+            "       Questions you cannot answer yet.\n\n" +
+            "  Have a plan or an email already? Paste it under Notes — your agent can\n" +
+            '  turn it into the module sections: specgate propose --from-brief --agent "claude -p"\n' +
+            ui.next("specgate propose --from-brief --check", "it checks the brief and says what is missing")));
     }
     /**
      * `draft --agent` without a module: the agent proposes the front matter.
@@ -662,10 +783,20 @@ class DraftCommand extends command_1.BaseCommand {
     frontMatterWithAgent(opts, projectDir, brief) {
         const io = (0, agent_1.agentIo)(opts.json);
         if ((0, brief_setup_1.frontMatter)(brief.text) !== null && (0, brief_setup_1.checkFrontMatter)(brief.text).length === 0) {
-            const first = (0, DraftChecklist_1.briefModules)(brief.text)[0];
-            io.emit({ draft: { brief: brief.rel, frontMatter: "ok", next: `specgate draft ${first}` } }, () => process.stdout.write(ui.header("draft --agent", brief.rel) +
+            const modules = (0, DraftChecklist_1.briefModules)(brief.text);
+            if (modules.length > 0 && (0, BriefCards_1.readBriefBody)(brief.text).modules.length === 0) {
+                return this.cardsWithAgent(opts, projectDir, brief, modules);
+            }
+            const first = modules[0];
+            io.emit({
+                draft: {
+                    brief: brief.rel,
+                    frontMatter: "ok",
+                    next: `specgate propose --from-brief ${first}`,
+                },
+            }, () => process.stdout.write(ui.header(`${this.verb} --agent`, brief.rel) +
                 ui.ok(`The front matter of ${brief.rel} is already there and complete — nothing for the agent to do.`) +
-                ui.next(`specgate draft ${first}`)));
+                ui.next(`specgate propose --from-brief ${first}`)));
             return;
         }
         writeSetupGuide(projectDir, brief.rel);
@@ -675,7 +806,7 @@ class DraftCommand extends command_1.BaseCommand {
             .join("/");
         const agent = (0, confined_agent_1.withWritePermission)(opts.agent);
         if (!opts.json) {
-            process.stdout.write(ui.header("draft --agent", brief.rel) +
+            process.stdout.write(ui.header(`${this.verb} --agent`, brief.rel) +
                 agentLine(agent.command, `is proposing the front matter of ${brief.rel}`, agent.added));
         }
         const run = (0, confined_agent_1.runConfinedAgent)({
@@ -703,7 +834,7 @@ class DraftCommand extends command_1.BaseCommand {
             fs.writeFileSync(path.resolve(projectDir, brief.rel), brief.text, "utf8");
             io.fail({ draft: null }, [
                 (0, diagnostics_1.error)("draft_brief_body_changed", "The agent changed the brief itself, not only its front matter — undone.", {
-                    fix: `${brief.rel} is back as it was. Try again, or write the four fields yourself (\`specgate draft\` shows them).`,
+                    fix: `${brief.rel} is back as it was. Try again, or write the four fields yourself (\`specgate propose --from-brief\` shows them).`,
                 }),
             ]);
         }
@@ -718,13 +849,13 @@ class DraftCommand extends command_1.BaseCommand {
         if (proposed === null) {
             io.fail({ draft: null }, [
                 (0, diagnostics_1.error)("draft_no_front_matter", "The agent wrote no front matter.", {
-                    fix: `${confined_agent_1.NO_WRITE_HINT} Or run \`specgate draft\` to see the four fields, and write them yourself.`,
+                    fix: `${confined_agent_1.NO_WRITE_HINT} Or run \`specgate propose --from-brief\` to see the four fields, and write them yourself.`,
                 }),
             ]);
         }
         const problems = (0, brief_setup_1.checkFrontMatter)(after);
         io.emit({
-            draft: { brief: brief.rel, frontMatter: proposed, next: "specgate draft" },
+            draft: { brief: brief.rel, frontMatter: proposed, next: "specgate propose --from-brief" },
             status: problems.map((p) => (0, diagnostics_1.error)(p.code, p.message, { fix: p.fix })),
         }, () => {
             const out = process.stdout;
@@ -737,7 +868,81 @@ class DraftCommand extends command_1.BaseCommand {
                 for (const p of problems)
                     out.write(ui.fail(p.message) + ui.fix(p.fix));
             }
-            out.write(ui.next("specgate draft", "review it — change anything — then run it"));
+            out.write(ui.next("specgate propose --from-brief", "review it — change anything — then run it"));
+        });
+    }
+    /**
+     * `draft --agent` on a brief with its front matter and no module sections:
+     * the agent proposes one section per module from the brief's own text. It
+     * may write only the brief, and must keep every line already there.
+     */
+    cardsWithAgent(opts, projectDir, brief, modules) {
+        const io = (0, agent_1.agentIo)(opts.json);
+        const guide = (0, brief_setup_1.briefCardsGuide)(brief.rel, modules);
+        const guideFile = path.join(projectDir, brief_setup_1.BRIEF_CARDS_FILE);
+        fs.mkdirSync(path.dirname(guideFile), { recursive: true });
+        fs.writeFileSync(guideFile, guide, "utf8");
+        const own = path
+            .relative(projectDir, path.resolve(projectDir, brief.rel))
+            .split(path.sep)
+            .join("/");
+        const agent = (0, confined_agent_1.withWritePermission)(opts.agent);
+        if (!opts.json) {
+            process.stdout.write(ui.header(`${this.verb} --agent`, brief.rel) +
+                agentLine(agent.command, `is proposing the module sections of ${brief.rel}`, agent.added));
+        }
+        const run = (0, confined_agent_1.runConfinedAgent)({
+            projectDir,
+            changeId: "brief",
+            allowed: (rel) => rel === own,
+            command: agent.command,
+            prompt: (0, brief_setup_1.briefCardsPrompt)(guide),
+            showOutput: !opts.json,
+        });
+        if (run.problem === "no_git") {
+            io.fail({ draft: null }, [
+                (0, diagnostics_1.error)("draft_agent_needs_git", "--agent needs a git repository.", {
+                    fix: `Run \`git init\`, then try again — or paste this into your agent yourself: ${brief_setup_1.BRIEF_CARDS_PASTE}`,
+                }),
+            ]);
+        }
+        if (run.reverted.length > 0 && !opts.json) {
+            process.stdout.write("\n" +
+                ui.warn(`${ui_1.sym.undo} Undone — the agent wrote outside the brief: ${run.reverted.join(", ")}`));
+        }
+        const file = path.resolve(projectDir, brief.rel);
+        const after = readIf(file) ?? "";
+        if (!(0, brief_setup_1.keepsEveryLine)(brief.text, after)) {
+            fs.writeFileSync(file, brief.text, "utf8");
+            io.fail({ draft: null }, [
+                (0, diagnostics_1.error)("draft_brief_text_lost", "The agent changed or removed a line of the brief, not only added sections — undone.", {
+                    fix: `${brief.rel} is back as it was. Try again, or write the sections yourself: \`## Module: ${modules[0]}\` with Rules, Examples and Questions.`,
+                }),
+            ]);
+        }
+        if (!run.ok) {
+            io.fail({ draft: null }, [
+                (0, diagnostics_1.error)("draft_agent_failed", `The agent ${run.detail}.`, {
+                    fix: `Check the command runs on its own, or paste this into your agent: ${brief_setup_1.BRIEF_CARDS_PASTE}`,
+                }),
+            ]);
+        }
+        const added = (0, BriefCards_1.readBriefBody)(after).modules.map((m) => m.name);
+        if (added.length === 0) {
+            io.fail({ draft: null }, [
+                (0, diagnostics_1.error)("draft_no_cards", "The agent added no module section.", {
+                    fix: `${confined_agent_1.NO_WRITE_HINT} Or write them yourself: \`## Module: ${modules[0]}\` with Rules, Examples and Questions.`,
+                }),
+            ]);
+        }
+        const findings = (0, brief_check_1.checkBrief)(after, brief.rel);
+        const next = "specgate propose --from-brief --check";
+        io.emit({ draft: { brief: brief.rel, sections: added, next }, status: findings }, () => {
+            const out = process.stdout;
+            out.write(ui.rule() + "\n");
+            out.write(ui.ok(`The agent proposed ${added.length} module section(s) in ${brief.rel}: ${added.join(", ")}`) + "\n");
+            out.write(ui.info("Every line you wrote is still there."));
+            out.write(ui.next(next, "review the sections — change anything — then check them"));
         });
     }
     // ── specgate draft <module> ─────────────────────────────────────────────────
@@ -752,28 +957,41 @@ class DraftCommand extends command_1.BaseCommand {
                     module: opts.module,
                     change: changeId,
                     state: "archived",
-                    next: "specgate draft",
+                    next: "specgate propose --from-brief",
                 },
-            }, () => process.stdout.write(ui.header(`draft ${opts.module}`) +
+            }, () => process.stdout.write(ui.header(`${this.verb} ${opts.module}`) +
                 ui.ok(`${opts.module} is already drafted and archived ${ui.muted(`(${status.archivedAs})`)}`) +
-                ui.next("specgate draft", "the next module of the brief, or what to build first")));
+                ui.next("specgate propose --from-brief", "the next module of the brief, or what to build first")));
             return;
         }
         if (status.state === "not started") {
             if (!fs.existsSync(path.join(projectDir, "spec.md"))) {
                 io.fail({ draft: null }, [
                     (0, diagnostics_1.error)("draft_no_project", "This folder is not a Specgate project yet.", {
-                        fix: "Run `specgate init` first, then `specgate draft " + opts.module + "`.",
+                        fix: "Run `specgate init` first, then `specgate propose --from-brief " +
+                            opts.module +
+                            "`.",
                     }),
                 ]);
             }
             const brief = this.brief(projectDir, opts);
+            // A brief that is plain markdown, with no front matter, still drafts:
+            // only the rules that apply to what it does say stop it.
+            const blocking = (0, brief_check_1.checkBrief)(brief.text, brief.rel).filter((d) => d.code !== "brief_no_front_matter");
+            if (!(0, brief_check_1.briefReady)(blocking)) {
+                io.fail({ draft: null }, [
+                    (0, diagnostics_1.error)("brief_not_ready", `${brief.rel} is not ready to draft ${opts.module} from.`, {
+                        fix: "Fix what `specgate propose --from-brief --check` reports, then run this again.",
+                    }),
+                    ...blocking.filter((d) => d.severity === "error"),
+                ]);
+            }
             const listed = (0, DraftChecklist_1.briefModules)(brief.text);
             const opened = openDraft(projectDir, opts.module, brief.rel, opts);
             const notes = listed.length > 0 && !listed.includes(opts.module)
                 ? [
                     (0, diagnostics_1.info)("draft_module_not_in_brief", `${opts.module} is not among the brief's modules (${listed.join(", ")}).`, {
-                        fix: "Add it to `modules:` in the brief's front matter, so `specgate draft` lists it.",
+                        fix: "Add it to `modules:` in the brief's front matter, so `specgate propose --from-brief` lists it.",
                     }),
                 ]
                 : [];
@@ -788,7 +1006,7 @@ class DraftCommand extends command_1.BaseCommand {
                     reserved: opened.reqRange,
                     created: opened.created,
                     prompt: pasteLine(opts.module),
-                    next: `specgate draft ${opts.module}`,
+                    next: `specgate propose --from-brief ${opts.module}`,
                 },
                 status: notes,
             }, () => {
@@ -800,7 +1018,7 @@ class DraftCommand extends command_1.BaseCommand {
                     [`${dir}/change.yaml, proposal.md`, ""],
                 ];
                 const w = Math.max(...files.map((r) => r[0].length));
-                out.write(ui.header(`draft ${opts.module}`, brief.rel) +
+                out.write(ui.header(`${this.verb} ${opts.module}`, brief.rel) +
                     ui.ok(`Draft ${ui.bold(opened.changeId)} opened ` +
                         ui.muted(`· REQ ids ${opened.reqRange[0]}…${opened.reqRange[1]} reserved`)) +
                     "\n" +
@@ -809,7 +1027,8 @@ class DraftCommand extends command_1.BaseCommand {
                     ui.section("Have your agent write it") +
                     "  Paste this into Claude Code, Cursor, Codex…\n\n" +
                     ui.quote(pasteLine(opts.module)) +
-                    ui.next(`specgate draft ${opts.module} --agent "claude -p"`, `or let Specgate call it — then run specgate draft ${opts.module} until it says Ready to review`));
+                    ui.next(`specgate propose --from-brief ${opts.module} --agent "claude -p"`, `or let Specgate call it — then run specgate propose --from-brief ${opts.module} until it says Ready to review`));
+                // Every note above is built with a `fix`.
                 for (const n of notes)
                     out.write(ui.info(n.message) + ui.fix(n.fix) + "\n");
             });
@@ -827,7 +1046,7 @@ class DraftCommand extends command_1.BaseCommand {
         const guide = readIf(path.join(projectDir, CHANGES, changeId, "DRAFTING.md")) || "";
         const agent = (0, confined_agent_1.withWritePermission)(opts.agent);
         if (!opts.json) {
-            process.stdout.write(ui.header(`draft ${opts.module}`, brief) +
+            process.stdout.write(ui.header(`${this.verb} ${opts.module}`, brief) +
                 (created.length ? ui.ok(`Draft ${changeId} opened, linked to ${brief}.`) : "") +
                 agentLine(agent.command, `is drafting ${opts.module}`, agent.added));
         }
@@ -842,7 +1061,7 @@ class DraftCommand extends command_1.BaseCommand {
             io.fail({ draft: null }, [
                 (0, diagnostics_1.error)("draft_agent_needs_git", "--agent needs a git repository.", {
                     fix: "Git is how Specgate finds what the agent wrote and undoes anything outside the draft. " +
-                        "Run `git init`, then `specgate draft " +
+                        "Run `git init`, then `specgate propose --from-brief " +
                         opts.module +
                         ' --agent "…"` again — or paste the prompt into your agent yourself.',
                 }),
@@ -878,16 +1097,16 @@ class DraftCommand extends command_1.BaseCommand {
                     state: status.state,
                     brief,
                     prompt: pasteLine(opts.module),
-                    next: `specgate draft ${opts.module}`,
+                    next: `specgate propose --from-brief ${opts.module}`,
                 },
-            }, () => process.stdout.write((afterAgent ? "\n" : ui.header(`draft ${opts.module}`, brief)) +
+            }, () => process.stdout.write((afterAgent ? "\n" : ui.header(`${this.verb} ${opts.module}`, brief)) +
                 (afterAgent
                     ? ui.fail("The agent ran, but the draft is still the placeholder.") +
                         ui.fix(confined_agent_1.NO_WRITE_HINT) +
                         "\n"
                     : "  The draft is still the placeholder. Have your agent write it:\n\n" +
                         ui.quote(pasteLine(opts.module)) +
-                        ui.next(`specgate draft ${opts.module} --agent "claude -p"`, "or let Specgate call it"))));
+                        ui.next(`specgate propose --from-brief ${opts.module} --agent "claude -p"`, "or let Specgate call it"))));
             process.exitCode = 1;
             return;
         }
@@ -899,7 +1118,9 @@ class DraftCommand extends command_1.BaseCommand {
         const report = result.report;
         const diags = [...report.status, ...skippedNotes(report)];
         const errors = report.status.length;
-        const next = errors === 0 ? `specgate change archive ${changeId}` : `specgate draft ${opts.module}`;
+        // Ready: reviewed, then its requirements are applied one by one, and the
+        // change is archived once they are all delivered (ADR-0035).
+        const next = errors === 0 ? "specgate apply" : `specgate propose --from-brief ${opts.module}`;
         io.emit({
             draft: {
                 module: opts.module,
@@ -915,7 +1136,7 @@ class DraftCommand extends command_1.BaseCommand {
             status: diags,
         }, () => {
             const out = process.stdout;
-            out.write(afterAgent ? "\n" : ui.header(`draft ${opts.module}`, brief));
+            out.write(afterAgent ? "\n" : ui.header(`${this.verb} ${opts.module}`, brief));
             writeFindings(report, diags);
             const dir = `${CHANGES.split(path.sep).join("/")}/${changeId}`;
             const steps = [];
@@ -923,17 +1144,17 @@ class DraftCommand extends command_1.BaseCommand {
                 out.write(`${diags.length ? "\n" : ""}` + ui.ok(ui.bold("Ready to review")));
                 steps.push(`Read ${dir}/specs/ with whoever knows the business`, fs.existsSync(path.join(projectDir, CHANGES, changeId, "questions.md"))
                     ? `Answer what you can in ${dir}/questions.md`
-                    : `Check ${dir}/assumptions.md, if the agent wrote one`, next);
+                    : `Check ${dir}/assumptions.md, if the agent wrote one`, [next, "its requirements, one at a time; then specgate archive " + changeId]);
                 const after = nextModuleAfter(projectDir, brief, opts.module);
                 steps.push(after
-                    ? [`specgate draft ${after}`, "the next module of the brief"]
+                    ? [`specgate propose --from-brief ${after}`, "the next module of the brief"]
                     : ["specgate status", "every module drafted: what to build first"]);
             }
             else {
                 out.write("\n" +
                     ui.fail(`${ui.bold(`${errors} finding(s) to fix`)} ${ui.muted("— each says how; DRAFTING.md has the formats")}`));
                 steps.push([
-                    `specgate draft ${opts.module} --agent "claude -p"`,
+                    `specgate propose --from-brief ${opts.module} --agent "claude -p"`,
                     "your agent fixes them — or fix them yourself",
                 ], [next, "again, until it says Ready to review"]);
             }
@@ -966,7 +1187,7 @@ class DraftCommand extends command_1.BaseCommand {
             status,
         }, () => {
             const out = process.stdout;
-            out.write(ui.header(`draft --check ${opts.check}`));
+            out.write(ui.header(`${this.verb} --check ${opts.check}`));
             writeFindings(report, status);
             const skipped = report.skipped.length;
             out.write(errors === 0
@@ -993,4 +1214,19 @@ function writeFindings(report, status) {
             out.write(ui.fix(d.fix));
     }
 }
+/** The brief rules' findings: code, the module they are about, message, fix. */
+function writeBriefFindings(findings) {
+    const out = process.stdout;
+    for (const d of findings) {
+        const where = d.target ? `${ui.bold(d.target)}  ` : "";
+        const line = `${ui.muted(d.code)}  ${where}${d.message}`;
+        out.write(d.severity === "error"
+            ? ui.fail(line)
+            : d.severity === "warning"
+                ? ui.warn(line)
+                : ui.info(line));
+        if (d.fix)
+            out.write(ui.fix(d.fix));
+    }
+}
 //# sourceMappingURL=DraftCommand.js.map