@coclaw/openclaw-coclaw 0.1.2 → 0.1.4

package/package.json

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

package/src/realtime-bridge.js

@@ -152,7 +152,6 @@ async function gatewayRpc(method, params = {}, options = {}) {
 	});
 }
 
-// eslint-disable-next-line no-unused-vars -- 功能暂时禁用，保留函数体供后续修复参考
 async function ensureMainSessionKey() {
 	if (mainSessionEnsured) {
 		return { ok: true, state: 'ready' };
@@ -162,25 +161,25 @@ async function ensureMainSessionKey() {
 	}
 	mainSessionEnsurePromise = (async () => {
 		const key = 'agent:main:main';
+		// sessions.resolve 仅返回 { ok, key }，不含 entry
 		const resolved = await gatewayRpc('sessions.resolve', { key }, { timeoutMs: 2000 });
-		const resolvedSessionId = resolved?.response?.result?.entry?.sessionId;
-		if (resolved?.ok === true && typeof resolvedSessionId === 'string' && resolvedSessionId.trim()) {
+		if (resolved?.ok === true) {
 			mainSessionEnsured = true;
-			logBridgeDebug(`main session key ensure: ready key=${key} sessionId=${resolvedSessionId}`);
-			return { ok: true, state: 'ready', sessionId: resolvedSessionId };
+			logBridgeDebug(`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' };
+		}
+		// session key 不存在，通过 sessions.reset 创建
 		const reset = await gatewayRpc('sessions.reset', { key, reason: 'new' }, { timeoutMs: 2500 });
 		if (reset?.ok !== true) {
 			return { ok: false, error: reset?.error ?? 'sessions_reset_failed' };
 		}
-		const verify = await gatewayRpc('sessions.resolve', { key }, { timeoutMs: 2000 });
-		const verifySessionId = verify?.response?.result?.entry?.sessionId;
-		if (verify?.ok === true && typeof verifySessionId === 'string' && verifySessionId.trim()) {
-			mainSessionEnsured = true;
-			logBridgeDebug(`main session key ensure: created key=${key} sessionId=${verifySessionId}`);
-			return { ok: true, state: 'created', sessionId: verifySessionId };
-		}
-		return { ok: false, error: verify?.error ?? 'sessions_resolve_after_reset_failed' };
+		mainSessionEnsured = true;
+		logBridgeDebug(`main session key ensure: created key=${key}`);
+		return { ok: true, state: 'created' };
 	})();
 	try {
 		const result = await mainSessionEnsurePromise;
@@ -259,9 +258,7 @@ function ensureGatewayConnection() {
 				gatewayReady = true;
 				logBridgeDebug(`gateway connect ok <- id=${payload.id}`);
 				gatewayConnectReqId = null;
-				// [DISABLED] ensureMainSessionKey 存在 bug，每次重连都会误触 sessions.reset
-				// 导致对话被频繁重置。详见 docs/ensure-main-session-bug-analysis.md
-				// void ensureMainSessionKey();
+				void ensureMainSessionKey();
 			}
 			else {
 				gatewayReady = false;
@@ -528,6 +525,8 @@ export async function refreshRealtimeBridge() {
 
 export async function stopRealtimeBridge() {
 	started = false;
+	mainSessionEnsured = false;
+	mainSessionEnsurePromise = null;
 	clearConnectTimer();
 	if (reconnectTimer) {
 		clearTimeout(reconnectTimer);

package/src/session-manager/manager.js

@@ -184,10 +184,28 @@ export function createSessionManager(options = {}) {
 			}
 		}
 
+		// 补充 sessions.json 中有索引但无 transcript 文件的 session（如 reset 后未对话、新建 session）
+		for (const [sessionKey, entry] of Object.entries(index)) {
+			const sid = entry?.sessionId;
+			if (!sid || grouped.has(sid)) continue;
+			grouped.set(sid, {
+				sessionId: sid,
+				sessionKey,
+				indexed: true,
+				archiveType: 'live',
+				fileName: null,
+				updatedAt: entry.updatedAt ?? 0,
+				size: 0,
+			});
+		}
+
 		const rows = Array.from(grouped.values());
 		rows.sort((a, b) => b.updatedAt - a.updatedAt);
 
 		const items = rows.slice(cursor, cursor + limit).map((row) => {
+			if (!row.fileName) {
+				return { ...row };
+			}
 			const transcriptPath = nodePath.join(dir, row.fileName);
 			const derivedTitle = deriveTitle(transcriptPath, logger);
 			if (!derivedTitle) {
@@ -246,7 +264,9 @@ export function createSessionManager(options = {}) {
 		const limit = clamp(params.limit, 1, 500, 100);
 		const cursor = clamp(params.cursor, 0, Number.MAX_SAFE_INTEGER, 0);
 		const file = resolveTranscriptFile(agentId, sessionId);
-		if (!file) throw new Error(`session transcript not found: ${sessionId}`);
+		if (!file) {
+			return { agentId, sessionId, total: 0, cursor: String(cursor), nextCursor: null, messages: [] };
+		}
 
 		const all = [];
 		for (const line of fs.readFileSync(file, 'utf8').split(/\r?\n/).filter(Boolean)) {