tokentracker-cli 0.24.6 → 0.24.7

package/dashboard/dist/assets/{use-limits-display-prefs-DccYvUNZ.js → use-limits-display-prefs-IJ650iD0.js}

@@ -1 +1 @@
-import{r as a}from"./main-QPJFCBQm.js";const d=["claude","codex","cursor","gemini","kimi","kiro","copilot","antigravity"],S={claude:"Claude",codex:"Codex",cursor:"Cursor",gemini:"Gemini",kimi:"Kimi",kiro:"Kiro",copilot:"GitHub Copilot",antigravity:"Antigravity"},v={claude:"/brand-logos/claude-code.svg",codex:"/brand-logos/codex.svg",cursor:"/brand-logos/cursor.svg",gemini:"/brand-logos/gemini.svg",kimi:"/brand-logos/kimi.svg",kiro:"/brand-logos/kiro.svg",copilot:"/brand-logos/copilot.svg",antigravity:"/brand-logos/antigravity.svg"},l="tt.limits.providerOrder",g="tt.limits.providerVisibility";function w(){if(typeof window>"u")return[...d];try{const i=window.localStorage.getItem(l);if(!i)return[...d];const s=JSON.parse(i);if(!Array.isArray(s))return[...d];const r=s.filter(c=>d.includes(c));for(const c of d)r.includes(c)||r.push(c);return r}catch{return[...d]}}function y(){const i=Object.fromEntries(d.map(s=>[s,!0]));if(typeof window>"u")return i;try{const s=window.localStorage.getItem(g);if(!s)return i;const r=JSON.parse(s);if(!r||typeof r!="object")return i;const c={...i};for(const u of d)typeof r[u]=="boolean"&&(c[u]=r[u]);return c}catch{return i}}function C(){const[i,s]=a.useState(w),[r,c]=a.useState(y);a.useEffect(()=>{if(!(typeof window>"u"))try{window.localStorage.setItem(l,JSON.stringify(i))}catch{}},[i]),a.useEffect(()=>{if(!(typeof window>"u"))try{window.localStorage.setItem(g,JSON.stringify(r))}catch{}},[r]),a.useEffect(()=>{if(typeof window>"u")return;const o=t=>{t.key===l&&s(w()),t.key===g&&c(y())};return window.addEventListener("storage",o),()=>window.removeEventListener("storage",o)},[]);const u=a.useCallback(o=>{c(t=>({...t,[o]:!t[o]}))},[]),b=a.useCallback(o=>{s(t=>{const e=t.indexOf(o);if(e<=0)return t;const n=[...t];return[n[e-1],n[e]]=[n[e],n[e-1]],n})},[]),p=a.useCallback(o=>{s(t=>{const e=t.indexOf(o);if(e<0||e>=t.length-1)return t;const n=[...t];return[n[e],n[e+1]]=[n[e+1],n[e]],n})},[]),O=a.useCallback((o,t)=>{o!==t&&s(e=>{const n=e.indexOf(o),m=e.indexOf(t);if(n<0||m<0)return e;const f=[...e],[I]=f.splice(n,1);return f.splice(m,0,I),f})},[]),k=a.useCallback(()=>{s([...d]),c(Object.fromEntries(d.map(o=>[o,!0])))},[]),x=a.useMemo(()=>i.filter(o=>r[o]!==!1),[i,r]);return{order:i,visibility:r,visibleOrdered:x,toggle:u,moveUp:b,moveDown:p,moveToward:O,reset:k}}export{v as L,S as a,C as u};
+import{r as a}from"./main-DDbFansE.js";const d=["claude","codex","cursor","gemini","kimi","kiro","copilot","antigravity"],S={claude:"Claude",codex:"Codex",cursor:"Cursor",gemini:"Gemini",kimi:"Kimi",kiro:"Kiro",copilot:"GitHub Copilot",antigravity:"Antigravity"},v={claude:"/brand-logos/claude-code.svg",codex:"/brand-logos/codex.svg",cursor:"/brand-logos/cursor.svg",gemini:"/brand-logos/gemini.svg",kimi:"/brand-logos/kimi.svg",kiro:"/brand-logos/kiro.svg",copilot:"/brand-logos/copilot.svg",antigravity:"/brand-logos/antigravity.svg"},l="tt.limits.providerOrder",g="tt.limits.providerVisibility";function w(){if(typeof window>"u")return[...d];try{const i=window.localStorage.getItem(l);if(!i)return[...d];const s=JSON.parse(i);if(!Array.isArray(s))return[...d];const r=s.filter(c=>d.includes(c));for(const c of d)r.includes(c)||r.push(c);return r}catch{return[...d]}}function y(){const i=Object.fromEntries(d.map(s=>[s,!0]));if(typeof window>"u")return i;try{const s=window.localStorage.getItem(g);if(!s)return i;const r=JSON.parse(s);if(!r||typeof r!="object")return i;const c={...i};for(const u of d)typeof r[u]=="boolean"&&(c[u]=r[u]);return c}catch{return i}}function C(){const[i,s]=a.useState(w),[r,c]=a.useState(y);a.useEffect(()=>{if(!(typeof window>"u"))try{window.localStorage.setItem(l,JSON.stringify(i))}catch{}},[i]),a.useEffect(()=>{if(!(typeof window>"u"))try{window.localStorage.setItem(g,JSON.stringify(r))}catch{}},[r]),a.useEffect(()=>{if(typeof window>"u")return;const o=t=>{t.key===l&&s(w()),t.key===g&&c(y())};return window.addEventListener("storage",o),()=>window.removeEventListener("storage",o)},[]);const u=a.useCallback(o=>{c(t=>({...t,[o]:!t[o]}))},[]),b=a.useCallback(o=>{s(t=>{const e=t.indexOf(o);if(e<=0)return t;const n=[...t];return[n[e-1],n[e]]=[n[e],n[e-1]],n})},[]),p=a.useCallback(o=>{s(t=>{const e=t.indexOf(o);if(e<0||e>=t.length-1)return t;const n=[...t];return[n[e],n[e+1]]=[n[e+1],n[e]],n})},[]),O=a.useCallback((o,t)=>{o!==t&&s(e=>{const n=e.indexOf(o),m=e.indexOf(t);if(n<0||m<0)return e;const f=[...e],[I]=f.splice(n,1);return f.splice(m,0,I),f})},[]),k=a.useCallback(()=>{s([...d]),c(Object.fromEntries(d.map(o=>[o,!0])))},[]),x=a.useMemo(()=>i.filter(o=>r[o]!==!1),[i,r]);return{order:i,visibility:r,visibleOrdered:x,toggle:u,moveUp:b,moveDown:p,moveToward:O,reset:k}}export{v as L,S as a,C as u};

