Sync public snapshot from freebuff-private

Source: CodebuffAI/freebuff-private@c0ffc5fe85e218f98057d2fc3651c3217b4f64f3

Author: github-actions[bot]

bun.lock

@@ -975,6 +975,7 @@ describe('extractBlockById', () => {
       blocks,
       'nested-child',
     )
+    expect(remainingBlocks).toHaveLength(1)
     expect((remainingBlocks[0] as AgentContentBlock).blocks).toHaveLength(0)
     expect(extractedBlock).not.toBeNull()
     expect((extractedBlock as AgentContentBlock).agentId).toBe('nested-child')
@@ -1016,6 +1017,7 @@ describe('extractBlockById', () => {
       blocks,
       'extract-me',
     )
+    expect(remainingBlocks).toHaveLength(1)
     const parentBlock = remainingBlocks[0] as AgentContentBlock
     expect(parentBlock.blocks).toHaveLength(2)
     expect((parentBlock.blocks![0] as TextContentBlock).content).toBe(
@@ -1195,6 +1197,22 @@ describe('updateToolBlockWithOutput', () => {
     expect((result[0] as ToolContentBlock).output).toBe('outerr')
   })
 
+  test('falls back to formatted output when terminal payload has no stdout/stderr', () => {
+    const blocks: ContentBlock[] = [
+      {
+        type: 'tool',
+        toolCallId: 'tool-123',
+        toolName: 'run_terminal_command',
+        input: { command: 'cmd' },
+      },
+    ]
+    const result = updateToolBlockWithOutput(blocks, {
+      toolCallId: 'tool-123',
+      toolOutput: [{ type: 'json', value: { exitCode: 1 } }],
+    })
+    expect((result[0] as ToolContentBlock).output).toBe('exitCode: 1')
+  })
+
   test('does not update non-matching tool block', () => {
     const blocks: ContentBlock[] = [
       {

cli/src/utils/__tests__/message-block-helpers.test.ts

@@ -476,7 +476,8 @@ const checkBlockIsUnderParent = (
     if (block.type === 'agent' && block.agentId === parentAgentId) {
       // Found the parent, check if target is anywhere in its children
       return findBlockInChildren(block.blocks || [], targetAgentId)
-    } else if (block.type === 'agent' && block.blocks) {
+    }
+    if (block.type === 'agent' && block.blocks) {
       // Recurse into other agent blocks to find the parent
       if (checkBlockIsUnderParent(block.blocks, targetAgentId, parentAgentId)) {
         return true
@@ -502,14 +503,16 @@ export const extractBlockById = (
       if (block.type === 'agent' && block.agentId === targetAgentId) {
         extractedBlock = block
         // Don't add to result - we're extracting it
-      } else if (block.type === 'agent' && block.blocks) {
+        continue
+      }
+      if (block.type === 'agent' && block.blocks) {
         result.push({
           ...block,
           blocks: extractRecursively(block.blocks),
         })
-      } else {
-        result.push(block)
+        continue
       }
+      result.push(block)
     }
     return result
   }
@@ -659,19 +662,17 @@ export const updateToolBlockWithOutput = (
 
   return blocks.map((block) => {
     if (block.type === 'tool' && block.toolCallId === toolCallId) {
-      let output: string
-      if (block.toolName === 'run_terminal_command') {
-        const parsed = (toolOutput?.[0] as any)?.value
-        if (parsed?.stdout || parsed?.stderr) {
-          output = (parsed.stdout || '') + (parsed.stderr || '')
-        } else {
-          output = formatToolOutput(toolOutput)
-        }
-      } else {
-        output = formatToolOutput(toolOutput)
+      if (block.toolName !== 'run_terminal_command') {
+        return { ...block, output: formatToolOutput(toolOutput) }
       }
+      const parsed = (toolOutput?.[0] as any)?.value
+      const output =
+        parsed?.stdout || parsed?.stderr
+          ? (parsed.stdout || '') + (parsed.stderr || '')
+          : formatToolOutput(toolOutput)
       return { ...block, output }
-    } else if (block.type === 'agent' && block.blocks) {
+    }
+    if (block.type === 'agent' && block.blocks) {
       const updatedBlocks = updateToolBlockWithOutput(block.blocks, options)
       // Avoid creating new block if nested blocks didn't change
       if (isEqual(block.blocks, updatedBlocks)) {

cli/src/utils/message-block-helpers.ts

@@ -1,21 +1,20 @@
 import { formatTimeUntil } from '@codebuff/common/util/dates'
 
 /**
- * Format time until reset in human-readable form.
+ * Format time until reset in human-readable form, including days.
  * @param resetDate - The date when the quota/resource resets
- * @returns Human-readable string like "2h 30m" or "45m"
+ * @returns Human-readable string like "4d 7h" or "2h 30m"
  */
-export const formatResetTime = (resetDate: Date | null): string => {
+export const formatResetTimeLong = (resetDate: Date | string | null): string => {
   if (!resetDate) return ''
   return formatTimeUntil(resetDate, { fallback: 'now' })
 }
 
 /**
- * Format time until reset in human-readable form, including days.
+ * Alias for {@link formatResetTimeLong} with a narrower `Date`-only parameter
+ * type.
  * @param resetDate - The date when the quota/resource resets
  * @returns Human-readable string like "4d 7h" or "2h 30m"
  */
-export const formatResetTimeLong = (resetDate: Date | string | null): string => {
-  if (!resetDate) return ''
-  return formatTimeUntil(resetDate, { fallback: 'now' })
-}
+export const formatResetTime = (resetDate: Date | null): string =>
+  formatResetTimeLong(resetDate)