lightclawbot 1.2.6-beta.0 → 1.2.6

package/dist/src/socket/agent-soul.js

@@ -0,0 +1,41 @@
+import * as fs from 'node:fs';
+import * as path from 'node:path';
+export const LIGHTSOUL_CONFIG_PATH = path.join(process.env.HOME || '', '.config/lightsoul/config.json');
+export function parseSoulIdMap(raw) {
+    const map = {};
+    let parsed;
+    try {
+        parsed = JSON.parse(raw);
+    }
+    catch (error) {
+        console.error('Failed to parse lightsoul config:', error);
+        return map;
+    }
+    if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed)) {
+        return map;
+    }
+    for (const [agentId, value] of Object.entries(parsed)) {
+        if (typeof value === 'string' && value.trim()) {
+            map[agentId] = value.trim();
+            continue;
+        }
+        if (value && typeof value === 'object' && !Array.isArray(value)) {
+            const soulId = value.soulId;
+            if (typeof soulId === 'string' && soulId.trim()) {
+                map[agentId] = soulId.trim();
+            }
+        }
+    }
+    return map;
+}
+export function readSoulIdMap(configPath = LIGHTSOUL_CONFIG_PATH) {
+    return parseSoulIdMap(fs.readFileSync(configPath, 'utf8'));
+}
+export function attachSoulIdsToAgents(agents, soulMap) {
+    return agents.map((agent) => {
+        const id = typeof agent.id === 'string' ? agent.id.trim() : '';
+        const name = typeof agent.name === 'string' ? agent.name.trim() : '';
+        const soulId = (id && soulMap[id]) || (name && soulMap[name]) || undefined;
+        return soulId ? { ...agent, soulId } : agent;
+    });
+}

package/dist/src/socket/handlers.js

@@ -20,8 +20,52 @@ import { handleChatList, handleChatCreate, handleChatUpdate, handleChatDelete }
 import { uploadFileToServer } from '../file-storage.js';
 import { guessMimeByExt } from '../media.js';
 import { ensureSessionInHistory, readChatsFile, resolveChatsFilePath } from '../utils/common.js';
+import { attachSoulIdsToAgents, readSoulIdMap, LIGHTSOUL_CONFIG_PATH } from './agent-soul.js';
 import * as fs from 'node:fs';
 import * as path from 'node:path';
+const getNonEmptyString = (value) => {
+    if (typeof value !== 'string')
+        return undefined;
+    const trimmed = value.trim();
+    return trimmed || undefined;
+};
+const isMainAgent = (agent) => {
+    const id = getNonEmptyString(agent.id);
+    const name = getNonEmptyString(agent.name);
+    return id === DEFAULT_AGENT_ID || name === DEFAULT_AGENT_ID;
+};
+const withDefaultWorkspace = (agent, defaultWorkspace) => {
+    if (!defaultWorkspace || getNonEmptyString(agent.workspace))
+        return agent;
+    return { ...agent, workspace: defaultWorkspace };
+};
+/**
+ * 组装 agents:request 响应列表，确保单 agent 场景也返回默认 main agent。
+ */
+export const normalizeAgentsWithMainAgent = (currentCfg) => {
+    const agentsConfig = currentCfg.agents;
+    const agentsList = Array.isArray(agentsConfig?.list) ? agentsConfig.list : [];
+    const defaultWorkspace = getNonEmptyString(agentsConfig?.defaults?.workspace);
+    let hasMainAgent = false;
+    const normalizedAgents = agentsList.map((agent) => {
+        if (!isMainAgent(agent))
+            return agent;
+        hasMainAgent = true;
+        return withDefaultWorkspace(agent, defaultWorkspace);
+    });
+    if (hasMainAgent)
+        return normalizedAgents;
+    const mainAgent = {
+        id: DEFAULT_AGENT_ID,
+        name: DEFAULT_AGENT_ID,
+        displayName: DEFAULT_AGENT_ID,
+        isDefault: true,
+    };
+    if (defaultWorkspace) {
+        mainAgent.workspace = defaultWorkspace;
+    }
+    return [mainAgent, ...normalizedAgents];
+};
 /**
  * 绑定所有 Socket.IO 事件监听器到指定 socket 实例。
  *
@@ -267,7 +311,7 @@ export function bindSocketHandlers(socket, deps) {
     });
     // ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
     // 事件：Agents 列表请求（agents:request）
-    // 职责：读取 openclaw.json 中 agents.list 并返回给客户端（支持热更新，不缓存）
+    // 职责：读取 openclaw.json 中 agents.list，并在单 agent 场景补齐默认 main（支持热更新，不缓存）
     // ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
     socket.on(EVENT_AGENTS_REQUEST, (data, ack) => {
         // 立即回复 ACK，告知服务端请求已收到
@@ -280,14 +324,21 @@ export function bindSocketHandlers(socket, deps) {
             // 获取插件运行时，读取最新配置
             const pluginRuntime = getLightclawRuntime();
             const currentCfg = pluginRuntime.config.loadConfig();
-            const agentsList = currentCfg.agents?.list ?? [];
-            log?.info(`[${CHANNEL_KEY}] Agents request: count=${agentsList.length}`);
+            const agentsList = normalizeAgentsWithMainAgent(currentCfg);
+            let agentsWithSoulIds = agentsList;
+            try {
+                agentsWithSoulIds = attachSoulIdsToAgents(agentsList, readSoulIdMap());
+            }
+            catch (soulErr) {
+                log?.warn(`[${CHANNEL_KEY}] Failed to read soul config ${LIGHTSOUL_CONFIG_PATH}: ${soulErr instanceof Error ? soulErr.message : String(soulErr)}`);
+            }
+            log?.info(`[${CHANNEL_KEY}] Agents request: count=${agentsWithSoulIds.length}`);
             const agentsMsgId = generateMsgId();
             reliableEmitter.emitWithAck(EVENT_AGENTS_RESPONSE, {
                 msgId: agentsMsgId,
                 to: data.from,
                 from: botClientId,
-                agents: agentsList,
+                agents: agentsWithSoulIds,
                 timestamp: Date.now(),
             }, agentsMsgId);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lightclawbot",
-  "version": "1.2.6-beta.0",
+  "version": "1.2.6",
   "description": "LightClawBot channel plugin with message support, cron jobs, and proactive messaging",
   "type": "module",
   "files": [