planpong 0.5.7 → 0.6.1

package/dist/src/mcp/tools/record-revision.js

@@ -1,11 +1,12 @@
 import { z } from "zod";
 import { readFileSync } from "node:fs";
 import { resolve } from "node:path";
-import { readSessionState, readRoundFeedback, writeRoundMetrics, } from "../../core/session.js";
+import { readSessionState, readRoundFeedback, readRoundResponse, writeRoundMetrics, withSessionLock, } from "../../core/session.js";
 import { finalizeRevision, writeStatusLineToPlan, } from "../../core/operations.js";
 import { loadConfig } from "../../config/loader.js";
 import { getReviewPhase } from "../../prompts/reviewer.js";
 import { IssueResponseSchema, } from "../../schemas/revision.js";
+import { formatDecisionDisplay } from "../../core/presentation.js";
 /**
  * Inline-mode counterpart to `planpong_revise`. The agent that invoked
  * /pong-review acts as the planner: it edited the plan with its own
@@ -33,110 +34,184 @@ const inputSchema = {
 };
 export async function recordRevisionHandler(input) {
     const cwd = input.cwd ?? process.cwd();
-    const session = readSessionState(cwd, input.session_id);
-    if (!session) {
+    const existing = readSessionState(cwd, input.session_id);
+    if (!existing) {
         return errorResponse(`Session not found: ${input.session_id}`);
     }
-    if (session.status !== "in_review") {
-        return errorResponse(`Session status is '${session.status}', expected 'in_review'`);
-    }
-    if (session.plannerMode !== "inline") {
-        return errorResponse(`session is in ${session.plannerMode} planner mode — use planpong_revise instead`, { planner_mode: session.plannerMode });
-    }
-    if (input.expected_round !== session.currentRound) {
-        return errorResponse(`round ${input.expected_round} already finalized (current round is ${session.currentRound})`, {
-            expected_round: input.expected_round,
-            current_round: session.currentRound,
+    return withSessionLock(cwd, input.session_id, async () => {
+        const session = readSessionState(cwd, input.session_id);
+        if (!session) {
+            return errorResponse(`Session not found: ${input.session_id}`);
+        }
+        if (session.status !== "in_review") {
+            return errorResponse(`Session status is '${session.status}', expected 'in_review'`);
+        }
+        if (session.plannerMode !== "inline") {
+            return errorResponse(`session is in ${session.plannerMode} planner mode — use planpong_revise instead`, { planner_mode: session.plannerMode });
+        }
+        if (input.expected_round !== session.currentRound) {
+            const relation = input.expected_round < session.currentRound ? "stale" : "out-of-order";
+            const message = relation === "stale"
+                ? `stale revision call for round ${input.expected_round}; current round is ${session.currentRound}`
+                : `out-of-order revision call for round ${input.expected_round}; call planpong_get_feedback first`;
+            return errorResponse(message, {
+                expected_round: input.expected_round,
+                current_round: session.currentRound,
+            });
+        }
+        const feedback = readRoundFeedback(cwd, session.id, session.currentRound);
+        if (!feedback) {
+            return errorResponse(`No feedback found for session ${session.id} round ${session.currentRound}. Call planpong_get_feedback first.`);
+        }
+        const existingResponse = readRoundResponse(cwd, session.id, session.currentRound);
+        if (existingResponse &&
+            JSON.stringify(existingResponse.responses) ===
+                JSON.stringify(input.responses)) {
+            const accepted = existingResponse.responses.filter((r) => r.action === "accepted").length;
+            const rejected = existingResponse.responses.filter((r) => r.action === "rejected").length;
+            const deferred = existingResponse.responses.filter((r) => r.action === "deferred").length;
+            const config = loadConfig({ cwd });
+            const sessionConfig = {
+                ...config,
+                planner: session.planner,
+                reviewer: session.reviewer,
+            };
+            const statusLine = writeStatusLineToPlan(session, cwd, sessionConfig, "Revision recorded");
+            return buildRecordRevisionResponse({
+                round: session.currentRound,
+                feedback,
+                revision: existingResponse,
+                responses: existingResponse.responses,
+                accepted,
+                rejected,
+                deferred,
+                unverifiedRejected: countUnverifiedRejected(existingResponse.responses),
+                planUpdated: false,
+                statusLine,
+                idempotentReplay: true,
+            });
+        }
+        if (existingResponse) {
+            return errorResponse(`round ${session.currentRound} already finalized with different responses`, {
+                current_round: session.currentRound,
+                idempotent_replay: false,
+            });
+        }
+        // Validate every issue has a response. Mirrors the planner prompt's
+        // "every issue MUST have an entry in responses" constraint so inline
+        // mode produces the same shape downstream tools expect.
+        const responseIds = new Set(input.responses.map((r) => r.issue_id));
+        const missing = feedback.issues
+            .map((i) => i.id)
+            .filter((id) => !responseIds.has(id));
+        if (missing.length > 0) {
+            return errorResponse(`responses missing for issue(s): ${missing.join(", ")}. Provide one response per feedback issue.`, { missing_issue_ids: missing });
+        }
+        const round = session.currentRound;
+        const phase = getReviewPhase(round);
+        const planPath = resolve(cwd, session.planPath);
+        // Hash before finalize so we can detect "agent forgot to edit".
+        const planHashBefore = session.planHash;
+        // Construct PlannerRevision-shape payload. Direction phase keeps the
+        // full-plan shape; risk/detail keep the edits shape (with empty edits[]
+        // — the agent applied changes via its own Edit tool rather than
+        // declaring them here, so the array is informational-only).
+        const planContent = readFileSync(planPath, "utf-8");
+        const revision = phase === "direction"
+            ? { responses: input.responses, updated_plan: planContent }
+            : { responses: input.responses, edits: [] };
+        const tally = finalizeRevision({
+            session,
+            cwd,
+            round,
+            revision,
+            planPath,
+        });
+        // Plan-hash warn: any accepted issue should correspond to a plan edit.
+        // Surface the no-op case but don't gate — sometimes all issues are
+        // legitimately rejected and the plan correctly stays unchanged.
+        const planUnchanged = session.planHash === planHashBefore;
+        const anyAccepted = input.responses.some((r) => r.action === "accepted");
+        const planUpdateWarning = planUnchanged && anyAccepted
+            ? `Round ${round} has accepted issues but the plan hash is unchanged. Confirm the plan edits were applied.`
+            : undefined;
+        if (planUnchanged && anyAccepted) {
+            process.stderr.write(`[planpong] warn: round ${round} has accepted issues but plan hash is unchanged — did the agent forget to edit?\n`);
+        }
+        // Write fully valid RoundMetrics so bench/run.ts:226 doesn't drop this
+        // round from analysis. Inline revisions have no provider duration —
+        // started_at and completed_at are the same instant.
+        const ts = new Date().toISOString();
+        const metrics = {
+            schema_version: 1,
+            session_id: session.id,
+            round,
+            phase,
+            role: "revision",
+            started_at: ts,
+            completed_at: ts,
+            total_duration_ms: 0,
+            attempts: [],
+            planner_mode: "inline",
+        };
+        writeRoundMetrics(cwd, session.id, round, "revision", metrics);
+        // Update plan status line. Use loadConfig for provider labels (the
+        // status-line writer needs them). In inline mode the planner provider
+        // is informational, not invoked.
+        const config = loadConfig({ cwd });
+        const sessionConfig = {
+            ...config,
+            planner: session.planner,
+            reviewer: session.reviewer,
+        };
+        const statusLine = writeStatusLineToPlan(session, cwd, sessionConfig, "Revision recorded");
+        // Match planpong_revise's unverified_rejected counter so the slash
+        // command can consume either tool's output uniformly.
+        return buildRecordRevisionResponse({
+            round,
+            feedback,
+            revision,
+            responses: input.responses,
+            accepted: tally.accepted,
+            rejected: tally.rejected,
+            deferred: tally.deferred,
+            unverifiedRejected: countUnverifiedRejected(input.responses),
+            planUpdated: !planUnchanged,
+            statusLine,
+            idempotentReplay: !tally.fresh,
+            displayWarning: planUpdateWarning,
         });
-    }
-    const feedback = readRoundFeedback(cwd, session.id, session.currentRound);
-    if (!feedback) {
-        return errorResponse(`No feedback found for session ${session.id} round ${session.currentRound}. Call planpong_get_feedback first.`);
-    }
-    // Validate every issue has a response. Mirrors the planner prompt's
-    // "every issue MUST have an entry in responses" constraint so inline
-    // mode produces the same shape downstream tools expect.
-    const responseIds = new Set(input.responses.map((r) => r.issue_id));
-    const missing = feedback.issues
-        .map((i) => i.id)
-        .filter((id) => !responseIds.has(id));
-    if (missing.length > 0) {
-        return errorResponse(`responses missing for issue(s): ${missing.join(", ")}. Provide one response per feedback issue.`, { missing_issue_ids: missing });
-    }
-    const round = session.currentRound;
-    const phase = getReviewPhase(round);
-    const planPath = resolve(cwd, session.planPath);
-    // Hash before finalize so we can detect "agent forgot to edit".
-    const planHashBefore = session.planHash;
-    // Construct PlannerRevision-shape payload. Direction phase keeps the
-    // full-plan shape; risk/detail keep the edits shape (with empty edits[]
-    // — the agent applied changes via its own Edit tool rather than
-    // declaring them here, so the array is informational-only).
-    const planContent = readFileSync(planPath, "utf-8");
-    const revision = phase === "direction"
-        ? { responses: input.responses, updated_plan: planContent }
-        : { responses: input.responses, edits: [] };
-    const tally = finalizeRevision({
-        session,
-        cwd,
-        round,
-        revision,
-        planPath,
     });
-    // Plan-hash warn: any accepted issue should correspond to a plan edit.
-    // Surface the no-op case but don't gate — sometimes all issues are
-    // legitimately rejected and the plan correctly stays unchanged.
-    const planUnchanged = session.planHash === planHashBefore;
-    const anyAccepted = input.responses.some((r) => r.action === "accepted");
-    if (planUnchanged && anyAccepted) {
-        process.stderr.write(`[planpong] warn: round ${round} has accepted issues but plan hash is unchanged — did the agent forget to edit?\n`);
-    }
-    // Write fully valid RoundMetrics so bench/run.ts:226 doesn't drop this
-    // round from analysis. Inline revisions have no provider duration —
-    // started_at and completed_at are the same instant.
-    const ts = new Date().toISOString();
-    const metrics = {
-        schema_version: 1,
-        session_id: session.id,
-        round,
-        phase,
-        role: "revision",
-        started_at: ts,
-        completed_at: ts,
-        total_duration_ms: 0,
-        attempts: [],
-        planner_mode: "inline",
-    };
-    writeRoundMetrics(cwd, session.id, round, "revision", metrics);
-    // Update plan status line. Use loadConfig for provider labels (the
-    // status-line writer needs them). In inline mode the planner provider
-    // is informational, not invoked.
-    const config = loadConfig({ cwd });
-    const sessionConfig = {
-        ...config,
-        planner: session.planner,
-        reviewer: session.reviewer,
-    };
-    const statusLine = writeStatusLineToPlan(session, cwd, sessionConfig, "Revision recorded");
-    // Match planpong_revise's unverified_rejected counter so the slash
-    // command can consume either tool's output uniformly.
-    const unverifiedRejected = input.responses.filter((r) => r.action === "rejected" &&
+}
+function countUnverifiedRejected(responses) {
+    return responses.filter((r) => r.action === "rejected" &&
         /unverified\s+evidence/i.test(r.rationale ?? "")).length;
+}
+function buildRecordRevisionResponse(args) {
+    const display = formatDecisionDisplay({
+        round: args.round,
+        feedback: args.feedback,
+        revision: args.revision,
+        warning: args.displayWarning,
+    });
     const payload = {
-        round,
-        responses: input.responses,
-        accepted: tally.accepted,
-        rejected: tally.rejected,
-        deferred: tally.deferred,
-        unverified_rejected: unverifiedRejected,
-        plan_updated: !planUnchanged,
-        status_line: statusLine,
+        round: args.round,
+        responses: args.responses,
+        accepted: args.accepted,
+        rejected: args.rejected,
+        deferred: args.deferred,
+        unverified_rejected: args.unverifiedRejected,
+        plan_updated: args.planUpdated,
+        status_line: args.statusLine,
         planner_mode: "inline",
-        idempotent_replay: !tally.fresh,
+        idempotent_replay: args.idempotentReplay,
+        decision_rows: display.rows,
+        display_markdown: display.markdown,
+        ...(display.warnings.length > 0 && { display_warnings: display.warnings }),
     };
     return {
         content: [
-            { type: "text", text: statusLine },
+            { type: "text", text: args.statusLine },
             { type: "text", text: JSON.stringify(payload) },
         ],
     };

package/dist/src/mcp/tools/record-revision.js.map

@@ -1 +1 @@
-{"version":3,"file":"record-revision.js","sourceRoot":"","sources":["../../../../src/mcp/tools/record-revision.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"record-revision.js","sourceRoot":"","sources":["../../../../src/mcp/tools/record-revision.ts"],"names":[],"mappings":"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"}

package/dist/src/mcp/tools/revise.d.ts

@@ -1,18 +1,12 @@
 import type { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 export declare function reviseHandler(input: {
     session_id: string;
+    expected_round: number;
     cwd?: string;
 }): Promise<{
     content: {
         type: "text";
         text: string;
     }[];
-    isError: boolean;
-} | {
-    content: {
-        type: "text";
-        text: string;
-    }[];
-    isError?: undefined;
 }>;
 export declare function registerRevise(server: McpServer): void;

package/dist/src/mcp/tools/revise.js

@@ -1,10 +1,16 @@
 import { z } from "zod";
 import { loadConfig } from "../../config/loader.js";
 import { getProvider } from "../../providers/registry.js";
-import { readSessionState } from "../../core/session.js";
+import { readRoundFeedback, readRoundResponse, readSessionState, withSessionLock, } from "../../core/session.js";
 import { runRevisionRound, writeStatusLineToPlan, } from "../../core/operations.js";
+import { formatDecisionDisplay } from "../../core/presentation.js";
 const inputSchema = {
     session_id: z.string().describe("Session ID from planpong_start_review"),
+    expected_round: z
+        .number()
+        .int()
+        .positive()
+        .describe("The feedback round this revision responds to. Must equal session.currentRound."),
     cwd: z
         .string()
         .optional()
@@ -12,111 +18,141 @@ const inputSchema = {
 };
 export async function reviseHandler(input) {
     const cwd = input.cwd ?? process.cwd();
-    const session = readSessionState(cwd, input.session_id);
-    if (!session) {
-        return {
-            content: [
-                {
-                    type: "text",
-                    text: JSON.stringify({
-                        error: `Session not found: ${input.session_id}`,
-                    }),
-                },
-            ],
-            isError: true,
-        };
-    }
-    if (session.status !== "in_review") {
-        return {
-            content: [
-                {
-                    type: "text",
-                    text: JSON.stringify({
-                        error: `Session status is '${session.status}', expected 'in_review'`,
-                    }),
-                },
-            ],
-            isError: true,
-        };
+    const existing = readSessionState(cwd, input.session_id);
+    if (!existing) {
+        return errorResponse(`Session not found: ${input.session_id}`);
     }
-    if (session.plannerMode === "inline") {
-        return {
-            content: [
-                {
-                    type: "text",
-                    text: JSON.stringify({
-                        error: "session is in inline planner mode — use planpong_record_revision instead",
-                        planner_mode: "inline",
-                    }),
-                },
-            ],
-            isError: true,
-        };
-    }
-    const config = loadConfig({ cwd });
-    const plannerProvider = getProvider(session.planner.provider);
-    if (!plannerProvider) {
-        return {
-            content: [
-                {
-                    type: "text",
-                    text: JSON.stringify({
-                        error: `Planner provider not found: ${session.planner.provider}`,
-                    }),
-                },
-            ],
-            isError: true,
+    return withSessionLock(cwd, input.session_id, async () => {
+        const session = readSessionState(cwd, input.session_id);
+        if (!session) {
+            return errorResponse(`Session not found: ${input.session_id}`);
+        }
+        if (input.expected_round < session.currentRound) {
+            return errorResponse(`stale revision call for round ${input.expected_round}; current round is ${session.currentRound}`, {
+                expected_round: input.expected_round,
+                current_round: session.currentRound,
+            });
+        }
+        if (input.expected_round > session.currentRound) {
+            return errorResponse(`out-of-order revision call for round ${input.expected_round}; call planpong_get_feedback first`, {
+                expected_round: input.expected_round,
+                current_round: session.currentRound,
+            });
+        }
+        if (session.status !== "in_review") {
+            return errorResponse(`Session status is '${session.status}', expected 'in_review'`);
+        }
+        if (session.plannerMode === "inline") {
+            return errorResponse("session is in inline planner mode — use planpong_record_revision instead", { planner_mode: "inline" });
+        }
+        const config = loadConfig({ cwd });
+        const sessionConfig = {
+            ...config,
+            planner: session.planner,
+            reviewer: session.reviewer,
         };
+        const feedback = readRoundFeedback(cwd, session.id, input.expected_round);
+        if (!feedback) {
+            return errorResponse(`No feedback found for session ${session.id} round ${input.expected_round}. Call planpong_get_feedback first.`);
+        }
+        const existingResponse = readRoundResponse(cwd, session.id, input.expected_round);
+        if (existingResponse) {
+            const tally = tallyResponses(existingResponse.responses);
+            const statusLine = writeStatusLineToPlan(session, cwd, sessionConfig, "Revision submitted");
+            return buildRevisionResponse({
+                round: input.expected_round,
+                revision: existingResponse,
+                accepted: tally.accepted,
+                rejected: tally.rejected,
+                deferred: tally.deferred,
+                planUpdated: false,
+                statusLine,
+                feedback,
+                idempotentReplay: true,
+            });
+        }
+        const plannerProvider = getProvider(session.planner.provider);
+        if (!plannerProvider) {
+            return errorResponse(`Planner provider not found: ${session.planner.provider}`);
+        }
+        const result = await runRevisionRound(session, cwd, sessionConfig, plannerProvider);
+        // Update status line in plan file (planner may have mangled it)
+        const statusLine = writeStatusLineToPlan(session, cwd, sessionConfig, "Revision submitted");
+        return buildRevisionResponse({
+            ...result,
+            statusLine,
+            feedback,
+            idempotentReplay: false,
+        });
+    });
+}
+function tallyResponses(responses) {
+    let accepted = 0;
+    let rejected = 0;
+    let deferred = 0;
+    for (const response of responses) {
+        if (response.action === "accepted")
+            accepted++;
+        else if (response.action === "rejected")
+            rejected++;
+        else if (response.action === "deferred")
+            deferred++;
     }
-    const sessionConfig = {
-        ...config,
-        planner: session.planner,
-        reviewer: session.reviewer,
-    };
-    const result = await runRevisionRound(session, cwd, sessionConfig, plannerProvider);
-    // Update status line in plan file (planner may have mangled it)
-    const statusLine = writeStatusLineToPlan(session, cwd, sessionConfig, "Revision submitted");
-    // Count rejections whose rationale matches "unverified evidence".
-    // Free-text matching is intentionally lenient; the planner prompt
-    // suggests the exact phrase but accepts variants (the plan flags
-    // this in Limitations & Future Work — a structured enum is a
-    // follow-up).
-    const unverifiedRejected = result.revision.responses.filter((r) => r.action === "rejected" &&
+    return { accepted, rejected, deferred };
+}
+function buildRevisionResponse(args) {
+    const unverifiedRejected = args.revision.responses.filter((r) => r.action === "rejected" &&
         /unverified\s+evidence/i.test(r.rationale ?? "")).length;
+    const display = formatDecisionDisplay({
+        round: args.round,
+        feedback: args.feedback,
+        revision: args.revision,
+    });
     const payload = {
-        round: result.round,
-        responses: result.revision.responses,
-        accepted: result.accepted,
-        rejected: result.rejected,
-        deferred: result.deferred,
+        round: args.round,
+        responses: args.revision.responses,
+        accepted: args.accepted,
+        rejected: args.rejected,
+        deferred: args.deferred,
         unverified_rejected: unverifiedRejected,
-        plan_updated: result.planUpdated,
-        status_line: statusLine,
+        plan_updated: args.planUpdated,
+        status_line: args.statusLine,
+        idempotent_replay: args.idempotentReplay,
+        decision_rows: display.rows,
+        display_markdown: display.markdown,
     };
-    if (result.timing) {
-        payload.timing = result.timing;
+    if (display.warnings.length > 0) {
+        payload.display_warnings = display.warnings;
     }
-    if (result.edits) {
-        payload.revision_mode = result.edits.revision_mode;
-        if (result.edits.revision_mode === "edits") {
-            payload.edits_attempted = result.edits.edits_attempted;
-            payload.edits_applied = result.edits.edits_applied;
-            payload.edits_failed = result.edits.edits_failed;
-            payload.edits_recovered = result.edits.edits_recovered;
-            payload.retry_invoked = result.edits.retry_invoked;
+    if (args.timing) {
+        payload.timing = args.timing;
+    }
+    if (args.edits) {
+        payload.revision_mode = args.edits.revision_mode;
+        if (args.edits.revision_mode === "edits") {
+            payload.edits_attempted = args.edits.edits_attempted;
+            payload.edits_applied = args.edits.edits_applied;
+            payload.edits_failed = args.edits.edits_failed;
+            payload.edits_recovered = args.edits.edits_recovered;
+            payload.retry_invoked = args.edits.retry_invoked;
         }
     }
+    return {
+        content: [
+            { type: "text", text: args.statusLine },
+            { type: "text", text: JSON.stringify(payload) },
+        ],
+    };
+}
+function errorResponse(error, extra = {}) {
     return {
         content: [
             {
                 type: "text",
-                text: statusLine,
-            },
-            {
-                type: "text",
-                text: JSON.stringify(payload),
+                text: JSON.stringify({ error, ...extra }),
             },
         ],
+        isError: true,
     };
 }
 export function registerRevise(server) {

package/dist/src/mcp/tools/revise.js.map

@@ -1 +1 @@
-{"version":3,"file":"revise.js","sourceRoot":"","sources":["../../../../src/mcp/tools/revise.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"revise.js","sourceRoot":"","sources":["../../../../src/mcp/tools/revise.ts"],"names":[],"mappings":"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"}