oc-codex-multi-auth 6.5.0 → 6.6.0

package/dist/lib/shutdown.d.ts

@@ -1,4 +1,5 @@
 type CleanupFn = () => void | Promise<void>;
+export declare function setShutdownOwnsProcess(owns: boolean): void;
 export declare function registerCleanup(fn: CleanupFn): void;
 export declare function unregisterCleanup(fn: CleanupFn): void;
 export declare function runCleanup(): Promise<void>;

package/dist/lib/shutdown.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shutdown.d.ts","sourceRoot":"","sources":["../../lib/shutdown.ts"],"names":[],"mappings":"AAAA,KAAK,SAAS,GAAG,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;AAK5C,wBAAgB,eAAe,CAAC,EAAE,EAAE,SAAS,GAAG,IAAI,CAGnD;AAED,wBAAgB,iBAAiB,CAAC,EAAE,EAAE,SAAS,GAAG,IAAI,CAKrD;AAED,wBAAsB,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC,CAWhD;AAmBD,wBAAgB,eAAe,IAAI,MAAM,CAExC"}
+{"version":3,"file":"shutdown.d.ts","sourceRoot":"","sources":["../../lib/shutdown.ts"],"names":[],"mappings":"AAAA,KAAK,SAAS,GAAG,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;AAyB5C,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,OAAO,GAAG,IAAI,CAE1D;AAED,wBAAgB,eAAe,CAAC,EAAE,EAAE,SAAS,GAAG,IAAI,CAGnD;AAED,wBAAgB,iBAAiB,CAAC,EAAE,EAAE,SAAS,GAAG,IAAI,CAKrD;AAED,wBAAgB,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC,CAmB1C;AAuBD,wBAAgB,eAAe,IAAI,MAAM,CAExC"}

package/dist/lib/shutdown.js

@@ -1,5 +1,26 @@
 const cleanupFunctions = [];
 let shutdownRegistered = false;
+/**
+ * Whether this process is ours to terminate.
+ *
+ * Defaults to false: the package normally runs as a plugin *inside* the
+ * opencode host process, where calling `process.exit` from a signal handler
+ * preempts opencode's own shutdown (#187). Only an entrypoint that IS the
+ * process — the standalone `warm` CLI — opts in. Read lazily at signal time,
+ * so the opt-in may happen after handlers are installed.
+ */
+let ownsProcess = false;
+/**
+ * The in-flight drain, if one is running. Concurrent callers (a signal handler
+ * and `beforeExit` firing in the same shutdown) share it rather than racing on
+ * an already-emptied queue. Cleared once settled, so *sequential* calls each
+ * drain freshly — `AccountManager` re-registers its flush handler after an
+ * external `runCleanup()`, and the test suites depend on that.
+ */
+let inFlight = null;
+export function setShutdownOwnsProcess(owns) {
+    ownsProcess = owns;
+}
 export function registerCleanup(fn) {
     cleanupFunctions.push(fn);
     ensureShutdownHandler();
@@ -10,29 +31,41 @@ export function unregisterCleanup(fn) {
         cleanupFunctions.splice(index, 1);
     }
 }
