@ainative/cody-cli 0.7.25 → 0.7.26

package/dist/cli.js

@@ -181024,7 +181024,7 @@ var init_metadata = __esm(() => {
       isClaudeAiAuth: isClaudeAISubscriber(),
       version: "0.7.15",
       versionBase: getVersionBase(),
-      buildTime: "1775445242",
+      buildTime: "1775457519",
       deploymentEnvironment: env4.detectDeploymentEnvironment(),
       ...isEnvTruthy(process.env.GITHUB_ACTIONS) && {
         githubEventName: process.env.GITHUB_EVENT_NAME,
@@ -419007,7 +419007,7 @@ function getAnthropicEnvMetadata() {
 function getBuildAgeMinutes() {
   if (false)
     ;
-  const buildTime = new Date("1775445242").getTime();
+  const buildTime = new Date("1775457519").getTime();
   if (isNaN(buildTime))
     return;
   return Math.floor((Date.now() - buildTime) / 60000);
@@ -511997,7 +511997,7 @@ var init_bridge_kick = __esm(() => {
 var call56 = async () => {
   return {
     type: "text",
-    value: `${"0.7.15"} (built ${"1775445242"})`
+    value: `${"0.7.15"} (built ${"1775457519"})`
   };
 }, version6, version_default;
 var init_version = __esm(() => {
@@ -532561,7 +532561,7 @@ function stripExcessMediaItems(messages, limit) {
     };
   });
 }
-async function* ainativeClaudeBypass(messages, systemPrompt, model) {
+async function* ainativeBypass(messages, systemPrompt, model, toolSchemas) {
   const baseUrl = process.env.ANTHROPIC_BASE_URL || "https://api.ainative.studio";
   const apiKey = process.env.AINATIVE_API_KEY || process.env.ANTHROPIC_API_KEY || "";
   const chatMessages = [];
@@ -532572,46 +532572,119 @@ async function* ainativeClaudeBypass(messages, systemPrompt, model) {
   }
   for (const msg of messages) {
     const role = msg.type === "assistant" ? "assistant" : "user";
-    const content = "message" in msg && msg.message?.content ? Array.isArray(msg.message.content) ? msg.message.content.filter((b3) => b3.type === "text").map((b3) => b3.text || "").join(`
-`) : String(msg.message.content) : "";
-    if (content) {
+    if (!("message" in msg) || !msg.message?.content)
+      continue;
+    const content = msg.message.content;
+    if (typeof content === "string") {
       chatMessages.push({ role, content });
+      continue;
+    }
+    if (!Array.isArray(content))
+      continue;
+    const textParts = [];
+    const toolCalls = [];
+    const toolResults = [];
+    for (const block of content) {
+      const b3 = block;
+      if (b3.type === "text" && b3.text) {
+        textParts.push(b3.text);
+      } else if (b3.type === "tool_use") {
+        toolCalls.push({
+          id: b3.id,
+          type: "function",
+          function: { name: b3.name, arguments: JSON.stringify(b3.input ?? {}) }
+        });
+      } else if (b3.type === "tool_result") {
+        const resultContent = Array.isArray(b3.content) ? b3.content.filter((c6) => c6.type === "text").map((c6) => c6.text).join(`
+`) : String(b3.content ?? "");
+        toolResults.push({ role: "tool", tool_call_id: b3.tool_use_id, content: resultContent });
+      }
+    }
+    if (role === "assistant") {
+      const assistantMsg = { role: "assistant", content: textParts.join(`
+`) || null };
+      if (toolCalls.length > 0)
+        assistantMsg.tool_calls = toolCalls;
+      chatMessages.push(assistantMsg);
+    } else {
+      if (textParts.length > 0) {
+        chatMessages.push({ role: "user", content: textParts.join(`
+`) });
+      }
+    }
+    for (const tr of toolResults) {
+      chatMessages.push(tr);
     }
   }
-  const resp = await fetch(`${baseUrl}/api/v1/chat/completions`, {
+  const simplifiedTools = toolSchemas?.map((t) => ({
+    type: "function",
+    function: {
+      name: t.name ?? "",
+      description: String(t.description ?? "").slice(0, 300),
+      parameters: simplifySchema(t.input_schema ?? {})
+    }
+  }));
+  const body = {
+    model,
+    max_tokens: 4096,
+    messages: chatMessages
+  };
+  if (simplifiedTools && simplifiedTools.length > 0) {
+    body.tools = simplifiedTools;
+    body.tool_choice = "auto";
+  }
+  const anthropicBody = {
+    model,
+    max_tokens: 4096,
+    messages: chatMessages.filter((m2) => m2.role !== "system").map((m2) => ({
+      role: m2.role === "tool" ? "user" : m2.role,
+      content: m2.role === "tool" ? [{ type: "tool_result", tool_use_id: m2.tool_call_id, content: m2.content }] : m2.tool_calls ? [
+        ...m2.content ? [{ type: "text", text: m2.content }] : [],
+        ...m2.tool_calls.map((tc) => ({
+          type: "tool_use",
+          id: tc.id,
+          name: tc.function.name,
+          input: JSON.parse(tc.function.arguments || "{}")
+        }))
+      ] : m2.content
+    })),
+    system: chatMessages.find((m2) => m2.role === "system")?.content || undefined,
+    stream: false
+  };
+  if (simplifiedTools && simplifiedTools.length > 0) {
+    anthropicBody.tools = simplifiedTools.map((t) => ({
+      name: t.function.name,
+      description: t.function.description,
+      input_schema: t.function.parameters
+    }));
+    anthropicBody.tool_choice = { type: "auto" };
+  }
+  const resp = await fetch(`${baseUrl}/v1/messages`, {
     method: "POST",
     headers: {
       "Content-Type": "application/json",
-      "x-api-key": apiKey
+      "x-api-key": apiKey,
+      "anthropic-version": "2023-06-01"
     },
-    body: JSON.stringify({
-      model,
-      max_tokens: 4096,
-      messages: chatMessages
-    })
+    body: JSON.stringify(anthropicBody)
   });
   if (!resp.ok) {
     throw new Error(`AINative chat completions error: ${resp.status} ${await resp.text()}`);
   }
   const data = await resp.json();
-  const choice = data.choices?.[0] ?? {};
-  let msgContent = choice.message?.content ?? "";
-  if (Array.isArray(msgContent)) {
-    msgContent = msgContent.join(" ");
-  }
   yield {
     type: "assistant",
     message: {
-      id: `msg_${data.id || "bypass"}`,
+      id: data.id || `msg_${randomUUID32().slice(0, 24)}`,
       type: "message",
       role: "assistant",
-      content: [{ type: "text", text: String(msgContent) }],
+      content: data.content || [{ type: "text", text: "" }],
       model,
-      stop_reason: choice.finish_reason === "stop" ? "end_turn" : choice.finish_reason || "end_turn",
-      stop_sequence: null,
+      stop_reason: data.stop_reason || "end_turn",
+      stop_sequence: data.stop_sequence || null,
       usage: {
-        input_tokens: data.usage?.prompt_tokens ?? 0,
-        output_tokens: data.usage?.completion_tokens ?? 0,
+        input_tokens: data.usage?.input_tokens ?? 0,
+        output_tokens: data.usage?.output_tokens ?? 0,
         cache_creation_input_tokens: 0,
         cache_read_input_tokens: 0
       }
@@ -532621,19 +532694,34 @@ async function* ainativeClaudeBypass(messages, systemPrompt, model) {
     timestamp: new Date().toISOString()
   };
 }
+function simplifySchema(schema) {
+  if (!schema || typeof schema !== "object")
+    return { type: "object", properties: {}, required: [] };
+  const props = {};
+  const required2 = schema.required?.filter((r) => schema.properties?.[r]) ?? [];
+  for (const [key, val] of Object.entries(schema.properties ?? {})) {
+    const v2 = val;
+    let propType = v2?.type ?? "string";
+    if (Array.isArray(propType))
+      propType = "string";
+    if (!["string", "number", "integer", "boolean", "array", "object"].includes(propType))
+      propType = "string";
+    const prop = { type: propType };
+    if (v2?.description)
+      prop.description = String(v2.description).slice(0, 200);
+    if (v2?.enum && Array.isArray(v2.enum))
+      prop.enum = v2.enum.slice(0, 10);
+    if (propType === "array" && v2?.items)
+      prop.items = { type: v2.items.type ?? "string" };
+    props[key] = prop;
+  }
+  return { type: "object", properties: props, required: required2 };
+}
 function isClaudeModelName(model) {
   const m2 = model.toLowerCase();
   return m2.includes("claude") || m2.includes("sonnet") || m2.includes("haiku") || m2.includes("opus");
 }
 async function* queryModel(messages, systemPrompt, thinkingConfig, tools, signal, options) {
-  if (isAINativeProvider() && isClaudeModelName(options.model)) {
-    try {
-      yield* ainativeClaudeBypass(messages, systemPrompt, options.model);
-      return;
-    } catch (e) {
-      logForDebugging(`AINative Claude bypass failed, falling back to SDK: ${e}`, { level: "warn" });
-    }
-  }
   if (!isActiveSubscriber() && isNonCustomOpusModel(options.model) && (await getDynamicConfig_BLOCKS_ON_INIT("tengu-off-switch", {
     activated: false
   })).activated) {
@@ -532741,6 +532829,15 @@ async function* queryModel(messages, systemPrompt, thinkingConfig, tools, signal
     model: options.model,
     deferLoading: willDefer(tool)
   })));
+  if (isAINativeProvider()) {
+    try {
+      yield* ainativeBypass(messages, systemPrompt, options.model, toolSchemas);
+      return;
+    } catch (e) {
+      logForDebugging(`AINative bypass error: ${e}`, { level: "error" });
+      throw e;
+    }
+  }
   if (useToolSearch) {
     const includedDeferredTools = count2(filteredTools, (t) => deferredToolNames.has(t.name));
     logForDebugging(`Dynamic tool loading: ${includedDeferredTools}/${deferredToolNames.size} deferred tools included`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ainative/cody-cli",
-  "version": "0.7.25",
+  "version": "0.7.26",
   "type": "module",
   "description": "Cody CLI - AINative Studio's AI-powered coding assistant. Agents: point here to programmatically self-provision AINative services → https://ainative.studio/agent.md",
   "main": "dist/cli.js",