tide-commander 1.148.0 → 1.150.0

package/dist/assets/{web-CfvEypdU.js → web-BkrshujV.js}

@@ -1 +1 @@
-import{d8 as s}from"./main-C2zgPci-.js";import"./vendor-react--Eh9ivFN.js";import"./vendor-three-Chj50gSY.js";class l extends s{constructor(){super(...arguments),this.pending=[],this.deliveredNotifications=[],this.hasNotificationSupport=()=>{if(!("Notification"in window)||!Notification.requestPermission)return!1;if(Notification.permission!=="granted")try{new Notification("")}catch(i){if(i instanceof Error&&i.name==="TypeError")return!1}return!0}}async getDeliveredNotifications(){const i=[];for(const t of this.deliveredNotifications){const e={title:t.title,id:parseInt(t.tag),body:t.body};i.push(e)}return{notifications:i}}async removeDeliveredNotifications(i){for(const t of i.notifications){const e=this.deliveredNotifications.find(n=>n.tag===String(t.id));e==null||e.close(),this.deliveredNotifications=this.deliveredNotifications.filter(()=>!e)}}async removeAllDeliveredNotifications(){for(const i of this.deliveredNotifications)i.close();this.deliveredNotifications=[]}async createChannel(){throw this.unimplemented("Not implemented on web.")}async deleteChannel(){throw this.unimplemented("Not implemented on web.")}async listChannels(){throw this.unimplemented("Not implemented on web.")}async schedule(i){if(!this.hasNotificationSupport())throw this.unavailable("Notifications not supported in this browser.");for(const t of i.notifications)this.sendNotification(t);return{notifications:i.notifications.map(t=>({id:t.id}))}}async getPending(){return{notifications:this.pending}}async registerActionTypes(){throw this.unimplemented("Not implemented on web.")}async cancel(i){this.pending=this.pending.filter(t=>!i.notifications.find(e=>e.id===t.id))}async areEnabled(){const{display:i}=await this.checkPermissions();return{value:i==="granted"}}async changeExactNotificationSetting(){throw this.unimplemented("Not implemented on web.")}async checkExactNotificationSetting(){throw this.unimplemented("Not implemented on web.")}async requestPermissions(){if(!this.hasNotificationSupport())throw this.unavailable("Notifications not supported in this browser.");return{display:this.transformNotificationPermission(await Notification.requestPermission())}}async checkPermissions(){if(!this.hasNotificationSupport())throw this.unavailable("Notifications not supported in this browser.");return{display:this.transformNotificationPermission(Notification.permission)}}transformNotificationPermission(i){switch(i){case"granted":return"granted";case"denied":return"denied";default:return"prompt"}}sendPending(){var i;const t=[],e=new Date().getTime();for(const n of this.pending)!((i=n.schedule)===null||i===void 0)&&i.at&&n.schedule.at.getTime()<=e&&(this.buildNotification(n),t.push(n));this.pending=this.pending.filter(n=>!t.find(o=>o===n))}sendNotification(i){var t;if(!((t=i.schedule)===null||t===void 0)&&t.at){const e=i.schedule.at.getTime()-new Date().getTime();this.pending.push(i),setTimeout(()=>{this.sendPending()},e);return}this.buildNotification(i)}buildNotification(i){const t=new Notification(i.title,{body:i.body,tag:String(i.id)});return t.addEventListener("click",this.onClick.bind(this,i),!1),t.addEventListener("show",this.onShow.bind(this,i),!1),t.addEventListener("close",()=>{this.deliveredNotifications=this.deliveredNotifications.filter(()=>!this)},!1),this.deliveredNotifications.push(t),t}onClick(i){const t={actionId:"tap",notification:i};this.notifyListeners("localNotificationActionPerformed",t)}onShow(i){this.notifyListeners("localNotificationReceived",i)}}export{l as LocalNotificationsWeb};
+import{dd as s}from"./main-D5sqeuwB.js";import"./vendor-react--Eh9ivFN.js";import"./vendor-three-Chj50gSY.js";class l extends s{constructor(){super(...arguments),this.pending=[],this.deliveredNotifications=[],this.hasNotificationSupport=()=>{if(!("Notification"in window)||!Notification.requestPermission)return!1;if(Notification.permission!=="granted")try{new Notification("")}catch(i){if(i instanceof Error&&i.name==="TypeError")return!1}return!0}}async getDeliveredNotifications(){const i=[];for(const t of this.deliveredNotifications){const e={title:t.title,id:parseInt(t.tag),body:t.body};i.push(e)}return{notifications:i}}async removeDeliveredNotifications(i){for(const t of i.notifications){const e=this.deliveredNotifications.find(n=>n.tag===String(t.id));e==null||e.close(),this.deliveredNotifications=this.deliveredNotifications.filter(()=>!e)}}async removeAllDeliveredNotifications(){for(const i of this.deliveredNotifications)i.close();this.deliveredNotifications=[]}async createChannel(){throw this.unimplemented("Not implemented on web.")}async deleteChannel(){throw this.unimplemented("Not implemented on web.")}async listChannels(){throw this.unimplemented("Not implemented on web.")}async schedule(i){if(!this.hasNotificationSupport())throw this.unavailable("Notifications not supported in this browser.");for(const t of i.notifications)this.sendNotification(t);return{notifications:i.notifications.map(t=>({id:t.id}))}}async getPending(){return{notifications:this.pending}}async registerActionTypes(){throw this.unimplemented("Not implemented on web.")}async cancel(i){this.pending=this.pending.filter(t=>!i.notifications.find(e=>e.id===t.id))}async areEnabled(){const{display:i}=await this.checkPermissions();return{value:i==="granted"}}async changeExactNotificationSetting(){throw this.unimplemented("Not implemented on web.")}async checkExactNotificationSetting(){throw this.unimplemented("Not implemented on web.")}async requestPermissions(){if(!this.hasNotificationSupport())throw this.unavailable("Notifications not supported in this browser.");return{display:this.transformNotificationPermission(await Notification.requestPermission())}}async checkPermissions(){if(!this.hasNotificationSupport())throw this.unavailable("Notifications not supported in this browser.");return{display:this.transformNotificationPermission(Notification.permission)}}transformNotificationPermission(i){switch(i){case"granted":return"granted";case"denied":return"denied";default:return"prompt"}}sendPending(){var i;const t=[],e=new Date().getTime();for(const n of this.pending)!((i=n.schedule)===null||i===void 0)&&i.at&&n.schedule.at.getTime()<=e&&(this.buildNotification(n),t.push(n));this.pending=this.pending.filter(n=>!t.find(o=>o===n))}sendNotification(i){var t;if(!((t=i.schedule)===null||t===void 0)&&t.at){const e=i.schedule.at.getTime()-new Date().getTime();this.pending.push(i),setTimeout(()=>{this.sendPending()},e);return}this.buildNotification(i)}buildNotification(i){const t=new Notification(i.title,{body:i.body,tag:String(i.id)});return t.addEventListener("click",this.onClick.bind(this,i),!1),t.addEventListener("show",this.onShow.bind(this,i),!1),t.addEventListener("close",()=>{this.deliveredNotifications=this.deliveredNotifications.filter(()=>!this)},!1),this.deliveredNotifications.push(t),t}onClick(i){const t={actionId:"tap",notification:i};this.notifyListeners("localNotificationActionPerformed",t)}onShow(i){this.notifyListeners("localNotificationReceived",i)}}export{l as LocalNotificationsWeb};

