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): shared-provider sends bypass the invitee's paid gate
MagicLizifda95ac812c1
diff --git a/apps/desktop/src/main/maker-ipc/__tests__/sessionTurnObserver.test.ts b/apps/desktop/src/main/maker-ipc/__tests__/sessionTurnObserver.test.tsindex 0477697667..390c5e6b0b 100644--- a/apps/desktop/src/main/maker-ipc/__tests__/sessionTurnObserver.test.ts+++ b/apps/desktop/src/main/maker-ipc/__tests__/sessionTurnObserver.test.ts@@ -69,16 +69,33 @@ describe('installSessionTurnObserver provider precheck', () => {}});- it('keeps the paid-model gate for an Agent on another computer', async () => {+ it('keeps the paid-model gate for an Agent on your own other computer', async () => {+ // 同账号另一台电脑仍由同一账号付费:本机 requires_payment 的记账主体就是这个账号,+ // 门禁照常执行,不能借远端 Agent 绕开本账号的付费裁决。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' });+ const rerouted = setup({ agentDeviceId: 'device-2' });await expect(rerouted.start()).rejects.toMatchObject({ code: 'INVALID_PARAMS' });});+ it('lets a shared-provider run send even when this account marks the model requires_payment', async () => {+ // 回归(PR #5689 review):受邀者(免费账号)使用分享者的付费订阅供应商时,受邀者本机目录+ // 把同名模型标为 requires_payment;请求记在分享者账上,不得用受邀者自己的标记拦发送。+ for (const verdict of [+ { kind: 'reject', reason: 'payment-required' },+ { kind: 'reroute', providerId: 'paid', reason: 'payment-required' },+ ]) {+ h.verdict.mockClear();+ h.verdict.mockResolvedValue(verdict);+ const { deps, start } = setup({ agentDeviceId: 'share:abc' });+ await expect(start()).resolves.toBeUndefined();+ expect(deps.sessionTurnLeaseTracker.markTurnStarted).toHaveBeenCalledWith('s1', 'i1:1');+ }+ });+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' });diff --git a/apps/desktop/src/main/maker-ipc/sessionTurnObserver.ts b/apps/desktop/src/main/maker-ipc/sessionTurnObserver.tsindex a33e1b1ddb..aa923aaf8d 100644--- a/apps/desktop/src/main/maker-ipc/sessionTurnObserver.ts+++ b/apps/desktop/src/main/maker-ipc/sessionTurnObserver.ts@@ -5,6 +5,7 @@ import { ensureManagedOllamaReadyForSession } from '../local-model-runtime/preflimport { createLogger } from '../logger.js';import { throwIpcError } from '../utils/ipcValidate.js';import { getSessionProvider } from '../maker-host/session-provider-store.js';+import { isProviderShareAgentDeviceId } from '../../shared/providerShare.js';import { verdictForModelRoute } from '../maker-host/model-route-guard-live.js';import { describeModelRouteRejection } from '../maker-host/model-route-guard.js';import { SilentStopTurnLeaseGate, SessionTurnLeaseTracker } from './sessionTurnLease.js';@@ -34,8 +35,14 @@ export function installSessionTurnObserver(deps: InstallSessionTurnObserverDeps,// 每条本地 Session.send 都经过这一个 Main-owned 边界,包括 renderer、IM、// Goal、Learn、Hook 与 Scheduler。付费权限不能只挂在普通 IPC 发送事务上。// Agent 在另一台电脑(含 `share:` 分享来源)上运行时,所选来源在对端目录里;本机目录查不到- // 它不代表来源失效。只放过这一种拒绝,provider 原样保留,付费门禁照常执行。+ // 它不代表来源失效。来源可用性只放过这一种拒绝,provider 原样保留。const providerOnOtherDevice = session.agentDeviceId !== null;+ // 付费门禁按**这次调用的记账主体**执行:`share:` 会话的模型请求只由分享者电脑上的 Agent+ // 用分享者的登录与供应商发出(docs/product-rules/provider-sharing.md §1、§9.2/§9.3),+ // 分享借出的就是分享者的模型额度;受邀者本机目录的 requires_payment 是受邀者自己账号的+ // 标记,裁决不到分享者的额度上,不能拿来拦记在分享者账上的请求。同账号另一台电脑仍由+ // 同一账号付费,门禁照常执行。+ const chargedToShareHost = isProviderShareAgentDeviceId(session.agentDeviceId);const model = session.model;if (model) {const verdict = await verdictForModelRoute(@@ -47,13 +54,21 @@ export function installSessionTurnObserver(deps: InstallSessionTurnObserverDeps,// runtime。付费 reroute 不能当作 pass,否则 null-provider 仍会落到已锁定// 的 XD 默认来源。普通停用/能力/独占 reroute 属于既有 best-effort 轴,// 运行中会话按 model-route-guard 契约不在这里打断。- if (verdict.kind === 'reroute' && verdict.reason === 'payment-required') {+ if (+ !chargedToShareHost+ && verdict.kind === 'reroute'+ && verdict.reason === 'payment-required'+ ) {throwIpcError('INVALID_PARAMS',`model "${model}" must switch to provider "${verdict.providerId}" before sending`,);}- if (verdict.kind === 'reject' && verdict.reason === 'payment-required') {+ if (+ !chargedToShareHost+ && verdict.kind === 'reject'+ && verdict.reason === 'payment-required'+ ) {throwIpcError('PERMISSION_DENIED', `model "${model}" requires paid access`);}if (