@gajae-code/coding-agent 0.18.10 → 0.18.12

package/src/commands/sdk.ts

@@ -12,12 +12,14 @@ import {
 } from "@gajae-code/natives";
 import { getAgentDir, logger, postmortem } from "@gajae-code/utils";
 import { CliParseError, Command } from "@gajae-code/utils/cli";
+import { projectEnvSnapshot } from "@gajae-code/utils/env-file";
 import type { Args as ParsedArgs } from "../cli/args";
 import { isSafeSdkInternalAgentDir, scanPublicCommand } from "../cli/public-command-entry";
 import { PublicCommandFailure } from "../cli/public-command-errors";
 import { FileLockAcquireError } from "../config/file-lock";
 import { parseModelString } from "../config/model-resolver";
 import { Settings } from "../config/settings";
+import { trustedCoordinatorEnv } from "../gjc-runtime/sidecar-bootstrap-env";
 import { usePostmortemSignalExitAuthority } from "../lsp/client";
 import { applyStartupModelProfiles, createSessionManager } from "../main";
 import { initializeExtensions } from "../modes/runtime-init";
@@ -29,15 +31,21 @@ import {
 	type BrokerStartupExitWriteStatus,
 	writeBrokerStartupExitRecordBounded,
 } from "../sdk/broker/broker-exit";
-import { readBrokerDiscovery } from "../sdk/broker/discovery";
+import {
+	type BrokerRestartIntentWithIdentity,
+	readBrokerDiscovery,
+	readBrokerRestartIntent,
+} from "../sdk/broker/discovery";
 import { type EndpointFileRead, readEndpointFile } from "../sdk/broker/endpoint-authority";
 import {
 	BROKER_DISCOVERY_BUDGET,
 	emitBrokerStartupTestSignal,
+	reapBrokerTrampolineChild,
 	reconcileBrokerGenerationForStartup,
 	SDK_BROKER_AUTOSTART_ENV,
 	withBrokerStartupLock,
 } from "../sdk/broker/ensure";
