auto-mode 3.1.3 → 3.1.4

package/dist/cli.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
-import { C as pickJudgeLane, E as updateJSONFile, S as CLI_LIMITS, T as resolveXDGDir, _ as readCheckout, a as resolveSessionScopePath, b as loadConfig, c as splitGitCommand, d as loadCheckoutFacts, f as writeActionDiagnostic, g as isUnresolvedWord, h as resolveShellPath, i as classifyAction, l as loadPolicy, m as collectShellCommands, n as readRuntime, o as loadSessionScope, p as toRepositorySlug, s as EMPTY_SESSION_SCOPE, t as parseActionRequest, u as resolveShippedPolicyDir, v as readGitEntry, w as M, x as runCapped, y as DEFAULT_SCOPE_SOURCES } from "./parse-action-request-Czvdr5DS.js";
-import { a as literal, d as string, i as discriminatedUnion, r as boolean, s as number, u as strictObject } from "./schemas-B80Yxv6m.js";
+import { C as pickJudgeLane, E as updateJSONFile, S as CLI_LIMITS, T as resolveXDGDir, _ as readCheckout, a as resolveSessionScopePath, b as loadConfig, c as splitGitCommand, d as loadCheckoutFacts, f as writeActionDiagnostic, g as isUnresolvedWord, h as resolveShellPath, i as classifyAction, l as loadPolicy, m as collectShellCommands, n as readRuntime, o as loadSessionScope, p as toRepositorySlug, s as EMPTY_SESSION_SCOPE, t as parseActionRequest, u as resolveShippedPolicyDir, v as readGitEntry, w as M, x as runCapped, y as DEFAULT_SCOPE_SOURCES } from "./parse-action-request-DlsgKqiF.js";
+import { a as literal, d as string, i as discriminatedUnion, l as record, p as unknown, r as boolean, s as number, u as strictObject } from "./schemas-B80Yxv6m.js";
 import { createHash, randomUUID } from "node:crypto";
 import { chmod, mkdir, open, readFile, realpath, stat } from "node:fs/promises";
 import { basename, dirname, isAbsolute, join, resolve } from "node:path";
@@ -2665,13 +2665,15 @@ function startDetachedProcess(file, args, env) {
 }
 //#endregion
 //#region src/judge/judge-server-response-schema.ts
