newmark-agent 0.5.7 → 0.5.8

package/dist/ui/index.html

@@ -2537,9 +2537,12 @@ button.left-ws-item {
   text-align: left;
   cursor: pointer;
   font: 600 12px var(--font);
+  transition: none !important;
+  animation: none !important;
+  transform: none !important;
 }
 
-.conversation-work-run-head:hover { color: var(--text-bright); }
+.conversation-work-run-head:hover { color: var(--text-bright); filter: none; }
 
 .conversation-work-run-chevron {
   width: 8px;
@@ -2548,7 +2551,7 @@ button.left-ws-item {
   border-right: 1px solid var(--text-dim);
   border-bottom: 1px solid var(--text-dim);
   transform: rotate(45deg);
-  transition: transform 150ms ease;
+  transition: none;
 }
 
 .conversation-work-run.collapsed .conversation-work-run-chevron { transform: rotate(-45deg); }
@@ -16524,6 +16527,57 @@ var _terminalCounter = 0;
 var _terminalTakeoverTabs = {};
 var _terminalTakeoverRefreshToken = 0;
 var _terminalTakeoverDetached = {};
+var _terminalOutputLimit = 256 * 1024;
+
+window.appendTerminalOutput = function(output, text, style) {
+  if (!output || !text) return;
+  var state = output._terminalRenderState;
+  if (!state) state = output._terminalRenderState = { pending: [], frame: 0 };
+  state.pending.push({ text: String(text), style: style || null });
+  if (state.frame) return;
+  state.frame = requestAnimationFrame(function() {
+    state.frame = 0;
+    if (!output.isConnected) { state.pending.length = 0; return; }
+    var nearBottom = output.scrollHeight - output.scrollTop - output.clientHeight <= 32;
+    var fragment = document.createDocumentFragment();
+    for (var i = 0; i < state.pending.length; i++) {
+      var item = state.pending[i];
+      if (item.style) {
+        var span = document.createElement('span');
+        span.textContent = item.text;
+        if (item.style.color) span.style.color = item.style.color;
+        if (item.style.opacity) span.style.opacity = item.style.opacity;
+        fragment.appendChild(span);
+      } else {
+        fragment.appendChild(document.createTextNode(item.text));
+      }
+    }
+    state.pending.length = 0;
+    output.appendChild(fragment);
+    var overflow = output.textContent.length - _terminalOutputLimit;
+    while (overflow > 0 && output.firstChild) {
+      var first = output.firstChild;
+      var length = first.textContent.length;
+      if (length <= overflow) {
+        output.removeChild(first);
+        overflow -= length;
+      } else {
+        first.textContent = first.textContent.slice(overflow);
+        overflow = 0;
+      }
+    }
+    if (nearBottom) output.scrollTop = output.scrollHeight;
+  });
+};
+
+window.setTerminalOutput = function(output, text, style) {
+  if (!output) return;
+  var state = output._terminalRenderState;
+  if (state && state.frame) cancelAnimationFrame(state.frame);
+  output._terminalRenderState = { pending: [], frame: 0 };
+  output.textContent = '';
+  window.appendTerminalOutput(output, text, style);
+};
 
 window.portableTerminalWorkspacePath = function(input) {
   var raw = String(input || '').trim().replace(/\\/g, '/').replace(/\/+$/g, '');
@@ -16606,14 +16660,14 @@ window.terminalSend = function() {
   if (takeoverSession) {
     input.value = '';
     if (!api.terminalTakeoverWrite) {
-      if (output) output.innerHTML += '\r\n<span style="color:#ff6666;">[' + esc(t('terminal.notConnected')) + ']</span>';
+      if (output) window.appendTerminalOutput(output, '\r\n[' + t('terminal.notConnected') + ']', { color:'#ff6666' });
       return;
     }
     var takeoverConversation = pane.getAttribute('data-takeover-conversation') || activeConversationId();
     api.terminalTakeoverWrite(takeoverSession, cmd, takeoverConversation).then(function(result) {
       if (result && result.ok === false) throw new Error(result.error || 'Terminal write failed');
     }).catch(function(err) {
-      if (output) output.innerHTML += '\r\n<span style="color:#ff6666;">[' + esc(t('common.error')) + '] ' + esc(err.message) + '</span>';
+      if (output) window.appendTerminalOutput(output, '\r\n[' + t('common.error') + '] ' + err.message, { color:'#ff6666' });
     });
     return;
   }
@@ -16632,12 +16686,12 @@ window.terminalSend = function() {
       input.disabled = false;
       var currentPane = window.getActiveTerminalPane();
       var currentOutput = (currentPane && currentPane.querySelector('.terminal-output')) || output;
-      if (currentOutput) currentOutput.innerHTML += '\r\n<span style="color:#ff6666;">[' + esc(t('common.error')) + '] ' + esc(err.message || String(err)) + '</span>';
+      if (currentOutput) window.appendTerminalOutput(currentOutput, '\r\n[' + t('common.error') + '] ' + (err.message || String(err)), { color:'#ff6666' });
     });
   }
   input.value = '';
   api.terminalWrite(sessionId, cmd + '\r').catch(function(err) {
-    if (output) output.innerHTML += '\r\n<span style="color:#ff6666;">[' + esc(t('common.error')) + '] ' + esc(err.message) + '</span>';
+    if (output) window.appendTerminalOutput(output, '\r\n[' + t('common.error') + '] ' + err.message, { color:'#ff6666' });
   });
 };
 
