@astrosheep/keiyaku 0.1.13 → 0.1.15

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/constants.js

@@ -1,3 +1,5 @@
 export const KEIYAKU_FILE = "KEIYAKU.md";
+export const KEIYAKU_DRAFT_FILE = "KEIYAKU.draft.md";
+export const KEIYAKU_DRAFT_NEW_FILE = "KEIYAKU.draft.new.md";
 export const TRACE_FILE = "KEIYAKU_TRACE.md";
 export const ROUND_SUBAGENTS = ["agent-a", "agent-b", "agent-c"];

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":
@@ -60,6 +62,14 @@ function hintForFlowCode(code, message) {
             return "Title cannot be converted to a valid branch token for `keiyaku/<title>`.";
         case "UNKNOWN_SUBAGENT":
             return unknownSubagentHint();
+        case "FROM_FILE_NOT_FOUND":
+            return "The path in `from_file` does not exist. Use an existing file path (absolute or relative to `cwd`).";
+        case "INVALID_KEIYAKU_DRAFT":
+            return "Invalid draft/input. Provide `title`, `goal`, `context`, and non-empty `criteria` (or include them in `from_file` with proper section headers).";
+        case "KEIYAKU_FILE_EXISTS":
+            return `\`${preset.tools.start.name}\` requires a clean slate. Remove existing \`KEIYAKU.md\` before starting.`;
+        case "DRAFT_FILE_EXISTS":
+            return `Existing \`KEIYAKU.draft.md\` detected. Use it via \`from_file\` or delete it before starting.`;
     }
 }
 const MESSAGE_HINT_PATTERNS = [
@@ -91,6 +101,10 @@ const MESSAGE_HINT_PATTERNS = [
     { code: "ROUND_SUBAGENT_FAILED", patterns: ["failed during subagent execution"] },
     { code: "INVALID_BRANCH_TITLE", patterns: ["cannot be converted to a valid branch name"] },
     { code: "UNKNOWN_SUBAGENT", patterns: ["Unknown subagent"] },
+    { code: "FROM_FILE_NOT_FOUND", patterns: ["from_file path does not exist"] },
+    { code: "INVALID_KEIYAKU_DRAFT", patterns: ["invalid keiyaku draft"] },
+    { code: "KEIYAKU_FILE_EXISTS", patterns: ["pre-flight failed: KEIYAKU.md already exists"] },
+    { code: "DRAFT_FILE_EXISTS", patterns: ["pre-flight failed: KEIYAKU.draft.md exists but from_file does not target it"] },
 ];
 function inferFlowCodeFromMessage(message) {
     for (const entry of MESSAGE_HINT_PATTERNS) {

package/build/config/term-presets.js

@@ -7,19 +7,19 @@ export const DEFAULT_AVAILABLE_NAMES = [
 export const DEFAULT_SUBAGENT_NAME = 'A-tier';
 const DEFAULT_VERDICT_CONFIG = {
     thresholds: {
-        precise: 5,
-        minimal: 4,
-        isolated: 4,
-        idiomatic: 3,
-        cohesive: 4,
+        precise: 10,
+        minimal: 8,
+        isolated: 8,
+        idiomatic: 6,
+        cohesive: 8,
     },
-    minTotalScore: 20,
+    minTotalScore: 40,
 };
 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.',
@@ -57,12 +57,13 @@ export const DEFAULT_PRESET = {
             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: ${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.',
-                directive: 'Optional First Step. Use to leash the servant to a specific starting point (e.g., "Analyze the code first"). If omitted, the Servant will attempt the Goal directly.',
-                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.',
+                from_file: "Optional markdown draft path. Loads `# title` + required sections from file (relative to cwd unless absolute).",
+                title: 'Required unless provided via `from_file`. A concise codename for this hunt.',
+                goal: 'Required unless provided via `from_file`. The Kill Condition for this mission.',
+                directive: 'Optional First Step. Overrides `## Directive` from `from_file` when both are provided.',
+                context: 'Required unless provided via `from_file`. Mission intel: behavior gap, key files, logs, and critical background.',
+                constraints: 'Optional. Non-negotiable rules as a list of strings. If omitted, the draft value (if any) is used.',
+                criteria: 'Required unless provided via `from_file`. Verifiable checks proving completion.',
                 name: 'Optional ${identity} profile to execute this mission. Available: ${available_names}.',
                 cwd: "Optional repository path. Defaults to the server's current working directory.",
             },
@@ -84,7 +85,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,11 +103,12 @@ 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.',
-                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.',
+                constraintsChecks: 'REQUIRED. For CLAIM: evidence that each constraint stayed compliant. For FORFEIT: list known violations or unresolved risk.',
+                score_precise: 'REQUIRED (0-10). Architectural placement. 10 = exact layer, exact boundary, zero misplacement.',
+                score_minimal: 'REQUIRED (0-10). Economy of change. 10 = no avoidable lines, no speculative edits, no hidden bloat.',
+                score_isolated: 'REQUIRED (0-10). Surgical containment. 10 = zero unrelated files, zero opportunistic cleanup, zero collateral.',
+                score_idiomatic: 'REQUIRED (0-10). Native fluency. 10 = naming, structure, style indistinguishable from the codebase.',
+                score_cohesive: 'REQUIRED (0-10). Single responsibility. 10 = each unit does one thing, boundaries intact.',
                 oath: 'Required for CLAIM. Your binding word. The Contract holds you to it.\nVerbatim: ${oath_text}',
                 cwd: "Optional repository path. Defaults to the server's current working directory.",
             },
@@ -115,9 +117,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: {},
         },
     },
 };
@@ -159,12 +159,13 @@ export const POCKET_PRESET = {
             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: ${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.',
-                directive: 'Optional Turn 1 strategy. Use to focus on the opening move.',
-                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.',
+                from_file: 'Optional battle plan markdown path with title + sections.',
+                title: 'Required unless provided via `from_file`. Battle card title for this encounter.',
+                goal: 'Required unless provided via `from_file`. Victory condition for this battle.',
+                directive: 'Optional Turn 1 strategy (overrides draft directive).',
+                context: 'Required unless provided via `from_file`. Battle background and repro clues.',
+                constraints: 'Optional battle rules as a list of strings. Uses draft constraints if omitted.',
+                criteria: 'Required unless provided via `from_file`. Concrete checks proving victory.',
                 name: 'Optional ${identity} to send into battle. Available: ${available_names}.',
                 cwd: 'Optional battlefield path (repository root). Defaults to current arena.',
             },
@@ -186,7 +187,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,11 +199,12 @@ 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.',
-                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.',
+                constraintsChecks: 'REQUIRED. Rule-by-rule proof that constraints were respected, or known breaks when forfeiting.',
+                score_precise: 'REQUIRED score (0-10). 10 means a Critical Hit: exact layer, exact target, zero meaningful misplacement.',
+                score_minimal: 'REQUIRED score (0-10). 10 means Max Efficiency: no wasted PP, no extra motion.',
+                score_isolated: 'REQUIRED score (0-10). 10 means 1v1 Focus: zero side-quests, zero unrelated damage.',
+                score_idiomatic: "REQUIRED score (0-10). 10 means STAB (Same Type Attack Bonus): perfectly matches the codebase style.",
+                score_cohesive: 'REQUIRED score (0-10). 10 means Team Synergy: action serves one purpose with clean boundaries.',
                 oath: "Trainer's Honor Code. Required for CLAIM. Verbatim: ${oath_text}",
                 cwd: 'Optional battlefield path (repository root). Defaults to current arena.',
             },
@@ -211,9 +213,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: {},
         },
     },
 };
