zelari-code 2.37.3 → 2.39.0

package/dist/cli/kraken/verifyReask.js

@@ -0,0 +1,134 @@
+/**
+ * verifyReask — t56: minimal one-shot re-ask for an `unknown` verify verdict.
+ *
+ * Problem
+ * -------
+ * When a reviewer's reply has no parseable verdict trailer, the executor
+ * records the node as `unresolved` (reason 'unknown') and moves on — correct
+ * per "unknown ≠ pass", but expensive in one specific way: the verdict was
+ * almost certainly FORMULATED in the reply and only the trailer line got
+ * mangled by prompt drift. Re-running the whole verify sub-agent pays a
+ * second full review for one missing line.
+ *
+ * What this module does instead
+ * -----------------------------
+ * A single non-streaming chat completion, no tools, against the same
+ * provider channel the CLI already uses (same resolution as the weakness
+ * meter): hand the model its own prior output (tail-capped) and ask it to
+ * emit ONLY the trailer it already supports. The reply is parsed with the
+ * SAME single-source parser as the original verdict (`parseVerifyVerdict`
+ * from @zelari/core) — no second grammar to drift.
+ *
+ * Guarantees:
+ *   - capped at ONE call per unknown verdict (the caller enforces this);
+ *   - default ON, opt-out via ZELARI_KRAKEN_VERIFY_REASK=0;
+ *   - any failure (disabled, no key, HTTP error, unparseable reply)
+ *     returns null and the existing unknown-flow is unchanged;
+ *   - the verify node's raw `result` is NEVER rewritten by this module —
+ *     audit sees what the reviewer actually emitted.
+ *
+ * Pattern follows `./weaknessMeter.ts` (provider resolution, timeout,
+ * silent failure). No I/O at import time.
+ *
+ * @since v2.x — t56 re-ask minimal su verdetto unknown
+ */
+import { parseVerifyVerdict } from '@zelari/core';
+import { getProviderConfig, getModelForProvider, getCustomEndpoint } from '../providerConfig.js';
+import { resolveApiKeyWithMeta } from '../keyStore.js';
+/** Env flag. Default ON ('0' | 'false' | 'no' disables). */
+export const VERIFY_REASK_ENV = 'ZELARI_KRAKEN_VERIFY_REASK';
+/** Wall-clock budget for the single re-ask call. */
+const REASK_TIMEOUT_MS = 12_000;
+/** How much of the prior verify output we forward (trailer lives at the end). */
+const PRIOR_OUTPUT_CAP_CHARS = 8_000;
+const REASK_SYSTEM_PROMPT = [
+    'You are a verdict-normalization helper.',
+    'The message below is a code-review verify report whose final verdict trailer line is missing or malformed.',
+    'Re-read the report and emit, as the LAST line, ONLY the verdict the report already supports:',
+    '`VERDICT: PASS` or `VERDICT: FAIL`.',
+    'Do not re-review the work, do not add commentary.',
+    'If the report genuinely supports neither verdict, emit `VERDICT: UNKNOWN`.',
+].join(' ');
+/**
+ * Whether the re-ask is enabled. Cheap; read per call (no memoization —
+ * unlike the weakness meter this is not on a hot path).
+ */
+export function isVerifyReaskEnabled(env = process.env) {
+    const raw = env[VERIFY_REASK_ENV];
+    if (raw === undefined || raw === '')
+        return true; // default ON
+    return !(raw === '0' || raw === 'false' || raw === 'no');
+}
+/**
+ * One-shot trailer recovery. Returns `'pass' | 'fail'` when the model
+ * restated a usable verdict, `null` otherwise (disabled / failed /
+ * still unknown). Never throws.
+ */
+export async function reaskVerifyTrailer(priorOutput, options = {}) {
+    const env = options.env ?? process.env;
+    if (!isVerifyReaskEnabled(env))
+        return null;
+    if (typeof priorOutput !== 'string' || priorOutput.trim() === '')
+        return null;
+    const provider = options.providerOverride ?? (await resolveActiveProvider(env));
+    if (!provider)
+        return null;
+    // Tail-cap: the verdict trailer sits at the end of the report.
+    const capped = priorOutput.length > PRIOR_OUTPUT_CAP_CHARS
+        ? priorOutput.slice(priorOutput.length - PRIOR_OUTPUT_CAP_CHARS)
+        : priorOutput;
+    try {
+        const fetchImpl = options.fetchImpl ?? fetch;
+        const ac = new AbortController();
+        const timer = setTimeout(() => ac.abort(), REASK_TIMEOUT_MS);
+        let response;
+        try {
+            response = await fetchImpl(provider.endpoint, {
+                method: 'POST',
+                headers: {
+                    'Content-Type': 'application/json',
+                    Authorization: `Bearer ${provider.apiKey}`,
+                },
+                body: JSON.stringify({
+                    model: provider.model,
+                    messages: [
+                        { role: 'system', content: REASK_SYSTEM_PROMPT },
+                        { role: 'user', content: capped },
+                    ],
+                    temperature: 0,
+                    stream: false,
+                }),
+                signal: ac.signal,
+            });
+        }
+        finally {
+            clearTimeout(timer);
+        }
+        if (!response.ok)
+            return null;
+        const json = (await response.json());
+        const raw = json.choices?.[0]?.message?.content;
+        if (typeof raw !== 'string')
+            return null;
+        // Same single-source parser as the executor — no second grammar.
+        const { verdict } = parseVerifyVerdict(raw);
+        return verdict === 'pass' || verdict === 'fail' ? verdict : null;
+    }
+    catch {
+        return null;
+    }
+}
+/** Same on-disk provider resolution the weakness meter uses. */
+async function resolveActiveProvider(env) {
+    const cfg = await getProviderConfig();
+    if (!cfg)
+        return null;
+    const providerId = cfg.activeProviderId;
+    const key = await resolveApiKeyWithMeta(providerId, env);
+    if (!key?.apiKey)
+        return null;
+    const model = getModelForProvider(providerId) ?? cfg.modelByProvider[providerId] ?? '';
+    const endpoint = getCustomEndpoint(providerId) ?? `https://api.openai.com/v1/chat/completions`;
+    return { providerId, model, endpoint, apiKey: key.apiKey };
+}
+//# sourceMappingURL=verifyReask.js.map

