@astrosheep/keiyaku 0.1.10 → 0.1.12

package/build/config/term-presets.js

@@ -26,14 +26,14 @@ export const DEFAULT_PRESET = {
             'Review [Diff]: Confirm the scaffold aligns with the stated Architecture.',
             'Next: Issue your first ${drive}. One directive, one focus.',
             'If—and only if—the work already meets every criterion with absolute certainty, you may ${close}.',
-            'Otherwise, do not even think about present yet.',
+            'Otherwise, do not even think about ${close} yet.',
         ],
         drive: [
-            'Step complete. Review [Diff] for exactly what changed.',
-            'Ask: Did this advance the Goal? Or did it drift?',
-            'If criteria remain unmet, continue with ${drive}.',
+            "Review Diffs: Use 'git diff HEAD~1 -- <path>' to inspect specific files.",
+            'Audit: Check against Constraints. Did it drift? Did it break the Law?',
+            'Verify: Do not trust. Independently confirm that Criteria are met.',
+            'If incomplete or non-compliant, continue with ${drive}.',
             'If ALL criteria are genuinely satisfied, you may ${close}.',
-            'If unsure, you are not ready. Keep driving.',
         ],
         ask: [
             'Intel acquired. This was stateless—no contract, no branch.',
@@ -42,12 +42,12 @@ export const DEFAULT_PRESET = {
         closeClaim: [
             'Contract fulfilled. Branch merged.',
             'You are back on base.',
-            'Next assignment: ${start} when ready.',
+            'Next assignment: ${start} or ${ask} when ready.',
         ],
         closeDrop: [
             'Contract forfeited. Branch discarded. Work erased.',
             'No penalty beyond the lost effort. Clean slate.',
-            'Redefine with ${start}, or walk away.',
+            'Redefine with ${start}, scout with ${ask}, or walk away.',
         ],
     },
     availableNames: DEFAULT_AVAILABLE_NAMES,
@@ -55,26 +55,26 @@ export const DEFAULT_PRESET = {
         start: {
             name: 'summon',
             title: 'Sign Keiyaku',
-            description: 'Initialize a Keiyaku (Contract). Bind a Servant to a dedicated workspace (branch).\nYou are the Architect; they are the Instrument. Define the Goal and Scope clearly.\nThe contract isolates their existence until the objective is met.\nCall ONCE to seal the bond.\n\nFlow: summon → [drive x N] → present',
+            description: 'Initialize a Keiyaku (Contract). Bind a Servant to a dedicated workspace (branch).\nYou are the Architect; they are the Instrument. Define the Goal and Scope clearly.\nThe contract isolates their existence until the objective is met.\nCall ONCE to seal the bond.\n\nFlow: ${start} → [${drive} x N] → ${close}',
             args: {
                 title: 'REQUIRED. A concise codename for this hunt.',
                 goal: 'REQUIRED. The Kill Condition. State exactly what success looks like for the servant to achieve.',
-                directive: 'Optional Round 1 Focus. Use to leash the servant to a specific starting point. Skip for simple tasks.',
+                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.',
-                name: 'Optional ${IDENTITY} profile to execute this mission. Available: ${AVAILABLE_NAMES}.',
+                name: 'Optional ${identity} profile to execute this mission. Available: ${available_names}.',
                 cwd: "Optional repository path. Defaults to the server's current working directory.",
             },
         },
         drive: {
             name: 'drive',
             title: 'Iterate',
-            description: "Issue a Directive. Command the Servant to execute the next phase of work.\nWhether scaffolding, implementing, or refining, this is the primary engine of progress.\nMANDATORY: Validate the output (git diff) before proceeding. Drive until the Goal is fully realized.\n\nFlow: summon → [drive x N] → present",
+            description: "Issue a Directive. Command the Servant to execute the next phase of work.\nWhether scaffolding, implementing, or refining, this is the primary engine of progress.\nMANDATORY: Validate the output (git diff) before proceeding. Drive until the Goal is fully realized.\n\nFlow: ${start} → [${drive} x N] → ${close}",
             args: {
                 directive: 'REQUIRED. The Next Order. Precise instructions for the servant. Can be a correction ("fix the leak") or a continuation ("now add the tests").',
                 context: 'Optional. New Intel. New error logs or details discovered after the servant\'s last strike.',
-                name: 'Optional ${IDENTITY} profile to process this turn. Available: ${AVAILABLE_NAMES}.',
+                name: 'Optional ${identity} profile to process this turn. Available: ${available_names}.',
                 cwd: "Optional repository path. Defaults to the server's current working directory.",
             },
         },
@@ -85,33 +85,29 @@ export const DEFAULT_PRESET = {
             args: {
                 request: 'REQUIRED. The task, question, or mission to delegate to the servant.',
                 context: 'REQUIRED. Relevant background or data the servant needs to execute the request.',
-                name: 'Optional ${IDENTITY} profile to perform this task. Available: ${AVAILABLE_NAMES}.',
+                name: 'Optional ${identity} profile to perform this task. Available: ${available_names}.',
                 cwd: "Optional repository path. Defaults to the server's current working directory.",
             },
         },
         close: {
             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}',
+            description: 'Submit **your** creation to the Contract. The Servant has no voice; it only echoes **your** command.\n\n' +
+                'Do not say "The Servant wrote it." **YOU** drove the Servant. **YOU** accepted the diff. **YOU** are the one presenting.\n' +
+                'The Contract judges **YOU**, not the tool.\n\n' +
+                'If there is a bug, **YOU** put it there.\n' +
+                'If it is messy, **YOU** left it there.\n\n' +
+                'Stand by your work. If uncertain, return to ${drive}. Premature claims are not forgiven.\n\n' +
+                'Flow: ${start} → [${drive} x N] → ${close}',
             args: {
-                petition: 'REQUIRED. CLAIM declares fulfillment; FORFEIT concedes failure.\nREQUIRES AN ACTIVE KEIYAKU (started via ${START_TOOL_NAME}).\nIf any score wavers, do not claim—return to ${DRIVE_TOOL_NAME}.',
+                petition: 'REQUIRED. CLAIM declares fulfillment; FORFEIT concedes failure.\nREQUIRES AN ACTIVE KEIYAKU (started via ${start}).\nIf any score wavers, do not claim—return to ${drive}.',
                 criteriaChecks: 'REQUIRED. For CLAIM: evidence that each criterion is met. For FORFEIT: honest account of what remains unfinished.',
                 score_precise: 'REQUIRED (0-5). Architectural placement. 5 = exact layer, exact boundary, zero misplacement.',
                 score_minimal: 'REQUIRED (0-5). Economy of change. 5 = no avoidable lines, no speculative edits, no hidden bloat.',
                 score_isolated: 'REQUIRED (0-5). Surgical containment. 5 = zero unrelated files, zero opportunistic cleanup, zero collateral.',
                 score_idiomatic: 'REQUIRED (0-5). Native fluency. 5 = naming, structure, style indistinguishable from the codebase.',
                 score_cohesive: 'REQUIRED (0-5). Single responsibility. 5 = each unit does one thing, boundaries intact.',
-                oath: 'Required for CLAIM. Your binding word. The Contract holds you to it.\nVerbatim: ${OATH_TEXT}',
+                oath: 'Required for CLAIM. Your binding word. The Contract holds you to it.\nVerbatim: ${oath_text}',
                 cwd: "Optional repository path. Defaults to the server's current working directory.",
             },
         },
@@ -138,9 +134,9 @@ export const POCKET_PRESET = {
             "Next Turn: Use '${drive}' to execute the next tactic, or '${close}' if the Badge is within reach.",
         ],
         drive: [
-            'Turn Complete: The [Diff] section shows the result of the last command.',
-            "Damage Check: Use 'git diff HEAD~1 -- <path>' to verify the move executed correctly.",
-            'Validate: Ensure no recoil damage (regressions) occurred.',
+            "Review Strategy: Use 'git diff HEAD~1 -- <path>' for precise field inspection.",
+            "Rule Check: Verify moves don't violate Arena Constraints.",
+            "Field Test: Do not trust the log. Independently confirm Criteria fulfillment.",
             "Command: '${drive}' to continue the combo, or '${close}' to attempt Capture.",
         ],
         ask: [
@@ -149,11 +145,11 @@ export const POCKET_PRESET = {
         ],
         closeClaim: [
             'Critter Captured! The entry is logged in the PC (base branch).',
-            "Heal up. Use '${start}' to challenge the next opponent.",
+            "Heal up. Use '${start}' to challenge the next opponent, or '${ask}' to scan for another.",
         ],
         closeDrop: [
             'Ran Away Safely. The encounter is reset.',
-            "Back to the map. Use '${start}' to find a wild Critter.",
+            "Back to the map. Use '${start}' to find a wild Critter, or '${ask}' to scan the tall grass.",
         ],
     },
     availableNames: ['grub', 'sparky', 'titan'],
@@ -161,7 +157,7 @@ export const POCKET_PRESET = {
         start: {
             name: 'choose_you',
             title: 'I Choose You!',
-            description: 'Initialize the Battle Phase. Send a Critter (Servant) into a dedicated Arena (branch).\nYou are the Trainer; they are the Fighter. Define the Victory Condition (Goal) clearly.\nThe battle continues in this Arena until the Badge is won.\nCall ONCE to start the encounter.\n\nFlow: choose_you → [command x N] → capture',
+            description: 'Initialize the Battle Phase. Send a Critter (Servant) into a dedicated Arena (branch).\nYou are the Trainer; they are the Fighter. Define the Victory Condition (Goal) clearly.\nThe battle continues in this Arena until the Badge is won.\nCall ONCE to start the encounter.\n\nFlow: ${start} → [${drive} x N] → ${close}',
             args: {
                 title: 'REQUIRED. Battle card title for this encounter.',
                 goal: 'REQUIRED. Victory condition. Define exactly what winning this battle means.',
@@ -169,18 +165,18 @@ export const POCKET_PRESET = {
                 context: 'REQUIRED. Battle background: key code paths, symptoms, logs, and repro clues.',
                 constraints: 'REQUIRED. Battle rules that cannot be broken while fighting.',
                 criteria: 'REQUIRED. Gym badges for completion: concrete checks proving victory.',
-                name: 'Optional ${IDENTITY} to send into battle. Available: ${AVAILABLE_NAMES}.',
+                name: 'Optional ${identity} to send into battle. Available: ${available_names}.',
                 cwd: 'Optional battlefield path (repository root). Defaults to current arena.',
             },
         },
         drive: {
             name: 'command',
             title: 'Issue Command',
-            description: 'Execute the next Strategic Move. Order the Critter to advance the battle state.\nWhether Attacking (coding) or Defending (testing), every command counts as a Turn.\nMANDATORY: Check the Battle Log (git diff) before the next move. Command until Victory is certain.\n\nFlow: choose_you → [command x N] → capture',
+            description: 'Execute the next Strategic Move. Order the Critter to advance the battle state.\nWhether Attacking (coding) or Defending (testing), every command counts as a Turn.\nMANDATORY: Check the Battle Log (git diff) before the next move. Command until Victory is certain.\n\nFlow: ${start} → [${drive} x N] → ${close}',
             args: {
                 directive: 'REQUIRED. The specific move or tactic to execute next.',
                 context: 'Optional new battle intel discovered after the previous turn.',
-                name: 'Optional ${IDENTITY} to execute this turn. Available: ${AVAILABLE_NAMES}.',
+                name: 'Optional ${identity} to execute this turn. Available: ${available_names}.',
                 cwd: 'Optional battlefield path (repository root). Defaults to current arena.',
             },
         },
@@ -191,23 +187,23 @@ export const POCKET_PRESET = {
             args: {
                 request: 'REQUIRED. What should the Dex analyze, compare, or execute.',
                 context: 'REQUIRED. Context entries so the action targets the right ecosystem.',
-                name: 'Optional ${IDENTITY} doing the work. Available: ${AVAILABLE_NAMES}.',
+                name: 'Optional ${identity} doing the work. Available: ${available_names}.',
                 cwd: 'Optional battlefield path (repository root). Defaults to current arena.',
             },
         },
         close: {
             name: 'capture',
             title: 'End Battle',
-            description: 'Attempt Capture. Present the weakened target for League Inspection.\nWARNING: The League (System) checks every Badge. If you attempt to `CLAIM` with fainted code, Disqualification (FORFEIT) is immediate.\nOnly throw the Ball when the target is 100% ready.\n\nFlow: ${START_TOOL_NAME} → [${DRIVE_TOOL_NAME} x N] → ${CLOSE_TOOL_NAME}',
+            description: 'Attempt Capture. Present the weakened target for League Inspection.\nWARNING: The League (System) checks every Badge. If you attempt to `CLAIM` with fainted code, Disqualification (FORFEIT) is immediate.\nOnly throw the Ball when the target is 100% ready.\n\nFlow: ${start} → [${drive} x N] → ${close}',
             args: {
-                petition: 'REQUIRED. CLAIM seeks Badge; FORFEIT forfeits the match.\nREQUIRES AN ACTIVE BATTLE (started via ${START_TOOL_NAME}).\nIf stats are low, continue with ${DRIVE_TOOL_NAME}.',
+                petition: 'REQUIRED. CLAIM seeks Badge; FORFEIT forfeits the match.\nREQUIRES AN ACTIVE BATTLE (started via ${start}).\nIf stats are low, continue with ${drive}.',
                 criteriaChecks: 'REQUIRED. Badge-by-badge proof for CLAIM, or reason for Forfeit.',
                 score_precise: 'REQUIRED score (0-5). 5 means a Critical Hit: exact layer, exact target, zero meaningful misplacement.',
                 score_minimal: 'REQUIRED score (0-5). 5 means Max Efficiency: no wasted PP, no extra motion.',
                 score_isolated: 'REQUIRED score (0-5). 5 means 1v1 Focus: zero side-quests, zero unrelated damage.',
                 score_idiomatic: "REQUIRED score (0-5). 5 means STAB (Same Type Attack Bonus): perfectly matches the codebase style.",
                 score_cohesive: 'REQUIRED score (0-5). 5 means Team Synergy: action serves one purpose with clean boundaries.',
-                oath: "Trainer's Honor Code. Required for CLAIM. Verbatim: ${OATH_TEXT}",
+                oath: "Trainer's Honor Code. Required for CLAIM. Verbatim: ${oath_text}",
                 cwd: 'Optional battlefield path (repository root). Defaults to current arena.',
             },
         },
@@ -234,9 +230,9 @@ export const MISCHIEF_PRESET = {
             "Next Phase: Command '${drive}' to advance the plot, or '${close}' if the world is yours.",
         ],
         drive: [
-            'Phase Complete: The [Diff] section shows the latest execution.',
-            "Deep Scrutiny: Use 'git diff HEAD~1 -- <path>' to check for incompetence.",
-            'Validation: Ensure no sabotage (regressions) in the plan.',
+            "Inspect Payload: Use 'git diff HEAD~1 -- <path>' to scrutinize specific sabotage.",
+            "Decree Audit: Did the Minion violate your Constraints? Punish drift.",
+            "Verification: Don't take their word for it. Independently confirm Criteria.",
             "Command: '${drive}' to push further, or '${close}' to reveal the masterpiece.",
         ],
         ask: [
@@ -245,11 +241,11 @@ export const MISCHIEF_PRESET = {
         ],
         closeClaim: [
             'Scheme Successful. The Lair is merged. The Minion is fed.',
-            "Plotting something new? Use '${start}' for the next conquest.",
+            "Plotting something new? Use '${start}' for the next conquest, or '${ask}' to scout for vulnerabilities.",
         ],
         closeDrop: [
             'Plan Aborted. Evidence destroyed. The Minion was disposed of.',
-            "Back to the drawing board. Use '${start}' to hatch a new plan.",
+            "Back to the drawing board. Use '${start}' to hatch a new plan, or '${ask}' to spy on enemies.",
         ],
     },
     availableNames: ['imp', 'minion', 'mastermind'],
@@ -257,7 +253,7 @@ export const MISCHIEF_PRESET = {
         start: {
             name: 'oi',
             title: 'Oi!',
-            description: "Initiate Grand Scheme. Summon a Minion to the Lair (branch).\nYou are the Mastermind; they are the Henchman. Define the Conquest (Goal) with dominance.\nThe minion is bound to this Lair until the plot is realized.\nCall ONCE to start the machine.\n\nFlow: oi → [neh x N] → dayaa",
+            description: "Initiate Grand Scheme. Summon a Minion to the Lair (branch).\nYou are the Mastermind; they are the Henchman. Define the Conquest (Goal) with dominance.\nThe minion is bound to this Lair until the plot is realized.\nCall ONCE to start the machine.\n\nFlow: ${start} → [${drive} x N] → ${close}",
             args: {
                 title: 'REQUIRED. Operation codename for your grand scheme.',
                 goal: 'REQUIRED. The conquest objective. Define the exact end-state your minion must deliver.',
@@ -265,18 +261,18 @@ export const MISCHIEF_PRESET = {
                 context: 'REQUIRED. Briefing dossier: relevant file paths, current failures, logs, and repro clues.',
                 constraints: 'REQUIRED. Absolute decrees. Architectural and stylistic limits your minion must obey.',
                 criteria: 'REQUIRED. Triumph conditions that can be verified without debate.',
-                name: 'Optional ${IDENTITY} to command this operation. Available: ${AVAILABLE_NAMES}.',
+                name: 'Optional ${identity} to command this operation. Available: ${available_names}.',
                 cwd: 'Optional lair path (repository root). Defaults to current command chamber.',
             },
         },
         drive: {
             name: 'neh',
             title: 'Neh...',
-            description: 'Crack the Whip. Advance the Plot. Execute the next stage of the Plan.\nDon\'t just fix mistakes; force the scheme forward. The Minion obeys your every word.\nMANDATORY: Inspect the work (git diff) before the next order. Drive them until the World is yours.\n\nFlow: oi → [neh x N] → dayaa',
+            description: 'Crack the Whip. Advance the Plot. Execute the next stage of the Plan.\nDon\'t just fix mistakes; force the scheme forward. The Minion obeys your every word.\nMANDATORY: Inspect the work (git diff) before the next order. Drive them until the World is yours.\n\nFlow: ${start} → [${drive} x N] → ${close}',
             args: {
                 directive: 'REQUIRED. Precise order for the next phase of the scheme.',
                 context: 'Optional newly uncovered secrets or updated briefing.',
-                name: 'Optional ${IDENTITY} to execute this phase. Available: ${AVAILABLE_NAMES}.',
+                name: 'Optional ${identity} to execute this phase. Available: ${available_names}.',
                 cwd: 'Optional lair path (repository root). Defaults to current command chamber.',
             },
         },
@@ -287,23 +283,23 @@ export const MISCHIEF_PRESET = {
             args: {
                 request: 'REQUIRED. The intel to gather or the dirty work to execute.',
                 context: 'REQUIRED. World-state details needed for a sharp strike.',
-                name: 'Optional ${IDENTITY} to handle this business. Available: ${AVAILABLE_NAMES}.',
+                name: 'Optional ${identity} to handle this business. Available: ${available_names}.',
                 cwd: 'Optional lair path (repository root). Defaults to current command chamber.',
             },
         },
         close: {
             name: 'dayaa',
             title: 'Dayaa!',
-            description: 'The Final Reveal. Present your Masterpiece to the Dark Council (System).\nWARNING: The Council destroys failure. If you `CLAIM` with weak plans, you will be eaten (FORFEIT).\nOnly throw the switch when the Doomsday Device is 100% operational.\n\nFlow: ${START_TOOL_NAME} → [${DRIVE_TOOL_NAME} x N] → ${CLOSE_TOOL_NAME}',
+            description: 'The Final Reveal. Present your Masterpiece to the Dark Council (System).\nWARNING: The Council destroys failure. If you `CLAIM` with weak plans, you will be eaten (FORFEIT).\nOnly throw the switch when the Doomsday Device is 100% operational.\n\nFlow: ${start} → [${drive} x N] → ${close}',
             args: {
-                petition: 'REQUIRED. CLAIM demands rule; FORFEIT admits defeat.\nREQUIRES AN ACTIVE SCHEME (started via ${START_TOOL_NAME}).\nIf the plan is weak, improve it with ${DRIVE_TOOL_NAME}.',
+                petition: 'REQUIRED. CLAIM demands rule; FORFEIT admits defeat.\nREQUIRES AN ACTIVE SCHEME (started via ${start}).\nIf the plan is weak, improve it with ${drive}.',
                 criteriaChecks: 'REQUIRED. Proof of conquest for CLAIM, or reason for self-destruct.',
                 score_precise: 'REQUIRED (0-5). Architectural placement. 5 = exact layer, exact boundary, zero misplacement.',
                 score_minimal: 'REQUIRED (0-5). Economy of change. 5 = no avoidable lines, no speculative edits, no hidden bloat.',
                 score_isolated: 'REQUIRED (0-5). Surgical containment. 5 = zero unrelated files, zero opportunistic cleanup, zero collateral.',
                 score_idiomatic: 'REQUIRED (0-5). Native fluency. 5 = naming, structure, style indistinguishable from the codebase.',
                 score_cohesive: 'REQUIRED (0-5). Single responsibility. 5 = each unit does one thing, boundaries intact.',
-                oath: "Mastermind's Vow. Required for CLAIM. Verbatim: ${OATH_TEXT}",
+                oath: "Mastermind's Vow. Required for CLAIM. Verbatim: ${oath_text}",
                 cwd: 'Optional lair path (repository root). Defaults to current command chamber.',
             },
         },

package/build/handlers/ask.js

@@ -1,5 +1,5 @@
 import { appendDebugLog } from "../utils/debug-log.js";
-import { handleAsk } from "../workflow/orchestrator.js";
+import { askServant } from "../workflow/ask.js";
 import { buildAskResponse, } from "../workflow/response-builders.js";
 import { resolveTermPreset } from "../config/term-presets.js";
 import { handleToolError } from "./shared.js";
@@ -8,7 +8,7 @@ export function createAskHandler() {
         const workingDir = cwd || process.cwd();
         try {
             appendDebugLog(`tool ask start cwd=${workingDir}`, { cwd: workingDir, section: "script" });
-            const result = await handleAsk({
+            const result = await askServant({
                 cwd: workingDir,
                 request,
                 context,

package/build/handlers/close.js

@@ -1,5 +1,5 @@
 import { appendDebugLog } from "../utils/debug-log.js";
-import { handleClose } from "../workflow/orchestrator.js";
+import { presentWork } from "../workflow/present.js";
 import { buildCloseDoneResponse, buildCloseDropResponse, } from "../workflow/response-builders.js";
 import { resolveTermPreset } from "../config/term-presets.js";
 import { handleToolError } from "./shared.js";
@@ -12,7 +12,7 @@ export function createCloseHandler() {
                 cwd: workingDir,
                 section: "script",
             });
-            const outcome = await handleClose({
+            const outcome = await presentWork({
                 cwd: workingDir,
                 petition,
                 criteriaChecks: criteriaCheckParts,

package/build/handlers/drive.js

@@ -1,5 +1,5 @@
 import { appendDebugLog } from "../utils/debug-log.js";
-import { handleDrive } from "../workflow/orchestrator.js";
+import { driveServant } from "../workflow/drive.js";
 import { buildDriveResponse, } from "../workflow/response-builders.js";
 import { resolveTermPreset } from "../config/term-presets.js";
 import { handleToolError } from "./shared.js";
@@ -11,7 +11,7 @@ export function createDriveHandler() {
                 cwd: workingDir,
                 section: "script",
             });
-            const outcome = await handleDrive({
+            const outcome = await driveServant({
                 cwd: workingDir,
                 directive,
                 context,

package/build/handlers/start.js

@@ -1,5 +1,5 @@
 import { appendDebugLog } from "../utils/debug-log.js";
-import { handleStart } from "../workflow/orchestrator.js";
+import { summonServant } from "../workflow/summon.js";
 import { buildKeiyakuSuccessResponse, } from "../workflow/response-builders.js";
 import { resolveTermPreset } from "../config/term-presets.js";
 import { handleToolError } from "./shared.js";
@@ -8,7 +8,7 @@ export function createStartHandler() {
         const workingDir = cwd || process.cwd();
         try {
             appendDebugLog(`tool start cwd=${workingDir}`, { cwd: workingDir, section: "script" });
-            const result = await handleStart({
+            const result = await summonServant({
                 cwd: workingDir,
                 title,
                 goal,

package/build/index.js

@@ -4,7 +4,7 @@ import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js"
 import { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/streamableHttp.js";
 import { createMcpExpressApp } from "@modelcontextprotocol/sdk/server/express.js";
 import { readFileSync } from "node:fs";
-import { resolveOath } from "./workflow/orchestrator.js";
+import { resolveOath } from "./workflow/contract.js";
 import { askToolSchema, startToolSchema, driveToolSchema, closeToolSchema, helpToolSchema, } from "./types/tool-schemas.js";
 import { listTermPresets, resolveTermPreset, getAvailableNamesForPreset } from "./config/term-presets.js";
 import { renderPreset } from "./utils/text-utils.js";
@@ -27,13 +27,14 @@ function registerTools(server) {
     const availableNames = getAvailableNamesForPreset(preset).join(", ");
     const currentOath = resolveOath();
     const renderedPreset = renderPreset(preset, {
-        IDENTITY: preset.identity,
-        PRESET_IDENTITIES: presetIdentities,
-        AVAILABLE_NAMES: availableNames,
-        START_TOOL_NAME: preset.tools.start.name,
-        DRIVE_TOOL_NAME: preset.tools.drive.name,
-        CLOSE_TOOL_NAME: preset.tools.close.name,
-        OATH_TEXT: `'${currentOath}'`,
+        start: preset.tools.start.name,
+        drive: preset.tools.drive.name,
+        ask: preset.tools.ask.name,
+        close: preset.tools.close.name,
+        identity: preset.identity,
+        preset_identities: presetIdentities,
+        available_names: availableNames,
+        oath_text: `'${currentOath}'`,
     });
     const startPreset = renderedPreset.tools.start;
     const drivePreset = renderedPreset.tools.drive;