pi-openai-toolkit 0.23.1 → 0.24.0

package/src/native-fallback.ts

@@ -39,7 +39,7 @@ export type NativeFallbackResult =
 export type NativeCompactFn = typeof compact;
 
 type ResolvedAuth =
-	| { ok: true; apiKey?: string; headers?: ProviderHeaders; env?: Record<string, string> }
+	| { ok: true; apiKey?: string; headers?: ProviderHeaders; baseUrl?: string; env?: Record<string, string> }
 	| { ok: false; error: string };
 
 function isAbortError(error: unknown): boolean {
@@ -61,10 +61,8 @@ function toErrorMessage(error: unknown): string {
  * active model cannot use remote v2 at all. This function never inspects `remoteCompactModel`
  * itself, so a model that cannot compact remotely can never inherit the remote producer.
  *
- * Only the "resolved model differs from the current one" case is handled here: when the feature
- * is disabled, nothing is resolved, or it equals the current model, the caller returns undefined
- * from session_before_compact so pi runs the same native path itself, keeping its internal
- * streamFn/thinkingLevel wiring.
+ * Unset or same-current-model defaults stay with Pi. This helper does not
+ * select a session model or take ownership of Pi's scheduler.
  */
 export async function runNativeFallbackCompaction(args: {
 	ctx: ExtensionContext;
@@ -73,30 +71,22 @@ export async function runNativeFallbackCompaction(args: {
 	/** Model spec supplied by the caller for this specific fallback reason. */
 	modelSpec?: string;
 	compactFn?: NativeCompactFn;
+	/** Reject results if the originating session/branch/selection changed. */
+	isCurrent?: () => boolean;
 }): Promise<NativeFallbackResult> {
 	const { ctx, event, config } = args;
 	const compactFn = args.compactFn ?? compact;
 	const nativeFallback = config.nativeFallback;
+	const isCurrent = () => !event.signal.aborted && (args.isCurrent?.() ?? true);
+	if (!isCurrent()) return { ok: false, reason: "aborted" };
 
-	if (!nativeFallback.enabled) {
-		return { ok: false, reason: "disabled" };
-	}
-
+	if (!nativeFallback.enabled) return { ok: false, reason: "disabled" };
 	const spec = args.modelSpec?.trim() ?? "";
-	if (!spec) {
-		return { ok: false, reason: "no-model-configured" };
-	}
-
+	if (!spec) return { ok: false, reason: "no-model-configured" };
 	const parsed = parseModelSpec(spec);
-	if (!parsed) {
-		return { ok: false, reason: "invalid-model-spec", modelSpec: spec };
-	}
-
+	if (!parsed) return { ok: false, reason: "invalid-model-spec", modelSpec: spec };
 	const model = ctx.modelRegistry.find(parsed.provider, parsed.modelId);
-	if (!model) {
-		return { ok: false, reason: "model-not-found", modelSpec: spec };
-	}
-
+	if (!model) return { ok: false, reason: "model-not-found", modelSpec: spec };
 	if (ctx.model && ctx.model.provider === model.provider && ctx.model.id === model.id) {
 		return { ok: false, reason: "same-as-current-model", modelSpec: spec };
 	}
@@ -115,10 +105,11 @@ export async function runNativeFallbackCompaction(args: {
 		return { ok: false, reason: "auth-failed", modelSpec: spec, errorMessage: auth.error };
 	}
 
+	if (!isCurrent()) return { ok: false, reason: "aborted", modelSpec: spec };
 	try {
 		const result = await compactFn(
 			event.preparation,
-			model,
+			auth.baseUrl ? { ...model, baseUrl: auth.baseUrl } : model,
 			auth.apiKey,
 			mergeProviderHeaders(auth.headers),
 			event.customInstructions,
@@ -128,7 +119,7 @@ export async function runNativeFallbackCompaction(args: {
 			auth.env,
 		);
 
-		if (event.signal.aborted) {
+		if (!isCurrent()) {
 			return { ok: false, reason: "aborted", modelSpec: spec };
 		}
 		if (!result.summary || result.summary.trim().length === 0) {