Skip to content

Commit cdcce22

Browse files
fix(clawsweeper): address review for automerge-openclaw-openclaw-75403 (validation-1)
1 parent 478d13d commit cdcce22

5 files changed

Lines changed: 11 additions & 11 deletions

File tree

extensions/copilot/harness.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1232,8 +1232,8 @@ describe("createCopilotAgentHarness", () => {
12321232
expect.objectContaining({
12331233
availableTools: [],
12341234
continuePendingWork: false,
1235+
disableResume: true,
12351236
model: "gpt-4.1",
1236-
suppressResumeEvent: true,
12371237
tools: [],
12381238
workingDirectory: "/workspace",
12391239
}),
@@ -1412,9 +1412,9 @@ describe("createCopilotAgentHarness", () => {
14121412
"sdk-sess-token",
14131413
expect.objectContaining({
14141414
continuePendingWork: false,
1415+
disableResume: true,
14151416
gitHubToken: "ghp_test",
14161417
model: "gpt-4.1",
1417-
suppressResumeEvent: true,
14181418
workingDirectory: "/workspace",
14191419
}),
14201420
);

extensions/copilot/harness.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ async function compactTrackedSdkSession(params: {
268268
...params.sessionConfig,
269269
continuePendingWork: false,
270270
...(params.gitHubToken ? { gitHubToken: params.gitHubToken } : {}),
271-
suppressResumeEvent: true,
271+
disableResume: true,
272272
})) as unknown as CopilotHistoryCompactSession;
273273
params.onSession?.(session);
274274
const request = params.customInstructions?.trim()

extensions/copilot/src/hooks-bridge.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { createHooksBridge, type CopilotHooksConfig } from "./hooks-bridge.js";
55
describe("createHooksBridge", () => {
66
const hookBase = {
77
sessionId: "runtime-session",
8-
timestamp: new Date(0),
8+
timestamp: 0,
99
cwd: "/",
1010
workingDirectory: "/",
1111
};

extensions/copilot/src/runtime.test.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ function makeFake(options: FakeFactoryOptions = {}) {
8585

8686
const client: FakeClient = {
8787
id,
88-
copilotHome: clientOptions.baseDirectory ?? "",
88+
copilotHome: clientOptions.copilotHome ?? "",
8989
start: vi.fn(async () => undefined),
9090
stop: vi.fn(async () => {
9191
stops.push(id);
@@ -278,11 +278,11 @@ describe("createCopilotClientPool", () => {
278278
const sdkFactory = async (clientOptions: CopilotClientOptions) => {
279279
attempt += 1;
280280
if (attempt === 1) {
281-
throw new Error(`constructor failed for ${String(clientOptions.baseDirectory)}`);
281+
throw new Error(`constructor failed for ${String(clientOptions.copilotHome)}`);
282282
}
283283
return {
284284
id: attempt,
285-
copilotHome: clientOptions.baseDirectory,
285+
copilotHome: clientOptions.copilotHome,
286286
start: vi.fn(async () => undefined),
287287
stop: vi.fn(async () => []),
288288
createSession: vi.fn(async () => ({})),
@@ -455,7 +455,7 @@ describe("createCopilotClientPool", () => {
455455
expect(first.client).toBe(second.client);
456456
expect(first.key.copilotHome).toBe(normalizedHome);
457457
expect(second.key.copilotHome).toBe(normalizedHome);
458-
expect(String(sdk.ctorCalls[0]?.baseDirectory)).toBe(normalizedHome);
458+
expect(String(sdk.ctorCalls[0]?.copilotHome)).toBe(normalizedHome);
459459
} finally {
460460
Object.defineProperty(process, "platform", { configurable: true, value: originalPlatform });
461461
}
@@ -483,7 +483,7 @@ describe("createCopilotClientPool", () => {
483483
expect(first.key.copilotHome).toBe(normalizedHome);
484484
expect(second.key.copilotHome).toBe(normalizedHome);
485485
expect(sdk.ctorCalls.length).toBe(1);
486-
expect(String(sdk.ctorCalls[0]?.baseDirectory)).toBe(normalizedHome);
486+
expect(String(sdk.ctorCalls[0]?.copilotHome)).toBe(normalizedHome);
487487
});
488488
});
489489

extensions/copilot/src/runtime.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ export interface PoolKey {
2121

2222
export interface ClientCreateOptions extends Omit<
2323
CopilotClientOptions,
24-
"baseDirectory" | "workingDirectory" | "useLoggedInUser" | "gitHubToken"
24+
"copilotHome" | "workingDirectory" | "useLoggedInUser" | "gitHubToken"
2525
> {
2626
readonly copilotHome: string;
2727
readonly useLoggedInUser?: boolean;
@@ -365,7 +365,7 @@ function normalizeClientCreateOptions(
365365
const { copilotHome: _copilotHome, ...clientOptions } = options;
366366
return {
367367
...clientOptions,
368-
baseDirectory: normalizedCopilotHome,
368+
copilotHome: normalizedCopilotHome,
369369
};
370370
}
371371

0 commit comments

Comments
 (0)