@adhdev/daemon-standalone 0.8.34 → 0.8.36

package/dist/index.js

@@ -27843,6 +27843,7 @@ var require_dist2 = __commonJS({
       const parsed = isPlainObject2(raw) ? raw : {};
       return {
         serverUrl: typeof parsed.serverUrl === "string" && parsed.serverUrl.trim() ? parsed.serverUrl : DEFAULT_CONFIG.serverUrl,
+        allowServerApiProxy: asBoolean(parsed.allowServerApiProxy, DEFAULT_CONFIG.allowServerApiProxy ?? false),
         selectedIde: asNullableString(parsed.selectedIde),
         configuredIdes: asStringArray(parsed.configuredIdes),
         installedExtensions: asStringArray(parsed.installedExtensions),
@@ -27996,6 +27997,7 @@ var require_dist2 = __commonJS({
         import_crypto2 = require("crypto");
         DEFAULT_CONFIG = {
           serverUrl: "https://api.adhf.dev",
+          allowServerApiProxy: false,
           selectedIde: null,
           configuredIdes: [],
           installedExtensions: [],
@@ -30284,8 +30286,6 @@ ${data.message || ""}`.trim();
             if (blockingModal || this.currentStatus === "waiting_approval") {
               throw new Error(`${this.cliName} is awaiting confirmation before it can accept a prompt`);
             }
-            this.committedMessages.push({ role: "user", content: text, timestamp: Date.now() });
-            this.syncMessageViews();
             this.isWaitingForResponse = true;
             this.responseBuffer = "";
             this.finishRetryCount = 0;
@@ -30317,6 +30317,13 @@ ${data.message || ""}`.trim();
             const submitDelayMs = this.sendDelayMs + Math.min(2e3, Math.max(0, estimatedLines - 1) * 350);
             const maxEchoWaitMs = submitDelayMs + Math.max(1500, Math.min(5e3, estimatedLines * 500));
             const retryDelayMs = Math.max(350, Math.min(1500, Math.max(this.sendDelayMs, submitDelayMs)));
+            let didCommitUserTurn = false;
+            const commitUserTurn = () => {
+              if (didCommitUserTurn) return;
+              didCommitUserTurn = true;
+              this.committedMessages.push({ role: "user", content: text, timestamp: Date.now() });
+              this.syncMessageViews();
+            };
             if (this.settleTimer) {
               clearTimeout(this.settleTimer);
               this.settleTimer = null;
@@ -30329,109 +30336,128 @@ ${data.message || ""}`.trim();
                 if (this.isWaitingForResponse) this.finishResponse();
               }, this.timeouts.maxResponse);
             };
-            const submit = () => {
-              if (!this.ptyProcess) return;
-              this.submitPendingUntil = 0;
-              this.recordTrace("submit_write", {
-                mode: "submit_key",
-                sendKey: this.sendKey,
-                screenText: summarizeCliTraceText(this.terminalScreen.getText(), 500)
-              });
-              this.ptyProcess.write(this.sendKey);
-              const retrySubmitIfStuck = (attempt) => {
-                this.submitRetryTimer = null;
-                if (!this.ptyProcess || !this.isWaitingForResponse || this.submitRetryUsed) return;
-                if (this.currentStatus === "waiting_approval") return;
-                if ((this.responseBuffer || "").trim()) return;
+            await new Promise((resolve12) => {
+              let resolved = false;
+              const resolveOnce = () => {
+                if (resolved) return;
+                resolved = true;
+                resolve12();
+              };
+              const submit = () => {
+                if (!this.ptyProcess) {
+                  resolveOnce();
+                  return;
+                }
+                commitUserTurn();
+                this.submitPendingUntil = 0;
                 const screenText = this.terminalScreen.getText();
-                if (!promptLikelyVisible(screenText, normalizedPromptSnippet)) return;
-                if (/Esc to interrupt|Do you want to proceed|This command requires approval|Allow Codex to|Approve and run now|Always approve this session|Running…|Running\.\.\./i.test(screenText)) return;
-                this.responseSettleIgnoreUntil = Date.now() + this.timeouts.outputSettle + 400;
-                LOG2.info("CLI", `[${this.cliType}] Retrying submit key for stuck prompt (attempt ${attempt})`);
                 this.recordTrace("submit_write", {
-                  mode: "submit_retry",
-                  attempt,
+                  mode: "submit_key",
                   sendKey: this.sendKey,
                   screenText: summarizeCliTraceText(screenText, 500)
                 });
                 this.ptyProcess.write(this.sendKey);
-                if (attempt >= 3) {
-                  this.submitRetryUsed = true;
-                  return;
-                }
-                this.submitRetryTimer = setTimeout(() => retrySubmitIfStuck(attempt + 1), retryDelayMs);
+                const retrySubmitIfStuck = (attempt) => {
+                  this.submitRetryTimer = null;
+                  if (!this.ptyProcess || !this.isWaitingForResponse || this.submitRetryUsed) return;
+                  if (this.currentStatus === "waiting_approval") return;
+                  if ((this.responseBuffer || "").trim()) return;
+                  const screenText2 = this.terminalScreen.getText();
+                  if (!promptLikelyVisible(screenText2, normalizedPromptSnippet)) return;
+                  if (/Esc to interrupt|Do you want to proceed|This command requires approval|Allow Codex to|Approve and run now|Always approve this session|Running…|Running\.\.\./i.test(screenText2)) return;
+                  this.responseSettleIgnoreUntil = Date.now() + this.timeouts.outputSettle + 400;
+                  LOG2.info("CLI", `[${this.cliType}] Retrying submit key for stuck prompt (attempt ${attempt})`);
+                  this.recordTrace("submit_write", {
+                    mode: "submit_retry",
+                    attempt,
+                    sendKey: this.sendKey,
+                    screenText: summarizeCliTraceText(screenText2, 500)
+                  });
+                  this.ptyProcess.write(this.sendKey);
+                  if (attempt >= 3) {
+                    this.submitRetryUsed = true;
+                    return;
+                  }
+                  this.submitRetryTimer = setTimeout(() => retrySubmitIfStuck(attempt + 1), retryDelayMs);
+                };
+                this.submitRetryTimer = setTimeout(() => retrySubmitIfStuck(1), retryDelayMs);
+                startResponseTimeout();
+                resolveOnce();
               };
-              this.submitRetryTimer = setTimeout(() => retrySubmitIfStuck(1), retryDelayMs);
-              startResponseTimeout();
-            };
-            if (this.submitStrategy === "immediate") {
-              this.submitPendingUntil = 0;
+              if (this.submitStrategy === "immediate") {
+                commitUserTurn();
+                this.submitPendingUntil = 0;
+                this.recordTrace("submit_write", {
+                  mode: "immediate",
+                  text: summarizeCliTraceText(text, 500),
+                  sendKey: this.sendKey,
+                  screenText: summarizeCliTraceText(this.terminalScreen.getText(), 500)
+                });
+                this.ptyProcess.write(text + this.sendKey);
+                this.submitRetryTimer = setTimeout(() => {
+                  this.submitRetryTimer = null;
+                  if (!this.ptyProcess || !this.isWaitingForResponse || this.submitRetryUsed) return;
+                  if (this.currentStatus === "waiting_approval") return;
+                  if ((this.responseBuffer || "").trim()) return;
+                  const screenText = this.terminalScreen.getText();
+                  if (!promptLikelyVisible(screenText, normalizedPromptSnippet)) return;
+                  LOG2.info("CLI", `[${this.cliType}] Retrying submit key for stuck prompt (attempt 1)`);
+                  this.responseSettleIgnoreUntil = Date.now() + this.timeouts.outputSettle + 400;
+                  this.recordTrace("submit_write", {
+                    mode: "immediate_retry",
+                    attempt: 1,
+                    sendKey: this.sendKey,
+                    screenText: summarizeCliTraceText(screenText, 500)
+                  });
+                  this.ptyProcess.write(this.sendKey);
+                  this.submitRetryUsed = true;
+                }, retryDelayMs);
+                startResponseTimeout();
+                resolveOnce();
+                return;
+              }
+              if (submitDelayMs > 0) {
+                this.submitPendingUntil = Date.now() + submitDelayMs;
+              }
+              this.ptyProcess.write(text);
               this.recordTrace("submit_write", {
-                mode: "immediate",
+                mode: "type_then_submit",
                 text: summarizeCliTraceText(text, 500),
                 sendKey: this.sendKey,
                 screenText: summarizeCliTraceText(this.terminalScreen.getText(), 500)
               });
-              this.ptyProcess.write(text + this.sendKey);
-              this.submitRetryTimer = setTimeout(() => {
-                this.submitRetryTimer = null;
-                if (!this.ptyProcess || !this.isWaitingForResponse || this.submitRetryUsed) return;
-                if (this.currentStatus === "waiting_approval") return;
-                if ((this.responseBuffer || "").trim()) return;
+              const submitStartedAt = Date.now();
+              let lastNormalizedScreen = "";
+              let lastScreenChangeAt = submitStartedAt;
+              const waitForEchoAndSubmit = () => {
+                if (!this.ptyProcess) {
+                  resolveOnce();
+                  return;
+                }
+                const now = Date.now();
+                const elapsed = now - submitStartedAt;
                 const screenText = this.terminalScreen.getText();
-                if (!promptLikelyVisible(screenText, normalizedPromptSnippet)) return;
-                LOG2.info("CLI", `[${this.cliType}] Retrying submit key for stuck prompt (attempt 1)`);
-                this.responseSettleIgnoreUntil = Date.now() + this.timeouts.outputSettle + 400;
-                this.recordTrace("submit_write", {
-                  mode: "immediate_retry",
-                  attempt: 1,
-                  sendKey: this.sendKey,
-                  screenText: summarizeCliTraceText(screenText, 500)
-                });
-                this.ptyProcess.write(this.sendKey);
-                this.submitRetryUsed = true;
-              }, retryDelayMs);
-              startResponseTimeout();
-              return;
-            }
-            if (submitDelayMs > 0) {
-              this.submitPendingUntil = Date.now() + submitDelayMs;
-            }
-            this.ptyProcess.write(text);
-            this.recordTrace("submit_write", {
-              mode: "type_then_submit",
-              text: summarizeCliTraceText(text, 500),
-              sendKey: this.sendKey,
-              screenText: summarizeCliTraceText(this.terminalScreen.getText(), 500)
-            });
-            const submitStartedAt = Date.now();
-            let lastNormalizedScreen = "";
-            let lastScreenChangeAt = submitStartedAt;
-            const waitForEchoAndSubmit = () => {
-              if (!this.ptyProcess) return;
-              const now = Date.now();
-              const elapsed = now - submitStartedAt;
-              const screenText = this.terminalScreen.getText();
-              const normalizedScreen = normalizePromptText(screenText);
-              if (normalizedScreen !== lastNormalizedScreen) {
-                lastNormalizedScreen = normalizedScreen;
-                lastScreenChangeAt = now;
-              }
-              const echoVisible = !normalizedPromptSnippet || promptLikelyVisible(screenText, normalizedPromptSnippet);
-              if (echoVisible) {
-                const screenSettled = now - lastScreenChangeAt >= 500;
-                if (elapsed >= submitDelayMs && screenSettled) {
+                const normalizedScreen = normalizePromptText(screenText);
+                if (normalizedScreen !== lastNormalizedScreen) {
+                  lastNormalizedScreen = normalizedScreen;
+                  lastScreenChangeAt = now;
+                }
+                const echoVisible = !normalizedPromptSnippet || promptLikelyVisible(screenText, normalizedPromptSnippet);
+                if (echoVisible) {
+                  const screenSettled = now - lastScreenChangeAt >= 500;
+                  if (elapsed >= submitDelayMs && screenSettled) {
+                    submit();
+                    return;
+                  }
+                }
+                if (elapsed >= maxEchoWaitMs) {
                   submit();
                   return;
                 }
-              }
-              if (elapsed >= maxEchoWaitMs) {
-                submit();
-                return;
-              }
-              setTimeout(waitForEchoAndSubmit, 50);
-            };
-            waitForEchoAndSubmit();
+                setTimeout(waitForEchoAndSubmit, 50);
+              };
+              waitForEchoAndSubmit();
+            });
           }
           getPartialResponse() {
             if (!this.isWaitingForResponse) return "";
@@ -30795,6 +30821,7 @@ ${data.message || ""}`.trim();
       SessionHostPtyTransportFactory: () => SessionHostPtyTransportFactory2,
       VersionArchive: () => VersionArchive,
       appendRecentActivity: () => appendRecentActivity,
+      buildMachineInfo: () => buildMachineInfo2,
       buildSessionEntries: () => buildSessionEntries,
       buildStatusSnapshot: () => buildStatusSnapshot2,
       connectCdpManager: () => connectCdpManager,
@@ -34712,11 +34739,24 @@ ${effect.notification.body || ""}`.trim();
       "thinking",
       "active"
     ]);
-    var STATUS_ACTIVE_CHAT_MESSAGE_LIMIT = 60;
-    var STATUS_ACTIVE_CHAT_TOTAL_BYTES_LIMIT = 96 * 1024;
-    var STATUS_ACTIVE_CHAT_STRING_LIMIT = 4 * 1024;
-    var STATUS_ACTIVE_CHAT_FALLBACK_STRING_LIMIT = 1024;
-    var STATUS_INPUT_CONTENT_LIMIT = 2 * 1024;
+    var FULL_STATUS_ACTIVE_CHAT_OPTIONS = {
+      includeMessages: true,
+      includeInputContent: true,
+      includeActiveModal: true,
+      messageLimit: 60,
+      totalBytesLimit: 96 * 1024,
+      stringLimit: 4 * 1024,
+      fallbackStringLimit: 1024
+    };
+    var LIVE_STATUS_ACTIVE_CHAT_OPTIONS = {
+      includeMessages: false,
+      includeInputContent: false,
+      includeActiveModal: false,
+      messageLimit: 0,
+      totalBytesLimit: 0,
+      stringLimit: 512,
+      fallbackStringLimit: 256
+    };
     var STATUS_MODAL_MESSAGE_LIMIT = 2 * 1024;
     var STATUS_MODAL_BUTTON_LIMIT = 120;
     function truncateString(value, maxChars) {
@@ -34755,19 +34795,20 @@ ${effect.notification.body || ""}`.trim();
       }
       return msg;
     }
-    function trimMessagesForStatus(messages) {
+    function trimMessagesForStatus(messages, options) {
+      if (!options.includeMessages || options.messageLimit <= 0 || options.totalBytesLimit <= 0) return [];
       if (!Array.isArray(messages) || messages.length === 0) return [];
-      const recent = messages.slice(-STATUS_ACTIVE_CHAT_MESSAGE_LIMIT);
+      const recent = messages.slice(-options.messageLimit);
       const kept = [];
       let totalBytes = 0;
       for (let i = recent.length - 1; i >= 0; i -= 1) {
-        let normalized = normalizeMessageTime(trimMessageForStatus(recent[i], STATUS_ACTIVE_CHAT_STRING_LIMIT));
+        let normalized = normalizeMessageTime(trimMessageForStatus(recent[i], options.stringLimit));
         let size = estimateBytes(normalized);
-        if (size > STATUS_ACTIVE_CHAT_TOTAL_BYTES_LIMIT) {
-          normalized = normalizeMessageTime(trimMessageForStatus(recent[i], STATUS_ACTIVE_CHAT_FALLBACK_STRING_LIMIT));
+        if (size > options.totalBytesLimit) {
+          normalized = normalizeMessageTime(trimMessageForStatus(recent[i], options.fallbackStringLimit));
           size = estimateBytes(normalized);
         }
-        if (kept.length > 0 && totalBytes + size > STATUS_ACTIVE_CHAT_TOTAL_BYTES_LIMIT) {
+        if (kept.length > 0 && totalBytes + size > options.totalBytesLimit) {
           continue;
         }
         kept.push(normalized);
@@ -34797,21 +34838,38 @@ ${effect.notification.body || ""}`.trim();
     function isManagedStatusWaiting(status, opts) {
       return normalizeManagedStatus(status, opts) === "waiting_approval";
     }
-    function normalizeActiveChatData(activeChat) {
+    function normalizeActiveChatData(activeChat, options = FULL_STATUS_ACTIVE_CHAT_OPTIONS) {
       if (!activeChat) return activeChat;
+      const resolvedOptions = {
+        ...FULL_STATUS_ACTIVE_CHAT_OPTIONS,
+        ...options
+      };
       return {
         ...activeChat,
         status: normalizeManagedStatus(activeChat.status, { activeModal: activeChat.activeModal }),
-        messages: trimMessagesForStatus(activeChat.messages),
-        activeModal: activeChat.activeModal ? {
+        messages: trimMessagesForStatus(activeChat.messages, resolvedOptions),
+        activeModal: resolvedOptions.includeActiveModal && activeChat.activeModal ? {
           message: truncateString(activeChat.activeModal.message || "", STATUS_MODAL_MESSAGE_LIMIT),
           buttons: (activeChat.activeModal.buttons || []).map(
             (button) => truncateString(String(button || ""), STATUS_MODAL_BUTTON_LIMIT)
           )
-        } : activeChat.activeModal,
-        inputContent: activeChat.inputContent ? truncateString(activeChat.inputContent, STATUS_INPUT_CONTENT_LIMIT) : activeChat.inputContent
+        } : null,
+        inputContent: resolvedOptions.includeInputContent && activeChat.inputContent ? truncateString(activeChat.inputContent, 2 * 1024) : void 0
       };
     }
+    function getActiveChatOptions(profile) {
+      if (profile === "full") return {};
+      return LIVE_STATUS_ACTIVE_CHAT_OPTIONS;
+    }
+    function shouldIncludeSessionControls(profile) {
+      return profile !== "live";
+    }
+    function shouldIncludeSessionMetadata(profile) {
+      return profile !== "live";
+    }
+    function shouldIncludeRuntimeMetadata(profile) {
+      return profile !== "live";
+    }
     function findCdpManager(cdpManagers, key) {
       const exact = cdpManagers.get(key);
       if (exact) return exact;
@@ -34919,74 +34977,88 @@ ${effect.notification.body || ""}`.trim();
       "set_mode",
       "set_thought_level"
     ];
-    function buildIdeWorkspaceSession(state, cdpManagers) {
-      const activeChat = normalizeActiveChatData(state.activeChat);
+    function buildIdeWorkspaceSession(state, cdpManagers, options) {
+      const profile = options.profile || "full";
+      const activeChat = normalizeActiveChatData(state.activeChat, getActiveChatOptions(profile));
+      const includeSessionMetadata = shouldIncludeSessionMetadata(profile);
+      const includeSessionControls = shouldIncludeSessionControls(profile);
       const title = activeChat?.title || state.name;
       return {
         id: state.instanceId || state.type,
         parentId: null,
         providerType: state.type,
-        providerName: state.name,
+        ...includeSessionMetadata && { providerName: state.name },
         kind: "workspace",
         transport: "cdp-page",
         status: normalizeManagedStatus(activeChat?.status || state.status, {
           activeModal: activeChat?.activeModal || null
         }),
         title,
-        workspace: state.workspace || null,
+        ...includeSessionMetadata && { workspace: state.workspace || null },
         activeChat,
-        capabilities: IDE_SESSION_CAPABILITIES,
+        ...includeSessionMetadata && { capabilities: IDE_SESSION_CAPABILITIES },
         cdpConnected: state.cdpConnected ?? isCdpConnected(cdpManagers, state.type),
         currentModel: state.currentModel,
         currentPlan: state.currentPlan,
         currentAutoApprove: state.currentAutoApprove,
-        controlValues: state.controlValues,
-        providerControls: buildFallbackControls(
-          state.providerControls,
-          state.currentModel,
-          state.currentPlan
-        ),
+        ...includeSessionControls && {
+          controlValues: state.controlValues,
+          providerControls: buildFallbackControls(
+            state.providerControls,
+            state.currentModel,
+            state.currentPlan
+          )
+        },
         errorMessage: state.errorMessage,
         errorReason: state.errorReason,
         lastUpdated: state.lastUpdated
       };
     }
-    function buildExtensionAgentSession(parent, ext) {
-      const activeChat = normalizeActiveChatData(ext.activeChat);
+    function buildExtensionAgentSession(parent, ext, options) {
+      const profile = options.profile || "full";
+      const activeChat = normalizeActiveChatData(ext.activeChat, getActiveChatOptions(profile));
+      const includeSessionMetadata = shouldIncludeSessionMetadata(profile);
+      const includeSessionControls = shouldIncludeSessionControls(profile);
       return {
         id: ext.instanceId || `${parent.instanceId}:${ext.type}`,
         parentId: parent.instanceId || parent.type,
         providerType: ext.type,
-        providerName: ext.name,
+        ...includeSessionMetadata && { providerName: ext.name },
         kind: "agent",
         transport: "cdp-webview",
         status: normalizeManagedStatus(activeChat?.status || ext.status, {
           activeModal: activeChat?.activeModal || null
         }),
         title: activeChat?.title || ext.name,
-        workspace: parent.workspace || null,
+        ...includeSessionMetadata && { workspace: parent.workspace || null },
         activeChat,
-        capabilities: EXTENSION_SESSION_CAPABILITIES,
+        ...includeSessionMetadata && { capabilities: EXTENSION_SESSION_CAPABILITIES },
         currentModel: ext.currentModel,
         currentPlan: ext.currentPlan,
-        controlValues: ext.controlValues,
-        providerControls: buildFallbackControls(
-          ext.providerControls,
-          ext.currentModel,
-          ext.currentPlan
-        ),
+        ...includeSessionControls && {
+          controlValues: ext.controlValues,
+          providerControls: buildFallbackControls(
+            ext.providerControls,
+            ext.currentModel,
+            ext.currentPlan
+          )
+        },
         errorMessage: ext.errorMessage,
         errorReason: ext.errorReason,
         lastUpdated: ext.lastUpdated
       };
     }
-    function buildCliSession(state) {
-      const activeChat = normalizeActiveChatData(state.activeChat);
+    function buildCliSession(state, options) {
+      const profile = options.profile || "full";
+      const activeChat = normalizeActiveChatData(state.activeChat, getActiveChatOptions(profile));
+      const includeSessionMetadata = shouldIncludeSessionMetadata(profile);
+      const includeRuntimeMetadata = shouldIncludeRuntimeMetadata(profile);
+      const includeSessionControls = shouldIncludeSessionControls(profile);
       return {
         id: state.instanceId,
         parentId: null,
         providerType: state.type,
-        providerName: state.name,
+        ...includeSessionMetadata && { providerName: state.name },
         providerSessionId: state.providerSessionId,
         kind: "agent",
         transport: "pty",
@@ -34994,74 +35066,85 @@ ${effect.notification.body || ""}`.trim();
           activeModal: activeChat?.activeModal || null
         }),
         title: activeChat?.title || state.name,
-        workspace: state.workspace || null,
-        runtimeKey: state.runtime?.runtimeKey,
-        runtimeDisplayName: state.runtime?.displayName,
-        runtimeWorkspaceLabel: state.runtime?.workspaceLabel,
-        runtimeWriteOwner: state.runtime?.writeOwner || null,
-        runtimeAttachedClients: state.runtime?.attachedClients || [],
+        ...includeSessionMetadata && { workspace: state.workspace || null },
+        ...includeRuntimeMetadata && {
+          runtimeKey: state.runtime?.runtimeKey,
+          runtimeDisplayName: state.runtime?.displayName,
+          runtimeWorkspaceLabel: state.runtime?.workspaceLabel,
+          runtimeWriteOwner: state.runtime?.writeOwner || null,
+          runtimeAttachedClients: state.runtime?.attachedClients || []
+        },
         mode: state.mode,
         resume: state.resume,
         activeChat,
-        capabilities: state.mode === "terminal" ? PTY_SESSION_CAPABILITIES : CLI_CHAT_SESSION_CAPABILITIES,
-        controlValues: state.controlValues,
-        providerControls: buildFallbackControls(
-          state.providerControls
-        ),
+        ...includeSessionMetadata && {
+          capabilities: state.mode === "terminal" ? PTY_SESSION_CAPABILITIES : CLI_CHAT_SESSION_CAPABILITIES
+        },
+        ...includeSessionControls && {
+          controlValues: state.controlValues,
+          providerControls: buildFallbackControls(
+            state.providerControls
+          )
+        },
         errorMessage: state.errorMessage,
         errorReason: state.errorReason,
         lastUpdated: state.lastUpdated
       };
     }
-    function buildAcpSession(state) {
-      const activeChat = normalizeActiveChatData(state.activeChat);
+    function buildAcpSession(state, options) {
+      const profile = options.profile || "full";
+      const activeChat = normalizeActiveChatData(state.activeChat, getActiveChatOptions(profile));
+      const includeSessionMetadata = shouldIncludeSessionMetadata(profile);
+      const includeSessionControls = shouldIncludeSessionControls(profile);
       return {
         id: state.instanceId,
         parentId: null,
         providerType: state.type,
-        providerName: state.name,
+        ...includeSessionMetadata && { providerName: state.name },
         kind: "agent",
         transport: "acp",
         status: normalizeManagedStatus(activeChat?.status || state.status, {
           activeModal: activeChat?.activeModal || null
         }),
         title: activeChat?.title || state.name,
-        workspace: state.workspace || null,
+        ...includeSessionMetadata && { workspace: state.workspace || null },
         activeChat,
-        capabilities: ACP_SESSION_CAPABILITIES,
+        ...includeSessionMetadata && { capabilities: ACP_SESSION_CAPABILITIES },
         currentModel: state.currentModel,
         currentPlan: state.currentPlan,
-        acpConfigOptions: state.acpConfigOptions,
-        acpModes: state.acpModes,
-        controlValues: state.controlValues,
-        providerControls: buildFallbackControls(
-          state.providerControls,
-          state.currentModel,
-          state.currentPlan,
-          state.acpConfigOptions,
-          state.acpModes
-        ),
+        ...includeSessionControls && {
+          acpConfigOptions: state.acpConfigOptions,
+          acpModes: state.acpModes,
+          controlValues: state.controlValues,
+          providerControls: buildFallbackControls(
+            state.providerControls,
+            state.currentModel,
+            state.currentPlan,
+            state.acpConfigOptions,
+            state.acpModes
+          )
+        },
         errorMessage: state.errorMessage,
         errorReason: state.errorReason,
         lastUpdated: state.lastUpdated
       };
     }
-    function buildSessionEntries(allStates, cdpManagers) {
+    function buildSessionEntries(allStates, cdpManagers, options = {}) {
       const sessions = [];
       const ideStates = allStates.filter((s15) => s15.category === "ide");
       const cliStates = allStates.filter((s15) => s15.category === "cli");
       const acpStates = allStates.filter((s15) => s15.category === "acp");
       for (const state of ideStates) {
-        sessions.push(buildIdeWorkspaceSession(state, cdpManagers));
+        sessions.push(buildIdeWorkspaceSession(state, cdpManagers, options));
         for (const ext of state.extensions) {
-          sessions.push(buildExtensionAgentSession(state, ext));
+          sessions.push(buildExtensionAgentSession(state, ext, options));
         }
       }
       for (const state of cliStates) {
-        sessions.push(buildCliSession(state));
+        sessions.push(buildCliSession(state, options));
       }
       for (const state of acpStates) {
-        sessions.push(buildAcpSession(state));
+        sessions.push(buildAcpSession(state, options));
       }
       const extensionParentIds = new Set(
         sessions.filter((session) => session.transport === "cdp-webview" && !!session.parentId).map((session) => session.parentId)
@@ -35117,9 +35200,26 @@ ${effect.notification.body || ""}`.trim();
       }
     }
     init_logger();
+    function flattenContent(content) {
+      if (typeof content === "string") return content;
+      return content.filter((b2) => b2.type === "text").map((b2) => b2.text).join("\n");
+    }
     init_logger();
     var RECENT_SEND_WINDOW_MS = 1200;
     var recentSendByTarget = /* @__PURE__ */ new Map();
+    function hashSignatureParts2(parts) {
+      let hash2 = 2166136261;
+      for (const part of parts) {
+        const text = String(part || "");
+        for (let i = 0; i < text.length; i += 1) {
+          hash2 ^= text.charCodeAt(i);
+          hash2 = Math.imul(hash2, 16777619) >>> 0;
+        }
+        hash2 ^= 255;
+        hash2 = Math.imul(hash2, 16777619) >>> 0;
+      }
+      return hash2.toString(16).padStart(8, "0");
+    }
     function getCurrentProviderType(h, fallback = "") {
       return h.currentSession?.providerType || h.currentProviderType || fallback;
     }
@@ -35193,6 +35293,134 @@ ${effect.notification.body || ""}`.trim();
         return value;
       }
     }
+    function getChatMessageSignature(message) {
+      if (!message) return "";
+      let content = "";
+      try {
+        content = JSON.stringify(message.content ?? "");
+      } catch {
+        content = String(message.content ?? "");
+      }
+      return hashSignatureParts2([
+        String(message.id || ""),
+        String(message.index ?? ""),
+        String(message.role || ""),
+        String(message.receivedAt ?? message.timestamp ?? ""),
+        content
+      ]);
+    }
+    function normalizeReadChatCursor(args) {
+      const knownMessageCount = Math.max(0, Number(args?.knownMessageCount || 0));
+      const lastMessageSignature = typeof args?.lastMessageSignature === "string" ? args.lastMessageSignature : "";
+      const tailLimit = Math.max(0, Number(args?.tailLimit || 0));
+      return { knownMessageCount, lastMessageSignature, tailLimit };
+    }
+    function normalizeReadChatMessages(payload) {
+      const messages = Array.isArray(payload.messages) ? payload.messages : [];
+      return messages;
+    }
+    function deriveHistoryDedupKey(message) {
+      const unitKey = typeof message._unitKey === "string" ? message._unitKey.trim() : "";
+      if (unitKey) return `read_chat:${unitKey}`;
+      const turnKey = typeof message._turnKey === "string" ? message._turnKey.trim() : "";
+      if (!turnKey) return void 0;
+      let content = "";
+      try {
+        content = JSON.stringify(message.content ?? "");
+      } catch {
+        content = String(message.content ?? "");
+      }
+      return `read_chat:${turnKey}:${String(message.role || "").toLowerCase()}:${content}`;
+    }
+    function toHistoryPersistedMessages(messages) {
+      return messages.map((message) => ({
+        role: message.role,
+        content: flattenContent(message.content),
+        receivedAt: typeof message.receivedAt === "number" ? message.receivedAt : void 0,
+        kind: typeof message.kind === "string" ? message.kind : void 0,
+        senderName: typeof message.senderName === "string" ? message.senderName : void 0,
+        historyDedupKey: deriveHistoryDedupKey(message)
+      }));
+    }
+    function computeReadChatSync(messages, cursor) {
+      const totalMessages = messages.length;
+      const lastMessageSignature = getChatMessageSignature(messages[totalMessages - 1]);
+      const { knownMessageCount, lastMessageSignature: knownSignature } = cursor;
+      if (!knownMessageCount || !knownSignature) {
+        return {
+          syncMode: "full",
+          replaceFrom: 0,
+          messages,
+          totalMessages,
+          lastMessageSignature
+        };
+      }
+      if (knownMessageCount > totalMessages) {
+        return {
+          syncMode: "full",
+          replaceFrom: 0,
+          messages,
+          totalMessages,
+          lastMessageSignature
+        };
+      }
+      if (knownMessageCount === totalMessages && knownSignature === lastMessageSignature) {
+        return {
+          syncMode: "noop",
+          replaceFrom: totalMessages,
+          messages: [],
+          totalMessages,
+          lastMessageSignature
+        };
+      }
+      if (knownMessageCount < totalMessages) {
+        const anchorSignature = getChatMessageSignature(messages[knownMessageCount - 1]);
+        if (anchorSignature === knownSignature) {
+          return {
+            syncMode: "append",
+            replaceFrom: knownMessageCount,
+            messages: messages.slice(knownMessageCount),
+            totalMessages,
+            lastMessageSignature
+          };
+        }
+      }
+      const replaceFrom = Math.max(0, Math.min(knownMessageCount - 1, totalMessages));
+      return {
+        syncMode: replaceFrom === 0 ? "full" : "replace_tail",
+        replaceFrom,
+        messages: replaceFrom === 0 ? messages : messages.slice(replaceFrom),
+        totalMessages,
+        lastMessageSignature
+      };
+    }
+    function buildReadChatCommandResult(payload, args) {
+      const messages = normalizeReadChatMessages(payload);
+      const cursor = normalizeReadChatCursor(args);
+      if (!cursor.knownMessageCount && !cursor.lastMessageSignature && cursor.tailLimit > 0 && messages.length > cursor.tailLimit) {
+        const tailMessages = messages.slice(-cursor.tailLimit);
+        const lastMessageSignature = getChatMessageSignature(tailMessages[tailMessages.length - 1]);
+        return {
+          success: true,
+          ...payload,
+          messages: tailMessages,
+          syncMode: "full",
+          replaceFrom: 0,
+          totalMessages: messages.length,
+          lastMessageSignature
+        };
+      }
+      const sync = computeReadChatSync(messages, cursor);
+      return {
+        success: true,
+        ...payload,
+        messages: sync.messages,
+        syncMode: sync.syncMode,
+        replaceFrom: sync.replaceFrom,
+        totalMessages: sync.totalMessages,
+        lastMessageSignature: sync.lastMessageSignature
+      };
+    }
     function didProviderConfirmSend(result) {
       const parsed = parseMaybeJson(result);
       if (parsed === true) return true;
@@ -35266,12 +35494,11 @@ ${effect.notification.body || ""}`.trim();
           _log(`${transport} adapter: ${adapter.cliType}`);
           const status = adapter.getStatus();
           if (status) {
-            return {
-              success: true,
+            return buildReadChatCommandResult({
               messages: status.messages || [],
               status: status.status,
               activeModal: status.activeModal
-            };
+            }, args);
           }
         }
         return { success: false, error: `${transport} adapter not found` };
@@ -35291,12 +35518,12 @@ ${effect.notification.body || ""}`.trim();
               _log(`Extension OK: ${parsed.messages?.length || 0} msgs`);
               h.historyWriter.appendNewMessages(
                 provider?.type || "unknown_extension",
-                parsed.messages || [],
+                toHistoryPersistedMessages(normalizeReadChatMessages(parsed)),
                 parsed.title,
                 args?.targetSessionId,
                 historySessionId
               );
-              return { success: true, ...parsed };
+              return buildReadChatCommandResult(parsed, args);
             }
           }
         } catch (e) {
@@ -35308,21 +35535,25 @@ ${effect.notification.body || ""}`.trim();
           if (cdp2 && parentSessionId) {
             const stream = await h.agentStream.collectActiveSession(cdp2, parentSessionId);
             if (stream?.agentType !== provider?.type) {
-              return { success: true, messages: [], status: "idle" };
+              return buildReadChatCommandResult({ messages: [], status: "idle" }, args);
             }
             if (stream) {
               h.historyWriter.appendNewMessages(
                 stream.agentType,
-                stream.messages || [],
+                toHistoryPersistedMessages(stream.messages || []),
                 void 0,
                 args?.targetSessionId,
                 historySessionId
               );
-              return { success: true, messages: stream.messages || [], status: stream.status, agentType: stream.agentType };
+              return buildReadChatCommandResult({
+                messages: stream.messages || [],
+                status: stream.status,
+                agentType: stream.agentType
+              }, args);
             }
           }
         }
-        return { success: true, messages: [], status: "idle" };
+        return buildReadChatCommandResult({ messages: [], status: "idle" }, args);
       }
       const cdp = h.getCdp();
       if (!cdp?.isConnected) return { success: false, error: "CDP not connected" };
@@ -35344,18 +35575,18 @@ ${effect.notification.body || ""}`.trim();
               _log(`Webview OK: ${parsed.messages?.length || 0} msgs`);
               h.historyWriter.appendNewMessages(
                 provider?.type || getCurrentProviderType(h, "unknown_webview"),
-                parsed.messages || [],
+                toHistoryPersistedMessages(normalizeReadChatMessages(parsed)),
                 parsed.title,
                 args?.targetSessionId,
                 historySessionId
               );
-              return { success: true, ...parsed };
+              return buildReadChatCommandResult(parsed, args);
             }
           }
         } catch (e) {
           _log(`Webview readChat error: ${e.message}`);
         }
-        return { success: true, messages: [], status: "idle" };
+        return buildReadChatCommandResult({ messages: [], status: "idle" }, args);
       }
       const script = h.getProviderScript("readChat") || h.getProviderScript("read_chat");
       if (script) {
@@ -35372,18 +35603,18 @@ ${effect.notification.body || ""}`.trim();
             _log(`OK: ${parsed.messages?.length} msgs`);
             h.historyWriter.appendNewMessages(
               provider?.type || getCurrentProviderType(h, "unknown_ide"),
-              parsed.messages || [],
+              toHistoryPersistedMessages(normalizeReadChatMessages(parsed)),
               parsed.title,
               args?.targetSessionId,
               historySessionId
             );
-            return { success: true, ...parsed };
+            return buildReadChatCommandResult(parsed, args);
           }
         } catch (e) {
           LOG2.info("Command", `[read_chat] Script error: ${e.message}`);
         }
       }
-      return { success: true, messages: [], status: "idle" };
+      return buildReadChatCommandResult({ messages: [], status: "idle" }, args);
     }
     async function handleSendChat(h, args) {
       const text = args?.text || args?.message;
@@ -36500,21 +36731,21 @@ ${effect.notification.body || ""}`.trim();
       });
     }
     async function executeProviderScript(h, args, scriptName) {
-      const { agentType, ideType } = args || {};
-      if (!agentType) return { success: false, error: "agentType is required" };
+      const resolvedProviderType = h.currentSession?.providerType || h.currentProviderType || args?.agentType || args?.providerType;
+      if (!resolvedProviderType) return { success: false, error: "targetSessionId or providerType is required" };
       const loader = h.ctx.providerLoader;
       if (!loader) return { success: false, error: "ProviderLoader not initialized" };
-      const provider = loader.resolve(agentType);
-      if (!provider) return { success: false, error: `Provider not found: ${agentType}` };
+      const provider = loader.resolve(resolvedProviderType);
+      if (!provider) return { success: false, error: `Provider not found: ${resolvedProviderType}` };
       const webviewScriptName = `webview${scriptName.charAt(0).toUpperCase() + scriptName.slice(1)}`;
       const hasWebviewScript = provider.category === "ide" && !!provider.scripts?.[webviewScriptName];
       const actualScriptName = hasWebviewScript ? webviewScriptName : scriptName;
       if (!provider.scripts?.[actualScriptName]) {
-        return { success: false, error: `Script '${actualScriptName}' not available for ${agentType}` };
+        return { success: false, error: `Script '${actualScriptName}' not available for ${resolvedProviderType}` };
       }
       const normalizedArgs = normalizeProviderScriptArgs(args);
       if (provider.category === "cli") {
-        const adapter = h.getCliAdapter(args?.targetSessionId || agentType);
+        const adapter = h.getCliAdapter(args?.targetSessionId || resolvedProviderType);
         if (!adapter?.invokeScript) {
           return { success: false, error: `CLI adapter does not support script '${actualScriptName}'` };
         }
@@ -36539,7 +36770,7 @@ ${effect.notification.body || ""}`.trim();
       const scriptFn = provider.scripts[actualScriptName];
       const scriptCode = scriptFn(normalizedArgs);
       if (!scriptCode) return { success: false, error: `Script '${actualScriptName}' returned null` };
-      const cdpKey = provider.category === "ide" ? h.currentSession?.cdpManagerKey || h.currentManagerKey || agentType : h.currentSession?.cdpManagerKey || h.currentManagerKey || ideType;
+      const cdpKey = provider.category === "ide" ? h.currentSession?.cdpManagerKey || h.currentManagerKey || resolvedProviderType : h.currentSession?.cdpManagerKey || h.currentManagerKey;
       LOG2.info("Command", `[ExtScript] provider=${provider.type} category=${provider.category} cdpKey=${cdpKey}`);
       const cdp = h.getCdp(cdpKey);
       if (!cdp?.isConnected) return { success: false, error: `No CDP connection for ${cdpKey || "any"}` };
@@ -36547,7 +36778,7 @@ ${effect.notification.body || ""}`.trim();
         let result;
         if (provider.category === "extension") {
           const runtimeSessionId = h.currentSession?.sessionId || args?.targetSessionId;
-          if (!runtimeSessionId) return { success: false, error: `No target session found for ${agentType}` };
+          if (!runtimeSessionId) return { success: false, error: `No target session found for ${resolvedProviderType}` };
           const parentSessionId = h.currentSession?.parentSessionId;
           if (parentSessionId) {
             await h.agentStream?.setActiveSession(cdp, parentSessionId, runtimeSessionId);
@@ -36576,7 +36807,7 @@ ${effect.notification.body || ""}`.trim();
             }
           } else {
             if (!targetSessionId) {
-              return { success: false, error: `No active session found for ${agentType}` };
+              return { success: false, error: `No active session found for ${resolvedProviderType}` };
             }
             result = await cdp.evaluateInSessionFrame(targetSessionId, scriptCode);
           }
@@ -37949,10 +38180,6 @@ ${effect.notification.body || ""}`.trim();
     var import_stream = require("stream");
     var import_child_process5 = require("child_process");
     var import_sdk = (init_acp(), __toCommonJS(acp_exports));
-    function flattenContent(content) {
-      if (typeof content === "string") return content;
-      return content.filter((b2) => b2.type === "text").map((b2) => b2.text).join("\n");
-    }
     init_logger();
     var AcpProviderInstance = class {
       constructor(provider, workingDir, cliArgs = []) {
@@ -41302,6 +41529,37 @@ Run 'adhdev doctor' for detailed diagnostics.`
         ...provider.detectedPath !== void 0 ? { detectedPath: provider.detectedPath } : {}
       }));
     }
