@astrosheep/keiyaku 0.1.9 → 0.1.10

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) -> summon` -> [`drive` x N] -> `present`\n`ask` (stateless dispatch / utility at any point)',
+    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`',
     nextHints: {
         start: [
             'Keiyaku signed. The Servant is bound to this branch until release.',
@@ -81,7 +81,7 @@ export const DEFAULT_PRESET = {
         ask: {
             name: 'ask',
             title: 'Ask',
-            description: 'Dispatch a temporary Servant for a stateless task.\nUse for quick reconnaissance, code generation, or isolated queries.\nNo contract signed. No branch created. Pure utility.',
+            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.',
@@ -129,7 +129,7 @@ export const POCKET_PRESET = {
     id: 'pocket',
     identity: 'Critter',
     verdict: DEFAULT_VERDICT_CONFIG,
-    usageGuide: "## Pocket Battle Guide\n\n**grub** — Basic Fighter 🐛\n- Weak but free. Use for Tackle and String Shot (small tasks).\n- Don't expect it to defeat the Elite Four.\n\n**sparky** — Reliable Partner ⚡\n- Good for most battles. Thunderbolt gets the job done.\n- Has some personality, but still follows orders.\n\n**titan** — Legendary Power 🔮\n- Costly. Dangerous. Overpowered.\n- Use only when the gym leader is cheating.\n\n## Workflow\n`choose_you` -> [`command` x N] -> `capture`\n`dex` (optional, read-only analysis)",
+    usageGuide: "## Pocket Battle Guide\n\n**grub** — Basic Fighter 🐛\n- Weak but free. Use for Tackle and String Shot (small tasks).\n- Don't expect it to defeat the Elite Four.\n\n**sparky** — Reliable Partner ⚡\n- Good for most battles. Thunderbolt gets the job done.\n- Has some personality, but still follows orders.\n\n**titan** — Legendary Power 🔮\n- Costly. Dangerous. Overpowered.\n- Use only when the gym leader is cheating.\n\n## Workflow\n`dex` (scan/test) | `choose_you` -> [`command` | `dex`]* -> `capture`",
     nextHints: {
         start: [
             'Battle Started: The [Diff] section shows the opening moves.',
@@ -187,11 +187,11 @@ export const POCKET_PRESET = {
         ask: {
             name: 'dex',
             title: 'Dex',
-            description: 'Scan the Environment. A stateless look-up for intel.\nUse for analyzing the codebase or checking type advantages (docs).\nNo PP cost. No turn used. Pure data.',
+            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 explain.',
-                context: 'REQUIRED. Context entries so the analysis targets the right ecosystem.',
-                name: 'Optional ${IDENTITY} doing the scan. Available: ${AVAILABLE_NAMES}.',
+                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}.',
                 cwd: 'Optional battlefield path (repository root). Defaults to current arena.',
             },
         },
@@ -225,7 +225,7 @@ export const MISCHIEF_PRESET = {
     id: 'mischief',
     identity: 'minion',
     verdict: DEFAULT_VERDICT_CONFIG,
-    usageGuide: '## Minion Manual\n\n**imp** — Disposable Grunt 😈\n- Expendable. Send it into the trap first.\n\n**minion** — Standard Henchman 👹\n- Can carry out complex evil plans. mostly.\n\n**mastermind** — The Boss ??? 🧠\n- Wait, why are you commanding the boss?\n- Extremely expensive consulting fee.\n\n## Workflow\n`oi` -> [`neh` x N] -> `yoshi`\n`eeto` (optional, read-only contemplation)',
+    usageGuide: '## Minion Manual\n\n**imp** — Disposable Grunt 😈\n- Expendable. Send it into the trap first.\n\n**minion** — Standard Henchman 👹\n- Can carry out complex evil plans. mostly.\n\n**mastermind** — The Boss ??? 🧠\n- Wait, why are you commanding the boss?\n- Extremely expensive consulting fee.\n\n## Workflow\n`nn` (Nn——! disposable/experiment) | `oi` -> [`neh` | `nn`]* -> `dayaa` (Dayaa!)',
     nextHints: {
         start: [
             "Inspect the Minion's Work: The [Diff] section shows the first step of the plan.",
@@ -241,7 +241,7 @@ export const MISCHIEF_PRESET = {
         ],
         ask: [
             "Intel Stolen: Use '${start}' to launch the scheme, or '${drive}' to exploit this weakness.",
-            "Still Puzzled? Send the spy ('${ask}') out again.",
+            "Still Puzzled? Send the disposable ('${ask}') out again.",
         ],
         closeClaim: [
             'Scheme Successful. The Lair is merged. The Minion is fed.',
@@ -257,7 +257,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] → yoshi",
+            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",
             args: {
                 title: 'REQUIRED. Operation codename for your grand scheme.',
                 goal: 'REQUIRED. The conquest objective. Define the exact end-state your minion must deliver.',
@@ -272,7 +272,7 @@ export const MISCHIEF_PRESET = {
         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] → yoshi',
+            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',
             args: {
                 directive: 'REQUIRED. Precise order for the next phase of the scheme.',
                 context: 'Optional newly uncovered secrets or updated briefing.',
@@ -281,28 +281,28 @@ export const MISCHIEF_PRESET = {
             },
         },
         ask: {
-            name: 'eeto',
-            title: 'Eeto...',
-            description: 'Send a Spy. A stateless reconnaissance mission.\nUse this to scout the enemy territory (codebase) or steal documents (docs).\nThe spy reports back and vanishes. No traces left.',
+            name: 'nn',
+            title: 'Nn——!',
+            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 strategy to formulate.',
-                context: 'REQUIRED. World-state details needed for a sharp analysis.',
-                name: 'Optional ${IDENTITY} to contemplate this puzzle. Available: ${AVAILABLE_NAMES}.',
+                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}.',
                 cwd: 'Optional lair path (repository root). Defaults to current command chamber.',
             },
         },
         close: {
-            name: 'yoshi',
-            title: 'Yoshi!',
-            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}',
+            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}',
             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}.',
                 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.',
+                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}",
                 cwd: 'Optional lair path (repository root). Defaults to current command chamber.',
             },

package/build/utils/git.js

@@ -160,20 +160,42 @@ export async function commit(cwd, message) {
         throw wrapGitError(args.join(" "), err, cwd);
     }
 }
-export async function merge(cwd, branchName, message) {
+export async function merge(cwd, branchName, message, options = {}) {
     const git = createGit(cwd);
+    const { squash = true } = options;
     const skipVerify = readBooleanEnv("KEIYAKU_GIT_NO_VERIFY", true);
     const noGpgSign = readBooleanEnv("KEIYAKU_GIT_NO_GPG_SIGN", true);
-    const options = [branchName, "--no-ff", "--no-edit", "-m", message];
+    if (!squash) {
+        const mergeOptions = [branchName, "--no-ff", "--no-edit", "-m", message];
+        if (skipVerify)
+            mergeOptions.push("--no-verify");
+        if (noGpgSign)
+            mergeOptions.push("--no-gpg-sign");
+        try {
+            await git.merge(mergeOptions);
+            return;
+        }
+        catch (err) {
+            throw wrapGitError(`merge ${mergeOptions.join(" ")}`, err, cwd);
+        }
+    }
+    const squashArgs = ["merge", "--squash", branchName];
+    try {
+        await git.raw(squashArgs);
+    }
+    catch (err) {
+        throw wrapGitError(squashArgs.join(" "), err, cwd);
+    }
+    const commitArgs = ["commit", "--allow-empty", "-m", message];
     if (skipVerify)
-        options.push("--no-verify");
+        commitArgs.push("--no-verify");
     if (noGpgSign)
-        options.push("--no-gpg-sign");
+        commitArgs.push("--no-gpg-sign");
     try {
-        await git.merge(options);
+        await git.raw(commitArgs);
     }
     catch (err) {
-        throw wrapGitError(`merge ${options.join(" ")}`, err, cwd);
+        throw wrapGitError(commitArgs.join(" "), err, cwd);
     }
 }
 export async function getUnmergedFiles(cwd) {

package/build/workflow/orchestrator.js

@@ -399,7 +399,21 @@ export async function handleAsk(input) {
     const prompt = buildAskPrompt(request, context);
     // TODO: enforce read-only access and persist summary to .keiyaku/notes/.
     const summary = await runSubagent(selectSubagent(name), prompt, cwd, 0, signal);
-    return { summary };
+    let branch;
+    let diffStats;
+    try {
+        branch = await git.getCurrentBranch(cwd);
+        if (branch && branch.startsWith("keiyaku/")) {
+            const baseBranch = await git.getKeiyakuBase(cwd, branch);
+            if (baseBranch) {
+                diffStats = await git.getDiffPreviewText(cwd, baseBranch);
+            }
+        }
+    }
+    catch {
+        branch = undefined;
+    }
+    return { summary, branch, diffStats };
 }
 export async function handleClose(input) {
     const { cwd } = input;
@@ -503,7 +517,7 @@ export async function handleClose(input) {
             const invokeFinalizeLog = `[CLAIM] Deleting merged branch '${keiyakuBranch}' and clearing metadata`;
             console.error(invokeFinalizeLog);
             appendDebugLog(invokeFinalizeLog, { cwd, section: "script" });
-            await git.deleteBranch(cwd, keiyakuBranch);
+            await git.deleteBranch(cwd, keiyakuBranch, true);
             await git.clearKeiyakuBase(cwd, keiyakuBranch);
             const round = computeTraceState(traceContent).maxRound;
             return {

package/build/workflow/response-builders.js

@@ -31,8 +31,33 @@ function buildSection(title, content) {
         return "";
     return `[${title}]\n${validLines.join("\n")}`;
 }
+function supportsHeaderColor() {
+    if (process.env.NO_COLOR !== undefined)
+        return false;
+    if (process.env.FORCE_COLOR === "0")
+        return false;
+    if (process.env.FORCE_COLOR !== undefined)
+        return true;
+    if (!process.stdout?.isTTY)
+        return false;
+    const term = process.env.TERM?.toLowerCase();
+    return term !== undefined && term !== "dumb";
+}
+function colorizeHeaderTitle(titleLabel) {
+    return `\x1b[1;38;5;15;48;5;23m${titleLabel}\x1b[0m`;
+}
 function formatHeader(title) {
-    return `\n── ${title.toUpperCase()} ${"─".repeat(Math.max(0, 50 - title.length))}`;
+    const headerWidth = 60;
+    const normalizedTitle = title.trim().toUpperCase();
+    const titleLabel = ` ${normalizedTitle} `;
+    if (!supportsHeaderColor()) {
+        const plainPrefix = `──${titleLabel}`;
+        const divider = "─".repeat(Math.max(0, headerWidth - plainPrefix.length));
+        return divider.length > 0 ? `\n${plainPrefix}${divider}` : `\n${plainPrefix}`;
+    }
+    const coloredTitle = colorizeHeaderTitle(titleLabel);
+    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 = []) {
     // Main Status Block
@@ -173,7 +198,11 @@ export function buildAskResponse(result, input) {
     ];
     const nextHints = renderHints(resolveTermPreset().nextHints.ask);
     const inputSection = buildSection("Input", inputEcho);
-    const infoLines = [...formatMaybe("CWD", input.cwd, 300)];
+    const infoLines = [
+        ...formatMaybe("CWD", input.cwd, 300),
+        ...formatMaybe("Current Branch", result.branch, 200),
+        ...formatMaybe("Diff Stats", result.diffStats, 1000),
+    ];
     const text = assembleResponse("Answered", result.summary, [inputSection], nextHints, infoLines);
     return {
         content: [{ type: "text", text }],

package/package.json

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