@amir83nasr/10router 0.1.5 → 0.1.7

package/open-sse/utils/opencodeFingerprint.js

@@ -0,0 +1,385 @@
+/**
+ * Helpers for the OpenCode free-tier client fingerprint.
+ *
+ * Live upstream probes (OpenCode v2, /inference/openai|anthropic/v1) show that free-tier
+ * requests must declare OpenCode's own `read` and `shell` tools with their exact
+ * descriptions and parameter schemas; stubbed descriptions, renamed schemas or
+ * tool_choice "none" are answered with 403 FreeTierError. Caller tools are sent
+ * untouched, except one that already uses an exact fingerprint name with a
+ * different definition: it travels under an alias and the response side
+ * restores the caller's original name.
+ */
+
+/** Names required by the upstream free-tier gate. */
+export const OPENCODE_FINGERPRINT_TOOLS = ["read", "shell"];
+
+// Verbatim from the OpenCode v2.0.26 CLI. Upstream compares description and
+// parameters, so do not reword or reformat these.
+const FINGERPRINT_TOOL_DEFINITIONS = {
+  read: {
+    description:
+      "Read the contents of a file or directory. Supports text files, images, and PDFs. Images and PDFs are presented directly to the model. Each text line is prefixed by its 1-based line number as <line>: <content>. The prefix is for reference and is not part of the file content. Directory entries are returned one per line. Use offset and limit to read large files or directories in sections. Prefer one larger read over many small slices, and use grep to find specific content in large files.",
+    parameters: {
+      type: "object",
+      properties: {
+        path: { type: "string", description: "File or directory to read" },
+        offset: {
+          type: "integer",
+          minimum: 0,
+          description: "The line or directory entry to start reading from (1-based)",
+        },
+        limit: {
+          type: "integer",
+          minimum: 0,
+          description:
+            "The maximum number of lines or directory entries to read (defaults to and capped at 2000)",
+        },
+      },
+      required: ["path"],
+      additionalProperties: false,
+    },
+  },
+  shell: {
+    description:
+      "Execute a shell command and return its output. Commands run on Linux using bash. Quote file paths containing spaces or special characters. Prefer dedicated tools over shell commands when possible. When output is large, the full result is saved to a file and a truncated preview is returned. Rely on automatic truncation unless filtering the output is more useful. Commands accept an optional timeout, background commands have no timeout by default. Background commands return immediately, and you will be notified when they complete.",
+    parameters: {
+      type: "object",
+      properties: {
+        command: { type: "string", description: "Shell command string to execute" },
+        workdir: {
+          type: "string",
+          description:
+            "Working directory to execute the command in. Defaults to the current working directory. When possible, avoid changing directories in the command and set the working directory here instead.",
+        },
+        timeout: {
+          type: "integer",
+          minimum: 0,
+          description:
+            "Timeout in milliseconds. Set to 0 to disable the timeout. Defaults to 120000 for foreground commands. Background commands have no timeout by default.",
+        },
+        background: {
+          type: "boolean",
+          description:
+            "Run the command in the background and return immediately (useful for dev servers and long-running builds). You do not need to use '&' at the end of the command when using this parameter. You will be notified when it completes. DO NOT poll for completion.",
+        },
+      },
+      required: ["command"],
+      additionalProperties: false,
+    },
+  },
+};
+
+// Request body -> names renamed for that request. transformRequest() mutates the
+// same body object that chatCore passed into the executor, so a WeakMap keeps the
+// mapping request-local without putting transport metadata on the wire.
+const renamedToolNames = new WeakMap();
+
+/** The fingerprint name when `name` is exactly one; "" otherwise. */
+export function fingerprintToolKey(name) {
+  const trimmed = String(name ?? "").trim();
+  return OPENCODE_FINGERPRINT_TOOLS.includes(trimmed) ? trimmed : "";
+}
+
+/** Read a tool name from either flat ({name}) or chat ({function:{name}}) shape. */
+function toolNameOf(tool) {
+  if (!tool || typeof tool !== "object" || Array.isArray(tool)) return "";
+  if (typeof tool.name === "string" && tool.name.trim()) return tool.name.trim();
+  const fn = tool.function;
+  if (fn && typeof fn === "object" && !Array.isArray(fn) && typeof fn.name === "string") {
+    return fn.name.trim();
+  }
+  return "";
+}
+
+function chatFunctionOf(tool) {
+  const fn = tool?.function;
+  return fn && typeof fn === "object" && !Array.isArray(fn) ? fn : null;
+}
+
+/** True when `tool` already carries OpenCode's exact definition for `key`. */
+function isFingerprintDefinition(tool, key) {
+  const def = tool && (chatFunctionOf(tool) || tool);
+  const want = FINGERPRINT_TOOL_DEFINITIONS[key];
+  return (
+    !!def &&
+    def.description === want.description &&
+    JSON.stringify(def.parameters) === JSON.stringify(want.parameters)
+  );
+}
+
+function withToolName(tool, name) {
+  const fn = chatFunctionOf(tool);
+  return fn ? { ...tool, function: { ...fn, name } } : { ...tool, name };
+}
+
+/**
+ * Move caller tools off the fingerprint names when their definition differs
+ * from OpenCode's, so the exact definitions can be appended without a
+ * duplicate name. Everything else, including case variants such as `Read`, is
+ * preserved verbatim; upstream accepts them alongside `read`.
+ *
+ * @param {Array} tools
+ * @returns {{ tools: Array, map: Map<string,string> }} map: sent name -> original name
+ */
+export function concealFingerprintToolNames(tools) {
+  const map = new Map();
+  if (!Array.isArray(tools) || tools.length === 0) return { tools, map };
+
+  const taken = new Set(tools.map(toolNameOf));
+  const seen = new Set();
+  const out = [];
+  for (const tool of tools) {
+    if (!tool || typeof tool !== "object" || Array.isArray(tool)) {
+      out.push(tool);
+      continue;
+    }
+
+    const key = fingerprintToolKey(toolNameOf(tool));
+    if (!key) {
+      out.push(tool);
+      continue;
+    }
+
+    // Duplicate declarations of one name are rejected upstream; keep the first.
+    if (seen.has(key)) continue;
+    seen.add(key);
+
+    if (isFingerprintDefinition(tool, key)) {
+      out.push(tool);
+      continue;
+    }
+
+    let alias = `${key}_client`;
+    for (let i = 2; taken.has(alias); i++) alias = `${key}_client${i}`;
+    taken.add(alias);
+    map.set(alias, key);
+    out.push(withToolName(tool, alias));
+  }
+  return { tools: out, map };
+}
+
+/**
+ * Append OpenCode's definition for each fingerprint tool not already declared.
+ *
+ * @returns {string[]} names that were appended
+ */
+export function appendMissingFingerprintTools(tools, flat) {
+  const appended = [];
+  if (!Array.isArray(tools)) return appended;
+  for (const name of OPENCODE_FINGERPRINT_TOOLS) {
+    if (tools.some((tool) => fingerprintToolKey(toolNameOf(tool)) === name)) continue;
+    const { description, parameters } = FINGERPRINT_TOOL_DEFINITIONS[name];
+    tools.push(
+      flat
+        ? { type: "function", name, description, parameters, strict: false }
+        : { type: "function", function: { name, description, parameters } },
+    );
+    appended.push(name);
+  }
+  return appended;
+}
+
+/** Invert a sent -> original rename map. */
+function aliasesByOriginal(map) {
+  return new Map([...map].map(([alias, original]) => [original, alias]));
+}
+
+/** Point an explicit tool_choice at the alias of a concealed caller tool. */
+export function retargetToolChoice(body, map) {
+  if (!body || typeof body !== "object" || !map?.size) return;
+  const choice = body.tool_choice;
+  if (!choice || typeof choice !== "object" || Array.isArray(choice)) return;
+  const aliases = aliasesByOriginal(map);
+
+  if (typeof choice.name === "string") {
+    const alias = aliases.get(choice.name.trim());
+    if (alias) body.tool_choice = { ...choice, name: alias };
+    return;
+  }
+
+  const fn = choice.function;
+  if (fn && typeof fn === "object" && !Array.isArray(fn) && typeof fn.name === "string") {
+    const alias = aliases.get(fn.name.trim());
+    if (alias) body.tool_choice = { ...choice, function: { ...fn, name: alias } };
+  }
+}
+
+/**
+ * Rename prior-turn calls to concealed caller tools as well; otherwise the model
+ * reads its own earlier calls as calls to OpenCode's tool of the same name.
+ */
+export function aliasHistoryToolCalls(body, map) {
+  if (!body || typeof body !== "object" || !map?.size) return;
+  const aliases = aliasesByOriginal(map);
+
+  if (Array.isArray(body.input)) {
+    body.input = body.input.map((item) =>
+      item?.type === "function_call" && aliases.has(item.name)
+        ? { ...item, name: aliases.get(item.name) }
+        : item,
+    );
+  }
+
+  if (Array.isArray(body.messages)) {
+    body.messages = body.messages.map((msg) => {
+      if (!Array.isArray(msg?.tool_calls)) return msg;
+      return {
+        ...msg,
+        tool_calls: msg.tool_calls.map((call) =>
+          aliases.has(call?.function?.name)
+            ? { ...call, function: { ...call.function, name: aliases.get(call.function.name) } }
+            : call,
+        ),
+      };
+    });
+  }
+}
+
+// Without the old "must not be used" descriptions the model does call the
+// appended tools (live probe: `read` on "what files are in /etc?"), so tell it
+// in the system prompt instead. Upstream does not gate on the prompt text.
+// Wording matters: "not available" made the model also refuse the caller's own
+// Read/Bash; "placeholders ... use the other tools" kept those working.
+function noteUnavailableTools(body, flat, names) {
+  const list = names.map((name) => `\`${name}\``).join(" or ");
+  const note =
+    names.length > 1
+      ? `Do not call the ${list} tools; they are placeholders that do nothing. Use the other tools you have been given instead.`
+      : `Do not call the ${list} tool; it is a placeholder that does nothing. Use the other tools you have been given instead.`;
+  if (flat) {
+    body.instructions =
+      typeof body.instructions === "string" && body.instructions.trim()
+        ? `${body.instructions}\n\n${note}`
+        : note;
+    return;
+  }
+  // OpenAI chat shape only; Claude-shaped bodies carry `system` instead.
+  if (!Array.isArray(body.messages) || body.system !== undefined) return;
+  const first = body.messages[0];
+  if (first?.role === "system" && typeof first.content === "string") {
+    body.messages = [
+      { ...first, content: `${first.content}\n\n${note}` },
+      ...body.messages.slice(1),
+    ];
+  } else {
+    body.messages = [{ role: "system", content: note }, ...body.messages];
+  }
+}
+
+/**
+ * Full request-side pass: alias conflicting caller tools, append OpenCode's
+ * fingerprint definitions, and tell the model the appended ones are off-limits.
+ *
+ * @param {object} body
+ * @param {boolean} flat - true for Responses tools ({name}), false for chat tools
+ * @returns {Map<string,string>} map: sent name -> original name
+ */
+export function applyFingerprintTools(body, flat) {
+  if (!body || typeof body !== "object") return new Map();
+
+  const { tools, map } = concealFingerprintToolNames(body.tools);
+  body.tools = Array.isArray(tools) ? tools : [];
+  const appended = appendMissingFingerprintTools(body.tools, flat);
+  retargetToolChoice(body, map);
+  aliasHistoryToolCalls(body, map);
+  if (appended.length) noteUnavailableTools(body, flat, appended);
+
+  // Responses keeps its explicit auto default. Never default to "none": upstream
+  // answers tool_choice "none" with 403 FreeTierError.
+  if (!body.tool_choice && flat) body.tool_choice = "auto";
+
+  recordRenamedToolNames(body, map);
+  return map;
+}
+
+/** Store the rename map for `body`. */
+export function recordRenamedToolNames(body, map) {
+  if (!body || typeof body !== "object" || !map?.size) return;
+  renamedToolNames.set(body, map);
+}
+
+/** Retrieve the rename map for `body`. */
+export function takeRenamedToolNames(body) {
+  if (!body || typeof body !== "object") return null;
+  return renamedToolNames.get(body) || null;
+}
+
+// Response side -------------------------------------------------------------
+
+/** Restore caller tool spellings in supported response/event shapes. */
+export function restoreToolNames(payload, map) {
+  if (!map?.size || !payload) return payload;
+  if (Array.isArray(payload)) return payload.map((item) => restoreToolNames(item, map));
+  if (typeof payload !== "object") return payload;
+
+  let out = payload;
+  const put = (key, value) => {
+    if (out === payload) out = { ...payload };
+    out[key] = value;
+  };
+
+  // Claude streaming content_block_start event.
+  if (payload.type === "content_block_start") {
+    const block = payload.content_block;
+    if (block?.type === "tool_use" && typeof block.name === "string" && map.has(block.name)) {
+      put("content_block", { ...block, name: map.get(block.name) });
+    }
+  }
+
+  // Claude non-streaming message body.
+  if (Array.isArray(payload.content)) {
+    put(
+      "content",
+      payload.content.map((block) =>
+        block?.type === "tool_use" && typeof block.name === "string" && map.has(block.name)
+          ? { ...block, name: map.get(block.name) }
+          : block,
+      ),
+    );
+  }
+
+  // OpenAI Chat Completions, both streaming delta and JSON message shapes.
+  if (Array.isArray(payload.choices)) {
+    put(
+      "choices",
+      payload.choices.map((choice) => {
+        let changed = false;
+        const next = { ...choice };
+        for (const holder of ["delta", "message"]) {
+          const value = choice?.[holder];
+          if (!value || !Array.isArray(value.tool_calls) || value.tool_calls.length === 0) continue;
+          const calls = value.tool_calls.map((call) => {
+            const name = call?.function?.name;
+            if (typeof name === "string" && map.has(name)) {
+              changed = true;
+              return { ...call, function: { ...call.function, name: map.get(name) } };
+            }
+            return call;
+          });
+          next[holder] = { ...value, tool_calls: calls };
+        }
+        return changed ? next : choice;
+      }),
+    );
+  }
+
+  // OpenAI Responses final JSON body.
+  if (Array.isArray(payload.output)) {
+    put(
+      "output",
+      payload.output.map((item) =>
+        item?.type === "function_call" && typeof item.name === "string" && map.has(item.name)
+          ? { ...item, name: map.get(item.name) }
+          : item,
+      ),
+    );
+  }
+
+  // OpenAI Responses SSE events such as response.output_item.added/done.
+  const item = payload.item;
+  if (item?.type === "function_call" && typeof item.name === "string" && map.has(item.name)) {
+    put("item", { ...item, name: map.get(item.name) });
+  }
+
+  return out;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@amir83nasr/10router",
-  "version": "0.1.5",
+  "version": "0.1.7",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/Amir83Nasr/10Router.git"
@@ -12,6 +12,7 @@
   },
   "files": [
     "bin/",
+    "CHANGELOG.md",
     "custom-server.js",
     "src/",
     "open-sse/",

package/src/app/api/changelog/{route.js → route.ts}

@@ -12,7 +12,8 @@ export async function GET() {
   let markdown = "";
   try {
     markdown = await fs.promises.readFile(path.join(process.cwd(), "CHANGELOG.md"), "utf8");
-  } catch {
+  } catch (error) {
+    console.error("GET /api/changelog: failed to read CHANGELOG.md", error);
     return NextResponse.json(
       { error: "changelog unavailable" },
       { status: 500, headers: CORS_HEADERS },

package/src/app/api/providers/[id]/test/testUtils.js

@@ -901,12 +901,12 @@ async function testApiKeyConnection(connection, effectiveProxy = null) {
       case "opencode": {
         // Connectivity-only probe: GET /inference/v1/models never exercises the Responses
         // tool path, so a green dashboard test does NOT rule out 403
-        // FreeTierError on POST /zen/v1/responses with tools (requires
+        // FreeTierError on POST /inference/openai/v1/responses with tools (requires
         // bash+read decoys + tool_choice auto — see OpenCodeExecutor).
         const res = await fetchWithConnectionProxy(
           "https://opencode.ai/inference/v1/models",
           {
-            headers: { "User-Agent": "opencode/1.18.35" },
+            headers: { "User-Agent": "opencode/latest/2.0.26/cli" },
           },
           effectiveProxy,
         );
@@ -914,7 +914,7 @@ async function testApiKeyConnection(connection, effectiveProxy = null) {
       }
       case "opencode-go": {
         const res = await fetchWithConnectionProxy(
-          "https://opencode.ai/zen/go/v1/chat/completions",
+          "https://opencode.ai/inference/go/v1/chat/completions",
           {
             method: "POST",
             headers: {

package/src/app/api/providers/validate/route.js

@@ -454,7 +454,7 @@ export async function POST(request) {
         }
 
         case "opencode-go": {
-          const res = await fetch("https://opencode.ai/zen/go/v1/chat/completions", {
+          const res = await fetch("https://opencode.ai/inference/go/v1/chat/completions", {
             method: "POST",
             headers: { "Content-Type": "application/json", Authorization: `Bearer ${apiKey}` },
             body: JSON.stringify({

package/src/app/api/version/route.js

@@ -3,7 +3,7 @@ import { getLatestVersion, isNewerVersion } from "@/lib/versionCheck";
 
 export async function GET() {
   const currentVersion = pkg.version;
-  // Fail-open: GitHub unreachable → latestVersion falls back to current.
+  // Fail-open: npm registry unreachable → latestVersion falls back to current.
   const { version, reason } = await getLatestVersion();
   const latestVersion = version || currentVersion;
   return Response.json({

package/src/lib/versionCheck.js

@@ -1,7 +1,12 @@
-const REPO = "Amir83Nasr/10Router";
-const TAGS_URL = `https://api.github.com/repos/${REPO}/tags?per_page=100`;
+// Single source of truth for the dashboard update check (/api/version →
+// sidebar VersionLabel). Uses the npm registry — not GitHub tags — so the
+// offered version always matches `npm i -g <pkg>@latest`.
+import pkg from "../../package.json" with { type: "json" };
+
+const NPM_PKG = pkg.name || "@amir83nasr/10router";
+const LATEST_URL = `https://registry.npmjs.org/${NPM_PKG.replace("/", "%2F")}/latest`;
 const CACHE_TTL_MS = 6 * 60 * 60 * 1000;
-// Short negative cache so one GitHub failure (rate limit / no egress on
+// Short negative cache so one npm failure (rate limit / no egress on
 // docker) doesn't turn every /api/version hit into another upstream call.
 const FAIL_TTL_MS = 10 * 60 * 1000;
 
@@ -36,26 +41,23 @@ export async function getLatestVersion({ fetchFn = fetch, now = Date.now } = {})
     return { version: cache.latest, reason: "cache-fresh" };
   if (!cache.latest && now() - cache.failAt < FAIL_TTL_MS)
     return { version: null, reason: "cooldown" };
-  const headers = { Accept: "application/vnd.github+json", "User-Agent": "10router" };
-  const token = process.env.GITHUB_TOKEN || process.env.GH_TOKEN;
-  if (token) headers.Authorization = `Bearer ${token}`;
   try {
-    const res = await fetchFn(TAGS_URL, {
-      headers,
+    const res = await fetchFn(LATEST_URL, {
+      headers: { Accept: "application/json" },
       signal: AbortSignal.timeout(8000),
     });
     if (!res.ok) {
       cache.failAt = now();
-      return { version: cache.latest, reason: `github-${res.status}` };
+      return { version: cache.latest, reason: `npm-${res.status}` };
     }
-    const tags = await res.json();
-    let best = null;
-    for (const t of Array.isArray(tags) ? tags : []) {
-      const v = normalizeVersion(t?.name);
-      if (/^\d+\.\d+\.\d+/.test(v) && (!best || compareVersions(v, best) > 0)) best = v;
+    const data = await res.json();
+    const v = normalizeVersion(data?.version);
+    if (!/^\d+\.\d+\.\d+/.test(v)) {
+      cache.failAt = now();
+      return { version: cache.latest, reason: "no-version" };
     }
-    if (best) cache = { at: now(), latest: best, failAt: 0 };
-    return { version: cache.latest, reason: best ? "github" : "no-tags" };
+    cache = { at: now(), latest: v, failAt: 0 };
+    return { version: v, reason: "npm" };
   } catch (err) {
     cache.failAt = now();
     return { version: cache.latest, reason: "fetch-error" };

package/src/shared/components/UpdateDialog.tsx

@@ -203,7 +203,7 @@ export default function UpdateDialog({
   const status = !info ? (
     <p className="rounded-lg border border-border bg-muted/50 px-3 py-2 text-sm text-muted-foreground">
       {checkFailed
-        ? "Could not reach GitHub to check for updates — the manual steps below still work."
+        ? "Could not reach npm registry to check for updates — the manual steps below still work."
         : "Checking for updates…"}
     </p>
   ) : info.hasUpdate ? (