@askalf/dario 5.5.79 → 5.5.81

package/dist/proxy.js

@@ -9,7 +9,7 @@ import { getAccessToken, getStatus, ignoreCcCredentials } from './oauth.js';
 import { buildHealthResponse, derivePoolStatus, probeRequested, shouldDiscloseHealthInternals, shouldRunServingProbe } from './health-response.js';
 import { getServingProbe } from './serving-probe.js';
 import { darioVersion } from './version.js';
-import { buildCCRequest, applyCcPromptCaching, parseEffortSuffix, reverseMapResponse, createStreamingReverseMapper, orderHeadersForOutbound, overlayTemplateHeaderValues, forwardClientCCIdentityHeaders, isMcpToolName, CC_TEMPLATE, effectiveCacheControl, withForced1hBeta } from './cc-template.js';
+import { buildCCRequest, applyCcPromptCaching, isGenuineCCClient, 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, probeInstalledCCVersion } from './live-fingerprint.js';
 import { AccountPool, computeStickyKey, parseRateLimits, modelFamily, isInAuthCooldown, authCooldownMs, accountIneligibility, reconcilePoolAccounts, resolvePoolStrategy, utilFreshness } from './pool.js';
@@ -657,6 +657,23 @@ export function sanitizeMessages(body, preserveTags) {
     const messages = body.messages;
     if (!messages)
         return;
+    // A genuine Claude Code client is forwarded with its conversation untouched.
+    // The scrub exists to make OTHER harnesses (Aider, Cursor, OpenClaw, ...)
+    // look like CC by removing their orchestration wrappers; CC's own
+    // `<system-reminder>`, `<task-notification>`, `<env>` blocks ARE the CC
+    // wire shape, and stripping them made every request through dario less
+    // faithful than the same request sent direct. It was also the origin of a
+    // whole class of defects — the empty blocks and emptied turns the scrub
+    // leaves behind (dario#54, #744, #1033, #1092, #1117) each needed its own
+    // guard, and each guard patched the previous one's hole. The genuine-CC
+    // branch of buildCCRequest already declares "messages: untouched — the
+    // client is the authority on its own wire shape"; this makes that true from
+    // the first byte. The empty-content filters that genuine CC still needs
+    // (a real CC retry artifact, dario#1092) live in buildCCRequest and keep
+    // running. Detection is the same check the template uses: the billing
+    // header in system[0] and a CC opener in system[1].
+    if (isGenuineCCClient(body))
+        return;
     const patterns = orchestrationPatternsFor(preserveTags);
     // Snapshot the tail turn before scrubbing. If the scrub empties it and the
     // drop below would expose an assistant turn, we put the original content
@@ -739,16 +756,23 @@ export function sanitizeMessages(body, preserveTags) {
     // so keeping it is *more* wire-faithful, not less; for a non-CC client a
     // lone tag as the final turn is the actual prompt, and forwarding it beats
     // a hard 400. Every other position still scrubs exactly as before.
+    //
+    // This holds even when the tail was ALREADY empty before the scrub
+    // (dario#1117, second report). CC's stream-interruption retry appends a
+    // user turn with `content: []` as the final message — the shape the
+    // genuine-CC rewind in buildCCRequest (dario#1092) exists to recover. The
+    // message-level drop above ran first and removed that turn, and an
+    // "only restore a tail that had content" condition here let it go, so the
+    // template saw a request already ending on the assistant's real reply and
+    // upstream answered with the prefill rejection. Restoring an empty tail is
+    // never worse than dropping it: on the genuine-CC path #1092 rewinds the
+    // pair, and on the general path the upstream names the malformed turn
+    // accurately ("content must contain at least one block") — the #1033
+    // decision — instead of dario converting it into a misleading prefill 400.
     const tailWasDropped = tail !== undefined && kept[kept.length - 1] !== tail;
-    const tailHadContent = Array.isArray(tailContentBeforeScrub)
-        ? tailContentBeforeScrub.length > 0
-        : typeof tailContentBeforeScrub === 'string'
-            ? tailContentBeforeScrub !== ''
-            : tailContentBeforeScrub != null;
     if (tail !== undefined &&
         tailWasDropped &&
         tail.role === 'user' &&
-        tailHadContent &&
         kept.length > 0 &&
         kept[kept.length - 1].role === 'assistant') {
         tail.content = tailContentBeforeScrub;

package/package.json

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