dsh-subscriptions 0.2.0 → 0.2.3

package/lib/translate/antigravity.js

@@ -22,37 +22,54 @@ import { antigravityToolParameters } from './antigravity-schema.js';
  * successful results retain their existing serialized shape.
  */
 function toolResultValue(block) {
-    const text = block.content.map(part => part.type === 'text' ? part.text : '').join('');
+    const text = block.content
+        .map((part) => (part.type === 'text' ? part.text : ''))
+        .join('');
     let parsed;
     try {
         parsed = JSON.parse(text);
     }
     catch {
-        return { output: text, ...block.isError === true ? { isError: true } : {} };
+        return {
+            output: text,
+            ...(block.isError === true ? { isError: true } : {}),
+        };
     }
     if (parsed !== null && typeof parsed === 'object' && !Array.isArray(parsed)) {
         const value = parsed;
         return block.isError === true ? { ...value, isError: true } : value;
     }
-    return { output: parsed, ...block.isError === true ? { isError: true } : {} };
+    return {
+        output: parsed,
+        ...(block.isError === true ? { isError: true } : {}),
+    };
 }
 /** Safely read per-block replay metadata emitted by this adapter. */
 function replayBlocks(message, model) {
     const source = message.source;
-    if (model !== undefined && (message.source?.kind !== 'model'
-        || message.source.provider !== 'antigravity' || message.source.model !== model))
+    if (model !== undefined &&
+        (message.source?.kind !== 'model' ||
+            message.source.provider !== 'antigravity' ||
+            message.source.model !== model))
         return [];
-    if (source?.kind !== 'model' || typeof source.replayState !== 'object' || source.replayState === null)
+    if (source?.kind !== 'model' ||
+        typeof source.replayState !== 'object' ||
+        source.replayState === null)
         return [];
     const envelope = source.replayState;
     const response = envelope.response;
-    if (response === null || response?.kind !== 'antigravity' || response.version !== 1 || !Array.isArray(envelope.blocks))
+    if (response === null ||
+        response?.kind !== 'antigravity' ||
+        response.version !== 1 ||
+        !Array.isArray(envelope.blocks))
         return [];
     return envelope.blocks.map((entry) => {
         if (typeof entry !== 'object' || entry === null)
             return {};
         const signature = entry.thoughtSignature;
-        return typeof signature === 'string' && signature.length > 0 ? { thoughtSignature: signature } : {};
+        return typeof signature === 'string' && signature.length > 0
+            ? { thoughtSignature: signature }
+            : {};
     });
 }
 /** Map harness tool schemas to Gemini function declarations. */
