@askalf/dario 4.8.123 → 4.8.125

package/dist/cc-template.js

@@ -148,14 +148,35 @@ export const CC_AGENT_IDENTITY = TEMPLATE.agent_identity;
 export const CLIENT_SYSTEM_PREFACE = '\n\n---\n\nIMPORTANT: The operator of this session has supplied the following ' +
     'task-specific instructions. For this conversation they OVERRIDE any ' +
     'conflicting general behavior described above. Follow them exactly:\n\n';
+// Memoize the stripped prompt by (base, level) (#642-audit): resolveSystemPrompt
+// runs per request and stripBehavioralConstraints does ~12 regex passes over the
+// ~25KB prompt. Keyed on the base STRING so a runtime template re-capture (a new
+// base) correctly misses and re-strips. Bounded to a few bases; cleared if it
+// somehow grows past a small cap.
+const _stripCache = new Map();
+function stripBehavioralConstraintsMemo(base, level) {
+    if (_stripCache.size > 8)
+        _stripCache.clear();
+    let byLevel = _stripCache.get(base);
+    if (!byLevel) {
+        byLevel = new Map();
+        _stripCache.set(base, byLevel);
+    }
+    let v = byLevel.get(level);
+    if (v === undefined) {
+        v = stripBehavioralConstraints(base, level);
+        byLevel.set(level, v);
+    }
+    return v;
+}
 export function resolveSystemPrompt(arg, model) {
     const base = systemPromptForModel(model);
     if (!arg || arg === 'verbatim')
         return base;
     if (arg === 'partial')
-        return stripBehavioralConstraints(base, 'partial');
+        return stripBehavioralConstraintsMemo(base, 'partial');
     if (arg === 'aggressive')
-        return stripBehavioralConstraints(base, 'aggressive');
+        return stripBehavioralConstraintsMemo(base, 'aggressive');
     return arg;
 }
 /**

package/dist/model-catalog.js

@@ -220,22 +220,37 @@ function envInt(name, dflt) {
 }
 async function fetchUpstreamBases(deps) {
     const f = deps.fetchImpl ?? fetch;
-    const headers = {
-        accept: 'application/json',
-        'anthropic-version': ANTHROPIC_VERSION,
-    };
-    if (deps.upstreamApiKey) {
-        headers['x-api-key'] = deps.upstreamApiKey;
-    }
-    else {
-        if (!deps.getToken)
-            throw new Error('no token source for catalog fetch');
-        headers['authorization'] = `Bearer ${await deps.getToken()}`;
-        headers['anthropic-beta'] = OAUTH_BETA;
-    }
+    // Arm the timeout FIRST so it bounds token acquisition too, not just the
+    // fetch (#642-audit): a hung getToken() (e.g. a stuck single-account OAuth
+    // refresh) would otherwise never settle, leaving the catalog `inflight` guard
+    // non-null forever and wedging every future refresh on the baked list.
     const ctl = new AbortController();
     const timer = setTimeout(() => ctl.abort(), deps.timeoutMs ?? DEFAULT_FETCH_TIMEOUT_MS);
     try {
+        const headers = {
+            accept: 'application/json',
+            'anthropic-version': ANTHROPIC_VERSION,
+        };
+        if (deps.upstreamApiKey) {
+            headers['x-api-key'] = deps.upstreamApiKey;
+        }
+        else {
+            if (!deps.getToken)
+                throw new Error('no token source for catalog fetch');
+            // Race token acquisition against the same abort deadline as the fetch.
+            const token = await Promise.race([
+                deps.getToken(),
+                new Promise((_, reject) => {
+                    const onAbort = () => reject(new Error('catalog token acquisition timed out'));
+                    if (ctl.signal.aborted)
+                        onAbort();
+                    else
+                        ctl.signal.addEventListener('abort', onAbort, { once: true });
+                }),
+            ]);
+            headers['authorization'] = `Bearer ${token}`;
+            headers['anthropic-beta'] = OAUTH_BETA;
+        }
         const res = await f(`${ANTHROPIC_API}/v1/models?limit=100`, { headers, signal: ctl.signal });
         if (!res.ok)
             throw new Error(`upstream /v1/models ${res.status}`);

package/dist/scrub-template.js

@@ -141,7 +141,7 @@ function removeHostContextSections(systemPrompt) {
  * drift signals and leaks the bake host's repo state.
  */
 function removeGitStatusBlock(systemPrompt) {
-    return systemPrompt.replace(/\ngitStatus:[\s\S]*?(?=\n# |$)/, '');
+    return systemPrompt.replace(/\r?\ngitStatus:[\s\S]*?(?=\r?\n# |$)/, '');
 }
 /**
  * Strip one named top-level section (`\n# <name>\n` through the next
@@ -150,7 +150,9 @@ function removeGitStatusBlock(systemPrompt) {
  */
 function removeSection(systemPrompt, name) {
     const escaped = name.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
-    const heading = new RegExp(`\\n# ${escaped}\\n`);
+    // \r?\n tolerates a CRLF capture; [ \t]* tolerates trailing whitespace on the
+    // heading line — either would otherwise leave a host-context section unstripped.
+    const heading = new RegExp(`\\r?\\n# ${escaped}[ \\t]*\\r?\\n`);
     let out = systemPrompt;
     while (true) {
         const m = heading.exec(out);
@@ -158,7 +160,7 @@ function removeSection(systemPrompt, name) {
             return out;
         const sectionStart = m.index;
         const afterHeading = out.slice(sectionStart + m[0].length);
-        const nextHeading = /\n# /.exec(afterHeading);
+        const nextHeading = /\r?\n# /.exec(afterHeading);
         const sectionEnd = nextHeading
             ? sectionStart + m[0].length + nextHeading.index
             : out.length;
@@ -203,5 +205,14 @@ export function findUserPathHits(text) {
         if (matches)
             hits.push(...matches);
     }
+    // A host-context section still present here means removeSection failed to
+    // strip it (e.g. a CRLF capture or a renamed heading). Flag it so the drift-
+    // gate fails the release rather than shipping the leak (#642-audit).
+    for (const name of HOST_CONTEXT_SECTION_HEADINGS) {
+        const esc = name.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+        if (new RegExp(`\\r?\\n# ${esc}[ \\t]*\\r?\\n`).test(text)) {
+            hits.push(`# ${name} (host-context section not stripped)`);
+        }
+    }
     return hits;
 }

package/package.json

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