@astrosheep/keiyaku 0.1.48 → 0.1.49

package/build/utils/keiyaku-document/parser.js

@@ -38,6 +38,10 @@ class MarkdownParser {
                 blocks.push(this.parseList(token.indent, token.ordered));
                 continue;
             }
+            if (token.type === "blockquote") {
+                blocks.push(this.parseBlockquote());
+                continue;
+            }
             blocks.push(this.parseText(shouldStop));
         }
         return blocks;
@@ -92,6 +96,24 @@ class MarkdownParser {
             text: header.text,
         };
     }
+    parseBlockquote() {
+        const lines = [];
+        let marker = "> ";
+        while (!this.isEof()) {
+            const token = this.peek();
+            if (!token || token.type !== "blockquote")
+                break;
+            marker = token.marker;
+            lines.push(token.body);
+            this.consume();
+        }
+        return {
+            type: "blockquote",
+            marker,
+            lines,
+            value: lines.join("\n"),
+        };
+    }
     parseList(indent, ordered) {
         const items = [];
         while (!this.isEof()) {
@@ -181,6 +203,8 @@ class MarkdownParser {
                 break;
             if (token.type === "list_marker" && token.indent <= 3)
                 break;
+            if (token.type === "blockquote")
+                break;
             if (this.options.allowSections && isSectionHeaderToken(token))
                 break;
             lines.push(token.raw);

package/build/utils/keiyaku-document/render.js

@@ -21,6 +21,8 @@ export function renderBlock(node) {
             return node.items.map((item) => renderListItemFirstLine(item)).join("\n");
         case "code_block":
             return node.lines.join("\n");
+        case "blockquote":
+            return node.lines.map((line) => `${node.marker}${line}`).join("\n");
         case "text":
             return node.value;
         case "heading":
@@ -39,6 +41,8 @@ export function renderNodeContent(node) {
             return node.children.map((child) => renderBlock(child)).join("\n");
         case "code_block":
             return node.lines.join("\n");
+        case "blockquote":
+            return node.lines.map((line) => `${node.marker}${line}`).join("\n");
         case "text":
             return node.value;
         case "heading":

package/build/utils/keiyaku-document.test.js

@@ -55,6 +55,17 @@ test("parseToAST keeps fenced code blocks as structured nodes", () => {
     assert.equal(section.children[0]?.type === "code_block" ? section.children[0].lines.join("\n") : "", "```md\n## Not A Section\n```");
     assert.equal(section.children[1]?.type === "text" ? section.children[1].value : "", "After fence.");
 });
+test("parseToAST keeps blockquote blocks as structured nodes", () => {
+    const markdown = ["## Summary", "> ## Outcome", "> Implemented parser.", ">", "> ## Changes", "> - Added tests."].join("\n");
+    const ast = parseToAST(markdown);
+    const section = ast.children[0];
+    assert.equal(section?.type, "section");
+    if (section?.type !== "section")
+        return;
+    assert.equal(section.children[0]?.type, "blockquote");
+    assert.equal(section.children[0]?.type === "blockquote" ? section.children[0].value : "", "## Outcome\nImplemented parser.\n\n## Changes\n- Added tests.");
+    assert.equal(section.children[0]?.type === "blockquote" ? renderSectionContent(section) : "", "> ## Outcome\n> Implemented parser.\n> \n> ## Changes\n> - Added tests.");
+});
 test("parseMarkdownListSection flattens list items and ignores source headers", () => {
     const markdown = [
         "## Group A",

package/build/utils/trace.js

@@ -6,6 +6,8 @@ import { parseToAST } from "./keiyaku-document/index.js";
 const DIFF_COORDINATES_SECTION_PREFIX = "Diff Coordinates";
 const DIFF_COORDINATES_FENCE = "```keiyaku-coords";
 const DIFF_COORDINATE_LINE_RE = /^(.*):(\d+)(?:-(\d+))?$/;
+const BLOCKQUOTE_PREFIX = "> ";
+const EMPTY_BLOCKQUOTE_LINE = ">";
 async function fileExists(cwd, filepath) {
     try {
         await fs.access(path.join(cwd, filepath));
@@ -33,6 +35,7 @@ export async function appendReview(cwd, round, reason) {
 export async function appendRoundReport(cwd, report) {
     const summaryText = report.summary.trim().length > 0 ? report.summary : "Unknown error.";
     const tracePath = path.join(cwd, TRACE_FILE);
+    const quotedSummary = summaryText.split(/\r?\n/).map((line) => (line.length > 0 ? `${BLOCKQUOTE_PREFIX}${line}` : EMPTY_BLOCKQUOTE_LINE));
     const lines = [
         "",
         "---",
@@ -41,9 +44,7 @@ export async function appendRoundReport(cwd, report) {
         "### Status",
         report.status,
         "### Summary",
-        "```markdown",
-        summaryText,
-        "```",
+        ...quotedSummary,
     ];
     if (report.errorMessage) {
         lines.push("### Error", report.errorMessage);
@@ -62,9 +63,7 @@ export async function appendRoundSystemNote(cwd, round, note) {
         "### Status",
         "FAILED",
         "### Summary",
-        "```markdown",
-        "Subagent execution cancelled by user/client.",
-        "```",
+        `${BLOCKQUOTE_PREFIX}Subagent execution cancelled by user/client.`,
         "### Error",
         note,
         "",

package/build/workflow/ask-execution.js

@@ -1,8 +1,17 @@
-import { getLatestCommitHash } from "../utils/git-ops.js";
+import { TRACE_FILE } from "../common/constants.js";
 import { appendAsk } from "../utils/trace.js";
 import { appendDebugLog } from "../utils/debug-log.js";
+import { logWarn } from "../utils/logger.js";
 import { runAsk } from "./ask.js";
+import { assertKeiyakuProtocolFiles } from "./keiyaku.js";
 import { persistAskHistory } from "../utils/ask-history.js";
+import * as git from "../utils/git.js";
+const ASK_TRACE_COMMIT_PREFIX = "ask: ";
+const ASK_TRACE_COMMIT_SUMMARY_MAX_CHARS = 50;
+function buildAskTraceCommitMessage(request) {
+    const summary = request.replaceAll(/\s+/g, " ").trim().slice(0, ASK_TRACE_COMMIT_SUMMARY_MAX_CHARS);
+    return `${ASK_TRACE_COMMIT_PREFIX}${summary}`;
+}
 export async function runAskAndPersist(input) {
     const result = await runAsk(input);
     let warning;
@@ -10,7 +19,7 @@ export async function runAskAndPersist(input) {
     try {
         let commit;
         try {
-            commit = await getLatestCommitHash(input.cwd);
+            commit = await git.getLatestCommitHash(input.cwd);
         }
         catch {
             // Ask can run outside git repos; history should still be persisted.
@@ -41,6 +50,25 @@ export async function runAskAndPersist(input) {
             summary: result.summary,
             diffStats: result.diffStats,
         });
+        try {
+            const activeState = await git.getActiveKeiyakuGitState(input.cwd);
+            if (activeState) {
+                await assertKeiyakuProtocolFiles(input.cwd);
+                try {
+                    await git.addFiles(input.cwd, TRACE_FILE);
+                    await git.commit(input.cwd, buildAskTraceCommitMessage(input.request));
+                }
+                catch (error) {
+                    const message = error instanceof Error ? error.message : String(error);
+                    const commitWarning = `Failed to commit ask trace update: ${message}`;
+                    logWarn(commitWarning, { cwd: input.cwd, section: "script" });
+                    warning = warning ? `${warning}\n${commitWarning}` : commitWarning;
+                }
+            }
+        }
+        catch {
+            // Non-active keiyaku or missing protocol files should not block ask.
+        }
     }
     catch (askTraceError) {
         const askTraceErrorMessage = askTraceError instanceof Error ? askTraceError.message : String(askTraceError);

package/build/workflow/drive.js

@@ -7,7 +7,7 @@ import * as git from "../utils/git.js";
 import { KeiyakuParseError, parseMarkdownStructure } from "../utils/keiyaku-document/index.js";
 import { logWarn } from "../utils/logger.js";
 import { renderToolRoundSummary } from "./round-summary.js";
-import { assertCleanWorkingTree, buildNoActiveKeiyakuGuidance, ensureKeiyakuFiles } from "./contract.js";
+import { assertCleanWorkingTree, assertKeiyakuProtocolFiles, buildNoActiveKeiyakuGuidance } from "./keiyaku.js";
 import { buildRoundCommitMessage, runAndRecordRound } from "./round.js";
 import { resolveIncrementalDiffMode } from "../config/incremental-diff-mode.js";
 import { buildIteratePlan } from "./iterate-plan.js";
@@ -58,7 +58,7 @@ export async function driveServant(input) {
         throw new FlowError("MISSING_KEIYAKU_BASE", `branch ${keiyakuBranch} is missing base metadata; cannot continue drive`);
     }
     await assertCleanWorkingTree(cwd, [KEIYAKU_DRAFT_FILE]);
-    await ensureKeiyakuFiles(cwd);
+    await assertKeiyakuProtocolFiles(cwd);
     const keiyakuContent = await fs.readFile(path.join(cwd, KEIYAKU_FILE), "utf-8");
     const parsedKeiyaku = parseKeiyakuStructure(keiyakuContent);
     const traceContent = await readTraceContent(cwd);

package/build/workflow/{contract.js → keiyaku.js}

@@ -7,7 +7,7 @@ import * as git from "../utils/git.js";
 import { resolveOath } from "./oath.js";
 export { resolveOath };
 const DIRTY_WORKTREE_LIST_LIMIT = 10;
-export async function ensureKeiyakuFiles(cwd) {
+export async function assertKeiyakuProtocolFiles(cwd) {
     const keiyakuPath = path.join(cwd, KEIYAKU_FILE);
     const tracePath = path.join(cwd, TRACE_FILE);
     try {

package/build/workflow/markdown-normalization.js

@@ -19,7 +19,7 @@ export function demoteMarkdownHeadings(text, minLevel = 3) {
             if (node.type === "heading") {
                 shallowest = shallowest === null ? node.level : Math.min(shallowest, node.level);
             }
-            if (node.type === "code_block" || node.type === "text")
+            if (node.type === "code_block" || node.type === "blockquote" || node.type === "text")
                 continue;
             if (node.type === "document" || node.type === "section" || node.type === "list_item") {
                 stack.push(...node.children);
@@ -41,6 +41,7 @@ export function demoteMarkdownHeadings(text, minLevel = 3) {
                 return nextLevel === node.level ? node : { ...node, level: nextLevel };
             }
             case "code_block":
+            case "blockquote":
             case "text":
                 return node;
             case "document":

package/build/workflow/present.js

@@ -5,10 +5,11 @@ import { KEIYAKU_ARCHIVE_TAG_PREFIX, KEIYAKU_BRANCH_PREFIX, KEIYAKU_DRAFT_FILE,
 import { resolveTermPreset } from "../config/term-presets/index.js";
 import { logInfo, logWarn } from "../utils/logger.js";
 import { FlowError, wrapFlowError } from "../common/errors.js";
+import { readDraftSnapshot, restoreDraftSnapshot } from "../utils/draft.js";
 import * as git from "../utils/git.js";
 import { appendVerdict, computeTraceState, readTraceContent } from "../utils/trace.js";
 import { oathMatches } from "./oath.js";
-import { assertCleanWorkingTree, buildNoActiveKeiyakuGuidance, ensureKeiyakuFiles, resolveOath } from "./contract.js";
+import { assertCleanWorkingTree, assertKeiyakuProtocolFiles, buildNoActiveKeiyakuGuidance, resolveOath } from "./keiyaku.js";
 const DIMENSIONS = [
     "placement",
     "exactness",
@@ -212,14 +213,7 @@ export async function presentWork(input) {
     }
     const title = keiyakuBranch.slice(KEIYAKU_BRANCH_PREFIX.length);
     const petition = input.petition;
-    let draftKept = false;
-    try {
-        const stat = await fs.stat(path.join(cwd, KEIYAKU_DRAFT_FILE));
-        draftKept = stat.isFile();
-    }
-    catch {
-        // ignored
-    }
+    const draftSnapshot = await readDraftSnapshot(cwd);
     if (petition === "FORFEIT") {
         const archiveTag = `${KEIYAKU_ARCHIVE_TAG_PREFIX}${title}`;
         let round = 0;
@@ -238,6 +232,9 @@ export async function presentWork(input) {
                 await git.discardAllWorkingTreeChanges(cwd);
             }
             await git.checkoutBranch(cwd, baseBranch);
+            if (draftSnapshot) {
+                await restoreDraftSnapshot(cwd, draftSnapshot);
+            }
             await git.deleteBranch(cwd, keiyakuBranch, true);
             await git.clearKeiyakuBase(cwd, keiyakuBranch);
         }
@@ -256,10 +253,10 @@ export async function presentWork(input) {
                 ? `Forfeited without merge. Dropped ${droppedChanges.length} local change(s).`
                 : "Forfeited without merge.",
             droppedChanges,
-            draftKept,
+            draftPath: draftSnapshot?.path ?? null,
         };
     }
-    await ensureKeiyakuFiles(cwd);
+    await assertKeiyakuProtocolFiles(cwd);
     let traceContent = await readTraceContent(cwd);
     if (petition === "CLAIM") {
         const driveCommandName = resolveTermPreset().tools.drive.name;
@@ -340,7 +337,7 @@ export async function presentWork(input) {
                 mergedInto: baseBranch,
                 deletedBranch: keiyakuBranch,
                 diff,
-                draftKept,
+                draftPath: draftSnapshot?.path ?? null,
             };
         }
         catch (err) {

package/build/workflow/response-builders.js

@@ -6,6 +6,12 @@ const FORMAT_LIST_MAX_ITEMS = 16;
 const FORMAT_LIST_MAX_ITEM_CHARS = 400;
 const RULES_SECTION_MAX_CHARS = 5000;
 const BRANCH_LABEL = "Branch";
+const INFO_SECTION_TITLE = "Info";
+const HINTS_SECTION_TITLE = "Hints";
+const STATUS_KEIYAKU_SECTION_TITLE = "Keiyaku";
+const STATUS_BLOCKED_SECTION_TITLE = "Blocked";
+const STATUS_ACTIVE_SUMMARY_PREFIX = "● Active";
+const STATUS_INACTIVE_SUMMARY = "○ Inactive";
 // --- Helpers ---
 function truncateForDisplay(raw, maxChars = DISPLAY_TEXT_MAX_CHARS) {
     const text = raw.trim();
@@ -47,17 +53,14 @@ function buildSection(title, content) {
         return null;
     return { title, body };
 }
-function formatBlockedOperation(label, readiness) {
-    if (readiness.available)
+function formatBlockedOperation(label, blockers) {
+    if (blockers.length === 0)
         return [];
     return [
-        `${label}: blocked ✕`,
-        ...formatList(`${label} Blockers`, readiness.blockers, { maxItems: 10, maxItemChars: 300 }),
+        `${label}:`,
+        ...formatList(`${label} Blockers`, blockers, { maxItems: 10, maxItemChars: 300 }),
     ];
 }
-function formatStatusFileSignal(signal) {
-    return `${signal.path}: ${signal.present ? "present ✓" : "missing ✕"}`;
-}
 function buildSuccessStructuredContent(data) {
     return {
         status: "success",
@@ -71,9 +74,9 @@ export function buildKeiyakuSuccessResponse(result, input) {
     const responseData = normalizedRules ? { ...resultData, rules: normalizedRules } : { ...resultData };
     const summarySection = buildSection("Summary", result.summary);
     const rulesSection = buildSection("Rules", truncateForDisplay(normalizedRules, RULES_SECTION_MAX_CHARS));
-    const hintsSection = buildSection("Hints", formatHints(result.meta?.hints ?? [], { maxItems: 12, maxItemChars: 400 }));
+    const hintsSection = buildSection(HINTS_SECTION_TITLE, formatHints(result.meta?.hints ?? [], { maxItems: 12, maxItemChars: 400 }));
     const diffSection = buildSection(DIFF_OVERVIEW_SECTION_TITLE, result.diff);
-    const infoLines = [
+    const infoSection = buildSection(INFO_SECTION_TITLE, [
         ...formatMaybe("Identity", input.name, 120),
         ...formatMaybe("Consumed from_file and deleted", result.consumedFromFile, 300),
         ...formatList("Existing local keiyaku branches (non-blocking)", result.existingBranches ?? [], {
@@ -83,11 +86,11 @@ export function buildKeiyakuSuccessResponse(result, input) {
         ...formatMaybe(BRANCH_LABEL, result.currentBranch, 200),
         ...formatMaybe("Base Branch", result.baseBranch, 200),
         ...formatMaybe("Commit", result.commit, 100),
-    ];
+    ]);
     const summaryLine = result.commit
         ? `Created branch '${result.currentBranch}' (base: '${result.baseBranch}') [${result.commit}].`
         : `Created branch '${result.currentBranch}' (base: '${result.baseBranch}').`;
-    const text = assembleResponse(`${RESPONSE_MARKERS.round} Started (Round ${result.round})`, summaryLine, [summarySection, rulesSection, hintsSection, diffSection].filter((section) => section !== null), infoLines);
+    const text = assembleResponse(`${RESPONSE_MARKERS.round} Started (Round ${result.round})`, summaryLine, [summarySection, rulesSection, infoSection, diffSection, hintsSection].filter((section) => section !== null));
     return {
         content: [{ type: "text", text }],
         structuredContent: buildSuccessStructuredContent(responseData),
@@ -96,18 +99,18 @@ export function buildKeiyakuSuccessResponse(result, input) {
 export function buildDriveResponse(result, input) {
     const { status: _status, ...resultData } = result;
     const summarySection = buildSection("Summary", result.summary);
-    const hintsSection = buildSection("Hints", formatHints(result.meta?.hints ?? [], { maxItems: 12, maxItemChars: 400 }));
+    const hintsSection = buildSection(HINTS_SECTION_TITLE, formatHints(result.meta?.hints ?? [], { maxItems: 12, maxItemChars: 400 }));
     const diffSection = buildSection(DIFF_OVERVIEW_SECTION_TITLE, result.diff);
-    const infoLines = [
+    const infoSection = buildSection(INFO_SECTION_TITLE, [
         ...formatMaybe("Identity", input.name, 120),
         ...formatMaybe(BRANCH_LABEL, result.currentBranch, 200),
         ...formatMaybe("Base Branch", result.baseBranch, 200),
         ...formatMaybe("Commit", result.commit, 100),
-    ];
+    ]);
     const summaryLine = result.commit
         ? `Updated branch '${result.currentBranch}' [${result.commit}].`
         : `Updated branch '${result.currentBranch}'.`;
-    const text = assembleResponse(`${RESPONSE_MARKERS.round} Driven (Round ${result.round})`, summaryLine, [summarySection, hintsSection, diffSection].filter((section) => section !== null), infoLines);
+    const text = assembleResponse(`${RESPONSE_MARKERS.round} Driven (Round ${result.round})`, summaryLine, [summarySection, infoSection, diffSection, hintsSection].filter((section) => section !== null));
     return {
         content: [{ type: "text", text }],
         structuredContent: buildSuccessStructuredContent(resultData),
@@ -149,7 +152,8 @@ export function buildCloseDoneResponse(result, input) {
         `Scores: placement=${input.placement} exactness=${input.exactness} containment=${input.containment} idiomatic=${input.idiomatic} cohesive=${input.cohesive}  [total: ${input.placement + input.exactness + input.containment + input.idiomatic + input.cohesive}/50]`,
         ...formatMaybe("Oath", input.oath, 220),
     ];
-    const text = assembleResponse(`${RESPONSE_MARKERS.claim} Keiyaku Fulfilled (Claim)`, `Merged '${result.deletedBranch}' into '${result.mergedInto}'${result.commit ? ` [${result.commit}]` : ''}. Deleted feature branch.${result.draftKept ? " Draft 'KEIYAKU.draft.md' kept." : ''}`, [diffSection].filter((section) => section !== null), infoLines);
+    const draftPathMessage = result.draftPath ? ` Draft kept at '${result.draftPath}'.` : "";
+    const text = assembleResponse(`${RESPONSE_MARKERS.claim} Keiyaku Fulfilled (Claim)`, `Merged '${result.deletedBranch}' into '${result.mergedInto}'${result.commit ? ` [${result.commit}]` : ''}. Deleted feature branch.${draftPathMessage}`, [diffSection].filter((section) => section !== null), infoLines);
     return {
         content: [{ type: "text", text }],
         structuredContent: buildSuccessStructuredContent(resultData),
@@ -165,7 +169,8 @@ export function buildCloseDropResponse(result, _input) {
         ...formatMaybe(BRANCH_LABEL, result.currentBranch, 200),
         ...formatMaybe("Base Branch", result.baseBranch, 200),
     ];
-    const text = assembleResponse(`${RESPONSE_MARKERS.forfeit} Keiyaku Forfeited (Forfeit)`, `Deleted '${result.deletedBranch}'. Switched back to '${result.baseBranch}'.${result.archiveTag ? ` Archived at '${result.archiveTag}'.` : ""}${droppedChanges.length > 0 ? ` Dropped ${droppedChanges.length} local change(s).` : ''}${result.draftKept ? " Draft 'KEIYAKU.draft.md' kept." : ''}`, [warningSection].filter((section) => section !== null), infoLines);
+    const draftPathMessage = result.draftPath ? ` Draft kept at '${result.draftPath}'.` : "";
+    const text = assembleResponse(`${RESPONSE_MARKERS.forfeit} Keiyaku Forfeited (Forfeit)`, `Deleted '${result.deletedBranch}'. Switched back to '${result.baseBranch}'.${result.archiveTag ? ` Archived at '${result.archiveTag}'.` : ""}${droppedChanges.length > 0 ? ` Dropped ${droppedChanges.length} local change(s).` : ''}${draftPathMessage}`, [warningSection].filter((section) => section !== null), infoLines);
     return {
         content: [{ type: "text", text }],
         structuredContent: buildSuccessStructuredContent(resultData),
@@ -202,66 +207,46 @@ export function buildHelpResponse(input) {
     };
 }
 export function buildStatusResponse(result, labels) {
-    const { active: _active, branch: _branch, protocolFiles: _protocolFiles, keiyakuPreview: _keiyakuPreview, lastRoundPreview: _lastRoundPreview, ...resultData } = result;
     const blockedItems = {};
-    if (result.operationReadiness.start.blockers.length > 0) {
-        blockedItems[labels.start] = result.operationReadiness.start.blockers;
+    if (result.blockedByOperation.start.length > 0) {
+        blockedItems[labels.start] = result.blockedByOperation.start;
     }
-    if (result.operationReadiness.drive.blockers.length > 0) {
-        blockedItems[labels.drive] = result.operationReadiness.drive.blockers;
+    if (result.blockedByOperation.drive.length > 0) {
+        blockedItems[labels.drive] = result.blockedByOperation.drive;
     }
-    if (result.operationReadiness.present.blockers.length > 0) {
-        blockedItems[labels.present] = result.operationReadiness.present.blockers;
+    if (result.blockedByOperation.present.length > 0) {
+        blockedItems[labels.close] = result.blockedByOperation.present;
     }
-    const operationReadiness = {
-        [labels.start]: result.operationReadiness.start,
-        [labels.drive]: result.operationReadiness.drive,
-        [labels.present]: result.operationReadiness.present,
-    };
     const summaryLine = result.branch
-        ? `Active contract on '${result.branch}'.`
-        : "No active contract branch.";
-    const draftFileInfo = result.protocolFiles.draft.present
-        ? [
-            `present`,
-            `tracked=${result.protocolFiles.draft.tracked ? "yes" : "no"}`,
-            `dirty=${result.protocolFiles.draft.dirty ? "yes" : "no"}`,
-        ].join(", ")
-        : "missing";
+        ? `${STATUS_ACTIVE_SUMMARY_PREFIX} — ${result.branch} (round ${result.round})`
+        : STATUS_INACTIVE_SUMMARY;
     const stateLines = [
-        ...formatMaybe("Active Branch", result.branch, 200),
-        ...formatMaybe("Base Branch", result.baseBranch, 200),
-        `Round: ${result.round}`,
+        ...formatMaybe("Keiyaku Preview", result.keiyakuPreview, 400),
         ...formatMaybe("Last Round Preview", result.lastRoundPreview, 400),
-    ];
-    const protocolLines = [
-        formatStatusFileSignal(result.protocolFiles.keiyaku),
-        formatStatusFileSignal(result.protocolFiles.trace),
-        `${result.protocolFiles.draft.path}: ${draftFileInfo}`,
+        ...formatMaybe("Draft Preview", result.draftPreview, 400),
     ];
     const readinessLines = [
-        ...formatBlockedOperation(labels.start, result.operationReadiness.start),
-        ...formatBlockedOperation(labels.drive, result.operationReadiness.drive),
-        ...formatBlockedOperation(labels.present, result.operationReadiness.present),
+        ...formatBlockedOperation(labels.start, result.blockedByOperation.start),
+        ...formatBlockedOperation(labels.drive, result.blockedByOperation.drive),
+        ...formatBlockedOperation(labels.close, result.blockedByOperation.present),
     ];
-    if (readinessLines.length === 0) {
-        readinessLines.push("No blocked operations detected from repository/protocol state.");
-    }
     const hintLines = formatHints(result.hints, { maxItems: 12, maxItemChars: 400 });
     const text = assembleResponse(`${RESPONSE_MARKERS.round} Status`, summaryLine, [
-        buildSection("Keiyaku", stateLines),
-        buildSection("Warning", readinessLines),
-        buildSection("Hints", hintLines),
-        buildSection("Info", protocolLines),
+        buildSection(STATUS_KEIYAKU_SECTION_TITLE, stateLines),
+        buildSection(STATUS_BLOCKED_SECTION_TITLE, readinessLines),
+        buildSection(HINTS_SECTION_TITLE, hintLines),
     ].filter((section) => section !== null));
     return {
         content: [{ type: "text", text }],
         structuredContent: buildSuccessStructuredContent({
-            ...resultData,
+            active: result.active,
+            round: result.round,
+            baseBranch: result.baseBranch,
+            hints: result.hints,
             currentKeiyakuBranch: result.branch ?? null,
             keiyakuPreview: result.keiyakuPreview ?? null,
             lastRoundPreview: result.lastRoundPreview ?? null,
-            draftPreview: result.protocolFiles.draft.present ? draftFileInfo : null,
+            draftPreview: result.draftPreview ?? null,
             blockedItems,
         }),
     };

package/build/workflow/response-renderer.js

@@ -1,4 +1,4 @@
-import { DIFF_OVERVIEW_SECTION_TITLE, SECTION_ICONS } from "../common/response-style.js";
+import { SECTION_ICONS } from "../common/response-style.js";
 const HEADER_MAX_WIDTH = 40;
 const HEADER_DASH = "┈";
 function supportsHeaderColor() {
@@ -50,21 +50,10 @@ export function assembleResponse(status, summary, sections, infoLines = []) {
     if (summaryLine) {
         statusLines.push(`↳ ${summaryLine}`);
     }
-    const normalSections = [];
-    const diffSections = [];
-    for (const section of sections) {
-        if (section.title.trim().toLowerCase() === DIFF_OVERVIEW_SECTION_TITLE.toLowerCase()) {
-            diffSections.push(section);
-        }
-        else {
-            normalSections.push(section);
-        }
-    }
-    const fullSections = [...normalSections];
+    const fullSections = [...sections];
     if (infoLines.length > 0) {
         fullSections.push({ title: "Info", body: infoLines.join("\n") });
     }
-    fullSections.push(...diffSections);
     const renderedSections = fullSections
         .map((section) => {
         const body = section.body.trim();

package/build/workflow/start.js

@@ -7,7 +7,7 @@ import * as git from "../utils/git.js";
 import { parseDiffCoordinates } from "../utils/trace.js";
 import { buildStartPrompt } from "./prompts.js";
 import { renderToolRoundSummary } from "./round-summary.js";
-import { assertCleanWorkingTree } from "./contract.js";
+import { assertCleanWorkingTree } from "./keiyaku.js";
 import { runAndRecordRound } from "./round.js";
 import { renderKeiyaku } from "./keiyaku-document-builder.js";
 import { parseAndValidateKeiyakuDraft, } from "./keiyaku-draft.js";