@askalf/dario 5.4.17 → 5.4.20

package/dist/cc-template.d.ts

@@ -170,6 +170,17 @@ export declare const CC_AGENT_IDENTITY: string;
  */
 export declare const CLIENT_SYSTEM_PREFACE: string;
 export declare function resolveSystemPrompt(arg: string | undefined, model?: string): string;
+/**
+ * Pick the CC-identity headers out of an inbound request so the passthrough
+ * path can forward them unchanged.
+ *
+ * Pure and exported so the allow/deny behaviour is unit-testable without
+ * standing up the proxy, matching `orderHeadersForOutbound` and
+ * `overlayTemplateHeaderValues`. Array-valued headers (Node allows repeats)
+ * take the first value; empty strings are skipped so a client sending a blank
+ * header cannot blank out a value dario would otherwise supply.
+ */
+export declare function forwardClientCCIdentityHeaders(reqHeaders: Record<string, string | string[] | undefined>): Record<string, string>;
 /**
  * Overlay a captured template's `header_values` onto the outbound header record,
  * skipping the keys that must never be replayed.

package/dist/cc-template.js

@@ -283,6 +283,74 @@ function stripBehavioralConstraints(input, level) {
  * so new captures are clean. This skip list is what makes every ALREADY-baked
  * template and warm cache self-heal without waiting for a re-bake.
  */
