wave-code 0.17.1 → 0.17.2

package/dist/managers/inputReducer.js

@@ -1,4 +1,5 @@
 import { getAtSelectorPosition, getSlashSelectorPosition, getWordEnd, SELECTOR_TRIGGERS, getProjectedState, } from "../utils/inputUtils.js";
+import { AVAILABLE_COMMANDS } from "../constants/commands.js";
 export const initialState = {
     inputText: "",
     cursorPosition: 0,
@@ -23,6 +24,7 @@ export const initialState = {
     showLoginCommand: false,
     showPluginManager: false,
     showModelSelector: false,
+    showWorkflowManager: false,
     permissionMode: "default",
     selectorJustUsed: false,
     isPasting: false,
@@ -214,6 +216,12 @@ export function inputReducer(state, action) {
                 showModelSelector: action.payload,
                 selectorJustUsed: !action.payload ? true : state.selectorJustUsed,
             };
+        case "SET_SHOW_WORKFLOW_MANAGER":
+            return {
+                ...state,
+                showWorkflowManager: action.payload,
+                selectorJustUsed: !action.payload ? true : state.selectorJustUsed,
+            };
         case "SET_PERMISSION_MODE":
             return { ...state, permissionMode: action.payload };
         case "SET_SELECTOR_JUST_USED":
@@ -457,9 +465,7 @@ export function inputReducer(state, action) {
             return { ...state, pendingEffect: null };
         case "HANDLE_KEY": {
             const { input, key } = action.payload;
-            if (state.selectorJustUsed) {
-                return state;
-            }
+            const hasQueuedMessages = action.payload.hasQueuedMessages ?? false;
             // 1. BTW State Handling
             if (state.btwState.isActive) {
                 if (key.escape) {
@@ -540,7 +546,8 @@ export function inputReducer(state, action) {
                     state.showStatusCommand ||
                     state.showLoginCommand ||
                     state.showPluginManager ||
-                    state.showModelSelector)) {
+                    state.showModelSelector ||
+                    state.showWorkflowManager)) {
                     return { ...state, pendingEffect: { type: "ABORT_MESSAGE" } };
                 }
                 return state;
@@ -582,6 +589,13 @@ export function inputReducer(state, action) {
             if (key.upArrow &&
                 !state.showFileSelector &&
                 !state.showCommandSelector) {
+                // If queue has messages, recall from queue first (before history)
+                if (hasQueuedMessages) {
+                    return {
+                        ...state,
+                        pendingEffect: { type: "RECALL_QUEUED_MESSAGE" },
+                    };
+                }
                 if (state.history.length === 0) {
                     return { ...state, pendingEffect: { type: "FETCH_HISTORY" } };
                 }
@@ -754,6 +768,29 @@ export function inputReducer(state, action) {
                             pendingEffect: question ? { type: "ASK_BTW", question } : null,
                         };
                     }
+                    // Check if the content is a CLI-internal slash command (help, tasks,
+                    // etc.) that should be executed locally rather than sent as a message.
+                    // Agent slash commands and unknown /commands always go to SEND_MESSAGE.
+                    if (contentWithPlaceholders.startsWith("/")) {
+                        const spaceIndex = contentWithPlaceholders.indexOf(" ");
+                        const commandName = spaceIndex === -1
+                            ? contentWithPlaceholders.substring(1)
+                            : contentWithPlaceholders.substring(1, spaceIndex);
+                        const isInternalCommand = AVAILABLE_COMMANDS.some((cmd) => cmd.id === commandName);
+                        if (isInternalCommand) {
+                            return {
+                                ...state,
+                                inputText: "",
+                                cursorPosition: 0,
+                                historyIndex: -1,
+                                longTextMap: {},
+                                pendingEffect: {
+                                    type: "EXECUTE_COMMAND",
+                                    command: commandName,
+                                },
+                            };
+                        }
+                    }
                     return {
                         ...state,
                         inputText: "",

package/dist/print-cli.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"print-cli.d.ts","sourceRoot":"","sources":["../src/print-cli.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAE1C,MAAM,WAAW,eAAgB,SAAQ,YAAY;IACnD,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,8DAA8D;IAC9D,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,gBAAgB,EAAE,eAAe,CAAC,CAAC;CACvE;AAgBD,wBAAsB,aAAa,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,CAuN3E"}
+{"version":3,"file":"print-cli.d.ts","sourceRoot":"","sources":["../src/print-cli.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAE1C,MAAM,WAAW,eAAgB,SAAQ,YAAY;IACnD,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,8DAA8D;IAC9D,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,gBAAgB,EAAE,eAAe,CAAC,CAAC;CACvE;AAgBD,wBAAsB,aAAa,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,CAqL3E"}

package/dist/print-cli.js

@@ -24,14 +24,14 @@ export async function startPrintCli(options) {
     let agent;
     let isReasoning = false;
     let isContent = false;
-    const subagentReasoningStates = new Map();
-    const subagentContentStates = new Map();
     // Setup callbacks for agent
+    // Print mode only outputs the main agent's response (matching Claude Code's
+    // behavior). Subagent output is internal — the main agent incorporates
+    // relevant results in its own response.
     const callbacks = {
         onAssistantMessageAdded: () => {
             isReasoning = false;
             isContent = false;
-            // Assistant message started - no content to output yet
         },
         onAssistantReasoningUpdated: (chunk) => {
             if (!isReasoning) {
@@ -50,36 +50,8 @@ export async function startPrintCli(options) {
                 }
                 isContent = true;
             }
-            // FR-001: Stream content updates for real-time display - output only the new chunk
             process.stdout.write(chunk);
         },
-        // Subagent message callbacks
-        onSubagentAssistantMessageAdded: (subagentId) => {
-            subagentReasoningStates.set(subagentId, false);
-            subagentContentStates.set(subagentId, false);
-        },
-        onSubagentAssistantReasoningUpdated: (subagentId, chunk) => {
-            if (!subagentReasoningStates.get(subagentId)) {
-                process.stdout.write("\n   💭 Reasoning: ");
-                subagentReasoningStates.set(subagentId, true);
-            }
-            process.stdout.write(chunk);
-        },
-        onSubagentAssistantContentUpdated: (subagentId, chunk) => {
-            if (!subagentContentStates.get(subagentId)) {
-                if (subagentReasoningStates.get(subagentId)) {
-                    process.stdout.write("\n   📝 Response: ");
-                }
-                else {
-                    process.stdout.write("\n   ");
-                }
-                subagentContentStates.set(subagentId, true);
-            }
-            process.stdout.write(chunk);
-        },
-        onSubagentUserMessageAdded: (_subagentId, params) => {
-            process.stdout.write(`\n   👤 User: ${params.content}\n`);
-        },
         // Tool block callback - display tool name when tool starts
         onToolBlockUpdated: (params) => {
             // Print tool name only during 'running' stage (happens once per tool call)

package/dist/reducers/workflowManagerReducer.d.ts

@@ -0,0 +1,41 @@
+import { Key } from "ink";
+import type { WorkflowRun } from "wave-agent-sdk";
+export type PendingEffect = {
+    type: "CANCEL";
+} | {
+    type: "STOP_RUN";
+    runId: string;
+};
+export interface WorkflowManagerState {
+    runs: WorkflowRun[];
+    selectedIndex: number;
+    viewMode: "list" | "detail";
+    detailRunId: string | null;
+    pendingEffect: PendingEffect | null;
+}
+export type WorkflowManagerAction = {
+    type: "SET_RUNS";
+    runs: WorkflowRun[];
+} | {
+    type: "SELECT_INDEX";
+    index: number;
+} | {
+    type: "MOVE_UP";
+} | {
+    type: "MOVE_DOWN";
+} | {
+    type: "SELECT_CURRENT";
+} | {
+    type: "SET_VIEW_MODE";
+    mode: "list" | "detail";
+} | {
+    type: "RESET_DETAIL";
+} | {
+    type: "HANDLE_KEY";
+    input: string;
+    key: Key;
+} | {
+    type: "CLEAR_PENDING_EFFECT";
+};
+export declare function workflowManagerReducer(state: WorkflowManagerState, action: WorkflowManagerAction): WorkflowManagerState;
+//# sourceMappingURL=workflowManagerReducer.d.ts.map

package/dist/reducers/workflowManagerReducer.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"workflowManagerReducer.d.ts","sourceRoot":"","sources":["../../src/reducers/workflowManagerReducer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAC1B,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAElD,MAAM,MAAM,aAAa,GACrB;IAAE,IAAI,EAAE,QAAQ,CAAA;CAAE,GAClB;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAExC,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,WAAW,EAAE,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,EAAE,MAAM,GAAG,QAAQ,CAAC;IAC5B,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,aAAa,EAAE,aAAa,GAAG,IAAI,CAAC;CACrC;AAED,MAAM,MAAM,qBAAqB,GAC7B;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,IAAI,EAAE,WAAW,EAAE,CAAA;CAAE,GACzC;IAAE,IAAI,EAAE,cAAc,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GACvC;IAAE,IAAI,EAAE,SAAS,CAAA;CAAE,GACnB;IAAE,IAAI,EAAE,WAAW,CAAA;CAAE,GACrB;IAAE,IAAI,EAAE,gBAAgB,CAAA;CAAE,GAC1B;IAAE,IAAI,EAAE,eAAe,CAAC;IAAC,IAAI,EAAE,MAAM,GAAG,QAAQ,CAAA;CAAE,GAClD;IAAE,IAAI,EAAE,cAAc,CAAA;CAAE,GACxB;IAAE,IAAI,EAAE,YAAY,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,GAAG,CAAA;CAAE,GAC/C;IAAE,IAAI,EAAE,sBAAsB,CAAA;CAAE,CAAC;AAErC,wBAAgB,sBAAsB,CACpC,KAAK,EAAE,oBAAoB,EAC3B,MAAM,EAAE,qBAAqB,GAC5B,oBAAoB,CAiHtB"}

package/dist/reducers/workflowManagerReducer.js

@@ -0,0 +1,100 @@
+export function workflowManagerReducer(state, action) {
+    switch (action.type) {
+        case "SET_RUNS":
+            return { ...state, runs: action.runs };
+        case "SELECT_INDEX":
+            return { ...state, selectedIndex: action.index };
+        case "MOVE_UP":
+            return { ...state, selectedIndex: Math.max(0, state.selectedIndex - 1) };
+        case "MOVE_DOWN":
+            return {
+                ...state,
+                selectedIndex: Math.min(state.runs.length > 0 ? state.runs.length - 1 : 0, state.selectedIndex + 1),
+            };
+        case "SELECT_CURRENT":
+            if (state.runs.length > 0 && state.selectedIndex < state.runs.length) {
+                return {
+                    ...state,
+                    detailRunId: state.runs[state.selectedIndex].runId,
+                    viewMode: "detail",
+                };
+            }
+            return state;
+        case "SET_VIEW_MODE":
+            return { ...state, viewMode: action.mode };
+        case "RESET_DETAIL":
+            return {
+                ...state,
+                viewMode: "list",
+                detailRunId: null,
+            };
+        case "HANDLE_KEY": {
+            const { input, key } = action;
+            if (state.viewMode === "list") {
+                if (key.return) {
+                    if (state.runs.length > 0 &&
+                        state.selectedIndex < state.runs.length) {
+                        return {
+                            ...state,
+                            detailRunId: state.runs[state.selectedIndex].runId,
+                            viewMode: "detail",
+                        };
+                    }
+                    return state;
+                }
+                if (key.escape) {
+                    return { ...state, pendingEffect: { type: "CANCEL" } };
+                }
+                if (key.upArrow) {
+                    return {
+                        ...state,
+                        selectedIndex: Math.max(0, state.selectedIndex - 1),
+                    };
+                }
+                if (key.downArrow) {
+                    return {
+                        ...state,
+                        selectedIndex: Math.min(state.runs.length > 0 ? state.runs.length - 1 : 0, state.selectedIndex + 1),
+                    };
+                }
+                if (input === "k") {
+                    if (state.runs.length > 0 &&
+                        state.selectedIndex < state.runs.length) {
+                        const selectedRun = state.runs[state.selectedIndex];
+                        if (selectedRun.status === "running") {
+                            return {
+                                ...state,
+                                pendingEffect: { type: "STOP_RUN", runId: selectedRun.runId },
+                            };
+                        }
+                    }
+                    return state;
+                }
+            }
+            else if (state.viewMode === "detail") {
+                if (key.escape) {
+                    return {
+                        ...state,
+                        viewMode: "list",
+                        detailRunId: null,
+                    };
+                }
+                if (input === "k" && state.detailRunId) {
+                    const run = state.runs.find((r) => r.runId === state.detailRunId);
+                    if (run && run.status === "running") {
+                        return {
+                            ...state,
+                            pendingEffect: { type: "STOP_RUN", runId: state.detailRunId },
+                        };
+                    }
+                    return state;
+                }
+            }
+            return state;
+        }
+        case "CLEAR_PENDING_EFFECT":
+            return { ...state, pendingEffect: null };
+        default:
+            return state;
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wave-code",
-  "version": "0.17.1",
+  "version": "0.17.2",
   "description": "CLI-based code assistant powered by AI, built with React and Ink",
   "repository": {
     "type": "git",
@@ -42,7 +42,7 @@
     "semver": "^7.7.4",
     "yargs": "^17.7.2",
     "zod": "^3.23.8",
-    "wave-agent-sdk": "0.17.1"
+    "wave-agent-sdk": "0.17.2"
   },
   "devDependencies": {
     "@types/react": "^19.1.8",

package/src/acp/agent.ts

@@ -102,7 +102,7 @@ export class WaveAcpAgent implements AcpAgent {
 
   private getSessionConfigOptions(agent: WaveAgent): SessionConfigOption[] {
     const configuredModels = agent.getConfiguredModels();
-    const currentModel = agent.getModelConfig().model;
+    const currentModel = agent.getModelConfig().model || "";
 
     return [
       {

package/src/components/ChatInterface.tsx

@@ -37,6 +37,9 @@ export const ChatInterface: React.FC = () => {
     workdir,
     remountKey,
     requestRemount,
+    isGoalActive,
+    goalElapsed,
+    isGoalEvaluating,
   } = useChat();
 
   const displayMessages = messages;
@@ -80,11 +83,15 @@ export const ChatInterface: React.FC = () => {
 
       {!isConfirmationVisible && !isExpanded && (
         <>
-          {(isLoading || isCommandRunning || isCompacting) && (
+          {(isLoading ||
+            isCommandRunning ||
+            isCompacting ||
+            isGoalEvaluating) && (
             <LoadingIndicator
               isLoading={isLoading}
               isCommandRunning={isCommandRunning}
               isCompacting={isCompacting}
+              isGoalEvaluating={isGoalEvaluating}
               latestTotalTokens={latestTotalTokens}
             />
           )}
@@ -102,6 +109,8 @@ export const ChatInterface: React.FC = () => {
             hasSlashCommand={hasSlashCommand}
             latestTotalTokens={latestTotalTokens}
             maxInputTokens={maxInputTokens}
+            isGoalActive={isGoalActive}
+            goalElapsed={goalElapsed}
           />
         </>
       )}

package/src/components/InputBox.tsx

@@ -1,4 +1,4 @@
-import React, { useEffect } from "react";
+import React, { useEffect, useRef, useCallback } from "react";
 import { Box, Text } from "ink";
 import { useInput } from "ink";
 import { FileSelector } from "./FileSelector.js";
@@ -12,6 +12,7 @@ import { StatusCommand } from "./StatusCommand.js";
 import { LoginCommand } from "./LoginCommand.js";
 import { PluginManagerShell } from "./PluginManagerShell.js";
 import { ModelSelector } from "./ModelSelector.js";
+import { WorkflowManager } from "./WorkflowManager.js";
 import { StatusLine } from "./StatusLine.js";
 import { BtwDisplay } from "./BtwDisplay.js";
 import { useInputManager } from "../hooks/useInputManager.js";
@@ -47,6 +48,9 @@ export interface InputBoxProps {
   // Token usage
   latestTotalTokens?: number;
   maxInputTokens?: number;
+  // Goal state
+  isGoalActive?: boolean;
+  goalElapsed?: string;
 }
 
 export const InputBox: React.FC<InputBoxProps> = ({
@@ -59,6 +63,8 @@ export const InputBox: React.FC<InputBoxProps> = ({
   hasSlashCommand = () => false,
   latestTotalTokens = 0,
   maxInputTokens = 128000,
+  isGoalActive,
+  goalElapsed,
 }) => {
   const {
     permissionMode: chatPermissionMode,
@@ -74,8 +80,23 @@ export const InputBox: React.FC<InputBoxProps> = ({
     configuredModels,
     setModel,
     recreateAgent,
+    recallQueuedMessage,
+    queuedMessages,
   } = useChat();
 
+  // Ref to hold setInputText so queue callbacks can access it before useInputManager returns
+  const setInputTextRef = useRef<(text: string) => void>(() => {});
+
+  const hasQueuedMessages = (queuedMessages?.length ?? 0) > 0;
+
+  const onRecallQueuedMessage = useCallback(() => {
+    const msg = recallQueuedMessage();
+    if (msg) {
+      const prefix = msg.type === "bang" ? "!" : "";
+      setInputTextRef.current(prefix + msg.content);
+    }
+  }, [recallQueuedMessage]);
+
   // Input manager with all input state and functionality (including images)
   const {
     inputText,
@@ -110,6 +131,7 @@ export const InputBox: React.FC<InputBoxProps> = ({
     showLoginCommand,
     showPluginManager,
     showModelSelector,
+    showWorkflowManager,
     setShowBackgroundTaskManager,
     setShowMcpManager,
     setShowRewindManager,
@@ -118,6 +140,7 @@ export const InputBox: React.FC<InputBoxProps> = ({
     setShowLoginCommand,
     setShowPluginManager,
     setShowModelSelector,
+    setShowWorkflowManager,
     // Permission mode
     permissionMode,
     setPermissionMode,
@@ -127,6 +150,8 @@ export const InputBox: React.FC<InputBoxProps> = ({
     handleInput,
     // Manager ready state
     isManagerReady,
+    // Direct state setters
+    setInputText,
   } = useInputManager({
     onSendMessage: sendMessage,
     onAskBtw: askBtw,
@@ -137,8 +162,15 @@ export const InputBox: React.FC<InputBoxProps> = ({
     sessionId,
     workdir: workingDirectory,
     getFullMessageThread,
+    hasQueuedMessages,
+    onRecallQueuedMessage,
   });
 
+  // Keep setInputText ref updated for queue callbacks
+  useEffect(() => {
+    setInputTextRef.current = setInputText;
+  }, [setInputText]);
+
   // Sync permission mode from useChat to InputManager
   useEffect(() => {
     setPermissionMode(chatPermissionMode);
@@ -157,7 +189,8 @@ export const InputBox: React.FC<InputBoxProps> = ({
       showPluginManager ||
       showModelSelector ||
       showBackgroundTaskManager ||
-      showMcpManager
+      showMcpManager ||
+      showWorkflowManager
     ) {
       return;
     }
@@ -291,13 +324,18 @@ export const InputBox: React.FC<InputBoxProps> = ({
         />
       )}
 
+      {showWorkflowManager && (
+        <WorkflowManager onCancel={() => setShowWorkflowManager(false)} />
+      )}
+
       {showBackgroundTaskManager ||
         showMcpManager ||
         showRewindManager ||
         showHelp ||
         showStatusCommand ||
         showLoginCommand ||
-        showPluginManager || (
+        showPluginManager ||
+        showWorkflowManager || (
           <Box flexDirection="column">
             <Box
               borderStyle="single"
@@ -330,6 +368,8 @@ export const InputBox: React.FC<InputBoxProps> = ({
               permissionMode={permissionMode}
               isShellCommand={isShellCommand}
               isBtwActive={btwState.isActive}
+              isGoalActive={isGoalActive}
+              goalElapsed={goalElapsed}
               latestTotalTokens={latestTotalTokens}
               maxInputTokens={maxInputTokens}
             />

package/src/components/LoadingIndicator.tsx

@@ -5,6 +5,7 @@ export interface LoadingIndicatorProps {
   isLoading?: boolean;
   isCommandRunning?: boolean;
   isCompacting?: boolean;
+  isGoalEvaluating?: boolean;
   latestTotalTokens?: number;
 }
 
@@ -12,11 +13,12 @@ export const LoadingIndicator = ({
   isLoading = false,
   isCommandRunning = false,
   isCompacting = false,
+  isGoalEvaluating = false,
   latestTotalTokens = 0,
 }: LoadingIndicatorProps) => {
   return (
     <Box flexDirection="column">
-      {isLoading && !isCompacting && (
+      {isLoading && !isCompacting && !isGoalEvaluating && (
         <Box>
           <Text color="yellow">✻ AI is thinking... </Text>
           {latestTotalTokens > 0 && (
@@ -49,6 +51,7 @@ export const LoadingIndicator = ({
       {isCompacting && (
         <Text color="magenta">✻ Compacting message history...</Text>
       )}
+      {isGoalEvaluating && <Text color="cyan">✻ Evaluating goal...</Text>}
     </Box>
   );
 };

package/src/components/QueuedMessageList.tsx

@@ -18,15 +18,19 @@ export const QueuedMessageList: React.FC = () => {
         const displayText = prefix + (content || (hasImages ? "[Images]" : ""));
 
         return (
-          <Box key={index}>
+          <Box key={msg.id ?? index}>
+            <Text color="gray">[{index + 1}] </Text>
             <Text color="gray" italic>
-              {displayText.length > 60
-                ? `${displayText.substring(0, 57)}...`
+              {displayText.length > 55
+                ? `${displayText.substring(0, 52)}...`
                 : displayText}
             </Text>
           </Box>
         );
       })}
+      <Text color="gray" dimColor>
+        {"  "}↑ recall
+      </Text>
     </Box>
   );
 };

package/src/components/StatusLine.tsx

@@ -5,6 +5,8 @@ export interface StatusLineProps {
   permissionMode: string;
   isShellCommand: boolean;
   isBtwActive: boolean;
+  isGoalActive?: boolean;
+  goalElapsed?: string;
   latestTotalTokens?: number;
   maxInputTokens?: number;
 }
@@ -13,6 +15,8 @@ export const StatusLine: React.FC<StatusLineProps> = ({
   permissionMode,
   isShellCommand,
   isBtwActive,
+  isGoalActive,
+  goalElapsed,
   latestTotalTokens = 0,
   maxInputTokens = 128000,
 }) => {
@@ -35,22 +39,30 @@ export const StatusLine: React.FC<StatusLineProps> = ({
           Shell: <Text color="yellow">Run shell command</Text>
         </Text>
       ) : (
-        <Text color="gray">
-          Mode:{" "}
-          <Text
-            color={
-              permissionMode === "plan"
-                ? "yellow"
-                : permissionMode === "bypassPermissions"
-                  ? "red"
-                  : "cyan"
-            }
-            bold={permissionMode === "bypassPermissions"}
-          >
-            {permissionMode}
-          </Text>{" "}
-          (Shift+Tab to cycle)
-        </Text>
+        <Box>
+          {isGoalActive && (
+            <Text color="gray">
+              <Text color="cyan">◎ /goal</Text> active{" "}
+              {goalElapsed && <Text>({goalElapsed})</Text>} |{" "}
+            </Text>
+          )}
+          <Text color="gray">
+            Mode:{" "}
+            <Text
+              color={
+                permissionMode === "plan"
+                  ? "yellow"
+                  : permissionMode === "bypassPermissions"
+                    ? "red"
+                    : "cyan"
+              }
+              bold={permissionMode === "bypassPermissions"}
+            >
+              {permissionMode}
+            </Text>{" "}
+            (Shift+Tab to cycle)
+          </Text>
+        </Box>
       )}
       {percentage > 0 && (
         <Text color={contextColor}>{percentage}% context</Text>