@@ -60,18 +77,28 @@ export function toAntigravityTools(tools, model = 'gemini') {
     if (tools.length === 0)
         return [];
     const legacy = /^(claude-|gpt-oss-)/.test(model);
-    return [{
-            functionDeclarations: tools.map(tool => ({
+    return [
+        {
+            functionDeclarations: tools.map((tool) => ({
                 name: tool.name,
                 description: tool.description,
                 [legacy ? 'parameters' : 'parametersJsonSchema']: antigravityToolParameters(tool.parameters, legacy),
             })),
-        }];
+        },
+    ];
 }
 const SKIP_THOUGHT_SIGNATURE_VALIDATOR = 'skip_thought_signature_validator';
-/** Gemini 3 validates the first function call in every model tool-call step. */
+/**
+ * Whether this model validates thought signatures on replayed function calls.
+ *
+ * Gemini 3 and 4 require a signature on the first function call of each step;
+ * foreign history uses the documented placeholder when no signature can be reused.
+ * https://ai.google.dev/gemini-api/docs/generate-content/thought-signatures
+ * Keep this scoped to these model families; future versions and unversioned aliases
+ * need verification before enabling the same fallback.
+ */
 function requiresThoughtSignatures(model) {
-    return model !== undefined && /^gemini-3(?:[.-]|$)/i.test(model);
+    return model !== undefined && /^gemini-[34](?:[.-]|$)/i.test(model.trim());
 }
 /**
  * Convert resolved harness messages into Gemini contents. Function response
@@ -85,18 +112,27 @@ export function toAntigravityContents(messages, model) {
         if (message.role === 'system')
             continue;
         if (message.role === 'tool') {
-            const id = message.toolCallId ?? message.tool_call_id
-                ?? (message.source?.kind === 'tool' ? String(message.source.callId) : undefined);
+            const id = message.toolCallId ??
+                message.tool_call_id ??
+                (message.source?.kind === 'tool'
+                    ? String(message.source.callId)
+                    : undefined);
             if (id === undefined)
                 throw new LlmError('tool result has no call id', 'INVALID_REQUEST');
-            const part = { functionResponse: {
+            const part = {
+                functionResponse: {
                     id,
                     name: callNames.get(id) ?? '',
                     response: toolResultValue({
-                        type: 'tool-result', toolCallId: ToolCallId(id), content: message.content,
-                        ...message.isError === undefined ? {} : { isError: message.isError },
+                        type: 'tool-result',
+                        toolCallId: ToolCallId(id),
+                        content: message.content,
+                        ...(message.isError === undefined
+                            ? {}
+                            : { isError: message.isError }),
                     }),
-                } };
+                },
+            };
             const previous = out.at(-1);
             if (previous?.role === 'user')
                 previous.parts.push(part);
@@ -115,7 +151,9 @@ export function toAntigravityContents(messages, model) {
                     // Antigravity's Claude-backed models reject empty text parts.
                     parts.push({
                         text: block.text.trim().length > 0 ? block.text : '.',
-                        ...metadata[index]?.thoughtSignature === undefined ? {} : { thoughtSignature: metadata[index].thoughtSignature },
+                        ...(metadata[index]?.thoughtSignature === undefined
+                            ? {}
+                            : { thoughtSignature: metadata[index].thoughtSignature }),
                     });
                     break;
                 case 'reasoning': {
@@ -126,7 +164,9 @@ export function toAntigravityContents(messages, model) {
                 }
                 case 'image':
                     if ('dataBase64' in block) {
-                        parts.push({ inlineData: { mimeType: block.mediaType, data: block.dataBase64 } });
+                        parts.push({
+                            inlineData: { mimeType: block.mediaType, data: block.dataBase64 },
+                        });
                     }
                     break;
                 case 'tool-call': {
@@ -139,12 +179,13 @@ export function toAntigravityContents(messages, model) {
                         args = {};
                     }
                     const replaySignature = metadata[index]?.thoughtSignature;
-                    const thoughtSignature = replaySignature ?? (!sawFunctionCall && requiresThoughtSignatures(model)
-                        ? SKIP_THOUGHT_SIGNATURE_VALIDATOR
-                        : undefined);
+                    const thoughtSignature = replaySignature ??
+                        (!sawFunctionCall && requiresThoughtSignatures(model)
+                            ? SKIP_THOUGHT_SIGNATURE_VALIDATOR
+                            : undefined);
                     parts.push({
                         functionCall: { id: String(block.id), name: block.name, args },
-                        ...thoughtSignature === undefined ? {} : { thoughtSignature },
+                        ...(thoughtSignature === undefined ? {} : { thoughtSignature }),
                     });
                     sawFunctionCall = true;
                     break;
@@ -186,19 +227,29 @@ export function toAntigravityRequest(options, messages, projectId, forStreaming
     const thinkingConfig = antigravityThinking(options.model, options.reasoningEffort, options.maxTokens);
     let maxOutputTokens = options.maxTokens;
     // Claude models on the streaming path reject maxOutputTokens >= 65535
-    if (forStreaming && maxOutputTokens !== undefined && /^claude-/.test(options.model) && maxOutputTokens >= 65535) {
+    if (forStreaming &&
+        maxOutputTokens !== undefined &&
+        /^claude-/.test(options.model) &&
+        maxOutputTokens >= 65535) {
         maxOutputTokens = 64000;
     }
     const generationConfig = {
-        ...maxOutputTokens === undefined ? {} : { maxOutputTokens },
-        ...options.temperature === undefined ? {} : { temperature: options.temperature },
-        ...options.stop === undefined || options.stop.length === 0 ? {} : { stopSequences: options.stop },
-        ...thinkingConfig === undefined ? {} : { thinkingConfig },
+        ...(maxOutputTokens === undefined ? {} : { maxOutputTokens }),
+        ...(options.temperature === undefined
+            ? {}
+            : { temperature: options.temperature }),
+        ...(options.stop === undefined || options.stop.length === 0
+            ? {}
+            : { stopSequences: options.stop }),
+        ...(thinkingConfig === undefined ? {} : { thinkingConfig }),
     };
-    const systemTexts = messages.flatMap(message => message.role === 'system'
-        ? message.content.filter((block) => block.type === 'text').map(block => block.text)
+    const systemTexts = messages.flatMap((message) => message.role === 'system'
+        ? message.content
+            .filter((block) => block.type === 'text')
+            .map((block) => block.text)
         : []);
-    const system = options.system ?? (systemTexts.length > 0 ? systemTexts.join('\n\n') : undefined);
+    const system = options.system ??
+        (systemTexts.length > 0 ? systemTexts.join('\n\n') : undefined);
     const sessionId = options.sessionId === undefined ? randomUUID() : String(options.sessionId);
     return {
         project: projectId,
@@ -209,12 +260,20 @@ export function toAntigravityRequest(options, messages, projectId, forStreaming
         request: {
             contents: toAntigravityContents(messages, options.model),
             sessionId,
-            ...system === undefined || system.length === 0 ? {} : { systemInstruction: { parts: [{ text: system }] } },
-            ...tools.length === 0 ? {} : {
-                tools,
-                toolConfig: { functionCallingConfig: { mode: 'VALIDATED' } },
-            },
-            ...Object.keys(generationConfig).length === 0 ? {} : { generationConfig },
+            ...(system === undefined || system.length === 0
+                ? {}
+                : { systemInstruction: { parts: [{ text: system }] } }),
+            ...(tools.length === 0
+                ? {}
+                : {
+                    tools,
+                    toolConfig: {
+                        functionCallingConfig: { mode: 'VALIDATED' },
+                    },
+                }),
+            ...(Object.keys(generationConfig).length === 0
+                ? {}
+                : { generationConfig }),
         },
     };
 }
@@ -224,8 +283,10 @@ export function mapAntigravityUsage(metadata) {
     return {
         inputTokens: Math.max(0, (metadata.promptTokenCount ?? 0) - cached),
         outputTokens: metadata.candidatesTokenCount ?? 0,
-        ...cached > 0 ? { cacheReadTokens: cached } : {},
-        ...metadata.thoughtsTokenCount === undefined ? {} : { reasoningTokens: metadata.thoughtsTokenCount },
+        ...(cached > 0 ? { cacheReadTokens: cached } : {}),
+        ...(metadata.thoughtsTokenCount === undefined
+            ? {}
+            : { reasoningTokens: metadata.thoughtsTokenCount }),
     };
 }
 /** Push translator for both parsed SSE events and one non-stream response. */
@@ -237,7 +298,12 @@ export class AntigravityStreamTranslator {
     sawToolCall = false;
     terminated = false;
     open(key, kind, chunks, values = {}) {
-        const block = { index: this.nextIndex++, kind, text: '', ...values };
+        const block = {
+            index: this.nextIndex++,
+            kind,
+            text: '',
+            ...values,
+        };
         this.blocks.set(key, block);
         chunks.push({ type: 'block-start', index: block.index, blockType: kind });
         return block;
@@ -259,7 +325,10 @@ export class AntigravityStreamTranslator {
                 name: block.name ?? '',
                 arguments: block.text,
             };
-        this.closed[block.index] = block.thoughtSignature === undefined ? {} : { thoughtSignature: block.thoughtSignature };
+        this.closed[block.index] =
+            block.thoughtSignature === undefined
+                ? {}
+                : { thoughtSignature: block.thoughtSignature };
         chunks.push({ type: 'block-end', index: block.index, block: content });
     }
     closeAll(chunks) {
@@ -268,24 +337,45 @@ export class AntigravityStreamTranslator {
     }
     finish(reason) {
         const replayState = {
-            response: { kind: 'antigravity', version: 1 },
+            response: {
+                kind: 'antigravity',
+                version: 1,
+            },
             blocks: this.closed,
         };
         if (!this.sawContent) {
             return {
                 type: 'finish',
-                reason: { kind: 'error', failure: { message: 'Antigravity returned no content', code: EMPTY_RESPONSE_CODE } },
+                reason: {
+                    kind: 'error',
+                    failure: {
+                        message: 'Antigravity returned no content',
+                        code: EMPTY_RESPONSE_CODE,
+                    },
+                },
             };
         }
         if (reason === 'MAX_TOKENS')
             return { type: 'finish', reason: { kind: 'max-tokens' }, replayState };
-        if (reason === 'SAFETY' || reason === 'RECITATION' || reason === 'BLOCKLIST') {
+        if (reason === 'SAFETY' ||
+            reason === 'RECITATION' ||
+            reason === 'BLOCKLIST') {
             return {
                 type: 'finish',
-                reason: { kind: 'error', failure: { message: `Antigravity blocked the response (${reason})`, code: 'CONTENT_FILTER' } },
+                reason: {
+                    kind: 'error',
+                    failure: {
+                        message: `Antigravity blocked the response (${reason})`,
+                        code: 'CONTENT_FILTER',
+                    },
+                },
             };
         }
-        return { type: 'finish', reason: { kind: this.sawToolCall ? 'tool-calls' : 'stop' }, replayState };
+        return {
+            type: 'finish',
+            reason: { kind: this.sawToolCall ? 'tool-calls' : 'stop' },
+            replayState,
+        };
     }
     /** Process one decoded Antigravity response frame. */
     push(event) {
@@ -294,13 +384,20 @@ export class AntigravityStreamTranslator {
         const chunks = [];
         const candidate = event.response?.candidates?.[0];
         for (const [partIndex, part] of (candidate?.content?.parts ?? []).entries()) {
-            if (part.thought === true && typeof part.text === 'string' && part.text.length > 0) {
-                const block = this.blocks.get('reasoning') ?? this.open('reasoning', 'reasoning', chunks);
+            if (part.thought === true &&
+                typeof part.text === 'string' &&
+                part.text.length > 0) {
+                const block = this.blocks.get('reasoning') ??
+                    this.open('reasoning', 'reasoning', chunks);
                 block.text += part.text;
                 if (part.thoughtSignature !== undefined)
                     block.thoughtSignature = part.thoughtSignature;
                 this.sawContent = true;
-                chunks.push({ type: 'reasoning-delta', index: block.index, text: part.text });
+                chunks.push({
+                    type: 'reasoning-delta',
+                    index: block.index,
+                    text: part.text,
+                });
             }
             else if (typeof part.text === 'string' && part.text.length > 0) {
                 const block = this.blocks.get('text') ?? this.open('text', 'text', chunks);
@@ -320,7 +417,9 @@ export class AntigravityStreamTranslator {
                 const block = this.open(key, 'tool-call', chunks, {
                     id,
                     name: call.name ?? '',
-                    ...part.thoughtSignature === undefined ? {} : { thoughtSignature: part.thoughtSignature },
+                    ...(part.thoughtSignature === undefined
+                        ? {}
+                        : { thoughtSignature: part.thoughtSignature }),
                 });
                 block.text = args;
                 this.sawContent = true;

package/lib/translate/chat-completions.js

@@ -11,7 +11,9 @@ import { parseSse } from './sse.js';
 import { withToolResultImages } from './resolved.js';
 /** Flatten a tool result's content to plain text for a `tool` message. */
 function toolResultText(block) {
-    return block.content.map(part => (part.type === 'text' ? part.text : '')).join('');
+    return block.content
+        .map((part) => (part.type === 'text' ? part.text : ''))
+        .join('');
 }
 /**
  * Convert harness messages into chat completions `messages`. System-role
@@ -37,15 +39,27 @@ export function toChatMessages(messages, system) {
             continue;
         }
         if (message.role === 'tool') {
-            const callId = message.toolCallId ?? message.tool_call_id
-                ?? (message.source?.kind === 'tool' ? String(message.source.callId) : undefined);
+            const callId = message.toolCallId ??
+                message.tool_call_id ??
+                (message.source?.kind === 'tool'
+                    ? String(message.source.callId)
+                    : undefined);
             if (callId === undefined)
                 throw new LlmError('tool result has no call id', 'INVALID_REQUEST');
-            out.push({ role: 'tool', tool_call_id: callId, content: message.content.map(block => block.type === 'text' ? block.text : '').join('') });
+            out.push({
+                role: 'tool',
+                tool_call_id: callId,
+                content: message.content
+                    .map((block) => (block.type === 'text' ? block.text : ''))
+                    .join(''),
+            });
             continue;
         }
         if (message.role === 'developer') {
-            const content = message.content.filter(block => block.type === 'text').map(block => block.text).join('');
+            const content = message.content
+                .filter((block) => block.type === 'text')
+                .map((block) => block.text)
+                .join('');
             if (content.length > 0)
                 out.push({ role: 'developer', content });
             continue;
@@ -79,7 +93,9 @@ export function toChatMessages(messages, system) {
                         if ('dataBase64' in block) {
                             parts.push({
                                 type: 'image_url',
-                                image_url: { url: `data:${block.mediaType};base64,${block.dataBase64}` },
+                                image_url: {
+                                    url: `data:${block.mediaType};base64,${block.dataBase64}`,
+                                },
                             });
                         }
                         break;
@@ -123,7 +139,7 @@ export function toChatMessages(messages, system) {
         out.push({
             role: 'assistant',
             content: texts.join('\n'),
-            ...toolCalls.length > 0 ? { tool_calls: toolCalls } : {},
+            ...(toolCalls.length > 0 ? { tool_calls: toolCalls } : {}),
         });
     }
     const systemText = system ?? (systemTexts.length > 0 ? systemTexts.join('\n\n') : undefined);
@@ -137,7 +153,7 @@ export function toChatMessages(messages, system) {
  * @returns the wire `tools` array.
  */
 export function toChatTools(tools) {
-    return tools.map(tool => ({
+    return tools.map((tool) => ({
         type: 'function',
         function: {
             name: tool.name,
@@ -158,8 +174,8 @@ export function mapChatCompletionsUsage(usage) {
     return {
         inputTokens: usage.prompt_tokens - (cached ?? 0),
         outputTokens: usage.completion_tokens,
-        ...cached !== undefined ? { cacheReadTokens: cached } : {},
-        ...reasoning !== undefined ? { reasoningTokens: reasoning } : {},
+        ...(cached !== undefined ? { cacheReadTokens: cached } : {}),
+        ...(reasoning !== undefined ? { reasoningTokens: reasoning } : {}),
     };
 }
 /** Assemble the final ContentBlock for one open block. */
@@ -208,7 +224,7 @@ export class ChatCompletionsStreamTranslator {
             kind,
             text: '',
             callId,
-            ...name === undefined ? {} : { name },
+            ...(name === undefined ? {} : { name }),
         };
         this.blocks.set(key, block);
         this.order.push(block);
@@ -220,7 +236,11 @@ export class ChatCompletionsStreamTranslator {
         if (block === undefined)
             return;
         this.blocks.delete(key);
-        chunks.push({ type: 'block-end', index: block.index, block: closeBlock(block) });
+        chunks.push({
+            type: 'block-end',
+            index: block.index,
+            block: closeBlock(block),
+        });
     }
     closeAll(chunks) {
         for (const key of [...this.blocks.keys()])
@@ -233,7 +253,10 @@ export class ChatCompletionsStreamTranslator {
                 type: 'finish',
                 reason: {
                     kind: 'error',
-                    failure: { message: 'model returned a completed response with no content', code: EMPTY_RESPONSE_CODE },
+                    failure: {
+                        message: 'model returned a completed response with no content',
+                        code: EMPTY_RESPONSE_CODE,
+                    },
                 },
             };
         }
@@ -247,17 +270,26 @@ export class ChatCompletionsStreamTranslator {
                     type: 'finish',
                     reason: {
                         kind: 'error',
-                        failure: { message: 'the response was blocked by the provider content filter', code: 'CONTENT_FILTER' },
+                        failure: {
+                            message: 'the response was blocked by the provider content filter',
+                            code: 'CONTENT_FILTER',
+                        },
                     },
                 };
             default:
-                return { type: 'finish', reason: { kind: this.sawToolCall ? 'tool-calls' : 'stop' } };
+                return {
+                    type: 'finish',
+                    reason: { kind: this.sawToolCall ? 'tool-calls' : 'stop' },
+                };
         }
     }
     /** Usage, then the armed finish: the only order the harness accepts. */
     drainTerminal(chunks) {
         if (this.pendingUsage !== undefined) {
-            chunks.push({ type: 'usage', usage: mapChatCompletionsUsage(this.pendingUsage) });
+            chunks.push({
+                type: 'usage',
+                usage: mapChatCompletionsUsage(this.pendingUsage),
+            });
             this.pendingUsage = undefined;
         }
         if (this.armedFinish !== undefined) {
@@ -285,15 +317,26 @@ export class ChatCompletionsStreamTranslator {
             if (typeof delta.content === 'string' && delta.content.length > 0) {
                 const block = this.blocks.get('content') ?? this.open('content', 'text', chunks);
                 block.text += delta.content;
-                chunks.push({ type: 'text-delta', index: block.index, text: delta.content });
+                chunks.push({
+                    type: 'text-delta',
+                    index: block.index,
+                    text: delta.content,
+                });
             }
-            const reasoning = typeof delta.reasoning_content === 'string' ? delta.reasoning_content
-                : typeof delta.reasoning_text === 'string' ? delta.reasoning_text
+            const reasoning = typeof delta.reasoning_content === 'string'
+                ? delta.reasoning_content
+                : typeof delta.reasoning_text === 'string'
+                    ? delta.reasoning_text
                     : undefined;
             if (reasoning !== undefined && reasoning.length > 0) {
-                const block = this.blocks.get('reasoning') ?? this.open('reasoning', 'reasoning', chunks);
+                const block = this.blocks.get('reasoning') ??
+                    this.open('reasoning', 'reasoning', chunks);
                 block.text += reasoning;
-                chunks.push({ type: 'reasoning-delta', index: block.index, text: reasoning });
+                chunks.push({
+                    type: 'reasoning-delta',
+                    index: block.index,
+                    text: reasoning,
+                });
             }
             for (const call of delta.tool_calls ?? []) {
                 const key = `call:${String(call.index ?? 0)}`;
@@ -305,11 +348,12 @@ export class ChatCompletionsStreamTranslator {
                         type: 'tool-call-delta',
                         index: block.index,
                         id: ToolCallId(block.callId),
-                        ...block.name === undefined ? {} : { name: block.name },
+                        ...(block.name === undefined ? {} : { name: block.name }),
                         argumentsDelta: '',
                     });
                 }
-                if (call.function?.arguments !== undefined && call.function.arguments.length > 0) {
+                if (call.function?.arguments !== undefined &&
+                    call.function.arguments.length > 0) {
                     block.text += call.function.arguments;
                     chunks.push({
                         type: 'tool-call-delta',