tickmarkr 1.84.0 → 1.86.0

package/dist/run/consult.js

@@ -2,7 +2,8 @@ import { mkdirSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
 import { getAdapter } from "../adapters/registry.js";
 import { bannerShell, paneDispatchCommand } from "../brand.js";
-import { augmentFakeVerdictOutput, extractVerdictJson, gateExitTrailer, gatePaneName, generateVerdictNonce, verdictNonceLine } from "../gates/llm.js";
+import { extractVerdictJson, gateExitTrailer, gatePaneName, generateVerdictNonce, verdictNonceLine } from "../gates/llm.js";
+import { classifyVerdictCause } from "../gates/verdict-cause.js";
 import { sh } from "./git.js";
 import { redactSecrets } from "./redact.js";
 import { filterLlmTranscript } from "./stall.js";
@@ -57,6 +58,33 @@ export function augmentRetryBrief(feedback, opts) {
     return parts.join("\n\n");
 }
 const ACTIONS = ["retry", "reroute", "decompose", "human"];
+export function parseConsultVerdict(out, nonce) {
+    const v = extractVerdictJson(out, nonce);
+    if (!v)
+        return { verdict: null, cause: classifyVerdictCause(out, nonce, "action") };
+    // A parsed object with an unknown action is a content rejection, not silence. It keeps the existing
+    // null result without manufacturing a classifier cause for a state the classifier never saw.
+    if (!ACTIONS.includes(v.action))
+        return { verdict: null };
+    // fail-closed exclusion: only a non-empty string survives. Malformed values (number/array/object/
+    // empty) are dropped — the verdict stays a normal channel-level reroute/retry/…, never a crash
+    // and never silently forced to human. Unknown adapter ids pass through; the daemon treats a
+    // zero-match expansion as channel-level reroute.
+    const raw = v.excludeAdapter;
+    const excludeAdapter = typeof raw === "string" && raw.length > 0 ? raw : undefined;
+    const reason = typeof v.reason === "string" ? v.reason : undefined;
+    const guidance = typeof v.guidance === "string" ? v.guidance : undefined;
+    const notes = String(v.notes ?? guidance ?? reason ?? "");
+    return {
+        verdict: {
+            action: v.action,
+            notes,
+            ...(reason ? { reason } : {}),
+            ...(guidance ? { guidance } : {}),
+            ...(excludeAdapter ? { excludeAdapter } : {}),
+        },
+    };
+}
 // v1.65 T2: transcript noise (spinner repaints, CR churn, pass-run spam) is squashed at build time —
 // the filtered form is what persists to the consults/ artifact AND what the model reads; fail-open.
 export function buildDossierPrompt(d, nonce) {
@@ -108,7 +136,8 @@ opts = {}) {
     // consult model reads) is masked at this seam; the in-memory Dossier stays untouched.
     writeFileSync(promptFile, redactSecrets(buildDossierPrompt(d, nonce)));
     // One seat = the WHOLE invoke-and-parse unit, both visibility branches (OBS-69 class: a headless-only
-    // failover would leave the production pane path hard-failing on seat one). null = no parseable verdict.
+    // failover would leave the production pane path hard-failing on seat one). A null verdict retains
+    // the classifier's cause when extraction failed; parsed content rejections deliberately have none.
     const invokeSeat = async (seatAdapter, seatModel, seatIdx) => {
         const adapter = getAdapter(seatAdapter, adapters);
         let out;
@@ -143,26 +172,7 @@ opts = {}) {
                     await driver.close(slot);
             }
         }
-        out = augmentFakeVerdictOutput(adapter, out, nonce);
-        const v = extractVerdictJson(out, nonce);
-        if (!v || !ACTIONS.includes(v.action))
-            return null;
-        // fail-closed exclusion: only a non-empty string survives. Malformed values (number/array/object/
-        // empty) are dropped — the verdict stays a normal channel-level reroute/retry/…, never a crash
-        // and never silently forced to human. Unknown adapter ids pass through; the daemon treats a
-        // zero-match expansion as channel-level reroute.
-        const raw = v.excludeAdapter;
-        const excludeAdapter = typeof raw === "string" && raw.length > 0 ? raw : undefined;
-        const reason = typeof v.reason === "string" ? v.reason : undefined;
-        const guidance = typeof v.guidance === "string" ? v.guidance : undefined;
-        const notes = String(v.notes ?? guidance ?? reason ?? "");
-        return {
-            action: v.action,
-            notes,
-            ...(reason ? { reason } : {}),
-            ...(guidance ? { guidance } : {}),
-            ...(excludeAdapter ? { excludeAdapter } : {}),
-        };
+        return parseConsultVerdict(out, nonce);
     };
     // v1.54 T1: ranked seat failover. Walk consult.prefer (adapter:model entries) to the first entry
     // whose adapter is in the live channel set; a failed seat or unparseable verdict falls to the next;
