Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
fix(remote-agent): allow shared custom gateways on agent host
MagicLizi277177e8bd09
diff --git a/apps/desktop/src/main/maker-ipc/__tests__/sessionTurnObserver.test.ts b/apps/desktop/src/main/maker-ipc/__tests__/sessionTurnObserver.test.tsnew file mode 100644index 0000000000..0477697667--- /dev/null+++ b/apps/desktop/src/main/maker-ipc/__tests__/sessionTurnObserver.test.ts@@ -0,0 +1,100 @@+import { beforeEach, describe, expect, it, vi } from 'vitest';++const h = vi.hoisted(() => ({+ verdict: vi.fn(),+ provider: vi.fn<(sessionId: string) => string | null>(),+ ensureLlama: vi.fn(async () => undefined),+}));++vi.mock('../../maker-host/model-route-guard-live.js', () => ({ verdictForModelRoute: h.verdict }));+vi.mock('../../maker-host/session-provider-store.js', () => ({ getSessionProvider: h.provider }));+vi.mock('../../local-model-runtime/preflight.js', () => ({ ensureManagedOllamaReadyForSession: h.ensureLlama }));+vi.mock('../../logger.js', () => ({ createLogger: () => ({ debug: vi.fn() }) }));++import type { Session } from '@cindy/maker-core';+import { MANAGED_LLAMACPP_PROVIDER_ID } from '../../../shared/llamaCpp.js';+import { installSessionTurnObserver } from '../sessionTurnObserver.js';++type Observer = { beforeProviderStart: (turnGeneration: number) => Promise<void> };++function setup(fields: { remoteHostId?: string | null; agentDeviceId?: string | null }) {+ let observer: Observer | null = null;+ const session = {+ id: 's1',+ instanceId: 'i1',+ agentKind: 'pi',+ model: 'some-model',+ workDir: '/work',+ remoteHostId: fields.remoteHostId ?? null,+ agentDeviceId: fields.agentDeviceId ?? null,+ setTurnLifecycleObserver: (next: Observer | null) => { observer = next; },+ claimHostTurnContinuation: vi.fn(),+ } as unknown as Session;+ const deps = {+ beforeLocalProviderStart: vi.fn(async () => undefined),+ silentStopTurnLeaseGate: { supersede: vi.fn(), schedule: vi.fn(), supersedeOwnedBy: vi.fn() },+ sessionTurnLeaseTracker: { markTurnStarted: vi.fn(async () => undefined), markTurnEnded: vi.fn(async () => undefined) },+ providerTurnLeaseId: (instanceId: string, generation: number) => `${instanceId}:${generation}`,+ log: { debug: vi.fn() },+ };+ installSessionTurnObserver(deps, session);+ return { deps, start: () => observer!.beforeProviderStart(1) };+}++describe('installSessionTurnObserver provider precheck', () => {+ beforeEach(() => {+ h.verdict.mockReset();+ h.provider.mockReset();+ h.ensureLlama.mockClear();+ h.verdict.mockResolvedValue({ kind: 'reject', reason: 'explicit-source-unavailable' });+ h.provider.mockReturnValue('magpie-2e446a11');+ });++ it('still rejects a local session whose explicit source is gone from this computer', async () => {+ const { deps, start } = setup({});+ await expect(start()).rejects.toMatchObject({ message: expect.stringContaining('magpie-2e446a11') });+ expect(h.verdict).toHaveBeenCalledWith('pi', 'some-model', 'magpie-2e446a11');+ expect(deps.sessionTurnLeaseTracker.markTurnStarted).not.toHaveBeenCalled();+ });++ it('does not treat a source missing from this computer as gone when the Agent runs elsewhere', async () => {+ for (const agentDeviceId of ['share:abc', 'device-2']) {+ h.verdict.mockClear();+ const { deps, start } = setup({ agentDeviceId });+ await expect(start()).resolves.toBeUndefined();+ expect(h.verdict).toHaveBeenCalledWith('pi', 'some-model', 'magpie-2e446a11');+ expect(deps.beforeLocalProviderStart).toHaveBeenCalledTimes(1);+ expect(deps.silentStopTurnLeaseGate.supersede).toHaveBeenCalledWith('s1');+ expect(deps.sessionTurnLeaseTracker.markTurnStarted).toHaveBeenCalledWith('s1', 'i1:1');+ }+ });++ it('keeps the paid-model gate for an Agent on another computer', async () => {+ h.verdict.mockResolvedValue({ kind: 'reject', reason: 'payment-required' });+ const rejected = setup({ agentDeviceId: 'device-2' });+ await expect(rejected.start()).rejects.toMatchObject({ code: 'PERMISSION_DENIED' });+ expect(rejected.deps.sessionTurnLeaseTracker.markTurnStarted).not.toHaveBeenCalled();+ h.verdict.mockResolvedValue({ kind: 'reroute', providerId: 'paid', reason: 'payment-required' });+ const rerouted = setup({ agentDeviceId: 'share:abc' });+ await expect(rerouted.start()).rejects.toMatchObject({ code: 'INVALID_PARAMS' });+ });++ it("does not start this computer's managed llama.cpp for an Agent on another computer", async () => {+ h.provider.mockReturnValue(MANAGED_LLAMACPP_PROVIDER_ID);+ const remote = setup({ agentDeviceId: 'device-2' });+ await remote.start();+ expect(h.ensureLlama).not.toHaveBeenCalled();+ h.verdict.mockResolvedValue({ kind: 'pass' });+ const local = setup({});+ await local.start();+ expect(h.ensureLlama).toHaveBeenCalledTimes(1);+ });++ it('keeps the SSH early return unchanged', async () => {+ const { deps, start } = setup({ remoteHostId: 'ssh-host' });+ await start();+ expect(h.verdict).not.toHaveBeenCalled();+ expect(deps.beforeLocalProviderStart).not.toHaveBeenCalled();+ expect(deps.sessionTurnLeaseTracker.markTurnStarted).not.toHaveBeenCalled();+ });+});diff --git a/apps/desktop/src/main/maker-ipc/sessionTurnObserver.ts b/apps/desktop/src/main/maker-ipc/sessionTurnObserver.tsindex ff83631877..a33e1b1ddb 100644--- a/apps/desktop/src/main/maker-ipc/sessionTurnObserver.ts+++ b/apps/desktop/src/main/maker-ipc/sessionTurnObserver.ts@@ -33,6 +33,9 @@ export function installSessionTurnObserver(deps: InstallSessionTurnObserverDeps,await deps.beforeLocalProviderStart?.(session);// 每条本地 Session.send 都经过这一个 Main-owned 边界,包括 renderer、IM、// Goal、Learn、Hook 与 Scheduler。付费权限不能只挂在普通 IPC 发送事务上。+ // Agent 在另一台电脑(含 `share:` 分享来源)上运行时,所选来源在对端目录里;本机目录查不到+ // 它不代表来源失效。只放过这一种拒绝,provider 原样保留,付费门禁照常执行。+ const providerOnOtherDevice = session.agentDeviceId !== null;const model = session.model;if (model) {const verdict = await verdictForModelRoute(@@ -53,14 +56,18 @@ export function installSessionTurnObserver(deps: InstallSessionTurnObserverDeps,if (verdict.kind === 'reject' && verdict.reason === 'payment-required') {throwIpcError('PERMISSION_DENIED', `model "${model}" requires paid access`);}- if (verdict.kind === 'reject' && verdict.reason === 'explicit-source-unavailable') {+ if (+ verdict.kind === 'reject'+ && verdict.reason === 'explicit-source-unavailable'+ && !providerOnOtherDevice+ ) {throwIpcError('INVALID_PARAMS', describeModelRouteRejection(verdict.reason, model, getSessionProvider(session.id)));}}// Existing tasks must restore the managed service after a manual stop too.// Reuse the common send boundary so IM/Goal/Scheduler get the same behavior.const providerId = getSessionProvider(session.id);- if (providerId === MANAGED_LLAMACPP_PROVIDER_ID) {+ if (!providerOnOtherDevice && providerId === MANAGED_LLAMACPP_PROVIDER_ID) {await ensureManagedOllamaReadyForSession({ providerId, onlyIfStopped: true });}deps.silentStopTurnLeaseGate.supersede(session.id);diff --git a/packages/maker-core/src/maker.agentDevice.test.ts b/packages/maker-core/src/maker.agentDevice.test.tsindex 664c315ee8..276b26b507 100644--- a/packages/maker-core/src/maker.agentDevice.test.ts+++ b/packages/maker-core/src/maker.agentDevice.test.ts@@ -94,6 +94,8 @@ describe('Maker: agent on another computer', () => {options: expect.objectContaining({ sessionId: 'task-1', workingDir: '/repo', model: 'spark/qwen', providerId: 'spark' }),});expect(store.rows.get('task-1')?.agentDeviceId).toBe('dev-b');+ // 发送边界据此判断供应商目录在对端,不能拿本机目录裁决。+ expect(session.agentDeviceId).toBe('dev-b');// 那台的 Cindy 不能转发对话截断时不提供回退(文件按本机保存点回退,对话在那台截断)。expect(session.capabilities.rewind).toMatchObject({supported: false,@@ -120,6 +122,21 @@ describe('Maker: agent on another computer', () => {const maker = new Maker({ agents: { pi: agent }, storage: storage(), logger });const session = await maker.createSession({ id: 'task-l', agentKind: 'pi', workingDir: '/repo', model: 'm' });expect(session.capabilities).toBe(agent.capabilities);+ expect(session.agentDeviceId).toBeNull();+ await maker.shutdown();+ });++ it('marks the session by the branch that actually started it, not a stored device id', async () => {+ const store = storage();+ await store.create({ id: 'task-d', agentKind: 'pi', workDir: '/repo', title: 't', model: 'm', agentDeviceId: 'dev-b' } as SessionMeta);+ const agent = localAgent();+ const startDeviceAgentSession = vi.fn(async () => handle('remote-sdk'));+ const maker = new Maker({ agents: { pi: agent }, storage: store, logger, startDeviceAgentSession });+ // 宿主读取任务记录失败、按本机降级启动时不带 agentDeviceId;事后读回的记录仍写着那台电脑。+ const session = await maker.createSession({ id: 'task-d', agentKind: 'pi', workingDir: '/repo', model: 'm' });+ expect(startDeviceAgentSession).not.toHaveBeenCalled();+ expect(agent.startSession).toHaveBeenCalledTimes(1);+ expect(session.agentDeviceId).toBeNull();await maker.shutdown();});diff --git a/packages/maker-core/src/maker.ts b/packages/maker-core/src/maker.tsindex 2eb8cf35a5..576042c8cd 100644--- a/packages/maker-core/src/maker.ts+++ b/packages/maker-core/src/maker.ts@@ -1064,6 +1064,8 @@ export class Maker {// 透传 remoteHostId 让 host 层在 hot path 上能 O(1) 判 local/remote// (不用每次 send 回 DB 读 SessionMeta — register.ts checkWorkDirExists 走这条)。remoteHostId: meta.remoteHostId ?? null,+ // 取实际决定启动分支的 startOpts:任务记录事后读回的旧值不能把本机启动的会话标成远端。+ agentDeviceId: startOpts.agentDeviceId ?? null,// 层 B:视觉桥钩子(per-session 优先,否则全局默认;缺省不传 = 零干扰)。visionBridge: startOpts.visionBridge ?? this.visionBridge,toolLoopReviewer: this.toolLoopReviewer,diff --git a/packages/maker-core/src/session.ts b/packages/maker-core/src/session.tsindex a76969392c..08ca6685cd 100644--- a/packages/maker-core/src/session.ts+++ b/packages/maker-core/src/session.ts@@ -180,6 +180,11 @@ export interface SessionOptions {* 是不可能存在于本地 fs 的, 没必要也不该 stat。*/remoteHostId?: string | null;+ /**+ * 同账号另一台电脑(或 `share:` 分享来源)上运行 Agent 时的设备 id,与 remoteHostId 互斥。+ * 主进程的发送边界用它判断供应商目录在对端:本机目录不能裁决这类会话的显式来源。+ */+ agentDeviceId?: string | null;/*** turn 零事件看门狗阈值(ms)。省略 = env / DEFAULT_TURN_STALL_MS;0 = 关闭。* 主要供测试注入短阈值,宿主正常不传。@@ -429,6 +434,8 @@ export class Session {readonly capabilities: Capabilities;/** 见 SessionOptions.remoteHostId。 */readonly remoteHostId: string | null;+ /** 见 SessionOptions.agentDeviceId。 */+ readonly agentDeviceId: string | null;private readonly handle: AgentSessionHandle;private readonly logger: Logger;@@ -567,6 +574,7 @@ export class Session {this.handle = opts.handle;this.capabilities = opts.capabilities;this.remoteHostId = opts.remoteHostId ?? null;+ this.agentDeviceId = opts.agentDeviceId ?? null;this.logger = opts.logger.child(`s:${this.id}`);this.permissionModeStateValue = {mode: opts.permissionMode ?? null,