Skip to content

armgit / cindy

Public Imported from GitHub
0

Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。

test(orca): align placement contracts and await import persistence

davidcbaf7fb4f94b
diff --git a/apps/desktop/src/main/__tests__/remoteAgentSetModelWiring.test.ts b/apps/desktop/src/main/__tests__/remoteAgentSetModelWiring.test.ts
index c13d244f68..f3467c6aba 100644
--- a/apps/desktop/src/main/__tests__/remoteAgentSetModelWiring.test.ts
+++ b/apps/desktop/src/main/__tests__/remoteAgentSetModelWiring.test.ts
@@ -87,7 +87,9 @@ describe('agent-device model selection wiring', () => {
});
it("lists the other computer's models for Orca leads whose agent runs there", () => {
- const start = source.indexOf('listAvailableModels: async ({ agent, callerSessionId, agentDeviceId: requestedAgentDeviceId }) => {');
+ // Locate the protocol adapter by its name, independent of optional inputs.
+ // Worker discovery behavior is covered by orcaRemoteWorkers unit tests.
+ const start = source.indexOf('listAvailableModels: async (');
expect(start).toBeGreaterThan(0);
const body = source.slice(start, source.indexOf('const providerRouting = await getProviderRoutingContext();', start));
// 不指定位置时列 Lead 所在位置(Lead 归在供应商组里时列组那一项所在电脑);Lead 也可以指定别的电脑 / 分享,
diff --git a/apps/desktop/src/main/bot-import/__tests__/host.test.ts b/apps/desktop/src/main/bot-import/__tests__/host.test.ts
index ffc8c78d51..8c9904c540 100644
--- a/apps/desktop/src/main/bot-import/__tests__/host.test.ts
+++ b/apps/desktop/src/main/bot-import/__tests__/host.test.ts
@@ -1417,9 +1417,13 @@ it.each(['short-legacy-document', `memory-${'a'.repeat(20)}-${'b'.repeat(20)}`])
const [source] = await listCompanionImportSources('phone');
const preview = await previewCompanionImport(source!.id, 'phone');
const selection = { previewId: preview.id, requestId: 'fixture-recovered-docs', name: 'Ada', entryIds: ['memory-original-entry'], takeover: false, deferSetup: true };
- await startCompanionImport(selection, 'phone');
- await vi.waitFor(async () => expect((await getCompanionImportResult(selection.requestId))?.status).toBe('needs-attention'));
+ const accepted = await startCompanionImport(selection, 'phone');
+ // CI on Windows can accept before real memory writes finish. Join the host's
+ // existing profile lock instead of polling under a fixed wall-clock budget;
+ // retain the partial-save and stable-ID assertions through the real import.
+ await withBotProfileLocks([accepted.botId], async () => {});
const result = (await getCompanionImportResult(selection.requestId))!;
+ expect(result.status).toBe('needs-attention');
// Simulate the old durable checkpoint, without an available source tree.
await h.store.update(h.root, result.botId, () => {}, environment => {
const snapshot = JSON.parse(environment.pendingImport!.snapshotJson);
@@ -1429,7 +1433,9 @@ it.each(['short-legacy-document', `memory-${'a'.repeat(20)}-${'b'.repeat(20)}`])
const firstFiles = (await storage.list()).map(record => record.filename);
expect(firstFiles).toHaveLength(1);
await startCompanionImport(selection, 'reconnected');
- await vi.waitFor(async () => expect((await getCompanionImportResult(selection.requestId))?.status).toBe('complete'));
+ await withBotProfileLocks([result.botId], async () => {});
+ const completed = await getCompanionImportResult(selection.requestId);
+ expect(completed?.status).toBe('complete');
expect((await storage.list()).map(record => record.filename)).toEqual(firstFiles);
const ids = h.importDocument.mock.calls.map(call => call[1] as string);
expect(ids[0]).toBe(ids[1]);
diff --git a/apps/desktop/src/renderer/features/cc-agent/__tests__/OrcaWorkerPanel.test.tsx b/apps/desktop/src/renderer/features/cc-agent/__tests__/OrcaWorkerPanel.test.tsx
index 4f7e0efbb4..be5a01ad98 100644
--- a/apps/desktop/src/renderer/features/cc-agent/__tests__/OrcaWorkerPanel.test.tsx
+++ b/apps/desktop/src/renderer/features/cc-agent/__tests__/OrcaWorkerPanel.test.tsx
@@ -283,7 +283,9 @@ describe('OrcaWorkerPanel worker on another computer', () => {
expect(mocks.sessionViewProps).toMatchObject({ sessionIdProp: 'proxy-1' });
});
- it('offers execution devices only for a confirmed local Lead and local Agent', () => {
+ // PR #6787: the work computer no longer depends on the Lead's Agent location.
+ // Exercise the real panel's dialog contract, retaining SSH/controlled limits.
+ it('offers execution devices for a confirmed local Lead independently of its Agent location', () => {
const { rerender } = render(
<OrcaWorkerPanel leadSessionId="lead-1" deviceId={null} agentDeviceId={null} viewVisible />,
);
@@ -293,9 +295,9 @@ describe('OrcaWorkerPanel worker on another computer', () => {
rerender(<OrcaWorkerPanel leadSessionId="lead-1" deviceId="dev-1" agentDeviceId={null} viewVisible />);
expect(mocks.createProps.executionDevicesEnabled).toBe(false);
rerender(<OrcaWorkerPanel leadSessionId="lead-1" deviceId={null} agentDeviceId="agent-pc" viewVisible />);
- expect(mocks.createProps.executionDevicesEnabled).toBe(false);
+ expect(mocks.createProps.executionDevicesEnabled).toBe(true);
rerender(<OrcaWorkerPanel leadSessionId="lead-1" deviceId={null} viewVisible />);
- expect(mocks.createProps.executionDevicesEnabled).toBe(false);
+ expect(mocks.createProps.executionDevicesEnabled).toBe(true);
rerender(<OrcaWorkerPanel leadSessionId="lead-1" viewVisible />);
expect(mocks.createProps.executionDevicesEnabled).toBe(false);
});
@@ -475,14 +477,14 @@ describe('OrcaWorkersTabBody Lead Agent context', () => {
expect(mocks.toolbarProps.clearAttentionWhenVisible).toBe(false);
});
- it.each([false, true])('hides execution devices for a remote Agent while keeping creation available (detached: %s)', async (detached) => {
+ it.each([false, true])('keeps execution devices available with a remote Agent (detached: %s)', async (detached) => {
mocks.sidebarWindow = detached;
mocks.sessions = [
{ id: 'other-lead', agentDeviceId: null, orcaRole: 'lead' },
{ id: 'lead-1', agentDeviceId: 'agent-pc', orcaRole: 'lead' },
];
const { rerender } = render(<OrcaWorkersTabBody ctx={ctx} state={{}} active />);
- expect(mocks.createProps.executionDevicesEnabled).toBe(false);
+ expect(mocks.createProps.executionDevicesEnabled).toBe(true);
expect(mocks.createProps.onCreate).toBeTypeOf('function');
await act(async () => (mocks.toolbarProps.onOpenCreate as () => void)());
expect(mocks.setCreateOpen).toHaveBeenCalledWith(true);
@@ -492,14 +494,16 @@ describe('OrcaWorkersTabBody Lead Agent context', () => {
expect(mocks.createProps.executionDevicesEnabled).toBe(true);
});
- it('does not offer execution devices before Lead metadata is available', () => {
+ it('keeps execution devices independent of pending Lead Agent metadata', () => {
mocks.sessionsLoading = true;
const { rerender } = render(<OrcaWorkersTabBody ctx={ctx} state={{}} active />);
- expect(mocks.createProps.executionDevicesEnabled).toBe(false);
+ expect(mocks.createProps.executionDevicesEnabled).toBe(true);
+ expect(mocks.workerAgentInput?.controlledDeviceId).toBeUndefined();
mocks.sessionsLoading = false;
mocks.sessions = [{ id: 'lead-1', orcaRole: 'lead' }];
rerender(<OrcaWorkersTabBody ctx={ctx} state={{}} active />);
expect(mocks.createProps.executionDevicesEnabled).toBe(true);
+ expect(mocks.workerAgentInput?.controlledDeviceId).toBeNull();
});
});