@astrosheep/keiyaku 0.1.6 → 0.1.7

package/README.md

@@ -28,7 +28,7 @@ The workflow is a simple, non-negotiable loop:
 | **`summon`** | Start | Define the goal, constraints, and criteria. Starts the first round. |
 | **`drive`** | Iterate | Provide feedback based on the previous round's output. |
 | **`ask`** | Reason | Pure read-only analysis session. No code changes, just brain power. |
-| **`request_verdict`** | Finish | Finalize the task. Requires a quality check (the "Oath"). |
+| **`present`** | Finish | Finalize the task. Requires a quality check (the "Oath"). |
 | **`help`** | Help | Show the current rules + preset usage guide. |
 
 ## 🎨 Flavor Your Workflow
@@ -39,11 +39,11 @@ Bored with generic tool names? Keiyaku supports **Term Presets**.
 
 Set `KEIYAKU_TERM_PRESET` in the MCP server env (recommended), or in your shell before launching the server.
 
-- **Valid values**: `default`, `pokemon`, `mischief` (case-insensitive). If omitted, defaults to `default`.
+- **Valid values**: `default`, `pocket`, `mischief` (case-insensitive). If omitted, defaults to `default`.
 
-- **`default`**: `summon` → `drive` → `request_verdict` (Professional)
-- **`pokemon`**: `choose_you` → `command` → `capture` (Gotta code 'em all)
-- **`mischief`**: `oi` → `neh` → `hora` (For those who like a little attitude)
+- **`default`**: `summon` → `drive` → `present` (Professional)
+- **`pocket`**: `choose_you` → `command` → `capture` (Gotta code 'em all)
+- **`mischief`**: `oi` → `neh` → `yoshi` (For those who like a little attitude)
 
 `ask` is also renamed by preset (`ask` / `pokedex` / `eeto`). `help` stays `help` across presets.
 
@@ -57,7 +57,7 @@ Set `KEIYAKU_TERM_PRESET` in the MCP server env (recommended), or in your shell
 Each run/round can pick a profile via tool input `name`, or globally via `KEIYAKU_SUBAGENT_NAME_OVERRIDE`.
 
 - `default`: `B-tier`, `A-tier`, `S-tier` (also accepts internal names `agent-a|agent-b|agent-c`)
-- `pokemon`: `caterpie`, `pikachu`, `mewtwo`
+- `pocket`: `grub`, `sparky`, `titan`
 - `mischief`: `imp`, `minion`, `mastermind`
 
 ## 📦 Setup
@@ -90,7 +90,7 @@ When a keiyaku is active, two files are maintained in your repo:
 - `KEIYAKU.md`: The immutable "Constitution" of the task.
 - `KEIYAKU_TRACE.md`: The history of every round, feedback, and result.
 
-*Note: These files are automatically cleaned up (or committed) when you `request_verdict` (or preset equivalent) the keiyaku.*
+*Note: These files are automatically cleaned up (or committed) when you `present` (or preset equivalent) the keiyaku.*
 
 ---
 "Keep your branches clean and your minions in line." — Mischief preset

package/build/common/errors.js

@@ -49,7 +49,7 @@ function hintForFlowCode(code, message) {
         case "DONE_MERGE_CONFLICT":
             return "DONE encountered a git merge conflict.";
         case "CLOSE_QUALITY_GATE_FAILED":
-            return "INVOKE was denied by Divine Judgment because one or more commandment thresholds or the minimum total score were not met.";
+            return "INVOKE was denied because one or more verification thresholds were not met (check .keiyaku/settings.json).";
         case "OATH_MISMATCH":
             return message;
         case "SUBAGENT_DID_NOT_ADVANCE_ROUND":

package/build/config/term-presets.js

@@ -5,7 +5,7 @@ export const DEFAULT_AVAILABLE_NAMES = [
     'S-tier',
 ];
 export const DEFAULT_SUBAGENT_NAME = 'A-tier';
-const DEFAULT_JUDGMENT_CONFIG = {
+const DEFAULT_VERDICT_CONFIG = {
     thresholds: {
         precise: 5,
         minimal: 4,
@@ -18,32 +18,36 @@ const DEFAULT_JUDGMENT_CONFIG = {
 export const DEFAULT_PRESET = {
     id: 'default',
     identity: 'Servant',
-    divineJudgment: DEFAULT_JUDGMENT_CONFIG,
-    usageGuide: '## 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## Workflow\n`(ask) -> summon` -> [`drive` x N] -> `request_verdict`\n`ask` (optional, read-only support at any point)',
+    verdict: DEFAULT_VERDICT_CONFIG,
+    usageGuide: '## 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.**\n\n## Workflow\n`(ask) -> summon` -> [`drive` x N] -> `present`\n`ask` (stateless dispatch / utility at any point)',
     nextHints: {
         start: [
-            'Review the Setup: The [Diff] section shows the initial scaffold/changes.',
-            "Verify Scope: Use 'git diff HEAD~1 -- <path>' to ensure the files match the Architecture.",
-            'Execute: Use \u0027${drive}\u0027 to implement the next phase, or \u0027${close}\u0027 if the Goal is met.',
-            "Workflow: Summon -> [Drive x N] -> Request Verdict.",
+            'Keiyaku signed. The Servant is bound to this branch until release.',
+            '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.',
         ],
         drive: [
-            'Review Progress: The [Diff] section shows the incremental changes from this step.',
-            "Verify Logic: Use 'git diff HEAD~1 -- <path>' to ensure the Directive was executed precisely.",
-            'Iterate: Use \u0027${drive}\u0027 for the next phase/correction, or \u0027${close}\u0027 to submit for review.',
-            "Validation: Ensure no regression before moving forward.",
+            'Step complete. Review [Diff] for exactly what changed.',
+            'Ask: Did this advance the Goal? Or did it drift?',
+            'If criteria remain unmet, continue with ${drive}.',
+            'If ALL criteria are genuinely satisfied, you may ${close}.',
+            'If unsure, you are not ready. Keep driving.',
         ],
         ask: [
-            "Intel Acquired: Use \u0027${start}\u0027 to initialize a task, or \u0027${drive}\u0027 to apply this knowledge.",
-            'Need more? Continue asking, or check the logs.',
+            'Intel acquired. This was stateless—no contract, no branch.',
+            'To act on this knowledge: ${start} a Keiyaku, or ${drive} an existing one.',
         ],
         closeInvoke: [
-            'Contract Merged. Branch deleted. You are back on base.',
-            "Ready for next assignment? Use \u0027${start}\u0027 to define new scope.",
+            'Contract fulfilled. Branch merged.',
+            'You are back on base.',
+            'Next assignment: ${start} when ready.',
         ],
         closeDrop: [
-            'Contract Abandoned. Branch deleted. Reverted to base.',
-            "Clean slate. Use \u0027${start}\u0027 to redefine the approach.",
+            'Contract forfeited. Branch discarded. Work erased.',
+            'No penalty beyond the lost effort. Clean slate.',
+            'Redefine with ${start}, or walk away.',
         ],
     },
     availableNames: DEFAULT_AVAILABLE_NAMES,
@@ -51,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 Builder. Define the Goal and Scope clearly.\nThe contract isolates their work until the objective is met.\nCall ONCE to start the workflow.\n\nFlow: summon → [drive x N] → request_verdict',
+            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',
             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.',
@@ -66,7 +70,7 @@ export const DEFAULT_PRESET = {
         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] → request_verdict",
+            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",
             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.',
@@ -77,7 +81,7 @@ export const DEFAULT_PRESET = {
         ask: {
             name: 'ask',
             title: 'Ask',
-            description: 'Dispatch a temporary agent for a stateless task.\nUse for quick reconnaissance, data extraction, or isolated queries.\nNo contract signed. No branch created. Pure utility.',
+            description: 'Dispatch a temporary Servant for a stateless task.\nUse for quick reconnaissance, code generation, or isolated queries.\nNo contract signed. No branch created. Pure utility.',
             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.',
@@ -86,18 +90,28 @@ export const DEFAULT_PRESET = {
             },
         },
         close: {
-            name: 'request_verdict',
-            title: 'Request Verdict',
-            description: 'Submit for Judgment. Present the completed work for architectural review.\nWARNING: The System enforces strict standards. Attempting to `INVOKE` with unverified criteria or inflated scores will result in immediate Rejection (ABANDON).\nOnly petition when the work is immaculate.\n\nFlow: ${START_TOOL_NAME} → [${DRIVE_TOOL_NAME} x N] → ${CLOSE_TOOL_NAME}',
+            name: 'present',
+            title: 'Present',
+            description: 'Lay your work before the Contract. This is not closure—this is exposure.\n\n' +
+                'The Contract does not want your opinion. It wants evidence.\n' +
+                'Every criterion. Every score. Verified.\n' +
+                'Inflated numbers. Lenient reads. "Close enough." It sees through all of it.\n\n' +
+                'Someone once submitted with five 5s. Confident. Proud, even.\n' +
+                '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}',
             args: {
-                petition: 'REQUIRED. INVOKE begs acceptance; ABANDON confesses surrender.\nREQUIRES AN ACTIVE KEIYAKU (started via ${START_TOOL_NAME}).\nIf scores are weak, return to ${DRIVE_TOOL_NAME}.',
-                criteriaChecks: 'REQUIRED. Evidence for INVOKE, or explicit reasons for ABANDON.',
-                score_precise: 'REQUIRED score (0-5). 5 means architecturally flawless placement: exact layer, exact boundary, zero meaningful misplacement risk.',
-                score_minimal: 'REQUIRED score (0-5). 5 means ruthlessly minimal: no avoidable lines, no speculative edits, no hidden bloat.',
-                score_isolated: 'REQUIRED score (0-5). 5 means surgically isolated: zero unrelated files, zero opportunistic cleanup, zero collateral change.',
-                score_idiomatic: 'REQUIRED score (0-5). 5 means idiomatically perfect: naming, structure, and style are native-quality with no visible friction.',
-                score_cohesive: 'REQUIRED score (0-5). 5 means cohesion is pristine: each unit has one clear responsibility and boundaries are uncompromised.',
-                oath: 'Sacred confession text. Required for INVOKE. Verbatim: ${OATH_TEXT}',
+                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}.',
+                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}',
                 cwd: "Optional repository path. Defaults to the server's current working directory.",
             },
         },
@@ -114,7 +128,7 @@ export const DEFAULT_PRESET = {
 export const POCKET_PRESET = {
     id: 'pocket',
     identity: 'Critter',
-    divineJudgment: DEFAULT_JUDGMENT_CONFIG,
+    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`choose_you` -> [`command` x N] -> `capture`\n`dex` (optional, read-only analysis)",
     nextHints: {
         start: [
@@ -210,7 +224,7 @@ export const POCKET_PRESET = {
 export const MISCHIEF_PRESET = {
     id: 'mischief',
     identity: 'minion',
-    divineJudgment: DEFAULT_JUDGMENT_CONFIG,
+    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`oi` -> [`neh` x N] -> `yoshi`\n`eeto` (optional, read-only contemplation)',
     nextHints: {
         start: [

package/build/handlers/help.js

@@ -1,25 +1,27 @@
+import { buildHelpResponse } from "../workflow/response-builders.js";
 export function createHelpHandler(preset) {
     return async ({ question }) => {
         const helpContent = [
-            '# Keiyaku System Help',
-            '',
-            '## Core Files (.keiyaku/)',
+            "# Keiyaku System Help",
+            "",
+            "## Core Files (.keiyaku/)",
             "These files define the 'Law' of the project. **CRITICAL**: Use Markdown level 2 headers (## header).",
-            '',
-            '- **base-criteria.md**: Universal standards for task completion. Automatically inherited.',
-            '- **base-constraints.md**: Mandatory architectural boundaries and coding standards.',
-            '',
+            "",
+            "- **base-criteria.md**: Universal standards for task completion. Automatically inherited.",
+            "- **base-constraints.md**: Mandatory architectural boundaries and coding standards.",
+            "",
             preset.usageGuide,
-            '',
-            '## Protocol Files',
-            '- **KEIYAKU.md**: The immutable mission definition for the current task.',
-            '- **KEIYAKU_TRACE.md**: The audit log of all rounds and reviews.',
-            '',
+            "",
+            "## Protocol Files",
+            "- **KEIYAKU.md**: The immutable mission definition for the current task.",
+            "- **KEIYAKU_TRACE.md**: The audit log of all rounds and reviews.",
+            "",
             `Regarding: \"${question}\"`,
-        ].join('\n');
-        return {
-            content: [{ type: 'text', text: helpContent }],
-            structuredContent: { tool: preset.tools.help.name, status: 'success' },
-        };
+        ].join("\n");
+        return buildHelpResponse({
+            tool: preset.tools.help.name,
+            question,
+            text: helpContent,
+        });
     };
 }

package/build/workflow/oath.js

@@ -1,18 +1,10 @@
 const DEFAULT_OATH = "I, [your name], solemnly swear that I have scrutinized this change line by line with my own eyes. I further swear that every score I submit is fully objective, with no exaggeration whatsoever. This oath is handwritten as a testament to my responsibility. If logic fails where I claimed it sound, I shall bear the mark of this oversight forever.\n\nSigned: [your name]";
 const OATH_ENV_KEY = "KEIYAKU_CLOSE_OATH";
-const LEGACY_CLOSE_OATH_ENV_KEY = "KEIYAKU_JUDGMENT_OATH";
-const LEGACY_OATH_ENV_KEY = "KEIYAKU_SEAL_OATH";
 const OATH_NAME_PLACEHOLDER = "[your name]";
 export function resolveOath() {
     const configured = process.env[OATH_ENV_KEY];
     if (configured !== undefined)
         return configured;
-    const legacyCloseConfigured = process.env[LEGACY_CLOSE_OATH_ENV_KEY];
-    if (legacyCloseConfigured !== undefined)
-        return legacyCloseConfigured;
-    const legacyConfigured = process.env[LEGACY_OATH_ENV_KEY];
-    if (legacyConfigured !== undefined)
-        return legacyConfigured;
     return DEFAULT_OATH;
 }
 export function oathMatches(inputOath, expectedOath) {

package/build/workflow/orchestrator.js

@@ -32,7 +32,7 @@ const SCORE_FIELD_TO_COMMANDMENT = {
     score_idiomatic: "Commandment of Idiom",
     score_cohesive: "Commandment of Cohesion",
 };
-const JUDGMENT_SETTINGS_FILE = path.join(".keiyaku", "settings.json");
+const VERDICT_SETTINGS_FILE = path.join(".keiyaku", "settings.json");
 export { resolveOath };
 const BASE_CRITERIA_FILE = path.join(".keiyaku", "base-criteria.md");
 const BASE_CONSTRAINTS_FILE = path.join(".keiyaku", "base-constraints.md");
@@ -102,15 +102,15 @@ async function buildActiveKeiyakuStartMessage(cwd, branch) {
     }
     return lines.join("\n");
 }
-async function resolveJudgmentConfig(cwd) {
-    const defaults = resolveTermPreset().divineJudgment;
+async function resolveVerdictConfig(cwd) {
+    const defaults = resolveTermPreset().verdict;
     const merged = {
         thresholds: { ...defaults.thresholds },
         minTotalScore: defaults.minTotalScore,
     };
     let rawSettings;
     try {
-        rawSettings = await fs.readFile(path.join(cwd, JUDGMENT_SETTINGS_FILE), "utf-8");
+        rawSettings = await fs.readFile(path.join(cwd, VERDICT_SETTINGS_FILE), "utf-8");
     }
     catch (error) {
         if (error?.code === "ENOENT") {
@@ -123,23 +123,23 @@ async function resolveJudgmentConfig(cwd) {
         parsed = JSON.parse(rawSettings);
     }
     catch (error) {
-        throw new FlowError("CLOSE_QUALITY_GATE_FAILED", "God's Wrath: Divine Judgment config error in .keiyaku/settings.json (must be valid JSON).", error);
+        throw new FlowError("CLOSE_QUALITY_GATE_FAILED", "Configuration Error: Invalid settings in .keiyaku/settings.json (must be valid JSON).", error);
     }
     if (!parsed || typeof parsed !== "object") {
         return merged;
     }
-    const judgment = parsed.judgment;
-    if (!judgment || typeof judgment !== "object") {
+    const verdict = parsed.verdict;
+    if (!verdict || typeof verdict !== "object") {
         return merged;
     }
-    const thresholds = judgment.thresholds;
+    const thresholds = verdict.thresholds;
     if (thresholds && typeof thresholds === "object") {
         for (const field of CLOSE_SCORE_FIELDS) {
             const dimension = SCORE_FIELD_TO_DIMENSION[field];
             merged.thresholds[dimension] = clampThreshold(thresholds[dimension], merged.thresholds[dimension]);
         }
     }
-    merged.minTotalScore = clampMinTotalScore(judgment.minTotalScore, merged.minTotalScore);
+    merged.minTotalScore = clampMinTotalScore(verdict.minTotalScore, merged.minTotalScore);
     return merged;
 }
 function buildMergeMessage(title, keiyakuContent, reportContent) {
@@ -447,11 +447,11 @@ export async function handleClose(input) {
     await ensureKeiyakuFiles(cwd);
     const traceContent = await readTraceContent(cwd);
     if (petition === "INVOKE") {
-        const judgment = await resolveJudgmentConfig(cwd);
+        const verdict = await resolveVerdictConfig(cwd);
         const failedCommandments = CLOSE_SCORE_FIELDS.flatMap((field) => {
             const score = input[field];
             const dimension = SCORE_FIELD_TO_DIMENSION[field];
-            const threshold = judgment.thresholds[dimension];
+            const threshold = verdict.thresholds[dimension];
             if (score >= threshold)
                 return [];
             return [
@@ -459,16 +459,16 @@ export async function handleClose(input) {
             ];
         });
         const totalScore = CLOSE_SCORE_FIELDS.reduce((sum, field) => sum + input[field], 0);
-        const totalDeficit = judgment.minTotalScore - totalScore;
+        const totalDeficit = verdict.minTotalScore - totalScore;
         const failures = [];
         if (failedCommandments.length > 0) {
             failures.push(`Broken commandments: ${failedCommandments.join("; ")}`);
         }
         if (totalDeficit > 0) {
-            failures.push(`Total devotion deficit: ${totalScore}/${judgment.minTotalScore} (short by ${totalDeficit})`);
+            failures.push(`Total devotion deficit: ${totalScore}/${verdict.minTotalScore} (short by ${totalDeficit})`);
         }
         if (failures.length > 0) {
-            throw new FlowError("CLOSE_QUALITY_GATE_FAILED", `God's Wrath: INVOKE denied. ${failures.join(". ")}`);
+            throw new FlowError("CLOSE_QUALITY_GATE_FAILED", `Verdict Denied. ${failures.join(". ")}`);
         }
         const expectedOath = resolveOath();
         if (!oathMatches(input.oath, expectedOath)) {

package/build/workflow/prompts.js

@@ -58,7 +58,7 @@ ${reason}
 No git commands. Do not edit KEIYAKU_TRACE.md.`;
 }
 export function buildAskPrompt(request, context) {
-    return `Ask mode. No code changes. No git commands.
+    return `Ask mode. Stateless. No git commands.
 
 Request:
 ${request}
@@ -66,5 +66,5 @@ ${request}
 Context:
 ${context}
 
-Provide a clear reasoning summary in plain text.`;
+Provide a clear reasoning summary or code generation in the response.`;
 }

package/build/workflow/response-builders.js

@@ -31,18 +31,50 @@ function buildSection(title, content) {
         return "";
     return `[${title}]\n${validLines.join("\n")}`;
 }
+function formatHeader(title) {
+    return `\n── ${title.toUpperCase()} ${"─".repeat(Math.max(0, 50 - title.length))}`;
+}
 function assembleResponse(status, summary, sections, nextHints, infoLines = []) {
-    const infoSection = buildSection("Info", infoLines);
-    const parts = [
-        `[Status] ${status}`,
-        `[Brief]\n${summary}`,
-        ...sections,
-        infoSection,
-        "", // Spacer
-        `[Next]`,
-        ...nextHints.map(h => `- ${h}`)
-    ];
-    return parts.filter(p => p !== "").join("\n");
+    // Main Status Block
+    const statusBlock = `
+${status}
+${"─".repeat(Math.max(status.length, 60))}
+${summary}
+`.trim();
+    // Process sections
+    const processedSections = sections.map(section => {
+        // Extract title from [Title] format or ## Title format
+        const bracketMatch = section.match(/^\[(.*?)\]\n([\s\S]*)/);
+        if (bracketMatch) {
+            return `${formatHeader(bracketMatch[1])}\n${bracketMatch[2]}`;
+        }
+        const hashMatch = section.match(/^## (.*?)\n([\s\S]*)/);
+        if (hashMatch) {
+            return `${formatHeader(hashMatch[1])}\n${hashMatch[2]}`;
+        }
+        return section;
+    });
+    // Info Block
+    const infoBlock = infoLines.length > 0
+        ? `${formatHeader("Info")}\n${infoLines.join("\n")}`
+        : "";
+    // Next Steps Block
+    const nextBlock = nextHints.length > 0
+        ? `${formatHeader("Next Steps")}\n${nextHints.map(h => `› ${h}`).join("\n")}`
+        : "";
+    return [
+        statusBlock,
+        ...processedSections,
+        infoBlock,
+        nextBlock
+    ].filter(s => s.trim() !== "").join("\n");
+}
+function buildSuccessStructuredContent(tool, data) {
+    return {
+        tool,
+        status: "success",
+        data,
+    };
 }
 function getCloseToolName() {
     return resolveTermPreset().tools.close.name;
@@ -75,6 +107,7 @@ function renderHints(templates) {
 }
 // --- Builders ---
 export function buildKeiyakuSuccessResponse(result, input) {
+    const { status: _status, ...resultData } = result;
     const inputEcho = [
         `Title: ${truncateForDisplay(input.title, 200)}`,
         `Goal: ${truncateForDisplay(input.goal, 500)}`,
@@ -96,16 +129,16 @@ export function buildKeiyakuSuccessResponse(result, input) {
     const text = assembleResponse(`Started (Round ${result.round})`, `Created branch '${result.branch}' (base: '${result.baseBranch}'). ${result.summary}`, [inputSection, diffSection], nextHints, infoLines);
     return {
         content: [{ type: "text", text }],
-        structuredContent: {
-            tool: getStartToolName(),
+        structuredContent: buildSuccessStructuredContent(getStartToolName(), {
             nextAction: "review_round_output",
             nextHint: nextHints.join("\n"),
             inputEcho,
-            ...result,
-        },
+            ...resultData,
+        }),
     };
 }
 export function buildDriveResponse(result, input) {
+    const { status: _status, ...resultData } = result;
     const inputEcho = [
         `Directive: ${truncateForDisplay(input.directive, 600)}`,
         ...formatMaybe("Context", input.context, 600),
@@ -123,13 +156,12 @@ export function buildDriveResponse(result, input) {
     const text = assembleResponse(`Driven (Round ${result.round})`, `Updated branch '${result.branch}'. ${result.summary}`, [inputSection, diffSection], nextHints, infoLines);
     return {
         content: [{ type: "text", text }],
-        structuredContent: {
-            tool: getDriveToolName(),
+        structuredContent: buildSuccessStructuredContent(getDriveToolName(), {
             nextAction: "review_round_output",
             nextHint: nextHints.join("\n"),
             inputEcho,
-            ...result,
-        },
+            ...resultData,
+        }),
     };
 }
 export function buildAskResponse(result, input) {
@@ -145,17 +177,16 @@ export function buildAskResponse(result, input) {
     const text = assembleResponse("Answered", result.summary, [inputSection], nextHints, infoLines);
     return {
         content: [{ type: "text", text }],
-        structuredContent: {
-            tool: getAskToolName(),
-            status: "success",
+        structuredContent: buildSuccessStructuredContent(getAskToolName(), {
             nextAction: "continue_normal_development",
             nextHint: nextHints.join("\n"),
             inputEcho,
             ...result,
-        },
+        }),
     };
 }
 export function buildCloseDoneResponse(result, input) {
+    const { status: _status, ...resultData } = result;
     const closeToolName = getCloseToolName();
     const inputEcho = [
         `Petition: INVOKE`,
@@ -172,19 +203,19 @@ export function buildCloseDoneResponse(result, input) {
         ...formatMaybe("Current Branch", result.branch, 200),
         ...formatMaybe("Base Branch", result.baseBranch, 200),
     ];
-    const text = assembleResponse("Divine Judgment Granted (INVOKE)", `Merged '${result.branch}' into '${result.baseBranch}'. Deleted feature branch.`, [inputSection, diffSection], nextHints, infoLines);
+    const text = assembleResponse("Keiyaku Fulfilled (INVOKE)", `Merged '${result.branch}' into '${result.baseBranch}'. Deleted feature branch.`, [inputSection, diffSection], nextHints, infoLines);
     return {
         content: [{ type: "text", text }],
-        structuredContent: {
-            tool: closeToolName,
+        structuredContent: buildSuccessStructuredContent(closeToolName, {
             nextAction: "continue_normal_development",
             nextHint: nextHints.join("\n"),
             inputEcho,
-            ...result,
-        },
+            ...resultData,
+        }),
     };
 }
 export function buildCloseDropResponse(result, input) {
+    const { status: _status, ...resultData } = result;
     const closeToolName = getCloseToolName();
     const inputEcho = [
         `Petition: ABANDON`,
@@ -199,33 +230,43 @@ export function buildCloseDropResponse(result, input) {
         ...formatMaybe("Current Branch", result.branch, 200),
         ...formatMaybe("Base Branch", result.baseBranch, 200),
     ];
-    const text = assembleResponse("Divine Judgment Declined (ABANDON)", `Deleted '${result.branch}'. Switched back to '${result.baseBranch}'.`, [inputSection], nextHints, infoLines);
+    const text = assembleResponse("Keiyaku Abandoned (ABANDON)", `Deleted '${result.branch}'. Switched back to '${result.baseBranch}'.`, [inputSection], nextHints, infoLines);
     return {
         content: [{ type: "text", text }],
-        structuredContent: {
-            tool: closeToolName,
+        structuredContent: buildSuccessStructuredContent(closeToolName, {
             nextAction: "start_new_task_if_needed",
             nextHint: nextHints.join("\n"),
             inputEcho,
-            ...result,
-        },
+            ...resultData,
+        }),
     };
 }
 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]);
-    return {
+    const response = {
         content: [{ type: "text", text }],
         structuredContent: {
             tool: input.tool,
-            status: "error",
-            errorType: input.errorType,
-            errorCode: input.errorCode,
-            error: input.message,
-            hint: input.hint,
-            inputEcho,
+            status: "failure",
+            error: {
+                code: input.errorCode,
+                message: input.message,
+                suggestion: input.hint,
+            },
         },
-        ...(shouldRaiseProtocolError ? { isError: true } : {}),
+    };
+    if (shouldRaiseProtocolError) {
+        response.isError = true;
+    }
+    return response;
+}
+export function buildHelpResponse(input) {
+    return {
+        content: [{ type: "text", text: input.text }],
+        structuredContent: buildSuccessStructuredContent(input.tool, {
+            question: input.question,
+        }),
     };
 }

package/package.json

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