planpong 0.3.0 → 0.5.0

package/dist/src/providers/claude.js

@@ -13,41 +13,151 @@ function cleanEnv() {
     }
     return env;
 }
+/**
+ * Parse claude's `--output-format json` envelope and extract the
+ * `structured_output` field as a JSON string ready for downstream parsing.
+ * Returns null if the envelope is malformed or the field is missing.
+ *
+ * Envelope shape (subset):
+ * {
+ *   "type": "result",
+ *   "is_error": false,
+ *   "result": "",
+ *   "structured_output": { ...model's constrained JSON... },
+ *   ...
+ * }
+ */
+function extractStructuredOutput(stdout) {
+    try {
+        const envelope = JSON.parse(stdout);
+        if (envelope &&
+            typeof envelope === "object" &&
+            "structured_output" in envelope &&
+            envelope.structured_output !== null &&
+            typeof envelope.structured_output === "object") {
+            return JSON.stringify(envelope.structured_output);
+        }
+    }
+    catch {
+        // Not JSON — may indicate a pre-envelope error or auth failure
+    }
+    return null;
+}
+/**
+ * Classify a CLI invocation failure as `capability` (downgrade-eligible) or
+ * `fatal` (terminal). Capability errors indicate the CLI doesn't support the
+ * requested structured output flag; fatal errors are everything else.
+ */
+function classifyError(stderr, exitCode) {
+    const lower = stderr.toLowerCase();
+    const capabilityIndicators = [
+        "unknown flag",
+        "unknown option",
+        "unrecognized",
+        "invalid schema",
+        "invalid json schema",
+        "json-schema",
+        "unsupported",
+    ];
+    const isCapability = capabilityIndicators.some((indicator) => lower.includes(indicator));
+    return {
+        kind: isCapability ? "capability" : "fatal",
+        message: stderr.slice(0, 500) || `claude exited with code ${exitCode}`,
+        exitCode,
+        stderr,
+    };
+}
 export class ClaudeProvider {
     name = "claude";
+    capabilityCache = null;
     async invoke(prompt, options) {
-        // claude -p reads prompt from stdin when no positional arg is given
-        const args = ["-p", "--output-format", "text"];
+        // claude -p reads prompt from stdin when no positional arg is given.
+        // --bare skips hooks/MCP/auto-memory/CLAUDE.md/plugin-sync for faster
+        // subprocess startup, but it bypasses OAuth/keychain — only safe to use
+        // when ANTHROPIC_API_KEY is set.
+        const args = ["-p"];
+        if (process.env.ANTHROPIC_API_KEY) {
+            args.push("--bare");
+        }
+        if (options.jsonSchema) {
+            // With a schema, use --output-format json so the response envelope
+            // includes a `structured_output` field containing the model's
+            // constrained JSON as a native object. --output-format text drops
+            // the structured_output field entirely.
+            args.push("--output-format", "json", "--json-schema", JSON.stringify(options.jsonSchema));
+        }
+        else {
+            args.push("--output-format", "text");
+        }
         if (options.model) {
             args.push("--model", options.model);
         }
+        // Persistent conversation. `--session-id` creates a new session with the
+        // given UUID; `--resume` continues an existing one. Caller must use one
+        // or the other, never both. Lets us drop heavy "current plan + prior
+        // decisions" stuffing on round 2+ since the model retains context.
+        if (options.newSessionId && options.resumeSessionId) {
+            throw new Error("claude provider: newSessionId and resumeSessionId are mutually exclusive");
+        }
+        if (options.newSessionId) {
+            args.push("--session-id", options.newSessionId);
+        }
+        else if (options.resumeSessionId) {
+            args.push("--resume", options.resumeSessionId);
+        }
         const start = Date.now();
         try {
             const result = await execa("claude", args, {
                 cwd: options.cwd,
                 preferLocal: true,
-                timeout: options.timeout ?? 300_000,
+                timeout: options.timeout ?? 600_000,
                 reject: false,
                 env: cleanEnv(),
                 extendEnv: false,
                 input: prompt,
             });
-            if (result.exitCode !== 0) {
-                process.stderr.write(`[claude-provider] exit=${result.exitCode} stderr=${result.stderr?.slice(0, 500)}\n`);
+            const duration = Date.now() - start;
+            const exitCode = result.exitCode ?? 1;
+            // claude -p can exit non-zero with valid stdout. Treat presence of
+            // stdout as success even on non-zero exit.
+            // Canonical session ID for the response: echoes the input UUID
+            // (claude accepts external UUIDs as session IDs, so input == output).
+            const sessionId = options.newSessionId ?? options.resumeSessionId;
+            if (result.stdout && result.stdout.trim().length > 0) {
+                if (options.jsonSchema) {
+                    // Parse claude's envelope and extract structured_output.
+                    const extracted = extractStructuredOutput(result.stdout);
+                    if (extracted === null) {
+                        return {
+                            ok: false,
+                            error: {
+                                kind: "capability",
+                                message: `claude returned envelope without structured_output field: ${result.stdout.slice(0, 300)}`,
+                                exitCode,
+                                stderr: result.stderr,
+                            },
+                            duration,
+                        };
+                    }
+                    return { ok: true, output: extracted, duration, sessionId };
+                }
+                return { ok: true, output: result.stdout, duration, sessionId };
             }
+            // No usable output — classify the failure
+            process.stderr.write(`[claude-provider] exit=${exitCode} stderr=${result.stderr?.slice(0, 500)}\n`);
             return {
-                content: result.stdout,
-                exitCode: result.exitCode ?? 1,
-                duration: Date.now() - start,
+                ok: false,
+                error: classifyError(result.stderr ?? "", exitCode),
+                duration,
             };
         }
         catch (error) {
+            const duration = Date.now() - start;
+            const message = error instanceof Error ? error.message : "Unknown error invoking claude";
             return {
-                content: error instanceof Error
-                    ? error.message
-                    : "Unknown error invoking claude",
-                exitCode: 1,
-                duration: Date.now() - start,
+                ok: false,
+                error: { kind: "fatal", message, exitCode: 1 },
+                duration,
             };
         }
     }
@@ -66,6 +176,34 @@ export class ClaudeProvider {
             return false;
         }
     }
+    async checkStructuredOutputSupport() {
+        if (this.capabilityCache !== null) {
+            return this.capabilityCache;
+        }
+        try {
+            const result = await execa("claude", ["--help"], {
+                preferLocal: true,
+                timeout: 5_000,
+                reject: false,
+                env: cleanEnv(),
+                extendEnv: false,
+            });
+            const helpText = `${result.stdout ?? ""}\n${result.stderr ?? ""}`;
+            const supported = helpText.includes("--json-schema");
+            this.capabilityCache = supported;
+            if (!supported) {
+                process.stderr.write(`[planpong] Structured output not supported by claude — using legacy parsing\n`);
+            }
+            return supported;
+        }
+        catch {
+            this.capabilityCache = false;
+            return false;
+        }
+    }
+    markNonCapable() {
+        this.capabilityCache = false;
+    }
     getModels() {
         return MODELS;
     }

package/dist/src/providers/claude.js.map

@@ -1 +1 @@
-{"version":3,"file":"claude.js","sourceRoot":"","sources":["../../../src/providers/claude.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC;AAG9B,MAAM,MAAM,GAAG,CAAC,MAAM,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;AAE3C;;;GAGG;AACH,SAAS,QAAQ;IACf,MAAM,GAAG,GAA2B,EAAE,CAAC;IACvC,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;QACvD,IAAI,GAAG,KAAK,YAAY,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YAChD,GAAG,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;QACnB,CAAC;IACH,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED,MAAM,OAAO,cAAc;IACzB,IAAI,GAAG,QAAQ,CAAC;IAEhB,KAAK,CAAC,MAAM,CACV,MAAc,EACd,OAAsB;QAEtB,oEAAoE;QACpE,MAAM,IAAI,GAAG,CAAC,IAAI,EAAE,iBAAiB,EAAE,MAAM,CAAC,CAAC;QAE/C,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;YAClB,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;QACtC,CAAC;QAED,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACzB,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,QAAQ,EAAE,IAAI,EAAE;gBACzC,GAAG,EAAE,OAAO,CAAC,GAAG;gBAChB,WAAW,EAAE,IAAI;gBACjB,OAAO,EAAE,OAAO,CAAC,OAAO,IAAI,OAAO;gBACnC,MAAM,EAAE,KAAK;gBACb,GAAG,EAAE,QAAQ,EAAE;gBACf,SAAS,EAAE,KAAK;gBAChB,KAAK,EAAE,MAAM;aACd,CAAC,CAAC;YAEH,IAAI,MAAM,CAAC,QAAQ,KAAK,CAAC,EAAE,CAAC;gBAC1B,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB,0BAA0B,MAAM,CAAC,QAAQ,WAAW,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,IAAI,CACrF,CAAC;YACJ,CAAC;YAED,OAAO;gBACL,OAAO,EAAE,MAAM,CAAC,MAAM;gBACtB,QAAQ,EAAE,MAAM,CAAC,QAAQ,IAAI,CAAC;gBAC9B,QAAQ,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK;aAC7B,CAAC;QACJ,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO;gBACL,OAAO,EACL,KAAK,YAAY,KAAK;oBACpB,CAAC,CAAC,KAAK,CAAC,OAAO;oBACf,CAAC,CAAC,+BAA+B;gBACrC,QAAQ,EAAE,CAAC;gBACX,QAAQ,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK;aAC7B,CAAC;QACJ,CAAC;IACH,CAAC;IAED,KAAK,CAAC,WAAW;QACf,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,QAAQ,EAAE,CAAC,WAAW,CAAC,EAAE;gBAClD,WAAW,EAAE,IAAI;gBACjB,OAAO,EAAE,KAAK;gBACd,MAAM,EAAE,KAAK;gBACb,GAAG,EAAE,QAAQ,EAAE;gBACf,SAAS,EAAE,KAAK;aACjB,CAAC,CAAC;YACH,OAAO,MAAM,CAAC,QAAQ,KAAK,CAAC,CAAC;QAC/B,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;IAED,SAAS;QACP,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,eAAe;QACb,oEAAoE;QACpE,OAAO,CAAC,SAAS,CAAC,CAAC;IACrB,CAAC;CACF"}
+{"version":3,"file":"claude.js","sourceRoot":"","sources":["../../../src/providers/claude.ts"],"names":[],"mappings":"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"}

package/dist/src/providers/codex.d.ts

@@ -1,8 +1,11 @@
 import type { Provider, InvokeOptions, ProviderResponse } from "./types.js";
 export declare class CodexProvider implements Provider {
     name: string;
+    private capabilityCache;
     invoke(prompt: string, options: InvokeOptions): Promise<ProviderResponse>;
     isAvailable(): Promise<boolean>;
+    checkStructuredOutputSupport(): Promise<boolean>;
+    markNonCapable(): void;
     getModels(): string[];
     getEffortLevels(): string[];
 }

package/dist/src/providers/codex.js

@@ -1,14 +1,79 @@
 import { randomBytes } from "node:crypto";
-import { readFileSync, unlinkSync } from "node:fs";
+import { readFileSync, unlinkSync, writeFileSync } from "node:fs";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
 import { execa } from "execa";
 const MODELS = ["gpt-5.3-codex", "o3-pro", "o3", "o4-mini"];
 const EFFORT_LEVELS = ["low", "medium", "high", "xhigh"];
+/**
+ * Classify a CLI invocation failure as `capability` (downgrade-eligible) or
+ * `fatal` (terminal). Capability errors indicate the CLI doesn't support the
+ * requested structured output flag; fatal errors are everything else.
+ *
+ * Patterns must be narrow — codex's normal session header includes flag
+ * names like "output-schema:" in its info output, so substring matches on
+ * the flag name alone produce false positives.
+ */
+function extractCodexThreadId(stdout) {
+    if (!stdout)
+        return undefined;
+    // The first non-empty line of `codex exec --json` stdout is a
+    // `thread.started` or `thread.resumed` event with `thread_id`. Scan
+    // the first ~10 lines defensively in case the model emits anything
+    // else first.
+    const lines = stdout.split("\n").slice(0, 10);
+    for (const line of lines) {
+        const trimmed = line.trim();
+        if (!trimmed.startsWith("{"))
+            continue;
+        try {
+            const evt = JSON.parse(trimmed);
+            if ((evt.type === "thread.started" || evt.type === "thread.resumed") &&
+                typeof evt.thread_id === "string") {
+                return evt.thread_id;
+            }
+        }
+        catch {
+            continue;
+        }
+    }
+    return undefined;
+}
+function classifyError(stderr, exitCode) {
+    const lower = stderr.toLowerCase();
+    const capabilityPatterns = [
+        /\bunknown (?:flag|option|argument)\b/,
+        /\bunrecognized (?:flag|option|argument)\b/,
+        /\bunexpected (?:flag|option|argument)\b/,
+        /\binvalid_json_schema\b/,
+        /\binvalid schema\b/,
+        /\bschema is not supported\b/,
+        /\bstructured output (?:not|isn't) supported\b/,
+    ];
+    const isCapability = capabilityPatterns.some((pattern) => pattern.test(lower));
+    return {
+        kind: isCapability ? "capability" : "fatal",
+        message: stderr.slice(0, 500) || `codex exited with code ${exitCode}`,
+        exitCode,
+        stderr,
+    };
+}
 export class CodexProvider {
     name = "codex";
+    capabilityCache = null;
     async invoke(prompt, options) {
-        const args = ["exec"];
+        // codex doesn't accept an externally-generated session UUID. The first
+        // call always creates a fresh thread; we capture `thread_id` from the
+        // `--json` event stream on stdout and the caller persists it. Resume
+        // subsequent calls via `codex exec resume <id>` (subcommand form).
+        if (options.newSessionId) {
+            // Silent ignore — codex generates its own ID. The caller will get
+            // the actual ID back via ProviderResponse.sessionId.
+        }
+        const isResume = options.resumeSessionId != null && options.resumeSessionId.length > 0;
+        const args = isResume
+            ? ["exec", "resume", options.resumeSessionId]
+            : ["exec"];
         if (options.model) {
             args.push("-m", options.model);
         }
@@ -18,6 +83,23 @@ export class CodexProvider {
         // Write clean output to a temp file to avoid parsing header/footer
         const outFile = join(tmpdir(), `planpong-codex-${randomBytes(6).toString("hex")}.txt`);
         args.push("-o", outFile);
+        // Always enable --json so we can capture the thread_id event from
+        // stdout. The `-o` file still receives the agent's clean text output;
+        // `--json` only changes stdout/stderr streaming.
+        args.push("--json");
+        // Optional structured output schema
+        let schemaFile = null;
+        if (options.jsonSchema) {
+            schemaFile = join(tmpdir(), `planpong-codex-schema-${randomBytes(6).toString("hex")}.json`);
+            try {
+                writeFileSync(schemaFile, JSON.stringify(options.jsonSchema));
+                args.push("--output-schema", schemaFile);
+            }
+            catch (error) {
+                // If we can't write the schema file, fall through without structured output
+                schemaFile = null;
+            }
+        }
         // Use stdin for prompt (CLI arg has length limits)
         args.push("-");
         const start = Date.now();
@@ -25,38 +107,66 @@ export class CodexProvider {
             const result = await execa("codex", args, {
                 cwd: options.cwd,
                 preferLocal: true,
-                timeout: options.timeout ?? 300_000,
+                timeout: options.timeout ?? 600_000,
                 reject: false,
                 input: prompt,
             });
-            let content;
+            const duration = Date.now() - start;
+            const exitCode = result.exitCode ?? 1;
+            let content = "";
             try {
                 content = readFileSync(outFile, "utf-8");
             }
             catch {
                 // Fall back to stdout if output file wasn't created
-                content = result.stdout;
+                content = result.stdout ?? "";
             }
-            // Clean up temp file
+            // Clean up temp files
             try {
                 unlinkSync(outFile);
             }
             catch {
                 // ignore
             }
+            if (schemaFile) {
+                try {
+                    unlinkSync(schemaFile);
+                }
+                catch {
+                    // ignore
+                }
+            }
+            if (content && content.trim().length > 0) {
+                // Capture thread_id from --json stdout. The first event is
+                // `thread.started` (fresh) or `thread.resumed` (resume). Both
+                // carry `thread_id`. We treat parse failures as "no session
+                // tracking" rather than as errors — sessions are an
+                // optimization, not a correctness requirement.
+                const sessionId = extractCodexThreadId(result.stdout);
+                return { ok: true, output: content, duration, sessionId };
+            }
             return {
-                content,
-                exitCode: result.exitCode ?? 1,
-                duration: Date.now() - start,
+                ok: false,
+                error: classifyError(result.stderr ?? "", exitCode),
+                duration,
             };
         }
         catch (error) {
+            const duration = Date.now() - start;
+            // Cleanup on error path
+            if (schemaFile) {
+                try {
+                    unlinkSync(schemaFile);
+                }
+                catch {
+                    // ignore
+                }
+            }
+            const message = error instanceof Error ? error.message : "Unknown error invoking codex";
             return {
-                content: error instanceof Error
-                    ? error.message
-                    : "Unknown error invoking codex",
-                exitCode: 1,
-                duration: Date.now() - start,
+                ok: false,
+                error: { kind: "fatal", message, exitCode: 1 },
+                duration,
             };
         }
     }
@@ -73,6 +183,32 @@ export class CodexProvider {
             return false;
         }
     }
+    async checkStructuredOutputSupport() {
+        if (this.capabilityCache !== null) {
+            return this.capabilityCache;
+        }
+        try {
+            const result = await execa("codex", ["exec", "--help"], {
+                preferLocal: true,
+                timeout: 5_000,
+                reject: false,
+            });
+            const helpText = `${result.stdout ?? ""}\n${result.stderr ?? ""}`;
+            const supported = helpText.includes("--output-schema");
+            this.capabilityCache = supported;
+            if (!supported) {
+                process.stderr.write(`[planpong] Structured output not supported by codex — using legacy parsing\n`);
+            }
+            return supported;
+        }
+        catch {
+            this.capabilityCache = false;
+            return false;
+        }
+    }
+    markNonCapable() {
+        this.capabilityCache = false;
+    }
     getModels() {
         return MODELS;
     }

package/dist/src/providers/codex.js.map

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

package/dist/src/providers/types.d.ts

@@ -3,16 +3,82 @@ export interface InvokeOptions {
     model?: string;
     effort?: string;
     timeout?: number;
+    /**
+     * JSON Schema to constrain model output. When set, providers pass this to
+     * their respective structured-output flags (`--json-schema` for claude,
+     * `--output-schema` for codex).
+     */
+    jsonSchema?: Record<string, unknown>;
+    /**
+     * Initialize a NEW persistent conversation with this UUID. Mutually
+     * exclusive with `resumeSessionId`. After the first call succeeds, the
+     * caller must use `resumeSessionId` on subsequent calls.
+     */
+    newSessionId?: string;
+    /**
+     * Resume an EXISTING persistent conversation. The model retains context
+     * from prior turns. Only valid for sessions previously created with
+     * `newSessionId`.
+     */
+    resumeSessionId?: string;
 }
-export interface ProviderResponse {
-    content: string;
+/**
+ * Provider invocation error categories. Used by the operations-layer state
+ * machine to decide whether to downgrade or fail terminally.
+ *
+ * - `capability`: schema rejected, flag unrecognized at runtime, structured
+ *   output format error. Indicates the CLI doesn't support the requested
+ *   structured output mode. Downgrade-eligible.
+ * - `fatal`: auth failure, timeout, network/transport error, non-zero exit
+ *   with no output. Unrelated to structured output capability. Terminal.
+ */
+export type ProviderErrorKind = "capability" | "fatal";
+export interface ProviderError {
+    kind: ProviderErrorKind;
+    message: string;
     exitCode: number;
-    duration: number;
+    stderr?: string;
 }
+/**
+ * Discriminated result of a single provider invocation. Providers are
+ * single-shot — they perform one invocation and return either the output
+ * or a typed error. They do NOT retry or downgrade internally; that is
+ * the operations-layer state machine's job.
+ *
+ * `sessionId` (success only): the canonical conversation ID the provider
+ * used. For providers that accept an externally-generated UUID (claude),
+ * this echoes the input; for providers that generate their own IDs
+ * (codex), this is parsed from the provider's output. Caller persists
+ * this and passes it as `resumeSessionId` on subsequent calls to keep
+ * the same conversation thread.
+ */
+export type ProviderResponse = {
+    ok: true;
+    output: string;
+    duration: number;
+    sessionId?: string;
+} | {
+    ok: false;
+    error: ProviderError;
+    duration: number;
+};
 export interface Provider {
     name: string;
     invoke(prompt: string, options: InvokeOptions): Promise<ProviderResponse>;
     isAvailable(): Promise<boolean>;
     getModels(): string[];
     getEffortLevels(): string[];
+    /**
+     * Probe the underlying CLI to determine whether structured output is
+     * supported. Result is cached for the session lifetime. If the probe
+     * fails or times out, returns false (use legacy path).
+     */
+    checkStructuredOutputSupport(): Promise<boolean>;
+    /**
+     * Mark this provider as non-capable for the remainder of the session.
+     * Called by the state machine after a runtime structured-output failure
+     * (capability error or JSON.parse failure) to prevent re-attempting
+     * structured output on subsequent rounds.
+     */
+    markNonCapable(): void;
 }

package/dist/src/schemas/config.d.ts

@@ -42,6 +42,7 @@ export declare const PlanpongConfigSchema: z.ZodObject<{
     plans_dir: z.ZodDefault<z.ZodString>;
     max_rounds: z.ZodDefault<z.ZodNumber>;
     human_in_loop: z.ZodDefault<z.ZodBoolean>;
+    revision_mode: z.ZodDefault<z.ZodEnum<["edits", "full"]>>;
 }, "strip", z.ZodTypeAny, {
     planner: {
         provider: string;
@@ -56,6 +57,7 @@ export declare const PlanpongConfigSchema: z.ZodObject<{
     plans_dir: string;
     max_rounds: number;
     human_in_loop: boolean;
+    revision_mode: "edits" | "full";
 }, {
     planner: {
         provider: string;
@@ -70,6 +72,7 @@ export declare const PlanpongConfigSchema: z.ZodObject<{
     plans_dir?: string | undefined;
     max_rounds?: number | undefined;
     human_in_loop?: boolean | undefined;
+    revision_mode?: "edits" | "full" | undefined;
 }>;
 export type ProviderConfig = z.infer<typeof ProviderConfigSchema>;
 export type PlanpongConfig = z.infer<typeof PlanpongConfigSchema>;

package/dist/src/schemas/config.js

@@ -10,5 +10,11 @@ export const PlanpongConfigSchema = z.object({
     plans_dir: z.string().default("docs/plans"),
     max_rounds: z.number().int().min(1).max(50).default(10),
     human_in_loop: z.boolean().default(true),
+    // Initial release defaults to `"full"`. Edits mode is opt-in via
+    // planpong.yaml until benchmark thresholds (first-pass success ≥80%,
+    // retry rate <30%, no rounds increase) are confirmed. `"full"` is the
+    // kill switch — risk + detail phases use the direction-phase schema and
+    // skip the edit applier entirely.
+    revision_mode: z.enum(["edits", "full"]).default("full"),
 });
 //# sourceMappingURL=config.js.map

package/dist/src/schemas/config.js.map

@@ -1 +1 @@
-{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/schemas/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,CAAC,MAAM,CAAC;IAC3C,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE;IACpB,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC5B,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;CAC9B,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,CAAC,MAAM,CAAC;IAC3C,OAAO,EAAE,oBAAoB;IAC7B,QAAQ,EAAE,oBAAoB;IAC9B,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,YAAY,CAAC;IAC3C,UAAU,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC;IACvD,aAAa,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC;CACzC,CAAC,CAAC"}
+{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/schemas/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,CAAC,MAAM,CAAC;IAC3C,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE;IACpB,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC5B,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;CAC9B,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,CAAC,MAAM,CAAC;IAC3C,OAAO,EAAE,oBAAoB;IAC7B,QAAQ,EAAE,oBAAoB;IAC9B,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,YAAY,CAAC;IAC3C,UAAU,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC;IACvD,aAAa,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC;IACxC,iEAAiE;IACjE,qEAAqE;IACrE,sEAAsE;IACtE,wEAAwE;IACxE,kCAAkC;IAClC,aAAa,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC;CACzD,CAAC,CAAC"}

package/dist/src/schemas/json-schema.d.ts

@@ -0,0 +1,21 @@
+import type { ReviewPhase } from "../prompts/reviewer.js";
+export declare const DirectionFeedbackJsonSchema: Record<string, unknown>;
+export declare const RiskFeedbackJsonSchema: Record<string, unknown>;
+export declare const ReviewFeedbackJsonSchema: Record<string, unknown>;
+export declare const PlannerRevisionJsonSchema: Record<string, unknown>;
+/**
+ * Get the JSON Schema appropriate for a given review phase.
+ */
+export declare function getFeedbackJsonSchemaForPhase(phase: ReviewPhase): Record<string, unknown>;
+/**
+ * Get the JSON Schema for a planner revision response, selecting the
+ * shape based on phase and the configured revision mode.
+ *
+ * - Direction phase always emits `updated_plan` (sweeping rewrites are
+ *   allowed in round 1).
+ * - Risk + detail phase with `revisionMode: "edits"` emits an `edits[]`
+ *   array — the planner cannot fall back to full output.
+ * - Risk + detail phase with `revisionMode: "full"` keeps the full-plan
+ *   shape (kill switch).
+ */
+export declare function getRevisionJsonSchema(phase: ReviewPhase, revisionMode: "edits" | "full"): Record<string, unknown>;