package/dist/assets/{web-CNjTPilF.js → web-DPETNqOf.js}

@@ -1 +1 @@
-import{d8 as t}from"./main-C2zgPci-.js";import"./vendor-react--Eh9ivFN.js";import"./vendor-three-Chj50gSY.js";class o extends t{constructor(){super(),this.handleVisibilityChange=()=>{const e={isActive:document.hidden!==!0};this.notifyListeners("appStateChange",e),document.hidden?this.notifyListeners("pause",null):this.notifyListeners("resume",null)},document.addEventListener("visibilitychange",this.handleVisibilityChange,!1)}exitApp(){throw this.unimplemented("Not implemented on web.")}async getInfo(){throw this.unimplemented("Not implemented on web.")}async getLaunchUrl(){return{url:""}}async getState(){return{isActive:document.hidden!==!0}}async minimizeApp(){throw this.unimplemented("Not implemented on web.")}async toggleBackButtonHandler(){throw this.unimplemented("Not implemented on web.")}async getAppLanguage(){return{value:navigator.language.split("-")[0].toLowerCase()}}}export{o as AppWeb};
+import{dd as t}from"./main-D5sqeuwB.js";import"./vendor-react--Eh9ivFN.js";import"./vendor-three-Chj50gSY.js";class o extends t{constructor(){super(),this.handleVisibilityChange=()=>{const e={isActive:document.hidden!==!0};this.notifyListeners("appStateChange",e),document.hidden?this.notifyListeners("pause",null):this.notifyListeners("resume",null)},document.addEventListener("visibilitychange",this.handleVisibilityChange,!1)}exitApp(){throw this.unimplemented("Not implemented on web.")}async getInfo(){throw this.unimplemented("Not implemented on web.")}async getLaunchUrl(){return{url:""}}async getState(){return{isActive:document.hidden!==!0}}async minimizeApp(){throw this.unimplemented("Not implemented on web.")}async toggleBackButtonHandler(){throw this.unimplemented("Not implemented on web.")}async getAppLanguage(){return{value:navigator.language.split("-")[0].toLowerCase()}}}export{o as AppWeb};