+const modelUsageSchema = record(string(), unknown());
 const judgeServerResponseSchema = discriminatedUnion("kind", [strictObject({
 	kind: literal("reply"),
 	text: string(),
 	model: string(),
 	safetyStops: number().nullable(),
 	fallback: boolean(),
-	warm: boolean().nullable()
+	warm: boolean().nullable(),
+	modelUsage: modelUsageSchema.nullable()
 }), strictObject({
 	kind: literal("failure"),
 	aborted: boolean(),
@@ -3283,7 +3285,7 @@ async function runJudgeServer(io, socketPath) {
 		io.stderr.write(`auto-mode: judge-server needs a socket path\n\n${USAGE}`);
 		return 2;
 	}
-	await (await (await import("./start-judge-server-CDYdRR4I.js")).startJudgeServer({
+	await (await (await import("./start-judge-server-BaeD4mmu.js")).startJudgeServer({
 		socketPath,
 		env: io.runtime.host.env,
 		idleMs: JUDGE_IDLE_MS

package/dist/index.d.ts

@@ -20,6 +20,7 @@ interface JudgeMessageReply {
   readonly safetyStops: number | null;
   readonly fallback: boolean;
   readonly warm: boolean | null;
+  readonly modelUsage: Readonly<Record<string, unknown>> | null;
 }
 interface JudgeSession {
   readonly review: (model: string, request: Readonly<ModelRequest>, signal: Readonly<AbortSignal>) => Promise<JudgeMessageReply>;
@@ -30,6 +31,7 @@ interface JudgeDiagnostics {
   readonly status: JudgeStatus;
   readonly failureReason: JudgeFailure | null;
   readonly overturnBasis: OverturnBasis | null;
+  readonly overturnReason: string | null;
   readonly model: string;
   readonly answeringModel: string | null;
   readonly safetyStops: number | null;

package/dist/index.js

@@ -1,4 +1,4 @@
-import { b as loadConfig$1, i as classifyAction$1, n as readRuntime, r as readHostEnvironment, t as parseActionRequest } from "./parse-action-request-Czvdr5DS.js";
+import { b as loadConfig$1, i as classifyAction$1, n as readRuntime, r as readHostEnvironment, t as parseActionRequest } from "./parse-action-request-DlsgKqiF.js";
 //#region src/index.ts
 function classifyAction(request, config, options = {}) {
 	return classifyAction$1(request, config, {

package/dist/{parse-action-request-Czvdr5DS.js → parse-action-request-DlsgKqiF.js}

@@ -3091,7 +3091,7 @@ async function writeActionDiagnostic(payload, entry, host, warnings) {
 	const agentKey = agentID === null ? payload.sessionID : `${payload.sessionID}\0${agentID}`;
 	const isReviewed = entry.judge !== void 0 || entry.grant !== void 0;
 	const record = {
-		schemaVersion: 7,
+		schemaVersion: 8,
 		time: (/* @__PURE__ */ new Date()).toISOString(),
 		invocationID: entry.invocationID,
 		sessionHash: toHash(payload.sessionID),
@@ -3103,8 +3103,8 @@ async function writeActionDiagnostic(payload, entry, host, warnings) {
 		denials: entry.denials ?? null,
 		escalation: entry.escalation ?? false,
 		diagnostics: entry.diagnostics ?? null,
-		judge: entry.judge ?? null,
-		grant: entry.grant ?? null,
+		judge: entry.judge === void 0 ? null : buildLoggedReview(entry.judge),
+		grant: entry.grant === void 0 ? null : buildLoggedReview(entry.grant),
 		action: isReviewed ? buildLoggedAction(payload) : null
 	};
 	try {
@@ -3120,6 +3120,17 @@ async function writeActionDiagnostic(payload, entry, host, warnings) {
 function toHash(value) {
 	return createHash("sha256").update(value).digest("hex").slice(0, 16);
 }
+function buildLoggedReview(review) {
+	if (review.overturnReason === null) return review;
+	const reason = buildSecretFreeText(review.overturnReason, () => "[secret]");
+	return {
+		...review,
+		overturnReason: findSecret({
+			text: reason,
+			path: null
+		}) === null ? reason : null
+	};
+}
 const LOGGED_INPUT_MAX_CHARS = 2e3;
 function buildLoggedAction(payload) {
 	const redacted = buildSecretFreeValue(payload.toolInput);
@@ -3149,6 +3160,25 @@ function hasSecret(value) {
 	return false;
 }
 //#endregion
+//#region src/diagnostics/write-judge-usage.ts
+async function writeJudgeUsage(usage, host, warnings) {
+	const path = host.env["AUTO_MODE_DEBUG_PATH"];
+	if (path === void 0 || path === "") return;
+	const line = {
+		time: (/* @__PURE__ */ new Date()).toISOString(),
+		...usage
+	};
+	try {
+		await mkdir(dirname(path), {
+			recursive: true,
+			mode: 448
+		});
+		await appendFile(path, `${JSON.stringify(line)}\n`, { mode: 384 });
+	} catch {
+		warnings.write("auto-mode: judge debug line unavailable\n");
+	}
+}
+//#endregion
 //#region src/git/build-repository-context.ts
 function buildRepositoryContext(facts) {
 	if (facts.head === null) return null;
@@ -3571,18 +3601,24 @@ function buildJudgedVerdict(rule, basis, reply, options) {
 	if (reply === null || reply.kind === "unreadable") return {
 		verdict: template,
 		status: "failed",
-		overturnBasis: null
+		overturnBasis: null,
+		overturnReason: null
 	};
 	if (reply.kind === "overturn") {
 		const clearsHardRule = reply.basis === "misread" && options.misreadClears === true;
-		return rule.tier === "hard" && !clearsHardRule || reply.basis === "misread" && options.overturns === "consent" || reply.basis === "consent" && !options.hasUserMessage ? {
+		const isHeld = rule.tier === "hard" && !clearsHardRule || reply.basis === "misread" && options.overturns === "consent" || reply.basis === "consent" && !options.hasUserMessage;
+		const overturn = {
+			overturnBasis: reply.basis,
+			overturnReason: formatJudgeText(buildSecretFreeText(reply.reason, () => "[secret]"))
+		};
+		return isHeld ? {
 			verdict: template,
 			status: "held",
-			overturnBasis: reply.basis
+			...overturn
 		} : {
 			verdict: { kind: "allow" },
 			status: "overturned",
-			overturnBasis: reply.basis
+			...overturn
 		};
 	}
 	return {
@@ -3592,7 +3628,8 @@ function buildJudgedVerdict(rule, basis, reply, options) {
 			reason: `The reviewer confirmed the ${rule.name} deny: ${formatJudgeText(reply.reason)}`
 		},
 		status: "confirmed",
-		overturnBasis: null
+		overturnBasis: null,
+		overturnReason: null
 	};
 }
 function formatJudgeText(text) {
@@ -3808,7 +3845,7 @@ function sendJudgeMessage(provider, request, transport, signal) {
 }
 async function sendToAgentSDK(provider, request, transport, signal) {
 	if (transport.session !== void 0) return transport.session.review(provider.model, request, signal);
-	const session = (await import("./start-judge-session-C0eRJFlg.js")).startJudgeSession(transport.env);
+	const session = (await import("./start-judge-session-B65PMvQ6.js")).startJudgeSession(transport.env);
 	try {
 		return await session.review(provider.model, request, signal);
 	} finally {
@@ -3822,7 +3859,8 @@ async function sendToMessagesAPI(provider, request, transport, signal) {
 		model: provider.model,
 		safetyStops: null,
 		fallback: false,
-		warm: null
+		warm: null,
+		modelUsage: null
 	};
 }
 //#endregion
@@ -3872,6 +3910,11 @@ async function classifyWithJudge(payload, evidence, judge, options) {
 			throw error;
 		});
 		replies = parseJudgeReplies(answered.text, evidence.map((entry) => entry.rule.name));
+		if (answered.modelUsage !== null) await options.onUsage?.({
+			model: judge.model,
+			answeringModel: answered.model,
+			modelUsage: answered.modelUsage
+		});
 		failure = null;
 	} catch {}
 	const elapsedMs = Math.round(performance.now() - start);
@@ -3890,6 +3933,7 @@ async function classifyWithJudge(payload, evidence, judge, options) {
 				status: verdict.status,
 				failureReason: failure ?? (reply?.kind === "unreadable" ? "unreadable" : null),
 				overturnBasis: verdict.overturnBasis,
+				overturnReason: verdict.overturnReason,
 				model: judge.model,
 				answeringModel: answered?.model ?? null,
 				safetyStops: answered?.safetyStops ?? null,
@@ -6241,7 +6285,8 @@ async function classifyWithGrant(ctx, decided) {
 	const judged = await classifyWithJudge(ctx.request, evidence, judge, {
 		...ctx.options,
 		rulesPath: ctx.config.rulesPath,
-		overturns: ctx.config.judgeOverturns ?? "any"
+		overturns: ctx.config.judgeOverturns ?? "any",
+		onUsage: (usage) => writeJudgeUsage(usage, ctx.options.runtime.host, ctx.options.stderr)
 	});
 	const granted = grant === null ? null : judged[0] ?? null;
 	const reviewed = denied === null ? null : judged.at(-1) ?? null;

package/dist/{start-judge-server-CDYdRR4I.js → start-judge-server-BaeD4mmu.js}

@@ -1,5 +1,5 @@
 import { d as string, s as number, u as strictObject } from "./schemas-B80Yxv6m.js";
-import { t as startJudgeSession } from "./start-judge-session-vhUxe9-V.js";
+import { t as startJudgeSession } from "./start-judge-session-C_k8lacU.js";
 import { randomBytes } from "node:crypto";
 import { chmod, mkdir, rename, rm, stat } from "node:fs/promises";
 import { dirname, join } from "node:path";

package/dist/start-judge-session-B65PMvQ6.js

@@ -0,0 +1 @@
+export { t as startJudgeSession } from "./start-judge-session-C_k8lacU.js";

package/dist/{start-judge-session-vhUxe9-V.js → start-judge-session-C_k8lacU.js}

@@ -1,4 +1,4 @@
-import { c as object, d as string, l as record, s as number } from "./schemas-B80Yxv6m.js";
+import { c as object, d as string, l as record, p as unknown, s as number } from "./schemas-B80Yxv6m.js";
 import { createRequire } from "node:module";
 import ut, { delimiter, isAbsolute, join } from "node:path";
 import { spawn } from "node:child_process";
@@ -39277,7 +39277,7 @@ function startJudgeSession(env) {
 			current.reviews += 1;
 			if (turn.sessionFallback) stop();
 			else current.cleared = sendClear(current.send, current.stop);
-			return buildReply(turn.result, turn.fallbacks, model, warm);
+			return buildReply(turn, model, warm);
 		} catch (error) {
 			if (signal.aborted) throw new DOMException("Judge review aborted", "AbortError");
 			throw error;
@@ -39343,13 +39343,18 @@ function startLiveProcess(model, system, key, env) {
 			waiter.sessionFallback ||= message.scope !== "local";
 			return;
 		}
+		if (message.type === "assistant" && message.parent_tool_use_id === null && message.error === void 0) {
+			waiter.replyModel = message.message.model;
+			return;
+		}
 		if (message.type === "result") {
 			const done = waiter;
 			waiter = null;
 			done.resolve({
 				result: message,
 				fallbacks: done.fallbacks,
-				sessionFallback: done.sessionFallback
+				sessionFallback: done.sessionFallback,
+				replyModel: done.replyModel
 			});
 		}
 	};
@@ -39371,7 +39376,8 @@ function startLiveProcess(model, system, key, env) {
 				resolve,
 				reject,
 				fallbacks: 0,
-				sessionFallback: false
+				sessionFallback: false,
+				replyModel: null
 			};
 			input.push(text);
 		})
@@ -39445,23 +39451,22 @@ async function sendClear(send, stop) {
 	}
 }
 const MODEL_USAGE = record(string(), object({ outputTokens: number() }));
+const RAW_MODEL_USAGE = record(string(), unknown());
 const SAFETY_STOPS = object({ safety_stops: number() });
-function buildReply(result, fallbacks, requested, warm) {
+function buildReply(turn, requested, warm) {
+	const result = turn.result;
 	if (result.subtype !== "success" || result.is_error) throw new Error(`the judge turn ended in ${result.subtype}`);
 	const usage = MODEL_USAGE.safeParse(result.modelUsage).data;
 	const stops = SAFETY_STOPS.safeParse(result).data?.safety_stops;
 	return {
 		text: result.result,
-		model: pickAnsweringModel(usage, requested),
+		model: turn.replyModel ?? requested,
 		safetyStops: stops ?? null,
-		fallback: fallbacks > 0 || isFallbackReply(usage, stops),
-		warm
+		fallback: turn.fallbacks > 0 || isFallbackReply(usage, stops),
+		warm,
+		modelUsage: RAW_MODEL_USAGE.safeParse(result.modelUsage).data ?? null
 	};
 }
-function pickAnsweringModel(usage, requested) {
-	const [top] = Object.entries(usage ?? {}).filter(([, entry]) => entry.outputTokens > 0).toSorted(([, left], [, right]) => right.outputTokens - left.outputTokens);
-	return top === void 0 ? requested : top[0];
-}
 function isFallbackReply(usage, stops) {
 	if (stops !== void 0) return stops > 0;
 	const entries = Object.values(usage ?? {});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "auto-mode",
-  "version": "3.1.3",
+  "version": "3.1.4",
   "description": "A permission classifier library and Claude Code mod, so agents that are not Claude can run unattended",
   "keywords": [
     "agent",

package/dist/start-judge-session-C0eRJFlg.js

@@ -1 +0,0 @@
-export { t as startJudgeSession } from "./start-judge-session-vhUxe9-V.js";