@hasna/assistants 0.6.35 → 0.6.36

package/dist/index.js

@@ -37324,15 +37324,15 @@ var DEFAULT_CONFIG = {
   },
   energy: {
     enabled: true,
-    regenRate: 5,
-    lowEnergyThreshold: 30,
-    criticalThreshold: 10,
-    maxEnergy: 100,
+    regenRate: 500,
+    lowEnergyThreshold: 3000,
+    criticalThreshold: 1000,
+    maxEnergy: 1e4,
     costs: {
-      message: 2,
-      toolCall: 5,
-      llmCall: 3,
-      longContext: 10
+      message: 200,
+      toolCall: 500,
+      llmCall: 300,
+      longContext: 1000
     }
   },
   validation: {
@@ -44783,18 +44783,18 @@ class RecoveryManager {
 }
 // packages/core/src/energy/types.ts
 var DEFAULT_ENERGY_COSTS = {
-  message: 2,
-  toolCall: 5,
-  llmCall: 3,
-  longContext: 10
+  message: 200,
+  toolCall: 500,
+  llmCall: 300,
+  longContext: 1000
 };
 var DEFAULT_ENERGY_CONFIG = {
   enabled: true,
   costs: DEFAULT_ENERGY_COSTS,
-  regenRate: 5,
-  lowEnergyThreshold: 30,
-  criticalThreshold: 10,
-  maxEnergy: 100
+  regenRate: 500,
+  lowEnergyThreshold: 3000,
+  criticalThreshold: 1000,
+  maxEnergy: 1e4
 };
 function buildEnergyConfig(config) {
   return {
@@ -49058,6 +49058,27 @@ function estimateMessageLines(message, maxWidth) {
   }
   return lines;
 }
+function estimateGroupedToolMessagesLines(messages, maxWidth) {
+  const toolCalls = [];
+  const toolResults = [];
+  for (const msg of messages) {
+    if (msg.toolCalls)
+      toolCalls.push(...msg.toolCalls);
+    if (msg.toolResults)
+      toolResults.push(...msg.toolResults);
+  }
+  if (toolCalls.length === 0)
+    return 0;
+  const synthetic = {
+    id: "grouped-tool-call",
+    role: "assistant",
+    content: "",
+    timestamp: 0,
+    toolCalls,
+    toolResults: toolResults.length > 0 ? toolResults : undefined
+  };
+  return estimateMessageLines(synthetic, maxWidth);
+}
 function countWrappedLines(lines, maxWidth) {
   if (!maxWidth || maxWidth <= 0) {
     return lines.length;
@@ -49107,6 +49128,34 @@ function isContinuationChunk(id) {
   const idx = Number(match[1]);
   return Number.isFinite(idx) && idx > 0;
 }
+function groupConsecutiveToolMessages(messages) {
+  const groups = [];
+  let currentToolGroup = [];
+  for (const msg of messages) {
+    const isToolOnlyAssistant = msg.role === "assistant" && (!msg.content || !msg.content.trim()) && msg.toolCalls && msg.toolCalls.length > 0;
+    if (isToolOnlyAssistant) {
+      currentToolGroup.push(msg);
+    } else {
+      if (currentToolGroup.length > 0) {
+        if (currentToolGroup.length === 1) {
+          groups.push({ type: "single", message: currentToolGroup[0] });
+        } else {
+          groups.push({ type: "grouped", messages: currentToolGroup });
+        }
+        currentToolGroup = [];
+      }
+      groups.push({ type: "single", message: msg });
+    }
+  }
+  if (currentToolGroup.length > 0) {
+    if (currentToolGroup.length === 1) {
+      groups.push({ type: "single", message: currentToolGroup[0] });
+    } else {
+      groups.push({ type: "grouped", messages: currentToolGroup });
+    }
+  }
+  return groups;
+}
 
 // packages/terminal/src/components/Messages.tsx
 var jsx_dev_runtime3 = __toESM(require_jsx_dev_runtime(), 1);
@@ -49144,7 +49193,7 @@ function Messages3({
   const lineSpans = import_react24.useMemo(() => {
     let cursor = 0;
     return items.map((item, index) => {
-      const lines = item.kind === "activity" ? estimateActivityEntryLines(item.entry, wrapWidth, messageWidth) : item.kind === "grouped" ? estimateGroupedToolLines(item.messages, messageWidth) : estimateMessageLines(item.message, messageWidth);
+      const lines = item.kind === "activity" ? estimateActivityEntryLines(item.entry, wrapWidth, messageWidth) : item.kind === "grouped" ? estimateGroupedToolMessagesLines(item.messages, messageWidth) : estimateMessageLines(item.message, messageWidth);
       const start = cursor;
       cursor += lines;
       return { item, index, start, end: cursor, lines };
@@ -49308,34 +49357,6 @@ function formatDuration(ms) {
   const secs = totalSeconds % 60;
   return `${mins}m ${secs}s`;
 }
-function groupConsecutiveToolMessages(messages) {
-  const groups = [];
-  let currentToolGroup = [];
-  for (const msg of messages) {
-    const isToolOnlyAssistant = msg.role === "assistant" && (!msg.content || !msg.content.trim()) && msg.toolCalls && msg.toolCalls.length > 0;
-    if (isToolOnlyAssistant) {
-      currentToolGroup.push(msg);
-    } else {
-      if (currentToolGroup.length > 0) {
-        if (currentToolGroup.length === 1) {
-          groups.push({ type: "single", message: currentToolGroup[0] });
-        } else {
-          groups.push({ type: "grouped", messages: currentToolGroup });
-        }
-        currentToolGroup = [];
-      }
-      groups.push({ type: "single", message: msg });
-    }
-  }
-  if (currentToolGroup.length > 0) {
-    if (currentToolGroup.length === 1) {
-      groups.push({ type: "single", message: currentToolGroup[0] });
-    } else {
-      groups.push({ type: "grouped", messages: currentToolGroup });
-    }
-  }
-  return groups;
-}
 function CombinedToolMessage({ messages }) {
   const allToolCalls = [];
   const allToolResults = [];
@@ -49355,27 +49376,6 @@ function CombinedToolMessage({ messages }) {
     }, undefined, false, undefined, this)
   }, undefined, false, undefined, this);
 }
-function estimateGroupedToolLines(messages, messageWidth) {
-  const toolCalls = [];
-  const toolResults = [];
-  for (const msg of messages) {
-    if (msg.toolCalls)
-      toolCalls.push(...msg.toolCalls);
-    if (msg.toolResults)
-      toolResults.push(...msg.toolResults);
-  }
-  if (toolCalls.length === 0)
-    return 0;
-  const synthetic = {
-    id: "grouped-tool-call",
-    role: "assistant",
-    content: "",
-    timestamp: 0,
-    toolCalls,
-    toolResults: toolResults.length > 0 ? toolResults : undefined
-  };
-  return estimateMessageLines(synthetic, messageWidth);
-}
 function MessageBubble({ message, queuedMessageIds }) {
   const isUser = message.role === "user";
   const isSystem = message.role === "system";
@@ -50733,6 +50733,7 @@ function App2({ cwd: cwd2, version }) {
   }, [activityLog, renderWidth, wrapChars]);
   const reservedLines = import_react29.useMemo(() => {
     let lines = 0;
+    const wrapWidth = Math.max(1, (columns ?? 80) - 2);
     lines += 2;
     if (showWelcome) {
       lines += 4;
@@ -50748,16 +50749,23 @@ function App2({ cwd: cwd2, version }) {
       const hasMore = activeQueue.length + inlineCount > MAX_QUEUED_PREVIEW;
       lines += 2;
       lines += 1;
-      lines += previewCount;
+      const previewWidth = Math.max(1, wrapWidth - 2);
+      const previewItems = [...activeInline, ...activeQueue].slice(0, MAX_QUEUED_PREVIEW);
+      const previewLines = previewItems.reduce((sum, queued) => {
+        const label = queued.mode === "inline" ? "\u21B3" : "\u23F3";
+        const text = `${label} ${truncateQueued(queued.content)}`;
+        return sum + countWrappedLines2([text], previewWidth);
+      }, 0);
+      lines += Math.max(previewCount, previewLines);
       if (hasMore)
         lines += 1;
     }
     if (error2) {
       const parsed = parseErrorMessage(error2);
-      const messageLines = parsed.message ? parsed.message.split(`
-`).length : 1;
-      const suggestionLines = parsed.suggestion ? parsed.suggestion.split(`
-`).length : 0;
+      const messageLines = parsed.message ? countWrappedLines2(parsed.message.split(`
+`), wrapWidth) : 1;
+      const suggestionLines = parsed.suggestion ? countWrappedLines2(parsed.suggestion.split(`
+`), wrapWidth) : 0;
       lines += 2;
       lines += Math.max(1, messageLines) + suggestionLines;
     }
@@ -50778,7 +50786,8 @@ function App2({ cwd: cwd2, version }) {
     scrollOffset,
     error2,
     isProcessing,
-    showWelcome
+    showWelcome,
+    columns
   ]);
   const displayMessages = import_react29.useMemo(() => buildDisplayMessages(messages, MESSAGE_CHUNK_LINES, wrapChars, { maxWidth: renderWidth }), [messages, wrapChars, renderWidth]);
   const streamingMessages = import_react29.useMemo(() => {
@@ -50793,8 +50802,15 @@ function App2({ cwd: cwd2, version }) {
     return buildDisplayMessages([streamingMessage], MESSAGE_CHUNK_LINES, wrapChars, { maxWidth: renderWidth });
   }, [currentResponse, isProcessing, wrapChars, renderWidth]);
   const displayLineCount = import_react29.useMemo(() => {
-    const combined = [...displayMessages, ...streamingMessages];
-    return combined.reduce((sum, msg) => sum + estimateMessageLines(msg, renderWidth), 0);
+    const grouped = groupConsecutiveToolMessages(displayMessages);
+    const groupedLines = grouped.reduce((sum, group) => {
+      if (group.type === "single") {
+        return sum + estimateMessageLines(group.message, renderWidth);
+      }
+      return sum + estimateGroupedToolMessagesLines(group.messages, renderWidth);
+    }, 0);
+    const streamingLines = streamingMessages.reduce((sum, msg) => sum + estimateMessageLines(msg, renderWidth), 0);
+    return groupedLines + streamingLines;
   }, [displayMessages, streamingMessages, renderWidth]);
   const totalLineCount = displayLineCount + activityLogLineCount;
   import_react29.useEffect(() => {
@@ -51379,7 +51395,7 @@ function formatStreamEvent(chunk) {
 
 // packages/terminal/src/index.tsx
 var jsx_dev_runtime10 = __toESM(require_jsx_dev_runtime(), 1);
-var VERSION3 = "0.6.35";
+var VERSION3 = "0.6.36";
 process.env.ASSISTANTS_VERSION ??= VERSION3;
 function parseArgs(argv) {
   const args = argv.slice(2);
@@ -51535,4 +51551,4 @@ if (options.print !== null) {
   });
 }
 
-//# debugId=2F2CC5B1781D557164756E2164756E21
+//# debugId=D20D9C4F4FE5D66664756E2164756E21