refactor(messages): rename reconcile to sync origins

Author: Tarquinen

lib/hooks.ts

@@ -4,12 +4,7 @@ import type { PluginConfig } from "./config"
 import { assignMessageRefs } from "./message-ids"
 import { syncToolCache } from "./state/tool-cache"
 import { deduplicate, supersedeWrites, purgeErrors } from "./strategies"
-import {
-    prune,
-    reconcilePruneOrigins,
-    insertPruneToolContext,
-    insertMessageIdContext,
-} from "./messages"
+import { prune, syncToolOrigins, insertPruneToolContext, insertMessageIdContext } from "./messages"
 import { buildToolIdList, isIgnoredUserMessage } from "./messages/utils"
 import { checkSession } from "./state"
 import { renderSystemPrompt } from "./prompts"
@@ -118,7 +113,7 @@ export function createChatMessageTransformHandler(
 
         syncToolCache(state, config, logger, output.messages)
         buildToolIdList(state, output.messages, logger)
-        reconcilePruneOrigins(state, logger, output.messages)
+        syncToolOrigins(state, logger, output.messages)
 
         deduplicate(state, logger, config, output.messages)
         supersedeWrites(state, logger, config, output.messages)

lib/messages/index.ts

@@ -1,4 +1,4 @@
 export { prune } from "./prune"
-export { reconcilePruneOrigins } from "./reconcile"
+export { syncToolOrigins } from "./sync"
 export { insertPruneToolContext } from "./inject"
 export { insertMessageIdContext } from "./inject"

lib/messages/reconcile.ts lib/messages/sync.tslib/messages/reconcile.ts renamed to lib/messages/sync.ts

@@ -1,7 +1,7 @@
 import type { SessionState, WithParts } from "../state"
 import type { Logger } from "../logger"
 
-export const reconcilePruneOrigins = (
+export const syncToolOrigins = (
     state: SessionState,
     logger: Logger,
     messages: WithParts[],
@@ -31,7 +31,7 @@ export const reconcilePruneOrigins = (
     }
 
     if (removedToolCount > 0 || removedOriginCount > 0) {
-        logger.info("Reconciled prune origins", {
+        logger.info("Synced prune origins", {
             removedToolCount,
             removedOriginCount,
         })

lib/messages/utils.ts

@@ -84,10 +84,15 @@ export const createSyntheticToolPart = (
     const partId = generateStableId("prt_dcp_tool", deterministicSeed)
     const callId = generateStableId("call_dcp_tool", deterministicSeed)
 
-    // Gemini requires thoughtSignature bypass to accept synthetic tool parts
+    // Gemini requires a thought signature on synthetic function calls.
+    // Keep this metadata both on the part and on state so whichever
+    // conversion path is used can forward it to providerOptions.
     const toolPartMetadata = isGeminiModel(modelID)
-        ? { google: { thoughtSignature: "skip_thought_signature_validator" } }
-        : {}
+        ? {
+              google: { thoughtSignature: "skip_thought_signature_validator" },
+              vertex: { thoughtSignature: "skip_thought_signature_validator" },
+          }
+        : undefined
 
     return {
         id: partId,
@@ -96,14 +101,15 @@ export const createSyntheticToolPart = (
         type: "tool" as const,
         callID: callId,
         tool: "context_info",
+        ...(toolPartMetadata ? { metadata: toolPartMetadata } : {}),
         state: {
             status: "completed" as const,
             input: {},
             output: content,
             title: "Context Info",
-            metadata: toolPartMetadata,
+            ...(toolPartMetadata ? { metadata: toolPartMetadata } : {}),
             time: { start: now, end: now },
-        },
+        } as any,
     }
 }