@@ -16651,7 +16705,7 @@ window.clearTerminal = function() {
     api.terminalKill(sessionId, state.terminalInterruptTimeoutMs || 0).catch(function(){});
     pane.setAttribute('data-session', '');
   }
-  if (output) output.innerHTML = '';
+  if (output) window.setTerminalOutput(output, '');
   if (prompt) prompt.textContent = '>';
 };
 
@@ -16761,12 +16815,12 @@ window.addTerminalTab = function(shellId, options) {
   var terminalReadyPromise = terminalSpawnPromise.then(function(resp) {
     pane.setAttribute('data-session', resp.sessionId);
     var out = pane.querySelector('.terminal-output');
-    if (out) out.innerHTML = '<span style="color:var(--accent2);">' + esc(t('terminal.connected')) + ' (' + esc(shellId) + ')</span>\r\n';
+    if (out) window.setTerminalOutput(out, t('terminal.connected') + ' (' + shellId + ')\r\n', { color:'var(--accent2)' });
     state._terminalActiveSession = resp.sessionId;
     return resp;
   }).catch(function(err) {
     var out = pane.querySelector('.terminal-output');
-    if (out) out.innerHTML = '<span style="color:#ff6666;">' + esc(t('terminal.failed')) + ': ' + esc(err.message) + '</span>';
+    if (out) window.setTerminalOutput(out, t('terminal.failed') + ': ' + err.message, { color:'#ff6666' });
     if (options.required === true) throw err;
     return null;
   });
@@ -16881,13 +16935,12 @@ window.applyTerminalTakeoverEvent = function(payload) {
   var output = pane.querySelector('.terminal-output');
   if (!output) return;
   if (payload.type === 'started' && session.buffer) {
-    output.innerHTML = esc(session.buffer);
+    window.setTerminalOutput(output, session.buffer);
   } else if (payload.data) {
-    output.innerHTML += esc(payload.data);
+    window.appendTerminalOutput(output, payload.data);
   } else if (payload.type === 'stopped') {
-    output.innerHTML += '\r\n<span style="color:var(--text-dim);opacity:0.65;">[Agent takeover stopped]</span>';
+    window.appendTerminalOutput(output, '\r\n[Agent takeover stopped]', { color:'var(--text-dim)', opacity:'0.65' });
   }
-  output.scrollTop = output.scrollHeight;
   if (!active) window.pruneTerminalTakeoverEndedPanes(session.id);
 };
 
@@ -17007,16 +17060,14 @@ if (api.onTerminalData) {
       .replace(/\x1b\][^\x07]*(?:\x07|\x1b\\)/g, '')
       .replace(/\x1b\[[0-?]*[ -\/]*[@-~]/g, '')
       .replace(/\r(?!\n)/g, '');
-    var text = clean.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
-    output.innerHTML += text;
-    output.scrollTop = output.scrollHeight;
+    window.appendTerminalOutput(output, clean);
   });
   api.onTerminalExit(function(event, sessionId, code) {
     var pane = document.querySelector('.terminal-pane[data-session="' + sessionId + '"]');
     if (!pane) return;
     pane.setAttribute('data-session', '');
     var output = pane.querySelector('.terminal-output');
-    if (output) output.innerHTML += '\r\n<span style="color:var(--text-dim);opacity:0.5;">[Process exited code=' + code + ']</span>';
+    if (output) window.appendTerminalOutput(output, '\r\n[Process exited code=' + code + ']', { color:'var(--text-dim)', opacity:'0.5' });
   });
 }
 