+import { waitForBrokerHandoffAcknowledgement, waitForBrokerHandoffDecision } from "../sdk/broker/hop";
 import {
 	LifecycleFailurePublicationCleanupError,
 	LifecycleReadinessCleanupError,
@@ -88,11 +96,17 @@ export async function lifecycleArgs(
 	if (targetScope.kind !== "resolved") throw new Error(`Lifecycle session scope is invalid: ${targetScope.message}`);
 	const forkSessionDir =
 		request.operation === "session.fork" ? SessionManager.getDefaultSessionDir(cwd, agentDir) : undefined;
+	// Bun has already copied the project dotenv into process.env. A matching or
+	// dynamic declaration must not select an in-memory session. The exact "1"
+	// check stays; an operator value the project does not declare is still honored.
+	const inMemorySession =
+		process.env.GJC_SDK_TEST_IN_MEMORY_SESSION === "1" &&
+		trustedCoordinatorEnv("GJC_SDK_TEST_IN_MEMORY_SESSION", process.env, projectEnvSnapshot(cwd)) === "1";
 	return {
 		messages: [],
 		fileArgs: [],
 		unknownFlags: new Map(),
-		...(process.env.GJC_SDK_TEST_IN_MEMORY_SESSION === "1" ? { noSession: true } : {}),
+		...(inMemorySession ? { noSession: true } : {}),
 		...(request.operation === "session.resume" ? { resume: request.sessionPath } : {}),
 		...(request.modelPreset ? { mpreset: request.modelPreset } : {}),
 		// Explicit model pin (#4707): coordinator-resolved `provider/model`
@@ -1713,6 +1727,34 @@ export default class Sdk extends Command {
 	}
 }
 
+/** Captures and removes one-shot restart credentials before the broker forks descendants. */
+export function consumeBrokerRestartEnvironment(environment: NodeJS.ProcessEnv): {
+	requestIdEnv: string | undefined;
+	restartDeadlineAt: number | undefined;
+} {
+	const restartRequestEnv = environment.GJC_BROKER_RESTART_REQUEST;
+	const restartDeadlineEnv = environment.GJC_BROKER_RESTART_DEADLINE;
+	delete environment.GJC_BROKER_RESTART_REQUEST;
+	delete environment.GJC_BROKER_RESTART_DEADLINE;
+	const requestIdEnv =
+		typeof restartRequestEnv === "string" && /^[A-Za-z0-9_-]{1,256}$/.test(restartRequestEnv)
+			? restartRequestEnv
+			: undefined;
+	let restartDeadlineAt: number | undefined;
+	if (restartDeadlineEnv !== undefined) {
+		const parsedDeadlineAt = Number(restartDeadlineEnv);
+		if (
+			requestIdEnv === undefined ||
+			!/^[0-9]{1,16}$/.test(restartDeadlineEnv) ||
+			!Number.isSafeInteger(parsedDeadlineAt) ||
+			parsedDeadlineAt <= Date.now()
+		)
+			throw new Error("Invalid SDK broker restart deadline; refusing successor startup.");
+		restartDeadlineAt = parsedDeadlineAt;
+	}
+	return { requestIdEnv, restartDeadlineAt };
+}
+
 /**
  * Runs one parsed SDK internal entry point. `publicBrokerRun` is set only by
  * the stable `gjc sdk broker run` contract, which must report a lost ownership
@@ -1722,13 +1764,16 @@ export default class Sdk extends Command {
 async function runSdkInternal(internal: SdkInternalArgv, publicBrokerRun = false): Promise<void> {
 	if (internal.action === "broker-trampoline-internal") {
 		if (process.platform === "win32") throw new CliParseError("Broker trampoline is unavailable on Windows.");
+		const retainChildUntilPublication = process.env.GJC_BROKER_TRAMPOLINE_RETAIN_UNTIL_PUBLICATION === "1";
 		const command = resolveSdkInternalSpawnCommand("broker-internal");
+		const brokerEnvironment = { ...command.env };
+		delete brokerEnvironment.GJC_BROKER_TRAMPOLINE_RETAIN_UNTIL_PUBLICATION;
 		let child: ChildProcess;
 		try {
 			child = spawn(command.file, [...command.args, "--agent-dir", internal.agentDir], {
 				detached: true,
 				stdio: ["ignore", "ignore", "inherit"],
-				env: command.env,
+				env: brokerEnvironment,
 				...(command.kind === "bun-source" ? { cwd: command.cwd } : {}),
 			});
 		} catch (error) {
@@ -1741,11 +1786,7 @@ async function runSdkInternal(internal: SdkInternalArgv, publicBrokerRun = false
 		if (child.pid === undefined) throw new Error("Broker trampoline could not start broker.");
 		const incarnation = processIncarnation(child.pid);
 		if (!incarnation) {
-			try {
-				child.kill("SIGKILL");
-			} catch {
-				// The child may already have exited; either way identity was not established.
-			}
+			await reapBrokerTrampolineChild(child, child.pid);
 			throw new Error("Broker trampoline could not observe broker identity.");
 		}
 		if (spawnError) throw new Error("Broker trampoline could not start broker.", { cause: spawnError });
@@ -1757,13 +1798,19 @@ async function runSdkInternal(internal: SdkInternalArgv, publicBrokerRun = false
 		try {
 			await stdoutWrite.promise;
 		} catch (error) {
-			try {
-				child.kill("SIGKILL");
-			} catch {
-				// The child may already have exited; reporting failure remains authoritative.
-			}
+			await reapBrokerTrampolineChild(child, child.pid, incarnation);
 			throw error;
 		}
+		if (retainChildUntilPublication) {
+			const decision = await waitForBrokerHandoffDecision(process.stdin);
+			if (decision === "abort") {
+				await reapBrokerTrampolineChild(child, child.pid, incarnation);
+				return;
+			}
+		} else if (!(await waitForBrokerHandoffAcknowledgement(process.stdin))) {
+			await reapBrokerTrampolineChild(child, child.pid, incarnation);
+			throw new Error("Broker trampoline handoff was not acknowledged; its direct child was reaped.");
+		}
 		child.unref();
 		return;
 	}
@@ -1846,7 +1893,13 @@ async function runSdkInternal(internal: SdkInternalArgv, publicBrokerRun = false
 		if (startupExitLogged) return;
 		startupExitLogged = true;
 		const level = record.exitCode === 1 ? "error" : "warn";
-		if (record.exitCode === 1) logger.error("sdk broker: startup watchdog forcing exit", record);
+		if (record.exitCode === 1)
+			logger.error(
+				record.reason === "startup-deadline"
+					? "sdk broker: startup watchdog forcing exit"
+					: "sdk broker: startup refused",
+				record,
+			);
 		else logger.warn("sdk broker: startup interrupted", record);
 		process.stderr.write(`${JSON.stringify({ level, message, ...record })}\n`);
 	};
@@ -1866,9 +1919,11 @@ async function runSdkInternal(internal: SdkInternalArgv, publicBrokerRun = false
 		const message =
 			reason === "startup-lock-blocked" && blockingLockPath
 				? `SDK broker startup blocked by retained removal transition ${blockingLockPath}.`
-				: reason === "startup-deadline"
-					? `SDK broker startup exceeded its ${timeoutMs}ms fence deadline.`
-					: `SDK broker startup interrupted by ${signal} before readiness.`;
+				: reason === "startup-lock-unavailable"
+					? `SDK broker startup could not acquire ${blockingLockPath ?? "a required lock"}.`
+					: reason === "startup-deadline"
+						? `SDK broker startup exceeded its ${timeoutMs}ms fence deadline.`
+						: `SDK broker startup interrupted by ${signal} before readiness.`;
 		writeStartupExitLog(exitRecord, message);
 		startupExitTask = (async () => {
 			const exitRecordWrite = await beginStartupExitRecordWrite(exitRecord);
@@ -1922,33 +1977,125 @@ async function runSdkInternal(internal: SdkInternalArgv, publicBrokerRun = false
 		await exitDuringStartup("startup-signal", startupSignalExitCode(signal), signal);
 		return true;
 	};
+	let startupFenceAcquired = false;
 	try {
+		const { requestIdEnv, restartDeadlineAt } = consumeBrokerRestartEnvironment(process.env);
+		const MAX_SESSION_INDEX_TIMEOUT_RETRIES = 2;
+		let sessionIndexTimeoutRetries = 0;
+		let activeStartupDeadlineAt = 0;
 		const startupOperation = async (deadline: number): Promise<Broker | undefined> => {
+			for (;;) {
+				activeStartupDeadlineAt = deadline;
+				try {
+					return await singleStartupAttempt(deadline);
+				} catch (error) {
+					if (
+						!(error instanceof FileLockAcquireError) ||
+						!startupFenceAcquired ||
+						error.code !== "acquire_timeout" ||
+						path.resolve(error.filePath) !==
+							path.resolve(path.join(agentDir, "sdk", "sessions", "index.jsonl")) ||
+						sessionIndexTimeoutRetries >= MAX_SESSION_INDEX_TIMEOUT_RETRIES
+					)
+						throw error;
+					sessionIndexTimeoutRetries++;
+					const backoffMs = 100 * 2 ** (sessionIndexTimeoutRetries - 1);
+					if (Date.now() + backoffMs >= activeStartupDeadlineAt) throw error;
+					const failedBroker = broker;
+					if (failedBroker) {
+						try {
+							await failedBroker.stop({ kind: "startup-failure" });
+						} catch (cleanupError) {
+							throw new AggregateError(
+								[error, cleanupError],
+								"Session-index startup retry could not clean up the failed broker candidate.",
+							);
+						}
+						if (broker === failedBroker) broker = undefined;
+						if (runningBroker === failedBroker) runningBroker = undefined;
+					}
+					candidateStartTask = undefined;
+					logger.debug("sdk broker: session-index lock timeout, retrying startup", {
+						reason: "session-index-timeout-retry",
+						attempt: sessionIndexTimeoutRetries,
+						backoffMs,
+					});
+					await Bun.sleep(backoffMs);
+				}
+			}
+		};
+		const singleStartupAttempt = async (deadline: number): Promise<Broker | undefined> => {
 			const remainingMs = Math.max(1, deadline - Date.now());
 			const testWatchdogMs = Number(process.env.GJC_SDK_TEST_BROKER_STARTUP_WATCHDOG_MS ?? 0);
-			const watchdogMs =
+			const ordinaryWatchdogMs =
 				Number.isSafeInteger(testWatchdogMs) && testWatchdogMs > 0 && testWatchdogMs <= remainingMs
 					? testWatchdogMs
 					: remainingMs;
-			const startupCheckpointDeadline = performance.now() + watchdogMs - 1_000;
-			const startupWatchdog = setTimeout(() => {
-				startupAbortController.abort();
-				void exitDuringStartup("startup-deadline", 1, null, watchdogMs).then(async started => {
-					if (!started) {
-						// A prior startup signal owns the exit cause; its postmortem callback
-						// returns after bounded cleanup and preserves the signal status.
-						return;
-					}
-					await waitForStartupAbortCleanup();
-					process.exit(1);
-				});
-			}, watchdogMs);
+			let restartRequestId: string | undefined;
+			let startupDeadlineAt = deadline;
+			let effectiveWatchdogMs = ordinaryWatchdogMs;
+			let startupCheckpointDeadline = performance.now() + Math.max(1, effectiveWatchdogMs - 1_000);
+			const armStartupWatchdog = (): NodeJS.Timeout =>
+				setTimeout(() => {
+					startupAbortController.abort();
+					void exitDuringStartup("startup-deadline", 1, null, effectiveWatchdogMs).then(async started => {
+						if (!started) {
+							// A prior startup signal owns the exit cause; its postmortem callback
+							// returns after bounded cleanup and preserves the signal status.
+							return;
+						}
+						await waitForStartupAbortCleanup();
+						process.exit(1);
+					});
+				}, effectiveWatchdogMs);
+			let startupWatchdog = armStartupWatchdog();
 			try {
+				let restartIntent: BrokerRestartIntentWithIdentity | null;
+				try {
+					restartIntent = await readBrokerRestartIntent(agentDir);
+				} catch (error) {
+					throw new Error("Could not validate SDK broker restart intent; refusing untagged startup.", {
+						cause: error,
+					});
+				}
+				// A committed request survives the prior owner's exit. Ordinary or
+				// mismatched starts must not publish ahead of its exact successor.
+				if (
+					restartIntent?.phase === "committed" &&
+					restartIntent.expiresAt > Date.now() &&
+					restartIntent.requestId !== requestIdEnv
+				)
+					throw new Error("A committed SDK broker restart is active; startup requires its exact request ID.");
+				if (
+					restartDeadlineAt !== undefined &&
+					(restartIntent?.phase !== "committed" ||
+						restartIntent.requestId !== requestIdEnv ||
+						restartIntent.expiresAt !== restartDeadlineAt)
+				)
+					throw new Error("Could not validate SDK broker restart deadline; refusing successor startup.");
+				if (requestIdEnv !== undefined && restartIntent?.requestId === requestIdEnv) {
+					if (restartIntent.phase !== "committed")
+						throw new Error("SDK broker restart intent is not committed; refusing successor startup.");
+					const remainingSuccessorMs = restartIntent.expiresAt - Date.now();
+					if (remainingSuccessorMs <= 0)
+						throw new Error("SDK broker restart intent expired; refusing untagged startup.");
+					restartRequestId = requestIdEnv;
+					startupDeadlineAt = restartDeadlineAt ?? restartIntent.expiresAt;
+					activeStartupDeadlineAt = startupDeadlineAt;
+					effectiveWatchdogMs =
+						Number.isSafeInteger(testWatchdogMs) && testWatchdogMs > 0 && testWatchdogMs <= remainingSuccessorMs
+							? testWatchdogMs
+							: remainingSuccessorMs;
+					clearTimeout(startupWatchdog);
+					startupCheckpointDeadline = performance.now() + Math.max(1, effectiveWatchdogMs - 1_000);
+					startupWatchdog = armStartupWatchdog();
+				}
+				if (startupAbortController.signal.aborted) return undefined;
 				// `gjc sdk broker run` never retires another owner, even one this generation cannot
 				// reuse: any live incumbent is a refusal. Autostart repairs unusable generations.
 				const existing = publicBrokerRun
 					? ((await readBrokerDiscovery(agentDir)) ?? undefined)
-					: await reconcileBrokerGenerationForStartup({ agentDir }, deadline);
+					: await reconcileBrokerGenerationForStartup({ agentDir }, startupDeadlineAt);
 				if (startupAbortController.signal.aborted) return undefined;
 				if (existing) {
 					logger.info("sdk broker: startup reused an existing owner", {
@@ -1985,11 +2132,9 @@ async function runSdkInternal(internal: SdkInternalArgv, publicBrokerRun = false
 				// launcher-supplied environment variable; it is validated here and handed
 				// to Broker as a typed setting, never read a second time inside broker.ts
 				// from process.env directly.
-				const restartRequestEnv = process.env.GJC_BROKER_RESTART_REQUEST;
-				const restartRequestId =
-					typeof restartRequestEnv === "string" && /^[A-Za-z0-9_-]{1,256}$/.test(restartRequestEnv)
-						? restartRequestEnv
-						: undefined;
+				// Restart authorization is revalidated before constructing the broker; the
+				// watchdog was already armed before any intent-file I/O.
+				const effectiveCheckpointDeadline = startupCheckpointDeadline;
 				const testPostPublicationDelayMs = Number(process.env.GJC_SDK_TEST_BROKER_POST_PUBLICATION_DELAY_MS ?? 0);
 				const startupPostPublicationDelayMs =
 					Number.isSafeInteger(testPostPublicationDelayMs) &&
@@ -2030,7 +2175,7 @@ async function runSdkInternal(internal: SdkInternalArgv, publicBrokerRun = false
 				const candidate = new Broker({
 					agentDir,
 					startupAbortSignal: startupAbortController.signal,
-					startupCheckpointDeadline,
+					startupCheckpointDeadline: effectiveCheckpointDeadline,
 					onStartupReady: () => clearTimeout(startupWatchdog),
 					masterOrphanGraceMs: (await Settings.loadForScope({ cwd: process.cwd(), agentDir })).get(
 						"sdk.masterOrphanGraceMs",
@@ -2066,7 +2211,11 @@ async function runSdkInternal(internal: SdkInternalArgv, publicBrokerRun = false
 			}
 		};
 		broker = await withBrokerStartupLock(agentDir, startupOperation, {
-			onAcquired: () => void emitBrokerStartupTestSignal("fence-acquired"),
+			...(restartDeadlineAt === undefined ? {} : { deadlineAt: restartDeadlineAt }),
+			onAcquired: () => {
+				startupFenceAcquired = true;
+				void emitBrokerStartupTestSignal("fence-acquired");
+			},
 			onContended: () => void emitBrokerStartupTestSignal("fence-contended"),
 		});
 	} catch (error) {
@@ -2074,9 +2223,14 @@ async function runSdkInternal(internal: SdkInternalArgv, publicBrokerRun = false
 			await finishPendingStartupSignal();
 			return;
 		}
-		// A retained removal transition is an explicit acquire failure, not only
-		// an exhausted ordinary contention timeout.
-		if (error instanceof FileLockAcquireError && error.orphanPath) {
+		// Only a retained transition on the outer startup fence gets its own
+		// blocked reason. Nested resource-lock failures are retryable unavailability.
+		if (
+			error instanceof FileLockAcquireError &&
+			!startupFenceAcquired &&
+			error.code === "orphan_transition" &&
+			error.orphanPath
+		) {
 			await exitDuringStartup(
 				"startup-lock-blocked",
 				1,
@@ -2084,6 +2238,9 @@ async function runSdkInternal(internal: SdkInternalArgv, publicBrokerRun = false
 				BROKER_DISCOVERY_BUDGET.startupLockWaitMs,
 				error.orphanPath,
 			);
+		} else if (error instanceof FileLockAcquireError) {
+			// Nested lock failures or non-orphan-transition errors
+			await exitDuringStartup("startup-lock-unavailable", 1, null, undefined, error.orphanPath ?? error.lockPath);
 		}
 		if (broker) {
 			try {

package/src/commands/ultragoal.ts

@@ -8,6 +8,7 @@ import {
 	writeCurrentSessionGoalModeState,
 	writePendingGoalModeRequest,
 } from "../gjc-runtime/goal-mode-request";
+import { trustedCoordinatorEnv } from "../gjc-runtime/sidecar-bootstrap-env";
 import { isUltragoalHelpInvocation, runNativeUltragoalCommand } from "../gjc-runtime/ultragoal-runtime";
 
 export default class Ultragoal extends Command {
@@ -44,16 +45,23 @@ export default class Ultragoal extends Command {
 		const { objective, goalsPath, provenance } = await readUltragoalGjcObjective(cwd);
 
 		await writeCurrentSessionGoalModeState({
-			sessionFile: process.env[GJC_SESSION_FILE_ENV],
+			// Bun has already copied the project dotenv into the environment. A
+			// value that matches that snapshot must not select the transcript.
+			sessionFile: trustedCoordinatorEnv(GJC_SESSION_FILE_ENV),
 			objective,
 			provenance,
 		});
-		await writePendingGoalModeRequest({
-			cwd,
-			objective,
-			goalsPath,
-			provenance,
-			sessionId: process.env[GJC_SESSION_ID_ENV],
-		});
+		// A matching or dynamic project declaration must not select the session.
+		// Skip the write in that case: the helper falls back to the same env value.
+		const sessionId = trustedCoordinatorEnv(GJC_SESSION_ID_ENV);
+		if (sessionId !== undefined || !process.env[GJC_SESSION_ID_ENV]?.trim()) {
+			await writePendingGoalModeRequest({
+				cwd,
+				objective,
+				goalsPath,
+				provenance,
+				sessionId,
+			});
+		}
 	}
 }

package/src/commit/changelog/index.ts

@@ -168,11 +168,49 @@ function applyChangelogEntries(
 	if (deletions) {
 		base = applyDeletions(base, deletions);
 	}
-	const merged = mergeEntries(base, entries);
+	const merged = mergeEntries(base, redactPersistedEntries(entries));
 	const sectionLines = renderUnreleasedSections(merged);
 	return [...before, ...sectionLines, ...after].join("\n");
 }
 
+function redactPersistedEntries(entries: Record<string, string[]>): Record<string, string[]> {
+	const redacted: Record<string, string[]> = {};
+	for (const [section, items] of Object.entries(entries)) {
+		redacted[section] = items.map(item => redactChangelogEntry(item));
+	}
+	return redacted;
+}
+
+const AWS_LABELED_KEY =
+	"(?:(?:aws[_-]?)?secret[_-]?access[_-]?key|(?:aws[_-]?)?session[_-]?token|x[_-]?amz[_-]?security[_-]?token)";
+
+export function redactChangelogEntry(text: string): string {
+	let redacted = text.replace(/(^|[^0-9A-Za-z])(?:AKIA|ASIA)[0-9A-Z]{16}(?![0-9A-Za-z])/g, "$1[REDACTED_AWS_KEY_ID]");
+	redacted = redacted.replace(
+		new RegExp(
+			`(^|[^A-Za-z0-9_-])(["']?${AWS_LABELED_KEY}["']?\\s*[=:]\\s*)(\\$?)(["'\`])([^"'\`\\r\\n]{8,})\\4`,
+			"gi",
+		),
+		"$1$2$3$4[REDACTED_SECRET]$4",
+	);
+	redacted = redacted.replace(
+		new RegExp(`(^|[^A-Za-z0-9_-])(["']?${AWS_LABELED_KEY}["']?\\s*[=:]\\s*)[^\\s"'\`,;{}[\\]()&<>#]{8,}`, "gi"),
+		"$1$2[REDACTED_SECRET]",
+	);
+	redacted = redacted.replace(/\b(?:sk|pk|rk|xox[baprs])-[-_A-Za-z0-9]{12,}\b/g, "[REDACTED_TOKEN]");
+	redacted = redacted.replace(/(?<![A-Za-z0-9_-])AIza[0-9A-Za-z_-]{35}(?![A-Za-z0-9_-])/g, "[REDACTED_TOKEN]");
+	redacted = redacted.replace(/\b(?:gh[opsur]_[A-Za-z0-9_]{12,}|github_pat_[A-Za-z0-9_]{12,})\b/g, "[REDACTED_TOKEN]");
+	redacted = redacted.replace(
+		/\b((?:ANTHROPIC|OPENAI|GITHUB|GOOGLE|GEMINI|KAGI|TAVILY|EXA|PERPLEXITY|ZAI|KIMI|BRAVE|SEARXNG|AWS)_[A-Z0-9_]*(?:KEY|TOKEN|SECRET|COOKIE|PASSWORD))\s*=\s*[^\s\n]+/gi,
+		"$1=[REDACTED_SECRET]",
+	);
+	redacted = redacted.replace(
+		/\b(Authorization|Proxy-Authorization)\s*:\s*(?:Bearer|Basic|Token)\s+[^\s\n]+/gi,
+		"$1: [REDACTED_AUTH_HEADER]",
+	);
+	return redacted.replace(/\b(Cookie|Set-Cookie)\s*:\s*[^\n]+/gi, "$1: [REDACTED_COOKIE]");
+}
+
 function applyDeletions(
 	existing: Record<string, string[]>,
 	deletions: Record<string, string[]>,

package/src/commit/message.ts

@@ -1,9 +1,16 @@
+import { redactCrashSecrets } from "@gajae-code/utils";
+import { redactChangelogEntry } from "./changelog";
 import type { ConventionalAnalysis } from "./types";
 
+/** Same order as generated task messages, so a second pass stays stable. */
+function redactCommitText(text: string): string {
+	return redactCrashSecrets(redactChangelogEntry(text));
+}
+
 export function formatCommitMessage(analysis: ConventionalAnalysis, summary: string): string {
-	const scopePart = analysis.scope ? `(${analysis.scope})` : "";
-	const header = `${analysis.type}${scopePart}: ${summary}`;
-	const bodyLines = analysis.details.map(detail => `- ${detail.text.trim()}`);
+	const scopePart = analysis.scope ? `(${redactCommitText(analysis.scope)})` : "";
+	const header = `${analysis.type}${scopePart}: ${redactCommitText(summary)}`;
+	const bodyLines = analysis.details.map(detail => `- ${redactCommitText(detail.text.trim())}`);
 	if (bodyLines.length === 0) {
 		return header;
 	}

package/src/config/autorouting-tier-map.ts

@@ -80,12 +80,42 @@ export const TIER_MAP_SKIP_LIST = {
 	"amazon-bedrock/au.anthropic.claude-sonnet-5-5": {
 		rationale: "Sonnet 5.5 catalog addition (#6111); not yet curated",
 	},
+	"amazon-bedrock/in.anthropic.claude-haiku-4-5-20251001-v1:0": {
+		rationale: "India-region Bedrock Anthropic catalog addition (#6731); not yet curated",
+	},
+	"amazon-bedrock/in.anthropic.claude-opus-5": {
+		rationale: "India-region Bedrock Anthropic catalog addition (#6731); not yet curated",
+	},
+	"amazon-bedrock/in.anthropic.claude-sonnet-5": {
+		rationale: "India-region Bedrock Anthropic catalog addition (#6731); not yet curated",
+	},
 	"amazon-bedrock/jp.anthropic.claude-sonnet-5-5": {
 		rationale: "Sonnet 5.5 catalog addition (#6111); not yet curated",
 	},
 	"amazon-bedrock/us.anthropic.claude-sonnet-5-5": {
 		rationale: "Sonnet 5.5 catalog addition (#6111); not yet curated",
 	},
+	"github-copilot/gemini-4-argon": {
+		rationale: "Gemini 4 Argon provider catalog addition (#6731); not yet curated",
+	},
+	"google/gemini-4-argon": {
+		rationale: "Gemini 4 Argon catalog addition (#6731); tier ordering not yet reviewed",
+	},
+	"kilo/google/gemini-4-argon": {
+		rationale: "Gemini 4 Argon provider catalog addition (#6731); not yet curated",
+	},
+	"opencode-zen/gemini-4-argon": {
+		rationale: "Gemini 4 Argon provider catalog addition (#6731); not yet curated",
+	},
+	"openrouter/google/gemini-4-argon": {
+		rationale: "Gemini 4 Argon provider catalog addition (#6731); not yet curated",
+	},
+	"openrouter/google/gemini-4-argon:batch": {
+		rationale: "Gemini 4 Argon batch provider catalog addition (#6731); not yet curated",
+	},
+	"vercel-ai-gateway/google/gemini-4-argon": {
+		rationale: "Gemini 4 Argon provider catalog addition (#6731); not yet curated",
+	},
 	"kiro/claude-opus-5-5": { rationale: "post-rebase catalog addition from dev; not yet curated" },
 	"kiro/claude-opus-5.5": { rationale: "post-rebase catalog addition from dev; not yet curated" },
 	"alibaba-token-plan/qwen3.8-flash": { rationale: "post-rebase catalog addition from dev; not yet curated" },