@wrongstack/tui 0.255.0 → 0.256.1

package/dist/index.d.ts

@@ -153,6 +153,8 @@ type Settings = {
     featureMemory: boolean;
     featureSkills: boolean;
     featureModelsRegistry: boolean;
+    /** Token-saving mode: omits non-essential tools and trims system prompt. */
+    featureTokenSaving: boolean;
     contextAutoCompact: boolean;
     contextStrategy: 'hybrid' | 'intelligent' | 'selective';
     logLevel: 'error' | 'warn' | 'info' | 'debug' | 'trace';
@@ -269,6 +271,10 @@ interface RunTuiOptions {
     confirmExit?: boolean | undefined;
     /** Active agent mode label shown in the status bar (e.g. "teach", "brief"). */
     modeLabel?: string | undefined;
+    /** Token-saving mode indicator — shown in the TUI status bar. */
+    tokenSavingMode?: boolean | undefined;
+    /** Number of registered tools — shown on the status bar line 2. */
+    toolCount?: number | undefined;
     /** Live getter for the agent mode label so the status bar updates after /mode. */
     getModeLabel?: (() => string) | undefined;
     /**
@@ -322,6 +328,13 @@ interface RunTuiOptions {
         enabled: boolean;
         setEnabled: (enabled: boolean) => void;
     } | undefined;
+    /**
+     * Controller for the `/interrupt` slash command. The App installs the real
+     * `abortLeader` on mount so the command can abort the in-flight leader run.
+     */
+    interruptController?: {
+        abortLeader: () => boolean;
+    } | undefined;
     /**
      * Controller for the `/enhance on|off` prompt-refinement toggle. The App
      * installs a dispatch-backed `setEnabled` here on mount so the slash command
@@ -338,8 +351,8 @@ interface RunTuiOptions {
      * visible bar without a round-trip. The initial value is loaded from
      * the config file before App mounts.
      */
-    statuslineHiddenItems: Array<'todos' | 'plan' | 'tasks' | 'fleet' | 'git' | 'elapsed' | 'context' | 'cost'>;
-    setStatuslineHiddenItems: (items: Array<'todos' | 'plan' | 'tasks' | 'fleet' | 'git' | 'elapsed' | 'context' | 'cost'>) => void;
+    statuslineHiddenItems: Array<'todos' | 'plan' | 'tasks' | 'fleet' | 'git' | 'elapsed' | 'context' | 'cost' | 'working_dir'>;
+    setStatuslineHiddenItems: (items: Array<'todos' | 'plan' | 'tasks' | 'fleet' | 'git' | 'elapsed' | 'context' | 'cost' | 'working_dir'>) => void;
     /**
      * Controller for the agents monitor overlay. App installs a dispatch-backed
      * setter on mount so the `/agents on|off` slash command can toggle the
@@ -541,16 +554,22 @@ declare function replaySessionEvents(events: SessionEvent[], startId: number): H
  * Unified next-steps suggestion parser.
  *
  * Three code paths feed into the suggestion store:
- *   1. TUI rendering  — entry.tsx parses "💡 Next steps" from assistant output
- *   2. REPL store     — repl.ts parses "💡 Next steps" from final agent output
+ *   1. TUI rendering  — entry.tsx parses "💡 Next steps" or "<next_steps>" from assistant output
+ *   2. REPL store     — repl.ts parses "💡 Next steps" or "<next_steps>" from final agent output
  *   3. /suggest output — suggest.ts parses LLM-generated numbered lists
  *
  * Heading mode (`requireHeading = true`):
- *   strict=true  — only 💡 emoji heading (TUI rendering)
- *   strict=false — 💡, ##, plain "Next steps" headings (REPL store)
+ *   strict=true  — only 💡 emoji heading or <next_steps> tag (TUI rendering)
+ *   strict=false — 💡, ##, plain "Next steps", or <next_steps> headings (REPL store)
  *
  * Raw mode (`requireHeading = false`):
  *   Parses numbered/bullet items from anywhere in text (subagent /suggest output).
+ *
+ * Supported formats:
+ *   💡 Next steps     (old emoji format)
+ *   ## Next steps     (markdown heading)
+ *   Next steps        (plain text)
+ *   <next_steps>      (new XML tag format - preferred)
  */
 interface ParsedNextStep {
     index: number;
@@ -562,16 +581,16 @@ interface ParseNextStepsResult {
     /** Flat string array — what gets stored in the suggestion store. */
     texts: string[];
     /**
-     * Content with the entire "💡 Next steps" block removed.
+     * Content with the entire "💡 Next steps" or "<next_steps>" block removed.
      * Used by entry.tsx to strip suggestions from the rendered message body.
      */
     stripped: string;
 }
 /**
- * Parse "💡 Next steps" blocks from assistant output (or raw numbered lines).
+ * Parse "<next_steps>" or "💡 Next steps" blocks from assistant output (or raw numbered lines).
  *
  * @param content        — raw assistant message text or subagent output
- * @param strict        — when true, only the 💡 emoji heading is accepted (TUI rendering).
+ * @param strict        — when true, accepts 💡 emoji heading OR <next_steps> XML tag (TUI rendering).
  *                        when false, also accepts ## / plain "Next steps" headings (REPL store).
  * @param requireHeading — when true, a heading must precede the item list.
  *                        when false, numbered/bullet items are parsed from anywhere in text

package/dist/index.js

@@ -163,7 +163,9 @@ function StatusBar({
   nextStepsAutoSubmitCountdown,
   autoProceedCountdown,
   sessionCount,
-  mailbox
+  mailbox,
+  tokenSavingMode,
+  toolCount
 }) {
   const { stdout } = useStdout();
   const [termWidth, setTermWidth] = useState(stdout?.columns ?? 90);
@@ -202,7 +204,7 @@ function StatusBar({
   const statePrefix = state === "idle" || state === "aborting" ? "\u25CF" : spinner;
   const thinking = state === "running" || state === "streaming";
   const hasAutoProceed = autoProceedCountdown != null && autoProceedCountdown > 0;
-  const hasSecondLine = yolo || autonomy && autonomy !== "off" || startedAt != null || git !== null && git !== void 0 || projectName !== void 0 && projectName.length > 0 || workingDir !== void 0 && workingDir.length > 0 || goalSummary !== null && goalSummary !== void 0 || !!modeLabel || hasAutoProceed;
+  const hasSecondLine = yolo || autonomy && autonomy !== "off" || startedAt != null || git !== null && git !== void 0 || projectName !== void 0 && projectName.length > 0 || workingDir !== void 0 && workingDir.length > 0 || goalSummary !== null && goalSummary !== void 0 || !!modeLabel || hasAutoProceed || tokenSavingMode || typeof toolCount === "number" && toolCount > 0;
   const fleetHasActivity = fleet && (fleet.running > 0 || fleet.idle > 0 || fleet.pending > 0 || fleet.completed > 0) || subagentCount > 0;
   const hasBrainActivity = !!brain && brain.state !== "idle";
   const hasDebugStream = !!debugStreamStats;
@@ -423,6 +425,19 @@ function StatusBar({
               " session",
               sessionCount === 1 ? "" : "s"
             ] })
+          ] }) : null,
+          toolCount != null ? /* @__PURE__ */ jsxs(Fragment, { children: [
+            yolo || startedAt != null || projectName || workingDir || git || sessionCount ? /* @__PURE__ */ jsx(Text, { dimColor: true, children: "\u2502" }) : null,
+            /* @__PURE__ */ jsxs(Text, { color: "cyan", children: [
+              "\u{1F527} ",
+              toolCount,
+              " tool",
+              toolCount === 1 ? "" : "s"
+            ] })
+          ] }) : null,
+          tokenSavingMode ? /* @__PURE__ */ jsxs(Fragment, { children: [
+            yolo || startedAt != null || projectName || workingDir || git || sessionCount || toolCount ? /* @__PURE__ */ jsx(Text, { dimColor: true, children: "\u2502" }) : null,
+            /* @__PURE__ */ jsx(Text, { color: "yellow", bold: true, children: "\u{1F4BE} save" })
           ] }) : null
         ] }) : /* @__PURE__ */ jsx(Box, { height: 1, children: /* @__PURE__ */ jsx(Text, { children: " " }) }),
         hasThirdLine ? /* @__PURE__ */ jsxs(Box, { flexDirection: "row", gap: 2, children: [
@@ -2846,7 +2861,7 @@ function MarkdownView({
     const tableEnd = detectTable(lines, i);
     if (tableEnd > i) {
       rows.push(
-        /* @__PURE__ */ jsx(Text, { children: renderTable(lines.slice(i, tableEnd), tableBudget) }, `t${key++}`)
+        /* @__PURE__ */ jsx(Box, { width: tableBudget, backgroundColor: "transparent", children: /* @__PURE__ */ jsx(Text, { children: renderTable(lines.slice(i, tableEnd), tableBudget) }) }, `t${key++}`)
       );
       i = tableEnd;
       continue;
@@ -2866,10 +2881,14 @@ function MarkdownView({
       rows.push(
         /* @__PURE__ */ jsxs(Box, { flexDirection: "row", children: [
           /* @__PURE__ */ jsx(Text, { dimColor: true, children: "  " }),
-          /[\u2500-\u257F]/.test(qContent) ? /* @__PURE__ */ jsx(Box, { flexDirection: "row", children: [...qContent].slice(0, (contentWidth ?? termWidth) - 2).map((ch, ci) => (
-            /* biome-ignore lint/suspicious/noArrayIndexKey: characters are not reorderable */
-            /* @__PURE__ */ jsx(Text, { dimColor: true, children: ch }, ci)
-          )) }) : /* @__PURE__ */ jsx(InlineLine, { tokens: parseInline(qContent), dim: true })
+          /[\u2500-\u257F]/.test(qContent) ? (
+            // Box-drawing characters inside blockquotes also need transparent
+            // background to avoid inheriting the message panel background.
+            /* @__PURE__ */ jsx(Box, { flexDirection: "row", backgroundColor: "transparent", children: [...qContent].slice(0, (contentWidth ?? termWidth) - 2).map((ch, ci) => (
+              /* biome-ignore lint/suspicious/noArrayIndexKey: characters are not reorderable */
+              /* @__PURE__ */ jsx(Text, { dimColor: true, children: ch }, ci)
+            )) })
+          ) : /* @__PURE__ */ jsx(InlineLine, { tokens: parseInline(qContent), dim: true })
         ] }, `q${key++}`)
       );
       continue;
@@ -2898,7 +2917,7 @@ function MarkdownView({
       const maxW = contentWidth ?? termWidth;
       const chars = [...line].slice(0, maxW);
       rows.push(
-        /* @__PURE__ */ jsx(Box, { flexDirection: "row", children: chars.map((ch, ci) => (
+        /* @__PURE__ */ jsx(Box, { width: maxW, backgroundColor: "transparent", flexDirection: "row", children: chars.map((ch, ci) => (
           /* biome-ignore lint/suspicious/noArrayIndexKey: characters are not reorderable */
           /* @__PURE__ */ jsx(Text, { children: ch }, ci)
         )) }, `bx${key++}`)
@@ -3800,11 +3819,12 @@ function Banner({
 }
 
 // src/components/suggestions.ts
-var STRICT_HEADING_RE = /💡\s*Next steps?\s*\n+/i;
+var STRICT_HEADING_RE = /(?:💡\s*Next steps?|<next_steps>)\s*\n+/i;
 var PERMISSIVE_HEADING_PATTERNS = [
   { re: /💡\s*Next steps?\s*\n+/i, label: "emoji" },
   { re: /##?\s*Next steps?\s*\n+/i, label: "markdown" },
-  { re: /\n{1,2}Next steps?\s*\n+/i, label: "plain" }
+  { re: /\n{1,2}Next steps?\s*\n+/i, label: "plain" },
+  { re: /<next_steps>\s*\n+/i, label: "xml-tag" }
 ];
 var ITEM_RE = /^(?:(\d+)[.)]\s*|[-*•]\s*)(.+)$/;
 var MAX_STEPS = 6;
@@ -3888,6 +3908,10 @@ function findBlockEnd(afterHeading, stepCount) {
   let found = 0;
   for (const rawLine of lines) {
     const line = rawLine.trim();
+    if (line === "</next_steps>") {
+      consumed += rawLine.length + 1;
+      break;
+    }
     if (!line) {
       consumed += rawLine.length + 1;
       continue;
@@ -3952,6 +3976,7 @@ var Entry = React5.memo(function Entry2({
           borderRight: false,
           borderBottom: false,
           borderColor: theme.user,
+          backgroundColor: "#1e1e2e",
           paddingLeft: 1,
           children: /* @__PURE__ */ jsxs(Text, { children: [
             /* @__PURE__ */ jsx(Text, { bold: true, color: theme.user, children: "USER  " }),
@@ -3981,8 +4006,9 @@ var Entry = React5.memo(function Entry2({
             borderStyle: "single",
             borderTop: false,
             borderRight: false,
-            borderBottom: hasNext ? false : void 0,
+            borderBottom: false,
             borderColor: theme.assistant,
+            backgroundColor: "#1e1e2e",
             paddingLeft: 1,
             children: [
               /* @__PURE__ */ jsx(Box, { flexDirection: "row", children: /* @__PURE__ */ jsx(Text, { bold: true, color: theme.assistant, children: "ASSISTANT" }) }),
@@ -5543,7 +5569,7 @@ var MODE_DESC = {
   suggest: "Shows next-step suggestions after each turn",
   auto: "Self-driving \u2014 agent continues automatically"
 };
-var SETTINGS_FIELD_COUNT = 25;
+var SETTINGS_FIELD_COUNT = 26;
 var CONFIG_SCOPES = ["global", "project"];
 function SettingsPicker({
   field,
@@ -5560,6 +5586,7 @@ function SettingsPicker({
   featureMemory,
   featureSkills,
   featureModelsRegistry,
+  featureTokenSaving,
   contextAutoCompact,
   contextStrategy,
   logLevel,
@@ -5643,6 +5670,11 @@ function SettingsPicker({
       value: boolVal(featureModelsRegistry),
       detail: "Fetch models.dev catalog at startup"
     },
+    {
+      label: "Token-saving mode",
+      value: boolVal(featureTokenSaving),
+      detail: "Omit non-essential tools and trim system prompt to save tokens"
+    },
     // ── Context ──
     { section: "Context" },
     {
@@ -6743,6 +6775,36 @@ function handleCollabDone(event, dispatch, stateRef) {
     verdict: payload.report.overallVerdict ?? "needs_revision"
   });
 }
+function useStatuslineState(opts) {
+  const [liveModel, setLiveModel] = useState(opts.model);
+  const [liveProvider, setLiveProvider] = useState(opts.provider ?? "agent");
+  const [activeMaxContext, setActiveMaxContext] = useState(opts.effectiveMaxContext);
+  const [yoloLive, setYoloLive] = useState(opts.yolo);
+  const [autonomyLive, setAutonomyLive] = useState(opts.getAutonomy?.() ?? "off");
+  const [liveModeLabel, setLiveModeLabel] = useState(opts.modeLabel ?? "");
+  const [hiddenItems, setHiddenItems] = useState(
+    Array.isArray(opts.statuslineHiddenItems) ? [...opts.statuslineHiddenItems] : [...opts.statuslineHiddenItems]
+  );
+  const [sessionCount, setSessionCount] = useState(0);
+  return {
+    liveModel,
+    setLiveModel,
+    liveProvider,
+    setLiveProvider,
+    activeMaxContext,
+    setActiveMaxContext,
+    yoloLive,
+    setYoloLive,
+    autonomyLive,
+    setAutonomyLive,
+    liveModeLabel,
+    setLiveModeLabel,
+    hiddenItems,
+    setHiddenItems,
+    sessionCount,
+    setSessionCount
+  };
+}
 function useTuiControllers({
   dispatch,
   streamFleet,
@@ -7809,6 +7871,7 @@ function reducer(state, action) {
           featureMemory: action.featureMemory,
           featureSkills: action.featureSkills,
           featureModelsRegistry: action.featureModelsRegistry,
+          featureTokenSaving: action.featureTokenSaving,
           contextAutoCompact: action.contextAutoCompact,
           contextStrategy: action.contextStrategy,
           logLevel: action.logLevel,
@@ -7866,53 +7929,54 @@ function reducer(state, action) {
       if (f === 10) return { ...state, settingsPicker: { ...sp, featureMemory: !sp.featureMemory, hint: void 0 } };
       if (f === 11) return { ...state, settingsPicker: { ...sp, featureSkills: !sp.featureSkills, hint: void 0 } };
       if (f === 12) return { ...state, settingsPicker: { ...sp, featureModelsRegistry: !sp.featureModelsRegistry, hint: void 0 } };
-      if (f === 13) return { ...state, settingsPicker: { ...sp, contextAutoCompact: !sp.contextAutoCompact, hint: void 0 } };
-      if (f === 14) {
+      if (f === 13) return { ...state, settingsPicker: { ...sp, featureTokenSaving: !sp.featureTokenSaving, hint: void 0 } };
+      if (f === 14) return { ...state, settingsPicker: { ...sp, contextAutoCompact: !sp.contextAutoCompact, hint: void 0 } };
+      if (f === 15) {
         const i = COMPACTOR_STRATEGIES.indexOf(sp.contextStrategy);
         const base = i < 0 ? 0 : i;
         const next = (base + action.delta + COMPACTOR_STRATEGIES.length) % COMPACTOR_STRATEGIES.length;
         return { ...state, settingsPicker: { ...sp, contextStrategy: expectDefined$1(COMPACTOR_STRATEGIES[next]), hint: void 0 } };
       }
-      if (f === 15) {
+      if (f === 16) {
         const i = LOG_LEVELS.indexOf(sp.logLevel);
         const base = i < 0 ? 0 : i;
         const next = (base + action.delta + LOG_LEVELS.length) % LOG_LEVELS.length;
         return { ...state, settingsPicker: { ...sp, logLevel: expectDefined$1(LOG_LEVELS[next]), hint: void 0 } };
       }
-      if (f === 16) {
+      if (f === 17) {
         const i = AUDIT_LEVELS.indexOf(sp.auditLevel);
         const base = i < 0 ? 0 : i;
         const next = (base + action.delta + AUDIT_LEVELS.length) % AUDIT_LEVELS.length;
         return { ...state, settingsPicker: { ...sp, auditLevel: expectDefined$1(AUDIT_LEVELS[next]), hint: void 0 } };
       }
-      if (f === 17) return { ...state, settingsPicker: { ...sp, indexOnStart: !sp.indexOnStart, hint: void 0 } };
-      if (f === 18) {
+      if (f === 18) return { ...state, settingsPicker: { ...sp, indexOnStart: !sp.indexOnStart, hint: void 0 } };
+      if (f === 19) {
         const j = MAX_ITERATIONS_PRESETS.indexOf(sp.maxIterations);
         const base = j < 0 ? 0 : j;
         const next = (base + action.delta + MAX_ITERATIONS_PRESETS.length) % MAX_ITERATIONS_PRESETS.length;
         return { ...state, settingsPicker: { ...sp, maxIterations: expectDefined$1(MAX_ITERATIONS_PRESETS[next]), hint: void 0 } };
       }
-      if (f === 19) {
+      if (f === 20) {
         const aj = AUTO_PROCEED_MAX_PRESETS.indexOf(sp.autoProceedMaxIterations);
         const abase = aj < 0 ? 0 : aj;
         const anext = (abase + action.delta + AUTO_PROCEED_MAX_PRESETS.length) % AUTO_PROCEED_MAX_PRESETS.length;
         return { ...state, settingsPicker: { ...sp, autoProceedMaxIterations: expectDefined$1(AUTO_PROCEED_MAX_PRESETS[anext]), hint: void 0 } };
       }
-      if (f === 20) {
+      if (f === 21) {
         const ej = ENHANCE_DELAY_PRESETS.indexOf(sp.enhanceDelayMs);
         const ebase = ej < 0 ? 0 : ej;
         const enext = (ebase + action.delta + ENHANCE_DELAY_PRESETS.length) % ENHANCE_DELAY_PRESETS.length;
         return { ...state, settingsPicker: { ...sp, enhanceDelayMs: expectDefined$1(ENHANCE_DELAY_PRESETS[enext]), hint: void 0 } };
       }
-      if (f === 21) return { ...state, settingsPicker: { ...sp, enhanceEnabled: !sp.enhanceEnabled, hint: void 0 } };
-      if (f === 22) {
+      if (f === 22) return { ...state, settingsPicker: { ...sp, enhanceEnabled: !sp.enhanceEnabled, hint: void 0 } };
+      if (f === 23) {
         const i = ENHANCE_LANGUAGES.indexOf(sp.enhanceLanguage);
         const base = i < 0 ? 0 : i;
         const next = (base + action.delta + ENHANCE_LANGUAGES.length) % ENHANCE_LANGUAGES.length;
         return { ...state, settingsPicker: { ...sp, enhanceLanguage: expectDefined$1(ENHANCE_LANGUAGES[next]), hint: void 0 } };
       }
-      if (f === 23) return { ...state, settingsPicker: { ...sp, debugStream: !sp.debugStream, hint: void 0 } };
-      if (f === 24) {
+      if (f === 24) return { ...state, settingsPicker: { ...sp, debugStream: !sp.debugStream, hint: void 0 } };
+      if (f === 25) {
         const i = CONFIG_SCOPES.indexOf(sp.configScope);
         const base = i < 0 ? 0 : i;
         const next = (base + action.delta + CONFIG_SCOPES.length) % CONFIG_SCOPES.length;
@@ -8751,6 +8815,8 @@ function App({
   provider,
   family,
   keyTail,
+  tokenSavingMode,
+  toolCount,
   getPickableProviders,
   switchProviderAndModel,
   getSettings,
@@ -8768,6 +8834,7 @@ function App({
   listSessions,
   onResumeSession,
   fleetStreamController,
+  interruptController,
   statuslineHiddenItems,
   setStatuslineHiddenItems,
   agentsMonitorController,
@@ -8788,14 +8855,32 @@ function App({
 }) {
   const { exit } = useApp();
   const { stdout } = useStdout();
-  const [liveModel, setLiveModel] = useState(model);
-  const [liveProvider, setLiveProvider] = useState(provider ?? "agent");
-  const [activeMaxContext, setActiveMaxContext] = useState(effectiveMaxContext);
-  const [yoloLive, setYoloLive] = useState(yolo);
-  const [autonomyLive, setAutonomyLive] = useState(getAutonomy?.() ?? "off");
-  const [liveModeLabel, setLiveModeLabel] = useState(modeLabel ?? "");
-  const [hiddenItems, setHiddenItems] = useState(statuslineHiddenItems);
-  const [sessionCount, setSessionCount] = useState(0);
+  const {
+    liveModel,
+    setLiveModel,
+    liveProvider,
+    setLiveProvider,
+    activeMaxContext,
+    setActiveMaxContext,
+    yoloLive,
+    setYoloLive,
+    autonomyLive,
+    setAutonomyLive,
+    liveModeLabel,
+    setLiveModeLabel,
+    hiddenItems,
+    setHiddenItems,
+    sessionCount,
+    setSessionCount
+  } = useStatuslineState({
+    model,
+    provider,
+    effectiveMaxContext,
+    yolo,
+    getAutonomy,
+    modeLabel,
+    statuslineHiddenItems
+  });
   const prevBranchRef = useRef(null);
   const [indexState, setIndexState] = useState(() => getIndexState());
   useEffect(() => {
@@ -8803,7 +8888,7 @@ function App({
     return onIndexStateChange((next) => setIndexState(next));
   }, []);
   useEffect(() => {
-    setHiddenItems(statuslineHiddenItems);
+    setHiddenItems([...statuslineHiddenItems]);
   }, [statuslineHiddenItems]);
   useEffect(() => {
     setStatuslineHiddenItems(hiddenItems);
@@ -8899,7 +8984,7 @@ function App({
     },
     autonomyPicker: { open: false, options: [], selected: 0 },
     resumePicker: { open: false, sessions: [], selected: 0, busy: false, hint: void 0, error: void 0 },
-    settingsPicker: { open: false, field: 0, mode: "off", delayMs: 0, titleAnimation: true, yolo: false, streamFleet: true, chime: false, confirmExit: true, nextPrediction: false, featureMcp: true, featurePlugins: true, featureMemory: true, featureSkills: true, featureModelsRegistry: true, contextAutoCompact: true, contextStrategy: "hybrid", logLevel: "info", auditLevel: "standard", indexOnStart: true, maxIterations: 500, autoProceedMaxIterations: 50, enhanceDelayMs: 6e4, enhanceEnabled: true, enhanceLanguage: "original", debugStream: false, configScope: "global" },
+    settingsPicker: { open: false, field: 0, mode: "off", delayMs: 0, titleAnimation: true, yolo: false, streamFleet: true, chime: false, confirmExit: true, nextPrediction: false, featureMcp: true, featurePlugins: true, featureMemory: true, featureSkills: true, featureModelsRegistry: true, featureTokenSaving: false, contextAutoCompact: true, contextStrategy: "hybrid", logLevel: "info", auditLevel: "standard", indexOnStart: true, maxIterations: 500, autoProceedMaxIterations: 50, enhanceDelayMs: 6e4, enhanceEnabled: true, enhanceLanguage: "original", debugStream: false, configScope: "global" },
     projectPicker: { open: false, allItems: [], items: [], selected: 0, filter: "", hint: void 0 },
     confirmQueue: [],
     enhance: null,
@@ -9531,6 +9616,7 @@ function App({
             featureMemory: sp.featureMemory,
             featureSkills: sp.featureSkills,
             featureModelsRegistry: sp.featureModelsRegistry,
+            featureTokenSaving: sp.featureTokenSaving,
             contextAutoCompact: sp.contextAutoCompact,
             contextStrategy: sp.contextStrategy,
             logLevel: sp.logLevel,
@@ -9908,6 +9994,7 @@ function App({
       featureMemory: s2.featureMemory ?? true,
       featureSkills: s2.featureSkills ?? true,
       featureModelsRegistry: s2.featureModelsRegistry ?? true,
+      featureTokenSaving: s2.featureTokenSaving ?? false,
       contextAutoCompact: s2.contextAutoCompact ?? true,
       contextStrategy: s2.contextStrategy ?? "hybrid",
       logLevel: s2.logLevel ?? "info",
@@ -10025,6 +10112,7 @@ function App({
       featureMemory: sp.featureMemory,
       featureSkills: sp.featureSkills,
       featureModelsRegistry: sp.featureModelsRegistry,
+      featureTokenSaving: sp.featureTokenSaving,
       contextAutoCompact: sp.contextAutoCompact,
       contextStrategy: sp.contextStrategy,
       logLevel: sp.logLevel,
@@ -10234,6 +10322,15 @@ function App({
         entry: { kind: "error", text: e.description }
       });
     });
+    const offFallback = events.on("provider.fallback", (e) => {
+      dispatch({
+        type: "addEntry",
+        entry: {
+          kind: "warn",
+          text: `\u21BB rate-limited (${e.status}) \u2014 switched to ${e.to.providerId}/${e.to.model}`
+        }
+      });
+    });
     const offProvResp = events.on("provider.response", () => {
       const text = streamingTextRef.current;
       streamingTextRef.current = "";
@@ -10307,6 +10404,7 @@ function App({
       offTool();
       offRetry();
       offProvErr();
+      offFallback();
       offProvResp();
       offConfirmNeeded();
       offTrustPersisted();
@@ -10368,6 +10466,15 @@ function App({
     enhanceController,
     agentsMonitorController
   });
+  useEffect(() => {
+    if (!interruptController) return;
+    interruptController.abortLeader = () => {
+      if (stateRef.current.status === "idle") return false;
+      activeCtrlRef.current?.abort("user interrupt (/interrupt)");
+      dispatch({ type: "status", status: "aborting" });
+      return true;
+    };
+  }, [interruptController, dispatch, stateRef]);
   const lastEscAtRef = useRef(0);
   const ESC_DOUBLE_PRESS_MS = 1e3;
   useDirectorFleetBridge({
@@ -11223,6 +11330,7 @@ function App({
           featureMemory: cfg.featureMemory ?? true,
           featureSkills: cfg.featureSkills ?? true,
           featureModelsRegistry: cfg.featureModelsRegistry ?? true,
+          featureTokenSaving: cfg.featureTokenSaving ?? false,
           contextAutoCompact: cfg.contextAutoCompact ?? true,
           contextStrategy: cfg.contextStrategy ?? "hybrid",
           logLevel: cfg.logLevel ?? "info",
@@ -12142,6 +12250,7 @@ User message:
           featureMemory: state.settingsPicker.featureMemory,
           featureSkills: state.settingsPicker.featureSkills,
           featureModelsRegistry: state.settingsPicker.featureModelsRegistry,
+          featureTokenSaving: state.settingsPicker.featureTokenSaving,
           contextAutoCompact: state.settingsPicker.contextAutoCompact,
           contextStrategy: state.settingsPicker.contextStrategy,
           logLevel: state.settingsPicker.logLevel,
@@ -12322,7 +12431,9 @@ User message:
           nextStepsAutoSubmitCountdown,
           autoProceedCountdown: state.countdown?.remainingSeconds ?? null,
           sessionCount,
-          mailbox: mailboxStatus
+          mailbox: mailboxStatus,
+          tokenSavingMode: getSettings ? getSettings().featureTokenSaving : tokenSavingMode,
+          toolCount
         }
       ) }),
       /* @__PURE__ */ jsx(
@@ -12731,6 +12842,7 @@ async function runTui(opts) {
           fleetRoster: opts.fleetRoster,
           onClearHistory: opts.onClearHistory ? (dispatch) => opts.onClearHistory?.(dispatch) : void 0,
           fleetStreamController: opts.fleetStreamController,
+          interruptController: opts.interruptController,
           enhanceController: opts.enhanceController,
           enhanceEnabled: opts.enhanceController?.enabled ?? true,
           statuslineHiddenItems: opts.statuslineHiddenItems,
@@ -12750,6 +12862,8 @@ async function runTui(opts) {
           confirmExit: opts.confirmExit,
           mouse: mouseEnabled,
           modeLabel: opts.modeLabel,
+          tokenSavingMode: opts.tokenSavingMode,
+          toolCount: opts.toolCount,
           getModeLabel: opts.getModeLabel,
           registerDebugStreamCallback: opts.registerDebugStreamCallback,
           restoreDebugStreamCallback: opts.restoreDebugStreamCallback,