@agentdocumentformat/cli 0.7.4 → 0.7.5

package/dist/adf.mjs

@@ -9,7 +9,7 @@ import "./chunks/chunk-M2RX3S2T.mjs";
 
 // src/main/cli/bin.ts
 function version() {
-  return "0.7.4";
+  return "0.7.5";
 }
 var DAEMON_HELP = `Usage: adf daemon [--port <n>] [--host <h>] [--settings <file>]
        adf daemon start [--port <n>] [--force]
@@ -140,9 +140,9 @@ async function main(argv) {
       let { daemonPaths } = await import("./chunks/daemon-control-HKFVSQTQ.mjs");
       process.env.ADF_DAEMON_PIDFILE = daemonPaths(Number(process.env.ADF_DAEMON_PORT ?? 7385)).pidFile;
     }
-    return await import("./chunks/daemon-YMIWVG5G.mjs"), -1;
+    return await import("./chunks/daemon-6RA2DIJ2.mjs"), -1;
   }
-  let [{ runCli, tuiInvocation }, control] = await Promise.all([import("./chunks/cli-ZGVQRVSQ.mjs"), import("./chunks/daemon-control-HKFVSQTQ.mjs")]);
+  let [{ runCli, tuiInvocation }, control] = await Promise.all([import("./chunks/cli-JDBN7CBR.mjs"), import("./chunks/daemon-control-HKFVSQTQ.mjs")]);
   return tuiInvocation(argv) && process.env.NODE_ENV === void 0 && (process.env.NODE_ENV = "production", process.env.ADF_NODE_ENV_DEFAULTED = "1"), await runCli(argv, {
     fetch: globalThis.fetch.bind(globalThis),
     stdout: (text) => process.stdout.write(text),

package/dist/chunks/{App-QMFRLBPQ.mjs → App-ZRQS3U7S.mjs}

@@ -5,7 +5,8 @@ const require = __adfCreateRequire(import.meta.url);
 const __filename = __adfFileURLToPath(import.meta.url);
 const __dirname = __adfDirname(__filename);
 import {
-  auth_flow_exports
+  auth_flow_exports,
+  openBrowser
 } from "./chunk-6VQEXLE2.mjs";
 import {
   createMouseController,
@@ -1260,8 +1261,8 @@ Accept the review and load it?`,
     return failure(store, null, "Accept review", err), !1;
   }
 }