+    function buildMachineInfo2(profile = "full") {
+      const base = {
+        hostname: os16.hostname(),
+        platform: os16.platform()
+      };
+      if (profile === "live") {
+        return base;
+      }
+      if (profile === "metadata") {
+        const memSnap2 = getHostMemorySnapshot();
+        return {
+          ...base,
+          arch: os16.arch(),
+          cpus: os16.cpus().length,
+          totalMem: memSnap2.totalMem,
+          release: os16.release()
+        };
+      }
+      const memSnap = getHostMemorySnapshot();
+      return {
+        ...base,
+        arch: os16.arch(),
+        cpus: os16.cpus().length,
+        totalMem: memSnap.totalMem,
+        freeMem: memSnap.freeMem,
+        availableMem: memSnap.availableMem,
+        loadavg: os16.loadavg(),
+        uptime: os16.uptime(),
+        release: os16.release()
+      };
+    }
     function parseMessageTime(value) {
       if (typeof value === "number" && Number.isFinite(value)) return value;
       if (typeof value === "string") {
@@ -41357,26 +41615,35 @@ Run 'adhdev doctor' for detailed diagnostics.`
       })).sort((a, b2) => b2.lastLaunchedAt - a.lastLaunchedAt).slice(0, 12);
     }
     function buildStatusSnapshot2(options) {
+      const profile = options.profile || "full";
       const cfg = loadConfig2();
       const state = loadState();
       const wsState = getWorkspaceState2(cfg);
-      const memSnap = getHostMemorySnapshot();
       const recentActivity = getRecentActivity(state, 20);
-      const sessions = buildSessionEntries(
+      const unreadSourceSessions = buildSessionEntries(
         options.allStates,
-        options.cdpManagers
+        options.cdpManagers,
+        { profile: "full" }
       );
-      for (const session of sessions) {
-        const lastSeenAt = getSessionSeenAt(state, session.id);
-        const seenCompletionMarker = getSessionSeenMarker(state, session.id);
-        const lastUsedAt = getSessionLastUsedAt(session);
-        const completionMarker = getSessionCompletionMarker(session);
-        const { unread, inboxBucket } = session.surfaceHidden ? { unread: false, inboxBucket: "idle" } : getUnreadState(
-          getSessionMessageUpdatedAt(session) > 0,
-          session.status,
+      const sessions = profile === "full" ? unreadSourceSessions : buildSessionEntries(
+        options.allStates,
+        options.cdpManagers,
+        { profile }
+      );
+      const sessionsById = new Map(sessions.map((session) => [session.id, session]));
+      for (const sourceSession of unreadSourceSessions) {
+        const session = sessionsById.get(sourceSession.id);
+        if (!session) continue;
+        const lastSeenAt = getSessionSeenAt(state, sourceSession.id);
+        const seenCompletionMarker = getSessionSeenMarker(state, sourceSession.id);
+        const lastUsedAt = getSessionLastUsedAt(sourceSession);
+        const completionMarker = getSessionCompletionMarker(sourceSession);
+        const { unread, inboxBucket } = sourceSession.surfaceHidden ? { unread: false, inboxBucket: "idle" } : getUnreadState(
+          getSessionMessageUpdatedAt(sourceSession) > 0,
+          sourceSession.status,
           lastUsedAt,
           lastSeenAt,
-          getLastMessageRole(session),
+          getLastMessageRole(sourceSession),
           completionMarker,
           seenCompletionMarker
         );
@@ -41386,39 +41653,30 @@ Run 'adhdev doctor' for detailed diagnostics.`
         if (READ_DEBUG_ENABLED && (session.unread || session.inboxBucket !== "idle" || session.providerType.includes("codex"))) {
           LOG2.info(
             "RecentRead",
-            `snapshot session id=${session.id} provider=${session.providerType} status=${String(session.status || "")} bucket=${inboxBucket} unread=${String(unread)} lastSeenAt=${lastSeenAt} completionMarker=${completionMarker || "-"} seenMarker=${seenCompletionMarker || "-"} lastUpdated=${String(session.lastUpdated || 0)} lastUsedAt=${lastUsedAt} lastRole=${getLastMessageRole(session)} msgUpdatedAt=${getSessionMessageUpdatedAt(session)}`
+            `snapshot session id=${session.id} provider=${session.providerType} status=${String(session.status || "")} bucket=${inboxBucket} unread=${String(unread)} lastSeenAt=${lastSeenAt} completionMarker=${completionMarker || "-"} seenMarker=${seenCompletionMarker || "-"} lastUpdated=${String(session.lastUpdated || 0)} lastUsedAt=${lastUsedAt} lastRole=${getLastMessageRole(sourceSession)} msgUpdatedAt=${getSessionMessageUpdatedAt(sourceSession)}`
           );
         }
       }
-      const terminalBackend = getTerminalBackendRuntimeStatus();
+      const includeMachineMetadata = profile !== "live";
+      const terminalBackend = includeMachineMetadata ? getTerminalBackendRuntimeStatus() : void 0;
       return {
         instanceId: options.instanceId,
-        version: options.version,
-        daemonMode: options.daemonMode,
-        machine: {
-          hostname: os16.hostname(),
-          platform: os16.platform(),
-          arch: os16.arch(),
-          cpus: os16.cpus().length,
-          totalMem: memSnap.totalMem,
-          freeMem: memSnap.freeMem,
-          availableMem: memSnap.availableMem,
-          loadavg: os16.loadavg(),
-          uptime: os16.uptime(),
-          release: os16.release()
-        },
-        machineNickname: options.machineNickname ?? cfg.machineNickname ?? null,
+        ...includeMachineMetadata ? { version: options.version } : {},
+        machine: buildMachineInfo2(profile),
+        ...includeMachineMetadata ? { machineNickname: options.machineNickname ?? cfg.machineNickname ?? null } : {},
         timestamp: options.timestamp ?? Date.now(),
-        detectedIdes: buildDetectedIdeInfos(options.detectedIdes, options.cdpManagers),
         ...options.p2p ? { p2p: options.p2p } : {},
         sessions,
-        workspaces: wsState.workspaces,
-        defaultWorkspaceId: wsState.defaultWorkspaceId,
-        defaultWorkspacePath: wsState.defaultWorkspacePath,
-        terminalSizingMode: cfg.terminalSizingMode || "measured",
-        recentLaunches: buildRecentLaunches(recentActivity),
-        terminalBackend,
-        availableProviders: buildAvailableProviders(options.providerLoader)
+        ...terminalBackend ? { terminalBackend } : {},
+        ...includeMachineMetadata && {
+          detectedIdes: buildDetectedIdeInfos(options.detectedIdes, options.cdpManagers),
+          workspaces: wsState.workspaces,
+          defaultWorkspaceId: wsState.defaultWorkspaceId,
+          defaultWorkspacePath: wsState.defaultWorkspacePath,
+          terminalSizingMode: cfg.terminalSizingMode || "measured",
+          recentLaunches: buildRecentLaunches(recentActivity),
+          availableProviders: buildAvailableProviders(options.providerLoader)
+        }
       };
     }
     var import_child_process7 = require("child_process");
