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。

Merge remote-tracking branch 'upstream/main' into feat/orca-lead-images

Zhang Yunjin7f9c234c34ff
diff --cc apps/desktop/src/main/maker-ipc/register.ts
index 1c45a604e7,6bc8889d4f..6e040440f1
--- a/apps/desktop/src/main/maker-ipc/register.ts
+++ b/apps/desktop/src/main/maker-ipc/register.ts
@@@ -2230,7 -2437,9 +2438,10 @@@ interface OrcaCollabService
label: string;
workingDir?: string;
initialTask?: string;
+ initialTaskImages?: string[];
+ executionDeviceId?: string;
+ /** Worker 的 Agent 所在位置;语义见 OrcaWorkerCreateParams.agentDeviceId。 */
+ agentDeviceId?: string | null;
}) => Promise<
| {
ok: true;
@@@ -12337,35 -13589,11 +13592,40 @@@ export function registerMakerIpc(maker
getSessionMeta: (sessionId) => maker.getSessionMeta(sessionId).catch(() => null),
getSessionRowSnapshot,
getLiveSession: (sessionId) => maker.getSession(sessionId),
+ validateImageAttachments: async (paths) => {
+ // 图片来源两类: 会话受管地址(cindy-media:// / xdt-image://)与任意本机绝对路径。
+ const images: Array<{ path: string; name: string; ext: string; size: number; mimeType: string }> = [];
+ for (const input of paths) {
+ const resolved = resolveOrcaImageAttachmentInput(input);
+ if (!resolved) {
+ return {
+ ok: false,
+ message: `image not resolvable (accepts cindy-media:// / xdt-image:// URIs or local image files: png/jpeg/gif/webp): ${input}`,
+ };
+ }
+ let size: number;
+ try {
+ const stat = await fsp.stat(resolved.absPath);
+ if (!stat.isFile()) throw new Error('not a file');
+ size = stat.size;
+ } catch {
+ return { ok: false, message: `image not found or unreadable: ${input}` };
+ }
+ images.push({
+ path: resolved.absPath,
+ name: path.basename(resolved.absPath),
+ ext: path.extname(resolved.absPath).toLowerCase(),
+ size,
+ mimeType: resolved.mimeType,
+ });
+ }
+ return { ok: true, images };
+ },
+ applyPendingAgentSwitch: (sessionId) =>
+ applyPendingAgentSwitchIfIdle(agentSwitchDeps, sessionId, { bootstrapAfterSwitch: true }),
+ hasPendingAgentSwitch: (sessionId) => !!agentSwitchPending.get(sessionId),
+ peekPendingHandoff: (sessionId) => agentHandoffPending.peek(sessionId),
+ consumePendingHandoff: (sessionId) => agentHandoffPending.consume(sessionId),
shouldQueueNewTurn: (sessionId): boolean => inputCoordinator.shouldQueueNewTurn(sessionId),
steerControlInput: (sessionId, item, expectedTurn) =>
inputCoordinator.steerControlInput(sessionId, { item }, expectedTurn),
diff --cc packages/lizi-mcps/src/orca/server.ts
index abdb0bcf2d,eceee25ead..4947c4944f
--- a/packages/lizi-mcps/src/orca/server.ts
+++ b/packages/lizi-mcps/src/orca/server.ts
@@@ -106,8 -106,9 +106,10 @@@ export interface OrcaMcpDeps
label: string;
workingDir?: string;
executionDeviceId?: string;
+ /** Worker 的 Agent 所在位置:null = 任务所在电脑;省略 = 跟 Lead。 */
+ agentDeviceId?: string | null;
initialTask?: string;
+ initialTaskImages?: string[];
}) => Promise<
ControlResult<
{ workerId: string; workerSessionId: string; softLimitExceeded?: boolean; dispatched?: boolean; dispatchOutcome?: import('../lizi_xdtHelperMcpServer.js').ControlDispatchOutcome; queuedMessageId?: string },
diff --cc packages/lizi-mcps/src/xdt-helper/create_worker.ts
index 081bada858,d4a0cf71a9..6d8c6d711c
--- a/packages/lizi-mcps/src/xdt-helper/create_worker.ts
+++ b/packages/lizi-mcps/src/xdt-helper/create_worker.ts
@@@ -61,8 -73,9 +73,10 @@@ export interface CreateWorkerDeps
label: string;
workingDir?: string;
executionDeviceId?: string;
+ /** Worker 的 Agent 所在位置:null = 任务所在电脑;省略 = 跟 Lead。 */
+ agentDeviceId?: string | null;
initialTask?: string;
+ initialTaskImages?: string[];
}) => Promise<CreateWorkerControlResult>;
}
@@@ -156,8 -156,8 +172,9 @@@ const DESCRIPTION =
'- label: worker 短标识, 1-32 chars, 只能含字母、数字、-、_, 同 workflow 内唯一, 用于 switch_focus 定位',
'- working_dir: 可选,Worker 所在主机上已存在的绝对目录;创建前校验并绑定,省略继承 Lead,失败不回退。不创建目录或 Git worktree。指定 execution_device_id 时是那台电脑上的目录,省略由那台分配。',
'- execution_device_id: 可选,运行设备(同账号另一台电脑)的 device_id,只能取 get_workspace_info 的 execution_devices 里 supported=true 的值;指定后 Worker 的任务、目录、命令与文件都在那台电脑,结果仍自动回报给你。用户没有要求放到别的电脑时不要传。',
+ '- agent_device_id: 可选,Worker 的 Agent 在哪运行(远程供应商,任务与文件仍在这台):取 list_available_models 的 locations[].agent_device_id,"local" 为这台电脑;省略与 Lead 相同。model / provider_id 要取 list_available_models 按同一位置列出的值。',
"- initial_task: 可选, 创建后立即派给 worker 的第一条消息;dispatch_outcome.wakeKind=queued 表示首条任务已成功入队(此时回传 queued_message_id, 被消费前可用 get_worker_queue_status / update_queued_message / cancel_queued_message / merge_queued_messages 管理);dispatch_outcome.kind='session-dispatch' 且 dispatched=false,或 kind='host-send' 且 accepted=false,表示 worker 已创建但首条任务未送达 / 派发失败",
+ "- images: 可选, 随 initial_task 发的图片(最多 8 张, 仅本机 worker)。用户在对话里贴的图, 把上下文 <cindy-host-image-references> 里的 uri 原样传入; Lead 自己落盘的文件传本机绝对路径。",
'',
'【硬边界】',
'- worker 数量达软上限 → 创建仍成功, payload.warning = WORKER_LIMIT_SOFT_EXCEEDED',
@@@ -181,7 -181,7 +198,7 @@@ export function registerCreateWorkerToo
category: 'control',
description: DESCRIPTION,
inputShape: createWorkerSpecSchema.shape,
- handler: async ({ role, agent, model, provider_id, effort, fast, label, initial_task, images, working_dir, execution_device_id }) => {
- handler: async ({ role, agent, model, provider_id, effort, fast, label, initial_task, working_dir, execution_device_id, agent_device_id }) => {
++ handler: async ({ role, agent, model, provider_id, effort, fast, label, initial_task, images, working_dir, execution_device_id, agent_device_id }) => {
const ctx = deps.getSessionContext?.() ?? deps;
if (!ctx.sessionId) {
return errorPayload('LEAD_NOT_SUPPORTED', '当前 session 类型不支持作为 Lead。');
@@@ -202,8 -202,8 +219,9 @@@
fast,
label,
...(working_dir !== undefined ? { workingDir: working_dir } : {}),
+ ...(images ? { initialTaskImages: images } : {}),
...(execution_device_id !== undefined ? { executionDeviceId: execution_device_id } : {}),
+ ...toHostAgentDeviceId(agent_device_id),
initialTask: initial_task,
});
if (!result.ok) {
diff --cc packages/lizi-mcps/src/xdt-helper/create_workers.ts
index 6f10f6a6a6,a1186ce0db..93d2069a3d
--- a/packages/lizi-mcps/src/xdt-helper/create_workers.ts
+++ b/packages/lizi-mcps/src/xdt-helper/create_workers.ts
@@@ -153,8 -154,8 +154,9 @@@ export function registerCreateWorkersTo
fast: worker.fast,
label: worker.label,
...(worker.working_dir !== undefined ? { workingDir: worker.working_dir } : {}),
+ ...(worker.images ? { initialTaskImages: worker.images } : {}),
...(worker.execution_device_id !== undefined ? { executionDeviceId: worker.execution_device_id } : {}),
+ ...toHostAgentDeviceId(worker.agent_device_id),
initialTask: worker.initial_task,
});
limit = result.limit ?? limit;