Merge provider-first accounts UI

gitcommit90 · gitcommit90 · commit d0fc8ab5f965 · 2026-07-15T01:52:52.000Z
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "rerouted",
-  "version": "0.4.5",
+  "version": "0.4.6",
   "description": "A macOS menu-bar router for accounts, models, and automatic fallback.",
   "author": "gitcommit90",
   "homepage": "https://rerouted.dev",
diff --git a/scripts/capture-ui.js b/scripts/capture-ui.js
diff --git a/src/renderer/app.js b/src/renderer/app.js
diff --git a/src/renderer/assets/providers/antigravity.svg b/src/renderer/assets/providers/antigravity.svg
@@ -0,0 +1,12 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+  <title>Google Antigravity</title>
+  <defs>
+    <linearGradient id="antigravity-gradient" x1="12" x2="12" y1="1" y2="23" gradientUnits="userSpaceOnUse">
+      <stop offset="0" stop-color="#FF5A4E"/>
+      <stop offset=".28" stop-color="#F7C948"/>
+      <stop offset=".52" stop-color="#53B96A"/>
+      <stop offset=".82" stop-color="#4285F4"/>
+    </linearGradient>
+  </defs>
+  <path fill="url(#antigravity-gradient)" fill-rule="evenodd" d="M21.751 22.607c1.34 1.005 3.35.335 1.508-1.508C17.73 15.74 18.904 1 12.037 1 5.17 1 6.342 15.74.815 21.1c-2.01 2.009.167 2.511 1.507 1.506 5.192-3.517 4.857-9.714 9.715-9.714 4.857 0 4.522 6.197 9.714 9.715Z"/>
+</svg>
diff --git a/src/renderer/assets/providers/chatgpt.svg b/src/renderer/assets/providers/chatgpt.svg
@@ -0,0 +1,4 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+  <title>ChatGPT</title>
+  <path fill="#10A37F" d="M22.2819 9.8211a5.9847 5.9847 0 0 0-.5157-4.9108 6.0462 6.0462 0 0 0-6.5098-2.9A6.0651 6.0651 0 0 0 4.9807 4.1818a5.9847 5.9847 0 0 0-3.9977 2.9 6.0462 6.0462 0 0 0 .7427 7.0966 5.98 5.98 0 0 0 .511 4.9107 6.051 6.051 0 0 0 6.5146 2.9001A5.9847 5.9847 0 0 0 13.2599 24a6.0557 6.0557 0 0 0 5.7718-4.2058 5.9894 5.9894 0 0 0 3.9977-2.9001 6.0557 6.0557 0 0 0-.7475-7.0729zm-9.022 12.6081a4.4755 4.4755 0 0 1-2.8764-1.0408l.1419-.0804 4.7783-2.7582a.7948.7948 0 0 0 .3927-.6813v-6.7369l2.02 1.1686a.071.071 0 0 1 .038.052v5.5826a4.504 4.504 0 0 1-4.4945 4.4944zm-9.6607-4.1254a4.4708 4.4708 0 0 1-.5346-3.0137l.142.0852 4.783 2.7582a.7712.7712 0 0 0 .7806 0l5.8428-3.3685v2.3324a.0804.0804 0 0 1-.0332.0615L9.74 19.9502a4.4992 4.4992 0 0 1-6.1408-1.6464zM2.3408 7.8956a4.485 4.485 0 0 1 2.3655-1.9728V11.6a.7664.7664 0 0 0 .3879.6765l5.8144 3.3543-2.0201 1.1685a.0757.0757 0 0 1-.071 0l-4.8303-2.7865A4.504 4.504 0 0 1 2.3408 7.872zm16.5963 3.8558L13.1038 8.364 15.1192 7.2a.0757.0757 0 0 1 .071 0l4.8303 2.7913a4.4944 4.4944 0 0 1-.6765 8.1042v-5.6772a.79.79 0 0 0-.407-.667zm2.0107-3.0231l-.142-.0852-4.7735-2.7818a.7759.7759 0 0 0-.7854 0L9.409 9.2297V6.8974a.0662.0662 0 0 1 .0284-.0615l4.8303-2.7866a4.4992 4.4992 0 0 1 6.6802 4.66zM8.3065 12.863l-2.02-1.1638a.0804.0804 0 0 1-.038-.0567V6.0742a4.4992 4.4992 0 0 1 7.3757-3.4537l-.142.0805L8.704 5.459a.7948.7948 0 0 0-.3927.6813zm1.0976-2.3654l2.602-1.4998 2.6069 1.4998v2.9994l-2.5974 1.4997-2.6067-1.4997Z"/>
+</svg>
diff --git a/src/renderer/assets/providers/claude.svg b/src/renderer/assets/providers/claude.svg
@@ -0,0 +1,4 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+  <title>Claude</title>
+  <path fill="#D97757" d="m4.7144 15.9555 4.7174-2.6471.079-.2307-.079-.1275h-.2307l-.7893-.0486-2.6956-.0729-2.3375-.0971-2.2646-.1214-.5707-.1215-.5343-.7042.0546-.3522.4797-.3218.686.0608 1.5179.1032 2.2767.1578 1.6514.0972 2.4468.255h.3886l.0546-.1579-.1336-.0971-.1032-.0972L6.973 9.8356l-2.55-1.6879-1.3356-.9714-.7225-.4918-.3643-.4614-.1578-1.0078.6557-.7225.8803.0607.2246.0607.8925.686 1.9064 1.4754 2.4893 1.8336.3643.3035.1457-.1032.0182-.0728-.164-.2733-1.3539-2.4467-1.445-2.4893-.6435-1.032-.17-.6194c-.0607-.255-.1032-.4674-.1032-.7285L6.287.1335 6.6997 0l.9957.1336.419.3642.6192 1.4147 1.0018 2.2282 1.5543 3.0296.4553.8985.2429.8318.091.255h.1579v-.1457l.1275-1.706.2368-2.0947.2307-2.6957.0789-.7589.3764-.9107.7468-.4918.5828.2793.4797.686-.0668.4433-.2853 1.8517-.5586 2.9021-.3643 1.9429h.2125l.2429-.2429.9835-1.3053 1.6514-2.0643.7286-.8196.85-.9046.5464-.4311h1.0321l.759 1.1293-.34 1.1657-1.0625 1.3478-.8804 1.1414-1.2628 1.7-.7893 1.36.0729.1093.1882-.0183 2.8535-.607 1.5421-.2794 1.8396-.3157.8318.3886.091.3946-.3278.8075-1.967.4857-2.3072.4614-3.4364.8136-.0425.0304.0486.0607 1.5482.1457.6618.0364h1.621l3.0175.2247.7892.522.4736.6376-.079.4857-1.2142.6193-1.6393-.3886-3.825-.9107-1.3113-.3279h-.1822v.1093l1.0929 1.0686 2.0035 1.8092 2.5075 2.3314.1275.5768-.3218.4554-.34-.0486-2.2039-1.6575-.85-.7468-1.9246-1.621h-.1275v.17l.4432.6496 2.3436 3.5214.1214 1.0807-.17.3521-.6071.2125-.6679-.1214-1.3721-1.9246L14.38 17.959l-1.1414-1.9428-.1397.079-.674 7.2552-.3156.3703-.7286.2793-.6071-.4614-.3218-.7468.3218-1.4753.3886-1.9246.3157-1.53.2853-1.9004.17-.6314-.0121-.0425-.1397.0182-1.4328 1.9672-2.1796 2.9446-1.7243 1.8456-.4128.164-.7164-.3704.0667-.6618.4008-.5889 2.386-3.0357 1.4389-1.882.929-1.0868-.0062-.1579h-.0546l-6.3385 4.1164-1.1293.1457-.4857-.4554.0608-.7467.2307-.2429 1.9064-1.3114Z"/>
+</svg>
diff --git a/src/renderer/assets/providers/cloudflare.svg b/src/renderer/assets/providers/cloudflare.svg
@@ -0,0 +1,4 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+  <title>Cloudflare</title>
+  <path fill="#F38020" d="M16.5088 16.8447c.1475-.5068.0908-.9707-.1553-1.3154-.2246-.3164-.6045-.499-1.0615-.5205l-8.6592-.1123a.1559.1559 0 0 1-.1333-.0713c-.0283-.042-.0351-.0986-.021-.1553.0278-.084.1123-.1484.2036-.1562l8.7359-.1123c1.0351-.0489 2.1601-.8868 2.5537-1.9136l.499-1.3013c.0215-.0561.0293-.1128.0147-.168-.5625-2.5463-2.835-4.4453-5.5499-4.4453-2.5039 0-4.6284 1.6177-5.3876 3.8614-.4927-.3658-1.1187-.5625-1.794-.499-1.2026.119-2.1665 1.083-2.2861 2.2856-.0283.31-.0069.6128.0635.894C1.5683 13.171 0 14.7754 0 16.752c0 .1748.0142.3515.0352.5273.0141.083.0844.1475.1689.1475h15.9814c.0909 0 .1758-.0645.2032-.1553l.12-.4268Zm2.7568-5.5634c-.0771 0-.1611 0-.2383.0112-.0566 0-.1054.0415-.127.0976l-.3378 1.1744c-.1475.5068-.0918.9707.1543 1.3164.2256.3164.6055.498 1.0625.5195l1.8437.1133c.0557 0 .1055.0263.1329.0703.0283.043.0351.1074.0214.1562-.0283.084-.1132.1485-.204.1553l-1.921.1123c-1.041.0488-2.1582.8867-2.5527 1.914l-.1406.3585c-.0283.0713.0215.1416.0986.1416h6.5977c.0771 0 .1474-.0489.169-.126.1122-.4082.1757-.837.1757-1.2803 0-2.6025-2.125-4.727-4.7344-4.727Z"/>
+</svg>
diff --git a/src/renderer/assets/providers/custom.svg b/src/renderer/assets/providers/custom.svg
@@ -0,0 +1,9 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+  <title>Custom provider</title>
+  <g fill="none" stroke="#EF5B2A" stroke-linecap="round" stroke-width="2.25">
+    <path d="M4 6h5m4 0h7M4 12h10m4 0h2M4 18h2m4 0h10"/>
+    <circle cx="11" cy="6" r="2"/>
+    <circle cx="16" cy="12" r="2"/>
+    <circle cx="8" cy="18" r="2"/>
+  </g>
+</svg>
diff --git a/src/renderer/assets/providers/glm.svg b/src/renderer/assets/providers/glm.svg
@@ -0,0 +1,5 @@
+<svg role="img" viewBox="0 0 30 30" xmlns="http://www.w3.org/2000/svg">
+  <title>GLM Coding</title>
+  <path fill="#2D2D2D" d="M24.51 28.51H5.49c-2.21 0-4-1.79-4-4V5.49c0-2.21 1.79-4 4-4h19.03c2.21 0 4 1.79 4 4v19.03c-.01 2.2-1.8 3.99-4.01 3.99Z"/>
+  <path fill="#FFFFFF" d="m15.47 7.1-1.3 1.85c-.2.29-.54.47-.9.47h-7.1V7.09l9.3.01Zm8.83 0L13.14 22.91H5.7L16.86 7.1h7.44Zm-9.77 15.81 1.31-1.86c.2-.29.54-.47.9-.47h7.09v2.33h-9.3Z"/>
+</svg>
diff --git a/src/renderer/assets/providers/nvidia.svg b/src/renderer/assets/providers/nvidia.svg
@@ -0,0 +1,4 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+  <title>NVIDIA</title>
+  <path fill="#76B900" d="M8.948 8.798v-1.43a6.7 6.7 0 0 1 .424-.018c3.922-.124 6.493 3.374 6.493 3.374s-2.774 3.851-5.75 3.851c-.398 0-.787-.062-1.158-.185v-4.346c1.528.185 1.837.857 2.747 2.385l2.04-1.714s-1.492-1.952-4-1.952a6.016 6.016 0 0 0-.796.035m0-4.735v2.138l.424-.027c5.45-.185 9.01 4.47 9.01 4.47s-4.08 4.964-8.33 4.964c-.37 0-.733-.035-1.095-.097v1.325c.3.035.61.062.91.062 3.957 0 6.82-2.023 9.593-4.408.459.371 2.34 1.263 2.73 1.652-2.633 2.208-8.772 3.984-12.253 3.984-.335 0-.653-.018-.971-.053v1.864H24V4.063zm0 10.326v1.131c-3.657-.654-4.673-4.46-4.673-4.46s1.758-1.944 4.673-2.262v1.237H8.94c-1.528-.186-2.73 1.245-2.73 1.245s.68 2.412 2.739 3.11M2.456 10.9s2.164-3.197 6.5-3.533V6.201C4.153 6.59 0 10.653 0 10.653s2.35 6.802 8.948 7.42v-1.237c-4.84-.6-6.492-5.936-6.492-5.936Z"/>
+</svg>
diff --git a/src/renderer/assets/providers/openrouter.svg b/src/renderer/assets/providers/openrouter.svg
@@ -0,0 +1,4 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+  <title>OpenRouter</title>
+  <path fill="#64748B" d="M16.778 1.844v1.919q-.569-.026-1.138-.032-.708-.008-1.415.037c-1.93.126-4.023.728-6.149 2.237-2.911 2.066-2.731 1.95-4.14 2.75-.396.223-1.342.574-2.185.798-.841.225-1.753.333-1.751.333v4.229s.768.108 1.61.333c.842.224 1.789.575 2.185.799 1.41.798 1.228.683 4.14 2.75 2.126 1.509 4.22 2.11 6.148 2.236.88.058 1.716.041 2.555.005v1.918l7.222-4.168-7.222-4.17v2.176c-.86.038-1.611.065-2.278.021-1.364-.09-2.417-.357-3.979-1.465-2.244-1.593-2.866-2.027-3.68-2.508.889-.518 1.449-.906 3.822-2.59 1.56-1.109 2.614-1.377 3.978-1.466.667-.044 1.418-.017 2.278.02v2.176L24 6.014Z"/>
+</svg>
diff --git a/src/renderer/assets/providers/xai.svg b/src/renderer/assets/providers/xai.svg
@@ -0,0 +1,4 @@
+<svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+  <title>xAI</title>
+  <path fill="#111111" fill-rule="evenodd" d="M6.469 8.776 16.512 23h-4.464L2.005 8.776H6.47Zm-.004 7.9 2.233 3.164L6.467 23H2l4.465-6.324ZM22 2.582V23h-3.659V7.764L22 2.582ZM22 1l-9.952 14.095-2.233-3.163L17.533 1H22Z"/>
+</svg>
diff --git a/src/renderer/index.html b/src/renderer/index.html
@@ -61,6 +61,7 @@
     <script src="account-identity.js"></script>
     <script src="number-format.js"></script>
     <script src="lock-state.js"></script>
