@astrosheep/keiyaku 0.1.10 → 0.1.11

package/build/config/term-presets.js

@@ -26,7 +26,7 @@ export const DEFAULT_PRESET = {
             'Review [Diff]: Confirm the scaffold aligns with the stated Architecture.',
             'Next: Issue your first ${drive}. One directive, one focus.',
             'If—and only if—the work already meets every criterion with absolute certainty, you may ${close}.',
-            'Otherwise, do not even think about present yet.',
+            'Otherwise, do not even think about ${close} yet.',
         ],
         drive: [
             'Step complete. Review [Diff] for exactly what changed.',
@@ -42,12 +42,12 @@ export const DEFAULT_PRESET = {
         closeClaim: [
             'Contract fulfilled. Branch merged.',
             'You are back on base.',
-            'Next assignment: ${start} when ready.',
+            'Next assignment: ${start} or ${ask} when ready.',
         ],
         closeDrop: [
             'Contract forfeited. Branch discarded. Work erased.',
             'No penalty beyond the lost effort. Clean slate.',
-            'Redefine with ${start}, or walk away.',
+            'Redefine with ${start}, scout with ${ask}, or walk away.',
         ],
     },
     availableNames: DEFAULT_AVAILABLE_NAMES,
@@ -55,7 +55,7 @@ export const DEFAULT_PRESET = {
         start: {
             name: 'summon',
             title: 'Sign Keiyaku',
-            description: 'Initialize a Keiyaku (Contract). Bind a Servant to a dedicated workspace (branch).\nYou are the Architect; they are the Instrument. Define the Goal and Scope clearly.\nThe contract isolates their existence until the objective is met.\nCall ONCE to seal the bond.\n\nFlow: summon → [drive x N] → present',
+            description: 'Initialize a Keiyaku (Contract). Bind a Servant to a dedicated workspace (branch).\nYou are the Architect; they are the Instrument. Define the Goal and Scope clearly.\nThe contract isolates their existence until the objective is met.\nCall ONCE to seal the bond.\n\nFlow: ${start} → [${drive} x N] → ${close}',
             args: {
                 title: 'REQUIRED. A concise codename for this hunt.',
                 goal: 'REQUIRED. The Kill Condition. State exactly what success looks like for the servant to achieve.',
@@ -63,18 +63,18 @@ export const DEFAULT_PRESET = {
                 context: 'REQUIRED. Mission Intel. The complete knowledge base for the servant: current vs. expected behavior, relevant file paths, error logs, and any critical background info.',
                 constraints: 'REQUIRED. Non-negotiable Rules. Architectural and stylistic boundaries the servant must obey.',
                 criteria: 'REQUIRED. Acceptance Criteria. Verifiable checks to prove the servant has finished the job.',
-                name: 'Optional ${IDENTITY} profile to execute this mission. Available: ${AVAILABLE_NAMES}.',
+                name: 'Optional ${identity} profile to execute this mission. Available: ${available_names}.',
                 cwd: "Optional repository path. Defaults to the server's current working directory.",
             },
         },
         drive: {
             name: 'drive',
             title: 'Iterate',
-            description: "Issue a Directive. Command the Servant to execute the next phase of work.\nWhether scaffolding, implementing, or refining, this is the primary engine of progress.\nMANDATORY: Validate the output (git diff) before proceeding. Drive until the Goal is fully realized.\n\nFlow: summon → [drive x N] → present",
+            description: "Issue a Directive. Command the Servant to execute the next phase of work.\nWhether scaffolding, implementing, or refining, this is the primary engine of progress.\nMANDATORY: Validate the output (git diff) before proceeding. Drive until the Goal is fully realized.\n\nFlow: ${start} → [${drive} x N] → ${close}",
             args: {
                 directive: 'REQUIRED. The Next Order. Precise instructions for the servant. Can be a correction ("fix the leak") or a continuation ("now add the tests").',
                 context: 'Optional. New Intel. New error logs or details discovered after the servant\'s last strike.',
-                name: 'Optional ${IDENTITY} profile to process this turn. Available: ${AVAILABLE_NAMES}.',
+                name: 'Optional ${identity} profile to process this turn. Available: ${available_names}.',
                 cwd: "Optional repository path. Defaults to the server's current working directory.",
             },
         },
@@ -85,7 +85,7 @@ export const DEFAULT_PRESET = {
             args: {
                 request: 'REQUIRED. The task, question, or mission to delegate to the servant.',
                 context: 'REQUIRED. Relevant background or data the servant needs to execute the request.',
-                name: 'Optional ${IDENTITY} profile to perform this task. Available: ${AVAILABLE_NAMES}.',
+                name: 'Optional ${identity} profile to perform this task. Available: ${available_names}.',
                 cwd: "Optional repository path. Defaults to the server's current working directory.",
             },
         },
@@ -100,18 +100,18 @@ export const DEFAULT_PRESET = {
                 'The Contract rejected. Coldly. Completely.\n' +
                 'What happened next... no one speaks of it.\n\n' +
                 'Do not call this to "finish." Call this when the work genuinely meets every criterion.\n' +
-                'If uncertain, return to ${DRIVE_TOOL_NAME}. Premature claims are not forgiven.\n\n' +
-                'You present. The Contract decides.\n\n' +
-                'Flow: ${START_TOOL_NAME} → [${DRIVE_TOOL_NAME} x N] → ${CLOSE_TOOL_NAME}',
+                'If uncertain, return to ${drive}. Premature claims are not forgiven.\n\n' +
+                'You call ${close}. The Contract decides.\n\n' +
+                'Flow: ${start} → [${drive} x N] → ${close}',
             args: {
-                petition: 'REQUIRED. CLAIM declares fulfillment; FORFEIT concedes failure.\nREQUIRES AN ACTIVE KEIYAKU (started via ${START_TOOL_NAME}).\nIf any score wavers, do not claim—return to ${DRIVE_TOOL_NAME}.',
+                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.',
                 score_precise: 'REQUIRED (0-5). Architectural placement. 5 = exact layer, exact boundary, zero misplacement.',
                 score_minimal: 'REQUIRED (0-5). Economy of change. 5 = no avoidable lines, no speculative edits, no hidden bloat.',
                 score_isolated: 'REQUIRED (0-5). Surgical containment. 5 = zero unrelated files, zero opportunistic cleanup, zero collateral.',
                 score_idiomatic: 'REQUIRED (0-5). Native fluency. 5 = naming, structure, style indistinguishable from the codebase.',
                 score_cohesive: 'REQUIRED (0-5). Single responsibility. 5 = each unit does one thing, boundaries intact.',
-                oath: 'Required for CLAIM. Your binding word. The Contract holds you to it.\nVerbatim: ${OATH_TEXT}',
+                oath: 'Required for CLAIM. Your binding word. The Contract holds you to it.\nVerbatim: ${oath_text}',
                 cwd: "Optional repository path. Defaults to the server's current working directory.",
             },
         },
@@ -149,11 +149,11 @@ export const POCKET_PRESET = {
         ],
         closeClaim: [
             'Critter Captured! The entry is logged in the PC (base branch).',
-            "Heal up. Use '${start}' to challenge the next opponent.",
+            "Heal up. Use '${start}' to challenge the next opponent, or '${ask}' to scan for another.",
         ],
         closeDrop: [
             'Ran Away Safely. The encounter is reset.',
-            "Back to the map. Use '${start}' to find a wild Critter.",
+            "Back to the map. Use '${start}' to find a wild Critter, or '${ask}' to scan the tall grass.",
         ],
     },
     availableNames: ['grub', 'sparky', 'titan'],
@@ -161,7 +161,7 @@ export const POCKET_PRESET = {
         start: {
             name: 'choose_you',
             title: 'I Choose You!',
-            description: 'Initialize the Battle Phase. Send a Critter (Servant) into a dedicated Arena (branch).\nYou are the Trainer; they are the Fighter. Define the Victory Condition (Goal) clearly.\nThe battle continues in this Arena until the Badge is won.\nCall ONCE to start the encounter.\n\nFlow: choose_you → [command x N] → capture',
+            description: 'Initialize the Battle Phase. Send a Critter (Servant) into a dedicated Arena (branch).\nYou are the Trainer; they are the Fighter. Define the Victory Condition (Goal) clearly.\nThe battle continues in this Arena until the Badge is won.\nCall ONCE to start the encounter.\n\nFlow: ${start} → [${drive} x N] → ${close}',
             args: {
                 title: 'REQUIRED. Battle card title for this encounter.',
                 goal: 'REQUIRED. Victory condition. Define exactly what winning this battle means.',
@@ -169,18 +169,18 @@ export const POCKET_PRESET = {
                 context: 'REQUIRED. Battle background: key code paths, symptoms, logs, and repro clues.',
                 constraints: 'REQUIRED. Battle rules that cannot be broken while fighting.',
                 criteria: 'REQUIRED. Gym badges for completion: concrete checks proving victory.',
-                name: 'Optional ${IDENTITY} to send into battle. Available: ${AVAILABLE_NAMES}.',
+                name: 'Optional ${identity} to send into battle. Available: ${available_names}.',
                 cwd: 'Optional battlefield path (repository root). Defaults to current arena.',
             },
         },
         drive: {
             name: 'command',
             title: 'Issue Command',
-            description: 'Execute the next Strategic Move. Order the Critter to advance the battle state.\nWhether Attacking (coding) or Defending (testing), every command counts as a Turn.\nMANDATORY: Check the Battle Log (git diff) before the next move. Command until Victory is certain.\n\nFlow: choose_you → [command x N] → capture',
+            description: 'Execute the next Strategic Move. Order the Critter to advance the battle state.\nWhether Attacking (coding) or Defending (testing), every command counts as a Turn.\nMANDATORY: Check the Battle Log (git diff) before the next move. Command until Victory is certain.\n\nFlow: ${start} → [${drive} x N] → ${close}',
             args: {
                 directive: 'REQUIRED. The specific move or tactic to execute next.',
                 context: 'Optional new battle intel discovered after the previous turn.',
-                name: 'Optional ${IDENTITY} to execute this turn. Available: ${AVAILABLE_NAMES}.',
+                name: 'Optional ${identity} to execute this turn. Available: ${available_names}.',
                 cwd: 'Optional battlefield path (repository root). Defaults to current arena.',
             },
         },
@@ -191,23 +191,23 @@ export const POCKET_PRESET = {
             args: {
                 request: 'REQUIRED. What should the Dex analyze, compare, or execute.',
                 context: 'REQUIRED. Context entries so the action targets the right ecosystem.',
-                name: 'Optional ${IDENTITY} doing the work. Available: ${AVAILABLE_NAMES}.',
+                name: 'Optional ${identity} doing the work. Available: ${available_names}.',
                 cwd: 'Optional battlefield path (repository root). Defaults to current arena.',
             },
         },
         close: {
             name: 'capture',
             title: 'End Battle',
-            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_TOOL_NAME} → [${DRIVE_TOOL_NAME} x N] → ${CLOSE_TOOL_NAME}',
+            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_TOOL_NAME}).\nIf stats are low, continue with ${DRIVE_TOOL_NAME}.',
+                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.',
                 score_precise: 'REQUIRED score (0-5). 5 means a Critical Hit: exact layer, exact target, zero meaningful misplacement.',
                 score_minimal: 'REQUIRED score (0-5). 5 means Max Efficiency: no wasted PP, no extra motion.',
                 score_isolated: 'REQUIRED score (0-5). 5 means 1v1 Focus: zero side-quests, zero unrelated damage.',
                 score_idiomatic: "REQUIRED score (0-5). 5 means STAB (Same Type Attack Bonus): perfectly matches the codebase style.",
                 score_cohesive: 'REQUIRED score (0-5). 5 means Team Synergy: action serves one purpose with clean boundaries.',
-                oath: "Trainer's Honor Code. Required for CLAIM. Verbatim: ${OATH_TEXT}",
+                oath: "Trainer's Honor Code. Required for CLAIM. Verbatim: ${oath_text}",
                 cwd: 'Optional battlefield path (repository root). Defaults to current arena.',
             },
         },
