@dexto/tui 1.14.6 → 1.15.0-beta.1

package/dist/host/index.test.cjs

@@ -1,47 +1,33 @@
 "use strict";
 var import_vitest = require("vitest");
 var import_index = require("./index.js");
-(0, import_vitest.describe)("TUI auth runtime services", () => {
+(0, import_vitest.describe)("TUI sign-in runtime services", () => {
   (0, import_vitest.afterEach)(() => {
     (0, import_index.setTuiRuntimeServices)({});
   });
-  (0, import_vitest.it)("uses host-provided API-key device login and persistence services", async () => {
-    const prompt = import_vitest.vi.fn();
-    const perform = import_vitest.vi.fn().mockResolvedValue({
-      dextoApiKey: "dxt_full_key",
-      dextoKeyDisplay: "dxt_abc...",
-      dextoKeyId: "key-id"
-    });
-    const persist = import_vitest.vi.fn().mockResolvedValue({
-      keyId: "key-id",
-      hasDextoApiKey: true
-    });
+  (0, import_vitest.it)("signs in, says who, and signs out through the host", async () => {
+    const signal = new AbortController().signal;
+    const onNote = import_vitest.vi.fn();
+    const hostSignIn = import_vitest.vi.fn().mockResolvedValue("Signed in as ada@example.com in Acme.");
     (0, import_index.setTuiRuntimeServices)({
-      performDeviceCodeLogin: perform,
-      persistDeviceApiKeyLoginResult: persist
-    });
-    const loginResult = await (0, import_index.performDeviceCodeLogin)({
-      onPrompt: prompt
-    });
-    const persisted = await (0, import_index.persistDeviceApiKeyLoginResult)(loginResult);
-    (0, import_vitest.expect)(perform).toHaveBeenCalledWith({ onPrompt: prompt });
-    (0, import_vitest.expect)(persist).toHaveBeenCalledWith({
-      dextoApiKey: "dxt_full_key",
-      dextoKeyDisplay: "dxt_abc...",
-      dextoKeyId: "key-id"
-    });
-    (0, import_vitest.expect)(persisted).toEqual({
-      keyId: "key-id",
-      hasDextoApiKey: true
+      currentSignIn: async () => "ada@example.com in Acme",
+      signIn: hostSignIn,
+      signOut: async () => "Logged out."
     });
+    (0, import_vitest.expect)(await (0, import_index.currentSignIn)()).toBe("ada@example.com in Acme");
+    (0, import_vitest.expect)(await (0, import_index.signIn)({ signal, onNote })).toBe("Signed in as ada@example.com in Acme.");
+    (0, import_vitest.expect)(hostSignIn).toHaveBeenCalledWith({ signal, onNote });
+    (0, import_vitest.expect)(await (0, import_index.signOut)()).toBe("Logged out.");
   });
-  (0, import_vitest.it)("fails fast when API-key device login persistence is not provided by the host", async () => {
+  (0, import_vitest.it)("fails fast when the host provides no sign-in", async () => {
+    await (0, import_vitest.expect)((0, import_index.currentSignIn)()).rejects.toThrow(
+      "TUI runtime services missing required method: currentSignIn"
+    );
     await (0, import_vitest.expect)(
-      (0, import_index.persistDeviceApiKeyLoginResult)({
-        dextoApiKey: "dxt_full_key",
-        dextoKeyDisplay: "dxt_abc...",
-        dextoKeyId: "key-id"
-      })
-    ).rejects.toThrow("TUI runtime services missing required method");
+      (0, import_index.signIn)({ signal: new AbortController().signal, onNote: () => void 0 })
+    ).rejects.toThrow("TUI runtime services missing required method: signIn");
+    await (0, import_vitest.expect)((0, import_index.signOut)()).rejects.toThrow(
+      "TUI runtime services missing required method: signOut"
+    );
   });
 });

package/dist/host/index.test.js

@@ -1,50 +1,32 @@
 import { afterEach, describe, expect, it, vi } from "vitest";
-import {
-  performDeviceCodeLogin,
-  persistDeviceApiKeyLoginResult,
-  setTuiRuntimeServices
-} from "./index.js";
-describe("TUI auth runtime services", () => {
+import { currentSignIn, setTuiRuntimeServices, signIn, signOut } from "./index.js";
+describe("TUI sign-in runtime services", () => {
   afterEach(() => {
     setTuiRuntimeServices({});
   });
-  it("uses host-provided API-key device login and persistence services", async () => {
-    const prompt = vi.fn();
-    const perform = vi.fn().mockResolvedValue({
-      dextoApiKey: "dxt_full_key",
-      dextoKeyDisplay: "dxt_abc...",
-      dextoKeyId: "key-id"
-    });
-    const persist = vi.fn().mockResolvedValue({
-      keyId: "key-id",
-      hasDextoApiKey: true
-    });
+  it("signs in, says who, and signs out through the host", async () => {
+    const signal = new AbortController().signal;
+    const onNote = vi.fn();
+    const hostSignIn = vi.fn().mockResolvedValue("Signed in as ada@example.com in Acme.");
     setTuiRuntimeServices({
-      performDeviceCodeLogin: perform,
-      persistDeviceApiKeyLoginResult: persist
-    });
-    const loginResult = await performDeviceCodeLogin({
-      onPrompt: prompt
-    });
-    const persisted = await persistDeviceApiKeyLoginResult(loginResult);
-    expect(perform).toHaveBeenCalledWith({ onPrompt: prompt });
-    expect(persist).toHaveBeenCalledWith({
-      dextoApiKey: "dxt_full_key",
-      dextoKeyDisplay: "dxt_abc...",
-      dextoKeyId: "key-id"
-    });
-    expect(persisted).toEqual({
-      keyId: "key-id",
-      hasDextoApiKey: true
+      currentSignIn: async () => "ada@example.com in Acme",
+      signIn: hostSignIn,
+      signOut: async () => "Logged out."
     });
+    expect(await currentSignIn()).toBe("ada@example.com in Acme");
+    expect(await signIn({ signal, onNote })).toBe("Signed in as ada@example.com in Acme.");
+    expect(hostSignIn).toHaveBeenCalledWith({ signal, onNote });
+    expect(await signOut()).toBe("Logged out.");
   });
-  it("fails fast when API-key device login persistence is not provided by the host", async () => {
+  it("fails fast when the host provides no sign-in", async () => {
+    await expect(currentSignIn()).rejects.toThrow(
+      "TUI runtime services missing required method: currentSignIn"
+    );
     await expect(
-      persistDeviceApiKeyLoginResult({
-        dextoApiKey: "dxt_full_key",
-        dextoKeyDisplay: "dxt_abc...",
-        dextoKeyId: "key-id"
-      })
-    ).rejects.toThrow("TUI runtime services missing required method");
+      signIn({ signal: new AbortController().signal, onNote: () => void 0 })
+    ).rejects.toThrow("TUI runtime services missing required method: signIn");
+    await expect(signOut()).rejects.toThrow(
+      "TUI runtime services missing required method: signOut"
+    );
   });
 });

package/dist/index.d.cts

@@ -362,38 +362,11 @@ declare function startInkCliRefactored(agent: TuiAgentBackend, initialSessionId:
 interface TuiShutdownHandle {
     stop?: (() => Promise<void>) | undefined;
 }
-interface TuiAuthConfig {
-    token?: string | undefined;
-    refreshToken?: string | undefined;
-    userId?: string | undefined;
-    email?: string | undefined;
-    expiresAt?: number | undefined;
-    createdAt: number;
-    dextoApiKey?: string | undefined;
-    dextoKeyId?: string | undefined;
-    dextoApiKeySource?: 'provisioned' | 'user-supplied' | undefined;
-}
-interface TuiDeviceApiKeyLoginResult {
-    dextoApiKey: string;
-    dextoKeyId: string;
-    dextoKeyDisplay: string;
-}
-interface TuiDeviceLoginPrompt {
-    userCode: string;
-    verificationUrl: string;
-    verificationUrlComplete: string | null;
-    expiresIn: number;
-}
-type TuiDextoApiKeyProvisionStatusLevel = 'info' | 'success' | 'warning' | 'error';
-interface TuiDextoApiKeyProvisionStatus {
-    level: TuiDextoApiKeyProvisionStatusLevel;
-    message: string;
-}
-interface TuiPersistedLoginResult {
-    email?: string | undefined;
-    userId?: string | undefined;
-    keyId?: string | undefined;
-    hasDextoApiKey: boolean;
+interface TuiSignInOptions {
+    /** Aborts the sign-in, such as when the person presses Esc. */
+    signal: AbortSignal;
+    /** What to show while signing in: the link, or the code to check. */
+    onNote: (text: string) => void;
 }
 interface TuiRuntimeServices {
     registerGracefulShutdown?: (getAgent: () => TuiShutdownHandle, options: {
@@ -408,26 +381,14 @@ interface TuiRuntimeServices {
         content: string;
         url?: string | undefined;
     } | null;
-    performDeviceCodeLogin?: (options?: {
-        signal?: AbortSignal | undefined;
-        onPrompt?: ((prompt: TuiDeviceLoginPrompt) => void) | undefined;
-    }) => Promise<TuiDeviceApiKeyLoginResult>;
-    persistDeviceApiKeyLoginResult?: (result: TuiDeviceApiKeyLoginResult) => Promise<TuiPersistedLoginResult>;
-    ensureDextoApiKeyForAuthToken?: (authToken: string, options?: {
-        onStatus?: ((status: TuiDextoApiKeyProvisionStatus) => void) | undefined;
-    }) => Promise<{
-        dextoApiKey: string;
-        keyId: string | null;
-    } | null>;
-    loadAuth?: () => Promise<TuiAuthConfig | null>;
-    storeAuth?: (config: TuiAuthConfig) => Promise<void>;
-    removeAuth?: () => Promise<void>;
-    removeDextoApiKeyFromEnv?: (options?: {
-        expectedValue?: string;
-    }) => Promise<{
-        removed: boolean;
-        targetEnvPath: string;
-    }>;
+    /** Who the current profile acts as, in a few words, or null when signed out. */
+    currentSignIn?: () => Promise<string | null>;
+    /** Signs the current profile in to Dexto, resolving with what to say once signed in. */
+    signIn?: (options: TuiSignInOptions) => Promise<string>;
+    /** Ends the current profile's sign-in, resolving with what to say. */
+    signOut?: () => Promise<string>;
+    /** The organization's Dexto credit balance in USD; null when signed out. */
+    dextoCreditBalance?: () => Promise<number | null>;
     isUsingDextoCredits?: () => Promise<boolean>;
     canUseDextoProvider?: () => Promise<boolean>;
     buildDextoBillingUrl?: (options: {

package/dist/interactive-commands/command-parser.cjs

@@ -1,9 +1,7 @@
 "use strict";
-var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -17,14 +15,6 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var command_parser_exports = {};
 __export(command_parser_exports, {
@@ -35,7 +25,7 @@ __export(command_parser_exports, {
   parseInput: () => parseInput
 });
 module.exports = __toCommonJS(command_parser_exports);
-var import_chalk = __toESM(require("chalk"), 1);
+var import_signal = require("../signal/index.js");
 const overlayOnlyHandler = async () => true;
 function parseQuotedArguments(input) {
   const args = [];
@@ -114,23 +104,23 @@ function getCommandSuggestions(partial, commands) {
   return suggestions.sort();
 }
 function formatCommandHelp(cmd, detailed = false) {
-  let help = import_chalk.default.cyan(`/${cmd.name}`) + " - " + cmd.description;
+  let help = (0, import_signal.paint)("teal")(`/${cmd.name}`) + " - " + cmd.description;
   if (detailed) {
-    help += "\n" + import_chalk.default.gray(`Usage: ${cmd.usage}`);
+    help += "\n" + (0, import_signal.paint)("dim")(`Usage: ${cmd.usage}`);
     if (cmd.aliases && cmd.aliases.length > 0) {
-      help += "\n" + import_chalk.default.gray(`Aliases: ${cmd.aliases.map((a) => `/${a}`).join(", ")}`);
+      help += "\n" + (0, import_signal.paint)("dim")(`Aliases: ${cmd.aliases.map((a) => `/${a}`).join(", ")}`);
     }
     if (cmd.subcommands && cmd.subcommands.length > 0) {
-      help += "\n" + import_chalk.default.gray("Subcommands:");
+      help += "\n" + (0, import_signal.paint)("dim")("Subcommands:");
       for (const sub of cmd.subcommands) {
-        help += "\n  " + import_chalk.default.cyan(`/${cmd.name} ${sub.name}`) + " - " + sub.description;
+        help += "\n  " + (0, import_signal.paint)("teal")(`/${cmd.name} ${sub.name}`) + " - " + sub.description;
       }
     }
   }
   return help;
 }
 function displayAllCommands(commands) {
-  console.log(import_chalk.default.bold.green("\n\u{1F4CB} Available Commands:\n"));
+  console.log((0, import_signal.paint)("add").bold("\n\u{1F4CB} Available Commands:\n"));
   const categoryOrder = [
     "General",
     "Session Management",
@@ -156,7 +146,7 @@ function displayAllCommands(commands) {
   for (const category of categoryOrder) {
     const cmds = categories[category];
     if (cmds && cmds.length > 0) {
-      console.log(import_chalk.default.bold.rgb(255, 165, 0)(`${category}:`));
+      console.log((0, import_signal.paint)("amber").bold(`${category}:`));
       for (const cmd of cmds) {
         console.log("  " + formatCommandHelp(cmd));
       }
@@ -165,15 +155,17 @@ function displayAllCommands(commands) {
   }
   for (const [category, cmds] of Object.entries(categories)) {
     if (!categoryOrder.includes(category) && cmds.length > 0) {
-      console.log(import_chalk.default.bold.rgb(255, 165, 0)(`${category}:`));
+      console.log((0, import_signal.paint)("amber").bold(`${category}:`));
       for (const cmd of cmds) {
         console.log("  " + formatCommandHelp(cmd));
       }
       console.log();
     }
   }
-  console.log(import_chalk.default.gray("\u{1F4A1} Tip: Use /help <command> for detailed help on any command"));
-  console.log(import_chalk.default.gray("\u{1F4A1} Tip: Type your message normally (without /) to chat with the AI\n"));
+  console.log((0, import_signal.paint)("dim")("\u{1F4A1} Tip: Use /help <command> for detailed help on any command"));
+  console.log(
+    (0, import_signal.paint)("dim")("\u{1F4A1} Tip: Type your message normally (without /) to chat with the AI\n")
+  );
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/interactive-commands/command-parser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"command-parser.d.ts","sourceRoot":"","sources":["../../src/interactive-commands/command-parser.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AACrF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAE3D,MAAM,WAAW,aAAa;IAC1B,IAAI,EAAE,SAAS,GAAG,QAAQ,CAAC;IAC3B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;CACpB;AAED;;;;;;GAMG;AACH,MAAM,MAAM,oBAAoB,GAAG,OAAO,GAAG,MAAM,GAAG,YAAY,GAAG,iBAAiB,CAAC;AAEvF;;GAEG;AACH,MAAM,WAAW,cAAc;IAC3B,uDAAuD;IACvD,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,yEAAyE;IACzE,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;CACjC;AAED,MAAM,WAAW,iBAAiB;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,WAAW,CAAC,EAAE,iBAAiB,EAAE,CAAC;IAClC,OAAO,EAAE,CACL,IAAI,EAAE,MAAM,EAAE,EACd,KAAK,EAAE,eAAe,EACtB,GAAG,EAAE,cAAc,KAClB,OAAO,CAAC,oBAAoB,CAAC,CAAC;CACtC;AAED;;;GAGG;AACH,eAAO,MAAM,kBAAkB,QAAa,OAAO,CAAC,oBAAoB,CAAS,CAAC;AA4ClF;;GAEG;AACH,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,aAAa,CAiCvD;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,iBAAiB,EAAE,GAAG,MAAM,EAAE,CAoB9F;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,iBAAiB,EAAE,QAAQ,GAAE,OAAe,GAAG,MAAM,CAmB3F;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,iBAAiB,EAAE,GAAG,IAAI,CAyDtE"}
+{"version":3,"file":"command-parser.d.ts","sourceRoot":"","sources":["../../src/interactive-commands/command-parser.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AACrF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAE3D,MAAM,WAAW,aAAa;IAC1B,IAAI,EAAE,SAAS,GAAG,QAAQ,CAAC;IAC3B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;CACpB;AAED;;;;;;GAMG;AACH,MAAM,MAAM,oBAAoB,GAAG,OAAO,GAAG,MAAM,GAAG,YAAY,GAAG,iBAAiB,CAAC;AAEvF;;GAEG;AACH,MAAM,WAAW,cAAc;IAC3B,uDAAuD;IACvD,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,yEAAyE;IACzE,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;CACjC;AAED,MAAM,WAAW,iBAAiB;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,WAAW,CAAC,EAAE,iBAAiB,EAAE,CAAC;IAClC,OAAO,EAAE,CACL,IAAI,EAAE,MAAM,EAAE,EACd,KAAK,EAAE,eAAe,EACtB,GAAG,EAAE,cAAc,KAClB,OAAO,CAAC,oBAAoB,CAAC,CAAC;CACtC;AAED;;;GAGG;AACH,eAAO,MAAM,kBAAkB,QAAa,OAAO,CAAC,oBAAoB,CAAS,CAAC;AA4ClF;;GAEG;AACH,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,aAAa,CAiCvD;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,iBAAiB,EAAE,GAAG,MAAM,EAAE,CAoB9F;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,iBAAiB,EAAE,QAAQ,GAAE,OAAe,GAAG,MAAM,CAoB3F;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,iBAAiB,EAAE,GAAG,IAAI,CA2DtE"}

package/dist/interactive-commands/command-parser.js

@@ -1,4 +1,4 @@
-import chalk from "chalk";
+import { paint } from "../signal/index.js";
 const overlayOnlyHandler = async () => true;
 function parseQuotedArguments(input) {
   const args = [];
@@ -77,23 +77,23 @@ function getCommandSuggestions(partial, commands) {
   return suggestions.sort();
 }
 function formatCommandHelp(cmd, detailed = false) {
-  let help = chalk.cyan(`/${cmd.name}`) + " - " + cmd.description;
+  let help = paint("teal")(`/${cmd.name}`) + " - " + cmd.description;
   if (detailed) {
-    help += "\n" + chalk.gray(`Usage: ${cmd.usage}`);
+    help += "\n" + paint("dim")(`Usage: ${cmd.usage}`);
     if (cmd.aliases && cmd.aliases.length > 0) {
-      help += "\n" + chalk.gray(`Aliases: ${cmd.aliases.map((a) => `/${a}`).join(", ")}`);
+      help += "\n" + paint("dim")(`Aliases: ${cmd.aliases.map((a) => `/${a}`).join(", ")}`);
     }
     if (cmd.subcommands && cmd.subcommands.length > 0) {
-      help += "\n" + chalk.gray("Subcommands:");
+      help += "\n" + paint("dim")("Subcommands:");
       for (const sub of cmd.subcommands) {
-        help += "\n  " + chalk.cyan(`/${cmd.name} ${sub.name}`) + " - " + sub.description;
+        help += "\n  " + paint("teal")(`/${cmd.name} ${sub.name}`) + " - " + sub.description;
       }
     }
   }
   return help;
 }
 function displayAllCommands(commands) {
-  console.log(chalk.bold.green("\n\u{1F4CB} Available Commands:\n"));
+  console.log(paint("add").bold("\n\u{1F4CB} Available Commands:\n"));
   const categoryOrder = [
     "General",
     "Session Management",
@@ -119,7 +119,7 @@ function displayAllCommands(commands) {
   for (const category of categoryOrder) {
     const cmds = categories[category];
     if (cmds && cmds.length > 0) {
-      console.log(chalk.bold.rgb(255, 165, 0)(`${category}:`));
+      console.log(paint("amber").bold(`${category}:`));
       for (const cmd of cmds) {
         console.log("  " + formatCommandHelp(cmd));
       }
@@ -128,15 +128,17 @@ function displayAllCommands(commands) {
   }
   for (const [category, cmds] of Object.entries(categories)) {
     if (!categoryOrder.includes(category) && cmds.length > 0) {
-      console.log(chalk.bold.rgb(255, 165, 0)(`${category}:`));
+      console.log(paint("amber").bold(`${category}:`));
       for (const cmd of cmds) {
         console.log("  " + formatCommandHelp(cmd));
       }
       console.log();
     }
   }
-  console.log(chalk.gray("\u{1F4A1} Tip: Use /help <command> for detailed help on any command"));
-  console.log(chalk.gray("\u{1F4A1} Tip: Type your message normally (without /) to chat with the AI\n"));
+  console.log(paint("dim")("\u{1F4A1} Tip: Use /help <command> for detailed help on any command"));
+  console.log(
+    paint("dim")("\u{1F4A1} Tip: Type your message normally (without /) to chat with the AI\n")
+  );
 }
 export {
   displayAllCommands,

package/dist/interactive-commands/general-commands.cjs

@@ -40,6 +40,7 @@ var import_command_output = require("./utils/command-output.js");
 var import_clipboardUtils = require("../utils/clipboardUtils.js");
 var import_exit_stats = require("./exit-stats.js");
 var import_exit_handler = require("./exit-handler.js");
+var import_signal = require("../signal/index.js");
 function getShellRcFile(shell) {
   const home = process.env.HOME;
   if (!home) return null;
@@ -140,13 +141,13 @@ const generalCommands = [
         lines.push(stdout.trim());
       }
       if (stderr.trim()) {
-        lines.push(import_chalk.default.yellow(stderr.trim()));
+        lines.push((0, import_signal.paint)("amberDim")(stderr.trim()));
       }
       if (exitCode !== 0) {
-        lines.push(import_chalk.default.red(`Exit code: ${exitCode}`));
+        lines.push((0, import_signal.paint)("red")(`Exit code: ${exitCode}`));
       }
       if (lines.length === 0) {
-        return (0, import_format_output.formatForInkCli)(import_chalk.default.gray("(no output)"));
+        return (0, import_format_output.formatForInkCli)((0, import_signal.paint)("dim")("(no output)"));
       }
       return (0, import_format_output.formatForInkCli)(lines.join("\n"));
     }
@@ -299,9 +300,9 @@ const generalCommands = [
         const filledWidth = Math.round(displayPercent / 100 * barWidth);
         const emptyWidth = barWidth - filledWidth;
         const progressBar = "\u2588".repeat(filledWidth) + "\u2591".repeat(emptyWidth);
-        let usageColor = import_chalk.default.green;
-        if (stats.usagePercent > 80) usageColor = import_chalk.default.red;
-        else if (stats.usagePercent > 60) usageColor = import_chalk.default.yellow;
+        let usageColor = (0, import_signal.paint)("add");
+        if (stats.usagePercent > 80) usageColor = (0, import_signal.paint)("red");
+        else if (stats.usagePercent > 60) usageColor = (0, import_signal.paint)("amberDim");
         const formatTokens = (tokens) => {
           if (tokens >= 1e3) {
             return `${(tokens / 1e3).toFixed(1)}k`;
@@ -328,7 +329,7 @@ const generalCommands = [
           `   ${usageColor(progressBar)} ${stats.usagePercent}%${overflowWarning}`,
           `   ${import_chalk.default.dim(stats.modelDisplayName)} \xB7 ${tokenDisplay} / ${formatTokens(totalTokenSpace)} tokens`,
           ``,
-          `   ${import_chalk.default.cyan("Breakdown:")} ${breakdownLabel}`,
+          `   ${(0, import_signal.paint)("teal")("Breakdown:")} ${breakdownLabel}`,
           `   \u251C\u2500 System prompt: ${formatTokens(breakdown.systemPrompt)} (${pct(breakdown.systemPrompt)})`,
           `   \u251C\u2500 Tools: ${formatTokens(breakdown.tools.total)} (${pct(breakdown.tools.total)})`,
           `   \u251C\u2500 Messages: ${formatTokens(breakdown.messages)} (${pct(breakdown.messages)})`,

package/dist/interactive-commands/general-commands.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"general-commands.d.ts","sourceRoot":"","sources":["../../src/interactive-commands/general-commands.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAKH,OAAO,KAAK,EAAE,iBAAiB,EAAwC,MAAM,qBAAqB,CAAC;AAOnG,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAoG3D;;GAEG;AACH,wBAAgB,iBAAiB,CAC7B,4BAA4B,EAAE,CAAC,KAAK,EAAE,eAAe,KAAK,iBAAiB,EAAE,GAC9E,iBAAiB,CAgCnB;AAED;;;GAGG;AACH,eAAO,MAAM,eAAe,EAAE,iBAAiB,EAwe9C,CAAC"}
+{"version":3,"file":"general-commands.d.ts","sourceRoot":"","sources":["../../src/interactive-commands/general-commands.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAKH,OAAO,KAAK,EAAE,iBAAiB,EAAwC,MAAM,qBAAqB,CAAC;AAQnG,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAoG3D;;GAEG;AACH,wBAAgB,iBAAiB,CAC7B,4BAA4B,EAAE,CAAC,KAAK,EAAE,eAAe,KAAK,iBAAiB,EAAE,GAC9E,iBAAiB,CAgCnB;AAED;;;GAGG;AACH,eAAO,MAAM,eAAe,EAAE,iBAAiB,EAwe9C,CAAC"}

package/dist/interactive-commands/general-commands.js

@@ -6,6 +6,7 @@ import { CommandOutputHelper } from "./utils/command-output.js";
 import { writeToClipboard } from "../utils/clipboardUtils.js";
 import { hasMeaningfulTokenUsage, setExitStats } from "./exit-stats.js";
 import { triggerExit } from "./exit-handler.js";
+import { paint } from "../signal/index.js";
 function getShellRcFile(shell) {
   const home = process.env.HOME;
   if (!home) return null;
@@ -106,13 +107,13 @@ const generalCommands = [
         lines.push(stdout.trim());
       }
       if (stderr.trim()) {
-        lines.push(chalk.yellow(stderr.trim()));
+        lines.push(paint("amberDim")(stderr.trim()));
       }
       if (exitCode !== 0) {
-        lines.push(chalk.red(`Exit code: ${exitCode}`));
+        lines.push(paint("red")(`Exit code: ${exitCode}`));
       }
       if (lines.length === 0) {
-        return formatForInkCli(chalk.gray("(no output)"));
+        return formatForInkCli(paint("dim")("(no output)"));
       }
       return formatForInkCli(lines.join("\n"));
     }
@@ -265,9 +266,9 @@ const generalCommands = [
         const filledWidth = Math.round(displayPercent / 100 * barWidth);
         const emptyWidth = barWidth - filledWidth;
         const progressBar = "\u2588".repeat(filledWidth) + "\u2591".repeat(emptyWidth);
-        let usageColor = chalk.green;
-        if (stats.usagePercent > 80) usageColor = chalk.red;
-        else if (stats.usagePercent > 60) usageColor = chalk.yellow;
+        let usageColor = paint("add");
+        if (stats.usagePercent > 80) usageColor = paint("red");
+        else if (stats.usagePercent > 60) usageColor = paint("amberDim");
         const formatTokens = (tokens) => {
           if (tokens >= 1e3) {
             return `${(tokens / 1e3).toFixed(1)}k`;
@@ -294,7 +295,7 @@ const generalCommands = [
           `   ${usageColor(progressBar)} ${stats.usagePercent}%${overflowWarning}`,
           `   ${chalk.dim(stats.modelDisplayName)} \xB7 ${tokenDisplay} / ${formatTokens(totalTokenSpace)} tokens`,
           ``,
-          `   ${chalk.cyan("Breakdown:")} ${breakdownLabel}`,
+          `   ${paint("teal")("Breakdown:")} ${breakdownLabel}`,
           `   \u251C\u2500 System prompt: ${formatTokens(breakdown.systemPrompt)} (${pct(breakdown.systemPrompt)})`,
           `   \u251C\u2500 Tools: ${formatTokens(breakdown.tools.total)} (${pct(breakdown.tools.total)})`,
           `   \u251C\u2500 Messages: ${formatTokens(breakdown.messages)} (${pct(breakdown.messages)})`,

package/dist/services/processStream.cjs

@@ -35,6 +35,7 @@ var import_debugLog = require("../utils/debugLog.js");
 var import_core = require("@dexto/core");
 var import_idGenerator = require("../utils/idGenerator.js");
 var import_streamSplitter = require("../utils/streamSplitter.js");
+var import_tool_step = require("../utils/tool-step.js");
 var import_messageFormatting = require("../utils/messageFormatting.js");
 var import_toolUtils = require("../utils/toolUtils.js");
 var import_host = require("../host/index.js");
@@ -48,6 +49,11 @@ function buildErrorContent(error, prefix) {
   }
   return errorContent;
 }
+function isReportedError(error, reported) {
+  if (reported.has(error)) return true;
+  if (!(error instanceof Error)) return false;
+  return [...reported].some((each) => each instanceof Error && each.message === error.message);
+}
 function getErrorCode(error) {
   if (typeof error !== "object" || error === null) {
     return null;
@@ -81,9 +87,9 @@ function extractInsufficientCreditsBalance(error) {
 }
 function buildInsufficientCreditsContent(balance) {
   if (balance === null) {
-    return "Out of Dexto Nova credits.\nUse the billing prompt to top up and retry your request.";
+    return "Out of Dexto credits.\nUse the billing prompt to top up and retry your request.";
   }
-  return `Out of Dexto Nova credits. Current balance: $${balance.toFixed(2)}.
+  return `Out of Dexto credits. Current balance: $${balance.toFixed(2)}.
 Use the billing prompt to top up and retry your request.`;
 }
 function hasMeaningfulTokenUsageForAnalytics(tokenUsage, estimatedCost) {
@@ -106,6 +112,7 @@ async function processStream(iterator, setters, options) {
   } = setters;
   const useStreaming = options?.useStreaming ?? true;
   const approvalIdToToolCallId = /* @__PURE__ */ new Map();
+  const reportedErrors = /* @__PURE__ */ new Set();
   const state = {
     messageId: null,
     content: "",
@@ -477,9 +484,6 @@ async function processStream(iterator, setters, options) {
           break;
         }
         case "llm:tool-call": {
-          if ((0, import_messageFormatting.shouldHideTool)(event.toolName)) {
-            break;
-          }
           debug.log("TOOL-CALL: state check", {
             toolName: event.toolName,
             hasMessageId: !!state.messageId,
@@ -559,7 +563,7 @@ async function processStream(iterator, setters, options) {
             }
           }
           const toolMessageId = event.callId ? `tool-${event.callId}` : (0, import_idGenerator.generateMessageId)("tool");
-          const { header: toolContent } = (0, import_messageFormatting.formatToolHeader)({
+          const { header: toolContent, argsFormatted: toolArgs } = (0, import_messageFormatting.formatToolHeader)({
             toolName: event.toolName,
             args: event.args || {},
             ...event.presentationSnapshot !== void 0 && {
@@ -577,6 +581,8 @@ ${import_chalk.default.dim(runningDescription)}`;
             role: "tool",
             content: finalToolContent,
             timestamp: /* @__PURE__ */ new Date(),
+            toolName: event.toolName,
+            toolArgs,
             toolStatus: "pending"
           });
           (0, import_host.captureAnalytics)("dexto_tool_called", {
@@ -587,9 +593,6 @@ ${import_chalk.default.dim(runningDescription)}`;
           break;
         }
         case "llm:tool-result": {
-          if ((0, import_messageFormatting.shouldHideTool)(event.toolName)) {
-            break;
-          }
           const sanitized = event.sanitized;
           const toolDisplayData = sanitized?.meta?.display;
           const toolContent = sanitized?.content;
@@ -628,6 +631,8 @@ ${import_chalk.default.dim(runningDescription)}`;
               toolResult: resultPreview,
               toolStatus: "finished",
               isError: !event.success,
+              ...(0, import_tool_step.backgroundFailure)(event.toolName, event.rawResult),
+              ...!event.success && event.error !== void 0 && { toolFailureText: event.error },
               ...toolDisplayData && { toolDisplayData },
               ...toolContent && { toolContent }
             });
@@ -654,6 +659,7 @@ ${import_chalk.default.dim(runningDescription)}`;
           break;
         }
         case "llm:error": {
+          reportedErrors.add(event.error);
           const insufficientCredits = getErrorCode(event.error) === import_core.LLMErrorCode.INSUFFICIENT_CREDITS;
           const insufficientCreditsBalance = insufficientCredits ? extractInsufficientCreditsBalance(event.error) : null;
           const errorContent = insufficientCredits ? buildInsufficientCreditsContent(insufficientCreditsBalance) : buildErrorContent(event.error, "Error: ");
@@ -663,7 +669,8 @@ ${import_chalk.default.dim(runningDescription)}`;
               id: (0, import_idGenerator.generateMessageId)("error"),
               role: "system",
               content: errorContent,
-              timestamp: /* @__PURE__ */ new Date()
+              timestamp: /* @__PURE__ */ new Date(),
+              systemKind: "fault"
             }
           ]);
           if (event.recoverable !== true) {
@@ -853,7 +860,8 @@ ${import_chalk.default.dim(runningDescription)}`;
               finalizeMessage(`tool-${toolCallId}`, {
                 toolStatus: "finished",
                 toolResult: "Cancelled",
-                isError: true
+                isError: true,
+                toolOutcome: event.status === import_core.ApprovalStatus.DENIED ? "denied" : "cancelled"
               });
             }
           }
@@ -945,6 +953,7 @@ ${import_chalk.default.dim(runningDescription)}`;
           break;
       }
     }
+    setUi((prev) => prev.isCancelling ? { ...prev, isCancelling: false } : prev);
   } catch (error) {
     if (error instanceof Error && error.name === "AbortError") {
       clearPending();
@@ -956,16 +965,19 @@ ${import_chalk.default.dim(runningDescription)}`;
       }));
     } else {
       clearPending();
-      const errorContent = buildErrorContent(error, "Stream error: ");
-      setMessages((prev) => [
-        ...prev,
-        {
-          id: (0, import_idGenerator.generateMessageId)("error"),
-          role: "system",
-          content: errorContent,
-          timestamp: /* @__PURE__ */ new Date()
-        }
-      ]);
+      if (!isReportedError(error, reportedErrors)) {
+        const errorContent = buildErrorContent(error, "Stream error: ");
+        setMessages((prev) => [
+          ...prev,
+          {
+            id: (0, import_idGenerator.generateMessageId)("error"),
+            role: "system",
+            content: errorContent,
+            timestamp: /* @__PURE__ */ new Date(),
+            systemKind: "fault"
+          }
+        ]);
+      }
       setUi((prev) => ({
         ...prev,
         isProcessing: false,