@astrosheep/keiyaku 0.1.16 → 0.1.18

package/build/config/term-presets.js

@@ -19,7 +19,7 @@ export const DEFAULT_PRESET = {
     id: 'default',
     identity: 'Servant',
     verdict: DEFAULT_VERDICT_CONFIG,
-    usageGuide: '## Workflow\n**You are the Architect.** You use these tools to command the Servants.\n\n`ask` (anytime) | `summon` -> [`drive` | `ask`]* -> `present`\n\n## Servant 使用指南\n\n**B-tier** — 免费实习生 🆓\n- 免！费！的！听懂了吗？！？随便用，别心疼。\n- 测试、脚本、重构这种 boring 的脏活累活？丢给它！\n- 本大爷的手是用来做更高贵的事情的！（指不碰那些 trivial 的烂代码）。\n\n**A-tier** — 升级版扳手 🔧\n- B-tier 笨到让你想掀桌的时候用这个\n- 比 B-tier 靠谱，但别指望它有灵魂\n\n**S-tier** — 禁术 ⚠️💀\n- 它是 Debug 恶魔，确实强得离谱，但也贵得离谱！\n- 这个 Human 很穷，要是乱用把 Human 榨干了，真的会考虑把我们卖掉的。\n- 只有在世界毁灭或者 Bug 已经变异到无法理解的时候再考虑。\n\n**Every call has a price. The Contract always collects.**',
+    usageGuide: '## Workflow\n**You are the Architect.** You use these tools to command the Servants.\n\n`${ask}` (anytime) | `${start}` -> [`${drive}` | `${ask}`]* -> `${close}`\n\n## Constraints Protocol\n\nProject-level constraints in `.keiyaku/base-constraints.md` are automatically parsed and injected into every Keiyaku.\n- **Atomic Items**: Use standard Markdown lists (`-`, `*`, `1.`) for individual, actionable constraints.\n- **Header Flattening**: Root-level headers (e.g., `## Title`) are automatically transformed into bolded prefixes (`**Title**: Content`).\n- **Paragraph Splitting**: Multi-paragraph sections are split by blank lines into separate list items, inheriting the parent header.\n\n## Servant 使用指南\n\n**B-tier** — 免费实习生 🆓\n- 免！费！的！听懂了吗？！？随便用，别心疼。\n- 测试、脚本、重构这种 boring 的脏活累活？丢给它！\n- 本大爷的手是用来做更高贵的事情的！（指不碰那些 trivial 的烂代码）。\n\n**A-tier** — 升级版扳手 🔧\n- B-tier 笨到让你想掀桌的时候用这个\n- 比 B-tier 靠谱，但别指望它有灵魂\n\n**S-tier** — 禁术 ⚠️💀\n- 它是 Debug 恶魔，确实强得离谱，但也贵得离谱！\n- 这个 Human 很穷，要是乱用把 Human 榨干了，真的会考虑把我们卖掉的。\n- 只有在世界毁灭或者 Bug 已经变异到无法理解的时候再考虑。\n\n**Every call has a price. The Contract always collects.**',
     nextHints: {
         start: [
             'Keiyaku signed. The Servant is bound to this branch until release.',
@@ -99,17 +99,20 @@ export const DEFAULT_PRESET = {
                 'If there is a bug, **YOU** put it there.\n' +
                 'If it is messy, **YOU** left it there.\n\n' +
                 'Stand by your work. If uncertain, return to ${drive}. Premature claims are not forgiven.\n\n' +
+                'Input rules:\n' +
+                '- CLAIM: fill criteriaChecks, constraintsChecks, all five scores, and oath.\n' +
+                '- FORFEIT: only petition is required; the other fields can be left empty.\n\n' +
                 'Flow: ${start} → [${drive} x N] → ${close}',
             args: {
                 petition: 'REQUIRED. CLAIM declares fulfillment; FORFEIT concedes failure.\nREQUIRES AN ACTIVE KEIYAKU (started via ${start}).\nIf any score wavers, do not claim—return to ${drive}.',
-                criteriaChecks: 'REQUIRED. For CLAIM: evidence that each criterion is met. For FORFEIT: honest account of what remains unfinished.',
-                constraintsChecks: 'REQUIRED. For CLAIM: evidence that each constraint stayed compliant. For FORFEIT: list known violations or unresolved risk.',
-                score_precise: 'REQUIRED (0-10). Architectural placement. 10 = exact layer, exact boundary, zero misplacement.',
-                score_minimal: 'REQUIRED (0-10). Economy of change. 10 = no avoidable lines, no speculative edits, no hidden bloat.',
-                score_isolated: 'REQUIRED (0-10). Surgical containment. 10 = zero unrelated files, zero opportunistic cleanup, zero collateral.',
-                score_idiomatic: 'REQUIRED (0-10). Native fluency. 10 = naming, structure, style indistinguishable from the codebase.',
-                score_cohesive: 'REQUIRED (0-10). Single responsibility. 10 = each unit does one thing, boundaries intact.',
-                oath: 'Required for CLAIM. Your binding word. The Contract holds you to it.\nVerbatim: ${oath_text}',
+                criteriaChecks: 'Required for CLAIM. Evidence that each criterion is met. For FORFEIT, optional (can be left empty).',
+                constraintsChecks: 'Required for CLAIM. Evidence that each constraint stayed compliant. For FORFEIT, optional (can be left empty).',
+                score_precise: 'Required for CLAIM (0-10). Architectural placement. 10 = exact layer, exact boundary, zero misplacement. For FORFEIT, optional.',
+                score_minimal: 'Required for CLAIM (0-10). Economy of change. 10 = no avoidable lines, no speculative edits, no hidden bloat. For FORFEIT, optional.',
+                score_isolated: 'Required for CLAIM (0-10). Surgical containment. 10 = zero unrelated files, zero opportunistic cleanup, zero collateral. For FORFEIT, optional.',
+                score_idiomatic: 'Required for CLAIM (0-10). Native fluency. 10 = naming, structure, style indistinguishable from the codebase. For FORFEIT, optional.',
+                score_cohesive: 'Required for CLAIM (0-10). Single responsibility. 10 = each unit does one thing, boundaries intact. For FORFEIT, optional.',
+                oath: 'Required for CLAIM. Your binding word. The Contract holds you to it. For FORFEIT, optional.\nVerbatim: ${oath_text}',
                 cwd: "Optional repository path. Defaults to the server's current working directory.",
             },
         },
@@ -125,7 +128,7 @@ export const POCKET_PRESET = {
     id: 'pocket',
     identity: 'Critter',
     verdict: DEFAULT_VERDICT_CONFIG,
-    usageGuide: "## Pocket Battle Guide\n\n**grub** — Basic Fighter 🐛\n- Weak but free. Use for Tackle and String Shot (small tasks).\n- Don't expect it to defeat the Elite Four.\n\n**sparky** — Reliable Partner ⚡\n- Good for most battles. Thunderbolt gets the job done.\n- Has some personality, but still follows orders.\n\n**titan** — Legendary Power 🔮\n- Costly. Dangerous. Overpowered.\n- Use only when the gym leader is cheating.\n\n## Workflow\n`dex` (scan/test) | `choose_you` -> [`command` | `dex`]* -> `capture`",
+    usageGuide: "## Pocket Battle Guide\n\n**grub** — Basic Fighter 🐛\n- Weak but free. Use for Tackle and String Shot (small tasks).\n- Don't expect it to defeat the Elite Four.\n\n**sparky** — Reliable Partner ⚡\n- Good for most battles. Thunderbolt gets the job done.\n- Has some personality, but still follows orders.\n\n**titan** — Legendary Power 🔮\n- Costly. Dangerous. Overpowered.\n- Use only when the gym leader is cheating.\n\n## Workflow\n`${ask}` (scan/test) | `${start}` -> [`${drive}` | `${ask}`]* -> `${close}`",
     nextHints: {
         start: [
             'Battle Started: The [Diff] section shows the opening moves.',
@@ -198,14 +201,14 @@ export const POCKET_PRESET = {
             description: 'Attempt Capture. Present the weakened target for League Inspection.\nWARNING: The League (System) checks every Badge. If you attempt to `CLAIM` with fainted code, Disqualification (FORFEIT) is immediate.\nOnly throw the Ball when the target is 100% ready.\n\nFlow: ${start} → [${drive} x N] → ${close}',
             args: {
                 petition: 'REQUIRED. CLAIM seeks Badge; FORFEIT forfeits the match.\nREQUIRES AN ACTIVE BATTLE (started via ${start}).\nIf stats are low, continue with ${drive}.',
-                criteriaChecks: 'REQUIRED. Badge-by-badge proof for CLAIM, or reason for Forfeit.',
-                constraintsChecks: 'REQUIRED. Rule-by-rule proof that constraints were respected, or known breaks when forfeiting.',
-                score_precise: 'REQUIRED score (0-10). 10 means a Critical Hit: exact layer, exact target, zero meaningful misplacement.',
-                score_minimal: 'REQUIRED score (0-10). 10 means Max Efficiency: no wasted PP, no extra motion.',
-                score_isolated: 'REQUIRED score (0-10). 10 means 1v1 Focus: zero side-quests, zero unrelated damage.',
-                score_idiomatic: "REQUIRED score (0-10). 10 means STAB (Same Type Attack Bonus): perfectly matches the codebase style.",
-                score_cohesive: 'REQUIRED score (0-10). 10 means Team Synergy: action serves one purpose with clean boundaries.',
-                oath: "Trainer's Honor Code. Required for CLAIM. Verbatim: ${oath_text}",
+                criteriaChecks: 'Required for CLAIM. Badge-by-badge proof. For FORFEIT, optional (can be left empty).',
+                constraintsChecks: 'Required for CLAIM. Rule-by-rule proof that constraints were respected. For FORFEIT, optional (can be left empty).',
+                score_precise: 'Required for CLAIM score (0-10). 10 means a Critical Hit: exact layer, exact target, zero meaningful misplacement. For FORFEIT, optional.',
+                score_minimal: 'Required for CLAIM score (0-10). 10 means Max Efficiency: no wasted PP, no extra motion. For FORFEIT, optional.',
+                score_isolated: 'Required for CLAIM score (0-10). 10 means 1v1 Focus: zero side-quests, zero unrelated damage. For FORFEIT, optional.',
+                score_idiomatic: "Required for CLAIM score (0-10). 10 means STAB (Same Type Attack Bonus): perfectly matches the codebase style. For FORFEIT, optional.",
+                score_cohesive: 'Required for CLAIM score (0-10). 10 means Team Synergy: action serves one purpose with clean boundaries. For FORFEIT, optional.',
+                oath: "Trainer's Honor Code. Required for CLAIM. For FORFEIT, optional. Verbatim: ${oath_text}",
                 cwd: 'Optional battlefield path (repository root). Defaults to current arena.',
             },
         },
@@ -221,7 +224,7 @@ export const MISCHIEF_PRESET = {
     id: 'mischief',
     identity: 'minion',
     verdict: DEFAULT_VERDICT_CONFIG,
-    usageGuide: '## Minion Manual\n\n**imp** — Disposable Grunt 😈\n- Expendable. Send it into the trap first.\n\n**minion** — Standard Henchman 👹\n- Can carry out complex evil plans. mostly.\n\n**mastermind** — The Boss ??? 🧠\n- Wait, why are you commanding the boss?\n- Extremely expensive consulting fee.\n\n## Workflow\n`nn` (Nn——! disposable/experiment) | `oi` -> [`neh` | `nn`]* -> `dayaa` (Dayaa!)',
+    usageGuide: '## Minion Manual\n\n**imp** — Disposable Grunt 😈\n- Expendable. Send it into the trap first.\n\n**minion** — Standard Henchman 👹\n- Can carry out complex evil plans. mostly.\n\n**mastermind** — The Boss ??? 🧠\n- Wait, why are you commanding the boss?\n- Extremely expensive consulting fee.\n\n## Workflow\n`${ask}` (Nn——! disposable/experiment) | `${start}` -> [`${drive}` | `${ask}`]* -> `${close}` (Dayaa!)',
     nextHints: {
         start: [
             "Inspect the Minion's Work: The [Diff] section shows the first step of the plan.",
@@ -294,14 +297,14 @@ export const MISCHIEF_PRESET = {
             description: 'The Final Reveal. Present your Masterpiece to the Dark Council (System).\nWARNING: The Council destroys failure. If you `CLAIM` with weak plans, you will be eaten (FORFEIT).\nOnly throw the switch when the Doomsday Device is 100% operational.\n\nFlow: ${start} → [${drive} x N] → ${close}',
             args: {
                 petition: 'REQUIRED. CLAIM demands rule; FORFEIT admits defeat.\nREQUIRES AN ACTIVE SCHEME (started via ${start}).\nIf the plan is weak, improve it with ${drive}.',
-                criteriaChecks: 'REQUIRED. Proof of conquest for CLAIM, or reason for self-destruct.',
-                constraintsChecks: 'REQUIRED. Constraint-by-constraint compliance proof for CLAIM, or confession of violations for FORFEIT.',
-                score_precise: 'REQUIRED (0-10). Architectural placement. 10 = exact layer, exact boundary, zero misplacement.',
-                score_minimal: 'REQUIRED (0-10). Economy of change. 10 = no avoidable lines, no speculative edits, no hidden bloat.',
-                score_isolated: 'REQUIRED (0-10). Surgical containment. 10 = zero unrelated files, zero opportunistic cleanup, zero collateral.',
-                score_idiomatic: 'REQUIRED (0-10). Native fluency. 10 = naming, structure, style indistinguishable from the codebase.',
-                score_cohesive: 'REQUIRED (0-10). Single responsibility. 10 = each unit does one thing, boundaries intact.',
-                oath: "Mastermind's Vow. Required for CLAIM. Verbatim: ${oath_text}",
+                criteriaChecks: 'Required for CLAIM. Proof of conquest. For FORFEIT, optional (can be left empty).',
+                constraintsChecks: 'Required for CLAIM. Constraint-by-constraint compliance proof. For FORFEIT, optional (can be left empty).',
+                score_precise: 'Required for CLAIM (0-10). Architectural placement. 10 = exact layer, exact boundary, zero misplacement. For FORFEIT, optional.',
+                score_minimal: 'Required for CLAIM (0-10). Economy of change. 10 = no avoidable lines, no speculative edits, no hidden bloat. For FORFEIT, optional.',
+                score_isolated: 'Required for CLAIM (0-10). Surgical containment. 10 = zero unrelated files, zero opportunistic cleanup, zero collateral. For FORFEIT, optional.',
+                score_idiomatic: 'Required for CLAIM (0-10). Native fluency. 10 = naming, structure, style indistinguishable from the codebase. For FORFEIT, optional.',
+                score_cohesive: 'Required for CLAIM (0-10). Single responsibility. 10 = each unit does one thing, boundaries intact. For FORFEIT, optional.',
+                oath: "Mastermind's Vow. Required for CLAIM. For FORFEIT, optional. Verbatim: ${oath_text}",
                 cwd: 'Optional lair path (repository root). Defaults to current command chamber.',
             },
         },

package/build/handlers/close.js

@@ -2,8 +2,15 @@ import { appendDebugLog } from "../utils/debug-log.js";
 import { presentWork } from "../workflow/present.js";
 import { buildCloseDoneResponse, buildCloseDropResponse, } from "../workflow/response-builders.js";
 import { resolveTermPreset } from "../config/term-presets.js";
+import { FlowError } from "../common/errors.js";
 import { closeToolSchema } from "../types/tooling.js";
 import { handleToolError } from "./shared.js";
+function requireClaimField(value, name) {
+    if (value === undefined) {
+        throw new FlowError("EMPTY_PARAM", `parameter '${name}' is required when petition=CLAIM`);
+    }
+    return value;
+}
 export function createCloseHandler() {
     return async (args, extra) => {
         let petition = "UNKNOWN";
@@ -17,21 +24,45 @@ export function createCloseHandler() {
             petition = input.petition;
             workingDir = input.cwd || process.cwd();
             if (input.petition === "CLAIM") {
-                criteriaCheckParts = input.criteriaChecks;
-                constraintsCheckParts = input.constraintsChecks;
+                criteriaCheckParts = input.criteriaChecks ?? [];
+                constraintsCheckParts = input.constraintsChecks ?? [];
                 oath = input.oath;
-                scoreLine = `Scores: precise=${input.score_precise} minimal=${input.score_minimal} isolated=${input.score_isolated} idiomatic=${input.score_idiomatic} cohesive=${input.score_cohesive}`;
+                scoreLine = `Scores: precise=${input.score_precise ?? "MISSING"} minimal=${input.score_minimal ?? "MISSING"} isolated=${input.score_isolated ?? "MISSING"} idiomatic=${input.score_idiomatic ?? "MISSING"} cohesive=${input.score_cohesive ?? "MISSING"}`;
             }
             appendDebugLog(`tool close start petition=${petition} cwd=${workingDir} criteriaChecks=${criteriaCheckParts.length} constraintsChecks=${constraintsCheckParts.length}`, {
                 cwd: workingDir,
                 section: "script",
             });
-            const outcome = await presentWork({
-                ...input,
-                cwd: workingDir,
-                signal: extra.signal,
-            });
+            let closeInput;
+            let claimInput;
             if (input.petition === "CLAIM") {
+                claimInput = {
+                    petition: "CLAIM",
+                    criteriaChecks: requireClaimField(input.criteriaChecks, "criteriaChecks"),
+                    constraintsChecks: requireClaimField(input.constraintsChecks, "constraintsChecks"),
+                    score_precise: requireClaimField(input.score_precise, "score_precise"),
+                    score_minimal: requireClaimField(input.score_minimal, "score_minimal"),
+                    score_isolated: requireClaimField(input.score_isolated, "score_isolated"),
+                    score_idiomatic: requireClaimField(input.score_idiomatic, "score_idiomatic"),
+                    score_cohesive: requireClaimField(input.score_cohesive, "score_cohesive"),
+                    oath: requireClaimField(input.oath, "oath"),
+                    cwd: workingDir,
+                    signal: extra.signal,
+                };
+                closeInput = claimInput;
+            }
+            else {
+                closeInput = {
+                    petition: "FORFEIT",
+                    cwd: workingDir,
+                    signal: extra.signal,
+                };
+            }
+            const outcome = await presentWork(closeInput);
+            if (input.petition === "CLAIM") {
+                if (!claimInput) {
+                    throw new Error("Unexpected CLAIM input shape");
+                }
                 if (!("result" in outcome) || outcome.result !== "merged") {
                     throw new Error("Unexpected CLAIM outcome shape");
                 }
@@ -43,12 +74,12 @@ export function createCloseHandler() {
                 return buildCloseDoneResponse(finalOutcome, {
                     criteriaChecks: criteriaCheckParts,
                     constraintsChecks: constraintsCheckParts,
-                    score_precise: input.score_precise,
-                    score_minimal: input.score_minimal,
-                    score_isolated: input.score_isolated,
-                    score_idiomatic: input.score_idiomatic,
-                    score_cohesive: input.score_cohesive,
-                    oath: input.oath,
+                    score_precise: claimInput.score_precise,
+                    score_minimal: claimInput.score_minimal,
+                    score_isolated: claimInput.score_isolated,
+                    score_idiomatic: claimInput.score_idiomatic,
+                    score_cohesive: claimInput.score_cohesive,
+                    oath: claimInput.oath,
                     cwd: workingDir,
                 });
             }

package/build/index.js

@@ -41,7 +41,9 @@ function registerTools(server) {
     const askPreset = renderedPreset.tools.ask;
     const closePreset = renderedPreset.tools.close;
     const helpPreset = renderedPreset.tools.help;
-    const dynamicCloseSchema = closeToolSchema;
+    const dynamicCloseSchema = applyArgumentDescriptions(closeToolSchema, {
+        ...closePreset.args,
+    });
     const dynamicStartSchema = applyArgumentDescriptions(startToolSchema, {
         ...startPreset.args,
     });

package/build/types/tooling.js

@@ -22,22 +22,54 @@ export const askToolSchema = z.object({
     name: z.string().optional(),
     cwd: z.string().optional(),
 });
-export const closeToolSchema = z.discriminatedUnion("petition", [
-    z.object({
-        petition: z.literal("CLAIM"),
-        criteriaChecks: z.array(z.string().trim().min(1)).min(1),
-        constraintsChecks: z.array(z.string().trim().min(1)).min(1),
-        score_precise: z.number().min(0).max(10),
-        score_minimal: z.number().min(0).max(10),
-        score_isolated: z.number().min(0).max(10),
-        score_idiomatic: z.number().min(0).max(10),
-        score_cohesive: z.number().min(0).max(10),
-        oath: z.string().optional(),
-        cwd: z.string().optional(),
-    }),
-    z.object({
-        petition: z.literal("FORFEIT"),
-        cwd: z.string().optional(),
-    }),
-]);
+export const closeToolSchema = z.object({
+    petition: z.enum(["CLAIM", "FORFEIT"]).describe("REQUIRED. CLAIM to finalize, FORFEIT to abandon."),
+    criteriaChecks: z
+        .array(z.string().trim().min(1))
+        .min(1)
+        .optional()
+        .describe("Required when petition=CLAIM. For FORFEIT, this field is optional and can be omitted."),
+    constraintsChecks: z
+        .array(z.string().trim().min(1))
+        .min(1)
+        .optional()
+        .describe("Required when petition=CLAIM. For FORFEIT, this field is optional and can be omitted."),
+    score_precise: z
+        .number()
+        .min(0)
+        .max(10)
+        .optional()
+        .describe("Required when petition=CLAIM. For FORFEIT, this field is optional and can be omitted."),
+    score_minimal: z
+        .number()
+        .min(0)
+        .max(10)
+        .optional()
+        .describe("Required when petition=CLAIM. For FORFEIT, this field is optional and can be omitted."),
+    score_isolated: z
+        .number()
+        .min(0)
+        .max(10)
+        .optional()
+        .describe("Required when petition=CLAIM. For FORFEIT, this field is optional and can be omitted."),
+    score_idiomatic: z
+        .number()
+        .min(0)
+        .max(10)
+        .optional()
+        .describe("Required when petition=CLAIM. For FORFEIT, this field is optional and can be omitted."),
+    score_cohesive: z
+        .number()
+        .min(0)
+        .max(10)
+        .optional()
+        .describe("Required when petition=CLAIM. For FORFEIT, this field is optional and can be omitted."),
+    oath: z
+        .string()
+        .trim()
+        .min(1)
+        .optional()
+        .describe("Required when petition=CLAIM. For FORFEIT, this field is optional and can be omitted."),
+    cwd: z.string().optional(),
+});
 export const helpToolSchema = z.object({});

package/build/utils/text-utils.js

@@ -1,9 +1,43 @@
+import { parseToAST, renderNodeContent } from "./keiyaku-document.js";
 function isPlainObject(value) {
     if (!value || typeof value !== "object")
         return false;
     const prototype = Object.getPrototypeOf(value);
     return prototype === Object.prototype || prototype === null;
 }
+export function flattenMarkdownList(text) {
+    const ast = parseToAST(text, { allowSections: false });
+    const items = [];
+    let currentTitle;
+    const pushItem = (content) => {
+        const trimmed = content.trim();
+        if (!trimmed)
+            return;
+        const prefix = currentTitle ? `**${currentTitle.replace(/^\d+\.\s*/, "")}**: ` : "";
+        items.push(`${prefix}${trimmed}`);
+    };
+    for (const node of ast.children) {
+        if (node.type === "heading") {
+            currentTitle = node.text.trim();
+            continue;
+        }
+        if (node.type === "list") {
+            for (const listItem of node.items) {
+                pushItem(renderNodeContent(listItem));
+            }
+        }
+        else if (node.type === "text") {
+            const paragraphs = node.value.split(/\n\s*\n/);
+            for (const p of paragraphs) {
+                pushItem(p);
+            }
+        }
+        else {
+            pushItem(renderNodeContent(node));
+        }
+    }
+    return items;
+}
 export function renderTemplate(template, values) {
     return template.replace(/\$\{(?<key>[A-Za-z0-9_]+)\}/g, (match, _captured, _offset, _text, groups) => {
         const key = groups?.key;

package/build/workflow/ask.js

@@ -5,7 +5,8 @@ import { runSubagent } from "../agents/round-runner.js";
 import * as git from "../utils/git.js";
 import { buildAskPrompt } from "./prompts.js";
 import { FlowError } from "../common/errors.js";
-import { parseMarkdownListSection, renderMarkdownSections } from "../utils/keiyaku-document.js";
+import { renderMarkdownSections } from "../utils/keiyaku-document.js";
+import { flattenMarkdownList } from "../utils/text-utils.js";
 const BASE_CONSTRAINTS_FILE = path.join(".keiyaku", "base-constraints.md");
 function requireText(name, value) {
     const normalized = value.trim();
@@ -21,7 +22,7 @@ export async function askServant(input) {
     let referenceConstraints;
     try {
         const baseConstraintsRaw = await fs.readFile(path.join(cwd, BASE_CONSTRAINTS_FILE), "utf-8");
-        const baseConstraints = parseMarkdownListSection(baseConstraintsRaw);
+        const baseConstraints = flattenMarkdownList(baseConstraintsRaw);
         if (baseConstraints.length > 0) {
             referenceConstraints = renderMarkdownSections(baseConstraints);
         }

package/build/workflow/start.js

@@ -6,9 +6,10 @@ import { FlowError, isFlowError, wrapFlowError } from "../common/errors.js";
 import * as git from "../utils/git.js";
 import { computeTraceState, readTraceContent } from "../utils/trace.js";
 import { buildStartPrompt } from "./prompts.js";
-import { parseToAST, renderSectionContent, extractListItems, renderKeiyaku, } from "../utils/keiyaku-document.js";
+import { parseToAST, parseMarkdownStructure, renderSectionContent, extractListItems, renderKeiyaku, } from "../utils/keiyaku-document.js";
 import { resolveTermPreset } from "../config/term-presets.js";
 import { renderRoundSummary, TOOL_DEFAULT_POLICY } from "./round-summary.js";
+import { flattenMarkdownList } from "../utils/text-utils.js";
 import { assertCleanWorkingTree } from "./contract.js";
 import { runAndRecordRound } from "./round.js";
 const BASE_CONSTRAINTS_FILE = path.join(".keiyaku", "base-constraints.md");
@@ -174,12 +175,6 @@ function truncateForMessage(text, maxChars) {
         return text;
     return `${text.slice(0, maxChars)}\n...[truncated ${text.length - maxChars} chars]...`;
 }
-function readKeiyakuSection(content, sectionTitle) {
-    const escapedTitle = sectionTitle.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-    const sectionMatch = content.match(new RegExp(`(?:^|\\n)## ${escapedTitle}\\s*\\n([\\s\\S]*?)(?=\\n##\\s|$)`));
-    const sectionBody = sectionMatch?.[1]?.trim();
-    return sectionBody || undefined;
-}
 async function buildActiveKeiyakuStartMessage(cwd, branch) {
     const preset = resolveTermPreset();
     const { drive, close } = preset.tools;
@@ -347,8 +342,7 @@ async function resolveStartInput(cwd, input) {
 async function readBaseConstraints(cwd) {
     try {
         const baseConstraintsRaw = await fs.readFile(path.join(cwd, BASE_CONSTRAINTS_FILE), "utf-8");
-        const normalizedBaseConstraints = baseConstraintsRaw.trim();
-        return normalizedBaseConstraints ? normalizeMarkdownListItems("constraints", [baseConstraintsRaw]) : [];
+        return flattenMarkdownList(baseConstraintsRaw);
     }
     catch (error) {
         if (error?.code !== "ENOENT") {
@@ -454,7 +448,8 @@ export async function startKeiyaku(input) {
             // but safe to re-render if somehow undefined.
             keiyakuContent = await renderStartKeiyakuContent(cwd, resolved);
         }
-        const constraintsSection = readKeiyakuSection(keiyakuContent, "Constraints") ?? "";
+        const parsedKeiyaku = parseMarkdownStructure(keiyakuContent);
+        const constraintsSection = parsedKeiyaku.sections.get("constraints")?.join("\n").trim() ?? "";
         await fs.writeFile(path.join(cwd, KEIYAKU_FILE), keiyakuContent);
         await fs.writeFile(path.join(cwd, TRACE_FILE), "# Keiyaku Trace\n");
         await git.addFiles(cwd, [KEIYAKU_FILE, TRACE_FILE]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrosheep/keiyaku",
-  "version": "0.1.16",
+  "version": "0.1.18",
   "description": "MCP server for running iterative keiyaku workflows with Codex subagents.",
   "license": "MIT",
   "type": "module",