minimal-agent 0.13.0 → 0.14.0

package/src/ui/App.js

@@ -7,36 +7,39 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
  *  不直接处理键盘输入，那是 InputBox 的事。
  * ============================================================
  */
-import React, { useDeferredValue } from 'react';
 import { Box, Text } from 'ink';
+import React, { useDeferredValue } from 'react';
 import { getWorkingDir } from '../bootstrap/workingDir.js';
+import { createCliComputerRun, readRecentComputerUseAudit, } from '../cli/computerUse.js';
 import { ConfigMenu } from '../cli/configMenu.js';
 import { configService } from '../config/configService.js';
 import { listArchives, restoreArchive } from '../context/archive.js';
 import { saveContext } from '../context/persistContext.js';
 import { sessionFileFor } from '../context/sessionPath.js';
-import { workspaceIndexService } from '../context/workspaceIndex.js';
-import { memoryService } from '../memory/memoryService.js';
 import { createSession, listSessionSummaries, updateSessionMetadata, } from '../context/sessionRegistry.js';
+import { workspaceIndexService, } from '../context/workspaceIndex.js';
+import { memoryService } from '../memory/memoryService.js';
+import { legacyModelId, modelRefFromLegacy } from '../modelRef.js';
 import { activatePlugins } from '../plugins/pluginLifecycle.js';
 import { runAgentTurn } from '../session/runAgentTurn.js';
-import { writeClipboardText } from '../utils/clipboardImage.js';
-import { createCliComputerRun, readRecentComputerUseAudit, } from '../cli/computerUse.js';
+import { beginTeamLogin, clearTeamCredentials, fetchOnlineModels, fetchTeamSubscription, fetchTeamUsage, loadTeamCredentials, revokeTeamCredentials, } from '../team/auth.js';
 import { computerUseService } from '../tools/computeruse/computerUseService.js';
-import { advisorHelpText, parseAdvisorCommand } from './advisorCommand.js';
+import { writeClipboardText } from '../utils/clipboardImage.js';
 import { AskQuestion } from './AskQuestion.js';
 import { InputBox } from './InputBox.js';
 import { LiveArea } from './LiveArea.js';
-import { QueuedMessagesBanner } from './QueuedMessagesBanner.js';
 import { MessageList } from './MessageList.js';
 import { ModelPicker } from './ModelPicker.js';
+import { QueuedMessagesBanner } from './QueuedMessagesBanner.js';
 import { SessionPicker } from './SessionPicker.js';
-import { WorkspacePicker } from './WorkspacePicker.js';
 import { StatusLine } from './StatusLine.js';
-import { theme } from './theme.js';
+import { WorkspacePicker } from './WorkspacePicker.js';
+import { advisorHelpText, parseAdvisorCommand } from './advisorCommand.js';
 import { parseComputerCommand } from './computerCommand.js';
 import { useChat } from './hooks/useChat.js';
 import { useTerminalSize } from './hooks/useTerminalSize.js';
