@lay111/dsh-plugin-google 1.0.15 → 1.0.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lay111/dsh-plugin-google",
-  "version": "1.0.15",
+  "version": "1.0.17",
   "description": "Community-driven DeepSeek Harness Plugin for Google Antigravity & Gemini/Claude Models",
   "type": "module",
   "main": "src/index.js",

package/src/api.js

@@ -6,18 +6,58 @@ const ANTIGRAVITY_ENDPOINTS = [
   'https://daily-cloudcode-pa.sandbox.googleapis.com/v1internal:streamGenerateContent?alt=sse',
 ];
 
+export function cleanSchema(schema) {
+  if (!schema || typeof schema !== 'object') return schema;
+  const clone = JSON.parse(JSON.stringify(schema));
+
+  function clean(obj) {
+    if (!obj || typeof obj !== 'object') return;
+    delete obj.$schema;
+    delete obj.$id;
+    delete obj.definitions;
+    delete obj.$defs;
+    delete obj.additionalProperties;
+
+    if (obj.properties && typeof obj.properties === 'object') {
+      for (const key of Object.keys(obj.properties)) {
+        clean(obj.properties[key]);
+      }
+    }
+    if (obj.items && typeof obj.items === 'object') {
+      clean(obj.items);
+    }
+    if (Array.isArray(obj.anyOf)) {
+      obj.anyOf.forEach(clean);
+    }
+    if (Array.isArray(obj.oneOf)) {
+      obj.oneOf.forEach(clean);
+    }
+    if (Array.isArray(obj.allOf)) {
+      obj.allOf.forEach(clean);
+    }
+  }
+
+  clean(clone);
+  return clone;
+}
+
 export function formatMessagesToAntigravity(messages, modelSpec, projectId) {
   const contents = [];
-  let systemInstruction = null;
+  const systemParts = [];
+  const isClaude = modelSpec.id.includes('claude') || modelSpec.wireId.includes('claude');
 
   for (const message of messages) {
     if (message.role === 'system') {
-      const text = typeof message.content === 'string' ? message.content : JSON.stringify(message.content);
-      if (text.length > 0) {
-        systemInstruction = {
-          role: 'user',
-          parts: [{ text }],
-        };
+      let text = '';
+      if (typeof message.content === 'string') {
+        text = message.content;
+      } else if (Array.isArray(message.content)) {
+        text = message.content
+          .map((b) => (b.type === 'text' ? b.text : typeof b === 'string' ? b : ''))
+          .join('\n');
+      }
+      if (text.trim().length > 0) {
+        systemParts.push({ text: text.trim() });
       }
       continue;
     }
@@ -30,24 +70,43 @@ export function formatMessagesToAntigravity(messages, modelSpec, projectId) {
     } else if (Array.isArray(message.content)) {
       for (const block of message.content) {
         if (block.type === 'text') {
-          parts.push({ text: block.text });
+          if (block.text && block.text.length > 0) {
+            parts.push({ text: block.text });
+          }
         } else if (block.type === 'thought' || block.type === 'reasoning') {
           parts.push({ thought: true, text: block.text || block.thought || '' });
         } else if (block.type === 'tool-call') {
-          parts.push({
+          const callPart = {
             functionCall: {
               name: block.name,
               args: typeof block.arguments === 'string' ? JSON.parse(block.arguments || '{}') : block.arguments || {},
             },
-          });
+          };
+          if (!isClaude) {
+            callPart.thoughtSignature = block.thoughtSignature || 'skip_thought_signature_validator';
+          }
+          parts.push(callPart);
         } else if (block.type === 'tool-result') {
+          let outputText = '';
+          if (typeof block.content === 'string') {
+            outputText = block.content;
+          } else if (Array.isArray(block.content)) {
+            outputText = block.content
+              .map((p) => p.text || (typeof p === 'string' ? p : JSON.stringify(p)))
+              .join('\n');
+          } else if (typeof block.content === 'object' && block.content !== null) {
+            outputText = JSON.stringify(block.content);
+          } else {
+            outputText = String(block.content || '');
+          }
+
           contents.push({
             role: 'user',
             parts: [
               {
                 functionResponse: {
-                  name: block.name || 'tool',
-                  response: { result: block.content },
+                  name: block.name || block.toolName || 'tool',
+                  response: { output: outputText || '(no output)' },
                 },
               },
             ],
@@ -68,7 +127,6 @@ export function formatMessagesToAntigravity(messages, modelSpec, projectId) {
     contents.push({ role: 'user', parts: [{ text: 'Hello' }] });
   }
 
-  const isClaude = modelSpec.id.includes('claude') || modelSpec.wireId.includes('claude');
   const payload = {
     project: projectId || 'aicode-consumers',
     model: modelSpec.wireId,
@@ -86,7 +144,7 @@ export function formatMessagesToAntigravity(messages, modelSpec, projectId) {
             }
           : {}),
       },
-      ...(systemInstruction ? { systemInstruction } : {}),
+      ...(systemParts.length > 0 ? { systemInstruction: { parts: systemParts } } : {}),
       labels: {
         trajectory_id: `traj_${Date.now()}`,
         used_claude: String(isClaude),
@@ -109,7 +167,7 @@ export async function* streamAntigravity(options, accessToken, projectId) {
         functionDeclarations: options.tools.map((tool) => ({
           name: tool.name,
           description: tool.description || '',
-          parameters: tool.parameters || {},
+          parameters: cleanSchema(tool.parameters || {}),
         })),
       },
     ];
@@ -165,7 +223,12 @@ export async function* streamAntigravity(options, accessToken, projectId) {
   const reader = response.body.getReader();
   const decoder = new TextDecoder();
   let buffer = '';
-  let blockIndex = 0;
+  let hasText = false;
+  let hasToolCall = false;
+  let accumulatedThoughts = '';
+  let nextBlockIndex = 0;
+  const reasoningBlockIndex = 0;
+  let textBlockIndex = 1;
 
   try {
     while (true) {
@@ -192,22 +255,26 @@ export async function* streamAntigravity(options, accessToken, projectId) {
 
             for (const part of candidate.content?.parts || []) {
               if (part.thought) {
+                accumulatedThoughts += part.text || '';
                 yield {
                   type: 'reasoning-delta',
-                  index: blockIndex,
+                  index: reasoningBlockIndex,
                   text: part.text || '',
                 };
               } else if (part.text) {
+                hasText = true;
                 yield {
                   type: 'text-delta',
-                  index: blockIndex,
+                  index: textBlockIndex,
                   text: part.text || '',
                 };
               } else if (part.functionCall) {
+                hasToolCall = true;
                 const callId = `call_${Math.random().toString(36).slice(2, 10)}`;
+                const callIndex = 2 + (nextBlockIndex++);
                 yield {
                   type: 'tool-call-delta',
-                  index: blockIndex++,
+                  index: callIndex,
                   id: callId,
                   name: part.functionCall.name,
                   argumentsDelta: JSON.stringify(part.functionCall.args || {}),
@@ -216,6 +283,17 @@ export async function* streamAntigravity(options, accessToken, projectId) {
             }
 
             if (candidate.finishReason) {
+              // Fallback protection: If the model only thought and emitted 0 text and 0 tool calls,
+              // synthesize a completion text so the turn never cuts off silently!
+              if (!hasText && !hasToolCall && accumulatedThoughts.length > 0) {
+                hasText = true;
+                yield {
+                  type: 'text-delta',
+                  index: textBlockIndex,
+                  text: '\n(已完成思考，请指示下一步)',
+                };
+              }
+
               yield {
                 type: 'finish',
                 reason: 'stop',
@@ -227,6 +305,19 @@ export async function* streamAntigravity(options, accessToken, projectId) {
         }
       }
     }
+
+    // Final safety check
+    if (!hasText && !hasToolCall && accumulatedThoughts.length > 0) {
+      yield {
+        type: 'text-delta',
+        index: textBlockIndex,
+        text: '\n(已完成思考，请指示下一步)',
+      };
+      yield {
+        type: 'finish',
+        reason: 'stop',
+      };
+    }
   } finally {
     reader.releaseLock();
   }