-export async function runCleanup() {
+export function runCleanup() {
+    if (inFlight)
+        return inFlight;
     const fns = [...cleanupFunctions];
     cleanupFunctions.length = 0;
-    for (const fn of fns) {
-        try {
-            await fn();
-        }
-        catch {
-            // Ignore cleanup errors during shutdown
+    inFlight = (async () => {
+        for (const fn of fns) {
+            try {
+                await fn();
+            }
+            catch {
+                // Ignore cleanup errors during shutdown
+            }
         }
-    }
+    })().finally(() => {
+        inFlight = null;
+    });
+    return inFlight;
 }
 function ensureShutdownHandler() {
     if (shutdownRegistered)
         return;
     shutdownRegistered = true;
-    const handleSignal = () => {
-        void runCleanup().finally(() => {
-            process.exit(0);
+    const handleSignal = (signal) => {
+        const drained = runCleanup();
+        // A guest in someone else's process: run cleanup, then let the host
+        // finish its own shutdown. Exiting here is what broke #187.
+        if (!ownsProcess)
+            return;
+        void drained.finally(() => {
+            process.exit(signal === "SIGTERM" ? 143 : 130);
         });
     };
-    process.once("SIGINT", handleSignal);
-    process.once("SIGTERM", handleSignal);
+    process.once("SIGINT", () => handleSignal("SIGINT"));
+    process.once("SIGTERM", () => handleSignal("SIGTERM"));
     process.once("beforeExit", () => {
         void runCleanup();
     });

package/dist/lib/shutdown.js.map

@@ -1 +1 @@
-{"version":3,"file":"shutdown.js","sourceRoot":"","sources":["../../lib/shutdown.ts"],"names":[],"mappings":"AAEA,MAAM,gBAAgB,GAAgB,EAAE,CAAC;AACzC,IAAI,kBAAkB,GAAG,KAAK,CAAC;AAE/B,MAAM,UAAU,eAAe,CAAC,EAAa;IAC5C,gBAAgB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC1B,qBAAqB,EAAE,CAAC;AACzB,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,EAAa;IAC9C,MAAM,KAAK,GAAG,gBAAgB,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IAC3C,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE,CAAC;QAClB,gBAAgB,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;IACnC,CAAC;AACF,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,UAAU;IAC/B,MAAM,GAAG,GAAG,CAAC,GAAG,gBAAgB,CAAC,CAAC;IAClC,gBAAgB,CAAC,MAAM,GAAG,CAAC,CAAC;IAE5B,KAAK,MAAM,EAAE,IAAI,GAAG,EAAE,CAAC;QACtB,IAAI,CAAC;YACJ,MAAM,EAAE,EAAE,CAAC;QACZ,CAAC;QAAC,MAAM,CAAC;YACR,wCAAwC;QACzC,CAAC;IACF,CAAC;AACF,CAAC;AAED,SAAS,qBAAqB;IAC7B,IAAI,kBAAkB;QAAE,OAAO;IAC/B,kBAAkB,GAAG,IAAI,CAAC;IAE1B,MAAM,YAAY,GAAG,GAAG,EAAE;QACzB,KAAK,UAAU,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE;YAC9B,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACjB,CAAC,CAAC,CAAC;IACJ,CAAC,CAAC;IAEF,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;IACrC,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;IACtC,OAAO,CAAC,IAAI,CAAC,YAAY,EAAE,GAAG,EAAE;QAC/B,KAAK,UAAU,EAAE,CAAC;IACnB,CAAC,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,eAAe;IAC9B,OAAO,gBAAgB,CAAC,MAAM,CAAC;AAChC,CAAC"}
+{"version":3,"file":"shutdown.js","sourceRoot":"","sources":["../../lib/shutdown.ts"],"names":[],"mappings":"AAEA,MAAM,gBAAgB,GAAgB,EAAE,CAAC;AACzC,IAAI,kBAAkB,GAAG,KAAK,CAAC;AAE/B;;;;;;;;GAQG;AACH,IAAI,WAAW,GAAG,KAAK,CAAC;AAExB;;;;;;GAMG;AACH,IAAI,QAAQ,GAAyB,IAAI,CAAC;AAE1C,MAAM,UAAU,sBAAsB,CAAC,IAAa;IACnD,WAAW,GAAG,IAAI,CAAC;AACpB,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,EAAa;IAC5C,gBAAgB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC1B,qBAAqB,EAAE,CAAC;AACzB,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,EAAa;IAC9C,MAAM,KAAK,GAAG,gBAAgB,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IAC3C,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE,CAAC;QAClB,gBAAgB,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;IACnC,CAAC;AACF,CAAC;AAED,MAAM,UAAU,UAAU;IACzB,IAAI,QAAQ;QAAE,OAAO,QAAQ,CAAC;IAE9B,MAAM,GAAG,GAAG,CAAC,GAAG,gBAAgB,CAAC,CAAC;IAClC,gBAAgB,CAAC,MAAM,GAAG,CAAC,CAAC;IAE5B,QAAQ,GAAG,CAAC,KAAK,IAAI,EAAE;QACtB,KAAK,MAAM,EAAE,IAAI,GAAG,EAAE,CAAC;YACtB,IAAI,CAAC;gBACJ,MAAM,EAAE,EAAE,CAAC;YACZ,CAAC;YAAC,MAAM,CAAC;gBACR,wCAAwC;YACzC,CAAC;QACF,CAAC;IACF,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE;QACjB,QAAQ,GAAG,IAAI,CAAC;IACjB,CAAC,CAAC,CAAC;IAEH,OAAO,QAAQ,CAAC;AACjB,CAAC;AAED,SAAS,qBAAqB;IAC7B,IAAI,kBAAkB;QAAE,OAAO;IAC/B,kBAAkB,GAAG,IAAI,CAAC;IAE1B,MAAM,YAAY,GAAG,CAAC,MAA4B,EAAE,EAAE;QACrD,MAAM,OAAO,GAAG,UAAU,EAAE,CAAC;QAC7B,oEAAoE;QACpE,4DAA4D;QAC5D,IAAI,CAAC,WAAW;YAAE,OAAO;QACzB,KAAK,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE;YACzB,OAAO,CAAC,IAAI,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;QAChD,CAAC,CAAC,CAAC;IACJ,CAAC,CAAC;IAEF,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,EAAE,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAC;IACrD,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,GAAG,EAAE,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC,CAAC;IACvD,OAAO,CAAC,IAAI,CAAC,YAAY,EAAE,GAAG,EAAE;QAC/B,KAAK,UAAU,EAAE,CAAC;IACnB,CAAC,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,eAAe;IAC9B,OAAO,gBAAgB,CAAC,MAAM,CAAC;AAChC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oc-codex-multi-auth",
-  "version": "6.5.0",
+  "version": "6.6.0",
   "description": "OpenCode plugin for ChatGPT Plus/Pro OAuth with Codex/GPT-5 routing, multi-account rotation, account switching, health checks, diagnostics, and recovery tools",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",

package/scripts/install-oc-codex-multi-auth-core.js

@@ -361,13 +361,19 @@ async function loadWarmRuntime(env) {
 	const distRoot = join(repoRoot, "dist", "lib");
 	const toUrl = (rel) => pathToFileURL(join(distRoot, rel)).href;
 	try {
-		const [storageMod, usageMod, warmReqMod, warmMod] = await Promise.all([
+		const [storageMod, usageMod, warmReqMod, warmMod, shutdownMod] = await Promise.all([
 			import(toUrl("storage.js")),
 			import(toUrl("codex-usage.js")),
 			import(toUrl("accounts/warm-request.js")),
 			import(toUrl("accounts/warm.js")),
+			import(toUrl("shutdown.js")),
 		]);
-		return { storageMod, usageMod, warmReqMod, warmMod };
+		// Unlike the plugin, this CLI *is* the process, so it owns termination:
+		// Ctrl+C must abort the warm run rather than wait for it to drain.
+		// Refreshing a token here persists credentials, which registers the
+		// shutdown handler via the storage lock.
+		shutdownMod.setShutdownOwnsProcess(true);
+		return { storageMod, usageMod, warmReqMod, warmMod, shutdownMod };
 	} catch (error) {
 		throw new Error(
 			`Could not load warm runtime from dist/. Build the package first (npm run build). Cause: ${formatErrorForLog(error)}`,