pi-openai-toolkit 0.14.5 → 0.14.7

package/src/context-management/window-budget.ts

@@ -1,83 +1,83 @@
-import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
-import {
-	CONTEXT_WINDOW_FALLBACK_BUFFER,
-	CONTEXT_WINDOW_FALLBACK_MESSAGE,
-	renderContextWindowReminder,
-	type ContextManagementMessageKind,
-	type ContextWindowIdentity,
-} from "./messages";
-
-export interface ContextRemaining {
-	remainingTokens: number | undefined;
-	windowId: string | undefined;
-	contextWindow: number;
-}
-
-export class ContextWindowBudget {
-	private readonly remindedWindows = new Set<string>();
-	private readonly exhaustedWindows = new Set<string>();
-
-	reset(): void {
-		this.remindedWindows.clear();
-		this.exhaustedWindows.clear();
-	}
-
-	restore(kind: ContextManagementMessageKind, windowId: string): void {
-		if (kind === "reminder") this.remindedWindows.add(windowId);
-		if (kind === "fallback") this.exhaustedWindows.add(windowId);
-	}
-
-	record(
-		ctx: ExtensionContext,
-		identity: ContextWindowIdentity,
-		contextTokens: number | undefined,
-		contextReminderThresholdPercent: number,
-	): { content: string; kind: "fallback" | "reminder" } | undefined {
-		const remaining = this.remaining(ctx, identity, contextTokens);
-		if (remaining.remainingTokens === undefined) return undefined;
-		const windowId = identity.currentWindowId;
-		if (remaining.remainingTokens <= 0 && !this.exhaustedWindows.has(windowId)) {
-			this.exhaustedWindows.add(windowId);
-			return { content: CONTEXT_WINDOW_FALLBACK_MESSAGE, kind: "fallback" };
-		}
-		const reminderThreshold =
-			contextReminderThresholdPercent > 0
-				? Math.floor((remaining.contextWindow * contextReminderThresholdPercent) / 100)
-				: 0;
-		if (
-			contextReminderThresholdPercent > 0 &&
-			remaining.remainingTokens <= reminderThreshold &&
-			!this.remindedWindows.has(windowId)
-		) {
-			this.remindedWindows.add(windowId);
-			return { content: renderContextWindowReminder(remaining.remainingTokens), kind: "reminder" };
-		}
-		return undefined;
-	}
-
-	remaining(
-		ctx: ExtensionContext,
-		identity: ContextWindowIdentity | undefined,
-		contextTokens?: number,
-	): ContextRemaining {
-		const usage = ctx.getContextUsage();
-		const contextWindow = usage?.contextWindow ?? ctx.model?.contextWindow ?? 0;
-		const limit = Math.max(0, contextWindow - CONTEXT_WINDOW_FALLBACK_BUFFER);
-		if (usage === undefined && contextTokens === undefined) {
-			return {
-				remainingTokens: undefined,
-				windowId: identity?.currentWindowId,
-				contextWindow: limit,
-			};
-		}
-		const used = contextTokens ?? usage?.tokens;
-		return {
-			remainingTokens:
-				used === null || used === undefined
-					? undefined
-					: Math.max(0, limit - used),
-			windowId: identity?.currentWindowId,
-			contextWindow: limit,
-		};
-	}
-}
+import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
+import {
+	CONTEXT_WINDOW_FALLBACK_BUFFER,
+	CONTEXT_WINDOW_FALLBACK_MESSAGE,
+	renderContextWindowReminder,
+	type ContextManagementMessageKind,
+	type ContextWindowIdentity,
+} from "./messages";
+
+export interface ContextRemaining {
+	remainingTokens: number | undefined;
+	windowId: string | undefined;
+	contextWindow: number;
+}
+
+export class ContextWindowBudget {
+	private readonly remindedWindows = new Set<string>();
+	private readonly exhaustedWindows = new Set<string>();
+
+	reset(): void {
+		this.remindedWindows.clear();
+		this.exhaustedWindows.clear();
+	}
+
+	restore(kind: ContextManagementMessageKind, windowId: string): void {
+		if (kind === "reminder") this.remindedWindows.add(windowId);
+		if (kind === "fallback") this.exhaustedWindows.add(windowId);
+	}
+
+	record(
+		ctx: ExtensionContext,
+		identity: ContextWindowIdentity,
+		contextTokens: number | undefined,
+		contextReminderThresholdPercent: number,
+	): { content: string; kind: "fallback" | "reminder" } | undefined {
+		const remaining = this.remaining(ctx, identity, contextTokens);
+		if (remaining.remainingTokens === undefined) return undefined;
+		const windowId = identity.currentWindowId;
+		if (remaining.remainingTokens <= 0 && !this.exhaustedWindows.has(windowId)) {
+			this.exhaustedWindows.add(windowId);
+			return { content: CONTEXT_WINDOW_FALLBACK_MESSAGE, kind: "fallback" };
+		}
+		const reminderThreshold =
+			contextReminderThresholdPercent > 0
+				? Math.floor((remaining.contextWindow * contextReminderThresholdPercent) / 100)
+				: 0;
+		if (
+			contextReminderThresholdPercent > 0 &&
+			remaining.remainingTokens <= reminderThreshold &&
+			!this.remindedWindows.has(windowId)
+		) {
+			this.remindedWindows.add(windowId);
+			return { content: renderContextWindowReminder(remaining.remainingTokens), kind: "reminder" };
+		}
+		return undefined;
+	}
+
+	remaining(
+		ctx: ExtensionContext,
+		identity: ContextWindowIdentity | undefined,
+		contextTokens?: number,
+	): ContextRemaining {
+		const usage = ctx.getContextUsage();
+		const contextWindow = usage?.contextWindow ?? ctx.model?.contextWindow ?? 0;
+		const limit = Math.max(0, contextWindow - CONTEXT_WINDOW_FALLBACK_BUFFER);
+		if (usage === undefined && contextTokens === undefined) {
+			return {
+				remainingTokens: undefined,
+				windowId: identity?.currentWindowId,
+				contextWindow: limit,
+			};
+		}
+		const used = contextTokens ?? usage?.tokens;
+		return {
+			remainingTokens:
+				used === null || used === undefined
+					? undefined
+					: Math.max(0, limit - used),
+			windowId: identity?.currentWindowId,
+			contextWindow: limit,
+		};
+	}
+}

