@astrosheep/keiyaku 0.1.12 → 0.1.14

package/README.md

@@ -90,6 +90,10 @@ 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.
 
+Project-level law lives in:
+- `.keiyaku/base-constraints.md`: Global constraints inherited by every keiyaku.
+- `ask` also injects `.keiyaku/base-constraints.md` as **reference context** (it may be unrelated to some asks).
+
 *Note: These files are automatically cleaned up (or committed) when you `present` (or preset equivalent) the keiyaku.*
 
 ---

package/build/common/errors.js

@@ -29,13 +29,15 @@ export function wrapFlowError(action, err) {
     return new Error(`${action} failed: ${asMessage(err)}`);
 }
 function hintForFlowCode(code, message) {
+    const preset = resolveTermPreset();
+    const { drive, close } = preset.tools;
     switch (code) {
         case "NOT_GIT_REPO":
             return "The provided `cwd` is not a git repository.";
         case "ACTIVE_KEIYAKU_EXISTS":
-            return "An active keiyaku branch already exists in this repository. Continue with `drive`, or use `close` + `FORFEIT` to drop it.";
+            return message;
         case "EXISTING_KEIYAKU_BRANCH_FOUND":
-            return "At least one local `keiyaku/*` branch already exists in this repository.";
+            return `\`${preset.tools.start.name}\` blocked: Existing branches detected. \`git switch\` to one and \`${close.name}\` it, or choose a different \`title\`.`;
         case "EMPTY_PARAM":
             return "One or more required parameters are empty.";
         case "DIRTY_WORKTREE":
@@ -43,13 +45,13 @@ function hintForFlowCode(code, message) {
         case "NOT_ACTIVE_KEIYAKU_BRANCH":
             return message;
         case "MISSING_KEIYAKU_BASE":
-            return "Current keiyaku branch is missing `keiyakuBase` metadata.";
+            return `Current branch is missing \`keiyakuBase\` metadata. This branch might not have been created via \`${preset.tools.start.name}\`.`;
         case "MISSING_PROTOCOL_FILES":
             return "Required protocol files are missing (`KEIYAKU.md` or `KEIYAKU_TRACE.md`).";
         case "DONE_MERGE_CONFLICT":
-            return "DONE encountered a git merge conflict.";
+            return `Merge conflict detected while merging into the base branch during \`CLAIM\`. Resolve the conflicts, commit the changes, and then run \`${close.name}\` again.`;
         case "CLOSE_QUALITY_GATE_FAILED":
-            return "CLAIM was denied because one or more verification thresholds were not met (check .keiyaku/settings.json).";
+            return `CLAIM denied: Inadequate work. Scores are below the required standard. Use \`${drive.name}\` to refine the mission until it is worthy of merging.`;
         case "OATH_MISMATCH":
             return message;
         case "SUBAGENT_DID_NOT_ADVANCE_ROUND":

package/build/config/term-presets.js

@@ -19,7 +19,7 @@ export const DEFAULT_PRESET = {
     id: 'default',
     identity: 'Servant',
     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` (anytime) | `summon` -> [`drive` | `ask`]* -> `present`',
+    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.**',
     nextHints: {
         start: [
             'Keiyaku signed. The Servant is bound to this branch until release.',
@@ -84,7 +84,7 @@ export const DEFAULT_PRESET = {
             description: 'Dispatch a temporary Servant for a stateless task.\nUse for quick reconnaissance, code generation, isolated execution, or one-off tasks.\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.',
+                context: 'REQUIRED. Relevant background or data the servant needs to execute the request. Note: .keiyaku/base-constraints.md is also injected as reference context (may be unrelated).',
                 name: 'Optional ${identity} profile to perform this task. Available: ${available_names}.',
                 cwd: "Optional repository path. Defaults to the server's current working directory.",
             },
@@ -102,6 +102,7 @@ export const DEFAULT_PRESET = {
             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-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.',
@@ -115,9 +116,7 @@ export const DEFAULT_PRESET = {
             name: 'help',
             title: 'Protocol Codex',
             description: 'Consult the Architect\'s Codex. Clarify the Laws of the Keiyaku and the standard Workflow.\nUse this to understand the constraints of the reality you command.',
-            args: {
-                question: 'REQUIRED. The specific Protocol, Law, or Workflow detail to clarify.',
-            },
+            args: {},
         },
     },
 };
@@ -186,7 +185,7 @@ export const POCKET_PRESET = {
             description: 'Scan the Environment. A stateless look-up or experiment.\nUse for analyzing the codebase, checking type advantages, or running field tests.\nNo PP cost. No turn used. Fast and functional.',
             args: {
                 request: 'REQUIRED. What should the Dex analyze, compare, or execute.',
-                context: 'REQUIRED. Context entries so the action targets the right ecosystem.',
+                context: 'REQUIRED. Context entries so the action targets the right ecosystem. Note: .keiyaku/base-constraints.md is also injected as reference context (may be unrelated).',
                 name: 'Optional ${identity} doing the work. Available: ${available_names}.',
                 cwd: 'Optional battlefield path (repository root). Defaults to current arena.',
             },
@@ -198,6 +197,7 @@ export const POCKET_PRESET = {
             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-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.',
@@ -211,9 +211,7 @@ export const POCKET_PRESET = {
             name: 'help',
             title: 'Trainer Guide',
             description: 'Consult the League Rules. Clarify the Battle System and Turn Structure.',
-            args: {
-                question: 'REQUIRED. The Pocket Battle System question you want answered.',
-            },
+            args: {},
         },
     },
 };
@@ -282,7 +280,7 @@ export const MISCHIEF_PRESET = {
             description: 'Send a Disposable. A stateless mission for intel or sabotage.\nUse this to scout enemy territory, steal documents, or run quick-and-dirty experiments.\nIf it dies, it dies! Just make sure it reports back before it vanishes.',
             args: {
                 request: 'REQUIRED. The intel to gather or the dirty work to execute.',
-                context: 'REQUIRED. World-state details needed for a sharp strike.',
+                context: 'REQUIRED. World-state details needed for a sharp strike. Note: .keiyaku/base-constraints.md is also injected as reference context (may be unrelated).',
                 name: 'Optional ${identity} to handle this business. Available: ${available_names}.',
                 cwd: 'Optional lair path (repository root). Defaults to current command chamber.',
             },
@@ -294,6 +292,7 @@ export const MISCHIEF_PRESET = {
             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-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.',
@@ -307,9 +306,7 @@ export const MISCHIEF_PRESET = {
             name: 'help',
             title: 'Nani?!',
             description: 'Consult the Evil Overlord List. Review the Laws of the Lair.',
-            args: {
-                question: 'REQUIRED. The law or protocol detail you want the realm to explain.',
-            },
+            args: {},
         },
     },
 };

package/build/handlers/ask.js

@@ -29,7 +29,7 @@ export function createAskHandler() {
                     `Request: ${request}`,
                     `Context: ${context}`,
                     ...(name ? [`${preset.identity}: ${name}`] : []),
-                    `CWD: ${workingDir}`,
+                    `Path: ${workingDir}`,
                 ],
             });
         }

package/build/handlers/close.js

@@ -4,11 +4,12 @@ import { buildCloseDoneResponse, buildCloseDropResponse, } from "../workflow/res
 import { resolveTermPreset } from "../config/term-presets.js";
 import { handleToolError } from "./shared.js";
 export function createCloseHandler() {
-    return async ({ petition, criteriaChecks, score_precise, score_minimal, score_isolated, score_idiomatic, score_cohesive, oath, cwd, }, extra) => {
+    return async ({ petition, criteriaChecks, constraintsChecks, score_precise, score_minimal, score_isolated, score_idiomatic, score_cohesive, oath, cwd, }, extra) => {
         const workingDir = cwd || process.cwd();
         const criteriaCheckParts = criteriaChecks;
+        const constraintsCheckParts = constraintsChecks ?? [];
         try {
-            appendDebugLog(`tool close start petition=${petition} cwd=${workingDir} criteriaChecks=${criteriaCheckParts.length}`, {
+            appendDebugLog(`tool close start petition=${petition} cwd=${workingDir} criteriaChecks=${criteriaCheckParts.length} constraintsChecks=${constraintsCheckParts.length}`, {
                 cwd: workingDir,
                 section: "script",
             });
@@ -16,6 +17,7 @@ export function createCloseHandler() {
                 cwd: workingDir,
                 petition,
                 criteriaChecks: criteriaCheckParts,
+                constraintsChecks: constraintsCheckParts,
                 score_precise,
                 score_minimal,
                 score_isolated,
@@ -35,6 +37,7 @@ export function createCloseHandler() {
                 });
                 return buildCloseDoneResponse(finalOutcome, {
                     criteriaChecks: criteriaCheckParts,
+                    constraintsChecks: constraintsCheckParts,
                     score_precise,
                     score_minimal,
                     score_isolated,
@@ -54,6 +57,7 @@ export function createCloseHandler() {
             });
             return buildCloseDropResponse(finalOutcome, {
                 criteriaChecks: criteriaCheckParts,
+                constraintsChecks: constraintsCheckParts,
                 score_precise,
                 score_minimal,
                 score_isolated,
@@ -73,9 +77,10 @@ export function createCloseHandler() {
                 inputEcho: [
                     `Petition: ${petition}`,
                     `Criteria checks (${criteriaCheckParts.length}): ${criteriaCheckParts.join("; ")}`,
+                    `Constraints checks (${constraintsCheckParts.length}): ${constraintsCheckParts.join("; ")}`,
                     `Scores: precise=${score_precise} minimal=${score_minimal} isolated=${score_isolated} idiomatic=${score_idiomatic} cohesive=${score_cohesive}`,
                     ...(oath ? [`Oath: ${oath}`] : []),
-                    `CWD: ${workingDir}`,
+                    `Path: ${workingDir}`,
                 ],
             });
         }

package/build/handlers/drive.js

@@ -35,7 +35,7 @@ export function createDriveHandler() {
                     `Directive: ${directive}`,
                     ...(context ? [`Context: ${context}`] : []),
                     ...(name ? [`${preset.identity}: ${name}`] : []),
-                    `CWD: ${workingDir}`,
+                    `Path: ${workingDir}`,
                 ],
             });
         }

package/build/handlers/help.js

@@ -1,13 +1,12 @@
 import { buildHelpResponse } from "../workflow/response-builders.js";
 export function createHelpHandler(preset) {
-    return async ({ question }) => {
+    return async ({}) => {
         const helpContent = [
             "# 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.",
             "",
             preset.usageGuide,
@@ -15,12 +14,9 @@ export function createHelpHandler(preset) {
             "## 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 buildHelpResponse({
             tool: preset.tools.help.name,
-            question,
             text: helpContent,
         });
     };

package/build/handlers/start.js

@@ -49,7 +49,7 @@ export function createStartHandler() {
                     ...(context ? [`Context: ${context}`] : []),
                     ...(constraints ? [`Constraints: ${constraints}`] : []),
                     ...(name ? [`${preset.identity}: ${name}`] : []),
-                    `CWD: ${workingDir}`,
+                    `Path: ${workingDir}`,
                 ],
             });
         }

package/build/index.js

@@ -5,7 +5,7 @@ import { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/
 import { createMcpExpressApp } from "@modelcontextprotocol/sdk/server/express.js";
 import { readFileSync } from "node:fs";
 import { resolveOath } from "./workflow/contract.js";
-import { askToolSchema, startToolSchema, driveToolSchema, closeToolSchema, helpToolSchema, } from "./types/tool-schemas.js";
+import { askToolSchema, startToolSchema, driveToolSchema, closeToolSchema, helpToolSchema, } from "./types/tooling.js";
 import { listTermPresets, resolveTermPreset, getAvailableNamesForPreset } from "./config/term-presets.js";
 import { renderPreset } from "./utils/text-utils.js";
 import { applyArgumentDescriptions } from "./utils/schema-utils.js";

package/build/types/{tool-schemas.js → tooling.js}

@@ -24,6 +24,7 @@ export const askToolSchema = z.object({
 export const closeToolSchema = z.object({
     petition: z.enum(["CLAIM", "FORFEIT"]),
     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(5),
     score_minimal: z.number().min(0).max(5),
     score_isolated: z.number().min(0).max(5),
@@ -32,6 +33,4 @@ export const closeToolSchema = z.object({
     oath: z.string().optional(),
     cwd: z.string().optional(),
 });
-export const helpToolSchema = z.object({
-    question: z.string(),
-});
+export const helpToolSchema = z.object({});

package/build/utils/git-diff.js

@@ -183,8 +183,8 @@ export async function getIncrementalDiff(cwd) {
     if (sections.length === 0)
         return "No changes in last round.";
     const filePreviews = [];
-    const MAX_TOTAL_CHARS = 4000;
-    const MAX_LINES_PER_FILE = 40;
+    const MAX_TOTAL_CHARS = 15000;
+    const MAX_LINES_PER_FILE = 50;
     let omittedFiles = 0;
     for (let i = 0; i < sections.length; i += 1) {
         const section = sections[i];

package/build/utils/text-utils.js

@@ -1,3 +1,4 @@
+const BASE_CONSTRAINTS_SOURCE = ".keiyaku/base-constraints.md";
 function isMarkdownHeaderLine(line) {
     return /^\s*#{2,}\s+/.test(line);
 }
@@ -97,17 +98,14 @@ export function parseMarkdownHeaders(text) {
     }
     return sections.filter((section) => section.length > 0);
 }
-export function renderKeiyaku(title, goal, context, baseConstraints, taskConstraints, baseCriteria, taskCriteria) {
+export function renderKeiyaku(title, goal, context, baseConstraints, taskConstraints, taskCriteria) {
     let content = `# ${title}\n\n## Context\n${context}\n\n## Goal\n${goal}`;
     content += "\n\n## Constraints";
     if (baseConstraints.length > 0) {
-        content += `\n\n### Base Constraints\n${renderMarkdownSections(baseConstraints)}`;
+        content += `\n\n### Project Constraints\nLoaded from: \`${BASE_CONSTRAINTS_SOURCE}\`\n\n${renderMarkdownSections(baseConstraints)}`;
     }
     content += `\n\n### Task Constraints\n${renderMarkdownSections(taskConstraints)}`;
     content += "\n\n## Acceptance Criteria";
-    if (baseCriteria.length > 0) {
-        content += `\n\n### Base Criteria\n${renderMarkdownSections(baseCriteria)}`;
-    }
     content += `\n\n### Task Criteria\n${renderMarkdownSections(taskCriteria)}`;
     return content;
 }

package/build/workflow/ask.js

@@ -1,8 +1,12 @@
+import * as fs from "fs/promises";
+import * as path from "path";
 import { selectSubagent } from "../agents/selector.js";
 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 { parseMarkdownHeaders, renderMarkdownSections } from "../utils/text-utils.js";
+const BASE_CONSTRAINTS_FILE = path.join(".keiyaku", "base-constraints.md");
 function requireText(name, value) {
     const normalized = value.trim();
     if (!normalized) {
@@ -14,7 +18,20 @@ export async function askServant(input) {
     const { cwd, signal, name } = input;
     const request = requireText("request", input.request);
     const context = requireText("context", input.context);
-    const prompt = buildAskPrompt(request, context);
+    let referenceConstraints;
+    try {
+        const baseConstraintsRaw = await fs.readFile(path.join(cwd, BASE_CONSTRAINTS_FILE), "utf-8");
+        const baseConstraints = parseMarkdownHeaders(baseConstraintsRaw);
+        if (baseConstraints.length > 0) {
+            referenceConstraints = renderMarkdownSections(baseConstraints);
+        }
+    }
+    catch (error) {
+        if (error?.code !== "ENOENT") {
+            throw error;
+        }
+    }
+    const prompt = buildAskPrompt(request, context, referenceConstraints);
     // TODO: enforce read-only access and persist summary to .keiyaku/notes/.
     const summary = await runSubagent(selectSubagent(name), prompt, cwd, 0, signal);
     let branch;

package/build/workflow/contract.js

@@ -26,7 +26,7 @@ export async function assertCleanWorkingTree(cwd) {
             return `  ${status} ${f.path}`;
         })
             .join("\n");
-        throw new FlowError("DIRTY_WORKTREE", `working tree has uncommitted changes:\n${list}\n\nplease commit or stash them before proceeding.`);
+        throw new FlowError("DIRTY_WORKTREE", `Uncommitted changes detected in working tree:\n${list}\n\nPlease commit or stash them before proceeding to ensure a stable state.`);
     }
 }
 export async function buildNoActiveKeiyakuGuidance(cwd, toolName) {
@@ -34,18 +34,16 @@ export async function buildNoActiveKeiyakuGuidance(cwd, toolName) {
     const localKeiyakuBranches = await git.listLocalKeiyakuBranches(cwd).catch(() => []);
     const preset = resolveTermPreset();
     const startCmd = preset.tools.start.name;
-    const currentCmd = preset.tools[toolName].name;
     const parts = [
-        `no active keiyaku branch in cwd (current branch: ${currentBranch})`,
-        `if this task is not using keiyaku workflow, skip ${currentCmd}`,
+        `Current branch '${currentBranch}' is not an active Keiyaku branch.`,
     ];
     if (localKeiyakuBranches.length > 0) {
         const listedBranches = localKeiyakuBranches.slice(0, 3).join(", ");
         const branchList = `${listedBranches}${localKeiyakuBranches.length > 3 ? ", ..." : ""}`;
-        parts.push(`switch to an active branch (${branchList}) or run ${startCmd} to create a new one`);
+        parts.push(`Use \`git switch\` to an active branch (${branchList}) or run \`${startCmd}\` to start a new mission.`);
     }
     else {
-        parts.push(`no local keiyaku/* branches found; run ${startCmd} to begin a new mission`);
+        parts.push(`No local keiyaku/* branches found. Run \`${startCmd}\` to begin.`);
     }
-    return parts.join(". ");
+    return parts.join(" ");
 }

package/build/workflow/drive.js

@@ -14,9 +14,14 @@ function requireText(name, value) {
     }
     return normalized;
 }
+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;
+}
 function readGoalFromKeiyaku(content) {
-    const goalMatch = content.match(/(?:^|\n)## Goal\s*\n([\s\S]*?)(?=\n##\s|$)/);
-    const goal = goalMatch?.[1]?.trim();
+    const goal = readKeiyakuSection(content, "Goal");
     if (!goal) {
         throw new FlowError("EMPTY_PARAM", "parameter 'goal' cannot be empty");
     }
@@ -42,6 +47,12 @@ export async function driveServant(input) {
     const traceState = computeTraceState(traceContent);
     const title = keiyakuBranch.slice("keiyaku/".length);
     const goal = readGoalFromKeiyaku(keiyakuContent);
+    const keiyakuSections = {
+        goal,
+        context: readKeiyakuSection(keiyakuContent, "Context"),
+        constraints: readKeiyakuSection(keiyakuContent, "Constraints"),
+        criteria: readKeiyakuSection(keiyakuContent, "Acceptance Criteria"),
+    };
     const normalizedDirective = requireText("directive", directive);
     try {
         const plan = buildIteratePlan(title, traceState, traceContent, goal, normalizedDirective, context);
@@ -68,6 +79,7 @@ export async function driveServant(input) {
             diff,
             summary,
             roundSummary,
+            keiyakuSections,
             branch: keiyakuBranch,
             baseBranch,
         };

package/build/workflow/present.js

@@ -89,8 +89,16 @@ async function resolveVerdictConfig(cwd) {
 function buildMergeMessage(title, keiyakuContent, reportContent) {
     return `keiyaku(${title}): done\n\n---\n${keiyakuContent}\n---\n${reportContent}\n---\n`;
 }
+function requireChecks(name, values) {
+    if (values.length === 0) {
+        throw new FlowError("EMPTY_PARAM", `parameter '${name}' cannot be empty`);
+    }
+    return values;
+}
 export async function presentWork(input) {
     const { cwd } = input;
+    requireChecks("criteriaChecks", input.criteriaChecks);
+    requireChecks("constraintsChecks", input.constraintsChecks);
     const isRepo = await git.isGitRepo(cwd);
     if (!isRepo) {
         throw new FlowError("NOT_GIT_REPO", `${cwd} is not a git repository`);

package/build/workflow/prompts.js

@@ -88,7 +88,10 @@ Self-critique.
 
 No git commands. Do not edit KEIYAKU_TRACE.md.`;
 }
-export function buildAskPrompt(request, context) {
+export function buildAskPrompt(request, context, referenceConstraints) {
+    const referenceBlock = referenceConstraints
+        ? `\nReference Constraints (project-level; use only if relevant to this ask):\n${referenceConstraints}\n`
+        : "";
     return `Ask mode. Stateless. No git commands.
 
 Request:
@@ -96,6 +99,7 @@ ${request}
 
 Context:
 ${context}
+${referenceBlock}
 
 Provide a clear final response.`;
 }

package/build/workflow/response-builders.js

@@ -26,11 +26,11 @@ function formatList(label, items, opts) {
     return [...head, ...shown, ...tail];
 }
 function buildSection(title, content) {
-    const lines = Array.isArray(content) ? content : [content];
-    const validLines = lines.filter((l) => l.trim().length > 0);
-    if (validLines.length === 0)
-        return "";
-    return `[${title}]\n${validLines.join("\n")}`;
+    const body = Array.isArray(content) ? content.join("\n") : content;
+    const normalized = body.trim();
+    if (!normalized)
+        return null;
+    return { title, body };
 }
 function supportsHeaderColor() {
     if (process.env.NO_COLOR !== undefined)
@@ -65,40 +65,38 @@ function formatHeader(title) {
     const divider = "─".repeat(Math.max(0, headerWidth - titleLabel.length - 1));
     return divider.length > 0 ? `\n${coloredTitle} ${divider}` : `\n${coloredTitle}`;
 }
-function assembleResponse(status, summary, sections, nextHints, infoLines = []) {
+function assembleResponse(status, summary, sections, infoLines = [], nextHints = []) {
     // 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 normalSections = [];
+    const diffSections = [];
+    for (const section of sections) {
+        if (section.title.trim().toLowerCase() === "diff") {
+            diffSections.push(section);
         }
-        const hashMatch = section.match(/^## (.*?)\n([\s\S]*)/);
-        if (hashMatch) {
-            return `${formatHeader(hashMatch[1])}\n${hashMatch[2]}`;
+        else {
+            normalSections.push(section);
         }
-        return section;
-    });
-    // Info Block
-    const infoBlock = infoLines.length > 0
-        ? `${formatHeader("Info")}\n${infoLines.join("\n")}`
-        : "";
-    // Next Steps Block
-    const nextBlock = nextHints.length > 0
-        ? `${formatHeader("Hints")}\n${nextHints.map(h => `› ${h}`).join("\n")}`
-        : "";
+    }
+    const fullSections = [...normalSections];
+    if (infoLines.length > 0) {
+        fullSections.push({ title: "Info", body: infoLines.join("\n") });
+    }
+    fullSections.push(...diffSections);
+    if (nextHints.length > 0) {
+        fullSections.push({ title: "Hints", body: nextHints.map((hint) => `› ${hint}`).join("\n") });
+    }
+    const renderedSections = fullSections.map((section) => `${formatHeader(section.title)}\n${section.body}`);
     return [
         statusBlock,
-        ...processedSections,
-        infoBlock,
-        nextBlock
-    ].filter(s => s.trim() !== "").join("\n");
+        ...renderedSections,
+    ]
+        .filter((chunk) => chunk.trim() !== "")
+        .join("\n");
 }
 function buildSuccessStructuredContent(tool, data) {
     return {
@@ -146,18 +144,17 @@ export function buildKeiyakuSuccessResponse(result, input) {
         ...formatList("Criteria", input.criteria, { maxItems: 10, maxItemChars: 200 }),
         ...formatMaybe("Context", input.context, 600),
         ...formatMaybe("Constraints", input.constraints, 600),
-        ...formatMaybe("Identity", input.name, 120),
-        ...formatMaybe("CWD", input.cwd, 300),
     ];
     const nextHints = renderHints(resolveTermPreset().nextHints.start);
-    const inputSection = buildSection("Input", inputEcho);
+    const keiyakuSection = buildSection("KEIYAKU", result.keiyaku.trim());
     const diffSection = buildSection("Diff", result.diff);
     const infoLines = [
-        ...formatMaybe("CWD", input.cwd, 300),
+        ...formatMaybe("Identity", input.name, 120),
+        ...formatMaybe("Path", input.cwd, 300),
         ...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}').\n\n${renderRoundSummary(result.roundSummary, TOOL_DEFAULT_POLICY)}`, [inputSection, diffSection], nextHints, infoLines);
+    const text = assembleResponse(`Started (Round ${result.round})`, `Created branch '${result.branch}' (base: '${result.baseBranch}').\n\n${renderRoundSummary(result.roundSummary, TOOL_DEFAULT_POLICY)}`, [keiyakuSection, diffSection].filter((section) => section !== null), infoLines, nextHints);
     return {
         content: [{ type: "text", text }],
         structuredContent: buildSuccessStructuredContent(getStartToolName(), {
@@ -173,18 +170,21 @@ export function buildDriveResponse(result, input) {
     const inputEcho = [
         `Directive: ${truncateForDisplay(input.directive, 600)}`,
         ...formatMaybe("Context", input.context, 600),
-        ...formatMaybe("Identity", input.name, 120),
-        ...formatMaybe("CWD", input.cwd, 300),
     ];
     const nextHints = renderHints(resolveTermPreset().nextHints.drive);
-    const inputSection = buildSection("Input", inputEcho);
+    const goalSection = buildSection("Goal", truncateForDisplay(result.keiyakuSections?.goal ?? "", 800));
+    const contextSection = buildSection("Context", truncateForDisplay(result.keiyakuSections?.context ?? "", 1200));
+    const constraintsSection = buildSection("Constraints", truncateForDisplay(result.keiyakuSections?.constraints ?? "", 1200));
+    const criteriaSection = buildSection("Criteria", truncateForDisplay(result.keiyakuSections?.criteria ?? "", 1200));
+    const directiveSection = buildSection("Directive", inputEcho);
     const diffSection = buildSection("Diff", result.diff);
     const infoLines = [
-        ...formatMaybe("CWD", input.cwd, 300),
+        ...formatMaybe("Identity", input.name, 120),
+        ...formatMaybe("Path", input.cwd, 300),
         ...formatMaybe("Current Branch", result.branch, 200),
         ...formatMaybe("Base Branch", result.baseBranch, 200),
     ];
-    const text = assembleResponse(`Driven (Round ${result.round})`, `Updated branch '${result.branch}'.\n\n${renderRoundSummary(result.roundSummary, TOOL_DEFAULT_POLICY)}`, [inputSection, diffSection], nextHints, infoLines);
+    const text = assembleResponse(`Driven (Round ${result.round})`, `Updated branch '${result.branch}'.\n\n${renderRoundSummary(result.roundSummary, TOOL_DEFAULT_POLICY)}`, [goalSection, contextSection, constraintsSection, criteriaSection, directiveSection, diffSection].filter((section) => section !== null), infoLines, nextHints);
     return {
         content: [{ type: "text", text }],
         structuredContent: buildSuccessStructuredContent(getDriveToolName(), {
@@ -200,16 +200,15 @@ export function buildAskResponse(result, input) {
         `Request: ${truncateForDisplay(input.request, 600)}`,
         `Context: ${truncateForDisplay(input.context, 800)}`,
         ...formatMaybe("Identity", input.name, 120),
-        ...formatMaybe("CWD", input.cwd, 300),
     ];
     const nextHints = renderHints(resolveTermPreset().nextHints.ask);
     const inputSection = buildSection("Input", inputEcho);
     const infoLines = [
-        ...formatMaybe("CWD", input.cwd, 300),
+        ...formatMaybe("Path", input.cwd, 300),
         ...formatMaybe("Current Branch", result.branch, 200),
         ...formatMaybe("Diff Stats", result.diffStats, 1000),
     ];
-    const text = assembleResponse("Answered", result.summary, [inputSection], nextHints, infoLines);
+    const text = assembleResponse("Answered", result.summary, [inputSection].filter((section) => section !== null), infoLines, nextHints);
     return {
         content: [{ type: "text", text }],
         structuredContent: buildSuccessStructuredContent(getAskToolName(), {
@@ -226,19 +225,19 @@ export function buildCloseDoneResponse(result, input) {
     const inputEcho = [
         `Petition: CLAIM`,
         ...formatList("Criteria Checks", input.criteriaChecks, { maxItems: 10, maxItemChars: 220 }),
+        ...formatList("Constraints Checks", input.constraintsChecks ?? [], { maxItems: 10, maxItemChars: 220 }),
         `Scores: precise=${input.score_precise}/5 minimal=${input.score_minimal}/5 isolated=${input.score_isolated}/5 idiomatic=${input.score_idiomatic}/5 cohesive=${input.score_cohesive}/5`,
         ...formatMaybe("Oath", input.oath, 220),
-        ...formatMaybe("CWD", input.cwd, 300),
     ];
     const nextHints = renderHints(resolveTermPreset().nextHints.closeClaim);
     const inputSection = buildSection("Input", inputEcho);
     const diffSection = result.diff ? buildSection("Diff", result.diff) : "";
     const infoLines = [
-        ...formatMaybe("CWD", input.cwd, 300),
+        ...formatMaybe("Path", input.cwd, 300),
         ...formatMaybe("Current Branch", result.branch, 200),
         ...formatMaybe("Base Branch", result.baseBranch, 200),
     ];
-    const text = assembleResponse("Keiyaku Fulfilled (CLAIM)", `Merged '${result.branch}' into '${result.baseBranch}'. Deleted feature branch.`, [inputSection, diffSection], nextHints, infoLines);
+    const text = assembleResponse("Keiyaku Fulfilled (CLAIM)", `Merged '${result.branch}' into '${result.baseBranch}'. Deleted feature branch.`, [inputSection, typeof diffSection === "string" ? null : diffSection].filter((section) => section !== null), infoLines, nextHints);
     return {
         content: [{ type: "text", text }],
         structuredContent: buildSuccessStructuredContent(closeToolName, {
@@ -255,17 +254,17 @@ export function buildCloseDropResponse(result, input) {
     const inputEcho = [
         `Petition: FORFEIT`,
         ...formatList("Reasons/Checks", input.criteriaChecks, { maxItems: 10, maxItemChars: 220 }),
+        ...formatList("Constraints Checks", input.constraintsChecks ?? [], { maxItems: 10, maxItemChars: 220 }),
         `Scores: precise=${input.score_precise}/5 minimal=${input.score_minimal}/5 isolated=${input.score_isolated}/5 idiomatic=${input.score_idiomatic}/5 cohesive=${input.score_cohesive}/5`,
-        ...formatMaybe("CWD", input.cwd, 300),
     ];
     const nextHints = renderHints(resolveTermPreset().nextHints.closeDrop);
     const inputSection = buildSection("Input", inputEcho);
     const infoLines = [
-        ...formatMaybe("CWD", input.cwd, 300),
+        ...formatMaybe("Path", input.cwd, 300),
         ...formatMaybe("Current Branch", result.branch, 200),
         ...formatMaybe("Base Branch", result.baseBranch, 200),
     ];
-    const text = assembleResponse("Keiyaku Forfeited (FORFEIT)", `Deleted '${result.branch}'. Switched back to '${result.baseBranch}'.`, [inputSection], nextHints, infoLines);
+    const text = assembleResponse("Keiyaku Forfeited (FORFEIT)", `Deleted '${result.branch}'. Switched back to '${result.baseBranch}'.`, [inputSection].filter((section) => section !== null), infoLines, nextHints);
     return {
         content: [{ type: "text", text }],
         structuredContent: buildSuccessStructuredContent(closeToolName, {
@@ -279,7 +278,8 @@ 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(colorizeErrorStatus("!! FAILED !!"), input.message, [buildSection("Input Context", inputEcho)], [input.hint]);
+    const contextSection = buildSection("Context", inputEcho);
+    const text = assembleResponse(colorizeErrorStatus("!! FAILED !!"), input.message, [contextSection].filter((section) => section !== null), [], [input.hint]);
     const response = {
         content: [{ type: "text", text }],
         structuredContent: {
@@ -300,8 +300,6 @@ export function buildToolErrorResponse(input) {
 export function buildHelpResponse(input) {
     return {
         content: [{ type: "text", text: input.text }],
-        structuredContent: buildSuccessStructuredContent(input.tool, {
-            question: input.question,
-        }),
+        structuredContent: buildSuccessStructuredContent(input.tool, {}),
     };
 }

package/build/workflow/summon.js

@@ -7,10 +7,10 @@ import * as git from "../utils/git.js";
 import { computeTraceState, readTraceContent } from "../utils/trace.js";
 import { buildStartPrompt } from "./prompts.js";
 import { parseMarkdownHeaders, renderKeiyaku } from "../utils/text-utils.js";
+import { resolveTermPreset } from "../config/term-presets.js";
 import { renderRoundSummary, TOOL_DEFAULT_POLICY } from "./round-summary.js";
 import { assertCleanWorkingTree } from "./contract.js";
 import { runAndRecordRound } from "./round.js";
-const BASE_CRITERIA_FILE = path.join(".keiyaku", "base-criteria.md");
 const BASE_CONSTRAINTS_FILE = path.join(".keiyaku", "base-constraints.md");
 const ACTIVE_KEIYAKU_PREVIEW_MAX_CHARS = 8000;
 function requireText(name, value) {
@@ -26,11 +26,14 @@ function truncateForMessage(text, maxChars) {
     return `${text.slice(0, maxChars)}\n...[truncated ${text.length - maxChars} chars]...`;
 }
 async function buildActiveKeiyakuStartMessage(cwd, branch) {
+    const preset = resolveTermPreset();
+    const { drive, close } = preset.tools;
     const lines = [
-        `active keiyaku already exists (${branch})`,
-        "This task is still active. Decide whether to continue or forfeit it.",
-        "Continue: run drive on the current keiyaku branch.",
-        "Forfeit: run close with petition=FORFEIT to drop the branch.",
+        `An active Keiyaku is already in progress on branch '${branch}'.`,
+        "This task is still pulsing. Decide its fate before starting anew:",
+        `1. Continue: Issue a \`${drive.name}\` to advance the work.`,
+        `2. Fulfill: Use \`${close.name}\` (\`CLAIM\`) to merge your progress.`,
+        `3. Forfeit: Use \`${close.name}\` (\`FORFEIT\`) to discard this effort.`,
     ];
     try {
         const keiyakuPath = path.join(cwd, KEIYAKU_FILE);
@@ -126,16 +129,6 @@ export async function summonServant(input) {
         const switchedLog = `Switched to branch: ${keiyakuBranch} (base: ${baseBranch})`;
         console.error(switchedLog);
         appendDebugLog(switchedLog, { cwd, section: "script" });
-        let baseCriteria = [];
-        try {
-            const baseCriteriaRaw = await fs.readFile(path.join(cwd, BASE_CRITERIA_FILE), "utf-8");
-            baseCriteria = parseMarkdownHeaders(baseCriteriaRaw);
-        }
-        catch (error) {
-            if (error?.code !== "ENOENT") {
-                throw error;
-            }
-        }
         let baseConstraints = [];
         try {
             const baseConstraintsRaw = await fs.readFile(path.join(cwd, BASE_CONSTRAINTS_FILE), "utf-8");
@@ -146,7 +139,7 @@ export async function summonServant(input) {
                 throw error;
             }
         }
-        const keiyakuContent = renderKeiyaku(finalTitle, finalGoal, finalContext, baseConstraints, normalizedTaskConstraints, baseCriteria, normalizedTaskCriteria);
+        const keiyakuContent = renderKeiyaku(finalTitle, finalGoal, finalContext, baseConstraints, normalizedTaskConstraints, normalizedTaskCriteria);
         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]);
@@ -165,6 +158,7 @@ export async function summonServant(input) {
             round: 1,
             trace,
             diff,
+            keiyaku: keiyakuContent,
             summary,
             roundSummary,
             branch: keiyakuBranch,

package/package.json

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