fix(agents): scope context windows to agent

src/agents/cli-runner/prepare.ts

@@ -843,6 +843,7 @@ export async function prepareCliRunContext(
       provider: params.provider,
       modelProvider: backendResolved.modelProvider,
       model: contextModelId,
+      agentId: sessionAgentId,
       modelContextWindow: params.modelContextWindow,
       modelContextTokens: params.modelContextTokens,
       allowAsyncLoad: false,

src/agents/context-resolution.ts

@@ -11,7 +11,7 @@ import {
   minPositiveContextTokens,
   providerContextTokenCacheKey,
 } from "./context-cache.js";
-import { resolveModelExtraParamSources } from "./model-extra-params.js";
+import { resolveModelExtraParamValue } from "./model-extra-params.js";
 import { normalizeProviderId } from "./model-selection.js";
 
 type ConfigModelEntry = { id?: string; contextWindow?: number; contextTokens?: number };
@@ -27,6 +27,7 @@ export type ContextTokenResolutionParams = {
   provider?: string;
   modelProvider?: string;
   model?: string;
+  agentId?: string;
   fallbackContextTokens?: number;
   modelContextWindow?: number;
   modelContextTokens?: number;
@@ -211,15 +212,15 @@ export function resolveContextTokensForModelFromCache(
       params.modelProvider,
       ref.model,
     );
-    const extraParamSources = resolveModelExtraParamSources({
-      config: params.cfg,
-      provider: ref.provider,
-      modelId: ref.model,
-    });
-    const effectiveContext1M =
-      extraParamSources.modelParams && Object.hasOwn(extraParamSources.modelParams, "context1m")
-        ? extraParamSources.modelParams.context1m
-        : extraParamSources.defaultParams?.context1m;
+    const effectiveContext1M = resolveModelExtraParamValue(
+      {
+        config: params.cfg,
+        provider: ref.provider,
+        modelId: ref.model,
+        agentId: params.agentId,
+      },
+      "context1m",
+    );
     const fixedContextWindow = resolveAnthropicFixedContextWindow(ref.provider, ref.model, {
       claudeCli1M: effectiveContext1M === true,
     });

src/agents/context.test.ts

@@ -393,6 +393,36 @@ describe("resolveContextTokensForModel", () => {
     expect(result).toBe(ANTHROPIC_CONTEXT_1M_TOKENS);
   });
 
+  it("honors an agent model context1m override", () => {
+    const result = resolveContextTokensForModel({
+      cfg: {
+        agents: {
+          defaults: {
+            params: { context1m: false },
+            models: {
+              "claude-cli/claude-opus-4-7": { params: { context1m: false } },
+            },
+          },
+          list: [
+            {
+              id: "research",
+              models: {
+                "claude-cli/claude-opus-4-7": { params: { context1m: true } },
+              },
+            },
+          ],
+        },
+      },
+      provider: "claude-cli",
+      model: "claude-opus-4-7",
+      agentId: "research",
+      fallbackContextTokens: 200_000,
+      allowAsyncLoad: false,
+    });
+
+    expect(result).toBe(ANTHROPIC_CONTEXT_1M_TOKENS);
+  });
+
   it("returns 1M context when claude-cli context1m is enabled for a GA 1M model", () => {
     const result = resolveContextTokensForModel({
       cfg: {

src/auto-reply/reply/agent-runner-context-recovery.ts

@@ -76,6 +76,7 @@ function resolveContextWindowForHint(params: {
     cfg: params.cfg,
     provider: params.ref.provider,
     model: params.ref.model,
+    agentId: params.agentId,
     allowAsyncLoad: false,
   });
   return modelContextTokens ?? sessionContextTokens;

src/auto-reply/reply/agent-runner-memory.ts

@@ -781,6 +781,7 @@ export async function runPreflightCompactionIfNeeded(params: {
       runtimePolicySessionKey: params.runtimePolicySessionKey,
     }),
     modelId: params.followupRun.run.model ?? params.defaultModel,
+    agentId: compactionAgentId,
   });
   const memoryFlushPlan = resolveMemoryFlushPlan({ cfg: params.cfg });
   const reserveTokensFloor = memoryFlushPlan?.reserveTokensFloor ?? 20_000;
@@ -1160,6 +1161,7 @@ export async function runMemoryFlushIfNeeded(params: {
       runtimePolicySessionKey: params.runtimePolicySessionKey,
     }),
     modelId: params.followupRun.run.model ?? params.defaultModel,
+    agentId: params.followupRun.run.agentId,
   });
 
   const promptTokenEstimate = estimatePromptTokensForMemoryFlush(

src/auto-reply/reply/agent-runner-result-accounting.ts

@@ -236,6 +236,7 @@ export async function accountAgentTurn(context: AgentTurnAccountingContext) {
           cfg,
           provider: providerUsed,
           model: modelUsed,
+          agentId: followupRun.run.agentId,
           allowAsyncLoad: false,
         })
       : undefined;

src/auto-reply/reply/commands-compact.ts

@@ -130,6 +130,7 @@ function resolveManualCompactContextTokenBudget(params: {
       contextConfigProvider,
       model,
     }),
+    agentId: params.agentId,
     allowAsyncLoad: false,
   });
   if (typeof configuredContextTokens === "number" && configuredContextTokens > 0) {

src/auto-reply/reply/get-reply-directives-apply.ts

@@ -522,6 +522,7 @@ export async function applyInlineDirectiveOverrides(params: {
       config: cfg,
     }),
     model,
+    agentId: resolveSessionAgentId({ sessionKey, config: cfg }),
     modelContextWindow: selectedCatalogEntry?.contextWindow,
     modelContextTokens: selectedCatalogEntry?.contextTokens,
   });