@@ -245,11 +245,11 @@ export const MISCHIEF_PRESET = {
         ],
         closeClaim: [
             'Scheme Successful. The Lair is merged. The Minion is fed.',
-            "Plotting something new? Use '${start}' for the next conquest.",
+            "Plotting something new? Use '${start}' for the next conquest, or '${ask}' to scout for vulnerabilities.",
         ],
         closeDrop: [
             'Plan Aborted. Evidence destroyed. The Minion was disposed of.',
-            "Back to the drawing board. Use '${start}' to hatch a new plan.",
+            "Back to the drawing board. Use '${start}' to hatch a new plan, or '${ask}' to spy on enemies.",
         ],
     },
     availableNames: ['imp', 'minion', 'mastermind'],
@@ -257,7 +257,7 @@ export const MISCHIEF_PRESET = {
         start: {
             name: 'oi',
             title: 'Oi!',
-            description: "Initiate Grand Scheme. Summon a Minion to the Lair (branch).\nYou are the Mastermind; they are the Henchman. Define the Conquest (Goal) with dominance.\nThe minion is bound to this Lair until the plot is realized.\nCall ONCE to start the machine.\n\nFlow: oi → [neh x N] → dayaa",
+            description: "Initiate Grand Scheme. Summon a Minion to the Lair (branch).\nYou are the Mastermind; they are the Henchman. Define the Conquest (Goal) with dominance.\nThe minion is bound to this Lair until the plot is realized.\nCall ONCE to start the machine.\n\nFlow: ${start} → [${drive} x N] → ${close}",
             args: {
                 title: 'REQUIRED. Operation codename for your grand scheme.',
                 goal: 'REQUIRED. The conquest objective. Define the exact end-state your minion must deliver.',
@@ -265,18 +265,18 @@ export const MISCHIEF_PRESET = {
                 context: 'REQUIRED. Briefing dossier: relevant file paths, current failures, logs, and repro clues.',
                 constraints: 'REQUIRED. Absolute decrees. Architectural and stylistic limits your minion must obey.',
                 criteria: 'REQUIRED. Triumph conditions that can be verified without debate.',
-                name: 'Optional ${IDENTITY} to command this operation. Available: ${AVAILABLE_NAMES}.',
+                name: 'Optional ${identity} to command this operation. Available: ${available_names}.',
                 cwd: 'Optional lair path (repository root). Defaults to current command chamber.',
             },
         },
         drive: {
             name: 'neh',
             title: 'Neh...',
-            description: 'Crack the Whip. Advance the Plot. Execute the next stage of the Plan.\nDon\'t just fix mistakes; force the scheme forward. The Minion obeys your every word.\nMANDATORY: Inspect the work (git diff) before the next order. Drive them until the World is yours.\n\nFlow: oi → [neh x N] → dayaa',
+            description: 'Crack the Whip. Advance the Plot. Execute the next stage of the Plan.\nDon\'t just fix mistakes; force the scheme forward. The Minion obeys your every word.\nMANDATORY: Inspect the work (git diff) before the next order. Drive them until the World is yours.\n\nFlow: ${start} → [${drive} x N] → ${close}',
             args: {
                 directive: 'REQUIRED. Precise order for the next phase of the scheme.',
                 context: 'Optional newly uncovered secrets or updated briefing.',
-                name: 'Optional ${IDENTITY} to execute this phase. Available: ${AVAILABLE_NAMES}.',
+                name: 'Optional ${identity} to execute this phase. Available: ${available_names}.',
                 cwd: 'Optional lair path (repository root). Defaults to current command chamber.',
             },
         },
@@ -287,23 +287,23 @@ export const MISCHIEF_PRESET = {
             args: {
                 request: 'REQUIRED. The intel to gather or the dirty work to execute.',
                 context: 'REQUIRED. World-state details needed for a sharp strike.',
-                name: 'Optional ${IDENTITY} to handle this business. Available: ${AVAILABLE_NAMES}.',
+                name: 'Optional ${identity} to handle this business. Available: ${available_names}.',
                 cwd: 'Optional lair path (repository root). Defaults to current command chamber.',
             },
         },
         close: {
             name: 'dayaa',
             title: 'Dayaa!',
-            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_TOOL_NAME} → [${DRIVE_TOOL_NAME} x N] → ${CLOSE_TOOL_NAME}',
+            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_TOOL_NAME}).\nIf the plan is weak, improve it with ${DRIVE_TOOL_NAME}.',
+                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.',
                 score_precise: 'REQUIRED (0-5). Architectural placement. 5 = exact layer, exact boundary, zero misplacement.',
                 score_minimal: 'REQUIRED (0-5). Economy of change. 5 = no avoidable lines, no speculative edits, no hidden bloat.',
                 score_isolated: 'REQUIRED (0-5). Surgical containment. 5 = zero unrelated files, zero opportunistic cleanup, zero collateral.',
                 score_idiomatic: 'REQUIRED (0-5). Native fluency. 5 = naming, structure, style indistinguishable from the codebase.',
                 score_cohesive: 'REQUIRED (0-5). Single responsibility. 5 = each unit does one thing, boundaries intact.',
