Improve tool call handling

Author: Caleb-T-Owens

apps/desktop/src/lib/codegen/claude.ts

@@ -1,6 +1,6 @@
 import { type ClaudeMessage, type ClaudeSessionDetails } from '$lib/codegen/types';
 import { hasTauriExtra } from '$lib/state/backendQuery';
-import { invalidatesItem, providesItem, ReduxTag } from '$lib/state/tags';
+import { providesItem, ReduxTag } from '$lib/state/tags';
 import { InjectionToken } from '@gitbutler/shared/context';
 import type { ClientState } from '$lib/state/clientState.svelte';
 
@@ -44,10 +44,7 @@ function injectEndpoints(api: ClientState['backendApi']) {
 					command: 'claude_send_message',
 					actionName: 'Send message'
 				},
-				query: (args) => args,
-				invalidatesTags: (_result, _error, args) => [
-					invalidatesItem(ReduxTag.EditChangesSinceInitial, args.projectId + args.stackId)
-				]
+				query: (args) => args
 			}),
 			getSessionDetails: build.query<
 				ClaudeSessionDetails,
@@ -63,7 +60,7 @@ function injectEndpoints(api: ClientState['backendApi']) {
 				extraOptions: { command: 'claude_get_messages' },
 				query: (args) => args,
 				providesTags: (_result, _error, args) => [
-					...providesItem(ReduxTag.EditChangesSinceInitial, args.projectId + args.stackId)
+					...providesItem(ReduxTag.ClaudeCodeTranscript, args.projectId + args.stackId)
 				],
 				async onCacheEntryAdded(arg, lifecycleApi) {
 					if (!hasTauriExtra(lifecycleApi.extra)) {

apps/desktop/src/lib/codegen/messages.ts

@@ -2,6 +2,7 @@
  * This module is responsible for taking the messages from a near-incomprehesable mess into something _vaugly_ useful.
  */
 
+import { isDefined } from '@gitbutler/ui/utils/typeguards';
 import type { ClaudeMessage } from '$lib/codegen/types';
 
 export type Message =
@@ -77,9 +78,10 @@ export function formatMessages(events: ClaudeMessage[]): Message[] {
 					const result = content[0]!;
 					const foundToolCall = toolCalls[result.tool_use_id];
 					if (!foundToolCall) {
-						return [];
-					} else if (!result.content) {
-						foundToolCall.result = undefined;
+						// This should never happen
+						continue;
+					} else if (!isDefined(result.content)) {
+						foundToolCall.result = 'Tool completed with no output';
 					} else if (typeof result.content === 'string') {
 						foundToolCall.result = result.content;
 					} else if (result.content[0]!.type === 'text') {