atom-agent 1.2.0 → 1.3.0

package/dist/ui/status-bar.js

@@ -12,6 +12,47 @@ import React from "react";
 import { Box, Text } from "ink";
 import { formatTokenSegment } from "../context-windows.js";
 import { theme } from "./theme.js";
+// Default objective budget for the goal segment: compact enough to share the
+// line with the pinned model/token/mode segments at 100 columns.
+export const GOAL_STATUS_OBJECTIVE_CHARS = 32;
+// Truncate an objective to n chars max (`…` tail keeps the start, which
+// carries the verb). n < 4 yields "" (the caller drops the segment instead).
+export function truncateGoalObjective(objective, max = GOAL_STATUS_OBJECTIVE_CHARS) {
+    const text = typeof objective === "string" ? objective : "";
+    if (text.length <= max)
+        return text;
+    if (max < 4)
+        return "";
+    return `${text.slice(0, max - 1)}…`;
+}
+// Full goal segment at the default budget, or null when no goal is live.
+// Paused reads distinct from active (`[paused]` vs `[active]`).
+export function formatGoalSegment(goal, max = GOAL_STATUS_OBJECTIVE_CHARS) {
+    if (!goal || typeof goal.objective !== "string" || goal.objective.length === 0)
+        return null;
+    const state = goal.active === true ? "active" : "paused";
+    return `goal: ${truncateGoalObjective(goal.objective, max)} [${state}]`;
+}
+// Fit the goal segment into `room` chars (the width left after every other
+// segment): full text when it fits, a shorter truncation when it almost
+// fits, null (drop the segment) when even a stub would displace the line.
+// Never throws; never returns "".
+export function fitGoalSegment(goal, room) {
+    if (!goal || typeof goal.objective !== "string" || goal.objective.length === 0)
+        return null;
+    if (typeof room !== "number" || !Number.isFinite(room) || room <= 0)
+        return null;
+    const state = goal.active === true ? "active" : "paused";
+    const full = `goal: ${goal.objective} [${state}]`;
+    if (full.length <= room)
+        return full;
+    // Room for at least 4 objective chars plus the fixed framing, else drop.
+    const overhead = `goal:  [${state}]`.length + 1;
+    const allow = Math.floor(room - overhead);
+    if (allow < 4)
+        return null;
+    return `goal: ${truncateGoalObjective(goal.objective, allow)} [${state}]`;
+}
 // ~/… collapse + tail-cut: informative, never a full scroll of nesting.
 // Further shrinking for tight widths goes through shrinkTo below (the bar
 // measures first and only renders what fits).
