@aragon-agent/cli 0.6.7 → 0.6.9

package/dist/ui/ActivityLine.d.ts

@@ -41,6 +41,8 @@
 import React from 'react';
 import type { Theme } from './theme.js';
 import type { TermCapabilities } from './capabilities.js';
+import { pickGlyphs } from './glyphs.js';
+import type { RunActivity } from './run-status-row.js';
 /**
  * The animated spinner this row draws while it is live, or `null` when it would
  * be STATIC — an ASCII terminal, or a user who asked for stillness.
@@ -57,42 +59,32 @@ import type { TermCapabilities } from './capabilities.js';
  * reader has to reason about; one more caller of this function is not.
  */
 export declare function liveSpinner(reducedMotion: boolean, caps: TermCapabilities): React.ReactElement | null;
-export interface ActivityLineProps {
-    /** Epoch ms the current run began — the phrase sequence's seed. */
-    startedAt: number;
-    /** `Date.now() - startedAt`, already computed by App's 200 ms ticker. */
-    elapsedMs: number;
-    reducedMotion: boolean;
-    /**
-     * The name of the tool currently in flight, or `undefined`
-     * (agent-activity-presentation-live L4 / D-31).
-     *
-     * `status === 'running'` covers the WHOLE turn, including the minutes the
-     * model is idle and a child process is doing the work. Round 1 chose the
-     * thinking vocabulary deliberately for the gap before the first token, and it
-     * is right for that gap; a UI that says "Pondering" while `npm test` runs is
-     * not calm, it is wrong.
-     */
-    runningTool?: string;
+/**
+ * The label ladder, MOST SPECIFIC FIRST: `Compacting context` outranks a tool name
+ * because compaction can be the only thing happening, and the tool name outranks
+ * the rotating phrase for the reason `runningTool` exists at all. One
+ * implementation, because the fixed bottom row and the run status row above the
+ * input must never disagree about what the agent is doing.
+ *
+ * `Running ${name}` rather than a per-tool verb table: a table would be a SECOND
+ * registry of tool names, and `toolGlyph` is already the one place that knows
+ * them. ASCII only, and the ellipsis comes from `pickGlyphs` like every other one.
+ */
+export declare function resolveActivityLabel(activity: RunActivity, glyphs: ReturnType<typeof pickGlyphs>): string;
+export interface ActivityLabelProps extends RunActivity {
     /**
-     * A context compaction is in flight (context-auto-compaction §6.1).
-     *
-     * HIGHEST PRECEDENCE IN THE LABEL LADDER, above `runningTool` and above the
-     * rotating phrase. Compaction happens BEFORE `turn_start`, i.e. at a moment
-     * when `status` is `'running'` but no tool is in flight — precisely the window
-     * in which the phrase rotation would say something false, and it can last
-     * tens of seconds. `runningTool` already established the principle one step
-     * back: a UI that says "Pondering" while `npm test` runs is not calm, it is
-     * wrong, and one that says it while a 30 k-token summarization runs is the same
-     * error.
-     *
-     * STILL NO SECOND SPINNER. `single-spinner-while-running`'s D-1 stands: this
-     * row owns the only animation while it is mounted, and the compaction card
-     * follows `FastCard` in taking a `reducedMotion` that `App` has already
-     * widened.
+     * False draws the STATIC glyph even when motion is allowed. The run status row
+     * uses it when it has scrolled out of the viewport (the fixed bottom row owns
+     * the animation then) or an overlay covers the chat. The phrase still rotates
+     * from the RAW `reducedMotion`, so a still icon never freezes the wording.
      */
-    compacting?: boolean;
+    spinnerLive?: boolean;
+    /** Prefix one space (the fixed bottom row's indent); the run row indents itself. */
+    leadingSpace?: boolean;
     theme: Theme;
     caps: TermCapabilities;
 }
-export declare function ActivityLine({ startedAt, elapsedMs, reducedMotion, runningTool, compacting, theme, caps, }: ActivityLineProps): React.ReactElement;
+/** `<spinner> <label>` as ONE truncating `<Text>`; the only place that composes them. */
+export declare function ActivityLabel({ spinnerLive, leadingSpace, theme, caps, ...activity }: ActivityLabelProps): React.ReactElement;
+export type ActivityLineProps = Omit<ActivityLabelProps, 'spinnerLive' | 'leadingSpace'>;
+export declare function ActivityLine(props: ActivityLineProps): React.ReactElement;

package/dist/ui/ActivityLine.js

@@ -21,32 +21,43 @@ import { pickActivityPhrase } from './activity-phrases.js';
 export function liveSpinner(reducedMotion, caps) {
     return caps.unicode && !reducedMotion ? _jsx(Spinner, { type: "dots" }) : null;
 }
-export function ActivityLine({ startedAt, elapsedMs, reducedMotion, runningTool, compacting, theme, caps, }) {
-    const glyphs = pickGlyphs(caps);
+/**
+ * The label ladder, MOST SPECIFIC FIRST: `Compacting context` outranks a tool name
+ * because compaction can be the only thing happening, and the tool name outranks
+ * the rotating phrase for the reason `runningTool` exists at all. One
+ * implementation, because the fixed bottom row and the run status row above the
+ * input must never disagree about what the agent is doing.
+ *
+ * `Running ${name}` rather than a per-tool verb table: a table would be a SECOND
+ * registry of tool names, and `toolGlyph` is already the one place that knows
+ * them. ASCII only, and the ellipsis comes from `pickGlyphs` like every other one.
+ */
+export function resolveActivityLabel(activity, glyphs) {
+    if (activity.compacting)
+        return `Compacting context${glyphs.ellipsis}`;
+    if (activity.runningTool)
+        return `Running ${activity.runningTool}`;
     // PURE AND DERIVED FROM `(startedAt, now)`, so the sequence does not need to
     // keep rotating underneath the tool label: when the tool settles the phrase
     // resumes at the position the clock implies, with no state anywhere.
-    const phrase = pickActivityPhrase(startedAt, startedAt + elapsedMs, !reducedMotion);
-    // `Running ${name}` rather than a per-tool verb table: a table would be a
-    // SECOND registry of tool names, and `toolGlyph` is already the one place that
-    // knows them. Everything round 1 legislated for this row survives — one row,
-    // no digits, no `esc abort`, no width ladder, ASCII only.
-    // THREE RUNGS, MOST SPECIFIC FIRST. `Compacting context` outranks a tool name
-    // because compaction can be the only thing happening, and it outranks the
-    // phrase for the reason `runningTool` does. ASCII only, and the ellipsis comes
-    // from `pickGlyphs` like every other one on this row.
-    const label = compacting
-        ? `Compacting context${glyphs.ellipsis}`
-        : runningTool
-            ? `Running ${runningTool}`
-            : `${phrase}${glyphs.ellipsis}`;
+    const phrase = pickActivityPhrase(activity.startedAt, activity.startedAt + activity.elapsedMs, !activity.reducedMotion);
+    return `${phrase}${glyphs.ellipsis}`;
+}
+/** `<spinner> <label>` as ONE truncating `<Text>`; the only place that composes them. */
+export function ActivityLabel({ spinnerLive = true, leadingSpace = false, theme, caps, ...activity }) {
+    const glyphs = pickGlyphs(caps);
+    const label = resolveActivityLabel(activity, glyphs);
     // The IDENTICAL branch `Transcript.tsx` uses for the assistant role marker, and
     // it must stay identical: braille dots are both an animation AND a Unicode-only
     // glyph, so reduced motion and an ASCII terminal fall back to the same marker.
     //
     // Through `liveSpinner` rather than inline, so this row and the glyph
     // `BottomStatusRow` composes beside a toast can never disagree about WHEN the
-    // spinner is live — the same reason `App` names its mount condition once.
-    const spinner = liveSpinner(reducedMotion, caps) ?? glyphs.spinnerStill;
-    return (_jsx(Box, { flexShrink: 0, children: _jsxs(Text, { wrap: "truncate", color: theme.thinking, children: [' ', spinner, " ", label] }) }));
+    // spinner is live - the same reason `App` names its mount condition once.
+    const spinner = (spinnerLive ? liveSpinner(activity.reducedMotion, caps) : null) ??
+        glyphs.spinnerStill;
+    return (_jsxs(Text, { wrap: "truncate", color: theme.thinking, children: [leadingSpace ? ' ' : '', spinner, " ", label] }));
+}
+export function ActivityLine(props) {
+    return (_jsx(Box, { flexShrink: 0, children: _jsx(ActivityLabel, { ...props, leadingSpace: true }) }));
 }

package/dist/ui/App.d.ts

@@ -5,11 +5,11 @@
  * input / toast stack / status bar / overlays.
  */
 import React from 'react';
+import type { ScrollbarBridge } from './scrollbar-controller.js';
 import type { AgentController } from '../agent/controller.js';
 import type { ConfirmRequest } from '../tools/index.js';
 import { type Overlay, type ToastLevel } from '../agent/reducer.js';
 import type { UpdateBridge } from '../update/types.js';
-import { type RenderMode } from './layout/frame.js';
 import type { MouseSource } from '../input/stdin-filter.js';
 import type { PasteBridge } from '../input/limits.js';
 import type { SelectionBridge } from './selection/selection-controller.js';
@@ -42,15 +42,11 @@ export interface AppProps {
     controller: AgentController;
     version: string;
     /** Decided once in `cli.tsx::runInteractive()`; never switched at run time. */
-    mode: RenderMode;
     initialOverlay?: Overlay;
     initialPrompt?: string;
     confirmBridge?: ConfirmBridge;
     /** The plan-mode human channel; absent in tests that do not exercise it. */
     humanInputBridge?: HumanInputBridge;
-    /** Wheel events, already stripped out of stdin. Absent whenever mouse support
-     *  is off: inline mode, `--no-mouse`, a non-TTY, or a filter that failed to
-     *  build (mouse-wheel-region-routing §4.2). */
     mouseSource?: MouseSource;
     /**
      * Present ONLY on a console that can deliver neither `CSI Z` nor a mouse
@@ -86,51 +82,17 @@ export interface AppProps {
      * on a non-TTY, and in every test that does not exercise it.
      */
     pasteBridge?: PasteBridge;
-    /**
-     * The terminal-facing services `cli.tsx` owns and this component cannot build
-     * (tui-selection-and-scroll-follow §4.4).
-     *
-     * ONE PROP RATHER THAN FOUR, and every FIELD of it is independently optional,
-     * so `--no-mouse`, `--no-diff-render` and inline mode each drop exactly the
-     * services they do not have. Absent altogether on a non-TTY and in every test
-     * that does not exercise selection, which is what keeps those trees
-     * byte-identical.
-     */
     terminal?: TerminalBridge;
 }
-/**
- * Terminal-level services, almost all of which exist only in a full-screen TTY
- * session — `writeForeign` is the exception, because `/copy` is available in
- * inline mode too and OSC 52 is what makes it work over SSH (§4.4.5).
- *
- * `selection` is a LATE-BOUND BRIDGE for the reason `updateBridge` above is one:
- * the controller is constructed before `render()` and must not hold React state,
- * while the toast sink and the redraw nonce only exist once this component has
- * mounted. The effect below assigns both and clears them on unmount.
- */
 export interface TerminalBridge {
+    scrollbar?: ScrollbarBridge;
     /** Whether drag-select is on for this session (`mouseSelect` + a filter). */
     mouseSelect: boolean;
     /** Release the mouse to the terminal, or take it back (`/mouse`, G3). */
     setMouseCapture?: (on: boolean) => void;
     /** Whether the mouse is captured right now — read at command time. */
     isMouseCaptured?: () => boolean;
-    /**
-     * Write bytes that are ours but are not a frame (OSC 52).
-     *
-     * IT MUST NOT BE `stdout.write` WITH THE DIFFER IN FRONT OF STDOUT (P1-6):
-     * that goes through the frame-writer proxy, which does not recognise an OSC 52
-     * chunk, counts it as a foreign write and prints `FRAME_FALLBACK_NOTICE` at
-     * the user the first time they copy anything. Without a differ — inline mode,
-     * `--no-diff-render` — stdout IS the real stream and `cli.tsx` supplies a
-     * direct write instead.
-     *
-     * Absent only when there is no terminal to accept it at all. It is never a
-     * function that writes nowhere: `copyText` reports `'osc52'` whenever its door
-     * took the text, so a no-op door would make the toast name a mechanism that
-     * was never attempted.
-     */
     writeForeign?: (text: string) => void;
     selection?: SelectionBridge;
 }
-export declare function App({ controller, version, mode, initialOverlay, initialPrompt, confirmBridge, humanInputBridge, mouseSource, vtInputWarning, updateBridge, pasteBridge, terminal, }: AppProps): React.ReactElement;
+export declare function App({ controller, version, initialOverlay, initialPrompt, confirmBridge, humanInputBridge, mouseSource, vtInputWarning, updateBridge, pasteBridge, terminal, }: AppProps): React.ReactElement;