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。

fix(orca): retain Worker placement across draft and mobile forms

davidc949d6ec16f8
diff --git a/apps/desktop/src/renderer/features/cc-agent/NewMakerDraftRoute.tsx b/apps/desktop/src/renderer/features/cc-agent/NewMakerDraftRoute.tsx
index c8d3000b13..f3af066da7 100644
--- a/apps/desktop/src/renderer/features/cc-agent/NewMakerDraftRoute.tsx
+++ b/apps/desktop/src/renderer/features/cc-agent/NewMakerDraftRoute.tsx
@@ -508,6 +508,7 @@ function draftEnableOrcaOptions(
...(deferDelegateTask ? { deferDelegateTask: true } : {}),
workerPermissionMode: cfg.workerPermissionMode,
executionDeviceId: cfg.executionDeviceId,
+ ...(cfg.agentDeviceId !== undefined ? { agentDeviceId: cfg.agentDeviceId } : {}),
...(cfg.executionWorkingDir ? { workingDir: cfg.executionWorkingDir } : {}),
};
}
diff --git a/apps/desktop/src/renderer/features/cc-agent/__tests__/newMakerDraftSubmission.test.ts b/apps/desktop/src/renderer/features/cc-agent/__tests__/newMakerDraftSubmission.test.ts
index fef46db5af..36c3f7afec 100644
--- a/apps/desktop/src/renderer/features/cc-agent/__tests__/newMakerDraftSubmission.test.ts
+++ b/apps/desktop/src/renderer/features/cc-agent/__tests__/newMakerDraftSubmission.test.ts
@@ -3,7 +3,9 @@ import { resolve } from 'node:path';
import { runInNewContext } from 'node:vm';
import ts from 'typescript';
import { describe, expect, it, vi } from 'vitest';
-import { buildUserProvider, getModel, type PiReasoningEffort, type ProviderView } from '@cindy/model-providers';
+import { buildUserProvider, connectedProvidersForAgent, getModel, isModelSelectableForNewRoute, type PiReasoningEffort, type ProviderView } from '@cindy/model-providers';
+import { createWorkerLabel } from '../workerLabel';
+import type { CollabDraft } from '@/state/newMakerDraft';
import { resolveSessionExecutionSelection } from '../../../../main/maker-ipc/sessionExecutionSelection';
import * as draftEffort from '../newMakerDraftModelPrefs';
import { resolveDeviceLinkSubmission } from '../deviceLinkCreateArgs';
@@ -35,6 +37,12 @@ function visit(node: ts.Node) {
ts.forEachChild(node, visit);
}
visit(source);
+const collabBuilder = source.statements.find((node): node is ts.FunctionDeclaration =>
+ ts.isFunctionDeclaration(node) && node.name?.text === 'draftEnableOrcaOptions');
+if (!collabBuilder) throw new Error('Draft collaboration builder missing');
+const collabBuilderCode = ts.transpileModule(`${collabBuilder.getText(source)}; draftEnableOrcaOptions`, {
+ compilerOptions: { target: ts.ScriptTarget.ES2022, module: ts.ModuleKind.CommonJS },
+}).outputText;
function executable(name: string) {
if (!callbacks[name]) throw new Error(`NewMakerDraftRoute.${name} callback missing`);
return ts.transpileModule(`(${callbacks[name].getText(source)})`, {
@@ -74,6 +82,7 @@ async function submit(options: {
worktreeSkills?: AgentSkillCommand[];
deviceId?: string;
worktreeSkillsAfterCollab?: AgentSkillCommand[];
+ collab?: CollabDraft;
slashCommandRanges?: Array<{ start: number; end: number }>;
} = {}) {
const providers = options.providers ?? [provider()];
@@ -125,11 +134,15 @@ async function submit(options: {
if (channel === 'maker:create-session') return { sessionId: args[0].id, workDir: args[0].workingDir };
throw new Error(`Unexpected remote invoke: ${channel}`);
});
+ const enableOrca = vi.fn(async () => {
+ worktreeSkills = options.worktreeSkillsAfterCollab;
+ return { workerSessionId: 'worker' };
+ });
vi.stubGlobal('window', { electronAPI: {
deviceLink: { invoke: invokeRemote },
worktreeCreate: vi.fn(async () => ({ ok: true, meta: { path: worktreePath, branch: 'cindy/creator' } })),
localDb: { sessions: { create: ipcCreate } }, maker: {
- enableOrca: async () => { worktreeSkills = options.worktreeSkillsAfterCollab; return { workerSessionId: 'worker' }; },
+ enableOrca,
setGoal, listAgentSkills,
listDesktopCommands: async () => ({ success: true, commands: [] }),
listAgentCommands: async () => ({ success: true, commands: [] }),
@@ -156,7 +169,7 @@ async function submit(options: {
calibratedDraftModel: selectedModel, chatPrefs, getProviderModelEffort: () => undefined,
chatInitialProviderId: selectedProviderId, chatInitialPermissionMode: 'default',
effectiveSourceId: selectedProviderId,
- sendInFlightRef: { current: false }, effectiveCollab: { enabled: !!options.worktreeSkillsAfterCollab },
+ sendInFlightRef: { current: false }, effectiveCollab: options.collab ?? { enabled: !!options.worktreeSkillsAfterCollab },
collabPolicy: { enabled: true }, collabPolicyEligible: true,
usesDeviceCatalog: !!options.agentDeviceId || !!options.deviceId, deviceLinkInitial: null,
isDeviceLinkDraft: !!options.deviceId, isRemoteProjectDraft: !!options.remoteHostId,
@@ -216,6 +229,11 @@ async function submit(options: {
log: { warn: (...args: unknown[]) => errors.push(args), error: (...args: unknown[]) => errors.push(args) },
toast: { error: toastError, warning: noop },
};
+ if (options.collab) {
+ environment.draftEnableOrcaOptions = runInNewContext(collabBuilderCode, {
+ ...environment, connectedProvidersForAgent, isModelSelectableForNewRoute, createWorkerLabel,
+ });
+ }
const localDraftEffort = runInNewContext(executable('localDraftEffort'), environment)();
const selection = runInNewContext(executable('draftInitialSelection'), { ...environment, localDraftEffort })();
Object.assign(environment, { draftInitialModel: selection.model, draftInitialEffort: selection.effort });
@@ -230,11 +248,25 @@ async function submit(options: {
}
await finished;
if (hasWorktree && createSession.mock.calls.length) await worktreeFinished;
- return { createSession, ipcCreate, sendMessage, setGoal, errors, environment, setPending, toastError, listAgentSkills, invokeRemote };
+ return { createSession, ipcCreate, sendMessage, setGoal, errors, environment, setPending, toastError, listAgentSkills, invokeRemote, enableOrca };
} finally { vi.unstubAllGlobals(); }
}
describe('homepage submission to Main admission and first-message handoff', () => {
+ // PR #6787, unit: the form stored both computers but the real draft builder
+ // dropped the model computer. Existing route tests stubbed that builder. Use
+ // the same production callback harness with the actual builder and assert IPC.
+ it.each(['send', 'goal'] as const)('forwards both Worker computers when creating a local %s', async entry => {
+ const result = await submit({ entry, collab: { enabled: true, worker: 'codex', workerConfig: {
+ role: 'developer', model: 'remote-only', providerId: 'remote-provider',
+ executionDeviceId: 'work-pc', executionWorkingDir: '/worker', agentDeviceId: 'model-pc',
+ } } });
+ expect(result.errors).toEqual([]);
+ expect(result.enableOrca).toHaveBeenCalledExactlyOnceWith('created', expect.objectContaining({
+ workerAgent: 'codex', model: 'remote-only', providerId: 'remote-provider',
+ executionDeviceId: 'work-pc', workingDir: '/worker', agentDeviceId: 'model-pc',
+ }));
+ });
// Unit: a Claude-prefilled creator draft must be resolved again after switching
// to Pi, including when Pi uses another computer as its provider. Exercise the
// actual home submit callback before any session creation/handoff.
diff --git a/apps/mobile/src/__tests__/OrcaWorkerFormView.test.tsx b/apps/mobile/src/__tests__/OrcaWorkerFormView.test.tsx
new file mode 100644
index 0000000000..78363cd9a9
--- /dev/null
+++ b/apps/mobile/src/__tests__/OrcaWorkerFormView.test.tsx
@@ -0,0 +1,70 @@
+// @vitest-environment jsdom
+import { act, useState, type ReactNode } from 'react';
+import { createRoot } from 'react-dom/client';
+import { expect, it, vi } from 'vitest';
+import { OrcaWorkerFormView } from '@/session/ContextSheetCollabView';
+import type { OrcaWorkerFormValue } from '@/session/orcaTeam';
+
+vi.mock('react-i18next', async importOriginal => ({
+ ...await importOriginal<typeof import('react-i18next')>(),
+ useTranslation: () => ({ t: (key: string) => key }),
+}));
+vi.mock('react-native', () => ({ Platform: { OS: 'android' }, View: 'div' }));
+vi.mock('lucide-react-native', () => ({ CircleStop: () => null, UserPlus: () => null }));
+vi.mock('@/theme', () => ({
+ iconSize: {}, iconStroke: {}, lineHeight: {}, radius: {}, typeScale: {},
+ useTheme: () => ({ colors: {} }),
+}));
+vi.mock('@/session/ContextSheet', () => {
+ const SelectRow = (props: {
+ testID?: string; value: string; disabled?: boolean;
+ options: Array<{ id: string; label: string; disabled?: boolean }>;
+ onChange(value: string): void;
+ }) => <select data-testid={props.testID} value={props.value} disabled={props.disabled}
+ onChange={event => props.onChange(event.target.value)}>
+ {props.options.map(option => <option key={option.id} value={option.id} disabled={option.disabled}>{option.label}</option>)}
+ </select>;
+ return {
+ ContextSheetGroup: ({ children }: { children: ReactNode }) => <div>{children}</div>,
+ ContextSheetChoiceRow: SelectRow, ContextSheetSelectRow: SelectRow,
+ ContextSheetRow: ({ testID, onPress }: { testID?: string; onPress?(): void }) =>
+ <button data-testid={testID} onClick={onPress} />,
+ ContextSheetTextField: () => null, ContextSheetError: () => null, ContextSheetNote: () => null,
+ };
+});
+
+// PR #6787, unit: render the production form through its controls. The existing
+// hook tests mock this component, so they cannot detect its mutual-exclusion gate.
+// This DOM fixture needs a separate file from the hook's module/native mocks.
+it.each([false, true])('keeps the work computer editable after choosing a model computer (work chosen first=%s)', async workFirst => {
+ Object.assign(globalThis, { IS_REACT_ACT_ENVIRONMENT: true });
+ const changed = vi.fn();
+ function Form() {
+ const [form, setForm] = useState<OrcaWorkerFormValue>({
+ role: 'developer', agent: 'codex', permissionMode: 'auto', model: null, initialTask: '',
+ ...(workFirst ? { executionDeviceId: 'work-b' } : {}),
+ });
+ return <OrcaWorkerFormView form={form} customRoleMode={false} onCustomRoleModeChange={() => {}}
+ onChange={patch => { changed(patch); setForm(current => ({ ...current, ...patch })); }}
+ onAgentChange={() => {}} onPermissionChange={() => {}} agents={['codex']} busy={false}
+ onPickDirectory={() => {}} onPickModel={() => setForm(current => ({ ...current, agentDeviceId: 'model-c' }))}
+ executionDevices={[
+ { deviceId: 'work-b', name: 'B', platform: 'win32', supported: true },
+ { deviceId: 'work-d', name: 'D', platform: 'darwin', supported: true },
+ ]} />;
+ }
+ const container = document.createElement('div');
+ const root = createRoot(container);
+ try {
+ await act(async () => root.render(<Form />));
+ await act(async () => container.querySelector<HTMLButtonElement>('[data-testid="collab.modelRow"]')!.click());
+ const selector = container.querySelector<HTMLSelectElement>('[data-testid="collab.executionDevice"]');
+ expect(selector).not.toBeNull();
+ expect(selector!.disabled).toBe(false);
+ await act(async () => { selector!.value = 'work-d'; selector!.dispatchEvent(new Event('change', { bubbles: true })); });
+ expect(changed).toHaveBeenLastCalledWith({ executionDeviceId: 'work-d' });
+ await act(async () => { selector!.value = '__lead__'; selector!.dispatchEvent(new Event('change', { bubbles: true })); });
+ expect(changed).toHaveBeenLastCalledWith({ executionDeviceId: undefined });
+ expect(container.querySelector<HTMLSelectElement>('[data-testid="collab.executionDevice"]')?.value).toBe('__lead__');
+ } finally { await act(async () => root.unmount()); }
+});
diff --git a/apps/mobile/src/session/ContextSheetCollabView.tsx b/apps/mobile/src/session/ContextSheetCollabView.tsx
index 9afcf1fa06..5bb29a3cf4 100644
--- a/apps/mobile/src/session/ContextSheetCollabView.tsx
+++ b/apps/mobile/src/session/ContextSheetCollabView.tsx
@@ -32,7 +32,6 @@ import {
} from '@/session/ContextSheet';
import {
orcaAgentLabel,
- orcaWorkerAgentElsewhere,
orcaWorkerDisplayName,
orcaWorkerStatusLabel,
isAbsoluteOrcaWorkerDir,
@@ -146,8 +145,8 @@ export function OrcaWorkerFormView({
/>
) : null}
</ContextSheetGroup>
- {/* 运行设备与远程供应商互斥:Worker 的 Agent 已选在另一台电脑时不提供运行设备。 */}
- {(executionDevices.length > 0 || form.executionDeviceId) && !orcaWorkerAgentElsewhere(form) ? (
+ {/* 工作电脑与模型电脑独立选择。 */}
+ {(executionDevices.length > 0 || form.executionDeviceId) ? (
<ContextSheetGroup
footer={t('session.collab.executionDeviceHint')}
label={title(t('session.collab.executionDeviceLabel'))}