Merge branch 'main' into subscription-client

Author: jahooma

.github/workflows/cli-release-prod.yml

@@ -148,12 +148,10 @@ jobs:
       - name: Set up Node.js for npm publishing
         uses: actions/setup-node@v4
         with:
-          node-version: 20
+          node-version: 24
           registry-url: https://registry.npmjs.org/
 
       - name: Publish to npm
         run: |
           cd cli/release
           npm publish --access public
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

cli/release/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codebuff",
-  "version": "1.0.603",
+  "version": "1.0.606",
   "description": "AI coding agent",
   "license": "MIT",
   "bin": {

cli/src/components/blocks/agent-branch-wrapper.tsx

@@ -353,15 +353,17 @@ export const AgentBranchWrapper = memo(
           (b): b is ToolContentBlock =>
             b.type === 'tool' && b.toolName === 'set_output',
         )
-        const implementationId = setOutputBlock?.input?.implementationId as string | undefined
+        // set_output wraps data in a 'data' property, so we need to access input.data
+        const outputData = (setOutputBlock?.input as { data?: Record<string, unknown> })?.data
+        const implementationId = outputData?.implementationId as string | undefined
         if (implementationId) {
           const letterIndex = implementationId.charCodeAt(0) - 65
           const implementors = siblingBlocks.filter(
             (b): b is AgentContentBlock =>
               b.type === 'agent' && isImplementorAgent(b),
           )
 
-          reason = setOutputBlock?.input?.reason as string | undefined
+          reason = outputData?.reason as string | undefined
 
           const selectedAgent = implementors[letterIndex]
           if (selectedAgent) {

cli/src/components/blocks/tool-branch.tsx

@@ -45,7 +45,19 @@ export const ToolBranch = memo(
     }
 
     const displayInfo = getToolDisplayInfo(toolBlock.toolName)
-    const isCollapsed = toolBlock.isCollapsed ?? shouldCollapseToolByDefault(toolBlock.toolName)
+    
+    // Check if there's a registered custom component for this tool
+    const toolRenderConfig = renderToolComponent(toolBlock, theme, {
+      availableWidth,
+      indentationOffset: 0,
+      previewPrefix: '',
+      labelWidth: 0,
+    })
+    
+    // Tools without a registered component (fallback rendering) should be collapsed by default
+    const hasRegisteredComponent = toolRenderConfig !== undefined
+    const isCollapsed = toolBlock.isCollapsed ?? 
+      (hasRegisteredComponent ? shouldCollapseToolByDefault(toolBlock.toolName) : true)
 
     const inputContent = `\`\`\`json\n${JSON.stringify(toolBlock.input, null, 2)}\n\`\`\``
     const codeBlockLang =
@@ -67,13 +79,6 @@ export const ToolBranch = memo(
         ? `$ ${toolBlock.input.command.trim()}`
         : null
 
-    let toolRenderConfig = renderToolComponent(toolBlock, theme, {
-      availableWidth,
-      indentationOffset: 0,
-      previewPrefix: '',
-      labelWidth: 0,
-    })
-
     const streamingPreview = isStreaming
       ? commandPreview ?? `${sanitizePreview(firstLine)}...`
       : ''

cli/src/data/slash-commands.ts

@@ -160,6 +160,16 @@ export const SLASHLESS_COMMAND_IDS = new Set(
   ),
 )
 
+/** Maximum description length for skill commands in the slash menu */
+const SKILL_MENU_DESCRIPTION_MAX_LENGTH = 50
+
+function truncateDescription(description: string): string {
+  if (description.length <= SKILL_MENU_DESCRIPTION_MAX_LENGTH) {
+    return description
+  }
+  return description.slice(0, SKILL_MENU_DESCRIPTION_MAX_LENGTH - 1) + '…'
+}
+
 /**
  * Returns SLASH_COMMANDS merged with skill commands.
  * Skills become slash commands that users can invoke directly.
@@ -168,7 +178,7 @@ export function getSlashCommandsWithSkills(skills: SkillsMap): SlashCommand[] {
   const skillCommands: SlashCommand[] = Object.values(skills).map((skill) => ({
     id: `skill:${skill.name}`,
     label: `skill:${skill.name}`,
-    description: skill.description,
+    description: truncateDescription(skill.description),
   }))
 
   return [...SLASH_COMMANDS, ...skillCommands]