@@ -255,12 +255,13 @@ export const MISCHIEF_PRESET = {
             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: ${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.',
-                directive: 'Optional first-order command. Point them in the right direction.',
-                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.',
+                from_file: 'Optional scheme markdown path with title + sectioned objectives.',
+                title: 'Required unless provided via `from_file`. Operation codename.',
+                goal: 'Required unless provided via `from_file`. Conquest objective and end-state.',
+                directive: 'Optional first-order command (overrides draft directive).',
+                context: 'Required unless provided via `from_file`. Briefing dossier and technical clues.',
+                constraints: 'Optional decrees as a list of strings. Uses draft constraints when omitted.',
+                criteria: 'Required unless provided via `from_file`. Verifiable triumph conditions.',
                 name: 'Optional ${identity} to command this operation. Available: ${available_names}.',
                 cwd: 'Optional lair path (repository root). Defaults to current command chamber.',
             },
@@ -282,7 +283,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,11 +295,12 @@ 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.',
-                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.',
+                constraintsChecks: 'REQUIRED. Constraint-by-constraint compliance proof for CLAIM, or confession of violations for FORFEIT.',
+                score_precise: 'REQUIRED (0-10). Architectural placement. 10 = exact layer, exact boundary, zero misplacement.',
+                score_minimal: 'REQUIRED (0-10). Economy of change. 10 = no avoidable lines, no speculative edits, no hidden bloat.',
+                score_isolated: 'REQUIRED (0-10). Surgical containment. 10 = zero unrelated files, zero opportunistic cleanup, zero collateral.',
+                score_idiomatic: 'REQUIRED (0-10). Native fluency. 10 = naming, structure, style indistinguishable from the codebase.',
+                score_cohesive: 'REQUIRED (0-10). Single responsibility. 10 = each unit does one thing, boundaries intact.',
                 oath: "Mastermind's Vow. Required for CLAIM. Verbatim: ${oath_text}",
                 cwd: 'Optional lair path (repository root). Defaults to current command chamber.',
             },
