resolve merge conflicts

2026-10-30 19:32:39 +08:00 · 2026-06-01 15:20:54 +02:00
parent 41606931f0 7cc6080646
commit 0f271a39d7
513 changed files with 55040 additions and 16910 deletions
@@ -854,6 +854,7 @@ export const layer: Layer.Layer<
            ),
            Effect.retry(
              SessionRetry.policy({
+                provider: input.model.providerID,
                parse,
                // kilocode_change start
                ...KiloSessionProcessor.retryOpts({ sessionID: ctx.sessionID, abort: ac.signal, set: status.set }),
@@ -873,6 +874,7 @@ export const layer: Layer.Layer<
                    type: "retry",
                    attempt: info.attempt,
                    message: info.message,
+                    action: info.action,
                    next: info.next,
                  })
                },