@@ -41970,6 +42228,25 @@ Run 'adhdev doctor' for detailed diagnostics.`
             updateConfig({ userName: name });
             return { success: true, userName: name };
           }
+          case "get_status_metadata": {
+            const snapshot = buildStatusSnapshot2({
+              allStates: this.deps.instanceManager.collectAllStates(),
+              cdpManagers: this.deps.cdpManagers,
+              providerLoader: this.deps.providerLoader,
+              detectedIdes: this.deps.detectedIdes.value,
+              instanceId: this.deps.statusInstanceId || loadConfig2().machineId || "daemon",
+              version: this.deps.statusVersion || "unknown",
+              profile: "metadata"
+            });
+            return { success: true, status: snapshot };
+          }
+          case "get_machine_runtime_stats": {
+            return {
+              success: true,
+              machine: buildMachineInfo2("full"),
+              timestamp: Date.now()
+            };
+          }
           case "mark_session_seen": {
             const sessionId = args?.sessionId;
             if (!sessionId || typeof sessionId !== "string") {
@@ -42121,6 +42398,7 @@ Run 'adhdev doctor' for detailed diagnostics.`
       lastStatusSentAt = 0;
       statusPendingThrottle = false;
       lastP2PStatusHash = "";
+      lastServerStatusHash = "";
       lastStatusSummary = "";
       statusTimer = null;
       p2pTimer = null;
