@yagni-app/code-staging 1.0.1-staging.1195.1 → 1.0.1-staging.1201.1

package/dist/extension/askYagniTool.d.ts

@@ -12,7 +12,7 @@ export interface Citation {
  * AskStanding — mirrored locally by this extension's no-workspace-imports
  * convention, see costHud.ts).
  */
-export type AskStanding = "confirmed" | "asserted" | "inferred" | "no_position";
+export type AskStanding = "confirmed" | "asserted" | "inferred" | "no_position" | "contested";
 /** One line the TUI shows above the answer, per standing. */
 export declare const STANDING_LINES: Record<AskStanding, string>;
 /** Options for {@link makeAskYagniTool}. */

package/dist/extension/askYagniTool.js

@@ -10,6 +10,7 @@ export const STANDING_LINES = {
     asserted: "Grounded in a recorded assumption, not yet verified",
     inferred: "Inferred from workspace context, not a recorded decision",
     no_position: "No recorded position in this workspace",
+    contested: "Two recorded decisions conflict — escalate to a human",
 };
 function standingLine(value) {
     return typeof value === "string" && value in STANDING_LINES
@@ -141,11 +142,29 @@ export function makeAskYagniTool(opts) {
                     text = `${text}\n\n${suggestion}`;
                 }
             }
+            // P0 (Run 8 review): a contested answer must reach the MODEL, not just
+            // the TUI. The backend composes an ordinary answer and only overrides
+            // standing client-side, so without this the coding agent can act on one
+            // conflicting side without ever seeing the do-not-proceed instruction.
+            // The refusal + both positions are appended VERBATIM to tool content.
+            if (data.standing === "contested") {
+                const lines = [];
+                if (data.contestedInstruction)
+                    lines.push(data.contestedInstruction);
+                for (const p of data.contestedPositions ?? []) {
+                    lines.push(`- (${p.id}) ${p.question}: ${p.decision}`);
+                }
+                if (lines.length > 0) {
+                    text = `${data.answer}\n\n${lines.join("\n")}`;
+                }
+            }
             return {
                 content: [{ type: "text", text }],
                 details: {
                     citations: data.citations ?? [],
                     ...(data.standing ? { standing: data.standing } : {}),
+                    ...(data.contestedInstruction ? { contestedInstruction: data.contestedInstruction } : {}),
+                    ...(data.contestedPositions ? { contestedPositions: data.contestedPositions } : {}),
                 },
             };
         },

package/dist/extension/index.js

@@ -40,7 +40,7 @@ import { registerDecisionCommands } from "./decisions.js";
 import { makeDecisionCapture } from "./decisionCapture.js";
 import { registerAmbientRecall } from "./recall.js";
 import { resilientFetch } from "./resilientFetch.js";
-import { installUncaughtExceptionMonitor, makeCrashReporter } from "./crashReport.js";
+import { installUncaughtExceptionMonitor, makeCrashReporter, runningUnderTest } from "./crashReport.js";
 import { flushSpool as defaultFlushSpool } from "./spool.js";
 import { makeAuthedFetch, makeTokenProvider } from "./tokenProvider.js";
 import { attributionHeaders, fetchCatalog as defaultFetchCatalog, fetchContextBrief as defaultFetchContextBrief, getToken, getTokenExpiresAt as defaultGetTokenExpiresAt, getWorkspaceId as defaultGetWorkspaceId, isDriverCaller, resolveBaseUrl, tokenExpiryNotice, } from "./config.js";
