ai-spend-agent 0.9.0 → 0.9.1

package/dist/guidedPrompt.d.ts

@@ -11,6 +11,8 @@
  * drain on every answer, exact-token choices, strict ISO times, reserved
  * vocabulary, Unicode format-character rejection, byte-honest length copy).
  */
+import { classifyGuidedAnswer, type ClassifyContext, type ClassifyResult, type GuidedFieldKind, type RejectCode } from "@agent-finops/core";
+export { classifyGuidedAnswer, type ClassifyContext, type ClassifyResult, type GuidedFieldKind, type RejectCode };
 export type PromptSourceEvent = {
     kind: "line";
     text: string;
@@ -41,33 +43,6 @@ export declare function createInteractivePromptSource(emitter: {
     onClose: (listener: () => void) => void;
     onInterrupt: (listener: () => void) => void;
 }): GuidedPromptSource;
-export type GuidedFieldKind = "prose" | "name" | "team" | "role" | "optional" | "time" | "choice" | "approve";
-export type ClassifyContext = {
-    example?: string;
-    /** Exact accepted tokens for choice fields, lowercase. */
-    choiceTokens?: readonly string[];
-    /** ISO instant the plan was approved (time fields). */
-    approvedAtIso?: string;
-    /** Clock override for tests. */
-    nowMs?: number;
-    /** Consecutive identical shell-rejections at this step (keep override). */
-    priorShellRejections?: number;
-};
-export type ClassifyResult = {
-    outcome: "accept";
-    value: string;
-} | {
-    outcome: "navigate";
-    action: "back" | "cancel";
-} | {
-    outcome: "skip";
-} | {
-    outcome: "reject";
-    code: RejectCode;
-    message: string;
-};
-export type RejectCode = "control" | "empty" | "shell" | "path" | "credential" | "reserved" | "timestamp_shaped" | "length" | "substance" | "time_invalid" | "time_before_approval" | "time_future" | "choice" | "approve_case";
-export declare function classifyGuidedAnswer(kind: GuidedFieldKind, rawInput: string, context?: ClassifyContext): ClassifyResult;
 export type GuidedScreenHeader = {
     commandTitle: string;
     experimentLabel: string;

package/dist/guidedPrompt.js

@@ -11,7 +11,11 @@
  * drain on every answer, exact-token choices, strict ISO times, reserved
  * vocabulary, Unicode format-character rejection, byte-honest length copy).
  */
-import { isCredentialLike, isPathLike } from "./projectAccountabilityState.js";
+import { classifyGuidedAnswer } from "@agent-finops/core";
+// The classifier lives in core (guidedAnswer.ts) so the terminal lane, the
+// agent-draft screening lane, and the MCP draft_improve_command preview
+// share ONE function by construction. Re-exported for existing consumers.
+export { classifyGuidedAnswer };
 const PROMPT_MARKER = "> ";
 /**
  * Scripted source for tests and non-interactive callers. Exhaustion THROWS:
@@ -98,287 +102,6 @@ export function createInteractivePromptSource(emitter) {
         }
     };
 }
-const unambiguousBinaries = new Set([
-    "node", "npm", "npx", "pnpm", "yarn", "bun", "bunx", "deno", "tsx", "ts-node",
-    "git", "gh", "curl", "wget", "bash", "sh", "zsh", "fish", "pwsh", "powershell",
-    "python", "python3", "pip", "pip3", "pipx", "uv", "uvx", "poetry", "pytest",
-    "vitest", "jest", "brew", "apt", "docker", "kubectl", "cargo", "rustc",
-    "dotnet", "mvn", "gradle", "terraform", "ssh", "scp", "rsync", "sudo",
-    "chmod", "chown", "xargs", "grep", "rg", "sed", "awk", "tar", "zip", "unzip",
-    "aibill", "ai-spend-agent", "vim", "nano", "code", "dir", "del", "robocopy"
-]);
-/** Common English verbs that are also binaries: reject only with corroboration. */
-const ambiguousVerbs = new Set([
-    "make", "open", "find", "go", "date", "kill", "top", "head", "tail", "touch",
-    "export", "source", "alias", "echo", "type", "cd", "ls", "cat", "cp", "mv",
-    "rm", "printf", "less", "ps", "copy", "move"
-]);
-const reservedVocabulary = new Set([
-    "held", "passed", "failed", "missing", "regressed", "approve", "approved",
-    "yes", "no", "y", "n", "p", "f", "h", "r", "m", "now", "skip", "keep"
-]);
-/**
- * The accountability backstop predicate (`isCredentialLike`) is the FLOOR:
- * this classifier must reject at least everything `parseDisplayLabel` would
- * reject, or a validated answer could still abort later (B2 QA blocker B1).
- * These extra patterns sit on top of the floor.
- */
-const extraCredentialPattern = /(authorization\s*:\s*(?:bearer|basic)\s+\S+|-----BEGIN [A-Z ]*PRIVATE KEY-----|(?:api[ _-]?key|token|password|secret)\s*[:=]\s*\S+)/i;
-function looksLikeCredential(answer) {
-    return isCredentialLike(answer) || extraCredentialPattern.test(answer);
-}
-const pathExtensionPattern = /\S+\.(?:js|ts|mjs|cjs|jsx|tsx|json|sh|bash|py|rb|go|rs|md|yml|yaml|toml|lock|xml|ps1|bat|cmd|gradle)(?:$|\s)/i;
-/** Strict full date-time with zone, mirroring the CLI's validIsoString. */
-const strictIsoPattern = /^\d{4}-\d{2}-\d{2}[Tt ]\d{2}:\d{2}(?::\d{2}(?:\.\d{1,9})?)?(?:[Zz]|[+-]\d{2}:?\d{2})$/;
-const futureToleranceMs = 2 * 60 * 1000;
-/**
- * Exact non-answer phrases (normalized: lowercase, punctuation stripped).
- * A plan sentence must be actionable later; "i am not sure" passes the
- * two-word substance bar but records a safety net that cannot be executed.
- * Exact match only — a real sentence that merely CONTAINS one still passes.
- */
-const nonAnswerPhrases = new Set([
-    "i am not sure", "im not sure", "not sure", "unsure", "i am unsure",
-    "idk", "i dont know", "dont know", "no idea", "dunno",
-    "no se", "no sé", "ni idea",
-    "whatever", "anything", "nothing", "none", "na", "tbd",
-    "help", "test", "testing", "asdf"
-]);
-function isNonAnswer(lowered) {
-    const normalized = lowered.replace(/[.,!?'’]/g, "").replace(/\s+/g, " ").trim();
-    return nonAnswerPhrases.has(normalized);
-}
-const choiceWordAliases = {
-    yes: "y",
-    no: "n",
-    passed: "p",
-    failed: "f",
-    held: "h",
-    regressed: "r",
-    missing: "m"
-};
-function stripQuotes(token) {
-    return token.replace(/^["'`]+/, "").replace(/["'`]+$/, "");
-}
-function stripEnvPrefixes(tokens) {
-    let index = 0;
-    while (index < tokens.length &&
-        (/^[A-Za-z_][A-Za-z0-9_]*=\S*$/.test(tokens[index]) ||
-            tokens[index] === "sudo" || tokens[index] === "env")) {
-        index += 1;
-    }
-    return tokens.slice(index);
-}
-function looksLikeShellCommand(answer) {
-    if (/^[$%#>] ?/.test(answer))
-        return true;
-    if (/&&|\|\||`|\$\(|>>|<<|2>&1| \| | > | < /.test(answer))
-        return true;
-    if (/(?:^|\s)--[A-Za-z][\w-]*/.test(answer))
-        return true;
-    if (/(?:^|\s)-[A-Za-z](?=\s|$)/.test(answer))
-        return true;
-    // PowerShell Verb-Noun cmdlet shape (Get-ChildItem, Remove-Item …).
-    if (/^[A-Z][a-z]+-[A-Z][A-Za-z]+(?:\s|$)/.test(answer))
-        return true;
-    const tokens = stripEnvPrefixes(answer.split(/\s+/).filter(Boolean));
-    const first = stripQuotes(tokens[0] ?? "").toLowerCase();
-    if (unambiguousBinaries.has(first))
-        return true;
-    if (ambiguousVerbs.has(first)) {
-        // Ambiguous English verbs reject only with a second signal: a path-like
-        // token, a file extension, or a terse all-lowercase fragment that reads
-        // like a command line rather than a sentence.
-        const hasPathToken = tokens.some((token) => /^(?:\/|\.\/|\.\.\/|~\/)/.test(token) || token.includes("/"));
-        const hasExtension = pathExtensionPattern.test(answer);
-        const terseLowercase = tokens.length <= 2 && answer === answer.toLowerCase();
-        return hasPathToken || hasExtension || terseLowercase;
-    }
-    return false;
-}
-function looksLikePath(answer, kind) {
-    // The accountability backstop predicate is the floor: it covers leading
-    // slashes and dot-segments, drive letters, backslashes, and bare ".".
-    if (isPathLike(answer))
-        return true;
-    if (kind === "prose") {
-        if (pathExtensionPattern.test(answer))
-            return true;
-        const slashTokens = answer.split(/\s+/).filter((token) => token.includes("/"));
-        return slashTokens.length >= 2;
-    }
-    // Name-like fields: a slashed token is a path; a bare file-extension token
-    // counts only when it IS the whole answer — "Node.js Guild" is a team.
-    if (/\S+\/\S+/.test(answer))
-        return true;
-    return pathExtensionPattern.test(answer) && !/\s/.test(answer.trim());
-}
-function byteLength(value) {
-    return Buffer.byteLength(value.normalize("NFC"), "utf8");
-}
-function hasControlOrFormatCharacters(value) {
-    // C0/C1 controls including embedded newlines and DEL (tab and trailing
-    // CR are normalized earlier), plus the invisible/directional format
-    // characters that can spoof what the review screen appears to say.
-    // ZWNJ/ZWJ (U+200C/U+200D) are deliberately ALLOWED: they are standard
-    // orthography in Persian and other scripts and in emoji families.
-    if (/[\u0000-\u0008\u000A-\u001F\u007F-\u009F\u2028\u2029]/.test(value))
-        return true;
-    return /[\u00AD\u061C\u200B\u200E\u200F\u202A-\u202E\u2060-\u2064\u2066-\u2069\uFEFF]/.test(value);
-}
-function hasUnpairedSurrogate(value) {
-    for (let index = 0; index < value.length; index += 1) {
-        const code = value.charCodeAt(index);
-        if (code >= 0xd800 && code <= 0xdbff) {
-            const next = value.charCodeAt(index + 1);
-            if (!(next >= 0xdc00 && next <= 0xdfff))
-                return true;
-            index += 1;
-        }
-        else if (code >= 0xdc00 && code <= 0xdfff) {
-            return true;
-        }
-    }
-    return false;
-}
-export function classifyGuidedAnswer(kind, rawInput, context = {}) {
-    const normalizedTabs = rawInput.replace(/\t/g, " ").replace(/\r$/, "");
-    const answer = normalizedTabs.trim();
-    const lowered = answer.toLowerCase();
-    const reject = (code, message) => ({
-        outcome: "reject", code, message
-    });
-    const exampleSuffix = context.example ? ` e.g. ${context.example}` : "";
-    // Navigation pre-pass (every field).
-    if (lowered === "back" || lowered === "b")
-        return { outcome: "navigate", action: "back" };
-    if (lowered === "cancel" || lowered === "q" || lowered === "quit" || lowered === "exit") {
-        return { outcome: "navigate", action: "cancel" };
-    }
-    if (kind === "optional" && (answer === "" || lowered === "skip")) {
-        return { outcome: "skip" };
-    }
-    if (hasControlOrFormatCharacters(answer) || hasUnpairedSurrogate(answer)) {
-        return reject("control", "That answer carried hidden control characters (usually a stray paste). Type it as plain text.");
-    }
-    if (answer === "") {
-        if (kind === "approve") {
-            // An empty answer at the approval screen is a decline, not an error.
-            return { outcome: "navigate", action: "cancel" };
-        }
-        return reject("empty", "This step needs an answer in words. Type it, or type back or cancel.");
-    }
-    if (looksLikeCredential(answer)) {
-        // Never echo, never store: callers must discard this input entirely.
-        return reject("credential", "That looks like it contains a credential. aibill never stores credentials — that answer was discarded. Type it again without the secret.");
-    }
-    switch (kind) {
-        case "approve": {
-            if (answer === "APPROVE")
-                return { outcome: "accept", value: answer };
-            // Clear approval intent gets the nudge, never a silent decline:
-            // APPROVED, aprove, i approve, full-width IME APPROVE, yes/y.
-            const folded = answer.normalize("NFKC").toUpperCase();
-            if (folded.includes("APPROV") || folded.includes("APROVE") ||
-                lowered === "yes" || lowered === "y") {
-                return reject("approve_case", "Approval must be typed APPROVE, in capitals, so it cannot happen by accident.");
-            }
-            // Any other answer is a decline — an answer, not an error.
-            return { outcome: "navigate", action: "cancel" };
-        }
-        case "choice": {
-            const tokens = context.choiceTokens ?? [];
-            if (tokens.includes(lowered))
-                return { outcome: "accept", value: lowered };
-            // Exact full words map to their canonical letter, but only within
-            // their own question family: "no" at a p/f/n question must reprompt,
-            // never silently become "n". Never prefix-match either — "probably
-            // failed" or "not sure" reprompts, not guesses.
-            const alias = choiceWordAliases[lowered];
-            if (alias !== undefined && tokens.includes(alias)) {
-                const applies = lowered === "yes" || lowered === "no" ? tokens.includes("y") :
-                    lowered === "passed" || lowered === "failed" ? tokens.includes("p") :
-                        tokens.includes("h");
-                if (applies)
-                    return { outcome: "accept", value: alias };
-            }
-            if (tokens.includes("p")) {
-                return reject("choice", "Answer p (passed), f (failed), or n (not run yet).");
-            }
-            if (tokens.includes("h")) {
-                return reject("choice", "Answer h (held), r (regressed), or m (cannot say).");
-            }
-            return reject("choice", `Answer one of: ${tokens.join(", ")}.`);
-        }
-        case "time": {
-            if (lowered === "now") {
-                return { outcome: "accept", value: new Date(context.nowMs ?? Date.now()).toISOString() };
-            }
-            if (!strictIsoPattern.test(answer)) {
-                return reject("time_invalid", "That is not a UTC ISO-8601 time. e.g. 2026-08-17T14:03:00Z — or type now if it just finished.");
-            }
-            const parsed = Date.parse(answer);
-            if (!Number.isFinite(parsed)) {
-                return reject("time_invalid", "That is not a UTC ISO-8601 time. e.g. 2026-08-17T14:03:00Z — or type now if it just finished.");
-            }
-            const approvedAt = context.approvedAtIso ? Date.parse(context.approvedAtIso) : undefined;
-            if (context.approvedAtIso !== undefined && !Number.isFinite(approvedAt ?? Number.NaN)) {
-                // Fail closed: an unreadable approval time must never silently
-                // disable the after-approval check.
-                return reject("time_invalid", "The approval record's own time is unreadable, so this time cannot be checked. Type cancel and rerun this command.");
-            }
-            if (approvedAt !== undefined && parsed <= approvedAt) {
-                return reject("time_before_approval", `That time is not after the approval at ${context.approvedAtIso}. A change cannot be applied before it was approved. Paste the time the agent reported.`);
-            }
-            if (parsed > (context.nowMs ?? Date.now()) + futureToleranceMs) {
-                return reject("time_future", "That time is in the future. Paste the actual reported time.");
-            }
-            return { outcome: "accept", value: new Date(parsed).toISOString() };
-        }
-        default:
-            break;
-    }
-    if (looksLikeShellCommand(answer)) {
-        const message = kind === "prose"
-            ? "That looks like a shell command, not an answer. Nothing runs here — describe it in words."
-            : "That looks like a shell command, not a name. Answer with the name in words.";
-        return reject("shell", message);
-    }
-    if (kind === "prose" && lowered === "keep" && (context.priorShellRejections ?? 0) >= 2) {
-        // After repeated identical shell rejections the user may type `keep` to
-        // record their exact text as words. The caller substitutes the last
-        // rejected line; this sentinel value never reaches storage.
-        return { outcome: "accept", value: "keep" };
-    }
-    if (looksLikePath(answer, kind)) {
-        return reject("path", "That looks like a file path. Describe it in words instead — the answer must read as a sentence, not a location.");
-    }
-    if (kind === "name" || kind === "team" || kind === "role" || kind === "optional") {
-        if (reservedVocabulary.has(lowered)) {
-            const message = kind === "role"
-                ? `"${answer}" is aibill's own vocabulary, not a role. Answer with your real job role, in words.${exampleSuffix}`
-                : `That is aibill vocabulary, not a name. Answer in your own words.${exampleSuffix}`;
-            return reject("reserved", message);
-        }
-        if (strictIsoPattern.test(answer)) {
-            return reject("timestamp_shaped", `That is a time, not a name.${exampleSuffix}`);
-        }
-        if (byteLength(answer) > 192) {
-            return reject("length", "That name is longer than aibill can store (192 bytes). Use a shorter form.");
-        }
-        return { outcome: "accept", value: answer.normalize("NFC") };
-    }
-    // prose
-    if (answer.length > 1000) {
-        return reject("length", "Keep it to one or two short sentences (under 1,000 characters).");
-    }
-    if (answer.split(/\s+/).filter(Boolean).length < 2 || isNonAnswer(lowered)) {
-        return reject("substance", `That is not something aibill can hold you to later. Write what should actually happen — or type back or cancel if you are not ready.${exampleSuffix}`);
-    }
-    // NFC like the name fields: the rollback sentence is later re-typed and
-    // compared by hash, so composition differences must not fail the match.
-    return { outcome: "accept", value: answer.normalize("NFC") };
-}
 export function renderGuidedHeader(header) {
     const demoPrefix = header.demo
         ? "DEMO · synthetic sample — practice run, nothing is recorded\n"

package/dist/improveFlow.d.ts

@@ -86,6 +86,17 @@ export type PlanDraftStore = {
     clear: () => Promise<void>;
 };
 export declare function parsePlanDraft(value: unknown): PlanDraftV1 | undefined;
+export type SuggestedPlanAnswer = {
+    value: string;
+    /**
+     * Who actually wrote this suggestion. Drives the per-field prefill label:
+     * "agent" renders `Drafted with your agent`, "aibill" renders `Suggested`.
+     * Acceptance converts provenance (m9): the moment the user Enter-accepts
+     * or types a sentence it is the USER'S answer — revisits show
+     * `Current answer:` and no provenance is stored anywhere.
+     */
+    provenance: "aibill" | "agent";
+};
 export type PlanResult = {
     action: "cancelled";
 } | {
@@ -118,12 +129,15 @@ export declare function runPlanSitting(io: FlowIo, options: {
     /**
      * Machine-drafted plan sentences, accepted with Enter. The human still
      * approves the exact recorded plan; a saved draft (the user's own words)
-     * always outranks a suggestion.
+     * always outranks a suggestion. Provenance travels WITH each value so
+     * the on-screen label is derived per field at render — there is no
+     * sitting-wide label option, so a mixed sitting (agent change + aibill
+     * rollback fallback) can never mislabel (B1, QA 17).
      */
     suggestedAnswers?: {
-        change?: string;
-        rollback?: string;
-        canary?: string;
+        change?: SuggestedPlanAnswer;
+        rollback?: SuggestedPlanAnswer;
+        canary?: SuggestedPlanAnswer;
     };
 }): Promise<PlanResult>;
 export type RecordResult = {
@@ -141,6 +155,22 @@ export declare function runRecordSitting(io: FlowIo, options: {
     header: Omit<SittingHeader, "sitting">;
     approvedAtIso: string;
     approvedByLine: string;
+    /**
+     * Agent-drafted applied-at prefill. Enter-keep re-classifies it with
+     * the approvedAtIso context (defense in depth), so a time before the
+     * approval or in the future can never be Enter-accepted.
+     */
+    suggested?: {
+        appliedAtIso?: string;
+    };
+    /**
+     * The agent's REPORTED canary result. Renders only as a claim line
+     * above the unchanged p/f/n question — it never prefills anything, and
+     * Enter on an empty line reprompts exactly as today (M6, QA 18). The
+     * most fakeable financial input in the loop keeps a mandatory human
+     * keystroke.
+     */
+    agentCanaryReport?: "passed" | "failed";
 }): Promise<RecordResult>;
 export type QualityResult = {
     action: "cancelled";

package/dist/improveFlow.js

@@ -37,12 +37,16 @@ async function ask(io, header, spec) {
             }),
             ""
         ];
-        if (spec.emptyKeepsValue !== undefined) {
+        if (spec.emptyKeepsValue !== undefined && spec.enterDefault === undefined) {
             const label = spec.emptyKeepsLabel ?? "Current answer";
             parts.push(`${label}: "${spec.emptyKeepsValue}"`);
-            parts.push(label === "Suggested"
-                ? "Press Enter to accept it, or type your own."
-                : "Press Enter to keep it, or type a replacement.");
+            // Any label other than a revisit of the user's own answer is a
+            // machine suggestion — "Suggested" (aibill's) or "Drafted with your
+            // agent" (B1: the label is computed per field from real provenance,
+            // never sitting-wide, so it can never sit over the wrong author).
+            parts.push(label === "Current answer"
+                ? "Press Enter to keep it, or type a replacement."
+                : "Press Enter to accept it, or type your own.");
             parts.push("");
         }
         parts.push(renderGuidedQuestion({
@@ -70,7 +74,11 @@ async function ask(io, header, spec) {
             ? { maxIdenticalRejections: io.maxIdenticalRejections }
             : {}),
         ...(io.nowMs !== undefined ? { nowMs: io.nowMs } : {}),
-        ...(spec.emptyKeepsValue !== undefined ? { emptyKeepsValue: spec.emptyKeepsValue } : {})
+        ...(spec.enterDefault !== undefined
+            ? { emptyKeepsValue: spec.enterDefault }
+            : spec.emptyKeepsValue !== undefined
+                ? { emptyKeepsValue: spec.emptyKeepsValue }
+                : {})
     });
 }
 export async function runStartSitting(io, options) {
@@ -92,8 +100,9 @@ export async function runStartSitting(io, options) {
             step: 1,
             totalSteps: 2,
             question: "Start this token test?",
-            guidance: "Answer y or n. Type cancel to stop safely.",
+            guidance: "Enter = y · n stops · cancel stops safely.",
             context: { choiceTokens: ["y", "n"] },
+            enterDefault: "y",
             sittingHint: shortSittingHint
         });
         if (first.outcome === "cancelled" || first.outcome === "back")
@@ -310,8 +319,9 @@ export async function runPlanSitting(io, options) {
                 kind: "choice",
                 step: 1,
                 totalSteps,
-                question: "Resume where you left off? Answer y to resume, n to start the plan over (saved answers are discarded).",
+                question: "Resume where you left off? Enter = y · n starts the plan over (saved answers are discarded).",
                 context: { choiceTokens: ["y", "n"] },
+                enterDefault: "y",
                 sittingHint: planSittingHint
             });
             if (resume.outcome === "cancelled" || resume.outcome === "back") {
@@ -339,7 +349,7 @@ export async function runPlanSitting(io, options) {
             const prose = planProse[stepIndex];
             const existing = answers[prose.key];
             const suggested = options.suggestedAnswers?.[prose.key];
-            const prefill = existing ?? suggested;
+            const prefill = existing ?? suggested?.value;
             const outcome = await ask(io, header, {
                 kind: "prose",
                 step: stepIndex + 1,
@@ -352,8 +362,15 @@ export async function runPlanSitting(io, options) {
                 navigationHint: "Type back to return, or cancel to stop safely.",
                 sittingHint: planSittingHint,
                 ...(prefill !== undefined ? { emptyKeepsValue: prefill } : {}),
-                ...(prefill !== undefined && existing === undefined
-                    ? { emptyKeepsLabel: "Suggested" }
+                // A saved/typed answer outranks any suggestion and shows the
+                // default "Current answer" revisit label; a suggestion's label is
+                // computed from ITS OWN provenance, per field (B1, m9).
+                ...(prefill !== undefined && existing === undefined && suggested !== undefined
+                    ? {
+                        emptyKeepsLabel: suggested.provenance === "agent"
+                            ? "Drafted with your agent"
+                            : "Suggested"
+                    }
                     : {})
             });
             if (outcome.outcome === "cancelled")
@@ -393,8 +410,9 @@ export async function runPlanSitting(io, options) {
                     kind: "choice",
                     step: 4,
                     totalSteps,
-                    question: "Approve as this identity? Answer y to continue, or n to stop here and run identify again first.",
+                    question: "Approve as this identity? Enter = y · n stops here so you can run identify again first.",
                     context: { choiceTokens: ["y", "n"] },
+                    enterDefault: "y",
                     sittingHint: planSittingHint
                 });
                 if (confirm.outcome === "cancelled")
@@ -503,7 +521,13 @@ export async function runRecordSitting(io, options) {
             example: "2026-08-17T14:03:00Z",
             navigationHint: "Type back if the change has not been applied yet, or cancel to stop safely.",
             context: { example: "2026-08-17T14:03:00Z", approvedAtIso: options.approvedAtIso },
-            sittingHint: recordSittingHint
+            sittingHint: recordSittingHint,
+            ...(options.suggested?.appliedAtIso !== undefined
+                ? {
+                    emptyKeepsValue: options.suggested.appliedAtIso,
+                    emptyKeepsLabel: "Drafted with your agent"
+                }
+                : {})
         });
         if (time.outcome === "cancelled")
             return { action: "cancelled" };
@@ -515,7 +539,9 @@ export async function runRecordSitting(io, options) {
             kind: "choice",
             step: 2,
             totalSteps: 2,
-            question: "Did the approved canary pass?",
+            question: options.agentCanaryReport !== undefined
+                ? `Your agent reports: canary ${options.agentCanaryReport} — not yet recorded; your\nanswer below is what counts.\nDid the approved canary pass?`
+                : "Did the approved canary pass?",
             guidance: "Answer p (passed) · f (failed) · n (not run yet)",
             context: { choiceTokens: ["p", "f", "n"] },
             sittingHint: recordSittingHint