@@ -307,9 +309,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,
@@ -29,12 +31,13 @@ export function createCloseHandler() {
                     throw new Error("Unexpected CLAIM outcome shape");
                 }
                 const finalOutcome = outcome;
-                appendDebugLog(`tool close CLAIM success branch=${finalOutcome.branch} base=${finalOutcome.baseBranch}`, {
+                appendDebugLog(`tool close CLAIM success branch=${finalOutcome.currentBranch} base=${finalOutcome.baseBranch}`, {
                     cwd: workingDir,
                     section: "script",
                 });
                 return buildCloseDoneResponse(finalOutcome, {
                     criteriaChecks: criteriaCheckParts,
+                    constraintsChecks: constraintsCheckParts,
                     score_precise,
                     score_minimal,
                     score_isolated,
@@ -48,12 +51,13 @@ export function createCloseHandler() {
                 throw new Error("Unexpected FORFEIT outcome shape");
             }
             const finalOutcome = outcome;
-            appendDebugLog(`tool close FORFEIT success branch=${finalOutcome.branch} base=${finalOutcome.baseBranch}`, {
+            appendDebugLog(`tool close FORFEIT success branch=${finalOutcome.currentBranch} base=${finalOutcome.baseBranch}`, {
                 cwd: workingDir,
                 section: "script",
             });
             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

@@ -1,35 +1,48 @@
 import { appendDebugLog } from "../utils/debug-log.js";
-import { summonServant } from "../workflow/summon.js";
+import { startKeiyaku } from "../workflow/start.js";
 import { buildKeiyakuSuccessResponse, } from "../workflow/response-builders.js";
 import { resolveTermPreset } from "../config/term-presets.js";
 import { handleToolError } from "./shared.js";
+function normalizeOptionalArg(value) {
+    if (value === undefined)
+        return undefined;
+    return value.trim().length > 0 ? value : undefined;
+}
 export function createStartHandler() {
-    return async ({ title, goal, directive, context, constraints, criteria, name, cwd }, extra) => {
+    return async ({ from_file, title, goal, directive, context, constraints, criteria, name, cwd }, extra) => {
         const workingDir = cwd || process.cwd();
+        const normalizedFromFile = normalizeOptionalArg(from_file);
         try {
             appendDebugLog(`tool start cwd=${workingDir}`, { cwd: workingDir, section: "script" });
-            const result = await summonServant({
-                cwd: workingDir,
-                title,
-                goal,
-                directive,
-                context,
-                criteria,
-                constraints,
-                name,
-                signal: extra.signal,
-            });
-            appendDebugLog(`tool start success branch=${result.branch} base=${result.baseBranch} round=${result.round}`, {
+            const result = normalizedFromFile
+                ? await startKeiyaku({
+                    cwd: workingDir,
+                    from_file: normalizedFromFile,
+                    title: normalizeOptionalArg(title),
+                    goal: normalizeOptionalArg(goal),
+                    directive: normalizeOptionalArg(directive),
+                    context: normalizeOptionalArg(context),
+                    constraints,
+                    criteria,
+                    name,
+                    signal: extra.signal,
+                })
+                : await startKeiyaku({
+                    cwd: workingDir,
+                    title: title ?? "",
+                    goal: goal ?? "",
+                    directive: normalizeOptionalArg(directive),
+                    context: context ?? "",
+                    constraints,
+                    criteria: criteria ?? [],
+                    name,
+                    signal: extra.signal,
+                });
+            appendDebugLog(`tool start success branch=${result.currentBranch} base=${result.baseBranch} round=${result.round}`, {
                 cwd: workingDir,
                 section: "script",
             });
             return buildKeiyakuSuccessResponse(result, {
-                title,
-                goal,
-                directive,
-                context,
-                constraints,
-                criteria,
                 name,
                 cwd: workingDir,
             });
@@ -42,14 +55,15 @@ export function createStartHandler() {
                 cwd: workingDir,
                 logLabel: "tool start",
                 inputEcho: [
-                    `Title: ${title}`,
-                    `Goal: ${goal}`,
+                    ...(normalizedFromFile ? [`From file: ${normalizedFromFile}`] : []),
+                    ...(title ? [`Title: ${title}`] : []),
+                    ...(goal ? [`Goal: ${goal}`] : []),
                     ...(directive ? [`Directive: ${directive}`] : []),
-                    `Criteria (${criteria.length}): ${criteria.join("; ")}`,
+                    ...(criteria ? [`Criteria (${criteria.length}): ${criteria.join("; ")}`] : []),
                     ...(context ? [`Context: ${context}`] : []),
-                    ...(constraints ? [`Constraints: ${constraints}`] : []),
+                    ...(constraints ? [`Constraints (${constraints.length}): ${constraints.join("; ")}`] : []),
                     ...(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}

@@ -1,11 +1,12 @@
 import { z } from "zod";
 export const startToolSchema = z.object({
-    title: z.string(),
-    goal: z.string(),
+    from_file: z.string().optional(),
+    title: z.string().optional(),
+    goal: z.string().optional(),
     directive: z.string().optional(),
-    context: z.string(),
-    constraints: z.string(),
-    criteria: z.array(z.string().trim().min(1)).min(1),
+    context: z.string().optional(),
+    constraints: z.array(z.string().trim().min(1)).min(1).optional(),
+    criteria: z.array(z.string().trim().min(1)).min(1).optional(),
     name: z.string().optional(),
     cwd: z.string().optional(),
 });
@@ -24,14 +25,13 @@ 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),
-    score_precise: z.number().min(0).max(5),
-    score_minimal: z.number().min(0).max(5),
-    score_isolated: z.number().min(0).max(5),
-    score_idiomatic: z.number().min(0).max(5),
-    score_cohesive: z.number().min(0).max(5),
+    constraintsChecks: z.array(z.string().trim().min(1)).min(1),
+    score_precise: z.number().min(0).max(10),
+    score_minimal: z.number().min(0).max(10),
+    score_isolated: z.number().min(0).max(10),
+    score_idiomatic: z.number().min(0).max(10),
+    score_cohesive: z.number().min(0).max(10),
     oath: z.string().optional(),
     cwd: z.string().optional(),
 });
-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];