@askalf/dario 3.30.6 → 3.30.7

package/dist/cli.d.ts

@@ -9,4 +9,13 @@
  *   dario refresh   — Force token refresh
  *   dario logout    — Remove saved credentials
  */
-export {};
+/**
+ * Parse --preserve-orchestration-tags (bare or =value) + env mirror.
+ * Exported for tests.
+ * dario#78.
+ *
+ *   undefined              — flag not passed + env unset → strip all (default)
+ *   Set(['*'])             — flag bare OR value "*"      → preserve all
+ *   Set(['thinking','env']) — value "thinking,env"        → preserve listed
+ */
+export declare function resolvePreserveOrchestrationTags(args: string[], env: string | undefined): Set<string> | undefined;

package/dist/cli.js

@@ -229,6 +229,13 @@ async function proxy() {
     const sessionRotateJitterMs = parsePositiveIntFlag('--session-rotate-jitter=');
     const sessionMaxAgeMs = parsePositiveIntFlag('--session-max-age=');
     const sessionPerClient = args.includes('--session-per-client') || undefined;
+    // --preserve-orchestration-tags (bare OR =tag1,tag2,...) — opt-out for
+    // workflows that legitimately need <system-reminder>, <thinking>, etc.
+    // preserved on the wire. Default behaviour unchanged (strip all).
+    // dario#78 (Gemini review push-back). Env mirror:
+    //   DARIO_PRESERVE_ORCHESTRATION_TAGS=*           (preserve all)
+    //   DARIO_PRESERVE_ORCHESTRATION_TAGS=thinking,env (preserve listed)
+    const preserveOrchestrationTags = resolvePreserveOrchestrationTags(args, process.env['DARIO_PRESERVE_ORCHESTRATION_TAGS']);
     // Non-loopback bind without DARIO_API_KEY turns dario into an open
     // OAuth-subscription relay for anyone on the reachable network. Refuse
     // to start rather than rely on the operator to read the startup banner.
@@ -248,7 +255,35 @@ async function proxy() {
         console.error(`[dario] Override (not recommended): pass --unsafe-no-auth if you have out-of-band network controls and accept the risk.`);
         process.exit(1);
     }
-    await startProxy({ port, host, verbose, verboseBodies, model, passthrough, preserveTools, hybridTools, noAutoDetect, strictTls, pacingMinMs, pacingJitterMs, drainOnClose, sessionIdleRotateMs, sessionRotateJitterMs, sessionMaxAgeMs, sessionPerClient });
+    await startProxy({ port, host, verbose, verboseBodies, model, passthrough, preserveTools, hybridTools, noAutoDetect, strictTls, pacingMinMs, pacingJitterMs, drainOnClose, sessionIdleRotateMs, sessionRotateJitterMs, sessionMaxAgeMs, sessionPerClient, preserveOrchestrationTags });
+}
+/**
+ * Parse --preserve-orchestration-tags (bare or =value) + env mirror.
+ * Exported for tests.
+ * dario#78.
+ *
+ *   undefined              — flag not passed + env unset → strip all (default)
+ *   Set(['*'])             — flag bare OR value "*"      → preserve all
+ *   Set(['thinking','env']) — value "thinking,env"        → preserve listed
+ */
+export function resolvePreserveOrchestrationTags(args, env) {
+    // Explicit --preserve-orchestration-tags=value wins over everything.
+    const withValue = args.find(a => a.startsWith('--preserve-orchestration-tags='));
+    if (withValue)
+        return parsePreserveTagsValue(withValue.split('=').slice(1).join('='));
+    // Bare flag = preserve all.
+    if (args.includes('--preserve-orchestration-tags'))
+        return new Set(['*']);
+    // Env mirror — explicit flag always wins, checked last.
+    if (env !== undefined)
+        return parsePreserveTagsValue(env);
+    return undefined;
+}
+function parsePreserveTagsValue(value) {
+    const trimmed = value.trim();
+    if (trimmed === '' || trimmed === '*')
+        return new Set(['*']);
+    return new Set(trimmed.split(',').map(s => s.trim()).filter(Boolean));
 }
 function parsePositiveIntFlag(prefix) {
     const found = args.find(a => a.startsWith(prefix));
@@ -561,6 +596,16 @@ async function help() {
                              header) its own rotated session id.
                              Default: off (single session across all
                              clients, v3.27 behaviour). (v3.28)
+    --preserve-orchestration-tags[=TAG,TAG]
+                             Opt specific orchestration wrapper tags
+                             (<system-reminder>, <env>, <thinking>,
+                             etc.) out of the scrub. Bare flag =
+                             preserve all. Value form = preserve only
+                             those listed; everything else is still
+                             stripped. Default: strip every tag in
+                             ORCHESTRATION_TAG_NAMES. Env mirror:
+                             DARIO_PRESERVE_ORCHESTRATION_TAGS=*
+                             or =tag1,tag2. (v3.31, dario#78)
     --port=PORT              Port to listen on (default: 3456)
     --host=ADDRESS           Address to bind to (default: 127.0.0.1)
                              Use 0.0.0.0 for LAN; see README for DARIO_API_KEY

package/dist/proxy.d.ts

@@ -3,8 +3,29 @@ export declare function parseProviderPrefix(model: string): {
     provider: 'openai' | 'claude';
     model: string;
 } | null;
-/** Strip orchestration tags from all messages in a request body. */
-export declare function sanitizeMessages(body: Record<string, unknown>): void;
+export declare const ORCHESTRATION_TAG_NAMES: string[];
+/**
+ * Build the regex list that actually strips orchestration tags.
+ *
+ * `preserveTags` selects which tags to KEEP in the outbound body.
+ *   undefined       → strip every tag in ORCHESTRATION_TAG_NAMES (default)
+ *   Set(['*'])      → preserve all tags (strip none)
+ *   Set(['thinking']) → strip everything except `<thinking>...</thinking>`
+ *
+ * Each tag produces two patterns — the wrapper form (`<tag>...</tag>`) and
+ * the self-closing form (`<tag ... />`) — so callers that emit either shape
+ * get the same treatment.
+ *
+ * dario#78 (Gemini review push-back).
+ */
+export declare function buildOrchestrationPatterns(preserveTags?: Set<string>): RegExp[];
+/**
+ * Strip orchestration tags from all messages in a request body.
+ *
+ * Pass `preserveTags` (a Set of tag names, or `Set(['*'])` for all) to
+ * opt any tag out of the scrub. dario#78.
+ */
+export declare function sanitizeMessages(body: Record<string, unknown>, preserveTags?: Set<string>): void;
 interface ProxyOptions {
     port?: number;
     host?: string;
@@ -23,6 +44,12 @@ interface ProxyOptions {
     sessionRotateJitterMs?: number;
     sessionMaxAgeMs?: number;
     sessionPerClient?: boolean;
+    /**
+     * Opt specific orchestration tags out of the scrub. Undefined = strip all
+     * (default, v3.30 and earlier behaviour). Set(['*']) = preserve all.
+     * Set(['thinking','env']) = strip everything except those two. dario#78.
+     */
+    preserveOrchestrationTags?: Set<string>;
 }
 export declare function sanitizeError(err: unknown): string;
 /**

package/dist/proxy.js

@@ -190,38 +190,66 @@ function filterBillableBetas(betas) {
 }
 // Orchestration tags injected by agents (Aider, Cursor, OpenCode, etc.)
 // that confuse Claude when passed through. Strip before forwarding.
-const ORCHESTRATION_TAG_NAMES = [
+export const ORCHESTRATION_TAG_NAMES = [
     'system-reminder', 'env', 'system_information', 'current_working_directory',
     'operating_system', 'default_shell', 'home_directory', 'task_metadata',
     'directories', 'thinking',
     'agent_persona', 'agent_context', 'tool_context', 'persona', 'tool_call',
 ];
-const ORCHESTRATION_PATTERNS = ORCHESTRATION_TAG_NAMES.flatMap(tag => [
-    new RegExp(`<${tag}\\b[^>]*>[\\s\\S]*?<\\/${tag}>`, 'gi'),
-    new RegExp(`<${tag}\\b[^>]*\\/>`, 'gi'),
-]);
+/**
+ * Build the regex list that actually strips orchestration tags.
+ *
+ * `preserveTags` selects which tags to KEEP in the outbound body.
+ *   undefined       → strip every tag in ORCHESTRATION_TAG_NAMES (default)
+ *   Set(['*'])      → preserve all tags (strip none)
+ *   Set(['thinking']) → strip everything except `<thinking>...</thinking>`
+ *
+ * Each tag produces two patterns — the wrapper form (`<tag>...</tag>`) and
+ * the self-closing form (`<tag ... />`) — so callers that emit either shape
+ * get the same treatment.
+ *
+ * dario#78 (Gemini review push-back).
+ */
+export function buildOrchestrationPatterns(preserveTags) {
+    if (preserveTags?.has('*'))
+        return [];
+    const effective = preserveTags
+        ? ORCHESTRATION_TAG_NAMES.filter(tag => !preserveTags.has(tag))
+        : ORCHESTRATION_TAG_NAMES;
+    return effective.flatMap(tag => [
+        new RegExp(`<${tag}\\b[^>]*>[\\s\\S]*?<\\/${tag}>`, 'gi'),
+        new RegExp(`<${tag}\\b[^>]*\\/>`, 'gi'),
+    ]);
+}
+const ORCHESTRATION_PATTERNS_DEFAULT = buildOrchestrationPatterns();
 /** Strip orchestration wrapper tags from message content. */
-function sanitizeContent(text) {
+function sanitizeContent(text, patterns) {
     let result = text;
-    for (const pattern of ORCHESTRATION_PATTERNS) {
+    for (const pattern of patterns) {
         pattern.lastIndex = 0;
         result = result.replace(pattern, '');
     }
     return result.replace(/\n{3,}/g, '\n\n').trim();
 }
-/** Strip orchestration tags from all messages in a request body. */
-export function sanitizeMessages(body) {
+/**
+ * Strip orchestration tags from all messages in a request body.
+ *
+ * Pass `preserveTags` (a Set of tag names, or `Set(['*'])` for all) to
+ * opt any tag out of the scrub. dario#78.
+ */
+export function sanitizeMessages(body, preserveTags) {
     const messages = body.messages;
     if (!messages)
         return;
+    const patterns = preserveTags === undefined ? ORCHESTRATION_PATTERNS_DEFAULT : buildOrchestrationPatterns(preserveTags);
     for (const msg of messages) {
         if (typeof msg.content === 'string') {
-            msg.content = sanitizeContent(msg.content);
+            msg.content = sanitizeContent(msg.content, patterns);
         }
         else if (Array.isArray(msg.content)) {
             for (const block of msg.content) {
                 if (typeof block === 'object' && block && 'text' in block && typeof block.text === 'string') {
-                    block.text = sanitizeContent(block.text);
+                    block.text = sanitizeContent(block.text, patterns);
                 }
             }
             // Drop text blocks that became empty after orchestration-tag scrubbing.
@@ -876,7 +904,7 @@ export async function startProxy(opts = {}) {
                 try {
                     const parsed = JSON.parse(body.toString());
                     // Strip orchestration tags from messages (Aider, Cursor, etc.)
-                    sanitizeMessages(parsed);
+                    sanitizeMessages(parsed, opts.preserveOrchestrationTags);
                     const result = isOpenAI ? openaiToAnthropic(parsed, modelOverride) : (modelOverride ? { ...parsed, model: modelOverride } : parsed);
                     const r = result;
                     requestModel = (r.model || '').toLowerCase();

package/package.json

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