pi-openai-toolkit 0.14.3 → 0.14.5

package/src/context-management/tools.ts

@@ -85,6 +85,7 @@ export function createContextManagementTools(
 	pi: ExtensionAPI,
 	manager: CodexContextWindowManager,
 	isActive: (ctx: ExtensionContext) => Promise<boolean> | boolean,
+	getGatewayModels: () => readonly string[] = () => [],
 ): ContextManagementTools {
 	const assertActive = async (ctx: ExtensionContext): Promise<void> => {
 		if (!(await isActive(ctx))) throw new Error("remote-context-inactive");
@@ -142,7 +143,7 @@ export function createContextManagementTools(
 		],
 		execute: async (_id, params, _signal, _update, ctx) => {
 			await assertActive(ctx);
-			return executeHistoryNotesTool("history", params.action, params as Record<string, unknown>, ctx, _signal);
+			return executeHistoryNotesTool("history", params.action, params as Record<string, unknown>, ctx, _signal, getGatewayModels());
 		},
 	};
 	const notes: ToolDefinition<typeof NOTES_PARAMETERS, CodexHistoryNotesDetails> = {
@@ -161,7 +162,7 @@ export function createContextManagementTools(
 		executionMode: "sequential",
 		execute: async (_id, params, _signal, _update, ctx) => {
 			await assertActive(ctx);
-			return executeHistoryNotesTool("notes", params.action, params as Record<string, unknown>, ctx, _signal);
+			return executeHistoryNotesTool("notes", params.action, params as Record<string, unknown>, ctx, _signal, getGatewayModels());
 		},
 	};
 	return { newContext, getContextRemaining, history, notes };
@@ -293,9 +294,10 @@ export function registerContextManagementTools(
 	pi: ExtensionAPI,
 	manager: CodexContextWindowManager,
 	isActive: (ctx: ExtensionContext) => Promise<boolean> | boolean,
+	getGatewayModels?: () => readonly string[],
 ): ContextManagementToolController {
 	const controller = new ContextManagementToolController(pi);
-	controller.register(createContextManagementTools(pi, manager, isActive));
+	controller.register(createContextManagementTools(pi, manager, isActive, getGatewayModels));
 	return controller;
 }
 

package/src/context-management/types.ts

@@ -1,160 +1,161 @@
-import type { ContextManagementMode } from "../types";
-
-export type { ContextManagementMode };
-
-export const CONTEXT_MANAGEMENT_PROTOCOL = 1 as const;
-export const CODEX_CONTEXT_WINDOW_MESSAGE_TYPE = "codex-context-window" as const;
-export const CONTEXT_WINDOW_COMPACTION_STRATEGY = "codex-context-window" as const;
-export const CONTEXT_WINDOW_REMINDER_THRESHOLD = 6_144;
-export const CONTEXT_WINDOW_FALLBACK_BUFFER = 16_384;
-
-export type ContextManagementMessageKind = "window" | "reminder" | "fallback";
-
-export type ContextWindowIdentity = {
-	firstWindowId: string;
-	currentWindowId: string;
-	previousWindowId?: string;
-	windowNumber: number;
-};
-
-export type CodexContextManagementMessageDetails = {
-	protocol: typeof CONTEXT_MANAGEMENT_PROTOCOL;
-	id: string;
-	sessionId?: string;
-	contextManagement: ContextWindowIdentity & {
-		protocol: typeof CONTEXT_MANAGEMENT_PROTOCOL;
-		kind: ContextManagementMessageKind;
-		trimPreviousWindow?: true;
-	};
-};
-
-export type ContextWindowCompactionDetails = {
-	protocol: typeof CONTEXT_MANAGEMENT_PROTOCOL;
-	strategy: typeof CONTEXT_WINDOW_COMPACTION_STRATEGY;
-	windowId?: string;
-};
-
-export type RemoteContextFailureReason =
-	| "context-management-inactive"
-	| "unsupported-model"
-	| "unsupported-api"
-	| "unsupported-backend"
-	| "auth-resolution-failed"
-	| "missing-token"
-	| "missing-api-key"
-	| "missing-account-id"
-	| "missing-base-url"
-	| "invalid-account-token"
-	| "backend-timeout"
-	| "aborted"
-	| "http-error"
-	| "invalid-json"
-	| "invalid-response"
-	| "protocol-error";
-
-export type NativeCodexContextProvider = {
-	kind: "native-codex";
-	route: "openai-codex";
-	provider: "openai-codex";
-	api: "openai-codex-responses";
-	model: string;
-	baseUrl: string;
-	token: string;
-	accountId: string;
-	headers: Record<string, string>;
-};
-
-export type GatewayCodexContextProvider = {
-	kind: "codex-gateway";
-	route: "codex-gateway";
-	provider: "uwoacrimson";
-	api: "openai-responses";
-	model: string;
-	baseUrl: string;
-	apiKey: string;
-	headers: Record<string, string>;
-};
-
-export type CodexContextProvider = NativeCodexContextProvider | GatewayCodexContextProvider;
-
-export type CodexContextProviderResolution =
-	| { ok: true; provider: CodexContextProvider }
-	| {
-			ok: false;
-			reason: RemoteContextFailureReason;
-			provider?: string;
-			api?: string;
-			model?: string;
-			baseUrl?: string;
-		};
-
-export type HistoryAction =
-	| "list_windows"
-	| "list_items"
-	| "read_item"
-	| "search_contents";
-
-export type NotesAction =
-	| "list_files_by_prefix"
-	| "read_file"
-	| "search_contents"
-	| "append_to_file"
-	| "write_file";
-
-export type HistoryNotesResponse = Record<string, unknown>;
-
-export type HistoryNotesResult =
-	| { ok: true; value: HistoryNotesResponse }
-	| {
-			ok: false;
-			reason: Exclude<RemoteContextFailureReason, "context-management-inactive" | "unsupported-model" | "unsupported-api">;
-			status?: number;
-		};
-
-export function isRecord(value: unknown): value is Record<string, unknown> {
-	return Boolean(value && typeof value === "object" && !Array.isArray(value));
-}
-
-export function isNonEmptyString(value: unknown): value is string {
-	return typeof value === "string" && value.trim().length > 0;
-}
-
-export function isContextWindowIdentity(value: unknown): value is ContextWindowIdentity {
-	if (!isRecord(value)) return false;
-	return (
-		isNonEmptyString(value.firstWindowId) &&
-		isNonEmptyString(value.currentWindowId) &&
-		(value.previousWindowId === undefined || isNonEmptyString(value.previousWindowId)) &&
-		Number.isInteger(value.windowNumber) &&
-		(value.windowNumber as number) >= 0
-	);
-}
-
-export function isCodexContextManagementMessageDetails(
-	value: unknown,
-): value is CodexContextManagementMessageDetails {
-	if (!isRecord(value) || value.protocol !== CONTEXT_MANAGEMENT_PROTOCOL || !isNonEmptyString(value.id)) {
-		return false;
-	}
-	if (value.sessionId !== undefined && !isNonEmptyString(value.sessionId)) return false;
-	if (!isRecord(value.contextManagement) || value.contextManagement.protocol !== CONTEXT_MANAGEMENT_PROTOCOL) {
-		return false;
-	}
-	const context = value.contextManagement;
-	if (!isRecord(context)) return false;
-	const trimPreviousWindow = context.trimPreviousWindow;
-	return (
-		(context.kind === "window" || context.kind === "reminder" || context.kind === "fallback") &&
-		isContextWindowIdentity(context) &&
-		(trimPreviousWindow === undefined || trimPreviousWindow === true)
-	);
-}
-
-export function isContextWindowCompactionDetails(value: unknown): value is ContextWindowCompactionDetails {
-	return (
-		isRecord(value) &&
-		value.protocol === CONTEXT_MANAGEMENT_PROTOCOL &&
-		value.strategy === CONTEXT_WINDOW_COMPACTION_STRATEGY &&
-		(value.windowId === undefined || isNonEmptyString(value.windowId))
-	);
-}
+import type { ContextManagementMode } from "../types";
+
+export type { ContextManagementMode };
+
+export const CONTEXT_MANAGEMENT_PROTOCOL = 1 as const;
+export const CODEX_CONTEXT_WINDOW_MESSAGE_TYPE = "codex-context-window" as const;
+export const CONTEXT_WINDOW_COMPACTION_STRATEGY = "codex-context-window" as const;
+export const CONTEXT_WINDOW_REMINDER_THRESHOLD = 6_144;
+export const CONTEXT_WINDOW_FALLBACK_BUFFER = 16_384;
+
+export type ContextManagementMessageKind = "window" | "reminder" | "fallback";
+
+export type ContextWindowIdentity = {
+	firstWindowId: string;
+	currentWindowId: string;
+	previousWindowId?: string;
+	windowNumber: number;
+};
+
+export type CodexContextManagementMessageDetails = {
+	protocol: typeof CONTEXT_MANAGEMENT_PROTOCOL;
+	id: string;
+	sessionId?: string;
+	contextManagement: ContextWindowIdentity & {
+		protocol: typeof CONTEXT_MANAGEMENT_PROTOCOL;
+		kind: ContextManagementMessageKind;
+		trimPreviousWindow?: true;
+	};
+};
+
+export type ContextWindowCompactionDetails = {
+	protocol: typeof CONTEXT_MANAGEMENT_PROTOCOL;
+	strategy: typeof CONTEXT_WINDOW_COMPACTION_STRATEGY;
+	windowId?: string;
+};
+
+export type RemoteContextFailureReason =
+	| "context-management-inactive"
+	| "unsupported-model"
+	| "unsupported-api"
+	| "unsupported-backend"
+	| "auth-resolution-failed"
+	| "missing-token"
+	| "missing-api-key"
+	| "missing-account-id"
+	| "missing-base-url"
+	| "invalid-account-token"
+	| "backend-timeout"
+	| "aborted"
+	| "http-error"
+	| "invalid-json"
+	| "invalid-response"
+	| "protocol-error";
+
+export type NativeCodexContextProvider = {
+	kind: "native-codex";
+	route: "openai-codex";
+	provider: "openai-codex";
+	api: "openai-codex-responses";
+	model: string;
+	baseUrl: string;
+	token: string;
+	accountId: string;
+	headers: Record<string, string>;
+};
+
+export type GatewayCodexContextProvider = {
+	kind: "codex-gateway";
+	route: "codex-gateway";
+	/** Operator-defined provider name; matched via compaction.gatewayContextModels. */
+	provider: string;
+	api: "openai-responses";
+	model: string;
+	baseUrl: string;
+	apiKey: string;
+	headers: Record<string, string>;
+};
+
+export type CodexContextProvider = NativeCodexContextProvider | GatewayCodexContextProvider;
+
+export type CodexContextProviderResolution =
+	| { ok: true; provider: CodexContextProvider }
+	| {
+			ok: false;
+			reason: RemoteContextFailureReason;
+			provider?: string;
+			api?: string;
+			model?: string;
+			baseUrl?: string;
+		};
+
+export type HistoryAction =
+	| "list_windows"
+	| "list_items"
+	| "read_item"
+	| "search_contents";
+
+export type NotesAction =
+	| "list_files_by_prefix"
+	| "read_file"
+	| "search_contents"
+	| "append_to_file"
+	| "write_file";
+
+export type HistoryNotesResponse = Record<string, unknown>;
+
+export type HistoryNotesResult =
+	| { ok: true; value: HistoryNotesResponse }
+	| {
+			ok: false;
+			reason: Exclude<RemoteContextFailureReason, "context-management-inactive" | "unsupported-model" | "unsupported-api">;
+			status?: number;
+		};
+
+export function isRecord(value: unknown): value is Record<string, unknown> {
+	return Boolean(value && typeof value === "object" && !Array.isArray(value));
+}
+
+export function isNonEmptyString(value: unknown): value is string {
+	return typeof value === "string" && value.trim().length > 0;
+}
+
+export function isContextWindowIdentity(value: unknown): value is ContextWindowIdentity {
+	if (!isRecord(value)) return false;
+	return (
+		isNonEmptyString(value.firstWindowId) &&
+		isNonEmptyString(value.currentWindowId) &&
+		(value.previousWindowId === undefined || isNonEmptyString(value.previousWindowId)) &&
+		Number.isInteger(value.windowNumber) &&
+		(value.windowNumber as number) >= 0
+	);
+}
+
+export function isCodexContextManagementMessageDetails(
+	value: unknown,
+): value is CodexContextManagementMessageDetails {
+	if (!isRecord(value) || value.protocol !== CONTEXT_MANAGEMENT_PROTOCOL || !isNonEmptyString(value.id)) {
+		return false;
+	}
+	if (value.sessionId !== undefined && !isNonEmptyString(value.sessionId)) return false;
+	if (!isRecord(value.contextManagement) || value.contextManagement.protocol !== CONTEXT_MANAGEMENT_PROTOCOL) {
+		return false;
+	}
+	const context = value.contextManagement;
+	if (!isRecord(context)) return false;
+	const trimPreviousWindow = context.trimPreviousWindow;
+	return (
+		(context.kind === "window" || context.kind === "reminder" || context.kind === "fallback") &&
+		isContextWindowIdentity(context) &&
+		(trimPreviousWindow === undefined || trimPreviousWindow === true)
+	);
+}
+
+export function isContextWindowCompactionDetails(value: unknown): value is ContextWindowCompactionDetails {
+	return (
+		isRecord(value) &&
+		value.protocol === CONTEXT_MANAGEMENT_PROTOCOL &&
+		value.strategy === CONTEXT_WINDOW_COMPACTION_STRATEGY &&
+		(value.windowId === undefined || isNonEmptyString(value.windowId))
+	);
+}

package/src/extension-runtime.ts

@@ -14,6 +14,7 @@ import {
 	isNativeCodexModel,
 } from "./context-management/codex-provider";
 import { routeContextNamespaceToolMessage } from "./context-management/namespace-tools";
+import { loadHistoryNotesThreadHint } from "./context-management/history-notes";
 import { CodexContextWindowManager } from "./context-management/window-manager";
 import { registerContextManagementTools } from "./context-management/tools";
 import { writeDebugArtifact, writeReplayFailureArtifact } from "./debug";
@@ -109,7 +110,7 @@ async function isRemoteContextActive(
 	model: ExtensionContext["model"] = ctx.model,
 ): Promise<boolean> {
 	if (!config.enabled || config.contextManagement !== "remote") return false;
-	const resolution = await resolveCodexContextProvider(ctx, model);
+	const resolution = await resolveCodexContextProvider(ctx, model, config.gatewayContextModels);
 	return resolution.ok;
 }
 
@@ -118,7 +119,7 @@ function isCodexContextModel(
 	config: CompactionConfig,
 ): boolean {
 	return config.contextManagement === "remote"
-		&& (isNativeCodexModel(model) || isCodexGatewayModel(model));
+		&& (isNativeCodexModel(model) || isCodexGatewayModel(model, config.gatewayContextModels));
 }
 
 function notifyRemoteContextFailure(ctx: ExtensionContext, reason: string): void {
@@ -759,7 +760,9 @@ export default function registerCompactionExtension(
 	overrides: Partial<CompactionDependencies> = {},
 ) {
 	const loadConfig = overrides.loadConfig ?? loadToolkitConfig;
-	const contextWindows = overrides.contextWindows ?? new CodexContextWindowManager();
+	const contextWindows = overrides.contextWindows ?? new CodexContextWindowManager((ctx, signal) =>
+		loadHistoryNotesThreadHint(ctx, signal, loadConfig().config.compaction.gatewayContextModels)
+	);
 	const dependencies: CompactionDependencies = {
 		loadConfig,
 		remoteCompact: executeRemoteV2Compaction,
@@ -775,6 +778,7 @@ export default function registerCompactionExtension(
 			const config = dependencies.loadConfig().config.compaction;
 			return tools.isRegistered && await isRemoteContextActive(ctx, config);
 		},
+		() => dependencies.loadConfig().config.compaction.gatewayContextModels,
 	);
 	const remoteContextActive: RemoteContextActive = async (ctx, config, model = ctx.model) =>
 		tools.isRegistered && await isRemoteContextActive(ctx, config, model);
@@ -807,7 +811,7 @@ export default function registerCompactionExtension(
 				activationReason = "tool-name-conflict";
 				notifyRemoteContextFailure(ctx, activationReason);
 			} else {
-				const remoteResolution = await resolveCodexContextProvider(ctx, ctx.model);
+				const remoteResolution = await resolveCodexContextProvider(ctx, ctx.model, config.gatewayContextModels);
 				activationReason = remoteResolution.ok ? "codex-context-unavailable" : remoteResolution.reason;
 				notifyRemoteContextFailure(ctx, activationReason);
 			}
@@ -874,7 +878,7 @@ export default function registerCompactionExtension(
 		const config = dependencies.loadConfig().config.compaction;
 		if (!isCodexContextModel(ctx.model, config)) return;
 		if (!(await remoteContextActive(ctx, config))) return;
-		const provider = await resolveCodexContextProvider(ctx, ctx.model);
+		const provider = await resolveCodexContextProvider(ctx, ctx.model, config.gatewayContextModels);
 		if (provider.ok && provider.provider.kind === "codex-gateway") {
 			const sessionId = getSessionId(ctx);
 			const gatewayHeaders = codexContextProviderHeaders(provider.provider, {

package/src/image-generation/extension.ts

@@ -8,6 +8,7 @@ import {
 	IMAGE_GENERATION_QUALITIES,
 	IMAGE_GENERATION_SIZES,
 	IMAGE_GENERATION_TOOL_NAME,
+	MAX_IMAGE_MODEL_ID_CHARS,
 	MAX_IMAGE_PATH_CHARS,
 	MAX_IMAGE_PROMPT_CHARS,
 	MAX_REFERENCE_IMAGE_COUNT,
@@ -65,6 +66,21 @@ const GenerateImageParameters = Type.Object(
 				description: "Requested image quality, or auto.",
 			}),
 		),
+		model: Type.Optional(
+			Type.Union(
+				[
+					Type.Null(),
+					Type.String({
+						minLength: 1,
+						maxLength: MAX_IMAGE_MODEL_ID_CHARS,
+					}),
+				],
+				{
+					description:
+						"Use null to accept the default image model, which is the first entry of imageGeneration.models; otherwise provide another model id exactly as it appears in that configured list.",
+				},
+			),
+		),
 	},
 	{ additionalProperties: false },
 );
@@ -98,14 +114,15 @@ export function registerImageGenerationExtension(
 		name: IMAGE_GENERATION_TOOL_NAME,
 		label: "OpenAI Generate Image",
 		description:
-			"Generate a PNG image, or edit from one to five user-approved local reference images, through the current Responses-capable model and the hosted gpt-image-2 image_generation tool. This is a paid provider operation.",
-		promptSnippet: "Generate or edit PNG images through the current Responses-capable model and gpt-image-2.",
+			"Generate a PNG image, or edit from one to five user-approved local reference images, through the current Responses-capable model and a configured hosted image_generation model. This is a paid provider operation.",
+		promptSnippet: "Generate or edit PNG images through the current Responses-capable model and a configured imageGeneration.models entry.",
 		promptGuidelines: [
 			"Use openai_generate_image when the user explicitly asks to create, draw, render, or edit a raster image and the active model speaks a Responses API.",
 			"Do not call openai_generate_image speculatively: it consumes the user's provider or gateway image quota.",
 			"Keep the image prompt faithful to the user's requested subject and constraints; do not invent unrequested style details.",
 			"Set referenceImagePaths to null unless the user explicitly identified local files; never invent paths or placeholder strings, and remember upload requires user approval.",
 			"Set outputPath to null unless the user explicitly asks for a destination; never invent a destination or placeholder string, and otherwise use the default Pi agent artifact.",
+			"Set model to null unless the user named an image model configured in imageGeneration.models; never invent or guess a model id, and remember an unlisted model fails before the paid request.",
 			"Do not substitute Python, browser automation, shell scripts, or unrelated image tools for an eligible image request.",
 		],
 		parameters: GenerateImageParameters,