Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
feat(im): 完整接入分享供应商模型配置与任务路由
Dash08f3a6299eb9
diff --git a/apps/desktop/src/main/hook-control/__tests__/session-runner.test.ts b/apps/desktop/src/main/hook-control/__tests__/session-runner.test.tsindex b1d3948023..6f2c08e5a4 100644--- a/apps/desktop/src/main/hook-control/__tests__/session-runner.test.ts+++ b/apps/desktop/src/main/hook-control/__tests__/session-runner.test.ts@@ -67,7 +67,10 @@ const h = vi.hoisted(() => {listProviders: vi.fn(async (): Promise<unknown[]> => []),getModelVisibilityOverride: vi.fn(() => undefined),readImDefaultSettings: vi.fn(),- getWorkspaceProviderSource: vi.fn((): string | null => null),+ getWorkspaceProviderSource: vi.fn((..._args: unknown[]): string | null => null),+ agentDeviceId: null as string | null,+ readRemoteRoute: vi.fn(),+ readRemotePermissionModes: vi.fn(async () => ['ask', 'bypassPermissions']),getWorkspacePref: vi.fn((): unknown => null),isWorkspacePrefsMigrated: vi.fn(() => true),useActualDefaults: false,@@ -229,6 +232,14 @@ vi.mock('../../im/defaultSettingsStore.js', () => ({}));vi.mock('../workspaceProviderSourceStore.js', () => ({getWorkspaceProviderSource: h.getWorkspaceProviderSource,+ getWorkspaceProviderRoute: (...args: unknown[]) => {+ const providerId = h.getWorkspaceProviderSource(...args);+ return providerId ? { providerId, agentDeviceId: h.agentDeviceId } : null;+ },+}));+vi.mock('../../im/remoteProviderRoute.js', () => ({+ readImRemoteProviderRoute: h.readRemoteRoute,+ readImRemotePermissionModes: h.readRemotePermissionModes,}));vi.mock('../workspacePrefsStore.js', async (importOriginal) => ({...(await importOriginal<typeof import('../workspacePrefsStore.js')>()),@@ -348,6 +359,7 @@ const fakeMaker = {sdkSessionId: 'sdk-1',agentKind: 'claude-code' as const,permissionMode: undefined as 'ask' | 'bypassPermissions' | undefined,+ agentDeviceId: undefined as string | undefined,})),getSession: vi.fn(),closeSession: vi.fn(async () => undefined),@@ -449,6 +461,13 @@ beforeEach(() => {h.resolvedConfig.permissionMode = 'bypassPermissions';h.resolvedConfig.providerId = null;h.getWorkspaceProviderSource.mockReturnValue(null);+ h.agentDeviceId = null;+ h.readRemoteRoute.mockReset();+ h.readImDefaultSettings.mockReturnValue({ agentKind: 'claude-code', agents: {+ 'claude-code': { providerId: null, model: 'test-model', effort: 'high' },+ codex: { providerId: null, model: 'gpt-5.5', effort: 'high' },+ pi: { providerId: null, model: 'test-model', effort: 'high' },+ } });h.getWorkspacePref.mockReturnValue(null);h.isWorkspacePrefsMigrated.mockReturnValue(true);h.peekPendingHandoff.mockResolvedValue(null);@@ -3129,6 +3148,7 @@ describe('permissionMode 落 createSession', () => {sdkSessionId: 'sdk-1',agentKind: 'claude-code' as const,permissionMode: 'ask' as const,+ agentDeviceId: undefined,}));const runner = createMakerHookSessionRunner({ log });// options 带 bypass 也不覆盖 meta 的 ask@@ -3166,6 +3186,72 @@ describe('permissionMode 落 createSession', () => {});describe('providerId(来源/供应商)贯通 —— issue #854 回归', () => {+ it('uses the execution host permission modes when the local engine is unavailable', async () => {+ h.useActualDefaults = true;+ h.getWorkspaceProviderSource.mockReturnValue('owner-provider');+ h.agentDeviceId = 'share:owner';+ h.readRemoteRoute.mockResolvedValue({ model: catalogModel('test-model') });+ h.isWorkspacePrefsMigrated.mockReturnValue(false);+ const outcome = await createMakerHookSessionRunner({ log }).run(baseReq({+ workspaceAlias: 'chat', source: { im: 'telegram' }, permissionMode: 'ask',+ }));+ expect(outcome.status).toBe('ok');+ expect(h.readRemotePermissionModes).toHaveBeenCalledWith('share:owner', 'claude-code');+ expect(fakeMaker.getCapabilities).not.toHaveBeenCalled();+ expect(fakeMaker.createSession).toHaveBeenCalledWith(expect.objectContaining({ permissionMode: 'ask' }));+ });++ it('persists the shared execution location for /new without starting an agent', async () => {+ h.getWorkspaceProviderSource.mockReturnValue('owner-provider');+ h.agentDeviceId = 'share:owner';+ h.readRemoteRoute.mockResolvedValue({ model: catalogModel('test-model') });+ const outcome = await createMakerHookSessionRunner({ log }).run(baseReq({+ workspaceAlias: 'chat', source: { im: 'telegram' }, createOnly: true,+ }));+ expect(outcome.status).toBe('ok');+ expect(h.createSessionRow).toHaveBeenCalledWith(expect.objectContaining({+ agentDeviceId: 'share:owner', model: 'test-model',+ }));+ expect(h.setSessionProviderIdInDb).toHaveBeenCalledWith('sess-new', 'owner-provider');+ expect(fakeMaker.createSession).not.toHaveBeenCalled();+ });++ it('rejects an unavailable shared workspace route without trying a local provider', async () => {+ h.getWorkspaceProviderSource.mockReturnValue('owner-provider');+ h.agentDeviceId = 'share:owner';+ h.readRemoteRoute.mockRejectedValue(new Error('Share paused'));+ await expect(createMakerHookSessionRunner({ log }).run(baseReq({+ workspaceAlias: 'chat', source: { im: 'telegram' },+ }))).rejects.toThrow('Share paused');+ expect(fakeMaker.createSession).not.toHaveBeenCalled();+ expect(h.createSessionRow).not.toHaveBeenCalled();+ });++ it('restores the shared execution location from a cold task', async () => {+ fakeMaker.getSessionMeta.mockResolvedValueOnce({+ workDir: 'D:/repo', model: 'test-model', sdkSessionId: 'sdk-1',+ agentKind: 'claude-code', agentDeviceId: 'share:owner',+ permissionMode: undefined,+ });+ const outcome = await createMakerHookSessionRunner({ log }).run(baseReq({+ sessionId: 'sess-old', isNew: false,+ }));+ expect(outcome.status).toBe('ok');+ expect(fakeMaker.createSession).toHaveBeenCalledWith(expect.objectContaining({+ agentDeviceId: 'share:owner', resumeSessionId: 'sdk-1',+ }));+ });++ it('starts a workspace task on its shared provider, without a local provider', async () => {+ h.getWorkspaceProviderSource.mockReturnValue('owner-provider');+ h.agentDeviceId = 'share:owner';+ h.readRemoteRoute.mockResolvedValue({ model: catalogModel('test-model') });+ const outcome = await createMakerHookSessionRunner({ log }).run(baseReq({ workspaceAlias: 'chat', source: { im: 'telegram' } }));+ expect(outcome.status).toBe('ok');+ expect(fakeMaker.createSession).toHaveBeenCalledWith(expect.objectContaining({+ agentDeviceId: 'share:owner', providerId: 'owner-provider', model: 'test-model',+ }));+ });it('新建: 草稿默认来源经校验后传 createSession + 注入运行时 store + 广播前落库', async () => {h.resolvedConfig.providerId = 'xd';h.listProviders.mockResolvedValueOnce([connectedProvider('xd', [catalogModel('test-model')])]);diff --git a/apps/desktop/src/main/hook-control/__tests__/workspaceProviderSourceStore.test.ts b/apps/desktop/src/main/hook-control/__tests__/workspaceProviderSourceStore.test.tsindex 66aeb5ad50..4ab4d8279d 100644--- a/apps/desktop/src/main/hook-control/__tests__/workspaceProviderSourceStore.test.ts+++ b/apps/desktop/src/main/hook-control/__tests__/workspaceProviderSourceStore.test.ts@@ -19,11 +19,19 @@ vi.mock('../../im/ownerScopedStorage.js', () => ({import {clearWorkspaceProviderSourcesForRemoteModelChanges,getWorkspaceProviderSource,+ getWorkspaceProviderRoute,listWorkspaceProviderSources,setWorkspaceProviderSource,} from '../workspaceProviderSourceStore';describe('workspaceProviderSourceStore', () => {+ it('keeps location and provider together across team fallback and local reselection', () => {+ setWorkspaceProviderSource('slack', null, 'chat', 'openai', 'share:owner');+ expect(getWorkspaceProviderRoute('slack', 'T2', 'chat')).toMatchObject({ providerId: 'openai', agentDeviceId: 'share:owner' });+ setWorkspaceProviderSource('slack', 'T2', 'chat', 'openai');+ expect(getWorkspaceProviderRoute('slack', 'T2', 'chat')?.agentDeviceId).toBeUndefined();+ expect(getWorkspaceProviderRoute('slack', 'T1', 'chat')?.agentDeviceId).toBe('share:owner');+ });beforeEach(() => {tmp.dir = fs.mkdtempSync(path.join(os.tmpdir(), 'wps-'));});diff --git a/apps/desktop/src/main/hook-control/defaults.ts b/apps/desktop/src/main/hook-control/defaults.tsindex 9ebc102f71..5173ee7f5c 100644--- a/apps/desktop/src/main/hook-control/defaults.ts+++ b/apps/desktop/src/main/hook-control/defaults.ts@@ -54,6 +54,7 @@ export interface HookDefaultsDeps {}export interface ResolvedHookSessionConfig {+ agentDeviceId?: string | null;agentKind: 'claude-code' | 'codex' | 'pi';model: string;effort: Effort | undefined;diff --git a/apps/desktop/src/main/hook-control/ipc.ts b/apps/desktop/src/main/hook-control/ipc.tsindex c68c27663f..e1b8e44707 100644--- a/apps/desktop/src/main/hook-control/ipc.ts+++ b/apps/desktop/src/main/hook-control/ipc.ts@@ -1175,6 +1175,10 @@ export function registerHookControlIpc(): void {if (providerId !== null && providerId.length > 128) {throwIpcError('INVALID_PARAMS', 'providerId too long');}+ const agentDeviceId = p.agentDeviceId == null ? null : requireString(p.agentDeviceId, 'agentDeviceId');+ if (agentDeviceId && (!/^[A-Za-z0-9_.:-]{1,128}$/.test(agentDeviceId) || !providerId)) {+ throwIpcError('INVALID_PARAMS', 'remote provider route invalid');+ }// 条目总量上限(codex review): 键合法性校验挡不住海量唯一 teamId 的无限// 追加 —— 新增(非替换/删除)且已达上限时拒绝。按精确键判新增(不能用// getWorkspaceProviderSource, 它的 teamId null 兜底会把新 team 误判为已存在)。@@ -1194,7 +1198,7 @@ export function registerHookControlIpc(): void {// throwIpcError 协议给稳定错误码, 细节留 main 日志。let entries: ReturnType<typeof setWorkspaceProviderSource>;try {- entries = setWorkspaceProviderSource(channel, teamId, workspace, providerId);+ entries = setWorkspaceProviderSource(channel, teamId, workspace, providerId, agentDeviceId);} catch (err) {log.warn(`workspace provider source write failed: ${err instanceof Error ? err.message : String(err)}`,diff --git a/apps/desktop/src/main/hook-control/session-runner.ts b/apps/desktop/src/main/hook-control/session-runner.tsindex 8644daf986..970cd35681 100644--- a/apps/desktop/src/main/hook-control/session-runner.ts+++ b/apps/desktop/src/main/hook-control/session-runner.ts@@ -101,7 +101,8 @@ import { resolveSafe as resolveCindyMediaUrl } from '../cindy-media/blobStore.jsimport { ingestMedia, supportedMime as isCindyMediaMime } from '../cindy-media/ingest.js';import { worktreeStore, WorktreeManager } from '../worktree/index.js';import { readImDefaultSettings } from '../im/defaultSettingsStore.js';-import { getWorkspaceProviderSource } from './workspaceProviderSourceStore.js';+import { readImRemotePermissionModes, readImRemoteProviderRoute } from '../im/remoteProviderRoute.js';+import { getWorkspaceProviderRoute } from './workspaceProviderSourceStore.js';import {getWorkspacePref,isWorkspacePrefsMigrated,@@ -206,6 +207,28 @@ async function resolveNewSessionConfig(prefsChannel !== null && workspaceAlias !== undefined && isWorkspacePrefsMigrated(prefsChannel),);+ const workdirRoute = prefsChannel && workspaceAlias+ ? getWorkspaceProviderRoute(prefsChannel, workspaceCtx.teamId, workspaceAlias) : null;+ const defaults = readImDefaultSettings(sourceIm === 'slack' ? 'slack' : undefined);+ const requestedAgent = mergedOverrides.agentKind === 'claude-code' || mergedOverrides.agentKind === 'codex' || mergedOverrides.agentKind === 'pi'+ ? mergedOverrides.agentKind : defaults.agentKind;+ const defaultRoute = defaults.agents[requestedAgent];+ const agentDeviceId = workdirRoute ? workdirRoute.agentDeviceId : defaultRoute.agentDeviceId;+ if (agentDeviceId) {+ const providerId = workdirRoute?.providerId ?? defaultRoute.providerId;+ const requestedModel = mergedOverrides.model ?? defaultRoute.model;+ const { model } = await readImRemoteProviderRoute({ agentDeviceId, agentKind: requestedAgent, providerId, model: requestedModel });+ const permissionModes = mergedOverrides.permissionMode !== null+ ? await readImRemotePermissionModes(agentDeviceId, requestedAgent) : [];+ const remote = resolveHookSessionConfig({+ readDefaults: () => defaults,+ getModels: () => [model],+ getPermissionModes: () => permissionModes,+ log,+ }, { ...mergedOverrides, agentKind: requestedAgent, model: requestedModel });+ return { ...remote, agentDeviceId, providerId };+ }+const resolved = resolveHookSessionConfig({readDefaults: () =>@@ -241,7 +264,7 @@ async function resolveNewSessionConfig(: null;const workdirProviderId =channel !== null && workspaceCtx?.alias- ? getWorkspaceProviderSource(channel, workspaceCtx.teamId, workspaceCtx.alias)+ ? workdirRoute?.providerId ?? null: null;// 目录来源是和目录模型一起选的(issue #5912)。目录模型为空、改为继承 IM 默认时,// 残留来源若账号仍可用、只是目录里根本没有这个继承来的模型,它已不再描述用户可见的@@ -597,6 +620,7 @@ export function createMakerHookSessionRunner(deps: {// 复用/接管路径的持久化来源(sessions.provider_id, 用户在聊天里切过的// 来源以它为权威); 新建路径恒 null, 由下方草稿默认解析let rowProviderId: string | null = null;+ let agentDeviceId = resolved?.agentDeviceId ?? null;if (!req.isNew) {// 复用/接管: session 自己的 meta 是权威(workDir/model/agentKind/// permissionMode), sdkSessionId 用于冷 resume; effort 不覆盖、权限档@@ -614,6 +638,7 @@ export function createMakerHookSessionRunner(deps: {effort = undefined;permissionMode = meta?.permissionMode ?? 'bypassPermissions';rowProviderId = row?.providerId ?? null;+ agentDeviceId = row?.agentDeviceId ?? meta?.agentDeviceId ?? null;}const fail = (msg: string, finalText = ''): HookRunOutcome => ({@@ -690,6 +715,7 @@ export function createMakerHookSessionRunner(deps: {agentKind: effectiveAgentKind,workingDir,model: effectiveModel,+ ...(agentDeviceId ? { agentDeviceId } : {}),...(providerId !== null ? { providerId } : {}),...(effort !== undefined ? { effort } : {}),permissionMode,@@ -726,6 +752,7 @@ export function createMakerHookSessionRunner(deps: {// 校验, docs/dev-rules/im-turn-flow.md 批次 2); 建行本身仍是下面各自既有的路径。// 准入可能规范化来源 / 推理强度, 新任务用准入后的路由。复用 / 接管不经过这里。const newSessionRoute: ChannelSessionRoute = {+ agentDeviceId,agentKind: effectiveAgentKind,model: effectiveModel,providerId,@@ -755,6 +782,7 @@ export function createMakerHookSessionRunner(deps: {workDir: workingDir,title: req.title ?? 'New task',model: admitted.model,+ ...(agentDeviceId ? { agentDeviceId } : {}),...(req.workspaceKind !== undefined ? { workspaceKind: req.workspaceKind } : {}),...(admitted.effort !== undefined ? { effort: admitted.effort } : {}),permissionMode,diff --git a/apps/desktop/src/main/hook-control/workspaceProviderSourceStore.ts b/apps/desktop/src/main/hook-control/workspaceProviderSourceStore.tsindex 1f92ca6537..94ca665187 100644--- a/apps/desktop/src/main/hook-control/workspaceProviderSourceStore.ts+++ b/apps/desktop/src/main/hook-control/workspaceProviderSourceStore.ts@@ -53,7 +53,8 @@ function isEntry(raw: unknown): raw is WorkspaceProviderSourceEntry {HOOK_WORKSPACE_ALIAS_RE.test(r.workspace) &&typeof r.providerId === 'string' &&r.providerId.length > 0 &&- r.providerId.length <= 128+ r.providerId.length <= 128 &&+ (r.agentDeviceId == null || (typeof r.agentDeviceId === 'string' && /^[A-Za-z0-9_.:-]{1,128}$/.test(r.agentDeviceId))));}@@ -97,10 +98,18 @@ export function getWorkspaceProviderSource(teamId: string | null,workspace: string,): string | null {+ return getWorkspaceProviderRoute(channel, teamId, workspace)?.providerId ?? null;+}++export function getWorkspaceProviderRoute(+ channel: HookProviderChannel,+ teamId: string | null,+ workspace: string,+): WorkspaceProviderSourceEntry | null {const entries = readFileEntries(filePath());return (- entries.find((e) => sameKey(e, channel, teamId, workspace))?.providerId ??- entries.find((e) => sameKey(e, channel, null, workspace))?.providerId ??+ entries.find((e) => sameKey(e, channel, teamId, workspace)) ??+ entries.find((e) => sameKey(e, channel, null, workspace)) ??null);}@@ -111,11 +120,13 @@ export function setWorkspaceProviderSource(teamId: string | null,workspace: string,providerId: string | null,+ agentDeviceId?: string | null,): WorkspaceProviderSourceEntry[] {const fp = filePath();const rest = readFileEntries(fp).filter((e) => !sameKey(e, channel, teamId, workspace));const next =- providerId === null ? rest : [...rest, { channel, teamId, workspace, providerId }];+ providerId === null ? rest : [...rest, { channel, teamId, workspace, providerId,+ ...(agentDeviceId ? { agentDeviceId } : {}) }];writeFileEntries(fp, next);return next;}diff --git a/apps/desktop/src/main/im/__tests__/defaultSessionSettings.test.ts b/apps/desktop/src/main/im/__tests__/defaultSessionSettings.test.tsindex da10875ae2..4d57a9ae1f 100644--- a/apps/desktop/src/main/im/__tests__/defaultSessionSettings.test.ts+++ b/apps/desktop/src/main/im/__tests__/defaultSessionSettings.test.ts@@ -4,6 +4,7 @@ const mocks = vi.hoisted(() => ({getCapabilities: vi.fn(),listProviders: vi.fn(),readImDefaultSettings: vi.fn(),+ readRemoteRoute: vi.fn(),logger: {warn: vi.fn(),info: vi.fn(),@@ -22,6 +23,7 @@ vi.mock('../../maker-host/createDesktopProviderService', () => ({vi.mock('../defaultSettingsStore', () => ({readImDefaultSettings: mocks.readImDefaultSettings,}));+vi.mock('../remoteProviderRoute', () => ({ readImRemoteProviderRoute: mocks.readRemoteRoute }));import { resolveImSessionDefaults } from '../defaultSessionSettings';import type { ImOrchestratorConfig } from '../shared/types';@@ -111,6 +113,19 @@ const customCodexModel = {};describe('resolveImSessionDefaults', () => {+ it.each(['claude-code', 'codex', 'pi'] as const)('resolves a shared %s model only against its own catalog', async (agentKind) => {+ mocks.readImDefaultSettings.mockReturnValue({ agentKind, permissionMode: 'auto', agents: {+ [agentKind]: { agentDeviceId: 'share:owner', providerId: 'owner-only', model: 'remote-model', effort: 'high' },+ } });+ mocks.readRemoteRoute.mockResolvedValue({ model: { efforts: ['low'], defaultEffort: 'low' } });+ await expect(resolveImSessionDefaults(config)).resolves.toMatchObject({+ agentKind, agentDeviceId: 'share:owner', providerId: 'owner-only', model: 'remote-model', effort: 'low',+ });+ expect(mocks.listProviders).not.toHaveBeenCalled();+ mocks.readRemoteRoute.mockRejectedValue(new Error('[REMOTE_AGENT_SHARE_PAUSED] paused'));+ await expect(resolveImSessionDefaults(config)).rejects.toThrow('REMOTE_AGENT_SHARE_PAUSED');+ expect(mocks.listProviders).not.toHaveBeenCalled();+ });beforeEach(() => {vi.clearAllMocks();mocks.getCapabilities.mockImplementation((agentKind: string) => ({diff --git a/apps/desktop/src/main/im/__tests__/defaultSettingsStore.test.ts b/apps/desktop/src/main/im/__tests__/defaultSettingsStore.test.tsindex af746ab066..a3b247dc53 100644--- a/apps/desktop/src/main/im/__tests__/defaultSettingsStore.test.ts+++ b/apps/desktop/src/main/im/__tests__/defaultSettingsStore.test.ts@@ -47,6 +47,14 @@ const settingsFile = () =>path.join(settingsDir, 'owners', scopeMocks.owner, 'im-default-settings.json');describe('im default settings store', () => {+ it('persists the shared location per channel and can switch back to local', () => {+ const route = { ...IM_DEFAULT_SETTINGS.agents.codex, providerId: 'openai', agentDeviceId: 'share:alice' };+ writeImDefaultSettingsPatch({ agentKind: 'codex', agents: { codex: route } }, 'feishu');+ expect(readImDefaultSettings('feishu').agents.codex).toEqual(route);+ expect(readImDefaultSettings('telegram').agents.codex.agentDeviceId).toBeUndefined();+ writeImDefaultSettingsPatch({ agents: { codex: { ...route, agentDeviceId: null } } }, 'feishu');+ expect(readImDefaultSettings('feishu').agents.codex.agentDeviceId).toBeUndefined();+ });beforeEach(() => {scopeMocks.join = path.join;scopeMocks.owner = 'cloud-a';diff --git a/apps/desktop/src/main/im/__tests__/parseDefaultSettingsPatch.test.ts b/apps/desktop/src/main/im/__tests__/parseDefaultSettingsPatch.test.tsindex 9d28b37cc7..be1b19b183 100644--- a/apps/desktop/src/main/im/__tests__/parseDefaultSettingsPatch.test.ts+++ b/apps/desktop/src/main/im/__tests__/parseDefaultSettingsPatch.test.ts@@ -14,6 +14,13 @@ import {import { parseImDefaultSettingsPatch } from '../parseDefaultSettingsPatch.js';describe('parseImDefaultSettingsPatch', () => {+ it('preserves a shared route and clears its location when selecting local', () => {+ const shared = { providerId: 'openai', model: 'gpt-5.5', effort: 'high', agentDeviceId: 'share:alice' };+ expect(parseImDefaultSettingsPatch({ agents: { codex: shared } }).agents?.codex).toEqual(shared);+ expect(parseImDefaultSettingsPatch({ agents: { codex: { ...shared, agentDeviceId: null } } }).agents?.codex?.agentDeviceId).toBeUndefined();+ expect(() => parseImDefaultSettingsPatch({ agents: { codex: { ...shared, providerId: null } } })).toThrow();+ expect(() => parseImDefaultSettingsPatch({ agents: { codex: { ...shared, agentDeviceId: 42 } } })).toThrow();+ });it('keeps agentKind / permissionMode / groupPermissionMode', () => {expect(parseImDefaultSettingsPatch({diff --git a/apps/desktop/src/main/im/__tests__/remoteProviderRoute.test.ts b/apps/desktop/src/main/im/__tests__/remoteProviderRoute.test.tsnew file mode 100644index 0000000000..d013700d96--- /dev/null+++ b/apps/desktop/src/main/im/__tests__/remoteProviderRoute.test.ts@@ -0,0 +1,39 @@+import { beforeEach, expect, it, vi } from 'vitest';++const invoke = vi.hoisted(() => vi.fn());+vi.mock('../../device-link', () => ({ remoteBackgroundInvoke: invoke }));+import { readImRemotePermissionModes, readImRemoteProviderRoute } from '../remoteProviderRoute';++const route = { agentDeviceId: 'share:owner', agentKind: 'codex' as const, providerId: 'openai', model: 'shared-model' };+const provider = {+ id: 'openai', name: 'OpenAI', agents: ['codex'], connected: true,+ remoteInvocationEnabled: true, source: 'builtin',+ models: { codex: [{ id: 'shared-model', name: 'Shared model', efforts: ['high'], defaultEffort: 'high' }] },+};+beforeEach(() => invoke.mockReset());+it('reads permission modes from the execution host', async () => {+ invoke.mockResolvedValue({ ok: true, result: { permissionModes: [{ id: 'ask' }, { id: 'auto' }] } });+ await expect(readImRemotePermissionModes('share:owner', 'pi')).resolves.toEqual(['ask', 'auto']);+ expect(invoke).toHaveBeenCalledWith('share:owner', 'maker:get-capabilities', ['pi']);+});+it('rejects missing remote permission modes instead of broadening access', async () => {+ invoke.mockResolvedValue({ ok: true, result: {} });+ await expect(readImRemotePermissionModes('share:owner', 'pi')).rejects.toThrow('Invalid remote agent permission modes');+});+it('uses the authorized sharing catalog', async () => {+ invoke.mockResolvedValue({ ok: true, result: { providers: [provider] } });+ await expect(readImRemoteProviderRoute(route)).resolves.toMatchObject({ provider: { id: 'openai' }, model: { id: 'shared-model' } });+ expect(invoke).toHaveBeenCalledWith('share:owner', 'maker:provider:list', expect.any(Array));+});+it.each([+ { connected: false }, { suspended: true }, { remoteInvocationEnabled: false },+ { models: { codex: [{ id: 'shared-model', disabled: true }] } },+ { models: { codex: [{ id: 'shared-model', mode: 'image_generation' }] } },+])('rejects an unavailable or non-chat shared route: %j', async (patch) => {+ invoke.mockResolvedValue({ ok: true, result: { providers: [{ ...provider, ...patch }] } });+ await expect(readImRemoteProviderRoute(route)).rejects.toThrow('REMOTE_AGENT_UNAVAILABLE');+});+it('preserves the sharing failure reason', async () => {+ invoke.mockResolvedValue({ ok: false, error: { message: '[REMOTE_AGENT_SHARE_REMOVED] removed' } });+ await expect(readImRemoteProviderRoute(route)).rejects.toThrow('REMOTE_AGENT_SHARE_REMOVED');+});diff --git a/apps/desktop/src/main/im/defaultSessionSettings.ts b/apps/desktop/src/main/im/defaultSessionSettings.tsindex c4f5afdd1a..61c261aebf 100644--- a/apps/desktop/src/main/im/defaultSessionSettings.ts+++ b/apps/desktop/src/main/im/defaultSessionSettings.ts@@ -32,12 +32,14 @@ import { createLogger } from '../logger';import { getMaker } from '../maker-host';import { getDesktopProviderService } from '../maker-host/createDesktopProviderService';import { readImDefaultSettings } from './defaultSettingsStore';+import { readImRemoteProviderRoute } from './remoteProviderRoute';import { fingerprintImDefaultSettings, type ImDefaultRoute } from './shared/channelDefaultRoute';import type { ImOrchestratorConfig } from './shared/types';const log = createLogger('im:defaults');export interface ResolvedImSessionDefaults {+ agentDeviceId?: string | null;agentKind: AgentKind;model: string;effort: Effort;@@ -69,6 +71,19 @@ export async function resolveImSessionDefaults(channel?: ImDefaultSettingsChannel,): Promise<ResolvedImSessionDefaults> {const raw = readImDefaultSettings(channel);+ const remote = raw.agents[raw.agentKind];+ if (remote.agentDeviceId) {+ const { model } = await readImRemoteProviderRoute({ ...remote, agentDeviceId: remote.agentDeviceId, agentKind: raw.agentKind });+ return {+ ...remote,+ agentKind: raw.agentKind,+ effort: model.efforts.includes(remote.effort) || !model.efforts.length+ ? remote.effort : model.defaultEffort ?? model.efforts[0],+ permissionMode: raw.permissionMode ?? config.defaultPermissionMode,+ fastMode: false,+ fingerprint: fingerprintImDefaultSettings(raw),+ };+ }const providers =providerSnapshot === undefined ? await listProvidersForDefaults() : providerSnapshot;const requestedAgent = raw.agentKind;@@ -126,6 +141,7 @@ export function readImRawDefaultRoute(channel?: ImDefaultSettingsChannel): ImDefagentKind: raw.agentKind,model: settings.model,providerId: settings.providerId?.trim() || null,+ agentDeviceId: settings.agentDeviceId ?? null,effort: settings.effort,};}diff --git a/apps/desktop/src/main/im/defaultSettingsStore.ts b/apps/desktop/src/main/im/defaultSettingsStore.tsindex dcdfc00e37..8a150ebcf6 100644--- a/apps/desktop/src/main/im/defaultSettingsStore.ts+++ b/apps/desktop/src/main/im/defaultSettingsStore.ts@@ -196,6 +196,8 @@ function normalizeAgentSettings(const defaults = IM_DEFAULT_SETTINGS.agents[agentKind];if (!isRecord(raw)) return { ...defaults };return {+ ...(typeof raw.agentDeviceId === 'string' && raw.agentDeviceId.trim()+ ? { agentDeviceId: raw.agentDeviceId.trim() } : {}),providerId:typeof raw.providerId === 'string' && raw.providerId.trim() ? raw.providerId.trim() : null,model: typeof raw.model === 'string' && raw.model.trim() ? raw.model.trim() : defaults.model,@@ -386,7 +388,8 @@ function settingsCustomizedKeys(value: ImDefaultSettings, defaults: ImDefaultSet}function agentSettingsEqual(a: ImDefaultAgentSettings, b: ImDefaultAgentSettings): boolean {- return a.providerId === b.providerId && a.model === b.model && a.effort === b.effort;+ return (a.agentDeviceId ?? null) === (b.agentDeviceId ?? null)+ && a.providerId === b.providerId && a.model === b.model && a.effort === b.effort;}function cloneSettings(settings: ImDefaultSettings): ImDefaultSettings {diff --git a/apps/desktop/src/main/im/parseDefaultSettingsPatch.ts b/apps/desktop/src/main/im/parseDefaultSettingsPatch.tsindex 3c6c832282..ec72ed06fe 100644--- a/apps/desktop/src/main/im/parseDefaultSettingsPatch.ts+++ b/apps/desktop/src/main/im/parseDefaultSettingsPatch.ts@@ -84,6 +84,13 @@ function parseImDefaultAgentSettings(}const input = raw as Record<string, unknown>;let providerId = defaults.providerId;+ let agentDeviceId: string | null = null;+ if ('agentDeviceId' in input && input.agentDeviceId !== null) {+ if (typeof input.agentDeviceId !== 'string' || !/^[A-Za-z0-9_.:-]{1,128}$/.test(input.agentDeviceId)) {+ throwIpcError('INVALID_PARAMS', 'im default agentDeviceId invalid');+ }+ agentDeviceId = input.agentDeviceId.trim();+ }let model = defaults.model;let effort = defaults.effort;if ('providerId' in input) {@@ -107,5 +114,6 @@ function parseImDefaultAgentSettings(}effort = input.effort;}- return { providerId, model, effort };+ if (agentDeviceId && !providerId) throwIpcError('INVALID_PARAMS', 'remote providerId required');+ return { providerId, model, effort, ...(agentDeviceId ? { agentDeviceId } : {}) };}diff --git a/apps/desktop/src/main/im/remoteProviderRoute.ts b/apps/desktop/src/main/im/remoteProviderRoute.tsnew file mode 100644index 0000000000..e34fc98bc6--- /dev/null+++ b/apps/desktop/src/main/im/remoteProviderRoute.ts@@ -0,0 +1,34 @@+import type { AgentKind } from '@cindy/maker-core';+import { getModel, isModelSelectableForNewRoute } from '@cindy/model-providers';++import { readDeviceProviderViews } from '../remote-agent/controller/deviceCatalog';++/** 与普通任务共用授权目录;失败不回落到本机的同名供应商。 */+export async function readImRemoteProviderRoute(route: {+ agentDeviceId: string;+ agentKind: AgentKind;+ providerId: string | null;+ model: string;+}) {+ const { remoteBackgroundInvoke } = await import('../device-link');+ const providers = await readDeviceProviderViews(remoteBackgroundInvoke, route.agentDeviceId);+ const provider = providers.find((p) => p.id === route.providerId && p.connected && !p.suspended && p.agents.includes(route.agentKind));+ const model = provider && getModel(provider, route.model, route.agentKind);+ if (!provider || !model || !isModelSelectableForNewRoute(model, { userProvider: provider.source === 'user' })) {+ throw new Error('[REMOTE_AGENT_UNAVAILABLE] Selected remote provider or model is unavailable.');+ }+ return { provider, model };+}++/** 权限档也取执行端能力,发起电脑可能没有安装该引擎。 */+export async function readImRemotePermissionModes(agentDeviceId: string, agentKind: AgentKind): Promise<string[]> {+ const { remoteBackgroundInvoke } = await import('../device-link');+ const response = await remoteBackgroundInvoke(agentDeviceId, 'maker:get-capabilities', [agentKind]);+ if (!response.ok) throw new Error(response.error?.message ?? 'Remote agent capabilities unavailable');+ const modes = (response.result as { permissionModes?: unknown } | null)?.permissionModes;+ if (!Array.isArray(modes) || !modes.length || !modes.every((mode) =>+ mode && typeof mode === 'object' && typeof mode.id === 'string' && mode.id.length > 0)) {+ throw new Error('Invalid remote agent permission modes');+ }+ return modes.map((mode) => mode.id);+}diff --git a/apps/desktop/src/main/im/shared/__tests__/authCheck.test.ts b/apps/desktop/src/main/im/shared/__tests__/authCheck.test.tsindex 97c3139c31..1f2201d0c2 100644--- a/apps/desktop/src/main/im/shared/__tests__/authCheck.test.ts+++ b/apps/desktop/src/main/im/shared/__tests__/authCheck.test.ts@@ -77,6 +77,20 @@ function provider(}describe('checkImRouteAuth', () => {+ it('checks the shared provider without requiring this computer to have its credentials', async () => {+ const remote = provider({ id: 'openai', strategy: 'oauth-passthrough' });+ const d = deps({ checkRemoteRoute: vi.fn(async () => ({ provider: remote })) });+ await expect(checkImRouteAuthDetailed(row({ providerId: 'openai', agentDeviceId: 'share:a' }), undefined, d))+ .resolves.toMatchObject({ ok: true, providerId: 'openai', providerLabel: 'openai' });+ expect(d.listProviders).not.toHaveBeenCalled();+ expect(d.getAgentAuthState).not.toHaveBeenCalled();+ });+ it('does not use a local credential when the sharing is unavailable', async () => {+ const d = deps({ readXdGatewayApiKey: () => 'local-key', checkRemoteRoute: vi.fn(async () => { throw new Error('paused'); }) });+ await expect(checkImRouteAuth(row({ providerId: 'xd', agentDeviceId: 'share:a' }), undefined, d))+ .resolves.toMatchObject({ ok: false, missing: 'provider-disconnected' });+ expect(d.listProviders).not.toHaveBeenCalled();+ });it.each([['Discord', discordUi],['Feishu', feishuUi],diff --git a/apps/desktop/src/main/im/shared/__tests__/channelDefaultRoute.test.ts b/apps/desktop/src/main/im/shared/__tests__/channelDefaultRoute.test.tsindex eae52e17a2..98b6d6316f 100644--- a/apps/desktop/src/main/im/shared/__tests__/channelDefaultRoute.test.ts+++ b/apps/desktop/src/main/im/shared/__tests__/channelDefaultRoute.test.ts@@ -26,6 +26,15 @@ function settings(patch: Partial<ImDefaultSettings> = {}): ImDefaultSettings {}describe('fingerprintImDefaultSettings', () => {+ it('distinguishes the same provider/model on local and shared computers', () => {+ const base = settings();+ const shared = structuredClone(base);+ shared.agents[shared.agentKind].agentDeviceId = 'share:a';+ expect(fingerprintImDefaultSettings(shared)).not.toBe(fingerprintImDefaultSettings(base));+ expect(sameImDefaultRoute(OLD, { ...OLD, agentDeviceId: 'share:a' })).toBe(false);+ const route = { ...OLD, agentDeviceId: 'share:a' };+ expect(parseImDefaultRouteRecord(buildImDefaultRouteRecord('fp', route))?.route).toEqual(route);+ });it('changes with any engine route setting but not with permission modes', () => {const base = settings();const fp = fingerprintImDefaultSettings(base);diff --git a/apps/desktop/src/main/im/shared/__tests__/channelDefaultRouteSync.test.ts b/apps/desktop/src/main/im/shared/__tests__/channelDefaultRouteSync.test.tsindex ad70ac856f..8c3bb5d7bc 100644--- a/apps/desktop/src/main/im/shared/__tests__/channelDefaultRouteSync.test.ts+++ b/apps/desktop/src/main/im/shared/__tests__/channelDefaultRouteSync.test.ts@@ -148,6 +148,7 @@ async function insertTask(agentKind: dbAgentKind(route.agentKind),model: route.model,providerId: route.providerId,+ agentDeviceId: route.agentDeviceId ?? null,effort: route.effort,fastMode: opts.fastMode === true,permissionMode: 'auto',@@ -175,6 +176,7 @@ async function setRoute(id: string, route: ImDefaultRoute): Promise<void> {agentKind: dbAgentKind(route.agentKind),model: route.model,providerId: route.providerId,+ agentDeviceId: route.agentDeviceId ?? null,effort: route.effort as typeof sessions.$inferInsert.effort,}).where(eq(sessions.id, id));@@ -208,11 +210,24 @@ beforeEach(() => {});describe('syncUnderLock', () => {+ it('moves a following task to a share and back even when provider and model are identical', async () => {+ await insertTask('t1', OLD);+ const shared = { ...OLD, agentDeviceId: 'share:owner' };+ mocks.resolveDefaults.mockResolvedValue({ ...shared, fingerprint: 'fp-new' });+ await sync().syncUnderLock('t1');+ expect((await rowOf('t1')).agentDeviceId).toBe('share:owner');+ expect(parseImDefaultRouteRecord((await rowOf('t1')).imDefaultRoute)?.route).toEqual(shared);+ mocks.fingerprint.mockReturnValue('fp-back');+ mocks.resolveDefaults.mockResolvedValue({ ...OLD, fingerprint: 'fp-back' });+ await sync().syncUnderLock('t1');+ expect((await rowOf('t1')).agentDeviceId).toBeNull();+ expect(mocks.applyRoute).toHaveBeenLastCalledWith('t1', { ...OLD, agentDeviceId: null, fastMode: false }, 'claude-code');+ });it('switches a following task and records the read-back route under the new fingerprint', async () => {await insertTask('t1', OLD);await expect(sync().syncUnderLock('t1')).resolves.toBe(false);- expect(mocks.applyRoute).toHaveBeenCalledWith('t1', { ...NEW, fastMode: false }, 'claude-code');+ expect(mocks.applyRoute).toHaveBeenCalledWith('t1', { ...NEW, agentDeviceId: null, fastMode: false }, 'claude-code');const record = parseImDefaultRouteRecord((await rowOf('t1')).imDefaultRoute);expect(record).toEqual({ v: 1, fp: 'fp-new', route: NEW });});@@ -245,7 +260,7 @@ describe('syncUnderLock', () => {await insertTask('t1', OLD, { fastMode: true });await sync().syncUnderLock('t1');- expect(mocks.applyRoute).toHaveBeenCalledWith('t1', { ...NEW, fastMode: true }, 'claude-code');+ expect(mocks.applyRoute).toHaveBeenCalledWith('t1', { ...NEW, agentDeviceId: null, fastMode: true }, 'claude-code');});it('still defers the generic apply when the staged claim write fails', async () => {diff --git a/apps/desktop/src/main/im/shared/__tests__/openChannelSession.test.ts b/apps/desktop/src/main/im/shared/__tests__/openChannelSession.test.tsindex fd69a38a75..96fee77fa3 100644--- a/apps/desktop/src/main/im/shared/__tests__/openChannelSession.test.ts+++ b/apps/desktop/src/main/im/shared/__tests__/openChannelSession.test.ts@@ -10,6 +10,13 @@ vi.mock('../../../localDb/sessionOpening', () => ({ openSession }));import { openChannelSession } from '../openChannelSession';describe('openChannelSession', () => {+ it('passes shared execution location into new-session admission', async () => {+ openSession.mockImplementationOnce(async (input, commit) => ({ row: input.body, value: await commit(input.body, () => undefined) }));+ const route = { agentDeviceId: 'share:owner', agentKind: 'codex' as const, model: 'm', providerId: 'p', permissionMode: 'auto' as const, workingDir: '/w' };+ await openChannelSession('shared', route, async () => 'created');+ expect(openSession).toHaveBeenLastCalledWith(expect.objectContaining({ body: expect.objectContaining({ agentDeviceId: 'share:owner', providerId: 'p' }) }), expect.any(Function));+ openSession.mockClear();+ });it('把渠道路由送进 openSession(agentKind 用库值), 回调拿到准入后的路由', async () => {openSession.mockImplementationOnce(async (input, commit) => ({row: {diff --git a/apps/desktop/src/main/im/shared/__tests__/turnRunnerThreadRouting.test.ts b/apps/desktop/src/main/im/shared/__tests__/turnRunnerThreadRouting.test.tsindex 360855b7d6..52a55c0684 100644--- a/apps/desktop/src/main/im/shared/__tests__/turnRunnerThreadRouting.test.ts+++ b/apps/desktop/src/main/im/shared/__tests__/turnRunnerThreadRouting.test.ts@@ -56,7 +56,9 @@ const mocks = vi.hoisted(() => ({resolveXdtImageUrl: vi.fn(),generateAndPersistFbotTitle: vi.fn(),dbSelect: vi.fn(),+ readRemoteRoute: vi.fn(),}));+vi.mock('../../remoteProviderRoute', () => ({ readImRemoteProviderRoute: mocks.readRemoteRoute }));vi.mock('../../../logger', () => ({ createLogger: () => mocks.logger }));vi.mock('../../../maker-host', () => ({ getMaker: mocks.getMaker }));@@ -1256,6 +1258,17 @@ describe('turnRunner 自动任务转播(scheduler turn → 远程控制 thread)'});describe('notification replies reuse the originating session without takeover', () => {+ it('cold-opens a shared session on its saved execution computer', async () => {+ mocks.dbSelect.mockReturnValue({ from: () => ({ where: () => ({ limit: async () => [{+ ...rowFor('original-session'), status: 'active', agentDeviceId: 'share:owner', providerId: 'remote-provider', sdkSessionId: 'remote-sdk',+ }] }) }) });+ mocks.readRemoteRoute.mockResolvedValue({ provider: { name: 'Shared provider' } });+ await reply('shared-thread');+ expect(mocks.getMaker().createSession).toHaveBeenCalledWith(expect.objectContaining({+ agentDeviceId: 'share:owner', providerId: 'remote-provider', resumeSessionId: 'remote-sdk',+ }));+ expect(mocks.readRemoteRoute).toHaveBeenCalledWith(expect.objectContaining({ agentDeviceId: 'share:owner', providerId: 'remote-provider' }));+ });function origin(status = 'active') {mocks.dbSelect.mockReturnValue({ from: () => ({ where: () => ({ limit: async () => [{...rowFor('original-session'), sdkSessionId: 'original-sdk-session', status,diff --git a/apps/desktop/src/main/im/shared/authCheck.ts b/apps/desktop/src/main/im/shared/authCheck.tsindex 5caffb1ac6..1e75a898b7 100644--- a/apps/desktop/src/main/im/shared/authCheck.ts+++ b/apps/desktop/src/main/im/shared/authCheck.ts@@ -10,7 +10,7 @@ import type { AgentKind } from '@cindy/maker-core';import type { ImSessionRow } from './sessionRepo';-type AuthRow = Pick<ImSessionRow, 'agentKind' | 'model' | 'providerId'>;+type AuthRow = Pick<ImSessionRow, 'agentKind' | 'model' | 'providerId' | 'agentDeviceId'>;export type ImAuthMissing ='gateway-key' | 'agent-oauth' | 'provider-key' | 'provider-disconnected';@@ -28,6 +28,7 @@ export interface ImAuthCheckDeps {hasCustomProviderKey(providerId: string, agentKind: AgentKind): boolean;getAgentAuthState(agentKind: AgentKind): Promise<{ authenticated: boolean }>;listProviders(): Promise<ProviderView[]>;+ checkRemoteRoute?(row: AuthRow & { agentDeviceId: string }): Promise<{ provider: ProviderView }>;warn(message: string): void;}@@ -44,6 +45,7 @@ export async function checkImRouteAuth(providerSnapshot: ProviderView[] | null | undefined,deps: ImAuthCheckDeps,): Promise<ImAuthCheckResult> {+ if (row.agentDeviceId) return checkRemoteAuth(row, deps);const resolution = resolveEffectiveProvider(row,providerSnapshot === undefined ? await listProvidersForAuth(deps) : providerSnapshot,@@ -109,6 +111,7 @@ export async function checkImRouteAuthDetailed(providerSnapshot: ProviderView[] | null | undefined,deps: ImAuthCheckDeps,): Promise<ImAuthRouteStatus> {+ if (row.agentDeviceId) return checkRemoteAuth(row, deps);const providers =providerSnapshot === undefined ? await listProvidersForAuth(deps) : providerSnapshot;const resolution = resolveEffectiveProvider(row, providers);@@ -125,6 +128,17 @@ export async function checkImRouteAuthDetailed(};}+async function checkRemoteAuth(row: AuthRow, deps: ImAuthCheckDeps): Promise<ImAuthRouteStatus> {+ try {+ if (!row.agentDeviceId || !deps.checkRemoteRoute) throw new Error('Remote route checker unavailable');+ const { provider } = await deps.checkRemoteRoute({ ...row, agentDeviceId: row.agentDeviceId });+ return { ok: true, missing: null, providerId: row.providerId, providerLabel: provider.name };+ } catch (error) {+ deps.warn(`remote provider unavailable: ${error instanceof Error ? error.message : String(error)}`);+ return { ok: false, missing: 'provider-disconnected', providerId: row.providerId, providerLabel: null };+ }+}+export function hasCustomProviderAuth(provider: ProviderView,agentKind: AgentKind,diff --git a/apps/desktop/src/main/im/shared/cardActionHandler.ts b/apps/desktop/src/main/im/shared/cardActionHandler.tsindex 8d655c977f..40986204ae 100644--- a/apps/desktop/src/main/im/shared/cardActionHandler.ts+++ b/apps/desktop/src/main/im/shared/cardActionHandler.ts@@ -26,6 +26,7 @@ import {} from '@cindy/maker-core';import { createLogger } from '../../logger';+import { readImRemoteProviderRoute } from '../remoteProviderRoute';import { getMaker } from '../../maker-host';import {resolveLenientSessionRoute,@@ -350,6 +351,18 @@ export function createCardActionHandler(const sessionAgentKind = liveBeforePick?.agentKind ??(await getMaker().getSessionMeta?.(sessionId))?.agentKind;const isPiSession = sessionAgentKind === 'pi';+ if (previousRoute?.agentDeviceId && sessionAgentKind) {+ try {+ await readImRemoteProviderRoute({+ agentDeviceId: previousRoute.agentDeviceId,+ agentKind: sessionAgentKind,+ providerId: providerId === undefined ? previousRoute.providerId : providerId,+ model: modelId,+ });+ } catch (error) {+ return error instanceof Error ? error.message : String(error);+ }+ }const restorePersistentRoute = async (reason: string): Promise<void> => {if (!previousRoute) return;try {diff --git a/apps/desktop/src/main/im/shared/channelDefaultRoute.ts b/apps/desktop/src/main/im/shared/channelDefaultRoute.tsindex 571ebe8fc2..300e1fbac0 100644--- a/apps/desktop/src/main/im/shared/channelDefaultRoute.ts+++ b/apps/desktop/src/main/im/shared/channelDefaultRoute.ts@@ -13,6 +13,7 @@ import type { AgentKind } from '@cindy/maker-core';import type { ImDefaultSettings } from '../../../shared/imDefaultSettings.js';export interface ImDefaultRoute {+ agentDeviceId?: string | null;agentKind: AgentKind;model: string;providerId: string | null;@@ -54,7 +55,8 @@ export function fingerprintImDefaultSettings(raw: ImDefaultSettings): string {raw.agentKind,AGENT_KINDS.map((agent) => {const settings = raw.agents[agent];- return settings ? [settings.providerId ?? null, settings.model, settings.effort] : null;+ return settings ? [settings.providerId ?? null, settings.model, settings.effort,+ ...(settings.agentDeviceId ? [settings.agentDeviceId] : [])] : null;}),]);}@@ -66,7 +68,9 @@ function parseRoute(value: unknown): ImDefaultRoute | null {if (typeof r.model !== 'string' || !r.model) return null;if (r.providerId !== null && typeof r.providerId !== 'string') return null;if (r.effort !== null && typeof r.effort !== 'string') return null;+ if (r.agentDeviceId != null && typeof r.agentDeviceId !== 'string') return null;return {+ ...(r.agentDeviceId ? { agentDeviceId: r.agentDeviceId as string } : {}),agentKind: r.agentKind as AgentKind,model: r.model,providerId: (r.providerId as string | null) || null,@@ -146,6 +150,7 @@ export function sameImDefaultRoute(): boolean {return (a.agentKind === b.agentKind &&+ (a.agentDeviceId ?? null) === (b.agentDeviceId ?? null) &&a.model === b.model &&(a.effort ?? null) === (b.effort ?? null) &&normalizeProvider(a) === normalizeProvider(b)diff --git a/apps/desktop/src/main/im/shared/channelDefaultRouteSync.ts b/apps/desktop/src/main/im/shared/channelDefaultRouteSync.tsindex 2bda046835..e78c3e83dd 100644--- a/apps/desktop/src/main/im/shared/channelDefaultRouteSync.ts+++ b/apps/desktop/src/main/im/shared/channelDefaultRouteSync.ts@@ -44,7 +44,7 @@ import type { ImOrchestratorConfig } from './types';const log = createLogger('im:default-route');-type RouteAuthCheck = (route: Pick<ImDefaultRoute, 'agentKind' | 'model' | 'providerId'>) => Promise<boolean>;+type RouteAuthCheck = (route: Pick<ImDefaultRoute, 'agentKind' | 'model' | 'providerId' | 'agentDeviceId'>) => Promise<boolean>;export interface ImChannelDefaultRouteSync {/**@@ -68,6 +68,7 @@ export interface ImChannelDefaultRouteSync {}interface SessionRouteRow {+ agentDeviceId?: string | null;source: string | null;status: string;remoteHostId: string | null;@@ -93,6 +94,7 @@ async function readSessionRouteRow(sessionId: string): Promise<SessionRouteRow |agentKind: sessions.agentKind,model: sessions.model,providerId: sessions.providerId,+ agentDeviceId: sessions.agentDeviceId,effort: sessions.effort,fastMode: sessions.fastMode,imDefaultRoute: sessions.imDefaultRoute,@@ -124,6 +126,7 @@ function currentRouteOf(row: SessionRouteRow): ImDefaultRoute {agentKind: toCoreAgentKind(row.agentKind),model: row.model ?? '',providerId: row.providerId?.trim() || null,+ ...(row.agentDeviceId ? { agentDeviceId: row.agentDeviceId } : {}),effort: row.effort ?? null,};}@@ -134,7 +137,7 @@ function currentRouteOf(row: SessionRouteRow): ImDefaultRoute {*/function providerNormalizer(providers: ProviderView[]) {return (route: ImDefaultRoute): string | null =>- route.providerId ?? effectiveSourceIdForModel(providers, null, route.model, route.agentKind as AgentKind);+ route.agentDeviceId ? route.providerId : route.providerId ?? effectiveSourceIdForModel(providers, null, route.model, route.agentKind as AgentKind);}async function listProviders(): Promise<ProviderView[] | null> {@@ -182,6 +185,7 @@ export function createImChannelDefaultRouteSync(deps: {agentKind: defaults.agentKind,model: defaults.model,providerId: defaults.providerId,+ ...(defaults.agentDeviceId ? { agentDeviceId: defaults.agentDeviceId } : {}),effort: defaults.effort,};const current = currentRouteOf(row);@@ -196,6 +200,7 @@ export function createImChannelDefaultRouteSync(deps: {agentKind: pending.agentKind,model: pending.model,providerId: pending.providerId,+ agentDeviceId: pending.agentDeviceId === undefined ? row.agentDeviceId : pending.agentDeviceId,effort: pending.effort ?? null,}: undefined,@@ -241,7 +246,7 @@ export function createImChannelDefaultRouteSync(deps: {outcome = await applySessionRouteUnderSendLock(sessionId,// Fast 不属于渠道默认: 保留任务自己的开关, 不拿新任务的固定默认覆盖。- { ...e.target, fastMode: e.currentFastMode },+ { ...e.target, agentDeviceId: e.target.agentDeviceId ?? null, fastMode: e.currentFastMode },e.current.agentKind,);} catch (err) {@@ -266,6 +271,7 @@ export function createImChannelDefaultRouteSync(deps: {agentKind: intent.agentKind,model: intent.model,providerId: intent.providerId,+ agentDeviceId: intent.agentDeviceId === undefined ? e.target.agentDeviceId : intent.agentDeviceId,effort: intent.effort ?? null,},intent.rev,@@ -366,6 +372,7 @@ export function createImChannelDefaultRouteSync(deps: {agentKind: pending.agentKind,model: pending.model,providerId: pending.providerId,+ agentDeviceId: pending.agentDeviceId === undefined ? row.agentDeviceId : pending.agentDeviceId,effort: pending.effort ?? null,}: undefined,@@ -467,6 +474,7 @@ export async function backfillLegacyImDefaultRoutes(agentKind: sessions.agentKind,model: sessions.model,providerId: sessions.providerId,+ agentDeviceId: sessions.agentDeviceId,effort: sessions.effort,imDefaultRoute: sessions.imDefaultRoute,feishuBotAppId: sessions.feishuBotAppId,@@ -500,6 +508,7 @@ export async function backfillLegacyImDefaultRoutes(agentKind: defaults.agentKind,model: defaults.model,providerId: defaults.providerId,+ agentDeviceId: defaults.agentDeviceId ?? null,effort: defaults.effort,};} catch (err) {diff --git a/apps/desktop/src/main/im/shared/manualRouteOverride.ts b/apps/desktop/src/main/im/shared/manualRouteOverride.tsindex 5140e7ef78..affa2f2870 100644--- a/apps/desktop/src/main/im/shared/manualRouteOverride.ts+++ b/apps/desktop/src/main/im/shared/manualRouteOverride.ts@@ -41,6 +41,7 @@ export async function markImSessionManualRouteOverride(sessionId: string): PromiagentKind: sessions.agentKind,model: sessions.model,providerId: sessions.providerId,+ agentDeviceId: sessions.agentDeviceId,effort: sessions.effort,feishuBotAppId: sessions.feishuBotAppId,imBotContextId: sessions.imBotContextId,@@ -57,6 +58,7 @@ export async function markImSessionManualRouteOverride(sessionId: string): PromiagentKind: dbToMakerAgentKind(row.agentKind),model: row.model,providerId: row.providerId?.trim() || null,+ agentDeviceId: row.agentDeviceId ?? null,effort: row.effort ?? null,};if (isAppSessionBoundaryPending() || activeOwnerScopeKey() !== ownerScopeKey) {diff --git a/apps/desktop/src/main/im/shared/openChannelSession.ts b/apps/desktop/src/main/im/shared/openChannelSession.tsindex 72bf6a0199..edaec9e02c 100644--- a/apps/desktop/src/main/im/shared/openChannelSession.ts+++ b/apps/desktop/src/main/im/shared/openChannelSession.ts@@ -22,6 +22,7 @@ import { openSession, type SessionOpenBody } from '../../localDb/sessionOpening'/** 渠道为新任务选定的路由(准入前)。 */export interface ChannelSessionRoute {+ agentDeviceId?: string | null;agentKind: AgentKind;model: string;providerId: string | null;@@ -68,6 +69,7 @@ export async function openChannelSession<T>(agentKind: normalizeDbAgentKind(route.agentKind) as SessionOpenBody['agentKind'],model: route.model,providerId: route.providerId,+ ...(route.agentDeviceId ? { agentDeviceId: route.agentDeviceId } : {}),...(route.effort !== undefined ? { effort: route.effort } : {}),...(route.fastMode !== undefined ? { fastMode: route.fastMode } : {}),permissionMode: route.permissionMode,diff --git a/apps/desktop/src/main/im/shared/sessionRepo.ts b/apps/desktop/src/main/im/shared/sessionRepo.tsindex bbce577255..83b6ec91ab 100644--- a/apps/desktop/src/main/im/shared/sessionRepo.ts+++ b/apps/desktop/src/main/im/shared/sessionRepo.ts@@ -49,6 +49,7 @@ function toDbAgentKind(kind: AgentKind): string {}export interface ImSessionRow {+ agentDeviceId?: string | null;id: string;agentKind: AgentKind;workingDir: string;@@ -83,6 +84,7 @@ export interface ImSessionRow {}export interface SessionModelRouteSnapshot {+ agentDeviceId?: string | null;model: string;effort: Effort;providerId: string | null;@@ -282,6 +284,7 @@ export function createImSessionRepo(sdkSessionId: row.sdkSessionId,remoteHostId: row.remoteHostId ?? null,providerId: row.providerId ?? null,+ agentDeviceId: row.agentDeviceId ?? null,workspaceKind: readWorkspaceKind(row.workingDir, row.workspaceKind ?? null, botContextId),};},@@ -360,6 +363,7 @@ export function createImSessionRepo(sdkSessionId: row.sdkSessionId,remoteHostId: row.remoteHostId ?? null,providerId: row.providerId ?? null,+ agentDeviceId: row.agentDeviceId ?? null,// update 前读到的旧值不能直接回 —— 与 correctedWorkspaceKind 用同一判据现算,// caller 拿到的和库里落定的才是同一个答案。workspaceKind,@@ -382,6 +386,7 @@ export function createImSessionRepo(sdkSessionId: row.sdkSessionId,remoteHostId: row.remoteHostId ?? null,providerId: row.providerId ?? null,+ agentDeviceId: row.agentDeviceId ?? null,workspaceKind: row.workspaceKind ?? null,};},@@ -427,6 +432,7 @@ export function createImSessionRepo(agentKind: defaults.agentKind,model: defaults.model,providerId: defaults.providerId,+ agentDeviceId: defaults.agentDeviceId ?? null,effort: defaults.effort,fastMode: defaults.fastMode,permissionMode: defaults.permissionMode,@@ -465,6 +471,7 @@ export function createImSessionRepo(status: 'active',agentKind: toDbAgentKind(row.agentKind),providerId: row.providerId,+ agentDeviceId: row.agentDeviceId ?? null,imDefaultRoute: defaultRouteRecordFor(row),source: ns.source,...ns.extraInsertColumns(botContextId, userId),@@ -511,6 +518,7 @@ export function createImSessionRepo(sdkSessionId: persistedRow.sdkSessionId,remoteHostId: persistedRow.remoteHostId ?? null,providerId: persistedRow.providerId ?? null,+ agentDeviceId: persistedRow.agentDeviceId ?? null,}: row;log.info(@@ -571,6 +579,7 @@ export function createImSessionRepo(agentKind: fresh.agentKind,model: fresh.model,providerId: fresh.providerId,+ agentDeviceId: fresh.agentDeviceId ?? null,effort: fresh.effort,fastMode: fresh.fastMode,permissionMode: fresh.permissionMode,@@ -619,6 +628,7 @@ export function createImSessionRepo(fastMode: fresh.fastMode,agentKind: toDbAgentKind(fresh.agentKind),providerId: fresh.providerId,+ agentDeviceId: fresh.agentDeviceId ?? null,imDefaultRoute: defaultRouteRecordFor(fresh),source: ns.source,imBotContextId,@@ -665,6 +675,7 @@ function rowFromDefaults(sdkSessionId: null,remoteHostId: null,providerId: defaults.providerId,+ agentDeviceId: defaults.agentDeviceId ?? null,defaultRouteFingerprint: defaults.fingerprint,};}@@ -676,6 +687,7 @@ function defaultRouteRecordFor(row: ImSessionRow): string | null {agentKind: row.agentKind,model: row.model,providerId: row.providerId,+ ...(row.agentDeviceId ? { agentDeviceId: row.agentDeviceId } : {}),effort: row.effort,});}@@ -740,6 +752,7 @@ export async function resetSessionToDefaults(model: defaults.model,effort: defaults.effort,providerId: defaults.providerId,+ agentDeviceId: defaults.agentDeviceId ?? null,permissionMode: defaults.permissionMode,fastMode: defaults.fastMode,imDefaultRoute: defaultRouteRecordFor(defaults),@@ -795,6 +808,7 @@ export async function readModelRouteSnapshot(model: sessions.model,effort: sessions.effort,providerId: sessions.providerId,+ agentDeviceId: sessions.agentDeviceId,}).from(sessions).where(eq(sessions.id, sessionId))@@ -805,6 +819,7 @@ export async function readModelRouteSnapshot(model: row.model,effort: row.effort as Effort,providerId: row.providerId ?? null,+ agentDeviceId: row.agentDeviceId ?? null,};}diff --git a/apps/desktop/src/main/im/shared/slashCommands.ts b/apps/desktop/src/main/im/shared/slashCommands.tsindex 3f539d5cf7..1d84b8863f 100644--- a/apps/desktop/src/main/im/shared/slashCommands.ts+++ b/apps/desktop/src/main/im/shared/slashCommands.ts@@ -12,6 +12,7 @@*/import { getDesktopProviderService } from '../../maker-host/createDesktopProviderService';+import { readDeviceProviderViews } from '../../remote-agent/controller/deviceCatalog';import { getModelVisibilityOverride, waitForModelVisibilityMirror } from '../../maker-host/model-visibility-mirror';import { getSessionProvider } from '../../maker-host/session-provider-store';import {@@ -333,8 +334,10 @@ export function createSlashHandlers(// 保证 IM 列表与应用内逐模型一致。currentProviderId 优先取会话持久化的 providerId。const agentKind = row.agentKind;const currentProviderId = getSessionProvider(row.id) ?? row.providerId;- const providers = await getDesktopProviderService().listProviders({ allowSideEffects: true });- await waitForModelVisibilityMirror();+ const providers = row.agentDeviceId+ ? await readDeviceProviderViews((await import('../../device-link')).remoteBackgroundInvoke, row.agentDeviceId)+ : await getDesktopProviderService().listProviders({ allowSideEffects: true });+ if (!row.agentDeviceId) await waitForModelVisibilityMirror();const connected = connectedProvidersForAgent(providers, agentKind);const sections = buildProviderSections({providers: connected,@@ -345,7 +348,7 @@ export function createSlashHandlers(const provider = connected.find((p) => p.id === pid);const model = provider ? getModel(provider, mid, agentKind) : undefined;return isModelVisible(- getModelVisibilityOverride(agentKind, pid, mid),+ row.agentDeviceId ? undefined : getModelVisibilityOverride(agentKind, pid, mid),model?.defaultEnabled,);},diff --git a/apps/desktop/src/main/im/shared/turnRunner.ts b/apps/desktop/src/main/im/shared/turnRunner.tsindex 403ce490c9..9057f5b99f 100644--- a/apps/desktop/src/main/im/shared/turnRunner.ts+++ b/apps/desktop/src/main/im/shared/turnRunner.ts@@ -1,3 +1,4 @@+import { readImRemoteProviderRoute } from '../remoteProviderRoute';import { createLocalImSource, type ImContextSnapshot } from '../../../shared/imMessageSource';/*** main/im/shared/turnRunner.ts@@ -596,9 +597,9 @@ export interface ImTurnRunner {userId: string,scopeKey?: string,): Promise<RouteTarget | null>;- hasAuthForRoute(row: Pick<ImSessionRow, 'agentKind' | 'model' | 'providerId'>): Promise<boolean>;+ hasAuthForRoute(row: Pick<ImSessionRow, 'agentKind' | 'model' | 'providerId' | 'agentDeviceId'>): Promise<boolean>;getAuthStatusForRoute?: (- row: Pick<ImSessionRow, 'agentKind' | 'model' | 'providerId'>,+ row: Pick<ImSessionRow, 'agentKind' | 'model' | 'providerId' | 'agentDeviceId'>,) => Promise<ImAuthRouteStatus>;prewireAttachedSession(botContextId: string, userId: string, scopeKey?: string): Promise<void>;/** 接管 detach 清理(原 detachFeishuFromSession)— binding cleanup hook 调用。 */@@ -638,9 +639,10 @@ export interface ImTurnRunner {/** row 的路由快照 —— 跟随切换的实际落点比对用。 */function routeOfRow(- row: Pick<ImSessionRow, 'agentKind' | 'model' | 'providerId' | 'effort'>,+ row: Pick<ImSessionRow, 'agentKind' | 'model' | 'providerId' | 'agentDeviceId' | 'effort'>,): ImDefaultRoute {return {+ agentDeviceId: row.agentDeviceId ?? null,agentKind: row.agentKind,model: row.model,providerId: row.providerId,@@ -749,7 +751,8 @@ export function createTurnRunner(return {row: { id: row.id, agentKind: toCoreAgentKind(row.agentKind), workingDir: row.workingDir,model: row.model, effort: row.effort, permissionMode: row.permissionMode, fastMode: row.fastMode,- sdkSessionId: row.sdkSessionId, remoteHostId: row.remoteHostId ?? null, providerId: row.providerId ?? null },+ sdkSessionId: row.sdkSessionId, remoteHostId: row.remoteHostId ?? null, providerId: row.providerId ?? null,+ agentDeviceId: row.agentDeviceId ?? null },attached: false, notificationReply: true, scopeKey,};}@@ -817,6 +820,7 @@ export function createTurnRunner(sdkSessionId: row.sdkSessionId,remoteHostId: row.remoteHostId ?? null,providerId: row.providerId ?? null,+ agentDeviceId: row.agentDeviceId ?? null,},attached: true,scopeKey,@@ -900,6 +904,7 @@ export function createTurnRunner(agentKind: followTarget.agentKind,model: followTarget.model,providerId: followTarget.providerId,+ agentDeviceId: followTarget.agentDeviceId ?? null,}: row;const auth = await checkImRouteAuthDetailed(authRow, undefined, authCheckDeps());@@ -1047,6 +1052,7 @@ export function createTurnRunner(effort: refreshed.effort,fastMode: refreshed.fastMode,providerId: refreshed.providerId,+ agentDeviceId: refreshed.agentDeviceId ?? null,sdkSessionId: refreshed.sdkSessionId,},};@@ -1725,6 +1731,7 @@ export function createTurnRunner(fastMode: row.fastMode,// 保留 DB 的 null 语义:Pi 用 null 表示清除显式 provider,不能退化为 undefined。providerId: row.providerId,+ agentDeviceId: row.agentDeviceId ?? undefined,remoteHostId: row.remoteHostId ?? undefined,resumeSessionId: row.sdkSessionId ?? undefined,vendorOptions: state.preserveSessionConfig@@ -1916,6 +1923,7 @@ export function createTurnRunner(function authCheckDeps(): ImAuthCheckDeps {return {+ checkRemoteRoute: readImRemoteProviderRoute,readXdGatewayApiKey,hasCustomProviderKey,getAgentAuthState: (agentKind) => getMaker().getAgentAuthState(agentKind),@@ -1964,6 +1972,7 @@ export function createTurnRunner(fastMode: row.fastMode,// 保留 DB 的 null 语义:Pi 用 null 表示清除显式 provider,不能退化为 undefined。providerId: row.providerId,+ agentDeviceId: row.agentDeviceId ?? undefined,remoteHostId: row.remoteHostId ?? undefined,// 行总是先由 repo 建好, maker 复用已有 row 时该 title 不会生效 —// 仅作防御兜底(原 feishu 实现传 '飞书会话' 字面量, 语义等价)。diff --git a/apps/desktop/src/main/localDb/client/__tests__/tx.test.ts b/apps/desktop/src/main/localDb/client/__tests__/tx.test.tsindex 40cd26ac0c..1e4a7f1a21 100644--- a/apps/desktop/src/main/localDb/client/__tests__/tx.test.ts+++ b/apps/desktop/src/main/localDb/client/__tests__/tx.test.ts@@ -69,6 +69,7 @@ CREATE TABLE sessions (working_dir TEXT,model TEXT NOT NULL DEFAULT 'claude-sonnet-4-6',provider_id TEXT,+ agent_device_id TEXT,effort TEXT NOT NULL DEFAULT 'high',permission_mode TEXT NOT NULL DEFAULT 'ask',status TEXT NOT NULL DEFAULT 'active',@@ -3011,6 +3012,7 @@ describe('db worker tx handlers', () => {fastMode: false,agentKind: 'pi',providerId: 'xai',+ agentDeviceId: 'share:owner',imDefaultRoute: 'default-route-record',source: 'telegram',imBotContextId: 'bot',@@ -3020,6 +3022,8 @@ describe('db worker tx handlers', () => {});expect(result).toEqual({ previousStatus: 'active' });+ await expect(client.query("SELECT agent_device_id FROM sessions WHERE id = 'telegram-new'"))+ .resolves.toEqual([{ agent_device_id: 'share:owner' }]);await expect(client.query(`SELECT id, status, im_bot_context_id, im_user_id, im_default_routediff --git a/apps/desktop/src/main/localDb/client/tx/types.ts b/apps/desktop/src/main/localDb/client/tx/types.tsindex a345d373ef..eee3875980 100644--- a/apps/desktop/src/main/localDb/client/tx/types.ts+++ b/apps/desktop/src/main/localDb/client/tx/types.ts@@ -991,6 +991,7 @@ export interface ImRotateSessionArgs {agentKind: string;source: string;providerId: string | null;+ agentDeviceId?: string | null;/** 跟随渠道默认的记录(JSON, 见 im/shared/channelDefaultRoute.ts)。 */imDefaultRoute?: string | null;imBotContextId: string;diff --git a/apps/desktop/src/main/localDb/worker/opHandlers/tx.ts b/apps/desktop/src/main/localDb/worker/opHandlers/tx.tsindex 88ae036a91..39f5753a76 100644--- a/apps/desktop/src/main/localDb/worker/opHandlers/tx.ts+++ b/apps/desktop/src/main/localDb/worker/opHandlers/tx.ts@@ -2209,8 +2209,8 @@ function imRotateSession(`INSERT INTO sessions (id, title, working_dir, workspace_kind, model, effort, permission_mode,fast_mode, status, agent_kind, provider_id, source, im_bot_context_id,- im_user_id, im_default_route, created_at, updated_at, user_send_at- ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, 'active', ?, ?, ?, ?, ?, ?, ?, ?, ?)`,+ im_user_id, im_default_route, agent_device_id, created_at, updated_at, user_send_at+ ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, 'active', ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,);const retirePrevious = db.prepare(`UPDATE sessions@@ -2244,6 +2244,7 @@ function imRotateSession(expectString(session.imBotContextId, 'session.imBotContextId'),expectString(session.imUserId, 'session.imUserId'),nullableString(session.imDefaultRoute),+ nullableString(session.agentDeviceId),now,now,now,diff --git a/apps/desktop/src/main/maker-ipc/register.ts b/apps/desktop/src/main/maker-ipc/register.tsindex bacc089596..7521ebb13e 100644--- a/apps/desktop/src/main/maker-ipc/register.ts+++ b/apps/desktop/src/main/maker-ipc/register.ts@@ -4091,6 +4091,7 @@ let cancelPendingAgentSwitchHolder: ((sessionId: string) => void) | null = null;/** 会话级完整路由选择(引擎 + 模型 + 来源 + 档位 + Fast)。 */export interface SessionRouteSelection {+ agentDeviceId?: string | null;agentKind: AgentKind;model: string;providerId: string | null;@@ -14794,13 +14795,14 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)route: SessionRouteSelection,currentAgentKind: AgentKind,): Promise<void> => {- // 自动跟随(渠道默认 / 伙伴模型)给的是本机目录里的路由;Agent 在另一台电脑运行的任务- // 用那台的目录,不跟随。- if (await readSessionAgentDeviceId(sessionId)) return;- if (route.agentKind !== currentAgentKind) {+ // 未指定位置的调用方(伙伴模型)仍只管本机;IM 默认携带明确位置,允许跨电脑跟随。+ const currentDeviceId = await readSessionAgentDeviceId(sessionId);+ if (route.agentDeviceId === undefined && currentDeviceId) return;+ if (route.agentKind !== currentAgentKind || currentDeviceId !== (route.agentDeviceId ?? null)) {await performSessionAgentSwitch(agentSwitchDeps, {sessionId, targetAgentKind: route.agentKind, model: route.model,providerId: route.providerId, effort: route.effort, fastMode: route.fastMode,+ ...(route.agentDeviceId !== undefined ? { agentDeviceId: route.agentDeviceId } : {}),configStaged: true,});} else {@@ -14888,6 +14890,7 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)agentKind: intent.targetAgentKind,model: intent.model,providerId: intent.providerId ?? null,+ agentDeviceId: intent.targetAgentDeviceId,effort: intent.effort ?? null,rev: agentSwitchPending.revision?.(sessionId),}diff --git a/apps/desktop/src/preload/preload.ts b/apps/desktop/src/preload/preload.tsindex 6b60c9c1ef..4badb2d1ab 100644--- a/apps/desktop/src/preload/preload.ts+++ b/apps/desktop/src/preload/preload.ts@@ -5167,6 +5167,7 @@ contextBridge.exposeInMainWorld('electronAPI', {getWorkspaceProviderSources: (): Promise<{ entries: unknown }> =>ipcRenderer.invoke('maker:hook-control:workspace-provider-source-get'),setWorkspaceProviderSource: (payload: {+ agentDeviceId?: string | null;channel: 'slack' | 'telegram' | 'x';teamId: string | null;workspace: string;diff --git a/apps/desktop/src/renderer/components/settings/HookWorkspacePrefsEditor.tsx b/apps/desktop/src/renderer/components/settings/HookWorkspacePrefsEditor.tsxindex 1566500b49..35fcfb96b8 100644--- a/apps/desktop/src/renderer/components/settings/HookWorkspacePrefsEditor.tsx+++ b/apps/desktop/src/renderer/components/settings/HookWorkspacePrefsEditor.tsx@@ -44,6 +44,8 @@ import { toast } from '@/lib/toast';import { extractIpcError } from '@/utils/ipcError';import { useAgentCapabilities, type AgentCapabilities } from '@/hooks/useAgentCapabilities';import { ModelSelector } from '@/components/new-chat/ModelSelector';+import { useProviderShareAgentDevices } from '@/features/provider-share/useProviderShareAgentDevices';+import { agentDeviceModelMemoryAccessors } from '@/state/agentDeviceModelMemory';import { PermissionSelector } from '@/components/new-chat/PermissionSelector';import type { MakerVendor } from '@/lib/ccAgent.types';import {@@ -95,8 +97,9 @@ export interface HookWorkspacePrefsState {prefsFor: (alias: string) => HookWorkspacePrefs;/** 该目录的模型来源偏好(纯本地; null = 未设置, 跟随默认路由)。 */providerSourceFor: (alias: string) => string | null;+ agentDeviceFor: (alias: string) => string | null;/** 写/清该目录的模型来源偏好(providerId = null 清除)。 */- applyProviderSource: (alias: string, providerId: string | null) => void;+ applyProviderSource: (alias: string, providerId: string | null, agentDeviceId?: string | null) => Promise<boolean>;/** 是否可编辑(已连接 + 已绑定 + 快照可用)。 */editable: boolean;/** 写入在途的目录别名(该卡片下拉禁用)。 */@@ -114,6 +117,7 @@ export interface HookWorkspacePrefsState {workspace: string,patch: HookPrefsPatch,alsoProviderSource?: string | null,+ agentDeviceId?: string | null,) => Promise<boolean>;/** (multi-team)可用绑定清单(未 displaced); 单绑定/老 server 时 ≤1 条。 */teams: Array<{ teamId: string; teamName: string | null }>;@@ -360,18 +364,29 @@ export function useHookWorkspacePrefs([providerSources, provider, multiTeam, selectedTeamId],);+ const agentDeviceFor = useCallback((alias: string): string | null => {+ const teamId = multiTeam ? selectedTeamId : null;+ const entry = providerSources.find((e) => e.channel === provider && e.teamId === teamId && e.workspace === alias)+ ?? providerSources.find((e) => e.channel === provider && e.teamId === null && e.workspace === alias);+ return entry?.agentDeviceId ?? null;+ }, [providerSources, provider, multiTeam, selectedTeamId]);+const applyProviderSource = useCallback(- (alias: string, providerId: string | null) => {+ (alias: string, providerId: string | null, agentDeviceId?: string | null) => {const teamId = multiTeam ? selectedTeamId : null;const revision = ++providerSourceRevisionRef.current;- void window.electronAPI.hookControl- .setWorkspaceProviderSource({ channel: provider, teamId, workspace: alias, providerId })+ return window.electronAPI.hookControl+ .setWorkspaceProviderSource({ channel: provider, teamId, workspace: alias, providerId,+ ...(agentDeviceId !== undefined ? { agentDeviceId } : {}) }).then((res) => {if (revision === providerSourceRevisionRef.current) setProviderSources(res.entries);+ return true;}).catch((err: unknown) => {- if (revision !== providerSourceRevisionRef.current) return;- toast.error(extractIpcError(err)?.message ?? t('settings.tina.prefs.toast.saveFailed'));+ if (revision === providerSourceRevisionRef.current) {+ toast.error(extractIpcError(err)?.message ?? t('settings.tina.prefs.toast.saveFailed'));+ }+ return false;});},[provider, multiTeam, selectedTeamId, t],@@ -383,7 +398,7 @@ export function useHookWorkspacePrefs(// 一半失败时留下「新来源配旧模型」的分裂态)。顺序选「先远端后本地」:远端// 失败 → 整体失败, 来源不动, 状态与操作前一致;本地失败(概率远小)→ 旧来源// 配新模型, 派发端校验不通过时拒绝新任务并提示重新选择模型(显式来源不换账号)。- (workspace: string, patch: HookPrefsPatch, alsoProviderSource?: string | null) => {+ (workspace: string, patch: HookPrefsPatch, alsoProviderSource?: string | null, agentDeviceId?: string | null) => {// A server push, binding change, retry, or newer mutation must win over// this response. Otherwise a delayed set reply can roll the UI back to// an older provider snapshot and clear another mutation's pending state.@@ -398,13 +413,13 @@ export function useHookWorkspacePrefs(multiTeam ? selectedTeamId : undefined,);return request- .then((res) => {+ .then(async (res) => {// 来源落地在快照守卫**之前**(codex review): invoke 成功 = 远端已确认// 本次 (model, effort) 写入 —— 这一事实不因「更新的快照先到」而失效;// 守卫只管下方 UI 快照是否回填,若来源也被守卫跳过(prefs 回执经广播// 先到的正常时序), 会留下「新模型 + 旧来源」的持久分裂。if (alsoProviderSource !== undefined) {- applyProviderSource(workspace, alsoProviderSource);+ if (!await applyProviderSource(workspace, alsoProviderSource, agentDeviceId)) return false;}if (revision !== fetchRevisionRef.current) return true;const nextPrefs: HookPrefsView | ProviderPrefsView = res.prefs;@@ -456,6 +471,7 @@ export function useHookWorkspacePrefs(return {prefsFor,providerSourceFor,+ agentDeviceFor,applyProviderSource,editable: Boolean(enabled) && bound && loadError === null,pendingWs,@@ -505,9 +521,11 @@ export function WorkspacePrefsEditor({maxVisibleModelRows?: number;}) {const { t } = useTranslation();- const claudeCaps = useAgentCapabilities('claude-code');- const codexCaps = useAgentCapabilities('codex');- const piCaps = useAgentCapabilities('pi');+ const agentDeviceId = state.agentDeviceFor(alias);+ const sharedDevices = useProviderShareAgentDevices([agentDeviceId]);+ const claudeCaps = useAgentCapabilities('claude-code', agentDeviceId ?? undefined);+ const codexCaps = useAgentCapabilities('codex', agentDeviceId ?? undefined);+ const piCaps = useAgentCapabilities('pi', agentDeviceId ?? undefined);const capsByAgent = useMemo(() =>({@@ -529,7 +547,7 @@ export function WorkspacePrefsEditor({const disabled = !state.editable || state.pendingWs === alias;const vendorKey = toVendorKey(eff.agentKind.id);- const pickerAgents = useModelPickerAgents(vendorKey === 'cc' ? 'claude-code' : vendorKey === 'pi' ? 'pi' : 'codex');+ const pickerAgents = useModelPickerAgents(vendorKey === 'cc' ? 'claude-code' : vendorKey === 'pi' ? 'pi' : 'codex', agentDeviceId);/** 落一个模型选择(分段行与 flat 行共用): 随手写入 (agent, model) 配对并校准 effort。 */const applyModel = (next: string) => {@@ -552,12 +570,14 @@ export function WorkspacePrefsEditor({路由 —— 「选 A 落 B」的根因(选了来源没地方存)已消除。 */}<PrefsField label={t('settings.tina.prefs.modelLabel')} className="flex-1 basis-[220px]"><ModelSelector+ remoteAgent={{ devices: sharedDevices.devices, selectedDeviceId: agentDeviceId }}fastModeConfigurable={false}unifiedAgents={pickerAgents}- onUnifiedSelect={({ engine, modelId, providerId, effort }) => state.applyPatch(+ onUnifiedSelect={({ engine, modelId, providerId, effort, agentDevice }) => state.applyPatch(alias,{ agentKind: engine === 'cc' ? 'claude-code' : engine, model: modelId, effort: effort || null },providerId,+ agentDevice?.deviceId ?? null,)}modelId={eff.model.id ?? ''}effort={eff.effort.id ?? ''}@@ -580,7 +600,7 @@ export function WorkspacePrefsEditor({// (PrefsSelect 的 modelLabel 回落裸 id)行为一致; 派发侧另有回落并记日志。unknownModelLabel={(id) => id}// 非选中行 hover 配置(推理强度/Fast)与 composer 共用同一份模型级全局预设。- modelMemory={{+ modelMemory={agentDeviceId ? agentDeviceModelMemoryAccessors(agentDeviceId) : {getEffort: getProviderModelEffort,setEffort: setProviderModelEffort,setChoice: setProviderModelChoice,@@ -610,9 +630,9 @@ export function WorkspacePrefsEditor({patch.effort = remembered;}}- return state.applyPatch(alias, patch, providerId);+ return state.applyPatch(alias, patch, providerId, agentDeviceId);} else {- state.applyProviderSource(alias, providerId);+ void state.applyProviderSource(alias, providerId, agentDeviceId);}}}onModelChange={applyModel}diff --git a/apps/desktop/src/renderer/components/settings/ImDefaultSettingsSection.tsx b/apps/desktop/src/renderer/components/settings/ImDefaultSettingsSection.tsxindex 47d19dc5ef..8b51832495 100644--- a/apps/desktop/src/renderer/components/settings/ImDefaultSettingsSection.tsx+++ b/apps/desktop/src/renderer/components/settings/ImDefaultSettingsSection.tsx@@ -16,9 +16,11 @@ import { useCallback, useEffect, useMemo, useState } from 'react';import { useTranslation } from 'react-i18next';import { ModelSelector } from '@/components/new-chat/ModelSelector';+import { useProviderShareAgentDevices } from '@/features/provider-share/useProviderShareAgentDevices';import { PermissionSelector } from '@/components/new-chat/PermissionSelector';import { type ModelDescriptor, useAgentCapabilities } from '@/hooks/useAgentCapabilities';import { useProviders } from '@/hooks/useProviders';+import { useDeviceProviders } from '@/hooks/useDeviceProviders';import { deriveModelsFromProviders } from '@/lib/providerModels';import { toast } from '@/lib/toast';import type { Effort } from '@/lib/userPreferences.types';@@ -76,14 +78,18 @@ export function ImDefaultSettingsSection({onSummaryChange?: (summary: ImDefaultSettingsSummary | null) => void;}) {const { t } = useTranslation();- const { providers } = useProviders();- const cc = useAgentCapabilities('claude-code');- const codex = useAgentCapabilities('codex');- const pi = useAgentCapabilities('pi');const [settings, setSettings] = useState<ImDefaultSettingsState | null>(null);const [pending, setPending] = useState(false);+ const agentDeviceId = settings?.agents[settings.agentKind].agentDeviceId ?? null;+ const local = useProviders();+ const remote = useDeviceProviders(agentDeviceId ?? undefined);+ const providers = agentDeviceId ? remote.providers : local.providers;+ const cc = useAgentCapabilities('claude-code', agentDeviceId ?? undefined);+ const codex = useAgentCapabilities('codex', agentDeviceId ?? undefined);+ const pi = useAgentCapabilities('pi', agentDeviceId ?? undefined);+ const sharedDevices = useProviderShareAgentDevices([agentDeviceId]);- const pickerAgents = useModelPickerAgents(settings?.agentKind ?? 'claude-code');+ const pickerAgents = useModelPickerAgents(settings?.agentKind ?? 'claude-code', agentDeviceId);useEffect(() => {let cancelled = false;@@ -262,7 +268,7 @@ export function ImDefaultSettingsSection({providerId: string | null = activeSettings.providerId,reconciledEffort?: Effort,) => {- const nextProviderId = resolveProviderId(settings.agentKind, model, providerId);+ const nextProviderId = agentDeviceId ? providerId : resolveProviderId(settings.agentKind, model, providerId);const effort = isImDefaultEffort(reconciledEffort)? reconciledEffort: resolveEffort(settings.agentKind, model, activeSettings.effort);@@ -327,9 +333,10 @@ export function ImDefaultSettingsSection({{t('settings.imBot.defaults.modelLabel')}</span><ModelSelector+ remoteAgent={{ devices: sharedDevices.devices, selectedDeviceId: agentDeviceId }}fastModeConfigurable={false}unifiedAgents={pickerAgents}- onUnifiedSelect={({ engine, modelId, providerId, effort }) => {+ onUnifiedSelect={({ engine, modelId, providerId, effort, agentDevice }) => {const agentKind = agentKindOfVendor(engine);return persist({agentKind,@@ -337,6 +344,7 @@ export function ImDefaultSettingsSection({...settings.agents[agentKind],model: modelId,providerId,+ agentDeviceId: agentDevice?.deviceId ?? null,effort: isImDefaultEffort(effort)? effort: resolveEffort(agentKind, modelId, ''),diff --git a/apps/desktop/src/renderer/components/settings/__tests__/ImDefaultSettingsSection.test.tsx b/apps/desktop/src/renderer/components/settings/__tests__/ImDefaultSettingsSection.test.tsxindex 776583faf8..b49f043f9d 100644--- a/apps/desktop/src/renderer/components/settings/__tests__/ImDefaultSettingsSection.test.tsx+++ b/apps/desktop/src/renderer/components/settings/__tests__/ImDefaultSettingsSection.test.tsx@@ -66,8 +66,11 @@ vi.mock('@/hooks/useAvailableAgents', () => ({vi.mock('@/components/new-chat/ModelSelector', () => ({ModelSelector: ({ onUnifiedSelect, fastModeConfigurable }: {onUnifiedSelect: (selection: object) => void; fastModeConfigurable: boolean;- }) => <button data-testid="select-codex" data-fast-configurable={String(fastModeConfigurable)}- onClick={() => onUnifiedSelect({ engine: 'codex', modelId: 'gpt-5.5', providerId: 'xd', effort: 'low', fast: false })}>Select Codex</button>,+ }) => <>+ <button data-testid="select-codex" data-fast-configurable={String(fastModeConfigurable)}+ onClick={() => onUnifiedSelect({ engine: 'codex', modelId: 'gpt-5.5', providerId: 'xd', effort: 'low', fast: false })}>Select Codex</button>+ <button data-testid="select-shared" onClick={() => onUnifiedSelect({ engine: 'codex', modelId: 'owner-model', providerId: 'owner-provider', effort: 'high', agentDevice: { deviceId: 'share:owner', name: 'Owner' } })}>Select shared</button>+ </>,}));vi.mock('@/components/new-chat/PermissionSelector', () => ({@@ -99,6 +102,15 @@ function defaults(agentKind: ImDefaultSettingsState['agentKind']): ImDefaultSett}describe('ImDefaultSettingsSection Pi channel warning', () => {+ it('saves a shared model and its location together without local catalog membership', async () => {+ const save = vi.fn(async () => defaults('codex'));+ window.electronAPI.maker.imDefaultSettingsSet = save;+ render(<ImDefaultSettingsSection channel="feishu" />);+ fireEvent.click(await screen.findByTestId('select-shared'));+ await waitFor(() => expect(save).toHaveBeenCalledWith({ agentKind: 'codex', agents: {+ codex: { providerId: 'owner-provider', model: 'owner-model', effort: 'high', agentDeviceId: 'share:owner' },+ } }, 'feishu'));+ });it('saves the complete selection in one update while preserving permissions', async () => {const save = vi.fn(async (_patch: unknown) => defaults('codex'));window.electronAPI.maker.imDefaultSettingsSet = save;@@ -108,7 +120,7 @@ describe('ImDefaultSettingsSection Pi channel warning', () => {fireEvent.click(screen.getByTestId('select-codex'));await waitFor(() => expect(save).toHaveBeenCalledTimes(1));expect(save.mock.calls[0]?.[0]).toEqual({ agentKind: 'codex', agents: {- codex: { providerId: 'xd', model: 'gpt-5.5', effort: 'low' },+ codex: { providerId: 'xd', model: 'gpt-5.5', effort: 'low', agentDeviceId: null },} });});diff --git a/apps/desktop/src/renderer/components/settings/__tests__/WorkspacePrefsEditorRendering.test.tsx b/apps/desktop/src/renderer/components/settings/__tests__/WorkspacePrefsEditorRendering.test.tsxindex 3e0da474e9..8214c30e55 100644--- a/apps/desktop/src/renderer/components/settings/__tests__/WorkspacePrefsEditorRendering.test.tsx+++ b/apps/desktop/src/renderer/components/settings/__tests__/WorkspacePrefsEditorRendering.test.tsx@@ -47,7 +47,8 @@ vi.mock('@/components/new-chat/ModelSelector', () => ({ModelSelector: (props: {modelId: string;fastModeConfigurable?: boolean;- onUnifiedSelect?: (selection: { engine: 'cc' | 'codex' | 'pi'; modelId: string; providerId: string; effort: string; fast: boolean; favoriteUid: null }) => void;+ onUnifiedSelect?: (selection: { engine: 'cc' | 'codex' | 'pi'; modelId: string; providerId: string; effort: string; fast: boolean; favoriteUid: null; agentDevice?: { deviceId: string; name: string } }) => void;+ remoteAgent?: { selectedDeviceId: string | null };effort: string;vendorKey: string;triggerVariant?: string;@@ -75,10 +76,17 @@ vi.mock('@/components/new-chat/ModelSelector', () => ({// 未知模型的 trigger 文案由调用方给出;这里回放它对一个不存在的 id 的结果。data-unknown-label={props.unknownModelLabel?.('ghost-model-1') ?? ''}data-fast-configurable={String(props.fastModeConfigurable)}+ data-agent-device={props.remoteAgent?.selectedDeviceId ?? ''}onClick={() => props.onModelChange('gpt-5.5')}// 分段行点击(供应商, 模型, effort)原子选择 —— 回放 onProviderChange 的行为锁触发器。onKeyDown={() => props.onProviderChange?.('anthropic', 'claude-opus-5')}>+ <button data-testid="shared-model" onClick={(event) => {+ event.stopPropagation();+ props.onUnifiedSelect?.({ engine: 'codex', modelId: 'shared-model', providerId: 'owner-provider',+ effort: 'high', fast: false, favoriteUid: null,+ agentDevice: { deviceId: 'share:owner', name: 'Owner' } });+ }} />{(['cc', 'codex', 'pi'] as const).map((engine) => (<button key={engine} data-testid={`model-harness-${engine}`} disabled={props.disabled}onClick={(event) => { event.stopPropagation(); props.onUnifiedSelect?.({ engine,@@ -119,6 +127,7 @@ function stateWith(overrides: Partial<HookWorkspacePrefsState> = {}): HookWorksppermissionMode: 'bypassPermissions',}),providerSourceFor: () => null,+ agentDeviceFor: () => null,applyProviderSource: vi.fn(),editable: true,pendingWs: null,@@ -167,6 +176,15 @@ describe('WorkspacePrefsEditor 复用标准选择器', () => {expect(screen.getByTestId('model-selector').getAttribute('data-sources-enabled')).toBe('true');});+ it('saves shared execution location with the workspace model and displays it after reload', () => {+ render(<WorkspacePrefsEditor alias="cindy" state={stateWith({ agentDeviceFor: () => 'share:owner' })} />);+ expect(screen.getByTestId('model-selector').getAttribute('data-agent-device')).toBe('share:owner');+ fireEvent.click(screen.getByTestId('shared-model'));+ expect(applyPatch).toHaveBeenCalledWith('cindy', {+ agentKind: 'codex', model: 'shared-model', effort: 'high',+ }, 'owner-provider', 'share:owner');+ });+// 双写串联(Greptile/codex review):model/effort 走远端 prefs patch,来源作为// applyPatch 第三参在远端成功后落本地 —— 不再各自 fire-and-forget(分裂态风险)。it('分段行选择:(模型, 来源)经 applyPatch 串联落库,不直接调 applyProviderSource', () => {@@ -179,6 +197,7 @@ describe('WorkspacePrefsEditor 复用标准选择器', () => {'cindy',expect.objectContaining({ model: 'claude-opus-5', agentKind: 'claude-code' }),'anthropic',+ null,);expect(applyProviderSource).not.toHaveBeenCalled();});@@ -325,7 +344,7 @@ describe('WorkspacePrefsEditor 复用标准选择器', () => {agentKind: 'claude-code',model: 'claude-opus-4-8',effort: 'high',- }, 'xd');+ }, 'xd', null);});it('未知/过期 agentKind 归一到默认 agent,分段控件不禁死', () => {@@ -353,7 +372,7 @@ describe('WorkspacePrefsEditor 复用标准选择器', () => {agentKind: 'codex',model: 'gpt-5.5',effort: 'high',- }, 'xd');+ }, 'xd', null);});it('切换 Harness 原子写入选中的模型与档位,保留权限', () => {@@ -365,7 +384,7 @@ describe('WorkspacePrefsEditor 复用标准选择器', () => {agentKind: 'codex',model: 'gpt-5.5',effort: 'high',- }, 'xd');+ }, 'xd', null);});// 当前 Harness 的能力失败不能阻止改选另一个 Harness;权限仍依赖当前能力。@@ -379,7 +398,7 @@ describe('WorkspacePrefsEditor 复用标准选择器', () => {agentKind: 'codex',model: 'gpt-5.5',effort: 'high',- }, 'xd');+ }, 'xd', null);expect(screen.getByTestId('model-selector').getAttribute('data-disabled')).toBe('false');expect(screen.getByTestId('permission-selector').getAttribute('data-disabled')).toBe('true');});diff --git a/apps/desktop/src/renderer/vite-env.d.ts b/apps/desktop/src/renderer/vite-env.d.tsindex a9bc294a96..5c868d37a7 100644--- a/apps/desktop/src/renderer/vite-env.d.ts+++ b/apps/desktop/src/renderer/vite-env.d.ts@@ -4386,6 +4386,7 @@ interface ElectronAPI {entries: import('../shared/hookControlIpc').HookWorkspaceProviderSourceEntry[];}>;setWorkspaceProviderSource: (payload: {+ agentDeviceId?: string | null;channel: 'slack' | 'telegram' | 'x';teamId: string | null;workspace: string;diff --git a/apps/desktop/src/shared/hookControlIpc.ts b/apps/desktop/src/shared/hookControlIpc.tsindex 4e979312e3..7054863b9b 100644--- a/apps/desktop/src/shared/hookControlIpc.ts+++ b/apps/desktop/src/shared/hookControlIpc.ts@@ -340,6 +340,7 @@ export const HOOK_CHAT_WORKSPACE_ALIAS = 'chat';* 按本表与本机目录 model 组合后经 effectiveSourceIdForModel 收窄派发。*/export interface HookWorkspaceProviderSourceEntry {+ agentDeviceId?: string | null;channel: 'slack' | 'telegram' | 'x';/** Slack multi-team 归属; Telegram / X / 单绑定为 null。 */teamId: string | null;diff --git a/apps/desktop/src/shared/imDefaultSettings.ts b/apps/desktop/src/shared/imDefaultSettings.tsindex 0b16fe5b1f..d09ae7bdd5 100644--- a/apps/desktop/src/shared/imDefaultSettings.ts+++ b/apps/desktop/src/shared/imDefaultSettings.ts@@ -12,6 +12,8 @@ export type ImDefaultSettingsChannel ='feishu' | 'slack' | 'discord' | 'wechat' | 'telegram' | 'dingtalk' | 'wecom';export interface ImDefaultAgentSettings {+ /** Agent 所在电脑;share:<id> 表示分享供应商,缺省为本机。 */+ agentDeviceId?: string | null;providerId: string | null;model: string;effort: ImDefaultEffort;diff --git a/docs/product-rules/provider-sharing.md b/docs/product-rules/provider-sharing.mdindex 55eff07c98..b0211d314b 100644--- a/docs/product-rules/provider-sharing.md+++ b/docs/product-rules/provider-sharing.md@@ -174,6 +174,18 @@ Desktop 模型选择器「全部」「收藏」里,分享来的模型每行第### 5.2 供应商设置+IM bot 的渠道默认模型,以及官方 Slack / Telegram / X 的工作目录模型配置,沿用同一个+模型选择器展示已收到的分享。选择同时保存引擎、模型、供应商和 `share:<id>` 执行位置;+切回本机清除执行位置。个人渠道各自独立,官方目录偏好仍按渠道、team、目录隔离,不发给 hook server。+新建、`/new`、冷启动恢复、通知回复和接管已有任务均保留执行位置;跟随渠道默认的任务在+下一条消息时按既有切换流程交接,手动改过的任务不跟随。个人渠道 `/model` 对已使用分享的任务读取+该分享的授权目录,换执行位置仍在 Cindy 的模型配置中进行。+分享模型不要求发起电脑有同名供应商或登录;暂停、撤销、离线或模型不可用时拒绝执行,+不回退到本机同名账号。权限确认、分享凭证确认和工具执行沿用现有远程 Agent 通道,不扩大+IM 发言者或分享者的权限。手机查看已有任务时沿用主机保存的执行位置。+实现见 `im/remoteProviderRoute.ts`、`im/shared/turnRunner.ts` 与 `hook-control/session-runner.ts`+(相对 `apps/desktop/src/main/`);回归覆盖各自同目录的 `__tests__`。+Desktop「设置 → 模型供应商」的左栏(2026-10-08 用户裁决):- **自己其他电脑上能用的供应商**也列在左栏,接在本机供应商后面(不参与拖动排序):图标右上角带与模型diff --git a/docs/product-rules/telegram-bot-parity.md b/docs/product-rules/telegram-bot-parity.mdindex c2742102ad..2e315c9d3e 100644--- a/docs/product-rules/telegram-bot-parity.md+++ b/docs/product-rules/telegram-bot-parity.md@@ -81,7 +81,8 @@ App 完成未读与提醒统一由 `renderer/hooks/useSessionRunningStatus.ts`| 子代理输出隔离 | `im/shared/agentEventScope.ts` + `maker-core/agents/claude-code/translator.ts` | 官方 `hook-control/turnObserver` 与个人 `im/shared/turnRunner` 在消费实时事件前过滤带 `agentMeta.parentUuid` 的子代理事件。内部正文、工具/思考、媒体旁路和终态不进入主任务的 IM 回帖,也不影响主任务收口;个人侧自动任务转播同样适用。Claude translator 为子代理工具结果保留归属,主代理流式事件不继承子代理元数据;主任务正文统计和最后消息的实质内容判定只消费主代理,子代理完整消息与流式增量都不阻断主任务 result 截断补发,也不覆盖 silent-stop 判定。整轮失败即使由子代理 API 错误引起,仍按主任务失败收口。主代理主动引用的成果正常发送,桌面完整记录不变。 || 普通工具权限的多处确认 | `maker-ipc/interactionRouter.ts` + `sharedPermission.ts` | IM 与 Cindy 共用一个决定,首次有效回答生效,桌面/手机与渠道同步收口。来源正文由 `im/shared/interactionSource.ts` 构造;个人富卡与官方 Hook 分别负责各自载体更新。供应商分享的本机凭证确认卡共用 `interactionCardModel.ts` 回传当前任务的凭证授权标记;个人卡片点击从 pending 保存的原请求恢复作用域,不转换成通用工具允许规则。未来渠道复用同一注册接口,详见 [共享合同](im-permission-confirmation.md)。 || 代输入指引(2026-10-13) | `im/shared/inputHandoffChannelNotice.ts` | 任务开出代输入卡时,在驱动该任务的聊天里发**一行固定文字**「🔐 需要你帮忙输入:<任务名> · 在 Cindy 中打开」,每个请求一次。个人 bot 由 `turnRunner` 在 `beforeProviderStart` 绑定 `im.sendText`;官方 bot 由 `session-runner` 绑定与运行时回收提示同一条独立发送(`onRuntimeRecovery`,需协商 `msg-op-v1`,未协商时不发)。卡片、界面内容与主人填写的值**两侧都不进 Telegram**——这是有意的产品边界(值只走 Cindy 加密通道),不是缺口。详见 [代输入](input-handoff.md)。 |-| 模型列表的开关就绪 | `maker-host/model-visibility-mirror.ts` | 个人 `/model` 与官方 `listAgentModels` 均等待当前账号配置同步;超时返回错误,不把未同步当成全部关闭或回退出厂开关。 |+| 分享供应商的新任务路由 | `im/remoteProviderRoute.ts` + `im/shared/openChannelSession.ts` | 两侧均可在 Cindy 的 bot 模型设置选择分享供应商,按授权目录校验并保存 `agentDeviceId`;新建、`/new` 与冷恢复沿用该执行位置,分享不可用时不回落本机。个人渠道默认与官方工作目录默认仍各自保存。详见 [供应商分享 §5.2](provider-sharing.md#52-供应商设置)。 |+| 本机模型列表的开关就绪 | `maker-host/model-visibility-mirror.ts` | 个人 `/model` 与官方 `listAgentModels` 的本机目录均等待当前账号配置同步;超时返回错误,不把未同步当成全部关闭或回退出厂开关。个人分享任务的 `/model` 读取分享方授权目录,不套用本机同名供应商的开关。 || 过程区与正文的**文本合成** | `im/shared/turnPresenter.ts` + `turnActivity.ts` | 过程区怎么排(工具步骤、思考步骤、耗时行)、过程区与正文怎么拼(`composeProgressView`)。耗时行末尾的当前 `N tok/s` 同源:两侧(含个人侧自动任务转播)都只经 `applyStatusTokenRate` 读 `status` 事件的 `tokenSpeed`(与桌面运行状态栏同一份读数)——无读数不显示、占位帧与 0 读数保留上一个值、`generationReliable === false` 隐藏、只随 ticker 带出不单独刷帧;凡把过程区冻结进终稿的收口(个人侧终止错误、转播收口)都经 `clearRunningIndicators` 与重试说明一起清掉。**正文累积不算**——见第三节:`createTurnPresenter` 按 `mode` 实例化两个独立引擎,累积、消息投影、`finalText()` 判据都不同,改一个引擎不影响另一个 || 运行中**过程消息**的生命周期、渲染与出站失败判据(官方需双方协商 `telegram-progress-ops-v1`) | `packages/lizi-im/src/telegram/streamingText.ts`(`startTelegramProgressCarrier` 与个人 `startTelegramStreaming` 是同一个 handle 类)+ `progressFrame.ts` + `outboundPolicy.ts` + `markdown.ts` 的 `markdownToTelegramHtml` | 惰性占位、1.5s 尾沿节流、首帧 send 后续 edit、单帧上限 `TELEGRAM_PROGRESS_FRAME_MAX_CHARS = 3800`(源 markdown 字符数;官方 presenter 的 `PresenterPolicy.intermediateMaxRenderedChars` 默认值也取它)、NO_REPLY 及其前缀不落地、HTML 被拒(400)回落纯文本、`message is not modified` 视为成功、429 按 `retry_after` 全长退避后重试一次——两侧跑同一份代码。**传输不同**:个人走 Bot API(`index.ts` 的 `callSend` / `sendRenderedChunk` / `editHtml`),官方走 msg.op(`hook-control/telegramTurnCarrier.ts` 只实现 `TelegramStreamingDeps` 的 msg.op 版,并经 `telegramMsgOp.ts` 把 `msg.op.result` 的 `channelErrorCode` / `error` / `retryAfterMs` 映射成同形错误);服务端只执行,不做转换与回落。未协商时官方仍由服务端渲染 `turn.progress`,本行对官方不成立 || 成功终稿的**收口**(官方需双方协商 `telegram-final-ops-v1`) | `packages/lizi-im/src/telegram/streamingText.ts` 的 finalize(官方经 `startTelegramTurnCarrier`,与进度消息同一个 handle)+ `chunk.ts` | Rich 新发 → 明确 4xx 回落 HTML → HTML 400 回落纯文本、按 `chunkTelegramSource` 分段、终稿落地后才尽力删过程消息——两侧同一份代码。官方另有两处传输差异:终稿段经 `purpose: 'turn-final'` 登记(服务端据此写 route、在 `turn.end` 确认后提升续跑锚点、做群中继);私聊首段挂完成特效(第三节「终稿特效」)。**只覆盖普通成功、不带附件的轮次**:失败 / 取消 / 续跑轮 / 正文恰为 NO_REPLY(ambient 判定在服务端)/ 带附件 / 私聊草稿模式都仍由服务端按 `turn.end` 发布。带附件不走本端:桌面持久出箱只存终态文本(附件字节不进 JSON 持久化),本端逐段上传附件期间退出或崩溃时,重启重放的兜底帧没有附件、服务端接管后附件会丢,所以整轮随 `turn.end` 交给服务端(与旧路径相同)。终稿必达不降级:发布前 `turn.end` 先进桌面持久出箱,没有完整确认就以 `clientFinal.complete=false` 交回服务端重发(第四节第 3 行) |