@dexto/tui 1.14.4 → 1.15.0-beta.0

package/dist/components/Footer.cjs

@@ -40,6 +40,7 @@ var import_core = require("@dexto/core");
 var import_llm_provider_display = require("../utils/llm-provider-display.js");
 var import_chatgpt_rate_limit = require("../utils/chatgpt-rate-limit.js");
 var import_agent_backend = require("../agent-backend.js");
+var import_host = require("../host/index.js");
 function Footer({
   agent,
   sessionId,
@@ -125,6 +126,31 @@ function Footer({
       controller.abort();
     };
   }, [agent, sessionId]);
+  const [creditBalance, setCreditBalance] = (0, import_react.useState)(null);
+  const usesDextoCredits = provider === "dexto-nova";
+  (0, import_react.useEffect)(() => {
+    setCreditBalance(null);
+    if (!usesDextoCredits) return;
+    let cancelled = false;
+    const refresh = () => {
+      (0, import_host.dextoCreditBalance)().then((balance) => {
+        if (!cancelled) setCreditBalance(balance);
+      }).catch(() => void 0);
+    };
+    refresh();
+    const controller = new AbortController();
+    agent.on(
+      "llm:response",
+      (payload) => {
+        if (!payload.sessionId || payload.sessionId === sessionId) refresh();
+      },
+      { signal: controller.signal }
+    );
+    return () => {
+      cancelled = true;
+      controller.abort();
+    };
+  }, [agent, sessionId, usesDextoCredits]);
   const pathColor = isShellMode ? "yellow" : "blue";
   return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_ink.Box, { flexDirection: "column", paddingX: 1, children: [
     /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_ink.Box, { flexDirection: "row", justifyContent: "space-between", children: [
@@ -153,6 +179,11 @@ function Footer({
       contextLeft.percentLeft,
       "% context left"
     ] }) }),
+    creditBalance !== null && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_ink.Box, { children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_ink.Text, { color: "gray", children: [
+      "$",
+      creditBalance.toFixed(2),
+      " credits"
+    ] }) }),
     chatGPTRateLimitHint && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_ink.Box, { children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_ink.Text, { color: chatGPTRateLimitColor, children: chatGPTRateLimitHint }) }),
     /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_ink.Box, { children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_ink.Text, { color: "gray", children: [
       "approvals: ",

package/dist/components/Footer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Footer.d.ts","sourceRoot":"","sources":["../../src/components/Footer.tsx"],"names":[],"mappings":"AAAA;;;GAGG;AAMH,OAAO,EAAqB,KAAK,sBAAsB,EAAE,MAAM,aAAa,CAAC;AAM7E,OAAO,EAAwB,KAAK,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEjF,UAAU,WAAW;IACjB,KAAK,EAAE,eAAe,CAAC;IACvB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,SAAS,EAAE,MAAM,CAAC;IAClB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,kEAAkE;IAClE,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,sBAAsB,CAAC,EAAE,sBAAsB,GAAG,IAAI,CAAC;CAC1D;AAED;;GAEG;AACH,wBAAgB,MAAM,CAAC,EACnB,KAAK,EACL,SAAS,EACT,SAAS,EACT,GAAG,EACH,UAAU,EACV,gBAAgB,EAChB,iBAAiB,EACjB,cAAc,EACd,WAAW,EACX,sBAAsB,GACzB,EAAE,WAAW,2CAkLb"}
+{"version":3,"file":"Footer.d.ts","sourceRoot":"","sources":["../../src/components/Footer.tsx"],"names":[],"mappings":"AAAA;;;GAGG;AAMH,OAAO,EAAqB,KAAK,sBAAsB,EAAE,MAAM,aAAa,CAAC;AAM7E,OAAO,EAAwB,KAAK,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAGjF,UAAU,WAAW;IACjB,KAAK,EAAE,eAAe,CAAC;IACvB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,SAAS,EAAE,MAAM,CAAC;IAClB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,kEAAkE;IAClE,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,sBAAsB,CAAC,EAAE,sBAAsB,GAAG,IAAI,CAAC;CAC1D;AAED;;GAEG;AACH,wBAAgB,MAAM,CAAC,EACnB,KAAK,EACL,SAAS,EACT,SAAS,EACT,GAAG,EACH,UAAU,EACV,gBAAgB,EAChB,iBAAiB,EACjB,cAAc,EACd,WAAW,EACX,sBAAsB,GACzB,EAAE,WAAW,2CAqNb"}

package/dist/components/Footer.js

@@ -10,6 +10,7 @@ import {
   shouldShowChatGPTRateLimitHint
 } from "../utils/chatgpt-rate-limit.js";
 import { supportsContextStats } from "../agent-backend.js";
+import { dextoCreditBalance } from "../host/index.js";
 function Footer({
   agent,
   sessionId,
@@ -95,6 +96,31 @@ function Footer({
       controller.abort();
     };
   }, [agent, sessionId]);
+  const [creditBalance, setCreditBalance] = useState(null);
+  const usesDextoCredits = provider === "dexto-nova";
+  useEffect(() => {
+    setCreditBalance(null);
+    if (!usesDextoCredits) return;
+    let cancelled = false;
+    const refresh = () => {
+      dextoCreditBalance().then((balance) => {
+        if (!cancelled) setCreditBalance(balance);
+      }).catch(() => void 0);
+    };
+    refresh();
+    const controller = new AbortController();
+    agent.on(
+      "llm:response",
+      (payload) => {
+        if (!payload.sessionId || payload.sessionId === sessionId) refresh();
+      },
+      { signal: controller.signal }
+    );
+    return () => {
+      cancelled = true;
+      controller.abort();
+    };
+  }, [agent, sessionId, usesDextoCredits]);
   const pathColor = isShellMode ? "yellow" : "blue";
   return /* @__PURE__ */ jsxs(Box, { flexDirection: "column", paddingX: 1, children: [
     /* @__PURE__ */ jsxs(Box, { flexDirection: "row", justifyContent: "space-between", children: [
@@ -123,6 +149,11 @@ function Footer({
       contextLeft.percentLeft,
       "% context left"
     ] }) }),
+    creditBalance !== null && /* @__PURE__ */ jsx(Box, { children: /* @__PURE__ */ jsxs(Text, { color: "gray", children: [
+      "$",
+      creditBalance.toFixed(2),
+      " credits"
+    ] }) }),
     chatGPTRateLimitHint && /* @__PURE__ */ jsx(Box, { children: /* @__PURE__ */ jsx(Text, { color: chatGPTRateLimitColor, children: chatGPTRateLimitHint }) }),
     /* @__PURE__ */ jsx(Box, { children: /* @__PURE__ */ jsxs(Text, { color: "gray", children: [
       "approvals: ",

package/dist/components/Footer.test.cjs

@@ -4,6 +4,7 @@ var import_node_stream = require("node:stream");
 var import_ink = require("ink");
 var import_vitest = require("vitest");
 var import_Footer = require("./Footer.js");
+var import_host = require("../host/index.js");
 (0, import_vitest.describe)("configured approval policy in the TUI footer", () => {
   import_vitest.it.each(["manual", "auto-approve"])(
     "shows %s independently of session shortcuts",
@@ -45,3 +46,46 @@ var import_Footer = require("./Footer.js");
     }
   );
 });
+(0, import_vitest.describe)("Dexto credits in the TUI footer", () => {
+  async function renderFooter(provider, balance) {
+    (0, import_host.setTuiRuntimeServices)({ dextoCreditBalance: async () => balance });
+    const stdout = Object.assign(new import_node_stream.PassThrough(), { columns: 120, rows: 40, isTTY: false });
+    let output = "";
+    stdout.on("data", (chunk) => {
+      output += String(chunk);
+    });
+    const agent = {
+      capabilities: { contextStats: false },
+      getEffectiveConfig: () => ({ permissions: { mode: "manual" } }),
+      getCurrentLLMConfig: () => ({ provider, model: "openai/gpt-5" }),
+      on: () => void 0
+    };
+    const view = (0, import_ink.render)(
+      (0, import_react.createElement)(import_Footer.Footer, { agent, sessionId: "session-1", modelName: "openai/gpt-5" }),
+      {
+        stdout,
+        debug: true,
+        patchConsole: false,
+        exitOnCtrlC: false
+      }
+    );
+    try {
+      await import_vitest.vi.waitFor(() => (0, import_vitest.expect)(output).toContain("approvals: manual"));
+      await new Promise((resolve) => setTimeout(resolve, 20));
+      return output;
+    } finally {
+      view.unmount();
+      stdout.destroy();
+      (0, import_host.setTuiRuntimeServices)({});
+    }
+  }
+  (0, import_vitest.it)("shows the balance while a Dexto model runs, under the name Dexto", async () => {
+    const output = await renderFooter("dexto-nova", 12.5);
+    (0, import_vitest.expect)(output).toContain("$12.50 credits");
+    (0, import_vitest.expect)(output).toContain("(Dexto)");
+  });
+  (0, import_vitest.it)("shows no balance for other providers", async () => {
+    const output = await renderFooter("openai", 12.5);
+    (0, import_vitest.expect)(output).not.toContain("credits");
+  });
+});

package/dist/components/Footer.test.js

@@ -3,6 +3,7 @@ import { PassThrough } from "node:stream";
 import { render } from "ink";
 import { describe, expect, it, vi } from "vitest";
 import { Footer } from "./Footer.js";
+import { setTuiRuntimeServices } from "../host/index.js";
 describe("configured approval policy in the TUI footer", () => {
   it.each(["manual", "auto-approve"])(
     "shows %s independently of session shortcuts",
@@ -44,3 +45,46 @@ describe("configured approval policy in the TUI footer", () => {
     }
   );
 });
+describe("Dexto credits in the TUI footer", () => {
+  async function renderFooter(provider, balance) {
+    setTuiRuntimeServices({ dextoCreditBalance: async () => balance });
+    const stdout = Object.assign(new PassThrough(), { columns: 120, rows: 40, isTTY: false });
+    let output = "";
+    stdout.on("data", (chunk) => {
+      output += String(chunk);
+    });
+    const agent = {
+      capabilities: { contextStats: false },
+      getEffectiveConfig: () => ({ permissions: { mode: "manual" } }),
+      getCurrentLLMConfig: () => ({ provider, model: "openai/gpt-5" }),
+      on: () => void 0
+    };
+    const view = render(
+      createElement(Footer, { agent, sessionId: "session-1", modelName: "openai/gpt-5" }),
+      {
+        stdout,
+        debug: true,
+        patchConsole: false,
+        exitOnCtrlC: false
+      }
+    );
+    try {
+      await vi.waitFor(() => expect(output).toContain("approvals: manual"));
+      await new Promise((resolve) => setTimeout(resolve, 20));
+      return output;
+    } finally {
+      view.unmount();
+      stdout.destroy();
+      setTuiRuntimeServices({});
+    }
+  }
+  it("shows the balance while a Dexto model runs, under the name Dexto", async () => {
+    const output = await renderFooter("dexto-nova", 12.5);
+    expect(output).toContain("$12.50 credits");
+    expect(output).toContain("(Dexto)");
+  });
+  it("shows no balance for other providers", async () => {
+    const output = await renderFooter("openai", 12.5);
+    expect(output).not.toContain("credits");
+  });
+});

package/dist/components/overlays/InsufficientCreditsOverlay.cjs

@@ -49,6 +49,11 @@ const TOP_UP_OPTIONS = [
     id: "open-billing",
     label: "Open billing page",
     description: "View full billing dashboard"
+  },
+  {
+    id: "own-key",
+    label: "Use your own model key",
+    description: "Pick a model from a provider you have a key for"
   }
 ];
 const WAITING_OPTIONS = [
@@ -77,7 +82,7 @@ function formatBalance(balanceUsd) {
 function getErrorMessage(error) {
   return error instanceof Error ? error.message : String(error);
 }
-const InsufficientCreditsOverlay = (0, import_react.forwardRef)(function InsufficientCreditsOverlay2({ isVisible, initialBalanceUsd, onResolved, onClose }, ref) {
+const InsufficientCreditsOverlay = (0, import_react.forwardRef)(function InsufficientCreditsOverlay2({ isVisible, initialBalanceUsd, onResolved, onClose, onChooseOwnModel }, ref) {
   const selectorRef = (0, import_react.useRef)(null);
   const isActiveRef = (0, import_react.useRef)(false);
   const [step, setStep] = (0, import_react.useState)("select");
@@ -190,6 +195,9 @@ const InsufficientCreditsOverlay = (0, import_react.forwardRef)(function Insuffi
         case "open-billing":
           void openBillingDashboard();
           return;
+        case "own-key":
+          onChooseOwnModel();
+          return;
         case "reopen":
           void reopenBilling();
           return;
@@ -201,7 +209,14 @@ const InsufficientCreditsOverlay = (0, import_react.forwardRef)(function Insuffi
           return;
       }
     },
-    [onResolved, openBillingDashboard, openPrefilledBilling, reopenBilling, resetToSelection]
+    [
+      onChooseOwnModel,
+      onResolved,
+      openBillingDashboard,
+      openPrefilledBilling,
+      reopenBilling,
+      resetToSelection
+    ]
   );
   const formatItem = (0, import_react.useCallback)((option, isSelected) => {
     return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, { children: [
@@ -228,9 +243,9 @@ const InsufficientCreditsOverlay = (0, import_react.forwardRef)(function Insuffi
     return null;
   }
   return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_ink.Box, { flexDirection: "column", children: [
-    /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_ink.Box, { children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_ink.Text, { color: "yellow", bold: true, children: "Out of Dexto Nova credits" }) }),
+    /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_ink.Box, { children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_ink.Text, { color: "yellow", bold: true, children: "Out of Dexto credits" }) }),
     /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_ink.Box, { flexDirection: "column", marginTop: 1, children: [
-      /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_ink.Text, { color: "gray", children: "This request stopped because your Dexto Nova balance ran out." }),
+      /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_ink.Text, { color: "gray", children: "This request stopped because your Dexto credits ran out." }),
       formatBalance(balanceUsd) && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_ink.Text, { color: "gray", children: [
         "Current balance: ",
         formatBalance(balanceUsd)

package/dist/components/overlays/InsufficientCreditsOverlay.d.ts

@@ -5,6 +5,8 @@ export interface InsufficientCreditsOverlayProps {
     initialBalanceUsd: number | null;
     onResolved: () => void;
     onClose: () => void;
+    /** Leaves credits for a model on the person's own key. */
+    onChooseOwnModel: () => void;
 }
 export interface InsufficientCreditsOverlayHandle {
     handleInput: (input: string, key: Key) => boolean;

package/dist/components/overlays/InsufficientCreditsOverlay.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"InsufficientCreditsOverlay.d.ts","sourceRoot":"","sources":["../../../src/components/overlays/InsufficientCreditsOverlay.tsx"],"names":[],"mappings":"AAAA,OAAO,KAQN,MAAM,OAAO,CAAC;AAEf,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,qCAAqC,CAAC;AA6E/D,MAAM,WAAW,+BAA+B;IAC5C,SAAS,EAAE,OAAO,CAAC;IACnB,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,UAAU,EAAE,MAAM,IAAI,CAAC;IACvB,OAAO,EAAE,MAAM,IAAI,CAAC;CACvB;AAED,MAAM,WAAW,gCAAgC;IAC7C,WAAW,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,KAAK,OAAO,CAAC;CACrD;AAED,QAAA,MAAM,0BAA0B,0HAiO9B,CAAC;AAEH,eAAe,0BAA0B,CAAC"}
+{"version":3,"file":"InsufficientCreditsOverlay.d.ts","sourceRoot":"","sources":["../../../src/components/overlays/InsufficientCreditsOverlay.tsx"],"names":[],"mappings":"AAAA,OAAO,KAQN,MAAM,OAAO,CAAC;AAEf,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,qCAAqC,CAAC;AAmF/D,MAAM,WAAW,+BAA+B;IAC5C,SAAS,EAAE,OAAO,CAAC;IACnB,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,UAAU,EAAE,MAAM,IAAI,CAAC;IACvB,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,0DAA0D;IAC1D,gBAAgB,EAAE,MAAM,IAAI,CAAC;CAChC;AAED,MAAM,WAAW,gCAAgC;IAC7C,WAAW,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,KAAK,OAAO,CAAC;CACrD;AAED,QAAA,MAAM,0BAA0B,0HA4O9B,CAAC;AAEH,eAAe,0BAA0B,CAAC"}

package/dist/components/overlays/InsufficientCreditsOverlay.js

@@ -34,6 +34,11 @@ const TOP_UP_OPTIONS = [
     id: "open-billing",
     label: "Open billing page",
     description: "View full billing dashboard"
+  },
+  {
+    id: "own-key",
+    label: "Use your own model key",
+    description: "Pick a model from a provider you have a key for"
   }
 ];
 const WAITING_OPTIONS = [
@@ -62,7 +67,7 @@ function formatBalance(balanceUsd) {
 function getErrorMessage(error) {
   return error instanceof Error ? error.message : String(error);
 }
-const InsufficientCreditsOverlay = forwardRef(function InsufficientCreditsOverlay2({ isVisible, initialBalanceUsd, onResolved, onClose }, ref) {
+const InsufficientCreditsOverlay = forwardRef(function InsufficientCreditsOverlay2({ isVisible, initialBalanceUsd, onResolved, onClose, onChooseOwnModel }, ref) {
   const selectorRef = useRef(null);
   const isActiveRef = useRef(false);
   const [step, setStep] = useState("select");
@@ -175,6 +180,9 @@ const InsufficientCreditsOverlay = forwardRef(function InsufficientCreditsOverla
         case "open-billing":
           void openBillingDashboard();
           return;
+        case "own-key":
+          onChooseOwnModel();
+          return;
         case "reopen":
           void reopenBilling();
           return;
@@ -186,7 +194,14 @@ const InsufficientCreditsOverlay = forwardRef(function InsufficientCreditsOverla
           return;
       }
     },
-    [onResolved, openBillingDashboard, openPrefilledBilling, reopenBilling, resetToSelection]
+    [
+      onChooseOwnModel,
+      onResolved,
+      openBillingDashboard,
+      openPrefilledBilling,
+      reopenBilling,
+      resetToSelection
+    ]
   );
   const formatItem = useCallback((option, isSelected) => {
     return /* @__PURE__ */ jsxs(Fragment, { children: [
@@ -213,9 +228,9 @@ const InsufficientCreditsOverlay = forwardRef(function InsufficientCreditsOverla
     return null;
   }
   return /* @__PURE__ */ jsxs(Box, { flexDirection: "column", children: [
-    /* @__PURE__ */ jsx(Box, { children: /* @__PURE__ */ jsx(Text, { color: "yellow", bold: true, children: "Out of Dexto Nova credits" }) }),
+    /* @__PURE__ */ jsx(Box, { children: /* @__PURE__ */ jsx(Text, { color: "yellow", bold: true, children: "Out of Dexto credits" }) }),
     /* @__PURE__ */ jsxs(Box, { flexDirection: "column", marginTop: 1, children: [
-      /* @__PURE__ */ jsx(Text, { color: "gray", children: "This request stopped because your Dexto Nova balance ran out." }),
+      /* @__PURE__ */ jsx(Text, { color: "gray", children: "This request stopped because your Dexto credits ran out." }),
       formatBalance(balanceUsd) && /* @__PURE__ */ jsxs(Text, { color: "gray", children: [
         "Current balance: ",
         formatBalance(balanceUsd)

package/dist/components/overlays/LoginOverlay.cjs

@@ -28,9 +28,8 @@ var import_host = require("../../host/index.js");
 const LoginOverlay = (0, import_react.forwardRef)(function LoginOverlay2({ isVisible, onDone }, ref) {
   const [step, setStep] = (0, import_react.useState)("checking");
   const [existingUser, setExistingUser] = (0, import_react.useState)(null);
-  const [authUrl, setAuthUrl] = (0, import_react.useState)(null);
-  const [devicePrompt, setDevicePrompt] = (0, import_react.useState)(null);
-  const [status, setStatus] = (0, import_react.useState)("Preparing login...");
+  const [signInNote, setSignInNote] = (0, import_react.useState)(null);
+  const [status, setStatus] = (0, import_react.useState)("Preparing sign-in...");
   const [error, setError] = (0, import_react.useState)(null);
   const abortControllerRef = (0, import_react.useRef)(null);
   const isActiveRef = (0, import_react.useRef)(false);
@@ -42,47 +41,24 @@ const LoginOverlay = (0, import_react.forwardRef)(function LoginOverlay2({ isVis
     abortControllerRef.current?.abort(new Error("Authentication cancelled"));
     abortControllerRef.current = null;
   }, []);
-  const runDeviceLogin = (0, import_react.useCallback)(
-    async (abortController) => {
-      setStep("starting");
-      safeSetStatus("Starting device code login...");
-      setAuthUrl(null);
-      setDevicePrompt(null);
-      return (0, import_host.performDeviceCodeLogin)({
-        signal: abortController.signal,
-        onPrompt: (prompt) => {
-          if (!isActiveRef.current || abortController.signal.aborted) {
-            return;
-          }
-          setDevicePrompt(prompt);
-          setAuthUrl(prompt.verificationUrlComplete ?? prompt.verificationUrl);
-          setStep("waiting");
-          safeSetStatus("Open the URL below and approve login.");
-        }
-      });
-    },
-    [safeSetStatus]
-  );
   const startLogin = (0, import_react.useCallback)(async () => {
     cancelInFlight();
     setError(null);
-    setAuthUrl(null);
-    setDevicePrompt(null);
+    setSignInNote(null);
+    setStep("signing-in");
+    safeSetStatus("Signing in...");
     const abortController = new AbortController();
     abortControllerRef.current = abortController;
     try {
-      const result = await runDeviceLogin(abortController);
-      if (!result || !isActiveRef.current || abortController.signal.aborted) return;
-      setStep("finalizing");
-      safeSetStatus("Finalizing login...");
-      const persisted = await (0, import_host.persistDeviceApiKeyLoginResult)(result);
-      if (!isActiveRef.current || abortController.signal.aborted) return;
-      onDone({
-        outcome: "success",
-        email: persisted.email,
-        keyId: persisted.keyId,
-        hasDextoApiKey: persisted.hasDextoApiKey
+      const summary = await (0, import_host.signIn)({
+        signal: abortController.signal,
+        onNote: (text) => {
+          if (!isActiveRef.current || abortController.signal.aborted) return;
+          setSignInNote(text);
+        }
       });
+      if (!isActiveRef.current || abortController.signal.aborted) return;
+      onDone({ outcome: "success", summary });
     } catch (err) {
       if (abortController.signal.aborted) {
         return;
@@ -90,28 +66,27 @@ const LoginOverlay = (0, import_react.forwardRef)(function LoginOverlay2({ isVis
       setStep("error");
       const errorMessage = err instanceof Error ? err.message : String(err);
       setError(errorMessage);
-      safeSetStatus("Login failed");
+      safeSetStatus("Sign-in failed");
     } finally {
       abortControllerRef.current = null;
     }
-  }, [cancelInFlight, onDone, runDeviceLogin, safeSetStatus]);
+  }, [cancelInFlight, onDone, safeSetStatus]);
   (0, import_react.useEffect)(() => {
     if (!isVisible) return;
     isActiveRef.current = true;
     setStep("checking");
     setExistingUser(null);
-    setAuthUrl(null);
-    setDevicePrompt(null);
-    setStatus("Preparing login...");
+    setSignInNote(null);
+    setStatus("Preparing sign-in...");
     setError(null);
     void (async () => {
       try {
-        const auth = await (0, import_host.loadAuth)();
+        const signedInAs = await (0, import_host.currentSignIn)();
         if (!isActiveRef.current) return;
-        if (auth) {
-          setExistingUser(auth.email || auth.userId || "user");
+        if (signedInAs !== null) {
+          setExistingUser(signedInAs);
           setStep("already-authenticated");
-          setStatus("You are already logged in");
+          setStatus("You are already signed in");
           return;
         }
         await startLogin();
@@ -151,7 +126,7 @@ const LoginOverlay = (0, import_react.forwardRef)(function LoginOverlay2({ isVis
     [cancelInFlight, isVisible, onDone, startLogin, step]
   );
   if (!isVisible) return null;
-  const hint = step === "already-authenticated" ? "Enter to login again \u2022 Esc to close" : step === "error" ? "Enter to retry \u2022 Esc to close" : "Esc to cancel";
+  const hint = step === "already-authenticated" ? "Enter to sign in again \u2022 Esc to close" : step === "error" ? "Enter to retry \u2022 Esc to close" : "Esc to cancel";
   return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(
     import_ink.Box,
     {
@@ -161,27 +136,16 @@ const LoginOverlay = (0, import_react.forwardRef)(function LoginOverlay2({ isVis
       paddingX: 1,
       marginTop: 1,
       children: [
-        /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_ink.Box, { marginBottom: 1, children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_ink.Text, { bold: true, color: "cyan", children: "Login to Dexto" }) }),
+        /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_ink.Box, { marginBottom: 1, children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_ink.Text, { bold: true, color: "cyan", children: "Sign in to Dexto" }) }),
         existingUser && step === "already-authenticated" && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_ink.Box, { marginBottom: 1, children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_ink.Text, { color: "green", children: [
-          "\u2705 Already logged in as: ",
+          "Signed in as ",
           existingUser
         ] }) }),
         /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_ink.Box, { marginBottom: 1, children: [
           /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_ink.Text, { color: "gray", children: "Status: " }),
           /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_ink.Text, { children: status })
         ] }),
-        devicePrompt && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_ink.Box, { flexDirection: "column", marginBottom: 1, children: [
-          /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_ink.Text, { color: "gray", children: "Open this URL on any device:" }),
-          /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_ink.Text, { color: "yellowBright", children: devicePrompt.verificationUrlComplete ?? devicePrompt.verificationUrl }),
-          /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_ink.Text, { color: "gray", children: [
-            "Code: ",
-            devicePrompt.userCode
-          ] })
-        ] }),
-        authUrl && !devicePrompt && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_ink.Box, { flexDirection: "column", marginBottom: 1, children: [
-          /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_ink.Text, { color: "gray", children: "If your browser didn't open, use this URL:" }),
-          /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_ink.Text, { color: "yellowBright", children: authUrl })
-        ] }),
+        signInNote && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_ink.Box, { flexDirection: "column", marginBottom: 1, children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_ink.Text, { children: signInNote }) }),
         error && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_ink.Box, { flexDirection: "column", marginBottom: 1, children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_ink.Text, { color: "red", children: [
           "Error: ",
           error

package/dist/components/overlays/LoginOverlay.d.ts

@@ -2,9 +2,7 @@ import React from 'react';
 import type { Key } from '../../hooks/useInputOrchestrator.js';
 export type LoginOverlayOutcome = {
     outcome: 'success';
-    email?: string | undefined;
-    keyId?: string | undefined;
-    hasDextoApiKey: boolean;
+    summary: string;
 } | {
     outcome: 'cancelled';
 } | {

package/dist/components/overlays/LoginOverlay.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"LoginOverlay.d.ts","sourceRoot":"","sources":["../../../src/components/overlays/LoginOverlay.tsx"],"names":[],"mappings":"AAAA,OAAO,KAON,MAAM,OAAO,CAAC;AAEf,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,qCAAqC,CAAC;AAS/D,MAAM,MAAM,mBAAmB,GACzB;IACI,OAAO,EAAE,SAAS,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3B,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3B,cAAc,EAAE,OAAO,CAAC;CAC3B,GACD;IAAE,OAAO,EAAE,WAAW,CAAA;CAAE,GACxB;IAAE,OAAO,EAAE,QAAQ,CAAA;CAAE,CAAC;AAE5B,MAAM,WAAW,iBAAiB;IAC9B,SAAS,EAAE,OAAO,CAAC;IACnB,MAAM,EAAE,CAAC,OAAO,EAAE,mBAAmB,KAAK,IAAI,CAAC;CAClD;AAED,MAAM,WAAW,kBAAkB;IAC/B,WAAW,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,KAAK,OAAO,CAAC;CACrD;AAUD,QAAA,MAAM,YAAY,8FA0NhB,CAAC;AAEH,eAAe,YAAY,CAAC"}
+{"version":3,"file":"LoginOverlay.d.ts","sourceRoot":"","sources":["../../../src/components/overlays/LoginOverlay.tsx"],"names":[],"mappings":"AAAA,OAAO,KAON,MAAM,OAAO,CAAC;AAEf,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,qCAAqC,CAAC;AAG/D,MAAM,MAAM,mBAAmB,GACzB;IAAE,OAAO,EAAE,SAAS,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GACvC;IAAE,OAAO,EAAE,WAAW,CAAA;CAAE,GACxB;IAAE,OAAO,EAAE,QAAQ,CAAA;CAAE,CAAC;AAE5B,MAAM,WAAW,iBAAiB;IAC9B,SAAS,EAAE,OAAO,CAAC;IACnB,MAAM,EAAE,CAAC,OAAO,EAAE,mBAAmB,KAAK,IAAI,CAAC;CAClD;AAED,MAAM,WAAW,kBAAkB;IAC/B,WAAW,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,KAAK,OAAO,CAAC;CACrD;AAID,QAAA,MAAM,YAAY,8FAiLhB,CAAC;AAEH,eAAe,YAAY,CAAC"}