Add tool responses for tools which had empty responses

Author: jahooma

common/src/tools/params/tool/add-message.ts

@@ -2,7 +2,7 @@ import z from 'zod/v4'
 
 import {
   $getNativeToolCallExampleString,
-  emptyToolResultSchema,
+  textToolResultSchema,
 } from '../utils'
 
 import type { $ToolParams } from '../../constants'
@@ -35,5 +35,5 @@ export const addMessageParams = {
   endsAgentStep,
   description,
   inputSchema,
-  outputSchema: emptyToolResultSchema(),
+  outputSchema: textToolResultSchema(),
 } satisfies $ToolParams

common/src/tools/params/tool/end-turn.ts

@@ -2,7 +2,7 @@ import z from 'zod/v4'
 
 import {
   $getNativeToolCallExampleString,
-  emptyToolResultSchema,
+  textToolResultSchema,
 } from '../utils'
 
 import type { $ToolParams } from '../../constants'
@@ -53,5 +53,5 @@ export const endTurnParams = {
   endsAgentStep,
   description,
   inputSchema,
-  outputSchema: emptyToolResultSchema(),
+  outputSchema: textToolResultSchema(),
 } satisfies $ToolParams

common/src/tools/params/tool/set-messages.ts

@@ -2,7 +2,7 @@ import z from 'zod/v4'
 
 import {
   $getNativeToolCallExampleString,
-  emptyToolResultSchema,
+  textToolResultSchema,
 } from '../utils'
 
 import type { $ToolParams } from '../../constants'
@@ -40,5 +40,5 @@ export const setMessagesParams = {
   endsAgentStep,
   description,
   inputSchema,
-  outputSchema: emptyToolResultSchema(),
+  outputSchema: textToolResultSchema(),
 } satisfies $ToolParams

common/src/tools/params/tool/spawn-agent-inline.ts

@@ -2,7 +2,7 @@ import z from 'zod/v4'
 
 import {
   $getNativeToolCallExampleString,
-  emptyToolResultSchema,
+  textToolResultSchema,
 } from '../utils'
 
 import type { $ToolParams } from '../../constants'
@@ -51,5 +51,5 @@ export const spawnAgentInlineParams = {
   endsAgentStep,
   description,
   inputSchema,
-  outputSchema: emptyToolResultSchema(),
+  outputSchema: textToolResultSchema(),
 } satisfies $ToolParams

common/src/tools/params/tool/task-completed.ts

@@ -2,7 +2,7 @@ import z from 'zod/v4'
 
 import {
   $getNativeToolCallExampleString,
-  emptyToolResultSchema,
+  textToolResultSchema,
 } from '../utils'
 
 import type { $ToolParams } from '../../constants'
@@ -57,5 +57,5 @@ export const taskCompletedParams = {
   endsAgentStep,
   description,
   inputSchema,
-  outputSchema: emptyToolResultSchema(),
+  outputSchema: textToolResultSchema(),
 } satisfies $ToolParams

common/src/tools/params/tool/think-deeply.ts

@@ -2,7 +2,7 @@ import z from 'zod/v4'
 
 import {
   $getNativeToolCallExampleString,
-  emptyToolResultSchema,
+  textToolResultSchema,
 } from '../utils'
 
 import type { $ToolParams } from '../../constants'
@@ -52,5 +52,5 @@ export const thinkDeeplyParams = {
   endsAgentStep,
   description,
   inputSchema,
-  outputSchema: emptyToolResultSchema(),
+  outputSchema: textToolResultSchema(),
 } satisfies $ToolParams

common/src/tools/params/utils.ts

@@ -64,3 +64,15 @@ export function jsonToolResultSchema<T extends JSONValue>(
 export function emptyToolResultSchema() {
   return z.tuple([])
 }
+
+/** Generates the zod schema for a simple text tool result. */
+export function textToolResultSchema() {
+  return z.tuple([
+    z.object({
+      type: z.literal('json'),
+      value: z.object({
+        message: z.string(),
+      }),
+    }) satisfies z.ZodType<ToolResultOutput>,
+  ])
+}

npm-app/src/index.ts

@@ -107,6 +107,7 @@ async function codebuff({
 }
 
 if (require.main === module) {
+  console.log('npm-app index loaded')
   const program = new Command()
 
   program.name('codebuff').version(npmAppVersion || '0.0.0')

packages/agent-runtime/src/tools/handlers/tool/add-message.ts

@@ -30,5 +30,5 @@ export const handleAddMessage = (async (params: {
       : assistantMessage(toolCall.input.content),
   )
 
-  return { output: [] }
+  return { output: [{ type: 'json', value: { message: 'Message added.' } }] }
 }) satisfies CodebuffToolHandlerFunction<'add_message'>

packages/agent-runtime/src/tools/handlers/tool/end-turn.ts

@@ -11,5 +11,5 @@ export const handleEndTurn = (async (params: {
   const { previousToolCallFinished } = params
 
   await previousToolCallFinished
-  return { output: [] }
+  return { output: [{ type: 'json', value: { message: 'Turn ended.' } }] }
 }) satisfies CodebuffToolHandlerFunction<'end_turn'>