@dexto/tui 1.14.6 → 1.15.0-beta.1

package/dist/components/overlays/InsufficientCreditsOverlay.cjs

@@ -26,6 +26,7 @@ var import_react = require("react");
 var import_ink = require("ink");
 var import_BaseSelector = require("../base/BaseSelector.js");
 var import_host = require("../../host/index.js");
+var import_signal = require("../../signal/index.js");
 const TOP_UP_OPTIONS = [
   {
     id: "top-up-25",
@@ -49,6 +50,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 +83,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 +196,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,12 +210,19 @@ 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: [
-      /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_ink.Text, { color: isSelected ? "yellow" : "gray", bold: isSelected, children: option.label }),
-      /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_ink.Text, { color: isSelected ? "white" : "gray", children: [
+      /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_ink.Text, { color: isSelected ? (0, import_signal.tone)("amberDim") : (0, import_signal.tone)("dim"), bold: isSelected, children: option.label }),
+      /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_ink.Text, { color: isSelected ? (0, import_signal.tone)("hi") : (0, import_signal.tone)("dim"), children: [
         " - ",
         option.description
       ] })
@@ -228,17 +244,17 @@ 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: (0, import_signal.tone)("amberDim"), 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." }),
-      formatBalance(balanceUsd) && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_ink.Text, { color: "gray", children: [
+      /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_ink.Text, { color: (0, import_signal.tone)("dim"), children: "This request stopped because your Dexto credits ran out." }),
+      formatBalance(balanceUsd) && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_ink.Text, { color: (0, import_signal.tone)("dim"), children: [
         "Current balance: ",
         formatBalance(balanceUsd)
       ] })
     ] }),
     /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_ink.Box, { flexDirection: "column", marginTop: 1, children: [
       /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_ink.Text, { children: statusMessage }),
-      errorMessage && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_ink.Text, { color: "red", children: errorMessage })
+      errorMessage && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_ink.Text, { color: (0, import_signal.tone)("red"), children: errorMessage })
     ] }),
     /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_ink.Box, { marginTop: 1, children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
       import_BaseSelector.BaseSelector,
@@ -253,7 +269,7 @@ const InsufficientCreditsOverlay = (0, import_react.forwardRef)(function Insuffi
         onClose,
         formatItem,
         title: selectorTitle,
-        borderColor: "yellow",
+        borderColor: (0, import_signal.tone)("amberDim"),
         maxVisibleItems: 6,
         loadingMessage,
         emptyMessage: "No billing actions available"

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;AAoF/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,0HA8O9B,CAAC;AAEH,eAAe,0BAA0B,CAAC"}

package/dist/components/overlays/InsufficientCreditsOverlay.js

@@ -11,6 +11,7 @@ import {
 import { Box, Text } from "ink";
 import { BaseSelector } from "../base/BaseSelector.js";
 import { buildDextoBillingUrl, openDextoBillingPage } from "../../host/index.js";
+import { tone } from "../../signal/index.js";
 const TOP_UP_OPTIONS = [
   {
     id: "top-up-25",
@@ -34,6 +35,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 +68,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 +181,9 @@ const InsufficientCreditsOverlay = forwardRef(function InsufficientCreditsOverla
         case "open-billing":
           void openBillingDashboard();
           return;
+        case "own-key":
+          onChooseOwnModel();
+          return;
         case "reopen":
           void reopenBilling();
           return;
@@ -186,12 +195,19 @@ 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: [
-      /* @__PURE__ */ jsx(Text, { color: isSelected ? "yellow" : "gray", bold: isSelected, children: option.label }),
-      /* @__PURE__ */ jsxs(Text, { color: isSelected ? "white" : "gray", children: [
+      /* @__PURE__ */ jsx(Text, { color: isSelected ? tone("amberDim") : tone("dim"), bold: isSelected, children: option.label }),
+      /* @__PURE__ */ jsxs(Text, { color: isSelected ? tone("hi") : tone("dim"), children: [
         " - ",
         option.description
       ] })
@@ -213,17 +229,17 @@ 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: tone("amberDim"), 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." }),
-      formatBalance(balanceUsd) && /* @__PURE__ */ jsxs(Text, { color: "gray", children: [
+      /* @__PURE__ */ jsx(Text, { color: tone("dim"), children: "This request stopped because your Dexto credits ran out." }),
+      formatBalance(balanceUsd) && /* @__PURE__ */ jsxs(Text, { color: tone("dim"), children: [
         "Current balance: ",
         formatBalance(balanceUsd)
       ] })
     ] }),
     /* @__PURE__ */ jsxs(Box, { flexDirection: "column", marginTop: 1, children: [
       /* @__PURE__ */ jsx(Text, { children: statusMessage }),
-      errorMessage && /* @__PURE__ */ jsx(Text, { color: "red", children: errorMessage })
+      errorMessage && /* @__PURE__ */ jsx(Text, { color: tone("red"), children: errorMessage })
     ] }),
     /* @__PURE__ */ jsx(Box, { marginTop: 1, children: /* @__PURE__ */ jsx(
       BaseSelector,
@@ -238,7 +254,7 @@ const InsufficientCreditsOverlay = forwardRef(function InsufficientCreditsOverla
         onClose,
         formatItem,
         title: selectorTitle,
-        borderColor: "yellow",
+        borderColor: tone("amberDim"),
         maxVisibleItems: 6,
         loadingMessage,
         emptyMessage: "No billing actions available"

package/dist/components/overlays/LogLevelSelector.cjs

@@ -25,6 +25,7 @@ var import_jsx_runtime = require("react/jsx-runtime");
 var import_react = require("react");
 var import_ink = require("ink");
 var import_BaseSelector = require("../base/BaseSelector.js");
+var import_signal = require("../../signal/index.js");
 const LOG_LEVELS = [
   { level: "error", description: "Errors only", icon: "!" },
   { level: "warn", description: "Warnings and above", icon: "\u26A0\uFE0F" },
@@ -79,12 +80,12 @@ const LogLevelSelector = (0, import_react.forwardRef)(
         option.icon,
         " "
       ] }),
-      /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_ink.Text, { color: isSelected ? "cyan" : "gray", bold: isSelected, children: option.level }),
-      /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_ink.Text, { color: isSelected ? "white" : "gray", children: [
+      /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_ink.Text, { color: isSelected ? (0, import_signal.tone)("teal") : (0, import_signal.tone)("dim"), bold: isSelected, children: option.level }),
+      /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_ink.Text, { color: isSelected ? (0, import_signal.tone)("hi") : (0, import_signal.tone)("dim"), children: [
         " - ",
         option.description
       ] }),
-      option.isCurrent && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_ink.Text, { color: isSelected ? "cyan" : "gray", bold: isSelected, children: [
+      option.isCurrent && /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_ink.Text, { color: isSelected ? (0, import_signal.tone)("teal") : (0, import_signal.tone)("dim"), bold: isSelected, children: [
         " ",
         "\u2190 Current"
       ] })
@@ -93,7 +94,7 @@ const LogLevelSelector = (0, import_react.forwardRef)(
       onSelect(option.level);
     };
     return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_ink.Box, { flexDirection: "column", children: [
-      logFilePath && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_ink.Box, { marginBottom: 1, children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_ink.Text, { color: "gray", children: [
+      logFilePath && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_ink.Box, { marginBottom: 1, children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_ink.Text, { color: (0, import_signal.tone)("dim"), children: [
         "\u{1F4C1} Log file: ",
         logFilePath
       ] }) }),
@@ -110,7 +111,7 @@ const LogLevelSelector = (0, import_react.forwardRef)(
           onClose,
           formatItem,
           title: "Select Log Level",
-          borderColor: "yellowBright",
+          borderColor: (0, import_signal.tone)("amber"),
           emptyMessage: "No log levels available"
         }
       )

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

@@ -1 +1 @@
-{"version":3,"file":"LogLevelSelector.d.ts","sourceRoot":"","sources":["../../../src/components/overlays/LogLevelSelector.tsx"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAuE,MAAM,OAAO,CAAC;AAE5F,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,qCAAqC,CAAC;AAE/D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAE9D,UAAU,qBAAqB;IAC3B,SAAS,EAAE,OAAO,CAAC;IACnB,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAClC,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,KAAK,EAAE,eAAe,CAAC;IACvB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;CAC5B;AAED,MAAM,WAAW,sBAAsB;IACnC,WAAW,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,KAAK,OAAO,CAAC;CACrD;AAkBD;;GAEG;AACH,QAAA,MAAM,gBAAgB,sGAwGrB,CAAC;AAEF,eAAe,gBAAgB,CAAC"}
+{"version":3,"file":"LogLevelSelector.d.ts","sourceRoot":"","sources":["../../../src/components/overlays/LogLevelSelector.tsx"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAuE,MAAM,OAAO,CAAC;AAE5F,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,qCAAqC,CAAC;AAE/D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAG9D,UAAU,qBAAqB;IAC3B,SAAS,EAAE,OAAO,CAAC;IACnB,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAClC,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,KAAK,EAAE,eAAe,CAAC;IACvB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;CAC5B;AAED,MAAM,WAAW,sBAAsB;IACnC,WAAW,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,KAAK,OAAO,CAAC;CACrD;AAkBD;;GAEG;AACH,QAAA,MAAM,gBAAgB,sGAwGrB,CAAC;AAEF,eAAe,gBAAgB,CAAC"}

package/dist/components/overlays/LogLevelSelector.js

@@ -2,6 +2,7 @@ import { Fragment, jsx, jsxs } from "react/jsx-runtime";
 import { useState, useEffect, forwardRef, useRef, useImperativeHandle } from "react";
 import { Box, Text } from "ink";
 import { BaseSelector } from "../base/BaseSelector.js";
+import { tone } from "../../signal/index.js";
 const LOG_LEVELS = [
   { level: "error", description: "Errors only", icon: "!" },
   { level: "warn", description: "Warnings and above", icon: "\u26A0\uFE0F" },
@@ -56,12 +57,12 @@ const LogLevelSelector = forwardRef(
         option.icon,
         " "
       ] }),
-      /* @__PURE__ */ jsx(Text, { color: isSelected ? "cyan" : "gray", bold: isSelected, children: option.level }),
-      /* @__PURE__ */ jsxs(Text, { color: isSelected ? "white" : "gray", children: [
+      /* @__PURE__ */ jsx(Text, { color: isSelected ? tone("teal") : tone("dim"), bold: isSelected, children: option.level }),
+      /* @__PURE__ */ jsxs(Text, { color: isSelected ? tone("hi") : tone("dim"), children: [
         " - ",
         option.description
       ] }),
-      option.isCurrent && /* @__PURE__ */ jsxs(Text, { color: isSelected ? "cyan" : "gray", bold: isSelected, children: [
+      option.isCurrent && /* @__PURE__ */ jsxs(Text, { color: isSelected ? tone("teal") : tone("dim"), bold: isSelected, children: [
         " ",
         "\u2190 Current"
       ] })
@@ -70,7 +71,7 @@ const LogLevelSelector = forwardRef(
       onSelect(option.level);
     };
     return /* @__PURE__ */ jsxs(Box, { flexDirection: "column", children: [
-      logFilePath && /* @__PURE__ */ jsx(Box, { marginBottom: 1, children: /* @__PURE__ */ jsxs(Text, { color: "gray", children: [
+      logFilePath && /* @__PURE__ */ jsx(Box, { marginBottom: 1, children: /* @__PURE__ */ jsxs(Text, { color: tone("dim"), children: [
         "\u{1F4C1} Log file: ",
         logFilePath
       ] }) }),
@@ -87,7 +88,7 @@ const LogLevelSelector = forwardRef(
           onClose,
           formatItem,
           title: "Select Log Level",
-          borderColor: "yellowBright",
+          borderColor: tone("amber"),
           emptyMessage: "No log levels available"
         }
       )

package/dist/components/overlays/LoginOverlay.cjs

@@ -25,12 +25,12 @@ var import_jsx_runtime = require("react/jsx-runtime");
 var import_react = require("react");
 var import_ink = require("ink");
 var import_host = require("../../host/index.js");
+var import_signal = require("../../signal/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 +42,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 +67,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,42 +127,31 @@ 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,
     {
       flexDirection: "column",
       borderStyle: "round",
-      borderColor: "cyan",
+      borderColor: (0, import_signal.tone)("teal"),
       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" }) }),
-        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: ",
+        /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_ink.Box, { marginBottom: 1, children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_ink.Text, { bold: true, color: (0, import_signal.tone)("teal"), 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: (0, import_signal.tone)("add"), children: [
+          "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, { color: (0, import_signal.tone)("dim"), 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 })
-        ] }),
-        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: [
+        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: (0, import_signal.tone)("red"), children: [
           "Error: ",
           error
         ] }) }),
-        /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_ink.Box, { children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_ink.Text, { color: "gray", dimColor: true, children: hint }) })
+        /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_ink.Box, { children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_ink.Text, { color: (0, import_signal.tone)("dim"), dimColor: true, children: hint }) })
       ]
     }
   );

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;AAI/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"}