src/auto-reply/reply/get-reply-directives.ts

@@ -481,6 +481,7 @@ export async function resolveReplyDirectives(params: {
         cfg,
         provider,
         model,
+        agentId,
         modelContextWindow: modelState.modelContextWindow,
         modelContextTokens: modelState.modelContextTokens,
       });

src/auto-reply/reply/get-reply-native-slash-fast-path.ts

@@ -384,6 +384,7 @@ export async function maybeResolveNativeSlashCommandFastReply(params: {
           cfg: params.cfg,
           provider: params.provider,
           model: params.model,
+          agentId: params.agentId,
         }),
         isGroup: sessionState.isGroup,
         loadSkillCommands: loadNativeSkillCommands,

src/auto-reply/reply/memory-flush.ts

@@ -18,12 +18,14 @@ export function resolveMemoryFlushContextWindowTokens(params: {
   modelId?: string;
   cfg?: OpenClawConfig;
   provider?: string;
+  agentId?: string;
 }): number {
   return (
     resolveContextTokensForModel({
       cfg: params.cfg,
       provider: params.provider,
       model: params.modelId,
+      agentId: params.agentId,
       allowAsyncLoad: false,
     }) ?? DEFAULT_CONTEXT_TOKENS
   );

src/auto-reply/reply/model-selection-context.ts

@@ -7,6 +7,7 @@ export function resolveContextTokens(params: {
   cfg: OpenClawConfig;
   provider: string;
   model: string;
+  agentId?: string;
   modelContextWindow?: number;
   modelContextTokens?: number;
 }): number {
@@ -15,6 +16,7 @@ export function resolveContextTokens(params: {
       cfg: params.cfg,
       provider: params.provider,
       model: params.model,
+      agentId: params.agentId,
       modelContextWindow: params.modelContextWindow,
       modelContextTokens: params.modelContextTokens,
       allowAsyncLoad: false,

src/cron/isolated-agent/run-finalize.ts

@@ -107,6 +107,7 @@ export async function finalizeCronRun(params: {
     cfg: prepared.cfgWithAgentDefaults,
     provider: providerUsed,
     model: modelUsed,
+    agentId: prepared.agentId,
     allowAsyncLoad: false,
   });
   const agentHarnessId = normalizeOptionalString(finalRunResult.meta?.agentMeta?.agentHarnessId);