package/dashboard/dist/assets/{use-native-settings-DAbSUv-n.js → use-native-settings-B0Civ1m0.js}

@@ -1 +1 @@
-import{C as a,a7 as x,r as n,aH as g,aI as m,aJ as b,aK as u,aL as f,aF as h}from"./main-QPJFCBQm.js";import{C as y}from"./Card-BfayTmBt.js";function p({checked:s,onChange:t,disabled:e,ariaLabel:i}){return a.jsx("button",{type:"button",role:"switch","aria-checked":s,"aria-label":i,onClick:t,disabled:e,className:x("relative inline-flex h-5 w-9 shrink-0 items-center rounded-full transition-colors focus:outline-none focus-visible:ring-2 focus-visible:ring-oai-brand-500 disabled:opacity-50 disabled:cursor-not-allowed",s?"bg-oai-brand-500":"bg-oai-gray-300 dark:bg-oai-gray-700"),children:a.jsx("span",{className:x("inline-block h-3.5 w-3.5 rounded-full bg-white transition-transform",s?"translate-x-[18px]":"translate-x-[3px]")})})}function j({label:s,hint:t,control:e}){return a.jsxs("div",{className:"flex items-center justify-between gap-4 py-3",children:[a.jsxs("div",{className:"min-w-0 flex-1",children:[a.jsx("div",{className:"text-sm text-oai-gray-900 dark:text-oai-gray-200",children:s}),t?a.jsx("div",{className:"mt-0.5 text-xs text-oai-gray-500 dark:text-oai-gray-400",children:t}):null]}),a.jsx("div",{className:"shrink-0",children:e})]})}function N({title:s,subtitle:t,action:e,children:i}){return a.jsxs(y,{children:[a.jsxs("div",{className:"mb-3 flex items-start justify-between gap-4",children:[a.jsxs("div",{className:"min-w-0 flex-1",children:[a.jsx("h2",{className:"text-sm font-medium text-oai-gray-500 dark:text-oai-gray-300 uppercase tracking-wide",children:s}),t?a.jsx("p",{className:"mt-1 truncate text-xs text-oai-gray-500 dark:text-oai-gray-400",children:t}):null]}),e?a.jsx("div",{className:"shrink-0",children:e}):null]}),a.jsx("div",{className:"-mb-3 divide-y divide-oai-gray-200/60 dark:divide-oai-gray-800/60",children:i})]})}function w({options:s,value:t,onChange:e}){return a.jsx("div",{className:"inline-flex items-center rounded-lg border border-oai-gray-200 bg-oai-gray-50 p-0.5 dark:border-oai-gray-800 dark:bg-oai-gray-900",children:s.map(({value:i,label:d,Icon:l})=>{const r=t===i;return a.jsxs("button",{type:"button",onClick:()=>e(i),"aria-pressed":r,className:x("inline-flex items-center gap-1.5 rounded-md px-3 py-1.5 text-xs font-medium transition-colors",r?"bg-white text-oai-black shadow-sm dark:bg-oai-gray-800 dark:text-white":"text-oai-gray-500 hover:text-oai-black dark:text-oai-gray-400 dark:hover:text-white"),children:[l?a.jsx(l,{className:"h-3.5 w-3.5","aria-hidden":!0}):null,a.jsx("span",{children:d})]},i)})})}function S(){const[s,t]=n.useState(null),e=g()&&m();n.useEffect(()=>{if(!e)return;const r=b(o=>t(o));return u(),r},[e]);const i=n.useCallback((r,o)=>{e&&(t(c=>c&&{...c,[r]:o}),f(r,o))},[e]),d=n.useCallback(r=>{e&&h(r)},[e]),l=n.useCallback(()=>{e&&u()},[e]);return{available:e,settings:s,setSetting:i,runAction:d,refresh:l}}export{N as S,p as T,j as a,w as b,S as u};
+import{C as a,a7 as x,r as n,aH as g,aI as m,aJ as b,aK as u,aL as f,aF as h}from"./main-DDbFansE.js";import{C as y}from"./Card-Cy2qG2yw.js";function p({checked:s,onChange:t,disabled:e,ariaLabel:i}){return a.jsx("button",{type:"button",role:"switch","aria-checked":s,"aria-label":i,onClick:t,disabled:e,className:x("relative inline-flex h-5 w-9 shrink-0 items-center rounded-full transition-colors focus:outline-none focus-visible:ring-2 focus-visible:ring-oai-brand-500 disabled:opacity-50 disabled:cursor-not-allowed",s?"bg-oai-brand-500":"bg-oai-gray-300 dark:bg-oai-gray-700"),children:a.jsx("span",{className:x("inline-block h-3.5 w-3.5 rounded-full bg-white transition-transform",s?"translate-x-[18px]":"translate-x-[3px]")})})}function j({label:s,hint:t,control:e}){return a.jsxs("div",{className:"flex items-center justify-between gap-4 py-3",children:[a.jsxs("div",{className:"min-w-0 flex-1",children:[a.jsx("div",{className:"text-sm text-oai-gray-900 dark:text-oai-gray-200",children:s}),t?a.jsx("div",{className:"mt-0.5 text-xs text-oai-gray-500 dark:text-oai-gray-400",children:t}):null]}),a.jsx("div",{className:"shrink-0",children:e})]})}function N({title:s,subtitle:t,action:e,children:i}){return a.jsxs(y,{children:[a.jsxs("div",{className:"mb-3 flex items-start justify-between gap-4",children:[a.jsxs("div",{className:"min-w-0 flex-1",children:[a.jsx("h2",{className:"text-sm font-medium text-oai-gray-500 dark:text-oai-gray-300 uppercase tracking-wide",children:s}),t?a.jsx("p",{className:"mt-1 truncate text-xs text-oai-gray-500 dark:text-oai-gray-400",children:t}):null]}),e?a.jsx("div",{className:"shrink-0",children:e}):null]}),a.jsx("div",{className:"-mb-3 divide-y divide-oai-gray-200/60 dark:divide-oai-gray-800/60",children:i})]})}function w({options:s,value:t,onChange:e}){return a.jsx("div",{className:"inline-flex items-center rounded-lg border border-oai-gray-200 bg-oai-gray-50 p-0.5 dark:border-oai-gray-800 dark:bg-oai-gray-900",children:s.map(({value:i,label:d,Icon:l})=>{const r=t===i;return a.jsxs("button",{type:"button",onClick:()=>e(i),"aria-pressed":r,className:x("inline-flex items-center gap-1.5 rounded-md px-3 py-1.5 text-xs font-medium transition-colors",r?"bg-white text-oai-black shadow-sm dark:bg-oai-gray-800 dark:text-white":"text-oai-gray-500 hover:text-oai-black dark:text-oai-gray-400 dark:hover:text-white"),children:[l?a.jsx(l,{className:"h-3.5 w-3.5","aria-hidden":!0}):null,a.jsx("span",{children:d})]},i)})})}function S(){const[s,t]=n.useState(null),e=g()&&m();n.useEffect(()=>{if(!e)return;const r=b(o=>t(o));return u(),r},[e]);const i=n.useCallback((r,o)=>{e&&(t(c=>c&&{...c,[r]:o}),f(r,o))},[e]),d=n.useCallback(r=>{e&&h(r)},[e]),l=n.useCallback(()=>{e&&u()},[e]);return{available:e,settings:s,setSetting:i,runAction:d,refresh:l}}export{N as S,p as T,j as a,w as b,S as u};

