mycomesh-consumer 0.1.44 → 0.1.46

package/package.json

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

package/src/consumer-runtime.mjs

@@ -87,6 +87,7 @@ const TUNNEL_START_TIMEOUT_MS = 30_000;
 const TUNNEL_STOP_TIMEOUT_MS = 2_000;
 const RELAY_HEALTH_CACHE_MS = 30_000;
 const RELAY_HEALTH_STALE_MS = 10 * 60_000;
+const RELAY_HEALTH_RETRY_DELAY_MS = 250;
 
 const DEFAULT_NETWORK = Object.freeze({
   chain_id: DEFAULT_CHAIN_ID,
@@ -582,7 +583,7 @@ export class NativeConsumerState {
     this.maxFeeUnits = options.maxFeeUnits || Number(env.MYCOMESH_V8_MAX_FEE_UNITS || DEFAULT_MAX_FEE_UNITS);
     if (!Number.isSafeInteger(this.maxFeeUnits) || this.maxFeeUnits <= 0) throw new Error("max fee must be a positive integer");
     this.timeoutMs = options.timeoutMs ?? Number(env.MYCOMESH_V8_REQUEST_TIMEOUT_SECONDS || 300) * 1000;
-    this.healthTimeoutMs = options.healthTimeoutMs ?? Number(env.MYCOMESH_V8_HEALTH_TIMEOUT_SECONDS || 5) * 1000;
+    this.healthTimeoutMs = options.healthTimeoutMs ?? Number(env.MYCOMESH_V8_HEALTH_TIMEOUT_SECONDS || 10) * 1000;
     this.network = parseNetworkConfig(options.networkConfig || env.MYCOMESH_CONSUMER_NETWORK_CONFIG);
     if (env.MYCOMESH_CONSUMER_SETTLEMENT_RPC_URLS) {
       this.network.rpc_urls = String(env.MYCOMESH_CONSUMER_SETTLEMENT_RPC_URLS).split(",").map((item) => item.trim()).filter(Boolean);
@@ -901,13 +902,21 @@ export class NativeConsumerState {
     if (cached && !refresh && cacheAge < RELAY_HEALTH_CACHE_MS) return cached.payload;
     const request = { dispatcher: this.dispatcher, headers: { accept: "application/json" } };
     let payload;
-    try {
-      const response = await fetchWithTimeout(`${relayUrl}/relay/health`, request, this.healthTimeoutMs);
-      payload = await readJsonResponse(response);
-      if (!response.ok || payload?.ok !== true) throw new Error(`Relay health is invalid for ${relayUrl}`);
-    } catch (error) {
+    let lastError;
+    for (let attempt = 0; attempt < 2 && !payload; attempt += 1) {
+      try {
+        const response = await fetchWithTimeout(`${relayUrl}/relay/health`, request, this.healthTimeoutMs);
+        payload = await readJsonResponse(response);
+        if (!response.ok || payload?.ok !== true) throw new Error(`Relay health is invalid for ${relayUrl}`);
+      } catch (error) {
+        lastError = error;
+        payload = undefined;
+        if (attempt === 0) await new Promise((resolve) => setTimeout(resolve, RELAY_HEALTH_RETRY_DELAY_MS));
+      }
+    }
+    if (!payload) {
       if (cached && cacheAge < RELAY_HEALTH_STALE_MS) return cached.payload;
-      throw error;
+      throw lastError || new Error(`Relay health is unavailable for ${relayUrl}`);
     }
     const v8 = payload.v8;
     if (!v8 || v8.enabled !== true || Number(v8.providers || 0) <= 0) throw new Error(`Relay has no live Settlement V8 Provider: ${relayUrl}`);
@@ -996,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;
       }
@@ -1020,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;

package/src/consumer.mjs

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