@astrosheep/keiyaku 0.1.15 → 0.1.16

package/build/handlers/close.js

@@ -2,32 +2,37 @@ import { appendDebugLog } from "../utils/debug-log.js";
 import { presentWork } from "../workflow/present.js";
 import { buildCloseDoneResponse, buildCloseDropResponse, } from "../workflow/response-builders.js";
 import { resolveTermPreset } from "../config/term-presets.js";
+import { closeToolSchema } from "../types/tooling.js";
 import { handleToolError } from "./shared.js";
 export function createCloseHandler() {
-    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 ?? [];
+    return async (args, extra) => {
+        let petition = "UNKNOWN";
+        let workingDir = process.cwd();
+        let criteriaCheckParts = [];
+        let constraintsCheckParts = [];
+        let oath;
+        let scoreLine;
         try {
+            const input = closeToolSchema.parse(args);
+            petition = input.petition;
+            workingDir = input.cwd || process.cwd();
+            if (input.petition === "CLAIM") {
+                criteriaCheckParts = input.criteriaChecks;
+                constraintsCheckParts = input.constraintsChecks;
+                oath = input.oath;
+                scoreLine = `Scores: precise=${input.score_precise} minimal=${input.score_minimal} isolated=${input.score_isolated} idiomatic=${input.score_idiomatic} cohesive=${input.score_cohesive}`;
+            }
             appendDebugLog(`tool close start petition=${petition} cwd=${workingDir} criteriaChecks=${criteriaCheckParts.length} constraintsChecks=${constraintsCheckParts.length}`, {
                 cwd: workingDir,
                 section: "script",
             });
             const outcome = await presentWork({
+                ...input,
                 cwd: workingDir,
-                petition,
-                criteriaChecks: criteriaCheckParts,
-                constraintsChecks: constraintsCheckParts,
-                score_precise,
-                score_minimal,
-                score_isolated,
-                score_idiomatic,
-                score_cohesive,
-                oath,
                 signal: extra.signal,
             });
-            if (petition === "CLAIM") {
-                if (!("result" in outcome) || outcome.result !== "done") {
+            if (input.petition === "CLAIM") {
+                if (!("result" in outcome) || outcome.result !== "merged") {
                     throw new Error("Unexpected CLAIM outcome shape");
                 }
                 const finalOutcome = outcome;
@@ -38,12 +43,12 @@ export function createCloseHandler() {
                 return buildCloseDoneResponse(finalOutcome, {
                     criteriaChecks: criteriaCheckParts,
                     constraintsChecks: constraintsCheckParts,
-                    score_precise,
-                    score_minimal,
-                    score_isolated,
-                    score_idiomatic,
-                    score_cohesive,
-                    oath,
+                    score_precise: input.score_precise,
+                    score_minimal: input.score_minimal,
+                    score_isolated: input.score_isolated,
+                    score_idiomatic: input.score_idiomatic,
+                    score_cohesive: input.score_cohesive,
+                    oath: input.oath,
                     cwd: workingDir,
                 });
             }
@@ -56,14 +61,6 @@ export function createCloseHandler() {
                 section: "script",
             });
             return buildCloseDropResponse(finalOutcome, {
-                criteriaChecks: criteriaCheckParts,
-                constraintsChecks: constraintsCheckParts,
-                score_precise,
-                score_minimal,
-                score_isolated,
-                score_idiomatic,
-                score_cohesive,
-                oath,
                 cwd: workingDir,
             });
         }
@@ -78,8 +75,8 @@ export function createCloseHandler() {
                     `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}`] : []),
+                    ...(scoreLine ? [scoreLine] : []),
+                    ...(petition === "CLAIM" && oath ? [`Oath: ${oath}`] : []),
                     `Path: ${workingDir}`,
                 ],
             });

package/build/handlers/help.js

