Skip to content

Commit b99eed4

Browse files
jalehmanjalehman
committed
fix: unblock rebased overflow token prepare #40357 thanks @rabsef-bicrym 
1 parent f912715 commit b99eed4

18 files changed

+48
-50
lines changed

‎src/agents/anthropic-payload-log.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ describe("createAnthropicPayloadLogger", () => {
2929
],
3030
};
3131
const streamFn: StreamFn = ((model, __, options) => {
32-
options?.onPayload?.(payload, model);
32+
options?.onPayload?.(payload);
3333
return {} as never;
3434
}) as StreamFn;
3535

‎src/agents/anthropic-payload-log.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ export function createAnthropicPayloadLogger(params: {
145145
payload: redactedPayload,
146146
payloadDigest: digest(redactedPayload),
147147
});
148-
return options?.onPayload?.(payload, model);
148+
return options?.onPayload?.(payload);
149149
};
150150
return streamFn(model, context, {
151151
...options,

‎src/agents/auth-profiles/oauth.openai-codex-refresh-fallback.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ const { getOAuthApiKeyMock } = vi.hoisted(() => ({
1717
}),
1818
}));
1919

20-
vi.mock("@mariozechner/pi-ai/oauth", () => ({
20+
vi.mock("@mariozechner/pi-ai", () => ({
2121
getOAuthApiKey: getOAuthApiKeyMock,
2222
getOAuthProviders: () => [
2323
{ id: "openai-codex", envApiKey: "OPENAI_API_KEY", oauthTokenEnv: "OPENAI_OAUTH_TOKEN" }, // pragma: allowlist secret

‎src/agents/auth-profiles/oauth.ts‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
1-
import type { OAuthCredentials, OAuthProvider } from "@mariozechner/pi-ai";
2-
import { getOAuthApiKey, getOAuthProviders } from "@mariozechner/pi-ai/oauth";
1+
import {
2+
getOAuthApiKey,
3+
getOAuthProviders,
4+
type OAuthCredentials,
5+
type OAuthProvider,
6+
} from "@mariozechner/pi-ai";
37
import { loadConfig, type OpenClawConfig } from "../../config/config.js";
48
import { coerceSecretRef } from "../../config/types.secrets.js";
59
import { withFileLock } from "../../infra/file-lock.js";

‎src/agents/openai-ws-stream.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -797,7 +797,7 @@ export function createOpenAIWebSocketStreamFn(
797797
...(prevResponseId ? { previous_response_id: prevResponseId } : {}),
798798
...extraParams,
799799
};
800-
const nextPayload = await options?.onPayload?.(payload, model);
800+
const nextPayload = options?.onPayload?.(payload);
801801
const requestPayload = (nextPayload ?? payload) as Parameters<
802802
OpenAIWebSocketManager["send"]
803803
>[0];

‎src/agents/pi-embedded-runner-extraparams.test.ts‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ describe("applyExtraParamsToAgent", () => {
208208
}) {
209209
const payload = params.payload ?? { store: false };
210210
const baseStreamFn: StreamFn = (model, _context, options) => {
211-
options?.onPayload?.(payload, model);
211+
options?.onPayload?.(payload);
212212
return {} as ReturnType<StreamFn>;
213213
};
214214
const agent = { streamFn: baseStreamFn };
@@ -233,7 +233,7 @@ describe("applyExtraParamsToAgent", () => {
233233
}) {
234234
const payload = params.payload ?? {};
235235
const baseStreamFn: StreamFn = (model, _context, options) => {
236-
options?.onPayload?.(payload, model);
236+
options?.onPayload?.(payload);
237237
return {} as ReturnType<StreamFn>;
238238
};
239239
const agent = { streamFn: baseStreamFn };
@@ -276,7 +276,7 @@ describe("applyExtraParamsToAgent", () => {
276276
const payloads: Record<string, unknown>[] = [];
277277
const baseStreamFn: StreamFn = (_model, _context, options) => {
278278
const payload: Record<string, unknown> = { model: "deepseek/deepseek-r1" };
279-
options?.onPayload?.(payload, model);
279+
options?.onPayload?.(payload);
280280
payloads.push(payload);
281281
return {} as ReturnType<StreamFn>;
282282
};
@@ -308,7 +308,7 @@ describe("applyExtraParamsToAgent", () => {
308308
const payloads: Record<string, unknown>[] = [];
309309
const baseStreamFn: StreamFn = (_model, _context, options) => {
310310
const payload: Record<string, unknown> = {};
311-
options?.onPayload?.(payload, model);
311+
options?.onPayload?.(payload);
312312
payloads.push(payload);
313313
return {} as ReturnType<StreamFn>;
314314
};
@@ -332,7 +332,7 @@ describe("applyExtraParamsToAgent", () => {
332332
const payloads: Record<string, unknown>[] = [];
333333
const baseStreamFn: StreamFn = (_model, _context, options) => {
334334
const payload: Record<string, unknown> = { reasoning_effort: "high" };
335-
options?.onPayload?.(payload, model);
335+
options?.onPayload?.(payload);
336336
payloads.push(payload);
337337
return {} as ReturnType<StreamFn>;
338338
};
@@ -357,7 +357,7 @@ describe("applyExtraParamsToAgent", () => {
357357
const payloads: Record<string, unknown>[] = [];
358358
const baseStreamFn: StreamFn = (_model, _context, options) => {
359359
const payload: Record<string, unknown> = { reasoning: { max_tokens: 256 } };
360-
options?.onPayload?.(payload, model);
360+
options?.onPayload?.(payload);
361361
payloads.push(payload);
362362
return {} as ReturnType<StreamFn>;
363363
};
@@ -381,7 +381,7 @@ describe("applyExtraParamsToAgent", () => {
381381
const payloads: Record<string, unknown>[] = [];
382382
const baseStreamFn: StreamFn = (_model, _context, options) => {
383383
const payload: Record<string, unknown> = { reasoning_effort: "medium" };
384-
options?.onPayload?.(payload, model);
384+
options?.onPayload?.(payload);
385385
payloads.push(payload);
386386
return {} as ReturnType<StreamFn>;
387387
};
@@ -588,7 +588,7 @@ describe("applyExtraParamsToAgent", () => {
588588
const payloads: Record<string, unknown>[] = [];
589589
const baseStreamFn: StreamFn = (_model, _context, options) => {
590590
const payload: Record<string, unknown> = { thinking: "off" };
591-
options?.onPayload?.(payload, model);
591+
options?.onPayload?.(payload);
592592
payloads.push(payload);
593593
return {} as ReturnType<StreamFn>;
594594
};
@@ -619,7 +619,7 @@ describe("applyExtraParamsToAgent", () => {
619619
const payloads: Record<string, unknown>[] = [];
620620
const baseStreamFn: StreamFn = (_model, _context, options) => {
621621
const payload: Record<string, unknown> = { thinking: "off" };
622-
options?.onPayload?.(payload, model);
622+
options?.onPayload?.(payload);
623623
payloads.push(payload);
624624
return {} as ReturnType<StreamFn>;
625625
};
@@ -650,7 +650,7 @@ describe("applyExtraParamsToAgent", () => {
650650
const payloads: Record<string, unknown>[] = [];
651651
const baseStreamFn: StreamFn = (_model, _context, options) => {
652652
const payload: Record<string, unknown> = {};
653-
options?.onPayload?.(payload, model);
653+
options?.onPayload?.(payload);
654654
payloads.push(payload);
655655
return {} as ReturnType<StreamFn>;
656656
};
@@ -674,7 +674,7 @@ describe("applyExtraParamsToAgent", () => {
674674
const payloads: Record<string, unknown>[] = [];
675675
const baseStreamFn: StreamFn = (_model, _context, options) => {
676676
const payload: Record<string, unknown> = { tool_choice: "required" };
677-
options?.onPayload?.(payload, model);
677+
options?.onPayload?.(payload);
678678
payloads.push(payload);
679679
return {} as ReturnType<StreamFn>;
680680
};
@@ -699,7 +699,7 @@ describe("applyExtraParamsToAgent", () => {
699699
const payloads: Record<string, unknown>[] = [];
700700
const baseStreamFn: StreamFn = (_model, _context, options) => {
701701
const payload: Record<string, unknown> = {};
702-
options?.onPayload?.(payload, model);
702+
options?.onPayload?.(payload);
703703
payloads.push(payload);
704704
return {} as ReturnType<StreamFn>;
705705
};
@@ -749,7 +749,7 @@ describe("applyExtraParamsToAgent", () => {
749749
],
750750
tool_choice: { type: "tool", name: "read" },
751751
};
752-
options?.onPayload?.(payload, model);
752+
options?.onPayload?.(payload);
753753
payloads.push(payload);
754754
return {} as ReturnType<StreamFn>;
755755
};
@@ -793,7 +793,7 @@ describe("applyExtraParamsToAgent", () => {
793793
},
794794
],
795795
};
796-
options?.onPayload?.(payload, model);
796+
options?.onPayload?.(payload);
797797
payloads.push(payload);
798798
return {} as ReturnType<StreamFn>;
799799
};
@@ -832,7 +832,7 @@ describe("applyExtraParamsToAgent", () => {
832832
},
833833
],
834834
};
835-
options?.onPayload?.(payload, model);
835+
options?.onPayload?.(payload);
836836
payloads.push(payload);
837837
return {} as ReturnType<StreamFn>;
838838
};
@@ -896,7 +896,7 @@ describe("applyExtraParamsToAgent", () => {
896896
},
897897
},
898898
};
899-
options?.onPayload?.(payload, model);
899+
options?.onPayload?.(payload);
900900
payloads.push(payload);
901901
return {} as ReturnType<StreamFn>;
902902
};
@@ -943,7 +943,7 @@ describe("applyExtraParamsToAgent", () => {
943943
},
944944
},
945945
};
946-
options?.onPayload?.(payload, model);
946+
options?.onPayload?.(payload);
947947
payloads.push(payload);
948948
return {} as ReturnType<StreamFn>;
949949
};

‎src/agents/pi-embedded-runner/anthropic-stream-wrappers.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ export function createAnthropicToolPayloadCompatibilityWrapper(
298298
);
299299
}
300300
}
301-
return originalOnPayload?.(payload, model);
301+
return originalOnPayload?.(payload);
302302
},
303303
});
304304
};

‎src/agents/pi-embedded-runner/extra-params.kilocode.test.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ function applyAndCapture(params: {
1919

2020
const baseStreamFn: StreamFn = (_model, _context, options) => {
2121
captured.headers = options?.headers;
22-
options?.onPayload?.({}, _model);
22+
options?.onPayload?.({});
2323
return createAssistantMessageEventStream();
2424
};
2525
const agent = { streamFn: baseStreamFn };
@@ -97,7 +97,7 @@ describe("extra-params: Kilocode kilo/auto reasoning", () => {
9797

9898
const baseStreamFn: StreamFn = (_model, _context, options) => {
9999
const payload: Record<string, unknown> = { reasoning_effort: "high" };
100-
options?.onPayload?.(payload, _model);
100+
options?.onPayload?.(payload);
101101
capturedPayload = payload;
102102
return createAssistantMessageEventStream();
103103
};
@@ -125,7 +125,7 @@ describe("extra-params: Kilocode kilo/auto reasoning", () => {
125125

126126
const baseStreamFn: StreamFn = (_model, _context, options) => {
127127
const payload: Record<string, unknown> = {};
128-
options?.onPayload?.(payload, _model);
128+
options?.onPayload?.(payload);
129129
capturedPayload = payload;
130130
return createAssistantMessageEventStream();
131131
};
@@ -158,7 +158,7 @@ describe("extra-params: Kilocode kilo/auto reasoning", () => {
158158

159159
const baseStreamFn: StreamFn = (_model, _context, options) => {
160160
const payload: Record<string, unknown> = { reasoning_effort: "high" };
161-
options?.onPayload?.(payload, _model);
161+
options?.onPayload?.(payload);
162162
capturedPayload = payload;
163163
return createAssistantMessageEventStream();
164164
};

‎src/agents/pi-embedded-runner/extra-params.openrouter-cache-control.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ type StreamPayload = {
1313

1414
function runOpenRouterPayload(payload: StreamPayload, modelId: string) {
1515
const baseStreamFn: StreamFn = (_model, _context, options) => {
16-
options?.onPayload?.(payload, _model);
16+
options?.onPayload?.(payload);
1717
return createAssistantMessageEventStream();
1818
};
1919
const agent = { streamFn: baseStreamFn };

‎src/agents/pi-embedded-runner/extra-params.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ function createGoogleThinkingPayloadWrapper(
230230
thinkingLevel,
231231
});
232232
}
233-
return onPayload?.(payload, model);
233+
return onPayload?.(payload);
234234
},
235235
});
236236
};
@@ -263,7 +263,7 @@ function createZaiToolStreamWrapper(
263263
// Inject tool_stream: true for Z.AI API
264264
(payload as Record<string, unknown>).tool_stream = true;
265265
}
266-
return originalOnPayload?.(payload, model);
266+
return originalOnPayload?.(payload);
267267
},
268268
});
269269
};
@@ -310,7 +310,7 @@ function createParallelToolCallsWrapper(
310310
if (payload && typeof payload === "object") {
311311
(payload as Record<string, unknown>).parallel_tool_calls = enabled;
312312
}
313-
return originalOnPayload?.(payload, model);
313+
return originalOnPayload?.(payload);
314314
},
315315
});
316316
};

0 commit comments

Comments
 (0)