copillm 0.2.9 → 0.3.0-beta.2

package/dist/server/routes/shared.js

@@ -1,4 +1,5 @@
 import { stripOneMillionAlias } from "../../translation/openaiAnthropic.js";
+import { isValidAccountId } from "../../config/accountId.js";
 import { JsonRequestParseError } from "../errors.js";
 export async function readJson(req) {
     const chunks = [];
@@ -119,43 +120,87 @@ export function safePathname(rawUrl) {
         return "/";
     }
 }
-export function resolveRoute(method, rawUrl) {
-    if (!method || !rawUrl) {
-        return { kind: "not_found", anthroShape: false };
-    }
-    let pathname;
-    try {
-        pathname = new URL(rawUrl, "http://127.0.0.1").pathname;
-    }
-    catch {
-        return { kind: "not_found", anthroShape: false };
-    }
+// First path segments that belong to real routes and must never be mistaken
+// for an account prefix. (Direct matching already wins for these, so this is
+// belt-and-suspenders against contrived nested paths.)
+const RESERVED_FIRST_SEGMENTS = new Set([
+    "livez",
+    "healthz",
+    "models",
+    "v1",
+    "codex",
+    "anthropic",
+    "_debug"
+]);
+// Only these routes may be addressed with an `/<account>` prefix. The generic
+// `/models` discovery route and all health/debug routes stay global.
+const PREFIXABLE_KINDS = new Set([
+    "codex_models",
+    "anthropic_models",
+    "codex_responses",
+    "openai",
+    "anthropic"
+]);
+function matchRoute(method, pathname) {
     if (method === "GET" && pathname === "/livez") {
-        return { kind: "livez", anthroShape: false };
+        return { kind: "livez", anthroShape: false, accountId: null };
     }
     if (method === "GET" && pathname === "/healthz") {
-        return { kind: "healthz", anthroShape: false };
+        return { kind: "healthz", anthroShape: false, accountId: null };
     }
     if (method === "GET" && (pathname === "/models" || pathname === "/v1/models")) {
-        return { kind: "models", anthroShape: false };
+        return { kind: "models", anthroShape: false, accountId: null };
     }
     if (method === "GET" && pathname === "/codex/v1/models") {
-        return { kind: "codex_models", anthroShape: false };
+        return { kind: "codex_models", anthroShape: false, accountId: null };
     }
     if (method === "GET" && pathname === "/anthropic/v1/models") {
-        return { kind: "anthropic_models", anthroShape: false };
+        return { kind: "anthropic_models", anthroShape: false, accountId: null };
     }
     if (method === "POST" && pathname === "/codex/v1/responses") {
-        return { kind: "codex_responses", anthroShape: false };
+        return { kind: "codex_responses", anthroShape: false, accountId: null };
     }
     if (method === "GET" && pathname === "/_debug") {
-        return { kind: "debug", anthroShape: false };
+        return { kind: "debug", anthroShape: false, accountId: null };
     }
     if (method === "POST" && pathname === "/v1/chat/completions") {
-        return { kind: "openai", anthroShape: false };
+        return { kind: "openai", anthroShape: false, accountId: null };
     }
     if (method === "POST" && (pathname === "/anthropic/v1/messages" || pathname === "/v1/messages")) {
-        return { kind: "anthropic", anthroShape: true };
+        return { kind: "anthropic", anthroShape: true, accountId: null };
+    }
+    return null;
+}
+export function resolveRoute(method, rawUrl) {
+    if (!method || !rawUrl) {
+        return { kind: "not_found", anthroShape: false, accountId: null };
+    }
+    let pathname;
+    try {
+        pathname = new URL(rawUrl, "http://127.0.0.1").pathname;
+    }
+    catch {
+        return { kind: "not_found", anthroShape: false, accountId: null };
+    }
+    // Try the path as-is first. This keeps every existing (unprefixed) route
+    // working unchanged and ensures a reserved first segment like `/codex/...`
+    // is always interpreted as a route, never as an account named "codex".
+    const direct = matchRoute(method, pathname);
+    if (direct) {
+        return direct;
+    }
+    // Otherwise, peel an optional leading `/<account>` segment and re-match the
+    // remainder against the prefixable routes.
+    const prefixMatch = pathname.match(/^\/([^/]+)(\/.*)$/);
+    if (prefixMatch) {
+        const candidate = prefixMatch[1];
+        const rest = prefixMatch[2];
+        if (isValidAccountId(candidate) && !RESERVED_FIRST_SEGMENTS.has(candidate)) {
+            const sub = matchRoute(method, rest);
+            if (sub && PREFIXABLE_KINDS.has(sub.kind)) {
+                return { ...sub, accountId: candidate };
+            }
+        }
     }
-    return { kind: "not_found", anthroShape: false };
+    return { kind: "not_found", anthroShape: false, accountId: null };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "copillm",
-  "version": "0.2.9",
+  "version": "0.3.0-beta.2",
   "description": "Local Copilot proxy CLI (OpenAI/Anthropic-compatible)",
   "license": "MIT",
   "type": "module",