@fatagnus/codebuff 1.0.4 → 1.0.6

package/dist/convex.cjs

@@ -5459,11 +5459,14 @@ __p += '`;
 // src/convex.ts
 var exports_convex = {};
 __export(exports_convex, {
+  validateSpawnPermission: () => validateSpawnPermission,
   sanitizeErrorMessage: () => sanitizeErrorMessage,
   run: () => run,
   isRetryableStatusCode: () => isRetryableStatusCode,
+  getMatchingSpawn: () => getMatchingSpawn,
   getErrorStatusCode: () => getErrorStatusCode,
   getCustomToolDefinition: () => getCustomToolDefinition,
+  filterUnfinishedToolCalls: () => filterUnfinishedToolCalls,
   createServerError: () => createServerError,
   createPaymentRequiredError: () => createPaymentRequiredError,
   createNetworkError: () => createNetworkError,
@@ -5473,19 +5476,23 @@ __export(exports_convex, {
   convexInitialSessionState: () => convexInitialSessionState,
   convexApplyOverridesToSessionState: () => convexApplyOverridesToSessionState,
   buildUserMessageContent: () => buildUserMessageContent,
+  buildToolsForApi: () => buildToolsForApi,
+  buildSystemPrompt: () => buildSystemPrompt,
   WEBSITE_URL: () => WEBSITE_URL,
   RETRY_BACKOFF_MAX_DELAY_MS: () => RETRY_BACKOFF_MAX_DELAY_MS,
   RETRY_BACKOFF_BASE_DELAY_MS: () => RETRY_BACKOFF_BASE_DELAY_MS,
   RETRYABLE_STATUS_CODES: () => RETRYABLE_STATUS_CODES,
   RECONNECTION_RETRY_DELAY_MS: () => RECONNECTION_RETRY_DELAY_MS,
   RECONNECTION_MESSAGE_DURATION_MS: () => RECONNECTION_MESSAGE_DURATION_MS,
+  MAX_SUBAGENT_DEPTH: () => MAX_SUBAGENT_DEPTH,
   MAX_RETRIES_PER_MESSAGE: () => MAX_RETRIES_PER_MESSAGE,
   IS_TEST: () => IS_TEST,
   IS_PROD: () => IS_PROD,
   IS_DEV: () => IS_DEV,
   ConvexUnsupportedToolError: () => ConvexUnsupportedToolError,
   ConvexCodebuffClient: () => ConvexCodebuffClient,
-  CODEBUFF_BINARY: () => CODEBUFF_BINARY
+  CODEBUFF_BINARY: () => CODEBUFF_BINARY,
+  BASE_AGENT_IDS: () => BASE_AGENT_IDS
 });
 module.exports = __toCommonJS(exports_convex);
 
@@ -6104,6 +6111,35 @@ function userMessage(content) {
     sentAt: Date.now()
   };
 }
+function withSystemTags(text) {
+  return `<system>${text}</system>`;
+}
+function filterUnfinishedToolCalls(messages) {
+  const completedToolCallIds = new Set;
+  for (const msg of messages) {
+    if (msg.role === "tool") {
+      completedToolCallIds.add(msg.toolCallId);
+    }
+  }
+  return messages.map((msg) => {
+    if (msg.role !== "assistant") {
+      return msg;
+    }
+    const filteredContent = msg.content.filter((part) => {
+      if (part.type === "tool-call") {
+        return completedToolCallIds.has(part.toolCallId);
+      }
+      return true;
+    });
+    if (filteredContent.length === 0) {
+      return null;
+    }
+    return {
+      ...msg,
+      content: filteredContent
+    };
+  }).filter((msg) => msg !== null);
+}
 var createAbortError = (signal) => {
   if (signal?.reason instanceof Error) {
     return signal.reason;
@@ -6453,25 +6489,25 @@ async function handleToolCall(context) {
   } = context;
   const customToolHandler = customToolDefinitions[toolName];
   if (customToolHandler) {
-    return await customToolHandler.execute(input);
+    return { output: await customToolHandler.execute(input), creditsUsed: 0 };
   }
   let override = overrides[toolName];
   if (!override && toolName === "str_replace") {
     override = overrides["write_file"];
   }
   if (override) {
-    return await override(input);
+    return { output: await override(input), creditsUsed: 0 };
   }
   switch (toolName) {
     case "end_turn":
-      return [{ type: "json", value: { message: "Turn ended." } }];
+      return { output: [{ type: "json", value: { message: "Turn ended." } }], creditsUsed: 0 };
     case "read_files": {
       const files = await readFiles({
         filePaths: input.paths || input.filePaths || [],
         override: overrides.read_files,
         projectFiles
       });
-      return [{ type: "json", value: files }];
+      return { output: [{ type: "json", value: files }], creditsUsed: 0 };
     }
     case "spawn_agents": {
       return await handleSpawnAgents(context);
@@ -6488,10 +6524,13 @@ async function handleToolCall(context) {
     case "glob":
       throw new ConvexUnsupportedToolError("glob", "File system access is not available in Convex");
     case "run_file_change_hooks":
-      return [{
-        type: "json",
-        value: { message: "File change hooks are not supported in Convex mode" }
-      }];
+      return {
+        output: [{
+          type: "json",
+          value: { message: "File change hooks are not supported in Convex mode" }
+        }],
+        creditsUsed: 0
+      };
     default:
       throw new Error(`Tool not implemented in Convex SDK: ${toolName}. ` + `Please provide an override or modify your agent to not use this tool.`);
   }
@@ -6519,12 +6558,15 @@ async function handleSpawnAgents(context) {
     throw new Error('spawn_agents requires an "agents" array parameter');
   }
   if (currentDepth >= MAX_SUBAGENT_DEPTH) {
-    return [{
-      type: "json",
-      value: {
-        errorMessage: `Maximum subagent depth (${MAX_SUBAGENT_DEPTH}) exceeded. Cannot spawn more subagents.`
-      }
-    }];
+    return {
+      output: [{
+        type: "json",
+        value: {
+          errorMessage: `Maximum subagent depth (${MAX_SUBAGENT_DEPTH}) exceeded. Cannot spawn more subagents.`
+        }
+      }],
+      creditsUsed: 0
+    };
   }
   const parentSpawnableAgents = parentAgentDefinition?.spawnableAgents ?? [];
   const results = await Promise.allSettled(agents.map(async ({ agent_type: agentTypeStr, prompt, params: spawnParams }) => {
@@ -6543,6 +6585,20 @@ async function handleSpawnAgents(context) {
         prompt
       });
     }
+    let inheritedMessageHistory;
+    if (childAgentDef.includeMessageHistory) {
+      inheritedMessageHistory = filterUnfinishedToolCalls(context.parentMessageHistory ?? []);
+      inheritedMessageHistory.push({
+        role: "user",
+        content: [
+          {
+            type: "text",
+            text: withSystemTags(`Subagent ${childAgentDef.id} has been spawned.`)
+          }
+        ],
+        tags: ["SUBAGENT_SPAWN"]
+      });
+    }
     const result = await executeAgentLoop({
       apiKey,
       runId,
@@ -6556,6 +6612,7 @@ async function handleSpawnAgents(context) {
       currentDepth: currentDepth + 1,
       overrideTools: overrides,
       customToolDefinitions,
+      inheritedMessageHistory,
       handleStreamChunk: handleStreamChunk ? async (chunk) => {
         if (typeof chunk === "string") {
           await handleStreamChunk({
@@ -6587,24 +6644,35 @@ async function handleSpawnAgents(context) {
       creditsUsed: result.creditsUsed
     };
   }));
+  let totalSubagentCredits = 0;
+  for (const result of results) {
+    if (result.status === "fulfilled") {
+      totalSubagentCredits += result.value.creditsUsed;
+    }
+  }
   const reports = results.map((result, index) => {
     if (result.status === "fulfilled") {
-      const { agentType, agentName, output } = result.value;
+      const { agentType, agentName, output, creditsUsed } = result.value;
       return {
         agentName,
         agentType,
-        value: output
+        value: output,
+        creditsUsed
       };
     } else {
       const agentTypeStr = agents[index].agent_type;
       return {
         agentType: agentTypeStr,
         agentName: agentTypeStr,
-        value: { errorMessage: `Error spawning agent: ${result.reason}` }
+        value: { errorMessage: `Error spawning agent: ${result.reason}` },
+        creditsUsed: 0
       };
     }
   });
-  return [{ type: "json", value: reports }];
+  return {
+    output: [{ type: "json", value: reports }],
+    creditsUsed: totalSubagentCredits
+  };
 }
 async function executeAgentLoop(options) {
   const {
@@ -6623,17 +6691,19 @@ async function executeAgentLoop(options) {
     handleStreamChunk,
     handleEvent,
     logger,
-    signal
+    signal,
+    inheritedMessageHistory
   } = options;
   const systemPrompt = buildSystemPrompt(agentDefinition, projectFiles);
   const tools = buildToolsForApi(agentDefinition, Object.values(customToolDefinitions));
   const model = agentDefinition.model || "anthropic/claude-sonnet-4";
-  const messages = [];
+  const messages = inheritedMessageHistory ? [...inheritedMessageHistory] : [];
   if (prompt || params) {
     messages.push(userMessage(buildUserMessageContent(prompt, params, undefined)));
   }
   let totalSteps = 0;
-  let creditsUsed = 0;
+  let directCreditsUsed = 0;
+  let subagentCreditsUsed = 0;
   let fullResponse = "";
   while (totalSteps < maxAgentSteps) {
     if (signal?.aborted) {
@@ -6691,7 +6761,7 @@ async function executeAgentLoop(options) {
       }
       try {
         const input = JSON.parse(tc.arguments || "{}");
-        const result = await handleToolCall({
+        const toolResult = await handleToolCall({
           toolName: tc.name,
           input,
           overrides: overrideTools,
@@ -6707,13 +6777,15 @@ async function executeAgentLoop(options) {
           handleStreamChunk,
           handleEvent,
           logger,
-          signal
+          signal,
+          parentMessageHistory: messages
         });
+        subagentCreditsUsed += toolResult.creditsUsed;
         messages.push({
           role: "tool",
           toolCallId: tc.id,
           toolName: tc.name,
-          content: result
+          content: toolResult.output
         });
       } catch (error) {
         const errorMessage = error instanceof Error ? error.message : String(error);
@@ -6729,10 +6801,13 @@ async function executeAgentLoop(options) {
       break;
     }
   }
+  const totalCreditsUsed = directCreditsUsed + subagentCreditsUsed;
   return {
     response: fullResponse,
     output: fullResponse || "Agent completed.",
-    creditsUsed,
+    creditsUsed: totalCreditsUsed,
+    directCreditsUsed,
+    subagentCreditsUsed,
     messages
   };
 }
@@ -6948,16 +7023,18 @@ async function run(options) {
         messageHistoryLength: initialMessages.length
       });
     }
+    const effectiveAgentDef = agentDefinition ?? {
+      id: agentId,
+      displayName: agentId,
+      systemPrompt: "You are a helpful AI assistant.",
+      toolNames: ["read_files", "end_turn"],
+      model: "anthropic/claude-sonnet-4"
+    };
     const result = await executeAgentLoop({
       apiKey,
       runId,
       agentId: mainAgentId,
-      agentDefinition: agentDefinition ?? {
-        id: agentId,
-        displayName: agentId,
-        systemPrompt: "You are a helpful AI assistant.",
-        toolNames: ["read_files", "end_turn"]
-      },
+      agentDefinition: effectiveAgentDef,
       agentDefinitions,
       projectFiles,
       maxAgentSteps,
@@ -6971,13 +7048,10 @@ async function run(options) {
       logger,
       signal
     });
-    const allMessages = [...initialMessages.slice(0, -1), ...result.messages];
-    if (initialMessages.length > 0 && result.messages.length === 0) {
-      allMessages.push(...initialMessages);
-    }
     sessionState.mainAgentState.messageHistory = result.messages.length > 0 ? result.messages : initialMessages;
     sessionState.mainAgentState.creditsUsed = result.creditsUsed;
-    await finishAgentRun(apiKey, runId, "completed", Math.ceil(result.messages.length / 2), result.creditsUsed, result.creditsUsed, logger);
+    sessionState.mainAgentState.directCreditsUsed = result.directCreditsUsed;
+    await finishAgentRun(apiKey, runId, "completed", Math.ceil(result.messages.length / 2), result.directCreditsUsed, result.creditsUsed, logger);
     if (handleEvent) {
       await handleEvent({
         type: "finish",
@@ -7046,3 +7120,16 @@ Provide a handleEvent function to handle this error.`);
     }
   }
 }
+
+// src/convex.ts
+if (typeof Promise.withResolvers !== "function") {
+  Promise.withResolvers = function() {
+    let resolve;
+    let reject;
+    const promise = new Promise((res, rej) => {
+      resolve = res;
+      reject = rej;
+    });
+    return { promise, resolve, reject };
+  };
+}

package/dist/convex.mjs

@@ -6047,6 +6047,35 @@ function userMessage(content) {
     sentAt: Date.now()
   };
 }
+function withSystemTags(text) {
+  return `<system>${text}</system>`;
+}
+function filterUnfinishedToolCalls(messages) {
+  const completedToolCallIds = new Set;
+  for (const msg of messages) {
+    if (msg.role === "tool") {
+      completedToolCallIds.add(msg.toolCallId);
+    }
+  }
+  return messages.map((msg) => {
+    if (msg.role !== "assistant") {
+      return msg;
+    }
+    const filteredContent = msg.content.filter((part) => {
+      if (part.type === "tool-call") {
+        return completedToolCallIds.has(part.toolCallId);
+      }
+      return true;
+    });
+    if (filteredContent.length === 0) {
+      return null;
+    }
+    return {
+      ...msg,
+      content: filteredContent
+    };
+  }).filter((msg) => msg !== null);
+}
 var createAbortError = (signal) => {
   if (signal?.reason instanceof Error) {
     return signal.reason;
@@ -6396,25 +6425,25 @@ async function handleToolCall(context) {
   } = context;
   const customToolHandler = customToolDefinitions[toolName];
   if (customToolHandler) {
-    return await customToolHandler.execute(input);
+    return { output: await customToolHandler.execute(input), creditsUsed: 0 };
   }
   let override = overrides[toolName];
   if (!override && toolName === "str_replace") {
     override = overrides["write_file"];
   }
   if (override) {
-    return await override(input);
+    return { output: await override(input), creditsUsed: 0 };
   }
   switch (toolName) {
     case "end_turn":
-      return [{ type: "json", value: { message: "Turn ended." } }];
+      return { output: [{ type: "json", value: { message: "Turn ended." } }], creditsUsed: 0 };
     case "read_files": {
       const files = await readFiles({
         filePaths: input.paths || input.filePaths || [],
         override: overrides.read_files,
         projectFiles
       });
-      return [{ type: "json", value: files }];
+      return { output: [{ type: "json", value: files }], creditsUsed: 0 };
     }
     case "spawn_agents": {
       return await handleSpawnAgents(context);
@@ -6431,10 +6460,13 @@ async function handleToolCall(context) {
     case "glob":
       throw new ConvexUnsupportedToolError("glob", "File system access is not available in Convex");
     case "run_file_change_hooks":
-      return [{
-        type: "json",
-        value: { message: "File change hooks are not supported in Convex mode" }
-      }];
+      return {
+        output: [{
+          type: "json",
+          value: { message: "File change hooks are not supported in Convex mode" }
+        }],
+        creditsUsed: 0
+      };
     default:
       throw new Error(`Tool not implemented in Convex SDK: ${toolName}. ` + `Please provide an override or modify your agent to not use this tool.`);
   }
@@ -6462,12 +6494,15 @@ async function handleSpawnAgents(context) {
     throw new Error('spawn_agents requires an "agents" array parameter');
   }
   if (currentDepth >= MAX_SUBAGENT_DEPTH) {
-    return [{
-      type: "json",
-      value: {
-        errorMessage: `Maximum subagent depth (${MAX_SUBAGENT_DEPTH}) exceeded. Cannot spawn more subagents.`
-      }
-    }];
+    return {
+      output: [{
+        type: "json",
+        value: {
+          errorMessage: `Maximum subagent depth (${MAX_SUBAGENT_DEPTH}) exceeded. Cannot spawn more subagents.`
+        }
+      }],
+      creditsUsed: 0
+    };
   }
   const parentSpawnableAgents = parentAgentDefinition?.spawnableAgents ?? [];
   const results = await Promise.allSettled(agents.map(async ({ agent_type: agentTypeStr, prompt, params: spawnParams }) => {
@@ -6486,6 +6521,20 @@ async function handleSpawnAgents(context) {
         prompt
       });
     }
+    let inheritedMessageHistory;
+    if (childAgentDef.includeMessageHistory) {
+      inheritedMessageHistory = filterUnfinishedToolCalls(context.parentMessageHistory ?? []);
+      inheritedMessageHistory.push({
+        role: "user",
+        content: [
+          {
+            type: "text",
+            text: withSystemTags(`Subagent ${childAgentDef.id} has been spawned.`)
+          }
+        ],
+        tags: ["SUBAGENT_SPAWN"]
+      });
+    }
     const result = await executeAgentLoop({
       apiKey,
       runId,
@@ -6499,6 +6548,7 @@ async function handleSpawnAgents(context) {
       currentDepth: currentDepth + 1,
       overrideTools: overrides,
       customToolDefinitions,
+      inheritedMessageHistory,
       handleStreamChunk: handleStreamChunk ? async (chunk) => {
         if (typeof chunk === "string") {
           await handleStreamChunk({
@@ -6530,24 +6580,35 @@ async function handleSpawnAgents(context) {
       creditsUsed: result.creditsUsed
     };
   }));
+  let totalSubagentCredits = 0;
+  for (const result of results) {
+    if (result.status === "fulfilled") {
+      totalSubagentCredits += result.value.creditsUsed;
+    }
+  }
   const reports = results.map((result, index) => {
     if (result.status === "fulfilled") {
-      const { agentType, agentName, output } = result.value;
+      const { agentType, agentName, output, creditsUsed } = result.value;
       return {
         agentName,
         agentType,
-        value: output
+        value: output,
+        creditsUsed
       };
     } else {
       const agentTypeStr = agents[index].agent_type;
       return {
         agentType: agentTypeStr,
         agentName: agentTypeStr,
-        value: { errorMessage: `Error spawning agent: ${result.reason}` }
+        value: { errorMessage: `Error spawning agent: ${result.reason}` },
+        creditsUsed: 0
       };
     }
   });
-  return [{ type: "json", value: reports }];
+  return {
+    output: [{ type: "json", value: reports }],
+    creditsUsed: totalSubagentCredits
+  };
 }
 async function executeAgentLoop(options) {
   const {
@@ -6566,17 +6627,19 @@ async function executeAgentLoop(options) {
     handleStreamChunk,
     handleEvent,
     logger,
-    signal
+    signal,
+    inheritedMessageHistory
   } = options;
   const systemPrompt = buildSystemPrompt(agentDefinition, projectFiles);
   const tools = buildToolsForApi(agentDefinition, Object.values(customToolDefinitions));
   const model = agentDefinition.model || "anthropic/claude-sonnet-4";
-  const messages = [];
+  const messages = inheritedMessageHistory ? [...inheritedMessageHistory] : [];
   if (prompt || params) {
     messages.push(userMessage(buildUserMessageContent(prompt, params, undefined)));
   }
   let totalSteps = 0;
-  let creditsUsed = 0;
+  let directCreditsUsed = 0;
+  let subagentCreditsUsed = 0;
   let fullResponse = "";
   while (totalSteps < maxAgentSteps) {
     if (signal?.aborted) {
@@ -6634,7 +6697,7 @@ async function executeAgentLoop(options) {
       }
       try {
         const input = JSON.parse(tc.arguments || "{}");
-        const result = await handleToolCall({
+        const toolResult = await handleToolCall({
           toolName: tc.name,
           input,
           overrides: overrideTools,
@@ -6650,13 +6713,15 @@ async function executeAgentLoop(options) {
           handleStreamChunk,
           handleEvent,
           logger,
-          signal
+          signal,
+          parentMessageHistory: messages
         });
+        subagentCreditsUsed += toolResult.creditsUsed;
         messages.push({
           role: "tool",
           toolCallId: tc.id,
           toolName: tc.name,
-          content: result
+          content: toolResult.output
         });
       } catch (error) {
         const errorMessage = error instanceof Error ? error.message : String(error);
@@ -6672,10 +6737,13 @@ async function executeAgentLoop(options) {
       break;
     }
   }
+  const totalCreditsUsed = directCreditsUsed + subagentCreditsUsed;
   return {
     response: fullResponse,
     output: fullResponse || "Agent completed.",
-    creditsUsed,
+    creditsUsed: totalCreditsUsed,
+    directCreditsUsed,
+    subagentCreditsUsed,
     messages
   };
 }
@@ -6891,16 +6959,18 @@ async function run(options) {
         messageHistoryLength: initialMessages.length
       });
     }
+    const effectiveAgentDef = agentDefinition ?? {
+      id: agentId,
+      displayName: agentId,
+      systemPrompt: "You are a helpful AI assistant.",
+      toolNames: ["read_files", "end_turn"],
+      model: "anthropic/claude-sonnet-4"
+    };
     const result = await executeAgentLoop({
       apiKey,
       runId,
       agentId: mainAgentId,
-      agentDefinition: agentDefinition ?? {
-        id: agentId,
-        displayName: agentId,
-        systemPrompt: "You are a helpful AI assistant.",
-        toolNames: ["read_files", "end_turn"]
-      },
+      agentDefinition: effectiveAgentDef,
       agentDefinitions,
       projectFiles,
       maxAgentSteps,
@@ -6914,13 +6984,10 @@ async function run(options) {
       logger,
       signal
     });
-    const allMessages = [...initialMessages.slice(0, -1), ...result.messages];
-    if (initialMessages.length > 0 && result.messages.length === 0) {
-      allMessages.push(...initialMessages);
-    }
     sessionState.mainAgentState.messageHistory = result.messages.length > 0 ? result.messages : initialMessages;
     sessionState.mainAgentState.creditsUsed = result.creditsUsed;
-    await finishAgentRun(apiKey, runId, "completed", Math.ceil(result.messages.length / 2), result.creditsUsed, result.creditsUsed, logger);
+    sessionState.mainAgentState.directCreditsUsed = result.directCreditsUsed;
+    await finishAgentRun(apiKey, runId, "completed", Math.ceil(result.messages.length / 2), result.directCreditsUsed, result.creditsUsed, logger);
     if (handleEvent) {
       await handleEvent({
         type: "finish",
@@ -6989,12 +7056,28 @@ Provide a handleEvent function to handle this error.`);
     }
   }
 }
+
+// src/convex.ts
+if (typeof Promise.withResolvers !== "function") {
+  Promise.withResolvers = function() {
+    let resolve;
+    let reject;
+    const promise = new Promise((res, rej) => {
+      resolve = res;
+      reject = rej;
+    });
+    return { promise, resolve, reject };
+  };
+}
 export {
+  validateSpawnPermission,
   sanitizeErrorMessage,
   run,
   isRetryableStatusCode,
+  getMatchingSpawn,
   getErrorStatusCode,
   getCustomToolDefinition,
+  filterUnfinishedToolCalls,
   createServerError,
   createPaymentRequiredError,
   createNetworkError,
@@ -7004,17 +7087,21 @@ export {
   convexInitialSessionState,
   convexApplyOverridesToSessionState,
   buildUserMessageContent,
+  buildToolsForApi,
+  buildSystemPrompt,
   WEBSITE_URL,
   RETRY_BACKOFF_MAX_DELAY_MS,
   RETRY_BACKOFF_BASE_DELAY_MS,
   RETRYABLE_STATUS_CODES,
   RECONNECTION_RETRY_DELAY_MS,
   RECONNECTION_MESSAGE_DURATION_MS,
+  MAX_SUBAGENT_DEPTH,
   MAX_RETRIES_PER_MESSAGE,
   IS_TEST,
   IS_PROD,
   IS_DEV,
   ConvexUnsupportedToolError,
   ConvexCodebuffClient,
-  CODEBUFF_BINARY
+  CODEBUFF_BINARY,
+  BASE_AGENT_IDS
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@fatagnus/codebuff",
   "private": false,
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "Official SDK for Codebuff — AI coding agent & framework",
   "license": "Apache-2.0",
   "type": "module",
@@ -72,10 +72,7 @@
     "ws": "^8.18.0",
     "zod": "^4.2.1"
   },
-  "optionalDependencies": {
-    "@vscode/tree-sitter-wasm": "0.1.4",
-    "web-tree-sitter": "0.25.6"
-  },
+
   "devDependencies": {
     "@types/bun": "^1.3.5",
     "@types/diff": "8.0.0",