@askalf/dario 5.5.27 → 5.5.28

package/dist/cc-template.js

@@ -1672,10 +1672,19 @@ export function buildCCRequest(clientBody, billingTag, cacheControl, identity, o
     // appended its assistant reply locally, dario stripped it from the next
     // request, the model regenerated the same reply, dario stripped that, and
     // the loop never terminated (133 POSTs from a single user prompt).
+    //
+    // Restricted to ASSISTANT turns, which is the only shape this loop was
+    // written for (a thinking-only assistant turn emptied by the strip above).
+    // Popping an empty *user* turn is what the loop must not do: it exposes the
+    // assistant turn behind it and produces the very prefill rejection the loop
+    // exists to prevent (dario#1033). An empty user turn is a malformed client
+    // request either way — leaving it in place lets the upstream name it
+    // accurately ("messages.N: content must contain at least one block")
+    // instead of dario converting it into a misleading prefill error.
     while (messages.length > 0) {
         const last = messages[messages.length - 1];
         const contentEmpty = Array.isArray(last.content) && last.content.length === 0;
-        if (contentEmpty) {
+        if (contentEmpty && last.role === 'assistant') {
             messages.pop();
             continue;
         }

package/dist/proxy.js

@@ -658,6 +658,12 @@ export function sanitizeMessages(body, preserveTags) {
     if (!messages)
         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
+    // back rather than ship a prefill (dario#1033) — see the guard after the
+    // filter for the reasoning.
+    const tail = messages.length > 0 ? messages[messages.length - 1] : undefined;
+    const tailContentBeforeScrub = tail ? tail.content : undefined;
     for (const msg of messages) {
         if (typeof msg.content === 'string') {
             msg.content = sanitizeContent(msg.content, patterns);
@@ -691,13 +697,48 @@ export function sanitizeMessages(body, preserveTags) {
     // The message carried nothing for the model, so removing it is the same
     // decision the block filter already made, applied one level up. String
     // content scrubbed to '' is the same case in its other shape.
-    body.messages = messages.filter((m) => {
+    const kept = messages.filter((m) => {
         if (Array.isArray(m.content))
             return m.content.length > 0;
         if (typeof m.content === 'string')
             return m.content !== '';
         return true;
     });
+    // Invariant: the scrub must never turn a request that ended on a USER turn
+    // into one that ends on an ASSISTANT turn. Anthropic reads a trailing
+    // assistant turn as a prefill ("continue from this text") and Opus 4.6 under
+    // adaptive thinking + the claude-code beta rejects it outright:
+    //   400 "This model does not support assistant message prefill.
+    //        The conversation must end with a user message."
+    //
+    // CC emits standalone `<system-reminder>` / `<task_metadata>` user turns —
+    // notably right after a Task (sub-agent) result is folded back into the
+    // parent transcript. Both tags are in ORCHESTRATION_TAG_NAMES, so that turn
+    // scrubs to empty, the filter above drops it, and a valid CC request leaves
+    // as a prefill (dario#1033).
+    //
+    // The fix restores the turn's PRE-SCRUB content instead of dropping it. The
+    // orchestration tag survives in this one position only, which is the right
+    // trade in both directions: for a CC client the tag is CC's own injection,
+    // 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.
+    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;
+        kept.push(tail);
+    }
+    body.messages = kept;
 }
 /**
  * Scrub non-Claude-Code fields and normalize field ordering.

package/package.json

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