+import { isLogoutCommand, loginHelpText, parseLoginCommand, } from './loginCommand.js';
+import { theme } from './theme.js';
 /**
  * ANSI escape: 清屏 + 光标归位。
  *
@@ -56,6 +59,38 @@ function formatProviderName(apiFormat) {
         return 'OpenAI兼容';
     return apiFormat;
 }
+function toPickerModel(model) {
+    return {
+        id: legacyModelId({
+            source: 'gateway',
+            serverId: 'gateway',
+            modelId: model.id,
+        }),
+        apiFormat: model.apiFormat,
+        displayName: model.displayName,
+        model: model.model,
+        contextWindow: model.contextWindow,
+        maxTokens: model.maxTokens,
+        supportsVision: model.supportsVision,
+        enabled: true,
+        source: 'gateway',
+        isDefault: model.isDefault,
+        availability: model.availability,
+    };
+}
+async function openTeamBrowser(url) {
+    const command = process.platform === 'darwin'
+        ? ['open', url]
+        : process.platform === 'win32'
+            ? ['cmd', '/c', 'start', '', url]
+            : ['xdg-open', url];
+    try {
+        Bun.spawn({ cmd: command, stdout: 'ignore', stderr: 'ignore' });
+    }
+    catch {
+        /* TUI prints the URL below */
+    }
+}
 export function App({ provider, initialHistory }) {
     // v2 multi-session：持久化路径完全由 useChat 内部管控（按 activeSessionId 选文件）。
     // App 不再传 onPersist —— 之前 App 端调 saveContext(messages) 会污染 default session。
@@ -74,13 +109,15 @@ export function App({ provider, initialHistory }) {
             provider,
             signal: controller.signal,
             runAgentTurn,
-        }).then((fn) => {
+        })
+            .then((fn) => {
             if (controller.signal.aborted) {
                 fn();
                 return;
             }
             cleanup = fn;
-        }).catch((err) => {
+        })
+            .catch((err) => {
             console.warn(`[minimal-agent] plugin activation failed: ${err instanceof Error ? err.message : String(err)}`);
         });
         return () => {
@@ -160,13 +197,47 @@ export function App({ provider, initialHistory }) {
             return;
         const snap = await configService.getSnapshot();
         const model = snap.config?.models.find((m) => m.id === modelId);
+        const selectedRef = modelRefFromLegacy(modelId);
+        const isGateway = selectedRef.source === 'gateway';
+        if (isGateway) {
+            const provider = await configService.providerForRef(selectedRef);
+            if (provider) {
+                const gatewayProvider = provider.source === 'gateway' ? provider : null;
+                if (!gatewayProvider)
+                    return;
+                await updateSessionMetadata(getWorkingDir(), chat.activeSessionId, {
+                    modelId: null,
+                    preferredModel: {
+                        source: 'gateway',
+                        serverId: gatewayProvider.gatewayUrl,
+                        modelId: selectedRef.modelId,
+                    },
+                    effectiveModel: {
+                        source: 'gateway',
+                        serverId: gatewayProvider.gatewayUrl,
+                        modelId: selectedRef.modelId,
+                    },
+                    restoreWhenAvailable: true,
+                });
+                chat.setProvider(provider);
+                forceRerender((v) => v + 1);
+                chat.ephemeralLine(`[/model] 当前 Session 已切换为在线模型 ${provider.name}，下一轮对话生效。`);
+            }
+            return;
+        }
         if (!model) {
             chat.ephemeralLine(`[/model] 未找到模型 "${modelId}"`);
             return;
         }
         const newProvider = await configService.providerForModel(modelId);
         if (newProvider) {
-            await updateSessionMetadata(getWorkingDir(), chat.activeSessionId, { modelId });
+            await updateSessionMetadata(getWorkingDir(), chat.activeSessionId, {
+                modelId: null,
+                preferredModel: { source: 'local', modelId },
+                effectiveModel: { source: 'local', modelId },
+                fallbackReason: undefined,
+                restoreWhenAvailable: false,
+            });
             chat.setProvider(newProvider);
             forceRerender((v) => v + 1);
             chat.ephemeralLine(`[/model] 当前 Session 已切换为 ${model.displayName || model.model}（${formatProviderName(model.apiFormat)}），下一轮对话生效。`);
@@ -174,22 +245,100 @@ export function App({ provider, initialHistory }) {
     }, [chat.activeSessionId, chat.setProvider, chat.ephemeralLine]);
     React.useEffect(() => {
         let cancelled = false;
-        void listSessionSummaries(getWorkingDir()).then(async (sessions) => {
-            const modelId = sessions.find((session) => session.id === chat.activeSessionId)?.modelId;
-            const provider = await configService.providerForModel(modelId ?? null)
-                ?? await configService.providerForModel(null);
-            if (!cancelled && provider)
+        void listSessionSummaries(getWorkingDir())
+            .then(async (sessions) => {
+            const currentSession = sessions.find((session) => session.id === chat.activeSessionId);
+            const preferredModel = currentSession?.preferredModel ??
+                (currentSession?.modelId
+                    ? modelRefFromLegacy(currentSession.modelId)
+                    : null);
+            let provider = null;
+            let fallbackReason = null;
+            if (preferredModel) {
+                const resolved = await configService.resolveModelRef(preferredModel);
+                provider = resolved.provider;
+                fallbackReason = resolved.fallbackReason;
+                if (!provider && preferredModel.source === 'gateway')
+                    provider = await configService.providerForModel(null);
+            }
+            else {
+                provider = await configService.onlineDefaultProvider();
+                if (!provider)
+                    provider = await configService.providerForModel(null);
+            }
+            if (cancelled)
+                return;
+            if (provider) {
+                const localModelId = currentSession?.preferredModel?.source === 'local'
+                    ? currentSession.preferredModel.modelId
+                    : currentSession?.modelId &&
+                        !currentSession.modelId.startsWith('online:')
+                        ? currentSession.modelId
+                        : ((await configService.getSnapshot()).config?.baseModelId ??
+                            provider.model);
+                const effectiveModel = provider.source === 'gateway'
+                    ? {
+                        source: 'gateway',
+                        serverId: provider.gatewayUrl ?? 'gateway',
+                        modelId: provider.remoteModelId ?? provider.model,
+                    }
+                    : { source: 'local', modelId: localModelId };
+                const isGatewayPreference = preferredModel?.source === 'gateway';
+                const shouldPersist = (provider.source === 'gateway' && !preferredModel) ||
+                    (isGatewayPreference &&
+                        (currentSession?.effectiveModel?.source !==
+                            effectiveModel.source ||
+                            currentSession?.effectiveModel?.modelId !==
+                                effectiveModel.modelId ||
+                            currentSession.fallbackReason !== fallbackReason));
                 chat.setProvider(provider);
-        }).catch(() => { });
-        return () => { cancelled = true; };
-    }, [chat.activeSessionId, chat.setProvider]);
+                if (shouldPersist ||
+                    (isGatewayPreference && provider.source === 'local')) {
+                    await updateSessionMetadata(getWorkingDir(), chat.activeSessionId, {
+                        ...(provider.source === 'gateway' && !preferredModel
+                            ? { preferredModel: effectiveModel }
+                            : {}),
+                        effectiveModel,
+                        fallbackReason: provider.source === 'local' ? fallbackReason : null,
+                        restoreWhenAvailable: isGatewayPreference || provider.source === 'gateway',
+                    }).catch(() => { });
+                    if (isGatewayPreference && provider.source === 'local')
+                        chat.ephemeralLine(`[/model] 在线模型暂不可用，已回退本地模型（${fallbackReason ?? 'offline'}）；服务恢复后将自动恢复。`);
+                    else if (isGatewayPreference &&
+                        provider.source === 'gateway' &&
+                        currentSession?.fallbackReason)
+                        chat.ephemeralLine(`[/model] 在线模型已恢复，当前 Session 已恢复在线模型 ${provider.name}。`);
+                }
+            }
+            else if (preferredModel?.source === 'gateway') {
+                chat.ephemeralLine('[/model] 在线模型不可用，且未配置本地模型；请连接团队服务器或配置本地模型。');
+            }
+        })
+            .catch(() => { });
+        return () => {
+            cancelled = true;
+        };
+    }, [chat.activeSessionId, chat.setProvider, chat.ephemeralLine]);
     const handleAdvisorModelSelect = React.useCallback(async (modelId) => {
         setAdvisorModelPicker(null);
         if (modelId === null) {
-            await configService.savePatch({ advisor: { modelId: null, enabled: false } });
+            await configService.savePatch({
+                advisor: { modelId: null, enabled: false },
+            });
             chat.ephemeralLine('[/advisor] 已关闭顾问模型。');
             return;
         }
+        const selectedRef = modelRefFromLegacy(modelId);
+        if (selectedRef.source === 'gateway') {
+            const provider = await configService.providerForRef(selectedRef);
+            if (!provider) {
+                chat.ephemeralLine('[/advisor] 在线模型不可用、未授权或设备凭据已过期。');
+                return;
+            }
+            await configService.savePatch({ advisor: { modelId, enabled: true } });
+            chat.ephemeralLine(`[/advisor] 已设置顾问模型为 ${provider.name}（在线）。`);
+            return;
+        }
         const snap = await configService.getSnapshot();
         const model = snap.config?.models.find((m) => m.id === modelId);
         if (!model) {
@@ -220,15 +369,23 @@ export function App({ provider, initialHistory }) {
      */
     const handleSubmit = React.useCallback(async (text) => {
         const trimmed = text.trim();
-        const isBareSessionCmd = trimmed === '/session' || trimmed === '/sessions' || trimmed === '/resume';
+        const isBareSessionCmd = trimmed === '/session' ||
+            trimmed === '/sessions' ||
+            trimmed === '/resume';
         const sessionArgMatch = /^\/(?:session|resume)\s+(.+)$/.exec(trimmed);
         if (trimmed === '/workspaces') {
             await openWorkspacePicker();
             return;
         }
         if (trimmed === '/copy') {
-            const latest = [...historyRef.current].reverse().find((message) => message.role === 'assistant' && typeof message.content === 'string' && message.content.length > 0);
-            if (!latest || latest.role !== 'assistant' || typeof latest.content !== 'string') {
+            const latest = [...historyRef.current]
+                .reverse()
+                .find((message) => message.role === 'assistant' &&
+                typeof message.content === 'string' &&
+                message.content.length > 0);
+            if (!latest ||
+                latest.role !== 'assistant' ||
+                typeof latest.content !== 'string') {
                 chat.ephemeralLine('[/copy] 当前会话还没有可复制的 AI 最终回复。');
                 return;
             }
@@ -247,7 +404,7 @@ export function App({ provider, initialHistory }) {
             if (sub === 'help') {
                 const helperAvailable = computerUseService.available();
                 let helperBackend = '未知';
-                let modeLabel = chat.computerUseMode;
+                const modeLabel = chat.computerUseMode;
                 try {
                     const workspace = await workspaceIndexService
                         .findByPath(getWorkingDir())
@@ -260,7 +417,9 @@ export function App({ provider, initialHistory }) {
                         allowedFileRoots: [getWorkingDir()],
                         supervised: true,
                     });
-                    const resp = await computerUseService.request(context, { action: 'status' });
+                    const resp = await computerUseService.request(context, {
+                        action: 'status',
+                    });
                     if (resp.ok && resp.state?.backend) {
                         helperBackend = resp.state.backend;
                     }
@@ -358,7 +517,7 @@ export function App({ provider, initialHistory }) {
                 const apps = response.state?.windows
                     .map((window) => window.appId)
                     .filter((id, index, all) => all.indexOf(id) === index);
-                chat.ephemeralLine(`[/computer] 可见应用：${apps?.length ? apps.join('、') : response.content ?? '当前没有可见应用'}`);
+                chat.ephemeralLine(`[/computer] 可见应用：${apps?.length ? apps.join('、') : (response.content ?? '当前没有可见应用')}`);
                 return;
             }
             if (sub === 'permissions') {
@@ -366,11 +525,7 @@ export function App({ provider, initialHistory }) {
                 return;
             }
             // status
-            chat.ephemeralLine(`[/computer] 状态：\n` +
-                `  模式：${chat.computerUseMode}\n` +
-                `  Helper：${computerUseService.available() ? '✅ 可用' : '❌ 不可用'}\n` +
-                `  Backend：${response.state?.backend ?? '未知'}\n` +
-                `  提示：输入 /computer help 查看所有可用命令`);
+            chat.ephemeralLine(`[/computer] 状态：\n  模式：${chat.computerUseMode}\n  Helper：${computerUseService.available() ? '✅ 可用' : '❌ 不可用'}\n  Backend：${response.state?.backend ?? '未知'}\n  提示：输入 /computer help 查看所有可用命令`);
             return;
         }
         if (computerCommand.matched) {
@@ -378,18 +533,24 @@ export function App({ provider, initialHistory }) {
             return;
         }
         if (trimmed === '/memories') {
-            const workspace = await workspaceIndexService.findByPath(getWorkingDir()).catch(() => null);
+            const workspace = await workspaceIndexService
+                .findByPath(getWorkingDir())
+                .catch(() => null);
             const records = await memoryService.recall('', workspace?.id, 100);
             if (!records.length) {
                 chat.ephemeralLine('[/memories] 当前没有本机长期记忆。');
                 return;
             }
-            chat.ephemeralLine(`[/memories] 本机长期记忆：\n${records.map((record) => `  ${record.id} · ${record.scope === 'personal' ? '个人' : '工作区'} · ${record.subject}: ${record.statement}`).join('\n')}\n使用 /forget-memory <id> 删除一条记忆。`);
+            chat.ephemeralLine(`[/memories] 本机长期记忆：\n${records
+                .map((record) => `  ${record.id} · ${record.scope === 'personal' ? '个人' : '工作区'} · ${record.subject}: ${record.statement}`)
+                .join('\n')}\n使用 /forget-memory <id> 删除一条记忆。`);
             return;
         }
         if (trimmed.startsWith('/forget-memory ')) {
             const id = trimmed.slice('/forget-memory '.length).trim();
-            const workspace = await workspaceIndexService.findByPath(getWorkingDir()).catch(() => null);
+            const workspace = await workspaceIndexService
+                .findByPath(getWorkingDir())
+                .catch(() => null);
             const records = await memoryService.recall('', workspace?.id, 100);
             const record = records.find((item) => item.id === id);
             if (!record) {
@@ -428,7 +589,9 @@ export function App({ provider, initialHistory }) {
                 .slice(0, 30)
                 .map((e) => `  ${e.id}  ·  ${e.msgCount} msgs  ·  ${e.firstUserPreview || '(empty)'}`)
                 .join('\n');
-            const tail = entries.length > 30 ? `\n  ...（共 ${entries.length} 条，仅显示前 30）` : '';
+            const tail = entries.length > 30
+                ? `\n  ...（共 ${entries.length} 条，仅显示前 30）`
+                : '';
             chat.ephemeralLine(`[/list-archive] 归档列表（最新优先）：\n${lines}${tail}`);
             return;
         }
@@ -466,33 +629,171 @@ export function App({ provider, initialHistory }) {
             chat.ephemeralLine(`[tool result · #${hit.tool_call_id.slice(-8)} · 完整 ${hit.content.split('\n').length} 行]\n${hit.content}`);
             return;
         }
-        // /plan <目标> —— 便捷别名，等价 /workflow plan（跑 plan 工作流：
-        // 调研 → AskUserQuestion 选择 → 产出 ./PLAN.md）。改写后透传给 pluginRunner。
-        // 目标里的引号剥掉，避免破坏 workflow 参数 tokenizer（"..." 整体当一个位置参数）。
-        if (text.startsWith('/plan ') || text.trim() === '/plan') {
-            const goal = text.slice('/plan'.length).trim().replace(/"/g, '');
-            if (goal.length === 0) {
-                chat.ephemeralLine('[/plan] 用法：/plan <目标>（= /workflow plan：调研→提问选择→产出 ./PLAN.md）');
+        // ⚠️ 这里曾有一个 `/plan` 的硬编码特例（改写成 `/workflow plan`）。
+        // 已删 —— `src/plugins/slashFallback.ts` 把它通用化了：`/xxx` 没命中插件
+        // 命令时会按「工具 → skill → 工作流目录」继续找，所以 `/plan`、`/research`、
+        // `/pptx` 全都自动可用，加一条工作流不用再回来改 TUI。
+        // /model —— 列出已配置的基座模型并切换选择器；/model <id> 直接切换
+        // /login /logout —— 团队在线模型登录；不登录不影响本机模型（原 /team，改名理由见 loginCommand.ts）。
+        if (isLogoutCommand(trimmed)) {
+            // A standalone session can retain an old auth file from a previous
+            // team run.  Only revoke over the network when the credential matches
+            // the currently configured server; otherwise just clear it locally.
+            const configuredServer = await configService.resolveTeamServerUrl();
+            if (configuredServer.value) {
+                const credentials = await loadTeamCredentials(configuredServer.value);
+                if (credentials)
+                    await revokeTeamCredentials(credentials);
+                else
+                    await clearTeamCredentials();
+            }
+            else {
+                // No configured server is the standalone boundary. Do not let
+                // revokeTeamCredentials() discover and contact a stale auth file.
+                await clearTeamCredentials();
+            }
+            chat.ephemeralLine('[/logout] 已登出并撤销本机设备授权；本地模型配置和 Session 未受影响。');
+            return;
+        }
+        // 发起一次登录尝试。普通用户只使用发行版/配置中的服务端地址。
+        const attemptTeamLogin = async (server, sourceNote) => {
+            if (sourceNote)
+                chat.ephemeralLine(`[/login] ${sourceNote}`);
+            try {
+                const resolved = server
+                    ? { value: server, source: 'explicit' }
+                    : await configService.resolveTeamServerUrl();
+                if (!resolved.value)
+                    throw new Error('KakadeAI 登录服务暂时不可用，请稍后重试');
+                const login = await beginTeamLogin(resolved.value, 'minimal-agent TUI');
+                chat.ephemeralLine(`[/login] 已打开浏览器授权：${login.authorizeUrl}`);
+                await openTeamBrowser(login.authorizeUrl);
+                await login.complete();
+                chat.ephemeralLine('[/login] 登录完成；使用 /login models 查看在线模型。');
+            }
+            catch (error) {
+                chat.ephemeralLine(`[/login] ${error instanceof Error ? error.message : String(error)}`);
+            }
+        };
+        const loginCommand = parseLoginCommand(trimmed);
+        if (loginCommand.matched) {
+            if (loginCommand.command === 'help') {
+                chat.ephemeralLine(loginHelpText());
+                return;
+            }
+            if (loginCommand.command === 'login') {
+                await attemptTeamLogin(loginCommand.server);
+                return;
+            }
+            const configuredServer = await configService.resolveTeamServerUrl();
+            const credentials = configuredServer.value
+                ? await loadTeamCredentials(configuredServer.value)
+                : null;
+            if (loginCommand.command === 'models') {
+                if (!credentials) {
+                    chat.ephemeralLine('[/login models] 未登录；当前仅使用本机模型。输入 /login 登录。');
+                    return;
+                }
+                try {
+                    const models = await fetchOnlineModels(credentials);
+                    chat.ephemeralLine(models.length
+                        ? models
+                            .map((model) => `${model.displayName} · ${model.model}${model.isDefault ? ' · 默认' : ''}${model.availability?.reason ? ` · ${model.availability.reason}` : ''}`)
+                            .join('\n')
+                        : '没有可用在线模型。');
+                }
+                catch (error) {
+                    chat.ephemeralLine(`[/login models] ${error instanceof Error ? error.message : String(error)}`);
+                }
+                return;
+            }
+            if (loginCommand.command === 'usage') {
+                if (!credentials) {
+                    chat.ephemeralLine('[/login usage] 未登录。');
+                    return;
+                }
+                try {
+                    const subscription = await fetchTeamSubscription(credentials);
+                    const usage = await fetchTeamUsage(credentials);
+                    chat.ephemeralLine(subscription
+                        ? `[/login usage] ${subscription.planName} · ${subscription.status}\n请求 ${subscription.requestCount}/${subscription.requestLimit} · 输入 ${subscription.inputTokens}/${subscription.inputTokenLimit} · 输出 ${subscription.outputTokens}/${subscription.outputTokenLimit}\n模型记录 ${usage.length} 条`
+                        : '[/login usage] 当前没有有效订阅。');
+                }
+                catch (error) {
+                    chat.ephemeralLine(`[/login usage] ${error instanceof Error ? error.message : String(error)}`);
+                }
+                return;
+            }
+            if (loginCommand.command === 'status') {
+                if (!credentials) {
+                    chat.ephemeralLine('[/login status] 未登录；当前仅使用本机模型。输入 /login 登录。');
+                }
+                else {
+                    try {
+                        const online = await fetchOnlineModels(credentials);
+                        chat.ephemeralLine(`[/login status] 已连接 ${credentials.serverUrl}；可用在线模型 ${online.length} 个。/logout 登出。`);
+                    }
+                    catch (error) {
+                        chat.ephemeralLine(`[/login status] 设备凭据存在，但在线服务不可用：${error instanceof Error ? error.message : String(error)}；当前使用本机模型。`);
+                    }
+                }
+                return;
+            }
+            if (loginCommand.command === 'tools') {
+                const current = (await listSessionSummaries(getWorkingDir())).find((session) => session.id === chat.activeSessionId);
+                const value = loginCommand.value;
+                if (!value || value === 'list') {
+                    chat.ephemeralLine(`[/login tools] 当前 Session 类别：${current?.onlineToolCategories?.join(', ') || '未设置（使用服务器模型预设）'}\n可选：workspace web computer subagents integrations\n设置：/login tools workspace,web`);
+                }
+                else {
+                    const categories = [
+                        ...new Set(value.split(/[ ,]+/).filter(Boolean)),
+                    ];
+                    const allowed = new Set([
+                        'workspace',
+                        'web',
+                        'computer',
+                        'subagents',
+                        'integrations',
+                    ]);
+                    if (categories.some((category) => !allowed.has(category))) {
+                        chat.ephemeralLine('[/login tools] 类别无效，可用：workspace web computer subagents integrations');
+                        return;
+                    }
+                    await updateSessionMetadata(getWorkingDir(), chat.activeSessionId, {
+                        onlineToolCategories: categories,
+                    });
+                    chat.ephemeralLine(`[/login tools] 已设置当前 Session 工具类别：${categories.join(', ') || '无'}`);
+                }
                 return;
             }
-            void chat.submit(`/workflow plan "${goal}"`);
-            return;
         }
-        // /model —— 列出已配置的基座模型并切换选择器；/model <id> 直接切换
         const modelArgMatch = /^\/model(?:\s+(.+))?$/.exec(trimmed);
         if (modelArgMatch) {
             const arg = modelArgMatch[1]?.trim();
             const models = await configService.models();
             const enabledModels = models.filter((m) => m.enabled && m.apiKey);
-            if (enabledModels.length === 0) {
+            const configuredServer = await configService.resolveTeamServerUrl();
+            const credentials = configuredServer.value
+                ? await loadTeamCredentials(configuredServer.value)
+                : null;
+            const online = credentials
+                ? await fetchOnlineModels(credentials).catch((error) => {
+                    chat.ephemeralLine(`[/model] 在线模型暂时不可用：${error instanceof Error ? error.message : String(error)}；仍可选择本机模型。`);
+                    return [];
+                })
+                : [];
+            const onlinePickerModels = online.map(toPickerModel);
+            const pickerModels = [...enabledModels, ...onlinePickerModels];
+            if (pickerModels.length === 0) {
                 chat.ephemeralLine('[/model] 尚未配置任何模型，请先通过 Desktop 设置或 /config 添加模型。');
                 return;
             }
             if (arg) {
                 // 直接切换到指定模型（支持精确匹配 id 或模糊匹配 displayName/model）
-                const target = enabledModels.find((m) => m.id === arg || m.model === arg || m.displayName === arg);
+                const target = pickerModels.find((m) => m.id === arg || m.model === arg || m.displayName === arg);
                 if (!target) {
-                    chat.ephemeralLine(`[/model] 未找到模型 "${arg}"，可用模型：\n${enabledModels.map((m) => `  ${m.id}  ·  ${m.displayName || m.model}`).join('\n')}`);
+                    chat.ephemeralLine(`[/model] 未找到模型 "${arg}"，可用模型：\n${pickerModels.map((m) => `  ${m.id}  ·  ${m.displayName || m.model}`).join('\n')}`);
                     return;
                 }
                 await handleBaseModelSelect(target.id);
@@ -501,7 +802,11 @@ export function App({ provider, initialHistory }) {
             // 无参数：打开交互选择器
             const currentSession = (await listSessionSummaries(getWorkingDir())).find((session) => session.id === chat.activeSessionId);
             const snap = await configService.getSnapshot();
-            setBaseModelPicker({ models: enabledModels, currentId: currentSession?.modelId ?? snap.config?.baseModelId ?? null });
+            const currentRef = currentSession?.preferredModel;
+            const currentId = currentRef
+                ? legacyModelId(currentRef)
+                : (currentSession?.modelId ?? snap.config?.baseModelId ?? null);
+            setBaseModelPicker({ models: pickerModels, currentId });
             return;
         }
         // /advisor [help|status|on|off|ask|select] —— 与 Desktop 共用统一配置。
@@ -546,24 +851,40 @@ export function App({ provider, initialHistory }) {
             if (sub === 'select') {
                 const models = await configService.models();
                 const enabledModels = models.filter((m) => m.enabled && m.apiKey);
-                if (enabledModels.length === 0) {
+                const configuredServer = await configService.resolveTeamServerUrl();
+                const credentials = configuredServer.value
+                    ? await loadTeamCredentials(configuredServer.value)
+                    : null;
+                const online = credentials
+                    ? await fetchOnlineModels(credentials).catch((error) => {
+                        chat.ephemeralLine(`[/advisor] 在线顾问模型暂时不可用：${error instanceof Error ? error.message : String(error)}；仍可选择本机顾问模型。`);
+                        return [];
+                    })
+                    : [];
+                const pickerModels = [...enabledModels, ...online.map(toPickerModel)];
+                if (pickerModels.length === 0) {
                     chat.ephemeralLine('[/advisor] 尚未配置任何模型，请先添加模型。');
                     return;
                 }
                 if (note) {
                     // /advisor select <id> 直接指定模型
-                    const target = enabledModels.find((m) => m.id === note || m.model === note || m.displayName === note);
+                    const target = pickerModels.find((m) => m.id === note || m.model === note || m.displayName === note);
                     if (!target) {
-                        chat.ephemeralLine(`[/advisor] 未找到模型 "${note}"，可用模型：\n${enabledModels.map((m) => `  ${m.id}  ·  ${m.displayName || m.model}`).join('\n')}`);
+                        chat.ephemeralLine(`[/advisor] 未找到模型 "${note}"，可用模型：\n${pickerModels.map((m) => `  ${m.id}  ·  ${m.displayName || m.model}`).join('\n')}`);
                         return;
                     }
-                    await configService.savePatch({ advisor: { modelId: target.id, enabled: true } });
+                    await configService.savePatch({
+                        advisor: { modelId: target.id, enabled: true },
+                    });
                     chat.ephemeralLine(`[/advisor] 已设置顾问模型为 ${target.displayName || target.model}（${formatProviderName(target.apiFormat)}）。`);
                 }
                 else {
                     // 无参数：打开交互选择器（含"关闭"选项）
                     const snap = await configService.getSnapshot();
-                    setAdvisorModelPicker({ models: enabledModels, currentId: snap.config?.advisor?.modelId ?? null });
+                    setAdvisorModelPicker({
+                        models: pickerModels,
+                        currentId: snap.config?.advisor?.modelId ?? null,
+                    });
                 }
                 return;
             }
@@ -603,7 +924,6 @@ export function App({ provider, initialHistory }) {
         chat.activeSessionId,
         chat.submit,
         chat.runManualAdvisor,
-        chat.setProvider,
         chat.computerUseMode,
         chat.setComputerUseMode,
         chat.stopComputerUse,
@@ -613,7 +933,6 @@ export function App({ provider, initialHistory }) {
         handleSessionCreate,
         openWorkspacePicker,
         handleBaseModelSelect,
-        handleAdvisorModelSelect,
     ]);
     // banner 改作为 Static items[0] 走 MessageList。原因：Ink 5 的 Static 约定
     // 它必须是兄弟节点中第一个，否则 above-sibling 会跟 Static commit 一起被重打
@@ -621,7 +940,7 @@ export function App({ provider, initialHistory }) {
     // 使用 getCurrentProvider() 获取最新 provider（/model 切换后实时显示）
     const currentProvider = chat.getCurrentProvider();
     const bannerText = `minimal-agent  · ${currentProvider.name}/${currentProvider.model} · /model 切模型 · /computer 控制桌面 · /copy 复制回复 · /paste-image 添加图片 · /new 清空 · /compact 压缩 · Ctrl+C 中断`;
-    return (_jsxs(Box, { flexDirection: "column", children: [_jsx(MessageList, { history: deferredHistory, compactGeneration: chat.compactGeneration, bannerText: bannerText, terminalRows: terminalRows }), _jsxs(Box, { flexDirection: "column", width: Math.max(1, terminalCols - 1), children: [_jsx(LiveArea, { progressStage: chat.progressStage, reasoningPreview: chat.reasoningPreview, streamingText: chat.streamingText, runningTools: chat.runningTools, pluginProgress: chat.pluginProgress, transientError: chat.transientError, terminalCols: terminalCols, terminalRows: terminalRows }), _jsx(QueuedMessagesBanner, { items: chat.queuedItems }), chat.pendingComputerIntervention && (_jsxs(Box, { flexDirection: "column", borderStyle: "round", borderColor: theme.warning, paddingX: 1, marginBottom: 1, children: [_jsxs(Text, { color: theme.warning, children: ["\u9700\u8981\u4EBA\u5DE5\u64CD\u4F5C\uFF1A", chat.pendingComputerIntervention.sanitizedSummary] }), _jsx(Text, { dimColor: true, children: "\u8BF7\u76F4\u63A5\u5728\u76EE\u6807\u5E94\u7528\u4E2D\u5904\u7406\uFF1B\u654F\u611F\u5185\u5BB9\u4E0D\u4F1A\u8FDB\u5165\u7EC8\u7AEF\u6216\u6A21\u578B\u3002\u5B8C\u6210\u540E\u8F93\u5165 /computer resume\uFF0C\u53D6\u6D88\u8F93\u5165 /computer cancel\u3002" })] })), chat.error && (_jsx(Box, { marginBottom: 1, children: _jsxs(Text, { color: theme.error, children: ["\u26A0 ", chat.error] }) })), chat.interrupted && (_jsxs(Box, { marginBottom: 1, children: [_jsx(Text, { color: theme.warning, children: "\u26A1 \u64CD\u4F5C\u88AB\u7528\u6237\u4E2D\u65AD\uFF0C\u7B49\u5F85\u65B0\u7684\u4EFB\u52A1\u8F93\u5165..." }), _jsx(Text, { dimColor: true, children: "  \u8C03\u6574\u4E0A\u4E00\u6B21\u8BA1\u5212\uFF1A\u76F4\u63A5\u8BF4\u8C03\u6574\u5185\u5BB9 / \u91CD\u65B0\u8DD1 /plan \u76EE\u6807 / \u65B0\u4EFB\u52A1\u76F4\u63A5\u8BF4" })] })), configMenuOpen ? (_jsx(ConfigMenu, { mode: "reconfigure", onDone: () => setConfigMenuOpen(false) })) : baseModelPicker ? (_jsx(ModelPicker, { models: baseModelPicker.models, currentModelId: baseModelPicker.currentId, title: "\u9009\u62E9\u57FA\u5EA7\u6A21\u578B", onSelect: handleBaseModelSelect, onCancel: () => setBaseModelPicker(null) })) : advisorModelPicker ? (_jsx(ModelPicker, { models: advisorModelPicker.models, currentModelId: advisorModelPicker.currentId, title: "\u9009\u62E9\u987E\u95EE\u6A21\u578B", nullOptionLabel: "\u25CB \u4E0D\u4F7F\u7528\u987E\u95EE\u6A21\u578B", onSelect: handleAdvisorModelSelect, onCancel: () => setAdvisorModelPicker(null) })) : workspacePicker ? (_jsx(WorkspacePicker, { workspaces: workspacePicker, currentPath: getWorkingDir(), currentSessionId: chat.activeSessionId, onSelect: handleWorkspaceSelect, onCancel: () => setWorkspacePicker(null) })) : sessionPicker ? (_jsx(SessionPicker, { sessions: sessionPicker, activeSessionId: chat.activeSessionId, onSelect: handleSessionSelect, onCreate: handleSessionCreate, onCancel: () => setSessionPicker(null) })) : chat.pendingAsk ? (_jsx(AskQuestion, { questions: chat.pendingAsk, source: chat.pendingAskSource, queuedCount: chat.pendingAskQueueCount, onAnswer: chat.answerAsk, onCancel: chat.cancelAsk })) : (
+    return (_jsxs(Box, { flexDirection: "column", children: [_jsx(MessageList, { history: deferredHistory, compactGeneration: chat.compactGeneration, bannerText: bannerText, terminalRows: terminalRows }), _jsxs(Box, { flexDirection: "column", width: Math.max(1, terminalCols - 1), children: [_jsx(LiveArea, { progressStage: chat.progressStage, reasoningPreview: chat.reasoningPreview, streamingText: chat.streamingText, runningTools: chat.runningTools, pluginProgress: chat.pluginProgress, transientError: chat.transientError, terminalCols: terminalCols, terminalRows: terminalRows }), _jsx(QueuedMessagesBanner, { items: chat.queuedItems }), chat.pendingComputerIntervention && (_jsxs(Box, { flexDirection: "column", borderStyle: "round", borderColor: theme.warning, paddingX: 1, marginBottom: 1, children: [_jsxs(Text, { color: theme.warning, children: ["\u9700\u8981\u4EBA\u5DE5\u64CD\u4F5C\uFF1A", chat.pendingComputerIntervention.sanitizedSummary] }), _jsx(Text, { dimColor: true, children: "\u8BF7\u76F4\u63A5\u5728\u76EE\u6807\u5E94\u7528\u4E2D\u5904\u7406\uFF1B\u654F\u611F\u5185\u5BB9\u4E0D\u4F1A\u8FDB\u5165\u7EC8\u7AEF\u6216\u6A21\u578B\u3002\u5B8C\u6210\u540E\u8F93\u5165 /computer resume\uFF0C\u53D6\u6D88\u8F93\u5165 /computer cancel\u3002" })] })), chat.error && (_jsx(Box, { marginBottom: 1, children: _jsxs(Text, { color: theme.error, children: ["\u26A0 ", chat.error] }) })), chat.interrupted && (_jsxs(Box, { marginBottom: 1, children: [_jsx(Text, { color: theme.warning, children: "\u26A1 \u64CD\u4F5C\u88AB\u7528\u6237\u4E2D\u65AD\uFF0C\u7B49\u5F85\u65B0\u7684\u4EFB\u52A1\u8F93\u5165..." }), _jsxs(Text, { dimColor: true, children: [' ', "\u8C03\u6574\u4E0A\u4E00\u6B21\u8BA1\u5212\uFF1A\u76F4\u63A5\u8BF4\u8C03\u6574\u5185\u5BB9 / \u91CD\u65B0\u8DD1 /plan \u76EE\u6807 / \u65B0\u4EFB\u52A1\u76F4\u63A5\u8BF4"] })] })), configMenuOpen ? (_jsx(ConfigMenu, { mode: "reconfigure", onDone: () => setConfigMenuOpen(false) })) : baseModelPicker ? (_jsx(ModelPicker, { models: baseModelPicker.models, currentModelId: baseModelPicker.currentId, title: "\u9009\u62E9\u57FA\u5EA7\u6A21\u578B", onSelect: handleBaseModelSelect, onCancel: () => setBaseModelPicker(null) })) : advisorModelPicker ? (_jsx(ModelPicker, { models: advisorModelPicker.models, currentModelId: advisorModelPicker.currentId, title: "\u9009\u62E9\u987E\u95EE\u6A21\u578B", nullOptionLabel: "\u25CB \u4E0D\u4F7F\u7528\u987E\u95EE\u6A21\u578B", onSelect: handleAdvisorModelSelect, onCancel: () => setAdvisorModelPicker(null) })) : workspacePicker ? (_jsx(WorkspacePicker, { workspaces: workspacePicker, currentPath: getWorkingDir(), currentSessionId: chat.activeSessionId, onSelect: handleWorkspaceSelect, onCancel: () => setWorkspacePicker(null) })) : sessionPicker ? (_jsx(SessionPicker, { sessions: sessionPicker, activeSessionId: chat.activeSessionId, onSelect: handleSessionSelect, onCreate: handleSessionCreate, onCancel: () => setSessionPicker(null) })) : chat.pendingAsk ? (_jsx(AskQuestion, { questions: chat.pendingAsk, source: chat.pendingAskSource, queuedCount: chat.pendingAskQueueCount, onAnswer: chat.answerAsk, onCancel: chat.cancelAsk })) : (
                     /* handleSubmit 包装做 slash 命令拦截，非命令透传 chat.submit */
                     _jsx(InputBox, { onSubmit: handleSubmit, disabled: chat.isLoading && !chat.pendingComputerIntervention, onAbort: chat.abort, onClear: handleClear, onCompact: chat.compactNow, onWorkspaces: openWorkspacePicker })), _jsx(StatusLine, { provider: currentProvider, history: chat.history, pluginProgress: chat.pluginProgress, contextUsage: chat.contextUsage })] })] }));
 }