Merge remote-tracking branch 'origin/master' into feat/todo-multi-in-progress

examples/acp-agent/retry.cordis.snapshot.yml

@@ -1,8 +1,7 @@
 # Keyless replay for the retry overlay: disable the key-requiring DeepSeek
-# adapter, insert `llm-replay`, and restate the app config with the same
-# deterministic 1 ms zero-jitter retry policy as the live sibling. A config
-# patch replaces the whole app config, so the base fields are restated
-# verbatim (raw JSONL persistence so the harness can harvest the log).
+# adapter, insert `llm-replay`, and give its provider the same deterministic
+# 1 ms zero-jitter retry policy as the live sibling. The app patch still
+# restates its whole config for raw JSONL persistence and the recorded model.
 - id: base
   name: '@cordisjs/plugin-include'
   config:
@@ -20,11 +19,6 @@
           persistenceCompression: none
           workspaceContext:
             maxBytes: 65536
-          llmRetry:
-            maxTransientRetries: 2
-            initialDelayMs: 1
-            maxDelayMs: 1
-            jitterRatio: 0
           persona: |
             You are a coding assistant powered by the {{model}} model. Your working directory is {{cwd}}. Your bash tool runs under a file sandbox — a `[sandbox: file access denied …]` result is policy, not a command bug.
 
@@ -36,6 +30,13 @@
               providers:
                 - id: deepseek
                   name: DeepSeek
+                  retryPolicy:
+                    mode: normal
+                    maxRetries: 2
+                    backoff:
+                      initialDelayMs: 1
+                      maxDelayMs: 1
+                      jitterRatio: 0
                   models:
                     - id: deepseek-v4-flash
                     - id: deepseek-v4-pro

examples/acp-agent/retry.cordis.yml

@@ -2,14 +2,32 @@
 # deterministic 1 ms zero-jitter delay so the durable `llm/retry` event
 # (`delayMs`) and replay wall time stay reproducible. The overlay changes no
 # tool or prompt composition, so its scenarios share the default header class.
-# A config patch replaces the whole app config, so the base fields are restated
-# verbatim; the model is re-pinned to `deepseek-v4-flash` like the other
-# snapshot overlays because the recorded corpus was captured on flash.
+# Config patches replace whole plugin configs: the provider patch restates its
+# adapter fields around `retryPolicy`, while the app patch re-pins the recorded
+# flash model and restates its base fields.
 - id: base
   name: '@cordisjs/plugin-include'
   config:
     path: ./cordis.yml
     patches:
+      - id: llm-deepseek
+        name: '@deepseek-ai/dsh-llm-deepseek'
+        config:
+          apiKey: !!js process.env.DEEPSEEK_API_KEY
+          baseURL: !!js process.env.DEEPSEEK_BASE_URL
+          thinking: enabled
+          reasoningEffort: max
+          defaultContextWindow: 256000
+          retryPolicy:
+            mode: normal
+            maxRetries: 2
+            backoff:
+              initialDelayMs: 1
+              maxDelayMs: 1
+              jitterRatio: 0
+          models:
+            - id: deepseek-v4-flash
+            - id: deepseek-v4-pro
       - id: acp-agent
         name: '@deepseek-ai/dsh-acp-demo'
         config:
@@ -19,11 +37,6 @@
           persistenceCompression: !!js "process.env.DSH_SNAPSHOT === undefined ? 'zstd' : 'none'"
           workspaceContext:
             maxBytes: 65536
-          llmRetry:
-            maxTransientRetries: 2
-            initialDelayMs: 1
-            maxDelayMs: 1
-            jitterRatio: 0
           persona: |
             You are a coding assistant powered by the {{model}} model. Your working directory is {{cwd}}. Your bash tool runs under a file sandbox — a `[sandbox: file access denied …]` result is policy, not a command bug.
 

examples/acp-agent/tests/acp.snapshot.ts

@@ -131,10 +131,10 @@ const SCENARIOS: Scenario[] = [
   { name: 'error-finish', hasModelTurn: true, recorded: false, overridden: true },
   // Keyless, authored (like error-finish): a live provider cannot be coaxed
   // into a degenerate empty completion, so the fixture scripts the adapters'
-  // EMPTY_RESPONSE error finish (step 1) followed by the recovered reply
-  // (step 2), proving the default retry policy end to end: the durable
+  // EMPTY_RESPONSE error finish in turn 1 followed by the recovered reply
+  // in retry turn 2, proving the default retry policy end to end: the durable
   // llm/retry event, no ACP output for the discarded attempt, the recovered
-  // reply, and a clean completed turn. Its overlay only pins a deterministic
+  // reply, and a clean completed retry turn. Its overlay only pins a deterministic
   // 1 ms zero-jitter delay, so it shares the default header class.
   { name: 'empty-response-retry', hasModelTurn: true, recorded: false, configPath: RETRY_CONFIG },
   // Keyless, authored (like error-finish/cancel): deterministically forcing a

examples/acp-agent/tests/snapshots/empty-response-retry/session.jsonl

@@ -7,7 +7,7 @@
 {"type":"assistant/chunk","seq":5,"time":0,"data":{"turn":1,"step":1,"chunk":{"type":"usage","usage":{"inputTokens":0,"outputTokens":0}}}}
 {"type":"assistant/chunk","seq":6,"time":0,"data":{"turn":1,"step":1,"chunk":{"type":"finish","reason":{"kind":"error","failure":{"message":"model returned a completed response with no content","code":"EMPTY_RESPONSE"}}}}}
 {"type":"step/end","seq":7,"time":0,"data":{"turn":1,"step":1}}
-{"type":"llm/retry","seq":8,"time":0,"data":{"turn":1,"step":1,"retry":1,"maxRetries":2,"delayMs":1,"failure":{"message":"model returned a completed response with no content","code":"EMPTY_RESPONSE"}}}
+{"type":"llm/retry","seq":8,"time":0,"data":{"turn":1,"step":1,"provider":"deepseek","mode":"normal","policyKey":"[\"normal\",2,[\"EMPTY_RESPONSE\",\"RATE_LIMIT\",\"SERVER\",\"TIMEOUT\",\"TRANSPORT\"],1,1,0]","retry":1,"maxRetries":2,"delayMs":1,"failure":{"message":"model returned a completed response with no content","code":"EMPTY_RESPONSE"}}}
 {"type":"turn/end","seq":9,"time":1785047244285,"data":{"turn":1,"reason":{"kind":"error","step":1,"failure":{"message":"model returned a completed response with no content","code":"EMPTY_RESPONSE"}}}}
 {"type":"turn/start","seq":10,"time":1785047244285,"data":{"turn":2,"trigger":{"kind":"retry"}}}
 {"type":"step/start","seq":11,"time":1785047244289,"data":{"turn":2,"step":1}}