@@ -332,7 +332,10 @@ export async function registerYagni(pi, deps = {}) {
         const { event: _ignored, ...fields } = payload;
         logEvent({
             source: "guardian",
-            level: event === "guardian_event_post_failed" ? "error" : "info",
+            // `malformed` is a real failure (this is the "unclear verdict" bug the
+            // whole capture exists to diagnose) — an error, not routine info. The
+            // failed-telemetry event is already an error.
+            level: event === "guardian_event_post_failed" || payload.outcome === "malformed" ? "error" : "info",
             event,
             sessionId: env.YAGNI_SESSION_ID ?? undefined,
             fields,
@@ -357,7 +360,43 @@ export async function registerYagni(pi, deps = {}) {
         guardianTier,
         guardianDisabled,
         guardianReview: (command, deps) => reviewCommand(command, { ...deps, modelTier: guardianTier }),
-        onGuardianReview: (ev) => guardianLogSink(ev),
+        onGuardianReview: (ev) => {
+            guardianLogSink(ev);
+            // A malformed verdict is a real failure on our side that must reach
+            // Sentry for EVERY workspace (independent of the opt-in storage tier).
+            // Fire-and-forget to the dedicated telemetry endpoint; fail-soft, and
+            // suppressed under test/eval so a CI run never phones prod.
+            if (ev.outcome === "malformed" && !evalMode && !runningUnderTest(env)) {
+                void (async () => {
+                    try {
+                        const body = {
+                            outcome: ev.outcome,
+                            ...(ev.rawOutput ? { rawOutput: ev.rawOutput } : {}),
+                            ...(ev.durationMs !== undefined ? { durationMs: ev.durationMs } : {}),
+                            ...(ev.tier ? { tier: ev.tier } : {}),
+                        };
+                        const res = await resilientFetch(`${baseUrl}/api/yagni-code/guardian-error`, {
+                            method: "POST",
+                            headers: {
+                                "content-type": "application/json",
+                                authorization: `Bearer ${getTokenFn() ?? ""}`,
+                                ...attributionHeaders(deps.env),
+                            },
+                            body: JSON.stringify(body),
+                        }, {
+                            fetchImpl: authedFetch,
+                            policy: { maxAttempts: 1, backoffBaseMs: 0, backoffMaxMs: 0, timeoutMs: GUARDIAN_EVENT_TIMEOUT_MS, jitterRatio: 0 },
+                        });
+                        if (!res.ok) {
+                            guardianLogSink({ event: "guardian_error_post_failed", status: res.status });
+                        }
+                    }
+                    catch {
+                        guardianLogSink({ event: "guardian_error_post_failed", kind: "network" });
+                    }
+                })();
+            }
+        },
         grants: sessionGrants,
         resolveRepoKey,
         persistGrant: (grant) => {

package/dist/extension/permission/gate.js

@@ -561,13 +561,14 @@ export function registerPermissionGate(pi, deps = {}) {
                             ctx.ui.setStatus?.("yagni-guardian", undefined);
                     }
                     const durationMs = Date.now() - startMs;
-                    const emitDiag = (outcome, rationale) => {
+                    const emitDiag = (outcome, rationale, rawOutput) => {
                         if (!deps.onGuardianReview)
                             return;
                         void Promise.resolve(deps.onGuardianReview(buildDiagnosticEvent(outcome, {
                             durationMs,
                             tier: guardianTier,
                             ...(rationale ? { rationale } : {}),
+                            ...(rawOutput ? { rawOutput } : {}),
                             debug: isDebug(),
                         }))).catch(() => { });
                     };
@@ -734,7 +735,7 @@ export function registerPermissionGate(pi, deps = {}) {
                     }
                     // Guardian failed (timeout/malformed/network/empty/aborted).
                     const error = reviewResult.error ?? "network";
-                    emitDiag(error);
+                    emitDiag(error, undefined, reviewResult.rawOutput);
                     if (error === "aborted" || ctx?.signal?.aborted) {
                         // The user aborted mid-consult — silent block: no dialog, no
                         // "Guardian unavailable" warning on a turn they deliberately

package/dist/extension/permission/guardian.d.ts

@@ -106,7 +106,20 @@ export interface ReviewResult {
     verdict: GuardianVerdict | null;
     error?: GuardianError;
     cost: number;
+    /**
+     * Scrubbed + capped copy of the model output when the verdict failed to
+     * parse (`error: "malformed"`). Present so the sink can capture the exact
+     * failure shape. Never contains the raw command unredacted: `scrubSecrets`
+     * removes secret-shaped values before this is stored.
+     */
+    rawOutput?: string;
 }
+/**
+ * Cap on the malformed-output capture. The model's unparseable verdict is
+ * usually a single short JSON-ish blob; this bounds a pathological output so
+ * it cannot balloon a log line or a Sentry payload.
+ */
+export declare const GUARDIAN_RAW_OUTPUT_CAP = 2048;
 export interface ReviewCommandDeps {
     runStage?: typeof defaultRunStage;
     cwd: string;
@@ -143,6 +156,12 @@ export interface GuardianDiagnosticEvent {
     commandHash?: string;
     /** Debug-only: the Guardian's rationale. */
     rationale?: string;
+    /**
+     * Scrubbed + capped copy of the unparseable model output, present only for
+     * `outcome: "malformed"`. Always-on (NOT debug-gated): it is already
+     * `scrubSecrets`-redacted and size-capped at the source.
+     */
+    rawOutput?: string;
 }
 /**
  * Create a sanitized diagnostic event. Never includes the raw command text
@@ -153,6 +172,7 @@ export declare function buildDiagnosticEvent(outcome: GuardianOutcome | Guardian
     tier?: string;
     rationale?: string;
     commandHash?: string;
+    rawOutput?: string;
     debug?: boolean;
 }): GuardianDiagnosticEvent;
 //# sourceMappingURL=guardian.d.ts.map

package/dist/extension/permission/guardian.js

@@ -28,6 +28,7 @@
  * alternating deny/ask.
  */
 import { runStage as defaultRunStage } from "../pipeline/runner.js";
+import { scrubSecrets } from "../pipeline/scrubSecrets.js";
 export const DEFAULT_GUARDIAN_LIMITS = {
     maxReviews: 120,
     maxConsecutiveDenials: 3,
@@ -161,6 +162,12 @@ export function formatGuardianSubtotal(state, limits) {
     const plural = state.reviews === 1 ? "review" : "reviews";
     return `Guardian: ${state.reviews} ${plural}.`;
 }
+/**
+ * Cap on the malformed-output capture. The model's unparseable verdict is
+ * usually a single short JSON-ish blob; this bounds a pathological output so
+ * it cannot balloon a log line or a Sentry payload.
+ */
+export const GUARDIAN_RAW_OUTPUT_CAP = 2048;
 /**
  * The synthetic stage a Guardian consult runs as. Borrows the `plan` StageId
  * (same pattern as the advisor) so it doesn't ripple into feed/reducers. The
@@ -231,7 +238,14 @@ export async function reviewCommand(command, deps) {
         }
         const verdict = parseVerdict(output);
         if (!verdict) {
-            return { verdict: null, error: "malformed", cost };
+            // Scrubbed + capped so the local sink and Sentry can see the exact
+            // failure shape without carrying a raw command or a secret it echoed.
+            return {
+                verdict: null,
+                error: "malformed",
+                cost,
+                rawOutput: scrubSecrets(output).slice(0, GUARDIAN_RAW_OUTPUT_CAP),
+            };
         }
         return { verdict, cost };
     }
@@ -261,6 +275,7 @@ export function buildDiagnosticEvent(outcome, opts) {
         outcome,
         ...(opts.durationMs !== undefined ? { durationMs: opts.durationMs } : {}),
         ...(opts.tier !== undefined ? { tier: opts.tier } : {}),
+        ...(opts.rawOutput !== undefined ? { rawOutput: opts.rawOutput } : {}),
     };
     if (opts.debug) {
         if (opts.rationale)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yagni-app/code-staging",
-  "version": "1.0.1-staging.1195.1",
+  "version": "1.0.1-staging.1201.1",
   "description": "YAGNI Code: a terminal coding agent that already knows your company. One YAGNI login routes the model and grounds the agent in your team's context.",
   "license": "SEE LICENSE IN LICENSE.md",
   "author": "YAGNI, Inc. <jack@yagni.app> (https://yagni.app)",
@@ -41,5 +41,5 @@
     "turndown": "^7.2.4",
     "typebox": "^1.3.15"
   },
-  "yagniSourceSha": "94552f071c671de30adbf48b73c34999e9c831d2"
+  "yagniSourceSha": "a096635384d1ff496d9cd4bd15611c0b2b1a6601"
 }