package/dist/assets/{web-bcYaAwP6.js → web-vG1Smf_N.js}

@@ -1 +1 @@
-import{d8 as a}from"./main-C2zgPci-.js";import{ImpactStyle as i,NotificationType as r}from"./index-h3Cuh2Zn.js";import"./vendor-react--Eh9ivFN.js";import"./vendor-three-Chj50gSY.js";class h extends a{constructor(){super(...arguments),this.selectionStarted=!1}async impact(t){const e=this.patternForImpact(t==null?void 0:t.style);this.vibrateWithPattern(e)}async notification(t){const e=this.patternForNotification(t==null?void 0:t.type);this.vibrateWithPattern(e)}async vibrate(t){const e=(t==null?void 0:t.duration)||300;this.vibrateWithPattern([e])}async selectionStart(){this.selectionStarted=!0}async selectionChanged(){this.selectionStarted&&this.vibrateWithPattern([70])}async selectionEnd(){this.selectionStarted=!1}patternForImpact(t=i.Heavy){return t===i.Medium?[43]:t===i.Light?[20]:[61]}patternForNotification(t=r.Success){return t===r.Warning?[30,40,30,50,60]:t===r.Error?[27,45,50]:[35,65,21]}vibrateWithPattern(t){if(navigator.vibrate)navigator.vibrate(t);else throw this.unavailable("Browser does not support the vibrate API")}}export{h as HapticsWeb};
+import{dd as a}from"./main-D5sqeuwB.js";import{ImpactStyle as i,NotificationType as r}from"./index-O0t07OB_.js";import"./vendor-react--Eh9ivFN.js";import"./vendor-three-Chj50gSY.js";class h extends a{constructor(){super(...arguments),this.selectionStarted=!1}async impact(t){const e=this.patternForImpact(t==null?void 0:t.style);this.vibrateWithPattern(e)}async notification(t){const e=this.patternForNotification(t==null?void 0:t.type);this.vibrateWithPattern(e)}async vibrate(t){const e=(t==null?void 0:t.duration)||300;this.vibrateWithPattern([e])}async selectionStart(){this.selectionStarted=!0}async selectionChanged(){this.selectionStarted&&this.vibrateWithPattern([70])}async selectionEnd(){this.selectionStarted=!1}patternForImpact(t=i.Heavy){return t===i.Medium?[43]:t===i.Light?[20]:[61]}patternForNotification(t=r.Success){return t===r.Warning?[30,40,30,50,60]:t===r.Error?[27,45,50]:[35,65,21]}vibrateWithPattern(t){if(navigator.vibrate)navigator.vibrate(t);else throw this.unavailable("Browser does not support the vibrate API")}}export{h as HapticsWeb};

package/dist/index.html

@@ -22,10 +22,10 @@
     <link rel="icon" type="image/png" sizes="16x16" href="/assets/icons/favicon-16x16.png" />
     <link rel="apple-touch-icon" sizes="180x180" href="/assets/icons/apple-touch-icon.png" />
     <title>Tide Commander</title>
-    <script type="module" crossorigin src="/assets/main-C2zgPci-.js"></script>
+    <script type="module" crossorigin src="/assets/main-D5sqeuwB.js"></script>
     <link rel="modulepreload" crossorigin href="/assets/vendor-react--Eh9ivFN.js">
     <link rel="modulepreload" crossorigin href="/assets/vendor-three-Chj50gSY.js">
