Merge pull request #82 from Tarquinen/fix/gemini-tool-name-resolution

Tarquinen · web-flow · commit b47a7543c0ea · 2025-12-07T02:56:29.000-05:00
Fix Gemini tool name resolution and session restore
diff --git a/lib/fetch-wrapper/formats/gemini.ts b/lib/fetch-wrapper/formats/gemini.ts
@@ -87,9 +87,10 @@ export const geminiFormat: FormatDescriptor = {
                         const toolCallId = positionMapping.get(positionKey)
 
                         if (toolCallId) {
+                            const metadata = state.toolParameters.get(toolCallId.toLowerCase())
                             outputs.push({
                                 id: toolCallId.toLowerCase(),
-                                toolName: funcName
+                                toolName: metadata?.tool
                             })
                         }
                     }
diff --git a/lib/fetch-wrapper/handler.ts b/lib/fetch-wrapper/handler.ts
@@ -71,6 +71,7 @@ export async function handleFormat(
     const sessionId = ctx.state.lastSeenSessionId
     const protectedSet = new Set(ctx.config.protectedTools)
     if (sessionId) {
+        await ensureSessionRestored(ctx.state, sessionId, ctx.logger)
         await syncToolCache(ctx.client, sessionId, ctx.state, ctx.toolTracker, protectedSet, ctx.logger)
     }
 

Original file line number	Diff line number	Diff line change
`@@ -87,9 +87,10 @@ export const geminiFormat: FormatDescriptor = {`
`87`	`87`	`const toolCallId = positionMapping.get(positionKey)`
`88`	`88`
`89`	`89`	`if (toolCallId) {`
	`90`	`+ const metadata = state.toolParameters.get(toolCallId.toLowerCase())`
`90`	`91`	`outputs.push({`
`91`	`92`	`id: toolCallId.toLowerCase(),`
`92`		`- toolName: funcName`
	`93`	`+ toolName: metadata?.tool`
`93`	`94`	`})`
`94`	`95`	`}`
`95`	`96`	`}`
Original file line number	Diff line number	Diff line change
`@@ -71,6 +71,7 @@ export async function handleFormat(`
`71`	`71`	`const sessionId = ctx.state.lastSeenSessionId`
`72`	`72`	`const protectedSet = new Set(ctx.config.protectedTools)`
`73`	`73`	`if (sessionId) {`
	`74`	`+ await ensureSessionRestored(ctx.state, sessionId, ctx.logger)`
`74`	`75`	`await syncToolCache(ctx.client, sessionId, ctx.state, ctx.toolTracker, protectedSet, ctx.logger)`
`75`	`76`	`}`
`76`	`77`