@monotykamary/pi-better-openai 0.2.9 → 0.2.11

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog
 
+## 0.2.11
+
+- Auto-redeem banked Codex resets ten minutes before expiry instead of one minute, with matching settings and redemption-time displays.
+- Preserve the scheduled credit across polling refreshes so the longer lead retains the no-fallback safeguard.
+- Extend the shared redemption cooldown to ten minutes and add regression coverage for exact timing and startup inside the redemption window.
+
+## 0.2.10
+
+- Hide disabled image, web search, and decision tools and their prompt guidance, including from pi-fabric capture.
+- Apply settings and decision-command toggles immediately without reactivating unrelated tools; retain execution guards and configuration commands.
+- Add real Pi regression coverage for startup, live toggles, nested-call availability, and prompt updates.
+- Update brace-expansion to 5.0.11 and undici to 8.10.2 to resolve high-severity security advisories.
+
 ## 0.2.9
 
 - Validate Pi 1.0.0 with exact development pins and wildcard host peers.

package/README.md

@@ -54,9 +54,9 @@ Usage display, image generation, and live voice require pi's `openai-codex` OAut
 
 ## Banked resets
 
-Unused banked Codex resets **auto-redeem by default, 1 minute before expiry**, while an interactive pi session is running and Codex credentials are available. Starting pi within that final one-minute window also triggers the check; expired credits are skipped. This runs independently of the usage display and current model. The reset picker and confirmation show each credit's actual local auto-redemption date and time (expiry minus one minute) beside its expiry. Disable **Auto-redeem banked resets** in `/openai-settings` or set `usage.autoRedeemBankedResets` to `false` to opt out.
+Unused banked Codex resets **auto-redeem by default, 10 minutes before expiry**, while an interactive pi session is running and Codex credentials are available. Starting pi within that final ten-minute window also triggers the check; expired credits are skipped. This runs independently of the usage display and current model. The reset picker and confirmation show each credit's actual local auto-redemption date and time (expiry minus ten minutes) beside its expiry. Disable **Auto-redeem banked resets** in `/openai-settings` or set `usage.autoRedeemBankedResets` to `false` to opt out.
 
-For safety, each attempt targets one explicit, freshly checked credit ID, with no fallback to another credit and no automatic retry after a consume request (including errors or `nothing_to_reset`). A persistent per-account guard permits at most one redemption attempt in one minute across pi sessions sharing the same agent directory; manual redemption uses the same guard. Automatic reservations recheck the one-minute eligibility window while holding an exclusive filesystem lock, and attempted credit IDs remain blocked even after later redemptions or restarts. Simultaneously expiring credits are not drained, and later credits wait for their own final one-minute window. Reservations live under `$PI_CODING_AGENT_DIR/pi-better-openai/reset-redemptions` (default `~/.pi/agent/pi-better-openai/reset-redemptions`); unreadable state or an orphaned lock blocks redemption rather than risking a duplicate. Update/restart all pi instances to use the current guard. Separate machines/agent directories cannot coordinate this local guard; instances using the same account should share an agent directory.
+For safety, each attempt targets one explicit, freshly checked credit ID, with no fallback to another credit and no automatic retry after a consume request (including errors or `nothing_to_reset`). A persistent per-account guard permits at most one redemption attempt in ten minutes across pi sessions sharing the same agent directory; manual redemption uses the same guard. Automatic reservations recheck the ten-minute eligibility window while holding an exclusive filesystem lock, and attempted credit IDs remain blocked even after later redemptions or restarts. Simultaneously expiring credits are not drained, and later credits wait for their own final ten-minute window. Reservations live under `$PI_CODING_AGENT_DIR/pi-better-openai/reset-redemptions` (default `~/.pi/agent/pi-better-openai/reset-redemptions`); unreadable state or an orphaned lock blocks redemption rather than risking a duplicate. Update/restart all pi instances to use the current guard. Separate machines/agent directories cannot coordinate this local guard; instances using the same account should share an agent directory.
 
 Pi must remain running and awake; this is not an OS-level scheduled task. No eligible usage window or unavailable credentials can prevent redemption.
 
