@monotykamary/pi-better-openai 0.2.3 → 0.2.5

package/README.md

@@ -51,9 +51,9 @@ Usage display, image generation, and live voice require pi's `openai-codex` OAut
 
 ## Banked resets
 
-Unused banked Codex resets **auto-redeem by default, 5 minutes before expiry**, while an interactive pi session is running and Codex credentials are available. Starting pi within that final five-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 five minutes) 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, 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.
 
-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 five minutes across pi sessions sharing the same agent directory; manual redemption uses the same guard. Automatic reservations recheck the five-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 five-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 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.
 
 Pi must remain running and awake; this is not an OS-level scheduled task. No eligible usage window or unavailable credentials can prevent redemption.
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@monotykamary/pi-better-openai",
-  "version": "0.2.3",
+  "version": "0.2.5",
   "description": "Improve OpenAI in pi with fast mode, usage stats, realtime voice, image generation, and footer polish.",
   "keywords": [
     "fast",

package/src/config.ts

@@ -45,6 +45,31 @@ export const DEFAULT_SUPPORTED_MODELS = [
   "openai-codex/gpt-5.5",
 ] as const;
 
+// Earlier versions seeded config files with an explicit copy of the then-current
+// default list. Treat those exact snapshots as unset so later additions to
+// DEFAULT_SUPPORTED_MODELS (such as gpt-6-astra) reach existing installs.
+const LEGACY_SEEDED_SUPPORTED_MODELS: readonly (readonly string[])[] = [
+  ["openai/gpt-5.4", "openai/gpt-5.5", "openai-codex/gpt-5.4", "openai-codex/gpt-5.5"],
+  [
+    "openai/gpt-5.4",
+    "openai/gpt-5.5",
+    "openai/gpt-5.6-sol",
+    "openai/gpt-5.6-terra",
+    "openai/gpt-5.6-luna",
+    "openai-codex/gpt-5.4",
+    "openai-codex/gpt-5.5",
+  ],
+  [
+    "openai/gpt-5.4",
+    "openai/gpt-5.5",
+    "openai-codex/gpt-5.6-sol",
+    "openai-codex/gpt-5.6-terra",
+    "openai-codex/gpt-5.6-luna",
+    "openai-codex/gpt-5.4",
+    "openai-codex/gpt-5.5",
+  ],
+];
+
 export type FooterMode = (typeof FOOTER_MODES)[number];
 export type ImageSaveMode = (typeof IMAGE_SAVE_MODES)[number];
 export type ImageOutputFormat = (typeof IMAGE_OUTPUT_FORMATS)[number];
@@ -194,11 +219,12 @@ export const DEFAULT_PET_CONFIG: Required<PetConfig> = {
 };
 
 export const DEFAULT_CONFIG: ConfigFile = {
+  // supportedModels is intentionally omitted so generated config files never pin
+  // the default list; resolution falls back to DEFAULT_SUPPORTED_MODELS live.
   persistState: true,
   notifyOnModelSwitch: true,
   active: false,
   desiredActive: false,
-  supportedModels: [...DEFAULT_SUPPORTED_MODELS],
   usage: DEFAULT_USAGE_CONFIG,
   footer: DEFAULT_FOOTER_CONFIG,
   image: DEFAULT_IMAGE_CONFIG,
@@ -331,7 +357,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 5 minutes before expiry while pi is running.",
+    description: "Redeem one unused banked reset 1 minute before expiry while pi is running.",
     parse: booleanSetting,
   },
 ];
@@ -631,6 +657,14 @@ export function parseModels(value: unknown): SupportedModel[] | undefined {
     .filter((entry): entry is SupportedModel => entry !== undefined);
 }
 
+function isLegacySeededSupportedModels(models: readonly SupportedModel[]): boolean {
+  return LEGACY_SEEDED_SUPPORTED_MODELS.some((snapshot) => {
+    if (snapshot.length !== models.length) return false;
+    const remaining = new Set(snapshot);
+    return models.every((model) => remaining.delete(`${model.provider}/${model.id}`));
+  });
+}
+
 export function readRawConfig(path: string): Record<string, unknown> {
   if (!existsSync(path)) return {};
   try {
@@ -823,6 +857,7 @@ export function resolveConfig(cwd: string): ResolvedConfig {
   const merged = { ...DEFAULT_CONFIG, ...globalConfig, ...projectConfig };
   const selectedPath = projectConfigExists ? paths.project : paths.global;
   const desiredActive = merged.desiredActive ?? merged.active ?? false;
+  const configuredSupportedModels = parseModels(merged.supportedModels);
 
   return {
     configPath: selectedPath,
@@ -835,7 +870,9 @@ export function resolveConfig(cwd: string): ResolvedConfig {
     active: merged.active ?? desiredActive,
     desiredActive,
     supportedModels:
-      parseModels(merged.supportedModels) ?? parseModels(DEFAULT_SUPPORTED_MODELS) ?? [],
+      configuredSupportedModels && !isLegacySeededSupportedModels(configuredSupportedModels)
+        ? configuredSupportedModels
+        : (parseModels(DEFAULT_SUPPORTED_MODELS) ?? []),
     usage: {
       ...DEFAULT_USAGE_CONFIG,
       ...globalConfig.usage,

package/src/resets.ts

@@ -7,7 +7,11 @@ 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";
 
-export const BANKED_RESET_AUTO_REDEEM_LEAD_MS = 5 * 60_000;
+// 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;
 
 export type BankedResetStatus = "available" | "redeeming" | "redeemed" | "unknown";