package/dist/wsl-agent-host.bundle.cjs

@@ -328713,6 +328713,30 @@ function parseProviderSse(raw) {
   }
   return events;
 }
+function assembleCompatibleToolArguments(parts) {
+  const nonEmpty = (parts || []).map(String).filter((part) => part && part !== "null");
+  if (!nonEmpty.length) return "{}";
+  const isJsonObject = (value) => {
+    try {
+      const parsed = JSON.parse(value);
+      return !!parsed && typeof parsed === "object" && !Array.isArray(parsed);
+    } catch {
+      return false;
+    }
+  };
+  const incremental = nonEmpty.join("");
+  if (isJsonObject(incremental)) return incremental;
+  let compatible = "";
+  for (const incoming of nonEmpty) {
+    if (!compatible) compatible = incoming;
+    else if (incoming === compatible) continue;
+    else if (incoming.startsWith(compatible)) compatible = incoming;
+    else if (compatible.startsWith(incoming)) continue;
+    else compatible += incoming;
+  }
+  if (isJsonObject(compatible)) return compatible;
+  return [...nonEmpty].reverse().find(isJsonObject) || compatible;
+}
 function isContentPolicyBlocked(json) {
   const choices = Array.isArray(json.choices) ? json.choices : [];
   const choice = choices[0] || {};
@@ -328941,6 +328965,8 @@ var ChatCompletionsAdapter = class {
     let contentPolicyBlocked = false;
     let emittedContent = false;
     let emittedTool = false;
+    let emittedReasoning = false;
+    let explicitCompletion = false;
     try {
       while (true) {
         const { done, value } = await readProviderStreamChunk(reader, signal);
@@ -328952,7 +328978,10 @@ var ChatCompletionsAdapter = class {
           const trimmed = line.trim();
           if (!trimmed.startsWith("data: ")) continue;
           const data = trimmed.slice(6);
-          if (data === "[DONE]") continue;
+          if (data === "[DONE]") {
+            explicitCompletion = true;
+            continue;
+          }
           let json;
           try {
             json = JSON.parse(data);
@@ -328965,11 +328994,16 @@ var ChatCompletionsAdapter = class {
           }
           if (isContentPolicyBlocked(json)) contentPolicyBlocked = true;
           const choices = Array.isArray(json.choices) ? json.choices : [];
-          const delta = choices[0]?.delta;
+          const choice = choices[0];
+          if (choice?.finish_reason !== void 0 && choice.finish_reason !== null) explicitCompletion = true;
+          const delta = choice?.delta;
           if (!delta) continue;
           if (delta.reasoning_content) {
             const reasoning = this.extractText(delta.reasoning_content);
-            if (reasoning) yield { type: "reasoning.summary.delta", delta: reasoning };
+            if (reasoning) {
+              emittedReasoning = true;
+              yield { type: "reasoning.summary.delta", delta: reasoning };
+            }
           }
           const textDelta = this.extractText(delta.content);
           if (textDelta) {
@@ -329014,13 +329048,17 @@ var ChatCompletionsAdapter = class {
             type: "tool_call.completed",
             id: currentToolCall.id,
             name: currentToolCall.name,
-            arguments: currentToolCall.argumentParts.join("")
+            arguments: assembleCompatibleToolArguments(currentToolCall.argumentParts)
           };
         }
       } else if (!emittedContent && !emittedTool && contentPolicyBlocked) {
         yield { type: "response.failed", error: "[Error] Content policy refusal (content_filter)." };
         return;
       }
+      if (!explicitCompletion && !emittedContent && !emittedTool && !emittedReasoning) {
+        yield { type: "response.failed", error: "[LLM Error] Chat stream ended before an explicit completion." };
+        return;
+      }
       yield { type: "response.completed" };
     } finally {
       reader.releaseLock();
@@ -329217,6 +329255,7 @@ var ResponsesAdapter = class {
               const key3 = `${String(payload.item_id || "")}:${String(payload.summary_index || 0)}`;
               const delta = this.extractText(payload.delta);
               if (delta) {
+                emittedContent = true;
                 reasoningSummaries.set(key3, (reasoningSummaries.get(key3) || "") + delta);
                 yield { type: "reasoning.summary.delta", delta };
               }
@@ -329247,7 +329286,7 @@ var ResponsesAdapter = class {
                 calls.set(key3, {
                   id: String(item.call_id || item.id || key3),
                   name: String(item.name || ""),
-                  arguments: String(item.arguments || ""),
+                  argumentParts: item.arguments ? [String(item.arguments)] : [],
                   emitted: false
                 });
               }
@@ -329255,9 +329294,9 @@ var ResponsesAdapter = class {
             }
             if (eventType === "response.function_call_arguments.delta") {
               const key3 = String(payload.item_id || payload.call_id || payload.output_index || "");
-              const call = calls.get(key3) || { id: String(payload.call_id || key3), name: String(payload.name || ""), arguments: "", emitted: false };
+              const call = calls.get(key3) || { id: String(payload.call_id || key3), name: String(payload.name || ""), argumentParts: [], emitted: false };
               const delta = String(payload.delta || "");
-              call.arguments += delta;
+              if (delta) call.argumentParts.push(delta);
               calls.set(key3, call);
               yield { type: "tool_call.arguments.delta", id: call.id, delta };
               continue;
@@ -329269,19 +329308,20 @@ var ResponsesAdapter = class {
                 const call = calls.get(key3) || {
                   id: String(item.call_id || item.id || key3),
                   name: String(item.name || ""),
-                  arguments: String(item.arguments || ""),
+                  argumentParts: item.arguments ? [String(item.arguments)] : [],
                   emitted: false
                 };
                 call.id = String(item.call_id || call.id);
                 call.name = String(item.name || call.name);
-                call.arguments = typeof item.arguments === "string" ? item.arguments : call.arguments;
+                if (typeof item.arguments === "string" && item.arguments) call.argumentParts.push(item.arguments);
                 if (!call.emitted) {
                   call.emitted = true;
+                  const argumentsJson = assembleCompatibleToolArguments(call.argumentParts);
                   yield { type: "tool_call.started", id: call.id, name: call.name };
-                  if (call.arguments && call.arguments !== "{}") {
-                    yield { type: "tool_call.arguments.delta", id: call.id, delta: call.arguments };
+                  if (argumentsJson !== "{}") {
+                    yield { type: "tool_call.arguments.delta", id: call.id, delta: argumentsJson };
                   }
-                  yield { type: "tool_call.completed", id: call.id, name: call.name, arguments: call.arguments };
+                  yield { type: "tool_call.completed", id: call.id, name: call.name, arguments: argumentsJson };
                 }
                 calls.set(key3, call);
               }
@@ -329306,8 +329346,14 @@ var ResponsesAdapter = class {
       } else if (!completed) {
         yield { type: "response.failed", error: "[LLM Error] Responses stream ended before response.completed." };
       } else if (!emittedContent && calls.size === 0) {
-        yield { type: "response.failed", error: "[Error] Empty Responses stream." };
+        yield { type: "response.failed", error: "[Error] Provider returned an empty response." };
       } else {
+        for (const call of calls.values()) {
+          if (call.emitted) continue;
+          const argumentsJson = assembleCompatibleToolArguments(call.argumentParts);
+          yield { type: "tool_call.started", id: call.id, name: call.name };
+          yield { type: "tool_call.completed", id: call.id, name: call.name, arguments: argumentsJson };
+        }
         yield { type: "response.completed" };
       }
     } finally {
@@ -330186,7 +330232,7 @@ ${responsePath}
    * `provider_adapters_v2` context flag. Request serialization and SSE
    * normalization are delegated to the shared provider adapters while the
    * transport orchestration (loopback node-http, fetch -> node-http fallback,
-   * 120s/30s timeouts) and the 4xx Chat -> Responses downgrade stay here.
+   * cancellation-only streaming and the 4xx Chat -> Responses downgrade) stay here.
    * The emitted request body and StreamToken stream are byte-equivalent to
    * the legacy inlined path.
    */
@@ -330323,9 +330369,9 @@ ${responsePath}
   }
   /**
    * Loopback-aware transport injected into adapter `execute`. Streaming
-   * requests retain the fetch-to-node fallback for transport failures, while
-   * a local deadline is returned directly so one request cannot become a
-   * second Windows fallback request.
+   * requests retain the fetch-to-node fallback for transport failures. They
+   * have no response deadline; only caller cancellation or a concrete
+   * transport/provider failure may end the request.
    */
   buildProviderAdapterTransport() {
     return async (request, signal) => {
@@ -330335,7 +330381,7 @@ ${responsePath}
         const forwardAbort = () => abort.abort(signal?.reason);
         if (signal?.aborted) forwardAbort();
         else signal?.addEventListener("abort", forwardAbort, { once: true });
-        const effectiveTimeout = this.effectiveRequestTimeout(12e4);
+        const effectiveTimeout = 0;
         const timer = effectiveTimeout > 0 ? setTimeout(() => abort.abort(providerTimeoutError(effectiveTimeout)), effectiveTimeout) : void 0;
         try {
           try {
@@ -330480,7 +330526,7 @@ ${responsePath}
     const forwardAbort = () => abort.abort(signal?.reason);
     if (signal?.aborted) forwardAbort();
     else signal?.addEventListener("abort", forwardAbort, { once: true });
-    const effectiveTimeout = this.effectiveRequestTimeout(12e4);
+    const effectiveTimeout = 0;
     const timeout = effectiveTimeout > 0 ? setTimeout(() => abort.abort(providerTimeoutError(effectiveTimeout)), effectiveTimeout) : void 0;
     let reader = null;
     try {
@@ -330512,10 +330558,14 @@ ${responsePath}
       }
       const decoder = new TextDecoder();
       let buffer = "";
-      let currentToolCall = null;
+      const toolCalls = /* @__PURE__ */ new Map();
+      const toolCallOrder = [];
+      let syntheticToolIndex = 0;
+      let lastToolIndex = 0;
       let currentReasoningContent = "";
       let contentPolicyBlocked = false;
       let emittedContent = false;
+      let explicitCompletion = false;
       const streamSignal = signal || new AbortController().signal;
       while (true) {
         const { done, value } = await readProviderStreamChunk(reader, streamSignal);
@@ -330527,7 +330577,10 @@ ${responsePath}
           const trimmed = line.trim();
           if (!trimmed.startsWith("data: ")) continue;
           const data = trimmed.slice(6);
-          if (data === "[DONE]") continue;
+          if (data === "[DONE]") {
+            explicitCompletion = true;
+            continue;
+          }
           try {
             const json = JSON.parse(data);
             if (json.usage) yield { type: "usage", text: "", usage: extractProviderUsage(json) };
@@ -330545,24 +330598,44 @@ ${responsePath}
             }
             if (delta.tool_calls) {
               for (const tc of delta.tool_calls) {
-                if (tc.id) {
-                  if (currentToolCall) {
-                    yield { type: "tool_call", text: "", toolCall: currentToolCall, reasoningContent: currentReasoningContent || void 0 };
-                  }
-                  currentToolCall = { id: tc.id, name: tc.function?.name || "", arguments: tc.function?.arguments || "" };
-                } else if (tc.function?.arguments && currentToolCall) {
-                  currentToolCall.arguments += tc.function.arguments;
+                const rawIndex = Number(tc.index);
+                const index = Number.isInteger(rawIndex) && rawIndex >= 0 ? rawIndex : tc.id ? syntheticToolIndex++ : lastToolIndex;
+                lastToolIndex = index;
+                let call = toolCalls.get(index);
+                if (!call && (tc.id || tc.function?.name)) {
+                  call = { id: tc.id || "", name: tc.function?.name || "", argumentParts: [] };
+                  toolCalls.set(index, call);
+                  toolCallOrder.push(index);
                 }
+                if (!call) continue;
+                if (tc.id && !call.id) call.id = tc.id;
+                if (tc.function?.name && !call.name) call.name = tc.function.name;
+                if (tc.function?.arguments) call.argumentParts.push(tc.function.arguments);
               }
             }
           } catch {
           }
         }
       }
-      if (currentToolCall && currentToolCall.arguments) {
-        yield { type: "tool_call", text: "", toolCall: currentToolCall, reasoningContent: currentReasoningContent || void 0 };
+      if (toolCallOrder.length) {
+        for (const index of toolCallOrder) {
+          const call = toolCalls.get(index);
+          if (!call) continue;
+          yield {
+            type: "tool_call",
+            text: "",
+            toolCall: {
+              id: call.id,
+              name: call.name,
+              arguments: assembleCompatibleToolArguments(call.argumentParts)
+            },
+            reasoningContent: currentReasoningContent || void 0
+          };
+        }
       } else if (!emittedContent && contentPolicyBlocked) {
         yield { type: "text", text: "[Error] Content policy refusal (content_filter)." };
+      } else if (!explicitCompletion && !emittedContent && !currentReasoningContent) {
+        yield { type: "text", text: "[LLM Error] GitHub Models stream ended before an explicit completion." };
       }
     } finally {
       reader?.releaseLock();
@@ -340515,6 +340588,22 @@ function createToolchainCore() {
   return { registry: new ToolRegistry(), catalog: new CapabilityCatalog() };
 }
 
+// src/core/emptyResponseRetry.ts
+var EMPTY_RESPONSE_RETRY_DELAYS_MS = [200, 800, 2e3, 1e4, 6e4];
+var MAX_EMPTY_RESPONSE_RETRIES = EMPTY_RESPONSE_RETRY_DELAYS_MS.length;
+var MAX_CONSECUTIVE_EMPTY_RESPONSES = MAX_EMPTY_RESPONSE_RETRIES + 1;
+function emptyResponseRetryDelayMs(consecutiveEmptyResponses) {
+  return EMPTY_RESPONSE_RETRY_DELAYS_MS[Math.max(0, consecutiveEmptyResponses - 1)] ?? 0;
+}
+function observeEmptyResponseOutcome(consecutiveEmptyResponses, emptyResponse) {
+  const nextCount = emptyResponse ? consecutiveEmptyResponses + 1 : 0;
+  return {
+    consecutiveEmptyResponses: nextCount,
+    retry: emptyResponse && nextCount <= MAX_EMPTY_RESPONSE_RETRIES,
+    terminate: emptyResponse && nextCount > MAX_EMPTY_RESPONSE_RETRIES
+  };
+}
+
 // src/core/agentKernelRunner.ts
 var publicStreamFilters = /* @__PURE__ */ new WeakMap();
 var brokerOnlyAssistantBuffers = /* @__PURE__ */ new WeakMap();
@@ -340666,7 +340755,7 @@ function kernelTurnFailed(agent, turn) {
   return turn.stopReason === "error" || agent.isLlmErrorText(turn.text);
 }
 function providerTurnIsEmpty(turn) {
-  return /provider returned an empty response/i.test(`${turn.errorMessage}
+  return !turn.activity && /provider returned an empty response/i.test(`${turn.errorMessage}
 ${turn.text}`);
 }
 function removeTrailingFailedAssistant(agent, messages) {
@@ -340675,6 +340764,12 @@ function removeTrailingFailedAssistant(agent, messages) {
   const text = KernelMessageText(last);
   if (last.stopReason === "error" || agent.isLlmErrorText(text)) messages.pop();
 }
+function removeTrailingThoughtOnlyAssistant(messages) {
+  const last = messages[messages.length - 1];
+  if (last?.role !== "assistant") return;
+  const hasToolCall = last.content.some((content) => content.type === "toolCall");
+  if (!KernelMessageText(last).trim() && !hasToolCall) messages.pop();
+}
 function normalizePublicProviderError(error, secrets = []) {
   let raw = "";
   if (error instanceof Error) {
@@ -340800,8 +340895,17 @@ async function runAgentKernel(agent) {
   const tokens = [];
   const runOnce = async (promptMessages, appendPromptToAgentHistory) => {
     let lastAssistant = null;
+    let observedActivity = false;
+    let observedThought = false;
     const unsubscribe = kernel2.subscribe(async (event) => {
       await handleKernelEvent(agent, event, tokens);
+      if (event.type === "message_update") {
+        const delta = event.assistantMessageEvent;
+        const deltaText = typeof delta.delta === "string" ? delta.delta : "";
+        const thoughtDelta = delta.type === "thinking_delta" && !!deltaText.trim();
+        observedThought = observedThought || thoughtDelta;
+        observedActivity = observedActivity || thoughtDelta || delta.type === "text_delta" && !!deltaText.trim() || delta.type === "toolcall_end";
+      }
       if (event.type === "message_end" && event.message.role === "assistant") {
         lastAssistant = event.message;
       }
@@ -340819,11 +340923,13 @@ async function runAgentKernel(agent) {
       const assistant = lastAssistant;
       const text = assistant ? KernelMessageText(assistant) : "";
       const hasToolCall = !!assistant?.content?.some((content) => content.type === "toolCall");
-      const emptyResponse = !assistant || !text.trim() && !hasToolCall && String(assistant?.stopReason || "") !== "aborted";
+      const emptyResponse = !assistant || !text.trim() && !hasToolCall && !observedActivity && String(assistant?.stopReason || "") !== "aborted";
       return {
         text: emptyResponse ? "[Error] Provider returned an empty response." : text,
         stopReason: String(assistant?.stopReason || ""),
-        errorMessage: String(assistant?.errorMessage || (emptyResponse ? "Provider returned an empty response." : ""))
+        errorMessage: String(assistant?.errorMessage || (emptyResponse ? "Provider returned an empty response." : "")),
+        activity: observedActivity || !!text.trim() || hasToolCall,
+        thoughtOnly: observedThought && !text.trim() && !hasToolCall && !["error", "aborted"].includes(String(assistant?.stopReason || ""))
       };
     } finally {
       unsubscribe();
@@ -340869,14 +340975,22 @@ async function runAgentKernel(agent) {
         fallback: { from: modelBeforeKernelRun, to: agent.model, providerId: agent.activeDeployment()?.providerId }
       });
     }
-    let emptyResponseRetries = 0;
-    while (providerTurnIsEmpty(lastTurn) && emptyResponseRetries < 2) {
+    let consecutiveEmptyResponses = 0;
+    for (; ; ) {
+      const emptyResponseState = observeEmptyResponseOutcome(consecutiveEmptyResponses, providerTurnIsEmpty(lastTurn));
+      consecutiveEmptyResponses = emptyResponseState.consecutiveEmptyResponses;
+      if (lastTurn.thoughtOnly) {
+        removeTrailingThoughtOnlyAssistant(kernel2.state.messages);
+        lastTurn = await runWithCompressionResume([], false);
+        continue;
+      }
+      if (!emptyResponseState.retry) break;
       removeTrailingFailedAssistant(agent, kernel2.state.messages);
-      emptyResponseRetries += 1;
-      const notice = `[Model retry] Provider returned an empty response; retrying the same deployment (${emptyResponseRetries}/2).`;
+      const retryNumber = consecutiveEmptyResponses;
+      const notice = `[Model retry] Provider returned an empty response; retrying the same deployment (${retryNumber}/${MAX_EMPTY_RESPONSE_RETRIES}) after ${emptyResponseRetryDelayMs(consecutiveEmptyResponses)}ms.`;
       tokens.push({ type: "text", text: notice });
       agent.recordWorkStatus(notice);
-      await agent.waitForPlannedRouteRetry();
+      await agent.waitForPlannedRouteRetry(emptyResponseRetryDelayMs(consecutiveEmptyResponses));
       lastTurn = await runWithCompressionResume([], false);
     }
     let routeRetries = 0;
@@ -341072,7 +341186,7 @@ async function runAgentKernel(agent) {
             return;
           }
           if (textStarted) finalContent.push({ type: "text", text });
-          if (!finalContent.length) {
+          if (!finalContent.length && !thinking.trim()) {
             text = "[Error] Provider returned an empty response.";
             finalContent.push({ type: "text", text });
           }
@@ -345656,7 +345770,12 @@ var Agent4 = class _Agent {
   beginRouteAttempt() {
     this.routeAttemptStartedAt = Date.now();
   }
-  async waitForPlannedRouteRetry() {
+  async waitForPlannedRouteRetry(explicitDelayMs) {
+    if (explicitDelayMs !== void 0) {
+      if (explicitDelayMs <= 0) return;
+      await new Promise((resolve16) => setTimeout(resolve16, explicitDelayMs));
+      return;
+    }
     const waitBudgetMs = Math.max(0, Math.min(15e3, this.lastRouteDecision?.retryBudgetMs ?? 5e3));
     const delay = Math.max(0, Math.min(waitBudgetMs, this.lastRouteRetryDelayMs));
     this.lastRouteRetryDelayMs = 0;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "newmark-agent",
   "productName": "Newmark Agent",
-  "version": "0.5.7",
+  "version": "0.5.8",
   "description": "Newmark Agent — Portable AI coding agent with rich GUI and CLI (TypeScript)",
   "homepage": "https://github.com/positer/Newmark-Agent",
   "repository": {
@@ -41,6 +41,7 @@
     "test:cli:built": "node dist/tests/cliToolContractVerify.js && node dist/tests/openAIHubAnthropicSmokeContractVerify.js && node dist/tests/cliComputerUseAccuracyVerify.js",
     "test:gui-tui-cli-stress": "npm run build && npm run test:gui-tui-cli-stress:built",
     "test:gui-tui-cli-stress:built": "node dist/tests/guiTuiCliSharedBackendStressVerify.js",
+    "test:empty-response-retry": "npm run build && node dist/tests/emptyResponseRetryVerify.js",
     "typecheck": "tsc --noEmit",
     "lint": "oxlint src",
     "test": "npm run test:full-release",
@@ -94,6 +95,7 @@
     "test:dev012": "npm run build && node dist/tests/performanceOptimizationVerify.js && node dist/tests/compressionFidelityVerify.js && node dist/tests/responseTrajectoryVerify.js && node dist/tests/normalChatRegressionVerify.js && node dist/tests/toolProvisioningVerify.js && node dist/tests/guideWorkRunVerify.js && node dist/tests/runtimeIsolationVerify.js && node dist/tests/openAIHubAnthropicSmokeContractVerify.js",
     "test:computer-use-performance": "npm run build && node dist/tests/computerUsePerformanceVerify.js",
     "test:terminal-takeover": "npm run build && node dist/tests/terminalTakeoverVerify.js",
+    "test:terminal-output-stress": "npm run build && node dist/tests/terminalOutputBackpressureVerify.js",
     "test:native-bash": "npm run build && node dist/tests/nativeBashVerify.js",
     "test:automation-bash-stress": "npm run build && node dist/tests/automationBashStressVerify.js",
     "dist:win": "npm run build:clean && node scripts/dist-portable.cjs",