@@ -139,6 +139,8 @@ Example config:
 }
 ```
 
+Setting `image.enabled`, `websearch.enabled`, or `decisions.enabled` to `false` hides that tool and removes its system-prompt guidance, including from pi-fabric capture. Changes in `/openai-settings` or `/openai-decisions` apply immediately; use `/reload` after editing config files manually. Configuration commands remain available.
+
 ## Service tiers
 
 `/openai-tier fast` requests `service_tier: "priority"`. `/openai-tier standard` explicitly requests `"default"`, clearing an inherited Fast/Ultrafast request tier on OpenAI providers. Legacy disabled configurations without an explicit tier leave payloads untouched. `/fast` and the `--fast` flag never select Ultrafast.

package/index.ts

@@ -83,6 +83,7 @@ import { registerOpenAIImage, _imageTest } from "./src/image.ts";
 import { registerOpenAIWebSearch, _websearchTest } from "./src/websearch.ts";
 import { registerOpenAILive } from "./src/live/index.ts";
 import { registerOpenAIDecisions } from "./src/decisions.ts";
+import type { OptionalTool } from "./src/optional-tool.ts";
 import {
   type CodexPetPackage,
   codexHome,
@@ -280,6 +281,7 @@ export default function betterOpenAI(pi: ExtensionAPI): void {
 
   const fastController = new FastController(SERVICE_TIER);
   let cachedConfig: ResolvedConfig | undefined;
+  const optionalTools = new Map<"image" | "websearch" | "decisions", OptionalTool>();
   let footerTotals = { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, cost: 0 };
   let footerInstalled = false;
   let statusInstalled = false;
@@ -327,8 +329,13 @@ export default function betterOpenAI(pi: ExtensionAPI): void {
     });
   }
 
+  function syncToolExposure(cfg: ResolvedConfig): void {
+    for (const [feature, tool] of optionalTools) tool.setEnabled(cfg[feature].enabled);
+  }
+
   function refresh(ctx: ExtensionContext): ResolvedConfig {
     cachedConfig = resolveConfig(ctx.cwd || process.cwd());
+    syncToolExposure(cachedConfig);
     return cachedConfig;
   }
 
@@ -1187,9 +1194,10 @@ export default function betterOpenAI(pi: ExtensionAPI): void {
     },
   });
 
-  registerOpenAIImage(pi, config);
-  registerOpenAIWebSearch(pi, config);
-  registerOpenAIDecisions(pi, config, refresh);
+  optionalTools.set("image", registerOpenAIImage(pi, config));
+  optionalTools.set("websearch", registerOpenAIWebSearch(pi, config));
+  optionalTools.set("decisions", registerOpenAIDecisions(pi, config, refresh));
+  if (cachedConfig) syncToolExposure(cachedConfig);
   registerOpenAILive(pi, config);
   registerOpenAIPets(pi, {
     wake: async (ctx, slug) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@monotykamary/pi-better-openai",
-  "version": "0.2.9",
+  "version": "0.2.11",
   "description": "Improve OpenAI in pi with fast mode, usage stats, realtime voice, image generation, and footer polish.",
   "keywords": [
     "fast",
@@ -61,7 +61,7 @@
     "https-proxy-agent": "9.1.0",
     "proxy-from-env": "2.1.0",
     "sharp": "0.35.4",
-    "undici": "8.10.0",
+    "undici": "8.10.2",
     "ws": "8.21.2"
   },
   "devDependencies": {
@@ -91,11 +91,11 @@
   "overrides": {
     "@earendil-works/pi-agent-core": "1.0.0",
     "@earendil-works/pi-ai": "1.0.0",
-    "brace-expansion": "5.0.9",
+    "brace-expansion": "5.0.11",
     "nanoid": "3.3.18",
     "postcss": "8.5.25",
     "protobufjs": "7.6.5",
-    "undici": "8.10.0"
+    "undici": "8.10.2"
   },
   "engines": {
     "node": ">=22.19.0"

package/src/config.ts

@@ -410,7 +410,7 @@ export const USAGE_SETTING_DESCRIPTORS: readonly SettingsOptionDescriptor[] = [
     label: "Auto-redeem banked resets",
     currentValue: (cfg) => String(cfg.usage.autoRedeemBankedResets),
     values: ["true", "false"],
-    description: "Redeem one unused banked reset 1 minute before expiry while pi is running.",
+    description: "Redeem one unused banked reset 10 minutes before expiry while pi is running.",
     parse: booleanSetting,
   },
 ];

package/src/decisions.ts

@@ -13,6 +13,7 @@ import {
   type DecisionsConfig,
   type ResolvedConfig,
 } from "./config.ts";
+import { registerOptionalTool, type OptionalTool } from "./optional-tool.ts";
 
 export const OPENAI_DECIDE_TOOL = "openai_decide";
 export const OPENAI_DECISIONS_COMMAND = "openai-decisions";
@@ -335,7 +336,7 @@ export function registerOpenAIDecisions(
   pi: ExtensionAPI,
   getConfig: (ctx: ExtensionContext) => ResolvedConfig,
   refreshConfig: (ctx: ExtensionContext) => ResolvedConfig,
-): void {
+): OptionalTool {
   function save(ctx: ExtensionContext, patch: DecisionsConfig): void {
     const cfg = refreshConfig(ctx);
     const raw = readRawConfig(cfg.configPath);
@@ -343,7 +344,7 @@ export function registerOpenAIDecisions(
       ...raw,
       decisions: { ...(isRecord(raw.decisions) ? raw.decisions : {}), ...patch },
     });
-    refreshConfig(ctx);
+    tool.setEnabled(refreshConfig(ctx).decisions.enabled);
   }
 
   pi.registerCommand(OPENAI_DECISIONS_COMMAND, {
@@ -388,7 +389,7 @@ export function registerOpenAIDecisions(
       }
     },
   });
-  pi.registerTool({
+  const tool = registerOptionalTool(pi, {
     name: OPENAI_DECIDE_TOOL,
     label: "Typed decision",
     description:
@@ -402,4 +403,5 @@ export function registerOpenAIDecisions(
     execute: (_id, params, signal, _onUpdate, ctx) =>
       evaluateDecision(ctx, getConfig(ctx), params, signal),
   });
+  return tool;
 }

package/src/image.ts

@@ -13,6 +13,7 @@ import {
 } from "./codex-auth.ts";
 import { maskIdentifier, sanitizeDiagnosticError } from "./format.ts";
 import { piAgentDir, resolveUserPath } from "./paths.ts";
+import { registerOptionalTool, type OptionalTool } from "./optional-tool.ts";
 
 const OPENAI_IMAGE_TOOL = "openai_image";
 const OPENAI_IMAGE_COMMAND = "openai-image";
@@ -464,7 +465,7 @@ function resultText(result: CodexImageResult): string {
 export function registerOpenAIImage(
   pi: ExtensionAPI,
   getConfig: (ctx: ExtensionContext) => ResolvedConfig,
-): { getDebug: (ctx: ExtensionContext) => Promise<ImageGenerationDebug> } {
+): OptionalTool & { getDebug: (ctx: ExtensionContext) => Promise<ImageGenerationDebug> } {
   let lastStatus: string | undefined;
   let lastError: string | undefined;
 
@@ -581,7 +582,7 @@ export function registerOpenAIImage(
     },
   });
 
-  pi.registerTool({
+  const tool = registerOptionalTool(pi, {
     name: OPENAI_IMAGE_TOOL,
     label: "OpenAI image",
     description:
@@ -616,7 +617,7 @@ export function registerOpenAIImage(
     },
   });
 
-  return { getDebug };
+  return { getDebug, ...tool };
 }
 
 export const _imageTest = {

package/src/optional-tool.ts

@@ -0,0 +1,27 @@
+import type { TSchema } from "@earendil-works/pi-ai";
+import type { ExtensionAPI, ToolDefinition } from "@earendil-works/pi-coding-agent";
+
+export interface OptionalTool {
+  setEnabled(enabled: boolean): void;
+}
+
+/** Hidden exposure withdraws both native calls and Fabric capture, unlike deactivation alone. */
+export function registerOptionalTool<TParams extends TSchema, TDetails>(
+  pi: ExtensionAPI,
+  definition: ToolDefinition<TParams, TDetails>,
+): OptionalTool {
+  let enabled: boolean | undefined;
+  const tool: OptionalTool = {
+    setEnabled(next) {
+      if (enabled === next) return;
+      pi.registerTool({
+        ...definition,
+        exposure: next ? (definition.exposure ?? "direct") : "hidden",
+      });
+      enabled = next;
+    },
+  };
+  // The factory has no session cwd yet. Stay unreachable until config is resolved.
+  tool.setEnabled(false);
+  return tool;
+}

package/src/reset-controller.ts

@@ -159,7 +159,7 @@ export class ResetController {
     );
   }
 
-  private scheduleAutoRedeem(): void {
+  private scheduleAutoRedeem(scheduled?: BankedResetCredit): void {
     const ctx = this.activeCtx;
     if (!ctx || this.redeeming) return;
     try {
@@ -170,7 +170,7 @@ export class ResetController {
       // A cache refresh must not replace a due timer with the next credit,
       // particularly when the scheduled one was redeemed in another client.
       if (this.autoTimer) return;
-      const credit = selectAutoRedeemCredit(this.cache?.credits.credits ?? []);
+      const credit = scheduled ?? selectAutoRedeemCredit(this.cache?.credits.credits ?? []);
       if (!credit || credit.expiresAtMs === null) return;
       const dueAt = Math.max(
         credit.expiresAtMs - BANKED_RESET_AUTO_REDEEM_LEAD_MS,
@@ -179,7 +179,9 @@ export class ResetController {
       this.autoTimer = setTimeout(
         () => {
           this.autoTimer = undefined;
-          if (Date.now() < dueAt) this.scheduleAutoRedeem();
+          // Preserve the exact credit across capped timer wakeups, even when
+          // a polling refresh has changed the cached credit list.
+          if (Date.now() < dueAt) this.scheduleAutoRedeem(credit);
           else void this.autoRedeem(ctx, credit);
         },
         Math.max(0, Math.min(dueAt - Date.now(), BANKED_RESET_CACHE_TTL_MS)),

package/src/resets.ts

@@ -7,11 +7,10 @@ export const RESET_CREDITS_URL = "https://chatgpt.com/backend-api/wham/rate-limi
 export const CONSUME_RESET_URL =
   "https://chatgpt.com/backend-api/wham/rate-limit-reset-credits/consume";
 
-// Auto-redeem fires in the final minute before expiry. The automatic flow
-// (credentials, a fresh credit re-check, reservation, and consume POST) shares
-// one 10s abort deadline, so a 60s lead still leaves the server tens of seconds
-// of headroom while spending the credit as late as safely possible.
-export const BANKED_RESET_AUTO_REDEEM_LEAD_MS = 60_000;
+// Auto-redeem fires ten minutes before expiry to leave more headroom than a
+// last-minute attempt. The automatic flow (credentials, a fresh credit re-check,
+// reservation, and consume POST) still shares one 10s abort deadline.
+export const BANKED_RESET_AUTO_REDEEM_LEAD_MS = 10 * 60_000;
 
 export type BankedResetStatus = "available" | "redeeming" | "redeemed" | "unknown";
 

package/src/websearch.ts

@@ -8,6 +8,7 @@ import {
 } from "./config.ts";
 import { getCodexCredentials, type CodexCredentialsWithSource } from "./codex-auth.ts";
 import { maskIdentifier, sanitizeDiagnosticError } from "./format.ts";
+import { registerOptionalTool, type OptionalTool } from "./optional-tool.ts";
 
 export const OPENAI_WEBSEARCH_TOOL = "openai_websearch";
 export const OPENAI_WEBSEARCH_COMMAND = "openai-websearch";
@@ -316,7 +317,7 @@ async function requestWebSearch(
 export function registerOpenAIWebSearch(
   pi: ExtensionAPI,
   getConfig: (ctx: ExtensionContext) => ResolvedConfig,
-): { getDebug: (ctx: ExtensionContext) => Promise<WebSearchDebug> } {
+): OptionalTool & { getDebug: (ctx: ExtensionContext) => Promise<WebSearchDebug> } {
   let lastStatus: string | undefined;
   let lastError: string | undefined;
 
@@ -402,7 +403,7 @@ export function registerOpenAIWebSearch(
     },
   });
 
-  pi.registerTool({
+  const tool = registerOptionalTool(pi, {
     name: OPENAI_WEBSEARCH_TOOL,
     label: "OpenAI web search",
     description:
@@ -426,7 +427,7 @@ export function registerOpenAIWebSearch(
     },
   });
 
-  return { getDebug };
+  return { getDebug, ...tool };
 }
 
 export const _websearchTest = {