fix: keep gateway overlay building on main

VACInc · VACInc · commit f0260149d3f6 · 2026-05-22T12:50:18.000-04:00
diff --git a/src/agents/harness/hook-context.ts b/src/agents/harness/hook-context.ts
@@ -1,3 +1,4 @@
+import type { DiagnosticTraceContext } from "../../infra/diagnostic-trace-context.js";
 import type {
   PluginHookAgentContext,
   PluginHookContextWindowSource,
@@ -6,6 +7,7 @@ import type {
 export type AgentHarnessHookContext = {
   runId: string;
   jobId?: string;
+  trace?: DiagnosticTraceContext;
   agentId?: string;
   sessionKey?: string;
   sessionId?: string;
@@ -24,6 +26,7 @@ export function buildAgentHookContext(params: AgentHarnessHookContext): PluginHo
   return {
     runId: params.runId,
     ...(params.jobId ? { jobId: params.jobId } : {}),
+    ...(params.trace ? { trace: params.trace } : {}),
     ...(params.agentId ? { agentId: params.agentId } : {}),
     ...(params.sessionKey ? { sessionKey: params.sessionKey } : {}),
     ...(params.sessionId ? { sessionId: params.sessionId } : {}),
diff --git a/src/auto-reply/reply/agent-runner-memory.ts b/src/auto-reply/reply/agent-runner-memory.ts
@@ -10,7 +10,6 @@ import { runWithModelFallback } from "../../agents/model-fallback.js";
 import { listLegacyRuntimeModelProviderAliases } from "../../agents/model-runtime-aliases.js";
 import { isCliProvider } from "../../agents/model-selection.js";
 import { resolveContextConfigProviderForRuntime } from "../../agents/openai-codex-routing.js";
-import { resolveExtraParams } from "../../agents/pi-embedded-runner/extra-params.js";
 import { resolveSandboxConfigForAgent, resolveSandboxRuntimeStatus } from "../../agents/sandbox.js";
 import {
   derivePromptTokens,
@@ -266,38 +265,6 @@ function resolveFollowupContextConfigProvider(params: {
   });
 }
 
-function parsePositiveInteger(value: unknown): number | undefined {
-  if (typeof value === "number" && Number.isFinite(value) && value > 0) {
-    return Math.floor(value);
-  }
-  if (typeof value === "string") {
-    const parsed = Number.parseInt(value, 10);
-    return Number.isFinite(parsed) && parsed > 0 ? parsed : undefined;
-  }
-  return undefined;
-}
-
-function resolveServerCompactionThresholdTokens(params: {
-  cfg: OpenClawConfig;
-  provider: string;
-  modelId?: string;
-  agentId?: string;
-}): number | undefined {
-  if (!params.modelId?.trim()) {
-    return undefined;
-  }
-  const extraParams = resolveExtraParams({
-    cfg: params.cfg,
-    provider: params.provider,
-    modelId: params.modelId,
-    agentId: params.agentId,
-  });
-  if (extraParams?.responsesServerCompaction !== true) {
-    return undefined;
-  }
-  return parsePositiveInteger(extraParams.responsesCompactThreshold);
-}
-
 function resolveVisibleMemoryFlushErrorPayloads(payloads?: ReplyPayload[]): ReplyPayload[] {
   return (payloads ?? []).filter(
     (payload) => payload.isError === true && isRenderablePayload(payload),
@@ -665,12 +632,6 @@ export async function runPreflightCompactionIfNeeded(params: {
     params.cfg.agents?.defaults?.compaction?.reserveTokensFloor ??
     20_000;
   const softThresholdTokens = memoryFlushPlan?.softThresholdTokens ?? 4_000;
-  const serverCompactionThresholdTokens = resolveServerCompactionThresholdTokens({
-    cfg: params.cfg,
-    provider: params.followupRun.run.provider,
-    modelId: params.followupRun.run.model ?? params.defaultModel,
-    agentId: params.followupRun.run.agentId,
-  });
   const freshPersistedTokens = resolveFreshSessionTotalTokens(entry);
   const persistedTotalTokens = entry.totalTokens;
   const hasPersistedTotalTokens =
@@ -732,9 +693,7 @@ export async function runPreflightCompactionIfNeeded(params: {
       ? projectedTokenCount
       : undefined;
 
-  const threshold =
-    serverCompactionThresholdTokens ??
-    contextWindowTokens - reserveTokensFloor - softThresholdTokens;
+  const threshold = contextWindowTokens - reserveTokensFloor - softThresholdTokens;
   logVerbose(
     `preflightCompaction check: sessionKey=${params.sessionKey} ` +
       `tokenCount=${tokenCountForCompaction ?? freshPersistedTokens ?? "undefined"} ` +
@@ -743,7 +702,6 @@ export async function runPreflightCompactionIfNeeded(params: {
       `persistedFresh=${entry?.totalTokensFresh === true} ` +
       `transcriptPromptTokens=${transcriptPromptTokens ?? "undefined"} ` +
       `promptTokensEst=${promptTokenEstimate ?? "undefined"} ` +
-      `serverCompactionThreshold=${serverCompactionThresholdTokens ?? "undefined"} ` +
       `activeTranscriptBytes=${activeTranscriptBytes ?? "undefined"} ` +
       `maxActiveTranscriptBytes=${maxActiveTranscriptBytes ?? "undefined"} ` +
       `sizeTrigger=${shouldCompactByTranscriptBytes}`,
@@ -755,7 +713,6 @@ export async function runPreflightCompactionIfNeeded(params: {
     contextWindowTokens,
     reserveTokensFloor,
     softThresholdTokens,
-    thresholdTokens: serverCompactionThresholdTokens,
   });
   const shouldCompact = shouldCompactByTokens || shouldCompactByTranscriptBytes;
   if (!shouldCompact) {
@@ -767,7 +724,6 @@ export async function runPreflightCompactionIfNeeded(params: {
     `preflightCompaction triggered: sessionKey=${params.sessionKey} ` +
       `tokenCount=${tokenCountForCompaction ?? freshPersistedTokens ?? "undefined"} ` +
       `threshold=${threshold} trigger=${compactionTrigger} ` +
-      `serverCompactionThreshold=${serverCompactionThresholdTokens ?? "undefined"} ` +
       `activeTranscriptBytes=${activeTranscriptBytes ?? "undefined"} ` +
       `maxActiveTranscriptBytes=${maxActiveTranscriptBytes ?? "undefined"}`,
   );
diff --git a/src/auto-reply/reply/memory-flush.ts b/src/auto-reply/reply/memory-flush.ts
@@ -44,7 +44,6 @@ function resolveMemoryFlushGateState<
   contextWindowTokens: number;
   reserveTokensFloor: number;
   softThresholdTokens: number;
-  thresholdTokens?: number;
 }): { entry: TEntry; totalTokens: number; threshold: number } | null {
   if (!params.entry) {
     return null;
@@ -59,9 +58,7 @@ function resolveMemoryFlushGateState<
   const contextWindow = Math.max(1, Math.floor(params.contextWindowTokens));
   const reserveTokens = Math.max(0, Math.floor(params.reserveTokensFloor));
   const softThreshold = Math.max(0, Math.floor(params.softThresholdTokens));
-  const configuredThreshold = resolvePositiveTokenCount(params.thresholdTokens);
-  const threshold =
-    configuredThreshold ?? Math.max(0, contextWindow - reserveTokens - softThreshold);
+  const threshold = Math.max(0, contextWindow - reserveTokens - softThreshold);
   if (threshold <= 0) {
     return null;
   }
@@ -107,7 +104,6 @@ export function shouldRunPreflightCompaction(params: {
   contextWindowTokens: number;
   reserveTokensFloor: number;
   softThresholdTokens: number;
-  thresholdTokens?: number;
 }): boolean {
   const state = resolveMemoryFlushGateState(params);
   return Boolean(state && state.totalTokens >= state.threshold);