package/dashboard/dist/assets/{use-reduced-motion-B_GaKtWC.js → use-reduced-motion-DnF5Mq2H.js}

@@ -1 +1 @@
-import{aM as t,aN as o,r,aO as s}from"./main-QPJFCBQm.js";function u(){!t.current&&o();const[e]=r.useState(s.current);return e}export{u};
+import{aM as t,aN as o,r,aO as s}from"./main-DDbFansE.js";function u(){!t.current&&o();const[e]=r.useState(s.current);return e}export{u};

package/dashboard/dist/assets/{use-usage-limits-3pTcFcoF.js → use-usage-limits-Ig-0cZyA.js}

@@ -1 +1 @@
-import{r,al as l}from"./main-QPJFCBQm.js";function y(i){const[o,a]=r.useState(null),[u,s]=r.useState(null),[c,f]=r.useState(!0),n=!!i?.initialRefresh,g=r.useCallback(async()=>{try{const e=await l({refresh:!0});a(e&&typeof e=="object"?e:null),s(null)}catch(e){s(e?.message||String(e))}},[]);return r.useEffect(()=>{let e=!1;return(async()=>{try{const t=await l(n?{refresh:!0}:{});if(e)return;a(t&&typeof t=="object"?t:null),s(null)}catch(t){if(e)return;s(t?.message||String(t))}finally{e||f(!1)}})(),()=>{e=!0}},[n]),{data:o,error:u,isLoading:c,refresh:g}}export{y as u};
+import{r,al as l}from"./main-DDbFansE.js";function y(i){const[o,a]=r.useState(null),[u,s]=r.useState(null),[c,f]=r.useState(!0),n=!!i?.initialRefresh,g=r.useCallback(async()=>{try{const e=await l({refresh:!0});a(e&&typeof e=="object"?e:null),s(null)}catch(e){s(e?.message||String(e))}},[]);return r.useEffect(()=>{let e=!1;return(async()=>{try{const t=await l(n?{refresh:!0}:{});if(e)return;a(t&&typeof t=="object"?t:null),s(null)}catch(t){if(e)return;s(t?.message||String(t))}finally{e||f(!1)}})(),()=>{e=!0}},[n]),{data:o,error:u,isLoading:c,refresh:g}}export{y as u};