@@ -42131,11 +42409,11 @@ Run 'adhdev doctor' for detailed diagnostics.`
       // ─── Lifecycle ───────────────────────────────────
       startReporting() {
         setTimeout(() => {
-          this.sendUnifiedStatusReport().catch((e) => LOG2.warn("Status", `Initial report failed: ${e?.message}`));
+          this.sendUnifiedStatusReport({ forceServer: true, reason: "initial" }).catch((e) => LOG2.warn("Status", `Initial report failed: ${e?.message}`));
         }, 2e3);
         const scheduleServerReport = () => {
           this.statusTimer = setTimeout(() => {
-            this.sendUnifiedStatusReport().catch((e) => LOG2.warn("Status", `Periodic report failed: ${e?.message}`));
+            this.sendUnifiedStatusReport({ forceServer: true, reason: "periodic" }).catch((e) => LOG2.warn("Status", `Periodic report failed: ${e?.message}`));
             scheduleServerReport();
           }, 3e4);
         };
@@ -42172,9 +42450,58 @@ Run 'adhdev doctor' for detailed diagnostics.`
           }, 5e3 - elapsed);
         }
       }
+      toDaemonStatusEventName(value) {
+        switch (value) {
+          case "agent:generating_started":
+          case "agent:waiting_approval":
+          case "agent:generating_completed":
+          case "agent:stopped":
+          case "monitor:long_generating":
+            return value;
+          default:
+            return null;
+        }
+      }
+      buildServerStatusEvent(event) {
+        const eventName = this.toDaemonStatusEventName(event.event);
+        if (!eventName) return null;
+        if (eventName.startsWith("provider:")) {
+          return null;
+        }
+        const payload = {
+          event: eventName,
+          timestamp: typeof event.timestamp === "number" && Number.isFinite(event.timestamp) ? event.timestamp : Date.now()
+        };
+        if (typeof event.targetSessionId === "string" && event.targetSessionId.trim()) {
+          payload.targetSessionId = event.targetSessionId.trim();
+        }
+        const providerType = typeof event.providerType === "string" && event.providerType.trim() ? event.providerType.trim() : typeof event.ideType === "string" && event.ideType.trim() ? event.ideType.trim() : "";
+        if (providerType) {
+          payload.providerType = providerType;
+        }
+        if (typeof event.duration === "number" && Number.isFinite(event.duration)) {
+          payload.duration = event.duration;
+        }
+        if (typeof event.elapsedSec === "number" && Number.isFinite(event.elapsedSec)) {
+          payload.elapsedSec = event.elapsedSec;
+        }
+        if (typeof event.modalMessage === "string" && event.modalMessage.trim()) {
+          payload.modalMessage = event.modalMessage;
+        }
+        if (Array.isArray(event.modalButtons)) {
+          const modalButtons = event.modalButtons.filter((button) => typeof button === "string" && button.trim().length > 0);
+          if (modalButtons.length > 0) {
+            payload.modalButtons = modalButtons;
+          }
+        }
+        return payload;
+      }
       emitStatusEvent(event) {
         LOG2.info("StatusEvent", `${event.event} (${event.providerType || event.ideType || ""})`);
-        this.deps.serverConn?.sendMessage("status_event", event);
+        const serverEvent = this.buildServerStatusEvent(event);
+        if (!serverEvent) return;
+        this.deps.p2p?.sendStatusEvent(serverEvent);
+        this.deps.serverConn?.sendMessage("status_event", serverEvent);
       }
       removeAgentTracking(_key) {
       }
