mycomesh-consumer 0.1.45 → 0.1.47

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mycomesh-consumer",
-  "version": "0.1.45",
+  "version": "0.1.47",
   "description": "Native Node.js MycoMesh Consumer and OpenAI-compatible request CLI.",
   "publishConfig": {
     "access": "public"

package/src/consumer-runtime.mjs

@@ -1005,7 +1005,7 @@ export class NativeConsumerState {
           this.recordReceipt(selected.relayUrl, path, payment.model, settlement);
           headers["PAYMENT-RESPONSE"] = paymentResponse;
         }
-        return { payload, status: 200, headers };
+        return { payload: restoreClientResponse(payload, body), status: 200, headers };
       } catch (error) {
         lastError = error.message;
       }
@@ -1029,6 +1029,49 @@ function normalizeOpenAiError(value, fallbackType) {
   return { ...value, error: { ...value.error, message: String(value.error.message || fallbackType), type: String(value.error.type || fallbackType), param: value.error.param ?? null, code: value.error.code || value.error.type || fallbackType } };
 }
 
+function clientToolSchema(tools, name) {
+  if (!Array.isArray(tools)) return undefined;
+  for (const tool of tools) {
+    if (!tool || typeof tool !== "object") continue;
+    const definition = tool.function && typeof tool.function === "object" ? tool.function : tool;
+    if (definition.name === name && definition.parameters && typeof definition.parameters === "object") return definition.parameters;
+  }
+  return undefined;
+}
+
+function orderBySchema(value, schema) {
+  if (Array.isArray(value)) return value.map((item) => orderBySchema(item, schema?.items));
+  if (!value || typeof value !== "object" || Array.isArray(schema)) return value;
+  const properties = schema?.properties;
+  if (!properties || typeof properties !== "object") return value;
+  const ordered = {};
+  for (const key of Object.keys(properties)) {
+    if (Object.prototype.hasOwnProperty.call(value, key)) ordered[key] = orderBySchema(value[key], properties[key]);
+  }
+  for (const key of Object.keys(value)) {
+    if (!Object.prototype.hasOwnProperty.call(ordered, key)) ordered[key] = value[key];
+  }
+  return ordered;
+}
+
+function restoreClientResponse(payload, body) {
+  if (!payload || typeof payload !== "object") return payload;
+  if (typeof body.model === "string" && body.model) payload.model = body.model;
+  const calls = [];
+  for (const choice of Array.isArray(payload.choices) ? payload.choices : []) {
+    calls.push(...(Array.isArray(choice?.message?.tool_calls) ? choice.message.tool_calls : []));
+  }
+  calls.push(...(Array.isArray(payload.output) ? payload.output.filter((item) => item?.type === "function_call") : []));
+  for (const call of calls) {
+    const fn = call?.function && typeof call.function === "object" ? call.function : call;
+    if (typeof fn?.name !== "string" || typeof fn.arguments !== "string") continue;
+    const schema = clientToolSchema(body.tools, fn.name);
+    if (!schema) continue;
+    try { fn.arguments = JSON.stringify(orderBySchema(JSON.parse(fn.arguments), schema)); } catch {}
+  }
+  return payload;
+}
+
 function decodeRequestBody(request) {
   return new Promise((resolve, reject) => {
     let size = 0;
@@ -1360,7 +1403,16 @@ export function responseSse(payload, compact = false) {
 export function chatCompletionSse(payload, includeUsage = false) {
   const id = String(payload?.id || `chatcmpl_${bytesToHex(randomBytes(16))}`); const model = String(payload?.model || ""); const created = Number(payload?.created || Math.floor(Date.now() / 1000)); const chunks = [];
   const chunk = (index, delta, finishReason = null) => chunks.push(`data: ${JSON.stringify({ id, object: "chat.completion.chunk", created, model, choices: [{ index, delta, finish_reason: finishReason }] })}\n\n`);
-  (Array.isArray(payload?.choices) ? payload.choices : []).forEach((choice, fallbackIndex) => { const index = Number.isInteger(choice.index) ? choice.index : fallbackIndex; const message = choice.message || {}; chunk(index, { role: String(message.role || "assistant") }); if (message.content) chunk(index, { content: String(message.content) }); chunk(index, {}, choice.finish_reason || "stop"); });
+  (Array.isArray(payload?.choices) ? payload.choices : []).forEach((choice, fallbackIndex) => {
+    const index = Number.isInteger(choice.index) ? choice.index : fallbackIndex;
+    const message = choice.message || {};
+    chunk(index, { role: String(message.role || "assistant") });
+    if (message.content) chunk(index, { content: String(message.content) });
+    (Array.isArray(message.tool_calls) ? message.tool_calls : []).forEach((call, toolIndex) => {
+      chunk(index, { tool_calls: [{ index: toolIndex, id: call.id, type: call.type || "function", function: { name: call.function?.name, arguments: String(call.function?.arguments || "") } }] });
+    });
+    chunk(index, {}, choice.finish_reason || "stop");
+  });
   if (includeUsage && payload?.usage) chunks.push(`data: ${JSON.stringify({ id, object: "chat.completion.chunk", created, model, choices: [], usage: payload.usage })}\n\n`);
   chunks.push("data: [DONE]\n\n"); return chunks;
 }

package/src/consumer.mjs

@@ -11,7 +11,7 @@ import {
   createConsumerServer,
 } from "./consumer-runtime.mjs";
 
-export const CONSUMER_RELEASE_VERSION = "0.1.45";
+export const CONSUMER_RELEASE_VERSION = "0.1.47";
 export const API_COMMANDS = new Set(["health", "models", "responses", "chat"]);
 const API_VALUE_OPTIONS = new Set([
   "--base-url",