package/dist/cli/kraken/verifyReask.js.map

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

package/dist/cli/kraken/worktreeCleanupBatch.js

@@ -0,0 +1,110 @@
+/**
+ * worktreeCleanupBatch — Int3c (plan v2 §7.3) cleanup policy + queue.
+ *
+ * The per-worktree git calls live in `tools/krakenWorktree.ts`; this module
+ * owns only the POLICY (`batch` vs `eager`) and the in-process QUEUE of
+ * repo-level cleanup that a run defers. Split out because krakenWorktree.ts is
+ * already at its size budget and the state here is unrelated to worktree
+ * creation/merging.
+ *
+ * Why defer anything: removing a worktree used to cost three git processes —
+ * `worktree remove --force` (must stay eager: the directory has to be free
+ * before the next writer, and a merge node may run right after), then
+ * `worktree prune`, then `branch -D <branch>`. Prune and branch deletion are
+ * idempotent, order-independent and invisible to the run, so inside a run
+ * scope they are coalesced into ONE `prune` + ONE `branch -D <list>` at the
+ * end of the run.
+ *
+ * Scope, not "always": `cleanupKrakenWorktree` only defers while a scope is
+ * open (`beginKrakenWorktreeCleanupBatch`). Outside one, nothing would ever
+ * drain the queue — a standalone `task` call would silently keep its branches
+ * — so cleanup stays eager there. The flag's default is still `batch`: every
+ * run that opens a scope defers, `ZELARI_KRAKEN_WORKTREE_CLEANUP=eager` opts
+ * out for all callers.
+ *
+ * Pure state + policy: no fs, no git, no clock. The caller does the spawning.
+ *
+ * @since v2.38.0 (Int3c)
+ */
+/**
+ * `ZELARI_KRAKEN_WORKTREE_CLEANUP`, default `batch` (plan v2 §13):
+ *
+ * `batch`  — inside a run scope, coalesce `worktree prune` + `branch -D` into
+ *            ONE pair at the end of the run.
+ * `eager`  — kill-switch: per-worktree `prune` + `branch -D`, exactly as
+ *            before Int3c.
+ *
+ * An unrecognized value falls back to the default rather than to `eager`: a
+ * typo must not silently re-enable the extra subprocesses the slice removed.
+ */
+export function resolveWorktreeCleanupMode(env = process.env) {
+    const v = (env.ZELARI_KRAKEN_WORKTREE_CLEANUP ?? '').trim().toLowerCase();
+    if (v === 'eager')
+        return 'eager';
+    return 'batch';
+}
+/** repoRoot → the `worktree prune` it still owes (one per removed worktree). */
+const pendingPruneRoots = new Set();
+/** repoRoot → branches whose worktree is gone but whose branch is not. */
+const pendingBranches = new Map();
+/**
+ * Open run scopes. A counter (not a boolean) so two concurrent scopes — an
+ * executor run and, say, a nested one — cannot close each other's batch: each
+ * `begin` is matched by one `take`, and a take already drains the whole queue
+ * (deleting a queued branch earlier than "end of run" is only ever *more*
+ * eager, never wrong).
+ */
+let batchScopes = 0;
+/** True when `cleanupKrakenWorktree` should defer instead of cleaning eagerly. */
+export function isKrakenWorktreeCleanupBatched(env = process.env) {
+    return batchScopes > 0 && resolveWorktreeCleanupMode(env) === 'batch';
+}
+/**
+ * Open the cleanup batch for a run. Returns whether deferral is active: false
+ * in `eager` mode (nothing is queued, so the caller has no flush to make).
+ */
+export function beginKrakenWorktreeCleanupBatch(env = process.env) {
+    if (resolveWorktreeCleanupMode(env) !== 'batch')
+        return false;
+    batchScopes += 1;
+    return true;
+}
+/**
+ * Queue the repo-level half of one cleanup. Duplicates collapse: N worktrees
+ * of the same repo cost one prune, and a branch name is unique per worktree
+ * anyway (it embeds a timestamp + random id).
+ */
+export function queueWorktreeCleanup(repoRoot, branch) {
+    pendingPruneRoots.add(repoRoot);
+    if (!branch)
+        return;
+    const queued = pendingBranches.get(repoRoot) ?? new Set();
+    queued.add(branch);
+    pendingBranches.set(repoRoot, queued);
+}
+/**
+ * Close one scope and drain the queue. Draining clears the state, so a second
+ * drain in the same process returns empty work — the caller can issue no git
+ * command for it (an idle flush costs zero spawns).
+ */
+export function takeQueuedWorktreeCleanup() {
+    if (batchScopes > 0)
+        batchScopes -= 1;
+    const repoRoots = new Set([...pendingPruneRoots, ...pendingBranches.keys()]);
+    const branchesByRoot = new Map();
+    for (const repoRoot of repoRoots) {
+        const queued = pendingBranches.get(repoRoot);
+        if (queued && queued.size > 0)
+            branchesByRoot.set(repoRoot, [...queued]);
+        pendingPruneRoots.delete(repoRoot);
+        pendingBranches.delete(repoRoot);
+    }
+    return { repoRoots: [...repoRoots], branchesByRoot };
+}
+/** Test-only: drop the queue and any open scope. */
+export function __resetKrakenWorktreeCleanupQueueForTests() {
+    pendingPruneRoots.clear();
+    pendingBranches.clear();
+    batchScopes = 0;
+}
+//# sourceMappingURL=worktreeCleanupBatch.js.map