package/dashboard/dist/assets/{useCurrency-CLZ2MqvV.js → useCurrency-kbOycXmD.js}

@@ -1 +1 @@
-import{r as e,aA as t,aB as r,I as c}from"./main-QPJFCBQm.js";const a=Object.freeze({currency:c,rate:1,symbol:"$",rates:{...r},rateSource:"default",rateFetchedAt:null,setCurrency:()=>{}});function u(){return e.useContext(t)??a}export{u};
+import{r as e,aA as t,aB as r,I as c}from"./main-DDbFansE.js";const a=Object.freeze({currency:c,rate:1,symbol:"$",rates:{...r},rateSource:"default",rateFetchedAt:null,setCurrency:()=>{}});function u(){return e.useContext(t)??a}export{u};

package/dashboard/dist/index.html

@@ -210,7 +210,7 @@
         ]
       }
     </script>
-    <script type="module" crossorigin src="/assets/main-QPJFCBQm.js"></script>
+    <script type="module" crossorigin src="/assets/main-DDbFansE.js"></script>
     <link rel="stylesheet" crossorigin href="/assets/main-C8k06i2w.css">
   </head>
   <body>

package/dashboard/dist/share.html

@@ -51,7 +51,7 @@
         "description": "Shareable Token Tracker dashboard snapshot."
       }
     </script>
