@benjamolina/pi-antigravity-guard 0.4.7 → 0.4.8

package/dist/context.js

@@ -26,12 +26,15 @@ export function serializeContext(input, injectedSelection, onDiagnostics) {
     const { toolChoice: _choice, ...textOptions } = isRecord(options) ? options : {};
     const text = serializeTextContext({ ...input, context: { ...textContext, messages: [{ role: "user", content: "placeholder", timestamp: 0 }] }, options: textOptions });
     const sameModel = (message) => field(message, "role") === "assistant" && entry.replay.kind === "same-public-model" && isSameProviderAndModel(message, entry.publicId);
-    const signedToolReplay = geminiRequiresSignedToolReplay(selection.route.wireModel) ? {
-        requireSignedToolCalls: true,
+    const requireSigned = geminiRequiresSignedToolReplay(selection.route.wireModel);
+    const includeToolCallId = entry.response.family === "claude" || entry.response.family === "gpt-oss";
+    const toolReplayPolicy = (requireSigned || includeToolCallId) ? {
+        requireSignedToolCalls: requireSigned,
         isSameModel: sameModel,
         toolCallSignature: (part, message) => sameModel(message) ? validThoughtSignature(field(part, "thoughtSignature")) : undefined,
+        includeToolCallId,
     } : undefined;
-    const contents = replayToolHistory(isDenseArray(messages), (part, message) => messagePart(part, field(message, "role") === "assistant", sameModel(message)), onDiagnostics, signedToolReplay, prepared?.declarations.length ?? 0);
+    const contents = replayToolHistory(isDenseArray(messages), (part, message) => messagePart(part, field(message, "role") === "assistant", sameModel(message)), onDiagnostics, toolReplayPolicy, prepared?.declarations.length ?? 0);
     const { systemInstruction, generationConfig } = text.request;
     return { ...text, request: {
             contents,

package/dist/tool-context.d.ts

@@ -20,10 +20,12 @@ export interface ToolReplayDiagnostics {
     readonly assistantToolCallBlockCount: number;
     readonly declaredToolCount: number;
 }
+export declare function sanitizeToolCallId(id: string, fallbackName?: string): string;
 export interface ToolReplayPolicy {
     readonly requireSignedToolCalls: boolean;
     readonly isSameModel: (message: Record<string, unknown>) => boolean;
     readonly toolCallSignature: (part: Record<string, unknown>, message: Record<string, unknown>) => string | undefined;
+    readonly includeToolCallId?: boolean;
 }
 export declare function replayToolHistory(messages: unknown[], serializePart: (part: Record<string, unknown>, message: Record<string, unknown>) => WirePart, onDiagnostics?: (diagnostics: ToolReplayDiagnostics) => void, policy?: ToolReplayPolicy, declaredToolCount?: number): WireContent[];
 export {};

package/dist/tool-context.js

@@ -32,6 +32,12 @@ export function prepareToolContext(tools, choice, schemaProfile) {
         unsupportedChoice();
     return { declarations, mode: choice === "none" ? "NONE" : "AUTO" };
 }
+let toolCallCounter = 0;
+export function sanitizeToolCallId(id, fallbackName) {
+    const cleaned = id.replace(/[^a-zA-Z0-9_-]/g, "_");
+    const capped = cleaned.slice(0, 64);
+    return capped || `${fallbackName || "tool"}_${++toolCallCounter}`;
+}
 export function replayToolHistory(messages, serializePart, onDiagnostics, policy, declaredToolCount = 0) {
     const output = [];
     const calls = new Set();
@@ -63,7 +69,7 @@ export function replayToolHistory(messages, serializePart, onDiagnostics, policy
             if (actual)
                 return actual;
             recoveryCount.value += 1;
-            return pending.observations ? observation(call, missingResultText()) : missingResult(call);
+            return pending.observations ? observation(call, missingResultText()) : missingResult(call, policy?.includeToolCallId);
         });
         if (pending.extraParts?.length) {
             turnParts.push(...pending.extraParts);
@@ -109,7 +115,7 @@ export function replayToolHistory(messages, serializePart, onDiagnostics, policy
             const text = textParts.join("\n\n");
             const outputText = text || (imageParts.length > 0 ? "[Image content]" : "");
             const response = value(current, "isError") === true ? { error: outputText } : { output: outputText };
-            pending.results.set(id, pending.observations ? observation(call, outputText) : { functionResponse: { name: call.name, response } });
+            pending.results.set(id, pending.observations ? observation(call, outputText) : { functionResponse: { ...(policy?.includeToolCallId ? { id: sanitizeToolCallId(call.id, call.name) } : {}), name: call.name, response } });
             if (imageParts.length > 0) {
                 if (!pending.extraParts)
                     pending.extraParts = [];
@@ -174,7 +180,7 @@ export function replayToolHistory(messages, serializePart, onDiagnostics, policy
                 return [part];
             if (observations)
                 return [];
-            return [{ functionCall: { name: part.call.name, args: part.call.args }, ...(part.signature ? { thoughtSignature: part.signature } : {}) }];
+            return [{ functionCall: { ...(policy?.includeToolCallId ? { id: sanitizeToolCallId(part.call.id, part.call.name) } : {}), name: part.call.name, args: part.call.args }, ...(part.signature ? { thoughtSignature: part.signature } : {}) }];
         }));
         pending = { calls: group, results: new Map(), observations };
     }
@@ -190,9 +196,10 @@ function observation(call, text) {
 function missingResultText() {
     return "Tool execution did not complete or its result was not recorded. Treat the call as failed; do not assume it had no side effects and do not retry it automatically.";
 }
-function missingResult(call) {
+function missingResult(call, includeToolCallId) {
     return {
         functionResponse: {
+            ...(includeToolCallId ? { id: sanitizeToolCallId(call.id, call.name) } : {}),
             name: call.name,
             response: {
                 error: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@benjamolina/pi-antigravity-guard",
-  "version": "0.4.7",
+  "version": "0.4.8",
   "description": "Pi adapter for Antigravity Guard",
   "type": "module",
   "license": "MIT",
@@ -24,7 +24,9 @@
     "README.md"
   ],
   "pi": {
-    "extensions": ["./dist/extension.js"]
+    "extensions": [
+      "./dist/extension.js"
+    ]
   },
   "dependencies": {
     "@benjamolina/antigravity-guard-core": "0.1.0"