@@ -42243,17 +42570,16 @@ Run 'adhdev doctor' for detailed diagnostics.`
             detectedIdes: this.deps.detectedIdes || [],
             instanceId: this.deps.instanceId,
             version: this.deps.daemonVersion || "unknown",
-            daemonMode: true,
             timestamp: now,
             p2p: {
               available: p2p?.isAvailable || false,
               state: p2p?.connectionState || "unavailable",
               peers: p2p?.connectedPeerCount || 0,
               screenshotActive: p2p?.screenshotActive || false
-            }
+            },
+            profile: "live"
           }),
-          screenshotUsage: this.deps.getScreenshotUsage?.() || null,
-          connectedExtensions: []
+          screenshotUsage: this.deps.getScreenshotUsage?.() || null
         };
         const payloadBytes = JSON.stringify(payload).length;
         const p2pSent = this.sendP2PPayload(payload);
@@ -42268,46 +42594,48 @@ Run 'adhdev doctor' for detailed diagnostics.`
         }
         if (opts?.p2pOnly) return;
         const wsPayload = {
-          daemonMode: true,
           sessions: sessions.map((session) => ({
             id: session.id,
             parentId: session.parentId,
             providerType: session.providerType,
-            providerName: session.providerName,
+            providerName: session.providerName || session.providerType,
             kind: session.kind,
             transport: session.transport,
             status: session.status,
-            workspace: session.workspace,
+            workspace: session.workspace ?? null,
             title: session.title,
             cdpConnected: session.cdpConnected,
             currentModel: session.currentModel,
             currentPlan: session.currentPlan,
-            currentAutoApprove: session.currentAutoApprove,
-            lastUpdated: session.lastUpdated,
-            unread: session.unread,
-            lastSeenAt: session.lastSeenAt,
-            inboxBucket: session.inboxBucket,
-            surfaceHidden: session.surfaceHidden,
-            controlValues: session.controlValues,
-            providerControls: session.providerControls,
-            acpConfigOptions: session.acpConfigOptions,
-            acpModes: session.acpModes
+            currentAutoApprove: session.currentAutoApprove
           })),
           p2p: payload.p2p,
-          timestamp: now,
-          detectedIdes: payload.detectedIdes,
-          availableProviders: payload.availableProviders
+          timestamp: now
         };
