Merge OAuth identity and image input fixes

Author: gitcommit90

README.md

@@ -95,7 +95,7 @@ ReRouted is an independent project and is not affiliated with or endorsed by any
 
 ### 1. Install
 
-[Download ReRouted 0.3.1 for Apple Silicon](https://github.com/gitcommit90/rerouted/releases/download/v0.3.1/ReRouted-0.3.1-arm64.dmg), open the DMG, and drag ReRouted to Applications.
+[Download ReRouted 0.4.1 for Apple Silicon](https://github.com/gitcommit90/rerouted/releases/download/v0.4.1/ReRouted-0.4.1-arm64.dmg), open the DMG, and drag ReRouted to Applications.
 
 The macOS release is Developer ID signed, notarized by Apple, and stapled for a normal Gatekeeper launch.
 
@@ -149,7 +149,7 @@ The gateway continues running when the panel is hidden. Quitting ReRouted stops
 | `GET /v1/models` | Enabled direct models and named routes |
 | `POST /v1/chat/completions` | Streaming or non-streaming routed completions |
 
-Requests require a generated bearer key except for `/` and `/health`. ReRouted currently targets clients that use OpenAI-style chat completions; embeddings, images, audio, and the rest of the OpenAI platform API are outside its scope.
+Requests require a generated bearer key except for `/` and `/health`. OpenAI-style image inputs inside chat-completion messages are supported when the selected upstream model accepts them. The separate `/v1/images` generation API, embeddings, audio, and the rest of the OpenAI platform API are outside ReRouted's scope.
 
 ## Local-first, with the boundaries stated plainly
 
@@ -185,7 +185,7 @@ Questions and bug reports are welcome in [GitHub Issues](https://github.com/gitc
 
 ## Current release
 
-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 `0.4.1` ships for Apple Silicon macOS with masked OAuth account identities, image inputs in chat completions, 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.
 

package-lock.json

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

package.json

@@ -140,7 +140,7 @@ function seedOnboarded() {
         id: "prov_chatgpt_demo",
         type: "chatgpt",
         name: "ChatGPT Plus",
-        email: "demo@example.com",
+        email: "fantasticfox@gmail.com",
         enabled: true,
         models: OAUTH.chatgpt.models,
         accessToken: "x",
@@ -150,12 +150,31 @@ function seedOnboarded() {
         id: "prov_claude_demo",
         type: "claude",
         name: "Claude Pro",
-        email: "route@example.com",
+        profileName: "Route Fox",
         enabled: true,
         models: OAUTH.claude.models,
         accessToken: "x",
         createdAt: now - 43_200_000,
       },
+      {
+        id: "prov_antigravity_demo",
+        type: "antigravity",
+        name: "Antigravity (gravitypilot@example.com)",
+        email: "gravitypilot@example.com",
+        enabled: true,
+        models: OAUTH.antigravity.models,
+        accessToken: "x",
+        createdAt: now - 21_600_000,
+      },
+      {
+        id: "prov_xai_demo",
+        type: "xai",
+        name: "xAI (Grok)",
+        enabled: true,
+        models: OAUTH.xai.models,
+        accessToken: "x",
+        createdAt: now - 10_800_000,
+      },
     ],
     combos: [
       {
@@ -181,6 +200,7 @@ function registerIpc() {
       name: p.name,
       accountAlias: p.accountAlias || null,
       email: p.email,
+      profileName: p.profileName,
       enabled: p.enabled !== false,
       hasToken: !!(p.accessToken || p.apiKey),
       models: p.models || defaultModelsForType(p.type),
@@ -288,9 +308,9 @@ function registerIpc() {
         {
           providerId: "demo",
           type: "chatgpt",
-          name: "ChatGPT",
+          name: "ChatGPT (fantasticfox@gmail.com)",
           accountAlias: "oauth1",
-          email: "demo@example.com",
+          email: "fantasticfox@gmail.com",
           status: "ok",
           source: "ChatGPT quota API",
           plan: "plus",
@@ -476,6 +496,13 @@ app.whenReady().then(async () => {
         (async () => {
           const b = document.getElementById("btn-scan");
           if (b) { b.click(); await new Promise(r => setTimeout(r, 400)); }
+          const results = document.getElementById("detect-results");
+          if (!results?.textContent.includes("use*@example.com")) {
+            throw new Error("Detected account email was not privacy masked");
+          }
+          if (results.outerHTML.includes("user@example.com")) {
+            throw new Error("Raw detected account email leaked into onboarding markup");
+          }
           return true;
         })()
       `);
@@ -516,6 +543,65 @@ app.whenReady().then(async () => {
       settings: ".settings-group",
     }[p] || "#view > *";
     await capture(`app-${p}.png`, selector);
+    if (p === "providers") {
+      await win.webContents.executeJavaScript(`
+        (() => {
+          const chatgpt = document.querySelector('[data-prov-card="prov_chatgpt_demo"]');
+          const claude = document.querySelector('[data-prov-card="prov_claude_demo"]');
+          const antigravity = document.querySelector('[data-prov-card="prov_antigravity_demo"]');
+          const xai = document.querySelector('[data-prov-card="prov_xai_demo"]');
+          if (!chatgpt || !claude || !antigravity || !xai) {
+            throw new Error("Identity fixtures did not render");
+          }
+          if (!chatgpt.querySelector(".row-sub")?.textContent.includes("fant********@gmail.com")) {
+            throw new Error("Account email was not privacy masked");
+          }
+          if (antigravity.querySelector(".row-title")?.textContent.trim() !== "Antigravity") {
+            throw new Error("Email suffix was not removed from Antigravity account name");
+          }
+          if (!antigravity.querySelector(".row-sub")?.textContent.includes("grav********@example.com")) {
+            throw new Error("Antigravity account email was not privacy masked");
+          }
+          if (!claude.querySelector(".row-sub")?.textContent.includes("Route Fox")) {
+            throw new Error("Profile name was not used when account email was unavailable");
+          }
+          const markup = chatgpt.outerHTML + antigravity.outerHTML;
+          if (markup.includes("fantasticfox@gmail.com") || markup.includes("gravitypilot@example.com")) {
+            throw new Error("Raw account email leaked into provider markup");
+          }
+          if (!chatgpt.querySelector(".alias-badge")?.textContent.includes("Account 1")) {
+            throw new Error("OAuth account alias was not preserved");
+          }
+          if (!xai.querySelector(".row-sub")?.textContent.includes("Account 1")) {
+            throw new Error("OAuth alias was not used when account identity was unavailable");
+          }
+          if (xai.querySelector(".account-copy")?.textContent.includes("prov_")) {
+            throw new Error("Internal provider id leaked into account copy");
+          }
+          return true;
+        })()
+      `);
+    }
+    if (p === "quota") {
+      await win.webContents.executeJavaScript(`
+        (() => {
+          const card = document.querySelector(".quota-card");
+          if (!card?.textContent.includes("fant********@gmail.com")) {
+            throw new Error("Quota account email was not privacy masked");
+          }
+          if (card.querySelector(".row-title")?.textContent.trim() !== "ChatGPT") {
+            throw new Error("Email suffix was not removed from quota account name");
+          }
+          if (card.outerHTML.includes("fantasticfox@gmail.com")) {
+            throw new Error("Raw account email leaked into quota markup");
+          }
+          if (!card.querySelector(".alias-badge")?.textContent.includes("Account 1")) {
+            throw new Error("Quota OAuth account alias was not preserved");
+          }
+          return true;
+        })()
+      `);
+    }
   }
 
   await win.webContents.executeJavaScript(`

scripts/capture-ui.js

@@ -65,6 +65,7 @@ const OAUTH = {
     clientId: "9d1c250a-e61b-44d9-88ed-5944d1962f5e",
     authorizeUrl: "https://claude.ai/oauth/authorize",
     tokenUrl: "https://api.anthropic.com/v1/oauth/token",
+    profileUrl: "https://api.anthropic.com/api/oauth/profile",
     scopes: ["org:create_api_key", "user:profile", "user:inference"],
     codeChallengeMethod: "S256",
     // Use a dedicated loopback callback. The full URL can be pasted if needed.

src/lib/constants.js

@@ -7,6 +7,11 @@ const { execFile } = require("node:child_process");
 const { promisify } = require("node:util");
 const { OAUTH } = require("./constants");
 const { generateId } = require("./password");
+const {
+  applyIdentity,
+  identityFromTokens,
+  mergeIdentity,
+} = require("./oauth-identity");
 
 const execFileAsync = promisify(execFile);
 
@@ -63,7 +68,7 @@ function detectCodex() {
             source: "codex-file",
             path: p,
             type: "chatgpt",
-            name: `ChatGPT (${data.email || path.basename(p, ".json")})`,
+            name: "ChatGPT",
             email: data.email,
             accessToken: access,
             refreshToken: refresh,
@@ -156,7 +161,7 @@ function detectClaudeFiles() {
         source: "claude-file",
         path: p,
         type: "claude",
-        name: `Claude (${data.email || path.basename(p, ".json")})`,
+        name: "Claude",
         email: data.email,
         accessToken: access,
         refreshToken: refresh,
@@ -211,7 +216,7 @@ function detectAntigravity() {
         source: "antigravity-file",
         path: p,
         type: "antigravity",
-        name: `Antigravity (${data.email || path.basename(p, ".json")})`,
+        name: "Antigravity",
         email: data.email,
         accessToken: access,
         refreshToken: refresh,
@@ -233,6 +238,52 @@ function detectAntigravity() {
   return found;
 }
 
+function localXaiIdentity(provider, authData) {
+  const stored = identityFromTokens("xai", provider || {});
+  const entries = Object.values(authData || {}).filter(
+    (entry) => entry && typeof entry === "object" && !Array.isArray(entry)
+  );
+
+  for (const entry of entries) {
+    const identity = mergeIdentity(
+      {
+        email: entry.email,
+        profileName:
+          entry.name || [entry.first_name, entry.last_name].filter(Boolean).join(" "),
+        accountId: entry.principal_id || entry.user_id,
+      },
+      identityFromTokens("xai", {
+        accessToken: entry.key || entry.access_token || entry.accessToken,
+        idToken: entry.id_token || entry.idToken,
+      })
+    );
+    const sameAccount =
+      (stored.accountId && identity.accountId && stored.accountId === identity.accountId) ||
+      (provider?.accessToken &&
+        provider.accessToken === (entry.key || entry.access_token || entry.accessToken));
+    if (sameAccount) return identity;
+  }
+  return {};
+}
+
+function backfillLocalOAuthIdentities(providers, { xaiAuthData } = {}) {
+  let authData = xaiAuthData;
+  if (authData === undefined) {
+    try {
+      authData = JSON.parse(fs.readFileSync(path.join(home(), ".grok", "auth.json"), "utf8"));
+    } catch {
+      authData = null;
+    }
+  }
+
+  let changed = false;
+  for (const provider of providers || []) {
+    if (provider?.type !== "xai" || (provider.email && provider.profileName)) continue;
+    changed = applyIdentity(provider, localXaiIdentity(provider, authData)) || changed;
+  }
+  return changed;
+}
+
 /**
  * Run all detectors. Returns flat list of importable accounts (no secrets stripped —
  * caller imports selected ones into store).
@@ -277,6 +328,8 @@ module.exports = {
   detectCodex,
   detectClaudeKeychain,
   detectAntigravity,
+  localXaiIdentity,
+  backfillLocalOAuthIdentities,
   detectAll,
   summarizeDetected,
 };

src/lib/detect.js

@@ -4,12 +4,20 @@ const http = require("node:http");
 const { DEFAULT_PORT } = require("./constants");
 const logger = require("./logger");
 
+const MAX_JSON_BODY_BYTES = 32 * 1024 * 1024;
+
 /**
  * OpenAI-compatible HTTP gateway.
  * Auth: Authorization: Bearer <apiKey>
  * Routes: GET /v1/models, POST /v1/chat/completions, GET /health
  */
-function createGateway({ store, router, port = DEFAULT_PORT, host = "127.0.0.1" } = {}) {
+function createGateway({
+  store,
+  router,
+  port = DEFAULT_PORT,
+  host = "127.0.0.1",
+  maxBodyBytes = MAX_JSON_BODY_BYTES,
+} = {}) {
   let server = null;
   let listeningPort = null;
   let listeningHost = null;
@@ -50,8 +58,33 @@ function createGateway({ store, router, port = DEFAULT_PORT, host = "127.0.0.1"
   function readBody(req) {
     return new Promise((resolve, reject) => {
       const chunks = [];
-      req.on("data", (c) => chunks.push(c));
+      let size = 0;
+      let settled = false;
+      const tooLarge = () => {
+        const error = new Error("Request body is too large");
+        error.code = "REQUEST_BODY_TOO_LARGE";
+        return error;
+      };
+      const declaredLength = Number(req.headers["content-length"]);
+      if (Number.isFinite(declaredLength) && declaredLength > maxBodyBytes) {
+        req.resume();
+        reject(tooLarge());
+        return;
+      }
+      req.on("data", (c) => {
+        if (settled) return;
+        size += c.length;
+        if (size > maxBodyBytes) {
+          settled = true;
+          chunks.length = 0;
+          reject(tooLarge());
+          return;
+        }
+        chunks.push(c);
+      });
       req.on("end", () => {
+        if (settled) return;
+        settled = true;
         const raw = Buffer.concat(chunks).toString("utf8");
         if (!raw) return resolve({});
         try {
@@ -60,7 +93,11 @@ function createGateway({ store, router, port = DEFAULT_PORT, host = "127.0.0.1"
           reject(e);
         }
       });
-      req.on("error", reject);
+      req.on("error", (error) => {
+        if (settled) return;
+        settled = true;
+        reject(error);
+      });
     });
   }
 
@@ -124,7 +161,21 @@ function createGateway({ store, router, port = DEFAULT_PORT, host = "127.0.0.1"
         let body;
         try {
           body = await readBody(req);
-        } catch {
+        } catch (error) {
+          if (error?.code === "REQUEST_BODY_TOO_LARGE") {
+            logger.warn("chat/completions: request body too large");
+            res.writeHead(413, { "Content-Type": "application/json" });
+            res.end(
+              JSON.stringify({
+                error: {
+                  message: `Request body exceeds the ${Math.floor(maxBodyBytes / (1024 * 1024))} MiB limit`,
+                  type: "invalid_request_error",
+                  code: "request_body_too_large",
+                },
+              })
+            );
+            return;
+          }
           logger.warn("chat/completions: invalid JSON body");
           res.writeHead(400, { "Content-Type": "application/json" });
           res.end(
@@ -273,4 +324,4 @@ function createGateway({ store, router, port = DEFAULT_PORT, host = "127.0.0.1"
   return { start, stop, restart, isListening, getAddress, checkAuth, handle, validKeys };
 }
 
-module.exports = { createGateway };
+module.exports = { createGateway, MAX_JSON_BODY_BYTES };