+    <script src="provider-catalog.js"></script>
     <script src="app.js"></script>
   </body>
 </html>
diff --git a/src/renderer/provider-catalog.js b/src/renderer/provider-catalog.js
@@ -0,0 +1,101 @@
+"use strict";
+
+(function exposeProviderCatalog(root) {
+  const TYPE_ALIASES = {
+    codex: "chatgpt",
+    custom: "custom",
+    "openai-compat": "custom",
+  };
+
+  function canonicalProviderType(type) {
+    const value = String(type || "").trim();
+    if (!value) return "";
+    return TYPE_ALIASES[value.toLowerCase()] || value;
+  }
+
+  function providerName(provider, fallback) {
+    const name = String(provider?.name || "").trim();
+    if (name) return name;
+    return String(fallback || "Provider")
+      .replace(/[-_]+/g, " ")
+      .replace(/\b\w/g, (letter) => letter.toUpperCase());
+  }
+
+  function buildProviderCatalog(source = {}) {
+    const oauthProviders = Array.isArray(source.oauthProviders) ? source.oauthProviders : [];
+    const keyedPresets = Array.isArray(source.keyedPresets) ? source.keyedPresets : [];
+    const connectedProviders = Array.isArray(source.providers)
+      ? source.providers
+      : Array.isArray(source.connectedProviders)
+        ? source.connectedProviders
+        : [];
+    const entries = [];
+    const entriesById = new Map();
+
+    for (const provider of oauthProviders) {
+      const id = canonicalProviderType(provider?.id || provider?.type);
+      if (!id || entriesById.has(id)) continue;
+      const entry = {
+        id,
+        name: providerName(provider, id),
+        kind: "oauth",
+        accounts: [],
+        oauthType: id,
+      };
+      entries.push(entry);
+      entriesById.set(id, entry);
+    }
+
+    let customPreset = null;
+    for (const preset of keyedPresets) {
+      const id = canonicalProviderType(preset?.id || preset?.type);
+      if (!id) continue;
+      if (id === "custom") {
+        customPreset ||= preset;
+        continue;
+      }
+      if (entriesById.has(id)) continue;
+      const entry = {
+        id,
+        name: providerName(preset, id),
+        kind: "keyed",
+        accounts: [],
+        preset,
+      };
+      entries.push(entry);
+      entriesById.set(id, entry);
+    }
+
+    const customEntry = {
+      id: "custom",
+      name: "Custom",
+      kind: "custom",
+      accounts: [],
+    };
+    if (customPreset) customEntry.preset = customPreset;
+    entries.push(customEntry);
+    entriesById.set(customEntry.id, customEntry);
+
+    for (const account of connectedProviders) {
+      const id = canonicalProviderType(account?.type) || "unknown";
+      let entry = entriesById.get(id);
+      if (!entry) {
+        entry = {
+          id,
+          name: providerName(account, id),
+          kind: "unknown",
+          accounts: [],
+        };
+        entries.push(entry);
+        entriesById.set(id, entry);
+      }
+      entry.accounts.push(account);
+    }
+
+    return entries;
+  }
+
+  const api = { buildProviderCatalog, canonicalProviderType };
+  if (typeof module !== "undefined" && module.exports) module.exports = api;
+  if (root) root.ReroutedProviderCatalog = api;
+})(typeof window !== "undefined" ? window : null);
diff --git a/src/renderer/styles.css b/src/renderer/styles.css
diff --git a/tests/provider-catalog.test.js b/tests/provider-catalog.test.js

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "rerouted",`
`3`		`- "version": "0.4.5",`
	`3`	`+ "version": "0.4.6",`
`4`	`4`	`"description": "A macOS menu-bar router for accounts, models, and automatic fallback.",`
`5`	`5`	`"author": "gitcommit90",`
`6`	`6`	`"homepage": "https://rerouted.dev",`