diff --git a/src/agents/context.test.ts b/src/agents/context.test.ts
index 6f5104fd3f3..0aec5efa209 100644
--- a/src/agents/context.test.ts
+++ b/src/agents/context.test.ts
@@ -240,13 +240,12 @@ describe("resolveContextTokensForModel", () => {
     expect(result).toBe(ANTHROPIC_CONTEXT_1M_TOKENS);
   });
 
-  it("does not force 1M context when claude-cli context1m is enabled", () => {
+  it("returns 1M context when claude-cli context1m is enabled for opus/sonnet", () => {
     const result = resolveContextTokensForModel({
       cfg: {
         models: {
           providers: {
             "claude-cli": {
-              baseUrl: "https://api.anthropic.com",
               models: [testModelContextWindow("claude-opus-4-7", 200_000)],
             },
           },
@@ -267,29 +266,7 @@ describe("resolveContextTokensForModel", () => {
       allowAsyncLoad: false,
     });
 
-    expect(result).toBe(200_000);
-  });
-
-  it("does not force 1M context for claude-cli aliases when context1m is enabled", () => {
-    const result = resolveContextTokensForModel({
-      cfg: {
-        agents: {
-          defaults: {
-            models: {
-              "claude-cli/sonnet": {
-                params: { context1m: true },
-              },
-            },
-          },
-        },
-      },
-      provider: "claude-cli",
-      model: "sonnet",
-      fallbackContextTokens: 200_000,
-      allowAsyncLoad: false,
-    });
-
-    expect(result).toBe(200_000);
+    expect(result).toBe(ANTHROPIC_CONTEXT_1M_TOKENS);
   });
 
   it("does not force 1M context when context1m is not enabled", () => {
diff --git a/src/agents/context.ts b/src/agents/context.ts
index 59715f0e536..d7ce75d2cf2 100644
--- a/src/agents/context.ts
+++ b/src/agents/context.ts
@@ -375,7 +375,7 @@ function resolveConfiguredProviderContextTokens(
 }
 
 function isAnthropic1MModel(provider: string, model: string): boolean {
-  if (provider !== "anthropic") {
+  if (provider !== "anthropic" && provider !== "claude-cli") {
     return false;
   }
   const modelId = resolveModelFamilyId(model);