@magpie-community/opencode-zen-free-auth 0.1.0 → 0.1.1

package/README.md

@@ -31,6 +31,9 @@ Requests go to `https://opencode.ai/zen/v1` using each model's native
 Chat Completions, Responses or Anthropic Messages API. Streaming and
 ordinary JSON replies are supported.
 
-The agent's tools are preserved. If Zen calls an added tool, its name is
-mapped to the agent's unique case-insensitive match (`bash` to `Bash`).
-A call with no matching tool returns an error. Tools run in the agent.
+The agent's tools are preserved. Zen's models often call OpenCode's own
+tool names; such a call is given the agent's tool whose name differs only
+in case (`bash` to `Bash`), or else only in case and `_`/`-` (`todowrite`
+to `todo_write`, `webfetch` to `web_fetch`), when exactly one does. A
+call with no such tool returns an error that names it. Tools run in the
+agent.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@magpie-community/opencode-zen-free-auth",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "OpenCode Zen free models through the public credential, with native streaming protocols",
   "type": "module",
   "main": "./index.mjs",

package/tool-response.mjs

@@ -30,20 +30,35 @@ function list(value) {
   return value;
 }
 
-function nameGuard(policy) {
-  const declared = new Set(policy.declared);
-  const injected = new Set(policy.injected);
+// OpenCode's own models call OpenCode's tool names (bash, todowrite,
+// webfetch) whatever the agent declared. A call is given the agent's tool
+// whose name differs only in case, or else only in case and separators
+// (todowrite → todo_write, webfetch → web_fetch), when exactly one does; a
+// name two of the agent's tools fold to is never guessed between.
+const separators = /[\s_.-]/g;
+function foldsTo(declared, key) {
   const folded = new Map();
   for (const name of declared) {
-    const key = name.toLowerCase();
-    folded.set(key, folded.has(key) ? null : name);
+    const k = key(name);
+    folded.set(k, folded.has(k) ? null : name);
   }
+  return folded;
+}
+
+function nameGuard(policy) {
+  const declared = new Set(policy.declared);
+  const lower = (name) => name.toLowerCase();
+  const bare = (name) => name.toLowerCase().replace(separators, "");
+  const byCase = foldsTo(declared, lower);
+  const byShape = foldsTo(declared, bare);
   return (name) => {
     if (typeof name !== "string" || !name) throw new GuardError("Missing upstream tool name");
     if (declared.has(name)) return name;
-    const match = injected.has(name) && folded.get(name.toLowerCase());
+    const match = byCase.get(lower(name)) ?? (byCase.has(lower(name)) ? null : byShape.get(bare(name)));
     if (match) return match;
-    throw new GuardError("Upstream called a tool not declared by the client");
+    throw new GuardError(
+      `Upstream called a tool not declared by the client: ${JSON.stringify(name.slice(0, 128))}`,
+    );
   };
 }