package/dist/cli/kraken/worktreeCleanupBatch.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"worktreeCleanupBatch.js","sourceRoot":"","sources":["../../../src/cli/kraken/worktreeCleanupBatch.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AAKH;;;;;;;;;;GAUG;AACH,MAAM,UAAU,0BAA0B,CACxC,MAAyB,OAAO,CAAC,GAAG;IAEpC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,8BAA8B,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;IAC1E,IAAI,CAAC,KAAK,OAAO;QAAE,OAAO,OAAO,CAAC;IAClC,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,gFAAgF;AAChF,MAAM,iBAAiB,GAAG,IAAI,GAAG,EAAU,CAAC;AAE5C,0EAA0E;AAC1E,MAAM,eAAe,GAAG,IAAI,GAAG,EAAuB,CAAC;AAEvD;;;;;;GAMG;AACH,IAAI,WAAW,GAAG,CAAC,CAAC;AAEpB,kFAAkF;AAClF,MAAM,UAAU,8BAA8B,CAC5C,MAAyB,OAAO,CAAC,GAAG;IAEpC,OAAO,WAAW,GAAG,CAAC,IAAI,0BAA0B,CAAC,GAAG,CAAC,KAAK,OAAO,CAAC;AACxE,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,+BAA+B,CAC7C,MAAyB,OAAO,CAAC,GAAG;IAEpC,IAAI,0BAA0B,CAAC,GAAG,CAAC,KAAK,OAAO;QAAE,OAAO,KAAK,CAAC;IAC9D,WAAW,IAAI,CAAC,CAAC;IACjB,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,oBAAoB,CAAC,QAAgB,EAAE,MAAqB;IAC1E,iBAAiB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAChC,IAAI,CAAC,MAAM;QAAE,OAAO;IACpB,MAAM,MAAM,GAAG,eAAe,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,IAAI,GAAG,EAAU,CAAC;IAClE,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IACnB,eAAe,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;AACxC,CAAC;AAUD;;;;GAIG;AACH,MAAM,UAAU,yBAAyB;IACvC,IAAI,WAAW,GAAG,CAAC;QAAE,WAAW,IAAI,CAAC,CAAC;IAEtC,MAAM,SAAS,GAAG,IAAI,GAAG,CAAS,CAAC,GAAG,iBAAiB,EAAE,GAAG,eAAe,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;IACrF,MAAM,cAAc,GAAG,IAAI,GAAG,EAAoB,CAAC;IACnD,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;QACjC,MAAM,MAAM,GAAG,eAAe,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAC7C,IAAI,MAAM,IAAI,MAAM,CAAC,IAAI,GAAG,CAAC;YAAE,cAAc,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC;QACzE,iBAAiB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QACnC,eAAe,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IACnC,CAAC;IAED,OAAO,EAAE,SAAS,EAAE,CAAC,GAAG,SAAS,CAAC,EAAE,cAAc,EAAE,CAAC;AACvD,CAAC;AAED,oDAAoD;AACpD,MAAM,UAAU,yCAAyC;IACvD,iBAAiB,CAAC,KAAK,EAAE,CAAC;IAC1B,eAAe,CAAC,KAAK,EAAE,CAAC;IACxB,WAAW,GAAG,CAAC,CAAC;AAClB,CAAC"}