@askalf/dario 3.9.2 → 3.9.4

package/dist/cc-template.js

@@ -35,7 +35,23 @@ export function scrubFrameworkIdentifiers(text) {
     let result = text;
     for (const pattern of FRAMEWORK_PATTERNS) {
         pattern.lastIndex = 0;
-        result = result.replace(pattern, '');
+        result = result.replace(pattern, (match, ...args) => {
+            const offset = args[args.length - 2];
+            const src = args[args.length - 1];
+            const before = offset > 0 ? src[offset - 1] : '';
+            const after = offset + match.length < src.length ? src[offset + match.length] : '';
+            // Preserve matches embedded in filesystem paths or URLs. `\b` word
+            // boundaries fire between `.` / `/` and word chars, which made
+            // `/Users/foo/.openclaw/workspace/` collapse to `/Users/foo/./workspace/`
+            // (dario#35). A preceding `.`, `/`, `\`, `-`, or `_` or a following
+            // `/` or `\` is a strong signal the identifier is part of a path or
+            // slug, not prose — leave it alone.
+            if (before === '.' || before === '/' || before === '\\' || before === '-' || before === '_')
+                return match;
+            if (after === '/' || after === '\\')
+                return match;
+            return '';
+        });
     }
     return result;
 }

package/dist/proxy.js

@@ -420,6 +420,14 @@ export async function startProxy(opts = {}) {
     };
     let requestCount = 0;
     const semaphore = new Semaphore(MAX_CONCURRENT);
+    // Cache context-1m beta availability. Set false once per account (or process
+    // in single-account mode) after the first "long context" rejection, so we
+    // skip sending context-1m on every subsequent request instead of paying the
+    // round-trip + retry cost each time. Keyed by account alias; `__default__`
+    // is the single-account slot. Reported by @boeingchoco in dario#36 — the
+    // retry loop was firing on every POST with hybrid-tools + OC.
+    const context1mUnavailable = new Set();
+    const ACCOUNT_KEY_SINGLE = '__default__';
     // Rate governor — minimum 500ms between requests. Fast enough for agents,
     // slow enough to not look like a scripted flood of identical traffic.
     let lastRequestTime = 0;
@@ -693,8 +701,14 @@ export async function startProxy(opts = {}) {
             }
             else {
                 // CC v2.1.104 beta set — 8 flags in the order Claude Code sends them.
-                // context-1m requires Extra Usage — if it 400s, we auto-retry without it.
-                beta = 'claude-code-20250219,oauth-2025-04-20,context-1m-2025-08-07,interleaved-thinking-2025-05-14,context-management-2025-06-27,prompt-caching-scope-2026-01-05,advisor-tool-2026-03-01,effort-2025-11-24';
+                // context-1m requires Extra Usage — if it 400s, we auto-retry without
+                // it, and cache the rejection so subsequent requests on this account
+                // skip context-1m entirely (dario#36).
+                const acctKey = poolAccount?.alias ?? ACCOUNT_KEY_SINGLE;
+                const skipContext1m = context1mUnavailable.has(acctKey);
+                beta = skipContext1m
+                    ? 'claude-code-20250219,oauth-2025-04-20,interleaved-thinking-2025-05-14,context-management-2025-06-27,prompt-caching-scope-2026-01-05,advisor-tool-2026-03-01,effort-2025-11-24'
+                    : 'claude-code-20250219,oauth-2025-04-20,context-1m-2025-08-07,interleaved-thinking-2025-05-14,context-management-2025-06-27,prompt-caching-scope-2026-01-05,advisor-tool-2026-03-01,effort-2025-11-24';
                 if (clientBeta) {
                     const baseSet = new Set(beta.split(','));
                     const filtered = filterBillableBetas(clientBeta)
@@ -792,8 +806,13 @@ export async function startProxy(opts = {}) {
                         || peekedBody.includes('Extra usage is required')
                         || peekedBody.includes('long_context');
                     if (isLongContextError) {
-                        if (verbose)
-                            console.log(`[dario] #${requestCount} context-1m rejected (${upstream.status}) — retrying without it`);
+                        // Cache the rejection so future requests on this account skip
+                        // context-1m up front instead of re-paying the 400/429 round-trip.
+                        const acctKey = poolAccount?.alias ?? ACCOUNT_KEY_SINGLE;
+                        const firstRejection = !context1mUnavailable.has(acctKey);
+                        context1mUnavailable.add(acctKey);
+                        if (verbose && firstRejection)
+                            console.log(`[dario] #${requestCount} context-1m rejected (${upstream.status}) — retrying without it (cached for session)`);
                         const reducedBeta = beta.replace(',context-1m-2025-08-07', '').replace('context-1m-2025-08-07,', '');
                         const retryHeaders = { ...headers, 'anthropic-beta': reducedBeta };
                         const retry = await fetch(targetBase, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@askalf/dario",
-  "version": "3.9.2",
+  "version": "3.9.4",
   "description": "A local LLM router. One endpoint, every provider — Claude subscriptions, OpenAI, OpenRouter, Groq, local LiteLLM, any OpenAI-compat endpoint — your tools don't need to change.",
   "type": "module",
   "bin": {
@@ -21,7 +21,7 @@
   ],
   "scripts": {
     "build": "tsc && cp src/cc-template-data.json dist/",
-    "test": "node test/issue-29-tool-translation.mjs && node test/hybrid-tools.mjs && node test/analytics-recording.mjs && node test/failover-429.mjs",
+    "test": "node test/issue-29-tool-translation.mjs && node test/hybrid-tools.mjs && node test/scrub-paths.mjs && node test/analytics-recording.mjs && node test/failover-429.mjs",
     "audit": "npm audit --production --audit-level=high",
     "prepublishOnly": "npm run build",
     "start": "node dist/cli.js",