diff --git a/packages/opencode/src/session/retry.ts b/packages/opencode/src/session/retry.ts
index 3cabacdb87b..c53bb926a8c 100644
--- a/packages/opencode/src/session/retry.ts
+++ b/packages/opencode/src/session/retry.ts
@@ -68,6 +68,12 @@ export namespace SessionRetry {
         if (json.code === "Some resource has been exhausted") {
           return "Provider is overloaded"
         }
+        if (json.type === "error" && json.error?.code?.includes("rate_limit")) {
+          return "Rate Limited"
+        }
+        if (json.error?.message?.includes("no_kv_space") || (json.type === "error" && json.error?.type === "server_error")) {
+          return "Provider Server Error"
+        }
       } catch {}
     }