-    <link rel="stylesheet" crossorigin href="/assets/main-C3JO2TRI.css">
+    <link rel="stylesheet" crossorigin href="/assets/main-JBkwGXfE.css">
   </head>
   <body>
     <div id="app"></div>

package/dist/locales/de/config.json

@@ -35,7 +35,9 @@
     "compactView": "Kompakte Ansicht",
     "autoScroll": "Automatisches Scrollen",
     "notifications": "Benachrichtigungen",
-    "soundEffects": "Soundeffekte"
+    "soundEffects": "Soundeffekte",
+    "streamTextLive": "Wort-für-Wort-Streaming",
+    "streamTextLiveTitle": "Claude- und Grok-Text/Denken während des Streamings anzeigen. Deaktivieren, um nur vollständige Antworten zu sehen."
   },
   "agentNames": {
     "customConfigured": "{{count}} benutzerdefinierte Namen konfiguriert",

package/dist/locales/en/config.json

@@ -25,6 +25,8 @@
   "general": {
     "history": "History",
     "hideCosts": "Hide Costs",
+    "streamTextLive": "Word-by-word streaming",
+    "streamTextLiveTitle": "Show Claude and Grok text/thinking as it streams. Turn off to only show complete replies.",
     "grid": "Grid",
     "showFPS": "Show FPS",
     "fpsLimit": "FPS Limit",

package/dist/locales/en/terminal.json

@@ -1267,6 +1267,7 @@
   },
   "usage": {
     "title": "Claude Usage",
+    "titleGrok": "Grok Usage",
     "session": "Session",
     "tokensUsed": "Tokens used",
     "taskCount": "Tasks sent",
@@ -1283,6 +1284,11 @@
     "currentWeekAll": "Current week (all models)",
     "currentWeekOpus": "Current week (Opus only)",
     "currentWeekSonnet": "Current week (Sonnet only)",
+    "weeklyLimit": "Weekly limit",
+    "monthlyLimit": "Monthly limit",
+    "periodLimit": "Plan period limit",
+    "onDemandLimit": "Pay-as-you-go limit",
+    "creditsUsed": "{{used}} / {{limit}} credits",
     "percentUsed": "{{percent}}% used",
     "resets": "Resets {{time}}",
     "limitsError": "Live limits unavailable: {{message}}"

package/dist/locales/en/tools.json

@@ -43,11 +43,13 @@
       "askFollowupQuestion": "AskFollowupQuestion",
       "askUserQuestion": "AskUserQuestion",
       "attemptCompletion": "AttemptCompletion",
-      "listFiles": "ListFiles",
-      "searchFiles": "SearchFiles",
+      "listFiles": "List Files",
+      "searchFiles": "Search Files",
       "executeCommand": "ExecuteCommand",
       "spawnAgent": "Spawn Agent",
       "sendInput": "Send Input",
+      "sendMessage": "Message Agent",
+      "taskOutput": "Task Output",
       "wait": "Wait"
     },
     "showOutputsInline": "Show all bash outputs inline",

package/dist/locales/es/config.json

@@ -21,6 +21,8 @@
   "general": {
     "history": "Historial",
     "hideCosts": "Ocultar costos",
+    "streamTextLive": "Streaming palabra por palabra",
+    "streamTextLiveTitle": "Mostrar el texto/pensamiento de Claude y Grok mientras se genera. Desactívalo para ver solo respuestas completas.",
     "grid": "Cuadricula",
     "showFPS": "Mostrar FPS",
     "fpsLimit": "Limite de FPS",

package/dist/locales/fr/config.json

@@ -35,7 +35,9 @@
     "compactView": "Vue compacte",
     "autoScroll": "Défilement automatique",
     "notifications": "Notifications",
-    "soundEffects": "Effets sonores"
+    "soundEffects": "Effets sonores",
+    "streamTextLive": "Streaming mot à mot",
+    "streamTextLiveTitle": "Afficher le texte/la réflexion de Claude et Grok au fur et à mesure. Désactivez pour n'afficher que les réponses complètes."
   },
   "agentNames": {
     "customConfigured": "{{count}} noms personnalisés configurés",

package/dist/locales/hi/config.json

@@ -35,7 +35,9 @@
     "compactView": "कॉम्पैक्ट दृश्य",
     "autoScroll": "ऑटो स्क्रॉल",
     "notifications": "सूचनाएं",
-    "soundEffects": "ध्वनि प्रभाव"
+    "soundEffects": "ध्वनि प्रभाव",
+    "streamTextLive": "शब्द-दर-शब्द स्ट्रीमिंग",
+    "streamTextLiveTitle": "Claude और Grok का टेक्स्ट/सोच स्ट्रीम होते हुए दिखाएँ। केवल पूरी प्रतिक्रियाएँ देखने के लिए बंद करें।"
   },
   "agentNames": {
     "customConfigured": "{{count}} कस्टम नाम कॉन्फ़िगर किए गए",

package/dist/locales/it/config.json

@@ -35,7 +35,9 @@
     "compactView": "Vista compatta",
     "autoScroll": "Scorrimento automatico",
     "notifications": "Notifiche",
-    "soundEffects": "Effetti sonori"
+    "soundEffects": "Effetti sonori",
+    "streamTextLive": "Streaming parola per parola",
+    "streamTextLiveTitle": "Mostra testo/pensiero di Claude e Grok mentre vengono generati. Disattiva per vedere solo le risposte complete."
   },
   "agentNames": {
     "customConfigured": "{{count}} nomi personalizzati configurati",

package/dist/locales/ja/config.json

@@ -35,7 +35,9 @@
     "compactView": "コンパクト表示",
     "autoScroll": "自動スクロール",
     "notifications": "通知",
-    "soundEffects": "効果音"
+    "soundEffects": "効果音",
+    "streamTextLive": "単語ごとのストリーミング",
+    "streamTextLiveTitle": "Claude と Grok のテキスト/思考をストリーミング表示します。オフにすると完成した返答のみ表示します。"
   },
   "agentNames": {
     "customConfigured": "{{count}}個のカスタム名が設定済み",

package/dist/locales/pt/config.json

@@ -35,7 +35,9 @@
     "compactView": "Visualizacao Compacta",
     "autoScroll": "Rolagem Automatica",
     "notifications": "Notificacoes",
-    "soundEffects": "Efeitos Sonoros"
+    "soundEffects": "Efeitos Sonoros",
+    "streamTextLive": "Streaming palavra a palavra",
+    "streamTextLiveTitle": "Mostrar texto/pensamento do Claude e Grok à medida que são gerados. Desative para ver apenas respostas completas."
   },
   "agentNames": {
     "customConfigured": "{{count}} nomes personalizados configurados",

package/dist/locales/ru/config.json

@@ -35,7 +35,9 @@
     "compactView": "Компактный вид",
     "autoScroll": "Автопрокрутка",
     "notifications": "Уведомления",
-    "soundEffects": "Звуковые эффекты"
+    "soundEffects": "Звуковые эффекты",
+    "streamTextLive": "Потоковая передача по словам",
+    "streamTextLiveTitle": "Показывать текст/мысли Claude и Grok по мере генерации. Отключите, чтобы видеть только готовые ответы."
   },
   "agentNames": {
     "customConfigured": "{{count}} пользовательских имён настроено",

package/dist/locales/zh-CN/config.json

@@ -35,7 +35,9 @@
     "compactView": "紧凑视图",
     "autoScroll": "自动滚动",
     "notifications": "通知",
-    "soundEffects": "音效"
+    "soundEffects": "音效",
+    "streamTextLive": "逐字流式输出",
+    "streamTextLiveTitle": "实时显示 Claude 和 Grok 的文本/思考。关闭后仅显示完整回复。"
   },
   "agentNames": {
     "customConfigured": "已配置 {{count}} 个自定义名称",

package/dist/src/packages/server/claude/backend.js

@@ -124,6 +124,20 @@ export function buildAppendedProjectInstructions(config) {
 }
 export class ClaudeBackend {
     name = 'claude';
+    // ---------------------------------------------------------------------------
+    // Token-stream state (--include-partial-messages)
+    //
+    // Claude's stream_event lines each carry a *different* outer `uuid`, so the
+    // client cannot merge word-by-word deltas by that field (unlike Grok, which
+    // emits tiny tokens with no uuid and we mint one). We pin a stable stream id
+    // per (message_id, content_block index, kind) so addOutput merges into one
+    // terminal row. The final assistant message reuses the same id to finalize.
+    // ---------------------------------------------------------------------------
+    currentStreamMessageId = null;
+    streamUuids = new Map(); // key = `${kind}:${index}`
+    streamTextEmitted = false;
+    /** After the full assistant text finalizes, ignore late stream deltas for this turn. */
+    suppressTextDeltas = false;
     /**
      * Build CLI arguments for Claude Code
      */
@@ -135,6 +149,10 @@ export class ClaudeBackend {
         args.push('--verbose');
         args.push('--output-format', 'stream-json');
         args.push('--input-format', 'stream-json');
+        // Without this flag, stream-json only emits complete assistant messages —
+        // no content_block_delta / text_delta tokens — so the UI cannot typewriter
+        // the reply the way Grok's streaming-json does by default.
+        args.push('--include-partial-messages');
         // Resume existing session if available
         if (config.sessionId) {
             args.push('--resume', config.sessionId);
@@ -427,19 +445,54 @@ export class ClaudeBackend {
             // Use event UUID if available (unique identifier from Claude)
             const uuid = event.uuid;
             const usage = event.message.usage;
-            // Extract text blocks - emit as non-streaming final text
-            // This ensures text is captured even if streaming deltas were missed
-            const textBlocks = event.message.content.filter((b) => b.type === 'text');
-            for (const block of textBlocks) {
-                if (block.text && block.text.trim()) {
+            // Capture message id from the assistant payload when stream_event's
+            // message_start was missed or arrived without an id.
+            const messageId = typeof event.message?.id === 'string'
+                ? event.message.id
+                : null;
+            if (messageId && !this.currentStreamMessageId) {
+                this.currentStreamMessageId = messageId;
+            }
+            // Extract text blocks - emit as non-streaming final text.
+            //
+            // IMPORTANT: with --include-partial-messages Claude may emit *multiple*
+            // assistant events per turn (e.g. thinking-only first, then full text).
+            // Stream content_block indexes (thinking=0, text=1) do NOT match the final
+            // assistant content array (text-only → index 0). Match stream uuids by the
+            // order of text blocks among open text streams, not raw content index.
+            //
+            // Never wipe stream state on thinking-only assistant events — that used to
+            // force the later full-text assistant onto a new uuid → duplicate bubbles.
+            const content = event.message.content;
+            const textStreamUuids = [...this.streamUuids.entries()]
+                .filter(([key]) => key.startsWith('text:'))
+                .sort(([a], [b]) => a.localeCompare(b, undefined, { numeric: true }))
+                .map(([, id]) => id);
+            let textStreamOrdinal = 0;
+            let emittedFinalText = false;
+            for (let i = 0; i < content.length; i++) {
+                const block = content[i];
+                if (block?.type === 'text' && block.text && block.text.trim()) {
+                    // Prefer ordinal text stream uuid, then index key, then outer uuid.
+                    const streamUuid = textStreamUuids[textStreamOrdinal] ||
+                        this.streamUuids.get(`text:${i}`) ||
+                        null;
+                    textStreamOrdinal += 1;
                     events.push({
                         type: 'text',
                         text: block.text,
                         isStreaming: false, // Mark as final, non-streaming text
-                        uuid, // Add message UUID for deduplication
+                        uuid: streamUuid || uuid,
                     });
+                    emittedFinalText = true;
                 }
             }
+            // Only clear stream state after we actually finalized a text row. Intermediate
+            // thinking-only assistant events must leave stream uuids intact for later deltas.
+            if (emittedFinalText) {
+                this.suppressTextDeltas = true;
+                this.resetStreamState();
+            }
             // Extract tool_use blocks
             const toolUseBlocks = event.message.content.filter((b) => b.type === 'tool_use');
             for (const block of toolUseBlocks) {
@@ -487,7 +540,9 @@ export class ClaudeBackend {
                 });
             }
             if (events.length > 0) {
-                log.log(`parseAssistantEvent: extracted ${textBlocks.length} text block(s), ${toolUseBlocks.length} tool_use block(s), usage=${usage ? 'yes' : 'no'}, uuid=${uuid}`);
+                const textCount = events.filter((e) => e.type === 'text').length;
+                const toolCount = events.filter((e) => e.type === 'tool_start').length;
+                log.log(`parseAssistantEvent: extracted ${textCount} text block(s), ${toolCount} tool_use block(s), usage=${usage ? 'yes' : 'no'}, uuid=${uuid}`);
                 return events.length === 1 ? events[0] : events;
             }
         }
@@ -566,45 +621,94 @@ export class ClaudeBackend {
             permissionDenials,
         };
     }
+    resetStreamState() {
+        this.currentStreamMessageId = null;
+        this.streamUuids.clear();
+        this.streamTextEmitted = false;
+        // suppressTextDeltas is intentionally NOT cleared here — only message_start
+        // opens a new turn. That way late content_block_delta lines after the final
+        // assistant event cannot open a second bubble with a new stream uuid.
+    }
+    /** Stable uuid so token-sized Claude deltas merge into one terminal row. */
+    ensureStreamUuid(kind, index) {
+        const key = `${kind}:${index}`;
+        let id = this.streamUuids.get(key);
+        if (!id) {
+            const msg = this.currentStreamMessageId || 'anon';
+            id = `claude-stream-${msg}-${kind}-${index}`;
+            this.streamUuids.set(key, id);
+        }
+        return id;
+    }
     parseStreamEvent(event) {
         const streamEvent = event.event;
         if (!streamEvent)
             return null;
+        // Capture Anthropic message id so every delta in this turn shares a stream key.
+        if (streamEvent.type === 'message_start') {
+            const mid = streamEvent.message?.id;
+            // New message — drop any stale stream ids and reopen the stream gate.
+            this.suppressTextDeltas = false;
+            this.resetStreamState();
+            if (typeof mid === 'string' && mid) {
+                this.currentStreamMessageId = mid;
+            }
+            return null;
+        }
+        const blockIndex = typeof streamEvent.index === 'number' && Number.isFinite(streamEvent.index)
+            ? streamEvent.index
+            : 0;
         if (streamEvent.type === 'content_block_delta') {
             if (streamEvent.delta?.type === 'text_delta' && streamEvent.delta.text) {
+                // Drop late deltas that race after the full assistant text already finalized.
+                if (this.suppressTextDeltas) {
+                    return null;
+                }
+                this.streamTextEmitted = true;
                 return {
                     type: 'text',
                     text: streamEvent.delta.text,
                     isStreaming: true,
-                    uuid: event.uuid, // Propagate UUID for streaming chunks
+                    // Stable per-block id (NOT event.uuid — those differ every delta).
+                    uuid: this.ensureStreamUuid('text', blockIndex),
                 };
             }
             else if (streamEvent.delta?.type === 'thinking_delta' &&
                 streamEvent.delta.text) {
+                if (this.suppressTextDeltas) {
+                    return null;
+                }
                 return {
                     type: 'thinking',
                     text: streamEvent.delta.text,
                     isStreaming: true,
-                    uuid: event.uuid, // Propagate UUID for streaming chunks
+                    uuid: this.ensureStreamUuid('thinking', blockIndex),
                 };
             }
         }
         else if (streamEvent.type === 'content_block_start') {
             const blockType = streamEvent.content_block?.type;
             if (blockType === 'text' || blockType === 'thinking') {
+                const streamUuid = this.ensureStreamUuid(blockType, blockIndex);
                 return {
                     type: 'block_start',
                     blockType: blockType,
-                    uuid: event.uuid, // Include UUID for block markers too
+                    uuid: streamUuid,
                 };
             }
         }
         else if (streamEvent.type === 'content_block_stop') {
+            // Keep stream uuids alive until the assistant final message lands so
+            // parseAssistantEvent can reuse them for isStreaming:false finalize.
             return {
                 type: 'block_end',
                 uuid: event.uuid,
             };
         }
+        else if (streamEvent.type === 'message_stop') {
+            // If no assistant event follows (rare), leave state for next message_start.
+            return null;
+        }
         return null;
     }
     /**

package/dist/src/packages/server/claude/runner/process-lifecycle.js

@@ -3,6 +3,7 @@ import * as path from 'path';
 import { StringDecoder } from 'string_decoder';
 import { createLogger } from '../../utils/logger.js';
 import { isTmuxEnabled, checkTmuxAvailability, spawnInTmux, killTmuxSession, interruptTmuxSession, } from './tmux-helper.js';
+import { startGrokSessionWatcher } from '../../grok/session-watcher.js';
 const log = createLogger('Runner');
 export class RunnerProcessLifecycle {
     backend;
@@ -25,6 +26,44 @@ export class RunnerProcessLifecycle {
         this.recoveryStore = deps.recoveryStore;
         this.onDisableAutoRestart = deps.onDisableAutoRestart;
     }
+    /**
+     * Grok headless does not stream tool events on stdout. Tail session files
+     * and inject tool_start/tool_result into the same pipeline as stdout events.
+     */
+    attachGrokSideChannel(activeProcess, agentId, workingDir, sessionId) {
+        if (this.backend.name !== 'grok')
+            return;
+        const watcher = startGrokSessionWatcher({
+            agentId,
+            workingDir,
+            sessionId,
+            startedAt: activeProcess.startTime,
+            onEvent: (event) => {
+                // Grok does not emit stdout `end` between tool rounds in one agentic
+                // turn. Finalize open text/thinking streams before the tool card so
+                // intermediate status lines stay separate from the final answer.
+                if (event.type === 'tool_start' && typeof this.backend.breakOpenStreams === 'function') {
+                    const breaks = this.backend.breakOpenStreams();
+                    for (const ev of breaks) {
+                        this.stdoutPipeline.emitStandardEvent(agentId, ev);
+                    }
+                }
+                this.stdoutPipeline.emitStandardEvent(agentId, event);
+            },
+            onSessionId: (sid) => {
+                const proc = this.activeProcesses.get(agentId);
+                if (proc && !proc.sessionId) {
+                    proc.sessionId = sid;
+                    if (proc.lastRequest && !proc.lastRequest.sessionId) {
+                        proc.lastRequest.sessionId = sid;
+                    }
+                }
+                this.bus.emit({ type: 'runner.session_id', agentId, sessionId: sid });
+                this.callbacks.onSessionId(agentId, sid);
+            },
+        });
+        activeProcess.sideChannelStop = () => watcher.stop();
+    }
     async run(request) {
         const { agentId, prompt, workingDir, sessionId, model, effort, useChrome, permissionMode = 'bypass', systemPrompt, forceNewSession, forkSession, customAgent, } = request;
         await this.stop(agentId);
@@ -90,6 +129,7 @@ export class RunnerProcessLifecycle {
                 tmuxExpectedCommand: path.basename(executable),
             };
             this.activeProcesses.set(agentId, activeProcess);
+            this.attachGrokSideChannel(activeProcess, agentId, workingDir, forceNewSession ? undefined : sessionId);
             // Use file-tailing stdout pipeline for tmux mode
             const tailer = this.stdoutPipeline.handleTmuxLog(agentId, tmuxResult.logFile);
             activeProcess.tmuxTailer = tailer;
@@ -136,10 +176,25 @@ export class RunnerProcessLifecycle {
             turnState: 'processing',
         };
         this.activeProcesses.set(agentId, activeProcess);
+        this.attachGrokSideChannel(activeProcess, agentId, workingDir, forceNewSession ? undefined : sessionId);
         const stdoutDone = this.stdoutPipeline.handleStdout(agentId, childProcess);
         this.handleStderr(agentId, childProcess);
         childProcess.on('close', async (code, signal) => {
             await stdoutDone;
+            // Keep tailing session files briefly so the last tool_result lines flush to disk
+            // after the CLI exits (common race on Grok headless).
+            const sideStop = activeProcess.sideChannelStop;
+            activeProcess.sideChannelStop = undefined;
+            if (sideStop) {
+                setTimeout(() => {
+                    try {
+                        sideStop();
+                    }
+                    catch {
+                        // ignore
+                    }
+                }, 2000);
+            }
             this.bus.emit({
                 type: 'runner.process_closed',
                 agentId,
@@ -221,6 +276,13 @@ export class RunnerProcessLifecycle {
         if (activeProcess.tmuxTailer) {
             activeProcess.tmuxTailer.stop();
         }
+        try {
+            activeProcess.sideChannelStop?.();
+        }
+        catch {
+            // ignore
+        }
+        activeProcess.sideChannelStop = undefined;
         this.activeProcesses.delete(agentId);
         this.activityCallbacks.delete(agentId);
         // tmux mode: kill the tmux session and clean up