@@ -5,9 +5,14 @@ export function createHelpHandler(preset) {
             "# Keiyaku System Help",
             "",
             "## Core Files (.keiyaku/)",
-            "These files define the 'Law' of the project. **CRITICAL**: Use Markdown level 2 headers (## header).",
+            "These files define the 'Law' and configuration of the project.",
             "",
             "- **base-constraints.md**: Mandatory architectural boundaries and coding standards.",
+            "  - **Purpose**: Global constraints injected into every mission.",
+            "  - **Logic**: The system prioritize extracting all list items (`-` or `*`) as individual constraints.",
+            "  - **Formatting**: Use lists for constraints. You can use H3+ headers (`###`) for organization, but they are stripped if the section contains lists.",
+            "  - **Strict Rule**: DO NOT use H1 (`#`) or H2 (`##`) within constraints or as content if they aren't meant to be item separators, as they will trigger validation errors.",
+            "- **settings.json**: Local configuration for the Keiyaku environment.",
             "",
             preset.usageGuide,
             "",

package/build/index.js

@@ -41,9 +41,7 @@ function registerTools(server) {
     const askPreset = renderedPreset.tools.ask;
     const closePreset = renderedPreset.tools.close;
     const helpPreset = renderedPreset.tools.help;
-    const dynamicCloseSchema = applyArgumentDescriptions(closeToolSchema, {
-        ...closePreset.args,
-    });
+    const dynamicCloseSchema = closeToolSchema;
     const dynamicStartSchema = applyArgumentDescriptions(startToolSchema, {
         ...startPreset.args,
     });

package/build/types/tooling.js

@@ -22,16 +22,22 @@ export const askToolSchema = z.object({
     name: z.string().optional(),
     cwd: z.string().optional(),
 });
-export const closeToolSchema = z.object({
-    petition: z.enum(["CLAIM", "FORFEIT"]),
-    criteriaChecks: z.array(z.string().trim().min(1)).min(1),
-    constraintsChecks: z.array(z.string().trim().min(1)).min(1),
-    score_precise: z.number().min(0).max(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 closeToolSchema = z.discriminatedUnion("petition", [
+    z.object({
+        petition: z.literal("CLAIM"),
+        criteriaChecks: z.array(z.string().trim().min(1)).min(1),
+        constraintsChecks: z.array(z.string().trim().min(1)).min(1),
+        score_precise: z.number().min(0).max(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(),
+    }),
+    z.object({
+        petition: z.literal("FORFEIT"),
+        cwd: z.string().optional(),
+    }),
+]);
 export const helpToolSchema = z.object({});

package/build/utils/git-ops.js

@@ -265,6 +265,16 @@ export async function getKeiyakuBase(cwd, branchName) {
         return null;
     }
 }
+export async function getLatestCommitHash(cwd) {
+    const git = createGit(cwd);
+    try {
+        const hash = await git.revparse(["--short", "HEAD"]);
+        return hash.trim();
+    }
+    catch (err) {
+        throw wrapGitError("rev-parse --short HEAD", err, cwd);
+    }
+}
 export async function clearKeiyakuBase(cwd, branchName) {
     const git = createGit(cwd);
     try {

package/build/workflow/drive.js

@@ -47,7 +47,6 @@ export async function driveServant(input) {
     const traceState = computeTraceState(traceContent);
     const title = keiyakuBranch.slice("keiyaku/".length);
     const goal = readGoalFromKeiyaku(keiyakuContent);
-    const keiyakuContext = readKeiyakuSection(keiyakuContent, "Context");
     const constraints = readKeiyakuSection(keiyakuContent, "Constraints");
     const criteria = readKeiyakuSection(keiyakuContent, "Acceptance Criteria");
     const normalizedDirective = requireText("directive", directive);
@@ -74,7 +73,6 @@ export async function driveServant(input) {
             diff,
             summary,
             goal,
-            context: keiyakuContext,
             constraints,
             criteria,
             currentBranch: keiyakuBranch,

package/build/workflow/present.js

@@ -97,8 +97,6 @@ function requireChecks(name, values) {
 }
 export async function presentWork(input) {
     const { cwd } = input;
-    requireChecks("criteriaChecks", input.criteriaChecks);
-    requireChecks("constraintsChecks", input.constraintsChecks);
     const isRepo = await git.isGitRepo(cwd);
     if (!isRepo) {
         throw new FlowError("NOT_GIT_REPO", `${cwd} is not a git repository`);
@@ -135,14 +133,17 @@ export async function presentWork(input) {
             status: "success",
             result: "dropped",
             round,
-            currentBranch: keiyakuBranch,
+            currentBranch: baseBranch,
             baseBranch,
+            deletedBranch: keiyakuBranch,
             diff: "Forfeited without merge.",
         };
     }
     await ensureKeiyakuFiles(cwd);
     const traceContent = await readTraceContent(cwd);
     if (petition === "CLAIM") {
+        requireChecks("criteriaChecks", input.criteriaChecks);
+        requireChecks("constraintsChecks", input.constraintsChecks);
         const verdict = await resolveVerdictConfig(cwd);
         const failedCommandments = CLOSE_SCORE_FIELDS.flatMap((field) => {
             const score = input[field];
@@ -194,6 +195,7 @@ export async function presentWork(input) {
             console.error(invokeMergeLog);
             appendDebugLog(invokeMergeLog, { cwd, section: "script" });
             await git.merge(cwd, keiyakuBranch, message);
+            const mergedCommit = await git.getLatestCommitHash(cwd);
             const invokeFinalizeLog = `[CLAIM] Deleting merged branch '${keiyakuBranch}' and clearing metadata`;
             console.error(invokeFinalizeLog);
             appendDebugLog(invokeFinalizeLog, { cwd, section: "script" });
@@ -202,10 +204,13 @@ export async function presentWork(input) {
             const round = computeTraceState(traceContent).maxRound;
             return {
                 status: "success",
-                result: "done",
+                result: "merged",
                 round,
-                currentBranch: keiyakuBranch,
+                currentBranch: baseBranch,
                 baseBranch,
+                mergedCommit,
+                mergedInto: baseBranch,
+                deletedBranch: keiyakuBranch,
                 diff,
             };
         }

package/build/workflow/prompts.js

@@ -28,12 +28,12 @@ Round: 1 (initial implementation).
 - [Logic delta]: [Key architectural or logic shift]
 
 ## Aesthetics Gap
-Self-critique.
-- precise: [score/reasoning]
-- minimal: [score/reasoning]
-- isolated: [score/reasoning]
-- idiomatic: [score/reasoning]
-- cohesive: [score/reasoning]
+Self-critique (The Delta). Focus only on what is missing or imperfect relative to the ideal. No scores.
+- precise (Architectural placement): [Gap from exact layer/boundary, zero misplacement]
+- minimal (Economy of change): [Gap from no avoidable lines, no speculative edits, no hidden bloat]
+- isolated (Surgical containment): [Gap from zero unrelated files, zero opportunistic cleanup, zero collateral]
+- idiomatic (Native fluency): [Gap from naming, structure, style indistinguishable from the codebase]
+- cohesive (Single responsibility): [Gap from each unit does one thing, boundaries intact]
 
 ## Blindspots
 - [Unintentional side effects or untested paths]
@@ -70,12 +70,12 @@ Round: ${round} (iteration after review).
 - [Logic delta]: [Key architectural or logic shift]
 
 ## Aesthetics Gap
-Self-critique.
-- precise: [score/reasoning]
-- minimal: [score/reasoning]
-- isolated: [score/reasoning]
-- idiomatic: [score/reasoning]
-- cohesive: [score/reasoning]
+Self-critique (The Delta). Focus only on what is missing or imperfect relative to the ideal. No scores.
+- precise (Architectural placement): [Gap from exact layer/boundary, zero misplacement]
+- minimal (Economy of change): [Gap from no avoidable lines, no speculative edits, no hidden bloat]
+- isolated (Surgical containment): [Gap from zero unrelated files, zero opportunistic cleanup, zero collateral]
+- idiomatic (Native fluency): [Gap from naming, structure, style indistinguishable from the codebase]
+- cohesive (Single responsibility): [Gap from each unit does one thing, boundaries intact]
 
 ## Blindspots
 - [Unintentional side effects or untested paths]

package/build/workflow/response-builders.js

@@ -146,7 +146,6 @@ export function buildDriveResponse(result, input) {
     const { status: _status, ...resultData } = result;
     const summarySection = buildSection("Summary", result.summary);
     const goalSection = buildSection("Goal", truncateForDisplay(result.goal, 800));
-    const contextSection = buildSection("Context", truncateForDisplay(result.context ?? "", 1200));
     const constraintsSection = buildSection("Constraints", truncateForDisplay(result.constraints ?? "", 1200));
     const criteriaSection = buildSection("Criteria", truncateForDisplay(result.criteria ?? "", 1200));
     const diffSection = buildSection("Diff", result.diff);
@@ -156,7 +155,7 @@ export function buildDriveResponse(result, input) {
         ...formatMaybe("Current Branch", result.currentBranch, 200),
         ...formatMaybe("Base Branch", result.baseBranch, 200),
     ];
-    const text = assembleResponse(`◆ Driven (Round ${result.round})`, `Updated branch '${result.currentBranch}'.`, [summarySection, goalSection, contextSection, constraintsSection, criteriaSection, diffSection].filter((section) => section !== null), infoLines);
+    const text = assembleResponse(`◆ Driven (Round ${result.round})`, `Updated branch '${result.currentBranch}'.`, [summarySection, goalSection, constraintsSection, criteriaSection, diffSection].filter((section) => section !== null), infoLines);
     return {
         content: [{ type: "text", text }],
         structuredContent: buildSuccessStructuredContent(getDriveToolName(), resultData),
@@ -181,6 +180,10 @@ export function buildCloseDoneResponse(result, input) {
     const diffSection = result.diff ? buildSection("Diff", result.diff) : "";
     const infoLines = [
         ...formatMaybe("Path", input.cwd, 300),
+        ...formatMaybe("Result", result.result, 100),
+        ...formatMaybe("Merged Commit", result.mergedCommit, 100),
+        ...formatMaybe("Merged Into", result.mergedInto, 200),
+        ...formatMaybe("Deleted Branch", result.deletedBranch, 200),
         ...formatMaybe("Current Branch", result.currentBranch, 200),
         ...formatMaybe("Base Branch", result.baseBranch, 200),
         ...formatList("Criteria Checks", input.criteriaChecks, { maxItems: 10, maxItemChars: 220 }),
@@ -188,7 +191,7 @@ export function buildCloseDoneResponse(result, input) {
         `Scores: precise=${input.score_precise}/10 minimal=${input.score_minimal}/10 isolated=${input.score_isolated}/10 idiomatic=${input.score_idiomatic}/10 cohesive=${input.score_cohesive}/10`,
         ...formatMaybe("Oath", input.oath, 220),
     ];
-    const text = assembleResponse("✓ Keiyaku Fulfilled (CLAIM)", `Merged '${result.currentBranch}' into '${result.baseBranch}'. Deleted feature branch.`, [typeof diffSection === "string" ? null : diffSection].filter((section) => section !== null), infoLines);
+    const text = assembleResponse("✓ Keiyaku Fulfilled (CLAIM)", `Merged '${result.deletedBranch}' into '${result.mergedInto}' (commit: ${result.mergedCommit}). Deleted feature branch.`, [typeof diffSection === "string" ? null : diffSection].filter((section) => section !== null), infoLines);
     return {
         content: [{ type: "text", text }],
         structuredContent: buildSuccessStructuredContent(closeToolName, resultData),
@@ -199,23 +202,19 @@ export function buildCloseDropResponse(result, input) {
     const closeToolName = getCloseToolName();
     const infoLines = [
         ...formatMaybe("Path", input.cwd, 300),
+        ...formatMaybe("Deleted Branch", result.deletedBranch, 200),
         ...formatMaybe("Current Branch", result.currentBranch, 200),
         ...formatMaybe("Base Branch", result.baseBranch, 200),
-        ...formatList("Reasons/Checks", input.criteriaChecks, { maxItems: 10, maxItemChars: 220 }),
-        ...formatList("Constraints Checks", input.constraintsChecks ?? [], { maxItems: 10, maxItemChars: 220 }),
-        `Scores: precise=${input.score_precise}/10 minimal=${input.score_minimal}/10 isolated=${input.score_isolated}/10 idiomatic=${input.score_idiomatic}/10 cohesive=${input.score_cohesive}/10`,
     ];
-    const text = assembleResponse("✗ Keiyaku Forfeited (FORFEIT)", `Deleted '${result.currentBranch}'. Switched back to '${result.baseBranch}'.`, [], infoLines);
+    const text = assembleResponse("✗ Keiyaku Forfeited (FORFEIT)", `Deleted '${result.deletedBranch}'. Switched back to '${result.baseBranch}'.`, [], infoLines);
     return {
         content: [{ type: "text", text }],
         structuredContent: buildSuccessStructuredContent(closeToolName, resultData),
     };
 }
 export function buildToolErrorResponse(input) {
-    const inputEcho = (input.inputEcho ?? []).map((line) => truncateForDisplay(line, 800));
     const shouldRaiseProtocolError = input.errorType === "runtime_error";
-    const contextSection = buildSection("Context", inputEcho);
-    const text = assembleResponse(colorizeErrorStatus("!! FAILED !!"), input.message, [contextSection].filter((section) => section !== null), [`Hint: ${input.hint}`]);
+    const text = assembleResponse(colorizeErrorStatus("!! FAILED !!"), input.message, [], [`Hint: ${input.hint}`]);
     const response = {
         content: [{ type: "text", text }],
         structuredContent: {

package/package.json

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