-    <script type="module" crossorigin src="/assets/main-QPJFCBQm.js"></script>
+    <script type="module" crossorigin src="/assets/main-DDbFansE.js"></script>
     <link rel="stylesheet" crossorigin href="/assets/main-C8k06i2w.css">
   </head>
   <body>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tokentracker-cli",
-  "version": "0.24.6",
+  "version": "0.24.7",
   "description": "Token usage tracker for AI agent CLIs (Claude Code, Codex, Cursor, Gemini, Kiro, OpenCode, OpenClaw, Every Code, Hermes, GitHub Copilot, Kimi Code, CodeBuddy, Grok Build, oh-my-pi, pi, Craft Agents, Kilo CLI, Kilo Code, Roo Code, Zed Agent, Goose)",
   "main": "src/cli.js",
   "bin": {

package/src/commands/serve.js

@@ -11,6 +11,7 @@ const { serveStaticFile } = require("../lib/static-server");
 const { openInBrowser } = require("../lib/browser-auth");
 
 const DEFAULT_PORT = 7680;
+const DEFAULT_MAX_PORT_ATTEMPTS = 20;
 const NPM_PACKAGE_NAME = "tokentracker-cli";
 const LOCAL_BIND_HOST = "127.0.0.1";
 
@@ -18,6 +19,10 @@ function buildPortInUseHint(port) {
   return `Port ${port} is still in use after cleanup. Try: npx ${NPM_PACKAGE_NAME} serve --port ${port + 1}\n`;
 }
 
+function isPortUnavailableError(error) {
+  return error?.code === "EADDRINUSE" || error?.code === "EACCES" || error?.code === "EPERM";
+}
+
 function getLocalServerUrl(port) {
   return `http://${LOCAL_BIND_HOST}:${port}`;
 }
@@ -127,10 +132,28 @@ async function cmdServe(argv) {
     }
   });
 
