Fix provider routing telemetry and account flows

Author: gitcommit90

README.md

@@ -185,7 +185,7 @@ Questions and bug reports are welcome in [GitHub Issues](https://github.com/gitc
 
 ## Current release
 
-ReRouted `0.3.1` ships for Apple Silicon macOS with a Developer ID signature, stapled Apple notarization tickets, and in-app updates backed by stable GitHub Releases. The public API is intentionally limited to health, model discovery, and chat completions; a published third-party client compatibility matrix is still forthcoming.
+ReRouted `0.4.0` ships for Apple Silicon macOS with a Developer ID signature, stapled Apple notarization tickets, and in-app updates backed by stable GitHub Releases. The public API is intentionally limited to health, model discovery, and chat completions; a published third-party client compatibility matrix is still forthcoming.
 
 ReRouted is released by [Public Bytes](https://publicbytes.org), a nonprofit building practical technology for public good.
 

docs/architecture.md

@@ -71,9 +71,9 @@ The router supports:
 - `fallback`: members are attempted in their configured order.
 - `round-robin`: each request rotates the starting member, then retains fallback behavior through the remaining members.
 
-Timeouts, `408`, `429`, and `5xx` responses are retryable. The per-member timeout defaults to 60 seconds. A route stops when a member returns a non-retryable failure; a single direct model stops after its only member.
+Timeouts, `408`, `429`, and `5xx` responses are retryable. The per-member timeout defaults to 60 seconds. An explicit route stops immediately when any account or member returns a non-retryable failure; a later account lock cannot replace that terminal response.
 
-OAuth providers add an account-pool layer beneath model routing. Accounts receive the lowest available alias (`oauth1`, `oauth2`, ...), and both shared ids (`chatgpt/gpt-5.4`) and account-specific ids (`chatgpt/oauth2/gpt-5.4`) can continue through sibling accounts. Quota failures create an account-wide lock using provider reset hints when available; authentication and transient failures use shorter model-scoped cooldowns. Early streaming quota events are inspected before the client stream starts so fallback can still occur. Selection, failure, fallback, locked-account skips, and terminal exhaustion are written as structured logs.
+OAuth providers add an account-pool layer beneath model routing. Accounts receive monotonic, never-reused aliases (`oauth1`, `oauth2`, ...). Model discovery advertises one canonical pooled id such as `chatgpt/gpt-5.4`; account-qualified ids such as `chatgpt/oauth2/gpt-5.4` and legacy stored-account ids remain resolvable but are not advertised. Quota failures create an account-wide lock using provider reset hints when available; authentication and transient failures use shorter model-scoped cooldowns. Early streaming quota events are inspected before the client stream starts so fallback can still occur. Selection, failure, fallback, locked-account skips, and terminal exhaustion are written as structured logs.
 
 ## Provider adapters
 
@@ -83,7 +83,7 @@ OAuth providers add an account-pool layer beneath model routing. Accounts receiv
 - `chatgpt.js` translates chat-completion requests to the ChatGPT Codex Responses surface and normalizes Responses SSE.
 - `claude.js` translates OpenAI messages and tools to Anthropic Messages, applies the current OAuth client contract, and converts JSON/SSE back to OpenAI shapes.
 - `antigravity.js` translates Gemini-style upstream requests and SSE.
-- `xai.js` uses an OpenAI-compatible chat surface with xAI OAuth credentials.
+- `xai.js` translates chat-completion requests to the xAI subscription Responses surface and normalizes its forced SSE stream.
 
 OAuth access-token refreshes are persisted back to the provider record when an adapter returns updated tokens.
 

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "rerouted",
-  "version": "0.3.1",
+  "version": "0.4.0",
   "description": "A macOS menu-bar router for accounts, models, and automatic fallback.",
   "author": "Public Bytes",
   "homepage": "https://rerouted.dev",

package.json

@@ -26,9 +26,10 @@ fs.mkdirSync(outDir, { recursive: true });
 fs.mkdirSync(userData, { recursive: true });
 
 const store = createStore(path.join(userData, "config.json"));
+const demoStartedAt = Date.now();
 
 function demoStats() {
-  const now = Date.now();
+  const now = demoStartedAt;
   return {
     totalRequests: 1284,
     sessionRequests: 12,
@@ -111,6 +112,9 @@ let demoLogEntries = [
   { at: Date.now() - 47 * 60_000, level: "info", msg: "Local gateway listening", meta: { host: "127.0.0.1", port: DEFAULT_PORT } },
 ];
 let keyedProviderAdds = [];
+let oauthCancels = [];
+let oauthStartsInFlight = 0;
+let oauthCancelRaces = 0;
 let updateState = {
   status: "current",
   currentVersion: packageInfo.version,
@@ -248,7 +252,17 @@ function registerIpc() {
     ],
   }));
   ipcMain.handle("app:import-detected", async () => ({ ok: true }));
-  ipcMain.handle("app:oauth-start", async () => ({ ok: true, authUrl: "https://example.com" }));
+  ipcMain.handle("app:oauth-start", async () => {
+    oauthStartsInFlight += 1;
+    await new Promise((resolve) => setTimeout(resolve, 150));
+    oauthStartsInFlight -= 1;
+    return { ok: true, authUrl: "https://example.com" };
+  });
+  ipcMain.handle("app:oauth-cancel", async (_event, type) => {
+    if (oauthStartsInFlight) oauthCancelRaces += 1;
+    oauthCancels.push(type);
+    return { ok: true };
+  });
   ipcMain.handle("app:oauth-status", async () => ({ active: false }));
   ipcMain.handle("app:oauth-complete", async () => ({
     ok: true,
@@ -259,6 +273,8 @@ function registerIpc() {
     return { ok: true };
   });
   ipcMain.handle("harness:keyed-provider-adds", async () => keyedProviderAdds);
+  ipcMain.handle("harness:oauth-cancels", async () => oauthCancels);
+  ipcMain.handle("harness:oauth-cancel-races", async () => oauthCancelRaces);
   ipcMain.handle("app:test-keyed-provider", async () => ({
     ok: true,
     models: [{ id: "test-model", name: "Test" }],
@@ -502,6 +518,50 @@ app.whenReady().then(async () => {
     await capture(`app-${p}.png`, selector);
   }
 
+  await win.webContents.executeJavaScript(`
+    (() => {
+      window.__rr_goto_page("home");
+      return true;
+    })()
+  `);
+  await sleep(1300);
+  await win.webContents.executeJavaScript(`
+    (() => {
+      const details = document.querySelector("[data-home-credentials]");
+      const routeMap = document.querySelector("[data-home-route-map]");
+      const track = routeMap?.querySelector(".route-track");
+      const copyButton = document.getElementById("copy-url");
+      if (!details || !routeMap || !track || !copyButton) {
+        throw new Error("Status persistence controls did not render");
+      }
+      details.open = true;
+      copyButton.focus();
+      window.__rr_home_poll_test = { routeMap, track, copyButton, animationStarts: 0 };
+      routeMap.addEventListener("animationstart", () => {
+        window.__rr_home_poll_test.animationStarts += 1;
+      });
+      return true;
+    })()
+  `);
+  await sleep(2300);
+  await win.webContents.executeJavaScript(`
+    (() => {
+      const test = window.__rr_home_poll_test;
+      const details = document.querySelector("[data-home-credentials]");
+      if (document.querySelector("[data-home-route-map] .route-track") !== test.track) {
+        throw new Error("Status polling replaced the route animation DOM");
+      }
+      if (!details?.open) throw new Error("Status polling collapsed Credentials and network");
+      if (document.activeElement !== test.copyButton) {
+        throw new Error("Status polling moved focus away from the endpoint controls");
+      }
+      if (test.animationStarts !== 0) {
+        throw new Error("Status polling restarted the route animation without new traffic");
+      }
+      return true;
+    })()
+  `);
+
   await win.webContents.executeJavaScript(`
     (() => {
       window.__rr_goto_page("providers");
@@ -512,27 +572,119 @@ app.whenReady().then(async () => {
   await capture("app-providers-expanded.png", ".provider-detail");
 
   await win.webContents.executeJavaScript(`
-    (() => {
+    (async () => {
+      const reconnect = document.querySelector("[data-reauth]");
+      reconnect?.click();
+      await new Promise((resolve) => setTimeout(resolve, 500));
+      const panel = document.querySelector("#add-panel .action-panel");
+      const viewport = document.getElementById("view").getBoundingClientRect();
+      const rect = panel?.getBoundingClientRect();
+      if (!panel || !rect || rect.top < viewport.top || rect.top >= viewport.bottom) {
+        throw new Error("Reconnect panel was not brought into view");
+      }
+      if (document.activeElement !== panel.querySelector("[data-panel-heading]")) {
+        throw new Error("Reconnect panel did not receive accessible focus");
+      }
+      document.dispatchEvent(new KeyboardEvent("keydown", { key: "Escape", bubbles: true }));
+      await new Promise((resolve) => requestAnimationFrame(() => requestAnimationFrame(resolve)));
+      if (document.querySelector("#add-panel .action-panel")) {
+        throw new Error("Escape did not dismiss reconnect panel");
+      }
+      if (document.activeElement !== reconnect) {
+        throw new Error("Reconnect dismissal did not restore focus");
+      }
+      const cancels = await window.rerouted.invoke("harness:oauth-cancels");
+      if (cancels.length !== 1 || cancels[0] !== "chatgpt") {
+        throw new Error("Reconnect dismissal did not cancel the pending OAuth flow");
+      }
+      return true;
+    })()
+  `);
+
+  await win.webContents.executeJavaScript(`
+    (async () => {
       window.__rr_goto_page("providers");
       if (document.querySelector(".provider-detail")) {
         document.querySelector("[data-expand]")?.click();
       }
       document.getElementById("btn-connect")?.click();
+      await new Promise((resolve) => setTimeout(resolve, 500));
+      const panel = document.querySelector("#add-panel .action-panel");
+      const viewport = document.getElementById("view").getBoundingClientRect();
+      const rect = panel?.getBoundingClientRect();
+      if (!panel || !rect || rect.top < viewport.top || rect.bottom > viewport.bottom + 1) {
+        throw new Error("Connect options were not brought into view");
+      }
+      if (document.activeElement !== panel.querySelector("[data-panel-heading]")) {
+        throw new Error("Connect panel did not receive accessible focus");
+      }
       return true;
     })()
   `);
   await capture("app-providers-connect.png", "#add-panel .action-panel", "#add-panel .action-panel");
 
   await win.webContents.executeJavaScript(`
-    (() => {
+    (async () => {
+      const opener = document.getElementById("btn-connect");
+      document.dispatchEvent(new KeyboardEvent("keydown", { key: "Escape", bubbles: true }));
+      await new Promise((resolve) => requestAnimationFrame(() => requestAnimationFrame(resolve)));
+      if (document.querySelector("#add-panel .action-panel")) {
+        throw new Error("Escape did not dismiss Connect panel");
+      }
+      if (document.activeElement !== opener) {
+        throw new Error("Connect dismissal did not restore focus");
+      }
+      opener.click();
+      await new Promise((resolve) => setTimeout(resolve, 500));
+      document.querySelector("#add-panel .tile")?.click();
+      await new Promise((resolve) => setTimeout(resolve, 20));
+      const oauth = document.querySelector("#add-panel .action-panel");
+      const cancel = oauth?.querySelector("[data-panel-cancel]");
+      if (!oauth || !cancel) {
+        throw new Error("OAuth panel was not dismissible while connection startup was pending");
+      }
+      cancel.click();
+      await new Promise((resolve) => requestAnimationFrame(() => requestAnimationFrame(resolve)));
+      if (document.querySelector("#add-panel .action-panel") || document.activeElement !== opener) {
+        throw new Error("OAuth Cancel did not dismiss and restore focus");
+      }
+      const deadline = Date.now() + 1000;
+      let cancels = await window.rerouted.invoke("harness:oauth-cancels");
+      while (cancels.length < 2 && Date.now() < deadline) {
+        await new Promise((resolve) => setTimeout(resolve, 20));
+        cancels = await window.rerouted.invoke("harness:oauth-cancels");
+      }
+      if (cancels.length !== 2 || cancels[1] !== "chatgpt") {
+        throw new Error("OAuth dismissal did not cancel the pending flow");
+      }
+      const cancelRaces = await window.rerouted.invoke("harness:oauth-cancel-races");
+      if (cancelRaces !== 0) {
+        throw new Error("OAuth dismissal raced callback-session creation");
+      }
+      opener.click();
+      await new Promise((resolve) => setTimeout(resolve, 500));
+      return true;
+    })()
+  `);
+
+  await win.webContents.executeJavaScript(`
+    (async () => {
       document.getElementById("btn-key")?.click();
+      await new Promise((resolve) => setTimeout(resolve, 500));
       const labels = [...document.querySelectorAll("[data-keyed-preset]")].map((button) =>
         (button.textContent || "").trim()
       );
       const expected = ["OpenRouter", "NVIDIA NIM", "Cloudflare", "GLM Coding", "Custom"];
       if (JSON.stringify(labels) !== JSON.stringify(expected)) {
         throw new Error("Post-onboarding keyed presets did not render: " + labels.join(", "));
       }
+      const panel = document.querySelector("#add-panel .action-panel");
+      if (!panel?.querySelector("[data-panel-cancel]")) {
+        throw new Error("API key panel did not render a Cancel action");
+      }
+      if (document.activeElement !== panel.querySelector("[data-panel-heading]")) {
+        throw new Error("API key panel did not receive accessible focus");
+      }
       return labels;
     })()
   `);

scripts/capture-ui.js

@@ -119,7 +119,7 @@ const OAUTH = {
     codeChallengeMethod: "S256",
     loopbackPort: 56121,
     callbackPath: "/callback",
-    chatUrl: "https://api.x.ai/v1/chat/completions",
+    chatUrl: "https://cli-chat-proxy.grok.com/v1/responses",
     models: [
       { id: "grok-4.5-high", name: "Grok 4.5 (High)" },
       { id: "grok-4.5-medium", name: "Grok 4.5 (Medium)" },

src/lib/constants.js

@@ -65,6 +65,7 @@ function extractTextFromGemini(data) {
 
 function fromGeminiJson(data, model) {
   const text = extractTextFromGemini(data);
+  const usage = data.usageMetadata || data.response?.usageMetadata;
   return {
     id: `chatcmpl-${Date.now()}`,
     object: "chat.completion",
@@ -73,13 +74,28 @@ function fromGeminiJson(data, model) {
     choices: [
       { index: 0, message: { role: "assistant", content: text }, finish_reason: "stop" },
     ],
+    ...(usage
+      ? {
+          usage: {
+            prompt_tokens: usage.promptTokenCount || 0,
+            completion_tokens: usage.candidatesTokenCount || 0,
+            total_tokens:
+              usage.totalTokenCount ||
+              (usage.promptTokenCount || 0) + (usage.candidatesTokenCount || 0),
+            prompt_tokens_details: {
+              cached_tokens: usage.cachedContentTokenCount || 0,
+            },
+          },
+        }
+      : {}),
   };
 }
 
 async function pipeGeminiSse(upstreamBody, res, model) {
   const parser = createSseParser();
   const id = `chatcmpl-${Date.now()}`;
   let roleSent = false;
+  let streamUsage = null;
 
   async function handleEvents(events) {
     for (const ev of events) {
@@ -95,6 +111,19 @@ async function pipeGeminiSse(upstreamBody, res, model) {
           upstream.message || upstream.code || upstream.status || "Antigravity stream failed"
         );
       }
+      const usage = data.usageMetadata || data.response?.usageMetadata;
+      if (usage) {
+        streamUsage = {
+          prompt_tokens: usage.promptTokenCount || 0,
+          completion_tokens: usage.candidatesTokenCount || 0,
+          total_tokens:
+            usage.totalTokenCount ||
+            (usage.promptTokenCount || 0) + (usage.candidatesTokenCount || 0),
+          prompt_tokens_details: {
+            cached_tokens: usage.cachedContentTokenCount || 0,
+          },
+        };
+      }
       const text = extractTextFromGemini(data);
       // For incremental SSE, parts may only contain the delta in some APIs;
       // Antigravity often re-sends full — we treat each event's text as delta if short path.
@@ -127,6 +156,7 @@ async function pipeGeminiSse(upstreamBody, res, model) {
   }
   res.write(formatSseData(openaiChunk({ id, model, finishReason: "stop" })));
   res.write(SSE_DONE);
+  return streamUsage;
 }
 
 async function refreshToken(provider, { fetchImpl = fetch } = {}) {