dsh-opencode-free-tier 0.1.1 → 0.1.2

package/README.md

@@ -29,14 +29,19 @@ A zero-dependency Cordis plugin that fixes all three at the fetch transport laye
   `AsyncLocalStorage` across each adapter stream, so the fetch layer knows which DSH
   conversation a request belongs to (stable session → optimal upstream prompt-cache routing).
 - **Fetch middleware, scoped strictly to `opencode.ai`** (+ subdomains) — every other
-  host passes through byte-for-byte untouched:
-  - missing/non-CLI `User-Agent` → `opencode/<cli-version> (platform arch; node...)`
-  - missing/malformed `x-opencode-session` → canonicalized (`ses_` + 26) from the DSH
-    conversation id; an already-canonical id passes through (cache affinity preserved)
-  - fills `x-opencode-client: cli`, `x-session-affinity`, `X-Session-Id`,
-    `x-opencode-request`, `x-opencode-project` when absent
-  - chat-completions bodies missing `bash`/`read` tools get the stubs appended
-    (`tool_choice: "none"` when the caller had no tools, so the model never calls them)
+  host passes through byte-for-byte untouched. It distinguishes the two lanes:
+  - **Anonymous free lane** (`/zen/...`) — the full CLI disguise: missing/non-CLI
+    `User-Agent` → `opencode/<cli-version> (platform arch; node...)`;
+    missing/malformed `x-opencode-session` → canonicalized (`ses_` + 26) from the DSH
+    conversation id (an already-canonical id passes through, preserving cache affinity);
+    `x-opencode-client: cli`, `x-session-affinity`, `X-Session-Id`,
+    `x-opencode-request`, `x-opencode-project` filled when absent; chat-completions
+    bodies missing `bash`/`read` tools get the stubs appended (`tool_choice: "none"`
+    when the caller had no tools, so the model never calls them).
+  - **Paid OpenCode Go lane** (`/zen/go/...`) — only the stable canonical
+    `x-opencode-session` the Go docs require; the harness's real `User-Agent` and the
+    request body stay untouched. This also fixes DSH's missing session header on the
+    Go lane ([discussion #5495](https://github.com/deepseek-ai/deepseek-harness/discussions/5495)).
 
 Already-correct requests pass through untouched (idempotent) — e.g. it coexists with
 `opencode2dsh` instead of breaking it.

package/lib/index.js

@@ -257,6 +257,13 @@ async function readBodyText(input, init) {
  * Options:
  *   - hosts: allowlist (default opencode.ai)
  *   - isEnabled: () => boolean, consulted per matching request
+ *
+ * Two lanes share the host:
+ *   - the anonymous free lane (`/zen/...`) needs the full CLI disguise (UA,
+ *     canonical session, `bash`/`read` tools) or it answers 403 FreeTierError;
+ *   - the paid OpenCode Go lane (`/zen/go/...`) only needs the stable
+ *     `x-opencode-session` header the Go docs ask for, and should keep the
+ *     harness's real User-Agent, so it is never disguised and gets no tools.
  */
 export function createFreeTierMiddleware(options) {
   const hosts = options?.hosts?.length ? options.hosts : DEFAULT_HOSTS
@@ -265,6 +272,7 @@ export function createFreeTierMiddleware(options) {
     const url = requestUrlOf(input)
     if (!url || !hostMatches(url.hostname, hosts)) return next(input, init)
     if (!isEnabled()) return next(input, init)
+    const freeLane = !url.pathname.startsWith('/zen/go/')
 
     // Merge whichever header source would actually reach the wire (fetch spec:
     // init.headers replaces Request headers when present).
@@ -276,10 +284,13 @@ export function createFreeTierMiddleware(options) {
           : undefined
     const headers = new Headers(source ?? undefined)
 
-    // 1. User-Agent must start with opencode/
-    const ua = headers.get('user-agent')
-    if (!ua || !ua.toLowerCase().startsWith('opencode/')) {
-      headers.set('user-agent', opencodeUserAgent())
+    // 1. User-Agent must start with opencode/ (free lane only; Go keeps the
+    // harness identity the Go docs ask clients to send).
+    if (freeLane) {
+      const ua = headers.get('user-agent')
+      if (!ua || !ua.toLowerCase().startsWith('opencode/')) {
+        headers.set('user-agent', opencodeUserAgent())
+      }
     }
 
     // 2. x-opencode-session must be canonical ses_+26; preserve a correct one
@@ -295,27 +306,31 @@ export function createFreeTierMiddleware(options) {
       session = canonicalSessionID(signal)
       headers.set(HEADER_SESSION, session)
     }
-    if (!headers.get('x-opencode-client')) headers.set('x-opencode-client', 'cli')
-    if (!headers.get('x-session-affinity')) headers.set('x-session-affinity', session)
-    if (!headers.get('x-session-id') && !headers.get('X-Session-Id')) headers.set('X-Session-Id', session)
-    if (!headers.get('x-opencode-request')) headers.set('x-opencode-request', randomID('req', 16))
-    if (!headers.get('x-opencode-project')) headers.set('x-opencode-project', defaultProjectID())
+    if (freeLane) {
+      if (!headers.get('x-opencode-client')) headers.set('x-opencode-client', 'cli')
+      if (!headers.get('x-session-affinity')) headers.set('x-session-affinity', session)
+      if (!headers.get('x-session-id') && !headers.get('X-Session-Id')) headers.set('X-Session-Id', session)
+      if (!headers.get('x-opencode-request')) headers.set('x-opencode-request', randomID('req', 16))
+      if (!headers.get('x-opencode-project')) headers.set('x-opencode-project', defaultProjectID())
+    }
 
-    // 3. Body must carry bash+read tools (chat-completions shape only).
+    // 3. Free lane only: body must carry bash+read tools (chat-completions shape).
     let newBodyText
-    try {
-      const bodyText = await readBodyText(input, init)
-      if (typeof bodyText === 'string' && bodyText.length > 0) {
-        let parsed
-        try {
-          parsed = JSON.parse(bodyText)
-        } catch {
-          parsed = undefined
+    if (freeLane) {
+      try {
+        const bodyText = await readBodyText(input, init)
+        if (typeof bodyText === 'string' && bodyText.length > 0) {
+          let parsed
+          try {
+            parsed = JSON.parse(bodyText)
+          } catch {
+            parsed = undefined
+          }
+          const fixed = parsed === undefined ? undefined : ensureFreeLaneShape(parsed)
+          if (fixed !== undefined) newBodyText = JSON.stringify(fixed)
         }
-        const fixed = parsed === undefined ? undefined : ensureFreeLaneShape(parsed)
-        if (fixed !== undefined) newBodyText = JSON.stringify(fixed)
-      }
-    } catch {}
+      } catch {}
+    }
 
     if (newBodyText === undefined) {
       return next(input, { ...init, headers })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-opencode-free-tier",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "Make DSH llm-pi-ai opencode routes pass Zen free-tier gate: opencode User-Agent + canonical ses_ session + bash/read tools. Scoped to opencode.ai only.",
   "type": "module",
   "main": "lib/index.js",