@coclaw/openclaw-coclaw 0.2.4 → 0.3.1

package/index.js

@@ -3,7 +3,7 @@ import { registerCoclawCli } from './src/cli-registrar.js';
 import { resolveErrorMessage } from './src/common/errors.js';
 import { notBound, bindOk, unbindOk } from './src/common/messages.js';
 import { coclawChannelPlugin } from './src/channel-plugin.js';
-import { refreshRealtimeBridge, startRealtimeBridge, stopRealtimeBridge } from './src/realtime-bridge.js';
+import { ensureAgentSession, refreshRealtimeBridge, startRealtimeBridge, stopRealtimeBridge } from './src/realtime-bridge.js';
 import { setRuntime } from './src/runtime.js';
 import { createSessionManager } from './src/session-manager/manager.js';
 import { AutoUpgradeScheduler } from './src/auto-upgrade/updater.js';
@@ -70,7 +70,7 @@ const plugin = {
 
 		api.registerGatewayMethod('coclaw.refreshBridge', async ({ respond }) => {
 			try {
-				await refreshRealtimeBridge();
+				await refreshRealtimeBridge({ logger, pluginConfig: api.pluginConfig });
 				respond(true, { status: 'refreshed' });
 			}
 			catch (err) {
@@ -88,8 +88,12 @@ const plugin = {
 			}
 		});
 
-		api.registerGatewayMethod('nativeui.sessions.listAll', ({ params, respond }) => {
+		api.registerGatewayMethod('nativeui.sessions.listAll', async ({ params, respond }) => {
 			try {
+				const agentId = params?.agentId?.trim?.() || 'main';
+				// best-effort ensure：失败不阻断 listAll
+				try { await ensureAgentSession(agentId); }
+				catch {}
 				respond(true, manager.listAll(params ?? {}));
 			}
 			catch (err) {
@@ -144,7 +148,7 @@ const plugin = {
 							code: positionals[0],
 							serverUrl,
 						});
-						await refreshRealtimeBridge();
+						await refreshRealtimeBridge({ logger, pluginConfig: api.pluginConfig });
 						return { text: bindOk(result) };
 					}
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coclaw/openclaw-coclaw",
-  "version": "0.2.4",
+  "version": "0.3.1",
   "type": "module",
   "license": "Apache-2.0",
   "description": "OpenClaw CoClaw channel plugin for remote chat",

package/src/realtime-bridge.js

@@ -90,8 +90,6 @@ export class RealtimeBridge {
 		this.gatewayConnectReqId = null;
 		this.gatewayRpcSeq = 0;
 		this.gatewayPendingRequests = new Map();
-		this.mainSessionEnsurePromise = null;
-		this.mainSessionEnsured = false;
 		this.logger = console;
 		this.pluginConfig = {};
 		this.intentionallyClosed = false;
@@ -248,45 +246,58 @@ export class RealtimeBridge {
 		});
 	}
 
-	async __ensureMainSessionKey() {
-		if (this.mainSessionEnsured) {
+	/**
+	 * 确保指定 agent 的主 session 存在（sessions.resolve + 条件 sessions.reset）
+	 * @param {string} [agentId] - agent ID，默认 'main'
+	 * @returns {Promise<{ok: boolean, state?: string, error?: string}>}
+	 */
+	async ensureAgentSession(agentId) {
+		const aid = typeof agentId === 'string' && agentId.trim() ? agentId.trim() : 'main';
+		const key = `agent:${aid}:main`;
+		const resolved = await this.__gatewayRpc('sessions.resolve', { key }, { timeoutMs: 2000 });
+		if (resolved?.ok === true) {
+			this.__logDebug(`ensure agent session: ready agentId=${aid}`);
 			return { ok: true, state: 'ready' };
 		}
-		/* c8 ignore next 3 -- 并发调用防御，复用进行中的 promise */
-		if (this.mainSessionEnsurePromise) {
-			return await this.mainSessionEnsurePromise;
-		}
-		this.mainSessionEnsurePromise = (async () => {
-			const key = 'agent:main:main';
-			// sessions.resolve 仅返回 { ok, key }，不含 entry
-			const resolved = await this.__gatewayRpc('sessions.resolve', { key }, { timeoutMs: 2000 });
-			if (resolved?.ok === true) {
-				this.mainSessionEnsured = true;
-				this.__logDebug(`main session key ensure: ready key=${key}`);
-				return { ok: true, state: 'ready' };
-			}
-			// 仅当网关真实响应 "不存在" 时才创建；超时/网关未就绪等瞬态错误不触发 reset
-			if (!resolved?.response) {
-				return { ok: false, error: resolved?.error ?? 'resolve_transient_failure' };
+		// 仅当网关真实响应 "不存在" 时才创建；超时/网关未就绪等瞬态错误不触发 reset
+		if (!resolved?.response) {
+			return { ok: false, error: resolved?.error ?? 'resolve_transient_failure' };
+		}
+		// session key 不存在，通过 sessions.reset 创建
+		const reset = await this.__gatewayRpc('sessions.reset', { key, reason: 'new' }, { timeoutMs: 2500 });
+		if (reset?.ok !== true) {
+			return { ok: false, error: reset?.error ?? 'sessions_reset_failed' };
+		}
+		this.__logDebug(`ensure agent session: created agentId=${aid}`);
+		return { ok: true, state: 'created' };
+	}
+
+	async __ensureAllAgentSessions() {
+		try {
+			const listResult = await this.__gatewayRpc('agents.list', {}, { timeoutMs: 3000 });
+			let agentIds = ['main'];
+			if (listResult?.ok === true && Array.isArray(listResult?.response?.payload?.agents)) {
+				const ids = listResult.response.payload.agents
+					.map((a) => a?.id)
+					.filter((id) => typeof id === 'string' && id.trim());
+				if (ids.length > 0) agentIds = ids;
 			}
-			// session key 不存在，通过 sessions.reset 创建
-			const reset = await this.__gatewayRpc('sessions.reset', { key, reason: 'new' }, { timeoutMs: 2500 });
-			if (reset?.ok !== true) {
-				return { ok: false, error: reset?.error ?? 'sessions_reset_failed' };
+			else {
+				this.logger.warn?.(`[coclaw] agents.list failed, falling back to main: ${listResult?.error ?? 'unknown'}`);
 			}
-			this.mainSessionEnsured = true;
-			this.__logDebug(`main session key ensure: created key=${key}`);
-			return { ok: true, state: 'created' };
-		})();
-		try {
-			const result = await this.mainSessionEnsurePromise;
-			if (!result?.ok) {
-				this.logger.warn?.(`[coclaw] ensure main session key failed: ${result?.error ?? 'unknown'}`);
+			const results = await Promise.allSettled(
+				agentIds.map((id) => this.ensureAgentSession(id)),
+			);
+			for (let i = 0; i < results.length; i++) {
+				const r = results[i];
+				if (r.status === 'fulfilled' && r.value?.ok) continue;
+				const err = r.status === 'fulfilled' ? r.value?.error : String(r.reason);
+				this.logger.warn?.(`[coclaw] ensure agent session failed: agentId=${agentIds[i]} error=${err ?? 'unknown'}`);
 			}
-			return result;
 		}
-		finally {
-			this.mainSessionEnsurePromise = null;
+		/* c8 ignore next 3 -- 防御性兜底，__gatewayRpc 内部已有完整错误处理 */
+		catch (err) {
+			this.logger.warn?.(`[coclaw] ensureAllAgentSessions unexpected error: ${String(err?.message ?? err)}`);
 		}
 	}
 
@@ -395,7 +406,7 @@ export class RealtimeBridge {
 					this.gatewayReady = true;
 					this.__logDebug(`gateway connect ok <- id=${payload.id}`);
 					this.gatewayConnectReqId = null;
-					void this.__ensureMainSessionKey();
+					void this.__ensureAllAgentSessions();
 				}
 				else {
 					this.gatewayReady = false;
@@ -672,8 +683,6 @@ export class RealtimeBridge {
 
 	async stop() {
 		this.started = false;
-		this.mainSessionEnsured = false;
-		this.mainSessionEnsurePromise = null;
 		this.__clearServerHeartbeat();
 		this.__clearConnectTimer();
 		if (this.reconnectTimer) {
@@ -712,8 +721,12 @@ export async function startRealtimeBridge(opts) {
 	await singleton.start(opts);
 }
 
-export async function refreshRealtimeBridge() {
+export async function refreshRealtimeBridge(opts) {
 	if (!singleton) {
+		// stop 后 singleton 被清除，需重新创建（如 bind 后重连）
+		if (opts) {
+			await startRealtimeBridge(opts);
+		}
 		return;
 	}
 	await singleton.refresh();
@@ -724,4 +737,12 @@ export async function stopRealtimeBridge() {
 		return;
 	}
 	await singleton.stop();
+	singleton = null;
+}
+
+export async function ensureAgentSession(agentId) {
+	if (!singleton) {
+		return { ok: false, error: 'bridge_not_started' };
+	}
+	return singleton.ensureAgentSession(agentId);
 }