@astrosheep/keiyaku 0.1.7 → 0.1.9

package/build/common/errors.js

@@ -33,7 +33,7 @@ function hintForFlowCode(code, message) {
         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` + `ABANDON` to drop it.";
+            return "An active keiyaku branch already exists in this repository. Continue with `drive`, or use `close` + `FORFEIT` to drop it.";
         case "EXISTING_KEIYAKU_BRANCH_FOUND":
             return "At least one local `keiyaku/*` branch already exists in this repository.";
         case "EMPTY_PARAM":
@@ -49,7 +49,7 @@ function hintForFlowCode(code, message) {
         case "DONE_MERGE_CONFLICT":
             return "DONE encountered a git merge conflict.";
         case "CLOSE_QUALITY_GATE_FAILED":
-            return "INVOKE was denied because one or more verification thresholds were not met (check .keiyaku/settings.json).";
+            return "CLAIM was denied because one or more verification thresholds were not met (check .keiyaku/settings.json).";
         case "OATH_MISMATCH":
             return message;
         case "SUBAGENT_DID_NOT_ADVANCE_ROUND":
@@ -72,7 +72,7 @@ const MESSAGE_HINT_PATTERNS = [
     { code: "MISSING_KEIYAKU_BASE", patterns: ["is missing base metadata"] },
     { code: "MISSING_PROTOCOL_FILES", patterns: ["missing protocol files"] },
     { code: "DONE_MERGE_CONFLICT", patterns: ["DONE merge conflict"] },
-    { code: "CLOSE_QUALITY_GATE_FAILED", patterns: ["God's Wrath: INVOKE denied"] },
+    { code: "CLOSE_QUALITY_GATE_FAILED", patterns: ["God's Wrath: CLAIM denied"] },
     {
         code: "OATH_MISMATCH",
         patterns: [

package/build/config/term-presets.js

@@ -39,7 +39,7 @@ export const DEFAULT_PRESET = {
             'Intel acquired. This was stateless—no contract, no branch.',
             'To act on this knowledge: ${start} a Keiyaku, or ${drive} an existing one.',
         ],
-        closeInvoke: [
+        closeClaim: [
             'Contract fulfilled. Branch merged.',
             'You are back on base.',
             'Next assignment: ${start} when ready.',
@@ -147,7 +147,7 @@ export const POCKET_PRESET = {
             "Data Recorded: Use '${start}' to begin the encounter, or '${drive}' to use this intel.",
             "Still Searching? Keep using '${ask}' to fill the Dex.",
         ],
-        closeInvoke: [
+        closeClaim: [
             'Critter Captured! The entry is logged in the PC (base branch).',
             "Heal up. Use '${start}' to challenge the next opponent.",
         ],
@@ -198,16 +198,16 @@ export const POCKET_PRESET = {
         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 `INVOKE` with fainted code, Disqualification (ABANDON) 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_TOOL_NAME} → [${DRIVE_TOOL_NAME} x N] → ${CLOSE_TOOL_NAME}',
             args: {
-                petition: 'REQUIRED. INVOKE seeks Badge; ABANDON forfeits the match.\nREQUIRES AN ACTIVE BATTLE (started via ${START_TOOL_NAME}).\nIf stats are low, continue with ${DRIVE_TOOL_NAME}.',
-                criteriaChecks: 'REQUIRED. Badge-by-badge proof for INVOKE, or reason for Forfeit.',
+                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}.',
+                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 INVOKE. Verbatim: ${OATH_TEXT}",
+                oath: "Trainer's Honor Code. Required for CLAIM. Verbatim: ${OATH_TEXT}",
                 cwd: 'Optional battlefield path (repository root). Defaults to current arena.',
             },
         },
@@ -243,7 +243,7 @@ export const MISCHIEF_PRESET = {
             "Intel Stolen: Use '${start}' to launch the scheme, or '${drive}' to exploit this weakness.",
             "Still Puzzled? Send the spy ('${ask}') out again.",
         ],
-        closeInvoke: [
+        closeClaim: [
             'Scheme Successful. The Lair is merged. The Minion is fed.',
             "Plotting something new? Use '${start}' for the next conquest.",
         ],
@@ -294,16 +294,16 @@ export const MISCHIEF_PRESET = {
         close: {
             name: 'yoshi',
             title: 'Yoshi!',
-            description: 'The Final Reveal. Present your Masterpiece to the Dark Council (System).\nWARNING: The Council destroys failure. If you `INVOKE` with weak plans, the Self-Destruct (ABANDON) will trigger.\nOnly reveal the Doomsday Device when it is fully 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, the Self-Destruct (FORFEIT) will trigger.\nOnly reveal the Doomsday Device when it is fully operational.\n\nFlow: ${START_TOOL_NAME} → [${DRIVE_TOOL_NAME} x N] → ${CLOSE_TOOL_NAME}',
             args: {
-                petition: 'REQUIRED. INVOKE demands rule; ABANDON admits defeat.\nREQUIRES AN ACTIVE SCHEME (started via ${START_TOOL_NAME}).\nIf the plan is weak, improve it with ${DRIVE_TOOL_NAME}.',
-                criteriaChecks: 'REQUIRED. Proof of conquest for INVOKE, or reason for self-destruct.',
+                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}.',
+                criteriaChecks: 'REQUIRED. Proof of conquest for CLAIM, or reason for self-destruct.',
                 score_precise: 'REQUIRED score (0-5). 5 means Laser Focus: exact cut, zero meaningful drift.',
                 score_minimal: 'REQUIRED score (0-5). 5 means Ruthless Efficiency: no wasted movement, no excess.',
                 score_isolated: 'REQUIRED score (0-5). 5 means Perfect Containment: no collateral damage.',
                 score_idiomatic: 'REQUIRED score (0-5). 5 means Native Tongue: matches the lair\'s dialect perfectly.',
                 score_cohesive: 'REQUIRED score (0-5). 5 means Absolute Loyalty: each unit serves the master plan.',
-                oath: "Mastermind's Vow. Required for INVOKE. 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/close.js

@@ -24,12 +24,12 @@ export function createCloseHandler() {
                 oath,
                 signal: extra.signal,
             });
-            if (petition === "INVOKE") {
+            if (petition === "CLAIM") {
                 if (!("result" in outcome) || outcome.result !== "done") {
-                    throw new Error("Unexpected INVOKE outcome shape");
+                    throw new Error("Unexpected CLAIM outcome shape");
                 }
                 const finalOutcome = outcome;
-                appendDebugLog(`tool close INVOKE success branch=${finalOutcome.branch} base=${finalOutcome.baseBranch}`, {
+                appendDebugLog(`tool close CLAIM success branch=${finalOutcome.branch} base=${finalOutcome.baseBranch}`, {
                     cwd: workingDir,
                     section: "script",
                 });
@@ -45,10 +45,10 @@ export function createCloseHandler() {
                 });
             }
             if (!("result" in outcome) || outcome.result !== "dropped") {
-                throw new Error("Unexpected ABANDON outcome shape");
+                throw new Error("Unexpected FORFEIT outcome shape");
             }
             const finalOutcome = outcome;
-            appendDebugLog(`tool close ABANDON success branch=${finalOutcome.branch} base=${finalOutcome.baseBranch}`, {
+            appendDebugLog(`tool close FORFEIT success branch=${finalOutcome.branch} base=${finalOutcome.baseBranch}`, {
                 cwd: workingDir,
                 section: "script",
             });

package/build/types/tool-schemas.js

@@ -22,7 +22,7 @@ export const askToolSchema = z.object({
     cwd: z.string().optional(),
 });
 export const closeToolSchema = z.object({
-    petition: z.enum(["INVOKE", "ABANDON"]),
+    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),

package/build/workflow/orchestrator.js

@@ -61,9 +61,9 @@ function truncateForMessage(text, maxChars) {
 async function buildActiveKeiyakuStartMessage(cwd, branch) {
     const lines = [
         `active keiyaku already exists (${branch})`,
-        "This task is still active. Decide whether to continue or abandon it.",
+        "This task is still active. Decide whether to continue or forfeit it.",
         "Continue: run drive on the current keiyaku branch.",
-        "Abandon: run close with petition=ABANDON to drop the branch.",
+        "Forfeit: run close with petition=FORFEIT to drop the branch.",
     ];
     try {
         const keiyakuPath = path.join(cwd, KEIYAKU_FILE);
@@ -417,7 +417,7 @@ export async function handleClose(input) {
     }
     const title = keiyakuBranch.slice("keiyaku/".length);
     const petition = input.petition;
-    if (petition === "ABANDON") {
+    if (petition === "FORFEIT") {
         let round = 0;
         try {
             const trace = await fs.readFile(path.join(cwd, TRACE_FILE), "utf-8");
@@ -433,7 +433,7 @@ export async function handleClose(input) {
             await git.clearKeiyakuBase(cwd, keiyakuBranch);
         }
         catch (err) {
-            throw wrapFlowError(`execute ABANDON (${keiyakuBranch} -> ${baseBranch})`, err);
+            throw wrapFlowError(`execute FORFEIT (${keiyakuBranch} -> ${baseBranch})`, err);
         }
         return {
             status: "success",
@@ -441,12 +441,12 @@ export async function handleClose(input) {
             round,
             branch: keiyakuBranch,
             baseBranch,
-            diff: "Abandoned without merge.",
+            diff: "Forfeited without merge.",
         };
     }
     await ensureKeiyakuFiles(cwd);
     const traceContent = await readTraceContent(cwd);
-    if (petition === "INVOKE") {
+    if (petition === "CLAIM") {
         const verdict = await resolveVerdictConfig(cwd);
         const failedCommandments = CLOSE_SCORE_FIELDS.flatMap((field) => {
             const score = input[field];
@@ -476,15 +476,15 @@ export async function handleClose(input) {
         }
         await assertCleanWorkingTree(cwd);
         try {
-            const invokeDiffLog = `[INVOKE] Collecting diff preview against base '${baseBranch}'`;
+            const invokeDiffLog = `[CLAIM] Collecting diff preview against base '${baseBranch}'`;
             console.error(invokeDiffLog);
             appendDebugLog(invokeDiffLog, { cwd, section: "script" });
-            const invokeReadLog = "[INVOKE] Reading keiyaku protocol files";
+            const invokeReadLog = "[CLAIM] Reading keiyaku protocol files";
             console.error(invokeReadLog);
             appendDebugLog(invokeReadLog, { cwd, section: "script" });
             const keiyakuContent = await fs.readFile(path.join(cwd, KEIYAKU_FILE), "utf-8");
             const message = buildMergeMessage(title, keiyakuContent, traceContent);
-            const invokeCleanupLog = "[INVOKE] Removing protocol files and creating cleanup commit";
+            const invokeCleanupLog = "[CLAIM] Removing protocol files and creating cleanup commit";
             console.error(invokeCleanupLog);
             appendDebugLog(invokeCleanupLog, { cwd, section: "script" });
             await fs.unlink(path.join(cwd, KEIYAKU_FILE));
@@ -492,15 +492,15 @@ export async function handleClose(input) {
             await git.addFiles(cwd, "-A");
             await git.commit(cwd, `keiyaku(${title}): cleanup`);
             const diff = await git.getDiffPreviewText(cwd, baseBranch);
-            const invokeCheckoutLog = `[INVOKE] Checking out base branch '${baseBranch}'`;
+            const invokeCheckoutLog = `[CLAIM] Checking out base branch '${baseBranch}'`;
             console.error(invokeCheckoutLog);
             appendDebugLog(invokeCheckoutLog, { cwd, section: "script" });
             await git.checkoutBranch(cwd, baseBranch);
-            const invokeMergeLog = `[INVOKE] Merging '${keiyakuBranch}' into '${baseBranch}'`;
+            const invokeMergeLog = `[CLAIM] Merging '${keiyakuBranch}' into '${baseBranch}'`;
             console.error(invokeMergeLog);
             appendDebugLog(invokeMergeLog, { cwd, section: "script" });
             await git.merge(cwd, keiyakuBranch, message);
-            const invokeFinalizeLog = `[INVOKE] Deleting merged branch '${keiyakuBranch}' and clearing metadata`;
+            const invokeFinalizeLog = `[CLAIM] Deleting merged branch '${keiyakuBranch}' and clearing metadata`;
             console.error(invokeFinalizeLog);
             appendDebugLog(invokeFinalizeLog, { cwd, section: "script" });
             await git.deleteBranch(cwd, keiyakuBranch);
@@ -518,9 +518,9 @@ export async function handleClose(input) {
         catch (err) {
             const conflictFiles = await git.getUnmergedFiles(cwd);
             if (conflictFiles.length > 0) {
-                throw new FlowError("DONE_MERGE_CONFLICT", `INVOKE merge conflict between ${keiyakuBranch} and ${baseBranch} (CONFLICTS: ${conflictFiles.join(", ")})`, err);
+                throw new FlowError("DONE_MERGE_CONFLICT", `CLAIM merge conflict between ${keiyakuBranch} and ${baseBranch} (CONFLICTS: ${conflictFiles.join(", ")})`, err);
             }
-            throw wrapFlowError(`execute INVOKE (merge ${keiyakuBranch} into ${baseBranch})`, err);
+            throw wrapFlowError(`execute CLAIM (merge ${keiyakuBranch} into ${baseBranch})`, err);
         }
     }
     throw new Error(`unsupported close petition: ${petition}`);

package/build/workflow/response-builders.js

@@ -189,13 +189,13 @@ export function buildCloseDoneResponse(result, input) {
     const { status: _status, ...resultData } = result;
     const closeToolName = getCloseToolName();
     const inputEcho = [
-        `Petition: INVOKE`,
+        `Petition: CLAIM`,
         ...formatList("Criteria Checks", input.criteriaChecks, { 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.closeInvoke);
+    const nextHints = renderHints(resolveTermPreset().nextHints.closeClaim);
     const inputSection = buildSection("Input", inputEcho);
     const diffSection = result.diff ? buildSection("Diff", result.diff) : "";
     const infoLines = [
@@ -203,7 +203,7 @@ export function buildCloseDoneResponse(result, input) {
         ...formatMaybe("Current Branch", result.branch, 200),
         ...formatMaybe("Base Branch", result.baseBranch, 200),
     ];
-    const text = assembleResponse("Keiyaku Fulfilled (INVOKE)", `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, diffSection], nextHints, infoLines);
     return {
         content: [{ type: "text", text }],
         structuredContent: buildSuccessStructuredContent(closeToolName, {
@@ -218,7 +218,7 @@ export function buildCloseDropResponse(result, input) {
     const { status: _status, ...resultData } = result;
     const closeToolName = getCloseToolName();
     const inputEcho = [
-        `Petition: ABANDON`,
+        `Petition: FORFEIT`,
         ...formatList("Reasons/Checks", input.criteriaChecks, { 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),
@@ -230,7 +230,7 @@ export function buildCloseDropResponse(result, input) {
         ...formatMaybe("Current Branch", result.branch, 200),
         ...formatMaybe("Base Branch", result.baseBranch, 200),
     ];
-    const text = assembleResponse("Keiyaku Abandoned (ABANDON)", `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], nextHints, infoLines);
     return {
         content: [{ type: "text", text }],
         structuredContent: buildSuccessStructuredContent(closeToolName, {

package/package.json

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