@askalf/dario 3.30.9 → 3.30.10

package/dist/cc-template.d.ts

@@ -170,6 +170,20 @@ export interface RequestContext {
  * Replaces the entire request structure — tools, fields, ordering — with
  * what real CC sends. Only the conversation content is preserved.
  */
+/** Valid values for the `--effort` flag. `'client'` passes through the client's own `output_config.effort` (falling back to `'high'` if the client didn't send one). dario#87. */
+export type EffortValue = 'low' | 'medium' | 'high' | 'xhigh' | 'client';
+export declare const VALID_EFFORT_VALUES: ReadonlyArray<EffortValue>;
+/**
+ * Resolve the outbound `output_config.effort` value.
+ *
+ *   undefined / 'high' → 'high' (current default, matches CC 2.1.116 wire value)
+ *   'low' / 'medium' / 'xhigh' → pin to that value
+ *   'client' → extract from `clientBody.output_config.effort`; fall back
+ *              to 'high' if the client didn't send one or sent a non-string
+ *
+ * Exported for tests.
+ */
+export declare function resolveEffort(flag: EffortValue | undefined, clientBody: Record<string, unknown>): string;
 export declare function buildCCRequest(clientBody: Record<string, unknown>, billingTag: string, cacheControl: {
     type: 'ephemeral';
 }, identity: {
@@ -180,6 +194,7 @@ export declare function buildCCRequest(clientBody: Record<string, unknown>, bill
     preserveTools?: boolean;
     hybridTools?: boolean;
     noAutoDetect?: boolean;
+    effort?: EffortValue;
 }): {
     body: Record<string, unknown>;
     toolMap: Map<string, ToolMapping>;

package/dist/cc-template.js

@@ -708,11 +708,29 @@ const TOOL_MAP = {
     },
     exit_worktree: { ccTool: 'ExitWorktree' },
 };
+export const VALID_EFFORT_VALUES = ['low', 'medium', 'high', 'xhigh', 'client'];
 /**
- * Build a CC-template request from a client request.
- * Replaces the entire request structure — tools, fields, ordering — with
- * what real CC sends. Only the conversation content is preserved.
+ * Resolve the outbound `output_config.effort` value.
+ *
+ *   undefined / 'high' → 'high' (current default, matches CC 2.1.116 wire value)
+ *   'low' / 'medium' / 'xhigh' → pin to that value
+ *   'client' → extract from `clientBody.output_config.effort`; fall back
+ *              to 'high' if the client didn't send one or sent a non-string
+ *
+ * Exported for tests.
  */
+export function resolveEffort(flag, clientBody) {
+    if (flag === undefined)
+        return 'high';
+    if (flag === 'client') {
+        const clientOC = clientBody.output_config;
+        const clientEffort = clientOC?.effort;
+        if (typeof clientEffort === 'string' && clientEffort.length > 0)
+            return clientEffort;
+        return 'high';
+    }
+    return flag;
+}
 export function buildCCRequest(clientBody, billingTag, cacheControl, identity, opts = {}) {
     const model = clientBody.model || 'claude-sonnet-4-6';
     const isHaiku = model.toLowerCase().includes('haiku');
@@ -979,7 +997,11 @@ export function buildCCRequest(clientBody, billingTag, cacheControl, identity, o
     if (!isHaiku) {
         ccRequest.thinking = { type: 'adaptive' };
         ccRequest.context_management = { edits: [{ type: 'clear_thinking_20251015', keep: 'all' }] };
-        ccRequest.output_config = { effort: 'high' };
+        // output_config.effort default is `'high'` (matches CC 2.1.116's wire
+        // value). `--effort` flag overrides; `'client'` passes through whatever
+        // the client sent (or falls back to `'high'` if the client didn't
+        // include an output_config). See dario#87.
+        ccRequest.output_config = { effort: resolveEffort(opts.effort, clientBody) };
     }
     ccRequest.stream = stream;
     // Replay the captured top-level key order. The hardcoded build order above

package/dist/cli.d.ts

@@ -9,6 +9,14 @@
  *   dario refresh   — Force token refresh
  *   dario logout    — Remove saved credentials
  */
+import { type EffortValue } from './cc-template.js';
+/**
+ * Parse the `--effort` flag + `DARIO_EFFORT` env. Validates against the
+ * allowed set; unrecognised values cause a non-zero exit with the list of
+ * valid choices (same philosophy as other strict parsers in this CLI).
+ * Flag value wins over env. Exported for tests. dario#87.
+ */
+export declare function resolveEffortFlag(args: string[], env: string | undefined): EffortValue | undefined;
 /**
  * Parse a positive-integer env var. Returns undefined on unset, empty,
  * non-numeric, or non-positive values so the caller's default applies.

package/dist/cli.js

@@ -37,6 +37,7 @@ import { join } from 'node:path';
 import { homedir } from 'node:os';
 import { startAutoOAuthFlow, startManualOAuthFlow, detectHeadlessEnvironment, getStatus, refreshTokens, loadCredentials } from './oauth.js';
 import { startProxy, sanitizeError } from './proxy.js';
+import { VALID_EFFORT_VALUES } from './cc-template.js';
 import { listAccountAliases, loadAllAccounts, addAccountViaOAuth, removeAccount } from './accounts.js';
 import { listBackends, saveBackend, removeBackend } from './openai-backend.js';
 const args = process.argv.slice(2);
@@ -260,6 +261,16 @@ async function proxy() {
         ?? parsePositiveIntEnv(process.env['DARIO_MAX_QUEUED']);
     const queueTimeoutMs = parsePositiveIntFlag('--queue-timeout=')
         ?? parsePositiveIntEnv(process.env['DARIO_QUEUE_TIMEOUT_MS']);
+    // --effort=low|medium|high|xhigh|client — override the outbound
+    // output_config.effort (dario#87). Default (unset) pins 'high' to match
+    // CC 2.1.116's wire value. 'client' passes through whatever the client
+    // sent, falling back to 'high' if the client didn't include one.
+    //
+    // Risk: setting effort to a non-CC-default value may cause Anthropic's
+    // classifier to flip requests to 'overage' billing. Users opting in
+    // should watch the `representative-claim` response header via -v logs
+    // and revert to default if subscription billing breaks.
+    const effort = resolveEffortFlag(args, process.env['DARIO_EFFORT']);
     // 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.
@@ -279,7 +290,25 @@ 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, preserveOrchestrationTags, noLiveCapture, strictTemplate, maxConcurrent, maxQueued, queueTimeoutMs });
+    await startProxy({ port, host, verbose, verboseBodies, model, passthrough, preserveTools, hybridTools, noAutoDetect, strictTls, pacingMinMs, pacingJitterMs, drainOnClose, sessionIdleRotateMs, sessionRotateJitterMs, sessionMaxAgeMs, sessionPerClient, preserveOrchestrationTags, noLiveCapture, strictTemplate, maxConcurrent, maxQueued, queueTimeoutMs, effort });
+}
+/**
+ * Parse the `--effort` flag + `DARIO_EFFORT` env. Validates against the
+ * allowed set; unrecognised values cause a non-zero exit with the list of
+ * valid choices (same philosophy as other strict parsers in this CLI).
+ * Flag value wins over env. Exported for tests. dario#87.
+ */
+export function resolveEffortFlag(args, env) {
+    const withValue = args.find(a => a.startsWith('--effort='));
+    const raw = withValue ? withValue.slice('--effort='.length) : env;
+    if (raw === undefined || raw === '')
+        return undefined;
+    const normalized = raw.trim().toLowerCase();
+    if (VALID_EFFORT_VALUES.includes(normalized)) {
+        return normalized;
+    }
+    console.error(`[dario] Invalid --effort value: ${JSON.stringify(raw)}. Must be one of: ${VALID_EFFORT_VALUES.join(', ')}.`);
+    process.exit(1);
 }
 /**
  * Parse a positive-integer env var. Returns undefined on unset, empty,
@@ -682,6 +711,17 @@ async function help() {
                              dario returns 504 "queue-timeout"
                              (default: 60000).
                              Env: DARIO_QUEUE_TIMEOUT_MS. (dario#80)
+    --effort=<low|medium|high|xhigh|client>
+                             Override the outbound output_config.effort
+                             on non-haiku requests. Default (unset)
+                             pins 'high' — matches CC 2.1.116's wire
+                             value. 'client' passes through what the
+                             client sent (falls back to 'high' if none).
+                             WARNING: non-'high' values may cause
+                             Anthropic's classifier to flip requests
+                             to 'overage' billing; watch -v logs for
+                             representative-claim changes.
+                             Env: DARIO_EFFORT. (dario#87)
     --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

@@ -1,4 +1,5 @@
 import { type IncomingMessage } from 'node:http';
+import { type EffortValue } from './cc-template.js';
 export declare function parseProviderPrefix(model: string): {
     provider: 'openai' | 'claude';
     model: string;
@@ -71,6 +72,14 @@ interface ProxyOptions {
     maxQueued?: number;
     /** Max ms a queued request waits before it times out with 504. Default 60000. dario#80. */
     queueTimeoutMs?: number;
+    /**
+     * Override the outbound `output_config.effort` value on non-haiku
+     * requests. Default (undefined) pins `'high'`, matching CC 2.1.116's
+     * wire value. `'client'` passes through whatever the client sent (or
+     * falls back to `'high'` if the client didn't include an output_config).
+     * dario#87.
+     */
+    effort?: EffortValue;
 }
 export declare function sanitizeError(err: unknown): string;
 /**

package/dist/proxy.js

@@ -978,6 +978,7 @@ export async function startProxy(opts = {}) {
                             preserveTools: opts.preserveTools ?? false,
                             hybridTools: opts.hybridTools ?? false,
                             noAutoDetect: opts.noAutoDetect ?? false,
+                            effort: opts.effort,
                         });
                         // Log the auto-preserve-tools switch once per text-tool
                         // client family. Skip when the operator already opted into

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@askalf/dario",
-  "version": "3.30.9",
+  "version": "3.30.10",
   "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/ && node -e \"require('fs').mkdirSync('dist/shim',{recursive:true})\" && cp src/shim/runtime.cjs dist/shim/",
-    "test": "node test/issue-29-tool-translation.mjs && node test/hybrid-tools.mjs && node test/tool-schema-contract.mjs && node test/scrub-paths.mjs && node test/provider-prefix.mjs && node test/analytics-recording.mjs && node test/analytics-billing-bucket.mjs && node test/failover-429.mjs && node test/pool-sticky.mjs && node test/live-fingerprint.mjs && node test/shim-runtime.mjs && node test/shim-e2e.mjs && node test/proxy-header-order.mjs && node test/proxy-body-order.mjs && node test/runtime-fingerprint.mjs && node test/pacing.mjs && node test/stream-drain.mjs && node test/subagent.mjs && node test/mcp-protocol.mjs && node test/mcp-tools.mjs && node test/mcp-e2e.mjs && node test/session-rotation.mjs && node test/drift-detection.mjs && node test/cc-authorize-probe-classifier.mjs && node test/compat-range.mjs && node test/doctor-formatter.mjs && node test/atomic-write.mjs && node test/account-refresh-singleflight.mjs && node test/streaming-edge-cases.mjs && node test/client-detection.mjs && node test/manual-oauth-flow.mjs && node test/scrub-template.mjs && node test/sanitize-messages.mjs && node test/platform-tools.mjs && node test/strict-template-flags.mjs && node test/request-queue.mjs",
+    "test": "node test/issue-29-tool-translation.mjs && node test/hybrid-tools.mjs && node test/tool-schema-contract.mjs && node test/scrub-paths.mjs && node test/provider-prefix.mjs && node test/analytics-recording.mjs && node test/analytics-billing-bucket.mjs && node test/failover-429.mjs && node test/pool-sticky.mjs && node test/live-fingerprint.mjs && node test/shim-runtime.mjs && node test/shim-e2e.mjs && node test/proxy-header-order.mjs && node test/proxy-body-order.mjs && node test/runtime-fingerprint.mjs && node test/pacing.mjs && node test/stream-drain.mjs && node test/subagent.mjs && node test/mcp-protocol.mjs && node test/mcp-tools.mjs && node test/mcp-e2e.mjs && node test/session-rotation.mjs && node test/drift-detection.mjs && node test/cc-authorize-probe-classifier.mjs && node test/compat-range.mjs && node test/doctor-formatter.mjs && node test/atomic-write.mjs && node test/account-refresh-singleflight.mjs && node test/streaming-edge-cases.mjs && node test/client-detection.mjs && node test/manual-oauth-flow.mjs && node test/scrub-template.mjs && node test/sanitize-messages.mjs && node test/platform-tools.mjs && node test/strict-template-flags.mjs && node test/request-queue.mjs && node test/effort-flag.mjs",
     "audit": "npm audit --production --audit-level=high",
     "prepublishOnly": "npm run build",
     "start": "node dist/cli.js",