@herbertgao/pi-extensions 2026.9.19 → 2026.10.0

package/node_modules/pi-web-access/dist/index.js

@@ -11423,14 +11423,154 @@ async function searchWithExa(query, options = {}) {
 
 // brave.ts
 init_activity();
+import { existsSync as existsSync11, readFileSync as readFileSync12 } from "node:fs";
+
+// brave-rate-limit.ts
+var DEFAULT_SAFETY_MARGIN_MS = 100;
+var DEFAULT_MAX_WAIT_MS = 3e4;
+function parseNumberList(value) {
+  if (!value) return [];
+  return value.split(",").map((part) => Number(part.trim()));
+}
+function parsePolicyWindows(value) {
+  if (!value) return [];
+  return value.split(",").map((part) => {
+    const match = /(?:^|;)\s*w=(\d+(?:\.\d+)?)\s*(?:;|$)/i.exec(part.trim());
+    if (!match) return null;
+    const seconds = Number(match[1]);
+    return Number.isFinite(seconds) && seconds >= 0 ? seconds : null;
+  });
+}
+function parseBraveRateLimitHeaders(headers) {
+  const limits = parseNumberList(headers.get("x-ratelimit-limit"));
+  const remaining2 = parseNumberList(headers.get("x-ratelimit-remaining"));
+  const resets = parseNumberList(headers.get("x-ratelimit-reset"));
+  const windows = parsePolicyWindows(headers.get("x-ratelimit-policy"));
+  const count = Math.max(limits.length, remaining2.length, resets.length, windows.length);
+  const buckets = [];
+  for (let index = 0; index < count; index++) {
+    const limit = limits[index];
+    const left = remaining2[index];
+    const resetSeconds = resets[index];
+    if (![limit, left, resetSeconds].every(Number.isFinite) || limit < 0 || left < 0 || resetSeconds < 0) continue;
+    buckets.push({
+      limit,
+      windowSeconds: windows[index] ?? null,
+      remaining: left,
+      resetSeconds
+    });
+  }
+  return buckets;
+}
+function parseRetryAfterMs(headers, now = Date.now()) {
+  const value = headers.get("retry-after")?.trim();
+  if (!value) return null;
+  const seconds = Number(value);
+  if (Number.isFinite(seconds) && seconds >= 0) return seconds * 1e3;
+  const date = Date.parse(value);
+  if (!Number.isFinite(date)) return null;
+  return Math.max(0, date - now);
+}
+function defaultSleep(ms, signal) {
+  if (signal?.aborted) return Promise.reject(new Error("Aborted"));
+  return new Promise((resolve2, reject) => {
+    const cleanup = () => signal?.removeEventListener("abort", onAbort);
+    const timer = setTimeout(() => {
+      cleanup();
+      resolve2();
+    }, ms);
+    const onAbort = () => {
+      clearTimeout(timer);
+      cleanup();
+      reject(new Error("Aborted"));
+    };
+    signal?.addEventListener("abort", onAbort, { once: true });
+  });
+}
+function formatWait(ms) {
+  const seconds = Math.ceil(ms / 1e3);
+  if (seconds < 60) return `${seconds}s`;
+  const minutes = Math.ceil(seconds / 60);
+  if (minutes < 60) return `${minutes}m`;
+  const hours = Math.ceil(minutes / 60);
+  return `${hours}h`;
+}
+var BraveRateLimitCoordinator = class {
+  queue = Promise.resolve();
+  blockedUntil = 0;
+  now;
+  sleep;
+  safetyMarginMs;
+  maxWaitMs;
+  constructor(options = {}) {
+    this.now = options.now ?? Date.now;
+    this.sleep = options.sleep ?? defaultSleep;
+    this.safetyMarginMs = options.safetyMarginMs ?? DEFAULT_SAFETY_MARGIN_MS;
+    this.maxWaitMs = options.maxWaitMs ?? DEFAULT_MAX_WAIT_MS;
+  }
+  run(operation, signal) {
+    const scheduled = this.queue.then(async () => {
+      await this.waitForAvailability(signal);
+      if (signal?.aborted) throw new Error("Aborted");
+      return operation();
+    });
+    this.queue = scheduled.then(() => void 0, () => void 0);
+    if (!signal) return scheduled;
+    if (signal.aborted) return Promise.reject(new Error("Aborted"));
+    return new Promise((resolve2, reject) => {
+      const onAbort = () => reject(new Error("Aborted"));
+      signal.addEventListener("abort", onAbort, { once: true });
+      scheduled.then(resolve2, reject).finally(() => signal.removeEventListener("abort", onAbort));
+    });
+  }
+  observe(headers) {
+    const exhausted = parseBraveRateLimitHeaders(headers).filter((bucket) => bucket.remaining === 0);
+    if (exhausted.length === 0) return;
+    const resetMs = Math.max(...exhausted.map((bucket) => bucket.resetSeconds * 1e3));
+    this.blockFor(resetMs);
+  }
+  retryDelay(headers) {
+    const advertised = parseRetryAfterMs(headers, this.now());
+    const exhausted = parseBraveRateLimitHeaders(headers).filter((bucket) => bucket.remaining === 0);
+    const bucketDelay = exhausted.length > 0 ? Math.max(...exhausted.map((bucket) => bucket.resetSeconds * 1e3)) : null;
+    if (advertised === null && bucketDelay === null) return null;
+    return Math.max(advertised ?? 0, bucketDelay ?? 0) + this.safetyMarginMs;
+  }
+  recordRetryDelay(delayMs) {
+    this.blockFor(delayMs, false);
+  }
+  async waitForRecordedCooldown(signal) {
+    await this.waitForAvailability(signal);
+  }
+  async waitForRetry(delayMs, signal) {
+    this.recordRetryDelay(delayMs);
+    await this.waitForRecordedCooldown(signal);
+  }
+  blockFor(delayMs, addMargin = true) {
+    const boundedDelay = Math.max(0, delayMs) + (addMargin ? this.safetyMarginMs : 0);
+    this.blockedUntil = Math.max(this.blockedUntil, this.now() + boundedDelay);
+  }
+  async waitForAvailability(signal) {
+    const waitMs = Math.max(0, this.blockedUntil - this.now());
+    if (waitMs === 0) return;
+    this.assertWaitIsBounded(waitMs);
+    await this.sleep(waitMs, signal);
+  }
+  assertWaitIsBounded(waitMs) {
+    if (waitMs <= this.maxWaitMs) return;
+    throw new Error(`Brave Search quota exhausted; estimated reset in ${formatWait(waitMs)}. Refusing to wait longer than ${formatWait(this.maxWaitMs)} inside one search call.`);
+  }
+};
+
+// brave.ts
 init_domain_filter_normalization();
 init_search_result_count_normalization();
 init_credential_source();
 init_utils();
-import { existsSync as existsSync11, readFileSync as readFileSync12 } from "node:fs";
 var BRAVE_API_BASE_URL = "https://api.search.brave.com/res/v1";
 var CONFIG_PATH7 = getWebSearchConfigPath();
 var SEARCH_TIMEOUT_MS = 3e4;
+var braveRateLimit = new BraveRateLimitCoordinator();
 var cachedConfig7 = null;
 function loadConfig6() {
   if (cachedConfig7) return cachedConfig7;
@@ -11541,15 +11681,29 @@ Get a key at https://brave.com/search/api/`
     if (freshness) params.set("freshness", freshness);
   }
   try {
-    const response = await fetchWithCredentialRedirects(`${apiUrl}?${params.toString()}`, {
-      method: "GET",
-      headers: {
-        "X-Subscription-Token": apiKey,
-        "Accept": "application/json",
-        "Accept-Encoding": "gzip"
-      },
-      signal: options.signal ? AbortSignal.any([AbortSignal.timeout(SEARCH_TIMEOUT_MS), options.signal]) : AbortSignal.timeout(SEARCH_TIMEOUT_MS)
-    }, ["X-Subscription-Token"]);
+    const searchDeadline = AbortSignal.timeout(SEARCH_TIMEOUT_MS);
+    const searchSignal = options.signal ? AbortSignal.any([searchDeadline, options.signal]) : searchDeadline;
+    const response = await braveRateLimit.run(async () => {
+      for (let attempt = 0; attempt < 2; attempt++) {
+        const current = await fetchWithCredentialRedirects(`${apiUrl}?${params.toString()}`, {
+          method: "GET",
+          headers: {
+            "X-Subscription-Token": apiKey,
+            "Accept": "application/json",
+            "Accept-Encoding": "gzip"
+          },
+          signal: searchSignal
+        }, ["X-Subscription-Token"]);
+        braveRateLimit.observe(current.headers);
+        if (current.status !== 429 || attempt === 1) return current;
+        const retryDelay = braveRateLimit.retryDelay(current.headers);
+        if (retryDelay === null) return current;
+        braveRateLimit.recordRetryDelay(retryDelay);
+        await current.body?.cancel().catch(() => void 0);
+        await braveRateLimit.waitForRecordedCooldown(searchSignal);
+      }
+      throw new Error("Brave Search retry loop exited unexpectedly");
+    }, searchSignal);
     if (!response.ok) {
       activityMonitor.logError(activityId, `HTTP ${response.status}`);
       const errorText = redactCredential(await response.text(), apiKey);
@@ -11631,6 +11785,11 @@ function resolveCurrentModelSearchTarget(model) {
   }
   throw new Error("Current model is not backed by an official OpenAI Responses endpoint");
 }
+function isOpenAISubscriptionModelSelected(ctx) {
+  const model = ctx?.model;
+  if (model?.provider === "openai-codex") return true;
+  return model?.provider === "openai" && ctx?.modelRegistry?.isUsingOAuth?.(model) === true;
+}
 function isCurrentModelHostedSearchEligible(ctx) {
   const model = ctx?.model;
   if (!model || !/^gpt-/iu.test(model.id)) return false;
@@ -11687,6 +11846,14 @@ function isCodexJwt(token) {
   const payload = decodeJwtPayload(token);
   return !!payload?.["https://api.openai.com/auth"];
 }
+function isOfficialOpenAIBaseUrl(baseUrl) {
+  if (baseUrl === void 0) return false;
+  try {
+    return new URL(baseUrl).toString().replace(/\/+$/u, "") === "https://api.openai.com/v1";
+  } catch {
+    return false;
+  }
+}
 function extractAccountId(token) {
   const payload = decodeJwtPayload(token);
   const auth = payload?.["https://api.openai.com/auth"];
@@ -11796,16 +11963,10 @@ async function resolvePiAuth(ctx, responsesUrl, providers, modelOverride, hasExp
     }
     if (!resolved.ok || !resolved.apiKey) continue;
     const baseUrl = resolved.baseUrl ?? preferred.baseUrl;
-    const useCodexEndpoint = provider === "openai-codex" || isCodexJwt(resolved.apiKey);
-    if (!hasExplicitResponsesUrl && !useProviderBaseUrl && !useCodexEndpoint && baseUrl !== void 0) {
-      let isOfficial = false;
-      try {
-        isOfficial = new URL(baseUrl).toString().replace(/\/+$/u, "") === "https://api.openai.com/v1";
-      } catch {
-      }
-      if (!isOfficial) {
-        throw new CustomOpenAIBaseUrlError(`OpenAI web search cannot reuse Pi credentials with a custom baseUrl by default. Set openaiResponsesUrl in ${CONFIG_PATH8} to the full Responses endpoint for this credential.`);
-      }
+    const isOfficialBaseUrl = isOfficialOpenAIBaseUrl(baseUrl);
+    const useCodexEndpoint = provider === "openai-codex" || !isOfficialBaseUrl && isCodexJwt(resolved.apiKey);
+    if (!hasExplicitResponsesUrl && !useProviderBaseUrl && !useCodexEndpoint && baseUrl !== void 0 && !isOfficialBaseUrl) {
+      throw new CustomOpenAIBaseUrlError(`OpenAI web search cannot reuse Pi credentials with a custom baseUrl by default. Set openaiResponsesUrl in ${CONFIG_PATH8} to the full Responses endpoint for this credential.`);
     }
     let providerResponsesUrl = responsesUrl;
     if (useProviderBaseUrl) {
@@ -11823,6 +11984,7 @@ async function resolvePiAuth(ctx, responsesUrl, providers, modelOverride, hasExp
       model: modelOverride ?? preferred.id,
       headers: resolved.headers ?? {},
       responsesUrl: providerResponsesUrl,
+      useCodexEndpoint,
       ...useProviderBaseUrl ? { useProviderBaseUrl: true } : {}
     };
   }
@@ -16193,9 +16355,6 @@ function errorMessage24(err) {
 function isAbortError2(err) {
   return errorMessage24(err).toLowerCase().includes("abort");
 }
-function isOpenAICodexSelected(ctx) {
-  return ctx?.model?.provider === "openai-codex";
-}
 async function tryOpenAIInAuto(query, options, fallbackErrors) {
   try {
     if (await isOpenAISearchAvailable(options.extensionContext)) {
@@ -16520,7 +16679,7 @@ async function search(query, options = {}) {
     }
   }
   let triedOpenAI = false;
-  if (allowed.has("openai") && (!options.extensionContext || isOpenAICodexSelected(options.extensionContext))) {
+  if (allowed.has("openai") && (!options.extensionContext || isOpenAISubscriptionModelSelected(options.extensionContext))) {
     triedOpenAI = true;
     const result = await tryOpenAIInAuto(query, options, fallbackErrors);
     if (result) return result;
@@ -21493,7 +21652,7 @@ Error: ${result.error}`;
   }
   return lines.join("\n");
 }
-function buildSummaryPrompt(results, feedback) {
+function buildSummaryPrompt(results, feedback, instructions) {
   const sections = [
     "You are writing the final web search summary for a coding assistant.",
     "Write a concise, factual summary using only the provided search results.",
@@ -21504,6 +21663,10 @@ function buildSummaryPrompt(results, feedback) {
     "- If evidence is weak or conflicting, say so explicitly.",
     '- End with a short "Sources" section listing the most relevant URLs.'
   ];
+  const extraInstructions = typeof instructions === "string" ? instructions.trim() : "";
+  if (extraInstructions) {
+    sections.push(extraInstructions);
+  }
   if (feedback) {
     sections.push("- Incorporate the user feedback provided below into the summary.");
   }
@@ -21676,7 +21839,7 @@ function getContentPartType(part) {
   const value = part;
   return typeof value.type === "string" ? value.type : "unknown";
 }
-async function generateSummaryDraft(results, ctx, signal, modelOverride, feedback, completeFn, deadlineMs = SUMMARY_GENERATION_DEADLINE_MS) {
+async function generateSummaryDraft(results, ctx, signal, modelOverride, feedback, completeFn, deadlineMs = SUMMARY_GENERATION_DEADLINE_MS, instructions) {
   if (!ctx || !ctx.modelRegistry) {
     throw new Error("Summary generation context unavailable");
   }
@@ -21720,7 +21883,7 @@ async function generateSummaryDraft(results, ctx, signal, modelOverride, feedbac
   }
   try {
     if (signal?.aborted) throw new Error("Aborted");
-    const prompt = buildSummaryPrompt(results, feedback);
+    const prompt = buildSummaryPrompt(results, feedback, instructions);
     let resolved;
     try {
       checkSummaryDeadline();
@@ -22445,6 +22608,12 @@ function getSummaryGenerationDeadlineMs() {
   }
   return Math.min(value, MAX_SUMMARY_GENERATION_DEADLINE_MS);
 }
+function getSummaryInstructions() {
+  const value = loadConfig37().summaryInstructions;
+  if (typeof value !== "string") return void 0;
+  const trimmed = value.trim();
+  return trimmed.length > 0 ? trimmed : void 0;
+}
 function shouldAutoOpenCuratorBrowser(config) {
   if (config.autoOpenBrowser === false) return false;
   if (resolveCuratorNetworkConfig().enabled && config.autoOpenBrowser !== true) return false;
@@ -22502,9 +22671,6 @@ async function getOptionalGeminiWebAvailability() {
     return null;
   }
 }
-function shouldUseOpenAICodexDefault(ctx) {
-  return ctx?.model?.provider === "openai-codex";
-}
 function shouldPreferOpenAI(options, preferOpenAICodexDefault) {
   if (options?.recencyFilter) return false;
   if (typeof options?.numResults === "number" && Number.isFinite(options.numResults) && Math.floor(options.numResults) !== 5) {
@@ -22523,7 +22689,7 @@ async function loadCuratorBootstrap(requestedProvider, ctx, options) {
   };
 }
 function resolveCuratorDefaultProvider(provider, available, ctx, options) {
-  return resolveProvider(provider, available, options, shouldUseOpenAICodexDefault(ctx), ctx);
+  return resolveProvider(provider, available, options, isOpenAISubscriptionModelSelected(ctx), ctx);
 }
 function firstAvailableProvider(available, preferOpenAI, fallback) {
   if (available.searxng) return "searxng";
@@ -23103,7 +23269,8 @@ function index_default(pi) {
         modelOverride,
         feedback,
         void 0,
-        getSummaryGenerationDeadlineMs()
+        getSummaryGenerationDeadlineMs(),
+        getSummaryInstructions()
       );
     } catch (err) {
       const isEmptyResponse = err instanceof Error && err.message.includes("Summary model returned empty response");
@@ -23908,7 +24075,8 @@ Open manually: ${handle.url}` }],
             summaryModelChoices.defaultSummaryModel ?? void 0,
             void 0,
             void 0,
-            getSummaryGenerationDeadlineMs()
+            getSummaryGenerationDeadlineMs(),
+            getSummaryInstructions()
           );
           approvedSummary = generated.summary;
           summaryMeta = generated.meta;
@@ -25264,5 +25432,6 @@ Age: ${Math.floor((Date.now() - selected.timestamp) / 6e4)}m
 export {
   index_default as default,
   getSummaryGenerationDeadlineMs,
+  getSummaryInstructions,
   resolveCuratorDefaultProvider
 };

package/node_modules/pi-web-access/gemini-search.ts

@@ -11,6 +11,7 @@ import { isBraveAvailable, searchWithBrave } from "./brave.ts";
 import {
 	isCurrentModelHostedSearchEligible,
 	isOpenAISearchAvailable,
+	isOpenAISubscriptionModelSelected,
 	OpenAIAlphaSearchUnsupportedError,
 	searchWithCurrentModelOpenAI,
 	searchWithOpenAI,
@@ -273,10 +274,6 @@ function isAbortError(err: unknown): boolean {
 	return errorMessage(err).toLowerCase().includes("abort");
 }
 
-function isOpenAICodexSelected(ctx?: ExtensionContext): boolean {
-	return ctx?.model?.provider === "openai-codex";
-}
-
 async function tryOpenAIInAuto(query: string, options: FullSearchOptions, fallbackErrors: string[]): Promise<AttributedSearchResponse | null> {
 	try {
 		if (await isOpenAISearchAvailable(options.extensionContext)) {
@@ -648,7 +645,7 @@ export async function search(query: string, options: FullSearchOptions = {}): Pr
 	}
 
 	let triedOpenAI = false;
-	if (allowed.has("openai") && (!options.extensionContext || isOpenAICodexSelected(options.extensionContext))) {
+	if (allowed.has("openai") && (!options.extensionContext || isOpenAISubscriptionModelSelected(options.extensionContext))) {
 		triedOpenAI = true;
 		const result = await tryOpenAIInAuto(query, options, fallbackErrors);
 		if (result) return result;

package/node_modules/pi-web-access/index.ts

@@ -47,7 +47,7 @@ import { isGeminiApiAvailable } from "./gemini-api.ts";
 import { getActiveGoogleEmail, getGeminiWebAvailabilityDiagnostic, getGeminiWebAvailabilityDiagnosticDetails, isGeminiWebAvailable } from "./gemini-web.ts";
 import { isBrowserCookieAccessAllowed } from "./gemini-web-config.ts";
 import { isBraveAvailable } from "./brave.ts";
-import { isCurrentModelHostedSearchEligible, isOpenAISearchAvailable } from "./openai-search.ts";
+import { isCurrentModelHostedSearchEligible, isOpenAISearchAvailable, isOpenAISubscriptionModelSelected } from "./openai-search.ts";
 import { isParallelAvailable } from "./parallel.ts";
 import { isParallelMcpAvailable } from "./parallel-mcp.ts";
 import { isTinyFishAvailable } from "./tinyfish.ts";
@@ -173,6 +173,7 @@ interface WebSearchConfig {
 	curatorRemote?: unknown;
 	summaryModel?: string;
 	summaryGenerationDeadlineMs?: unknown;
+	summaryInstructions?: unknown;
 	maxInlineContentChars?: unknown;
 	fetch?: {
 		defaultMode?: unknown;
@@ -456,6 +457,13 @@ export function getSummaryGenerationDeadlineMs(): number {
 	return Math.min(value, MAX_SUMMARY_GENERATION_DEADLINE_MS);
 }
 
+export function getSummaryInstructions(): string | undefined {
+	const value = loadConfig().summaryInstructions;
+	if (typeof value !== "string") return undefined;
+	const trimmed = value.trim();
+	return trimmed.length > 0 ? trimmed : undefined;
+}
+
 function shouldAutoOpenCuratorBrowser(config: WebSearchConfig): boolean {
 	if (config.autoOpenBrowser === false) return false;
 	if (resolveCuratorNetworkConfig().enabled && config.autoOpenBrowser !== true) return false;
@@ -516,10 +524,6 @@ async function getOptionalGeminiWebAvailability() {
 	}
 }
 
-function shouldUseOpenAICodexDefault(ctx?: Pick<ExtensionContext, "model">): boolean {
-	return ctx?.model?.provider === "openai-codex";
-}
-
 function shouldPreferOpenAI(options: Pick<PendingCurate, "numResults" | "recencyFilter"> | undefined, preferOpenAICodexDefault: boolean): boolean {
 	if (options?.recencyFilter) return false;
 	if (typeof options?.numResults === "number" && Number.isFinite(options.numResults) && Math.floor(options.numResults) !== 5) {
@@ -546,10 +550,10 @@ async function loadCuratorBootstrap(
 export function resolveCuratorDefaultProvider(
 	provider: SearchProviderSelection,
 	available: ProviderAvailability,
-	ctx?: Pick<ExtensionContext, "model">,
+	ctx?: Parameters<typeof isOpenAISubscriptionModelSelected>[0],
 	options?: Pick<PendingCurate, "numResults" | "recencyFilter">,
 ): SearchProvider {
-	return resolveProvider(provider, available, options, shouldUseOpenAICodexDefault(ctx), ctx);
+	return resolveProvider(provider, available, options, isOpenAISubscriptionModelSelected(ctx), ctx);
 }
 
 function firstAvailableProvider(available: ProviderAvailability, preferOpenAI: boolean, fallback: ResolvedSearchProvider): ResolvedSearchProvider | "auto" {
@@ -1279,6 +1283,7 @@ export default function (pi: ExtensionAPI) {
 				feedback,
 				undefined,
 				getSummaryGenerationDeadlineMs(),
+				getSummaryInstructions(),
 			);
 		} catch (err) {
 			const isEmptyResponse = err instanceof Error && err.message.includes("Summary model returned empty response");
@@ -2153,6 +2158,7 @@ export default function (pi: ExtensionAPI) {
 					undefined,
 					undefined,
 					getSummaryGenerationDeadlineMs(),
+					getSummaryInstructions(),
 				);
 				approvedSummary = generated.summary;
 				summaryMeta = generated.meta;

package/node_modules/pi-web-access/openai-search.ts

@@ -91,6 +91,14 @@ function resolveCurrentModelSearchTarget(model: CurrentModel): CurrentModelSearc
 	throw new Error("Current model is not backed by an official OpenAI Responses endpoint");
 }
 
+// The active model draws on a ChatGPT subscription: openai-codex, or openai signed in
+// through Pi's "Sign in with ChatGPT" OAuth rather than an API key.
+export function isOpenAISubscriptionModelSelected(ctx?: Pick<ExtensionContext, "model"> & { modelRegistry?: Pick<ExtensionContext["modelRegistry"], "isUsingOAuth"> }): boolean {
+	const model = ctx?.model;
+	if (model?.provider === "openai-codex") return true;
+	return model?.provider === "openai" && ctx?.modelRegistry?.isUsingOAuth?.(model) === true;
+}
+
 export function isCurrentModelHostedSearchEligible(ctx?: Pick<ExtensionContext, "model">): boolean {
 	const model = ctx?.model;
 	if (!model || !/^gpt-/iu.test(model.id)) return false;
@@ -163,6 +171,15 @@ function isCodexJwt(token: string): boolean {
 	return !!payload?.["https://api.openai.com/auth"];
 }
 
+function isOfficialOpenAIBaseUrl(baseUrl: string | undefined): boolean {
+	if (baseUrl === undefined) return false;
+	try {
+		return new URL(baseUrl).toString().replace(/\/+$/u, "") === "https://api.openai.com/v1";
+	} catch {
+		return false;
+	}
+}
+
 function extractAccountId(token: string): string | undefined {
 	const payload = decodeJwtPayload(token);
 	const auth = payload?.["https://api.openai.com/auth"];
@@ -282,16 +299,12 @@ async function resolvePiAuth(ctx: ExtensionContext, responsesUrl: string, provid
 		// Auth can override the model's base URL. Do not guess Responses/web_search
 		// support from a gateway URL, or pair its credential with the official API.
 		const baseUrl = resolved.baseUrl ?? preferred.baseUrl;
-		const useCodexEndpoint = provider === "openai-codex" || isCodexJwt(resolved.apiKey);
-		if (!hasExplicitResponsesUrl && !useProviderBaseUrl && !useCodexEndpoint && baseUrl !== undefined) {
-			let isOfficial = false;
-			try {
-				isOfficial = new URL(baseUrl).toString().replace(/\/+$/u, "") === "https://api.openai.com/v1";
-			} catch {
-			}
-			if (!isOfficial) {
-				throw new CustomOpenAIBaseUrlError(`OpenAI web search cannot reuse Pi credentials with a custom baseUrl by default. Set openaiResponsesUrl in ${CONFIG_PATH} to the full Responses endpoint for this credential.`);
-			}
+		const isOfficialBaseUrl = isOfficialOpenAIBaseUrl(baseUrl);
+		// Pi sends credentials for the official API base directly to api.openai.com, including
+		// "Sign in with ChatGPT" access tokens, which are ChatGPT JWTs but not Codex credentials.
+		const useCodexEndpoint = provider === "openai-codex" || (!isOfficialBaseUrl && isCodexJwt(resolved.apiKey));
+		if (!hasExplicitResponsesUrl && !useProviderBaseUrl && !useCodexEndpoint && baseUrl !== undefined && !isOfficialBaseUrl) {
+			throw new CustomOpenAIBaseUrlError(`OpenAI web search cannot reuse Pi credentials with a custom baseUrl by default. Set openaiResponsesUrl in ${CONFIG_PATH} to the full Responses endpoint for this credential.`);
 		}
 		let providerResponsesUrl = responsesUrl;
 		if (useProviderBaseUrl) {
@@ -309,6 +322,7 @@ async function resolvePiAuth(ctx: ExtensionContext, responsesUrl: string, provid
 			model: modelOverride ?? preferred.id,
 			headers: resolved.headers ?? {},
 			responsesUrl: providerResponsesUrl,
+			useCodexEndpoint,
 			...(useProviderBaseUrl ? { useProviderBaseUrl: true } : {}),
 		};
 	}

package/node_modules/pi-web-access/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-web-access",
-  "version": "0.34.0",
+  "version": "0.35.0",
   "description": "Web search, URL fetching, GitHub repo cloning, PDF extraction, YouTube video understanding, and local video analysis for Pi coding agent. Supports OpenAI, Brave, Parallel, TinyFish, Search1API, Searchinfinity, Querit, Tavily, Firecrawl, Crawl4AI, Jina, SERPdive, Kagi, Ollama, AnySearch, Bright Data SERP, SerpBase, SerpApi, Serply, You.com, SearXNG, Exa, Perplexity, Gemini, Kimi, and Mistral.",
   "type": "module",
   "scripts": {

package/node_modules/pi-web-access/summary-review.ts

@@ -63,7 +63,7 @@ function summarizeQueryResult(result: QueryResultData): string {
 	return lines.join("\n");
 }
 
-export function buildSummaryPrompt(results: QueryResultData[], feedback?: string): string {
+export function buildSummaryPrompt(results: QueryResultData[], feedback?: string, instructions?: string): string {
 	const sections = [
 		"You are writing the final web search summary for a coding assistant.",
 		"Write a concise, factual summary using only the provided search results.",
@@ -75,6 +75,11 @@ export function buildSummaryPrompt(results: QueryResultData[], feedback?: string
 		"- End with a short \"Sources\" section listing the most relevant URLs.",
 	];
 
+	const extraInstructions = typeof instructions === "string" ? instructions.trim() : "";
+	if (extraInstructions) {
+		sections.push(extraInstructions);
+	}
+
 	if (feedback) {
 		sections.push("- Incorporate the user feedback provided below into the summary.");
 	}
@@ -292,6 +297,7 @@ export async function generateSummaryDraft(
 	feedback?: string,
 	completeFn?: CompleteFunction,
 	deadlineMs = SUMMARY_GENERATION_DEADLINE_MS,
+	instructions?: string,
 ): Promise<{ summary: string; meta: SummaryMeta }> {
 	if (!ctx || !ctx.modelRegistry) {
 		throw new Error("Summary generation context unavailable");
@@ -349,7 +355,7 @@ export async function generateSummaryDraft(
 
 	try {
 		if (signal?.aborted) throw new Error("Aborted");
-		const prompt = buildSummaryPrompt(results, feedback);
+		const prompt = buildSummaryPrompt(results, feedback, instructions);
 		let resolved: Awaited<ReturnType<typeof resolveSummaryModelCandidates>>;
 		try {
 			checkSummaryDeadline();

package/node_modules/{@herbertgao/resume-from → resume-from}/README.md

@@ -1,6 +1,4 @@
-# @herbertgao/resume-from
-
-HerbertGao-maintained fork of [`alexei-led/resume-from`](https://github.com/alexei-led/resume-from), preserving its MIT license and cross-agent session format. Local fixes are contributed upstream when possible.
+# resume-from
 
 [![Release](https://github.com/alexei-led/resume-from/actions/workflows/release.yml/badge.svg)](https://github.com/alexei-led/resume-from/actions/workflows/release.yml)
 [![npm](https://img.shields.io/npm/v/resume-from)](https://www.npmjs.com/package/resume-from)
@@ -35,7 +33,7 @@ The source session is never changed.
 - **The current context is too large.** Import a budgeted history into a fresh native session.
 - **You want an independent handoff.** Create a target-side copy for continued work or review while preserving the original session.
 
-`resume-from` moves conversation context. It does not copy the repository or migrate a running process. The target agent must have access to the same working tree.
+`resume-from` moves conversation context. It does not copy the repository, transfer uncommitted work, switch branches, recreate removed worktrees, or migrate a running process. The destination can be the same checkout or another linked worktree of the same Git repository.
 
 ## Supported transfers
 
@@ -83,8 +81,10 @@ Install `resume-from` in the agent that will receive the new session.
 
 ### Pi
 
+See the [Pi guide](docs/agents/pi.md#install) for supported Pi versions.
+
 ```sh
-pi install npm:@herbertgao/resume-from
+pi install npm:resume-from
 ```
 
 Restart Pi, then run `/resume-from`.
@@ -107,7 +107,11 @@ The Codex prompt runs the matching published `resume-from` package through `npx`
 
 ## Run the first transfer
 
-Run the command from the Git repository that owns the source session.
+Start the destination agent in the directory whose files you intend to edit, including a checkout subdirectory. Main checkouts and linked worktrees share session discovery regardless of nested, sibling, or arbitrary external placement. Independent clones, submodules, and nested independent repositories remain separate.
+
+For an alternate source profile in Claude Code or Codex, use `/resume-from claude --home ~/.claude-team`; this changes the source home, not the target profile or destination directory. In Pi, configure the source profile in [`extraHomes`](docs/configuration.md#add-another-profile).
+
+Check the preview's canonical `Destination:` directory and warnings before confirming. Imports keep the destination agent's directory. A removed or moved source worktree needs a surviving recorded path that still identifies this repository; missing historical paths alone are insufficient. See [worktree workflows](docs/workflows.md#continue-in-another-worktree).
 
 ### In Pi
 
@@ -142,14 +146,14 @@ The user and maintainer documentation is organized in [`docs/`](docs/README.md).
 
 ## Development
 
-Development requires Node 24 LTS and Bun.
+Development requires Node 24 LTS and pnpm 11.20.0.
 
 ```sh
-bun install
-bun run build
-bun run test
-bun run typecheck
-bun run lint
+pnpm install
+pnpm build
+pnpm test
+pnpm typecheck
+pnpm lint
 ```
 
 Run the command help after a build:

package/node_modules/{@herbertgao/resume-from → resume-from}/dist/adapters/claude-code/adapter.d.ts

@@ -8,11 +8,6 @@ export declare const DEFAULT_WINDOW_TOKENS = 200000;
 /** The command the landing hands back, because Claude Code cannot move the user (C-2, FR-45). */
 export declare const HANDOVER_COMMAND = "claude --resume";
 export interface ClaudeCodeAdapterDeps {
-    /**
-     * The repository the import runs in. Claude Code keys a session to a repository, and no
-     * argument of the port names one, so the working directory is the signal.
-     */
-    cwd: string;
     env: Record<string, string | undefined>;
     homeDir: string;
 }

package/node_modules/{@herbertgao/resume-from → resume-from}/dist/adapters/claude-code/adapter.js

@@ -15,7 +15,6 @@ export const HANDOVER_COMMAND = "claude --resume";
  * passes the real process values.
  */
 export function createClaudeCodeAdapter(deps = {}) {
-    const cwd = deps.cwd ?? process.cwd();
     const env = deps.env ?? process.env;
     // Resolved once: capabilities() is pure, synchronous, and equal on every call.
     const capabilities = Object.freeze({
@@ -37,8 +36,8 @@ export function createClaudeCodeAdapter(deps = {}) {
         loadSession(descriptor) {
             return loadSession(descriptor);
         },
-        serialize(session, target, marker) {
-            return serialize(session, target, marker, { cwd });
+        serialize(session, target, marker, context) {
+            return serialize(session, target, marker, context);
         },
         validate(serialized) {
             return validate(serialized);