-  // 4. Listen (kill stale process on same port if needed)
-  const port = opts.port;
-  await ensurePortFree(port);
-  server.listen(port, LOCAL_BIND_HOST, () => {
+  // 4. Listen. Default startup follows README behavior and picks the next
+  // available port; an explicit --port/PORT remains strict.
+  let port;
+  try {
+    port = await listenOnAvailablePort(server, opts.port, {
+      allowFallback: !opts.portExplicit,
+      ensurePortFreeFn: opts.portExplicit ? ensurePortFree : null,
+      onRetry: (failedPort) => {
+        process.stdout.write(`Port ${failedPort} unavailable, trying ${failedPort + 1}...\n`);
+      },
+    });
+  } catch (e) {
+    if (isPortUnavailableError(e)) {
+      process.stderr.write(buildPortInUseHint(opts.port));
+    } else {
+      process.stderr.write(`Server error: ${e.message}\n`);
+    }
+    process.exitCode = 1;
+    return;
+  }
+
+  {
     const url = getLocalServerUrl(port);
     process.stdout.write(
       [
@@ -148,14 +171,10 @@ async function cmdServe(argv) {
     if (opts.open) {
       openInBrowser(url);
     }
-  });
+  }
 
   server.on("error", (e) => {
-    if (e.code === "EADDRINUSE") {
-      process.stderr.write(buildPortInUseHint(port));
-    } else {
-      process.stderr.write(`Server error: ${e.message}\n`);
-    }
+    process.stderr.write(`Server error: ${e.message}\n`);
     process.exitCode = 1;
   });
 
@@ -213,6 +232,70 @@ async function ensurePortFree(port) {
   await new Promise((r) => setTimeout(r, 500));
 }
 
+function listenOnce(server, port, host) {
+  return new Promise((resolve, reject) => {
+    let settled = false;
+
+    const cleanup = () => {
+      server.off("listening", onListening);
+      server.off("error", onError);
+    };
+    const finish = (fn, value) => {
+      if (settled) return;
+      settled = true;
+      cleanup();
+      fn(value);
+    };
+    const onListening = () => finish(resolve);
+    const onError = (error) => finish(reject, error);
+
+    server.once("listening", onListening);
+    server.once("error", onError);
+    try {
+      server.listen(port, host);
+    } catch (error) {
+      finish(reject, error);
+    }
+  });
+}
+
+async function listenOnAvailablePort(
+  server,
+  startPort,
+  {
+    host = LOCAL_BIND_HOST,
+    allowFallback = false,
+    maxAttempts = DEFAULT_MAX_PORT_ATTEMPTS,
+    ensurePortFreeFn = null,
+    onRetry = null,
+  } = {},
+) {
+  const attempts = allowFallback ? Math.max(1, maxAttempts) : 1;
+  let port = startPort;
+  let lastError = null;
+
+  for (let i = 0; i < attempts && port < 65536; i++, port++) {
+    if (ensurePortFreeFn) {
+      await ensurePortFreeFn(port);
+    }
+
+    try {
+      await listenOnce(server, port, host);
+      return port;
+    } catch (error) {
+      lastError = error;
+      if (!allowFallback || !isPortUnavailableError(error) || port >= 65535) {
+        throw error;
+      }
+      if (typeof onRetry === "function") {
+        onRetry(port, error);
+      }
+    }
+  }
+
+  throw lastError || new Error(`No available port found from ${startPort}`);
+}
+
 function resolveDashboardDir() {
   const candidates = [
     path.resolve(__dirname, "../../dashboard/dist"),
@@ -224,13 +307,27 @@ function resolveDashboardDir() {
   return null;
 }
 
-function parseArgs(argv) {
-  const opts = { port: DEFAULT_PORT, open: true, sync: true };
+function parsePort(value) {
+  const n = parseInt(value, 10);
+  return Number.isFinite(n) && n > 0 && n < 65536 ? n : null;
+}
+
+function parseArgs(argv, env = process.env) {
+  const envPort = parsePort(env.PORT);
+  const opts = {
+    port: envPort || DEFAULT_PORT,
+    portExplicit: Boolean(envPort),
+    open: true,
+    sync: true,
+  };
   for (let i = 0; i < argv.length; i++) {
     const arg = argv[i];
     if (arg === "--port" && i + 1 < argv.length) {
-      const n = parseInt(argv[++i], 10);
-      if (Number.isFinite(n) && n > 0 && n < 65536) opts.port = n;
+      const n = parsePort(argv[++i]);
+      if (n) {
+        opts.port = n;
+        opts.portExplicit = true;
+      }
     } else if (arg === "--no-open") {
       opts.open = false;
     } else if (arg === "--no-sync") {
@@ -245,5 +342,8 @@ module.exports = {
   buildPortInUseHint,
   NPM_PACKAGE_NAME,
   LOCAL_BIND_HOST,
+  isPortUnavailableError,
+  listenOnAvailablePort,
   getLocalServerUrl,
+  parseArgs,
 };

package/src/commands/status.js

@@ -51,6 +51,8 @@ const {
   resolveRoocodeTaskFiles,
   resolveZedDbPath,
   resolveGooseDbPath,
+  listDroidSettingsFiles,
+  resolveDroidSessionsDir,
   resolveGrokBuildSessions,
 } = require("../lib/rollout");
 const { probeGrokHookState, resolveGrokHome } = require("../lib/grok-hook");
@@ -231,6 +233,11 @@ async function cmdStatus(argv = []) {
   const gooseDbPath = resolveGooseDbPath(process.env);
   const gooseInstalled = fssync.existsSync(gooseDbPath);
 
+  // Droid (Factory CLI) — passive cumulative-delta read of *.settings.json.
+  const droidSessionsDir = resolveDroidSessionsDir(process.env);
+  const droidSettingsFiles = listDroidSettingsFiles(process.env);
+  const droidInstalled = droidSettingsFiles.length > 0;
+
   // Grok Build (xAI TUI)
   const grokHookState = await probeGrokHookState({ home, trackerDir, env: process.env });
   const grokSessions = grokHookState.hasGrokInstall || grokHookState.sessionsDir
@@ -324,6 +331,9 @@ async function cmdStatus(argv = []) {
         goose: gooseInstalled
           ? { installed: true, detail: gooseDbPath }
           : { installed: false },
+        droid: droidInstalled
+          ? { installed: true, files: droidSettingsFiles.length, detail: droidSessionsDir }
+          : { installed: false },
         grok_build: grokInstalled
           ? {
               installed: true,
@@ -408,6 +418,9 @@ async function cmdStatus(argv = []) {
       gooseInstalled
         ? `- Goose (Block): passive reader (sessions.db, cumulative-delta)`
         : null,
+      droidInstalled
+        ? `- Droid (Factory): passive reader (${droidSettingsFiles.length} session${droidSettingsFiles.length !== 1 ? "s" : ""} in ${droidSessionsDir}, cumulative-delta)`
+        : null,
       ...(() => {
         const passive = passiveProviders.filter((p) => p.passive);
         if (passive.length === 0) return [];

package/src/commands/sync.js

@@ -52,6 +52,8 @@ const {
   parseZedIncremental,
   resolveGooseDbPath,
   parseGooseIncremental,
+  listDroidSettingsFiles,
+  parseDroidIncremental,
   bucketKey,
   totalsKey,
   claudeMessageDedupKey,
@@ -456,6 +458,35 @@ async function cmdSync(argv) {
       });
     }
 
+    // ── Droid (Factory CLI) — passive reader for ~/.factory/sessions/*.settings.json ──
+    const droidSettingsFiles = listDroidSettingsFiles(process.env);
+    let droidResult = { recordsProcessed: 0, eventsAggregated: 0, bucketsQueued: 0 };
+    if (droidSettingsFiles.length > 0) {
+      if (progress?.enabled) {
+        progress.start(
+          `Parsing Droid ${renderBar(0)} 0/${formatNumber(droidSettingsFiles.length)} sessions | buckets 0`,
+        );
+      }
+      droidResult = await parseDroidIncremental({
+        settingsFiles: droidSettingsFiles,
+        cursors,
+        queuePath,
+        // Full-scan sync: drop cursor entries for any session whose
+        // settings.json has disappeared off disk so cursors.droid stays
+        // bounded by the actual on-disk session count.
+        prune: true,
+        onProgress: (p) => {
+          if (!progress?.enabled) return;
+          const pct = p.total > 0 ? p.index / p.total : 1;
+          progress.update(
+            `Parsing Droid ${renderBar(pct)} ${formatNumber(p.index)}/${formatNumber(
+              p.total,
+            )} sessions | buckets ${formatNumber(p.bucketsQueued)}`,
+          );
+        },
+      });
+    }
+
     // ── Zed Agent (hosted models only; cumulative-delta over SQLite threads) ──
     const zedDbPath = resolveZedDbPath(process.env);
     let zedResult = { recordsProcessed: 0, eventsAggregated: 0, bucketsQueued: 0 };
@@ -948,7 +979,8 @@ async function cmdSync(argv) {
         kilocodeResult.recordsProcessed +
         roocodeResult.recordsProcessed +
         zedResult.recordsProcessed +
-        gooseResult.recordsProcessed;
+        gooseResult.recordsProcessed +
+        droidResult.recordsProcessed;
       const totalBuckets =
         parseResult.bucketsQueued +
         openclawResult.bucketsQueued +
@@ -971,7 +1003,8 @@ async function cmdSync(argv) {
         kilocodeResult.bucketsQueued +
         roocodeResult.bucketsQueued +
         zedResult.bucketsQueued +
-        gooseResult.bucketsQueued;
+        gooseResult.bucketsQueued +
+        droidResult.bucketsQueued;
       process.stdout.write(
         [
           "Sync finished:",

package/src/lib/pricing/matcher.js

@@ -72,6 +72,33 @@ function getSortedKeys(litellm) {
   return cached;
 }
 
+function buildDotRestoredModel(model) {
+  if (typeof model !== "string") return "";
+  const lower = model.toLowerCase();
+  const restored = lower.replace(/(\d+)-(\d+)/g, "$1.$2");
+  return restored === lower ? "" : restored;
+}
+
+function lookupExactCaseInsensitive(table, model) {
+  if (!table || !model) return null;
+  if (table[model]) return table[model];
+  const lower = model.toLowerCase();
+  for (const key of Object.keys(table)) {
+    if (key.toLowerCase() === lower) return table[key];
+  }
+  return null;
+}
+
+function lookupContainedExactCaseInsensitive(table, model) {
+  if (!table || !model) return null;
+  const lower = model.toLowerCase();
+  const keys = Object.keys(table).sort((a, b) => b.length - a.length);
+  for (const key of keys) {
+    if (lower.includes(key.toLowerCase())) return table[key];
+  }
+  return null;
+}
+
 function lookupPricing(model, { curated, litellm, source } = {}) {
   if (!model || typeof model !== "string") {
     return { hit: false, source: "empty", value: null };
@@ -80,16 +107,29 @@ function lookupPricing(model, { curated, litellm, source } = {}) {
     ? normalizeAntigravityModel(model)
     : model;
   const lower = lookupModel.toLowerCase();
+  const dotForm = buildDotRestoredModel(lookupModel);
 
   // 1. CURATED exact
   if (curated.exact && curated.exact[lookupModel]) {
     return { hit: true, source: "curated:exact", value: curated.exact[lookupModel] };
   }
+  const curatedDotExact = lookupExactCaseInsensitive(curated.exact, dotForm);
+  if (curatedDotExact) {
+    return { hit: true, source: "curated:exact-dot", value: curatedDotExact };
+  }
+  const curatedDotContainedExact = lookupContainedExactCaseInsensitive(curated.exact, dotForm);
+  if (curatedDotContainedExact) {
+    return { hit: true, source: "curated:exact-dot", value: curatedDotContainedExact };
+  }
 
   // 2. LiteLLM exact
   if (litellm && litellm[lookupModel]) {
     return { hit: true, source: "litellm:exact", value: litellm[lookupModel] };
   }
+  const litellmDotExact = lookupExactCaseInsensitive(litellm, dotForm);
+  if (litellmDotExact) {
+    return { hit: true, source: "litellm:exact-dot", value: litellmDotExact };
+  }
 
   // 3. CURATED alias (literal mapping like "auto" -> "composer-1")
   if (curated.alias && curated.alias[lookupModel] && curated.exact[curated.alias[lookupModel]]) {
@@ -100,11 +140,22 @@ function lookupPricing(model, { curated, litellm, source } = {}) {
     };
   }
 
-  // 4. CURATED fuzzy substring
+  // 4. CURATED fuzzy substring. Also try a dot-restored variant of the input
+  // (digits separated by `-` rejoined as `.`) so providers that dash-normalize
+  // numeric segments — Droid emits `glm-5-1-0` for upstream `GLM-5.1` — still
+  // resolve against dot-keyed curated entries like `glm-5.1`, `glm-4.6`, etc.
+  // The regex only fires on digit-dash-digit, so `claude-3-7-sonnet`,
+  // `gpt-5-codex`, `gemini-2-5-pro` are unaffected (no digit-pair to rejoin or
+  // no matching curated key).
   if (Array.isArray(curated.fuzzy)) {
     for (const { match, ref } of curated.fuzzy) {
       if (!match || !ref) continue;
-      if (lower.includes(match.toLowerCase()) && curated.exact[ref]) {
+      const needle = match.toLowerCase();
+      if (!curated.exact[ref]) continue;
+      if (lower.includes(needle)) {
+        return { hit: true, source: "curated:fuzzy", value: curated.exact[ref] };
+      }
+      if (dotForm && dotForm.includes(needle)) {
         return { hit: true, source: "curated:fuzzy", value: curated.exact[ref] };
       }
     }
@@ -125,7 +176,7 @@ function lookupPricing(model, { curated, litellm, source } = {}) {
       const keyLower = key.toLowerCase();
       // Only accept if model is a superset of key (model contains key), to
       // avoid e.g. "gpt-5" matching "gpt-5-pro" in the wrong direction.
-      if (lower.includes(keyLower)) {
+      if (lower.includes(keyLower) || (dotForm && dotForm.includes(keyLower))) {
         return { hit: true, source: "litellm:fuzzy", value: litellm[key] };
       }
     }