@astra-code/astra-ai 0.1.2 → 0.1.4

package/src/app/App.tsx

@@ -34,6 +34,7 @@ type ToolCard = {
   toolName: string;
   locality: "LOCAL" | "REMOTE";
   summary: string;
+  count?: number;
   path?: string;
   snippetLines?: string[];
 };
@@ -58,6 +59,7 @@ const ASTRA_ASCII = `
 ###     ###  ########     ###     ###    ### ###     ###       ########   ########  #########  ########## 
 by Sean Donovan
 `;
+const ASTRA_COMPACT = "ASTRA CODE";
 
 const WELCOME_WIDTH = 96;
 
@@ -74,6 +76,9 @@ const FOUNDER_WELCOME = centerLine("Welcome to Astra from Astra CEO & Founder, S
 
 const HISTORY_SETTINGS_URL = "https://astra-web-builder.vercel.app/settings";
 const VOICE_SILENCE_MS = Number(process.env.ASTRA_VOICE_SILENCE_MS ?? "3000");
+const VOICE_MIN_CHARS = Number(process.env.ASTRA_VOICE_MIN_CHARS ?? "4");
+const VOICE_DUPLICATE_WINDOW_MS = Number(process.env.ASTRA_VOICE_DUPLICATE_WINDOW_MS ?? "10000");
+const VOICE_NOISE_WORDS = new Set(["you", "yes", "yeah", "yep", "ok", "okay", "uh", "um", "hmm"]);
 const TOOL_SNIPPET_LINES = 6;
 const NOISY_EVENT_TYPES = new Set([
   "timing",
@@ -190,10 +195,10 @@ const extractAssistantText = (event: AgentEvent): string | null => {
   return null;
 };
 
-const DIVIDER =
-  "────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────";
-
 const LABEL_WIDTH = 10;
+const HEADER_PATH_MAX = Number(process.env.ASTRA_HEADER_PATH_MAX ?? "42");
+const MIN_DIVIDER = 64;
+const MAX_DIVIDER = 120;
 
 type MessageStyle = {
   label: string;
@@ -238,14 +243,67 @@ const normalizeAssistantText = (input: string): string => {
     return "";
   }
 
-  return input
+  let out = input
     // Remove control chars but preserve newlines/tabs.
     .replace(/[^\x09\x0A\x0D\x20-\x7E]/g, "")
+    .replace(/([a-z0-9/])([A-Z])/g, "$1 $2")
+    .replace(/([.!?])([A-Za-z])/g, "$1 $2")
+    .replace(/([a-z])(\u2022)/g, "$1\n$2")
+    .replace(/([^\n])(Summary:|Next:|Tests:)/g, "$1\n\n$2")
+    .replace(/([A-Za-z0-9_/-]+)\.\s+md\b/g, "$1.md")
+    .replace(/(\bnpm audit)(All tasks complete\.)/gi, "$1\n\n$2")
+    .replace(/([.!?])\s*(Summary:|Next:|Tests:)/g, "$1\n\n$2")
+    .replace(/([^\n])(\u2022\s)/g, "$1\n$2")
     // Trim trailing spaces line-by-line.
     .replace(/[ \t]+$/gm, "")
     // Normalize excessive blank lines.
-    .replace(/\n{3,}/g, "\n\n")
-    .trim();
+    .replace(/\n{3,}/g, "\n\n");
+
+  const paragraphs = out
+    .split(/\n{2,}/)
+    .map((p) => p.trim())
+    .filter(Boolean);
+  const seen = new Set<string>();
+  const deduped: string[] = [];
+  for (const para of paragraphs) {
+    const key = para.toLowerCase().replace(/\s+/g, " ");
+    if (para.length > 50 && seen.has(key)) {
+      continue;
+    }
+    seen.add(key);
+    deduped.push(para);
+  }
+  return deduped.join("\n\n").trim();
+};
+
+const summarizeToolResult = (toolName: string, data: Record<string, unknown>, success: boolean): string => {
+  if (!success) {
+    return `${toolName} failed`;
+  }
+  const path = typeof data.path === "string" ? data.path : "";
+  const totalLines = typeof data.total_lines === "number" ? data.total_lines : null;
+  if (toolName === "view_file") {
+    if (totalLines !== null && path) {
+      return `Read ${totalLines} lines of <${path}>`;
+    }
+    if (path) {
+      return `Read <${path}>`;
+    }
+  }
+  if (toolName === "list_directory") {
+    const dir = path || ".";
+    if (totalLines !== null) {
+      return `Listed ${totalLines} entries in <${dir}>`;
+    }
+    return `Listed <${dir}>`;
+  }
+  if (toolName === "semantic_search") {
+    return "Searched codebase context";
+  }
+  if (toolName === "search_files") {
+    return totalLines !== null ? `Found ${totalLines} matching paths` : "Searched file paths";
+  }
+  return `${toolName} completed`;
 };
 
 type InlineToken = {text: string; bold?: boolean; italic?: boolean; code?: boolean};
@@ -507,6 +565,20 @@ const renderMarkdownContent = (text: string, baseColor: string, keyPrefix: strin
 
 export const AstraApp = (): React.JSX.Element => {
   const workspaceRoot = useMemo(() => process.cwd(), []);
+  const [terminalWidth, setTerminalWidth] = useState<number>(() => process.stdout.columns || MAX_DIVIDER);
+  useEffect(() => {
+    const updateWidth = (): void => {
+      setTerminalWidth(process.stdout.columns || MAX_DIVIDER);
+    };
+    process.stdout.on("resize", updateWidth);
+    return () => {
+      process.stdout.off("resize", updateWidth);
+    };
+  }, []);
+  const dividerWidth = Math.max(MIN_DIVIDER, Math.min(MAX_DIVIDER, (terminalWidth ?? MAX_DIVIDER) - 2));
+  const divider = "─".repeat(dividerWidth);
+  const brand = dividerWidth < 96 ? ASTRA_COMPACT : ASTRA_ASCII;
+  const welcomeLine = dividerWidth < 96 ? "Welcome to Astra" : FOUNDER_WELCOME;
   const backend = useMemo(() => new BackendClient(), []);
   const {exit} = useApp();
 
@@ -565,8 +637,10 @@ export const AstraApp = (): React.JSX.Element => {
   const [streamingText, setStreamingText] = useState("");
   const [voiceEnabled, setVoiceEnabled] = useState(false);
   const [voiceListening, setVoiceListening] = useState(false);
+  const [voicePreparing, setVoicePreparing] = useState(false);
   const [voiceWaitingForSilence, setVoiceWaitingForSilence] = useState(false);
   const [voiceQueuedPrompt, setVoiceQueuedPrompt] = useState<string | null>(null);
+  const [toolFeedMode, setToolFeedMode] = useState<"compact" | "expanded">("compact");
   const [historyOpen, setHistoryOpen] = useState(false);
   const [historyMode, setHistoryMode] = useState<HistoryMode>("picker");
   const [historyPickerIndex, setHistoryPickerIndex] = useState(0);
@@ -576,6 +650,8 @@ export const AstraApp = (): React.JSX.Element => {
   const [historyIndex, setHistoryIndex] = useState(0);
   const liveVoiceRef = useRef<LiveTranscriptionController | null>(null);
   const voiceSilenceTimerRef = useRef<NodeJS.Timeout | null>(null);
+  const lastVoicePromptRef = useRef<{text: string; at: number} | null>(null);
+  const lastIgnoredVoiceRef = useRef<{text: string; at: number} | null>(null);
   const fileEditBuffersRef = useRef<Map<string, {path: string; chunks: string[]; toolName: string | undefined}>>(new Map());
   const isSuperAdmin = user?.role === "super_admin";
 
@@ -584,7 +660,28 @@ export const AstraApp = (): React.JSX.Element => {
   }, []);
 
   const pushToolCard = useCallback((card: ToolCard) => {
-    setMessages((prev) => [...prev, {kind: "tool", text: card.summary, card} satisfies UiMessage].slice(-300));
+    setMessages((prev) => {
+      const nextEntry = {kind: "tool", text: card.summary, card} satisfies UiMessage;
+      const last = prev[prev.length - 1];
+      if (
+        last &&
+        last.kind === "tool" &&
+        last.card &&
+        last.card.toolName === card.toolName &&
+        last.card.kind === card.kind &&
+        last.card.summary === card.summary &&
+        last.card.locality === card.locality
+      ) {
+        const updated = [...prev];
+        const existingCount = Math.max(1, Number(last.card.count ?? 1));
+        updated[updated.length - 1] = {
+          ...last,
+          card: {...last.card, count: existingCount + 1}
+        };
+        return updated.slice(-300);
+      }
+      return [...prev, nextEntry].slice(-300);
+    });
   }, []);
 
   const filteredHistory = useMemo(() => {
@@ -659,11 +756,13 @@ export const AstraApp = (): React.JSX.Element => {
     }
     const controller = liveVoiceRef.current;
     if (!controller) {
+      setVoicePreparing(false);
       setVoiceWaitingForSilence(false);
       return;
     }
     liveVoiceRef.current = null;
     await controller.stop();
+    setVoicePreparing(false);
     setVoiceListening(false);
     setVoiceWaitingForSilence(false);
   }, []);
@@ -673,19 +772,29 @@ export const AstraApp = (): React.JSX.Element => {
       return;
     }
     setVoiceEnabled(true);
-    setVoiceListening(true);
+    setVoicePreparing(true);
+    setVoiceListening(false);
     setVoiceWaitingForSilence(false);
     if (announce) {
-      pushMessage("system", "Voice input started. Speak now…");
+      pushMessage("system", "Dictation armed. Preparing microphone...");
     }
     liveVoiceRef.current = startLiveTranscription({
       onPartial: (text) => {
+        setVoicePreparing(false);
+        setVoiceListening(true);
         setPrompt(text);
         if (voiceSilenceTimerRef.current) {
           clearTimeout(voiceSilenceTimerRef.current);
         }
         const candidate = text.trim();
         if (!candidate) {
+          setVoiceWaitingForSilence(false);
+          return;
+        }
+        const normalized = candidate.toLowerCase();
+        const isLikelyNoise = normalized.length < VOICE_MIN_CHARS || VOICE_NOISE_WORDS.has(normalized);
+        if (isLikelyNoise) {
+          setVoiceWaitingForSilence(false);
           return;
         }
         setVoiceWaitingForSilence(true);
@@ -701,10 +810,13 @@ export const AstraApp = (): React.JSX.Element => {
         }
         setPrompt(text);
         liveVoiceRef.current = null;
+        setVoicePreparing(false);
         setVoiceListening(false);
         setVoiceWaitingForSilence(false);
       },
       onError: (error) => {
+        setVoicePreparing(false);
+        setVoiceListening(false);
         setVoiceWaitingForSilence(false);
         pushMessage("error", `Voice transcription error: ${error.message}`);
       }
@@ -934,6 +1046,8 @@ export const AstraApp = (): React.JSX.Element => {
       }
 
       const authSession = data as AuthSession;
+      // Set token immediately so follow-up profile/session calls are authenticated.
+      backend.setAuthSession(authSession);
       const hydrated = await backend.getUserProfile(authSession).catch(() => authSession);
       saveSession(hydrated);
       backend.setAuthSession(hydrated);
@@ -1195,6 +1309,26 @@ export const AstraApp = (): React.JSX.Element => {
 
       if (event.type === "credits_exhausted") {
         setCreditsRemaining(0);
+        if (voiceEnabled) {
+          await stopLiveVoice();
+          setVoiceEnabled(false);
+          pushMessage("system", "Dictation paused: credits exhausted. Recharge, then run /dictate on.");
+          pushMessage("system", "");
+        }
+      }
+
+      if (event.type === "continuation_check") {
+        const recommendation =
+          typeof event.recommendation === "string" && event.recommendation
+            ? event.recommendation
+            : "Please narrow the scope and continue with a specific target.";
+        const streak = Number(event.consecutive_read_only_iterations ?? 0);
+        const threshold = Number(event.threshold ?? 0);
+        pushMessage(
+          "system",
+          `Exploration paused (${streak}/${threshold} read-only turns). ${recommendation}`
+        );
+        return null;
       }
 
       if (!isSuperAdmin && NOISY_EVENT_TYPES.has(event.type)) {
@@ -1202,14 +1336,6 @@ export const AstraApp = (): React.JSX.Element => {
       }
 
       if (!isSuperAdmin && event.type === "tool_start") {
-        const tool = event.tool as {name?: string} | undefined;
-        const name = tool?.name ?? "tool";
-        pushToolCard({
-          kind: "start",
-          toolName: name,
-          locality: "REMOTE",
-          summary: `${name} is running...`
-        });
         return null;
       }
 
@@ -1223,11 +1349,23 @@ export const AstraApp = (): React.JSX.Element => {
           } else if (event.type === "tool_result") {
             const mark = event.success ? "completed" : "failed";
             const toolName = typeof event.tool_name === "string" ? event.tool_name : "tool";
+            const payload = (event.data ?? {}) as Record<string, unknown>;
+            const resultType = typeof event.result_type === "string" ? event.result_type : "";
+            const alreadyRepresented =
+              resultType === "file_create" ||
+              resultType === "file_edit" ||
+              resultType === "file_delete" ||
+              toolName === "start_preview" ||
+              toolName === "capture_screenshot";
+            if (alreadyRepresented) {
+              return null;
+            }
+            const summary = summarizeToolResult(toolName, payload, Boolean(event.success));
             pushToolCard({
               kind: event.success ? "success" : "error",
               toolName,
-              locality: ((event.data ?? {}) as Record<string, unknown>).local === true ? "LOCAL" : "REMOTE",
-              summary: `${toolName} ${mark}`
+              locality: payload.local === true ? "LOCAL" : "REMOTE",
+              summary: event.success ? summary : `${toolName} ${mark}`
             });
           }
         }
@@ -1239,7 +1377,7 @@ export const AstraApp = (): React.JSX.Element => {
       }
       return null;
     },
-    [backend, deleteLocalFile, isSuperAdmin, pushMessage, pushToolCard, writeLocalFile]
+    [backend, deleteLocalFile, isSuperAdmin, pushMessage, pushToolCard, stopLiveVoice, voiceEnabled, writeLocalFile]
   );
 
   const sendPrompt = useCallback(
@@ -1252,20 +1390,32 @@ export const AstraApp = (): React.JSX.Element => {
       if (text === "/help") {
         pushMessage(
           "system",
-          "/new  /history  /voice  /voice on|off|status  /settings  /settings model <id>  /logout  /exit"
+          "/new  /history  /dictate  /dictate on|off|status  /tools compact|expanded  /settings  /settings model <id>  /logout  /exit"
         );
         pushMessage("system", "");
         return;
       }
+      if (text === "/tools compact") {
+        setToolFeedMode("compact");
+        pushMessage("system", "Tool feed set to compact.");
+        pushMessage("system", "");
+        return;
+      }
+      if (text === "/tools expanded") {
+        setToolFeedMode("expanded");
+        pushMessage("system", "Tool feed set to expanded.");
+        pushMessage("system", "");
+        return;
+      }
       if (text === "/settings") {
         pushMessage(
           "system",
-          `Settings: mode=${runtimeMode} scope=${workspaceRoot} model=${activeModel} provider=${getProviderForModel(activeModel)} voice=${voiceEnabled ? "on" : "off"} listening=${voiceListening ? "yes" : "no"} silence_ms=${VOICE_SILENCE_MS} role=${user.role ?? "user"} client_id=${getDefaultClientId()} backend=${getBackendUrl()}`
+          `Settings: mode=${runtimeMode} scope=${workspaceRoot} model=${activeModel} provider=${getProviderForModel(activeModel)} dictate=${voiceEnabled ? "on" : "off"} listening=${voiceListening ? "yes" : "no"} tool_feed=${toolFeedMode} silence_ms=${VOICE_SILENCE_MS} role=${user.role ?? "user"} client_id=${getDefaultClientId()} backend=${getBackendUrl()}`
         );
         pushMessage("system", "");
         return;
       }
-      if (text === "/voice") {
+      if (text === "/dictate" || text === "/voice") {
         if (!voiceEnabled) {
           setVoiceEnabled(true);
           startLiveVoice(true);
@@ -1273,7 +1423,7 @@ export const AstraApp = (): React.JSX.Element => {
         }
         pushMessage(
           "system",
-          `Voice input is on${voiceListening ? " (currently listening)" : ""}. Use /voice off to disable.`
+          `Dictation is on${voiceListening ? " (currently listening)" : ""}. Use /dictate off to disable.`
         );
         pushMessage("system", "");
         return;
@@ -1298,34 +1448,34 @@ export const AstraApp = (): React.JSX.Element => {
         await openHistory();
         return;
       }
-      if (text === "/voice status") {
+      if (text === "/dictate status" || text === "/voice status") {
         pushMessage(
           "system",
-          `Voice input is ${voiceEnabled ? "on" : "off"}${voiceListening ? " (live transcription active)" : ""}${voiceWaitingForSilence ? " (waiting for silence to auto-send)" : ""}.`
+          `Dictation is ${voiceEnabled ? "on" : "off"}${voicePreparing ? " (preparing mic)" : ""}${voiceListening ? " (listening)" : ""}${voiceWaitingForSilence ? " (waiting for silence to auto-send)" : ""}.`
         );
         pushMessage("system", "");
         return;
       }
-      if (text === "/voice on") {
+      if (text === "/dictate on" || text === "/voice on") {
         setVoiceEnabled(true);
         startLiveVoice(true);
-        pushMessage("system", `Voice input enabled. Auto-send after ${Math.round(VOICE_SILENCE_MS / 1000)}s silence.`);
+        pushMessage("system", `Dictation enabled. Auto-send after ${Math.round(VOICE_SILENCE_MS / 1000)}s silence.`);
         pushMessage("system", "");
         return;
       }
-      if (text === "/voice off") {
+      if (text === "/dictate off" || text === "/voice off") {
         await stopLiveVoice();
         setVoiceEnabled(false);
-        pushMessage("system", "Voice input disabled.");
+        pushMessage("system", "Dictation disabled.");
         pushMessage("system", "");
         return;
       }
-      if (text === "/voice input") {
+      if (text === "/dictate input" || text === "/voice input") {
         const transcribed = await transcribeOnce();
         if (!transcribed) {
           pushMessage(
             "error",
-            "No speech transcribed. Ensure you're signed in and that mic capture works (optional ASTRA_STT_CAPTURE_COMMAND)."
+            "No speech transcribed. Ensure you're signed in and your microphone capture works (optional ASTRA_STT_CAPTURE_COMMAND)."
           );
           return;
         }
@@ -1397,6 +1547,9 @@ export const AstraApp = (): React.JSX.Element => {
               localActionConfirmed = true;
             }
           }
+          if (event.type === "done") {
+            break;
+          }
           const piece = await handleEvent(event, activeSessionId);
           if (piece) {
             assistant += piece;
@@ -1436,9 +1589,11 @@ export const AstraApp = (): React.JSX.Element => {
       startLiveVoice,
       stopLiveVoice,
       thinking,
+      toolFeedMode,
       user,
       voiceEnabled,
       voiceListening,
+      voicePreparing,
       voiceWaitingForSilence,
       workspaceRoot
     ]
@@ -1453,7 +1608,28 @@ export const AstraApp = (): React.JSX.Element => {
     if (!queued) {
       return;
     }
-    pushMessage("system", `Voice input: ${queued}`);
+    const normalizedQueued = queued.toLowerCase();
+    const last = lastVoicePromptRef.current;
+    const isLikelyNoise = normalizedQueued.length < VOICE_MIN_CHARS || VOICE_NOISE_WORDS.has(normalizedQueued);
+    const isFastDuplicate =
+      last !== null &&
+      last.text === normalizedQueued &&
+      Date.now() - last.at <= VOICE_DUPLICATE_WINDOW_MS;
+    if (isLikelyNoise || isFastDuplicate) {
+      const now = Date.now();
+      const lastIgnored = lastIgnoredVoiceRef.current;
+      const shouldLogIgnored =
+        !lastIgnored ||
+        lastIgnored.text !== normalizedQueued ||
+        now - lastIgnored.at > VOICE_DUPLICATE_WINDOW_MS;
+      if (shouldLogIgnored) {
+        pushMessage("system", `Ignored likely-noise dictation input: "${queued}"`);
+        lastIgnoredVoiceRef.current = {text: normalizedQueued, at: now};
+      }
+      return;
+    }
+    lastVoicePromptRef.current = {text: normalizedQueued, at: Date.now()};
+    pushMessage("system", `Dictation input: ${queued}`);
     setPrompt("");
     void sendPrompt(queued);
   }, [pushMessage, sendPrompt, thinking, user, voiceQueuedPrompt]);
@@ -1498,8 +1674,8 @@ export const AstraApp = (): React.JSX.Element => {
   if (booting) {
     return (
       <Box flexDirection="column">
-        <Text color="#7aa2ff">{ASTRA_ASCII}</Text>
-        <Text color="#8ea1bd">{FOUNDER_WELCOME}</Text>
+        <Text color="#7aa2ff">{brand}</Text>
+        <Text color="#8ea1bd">{welcomeLine}</Text>
         <Text color="#8aa2c9">
           <Spinner type="dots12" /> Booting Astra terminal shell...
         </Text>
@@ -1510,8 +1686,8 @@ export const AstraApp = (): React.JSX.Element => {
   if (bootError) {
     return (
       <Box flexDirection="column">
-        <Text color="#7aa2ff">{ASTRA_ASCII}</Text>
-        <Text color="#8ea1bd">{FOUNDER_WELCOME}</Text>
+        <Text color="#7aa2ff">{brand}</Text>
+        <Text color="#8ea1bd">{welcomeLine}</Text>
         <Text color="red">{bootError}</Text>
       </Box>
     );
@@ -1520,8 +1696,8 @@ export const AstraApp = (): React.JSX.Element => {
   if (!user) {
     return (
       <Box flexDirection="column">
-        <Text color="#7aa2ff">{ASTRA_ASCII}</Text>
-        <Text color="#8ea1bd">{FOUNDER_WELCOME}</Text>
+        <Text color="#7aa2ff">{brand}</Text>
+        <Text color="#8ea1bd">{welcomeLine}</Text>
         <Text color="#b8c8ff">
           Astra terminal AI pair programmer ({loginMode === "login" ? "Sign in" : "Create account"})
         </Text>
@@ -1565,16 +1741,16 @@ export const AstraApp = (): React.JSX.Element => {
     const selected = filteredHistory[historyIndex];
     return (
       <Box flexDirection="column">
-        <Text color="#7aa2ff">{ASTRA_ASCII}</Text>
-        <Text color="#8ea1bd">{FOUNDER_WELCOME}</Text>
-        <Text color="#2a3a50">{DIVIDER}</Text>
+        <Text color="#7aa2ff">{brand}</Text>
+        <Text color="#8ea1bd">{welcomeLine}</Text>
+        <Text color="#2a3a50">{divider}</Text>
         {historyMode === "picker" ? (
           <Box flexDirection="column">
             <Box flexDirection="row" justifyContent="space-between">
               <Text color="#dce9ff">History Picker</Text>
               <Text color="#5a7a9a">Esc close · Enter select</Text>
             </Box>
-            <Text color="#2a3a50">{DIVIDER}</Text>
+            <Text color="#2a3a50">{divider}</Text>
             <Box marginTop={1} flexDirection="column">
               <Box flexDirection="row">
                 <Text color={historyPickerIndex === 0 ? "#dce9ff" : "#7a9bba"}>
@@ -1587,7 +1763,7 @@ export const AstraApp = (): React.JSX.Element => {
                 </Text>
               </Box>
             </Box>
-            <Text color="#2a3a50">{DIVIDER}</Text>
+            <Text color="#2a3a50">{divider}</Text>
             <Text color="#5a7a9a">Credit usage history opens: {HISTORY_SETTINGS_URL}</Text>
           </Box>
         ) : (
@@ -1600,7 +1776,7 @@ export const AstraApp = (): React.JSX.Element => {
               <Text color="#4a6070">search </Text>
               <TextInput value={historyQuery} onChange={setHistoryQuery} placeholder="Filter chats..." />
             </Box>
-            <Text color="#2a3a50">{DIVIDER}</Text>
+            <Text color="#2a3a50">{divider}</Text>
             {historyLoading ? (
               <Text color="#8aa2c9">
                 <Spinner type="dots12" /> Loading chat history...
@@ -1626,7 +1802,7 @@ export const AstraApp = (): React.JSX.Element => {
                 })}
               </Box>
             )}
-            <Text color="#2a3a50">{DIVIDER}</Text>
+            <Text color="#2a3a50">{divider}</Text>
             <Box flexDirection="row" justifyContent="space-between">
               <Text color="#5a7a9a">
                 Page {historyPage + 1} / {historyPageCount}
@@ -1641,57 +1817,53 @@ export const AstraApp = (): React.JSX.Element => {
 
   return (
     <Box flexDirection="column">
-      <Text color="#7aa2ff">{ASTRA_ASCII}</Text>
-      <Text color="#8ea1bd">{FOUNDER_WELCOME}</Text>
+      <Text color="#7aa2ff">{brand}</Text>
+      <Text color="#8ea1bd">{welcomeLine}</Text>
       {/*<Text color="#9aa8c1">Astra Code · {process.cwd()}</Text>*/}
-      <Text color="#2a3a50">{DIVIDER}</Text>
-      <Box flexDirection="row" gap={2}>
-        <Box flexDirection="row">
-          <Text color="#4a6070">mode </Text>
-          <Text color="#9ad5ff">{runtimeMode}</Text>
-        </Box>
-        <Box flexDirection="row">
-          <Text color="#4a6070">scope </Text>
-          <Text color="#7a9bba">{workspaceRoot}</Text>
-        </Box>
-        <Box flexDirection="row">
-          <Text color="#4a6070">provider </Text>
-          <Text color="#9ad5ff">{getProviderForModel(activeModel)}</Text>
-        </Box>
-        <Box flexDirection="row">
-          <Text color="#4a6070">credits </Text>
-          <Text color={creditsRemaining !== null && creditsRemaining < 50 ? "#ffaa55" : "#9ad5ff"}>
-            {creditsRemaining ?? "--"}
-            {lastCreditCost !== null ? (
-              <Text color="#5a7a9a"> (-{lastCreditCost})</Text>
-            ) : null}
-          </Text>
-        </Box>
-        <Box flexDirection="row">
-          <Text color="#4a6070">model </Text>
-          <Text color="#9ad5ff">{activeModel}</Text>
-        </Box>
-        <Box flexDirection="row">
-          <Text color="#4a6070">voice </Text>
-          <Text color={voiceEnabled ? "#9ad5ff" : "#5a7a9a"}>
-            {voiceEnabled ? (voiceListening ? (voiceWaitingForSilence ? "on/waiting" : "on/listening") : "on") : "off"}
-          </Text>
-        </Box>
-      </Box>
-      <Text color="#2a3a50">{DIVIDER}</Text>
-      <Text color="#3a5068">/help  /new  /history  /voice  /voice on|off|status  /settings  /logout  /exit</Text>
-      <Text color="#2a3a50">{DIVIDER}</Text>
+      <Text color="#2a3a50">{divider}</Text>
+      <Text color="#7a9bba">
+        {`mode ${runtimeMode} · provider ${getProviderForModel(activeModel)} · model ${activeModel} · credits ${
+          creditsRemaining ?? "--"
+        }${lastCreditCost !== null ? ` (-${lastCreditCost})` : ""}`}
+      </Text>
+      <Text color="#6c88a8">
+        {`scope ${
+          workspaceRoot.length > HEADER_PATH_MAX ? `…${workspaceRoot.slice(-(HEADER_PATH_MAX - 1))}` : workspaceRoot
+        } · dictate ${
+          voiceEnabled
+            ? voicePreparing
+              ? "on/preparing"
+              : voiceListening
+              ? voiceWaitingForSilence
+                ? "on/waiting"
+                : "on/listening"
+              : "on/standby"
+            : "off"
+        }`}
+      </Text>
+      <Text color="#2a3a50">{divider}</Text>
+      <Text color="#3a5068">/help  /new  /history  /dictate  /dictate on|off|status</Text>
+      <Text color="#3a5068">/tools compact|expanded  /settings  /logout  /exit</Text>
+      <Text color="#2a3a50">{divider}</Text>
       <Box flexDirection="column" marginTop={1}>
         {messages.map((message, index) => {
+          const prev = index > 0 ? messages[index - 1] : null;
           const style = styleForKind(message.kind);
           const paddedLabel = style.label.padEnd(LABEL_WIDTH, " ");
           const isSpacing = message.text === "" && message.kind === "system";
+          const needsGroupGap =
+            Boolean(prev) &&
+            prev?.kind !== "system" &&
+            message.kind !== "system" &&
+            prev?.kind !== message.kind &&
+            (message.kind === "assistant" || message.kind === "tool");
           if (isSpacing) {
             return <Box key={`${index}-spacer`} marginTop={0}><Text> </Text></Box>;
           }
 
           if (message.kind === "tool" && message.card && !isSuperAdmin) {
             const card = message.card;
+            const localityLabel = card.locality === "LOCAL" ? "local" : "cloud";
             const icon =
               card.kind === "error"
                 ? "✕"
@@ -1721,38 +1893,50 @@ export const AstraApp = (): React.JSX.Element => {
                 ? "#9ad5ff"
                 : "#9bc5ff";
             return (
-              <Box key={`${index}-${message.kind}`} flexDirection="row">
-                <Text color={style.labelColor}>{paddedLabel}</Text>
-                <Box flexDirection="column">
-                  <Text color={accent}>
-                    {icon} {card.summary} <Text color="#5a7a9a">[{card.locality}]</Text>
-                  </Text>
-                  {card.path ? <Text color="#6c88a8">path: {card.path}</Text> : null}
-                  {(card.snippetLines ?? []).slice(0, TOOL_SNIPPET_LINES).map((line, idx) => (
-                    <Text key={`${index}-snippet-${idx}`} color="#8ea1bd">
-                      {line}
+              <React.Fragment key={`${index}-${message.kind}`}>
+                {needsGroupGap ? <Text> </Text> : null}
+                <Box flexDirection="row">
+                  <Text color={style.labelColor}>{paddedLabel}</Text>
+                  <Box flexDirection="column">
+                    <Text color={accent}>
+                      {icon} {card.summary}
+                      {card.count && card.count > 1 ? <Text color="#9cb8d8"> (x{card.count})</Text> : null}
+                      <Text color="#5a7a9a"> · {localityLabel}</Text>
                     </Text>
-                  ))}
+                    {toolFeedMode === "expanded" ? (
+                      <>
+                        {card.path ? <Text color="#6c88a8">path: {card.path}</Text> : null}
+                        {(card.snippetLines ?? []).slice(0, TOOL_SNIPPET_LINES).map((line, idx) => (
+                          <Text key={`${index}-snippet-${idx}`} color="#8ea1bd">
+                            {line}
+                          </Text>
+                        ))}
+                      </>
+                    ) : null}
+                  </Box>
                 </Box>
-              </Box>
+              </React.Fragment>
             );
           }
 
           return (
-            <Box key={`${index}-${message.kind}`} flexDirection="row">
-              <Text color={style.labelColor} bold={style.bold}>
-                {paddedLabel}
-              </Text>
-              {message.kind === "assistant" ? (
-                <Box flexDirection="column">
-                  {renderMarkdownContent(message.text, style.textColor, `assistant-${index}`)}
-                </Box>
-              ) : (
-                <Text color={style.textColor} bold={style.bold && message.kind === "error"}>
-                  {message.text}
+            <React.Fragment key={`${index}-${message.kind}`}>
+              {needsGroupGap ? <Text> </Text> : null}
+              <Box flexDirection="row">
+                <Text color={style.labelColor} bold={style.bold}>
+                  {paddedLabel}
                 </Text>
-              )}
-            </Box>
+                {message.kind === "assistant" ? (
+                  <Box flexDirection="column">
+                    {renderMarkdownContent(message.text, style.textColor, `assistant-${index}`)}
+                  </Box>
+                ) : (
+                  <Text color={style.textColor} bold={style.bold && message.kind === "error"}>
+                    {message.text}
+                  </Text>
+                )}
+              </Box>
+            </React.Fragment>
           );
         })}
         {streamingText ? (
@@ -1762,7 +1946,7 @@ export const AstraApp = (): React.JSX.Element => {
           </Box>
         ) : null}
       </Box>
-      <Text color="#2a3a50">{DIVIDER}</Text>
+      <Text color="#2a3a50">{divider}</Text>
       {thinking ? (
         <Box flexDirection="row" marginTop={1}>
           <Text color="#7aa2ff">{"◆ astra".padEnd(LABEL_WIDTH, " ")}</Text>
@@ -1774,13 +1958,15 @@ export const AstraApp = (): React.JSX.Element => {
       ) : null}
       {voiceEnabled && !thinking ? (
         <Box flexDirection="row" marginTop={1}>
-          <Text color="#9ad5ff">{"🎤 voice".padEnd(LABEL_WIDTH, " ")}</Text>
-          {voiceListening && !voiceWaitingForSilence ? (
-            <Text color="#a6d9ff">🎙 listening... goblin ears activated 👂</Text>
+          <Text color="#9ad5ff">{"🎤 dictate".padEnd(LABEL_WIDTH, " ")}</Text>
+          {voicePreparing ? (
+            <Text color="#f4d58a">🟡 preparing microphone...</Text>
+          ) : voiceListening && !voiceWaitingForSilence ? (
+            <Text color="#9de3b4">🟢 listening now - speak clearly</Text>
           ) : voiceWaitingForSilence ? (
-            <Text color="#b7c4d8">⏸ waiting for silence... dramatic pause loading...</Text>
+            <Text color="#b7c4d8">⏳ speech detected - waiting for silence to send</Text>
           ) : (
-            <Text color="#6f8199">voice armed... say something when ready</Text>
+            <Text color="#6f8199">⚪ voice armed - preparing next listen window</Text>
           )}
         </Box>
       ) : null}
@@ -1797,7 +1983,7 @@ export const AstraApp = (): React.JSX.Element => {
               setPrompt(value);
             }
           }}
-          placeholder={voiceEnabled ? "Ask Astra... (voice on: auto listen + send on silence)" : "Ask Astra..."}
+          placeholder={voiceEnabled ? "Ask Astra... (dictate on: auto listen + send on silence)" : "Ask Astra..."}
         />
       </Box>
     </Box>