package/src/context-management/window-manager.ts

@@ -31,8 +31,13 @@ import {
 	isNonEmptyString,
 	isRecord,
 	isContextWindowCompactionDetails,
+	type NotesCheckpointReceipt,
 } from "./types";
-import { encodeEncryptedOutputForContext, loadHistoryNotesThreadHint } from "./history-notes";
+import {
+	encodeEncryptedOutputForContext,
+	isSuccessfulHistoryNotesToolResult,
+	loadHistoryNotesThreadHint,
+} from "./history-notes";
 import { rewriteContextNamespaceTools } from "./namespace-tools";
 
 interface StartContextWindowOptions {
@@ -171,6 +176,9 @@ export class CodexContextWindowManager {
 		this.rolloverPending = true;
 		try {
 			const current = this.identity;
+			const checkpoint = current
+				? findLatestNotesCheckpointSinceBoundary(ctx.sessionManager.getBranch(), this.sessionId)
+				: undefined;
 			let threadHint: string | undefined;
 			if (current) {
 				try {
@@ -189,7 +197,7 @@ export class CodexContextWindowManager {
 					windowNumber: current.windowNumber + 1,
 				}
 				: { firstWindowId: currentWindowId, currentWindowId, windowNumber: 0 };
-			this.sendWindowMessage(pi, ctx, next, options, threadHint);
+			this.sendWindowMessage(pi, ctx, next, options, threadHint, checkpoint);
 			return true;
 		} catch (error) {
 			this.rolloverPending = false;
@@ -289,10 +297,11 @@ export class CodexContextWindowManager {
 		identity: ContextWindowIdentity,
 		options: StartContextWindowOptions,
 		threadHint?: string,
+		checkpoint?: NotesCheckpointReceipt,
 	): void {
 		sendContextWindowMessage(
 			pi,
-			renderContextWindowMessage(identity, threadHint),
+			renderContextWindowMessage(identity, threadHint, checkpoint),
 			"window",
 			identity,
 			{ triggerTurn: options.triggerTurn, sessionId: ctx.sessionManager.getSessionId() },
@@ -329,20 +338,7 @@ export function hasAssistantUsageSinceWindowBoundary(
 	entries: readonly SessionEntry[],
 	sessionId?: string,
 ): boolean {
-	let boundaryIndex = -1;
-	for (let index = entries.length - 1; index >= 0; index -= 1) {
-		const entry = entries[index]!;
-		if (entry.type !== "custom_message" || entry.customType !== CODEX_CONTEXT_WINDOW_MESSAGE_TYPE) continue;
-		if (!couldBelongToSession(entry.details, sessionId)) continue;
-		if (!isCodexContextManagementMessageDetails(entry.details)) {
-			throw new Error("Malformed persisted Codex context-window message");
-		}
-		if (!matchesSession(entry.details.sessionId, sessionId)) continue;
-		if (entry.details.contextManagement.kind === "window") {
-			boundaryIndex = index;
-			break;
-		}
-	}
+	const boundaryIndex = findLatestWindowBoundaryIndex(entries, sessionId);
 	if (boundaryIndex < 0) return false;
 	for (let index = boundaryIndex + 1; index < entries.length; index += 1) {
 		const entry = entries[index]!;
@@ -363,29 +359,18 @@ export function hasAssistantUsageSinceWindowBoundary(
 }
 
 /**
- * Whether the branch contains a successful notes append/write result after the
- * latest window boundary. Reads and failed writes never count as checkpoints.
+ * Return the most recent successful notes write after the latest window
+ * boundary. The receipt is derived from persisted session entries so it
+ * survives restarts and can be used for an explicit rollover handoff.
  */
-export function findNotesCheckpointSinceBoundary(
+export function findLatestNotesCheckpointSinceBoundary(
 	entries: readonly SessionEntry[],
 	sessionId?: string,
-): boolean {
-	let boundaryIndex = -1;
-	for (let index = entries.length - 1; index >= 0; index -= 1) {
-		const entry = entries[index]!;
-		if (entry.type !== "custom_message" || entry.customType !== CODEX_CONTEXT_WINDOW_MESSAGE_TYPE) continue;
-		if (!couldBelongToSession(entry.details, sessionId)) continue;
-		if (!isCodexContextManagementMessageDetails(entry.details)) {
-			throw new Error("Malformed persisted Codex context-window message");
-		}
-		if (!matchesSession(entry.details.sessionId, sessionId)) continue;
-		if (entry.details.contextManagement.kind === "window") {
-			boundaryIndex = index;
-			break;
-		}
-	}
-	if (boundaryIndex < 0) return false;
-	const checkpointCalls = new Set<string>();
+): NotesCheckpointReceipt | undefined {
+	const boundaryIndex = findLatestWindowBoundaryIndex(entries, sessionId);
+	if (boundaryIndex < 0) return undefined;
+	const checkpointCalls = new Map<string, NotesCheckpointReceipt>();
+	let latest: NotesCheckpointReceipt | undefined;
 	for (let index = boundaryIndex + 1; index < entries.length; index += 1) {
 		const entry = entries[index]!;
 		if (entry.type !== "message") continue;
@@ -393,28 +378,52 @@ export function findNotesCheckpointSinceBoundary(
 		if (message.role === "assistant") {
 			const parts = Array.isArray(message.content) ? message.content : [];
 			for (const part of parts) {
-				if (!isRecord(part) || part.type !== "toolCall") continue;
-				// Match by call id only; the provider-side namespace rewrite never
-				// affects the names persisted in the Pi session branch.
-				if (part.name !== "notes") continue;
+				if (!isRecord(part) || part.type !== "toolCall" || part.name !== "notes") continue;
 				const args = isRecord(part.arguments) ? part.arguments : undefined;
 				const action = typeof args?.action === "string" ? args.action : "";
-				if (typeof part.id === "string" && NOTES_CHECKPOINT_ACTIONS.has(action)) {
-					checkpointCalls.add(part.id);
+				const path = isNonEmptyString(args?.path) ? args.path : undefined;
+				if (isNonEmptyString(part.id) && path !== undefined && NOTES_CHECKPOINT_ACTIONS.has(action)) {
+					checkpointCalls.set(part.id, { path, toolCallId: part.id });
 				}
 			}
 			continue;
 		}
-		if (message.role === "toolResult" && checkpointCalls.has(message.toolCallId)) {
-			if (message.isError) {
-				checkpointCalls.delete(message.toolCallId);
-				continue;
-			}
-			const details = message.details;
-			if (isRecord(details) && isRecord(details.codexHistoryNotes)) return true;
+		if (message.role !== "toolResult" || message.toolName !== "notes") continue;
+		const receipt = checkpointCalls.get(message.toolCallId);
+		if (!receipt) continue;
+		checkpointCalls.delete(message.toolCallId);
+		if (message.isError !== false || !isSuccessfulHistoryNotesToolResult(message.details)) continue;
+		latest = receipt;
+	}
+	return latest;
+}
+
+/**
+ * Whether the branch contains a successful notes append/write result after the
+ * latest window boundary. Reads and failed writes never count as checkpoints.
+ */
+export function findNotesCheckpointSinceBoundary(
+	entries: readonly SessionEntry[],
+	sessionId?: string,
+): boolean {
+	return findLatestNotesCheckpointSinceBoundary(entries, sessionId) !== undefined;
+}
+
+function findLatestWindowBoundaryIndex(
+	entries: readonly SessionEntry[],
+	sessionId?: string,
+): number {
+	for (let index = entries.length - 1; index >= 0; index -= 1) {
+		const entry = entries[index]!;
+		if (entry.type !== "custom_message" || entry.customType !== CODEX_CONTEXT_WINDOW_MESSAGE_TYPE) continue;
+		if (!couldBelongToSession(entry.details, sessionId)) continue;
+		if (!isCodexContextManagementMessageDetails(entry.details)) {
+			throw new Error("Malformed persisted Codex context-window message");
 		}
+		if (!matchesSession(entry.details.sessionId, sessionId)) continue;
+		if (entry.details.contextManagement.kind === "window") return index;
 	}
-	return false;
+	return -1;
 }
 
 export function findLatestWindowBoundaryEntry(

package/src/context-management/window-request.ts

@@ -1,125 +1,125 @@
-import type { ProviderHeaders } from "@earendil-works/pi-ai";
-import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
-import type { ContextWindowIdentity } from "./types";
-import { CODEX_ENCRYPTED_OUTPUT_CONTEXT_MARKER } from "./history-notes";
-import { rewriteContextNamespaceCalls } from "./namespace-tools";
-
-export type ContextWindowRequestMetadata = {
-	session_id: string;
-	thread_id: string;
-	agent_name: "/root";
-	window_id: string;
-	window_number: number;
-	context_window_id: string;
-	request_kind: "turn";
-	history_ingest_requested: true;
-};
-
-export function buildContextWindowRequestMetadata(
-	ctx: Pick<ExtensionContext, "sessionManager">,
-	identity: ContextWindowIdentity,
-): ContextWindowRequestMetadata {
-	const sessionId = ctx.sessionManager.getSessionId();
-	return {
-		session_id: sessionId,
-		thread_id: sessionId,
-		agent_name: "/root",
-		window_id: `${sessionId}:${identity.windowNumber}`,
-		window_number: identity.windowNumber,
-		context_window_id: identity.currentWindowId,
-		request_kind: "turn",
-		history_ingest_requested: true,
-	};
-}
-
-export function rewriteWindowPayload(
-	payload: unknown,
-	ctx: Pick<ExtensionContext, "sessionManager">,
-	identity: ContextWindowIdentity | undefined,
-): unknown {
-	if (!identity || !isResponsesPayload(payload)) return payload;
-	const clientMetadata = payload.client_metadata;
-	if (clientMetadata !== undefined && !isRecord(clientMetadata)) return payload;
-	const existingTurnMetadata = parseTurnMetadata(clientMetadata?.["x-codex-turn-metadata"]);
-	if (clientMetadata?.["x-codex-turn-metadata"] !== undefined && !existingTurnMetadata) return payload;
-	const metadata = buildContextWindowRequestMetadata(ctx, identity);
-	const turnMetadata = { ...existingTurnMetadata, ...metadata };
-	const rewritten: Record<string, unknown> = {
-		...payload,
-		client_metadata: {
-			...(clientMetadata ?? {}),
-			"x-codex-window-id": metadata.window_id,
-			"x-codex-turn-metadata": JSON.stringify(turnMetadata),
-		},
-	};
-	return rewriteEncryptedToolOutputs(rewriteContextNamespaceCalls(rewritten));
-}
-
-export function rewriteEncryptedToolOutputs(payload: unknown): unknown {
-	if (!isRecord(payload) || !Array.isArray(payload.input)) return payload;
-	let changed = false;
-	const input = payload.input.map((item) => {
-		if (!isRecord(item) || item.type !== "function_call_output") return item;
-		const output = item.output;
-		if (typeof output === "string") {
-			const encrypted = decodeEncryptedOutputContext(output);
-			if (encrypted === undefined) return item;
-			changed = true;
-			return { ...item, output: [{ type: "encrypted_content", encrypted_content: encrypted }] };
-		}
-		if (!Array.isArray(output)) return item;
-		let outputChanged = false;
-		const rewrittenOutput = output.map((part) => {
-			if (!isRecord(part) || part.type !== "input_text" || typeof part.text !== "string") return part;
-			const encrypted = decodeEncryptedOutputContext(part.text);
-			if (encrypted === undefined) return part;
-			outputChanged = true;
-			return { type: "encrypted_content", encrypted_content: encrypted };
-		});
-		if (!outputChanged) return item;
-		changed = true;
-		return { ...item, output: rewrittenOutput };
-	});
-	return changed ? { ...payload, input } : payload;
-}
-
-function decodeEncryptedOutputContext(value: string): string | undefined {
-	if (!value.startsWith(CODEX_ENCRYPTED_OUTPUT_CONTEXT_MARKER)) return undefined;
-	try {
-		const decoded: unknown = JSON.parse(value.slice(CODEX_ENCRYPTED_OUTPUT_CONTEXT_MARKER.length));
-		if (typeof decoded !== "string" || decoded.length === 0) throw new Error("invalid encrypted output marker");
-		return decoded;
-	} catch {
-		throw new Error("Malformed encrypted history/notes output marker");
-	}
-}
-
-function parseTurnMetadata(value: unknown): Record<string, unknown> | undefined {
-	if (value === undefined) return {};
-	if (typeof value !== "string") return undefined;
-	try {
-		const parsed: unknown = JSON.parse(value);
-		return isRecord(parsed) ? parsed : undefined;
-	} catch {
-		return undefined;
-	}
-}
-
-function isResponsesPayload(value: unknown): value is Record<string, unknown> & { model: string; input: unknown[] } {
-	return isRecord(value) && typeof value.model === "string" && Array.isArray(value.input);
-}
-
-export function rewriteWindowHeaders(
-	headers: ProviderHeaders,
-	ctx: Pick<ExtensionContext, "sessionManager">,
-	identity: ContextWindowIdentity | undefined,
-): void {
-	if (!identity) return;
-	const metadata = buildContextWindowRequestMetadata(ctx, identity);
-	headers["x-codex-window-id"] = metadata.window_id;
-	headers["x-codex-turn-metadata"] = JSON.stringify(metadata);
-}
-
-function isRecord(value: unknown): value is Record<string, unknown> {
-	return Boolean(value && typeof value === "object" && !Array.isArray(value));
-}
+import type { ProviderHeaders } from "@earendil-works/pi-ai";
+import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
+import type { ContextWindowIdentity } from "./types";
+import { CODEX_ENCRYPTED_OUTPUT_CONTEXT_MARKER } from "./history-notes";
+import { rewriteContextNamespaceCalls } from "./namespace-tools";
+
+export type ContextWindowRequestMetadata = {
+	session_id: string;
+	thread_id: string;
+	agent_name: "/root";
+	window_id: string;
+	window_number: number;
+	context_window_id: string;
+	request_kind: "turn";
+	history_ingest_requested: true;
+};
+
+export function buildContextWindowRequestMetadata(
+	ctx: Pick<ExtensionContext, "sessionManager">,
+	identity: ContextWindowIdentity,
+): ContextWindowRequestMetadata {
+	const sessionId = ctx.sessionManager.getSessionId();
+	return {
+		session_id: sessionId,
+		thread_id: sessionId,
+		agent_name: "/root",
+		window_id: `${sessionId}:${identity.windowNumber}`,
+		window_number: identity.windowNumber,
+		context_window_id: identity.currentWindowId,
+		request_kind: "turn",
+		history_ingest_requested: true,
+	};
+}
+
+export function rewriteWindowPayload(
+	payload: unknown,
+	ctx: Pick<ExtensionContext, "sessionManager">,
+	identity: ContextWindowIdentity | undefined,
+): unknown {
+	if (!identity || !isResponsesPayload(payload)) return payload;
+	const clientMetadata = payload.client_metadata;
+	if (clientMetadata !== undefined && !isRecord(clientMetadata)) return payload;
+	const existingTurnMetadata = parseTurnMetadata(clientMetadata?.["x-codex-turn-metadata"]);
+	if (clientMetadata?.["x-codex-turn-metadata"] !== undefined && !existingTurnMetadata) return payload;
+	const metadata = buildContextWindowRequestMetadata(ctx, identity);
+	const turnMetadata = { ...existingTurnMetadata, ...metadata };
+	const rewritten: Record<string, unknown> = {
+		...payload,
+		client_metadata: {
+			...(clientMetadata ?? {}),
+			"x-codex-window-id": metadata.window_id,
+			"x-codex-turn-metadata": JSON.stringify(turnMetadata),
+		},
+	};
+	return rewriteEncryptedToolOutputs(rewriteContextNamespaceCalls(rewritten));
+}
+
+export function rewriteEncryptedToolOutputs(payload: unknown): unknown {
+	if (!isRecord(payload) || !Array.isArray(payload.input)) return payload;
+	let changed = false;
+	const input = payload.input.map((item) => {
+		if (!isRecord(item) || item.type !== "function_call_output") return item;
+		const output = item.output;
+		if (typeof output === "string") {
+			const encrypted = decodeEncryptedOutputContext(output);
+			if (encrypted === undefined) return item;
+			changed = true;
+			return { ...item, output: [{ type: "encrypted_content", encrypted_content: encrypted }] };
+		}
+		if (!Array.isArray(output)) return item;
+		let outputChanged = false;
+		const rewrittenOutput = output.map((part) => {
+			if (!isRecord(part) || part.type !== "input_text" || typeof part.text !== "string") return part;
+			const encrypted = decodeEncryptedOutputContext(part.text);
+			if (encrypted === undefined) return part;
+			outputChanged = true;
+			return { type: "encrypted_content", encrypted_content: encrypted };
+		});
+		if (!outputChanged) return item;
+		changed = true;
+		return { ...item, output: rewrittenOutput };
+	});
+	return changed ? { ...payload, input } : payload;
+}
+
+function decodeEncryptedOutputContext(value: string): string | undefined {
+	if (!value.startsWith(CODEX_ENCRYPTED_OUTPUT_CONTEXT_MARKER)) return undefined;
+	try {
+		const decoded: unknown = JSON.parse(value.slice(CODEX_ENCRYPTED_OUTPUT_CONTEXT_MARKER.length));
+		if (typeof decoded !== "string" || decoded.length === 0) throw new Error("invalid encrypted output marker");
+		return decoded;
+	} catch {
+		throw new Error("Malformed encrypted history/notes output marker");
+	}
+}
+
+function parseTurnMetadata(value: unknown): Record<string, unknown> | undefined {
+	if (value === undefined) return {};
+	if (typeof value !== "string") return undefined;
+	try {
+		const parsed: unknown = JSON.parse(value);
+		return isRecord(parsed) ? parsed : undefined;
+	} catch {
+		return undefined;
+	}
+}
+
+function isResponsesPayload(value: unknown): value is Record<string, unknown> & { model: string; input: unknown[] } {
+	return isRecord(value) && typeof value.model === "string" && Array.isArray(value.input);
+}
+
+export function rewriteWindowHeaders(
+	headers: ProviderHeaders,
+	ctx: Pick<ExtensionContext, "sessionManager">,
+	identity: ContextWindowIdentity | undefined,
+): void {
+	if (!identity) return;
+	const metadata = buildContextWindowRequestMetadata(ctx, identity);
+	headers["x-codex-window-id"] = metadata.window_id;
+	headers["x-codex-turn-metadata"] = JSON.stringify(metadata);
+}
+
+function isRecord(value: unknown): value is Record<string, unknown> {
+	return Boolean(value && typeof value === "object" && !Array.isArray(value));
+}

package/src/debug.ts

@@ -14,7 +14,7 @@ import {
 	type RedactOptions,
 } from "./types";
 
-const CRITICAL_KEY_RE = /(authorization|api[-_]?key|token|credential|oauth|auth|account[-_]?id|encrypted[_-]?(content|output))/i;
+const CRITICAL_KEY_RE = /(authorization|api[-_]?key|token|credential|oauth|auth|account[-_]?id|cookie|set[-_]?cookie|response(?:text)?|completed|encrypted[_-]?(content|output))/i;
 const SENSITIVE_KEY_RE = /(authorization|api[-_]?key|token|secret|password|cookie|set-cookie|signature|credential|oauth|auth|account[-_]?id|encrypted[_-]?(content|output))/i;
 const BEARER_RE = /\bBearer\s+[A-Za-z0-9._\-+/=]+/gi;
 const OPENAI_KEY_RE = /\bsk-[A-Za-z0-9\-_]+\b/g;