@protolabsai/proto 0.33.0 → 0.34.1

package/cli.js

@@ -169086,7 +169086,7 @@ __export(geminiContentGenerator_exports, {
   createGeminiContentGenerator: () => createGeminiContentGenerator
 });
 function createGeminiContentGenerator(config2, gcConfig) {
-  const version2 = "0.33.0";
+  const version2 = "0.34.1";
   const userAgent2 = config2.userAgent || `QwenCode/${version2} (${process.platform}; ${process.arch})`;
   const baseHeaders = {
     "User-Agent": userAgent2
@@ -181839,11 +181839,11 @@ var init_shellExecutionService = __esm({
     getErrorMessage2 = /* @__PURE__ */ __name((error40) => error40 instanceof Error ? error40.message : String(error40), "getErrorMessage");
     isExpectedPtyReadExitError = /* @__PURE__ */ __name((error40) => {
       const code2 = getErrnoCode(error40);
-      if (code2 === "EIO") {
+      if (code2 === "EIO" || code2 === "EAGAIN") {
         return true;
       }
       const message = getErrorMessage2(error40);
-      return message.includes("read EIO");
+      return message.includes("read EIO") || message.includes("EAGAIN");
     }, "isExpectedPtyReadExitError");
     isExpectedPtyExitRaceError = /* @__PURE__ */ __name((error40) => {
       const code2 = getErrnoCode(error40);
@@ -187118,7 +187118,7 @@ function toParts(input) {
   }
   return parts2;
 }
-var import_fast_levenshtein, debugLogger32, toolTracer, TRUNCATION_PARAM_GUIDANCE, TRUNCATION_EDIT_REJECTION, createErrorResponse, CoreToolScheduler;
+var import_fast_levenshtein, debugLogger32, toolTracer, TRUNCATION_PARAM_GUIDANCE, TRUNCATION_EDIT_REJECTION, VALIDATION_RETRY_LOOP_THRESHOLD, RETRY_LOOP_STOP_DIRECTIVE, createErrorResponse, CoreToolScheduler;
 var init_coreToolScheduler = __esm({
   "packages/core/dist/src/core/coreToolScheduler.js"() {
     "use strict";
@@ -187146,6 +187146,8 @@ var init_coreToolScheduler = __esm({
     __name(createFunctionResponsePart, "createFunctionResponsePart");
     __name(convertToFunctionResponse, "convertToFunctionResponse");
     __name(toParts, "toParts");
+    VALIDATION_RETRY_LOOP_THRESHOLD = 3;
+    RETRY_LOOP_STOP_DIRECTIVE = "\n\n\u26A0\uFE0F RETRY LOOP DETECTED: This tool call has failed validation multiple times with the same error. STOP retrying the same approach. Re-examine the tool schema and parameter requirements, then try a fundamentally different approach. If you cannot resolve the validation error, explain the issue to the user instead of retrying.";
     createErrorResponse = /* @__PURE__ */ __name((request3, error40, errorType) => ({
       callId: request3.callId,
       error: error40,
@@ -187177,6 +187179,7 @@ var init_coreToolScheduler = __esm({
       chatRecordingService;
       isFinalizingToolCalls = false;
       isScheduling = false;
+      validationRetryCounts = /* @__PURE__ */ new Map();
       requestQueue = [];
       constructor(options2) {
         this.config = options2.config;
@@ -187199,6 +187202,7 @@ var init_coreToolScheduler = __esm({
           const outcome = currentCall.outcome;
           switch (newStatus) {
             case "success": {
+              this.clearRetryCountsForTool(currentCall.request.name);
               const durationMs = existingStartTime ? Date.now() - existingStartTime : void 0;
               return {
                 request: currentCall.request,
@@ -187417,6 +187421,19 @@ var init_coreToolScheduler = __esm({
         }
         return this._schedule(request3, signal);
       }
+      /**
+       * Removes all validation retry counters for the given tool. Keys are
+       * "<toolName>:<errorMessage>", so a plain `Map.delete(toolName)` would not
+       * match anything.
+       */
+      clearRetryCountsForTool(toolName) {
+        const prefix = `${toolName}:`;
+        for (const key of this.validationRetryCounts.keys()) {
+          if (key.startsWith(prefix)) {
+            this.validationRetryCounts.delete(key);
+          }
+        }
+      }
       async _schedule(request3, signal) {
         this.isScheduling = true;
         try {
@@ -187424,6 +187441,17 @@ var init_coreToolScheduler = __esm({
             throw new Error("Cannot schedule new tool calls while other tool calls are actively running (executing or awaiting approval).");
           }
           const requestsToProcess = Array.isArray(request3) ? request3 : [request3];
+          if (this.validationRetryCounts.size > 0) {
+            const prevTools = /* @__PURE__ */ new Set();
+            for (const key of this.validationRetryCounts.keys()) {
+              const sep12 = key.indexOf(":");
+              prevTools.add(sep12 === -1 ? key : key.slice(0, sep12));
+            }
+            const hasPrevFailingTool = requestsToProcess.some((r5) => prevTools.has(r5.name));
+            if (!hasPrevFailingTool) {
+              this.validationRetryCounts.clear();
+            }
+          }
           const newToolCalls = [];
           for (const reqInfo of requestsToProcess) {
             const pm = this.config.getPermissionManager?.();
@@ -187482,16 +187510,26 @@ var init_coreToolScheduler = __esm({
             }
             const invocationOrError = this.buildInvocation(toolInstance, reqInfo.args);
             if (invocationOrError instanceof Error) {
-              const error40 = reqInfo.wasOutputTruncated ? new Error(`${invocationOrError.message} ${TRUNCATION_PARAM_GUIDANCE}`) : invocationOrError;
+              const baseError = reqInfo.wasOutputTruncated ? new Error(`${invocationOrError.message} ${TRUNCATION_PARAM_GUIDANCE}`) : invocationOrError;
+              const errorKey = `${reqInfo.name}:${baseError.message}`;
+              const count = (this.validationRetryCounts.get(errorKey) ?? 0) + 1;
+              for (const key of this.validationRetryCounts.keys()) {
+                if (key.startsWith(`${reqInfo.name}:`) && key !== errorKey) {
+                  this.validationRetryCounts.delete(key);
+                }
+              }
+              this.validationRetryCounts.set(errorKey, count);
+              const finalError = count >= VALIDATION_RETRY_LOOP_THRESHOLD ? new Error(`${baseError.message}${RETRY_LOOP_STOP_DIRECTIVE}`) : baseError;
               newToolCalls.push({
                 status: "error",
                 request: reqInfo,
                 tool: toolInstance,
-                response: createErrorResponse(reqInfo, error40, ToolErrorType.INVALID_TOOL_PARAMS),
+                response: createErrorResponse(reqInfo, finalError, ToolErrorType.INVALID_TOOL_PARAMS),
                 durationMs: 0
               });
               continue;
             }
+            this.clearRetryCountsForTool(reqInfo.name);
             if (reqInfo.wasOutputTruncated && toolInstance.kind === Kind.Edit) {
               const truncationError = new Error(TRUNCATION_EDIT_REJECTION);
               newToolCalls.push({
@@ -274659,6 +274697,7 @@ var init_config3 = __esm({
       hooks;
       hookSystem;
       messageBus;
+      modelChangeListeners = /* @__PURE__ */ new Set();
       constructor(params) {
         this.sessionId = params.sessionId ?? randomUUID5();
         this.sessionData = params.sessionData;
@@ -275065,6 +275104,18 @@ var init_config3 = __esm({
       getModel() {
         return this.contentGeneratorConfig?.model || this.modelsConfig.getModel();
       }
+      onModelChange(listener) {
+        this.modelChangeListeners.add(listener);
+        return () => {
+          this.modelChangeListeners.delete(listener);
+        };
+      }
+      notifyModelChangeListeners() {
+        const model = this.getModel();
+        for (const listener of this.modelChangeListeners) {
+          listener(model);
+        }
+      }
       /**
        * Set model programmatically (e.g., VLM auto-switch, fallback).
        * Delegates to ModelsConfig.
@@ -275074,6 +275125,7 @@ var init_config3 = __esm({
         if (this.contentGeneratorConfig) {
           this.contentGeneratorConfig.model = newModel;
         }
+        this.notifyModelChangeListeners();
       }
       /**
        * Handle model change from ModelsConfig.
@@ -275126,6 +275178,7 @@ var init_config3 = __esm({
        */
       async switchModel(authType, modelId) {
         await this.modelsConfig.switchModel(authType, modelId);
+        this.notifyModelChangeListeners();
       }
       getMaxSessionTurns() {
         return this.maxSessionTurns;
@@ -416752,7 +416805,7 @@ __name(getPackageJson, "getPackageJson");
 // packages/cli/src/utils/version.ts
 async function getCliVersion() {
   const pkgJson = await getPackageJson();
-  return "0.33.0";
+  return "0.34.1";
 }
 __name(getCliVersion, "getCliVersion");
 
@@ -424763,7 +424816,7 @@ var formatDuration = /* @__PURE__ */ __name((milliseconds) => {
 
 // packages/cli/src/generated/git-commit.ts
 init_esbuild_shims();
-var GIT_COMMIT_INFO = "52c7da728";
+var GIT_COMMIT_INFO = "bcae944e9";
 
 // packages/cli/src/utils/systemInfo.ts
 async function getNpmVersion() {
@@ -439592,6 +439645,64 @@ var getCachedStringWidth = /* @__PURE__ */ __name((str2) => {
   stringWidthCache.set(str2, width);
   return width;
 }, "getCachedStringWidth");
+function sliceTextByVisualHeight(text, maxHeight, maxWidth, options2 = {}) {
+  if (maxHeight === void 0) {
+    return { text, hiddenLinesCount: 0 };
+  }
+  const targetMaxHeight = Math.max(
+    Math.round(maxHeight),
+    options2.minHeight ?? 1
+  );
+  const visibleContentHeight = Math.max(
+    1,
+    targetMaxHeight - (options2.reservedRows ?? 0)
+  );
+  const visualWidth = Math.max(1, Math.floor(maxWidth));
+  const overflowDirection = options2.overflowDirection ?? "top";
+  const visibleLines = [];
+  let visualLineCount = 0;
+  let currentLine = "";
+  let currentLineWidth = 0;
+  const appendVisibleLine = /* @__PURE__ */ __name((line) => {
+    visualLineCount += 1;
+    if (overflowDirection === "bottom") {
+      if (visibleLines.length < visibleContentHeight) {
+        visibleLines.push(line);
+      }
+      return;
+    }
+    visibleLines.push(line);
+    if (visibleLines.length > visibleContentHeight) {
+      visibleLines.shift();
+    }
+  }, "appendVisibleLine");
+  const flushCurrentLine = /* @__PURE__ */ __name(() => {
+    appendVisibleLine(currentLine);
+    currentLine = "";
+    currentLineWidth = 0;
+  }, "flushCurrentLine");
+  for (const char of toCodePoints(text)) {
+    if (char === "\n") {
+      flushCurrentLine();
+      continue;
+    }
+    const charWidth = Math.max(getCachedStringWidth(char), 1);
+    if (currentLineWidth > 0 && currentLineWidth + charWidth > visualWidth) {
+      flushCurrentLine();
+    }
+    currentLine += char;
+    currentLineWidth += charWidth;
+  }
+  flushCurrentLine();
+  if (visualLineCount <= visibleContentHeight) {
+    return { text, hiddenLinesCount: 0 };
+  }
+  return {
+    text: visibleLines.join("\n"),
+    hiddenLinesCount: visualLineCount - visibleContentHeight
+  };
+}
+__name(sliceTextByVisualHeight, "sliceTextByVisualHeight");
 var regex2 = ansiRegex();
 function escapeAnsiCtrlCodes(obj) {
   if (typeof obj === "string") {
@@ -461554,25 +461665,82 @@ var getStatusText = /* @__PURE__ */ __name((status) => {
   }
 }, "getStatusText");
 var MAX_TOOL_CALLS = 5;
+var MAX_VERBOSE_TOOL_CALLS = 12;
 var MAX_TASK_PROMPT_LINES = 5;
+var DEFAULT_DETAIL_HEIGHT = 18;
+var RUNNING_FIXED_OVERHEAD = 10;
+var COMPLETED_FIXED_OVERHEAD = 22;
+var ROWS_PER_TOOL_CALL = 2;
+function truncateToVisualWidth(text, maxWidth) {
+  const visualWidth = Math.max(1, Math.floor(maxWidth));
+  const ellipsis = "...";
+  const ellipsisWidth = getCachedStringWidth(ellipsis);
+  let currentWidth = 0;
+  let result = "";
+  for (const char of toCodePoints(text)) {
+    const charWidth = Math.max(getCachedStringWidth(char), 1);
+    if (currentWidth + charWidth > visualWidth) {
+      const availableWidth = Math.max(0, visualWidth - ellipsisWidth);
+      let trimmed2 = "";
+      let trimmedWidth = 0;
+      for (const trimmedChar of toCodePoints(result)) {
+        const trimmedCharWidth = Math.max(getCachedStringWidth(trimmedChar), 1);
+        if (trimmedWidth + trimmedCharWidth > availableWidth) {
+          break;
+        }
+        trimmed2 += trimmedChar;
+        trimmedWidth += trimmedCharWidth;
+      }
+      return trimmed2 + ellipsis;
+    }
+    result += char;
+    currentWidth += charWidth;
+  }
+  return result;
+}
+__name(truncateToVisualWidth, "truncateToVisualWidth");
 var AgentExecutionDisplay = /* @__PURE__ */ __name(({
   data,
   availableHeight,
   childWidth,
-  config: config2
+  config: config2,
+  isFocused = true
 }) => {
   const [displayMode, setDisplayMode] = import_react62.default.useState("compact");
+  const detailHeight = Math.max(
+    4,
+    Math.floor(availableHeight ?? DEFAULT_DETAIL_HEIGHT)
+  );
+  const fixedOverhead = data.status === "running" ? RUNNING_FIXED_OVERHEAD : COMPLETED_FIXED_OVERHEAD;
+  const renderableBudget = Math.max(2, detailHeight - fixedOverhead);
+  const promptBudget = Math.max(1, Math.floor(renderableBudget / 3));
+  const toolBudget = Math.max(
+    1,
+    Math.floor((renderableBudget - promptBudget) / ROWS_PER_TOOL_CALL)
+  );
+  const maxTaskPromptLines = displayMode === "verbose" ? Math.min(8, promptBudget) : Math.min(MAX_TASK_PROMPT_LINES, promptBudget);
+  const maxToolCalls = displayMode === "verbose" ? Math.min(MAX_VERBOSE_TOOL_CALLS, toolBudget) : Math.min(MAX_TOOL_CALLS, toolBudget);
   const agentColor = (0, import_react62.useMemo)(() => {
     const colorOption = COLOR_OPTIONS.find(
       (option2) => option2.name === data.subagentColor
     );
     return colorOption?.value || theme.text.accent;
   }, [data.subagentColor]);
+  const promptChildWidth = Math.max(1, childWidth - 2);
+  const slicedPrompt = (0, import_react62.useMemo)(
+    () => sliceTextByVisualHeight(
+      data.taskPrompt,
+      maxTaskPromptLines,
+      promptChildWidth,
+      { minHeight: 1, overflowDirection: "bottom" }
+    ),
+    [data.taskPrompt, maxTaskPromptLines, promptChildWidth]
+  );
   const footerText = import_react62.default.useMemo(() => {
     if (data.status !== "running") return "";
     if (displayMode === "default") {
-      const hasMoreLines = data.taskPrompt.split("\n").length > MAX_TASK_PROMPT_LINES;
-      const hasMoreToolCalls = data.toolCalls && data.toolCalls.length > MAX_TOOL_CALLS;
+      const hasMoreLines = slicedPrompt.hiddenLinesCount > 0;
+      const hasMoreToolCalls = data.toolCalls && data.toolCalls.length > maxToolCalls;
       if (hasMoreToolCalls || hasMoreLines) {
         return "Press ctrl+e to show less, ctrl+f to show more.";
       }
@@ -461582,7 +461750,13 @@ var AgentExecutionDisplay = /* @__PURE__ */ __name(({
       return "Press ctrl+f to show less.";
     }
     return "";
-  }, [displayMode, data]);
+  }, [
+    displayMode,
+    data.status,
+    data.toolCalls,
+    slicedPrompt.hiddenLinesCount,
+    maxToolCalls
+  ]);
   useKeypress(
     (key) => {
       if (key.ctrl && key.name === "e") {
@@ -461595,7 +461769,7 @@ var AgentExecutionDisplay = /* @__PURE__ */ __name(({
         );
       }
     },
-    { isActive: true }
+    { isActive: data.status === "running" && isFocused }
   );
   if (displayMode === "compact") {
     return /* @__PURE__ */ (0, import_jsx_runtime32.jsxs)(Box_default, { flexDirection: "column", children: [
@@ -461654,15 +461828,18 @@ var AgentExecutionDisplay = /* @__PURE__ */ __name(({
     /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(
       TaskPromptSection,
       {
-        taskPrompt: data.taskPrompt,
-        displayMode
+        slicedPrompt,
+        displayMode,
+        maxVisualLines: maxTaskPromptLines
       }
     ),
     data.status === "running" && data.toolCalls && data.toolCalls.length > 0 && /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(Box_default, { flexDirection: "column", children: /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(
       ToolCallsList,
       {
         toolCalls: data.toolCalls,
-        displayMode
+        displayMode,
+        maxToolCalls,
+        childWidth: childWidth - 2
       }
     ) }),
     data.pendingConfirmation && /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(Box_default, { flexDirection: "column", children: /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(
@@ -461676,26 +461853,38 @@ var AgentExecutionDisplay = /* @__PURE__ */ __name(({
         compactMode: true
       }
     ) }),
-    (data.status === "completed" || data.status === "failed" || data.status === "cancelled") && /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(ResultsSection, { data, displayMode }),
+    (data.status === "completed" || data.status === "failed" || data.status === "cancelled") && /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(
+      ResultsSection,
+      {
+        data,
+        displayMode,
+        maxToolCalls,
+        childWidth: childWidth - 2
+      }
+    ),
     footerText && /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(Box_default, { flexDirection: "row", children: /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(Text3, { color: theme.text.secondary, children: footerText }) })
   ] });
 }, "AgentExecutionDisplay");
-var TaskPromptSection = /* @__PURE__ */ __name(({ taskPrompt, displayMode }) => {
-  const lines = taskPrompt.split("\n");
-  const shouldTruncate = lines.length > 10;
-  const showFull = displayMode === "verbose";
-  const displayLines = showFull ? lines : lines.slice(0, MAX_TASK_PROMPT_LINES);
+var TaskPromptSection = /* @__PURE__ */ __name(({ slicedPrompt, displayMode, maxVisualLines }) => {
+  const shouldTruncate = slicedPrompt.hiddenLinesCount > 0;
   return /* @__PURE__ */ (0, import_jsx_runtime32.jsxs)(Box_default, { flexDirection: "column", gap: 1, children: [
     /* @__PURE__ */ (0, import_jsx_runtime32.jsxs)(Box_default, { flexDirection: "row", children: [
       /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(Text3, { color: theme.text.primary, children: "Task Detail: " }),
-      shouldTruncate && displayMode === "default" && /* @__PURE__ */ (0, import_jsx_runtime32.jsxs)(Text3, { color: theme.text.secondary, children: [
+      shouldTruncate && displayMode !== "compact" && /* @__PURE__ */ (0, import_jsx_runtime32.jsxs)(Text3, { color: theme.text.secondary, children: [
         " ",
         "Showing the first ",
-        MAX_TASK_PROMPT_LINES,
-        " lines."
+        maxVisualLines,
+        " visual lines."
       ] })
     ] }),
-    /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(Box_default, { paddingLeft: 1, children: /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(Text3, { wrap: "wrap", children: displayLines.join("\n") + (shouldTruncate && !showFull ? "..." : "") }) })
+    /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(Box_default, { paddingLeft: 1, children: /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(Text3, { wrap: "wrap", children: slicedPrompt.text }) }),
+    slicedPrompt.hiddenLinesCount > 0 && /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(Box_default, { paddingLeft: 1, children: /* @__PURE__ */ (0, import_jsx_runtime32.jsxs)(Text3, { color: theme.text.secondary, wrap: "truncate", children: [
+      "... last ",
+      slicedPrompt.hiddenLinesCount,
+      " task line",
+      slicedPrompt.hiddenLinesCount === 1 ? "" : "s",
+      " hidden ..."
+    ] }) })
   ] });
 }, "TaskPromptSection");
 var StatusDot = /* @__PURE__ */ __name(({ status }) => /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(Box_default, { marginLeft: 1, marginRight: 1, children: /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(Text3, { color: getStatusColor(status), children: "\u25CF" }) }), "StatusDot");
@@ -461704,29 +461893,37 @@ var StatusIndicator = /* @__PURE__ */ __name(({ status }) => {
   const text = getStatusText(status);
   return /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(Text3, { color, children: text });
 }, "StatusIndicator");
-var ToolCallsList = /* @__PURE__ */ __name(({ toolCalls, displayMode }) => {
+var ToolCallsList = /* @__PURE__ */ __name(({ toolCalls, displayMode, maxToolCalls, childWidth }) => {
   const calls = toolCalls || [];
-  const shouldTruncate = calls.length > MAX_TOOL_CALLS;
-  const showAll = displayMode === "verbose";
-  const displayCalls = showAll ? calls : calls.slice(-MAX_TOOL_CALLS);
+  const displayLimit = Math.max(1, Math.floor(maxToolCalls));
+  const shouldTruncate = calls.length > displayLimit;
+  const displayCalls = calls.slice(-displayLimit);
   const reversedDisplayCalls = [...displayCalls].reverse();
   return /* @__PURE__ */ (0, import_jsx_runtime32.jsxs)(Box_default, { flexDirection: "column", children: [
     /* @__PURE__ */ (0, import_jsx_runtime32.jsxs)(Box_default, { flexDirection: "row", marginBottom: 1, children: [
       /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(Text3, { color: theme.text.primary, children: "Tools:" }),
-      shouldTruncate && displayMode === "default" && /* @__PURE__ */ (0, import_jsx_runtime32.jsxs)(Text3, { color: theme.text.secondary, children: [
+      shouldTruncate && displayMode !== "compact" && /* @__PURE__ */ (0, import_jsx_runtime32.jsxs)(Text3, { color: theme.text.secondary, children: [
         " ",
         "Showing the last ",
-        MAX_TOOL_CALLS,
+        displayCalls.length,
         " of ",
         calls.length,
         " tools."
       ] })
     ] }),
-    reversedDisplayCalls.map((toolCall, index) => /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(ToolCallItem, { toolCall }, `${toolCall.name}-${index}`))
+    reversedDisplayCalls.map((toolCall, index) => /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(
+      ToolCallItem,
+      {
+        toolCall,
+        childWidth
+      },
+      `${toolCall.name}-${index}`
+    ))
   ] });
 }, "ToolCallsList");
-var ToolCallItem = /* @__PURE__ */ __name(({ toolCall, compact = false }) => {
+var ToolCallItem = /* @__PURE__ */ __name(({ toolCall, compact = false, childWidth = 80 }) => {
   const STATUS_INDICATOR_WIDTH2 = 3;
+  const textWidth = Math.max(8, childWidth - STATUS_INDICATOR_WIDTH2 - 1);
   const statusIcon = import_react62.default.useMemo(() => {
     const color = getStatusColor(toolCall.status);
     switch (toolCall.status) {
@@ -461746,13 +461943,13 @@ var ToolCallItem = /* @__PURE__ */ __name(({ toolCall, compact = false }) => {
   const description = import_react62.default.useMemo(() => {
     if (!toolCall.description) return "";
     const firstLine = toolCall.description.split("\n")[0];
-    return firstLine.length > 80 ? firstLine.substring(0, 80) + "..." : firstLine;
-  }, [toolCall.description]);
+    return truncateToVisualWidth(firstLine, textWidth);
+  }, [toolCall.description, textWidth]);
   const truncatedOutput = import_react62.default.useMemo(() => {
     if (!toolCall.resultDisplay) return "";
     const firstLine = toolCall.resultDisplay.split("\n")[0];
-    return firstLine.length > 80 ? firstLine.substring(0, 80) + "..." : firstLine;
-  }, [toolCall.resultDisplay]);
+    return truncateToVisualWidth(firstLine, textWidth);
+  }, [toolCall.resultDisplay, textWidth]);
   return /* @__PURE__ */ (0, import_jsx_runtime32.jsxs)(Box_default, { flexDirection: "column", paddingLeft: 1, marginBottom: 0, children: [
     /* @__PURE__ */ (0, import_jsx_runtime32.jsxs)(Box_default, { flexDirection: "row", children: [
       /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(Box_default, { minWidth: STATUS_INDICATOR_WIDTH2, children: statusIcon }),
@@ -461833,8 +462030,16 @@ var ToolUsageStats = /* @__PURE__ */ __name(({ executionSummary }) => {
     ] })
   ] });
 }, "ToolUsageStats");
-var ResultsSection = /* @__PURE__ */ __name(({ data, displayMode }) => /* @__PURE__ */ (0, import_jsx_runtime32.jsxs)(Box_default, { flexDirection: "column", gap: 1, children: [
-  data.toolCalls && data.toolCalls.length > 0 && /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(ToolCallsList, { toolCalls: data.toolCalls, displayMode }),
+var ResultsSection = /* @__PURE__ */ __name(({ data, displayMode, maxToolCalls, childWidth }) => /* @__PURE__ */ (0, import_jsx_runtime32.jsxs)(Box_default, { flexDirection: "column", gap: 1, children: [
+  data.toolCalls && data.toolCalls.length > 0 && /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(
+    ToolCallsList,
+    {
+      toolCalls: data.toolCalls,
+      displayMode,
+      maxToolCalls,
+      childWidth
+    }
+  ),
   data.status === "completed" && /* @__PURE__ */ (0, import_jsx_runtime32.jsxs)(Box_default, { flexDirection: "column", children: [
     /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(Box_default, { flexDirection: "row", marginBottom: 1, children: /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(Text3, { color: theme.text.primary, children: "Execution Summary:" }) }),
     /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(ExecutionSummaryDetails, { data, displayMode })
@@ -465133,35 +465338,39 @@ var MainContent = /* @__PURE__ */ __name(() => {
     terminalWidth,
     mainAreaWidth,
     staticAreaMaxItemHeight,
-    availableTerminalHeight
+    availableTerminalHeight,
+    historyRemountKey
   } = uiState;
-  const staticItems = (0, import_react75.useMemo)(() => [
-    /* @__PURE__ */ (0, import_jsx_runtime66.jsx)(AppHeader, { version: version2 }, "app-header"),
-    /* @__PURE__ */ (0, import_jsx_runtime66.jsx)(DebugModeNotification, {}, "debug-notification"),
-    /* @__PURE__ */ (0, import_jsx_runtime66.jsx)(Notifications, {}, "notifications"),
-    ...uiState.history.map((h3) => /* @__PURE__ */ (0, import_jsx_runtime66.jsx)(
-      HistoryItemDisplayComponent,
-      {
-        terminalWidth,
-        mainAreaWidth,
-        availableTerminalHeight: staticAreaMaxItemHeight,
-        availableTerminalHeightGemini: MAX_GEMINI_MESSAGE_LINES,
-        item: h3,
-        isPending: false,
-        commands: uiState.slashCommands
-      },
-      h3.id
-    ))
-  ], [
-    uiState.history,
-    uiState.slashCommands,
-    version2,
-    terminalWidth,
-    mainAreaWidth,
-    staticAreaMaxItemHeight
-  ]);
+  const staticItems = (0, import_react75.useMemo)(
+    () => [
+      /* @__PURE__ */ (0, import_jsx_runtime66.jsx)(AppHeader, { version: version2 }, "app-header"),
+      /* @__PURE__ */ (0, import_jsx_runtime66.jsx)(DebugModeNotification, {}, "debug-notification"),
+      /* @__PURE__ */ (0, import_jsx_runtime66.jsx)(Notifications, {}, "notifications"),
+      ...uiState.history.map((h3) => /* @__PURE__ */ (0, import_jsx_runtime66.jsx)(
+        HistoryItemDisplayComponent,
+        {
+          terminalWidth,
+          mainAreaWidth,
+          availableTerminalHeight: staticAreaMaxItemHeight,
+          availableTerminalHeightGemini: MAX_GEMINI_MESSAGE_LINES,
+          item: h3,
+          isPending: false,
+          commands: uiState.slashCommands
+        },
+        h3.id
+      ))
+    ],
+    [
+      uiState.history,
+      uiState.slashCommands,
+      version2,
+      terminalWidth,
+      mainAreaWidth,
+      staticAreaMaxItemHeight
+    ]
+  );
   return /* @__PURE__ */ (0, import_jsx_runtime66.jsxs)(import_jsx_runtime66.Fragment, { children: [
-    /* @__PURE__ */ (0, import_jsx_runtime66.jsx)(Static, { items: staticItems, children: (item) => item }, `${uiState.historyRemountKey}`),
+    /* @__PURE__ */ (0, import_jsx_runtime66.jsx)(Static, { items: staticItems, children: (item) => item }, `${historyRemountKey}`),
     /* @__PURE__ */ (0, import_jsx_runtime66.jsx)(OverflowProvider, { children: /* @__PURE__ */ (0, import_jsx_runtime66.jsxs)(Box_default, { flexDirection: "column", children: [
       pendingHistoryItems.map((item, i4) => /* @__PURE__ */ (0, import_jsx_runtime66.jsx)(
         HistoryItemDisplayComponent,
@@ -473831,6 +474040,61 @@ __name(RewindPicker, "RewindPicker");
 
 // packages/cli/src/ui/components/DialogManager.tsx
 init_dist4();
+
+// packages/cli/src/ui/utils/historyMapping.ts
+init_esbuild_shims();
+function isRealUserTurn(item) {
+  if (item.type !== "user" || !("text" in item) || !item.text) return false;
+  return !item.text.startsWith("/") && !item.text.startsWith("?");
+}
+__name(isRealUserTurn, "isRealUserTurn");
+var STARTUP_CONTEXT_MODEL_ACK2 = "Got it. Thanks for the context!";
+function isUserTextContent(content) {
+  if (content.role !== "user") return false;
+  if (!content.parts || content.parts.length === 0) return false;
+  const hasFunctionResponse = content.parts.some(
+    (part) => "functionResponse" in part
+  );
+  if (hasFunctionResponse) return false;
+  return content.parts.some((part) => "text" in part && Boolean(part.text));
+}
+__name(isUserTextContent, "isUserTextContent");
+function hasStartupContext(apiHistory) {
+  if (apiHistory.length < 2) return false;
+  const first2 = apiHistory[0];
+  const second = apiHistory[1];
+  if (first2?.role !== "user" || second?.role !== "model") return false;
+  return second.parts?.some(
+    (part) => "text" in part && part.text === STARTUP_CONTEXT_MODEL_ACK2
+  ) ?? false;
+}
+__name(hasStartupContext, "hasStartupContext");
+function computeApiTruncationIndex(uiHistory, targetUserItemId, apiHistory) {
+  let uiUserTurnCount = 0;
+  for (const item of uiHistory) {
+    if (item.id === targetUserItemId) break;
+    if (isRealUserTurn(item)) {
+      uiUserTurnCount++;
+    }
+  }
+  const startIndex = hasStartupContext(apiHistory) ? 2 : 0;
+  if (uiUserTurnCount === 0) {
+    return startIndex;
+  }
+  let realUserPromptCount = 0;
+  for (let i4 = startIndex; i4 < apiHistory.length; i4++) {
+    if (isUserTextContent(apiHistory[i4])) {
+      realUserPromptCount++;
+      if (realUserPromptCount > uiUserTurnCount) {
+        return i4;
+      }
+    }
+  }
+  return -1;
+}
+__name(computeApiTruncationIndex, "computeApiTruncationIndex");
+
+// packages/cli/src/ui/components/DialogManager.tsx
 var import_jsx_runtime115 = __toESM(require_jsx_runtime(), 1);
 var DialogManager = /* @__PURE__ */ __name(({
   addItem,
@@ -474143,42 +474407,49 @@ var DialogManager = /* @__PURE__ */ __name(({
     }, "getUiHistoryCutIndex");
     const applyConversationRewind = /* @__PURE__ */ __name((promptId) => {
       const cutIdx = getUiHistoryCutIndex(promptId);
+      const targetUserItem = uiState.history[cutIdx];
       const slicedUiHistory = uiState.history.slice(0, cutIdx);
-      uiState.historyManager.loadHistory(slicedUiHistory);
-      uiActions.refreshStatic();
+      let compressionAbort = false;
       const geminiClient = config2?.getGeminiClient?.();
-      if (geminiClient) {
-        const userTurnCount = slicedUiHistory.filter(
-          (item) => item.type === "user"
-        ).length;
+      if (geminiClient && targetUserItem) {
         const llmHistory = geminiClient.getHistory();
-        let usersSeen = 0;
-        let llmCutIdx = 0;
-        for (let i4 = 0; i4 < llmHistory.length; i4++) {
-          if (llmHistory[i4].role === "user") {
-            usersSeen++;
-            if (usersSeen > userTurnCount) {
-              llmCutIdx = i4;
-              break;
-            }
-            llmCutIdx = i4 + 1;
-          }
-        }
-        geminiClient.setHistory(
-          userTurnCount === 0 ? [] : llmHistory.slice(0, llmCutIdx)
+        const apiCutIdx = computeApiTruncationIndex(
+          uiState.history,
+          targetUserItem.id,
+          llmHistory
         );
+        if (apiCutIdx < 0) {
+          compressionAbort = true;
+        } else {
+          geminiClient.setHistory(llmHistory.slice(0, apiCutIdx));
+          geminiClient.stripThoughtsFromHistory();
+        }
+      }
+      if (!compressionAbort) {
+        uiState.historyManager.loadHistory(slicedUiHistory);
+        uiActions.refreshStatic();
       }
       const checkpoint = checkpointStore.getByPromptId(promptId);
       const originalPrompt = checkpoint?.userPrompt ?? "";
-      return { slicedUiHistory, originalPrompt };
+      return { slicedUiHistory, originalPrompt, compressionAbort };
     }, "applyConversationRewind");
     const handleRestoreFilesAndConversation = /* @__PURE__ */ __name((promptId) => {
       try {
         checkpointStore.rewindToCheckpoint(promptId);
       } catch {
       }
-      const { slicedUiHistory, originalPrompt } = applyConversationRewind(promptId);
+      const { slicedUiHistory, originalPrompt, compressionAbort } = applyConversationRewind(promptId);
       uiActions.closeRewindDialog();
+      if (compressionAbort) {
+        addItem(
+          {
+            type: "error",
+            text: "Cannot rewind to a turn that was compressed. Try a more recent turn."
+          },
+          Date.now()
+        );
+        return;
+      }
       if (originalPrompt) {
         uiState.buffer.setText(originalPrompt);
       }
@@ -474194,8 +474465,18 @@ var DialogManager = /* @__PURE__ */ __name(({
       );
     }, "handleRestoreFilesAndConversation");
     const handleRestoreConversationOnly = /* @__PURE__ */ __name((promptId) => {
-      const { slicedUiHistory, originalPrompt } = applyConversationRewind(promptId);
+      const { slicedUiHistory, originalPrompt, compressionAbort } = applyConversationRewind(promptId);
       uiActions.closeRewindDialog();
+      if (compressionAbort) {
+        addItem(
+          {
+            type: "error",
+            text: "Cannot rewind to a turn that was compressed. Try a more recent turn."
+          },
+          Date.now()
+        );
+        return;
+      }
       if (originalPrompt) {
         uiState.buffer.setText(originalPrompt);
       }
@@ -488304,8 +488585,7 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
     () => setPermissionsDialogOpen(false),
     []
   );
-  const getCurrentModel = (0, import_react176.useCallback)(() => config2.getModel(), [config2]);
-  const [currentModel, setCurrentModel] = (0, import_react176.useState)(getCurrentModel());
+  const [currentModel, setCurrentModel] = (0, import_react176.useState)(() => config2.getModel());
   const [isConfigInitialized, setConfigInitialized] = (0, import_react176.useState)(false);
   const [userMessages, setUserMessages] = (0, import_react176.useState)([]);
   const { columns: terminalWidth, rows: terminalHeight } = useTerminalSize();
@@ -488334,14 +488614,11 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
     );
   }, [lastFinished, addHistoryItem]);
   (0, import_react176.useEffect)(() => {
-    const interval = setInterval(() => {
-      const model = getCurrentModel();
-      if (model !== currentModel) {
-        setCurrentModel(model);
-      }
-    }, 1e3);
-    return () => clearInterval(interval);
-  }, [config2, currentModel, getCurrentModel]);
+    const unsubscribe = config2.onModelChange((model) => {
+      setCurrentModel(model);
+    });
+    return unsubscribe;
+  }, [config2]);
   const { inputWidth, suggestionsWidth } = (0, import_react176.useMemo)(() => {
     const { inputWidth: inputWidth2, suggestionsWidth: suggestionsWidth2 } = calculatePromptWidths(terminalWidth);
     return { inputWidth: inputWidth2, suggestionsWidth: suggestionsWidth2 };
@@ -488392,6 +488669,18 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
     stdout3.write("\x1B[?2026l");
     setHistoryRemountKey((prev) => prev + 1);
   }, [setHistoryRemountKey, stdout3]);
+  (0, import_react176.useEffect)(() => {
+    const unsubscribe = config2.onModelChange((model) => {
+      setCurrentModel((prev) => {
+        if (prev === model) {
+          return prev;
+        }
+        refreshStatic();
+        return model;
+      });
+    });
+    return unsubscribe;
+  }, [config2, refreshStatic]);
   const {
     isThemeDialogOpen,
     openThemeDialog,
@@ -488943,24 +489232,11 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
     needsRestart: ideNeedsRestart,
     restartReason: ideTrustRestartReason
   } = useIdeTrustListener();
-  const isInitialMount = (0, import_react176.useRef)(true);
   (0, import_react176.useEffect)(() => {
     if (ideNeedsRestart) {
       setShowIdeRestartPrompt(true);
     }
   }, [ideNeedsRestart]);
-  (0, import_react176.useEffect)(() => {
-    if (isInitialMount.current) {
-      isInitialMount.current = false;
-      return;
-    }
-    const handler = setTimeout(() => {
-      refreshStatic();
-    }, 300);
-    return () => {
-      clearTimeout(handler);
-    };
-  }, [terminalWidth, refreshStatic]);
   (0, import_react176.useEffect)(() => {
     const unsubscribe = ideContextStore.subscribe(setIdeContextState);
     setIdeContextState(ideContextStore.get());
@@ -493626,7 +493902,7 @@ var QwenAgent = class {
   async initialize(args2) {
     this.clientCapabilities = args2.clientCapabilities;
     const authMethods = buildAuthMethods();
-    const version2 = "0.33.0";
+    const version2 = "0.34.1";
     return {
       protocolVersion: PROTOCOL_VERSION,
       agentInfo: {
@@ -494558,6 +494834,9 @@ var isExpectedPtyRaceError = /* @__PURE__ */ __name((error40) => {
   if (code2 === "EIO" && message.includes("read") || message.includes("read EIO")) {
     return true;
   }
+  if (code2 === "EAGAIN" && message.includes("read") || message.includes("read EAGAIN")) {
+    return true;
+  }
   if (message.includes("ioctl(2) failed, EBADF") || message.includes("Cannot resize a pty that has already exited")) {
     return true;
   }
@@ -494915,6 +495194,21 @@ main().catch((error40) => {
  *   /notes          — trigger a fresh extraction then display the notes
  *   /notes --view   — display the current notes without re-extracting
  */
+/**
+ * @license
+ * Copyright 2026 protoLabs
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Adapted from QwenLM/qwen-code PR #3441 to fix our existing rewind feature's
+ * LLM history truncation. The original implementation walked apiHistory by
+ * `role === 'user'` count, which conflated:
+ *   1. Real user prompts (what we want to count)
+ *   2. Tool result entries (`role: 'user'` with `functionResponse` parts)
+ *   3. The startup context pair (env preamble + "Got it" model ack)
+ *   4. UI-only slash command items that never reached the API
+ *
+ * `computeApiTruncationIndex` correctly handles all four cases.
+ */
 /**
  * @license
  * Copyright 2025 Qwen Team

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@protolabsai/proto",
-  "version": "0.33.0",
+  "version": "0.34.1",
   "description": "proto - AI-powered coding agent",
   "repository": {
     "type": "git",
@@ -21,7 +21,7 @@
     "bundled"
   ],
   "config": {
-    "sandboxImageUri": "ghcr.io/qwenlm/qwen-code:0.33.0"
+    "sandboxImageUri": "ghcr.io/qwenlm/qwen-code:0.34.1"
   },
   "dependencies": {},
   "optionalDependencies": {