@@ -34,9 +75,13 @@ export function shrinkTo(s, n) {
 // render (same-props parent churn — token paints, keystrokes, unrelated
 // ticks — must skip it; only changed props repaint).
 export const statusBarRenderProbe = { count: 0 };
-export const StatusBar = React.memo(function StatusBar({ provider, model, usageTotals, contextLoad, reasoningDisplay, mode, trustAll, busy, activity, phaseLabel, elapsedSecs, stalled, approvalPending, cwd, branch, columns = 100, }) {
+export const StatusBar = React.memo(function StatusBar({ provider, model, usageTotals, contextLoad, reasoningDisplay, mode, trustAll, busy, activity, phaseLabel, elapsedSecs, stalled, approvalPending, cwd, branch, columns = 100, extensionStatus, goal, }) {
     statusBarRenderProbe.count += 1;
     const bar = theme.symbol.bar;
+    // Extension guest slot (ticket 10): pre-budgeted text renders only when
+    // the full line still fits — the fixed-width contract above. The `+ 3`
+    // is the ` ${bar} ` separator the segment carries with it.
+    const hasExt = typeof extensionStatus === "string" && extensionStatus.length > 0;
     if (!busy) {
         const token = formatTokenSegment(usageTotals, model, contextLoad);
         const trust = trustAll && mode !== "plan" ? "+trust" : "";
@@ -46,7 +91,8 @@ export const StatusBar = React.memo(function StatusBar({ provider, model, usageT
         // order: branch → cwd tail → the whole segment.
         const tail = `reasoning: ${reasoningDisplay} ${bar} mode: ${mode}${trust}`;
         const baseLen = `${provider}/${model} ${bar} ${token} ${bar}  ${bar} ${tail}`.length;
-        const avail = columns - baseLen;
+        const showExt = hasExt && baseLen + extensionStatus.length + 3 + 2 <= columns;
+        const avail = columns - baseLen - (showExt ? extensionStatus.length + 3 : 0);
         let loc = null;
         if (cwd) {
             const branchPart = branch ? ` : ${branch}` : "";
@@ -61,15 +107,44 @@ export const StatusBar = React.memo(function StatusBar({ provider, model, usageT
                 loc = shrunk ? shrunk : null;
             }
         }
-        return (_jsx(Box, { marginTop: theme.spacing.statusMarginTop, children: _jsxs(Text, { dimColor: true, children: [provider, "/", model, " ", bar, " ", token, loc ? (_jsxs(_Fragment, { children: [" ", bar, " ", loc] })) : null, " ", bar, " reasoning: ", reasoningDisplay, " ", bar, " mode: ", mode, trust ? "+trust" : null] }) }));
+        // Goal segment (ticket 09): lowest-priority builtin — it takes only the
+        // width left after every other segment and drops whole rather than push
+        // the line past `columns`. Hidden entirely with no goal.
+        const lineSoFar = baseLen + (showExt ? extensionStatus.length + 3 : 0) + (loc ? loc.length + 3 : 0);
+        const goalSeg = fitGoalSegment(goal ?? null, columns - lineSoFar - 2);
+        return (_jsx(Box, { marginTop: theme.spacing.statusMarginTop, children: _jsxs(Text, { dimColor: true, children: [provider, "/", model, " ", bar, " ", token, showExt ? (_jsxs(_Fragment, { children: [" ", bar, " ", extensionStatus] })) : null, loc ? (_jsxs(_Fragment, { children: [" ", bar, " ", loc] })) : null, " ", bar, " reasoning: ", reasoningDisplay, " ", bar, " mode: ", mode, trust ? "+trust" : null, goalSeg ? (_jsxs(_Fragment, { children: [" ", bar, " ", goalSeg] })) : null] }) }));
     }
     // Busy layout prioritizes activity + clock + interrupt hint; the mode
     // stays pinned (it used to vanish while working), and the reasoning
     // effort stays visible (it used to vanish while working). The activity text
     // shrinks to fit so `esc stops` never wraps away.
     const busyTrust = trustAll && mode !== "plan" ? "+trust" : "";
-    const busyFixed = ` ${bar} ${elapsedSecs}s ${bar} ${formatTokenSegment(usageTotals, model, contextLoad)} ${bar} reasoning: ${reasoningDisplay} ${bar} mode: ${mode}${busyTrust} ${bar} esc stops`;
+    const busyToken = formatTokenSegment(usageTotals, model, contextLoad);
+    // Goal segment (ticket 09): a guest in the fixed part — capped at 48
+    // chars and rendered only when the FULL activity text still fits beside
+    // it. Otherwise the goal drops whole and every existing segment renders
+    // exactly as with no goal (the goal never displaces, same precedent as
+    // the extension guest above). The clock, token, mode, and esc-hint
+    // segments never move for it either way.
+    const busyGoalSeg = fitGoalSegment(goal ?? null, 48);
+    const busyGoalCandidate = busyGoalSeg ? ` ${bar} ${busyGoalSeg}` : "";
+    const activityFull = activity ?? phaseLabel;
+    const busyCore = ` ${bar} ${elapsedSecs}s ${bar} ${busyToken} ${bar} reasoning: ${reasoningDisplay} ${bar} mode: ${mode}${busyTrust}`;
+    const busyTail = ` ${bar} esc stops`;
+    const busyExtCandidate = hasExt && `${busyCore}${busyGoalCandidate}${busyTail}`.length + extensionStatus.length + 3 + 2 <= columns
+        ? ` ${bar} ${extensionStatus}`
+        : "";
+    const withGoalFixed = `${busyCore}${busyExtCandidate}${busyGoalCandidate}${busyTail}`;
+    // Room check against the unfitted activity text: when it no longer fits
+    // whole with the goal aboard, the goal yields (drop whole, recompute).
+    const busyGoalPart = busyGoalCandidate !== "" &&
+        withGoalFixed.length + activityFull.length + 2 <= columns
+        ? busyGoalCandidate
+        : "";
+    const busyNoExt = `${busyCore}${busyGoalPart}${busyTail}`;
+    const showBusyExt = hasExt && busyNoExt.length + extensionStatus.length + 3 + 2 <= columns;
+    const busyFixed = ` ${bar} ${elapsedSecs}s${showBusyExt ? ` ${bar} ${extensionStatus}` : ""} ${bar} ${busyToken} ${bar} reasoning: ${reasoningDisplay} ${bar} mode: ${mode}${busyTrust}${busyGoalPart} ${bar} esc stops`;
     const busyAvail = columns - busyFixed.length - 2;
-    const activityText = shrinkTo(activity ?? phaseLabel, Math.max(0, busyAvail));
+    const activityText = shrinkTo(activityFull, Math.max(0, busyAvail));
     return (_jsx(Box, { marginTop: theme.spacing.statusMarginTop, children: _jsxs(Text, { dimColor: true, children: [_jsxs(Text, { color: theme.color.activity, children: [theme.symbol.workTool, " ", activityText] }), busyFixed, stalled && !approvalPending ? ` ${bar} waiting${theme.symbol.ellipsis}` : null, approvalPending ? (_jsxs(Text, { color: theme.color.warning, children: [" ", bar, " waiting approval"] })) : null] }) }));
 });