@askalf/dario 4.8.77 → 4.8.78

package/dist/cch.d.ts

@@ -16,3 +16,11 @@ export declare function cchWithSeed(bodyText: string, seed: bigint): string | nu
  * A null return means the caller should keep its random placeholder.
  */
 export declare function cchForBody(bodyText: string, version: string): string | null;
+/**
+ * Return `bodyText` with the billing-tag cch replaced in place by the
+ * deterministic value for `version`, or unchanged when the version has no
+ * known seed or the body has no billing token. The replacement is anchored to
+ * the billing tag (CCH_RE), so conversation content that quotes a cch is never
+ * touched. Used by the proxy at outbound-serialize time.
+ */
+export declare function stampCch(bodyText: string, version: string): string;

package/dist/cch.js

@@ -102,10 +102,19 @@ export function xxh64(data, seed) {
     h = (h ^ (h >> 32n)) & U64;
     return h;
 }
-const CCH_RE = /cch=[0-9a-fA-F]{5}/;
+// Match the cch token INSIDE the billing tag specifically — never a stray
+// `cch=#####` quoted in conversation content (which sorts before `system` in
+// the body, so a naive first-match would grab it, mis-hash, AND silently
+// rewrite the user's text at stamp time — dario#528). Anchor on the
+// `cc_entrypoint=<value>; cch=` that immediately precedes it in the billing
+// header. The entrypoint value is BOUNDED ({1,32}) so the match stays linear
+// on a 10 MB body — an unbounded `[^"]*?` span here is O(n^2) when the anchor
+// repeats (CodeQL js/polynomial-redos). Anchoring is also what real CC must
+// do, so this matches upstream behavior, not just our own correctness.
+const CCH_RE = /(cc_entrypoint=[a-z0-9-]{1,32}; cch=)[0-9a-fA-F]{5}(?=;)/;
 /** Build the canonical cch pre-image bytes from a serialized request body. */
 function cchMaterial(bodyText) {
-    const zeroed = bodyText.replace(CCH_RE, 'cch=00000'); // first occurrence only
+    const zeroed = bodyText.replace(CCH_RE, (_m, prefix) => `${prefix}00000`);
     const body = JSON.parse(zeroed);
     body.model = '';
     delete body.fallbacks;
@@ -137,3 +146,16 @@ export function cchForBody(bodyText, version) {
         return null;
     return cchWithSeed(bodyText, seed);
 }
+/**
+ * Return `bodyText` with the billing-tag cch replaced in place by the
+ * deterministic value for `version`, or unchanged when the version has no
+ * known seed or the body has no billing token. The replacement is anchored to
+ * the billing tag (CCH_RE), so conversation content that quotes a cch is never
+ * touched. Used by the proxy at outbound-serialize time.
+ */
+export function stampCch(bodyText, version) {
+    const cch = cchForBody(bodyText, version);
+    if (cch === null)
+        return bodyText;
+    return bodyText.replace(CCH_RE, (_m, prefix) => `${prefix}${cch}`);
+}

package/dist/proxy.js

@@ -9,7 +9,7 @@ import { arch, platform } from 'node:process';
 import { getAccessToken, getStatus } from './oauth.js';
 import { buildHealthResponse } from './health-response.js';
 import { buildCCRequest, applyCcPromptCaching, parseEffortSuffix, reverseMapResponse, createStreamingReverseMapper, orderHeadersForOutbound, CC_TEMPLATE } from './cc-template.js';
-import { cchForBody } from './cch.js';
+import { stampCch } from './cch.js';
 import { describeTemplate, detectDrift, checkCCCompat } from './live-fingerprint.js';
 import { AccountPool, computeStickyKey, parseRateLimits, modelFamily, isInAuthCooldown, authCooldownMs } from './pool.js';
 import { Analytics, billingBucketFromClaim } from './analytics.js';
@@ -1768,17 +1768,16 @@ export async function startProxy(opts = {}) {
                     }
                     // dario#528: overwrite the random cch placeholder with the real
                     // deterministic value for Claude Code versions whose seed we've
-                    // reverse-engineered. cchForBody hashes a projection of THIS final
-                    // body, so it must run after every mutation above. It returns null
-                    // for unknown versions (keep the random placeholder) or bodies with
-                    // no billing token. Only the template-replay path is stamped —
-                    // passthrough / count_tokens forward the client's body (and its own
-                    // cch) verbatim. Reversible kill-switch: DARIO_CCH=random.
+                    // reverse-engineered. stampCch hashes a projection of THIS final body
+                    // (so it must run after every mutation above) and replaces the cch
+                    // anchored to the billing tag — never a cch quoted in conversation
+                    // content. No-op for unknown versions (keep the random placeholder).
+                    // Only the template-replay path is stamped — passthrough /
+                    // count_tokens forward the client's body (and its own cch) verbatim.
+                    // Reversible kill-switch: DARIO_CCH=random.
                     let outboundText = JSON.stringify(r);
                     if (!passthrough && !isCountTokens && process.env.DARIO_CCH !== 'random') {
-                        const realCch = cchForBody(outboundText, cliVersion);
-                        if (realCch)
-                            outboundText = outboundText.replace(/cch=[0-9a-fA-F]{5}/, `cch=${realCch}`);
+                        outboundText = stampCch(outboundText, cliVersion);
                     }
                     finalBody = Buffer.from(outboundText);
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@askalf/dario",
-  "version": "4.8.77",
+  "version": "4.8.78",
   "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": {