+        const wsHash = this.simpleHash(JSON.stringify({
+          ...wsPayload,
+          timestamp: void 0
+        }));
+        if (!opts?.forceServer && wsHash === this.lastServerStatusHash) {
+          LOG2.debug("Server", `skip duplicate status_report${opts?.reason ? ` (${opts.reason})` : ""}`);
+          return;
+        }
+        this.lastServerStatusHash = wsHash;
         serverConn.sendMessage("status_report", wsPayload);
-        LOG2.debug("Server", `sent status_report (${JSON.stringify(wsPayload).length} bytes)`);
+        LOG2.debug("Server", `sent status_report (${JSON.stringify(wsPayload).length} bytes)${opts?.reason ? ` [${opts.reason}]` : ""}`);
       }
       // ─── P2P ─────────────────────────────────────────
       sendP2PPayload(payload) {
         const { timestamp: _ts, system: _sys, ...hashTarget } = payload;
+        const sessions = Array.isArray(hashTarget.sessions) ? hashTarget.sessions.map((session) => {
+          if (!session || typeof session !== "object") return session;
+          const { lastUpdated: _lu, ...stableSession } = session;
+          return stableSession;
+        }) : hashTarget.sessions;
         const hashPayload = hashTarget.machine ? (() => {
           const { freeMem: _f, availableMem: _a2, loadavg: _l2, uptime: _u, ...stableMachine } = hashTarget.machine;
-          return { ...hashTarget, machine: stableMachine };
-        })() : hashTarget;
+          return { ...hashTarget, sessions, machine: stableMachine };
+        })() : { ...hashTarget, sessions };
         const h = this.simpleHash(JSON.stringify(hashPayload));
         if (h !== this.lastP2PStatusHash) {
           this.lastP2PStatusHash = h;
@@ -49363,6 +49691,8 @@ data: ${JSON.stringify(msg.data)}
         onStatusChange: config2.onStatusChange,
         onPostChatCommand: config2.onPostChatCommand,
         sessionHostControl: config2.sessionHostControl,
+        statusInstanceId: config2.statusInstanceId,
+        statusVersion: config2.statusVersion,
         getCdpLogFn: config2.getCdpLogFn || ((ideType) => LOG2.forComponent(`CDP:${ideType}`).asLogFn())
       });
       poller = new AgentStreamPoller({
@@ -49990,18 +50320,75 @@ var SESSION_TARGET_COMMANDS = /* @__PURE__ */ new Set([
   "restart_session",
   "agent_command"
 ]);
+var ACTIVE_CHAT_POLL_STATUSES = /* @__PURE__ */ new Set([
+  "generating",
+  "waiting_approval",
+  "starting"
+]);
+function hashSignatureParts(parts) {
+  let hash2 = 2166136261;
+  for (const part of parts) {
+    const text = String(part || "");
+    for (let i = 0; i < text.length; i += 1) {
+      hash2 ^= text.charCodeAt(i);
+      hash2 = Math.imul(hash2, 16777619) >>> 0;
+    }
+    hash2 ^= 255;
+    hash2 = Math.imul(hash2, 16777619) >>> 0;
+  }
+  return hash2.toString(16).padStart(8, "0");
+}
+function buildChatTailDeliverySignature(payload) {
+  let messages = "";
+  try {
+    messages = JSON.stringify(payload.messages);
+  } catch {
+    messages = String(payload.messages.length);
+  }
+  return hashSignatureParts([
+    payload.sessionId,
+    payload.historySessionId || "",
+    payload.status,
+    payload.title || "",
+    payload.syncMode,
+    String(payload.replaceFrom),
+    String(payload.totalMessages),
+    payload.lastMessageSignature,
+    payload.activeModal ? `${payload.activeModal.message}|${payload.activeModal.buttons.join("")}` : "",
+    messages
+  ]);
+}
+function buildSessionModalDeliverySignature(payload) {
+  return hashSignatureParts([
+    payload.sessionId,
+    payload.status,
+    payload.title || "",
+    payload.modalMessage || "",
+    Array.isArray(payload.modalButtons) ? payload.modalButtons.join("") : ""
+  ]);
+}
 var StandaloneServer = class {
   httpServer = null;
   wss = null;
   clients = /* @__PURE__ */ new Set();
+  wsSubscriptions = /* @__PURE__ */ new Map();
+  wsMachineRuntimeSubscriptions = /* @__PURE__ */ new Map();
+  wsSessionHostDiagnosticsSubscriptions = /* @__PURE__ */ new Map();
+  wsSessionModalSubscriptions = /* @__PURE__ */ new Map();
+  wsDaemonMetadataSubscriptions = /* @__PURE__ */ new Map();
   authToken = null;
   statusTimer = null;
   lastStatusBroadcastAt = 0;
   statusBroadcastPending = false;
+  lastWsStatusSignature = null;
+  wsChatFlushInFlight = false;
+  pendingWsChatFlush = null;
+  hotWsChatSessionIds = /* @__PURE__ */ new Set();
   running = false;
   components = null;
   devServer = null;
   sessionHostEndpoint = null;
+  sessionHostControl = null;
   isRecoverableSessionHostError(error48) {
     const message = error48 instanceof Error ? error48.message : String(error48);
     return message.includes("ECONNREFUSED") || message.includes("ENOENT") || message.includes("Session host socket unavailable");
@@ -50049,12 +50436,15 @@ var StandaloneServer = class {
   async start(options = {}) {
     const port = options.port || DEFAULT_PORT;
     const host = options.host || "127.0.0.1";
+    const cfg = (0, import_daemon_core2.loadConfig)();
     const sessionHostEndpoint = await ensureSessionHostReady();
     this.sessionHostEndpoint = sessionHostEndpoint;
     const sessionHostControl = new StandaloneSessionHostControlPlane(
       async () => this.ensureActiveSessionHostEndpoint()
     );
+    this.sessionHostControl = sessionHostControl;
     this.authToken = options.token || process.env.ADHDEV_TOKEN || null;
+    const statusInstanceId = `standalone_${cfg.machineId || "mach_unknown"}`;
     this.components = await (0, import_daemon_core2.initDaemonComponents)({
       cliManagerDeps: {
         getServerConn: () => null,
@@ -50091,6 +50481,9 @@ var StandaloneServer = class {
         }),
         listHostedCliRuntimes: async () => listHostedCliRuntimes(sessionHostEndpoint)
       },
+      statusInstanceId,
+      statusVersion: pkgVersion,
+      statusDaemonMode: false,
       onStatusChange: () => this.scheduleBroadcastStatus(),
       sessionHostControl,
       onStreamsUpdated: (ideType, streams) => {
@@ -50132,6 +50525,10 @@ var StandaloneServer = class {
     });
     this.statusTimer = setInterval(() => {
       this.scheduleBroadcastStatus();
+      void this.flushWsChatSubscriptions(void 0, { onlyActive: true });
+      void this.flushWsMachineRuntimeSubscriptions();
+      void this.flushWsSessionHostDiagnosticsSubscriptions();
+      void this.flushWsSessionModalSubscriptions();
     }, STATUS_INTERVAL);
     this.running = true;
     await new Promise((resolve4) => {
@@ -50467,13 +50864,27 @@ var StandaloneServer = class {
       }
     }
     this.clients.add(ws2);
+    this.wsSubscriptions.set(ws2, /* @__PURE__ */ new Map());
+    this.wsMachineRuntimeSubscriptions.set(ws2, /* @__PURE__ */ new Map());
+    this.wsSessionHostDiagnosticsSubscriptions.set(ws2, /* @__PURE__ */ new Map());
+    this.wsSessionModalSubscriptions.set(ws2, /* @__PURE__ */ new Map());
+    this.wsDaemonMetadataSubscriptions.set(ws2, /* @__PURE__ */ new Map());
     console.log(`[WS] Client connected (total: ${this.clients.size})`);
-    const status = this.getStatus();
+    const status = this.getWsStatus(this.buildSharedSnapshot("live"));
+    this.lastWsStatusSignature = this.buildWsStatusSignature(status);
     ws2.send(JSON.stringify({ type: "status", data: status }));
     void this.pushWsRuntimeSnapshots(ws2);
     ws2.on("message", async (raw) => {
       try {
         const msg = JSON.parse(raw.toString());
+        if (msg.type === "subscribe") {
+          await this.handleWsSubscribe(ws2, msg);
+          return;
+        }
+        if (msg.type === "unsubscribe") {
+          this.handleWsUnsubscribe(ws2, msg);
+          return;
+        }
         if (msg.type === "command") {
           const envelope = msg.data && typeof msg.data === "object" ? {
             ...msg.data,
@@ -50497,14 +50908,394 @@ var StandaloneServer = class {
     });
     ws2.on("close", () => {
       this.clients.delete(ws2);
+      this.wsSubscriptions.delete(ws2);
+      this.wsMachineRuntimeSubscriptions.delete(ws2);
+      this.wsSessionHostDiagnosticsSubscriptions.delete(ws2);
+      this.wsSessionModalSubscriptions.delete(ws2);
+      this.wsDaemonMetadataSubscriptions.delete(ws2);
       console.log(`[WS] Client disconnected (total: ${this.clients.size})`);
     });
     ws2.on("error", () => {
       this.clients.delete(ws2);
+      this.wsSubscriptions.delete(ws2);
+      this.wsMachineRuntimeSubscriptions.delete(ws2);
+      this.wsSessionHostDiagnosticsSubscriptions.delete(ws2);
+      this.wsSessionModalSubscriptions.delete(ws2);
+      this.wsDaemonMetadataSubscriptions.delete(ws2);
+    });
+  }
+  async handleWsSubscribe(ws2, msg) {
+    if (msg.topic === "session.chat_tail") {
+      const params = msg.params;
+      if (!params?.targetSessionId) return;
+      const subs = this.wsSubscriptions.get(ws2) || /* @__PURE__ */ new Map();
+      this.wsSubscriptions.set(ws2, subs);
+      subs.set(msg.key, {
+        request: {
+          ...msg,
+          topic: "session.chat_tail",
+          params
+        },
+        seq: 0,
+        cursor: {
+          knownMessageCount: Math.max(0, Number(params.knownMessageCount || 0)),
+          lastMessageSignature: typeof params.lastMessageSignature === "string" ? params.lastMessageSignature : "",
+          tailLimit: Math.max(0, Number(params.tailLimit || 0))
+        },
+        lastDeliveredSignature: ""
+      });
+      await this.flushWsChatSubscriptions(ws2);
+      return;
+    }
+    if (msg.topic === "machine.runtime") {
+      const params = msg.params;
+      const subs = this.wsMachineRuntimeSubscriptions.get(ws2) || /* @__PURE__ */ new Map();
+      this.wsMachineRuntimeSubscriptions.set(ws2, subs);
+      subs.set(msg.key, {
+        request: {
+          ...msg,
+          topic: "machine.runtime",
+          params
+        },
+        seq: 0,
+        lastSentAt: 0
+      });
+      await this.flushWsMachineRuntimeSubscriptions(ws2);
+      return;
+    }
+    if (msg.topic === "session_host.diagnostics") {
+      const params = msg.params;
+      const subs = this.wsSessionHostDiagnosticsSubscriptions.get(ws2) || /* @__PURE__ */ new Map();
+      this.wsSessionHostDiagnosticsSubscriptions.set(ws2, subs);
+      subs.set(msg.key, {
+        request: {
+          ...msg,
+          topic: "session_host.diagnostics",
+          params
+        },
+        seq: 0,
+        lastSentAt: 0
+      });
+      await this.flushWsSessionHostDiagnosticsSubscriptions(ws2);
+      return;
+    }
+    if (msg.topic === "session.modal") {
+      const params = msg.params;
+      if (!params?.targetSessionId) return;
+      const subs = this.wsSessionModalSubscriptions.get(ws2) || /* @__PURE__ */ new Map();
+      this.wsSessionModalSubscriptions.set(ws2, subs);
+      subs.set(msg.key, {
+        request: {
+          ...msg,
+          topic: "session.modal",
+          params
+        },
+        seq: 0,
+        lastSentAt: 0,
+        lastDeliveredSignature: ""
+      });
+      await this.flushWsSessionModalSubscriptions(ws2);
+      return;
+    }
+    if (msg.topic === "daemon.metadata") {
+      const params = msg.params;
+      const subs = this.wsDaemonMetadataSubscriptions.get(ws2) || /* @__PURE__ */ new Map();
+      this.wsDaemonMetadataSubscriptions.set(ws2, subs);
+      subs.set(msg.key, {
+        request: {
+          ...msg,
+          topic: "daemon.metadata",
+          params
+        },
+        seq: 0,
+        lastSentAt: 0
+      });
+      await this.flushWsDaemonMetadataSubscriptions(ws2);
+    }
+  }
+  handleWsUnsubscribe(ws2, msg) {
+    if (msg.topic === "session.chat_tail") {
+      this.wsSubscriptions.get(ws2)?.delete(msg.key);
+      return;
+    }
+    if (msg.topic === "machine.runtime") {
+      this.wsMachineRuntimeSubscriptions.get(ws2)?.delete(msg.key);
+      return;
+    }
+    if (msg.topic === "session_host.diagnostics") {
+      this.wsSessionHostDiagnosticsSubscriptions.get(ws2)?.delete(msg.key);
+      return;
+    }
+    if (msg.topic === "session.modal") {
+      this.wsSessionModalSubscriptions.get(ws2)?.delete(msg.key);
+      return;
+    }
+    if (msg.topic === "daemon.metadata") {
+      this.wsDaemonMetadataSubscriptions.get(ws2)?.delete(msg.key);
+    }
+  }
+  async buildChatTailUpdate(request, state, key) {
+    const result = await this.executeCommand("read_chat", {
+      targetSessionId: request.targetSessionId,
+      ...request.historySessionId ? { historySessionId: request.historySessionId } : {},
+      knownMessageCount: state.cursor.knownMessageCount,
+      lastMessageSignature: state.cursor.lastMessageSignature,
+      ...state.cursor.tailLimit > 0 ? { tailLimit: state.cursor.tailLimit } : {}
     });
+    if (!result?.success || result.syncMode === "noop") {
+      if (result?.success) {
+        state.cursor = {
+          knownMessageCount: Math.max(0, Number(result.totalMessages || state.cursor.knownMessageCount)),
+          lastMessageSignature: typeof result.lastMessageSignature === "string" ? result.lastMessageSignature : state.cursor.lastMessageSignature,
+          tailLimit: state.cursor.tailLimit
+        };
+      }
+      return null;
+    }
+    state.seq += 1;
+    const syncMode = result.syncMode === "append" || result.syncMode === "replace_tail" || result.syncMode === "noop" || result.syncMode === "full" ? result.syncMode : "full";
+    state.cursor = {
+      knownMessageCount: Math.max(0, Number(result.totalMessages || 0)),
+      lastMessageSignature: typeof result.lastMessageSignature === "string" ? result.lastMessageSignature : "",
+      tailLimit: state.cursor.tailLimit
+    };
+    const activeModal = result.activeModal && typeof result.activeModal === "object" && typeof result.activeModal.message === "string" && Array.isArray(result.activeModal.buttons) ? {
+      message: result.activeModal.message,
+      buttons: result.activeModal.buttons.filter((button) => typeof button === "string")
+    } : null;
+    const deliverySignature = buildChatTailDeliverySignature({
+      sessionId: request.targetSessionId,
+      ...request.historySessionId ? { historySessionId: request.historySessionId } : {},
+      messages: Array.isArray(result.messages) ? result.messages : [],
+      status: typeof result.status === "string" ? result.status : "idle",
+      ...typeof result.title === "string" ? { title: result.title } : {},
+      ...activeModal ? { activeModal } : {},
+      syncMode,
+      replaceFrom: Number(result.replaceFrom || 0),
+      totalMessages: Number(result.totalMessages || 0),
+      lastMessageSignature: typeof result.lastMessageSignature === "string" ? result.lastMessageSignature : ""
+    });
+    if (deliverySignature === state.lastDeliveredSignature) {
+      return null;
+    }
+    state.lastDeliveredSignature = deliverySignature;
+    return {
+      topic: "session.chat_tail",
+      key,
+      sessionId: request.targetSessionId,
+      ...request.historySessionId ? { historySessionId: request.historySessionId } : {},
+      seq: state.seq,
+      timestamp: Date.now(),
+      messages: Array.isArray(result.messages) ? result.messages : [],
+      status: typeof result.status === "string" ? result.status : "idle",
+      ...typeof result.title === "string" ? { title: result.title } : {},
+      ...activeModal ? { activeModal } : {},
+      syncMode,
+      replaceFrom: Number(result.replaceFrom || 0),
+      totalMessages: Number(result.totalMessages || 0),
+      lastMessageSignature: typeof result.lastMessageSignature === "string" ? result.lastMessageSignature : ""
+    };
+  }
+  getHotChatSessionIdsForWsFlush() {
+    const snapshot = this.buildSharedSnapshot("live");
+    const active = new Set(
+      snapshot.sessions.filter((session) => ACTIVE_CHAT_POLL_STATUSES.has(String(session.status || "").toLowerCase())).map((session) => session.id)
+    );
+    const finalizing = new Set(
+      Array.from(this.hotWsChatSessionIds).filter((sessionId) => !active.has(sessionId))
+    );
+    this.hotWsChatSessionIds = active;
+    return { active, finalizing };
+  }
+  async flushWsChatSubscriptions(targetWs, options = {}) {
+    if (this.wsChatFlushInFlight) {
+      const nextOnlyActive = options.onlyActive === true;
+      const pending = this.pendingWsChatFlush;
+      this.pendingWsChatFlush = {
+        targetWs: pending?.targetWs === void 0 || targetWs === void 0 ? void 0 : targetWs,
+        onlyActive: pending ? pending.onlyActive && nextOnlyActive : nextOnlyActive
+      };
+      return;
+    }
+    this.wsChatFlushInFlight = true;
+    try {
+      const targets = targetWs ? [targetWs] : Array.from(this.clients);
+      const hotSessionIds = options.onlyActive ? this.getHotChatSessionIdsForWsFlush() : null;
+      for (const ws2 of targets) {
+        if (ws2.readyState !== import_ws.WebSocket.OPEN) continue;
+        const subs = this.wsSubscriptions.get(ws2);
+        if (!subs || subs.size === 0) continue;
+        for (const [key, sub] of subs.entries()) {
+          const targetSessionId = sub.request.params.targetSessionId;
+          if (hotSessionIds && !hotSessionIds.active.has(targetSessionId) && !hotSessionIds.finalizing.has(targetSessionId)) {
+            continue;
+          }
+          const update = await this.buildChatTailUpdate(sub.request.params, sub, key);
+          if (!update || ws2.readyState !== import_ws.WebSocket.OPEN) continue;
+          ws2.send(JSON.stringify({ type: "topic_update", update }));
+        }
+      }
+    } finally {
+      this.wsChatFlushInFlight = false;
+      if (this.pendingWsChatFlush) {
+        const pending = this.pendingWsChatFlush;
+        this.pendingWsChatFlush = null;
+        void this.flushWsChatSubscriptions(pending.targetWs, { onlyActive: pending.onlyActive });
+      }
+    }
+  }
+  buildMachineRuntimeUpdate(state, key) {
+    const intervalMs = Math.max(5e3, Number(state.request.params.intervalMs || 15e3));
+    const now = Date.now();
+    if (state.lastSentAt > 0 && now - state.lastSentAt < intervalMs) {
+      return null;
+    }
+    state.seq += 1;
+    state.lastSentAt = now;
+    return {
+      topic: "machine.runtime",
+      key,
+      machine: (0, import_daemon_core2.buildMachineInfo)("full"),
+      seq: state.seq,
+      timestamp: now
+    };
+  }
+  async flushWsMachineRuntimeSubscriptions(targetWs) {
+    const targets = targetWs ? [targetWs] : Array.from(this.clients);
+    for (const ws2 of targets) {
+      if (ws2.readyState !== import_ws.WebSocket.OPEN) continue;
+      const subs = this.wsMachineRuntimeSubscriptions.get(ws2);
+      if (!subs || subs.size === 0) continue;
+      for (const [key, sub] of subs.entries()) {
+        const update = this.buildMachineRuntimeUpdate(sub, key);
+        if (!update || ws2.readyState !== import_ws.WebSocket.OPEN) continue;
+        ws2.send(JSON.stringify({ type: "topic_update", update }));
+      }
+    }
+  }
+  async buildSessionHostDiagnosticsUpdate(state, key) {
+    if (!this.sessionHostControl) return null;
+    const intervalMs = Math.max(5e3, Number(state.request.params.intervalMs || 1e4));
+    const now = Date.now();
+    if (state.lastSentAt > 0 && now - state.lastSentAt < intervalMs) {
+      return null;
+    }
+    const diagnostics = await this.sessionHostControl.getDiagnostics({
+      includeSessions: state.request.params.includeSessions !== false,
+      limit: Number(state.request.params.limit) || void 0
+    });
+    state.seq += 1;
+    state.lastSentAt = now;
+    return {
+      topic: "session_host.diagnostics",
+      key,
+      diagnostics,
+      seq: state.seq,
+      timestamp: now
+    };
+  }
+  async flushWsSessionHostDiagnosticsSubscriptions(targetWs) {
+    const targets = targetWs ? [targetWs] : Array.from(this.clients);
+    for (const ws2 of targets) {
+      if (ws2.readyState !== import_ws.WebSocket.OPEN) continue;
+      const subs = this.wsSessionHostDiagnosticsSubscriptions.get(ws2);
+      if (!subs || subs.size === 0) continue;
+      for (const [key, sub] of subs.entries()) {
+        const update = await this.buildSessionHostDiagnosticsUpdate(sub, key);
+        if (!update || ws2.readyState !== import_ws.WebSocket.OPEN) continue;
+        ws2.send(JSON.stringify({ type: "topic_update", update }));
+      }
+    }
+  }
+  findProviderStateBySessionId(sessionId) {
+    if (!this.components || !sessionId) return null;
+    const states = this.components.instanceManager.collectAllStates();
+    for (const state of states) {
+      if (state.instanceId === sessionId) return state;
+      if (state.category === "ide") {
+        const child = state.extensions.find((entry) => entry.instanceId === sessionId);
+        if (child) return child;
+      }
+    }
+    return null;
+  }
+  buildSessionModalUpdate(state, key) {
+    const providerState = this.findProviderStateBySessionId(state.request.params.targetSessionId);
+    if (!providerState) return null;
+    const now = Date.now();
+    state.seq += 1;
+    state.lastSentAt = now;
+    const activeModal = providerState.activeChat?.activeModal;
+    const modalButtons = Array.isArray(activeModal?.buttons) ? activeModal.buttons.filter((button) => typeof button === "string") : [];
+    const status = String(providerState.activeChat?.status || providerState.status || "idle");
+    const title = typeof providerState.activeChat?.title === "string" ? providerState.activeChat.title : void 0;
+    const modalMessage = typeof activeModal?.message === "string" ? activeModal.message : void 0;
+    const deliverySignature = buildSessionModalDeliverySignature({
+      sessionId: state.request.params.targetSessionId,
+      status,
+      ...title ? { title } : {},
+      ...modalMessage ? { modalMessage } : {},
+      ...modalButtons.length > 0 ? { modalButtons } : {}
+    });
+    if (deliverySignature === state.lastDeliveredSignature) {
+      return null;
+    }
+    state.lastDeliveredSignature = deliverySignature;
+    return {
+      topic: "session.modal",
+      key,
+      sessionId: state.request.params.targetSessionId,
+      status,
+      ...title ? { title } : {},
+      ...modalMessage ? { modalMessage } : {},
+      ...modalButtons.length > 0 ? { modalButtons } : {},
+      seq: state.seq,
+      timestamp: now
+    };
+  }
+  async flushWsSessionModalSubscriptions(targetWs) {
+    const targets = targetWs ? [targetWs] : Array.from(this.clients);
+    for (const ws2 of targets) {
+      if (ws2.readyState !== import_ws.WebSocket.OPEN) continue;
+      const subs = this.wsSessionModalSubscriptions.get(ws2);
+      if (!subs || subs.size === 0) continue;
+      for (const [key, sub] of subs.entries()) {
+        const update = this.buildSessionModalUpdate(sub, key);
+        if (!update || ws2.readyState !== import_ws.WebSocket.OPEN) continue;
+        ws2.send(JSON.stringify({ type: "topic_update", update }));
+      }
+    }
+  }
+  buildDaemonMetadataUpdate(state, key) {
+    const now = Date.now();
+    state.seq += 1;
+    state.lastSentAt = now;
+    const cfgSnap = (0, import_daemon_core2.loadConfig)();
+    return {
+      topic: "daemon.metadata",
+      key,
+      daemonId: `standalone_${cfgSnap.machineId || "standalone"}`,
+      status: this.buildSharedSnapshot("metadata"),
+      userName: cfgSnap.userName || void 0,
+      seq: state.seq,
+      timestamp: now
+    };
+  }
+  async flushWsDaemonMetadataSubscriptions(targetWs) {
+    const targets = targetWs ? [targetWs] : Array.from(this.clients);
+    for (const ws2 of targets) {
+      if (ws2.readyState !== import_ws.WebSocket.OPEN) continue;
+      const subs = this.wsDaemonMetadataSubscriptions.get(ws2);
+      if (!subs || subs.size === 0) continue;
+      for (const [key, sub] of subs.entries()) {
+        const update = this.buildDaemonMetadataUpdate(sub, key);
+        if (ws2.readyState !== import_ws.WebSocket.OPEN) continue;
+        ws2.send(JSON.stringify({ type: "topic_update", update }));
+      }
+    }
   }
   // ─── Core Logic ───
-  buildSharedSnapshot() {
+  buildSharedSnapshot(profile = "full") {
     const cfgSnap = (0, import_daemon_core2.loadConfig)();
     const machineId = cfgSnap.machineId || "mach_unknown";
     const allStates = this.components.instanceManager.collectAllStates();
@@ -50518,7 +51309,7 @@ var StandaloneServer = class {
       })),
       instanceId: `standalone_${machineId}`,
       version: pkgVersion,
-      daemonMode: false
+      profile
     });
   }
   async pushWsRuntimeSnapshots(ws2) {
@@ -50546,27 +51337,62 @@ var StandaloneServer = class {
       });
     }
   }
-  getStatus(snapshot = this.buildSharedSnapshot()) {
+  getStatus(snapshot = this.buildSharedSnapshot("full")) {
     const cfgSnap = (0, import_daemon_core2.loadConfig)();
+    const machineRuntime = (0, import_daemon_core2.buildMachineInfo)("full");
     return {
       ...snapshot,
       id: snapshot.instanceId,
-      daemonMode: false,
       type: "standalone",
       platform: snapshot.machine.platform,
       hostname: snapshot.machine.hostname,
       userName: cfgSnap.userName || void 0,
       system: {
-        cpus: snapshot.machine.cpus,
-        totalMem: snapshot.machine.totalMem,
-        freeMem: snapshot.machine.freeMem,
-        availableMem: snapshot.machine.availableMem,
-        loadavg: snapshot.machine.loadavg,
-        uptime: snapshot.machine.uptime,
-        arch: snapshot.machine.arch
+        cpus: snapshot.machine.cpus ?? machineRuntime.cpus ?? 0,
+        totalMem: snapshot.machine.totalMem ?? machineRuntime.totalMem ?? 0,
+        freeMem: snapshot.machine.freeMem ?? machineRuntime.freeMem ?? 0,
+        availableMem: snapshot.machine.availableMem ?? machineRuntime.availableMem ?? 0,
+        loadavg: snapshot.machine.loadavg ?? machineRuntime.loadavg ?? [],
+        uptime: snapshot.machine.uptime ?? machineRuntime.uptime ?? 0,
+        arch: snapshot.machine.arch ?? machineRuntime.arch ?? os5.arch()
       }
     };
   }
+  getWsStatus(snapshot = this.buildSharedSnapshot("live")) {
+    return {
+      instanceId: snapshot.instanceId,
+      machine: snapshot.machine,
+      timestamp: snapshot.timestamp,
+      sessions: snapshot.sessions,
+      terminalBackend: snapshot.terminalBackend
+    };
+  }
+  buildWsStatusSignature(status) {
+    return JSON.stringify({
+      instanceId: status.instanceId,
+      machine: {
+        hostname: status.machine.hostname,
+        platform: status.machine.platform
+      },
+      sessions: status.sessions.map((session) => ({
+        id: session.id,
+        parentId: session.parentId,
+        providerType: session.providerType,
+        kind: session.kind,
+        transport: session.transport,
+        status: session.status,
+        title: session.title,
+        cdpConnected: session.cdpConnected,
+        currentModel: session.currentModel,
+        currentPlan: session.currentPlan,
+        currentAutoApprove: session.currentAutoApprove,
+        lastSeenAt: session.lastSeenAt,
+        unread: session.unread,
+        inboxBucket: session.inboxBucket,
+        surfaceHidden: session.surfaceHidden
+      }))
+    });
+  }
   normalizeCommandEnvelope(input) {
     const body = input && typeof input === "object" ? input : {};
     const type = typeof body.type === "string" && body.type.trim() ? body.type.trim() : typeof body.commandType === "string" && body.commandType.trim() ? body.commandType.trim() : typeof body.command === "string" && body.command.trim() ? body.command.trim() : "";
@@ -50588,6 +51414,11 @@ var StandaloneServer = class {
     }
     const result = await this.components.router.execute(type, args, "standalone");
     if (type.startsWith("workspace_") || type.startsWith("session_host_")) this.scheduleBroadcastStatus();
+    if (type === "get_status_metadata" || type === "set_user_name" || type === "set_machine_nickname" || type.startsWith("workspace_") || type.startsWith("session_host_")) {
+      void this.flushWsDaemonMetadataSubscriptions();
+    }
+    if (type.startsWith("session_host_")) void this.flushWsSessionHostDiagnosticsSubscriptions();
+    if (type === "resolve_action" || type === "send_chat" || type === "read_chat") void this.flushWsSessionModalSubscriptions();
     return result;
   }
   scheduleBroadcastStatus() {
@@ -50607,8 +51438,11 @@ var StandaloneServer = class {
   }
   broadcastStatus() {
     if (this.clients.size === 0) return;
+    const status = this.getWsStatus(this.buildSharedSnapshot("live"));
+    const signature = this.buildWsStatusSignature(status);
+    if (signature === this.lastWsStatusSignature) return;
+    this.lastWsStatusSignature = signature;
     this.lastStatusBroadcastAt = Date.now();
-    const status = this.getStatus();
     const msg = JSON.stringify({ type: "status", data: status });
     const cdpCount = [...this.components.cdpManagers.values()].filter((m) => m.isConnected).length;
     import_daemon_core2.LOG.debug("Broadcast", `status \u2192 ${this.clients.size} client(s), ${status.sessions?.length || 0} session(s), ${cdpCount} CDP`);
@@ -50648,6 +51482,12 @@ var StandaloneServer = class {
       }
     }
     this.clients.clear();
+    this.wsSubscriptions.clear();
+    this.wsMachineRuntimeSubscriptions.clear();
+    this.wsSessionHostDiagnosticsSubscriptions.clear();
+    this.wsSessionModalSubscriptions.clear();
+    this.wsDaemonMetadataSubscriptions.clear();
+    this.lastWsStatusSignature = null;
     if (this.wss) {
       this.wss.close();
       this.wss = null;
@@ -50655,6 +51495,7 @@ var StandaloneServer = class {
     if (this.components) {
       await (0, import_daemon_core2.shutdownDaemonComponents)(this.components);
     }
+    this.sessionHostControl = null;
     if (this.httpServer) {
       this.httpServer.close();
       this.httpServer = null;