-                oath: "Mastermind's Vow. Required for CLAIM. Verbatim: ${OATH_TEXT}",
+                oath: "Mastermind's Vow. Required for CLAIM. Verbatim: ${oath_text}",
                 cwd: 'Optional lair path (repository root). Defaults to current command chamber.',
             },
         },

package/build/index.js

@@ -27,13 +27,14 @@ function registerTools(server) {
     const availableNames = getAvailableNamesForPreset(preset).join(", ");
     const currentOath = resolveOath();
     const renderedPreset = renderPreset(preset, {
-        IDENTITY: preset.identity,
-        PRESET_IDENTITIES: presetIdentities,
-        AVAILABLE_NAMES: availableNames,
-        START_TOOL_NAME: preset.tools.start.name,
-        DRIVE_TOOL_NAME: preset.tools.drive.name,
-        CLOSE_TOOL_NAME: preset.tools.close.name,
-        OATH_TEXT: `'${currentOath}'`,
+        start: preset.tools.start.name,
+        drive: preset.tools.drive.name,
+        ask: preset.tools.ask.name,
+        close: preset.tools.close.name,
+        identity: preset.identity,
+        preset_identities: presetIdentities,
+        available_names: availableNames,
+        oath_text: `'${currentOath}'`,
     });
     const startPreset = renderedPreset.tools.start;
     const drivePreset = renderedPreset.tools.drive;

package/build/utils/trace.js

@@ -27,11 +27,8 @@ export async function appendReview(cwd, round, reason) {
     const block = ["", `## Review ${round}`, "### Reason", reason, ""].join("\n");
     await fs.appendFile(tracePath, block, "utf-8");
 }
-function normalizeTraceText(text) {
-    return text.replace(/\s+/g, " ").trim().slice(0, 500) || "Unknown error.";
-}
 export async function appendRoundReport(cwd, report) {
-    const summaryText = normalizeTraceText(report.summary);
+    const summaryText = report.summary.trim() || "Unknown error.";
     const fileLines = report.filesModified.length > 0 ? report.filesModified.map((file) => `- ${file}`) : ["(none)"];
     const tracePath = path.join(cwd, TRACE_FILE);
     const lines = [
@@ -49,7 +46,7 @@ export async function appendRoundReport(cwd, report) {
         ...fileLines,
     ];
     if (report.errorMessage) {
-        lines.push("### Error", normalizeTraceText(report.errorMessage));
+        lines.push("### Error", report.errorMessage);
     }
     lines.push("");
     const block = lines.join("\n");
@@ -71,7 +68,7 @@ export async function appendRoundSystemNote(cwd, round, note) {
         "### Files Modified",
         "(none)",
         "### Error",
-        normalizeTraceText(note),
+        note,
         "",
     ].join("\n");
     await fs.appendFile(tracePath, block, "utf-8");

package/build/workflow/orchestrator.js

@@ -146,7 +146,7 @@ function buildMergeMessage(title, keiyakuContent, reportContent) {
     return `keiyaku(${title}): done\n\n---\n${keiyakuContent}\n---\n${reportContent}\n---\n`;
 }
 function summarizeForTrace(message) {
-    return message.replace(/\s+/g, " ").trim().slice(0, 500) || "Unknown error.";
+    return message.length > 0 ? message : "Unknown error.";
 }
 function isAbortError(error) {
     return error instanceof Error && error.name === "AbortError";
@@ -226,6 +226,18 @@ function formatSubagentFailureMessage(failure) {
         `message=${summarizeForTrace(failure.message)}`,
     ].join("; ");
 }
+function filterInternalSections(text) {
+    const sections = parseMarkdownHeaders(text);
+    if (sections.length === 0)
+        return text.trim();
+    return sections
+        .filter((section) => {
+        const firstLine = section.split(/\r?\n/, 1)[0] ?? "";
+        return !/^#{2,3}\s+(?:criteria|constraints)\s+check\s*$/i.test(firstLine.trim());
+    })
+        .join("\n\n")
+        .trim();
+}
 async function appendRoundResult(cwd, round, summary, failureMessage) {
     const dirtyPaths = await git.getDirtyPaths(cwd);
     const filesModified = collectRoundFiles(dirtyPaths);
@@ -269,7 +281,7 @@ async function runAndRecordRound(cwd, titleToken, round, prompt, options) {
             console.error(failureStderrLog);
             appendDebugBlock("subagent failure stderr", failure.stderrSnippet, { cwd, section: "codex-stderr" });
         }
-        failureMessage = summarizeForTrace(failure.message);
+        failureMessage = failure.message.trim() || "Unknown error.";
         summary =
             options.failureMode === "round_specific"
                 ? `Round ${round} completed with subagent execution failure recorded in trace.`
@@ -354,11 +366,12 @@ export async function handleStart(input) {
         await git.addFiles(cwd, [KEIYAKU_FILE, TRACE_FILE]);
         await git.commit(cwd, `keiyaku(${branchToken}): open`);
         const prompt = buildStartPrompt(finalTitle, finalGoal, directive);
-        const { summary } = await runAndRecordRound(cwd, branchToken, 1, prompt, {
+        const { summary: rawSummary } = await runAndRecordRound(cwd, branchToken, 1, prompt, {
             signal,
             name,
             failureMode: "standard",
         });
+        const summary = filterInternalSections(rawSummary);
         const trace = await fs.readFile(path.join(cwd, TRACE_FILE), "utf-8");
         const diff = await git.getIncrementalDiff(cwd);
         return {
@@ -563,7 +576,7 @@ export async function handleDrive(input) {
         await appendReview(cwd, plan.targetRound, plan.reviewReason);
         await git.addFiles(cwd, TRACE_FILE);
         await git.commit(cwd, `keiyaku(${title}): iterate round ${plan.targetRound}`);
-        const { summary } = await runAndRecordRound(cwd, title, plan.targetRound, plan.prompt, {
+        const { summary: rawSummary } = await runAndRecordRound(cwd, title, plan.targetRound, plan.prompt, {
             signal,
             name,
             failureMode: "round_specific",
@@ -573,6 +586,7 @@ export async function handleDrive(input) {
                 await git.commit(cwd, `keiyaku(${title}): round ${plan.targetRound} cancelled`);
             },
         });
+        const summary = filterInternalSections(rawSummary);
         const trace = await fs.readFile(path.join(cwd, TRACE_FILE), "utf-8");
         const diff = await git.getIncrementalDiff(cwd);
         return {

package/build/workflow/prompts.js

@@ -16,17 +16,31 @@ Round: 1 (initial implementation).
    - Do not violate constraints.
    - Meet all criteria.
    - Match existing structure.
-6. End with 4 sections:
-   - Summary: outcome.
-   - Changes: files, logic delta, evidence.
-   - Aesthetics Gap
-     Self-critique.
-     precise — right place, layer, abstraction
-     minimal — smallest diff that solves it
-     isolated — no unrelated changes riding along
-     idiomatic — fits the codebase's voice
-     cohesive — each unit does one thing
-   - Blindspots: untested paths/assumptions.
+6. End with exactly these 6 sections using this strict Markdown template:
+
+## Outcome
+[One sentence summarizing the outcome]
+
+## Changes
+- [File path]: [Brief description of change]
+- [Logic delta]: [Key architectural or logic shift]
+
+## Aesthetics Gap
+Self-critique.
+- precise: [score/reasoning]
+- minimal: [score/reasoning]
+- isolated: [score/reasoning]
+- idiomatic: [score/reasoning]
+- cohesive: [score/reasoning]
+
+## Blindspots
+- [Unintentional side effects or untested paths]
+
+## Criteria Check
+- [List each criterion and its status: MET/PARTIAL/TODO]
+
+## Constraints Check
+- [List each constraint and confirm compliance: COMPLIANT/VIOLATED]
 
 No git commands. Do not edit KEIYAKU_TRACE.md.`;
 }
@@ -43,17 +57,31 @@ ${reason}
 4. Fix review reason first.
 5. No drift from constraints/criteria.
 6. Keep diff small.
-7. End with 4 sections:
-   - Summary: outcome.
-   - Changes: files, logic delta, evidence.
-   - Aesthetics Gap
-     Self-critique.
-     precise — right place, layer, abstraction
-     minimal — smallest diff that solves it
-     isolated — no unrelated changes riding along
-     idiomatic — fits the codebase's voice
-     cohesive — each unit does one thing
-   - Blindspots: untested paths/assumptions.
+7. End with exactly these 6 sections using this strict Markdown template:
+
+## Outcome
+[One sentence summarizing the outcome]
+
+## Changes
+- [File path]: [Brief description of change]
+- [Logic delta]: [Key architectural or logic shift]
+
+## Aesthetics Gap
+Self-critique.
+- precise: [score/reasoning]
+- minimal: [score/reasoning]
+- isolated: [score/reasoning]
+- idiomatic: [score/reasoning]
+- cohesive: [score/reasoning]
+
+## Blindspots
+- [Unintentional side effects or untested paths]
+
+## Criteria Check
+- [List each criterion and its status: MET/PARTIAL/TODO]
+
+## Constraints Check
+- [List each constraint and confirm compliance: COMPLIANT/VIOLATED]
 
 No git commands. Do not edit KEIYAKU_TRACE.md.`;
 }
@@ -66,5 +94,5 @@ ${request}
 Context:
 ${context}
 
-Provide a clear reasoning summary or code generation in the response.`;
+Provide a clear final response.`;
 }

package/build/workflow/response-builders.js

@@ -46,6 +46,11 @@ function supportsHeaderColor() {
 function colorizeHeaderTitle(titleLabel) {
     return `\x1b[1;38;5;15;48;5;23m${titleLabel}\x1b[0m`;
 }
+function colorizeErrorStatus(status) {
+    if (!supportsHeaderColor())
+        return status;
+    return `\x1b[1;38;5;15;48;5;196m${status}\x1b[0m`;
+}
 function formatHeader(title) {
     const headerWidth = 60;
     const normalizedTitle = title.trim().toUpperCase();
@@ -85,7 +90,7 @@ ${summary}
         : "";
     // Next Steps Block
     const nextBlock = nextHints.length > 0
-        ? `${formatHeader("Next Steps")}\n${nextHints.map(h => `› ${h}`).join("\n")}`
+        ? `${formatHeader("Hints")}\n${nextHints.map(h => `› ${h}`).join("\n")}`
         : "";
     return [
         statusBlock,
@@ -151,7 +156,7 @@ export function buildKeiyakuSuccessResponse(result, input) {
         ...formatMaybe("Current Branch", result.branch, 200),
         ...formatMaybe("Base Branch", result.baseBranch, 200),
     ];
-    const text = assembleResponse(`Started (Round ${result.round})`, `Created branch '${result.branch}' (base: '${result.baseBranch}'). ${result.summary}`, [inputSection, diffSection], nextHints, infoLines);
+    const text = assembleResponse(`Started (Round ${result.round})`, `Created branch '${result.branch}' (base: '${result.baseBranch}').\n\n${result.summary}`, [inputSection, diffSection], nextHints, infoLines);
     return {
         content: [{ type: "text", text }],
         structuredContent: buildSuccessStructuredContent(getStartToolName(), {
@@ -178,7 +183,7 @@ export function buildDriveResponse(result, input) {
         ...formatMaybe("Current Branch", result.branch, 200),
         ...formatMaybe("Base Branch", result.baseBranch, 200),
     ];
-    const text = assembleResponse(`Driven (Round ${result.round})`, `Updated branch '${result.branch}'. ${result.summary}`, [inputSection, diffSection], nextHints, infoLines);
+    const text = assembleResponse(`Driven (Round ${result.round})`, `Updated branch '${result.branch}'.\n\n${result.summary}`, [inputSection, diffSection], nextHints, infoLines);
     return {
         content: [{ type: "text", text }],
         structuredContent: buildSuccessStructuredContent(getDriveToolName(), {
@@ -273,7 +278,7 @@ export function buildCloseDropResponse(result, input) {
 export function buildToolErrorResponse(input) {
     const inputEcho = (input.inputEcho ?? []).map((line) => truncateForDisplay(line, 800));
     const shouldRaiseProtocolError = input.errorType === "runtime_error";
-    const text = assembleResponse("Failed", input.message, [buildSection("Input Context", inputEcho)], [input.hint]);
+    const text = assembleResponse(colorizeErrorStatus("!! FAILED !!"), input.message, [buildSection("Input Context", inputEcho)], [input.hint]);
     const response = {
         content: [{ type: "text", text }],
         structuredContent: {

package/package.json

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