-async function runAutostart(store, dirs) {
-  let trackedDirs = dirs;
+async function runAutostart(store, dirs2) {
+  let trackedDirs = dirs2;
   if (!trackedDirs || trackedDirs.length === 0)
     try {
       trackedDirs = (await store.client.runtimeSettings()).trackedDirectories;
@@ -3829,7 +3830,7 @@ function wakesText(timers, now = Date.now(), sep4 = "\xB7") {
 }
 
 // src/main/tui/auth/flow.ts
-var { loginChatGpt, loginGrok, openBrowser } = cjs(auth_flow_exports), seams = { openBrowser };
+var { loginChatGpt, loginGrok, openBrowser: openBrowser2 } = cjs(auth_flow_exports), seams = { openBrowser: openBrowser2 };
 function openUrl(url2) {
   seams.openBrowser(url2);
 }
@@ -11349,7 +11350,7 @@ function toneColor3(theme2, tone) {
   }
 }
 function Viewer(props) {
-  let { width, height, active, title, meta = [], notice, name, text, bytes, mime, loading, error, plain: plain2 = !1, resetKey, onBack, onEdit, emptyText } = props, theme2 = useTheme(), [top, setTop] = (0, import_react36.useState)(0), [query, setQuery] = (0, import_react36.useState)(""), [typing, setTyping] = (0, import_react36.useState)(!1), [current, setCurrent] = (0, import_react36.useState)(0);
+  let { width, height, active, title, meta = [], notice, name, text, bytes, mime, loading, error, plain: plain2 = !1, resetKey, onBack, onEdit, onOpenExternal, onSaveBack, emptyText } = props, theme2 = useTheme(), [top, setTop] = (0, import_react36.useState)(0), [query, setQuery] = (0, import_react36.useState)(""), [typing, setTyping] = (0, import_react36.useState)(!1), [current, setCurrent] = (0, import_react36.useState)(0);
   (0, import_react36.useEffect)(() => {
     setTop(0), setQuery(""), setTyping(!1), setCurrent(0);
   }, [resetKey]);
@@ -11380,7 +11381,7 @@ function Viewer(props) {
       let firstVisible = matches.findIndex((m) => (lineStart2[m.line] ?? 0) >= clampedTop), index = firstVisible >= 0 ? firstVisible : 0;
       setCurrent(index), reveal(index);
     }
-  }, [query]), useKeys((input, key) => typing ? key.escape ? (setTyping(!1), setQuery(""), !0) : key.return ? (setTyping(!1), !0) : key.backspace || key.delete ? (setQuery((q) => q.slice(0, -1)), !0) : (key.leftArrow || key.rightArrow) && !key.ctrl && !key.shift ? !0 : input && !key.ctrl && !key.meta && !/[\r\n\t]/.test(input) ? (setQuery((q) => q + input), !0) : !1 : (key.ctrl || key.shift) && (key.leftArrow || key.rightArrow) ? !1 : key.upArrow || input === "k" && !key.ctrl ? (scrollTo(clampedTop - 1), !0) : key.downArrow || input === "j" && !key.ctrl ? (scrollTo(clampedTop + 1), !0) : key.pageUp || key.ctrl && input === "u" ? (scrollTo(clampedTop - Math.max(1, bodyRows - 1)), !0) : key.pageDown || input === " " || key.ctrl && input === "d" ? (scrollTo(clampedTop + Math.max(1, bodyRows - 1)), !0) : key.home || input === "g" ? (scrollTo(0), !0) : key.end || input === "G" ? (scrollTo(maxTop), !0) : input === "/" ? (setTyping(!0), setQuery(""), !0) : input === "n" && query ? (jump(1), !0) : input === "N" && query ? (jump(-1), !0) : input === "e" && onEdit ? (onEdit(), !0) : key.escape && query ? (setQuery(""), !0) : (key.escape || key.backspace && !key.ctrl && !key.meta) && onBack ? (onBack(), !0) : !1, { layer: "main", active });
+  }, [query]), useKeys((input, key) => typing ? key.escape ? (setTyping(!1), setQuery(""), !0) : key.return ? (setTyping(!1), !0) : key.backspace || key.delete ? (setQuery((q) => q.slice(0, -1)), !0) : (key.leftArrow || key.rightArrow) && !key.ctrl && !key.shift ? !0 : input && !key.ctrl && !key.meta && !/[\r\n\t]/.test(input) ? (setQuery((q) => q + input), !0) : !1 : (key.ctrl || key.shift) && (key.leftArrow || key.rightArrow) ? !1 : key.upArrow || input === "k" && !key.ctrl ? (scrollTo(clampedTop - 1), !0) : key.downArrow || input === "j" && !key.ctrl ? (scrollTo(clampedTop + 1), !0) : key.pageUp || key.ctrl && input === "u" ? (scrollTo(clampedTop - Math.max(1, bodyRows - 1)), !0) : key.pageDown || input === " " || key.ctrl && input === "d" ? (scrollTo(clampedTop + Math.max(1, bodyRows - 1)), !0) : key.home || input === "g" ? (scrollTo(0), !0) : key.end || input === "G" ? (scrollTo(maxTop), !0) : input === "/" ? (setTyping(!0), setQuery(""), !0) : input === "n" && query ? (jump(1), !0) : input === "N" && query ? (jump(-1), !0) : input === "e" && onEdit ? (onEdit(), !0) : input === "o" && onOpenExternal ? (onOpenExternal(), !0) : input === "s" && onSaveBack ? (onSaveBack(), !0) : key.escape && query ? (setQuery(""), !0) : (key.escape || key.backspace && !key.ctrl && !key.meta) && onBack ? (onBack(), !0) : !1, { layer: "main", active });
   let boxRef = (0, import_react36.useRef)(null);
   useWheel(boxRef, (delta) => scrollTo(clampedTop + delta * WHEEL_STEP));
   let visible = rows.slice(clampedTop, clampedTop + bodyRows), lastLine = visible.length ? visible[visible.length - 1].line + 1 : 0, firstLine2 = visible.length ? visible[0].line + 1 : 0, position = rows.length === 0 ? "" : `L${firstLine2}-${lastLine}/${prepared.lines.length}${maxTop > 0 ? ` ${Math.round(clampedTop / maxTop * 100)}%` : ""}`, search = typing ? `/${query}` : query ? `/${query}  ${matches.length ? `${currentIndex + 1}/${matches.length}` : "no match"}  n/N` : "", header2 = /* @__PURE__ */ (0, import_jsx_runtime44.jsxs)(Text, { wrap: "truncate-end", children: [
@@ -11423,11 +11424,12 @@ function Viewer(props) {
       theme2.glyph.sep,
       " hex dump of the first ",
       Math.min(256, bytes.length),
-      " bytes"
+      " bytes",
+      onOpenExternal ? ` ${theme2.glyph.sep} o opens it in the default app` : ""
     ] }) : null,
     /* @__PURE__ */ (0, import_jsx_runtime44.jsx)(Box_default, { flexDirection: "column", height: bodyRows, overflow: "hidden", children: body }),
     /* @__PURE__ */ (0, import_jsx_runtime44.jsxs)(Box_default, { justifyContent: "space-between", width, children: [
-      /* @__PURE__ */ (0, import_jsx_runtime44.jsx)(Text, { color: typing ? theme2.color.accent : theme2.color.muted, wrap: "truncate-end", children: search || (active ? `/ search${onEdit ? " \xB7 e edit" : ""}${onBack ? " \xB7 Backspace back" : ""}` : "") }),
+      /* @__PURE__ */ (0, import_jsx_runtime44.jsx)(Text, { color: typing ? theme2.color.accent : theme2.color.muted, wrap: "truncate-end", children: search || (active ? `/ search${onEdit ? " \xB7 e edit" : ""}${onOpenExternal ? " \xB7 o open in app" : ""}${onBack ? " \xB7 Backspace back" : ""}` : "") }),
       /* @__PURE__ */ (0, import_jsx_runtime44.jsx)(Text, { color: theme2.color.dim, children: position })
     ] })
   ] });