@@ -176,9 +186,9 @@ opts = {}) {
     seats.push({ adapter: cfg.consult.adapter, model: cfg.consult.model });
     for (const [i, seat] of seats.entries()) {
         try {
-            const v = await invokeSeat(seat.adapter, seat.model, i);
-            if (v)
-                return v;
+            const parsed = await invokeSeat(seat.adapter, seat.model, i);
+            if (parsed.verdict)
+                return parsed.verdict;
         }
         catch {
             // failed seat (unknown adapter, dead driver/pane, shell error) — fall to the next entry

package/dist/run/daemon.d.ts

@@ -1,7 +1,7 @@
 import { type WorkerAdapter } from "../adapters/types.js";
 import { type ModeResolution, type RoutingMode, type TickmarkrConfig } from "../config/config.js";
 import { type ExecutorDriver } from "../drivers/types.js";
-import { type JournalEvent } from "./journal.js";
+import { Journal, type JournalEvent } from "./journal.js";
 export interface RunOptions {
     runId?: string;
     resume?: boolean;
@@ -42,13 +42,59 @@ export interface RunSummary {
     lastMergedTask?: string;
 }
 export declare function formatSummary(s: RunSummary): string;
+/**
+ * T4 (OBS-265): the journal with the review objections a round did NOT hinge on removed. Judge and
+ * review are now launched together, so a round can journal a failed review that the serial walk would
+ * never have asked for — it returned at the judge. Those verdicts stay on the record (they are real,
+ * and the retry brief carries them), but they must not spend the OPERATOR-facing review round budget:
+ * otherwise concurrency alone parks a task rounds early for objections the old pipeline never bought.
+ * A round is the gate-result span opened by each `gates` phase-start, per task.
+ */
+export declare function decisiveReviewRounds(events: JournalEvent[]): JournalEvent[];
 export declare const EARLY_LAUNCH_LIVENESS_MS = 60000;
 /** Test seam — lowers the empty-pane liveness window without sleeping 60s per case. */
 export declare function setEarlyLaunchLivenessMsForTests(ms: number): void;
 export declare function resetEarlyLaunchLivenessMsForTests(): void;
-export declare const NUDGEABLE_ADAPTERS: Set<string>;
+export { NUDGEABLE_ADAPTERS } from "./stall.js";
 export declare const WORKER_NUDGE_MESSAGE = "tickmarkr liveness check: if the task is complete, print your TICKMARKR_RESULT completion trailer exactly as specified in your prompt now. If not, state your next concrete action and continue working.";
 /** Test seam — shrink the nudge gate and grace without minute-long sleeps. */
 export declare function setNudgeTimingForTests(silentMs: number, graceMs: number): void;
 export declare function resetNudgeTimingForTests(): void;
+/** Test seam — shrink the quota-banner silence gate without minute-long sleeps. */
+export declare function setQuotaBannerSilentMsForTests(ms: number): void;
+export declare function resetQuotaBannerSilentMsForTests(): void;
+/** Test seam — shrink the repeat-page cadence without minute-long sleeps. */
+export declare function setPageRepeatMsForTests(ms: number): void;
+export declare function resetPageRepeatMsForTests(): void;
+/** Test seam — shrink the fast-kill window without minute-long sleeps. */
+export declare function setDeadChannelFastKillMsForTests(ms: number): void;
+export declare function resetDeadChannelFastKillMsForTests(): void;
+/** Test seam — shrink the harvest silence gate without minute-long sleeps. */
+export declare function setHarvestSilentMsForTests(ms: number): void;
+export declare function resetHarvestSilentMsForTests(): void;
+export declare function harvestCpuFlatWindowMs(resolutionMs: number): number;
+/** Test seam — pin the flat window so a probe case need not sit through a real one. */
+export declare function setHarvestCpuFlatMsForTests(ms: number): void;
+export declare function resetHarvestCpuFlatMsForTests(): void;
+export declare const HARVESTED_RESULT_SUMMARY = "harvested: the worktree carries committed work; the worker emitted no TICKMARKR_RESULT trailer";
+/** T4 (OBS-266): identity of the command SET a tip verify ran — a changed command is a different verify. */
+export declare function commandsHash(commands: Record<string, string>): string;
+/**
+ * OBS-34's strict tip verify, but it stops re-paying for an unmoved tip (~334m corpus-wide; 69.5m in
+ * one park-heavy run whose 18 resume cycles merged nothing new). The verify journals the SHA it
+ * verified and the hash of the command set, so a later run-end can recognize the same verified state:
+ * head equals the LAST green verified SHA, commands unchanged, tree clean → journal
+ * `tip-verify-cached` and skip. ANY doubt — moved head, changed commands, dirty tree, a gate missing
+ * from that cycle's green set, a failure recorded in it, a cycle older than the last one — runs the
+ * full verify. The tip-verify-before-green law is untouched: a cached green is a verified green OF
+ * THAT EXACT COMMIT, established by the most recent real run of the same commands.
+ * Returns whether the tip is failing.
+ */
+export declare function verifyIntegrationTipCached(intWt: string, commands: Record<string, string>, journal: Journal, opts?: {
+    lastMergedTask?: string;
+}): Promise<boolean>;
+export declare function workerTreeCpuMs(marker: string, cwd: string): Promise<{
+    ms: number;
+    resolutionMs: number;
+} | undefined>;
 export declare function runDaemon(repoRoot: string, opts?: RunOptions): Promise<RunSummary>;