openclaw-vchat-plugin 0.0.7 → 0.0.8

package/src/relay-server.ts

@@ -4,6 +4,7 @@ import multer from 'multer';
 import path from 'path';
 import fs from 'fs';
 import http from 'http';
+import { execFileSync } from 'child_process';
 import { WebSocketServer, WebSocket } from 'ws';
 import { randomUUID } from 'crypto';
 import { SessionManager } from './session-manager';
@@ -26,6 +27,7 @@ interface GatewayWechatSession {
     lastMessage: string;
     lastMessageTime: number;
     createdAt: number;
+    model?: string;
 }
 
 type RequestMemoEntry<T> = {
@@ -69,6 +71,7 @@ function toBridgeSessionPayload(item: {
     lastMessageTime?: number;
     createdAt?: number;
     agentId?: string;
+    model?: string;
 }) {
     const createdAt = Number(item.createdAt) || Date.now();
     return {
@@ -78,6 +81,7 @@ function toBridgeSessionPayload(item: {
         lastMessageTime: Number(item.lastMessageTime) || createdAt,
         createdAt,
         agentId: String(item.agentId || '').trim() || 'main',
+        model: String(item.model || '').trim(),
     };
 }
 
@@ -148,14 +152,75 @@ function isRenderableHistoryRole(roleRaw: string): boolean {
     return roleRaw === 'user' || roleRaw === 'assistant' || roleRaw === 'system';
 }
 
-function normalizePreviewMessageText(raw: any): string {
+function getHistoryProvenance(row: any): any {
+    if (!row || typeof row !== 'object') return null;
+    return row?.provenance || row?.message?.provenance || null;
+}
+
+function shouldHideHistoryRow(row: any, currentSessionKey?: string): boolean {
+    const provenance = getHistoryProvenance(row);
+    if (!provenance || typeof provenance !== 'object') return false;
+
+    const kind = String(provenance?.kind || '').trim().toLowerCase();
+    if (kind !== 'inter_session') return false;
+
+    const sourceTool = String(provenance?.sourceTool || '').trim().toLowerCase();
+    const sourceSessionKey = String(provenance?.sourceSessionKey || '').trim().toLowerCase();
+    const targetSessionKey = String(currentSessionKey || '').trim().toLowerCase();
+
+    // Hide self-routed relay messages. They are persisted by OpenClaw with user role,
+    // but should not be rendered as human-authored bubbles in the WeChat UI.
+    return sourceTool === 'sessions_send' && Boolean(targetSessionKey) && sourceSessionKey === targetSessionKey;
+}
+
+function normalizePreviewMessageText(raw: any, currentSessionKey?: string): string {
     if (!raw || typeof raw !== 'object') return normalizeMessageText(raw);
     const roleRaw = getHistoryRoleRaw(raw);
     if (!isRenderableHistoryRole(roleRaw)) return '';
+    if (shouldHideHistoryRow(raw, currentSessionKey)) return '';
     return normalizeMessageText(raw);
 }
 
-function normalizeHistoryMessages(rawPayload: any, sessionId: string, limit: number, before?: number): Message[] {
+function isInternalSessionTitle(raw: any): boolean {
+    const title = String(raw || '').trim();
+    if (!title) return true;
+
+    const lower = title.toLowerCase();
+    if (
+        lower === 'openclaw-wechat-plugin'
+        || lower === 'openclaw-vchat-plugin'
+        || lower === 'openclaw-vchat'
+        || lower === 'openclaw-tui'
+    ) {
+        return true;
+    }
+
+    return (
+        lower.startsWith('webchat:')
+        || lower.startsWith('agent:')
+        || lower.includes('wechat:direct:')
+        || lower.includes('g-agent-')
+        || /^[a-f0-9-]{24,}$/i.test(title)
+    );
+}
+
+function pickVisibleSessionTitle(row: any, lastMessage: string): string {
+    const candidates = [row?.title, row?.displayName, row?.name];
+    for (const candidate of candidates) {
+        const title = String(candidate || '').trim();
+        if (!title || isInternalSessionTitle(title)) continue;
+        return title;
+    }
+    return String(lastMessage || '').trim() || '新对话';
+}
+
+function normalizeHistoryMessages(
+    rawPayload: any,
+    sessionId: string,
+    limit: number,
+    before?: number,
+    currentSessionKey?: string
+): Message[] {
     const payload = rawPayload || {};
     const rows = Array.isArray(payload.messages) ? payload.messages
         : Array.isArray(payload.items) ? payload.items
@@ -164,6 +229,7 @@ function normalizeHistoryMessages(rawPayload: any, sessionId: string, limit: num
                     : [];
 
     const mapped = rows.map((row: any) => {
+        if (shouldHideHistoryRow(row, currentSessionKey)) return null;
         const roleRaw = getHistoryRoleRaw(row) || 'assistant';
         if (!isRenderableHistoryRole(roleRaw)) return null;
         const role = roleRaw === 'user' ? 'user' : roleRaw === 'system' ? 'system' : 'assistant';
@@ -192,12 +258,100 @@ function normalizeHistoryMessages(rawPayload: any, sessionId: string, limit: num
     return filtered.slice(filtered.length - limit);
 }
 
+function readConfiguredPrimaryModel(gateway: GatewayClient): string {
+    try {
+        const raw = gateway.readConfig();
+        const agents = Array.isArray(raw?.agents?.list) ? raw.agents.list : [];
+        const mainAgent = agents.find((item: any) => String(item?.id || '').trim() === 'main');
+        const candidates = [
+            mainAgent?.model,
+            raw?.agents?.defaults?.model?.primary,
+            raw?.agents?.defaults?.primary,
+            raw?.defaults?.primary,
+            raw?.model,
+        ];
+        for (const candidate of candidates) {
+            const value = String(candidate || '').trim();
+            if (value) return value;
+        }
+    } catch {
+        // ignore
+    }
+    return '';
+}
+
+function readOpenClawVersion(): string {
+    try {
+        const value = execFileSync('openclaw', ['--version'], {
+            encoding: 'utf8',
+            timeout: 3000,
+            stdio: ['ignore', 'pipe', 'ignore'],
+        });
+        return String(value || '').trim();
+    } catch {
+        return '';
+    }
+}
+
+async function getOpenClawSummary(gateway: GatewayClient): Promise<{
+    online: boolean;
+    version: string;
+    model: string;
+    error?: string;
+}> {
+    const version = readOpenClawVersion();
+    try {
+        const status = await gateway.call('status', {});
+        const recent = status?.sessions?.recent?.[0];
+        const model = String(
+            status?.sessions?.defaults?.model
+            || recent?.model
+            || readConfiguredPrimaryModel(gateway)
+            || ''
+        ).trim();
+        return {
+            online: true,
+            version,
+            model,
+        };
+    } catch (err: any) {
+        return {
+            online: false,
+            version,
+            model: readConfiguredPrimaryModel(gateway),
+            error: err?.message || 'gateway-unavailable',
+        };
+    }
+}
+
+function buildGatewayRecentModelHints(statusPayload: any) {
+    const hints = new Map<string, string>();
+    const recent = Array.isArray(statusPayload?.sessions?.recent) ? statusPayload.sessions.recent : [];
+
+    for (const row of recent) {
+        const model = String(row?.model || '').trim();
+        if (!model) continue;
+
+        const key = String(row?.key || row?.sessionKey || '').trim().toLowerCase();
+        if (key) {
+            hints.set(key, model);
+            const parsed = parseWeChatDirectThreadSessionKey(key);
+            if (parsed) {
+                hints.set(`${parsed.userId}:${parsed.agentId}:${parsed.sessionId}`, model);
+            }
+        }
+    }
+
+    return hints;
+}
+
 async function listGatewayWechatSessions(gateway: GatewayClient, userId: string, agentId?: string): Promise<GatewayWechatSession[]> {
     const targetUserId = sanitizeWeChatId(userId, 'unknown');
     const targetAgentId = sanitizeWeChatId(agentId, '');
     const response = await gateway.call('sessions.list', {});
     const rawSessions = Array.isArray(response?.sessions) ? response.sessions : [];
     const now = Date.now();
+    let recentModelHints: Map<string, string> | null = null;
 
     const rows: GatewayWechatSession[] = [];
     for (const row of rawSessions) {
@@ -208,19 +362,36 @@ async function listGatewayWechatSessions(gateway: GatewayClient, userId: string,
         if (parsed.userId !== targetUserId) continue;
         if (targetAgentId && parsed.agentId !== targetAgentId) continue;
 
-        const lastMessage = normalizePreviewMessageText(row?.lastMessage || row?.preview || row?.summary || '');
-        const title = String(row?.title || row?.displayName || row?.name || '').trim();
+        const lastMessage = normalizePreviewMessageText(row?.lastMessage || row?.preview || row?.summary || '', key);
+        const title = pickVisibleSessionTitle(row, lastMessage);
         const createdAt = parseTimestamp(row?.createdAt) || pickTimestamp(row, now);
         const lastMessageTime = pickTimestamp(row, createdAt || now);
+        const modelProvider = String(row?.modelProvider || '').trim();
+        const modelId = String(row?.model || '').trim();
+        let model = modelProvider && modelId ? `${modelProvider}/${modelId}` : modelId;
+        if (!model) {
+            if (!recentModelHints) {
+                try {
+                    const status = await gateway.call('status', {});
+                    recentModelHints = buildGatewayRecentModelHints(status);
+                } catch {
+                    recentModelHints = new Map();
+                }
+            }
+            model = recentModelHints.get(key)
+                || recentModelHints.get(`${parsed.userId}:${parsed.agentId}:${parsed.sessionId}`)
+                || '';
+        }
         rows.push({
             id: parsed.sessionId,
             userId: targetUserId,
             agentId: parsed.agentId,
             gatewaySessionKey: key,
-            title: title || lastMessage || '新对话',
+            title,
             lastMessage,
             lastMessageTime,
             createdAt: createdAt || lastMessageTime || now,
+            model,
         });
     }
 
@@ -270,7 +441,7 @@ async function callGatewayHistory(
     for (const params of attempts) {
         try {
             const result = await gateway.call('chat.history', params);
-            const messages = normalizeHistoryMessages(result, sessionId, limit, before);
+            const messages = normalizeHistoryMessages(result, sessionId, limit, before, key);
             const hasMore = Boolean(result?.hasMore) || messages.length === limit;
             return { messages, hasMore };
         } catch (err: any) {
@@ -387,12 +558,14 @@ export function createRelayServer(config: PluginConfig, gateway: GatewayClient)
     const internal = express.Router();
     internal.use(internalAuth);
 
-    internal.get('/bridge/capabilities', (_req: Request, res: Response) => {
+    internal.get('/bridge/capabilities', async (_req: Request, res: Response) => {
+        const openclaw = await getOpenClawSummary(gateway);
         res.json({
             protocolVersion: BRIDGE_PROTOCOL_VERSION,
             pluginVersion: BRIDGE_PLUGIN_VERSION,
             capabilities: Array.from(BRIDGE_CAPABILITIES),
             bridgeRole: 'gateway-bridge',
+            openclaw,
             runtime: {
                 persistMessagesEnabled: sessionManager.isPersistMessagesEnabled(),
                 localFallbackEnabled: Boolean(config.allowLocalFallback),
@@ -429,6 +602,7 @@ export function createRelayServer(config: PluginConfig, gateway: GatewayClient)
                         lastMessageTime: item.lastMessageTime || item.createdAt || Date.now(),
                         createdAt: local?.createdAt || item.createdAt,
                         agentId: item.agentId,
+                        model: item.model,
                     });
                 }).sort((a, b) => b.lastMessageTime - a.lastMessageTime);
 

package/src/routes/config.routes.ts

@@ -27,6 +27,16 @@ router.get('/providers', (req: Request, res: Response) => {
     }
 });
 
+router.get('/models', (req: Request, res: Response) => {
+    try {
+        const models = configService.getConfiguredModels();
+        res.json({ models });
+    } catch (err: any) {
+        console.error('[ConfigRoutes] getConfiguredModels 错误:', err);
+        res.status(500).json({ error: err.message || '获取模型列表失败' });
+    }
+});
+
 /**
  * POST /api/config/providers
  * Body: { preset?, providerId?, baseUrl?, apiKey, name?, api?, authHeader?, headers?, models? }

package/src/services/config.service.ts

@@ -22,7 +22,9 @@ const DEFAULT_CONFIG_PATH = path.join(__dirname, '..', '..', 'default-config.jso
 function readConfig(): any {
     try {
         const content = fs.readFileSync(OPENCLAW_CONFIG_PATH, 'utf-8');
-        return JSON.parse(content);
+        const parsed = JSON.parse(content);
+        normalizeAgentList(parsed);
+        return parsed;
     } catch {
         return { models: { providers: {} } };
     }
@@ -150,12 +152,139 @@ function ensureAgentDefaults(config: any): Record<string, any> {
     return config.agents.defaults;
 }
 
+function normalizeAgentList(config: any): any[] {
+    if (!config.agents || typeof config.agents !== 'object') config.agents = {};
+    const raw = config.agents.list;
+
+    if (Array.isArray(raw)) {
+        config.agents.list = raw
+            .filter((item) => item && typeof item === 'object')
+            .map((item: any, index: number) => {
+                const entry = { ...item };
+                const id = String(entry.id || '').trim() || `agent_${index + 1}`;
+                entry.id = id;
+                return entry;
+            });
+        return config.agents.list;
+    }
+
+    const normalized: any[] = [];
+    if (raw && typeof raw === 'object') {
+        Object.entries(raw).forEach(([key, value], index) => {
+            if (!value || typeof value !== 'object') return;
+            const entry: any = { ...(value as Record<string, any>) };
+            entry.id = String(entry.id || key || '').trim() || `agent_${index + 1}`;
+            normalized.push(entry);
+        });
+    }
+
+    config.agents.list = normalized;
+    return config.agents.list;
+}
+
+function getAgentModel(config: any, agentId = 'main'): string {
+    const list = normalizeAgentList(config);
+    const hit = list.find((item: any) => String(item?.id || '').trim() === agentId);
+    return String(hit?.model || '').trim();
+}
+
 function getConfiguredPrimaryModel(config: any): string {
-    return String(config?.agents?.list?.main?.model || config?.agents?.defaults?.model?.primary || config?.defaults?.primary || '').trim();
+    return String(
+        getAgentModel(config, 'main')
+        || config?.agents?.defaults?.model?.primary
+        || config?.defaults?.primary
+        || ''
+    ).trim();
+}
+
+function buildModelRef(providerId: string, modelId: string): string {
+    const provider = String(providerId || '').trim();
+    const rawModelId = String(modelId || '').trim();
+    if (!provider || !rawModelId) return '';
+    if (rawModelId.toLowerCase().startsWith(`${provider.toLowerCase()}/`)) {
+        return rawModelId;
+    }
+    return `${provider}/${rawModelId}`;
+}
+
+function collectProviderModelRefs(providerId: string, providerEntry: any): string[] {
+    const models = Array.isArray(providerEntry?.models) ? providerEntry.models : [];
+    const refs = models
+        .map((model: any) => buildModelRef(providerId, String(model?.id || model?.name || model || '').trim()))
+        .filter(Boolean);
+    return Array.from(new Set(refs));
+}
+
+function collectAllowedModelRefs(config: any): string[] {
+    const defaults = ensureAgentDefaults(config);
+    const allowed = defaults?.models;
+    const refs = (allowed && typeof allowed === 'object' && !Array.isArray(allowed))
+        ? Object.keys(allowed).map((key) => String(key || '').trim()).filter(Boolean)
+        : [];
+
+    if (refs.length > 0) return refs;
+
+    const primary = getConfiguredPrimaryModel(config);
+    return primary ? [primary] : [];
+}
+
+function reconcileProviderAllowedModels(config: any, providerId: string, providerEntry?: any | null): void {
+    const defaults = ensureAgentDefaults(config);
+    const agentList = normalizeAgentList(config);
+    const currentAllowed = defaults?.models && typeof defaults.models === 'object' && !Array.isArray(defaults.models)
+        ? defaults.models
+        : {};
+
+    const providerPrefix = `${String(providerId || '').trim().toLowerCase()}/`;
+    const nextAllowed: Record<string, any> = {};
+
+    Object.entries(currentAllowed).forEach(([ref, meta]) => {
+        const safeRef = String(ref || '').trim();
+        if (!safeRef) return;
+        if (providerPrefix && safeRef.toLowerCase().startsWith(providerPrefix)) return;
+        nextAllowed[safeRef] = meta && typeof meta === 'object' && !Array.isArray(meta) ? meta : {};
+    });
+
+    collectProviderModelRefs(providerId, providerEntry).forEach((ref) => {
+        nextAllowed[ref] = currentAllowed[ref] && typeof currentAllowed[ref] === 'object' && !Array.isArray(currentAllowed[ref])
+            ? currentAllowed[ref]
+            : {};
+    });
+
+    defaults.models = nextAllowed;
+
+    if (!defaults.model || typeof defaults.model !== 'object') defaults.model = {};
+
+    const allowedRefs = Object.keys(nextAllowed);
+    const currentPrimary = String(defaults.model.primary || '').trim();
+    if (!currentPrimary || !nextAllowed[currentPrimary]) {
+        const mainAgent = agentList.find((item: any) => String(item?.id || '').trim() === 'main');
+        const currentMainModel = String(mainAgent?.model || '').trim();
+        if (currentMainModel && nextAllowed[currentMainModel]) {
+            defaults.model.primary = currentMainModel;
+        } else if (allowedRefs.length > 0) {
+            defaults.model.primary = allowedRefs[0];
+        } else {
+            delete defaults.model.primary;
+        }
+    }
+
+    let mainAgent = agentList.find((item: any) => String(item?.id || '').trim() === 'main');
+    const primary = String(defaults.model.primary || '').trim();
+    if (!mainAgent && primary) {
+        mainAgent = { id: 'main', model: primary };
+        agentList.unshift(mainAgent);
+    } else if (mainAgent) {
+        const currentMainModel = String(mainAgent.model || '').trim();
+        if ((!currentMainModel || !nextAllowed[currentMainModel]) && primary) {
+            mainAgent.model = primary;
+        }
+    }
 }
 
 function applyDefaultModelFallback(config: any, modelRef: string): void {
     const defaults = ensureAgentDefaults(config);
+    normalizeAgentList(config);
     if (!defaults.model || typeof defaults.model !== 'object') defaults.model = {};
     defaults.model.primary = modelRef;
     if (!defaults.models || typeof defaults.models !== 'object' || Array.isArray(defaults.models)) {
@@ -166,7 +295,7 @@ function applyDefaultModelFallback(config: any, modelRef: string): void {
     }
 }
 
-function setDefaultModelOfficial(config: any, modelRef: string): void {
+export function setDefaultModelOfficial(config: any, modelRef: string): void {
     // 等价于官方 `openclaw models set <provider/model>` 的最小配置结果。
     // 真相源仍然是 OpenClaw 官方字段，不引入私有结构。
     applyDefaultModelFallback(config, modelRef);
@@ -174,6 +303,58 @@ function setDefaultModelOfficial(config: any, modelRef: string): void {
     console.log(`[ConfigService] 已自动设置默认模型: ${modelRef}`);
 }
 
+function resolveConfiguredModelRef(config: any, input: string): string {
+    const raw = String(input || '').trim();
+    if (!raw) throw new Error('请提供模型名称');
+
+    const providers = ensureProvidersObject(config);
+    const loweredInput = raw.toLowerCase();
+    const matches: string[] = [];
+
+    Object.entries(providers).forEach(([providerId, providerEntry]) => {
+        const models = Array.isArray((providerEntry as any)?.models) ? (providerEntry as any).models : [];
+        models.forEach((model: any) => {
+            const modelId = String(model?.id || model?.name || '').trim();
+            const modelName = String(model?.name || model?.id || '').trim();
+            if (!modelId) return;
+            const modelRef = `${providerId}/${modelId}`;
+            if (
+                modelRef.toLowerCase() === loweredInput
+                || modelId.toLowerCase() === loweredInput
+                || modelName.toLowerCase() === loweredInput
+            ) {
+                matches.push(modelRef);
+            }
+        });
+    });
+
+    if (matches.length === 1) return matches[0];
+    if (matches.length > 1) {
+        throw new Error(`模型名重复，请使用 provider/model：${matches.join('、')}`);
+    }
+
+    const available = Object.entries(providers).flatMap(([providerId, providerEntry]) => {
+        const models = Array.isArray((providerEntry as any)?.models) ? (providerEntry as any).models : [];
+        return models
+            .map((model: any) => String(model?.id || model?.name || '').trim())
+            .filter(Boolean)
+            .map((modelId: string) => `${providerId}/${modelId}`);
+    });
+
+    if (available.length === 0) {
+        throw new Error('当前没有可用模型，请先配置模型提供商');
+    }
+
+    throw new Error(`模型未配置：${raw}。当前可用：${available.join('、')}`);
+}
+
+export function setConfiguredModel(input: string): string {
+    const config = readConfig();
+    const modelRef = resolveConfiguredModelRef(config, input);
+    setDefaultModelOfficial(config, modelRef);
+    return modelRef;
+}
+
 function maybeBootstrapDefaultModel(config: any, providerId: string, providerEntry: any): void {
     const existingPrimary = getConfiguredPrimaryModel(config);
     if (existingPrimary) return;
@@ -203,6 +384,7 @@ function pickProviderDisplayName(providerId: string, entry: any): string {
  */
 function writeConfig(config: any): void {
     fs.mkdirSync(path.dirname(OPENCLAW_CONFIG_PATH), { recursive: true });
+    normalizeAgentList(config);
     fs.writeFileSync(OPENCLAW_CONFIG_PATH, JSON.stringify(config, null, 2), 'utf-8');
 }
 
@@ -216,6 +398,41 @@ export function getProvidersMap(): Record<string, any> {
     return JSON.parse(JSON.stringify(providersObj));
 }
 
+export function getConfiguredModels(): Array<{
+    value: string;
+    label: string;
+    providerId: string;
+    modelId: string;
+}> {
+    const config = readConfig();
+    const providers = ensureProvidersObject(config);
+    const allowedRefs = collectAllowedModelRefs(config);
+
+    return allowedRefs
+        .map((ref) => {
+            const rawRef = String(ref || '').trim();
+            if (!rawRef) return null;
+
+            const slashIndex = rawRef.indexOf('/');
+            const providerId = slashIndex >= 0 ? rawRef.slice(0, slashIndex) : '';
+            const modelId = slashIndex >= 0 ? rawRef.slice(slashIndex + 1) : rawRef;
+            const providerModels = Array.isArray(providers?.[providerId]?.models) ? providers[providerId].models : [];
+            const hit = providerModels.find((model: any) => {
+                const candidate = String(model?.id || model?.name || model || '').trim();
+                return candidate === modelId || buildModelRef(providerId, candidate) === rawRef;
+            });
+            const label = String(hit?.name || hit?.id || modelId || rawRef).trim() || rawRef;
+
+            return {
+                value: rawRef,
+                label,
+                providerId,
+                modelId,
+            };
+        })
+        .filter((item): item is { value: string; label: string; providerId: string; modelId: string } => Boolean(item));
+}
+
 /**
  * 获取提供商列表（apiKey 脱敏，供 UI 展示）
  */
@@ -295,6 +512,7 @@ export function addProvider(options: {
     }
 
     providers[providerId] = providerEntry;
+    reconcileProviderAllowedModels(config, providerId, providerEntry);
     writeConfig(config);
     maybeBootstrapDefaultModel(config, providerId, providerEntry);
 
@@ -324,6 +542,7 @@ export function deleteProvider(providerId: string): void {
     }
 
     delete providers[providerId];
+    reconcileProviderAllowedModels(config, providerId, null);
     writeConfig(config);
 
     console.log(`[ConfigService] 删除提供商: ${providerId}`);
@@ -370,6 +589,7 @@ export function updateProvider(providerId: string, data: Partial<{
     if (data.models !== undefined) next.models = formatModels(data.models);
 
     providers[providerId] = next;
+    reconcileProviderAllowedModels(config, providerId, next);
     writeConfig(config);
     maybeBootstrapDefaultModel(config, providerId, next);