@@ -11656,6 +11658,77 @@ function DataTab({ kind, width, height, focused, agentId, agentLabel: agentLabel
 
 // src/main/tui/views/files/FilesTab.tsx
 var import_react38 = __toESM(require_react(), 1);
+
+// src/main/tui/views/files/external.ts
+import { promises as fs4, rmSync, statSync as statSync3 } from "node:fs";
+import { tmpdir as tmpdir3 } from "node:os";
+import { join as join4 } from "node:path";
+var copies = /* @__PURE__ */ new Map(), dirs = /* @__PURE__ */ new Set(), exitHook = !1, copyKey = (agentId, target2) => `${agentId}\0${targetKey(target2)}`, errorText5 = (err) => err instanceof Error ? err.message : String(err), bytesOf = (loaded) => loaded.binary ? Buffer.from(loaded.bytes ?? new Uint8Array()) : Buffer.from(loaded.text ?? "", "utf-8");
+function externalCopy(agentId, target2) {
+  return copies.get(copyKey(agentId, target2));
+}
+function externalChanged(copy) {
+  try {
+    return statSync3(copy.file).mtimeMs !== copy.mtimeMs;
+  } catch {
+    return !1;
+  }
+}
+function cleanupExternalCopies() {
+  for (let dir of dirs) rmSync(dir, { recursive: !0, force: !0 });
+  dirs.clear(), copies.clear();
+}
+async function openExternal(deps, target2) {
+  let { actions: actions4, agentId } = deps, label2 = targetLabel(target2), loaded = await actions4.run(`Open ${label2}`, (c) => loadTarget(c, agentId, target2));
+  if (!loaded) return !1;
+  let bytes = bytesOf(loaded), existing = externalCopy(agentId, target2), file = existing?.file;
+  if (!existing || !externalChanged(existing)) {
+    try {
+      if (!file) {
+        let dir = await fs4.mkdtemp(join4(tmpdir3(), "adf-tui-open-"));
+        dirs.add(dir), exitHook || (exitHook = !0, process.once("exit", cleanupExternalCopies)), file = join4(dir, targetFileName(target2));
+      }
+      await fs4.writeFile(file, bytes);
+    } catch (err) {
+      return actions4.toast(`Cannot write a temp copy of ${label2} in ${tmpdir3()}: ${errorText5(err)}`, "error", 12e3), !1;
+    }
+    copies.set(copyKey(agentId, target2), { agentId, target: target2, file, original: bytes, binary: loaded.binary, mime: loaded.mime, mtimeMs: (await fs4.stat(file)).mtimeMs });
+  }
+  return (deps.open ?? openBrowser)(file), actions4.toast(`Opened ${label2} in the default app \u2014 after saving there, press s to save it back (${file})`, "info", 8e3), !0;
+}
+async function saveBackExternal(deps, target2) {
+  let { client, actions: actions4, agentId, agentLabel: agentLabel5 } = deps, label2 = targetLabel(target2), copy = externalCopy(agentId, target2);
+  if (!copy)
+    return actions4.toast(`${label2} is not open in an app \u2014 press o to open it`, "warn"), "failed";
+  let edited;
+  try {
+    edited = await fs4.readFile(copy.file);
+  } catch (err) {
+    return actions4.toast(`Cannot read ${copy.file}: ${errorText5(err)} \u2014 nothing written`, "error", 12e3), "failed";
+  }
+  if (edited.equals(copy.original))
+    return copy.mtimeMs = (await fs4.stat(copy.file)).mtimeMs, actions4.toast(`No changes to ${label2}`, "info"), "unchanged";
+  let concurrent = null;
+  try {
+    let current = await loadTarget(client, agentId, target2);
+    bytesOf(current).equals(copy.original) || (concurrent = "changed in the agent since you opened it");
+  } catch (err) {
+    concurrent = err.status === 404 ? "was deleted since you opened it" : `could not be re-checked (${errorText5(err)})`;
+  }
+  return await actions4.confirm({
+    title: concurrent ? `Concurrent change: ${label2}` : `Save ${label2}`,
+    message: [
+      concurrent ? `WARNING: ${label2} ${concurrent}. Writing replaces that version.` : null,
+      `Write ${label2} in ${agentLabel5}: ${formatBytes(copy.original.length)} -> ${formatBytes(edited.length)}`
+    ].filter(Boolean).join(`
+`),
+    confirmLabel: concurrent ? "Overwrite" : "Write",
+    cancelLabel: "Cancel",
+    danger: !!concurrent
+  }) ? await actions4.run(`Write ${label2}`, (c) => (copy.binary && target2.kind === "file" ? c.writeFile(agentId, target2.path, { contentBase64: edited.toString("base64"), ...copy.mime ? { mimeType: copy.mime } : {} }) : writeTarget(c, agentId, target2, edited.toString("utf-8"))).then(() => !0)) ? (copy.original = edited, copy.mtimeMs = (await fs4.stat(copy.file)).mtimeMs, actions4.toast(`Saved ${label2} from the app`, "success"), "written") : (actions4.toast(`Write failed. Your copy is still at ${copy.file}`, "error", 12e3), "failed") : "discarded";
+}
+
+// src/main/tui/views/files/FilesTab.tsx
 var import_jsx_runtime46 = __toESM(require_jsx_runtime(), 1), recentWrites = /* @__PURE__ */ new Map(), RECENT_MS = 10 * 6e4;
 function pinnedKeyForPath(path) {
   return path === "mind.md" ? MIND_KEY : path === "README.md" || path === "document.md" ? DOCUMENT_KEY : null;
@@ -11763,7 +11836,30 @@ function FilesTab(props) {
     } finally {
       busy.current = !1;
     }
-  }, createFile = async (initialPath) => {
+  }, externalDeps = () => ({ client, actions: actions4, agentId, agentLabel: agentLabel5 }), runOpenExternal = async (target2) => {
+    await openExternal(externalDeps(), target2), setTick((t) => t + 1);
+  }, runSaveBack = async (target2) => {
+    if (busy.current) {
+      actions4.toast("An edit is already in progress", "warn");
+      return;
+    }
+    busy.current = !0;
+    try {
+      await saveBackExternal(externalDeps(), target2) === "written" && (invalidate(targetKey(target2)), await reloadList());
+    } catch (err) {
+      actions4.toast(`Save failed: ${err instanceof Error ? err.message : String(err)}`, "error", 12e3);
+    } finally {
+      busy.current = !1, setTick((t) => t + 1);
+    }
+  }, viewedCopy = viewerTarget ? externalCopy(agentId, viewerTarget) : void 0, copyChanged = viewedCopy ? externalChanged(viewedCopy) : !1;
+  (0, import_react38.useEffect)(() => {
+    if (!viewedCopy || copyChanged) return;
+    let timer = setInterval(() => {
+      externalChanged(viewedCopy) && setTick((t) => t + 1);
+    }, 1500);
+    return () => clearInterval(timer);
+  }, [viewedCopy, copyChanged]);
+  let createFile = async (initialPath) => {
     let path = initialPath?.trim();
     if (!path) {
       let base2 = cursorRow?.kind === "dir" ? `${cursorRow.path}/` : cursorRow?.kind === "file" && parentDir(cursorRow.path) ? `${parentDir(cursorRow.path)}/` : "";
@@ -11862,6 +11958,10 @@ function FilesTab(props) {
       let target2 = rowTarget(row4);
       return target2 ? runEdit(target2) : actions4.toast("Pick a file to edit", "warn"), !0;
     }
+    if ((input === "o" || input === "s") && !key.ctrl) {
+      let target2 = rowTarget(row4);
+      return target2 ? input === "o" ? runOpenExternal(target2) : runSaveBack(target2) : actions4.toast("Pick a file", "warn"), !0;
+    }
     return input === "m" && !key.ctrl ? (rename(row4), !0) : input === "d" && !key.ctrl || key.delete && !key.backspace ? (remove2(row4), !0) : input === "p" && !key.ctrl ? (cycleProtection(row4), !0) : input === "a" && !key.ctrl ? (toggleAuthorized(row4), !0) : !1;
   }, split = width >= 70, listWidth = split ? Math.max(24, Math.min(48, Math.floor(width * 0.38))) : width, viewerWidth = split ? width - listWidth - 2 : width, showList = split || pane === "list", showViewer = split || pane === "viewer", perAgent = recentWrites.get(agentId), renderRow = (row4, selected, w) => {
     let indent3 = "  ".repeat(row4.depth), glyph, color, right = "", suffix = "";
@@ -11964,7 +12064,7 @@ function FilesTab(props) {
             active: focused && pane === "viewer",
             title: viewerTitle,
             meta: viewerMeta,
-            notice: notice?.key === viewerKey ? notice.text : void 0,
+            notice: copyChanged ? "Changed in the default app \u2014 s saves it back" : notice?.key === viewerKey ? notice.text : viewedCopy ? "Open in the default app (o reopens, s saves it back)" : void 0,
             name: viewerTarget.kind === "file" ? viewerTarget.path : targetLabel(viewerTarget),
             text: loadedOk?.text,
             bytes: loadedOk?.binary ? loadedOk.bytes : void 0,
@@ -11975,6 +12075,12 @@ function FilesTab(props) {
             onBack: () => setPane("list"),
             onEdit: loadedOk?.binary ? void 0 : () => {
               runEdit(viewerTarget);
+            },
+            onOpenExternal: () => {
+              runOpenExternal(viewerTarget);
+            },
+            onSaveBack: () => {
+              runSaveBack(viewerTarget);
             }
           }
         ) : /* @__PURE__ */ (0, import_jsx_runtime46.jsx)(Text, { color: theme2.color.muted, children: "Pick a file." })
@@ -12107,7 +12213,7 @@ function keyHints(scope) {
     { keys: "backspace", label: "back" },
     { keys: "up down", label: "scroll" },
     { keys: "/", label: "search" },
-    ...state.tab === "files" ? [{ keys: "e", label: "edit" }] : [],
+    ...state.tab === "files" ? [{ keys: "e", label: "edit" }, { keys: "o", label: "open in app" }] : [],
     { keys: "left right", label: "tabs" }
   ] : state.tab !== "files" ? [
     { keys: "enter", label: "read" },
@@ -12121,6 +12227,7 @@ function keyHints(scope) {
     { keys: "backspace", label: "up" },
     { keys: "left right", label: "tabs" },
     { keys: "e", label: "edit" },
+    { keys: "o", label: "open in app" },
     { keys: "n", label: "new" },
     { keys: "/", label: "filter" },
     { keys: "d", label: "delete" }
@@ -12144,6 +12251,8 @@ var files = {
         { keys: "space", label: "Toggle a folder" },
         { keys: "/", label: "Filter by path (fuzzy)" },
         { keys: "e", label: "Edit in $EDITOR, then confirm the write (diff shown)" },
+        { keys: "o", label: "Open in the default app (xlsx, images, pdf, \u2026)" },
+        { keys: "s", label: "Save the default-app copy back (asks)" },
         { keys: "n", label: "New file" },
         { keys: "m", label: "Rename / move (a folder moves with its files)" },
         { keys: "d delete", label: "Delete (asks)" },
@@ -12158,7 +12267,8 @@ var files = {
         { keys: "backspace esc", label: "Back to the list (the entry stays selected)" },
         { keys: "up down", label: "Scroll (j k; PgUp PgDn Space page; g G top/bottom)" },
         { keys: "/", label: "Search, then n N next / previous hit" },
-        { keys: "e", label: "Edit this file" }
+        { keys: "e", label: "Edit this file" },
+        { keys: "o s", label: "Open in the default app \xB7 save that copy back" }
       ]
     },
     {

package/dist/chunks/{chatgpt-subscription-BQGWYZXE.mjs → chatgpt-subscription-E4MXTIAT.mjs}

@@ -10,7 +10,7 @@ import {
   createChatGPTSubscriptionProvider,
   describeCodexRequest,
   patchCodexRequestBody
-} from "./chunk-LAZIXV2F.mjs";
+} from "./chunk-BNXUAOO4.mjs";
 import "./chunk-LFMB4PAA.mjs";
 import "./chunk-RIX34QHC.mjs";
 import "./chunk-M2RX3S2T.mjs";

package/dist/chunks/{chunk-LAZIXV2F.mjs → chunk-BNXUAOO4.mjs}

@@ -5177,7 +5177,7 @@ function createChatGPTSubscriptionProvider(authManager, extraParams) {
         let pendingInstructions = requestId !== null ? requestsById.get(requestId)?.instructions : legacyInstructions;
         headers.set("Authorization", `Bearer ${token}`);
         let accountId = authManager.getAccountId();
-        accountId && headers.set("ChatGPT-Account-ID", accountId), headers.set("originator", "codex_cli_rs"), headers.set("version", "0.155.0");
+        accountId && headers.set("ChatGPT-Account-ID", accountId), headers.set("originator", "codex_cli_rs"), headers.set("version", "0.159.1");
         let patchedInit = init, requestSummary;
         if (init?.body && typeof init.body == "string")
           try {
@@ -5269,6 +5269,7 @@ function createChatGPTSubscriptionProvider(authManager, extraParams) {
   };
 }
 var CHATGPT_SUBSCRIPTION_MODELS = [
+  "gpt-6.1-sol",
   "gpt-6-astra",
   "gpt-6-sol",
   "gpt-6-luna",

package/dist/chunks/{cli-ZGVQRVSQ.mjs → cli-JDBN7CBR.mjs}

@@ -44,7 +44,7 @@ function tuiInvocation(argv) {
   return argv.filter((a) => a !== "--json");
 }
 async function defaultLaunchTui(argv) {
-  let { runTui } = await import("./tui-LWLJUXZ3.mjs");
+  let { runTui } = await import("./tui-I5LEARAV.mjs");
   return await runTui(argv);
 }
 function urlFromArgv(argv) {

package/dist/chunks/{daemon-YMIWVG5G.mjs → daemon-6RA2DIJ2.mjs}

@@ -51,7 +51,7 @@ import {
   createOpenAI,
   sliceWellFormed,
   toWellFormed
-} from "./chunk-LAZIXV2F.mjs";
+} from "./chunk-BNXUAOO4.mjs";
 import {
   AISDKError,
   APICallError,
@@ -97913,6 +97913,11 @@ function decodeJwtPayload(token) {
     return {};
   }
 }
+function chatgptAccountIdFromJwt(token) {
+  if (!token) return "";
+  let claims = decodeJwtPayload(token), auth2 = claims["https://api.openai.com/auth"], id = (auth2 && typeof auth2 == "object" ? auth2.chatgpt_account_id : void 0) ?? claims.chatgpt_account_id;
+  return typeof id == "string" ? id : "";
+}
 async function openExternal(url) {
   try {
     let electron = __require("electron");
@@ -97946,11 +97951,12 @@ var ChatGptAuthManager = class {
     this.syncFromDisk();
   }
   /**
-   * Re-read the token file, picking up writes from the other process.
+   * Re-read the token file, picking up writes from other processes.
    *
-   * Studio and the daemon share one file, and OpenAI rotates the refresh token
-   * on every refresh — so acting on a cached copy can invalidate the other
-   * process's live session. Always reading is what prevents that; the file is
+   * Each surface has its own file (see subscription-token-store), but several
+   * processes can share one — e.g. an installed and a dev Studio, or a CLI
+   * next to its daemon — and OpenAI rotates the refresh token on every
+   * refresh, so acting on a cached copy can invalidate a sibling's session. Always reading is what prevents that; the file is
    * well under a kilobyte and this runs once per LLM request.
    */
   syncFromDisk() {
@@ -98048,16 +98054,10 @@ var ChatGptAuthManager = class {
       let body = await tokenResponse.text();
       throw new Error(`Token exchange failed (${tokenResponse.status}): ${body}`);
     }
-    let tokenData = await tokenResponse.json(), accountId = "";
-    if (tokenData.id_token) {
-      let claims = decodeJwtPayload(tokenData.id_token);
-      this.email = claims.email, accountId = claims.chatgpt_account_id ?? "", console.log(`[ChatGPT Auth] id_token claims: email=${this.email}, chatgpt_account_id=${accountId}, sub=${claims.sub}`);
-    }
-    if (!accountId) {
-      let accessClaims = decodeJwtPayload(tokenData.access_token);
-      accountId = accessClaims.chatgpt_account_id ?? accessClaims.sub ?? "", console.log(`[ChatGPT Auth] access_token fallback: chatgpt_account_id=${accountId}`);
-    }
-    this.persist({
+    let tokenData = await tokenResponse.json();
+    tokenData.id_token && (this.email = decodeJwtPayload(tokenData.id_token).email);
+    let accountId = chatgptAccountIdFromJwt(tokenData.access_token) || chatgptAccountIdFromJwt(tokenData.id_token);
+    console.log(`[ChatGPT Auth] signed in: email=${this.email}, chatgpt_account_id=${accountId || "(missing)"}`), this.persist({
       access_token: tokenData.access_token,
       refresh_token: tokenData.refresh_token,
       expires_at: Date.now() + tokenData.expires_in * 1e3,
@@ -98073,7 +98073,8 @@ var ChatGptAuthManager = class {
     }), this.refreshPromise);
   }
   getAccountId() {
-    return this.syncFromDisk()?.account_id;
+    let tokens = this.syncFromDisk();
+    return chatgptAccountIdFromJwt(tokens?.access_token) || tokens?.account_id || void 0;
   }
   /**
    * Re-check the file after winning the in-process refresh lock.
@@ -98087,7 +98088,7 @@ var ChatGptAuthManager = class {
     return fresh && Date.now() + REFRESH_BUFFER_MS < fresh.expires_at ? fresh.access_token : this.refreshTokens(fresh ?? tokens);
   }
   async refreshTokens(tokens) {
-    let data;
+    let data, rejected = !1;
     try {
       let response = await fetch(TOKEN_URL, {
         method: "POST",
@@ -98099,13 +98100,13 @@ var ChatGptAuthManager = class {
         })
       });
       if (!response.ok)
-        throw new Error(`Token refresh failed (${response.status})`);
+        throw rejected = response.status === 400 || response.status === 401, new Error(`Token refresh failed (${response.status})`);
       data = await response.json();
-    } catch {
+    } catch (err) {
       let fresh = this.syncFromDisk();
       if (fresh && fresh.refresh_token !== tokens.refresh_token && Date.now() + REFRESH_BUFFER_MS < fresh.expires_at)
         return fresh.access_token;
-      throw clearTokens(), this.cachedTokens = null, this.email = void 0, new Error("Session expired \u2014 please sign in again");
+      throw rejected ? (clearTokens(), this.cachedTokens = null, this.email = void 0, new Error("Session expired \u2014 please sign in again")) : new Error(`Could not refresh the session (${err instanceof Error ? err.message : String(err)}) \u2014 still signed in, try again`);
     }
     if (data.id_token) {
       let claims = decodeJwtPayload(data.id_token);
@@ -98115,7 +98116,7 @@ var ChatGptAuthManager = class {
       access_token: data.access_token,
       refresh_token: data.refresh_token,
       expires_at: Date.now() + data.expires_in * 1e3,
-      account_id: tokens.account_id
+      account_id: chatgptAccountIdFromJwt(data.access_token) || chatgptAccountIdFromJwt(data.id_token) || tokens.account_id
     }), data.access_token;
   }
   getAuthStatus() {
@@ -98306,7 +98307,7 @@ var GrokAuthManager = class {
     return fresh && Date.now() + REFRESH_BUFFER_MS2 < fresh.expires_at ? fresh.access_token : this.refreshTokens(fresh ?? tokens);
   }
   async refreshTokens(tokens) {
-    let data;
+    let data, rejected = !1;
     try {
       let response = await fetch(TOKEN_URL2, {
         method: "POST",
@@ -98318,13 +98319,13 @@ var GrokAuthManager = class {
         }).toString()
       });
       if (!response.ok)
-        throw new Error(`Token refresh failed (${response.status})`);
+        throw rejected = response.status === 400 || response.status === 401, new Error(`Token refresh failed (${response.status})`);
       data = await response.json();
-    } catch {
+    } catch (err) {
       let fresh = this.syncFromDisk();
       if (fresh && fresh.refresh_token !== tokens.refresh_token && Date.now() + REFRESH_BUFFER_MS2 < fresh.expires_at)
         return fresh.access_token;
-      throw clearTokens2(), this.cachedTokens = null, this.email = void 0, new Error("Session expired \u2014 please sign in again");
+      throw rejected ? (clearTokens2(), this.cachedTokens = null, this.email = void 0, new Error("Session expired \u2014 please sign in again")) : new Error(`Could not refresh the session (${err instanceof Error ? err.message : String(err)}) \u2014 still signed in, try again`);
     }
     if (data.id_token) {
       let claims = decodeJwtPayload2(data.id_token);
@@ -123660,7 +123661,7 @@ async function listProviderModels(runtime2, settingsStore, providerId, agentId)
   let cfg = resolveModelListProviderConfig(runtime2, settingsStore, providerId, agentId);
   if (!cfg) return { provider: providerId, models: [], error: `Provider "${providerId}" not found.` };
   if (cfg.type === "chatgpt-subscription") {
-    let { CHATGPT_SUBSCRIPTION_MODELS } = await import("./chatgpt-subscription-BQGWYZXE.mjs");
+    let { CHATGPT_SUBSCRIPTION_MODELS } = await import("./chatgpt-subscription-E4MXTIAT.mjs");
     return { provider: providerId, models: [...CHATGPT_SUBSCRIPTION_MODELS] };
   }
   if (cfg.type === "grok-subscription") {

package/dist/chunks/{tui-LWLJUXZ3.mjs → tui-I5LEARAV.mjs}

@@ -119,7 +119,7 @@ ${tuiUsage()}
   ] = await Promise.all([
     import("./react-IUIDQ5LX.mjs"),
     import("./build-QF5W473T.mjs"),
-    import("./App-QMFRLBPQ.mjs"),
+    import("./App-ZRQS3U7S.mjs"),
     import("./themes-F2FKU7CP.mjs"),
     import("./store-HUVDJPYN.mjs"),
     import("./theme-NORU4J74.mjs"),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agentdocumentformat/cli",
-  "version": "0.7.4",
+  "version": "0.7.5",
   "description": "ADF CLI: the ADF (Agent Document Format) daemon, command line and terminal app. Run your agents headless: `adf daemon`, then `adf`.",
   "type": "module",
   "bin": {