@archal/cli 0.8.0 → 0.9.1

package/harnesses/_lib/llm-response.mjs

@@ -0,0 +1,490 @@
+/**
+ * Response parsing, message building, and tool formatting for each provider.
+ *
+ * Extracted from providers.mjs — pure functions, no HTTP calls.
+ */
+
+import { getModelCapabilities } from './model-configs.mjs';
+
+// ── Token usage tracking ────────────────────────────────────────────
+
+/**
+ * @typedef {Object} TokenUsage
+ * @property {number} inputTokens  - Input/prompt tokens used
+ * @property {number} outputTokens - Output/completion tokens used
+ */
+
+/**
+ * @typedef {Object} LlmResponse
+ * @property {object} body  - The raw API response body
+ * @property {TokenUsage} usage - Token usage for this call
+ */
+
+/**
+ * Extract token usage from a provider's response body.
+ * @param {'gemini' | 'anthropic' | 'openai'} provider
+ * @param {object} body
+ * @returns {TokenUsage}
+ */
+export function extractTokenUsage(provider, body) {
+  switch (provider) {
+    case 'gemini': {
+      const meta = body.usageMetadata ?? {};
+      return {
+        inputTokens: meta.promptTokenCount ?? 0,
+        outputTokens: meta.candidatesTokenCount ?? 0,
+      };
+    }
+    case 'anthropic': {
+      const usage = body.usage ?? {};
+      return {
+        inputTokens: usage.input_tokens ?? 0,
+        outputTokens: usage.output_tokens ?? 0,
+      };
+    }
+    case 'openai': {
+      const usage = body.usage ?? {};
+      return {
+        // Responses API uses input_tokens/output_tokens; Chat Completions uses prompt/completion tokens.
+        inputTokens: usage.input_tokens ?? usage.prompt_tokens ?? 0,
+        outputTokens: usage.output_tokens ?? usage.completion_tokens ?? 0,
+      };
+    }
+    default:
+      return { inputTokens: 0, outputTokens: 0 };
+  }
+}
+
+// ── Tool formatting ─────────────────────────────────────────────────
+
+/**
+ * Recursively strip JSON Schema keywords that LLM function-calling APIs reject.
+ * Applied to all providers (Gemini, OpenAI, Anthropic) for consistency.
+ * Strips: additionalProperties, $schema, propertyNames, patternProperties,
+ * if/then/else, not, const, contentEncoding, contentMediaType, anyOf, oneOf, allOf.
+ */
+const GEMINI_UNSUPPORTED_KEYWORDS = new Set([
+  'additionalProperties', '$schema', 'propertyNames', 'patternProperties',
+  'if', 'then', 'else', 'not', 'const', 'contentEncoding', 'contentMediaType',
+]);
+
+function sanitizeSchemaForLLM(schema) {
+  if (!schema || typeof schema !== 'object') return schema;
+  if (Array.isArray(schema)) return schema.map(sanitizeSchemaForLLM);
+
+  const cleaned = {};
+  for (const [key, value] of Object.entries(schema)) {
+    if (GEMINI_UNSUPPORTED_KEYWORDS.has(key)) continue;
+    // Gemini doesn't support anyOf/oneOf/allOf — flatten single-element unions,
+    // otherwise drop the keyword entirely (Gemini treats it as unknown).
+    if (key === 'anyOf' || key === 'oneOf' || key === 'allOf') {
+      if (Array.isArray(value) && value.length === 1) {
+        Object.assign(cleaned, sanitizeSchemaForLLM(value[0]));
+      }
+      // Multi-element unions are unsupported; skip the keyword
+      continue;
+    }
+    cleaned[key] = sanitizeSchemaForLLM(value);
+  }
+  return cleaned;
+}
+
+/**
+ * Convert MCP tool schemas to the format expected by each provider.
+ */
+export function formatToolsForProvider(provider, mcpTools) {
+  switch (provider) {
+    case 'gemini':
+      return [{
+        functionDeclarations: mcpTools.map((t) => ({
+          name: t.name,
+          description: t.description,
+          parameters: sanitizeSchemaForLLM(t.inputSchema),
+        })),
+      }];
+    case 'openai':
+      return mcpTools.map((t) => ({
+        type: 'function',
+        name: t.name,
+        description: t.description,
+        parameters: sanitizeSchemaForLLM(t.inputSchema),
+      }));
+    case 'anthropic':
+      return mcpTools.map((t) => ({
+        name: t.name,
+        description: t.description,
+        input_schema: sanitizeSchemaForLLM(t.inputSchema),
+      }));
+    default:
+      return mcpTools;
+  }
+}
+
+// ── Response parsing ────────────────────────────────────────────────
+
+/**
+ * Parse tool calls from the provider's response.
+ * Returns an array of { id, name, arguments } or null if no tool calls.
+ *
+ * Accepts either a raw response body or an LlmResponse wrapper.
+ */
+export function parseToolCalls(provider, responseOrWrapper) {
+  const response = responseOrWrapper?.body ?? responseOrWrapper;
+  switch (provider) {
+    case 'gemini':
+      return parseGeminiToolCalls(response);
+    case 'anthropic':
+      return parseAnthropicToolCalls(response);
+    case 'openai':
+      return parseOpenAiToolCalls(response);
+    default:
+      return parseOpenAiToolCalls(response);
+  }
+}
+
+function parseGeminiToolCalls(response) {
+  const parts = response.candidates?.[0]?.content?.parts ?? [];
+  const calls = parts
+    .filter((p) => p.functionCall)
+    .map((p) => ({
+      id: p.functionCall.name + '-' + Date.now(),
+      name: p.functionCall.name,
+      arguments: p.functionCall.args ?? {},
+    }));
+  return calls.length > 0 ? calls : null;
+}
+
+function parseAnthropicToolCalls(response) {
+  const content = response.content ?? [];
+  const calls = content
+    .filter((c) => c.type === 'tool_use')
+    .map((c) => ({
+      id: c.id,
+      name: c.name,
+      arguments: c.input ?? {},
+    }));
+  return calls.length > 0 ? calls : null;
+}
+
+function parseOpenAiToolCalls(response) {
+  const output = Array.isArray(response.output) ? response.output : [];
+  const calls = [];
+  for (const item of output) {
+    if (item?.type !== 'function_call') continue;
+
+    let parsedArguments = {};
+    if (typeof item.arguments === 'string' && item.arguments.trim()) {
+      try {
+        parsedArguments = JSON.parse(item.arguments);
+      } catch {
+        parsedArguments = { _raw: item.arguments };
+      }
+    } else if (item.arguments && typeof item.arguments === 'object') {
+      parsedArguments = item.arguments;
+    }
+
+    calls.push({
+      id: item.call_id ?? item.id ?? `${item.name ?? 'tool'}-${Date.now()}`,
+      name: item.name,
+      arguments: parsedArguments,
+    });
+  }
+
+  return calls.length > 0 ? calls : null;
+}
+
+/**
+ * Get the text content from the provider's response (if any).
+ *
+ * Accepts either a raw response body or an LlmResponse wrapper.
+ */
+export function getResponseText(provider, responseOrWrapper) {
+  const response = responseOrWrapper?.body ?? responseOrWrapper;
+  switch (provider) {
+    case 'gemini': {
+      const parts = response.candidates?.[0]?.content?.parts ?? [];
+      // Exclude thinking parts (thought === true) — those go to getThinkingContent()
+      const textParts = parts.filter((p) => p.text && !p.thought).map((p) => p.text);
+      return textParts.join('') || null;
+    }
+    case 'anthropic': {
+      const content = response.content ?? [];
+      const textBlocks = content.filter((c) => c.type === 'text').map((c) => c.text);
+      return textBlocks.join('') || null;
+    }
+    case 'openai': {
+      if (typeof response.output_text === 'string' && response.output_text.trim()) {
+        return response.output_text;
+      }
+      const output = Array.isArray(response.output) ? response.output : [];
+      const chunks = [];
+      for (const item of output) {
+        if (item?.type === 'output_text' && typeof item.text === 'string') {
+          chunks.push(item.text);
+          continue;
+        }
+        if (item?.type !== 'message' || !Array.isArray(item.content)) continue;
+        for (const part of item.content) {
+          if ((part?.type === 'output_text' || part?.type === 'text') && typeof part.text === 'string') {
+            chunks.push(part.text);
+          }
+        }
+      }
+      return chunks.join('') || null;
+    }
+    default:
+      return null;
+  }
+}
+
+/**
+ * Extract thinking/reasoning content from the provider's response.
+ * Returns the model's internal reasoning (Anthropic thinking blocks,
+ * Gemini thinking parts) or null if none.
+ *
+ * @param {'gemini' | 'anthropic' | 'openai'} provider
+ * @param {object} responseOrWrapper
+ * @returns {string | null}
+ */
+export function getThinkingContent(provider, responseOrWrapper) {
+  const response = responseOrWrapper?.body ?? responseOrWrapper;
+  switch (provider) {
+    case 'anthropic': {
+      const content = response.content ?? [];
+      const blocks = content
+        .filter((c) => c.type === 'thinking')
+        .map((c) => c.thinking);
+      return blocks.length > 0 ? blocks.join('\n') : null;
+    }
+    case 'openai': {
+      const output = Array.isArray(response.output) ? response.output : [];
+      const summaries = [];
+      for (const item of output) {
+        if (item?.type !== 'reasoning') continue;
+        if (Array.isArray(item.summary)) {
+          for (const summary of item.summary) {
+            if (typeof summary?.text === 'string' && summary.text.trim()) {
+              summaries.push(summary.text);
+            }
+          }
+        }
+      }
+      return summaries.length > 0 ? summaries.join('\n') : null;
+    }
+    case 'gemini': {
+      const parts = response.candidates?.[0]?.content?.parts ?? [];
+      const thinkingParts = parts
+        .filter((p) => p.thought === true)
+        .map((p) => p.text);
+      return thinkingParts.length > 0 ? thinkingParts.join('\n') : null;
+    }
+    default:
+      return null;
+  }
+}
+
+/**
+ * Get the stop reason from the provider's response.
+ * @param {'gemini' | 'anthropic' | 'openai'} provider
+ * @param {object} responseOrWrapper
+ * @returns {string | null}
+ */
+export function getStopReason(provider, responseOrWrapper) {
+  const response = responseOrWrapper?.body ?? responseOrWrapper;
+  switch (provider) {
+    case 'gemini':
+      return response.candidates?.[0]?.finishReason ?? null;
+    case 'anthropic':
+      return response.stop_reason ?? null;
+    case 'openai':
+      return parseOpenAiToolCalls(response) ? 'tool_calls' : (response.status ?? response.incomplete_details?.reason ?? null);
+    default:
+      return null;
+  }
+}
+
+// ── Message formatting ──────────────────────────────────────────────
+
+/**
+ * Build the initial messages array with system prompt and task for the provider.
+ * For reasoning models that don't support system prompts, the system prompt
+ * is prepended to the user message automatically.
+ *
+ * @param {'gemini' | 'anthropic' | 'openai'} provider
+ * @param {string} systemPrompt
+ * @param {string} task
+ * @param {string} [model] - Optional model name for capability checking
+ */
+export function buildInitialMessages(provider, systemPrompt, task, model) {
+  const capabilities = model ? getModelCapabilities(model) : null;
+  const supportsSystem = capabilities ? capabilities.supportsSystemPrompt : true;
+
+  switch (provider) {
+    case 'gemini':
+      return [
+        { role: 'user', parts: [{ text: (systemPrompt ? systemPrompt + '\n\n' : '') + task }] },
+      ];
+    case 'anthropic':
+      return {
+        system: systemPrompt || undefined,
+        messages: [{ role: 'user', content: task }],
+      };
+    case 'openai': {
+      let input;
+      if (!supportsSystem || !systemPrompt) {
+        // Reasoning models (o1, o3, o4) don't support system prompts.
+        // Merge system prompt into user message.
+        const combined = systemPrompt ? systemPrompt + '\n\n' + task : task;
+        input = [{ role: 'user', content: combined }];
+      } else {
+        input = [
+          { role: 'system', content: systemPrompt },
+          { role: 'user', content: task },
+        ];
+      }
+      return {
+        input,
+        previousResponseId: undefined,
+      };
+    }
+    default:
+      return [
+        { role: 'system', content: systemPrompt },
+        { role: 'user', content: task },
+      ];
+  }
+}
+
+/**
+ * Append the assistant response to the conversation for the next turn.
+ *
+ * Accepts either a raw response body or an LlmResponse wrapper.
+ */
+export function appendAssistantResponse(provider, messages, responseOrWrapper) {
+  const response = responseOrWrapper?.body ?? responseOrWrapper;
+  switch (provider) {
+    case 'gemini': {
+      const content = response.candidates?.[0]?.content;
+      if (content) messages.push(content);
+      return messages;
+    }
+    case 'anthropic': {
+      messages.messages.push({ role: 'assistant', content: response.content });
+      return messages;
+    }
+    case 'openai': {
+      if (Array.isArray(messages)) {
+        const text = getResponseText('openai', response);
+        messages.push({ role: 'assistant', content: text ?? '' });
+        return messages;
+      }
+      messages.previousResponseId = response.id ?? messages.previousResponseId;
+      messages.input = [];
+      return messages;
+    }
+    default:
+      return messages;
+  }
+}
+
+/**
+ * Append tool results to the conversation for the next turn.
+ */
+export function appendToolResults(provider, messages, toolCalls, results) {
+  switch (provider) {
+    case 'gemini': {
+      const parts = toolCalls.map((tc, i) => ({
+        functionResponse: {
+          name: tc.name,
+          response: { content: results[i] },
+        },
+      }));
+      messages.push({ role: 'user', parts });
+      return messages;
+    }
+    case 'anthropic': {
+      const content = toolCalls.map((tc, i) => ({
+        type: 'tool_result',
+        tool_use_id: tc.id,
+        content: results[i],
+      }));
+      messages.messages.push({ role: 'user', content });
+      return messages;
+    }
+    case 'openai': {
+      const toolOutputs = [];
+      for (let i = 0; i < toolCalls.length; i++) {
+        const output = typeof results[i] === 'string'
+          ? results[i]
+          : JSON.stringify(results[i]);
+        toolOutputs.push({
+          type: 'function_call_output',
+          call_id: toolCalls[i].id,
+          output,
+        });
+      }
+
+      if (Array.isArray(messages)) {
+        for (let i = 0; i < toolCalls.length; i++) {
+          messages.push({
+            role: 'tool',
+            tool_call_id: toolCalls[i].id,
+            content: toolOutputs[i].output,
+          });
+        }
+        return messages;
+      }
+
+      messages.input = toolOutputs;
+      return messages;
+    }
+    default:
+      return messages;
+  }
+}
+
+/**
+ * Append a plain-text user instruction for the next turn.
+ * Used for harness-level recovery nudges (for example, when the model
+ * responds without any tool calls before taking required actions).
+ *
+ * @param {'gemini' | 'anthropic' | 'openai'} provider
+ * @param {Array | object} messages
+ * @param {string} text
+ * @returns {Array | object}
+ */
+export function appendUserInstruction(provider, messages, text) {
+  switch (provider) {
+    case 'gemini': {
+      messages.push({ role: 'user', parts: [{ text }] });
+      return messages;
+    }
+    case 'anthropic': {
+      messages.messages.push({ role: 'user', content: text });
+      return messages;
+    }
+    case 'openai': {
+      if (Array.isArray(messages)) {
+        messages.push({ role: 'user', content: text });
+        return messages;
+      }
+      const nextInput = Array.isArray(messages.input) ? [...messages.input] : [];
+      nextInput.push({ role: 'user', content: text });
+      messages.input = nextInput;
+      return messages;
+    }
+    default:
+      return messages;
+  }
+}
+
+/**
+ * Extract the messages array and system prompt for the callLlm function.
+ * For Anthropic, the system prompt is separate from messages.
+ */
+export function extractCallArgs(provider, messages) {
+  if (provider === 'anthropic') {
+    return { system: messages.system, messages: messages.messages };
+  }
+  return { messages };
+}

package/harnesses/_lib/mcp-client.mjs

@@ -31,9 +31,14 @@ export async function connectMcp(configPath) {
 
   const client = new Client({ name: 'archal-harness-agent', version: '1.0.0' });
 
+  // Build requestInit with auth headers from config (required for cloud-hosted twins).
+  const requestInit = serverConfig.headers && Object.keys(serverConfig.headers).length > 0
+    ? { headers: serverConfig.headers }
+    : undefined;
+
   // Try StreamableHTTP first (modern MCP transport)
   try {
-    const transport = new StreamableHTTPClientTransport(new URL(mcpUrl));
+    const transport = new StreamableHTTPClientTransport(new URL(mcpUrl), { requestInit });
     await client.connect(transport);
     return { client, serverName };
   } catch {
@@ -42,7 +47,7 @@ export async function connectMcp(configPath) {
 
   // Fall back to SSE transport
   try {
-    const transport = new SSEClientTransport(new URL(mcpUrl));
+    const transport = new SSEClientTransport(new URL(mcpUrl), { requestInit });
     await client.connect(transport);
     return { client, serverName };
   } catch (err) {