+/**
+ * Headers a genuine Claude Code client sends to identify itself, which the
+ * passthrough path forwards verbatim instead of substituting template values.
+ *
+ * The template exists to SYNTHESISE CC's shape for clients that are not CC. On
+ * the passthrough path `isGenuineCCClient` has already established that the
+ * caller really is Claude Code, so its own headers are the authentic article and
+ * a capture is at best a good imitation of them. Measured before this changed:
+ * of 13 CC-identity headers a real client sent, 12 were replaced with template
+ * values and 1 was dropped — 0 forwarded (dario#885).
+ *
+ * Deliberately NOT in this list, because dario must own them:
+ *
+ *   authorization / x-api-key   must become the pool account's credential
+ *   x-claude-code-session-id    session rotation is a feature, not an accident
+ *   anthropic-beta              merged with operator pins + the per-account
+ *                               rejection cache; the client's set is not final
+ *   anthropic-version           already read from the client at the call site
+ *   accept / content-type       body framing, owned by the proxy
+ *   host / connection /         transport, owned by the HTTP stack; forwarding
+ *   content-length /            them corrupts the request
+ *   transfer-encoding /
+ *   accept-encoding / keep-alive
+ *
+ * Anything a future CC adds under the `x-stainless-*` or `x-claude-code-*`
+ * prefixes is forwarded by the prefix rules in
+ * `forwardClientCCIdentityHeaders` rather than needing to be enumerated here —
+ * the capture cannot see first-party-conditional headers at all (dario#885), so
+ * an allowlist of exact names would silently miss them.
+ */
+const CC_IDENTITY_HEADERS_TO_FORWARD = new Set([
+    'user-agent',
+    'x-app',
+    'anthropic-dangerous-direct-browser-access',
+]);
+/** Prefixes whose every member is CC self-identification, forwarded wholesale. */
+const CC_IDENTITY_HEADER_PREFIXES = ['x-stainless-', 'x-claude-code-', 'x-client-'];
+/** Never forwarded from the client even when it matches a prefix above. */
+const NEVER_FORWARD_FROM_CLIENT = new Set([
+    'x-claude-code-session-id', // dario rotates sessions deliberately
+]);
+/**
+ * Pick the CC-identity headers out of an inbound request so the passthrough
+ * path can forward them unchanged.
+ *
+ * Pure and exported so the allow/deny behaviour is unit-testable without
+ * standing up the proxy, matching `orderHeadersForOutbound` and
+ * `overlayTemplateHeaderValues`. Array-valued headers (Node allows repeats)
+ * take the first value; empty strings are skipped so a client sending a blank
+ * header cannot blank out a value dario would otherwise supply.
+ */
+export function forwardClientCCIdentityHeaders(reqHeaders) {
+    const out = {};
+    for (const [rawName, rawValue] of Object.entries(reqHeaders)) {
+        const name = rawName.toLowerCase();
+        if (NEVER_FORWARD_FROM_CLIENT.has(name))
+            continue;
+        const allowed = CC_IDENTITY_HEADERS_TO_FORWARD.has(name)
+            || CC_IDENTITY_HEADER_PREFIXES.some((p) => name.startsWith(p));
+        if (!allowed)
+            continue;
+        const value = Array.isArray(rawValue) ? rawValue[0] : rawValue;
+        if (typeof value !== 'string' || value.length === 0)
+            continue;
+        out[name] = value;
+    }
+    return out;
+}
 const NEVER_REPLAY_HEADER_VALUES = new Set([
     'x-api-key',
     'x-stainless-os',

package/dist/live-fingerprint.d.ts

@@ -336,12 +336,6 @@ export interface DriftResult {
  *   callers pass nothing and the real binary probe runs.
  */
 export declare function detectDrift(t: TemplateData, installedOverride?: string | null): DriftResult;
-/**
- * Reset the memoized `claude --version` probe. Test-only — production
- * code should never need to clear the cache since the installed binary
- * doesn't change mid-process.
- */
-export declare function _resetInstalledVersionProbeForTest(): void;
 /**
  * The CC version range the current dario release has been exercised
  * against. Update `maxTested` every time we validate against a new CC

package/dist/live-fingerprint.js

@@ -919,14 +919,6 @@ export function detectDrift(t, installedOverride) {
         message: `cache is from CC v${cachedVersion} but installed CC is v${installed} — background refresh will re-capture`,
     };
 }
-/**
- * Reset the memoized `claude --version` probe. Test-only — production
- * code should never need to clear the cache since the installed binary
- * doesn't change mid-process.
- */
-export function _resetInstalledVersionProbeForTest() {
-    _installedVersionProbe = { value: null, cached: false };
-}
 // ============================================================
 //  CC version compat matrix (v3.17)
 // ============================================================

package/dist/proxy.js

@@ -9,7 +9,7 @@ import { arch, platform } from 'node:process';
 import { getAccessToken, getStatus } from './oauth.js';
 import { buildHealthResponse, derivePoolStatus, shouldDiscloseHealthInternals } from './health-response.js';
 import { darioVersion } from './version.js';
-import { buildCCRequest, applyCcPromptCaching, parseEffortSuffix, reverseMapResponse, createStreamingReverseMapper, orderHeadersForOutbound, overlayTemplateHeaderValues, isMcpToolName, CC_TEMPLATE, effectiveCacheControl, withForced1hBeta } from './cc-template.js';
+import { buildCCRequest, applyCcPromptCaching, parseEffortSuffix, reverseMapResponse, createStreamingReverseMapper, orderHeadersForOutbound, overlayTemplateHeaderValues, forwardClientCCIdentityHeaders, isMcpToolName, CC_TEMPLATE, effectiveCacheControl, withForced1hBeta } from './cc-template.js';
 import { stampCch, hasCchSeed } from './cch.js';
 import { describeTemplate, detectDrift, checkCCCompat } from './live-fingerprint.js';
 import { AccountPool, computeStickyKey, parseRateLimits, modelFamily, isInAuthCooldown, authCooldownMs, reconcilePoolAccounts, resolvePoolStrategy } from './pool.js';
@@ -2064,6 +2064,12 @@ export async function startProxy(opts = {}) {
         let requestModel = '';
         let detectedClientForLog;
         let preserveToolsEffective = Boolean(opts.preserveTools);
+        // Per-request: did isGenuineCCClient recognise the caller as real Claude
+        // Code? Hoisted because the header build below needs it and `genuineCC` is
+        // block-scoped where buildCCRequest destructures it. NOT the same thing as
+        // `passthrough`, which is a startup CLI flag — conflating the two is why
+        // the first version of this forwarded nothing (dario#885).
+        let genuineCCRequest = false;
         try {
             // Select an account by headroom (v5.0: the pool is the one credential
             // model, so every OAuth request selects from it — a plain `dario login`
@@ -2442,6 +2448,7 @@ export async function startProxy(opts = {}) {
                         preserveToolsEffective = Boolean(opts.preserveTools)
                             || Boolean(genuineCC)
                             || (Boolean(detectedClient) && !opts.hybridTools && !opts.mergeTools);
+                        genuineCCRequest = Boolean(genuineCC);
                         if (genuineCC && !ccPassthroughLogged) {
                             ccPassthroughLogged = true;
                             console.log('[dario] genuine Claude Code client — system + tools forwarded verbatim (byte-faithful passthrough)');
@@ -2688,15 +2695,31 @@ export async function startProxy(opts = {}) {
                     console.log(`[dario] #${requestCount} session: rotate (${assigned.reason})${poolAccount ? ` [${poolAccount.alias}]` : ''}`);
                 }
             }
+            // On the passthrough path `isGenuineCCClient` has already established the
+            // caller IS Claude Code, so its own identity headers are the authentic
+            // article — forward them instead of substituting template values. The
+            // template is for synthesising CC's shape when the client is not CC; here it
+            // would only be an imitation of headers we already hold. Measured before
+            // this: 12 of 13 client CC-identity headers were replaced and 1 dropped,
+            // 0 forwarded (dario#885). Spread AFTER staticHeaders so the client wins
+            // over template values, and BEFORE the dario-owned block below so auth,
+            // session rotation and the merged beta set still win over the client.
+            const forwardedIdentity = (passthrough || genuineCCRequest)
+                ? forwardClientCCIdentityHeaders(req.headers)
+                : {};
             const headers = {
                 ...staticHeaders,
+                ...forwardedIdentity,
                 ...upstreamAuthHeaders(upstreamApiKey, accessToken),
                 'x-claude-code-session-id': outboundSessionId,
                 'anthropic-version': passthrough ? (req.headers['anthropic-version'] || '2023-06-01') : '2023-06-01',
                 'anthropic-beta': beta,
-                'x-client-request-id': randomUUID(),
+                // Prefer the client's own when passthrough forwarded one: a genuine CC
+                // request already carries a real request id, and synthesising over it
+                // discards information for no gain. Falls back to a fresh uuid otherwise.
+                'x-client-request-id': forwardedIdentity['x-client-request-id'] ?? randomUUID(),
                 // CC sends 600 on first request per session. With rotation, every request is "first"
-                'x-stainless-timeout': '600',
+                'x-stainless-timeout': forwardedIdentity['x-stainless-timeout'] ?? '600',
             };
             // Client-disconnect abort: if the client drops the connection before
             // we've finished sending the response, we default to aborting the

package/dist/version.d.ts

@@ -1,3 +1 @@
 export declare function darioVersion(): string;
-/** Test-only: clear the memoized version. */
-export declare function _resetVersionCacheForTest(): void;

package/dist/version.js

@@ -26,7 +26,3 @@ export function darioVersion() {
     cached = v;
     return v;
 }
-/** Test-only: clear the memoized version. */
-export function _resetVersionCacheForTest() {
-    cached = null;
-}

package/docs/wire-fidelity.md

@@ -11,4 +11,6 @@ Between v3.22 and v3.28, dario's Claude backend closed six axes along which a pr
 | **Session-ID lifecycle** | v3.28 | Generalizes the v3.19 hardcoded 15-minute idle rotation into a tunable `SessionRegistry` with jitter, max-age, and per-client bucketing. Fixes a v3.27 body/header rotation race as a side effect. | `--session-idle-rotate=MS` (default 900000), `--session-rotate-jitter=MS`, `--session-max-age=MS`, `--session-per-client`. Env mirrors `DARIO_SESSION_*`. Defaults are bit-identical to v3.27. |
 | **MCP / sub-agent reach** | v3.26 + v3.27 | Not a wire axis — a *surface* axis. CC-aware tools can now address dario directly (sub-agent from inside CC, MCP server for any MCP client), so operators don't have to switch terminals to introspect the proxy. Read-only by design. | `dario subagent install` / `dario mcp`. See [`mcp-server.md`](./mcp-server.md) and [`sub-agent.md`](./sub-agent.md). |
 
-The six-direction wire-fidelity roadmap is complete. Subsequent releases return to responding to issues and upstream template drift.
+| **Client identity headers** | v5.4.19 | On the passthrough path `isGenuineCCClient` has already established the caller *is* Claude Code, so its own identity headers (`user-agent`, `x-app`, `x-stainless-*`, `x-claude-code-*`, `x-client-*`) are forwarded unchanged instead of being replaced with template values. The template exists to synthesise CC's shape for clients that are not CC; where the genuine article is in hand, forwarding beats imitating. Measured before the change: of 13 identity headers a real client sent, 12 were replaced and 1 dropped — 0 forwarded (#885). Auth, session id and the merged beta set stay dario's. | Automatic on the genuine-CC path; nothing to tune. Non-CC clients are unaffected, and the gate reads the request **body**, so headers cannot self-authorise. |
+
+The original six-direction roadmap is complete; the axes below it are later findings. Note that header **order** is deliberately absent as an axis: `orderHeadersForOutbound` builds the captured sequence, but `fetch()` re-normalises it before the wire, and on Bun you cannot have both CC's JA3 and raw header control in one process (#813). The honest framing of the whole table is byte-identical **body**, structurally close **headers** — not packet-identical.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@askalf/dario",
-  "version": "5.4.17",
+  "version": "5.4.20",
   "description": "Use your Claude Pro/Max subscription in any tool — Cursor, Cline, Aider, the Agent SDK, your scripts — at subscription pricing, not per-token API bills. One local Anthropic + OpenAI-compatible endpoint.",
   "type": "module",
   "bin": {
@@ -24,7 +24,7 @@
   "scripts": {
     "build": "tsc && cp src/cc-template-data.json dist/",
     "test": "node --test --test-concurrency=8 test/all.test.mjs",
-    "test:serial": "node test/issue-29-tool-translation.mjs && node test/hybrid-tools.mjs && node test/tool-schema-contract.mjs && node test/scrub-paths.mjs && node test/provider-prefix.mjs && node test/analytics-recording.mjs && node test/analytics-billing-bucket.mjs && node test/failover-429.mjs && node test/pool-sticky.mjs && node test/live-fingerprint.mjs && node test/proxy-header-order.mjs && node test/proxy-body-order.mjs && node test/runtime-fingerprint.mjs && node test/pacing.mjs && node test/stream-drain.mjs && node test/subagent.mjs && node test/mcp-protocol.mjs && node test/mcp-tools.mjs && node test/mcp-e2e.mjs && node test/session-rotation.mjs && node test/drift-detection.mjs && node test/cc-authorize-probe-classifier.mjs && node test/compat-range.mjs && node test/doctor-formatter.mjs && node test/doctor-identity-drift.mjs && node test/atomic-write.mjs && node test/account-refresh-singleflight.mjs && node test/durable-token-persist.mjs && node test/streaming-edge-cases.mjs && node test/client-detection.mjs && node test/manual-oauth-flow.mjs && node test/scrub-template.mjs && node test/context-bleed.mjs && node test/capture-provenance.mjs && node test/sanitize-messages.mjs && node test/platform-tools.mjs && node test/strict-template-flags.mjs && node test/request-queue.mjs && node test/effort-flag.mjs && node test/template-invariants.mjs",
+    "test:serial": "node test/issue-29-tool-translation.mjs && node test/hybrid-tools.mjs && node test/tool-schema-contract.mjs && node test/scrub-paths.mjs && node test/provider-prefix.mjs && node test/analytics-recording.mjs && node test/analytics-billing-bucket.mjs && node test/failover-429.mjs && node test/pool-sticky.mjs && node test/live-fingerprint.mjs && node test/proxy-header-order.mjs && node test/proxy-body-order.mjs && node test/runtime-fingerprint.mjs && node test/pacing.mjs && node test/stream-drain.mjs && node test/subagent.mjs && node test/mcp-protocol.mjs && node test/mcp-tools.mjs && node test/mcp-e2e.mjs && node test/session-rotation.mjs && node test/drift-detection.mjs && node test/cc-authorize-probe-classifier.mjs && node test/compat-range.mjs && node test/doctor-formatter.mjs && node test/doctor-identity-drift.mjs && node test/atomic-write.mjs && node test/account-refresh-singleflight.mjs && node test/durable-token-persist.mjs && node test/streaming-edge-cases.mjs && node test/client-detection.mjs && node test/manual-oauth-flow.mjs && node test/scrub-template.mjs && node test/context-bleed.mjs && node test/passthrough-header-forwarding.mjs && node test/capture-provenance.mjs && node test/sanitize-messages.mjs && node test/platform-tools.mjs && node test/strict-template-flags.mjs && node test/request-queue.mjs && node test/effort-flag.mjs && node test/template-invariants.mjs",
     "audit": "npm audit --production --audit-level=high",
     "prepublishOnly": "npm run build",
     "start": "node dist/cli.js",