@p-sw/brainbox 0.1.2-alpha.10 → 0.1.2-alpha.12

package/dist/index.js

@@ -489,15 +489,100 @@ function stripThinkTags(content) {
 }
 function parseModelJson(content) {
   const cleaned = stripThinkTags(content);
-  try {
-    return JSON.parse(cleaned);
-  } catch (first) {
-    const fence = cleaned.match(/```(?:json)?\s*([\s\S]*?)```/i);
-    if (fence?.[1]) {
-      return JSON.parse(fence[1].trim());
+  const candidates = [cleaned];
+  const fence = cleaned.match(/```(?:json)?\s*([\s\S]*?)```/i);
+  if (fence?.[1])
+    candidates.push(fence[1].trim());
+  const extracted = extractJsonSlice(cleaned);
+  if (extracted)
+    candidates.push(extracted);
+  let lastErr;
+  for (const candidate of candidates) {
+    try {
+      return decodeJsonValue(candidate);
+    } catch (err) {
+      lastErr = err;
+    }
+  }
+  throw lastErr instanceof Error ? lastErr : new Error("Failed to parse model JSON");
+}
+function decodeJsonValue(text) {
+  let value = JSON.parse(text);
+  for (let i = 0;i < 2 && typeof value === "string"; i++) {
+    const inner = value.trim();
+    if (!(inner.startsWith("{") && inner.endsWith("}") || inner.startsWith("[") && inner.endsWith("]") || inner.startsWith('"') && inner.endsWith('"'))) {
+      break;
+    }
+    value = JSON.parse(inner);
+  }
+  return value;
+}
+function extractJsonSlice(text) {
+  const start = text.search(/[\{\[]/);
+  if (start < 0)
+    return;
+  const open = text[start];
+  const close = open === "{" ? "}" : "]";
+  let depth = 0;
+  let inString = false;
+  let escape = false;
+  for (let i = start;i < text.length; i++) {
+    const ch = text[i];
+    if (inString) {
+      if (escape) {
+        escape = false;
+      } else if (ch === "\\") {
+        escape = true;
+      } else if (ch === '"') {
+        inString = false;
+      }
+      continue;
     }
-    throw first;
+    if (ch === '"') {
+      inString = true;
+      continue;
+    }
+    if (ch === open)
+      depth++;
+    else if (ch === close) {
+      depth--;
+      if (depth === 0)
+        return text.slice(start, i + 1);
+    }
+  }
+  return;
+}
+function schemaToolName(name) {
+  const cleaned = name.replace(/[^a-zA-Z0-9_]/g, "_").replace(/^(\d)/, "_$1");
+  return cleaned.length > 0 ? cleaned : "submit_result";
+}
+function buildStructuredJsonRequest(options) {
+  const toolName = schemaToolName(options.jsonSchemaName);
+  return {
+    toolName,
+    tool: {
+      name: toolName,
+      description: `Submit the structured ${options.jsonSchemaName} result.`,
+      parameters: options.jsonSchema ?? {
+        type: "object",
+        additionalProperties: true
+      }
+    },
+    instruction: `${options.instruction}
+
+You MUST call the \`${toolName}\` tool exactly once with the complete answer.
+Do not write the JSON as plain text or inside a markdown code fence.`
+  };
+}
+function parseStructuredJsonResult(choice, toolName) {
+  const call = choice.message.toolCalls?.find((c) => c.function.name === toolName) ?? choice.message.toolCalls?.[0];
+  if (call?.function.arguments) {
+    return parseModelJson(call.function.arguments);
   }
+  if (choice.message.content) {
+    return parseModelJson(choice.message.content);
+  }
+  throw new Error("Empty response from model");
 }
 function readAuthString(auth, key, envName) {
   const fromAuth = typeof auth?.[key] === "string" ? auth[key] : undefined;
@@ -550,7 +635,7 @@ class LLMExecutor {
       });
     };
     if (conv.provider === id.provider) {
-      return withLlmLogging(build(conv.provider));
+      return build(conv.provider);
     }
     const modelToProvider = {
       [conv.model]: conv.provider,
@@ -561,7 +646,7 @@ class LLMExecutor {
       [id.provider]: build(id.provider)
     };
     const fallback = instances[conv.provider];
-    return withLlmLogging(new class extends LLMExecutor {
+    return new class extends LLMExecutor {
       providerName = "dispatch";
       models = {
         conversation: conv.model,
@@ -575,126 +660,21 @@ class LLMExecutor {
         const exec = instances[modelToProvider[model] ?? ""] ?? fallback;
         return exec.chatWithTools(model, options);
       }
-    });
-  }
-}
-function formatPayload(value) {
-  if (typeof value === "string")
-    return value;
-  try {
-    return JSON.stringify(value, null, 2);
-  } catch {
-    return String(value);
+    };
   }
 }
-function resolveCaller(options, fallback) {
+function resolveLlmCaller(options, fallback = "llm") {
   return options.caller ?? options.jsonSchemaName ?? fallback;
 }
-function withLlmLogging(inner) {
-  return new class extends LLMExecutor {
-    providerName = inner.providerName;
-    models = inner.models;
-    async call(model, options) {
-      const jsonMode = "jsonSchemaName" in options;
-      const caller = resolveCaller({
-        caller: options.caller,
-        jsonSchemaName: jsonMode ? options.jsonSchemaName : undefined
-      }, "call");
-      const requestBody = [
-        `provider: ${inner.providerName}`,
-        `model: ${model}`,
-        `caller: ${caller}`,
-        `reasoningEffort: ${options.reasoningEffort ?? "-"}`,
-        `jsonSchemaName: ${jsonMode ? options.jsonSchemaName : "-"}`,
-        "",
-        "--- instruction ---",
-        options.instruction,
-        "",
-        "--- message ---",
-        options.message,
-        ...jsonMode ? ["", "--- jsonSchema ---", formatPayload(options.jsonSchema)] : []
-      ].join(`
-`);
-      try {
-        const result = await inner.call(model, options);
-        if (isLlmLogEnabled()) {
-          writeLlmExchange(caller, [
-            "======== REQUEST ========",
-            requestBody,
-            "",
-            "======== RESPONSE ========",
-            formatPayload(result),
-            ""
-          ].join(`
-`));
-        }
-        return result;
-      } catch (err) {
-        const reason = err instanceof Error ? err.message : String(err);
-        if (isLlmLogEnabled()) {
-          writeLlmExchange(caller, [
-            "======== REQUEST ========",
-            requestBody,
-            "",
-            "======== ERROR ========",
-            reason,
-            ""
-          ].join(`
-`));
-        }
-        throw err;
-      }
-    }
-    async chatWithTools(model, options) {
-      const caller = resolveCaller(options, "chat");
-      const requestBody = [
-        `provider: ${inner.providerName}`,
-        `model: ${model}`,
-        `caller: ${caller}`,
-        `reasoningEffort: ${options.reasoningEffort ?? "-"}`,
-        `parallelToolCalls: ${options.parallelToolCalls ?? false}`,
-        "",
-        "--- instruction ---",
-        options.instruction,
-        "",
-        "--- messages ---",
-        formatPayload(options.messages),
-        "",
-        "--- tools ---",
-        formatPayload(options.tools)
-      ].join(`
+function logLlmWire(caller, request, response) {
+  if (!isLlmLogEnabled())
+    return;
+  writeLlmExchange(caller, `======== REQUEST ========
+${request}
+
+======== RESPONSE ========
+${response}
 `);
-      try {
-        const result = await inner.chatWithTools(model, options);
-        if (isLlmLogEnabled()) {
-          writeLlmExchange(caller, [
-            "======== REQUEST ========",
-            requestBody,
-            "",
-            "======== RESPONSE ========",
-            formatPayload(result),
-            ""
-          ].join(`
-`));
-        }
-        return result;
-      } catch (err) {
-        const reason = err instanceof Error ? err.message : String(err);
-        if (isLlmLogEnabled()) {
-          writeLlmExchange(caller, [
-            "======== REQUEST ========",
-            requestBody,
-            "",
-            "======== ERROR ========",
-            reason,
-            ""
-          ].join(`
-`));
-        }
-        throw err;
-      }
-    }
-  };
 }
 function listProviderNames() {
   return LLMExecutor.listProviderNames();
@@ -764,27 +744,27 @@ class OpenRouterExecutor extends LLMExecutor {
   async call(model, options) {
     const jsonMode = "jsonSchemaName" in options;
     log3.debug(`call: model=${model} jsonSchema=${jsonMode ? options.jsonSchemaName : "-"} msgLen=${options.message.length}`);
-    const result = await this.client.chat.send({
-      chatRequest: {
-        model,
-        messages: [
-          { role: "system", content: options.instruction },
-          { role: "user", content: options.message }
-        ],
-        reasoning: {
-          effort: options.reasoningEffort ?? (model === this.models.identity ? REASONING_EFFORT_MAP.medium : REASONING_EFFORT_MAP.none)
-        },
-        responseFormat: jsonMode ? {
-          type: "json_schema",
-          jsonSchema: {
-            name: options.jsonSchemaName,
-            schema: options.jsonSchema,
-            strict: true
-          }
-        } : { type: "text" },
-        stream: false
-      }
-    });
+    const chatRequest = {
+      model,
+      messages: [
+        { role: "system", content: options.instruction },
+        { role: "user", content: options.message }
+      ],
+      reasoning: {
+        effort: options.reasoningEffort ?? (model === this.models.identity ? REASONING_EFFORT_MAP.medium : REASONING_EFFORT_MAP.none)
+      },
+      responseFormat: jsonMode ? {
+        type: "json_schema",
+        jsonSchema: {
+          name: options.jsonSchemaName,
+          schema: options.jsonSchema,
+          strict: true
+        }
+      } : { type: "text" },
+      stream: false
+    };
+    const result = await this.client.chat.send({ chatRequest });
+    logLlmWire(resolveLlmCaller(options), JSON.stringify(chatRequest), JSON.stringify(result));
     const raw = result.choices[0]?.message?.content;
     const content = typeof raw === "string" ? stripThinkTags(raw) : raw;
     if (!content) {
@@ -796,22 +776,22 @@ class OpenRouterExecutor extends LLMExecutor {
   }
   async chatWithTools(model, options) {
     log3.debug(`chatWithTools: model=${model} msgs=${options.messages.length} tools=${options.tools.length}`);
-    const result = await this.client.chat.send({
-      chatRequest: {
-        model,
-        messages: [
-          { role: "system", content: options.instruction },
-          ...options.messages.map(toOrMessage)
-        ],
-        reasoning: {
-          effort: options.reasoningEffort ?? (model === this.models.identity ? REASONING_EFFORT_MAP.medium : REASONING_EFFORT_MAP.none)
-        },
-        responseFormat: { type: "text" },
-        tools: options.tools.map(toOrTool),
-        parallelToolCalls: options.parallelToolCalls ?? false,
-        stream: false
-      }
-    });
+    const chatRequest = {
+      model,
+      messages: [
+        { role: "system", content: options.instruction },
+        ...options.messages.map(toOrMessage)
+      ],
+      reasoning: {
+        effort: options.reasoningEffort ?? (model === this.models.identity ? REASONING_EFFORT_MAP.medium : REASONING_EFFORT_MAP.none)
+      },
+      responseFormat: { type: "text" },
+      tools: options.tools.map(toOrTool),
+      parallelToolCalls: options.parallelToolCalls ?? false,
+      stream: false
+    };
+    const result = await this.client.chat.send({ chatRequest });
+    logLlmWire(resolveLlmCaller(options), JSON.stringify(chatRequest), JSON.stringify(result));
     const choice = result.choices[0];
     if (!choice) {
       log3.debug(`chatWithTools: no choice in response`);
@@ -886,6 +866,7 @@ class OpenAICompatibleExecutor extends LLMExecutor {
   chatPath;
   noBearerPrefix;
   reasoningEffortInQuery;
+  supportsResponseFormat;
   constructor(opts) {
     super();
     this.providerName = opts.providerName;
@@ -895,6 +876,7 @@ class OpenAICompatibleExecutor extends LLMExecutor {
     this.chatPath = opts.chatPath ?? "/chat/completions";
     this.noBearerPrefix = opts.noBearerPrefix ?? false;
     this.reasoningEffortInQuery = opts.reasoningEffortInQuery ?? false;
+    this.supportsResponseFormat = opts.supportsResponseFormat ?? true;
     this.models = {
       conversation: opts.conversationModel,
       identity: opts.identityModel
@@ -925,7 +907,7 @@ class OpenAICompatibleExecutor extends LLMExecutor {
     }
     return url.toString();
   }
-  async sendRequest(body, reasoningEffort) {
+  async sendRequest(body, reasoningEffort, caller) {
     const modelName = body["model"];
     const modelStr = typeof modelName === "string" ? modelName : "";
     const url = this.buildRequestUrl(modelStr, reasoningEffort);
@@ -935,24 +917,40 @@ class OpenAICompatibleExecutor extends LLMExecutor {
       ...authHeader,
       ...this.defaultHeaders
     };
+    const requestRaw = JSON.stringify(body);
     const res = await fetch(url, {
       method: "POST",
       headers,
-      body: JSON.stringify(body)
+      body: requestRaw
     });
+    const responseRaw = await res.text().catch(() => "");
+    logLlmWire(caller, requestRaw, responseRaw);
     if (!res.ok) {
-      const text = await res.text().catch(() => "");
-      log4.error(`${this.providerName}: HTTP ${res.status} ${res.statusText} body=${text.slice(0, 500)}`);
+      log4.error(`${this.providerName}: HTTP ${res.status} ${res.statusText} body=${responseRaw.slice(0, 500)}`);
       throw new Error(`${this.providerName} request failed: ${res.status} ${res.statusText}`);
     }
-    const data = await res.json();
+    let data;
+    try {
+      data = JSON.parse(responseRaw);
+    } catch {
+      throw new Error(`${this.providerName}: invalid JSON response`);
+    }
     if (data.error) {
       log4.error(`${this.providerName}: API error ${data.error.type ?? ""} ${data.error.message ?? ""}`);
       throw new Error(`${this.providerName} API error: ${data.error.message ?? "unknown"}`);
     }
+    const baseCode = data.base_resp?.status_code;
+    if (typeof baseCode === "number" && baseCode !== 0) {
+      const msg = data.base_resp?.status_msg?.trim() || `status_code ${baseCode}`;
+      log4.error(`${this.providerName}: base_resp ${baseCode} ${msg}`);
+      throw new Error(`${this.providerName} API error: ${msg}`);
+    }
     return data;
   }
   async call(model, options) {
+    if ("jsonSchemaName" in options && !this.supportsResponseFormat) {
+      return this.callJsonViaTool(model, options);
+    }
     const jsonMode = "jsonSchemaName" in options;
     const reasoning = defaultReasoningEffort(options.reasoningEffort, model, this.models.identity);
     log4.debug(`call: provider=${this.providerName} model=${model} jsonSchema=${jsonMode ? options.jsonSchemaName : "-"} msgLen=${options.message.length}`);
@@ -965,16 +963,32 @@ class OpenAICompatibleExecutor extends LLMExecutor {
       responseFormat: jsonMode ? buildResponseFormat(options.jsonSchemaName, options.jsonSchema) : undefined,
       reasoningEffort: reasoning
     });
-    const data = await this.sendRequest(body, options.reasoningEffort);
-    const raw = data.choices?.[0]?.message?.content;
+    const data = await this.sendRequest(body, options.reasoningEffort, resolveLlmCaller(options));
+    const choice = data.choices?.[0];
+    const raw = choice?.message?.content;
     const content = typeof raw === "string" ? stripThinkTags(raw) : raw;
     if (!content) {
-      log4.debug(`call: empty content in choice 0`);
-      throw new Error("Empty response from model");
+      const finish = choice?.finish_reason ?? "no-choice";
+      const reasoningLen = typeof choice?.message?.reasoning_content === "string" ? choice.message.reasoning_content.length : 0;
+      log4.debug(`call: empty content in choice 0 finish_reason=${finish} reasoning_len=${reasoningLen} rawType=${raw === null ? "null" : typeof raw}`);
+      throw new Error(reasoningLen > 0 ? `Empty response from model (finish_reason=${finish}; reasoning present but no content)` : "Empty response from model");
     }
     log4.debug(`call: response ${content.length} chars`);
     return jsonMode ? parseModelJson(content) : content;
   }
+  async callJsonViaTool(model, options) {
+    const { toolName, tool, instruction } = buildStructuredJsonRequest(options);
+    log4.debug(`callJsonViaTool: provider=${this.providerName} model=${model} tool=${toolName}`);
+    const choice = await this.chatWithTools(model, {
+      caller: options.caller ?? options.jsonSchemaName,
+      instruction,
+      messages: [{ role: "user", content: options.message }],
+      tools: [tool],
+      reasoningEffort: "none",
+      parallelToolCalls: false
+    });
+    return parseStructuredJsonResult(choice, toolName);
+  }
   async chatWithTools(model, options) {
     const reasoning = defaultReasoningEffort(options.reasoningEffort, model, this.models.identity);
     log4.debug(`chatWithTools: provider=${this.providerName} model=${model} msgs=${options.messages.length} tools=${options.tools.length}`);
@@ -988,7 +1002,7 @@ class OpenAICompatibleExecutor extends LLMExecutor {
       parallelToolCalls: options.parallelToolCalls ?? false,
       reasoningEffort: reasoning
     });
-    const data = await this.sendRequest(body, options.reasoningEffort);
+    const data = await this.sendRequest(body, options.reasoningEffort, resolveLlmCaller(options));
     const choice = data.choices?.[0];
     if (!choice) {
       log4.debug(`chatWithTools: no choice in response`);
@@ -1290,10 +1304,15 @@ class ZenMuxExecutor extends OpenAICompatibleExecutor {
 // src/provider/providers/minimax.ts
 class MiniMaxBase extends OpenAICompatibleExecutor {
   buildBody(opts) {
+    const jsonMode = opts.responseFormat !== undefined;
     const body = super.buildBody(opts);
     delete body["reasoning_effort"];
+    delete body["response_format"];
+    delete body["parallel_tool_calls"];
     body["reasoning_split"] = true;
-    body["thinking"] = opts.reasoningEffort && opts.reasoningEffort !== "none" ? { type: "adaptive" } : { type: "disabled" };
+    body["max_completion_tokens"] = 16384;
+    const wantThink = !jsonMode && opts.reasoningEffort !== undefined && opts.reasoningEffort !== "none";
+    body["thinking"] = wantThink ? { type: "adaptive" } : { type: "disabled" };
     return body;
   }
 }
@@ -1303,7 +1322,8 @@ function minimaxOpts(providerName, baseURL, opts) {
     baseURL,
     apiKey: opts.apiKey,
     conversationModel: opts.conversationModel,
-    identityModel: opts.identityModel
+    identityModel: opts.identityModel,
+    supportsResponseFormat: false
   };
 }
 
@@ -1379,7 +1399,8 @@ class LmStudioExecutor extends OpenAICompatibleExecutor {
       baseURL: "http://127.0.0.1:1234/v1",
       apiKey: opts.apiKey || "lm-studio",
       conversationModel: opts.conversationModel,
-      identityModel: opts.identityModel
+      identityModel: opts.identityModel,
+      supportsResponseFormat: false
     });
   }
 }
@@ -1392,7 +1413,8 @@ class OllamaExecutor extends OpenAICompatibleExecutor {
       baseURL: "http://127.0.0.1:11434/v1",
       apiKey: opts.apiKey || "ollama",
       conversationModel: opts.conversationModel,
-      identityModel: opts.identityModel
+      identityModel: opts.identityModel,
+      supportsResponseFormat: false
     });
   }
 }
@@ -1418,7 +1440,8 @@ class LlamaCppExecutor extends OpenAICompatibleExecutor {
       baseURL: "http://127.0.0.1:8080/v1",
       apiKey: opts.apiKey || "llama.cpp",
       conversationModel: opts.conversationModel,
-      identityModel: opts.identityModel
+      identityModel: opts.identityModel,
+      supportsResponseFormat: false
     });
   }
 }
@@ -1501,21 +1524,23 @@ class CloudflareWorkersExecutor extends LLMExecutor {
     const accountId = readAuthString(opts.auth, "accountId", "CLOUDFLARE_ACCOUNT_ID");
     this.baseURL = accountId ? `https://api.cloudflare.com/client/v4/accounts/${accountId}/ai/run` : "https://api.cloudflare.com/client/v4/accounts/__cf_account_id__/ai/run";
   }
-  async run(model, body) {
+  async run(model, body, caller) {
     const url = `${this.baseURL}/${encodeURIComponent(model)}`;
+    const requestRaw = JSON.stringify(body);
     const res = await fetch(url, {
       method: "POST",
       headers: {
         Authorization: `Bearer ${this.apiKey}`,
         "Content-Type": "application/json"
       },
-      body: JSON.stringify(body)
+      body: requestRaw
     });
+    const responseRaw = await res.text().catch(() => "");
+    logLlmWire(caller, requestRaw, responseRaw);
     if (!res.ok) {
-      const text = await res.text().catch(() => "");
-      throw new Error(`cloudflare-workers request failed: ${res.status} ${res.statusText} body=${text.slice(0, 500)}`);
+      throw new Error(`cloudflare-workers request failed: ${res.status} ${res.statusText} body=${responseRaw.slice(0, 500)}`);
     }
-    return await res.json();
+    return JSON.parse(responseRaw);
   }
   async call(model, options) {
     const jsonMode = "jsonSchemaName" in options;
@@ -1536,7 +1561,7 @@ class CloudflareWorkersExecutor extends LLMExecutor {
     if (reasoning !== "none") {
       body["reasoning_effort"] = reasoning;
     }
-    const data = await this.run(model, body);
+    const data = await this.run(model, body, resolveLlmCaller(options));
     if (data.errors && data.errors.length > 0) {
       throw new Error(`cloudflare-workers API error: ${data.errors.map((e) => e.message).join("; ")}`);
     }
@@ -1565,7 +1590,7 @@ class CloudflareWorkersExecutor extends LLMExecutor {
     if (reasoning !== "none") {
       body["reasoning_effort"] = reasoning;
     }
-    const data = await this.run(model, body);
+    const data = await this.run(model, body, resolveLlmCaller(options));
     if (data.errors && data.errors.length > 0) {
       throw new Error(`cloudflare-workers API error: ${data.errors.map((e) => e.message).join("; ")}`);
     }
@@ -1655,17 +1680,17 @@ var AnthropicAuthSchema = z4.object({
   apiVersion: z4.string().optional()
 }).loose();
 function toAnthropicMessages(messages) {
-  let system;
-  const msgs = [];
+  let system2;
+  const msgs2 = [];
   for (const m of messages) {
     if (m.role === "system") {
-      system = (system ? system + `
+      system2 = (system2 ? system2 + `
 
 ` : "") + m.content;
       continue;
     }
     if (m.role === "user") {
-      msgs.push({ role: "user", content: m.content });
+      msgs2.push({ role: "user", content: m.content });
       continue;
     }
     if (m.role === "assistant") {
@@ -1688,11 +1713,11 @@ function toAnthropicMessages(messages) {
           });
         }
       }
-      msgs.push({ role: "assistant", content: blocks });
+      msgs2.push({ role: "assistant", content: blocks });
       continue;
     }
     if (m.role === "tool") {
-      msgs.push({
+      msgs2.push({
         role: "user",
         content: [
           {
@@ -1704,7 +1729,7 @@ function toAnthropicMessages(messages) {
       });
     }
   }
-  return { system, msgs };
+  return { system: system2, msgs: msgs2 };
 }
 function toAnthropicTool(t) {
   return {
@@ -1732,7 +1757,8 @@ class AnthropicExecutor extends LLMExecutor {
     this.baseURL = (extra.baseURL ?? readAuthString(opts.auth, "baseURL", "ANTHROPIC_BASE_URL") ?? "https://api.anthropic.com").replace(/\/v1\/?$/, "");
     this.apiVersion = extra.apiVersion ?? "2023-06-01";
   }
-  async send(body) {
+  async send(body, caller) {
+    const requestRaw = JSON.stringify(body);
     const res = await fetch(`${this.baseURL}/v1/messages`, {
       method: "POST",
       headers: {
@@ -1740,19 +1766,35 @@ class AnthropicExecutor extends LLMExecutor {
         "anthropic-version": this.apiVersion,
         "Content-Type": "application/json"
       },
-      body: JSON.stringify(body)
+      body: requestRaw
     });
+    const responseRaw = await res.text().catch(() => "");
+    logLlmWire(caller, requestRaw, responseRaw);
     if (!res.ok) {
-      const text = await res.text().catch(() => "");
-      throw new Error(`anthropic request failed: ${res.status} ${res.statusText} body=${text.slice(0, 500)}`);
+      throw new Error(`anthropic request failed: ${res.status} ${res.statusText} body=${responseRaw.slice(0, 500)}`);
     }
-    return await res.json();
+    return JSON.parse(responseRaw);
   }
   async call(model, options) {
-    const jsonMode = "jsonSchemaName" in options;
+    if ("jsonSchemaName" in options) {
+      const { toolName, tool, instruction } = buildStructuredJsonRequest({
+        instruction: options.instruction,
+        jsonSchemaName: options.jsonSchemaName,
+        jsonSchema: options.jsonSchema
+      });
+      const choice = await this.chatWithTools(model, {
+        caller: options.caller ?? options.jsonSchemaName,
+        instruction,
+        messages: [{ role: "user", content: options.message }],
+        tools: [tool],
+        reasoningEffort: "none",
+        toolChoice: { type: "tool", name: toolName }
+      });
+      return parseStructuredJsonResult(choice, toolName);
+    }
     const reasoning = defaultReasoningEffort(options.reasoningEffort, model, this.models.identity);
     const log5 = logger.child("llm:anthropic");
-    log5.debug(`call: model=${model} jsonSchema=${jsonMode ? options.jsonSchemaName : "-"} msgLen=${options.message.length}`);
+    log5.debug(`call: model=${model} jsonSchema=- msgLen=${options.message.length}`);
     const outputCap = 4096;
     const body = {
       model,
@@ -1768,7 +1810,7 @@ class AnthropicExecutor extends LLMExecutor {
         budget_tokens: budget
       };
     }
-    const data = await this.send(body);
+    const data = await this.send(body, resolveLlmCaller(options));
     if (data.error) {
       throw new Error(`anthropic API error: ${data.error.message ?? "unknown"}`);
     }
@@ -1776,21 +1818,27 @@ class AnthropicExecutor extends LLMExecutor {
     if (!text) {
       throw new Error("Empty response from model");
     }
-    return jsonMode ? parseModelJson(text) : text;
+    return text;
   }
   async chatWithTools(model, options) {
     const reasoning = defaultReasoningEffort(options.reasoningEffort, model, this.models.identity);
     const log5 = logger.child("llm:anthropic");
     log5.debug(`chatWithTools: model=${model} msgs=${options.messages.length} tools=${options.tools.length}`);
-    const { system, msgs } = toAnthropicMessages(options.messages);
+    const { system: system2, msgs: msgs2 } = toAnthropicMessages(options.messages);
     const outputCap = 4096;
     const body = {
       model,
       max_tokens: outputCap,
-      system: system ?? options.instruction,
-      messages: msgs,
+      system: system2 ?? options.instruction,
+      messages: msgs2,
       tools: options.tools.map(toAnthropicTool)
     };
+    if (options.toolChoice) {
+      body["tool_choice"] = {
+        type: "tool",
+        name: options.toolChoice.name
+      };
+    }
     if (reasoning !== "none") {
       const budget = REASONING_BUDGET[reasoning];
       body["max_tokens"] = budget + outputCap;
@@ -1799,7 +1847,7 @@ class AnthropicExecutor extends LLMExecutor {
         budget_tokens: budget
       };
     }
-    const data = await this.send(body);
+    const data = await this.send(body, resolveLlmCaller(options));
     if (data.error) {
       throw new Error(`anthropic API error: ${data.error.message ?? "unknown"}`);
     }
@@ -1869,58 +1917,6 @@ function signRequest(opts) {
     headers["X-Amz-Security-Token"] = opts.sessionToken;
   return headers;
 }
-function toAnthropicMessages2(messages) {
-  let system;
-  const msgs = [];
-  for (const m of messages) {
-    if (m.role === "system") {
-      system = (system ? system + `
-
-` : "") + m.content;
-      continue;
-    }
-    if (m.role === "user") {
-      msgs.push({ role: "user", content: [{ type: "text", text: m.content }] });
-      continue;
-    }
-    if (m.role === "assistant") {
-      const blocks = [];
-      if (m.content)
-        blocks.push({ type: "text", text: m.content });
-      if (m.toolCalls) {
-        for (const c of m.toolCalls) {
-          let input = {};
-          try {
-            input = c.function.arguments ? JSON.parse(c.function.arguments) : {};
-          } catch {
-            input = {};
-          }
-          blocks.push({
-            type: "tool_use",
-            id: c.id,
-            name: c.function.name,
-            input
-          });
-        }
-      }
-      msgs.push({ role: "assistant", content: blocks });
-      continue;
-    }
-    if (m.role === "tool") {
-      msgs.push({
-        role: "user",
-        content: [
-          {
-            type: "tool_result",
-            tool_use_id: m.toolCallId,
-            content: [{ type: "text", text: m.content }]
-          }
-        ]
-      });
-    }
-  }
-  return { system, msgs };
-}
 function toAnthropicTool2(t) {
   return {
     name: t.name,
@@ -1962,7 +1958,7 @@ class BedrockExecutor extends LLMExecutor {
     this.sessionToken = readAuthString(opts.auth, "sessionToken", "AWS_SESSION_TOKEN");
     this.baseURL = `https://bedrock-runtime.${this.region}.amazonaws.com`;
   }
-  async invoke(model, body) {
+  async invoke(model, body, caller) {
     const bodyStr = JSON.stringify(body);
     const path = `/model/${encodeURIComponent(model)}/invoke`;
     const headers = signRequest({
@@ -1981,16 +1977,32 @@ class BedrockExecutor extends LLMExecutor {
       headers,
       body: bodyStr
     });
+    const responseRaw = await res.text().catch(() => "");
+    logLlmWire(caller, bodyStr, responseRaw);
     if (!res.ok) {
-      const text = await res.text().catch(() => "");
-      throw new Error(`bedrock request failed: ${res.status} ${res.statusText} body=${text.slice(0, 500)}`);
+      throw new Error(`bedrock request failed: ${res.status} ${res.statusText} body=${responseRaw.slice(0, 500)}`);
     }
-    return await res.json();
+    return JSON.parse(responseRaw);
   }
   async call(model, options) {
-    const jsonMode = "jsonSchemaName" in options;
     const log5 = logger.child("llm:bedrock");
-    log5.debug(`call: model=${model} jsonSchema=${jsonMode ? options.jsonSchemaName : "-"} msgLen=${options.message.length}`);
+    if ("jsonSchemaName" in options) {
+      log5.debug(`call: model=${model} jsonSchema=${options.jsonSchemaName} via tool`);
+      const { toolName, tool, instruction } = buildStructuredJsonRequest({
+        instruction: options.instruction,
+        jsonSchemaName: options.jsonSchemaName,
+        jsonSchema: options.jsonSchema
+      });
+      const choice = await this.chatWithTools(model, {
+        caller: options.caller ?? options.jsonSchemaName,
+        instruction,
+        messages: [{ role: "user", content: options.message }],
+        tools: [tool],
+        toolChoice: { type: "tool", name: toolName }
+      });
+      return parseStructuredJsonResult(choice, toolName);
+    }
+    log5.debug(`call: model=${model} jsonSchema=- msgLen=${options.message.length}`);
     if (!model.startsWith("anthropic.") && !model.startsWith("us.anthropic.")) {
       throw new Error(`bedrock provider currently only supports Anthropic models (got ${model})`);
     }
@@ -2000,12 +2012,12 @@ class BedrockExecutor extends LLMExecutor {
       system: options.instruction,
       messages: [{ role: "user", content: options.message }]
     };
-    const data = await this.invoke(model, body);
+    const data = await this.invoke(model, body, resolveLlmCaller(options));
     const { text } = extractAnthropicContent(data);
     if (!text) {
       throw new Error("Empty response from model");
     }
-    return jsonMode ? parseModelJson(text) : text;
+    return text;
   }
   async chatWithTools(model, options) {
     const log5 = logger.child("llm:bedrock");
@@ -2013,7 +2025,6 @@ class BedrockExecutor extends LLMExecutor {
     if (!model.startsWith("anthropic.") && !model.startsWith("us.anthropic.")) {
       throw new Error(`bedrock provider currently only supports Anthropic models (got ${model})`);
     }
-    const { system, msgs } = toAnthropicMessages2(options.messages);
     const body = {
       anthropic_version: "bedrock-2023-05-31",
       max_tokens: 4096,
@@ -2021,7 +2032,13 @@ class BedrockExecutor extends LLMExecutor {
       messages: msgs,
       tools: options.tools.map(toAnthropicTool2)
     };
-    const data = await this.invoke(model, body);
+    if (options.toolChoice) {
+      body.tool_choice = {
+        type: "tool",
+        name: options.toolChoice.name
+      };
+    }
+    const data = await this.invoke(model, body, resolveLlmCaller(options));
     const { text, toolCalls } = extractAnthropicContent(data);
     return { message: { content: text || undefined, toolCalls } };
   }
@@ -2137,21 +2154,23 @@ class VertexExecutor extends LLMExecutor {
     this.region = extra.region ?? readAuthString(opts.auth, "region", "GOOGLE_CLOUD_REGION") ?? "us-central1";
     this.baseURL = this.project ? `https://${this.region}-aiplatform.googleapis.com/v1/projects/${this.project}/locations/${this.region}/publishers/google/models` : "https://us-central1-aiplatform.googleapis.com/v1";
   }
-  async generate(model, body) {
+  async generate(model, body, caller) {
     const url = `${this.baseURL}/${encodeURIComponent(model)}:generateContent`;
+    const requestRaw = JSON.stringify(body);
     const res = await fetch(url, {
       method: "POST",
       headers: {
         Authorization: `Bearer ${this.apiKey}`,
         "Content-Type": "application/json"
       },
-      body: JSON.stringify(body)
+      body: requestRaw
     });
+    const responseRaw = await res.text().catch(() => "");
+    logLlmWire(caller, requestRaw, responseRaw);
     if (!res.ok) {
-      const text = await res.text().catch(() => "");
-      throw new Error(`vertex request failed: ${res.status} ${res.statusText} body=${text.slice(0, 500)}`);
+      throw new Error(`vertex request failed: ${res.status} ${res.statusText} body=${responseRaw.slice(0, 500)}`);
     }
-    return await res.json();
+    return JSON.parse(responseRaw);
   }
   async call(model, options) {
     const jsonMode = "jsonSchemaName" in options;
@@ -2172,7 +2191,7 @@ class VertexExecutor extends LLMExecutor {
         responseSchema: options.jsonSchema
       };
     }
-    const data = await this.generate(model, body);
+    const data = await this.generate(model, body, resolveLlmCaller(options));
     if (data.error) {
       throw new Error(`vertex API error: ${data.error.message ?? "unknown"}`);
     }
@@ -2191,7 +2210,7 @@ class VertexExecutor extends LLMExecutor {
       systemInstruction: { parts: [{ text: options.instruction }] },
       tools: options.tools.length > 0 ? [toGeminiTools(options.tools)] : undefined
     };
-    const data = await this.generate(model, body);
+    const data = await this.generate(model, body, resolveLlmCaller(options));
     if (data.error) {
       throw new Error(`vertex API error: ${data.error.message ?? "unknown"}`);
     }
@@ -2267,25 +2286,41 @@ class GitLabDuoExecutor extends LLMExecutor {
     const extra = parsed.success ? parsed.data : {};
     this.baseURL = (extra.baseURL ?? readAuthString(opts.auth, "baseURL", "GITLAB_BASE_URL") ?? "https://gitlab.com/api/v4/ai/llm/proxy").replace(/\/+$/, "");
   }
-  async send(body) {
+  async send(body, caller) {
+    const requestRaw = JSON.stringify(body);
     const res = await fetch(this.baseURL, {
       method: "POST",
       headers: {
         Authorization: `Bearer ${this.apiKey}`,
         "Content-Type": "application/json"
       },
-      body: JSON.stringify(body)
+      body: requestRaw
     });
+    const responseRaw = await res.text().catch(() => "");
+    logLlmWire(caller, requestRaw, responseRaw);
     if (!res.ok) {
-      const text = await res.text().catch(() => "");
-      throw new Error(`gitlab-duo request failed: ${res.status} ${res.statusText} body=${text.slice(0, 500)}`);
+      throw new Error(`gitlab-duo request failed: ${res.status} ${res.statusText} body=${responseRaw.slice(0, 500)}`);
     }
-    return await res.json();
+    return JSON.parse(responseRaw);
   }
   async call(model, options) {
-    const jsonMode = "jsonSchemaName" in options;
     const log5 = logger.child("llm:gitlab-duo");
-    log5.debug(`call: model=${model} jsonSchema=${jsonMode ? options.jsonSchemaName : "-"} msgLen=${options.message.length}`);
+    if ("jsonSchemaName" in options) {
+      log5.debug(`call: model=${model} jsonSchema=${options.jsonSchemaName} via tool`);
+      const { toolName, tool, instruction } = buildStructuredJsonRequest({
+        instruction: options.instruction,
+        jsonSchemaName: options.jsonSchemaName,
+        jsonSchema: options.jsonSchema
+      });
+      const choice = await this.chatWithTools(model, {
+        caller: options.caller ?? options.jsonSchemaName,
+        instruction,
+        messages: [{ role: "user", content: options.message }],
+        tools: [tool]
+      });
+      return parseStructuredJsonResult(choice, toolName);
+    }
+    log5.debug(`call: model=${model} jsonSchema=- msgLen=${options.message.length}`);
     const body = {
       model,
       messages: [
@@ -2293,7 +2328,7 @@ class GitLabDuoExecutor extends LLMExecutor {
         { role: "user", content: options.message }
       ]
     };
-    const data = await this.send(body);
+    const data = await this.send(body, resolveLlmCaller(options));
     if (data.error) {
       throw new Error(`gitlab-duo API error: ${data.error.message ?? "unknown"}`);
     }
@@ -2301,7 +2336,7 @@ class GitLabDuoExecutor extends LLMExecutor {
     if (!content) {
       throw new Error("Empty response from model");
     }
-    return jsonMode ? parseModelJson(content) : content;
+    return content;
   }
   async chatWithTools(model, options) {
     const log5 = logger.child("llm:gitlab-duo");
@@ -2314,7 +2349,7 @@ class GitLabDuoExecutor extends LLMExecutor {
       ],
       tools: options.tools.map(toTool)
     };
-    const data = await this.send(body);
+    const data = await this.send(body, resolveLlmCaller(options));
     if (data.error) {
       throw new Error(`gitlab-duo API error: ${data.error.message ?? "unknown"}`);
     }
@@ -2382,26 +2417,43 @@ class SnowflakeCortexExecutor extends LLMExecutor {
     const account = extra.account ?? readAuthString(opts.auth, "account", "SNOWFLAKE_ACCOUNT") ?? "";
     this.baseURL = account ? `https://${account}.snowflakecomputing.com/api/v2/cortex/inference:complete` : "https://__account__.snowflakecomputing.com/api/v2/cortex/inference:complete";
   }
-  async send(body) {
+  async send(body, caller) {
+    const requestRaw = JSON.stringify(body);
     const res = await fetch(this.baseURL, {
       method: "POST",
       headers: {
         Authorization: `Bearer ${this.apiKey}`,
         "Content-Type": "application/json"
       },
-      body: JSON.stringify(body)
+      body: requestRaw
     });
+    const responseRaw = await res.text().catch(() => "");
+    logLlmWire(caller, requestRaw, responseRaw);
     if (!res.ok) {
-      const text = await res.text().catch(() => "");
-      throw new Error(`snowflake-cortex request failed: ${res.status} ${res.statusText} body=${text.slice(0, 500)}`);
+      throw new Error(`snowflake-cortex request failed: ${res.status} ${res.statusText} body=${responseRaw.slice(0, 500)}`);
     }
-    return await res.json();
+    return JSON.parse(responseRaw);
   }
   async call(model, options) {
-    const jsonMode = "jsonSchemaName" in options;
-    const reasoning = defaultReasoningEffort(options.reasoningEffort, model, this.models.identity);
     const log5 = logger.child("llm:snowflake-cortex");
-    log5.debug(`call: model=${model} jsonSchema=${jsonMode ? options.jsonSchemaName : "-"} msgLen=${options.message.length}`);
+    if ("jsonSchemaName" in options) {
+      log5.debug(`call: model=${model} jsonSchema=${options.jsonSchemaName} via tool`);
+      const { toolName, tool, instruction } = buildStructuredJsonRequest({
+        instruction: options.instruction,
+        jsonSchemaName: options.jsonSchemaName,
+        jsonSchema: options.jsonSchema
+      });
+      const choice = await this.chatWithTools(model, {
+        caller: options.caller ?? options.jsonSchemaName,
+        instruction,
+        messages: [{ role: "user", content: options.message }],
+        tools: [tool],
+        reasoningEffort: "none"
+      });
+      return parseStructuredJsonResult(choice, toolName);
+    }
+    const reasoning = defaultReasoningEffort(options.reasoningEffort, model, this.models.identity);
+    log5.debug(`call: model=${model} jsonSchema=- msgLen=${options.message.length}`);
     const body = {
       model,
       messages: [
@@ -2412,7 +2464,7 @@ class SnowflakeCortexExecutor extends LLMExecutor {
     if (reasoning !== "none") {
       body["reasoning_effort"] = reasoning;
     }
-    const data = await this.send(body);
+    const data = await this.send(body, resolveLlmCaller(options));
     if (data.error) {
       throw new Error(`snowflake-cortex API error: ${data.error.message ?? "unknown"}`);
     }
@@ -2420,7 +2472,7 @@ class SnowflakeCortexExecutor extends LLMExecutor {
     if (!content) {
       throw new Error("Empty response from model");
     }
-    return jsonMode ? parseModelJson(content) : content;
+    return content;
   }
   async chatWithTools(model, options) {
     const log5 = logger.child("llm:snowflake-cortex");
@@ -2433,7 +2485,7 @@ class SnowflakeCortexExecutor extends LLMExecutor {
       ],
       tools: options.tools.map(toCortexTool)
     };
-    const data = await this.send(body);
+    const data = await this.send(body, resolveLlmCaller(options));
     if (data.error) {
       throw new Error(`snowflake-cortex API error: ${data.error.message ?? "unknown"}`);
     }
@@ -2822,7 +2874,11 @@ class Brain {
   async regenerateSchedules() {
     const today = new Date;
     const nextMonth = new Date(today.getFullYear(), today.getMonth() + 1, today.getDate());
-    await this.createMonthlySchedule(nextMonth);
+    const monthly = await this.createMonthlySchedule(nextMonth);
+    if (!monthly) {
+      log7.debug(`regenerateSchedules: skip daily — monthly schedule generation failed`);
+      return;
+    }
     const tomorrow = new Date(today.getFullYear(), today.getMonth(), today.getDate() + 1);
     await this.createDailySchedule(tomorrow);
     await this.createDailySchedule(today);
@@ -3704,7 +3760,7 @@ class BaseChannel {
   static all() {
     return Array.from(BaseChannel.activeChannels.values());
   }
-  static async forceDo(brainId, action) {
+  static forceDo(brainId, action) {
     const channel = BaseChannel.activeChannels.get(brainId);
     if (!channel) {
       return {
@@ -3713,12 +3769,20 @@ class BaseChannel {
       };
     }
     const displayName = channel.brain.brainbase.displayName;
-    logger.info(`do ${action}: forcing for "${displayName}" (${brainId})`);
-    if (action === "generateSchedule") {
-      await channel.regenerateSchedules();
-    } else {
-      await channel.runSleepMemory(true);
-    }
+    logger.info(`do ${action}: queued for "${displayName}" (${brainId})`);
+    (async () => {
+      try {
+        if (action === "generateSchedule") {
+          await channel.regenerateSchedules();
+        } else {
+          await channel.runSleepMemory(true);
+        }
+        logger.success(`do ${action}: done for "${displayName}" (${brainId})`);
+      } catch (error) {
+        const reason = error instanceof Error ? error.message : String(error);
+        logger.error(`do ${action}: failed for "${displayName}" (${brainId}): ${reason}`);
+      }
+    })();
     return { ok: true, displayName };
   }
   static async view(brainId, thing) {
@@ -4303,7 +4367,7 @@ defineCommand({
     if (typeof brainId !== "string" || brainId.trim().length === 0) {
       return { ok: false, error: "missing brainId" };
     }
-    const result = await BaseChannel.forceDo(brainId.trim(), action);
+    const result = BaseChannel.forceDo(brainId.trim(), action);
     if (!result.ok)
       return result;
     return {
@@ -4380,8 +4444,8 @@ async function startChannels() {
 async function daemon() {
   const logDir = join5(config.brainboxRoot, "logs");
   logger.configure({ logDir });
-  configureLlmLog(join5(logDir, "llm"));
-  logger.debug(`daemon: boot (logDir=${logDir}, llmLogDir=${join5(logDir, "llm")})`);
+  configureLlmLog(config.debug ? join5(logDir, "llm") : undefined);
+  logger.debug(`daemon: boot (debug=${config.debug}, logDir=${logDir}, llmLog=${config.debug})`);
   const started = await startChannels();
   if (started === 0) {
     logger.info("No activated brains with channels. Daemon idling.");
@@ -4559,7 +4623,7 @@ async function doAction(action, brainId) {
     args: { action, brainId }
   });
   const name = response.result?.displayName ?? brainId;
-  logger.success(`Forced ${action} for "${name}" (${brainId}).`);
+  logger.success(`Successfully sent ${action} for "${name}" (${brainId}).`);
 }
 async function viewThing(thing, brainId) {
   if (!VIEW_THINGS.includes(thing)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@p-sw/brainbox",
-  "version": "0.1.2-alpha.10",
+  "version": "0.1.2-alpha.12",
   "module": "dist/index.js",
   "main": "dist/index.js",
   "type": "module",