@coclaw/openclaw-coclaw 0.1.1 → 0.1.3

package/README.md

@@ -1,6 +1,6 @@
 # @coclaw/openclaw-coclaw
 
-CoClaw 的 OpenClaw 插件（npm: `@coclaw/openclaw-coclaw`，plugin id: `coclaw`），包含：
+CoClaw 的 OpenClaw 插件（npm: `@coclaw/openclaw-coclaw`，plugin id: `openclaw-coclaw`），包含：
 
 - **transport bridge** — CoClaw server 与 OpenClaw gateway 之间的实时消息桥接
 - **session-manager** — 会话列表/读取能力（`nativeui.sessions.listAll` / `nativeui.sessions.get`）

package/index.js

@@ -47,7 +47,7 @@ function respondError(respond, err) {
 
 /* c8 ignore start */
 const plugin = {
-	id: 'coclaw',
+	id: 'openclaw-coclaw',
 	name: 'CoClaw',
 	description: 'OpenClaw CoClaw channel plugin for remote chat',
 	register(api) {

package/openclaw.plugin.json

@@ -1,5 +1,5 @@
 {
-  "id": "coclaw",
+  "id": "openclaw-coclaw",
   "name": "CoClaw",
   "description": "OpenClaw CoClaw channel plugin for remote chat",
   "channels": ["coclaw"],

package/package.json

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

package/src/common/gateway-notify.js

@@ -29,6 +29,7 @@ export function callGatewayMethod(method, spawnFn, opts) {
 		try {
 			child = doSpawn('openclaw', ['gateway', 'call', method, '--json'], {
 				stdio: ['ignore', 'pipe', 'pipe'],
+				shell: true, // Windows 上 npm 全局安装生成 .cmd，需经 shell 解析
 			});
 		} catch {
 			resolve({ ok: false, error: 'spawn_failed' });
@@ -45,7 +46,7 @@ export function callGatewayMethod(method, spawnFn, opts) {
 			settled = true;
 			clearTimeout(timeoutTimer);
 			clearTimeout(graceTimer);
-			try { child.kill(); } catch {} // eslint-disable-line no-empty
+			try { child.kill(); } catch {}
 			resolve(result);
 		};
 

package/src/homedir-mock.helper.js

@@ -0,0 +1,47 @@
+/**
+ * 跨平台 mock os.homedir()
+ *
+ * Node.js os.homedir() 在不同平台读取不同环境变量：
+ * - POSIX: HOME
+ * - Windows: USERPROFILE（优先）、HOMEDRIVE+HOMEPATH
+ *
+ * 测试中需同时设置两端变量，确保 os.homedir() 返回期望路径。
+ */
+
+const HOME_VARS = ['HOME', 'USERPROFILE'];
+
+/**
+ * 保存当前 home 相关环境变量
+ * @returns {Record<string, string | undefined>}
+ */
+export function saveHomedir() {
+	const saved = {};
+	for (const key of HOME_VARS) {
+		saved[key] = process.env[key];
+	}
+	return saved;
+}
+
+/**
+ * 将 home 相关环境变量统一设置为指定路径
+ * @param {string} dir - 目标路径
+ */
+export function setHomedir(dir) {
+	for (const key of HOME_VARS) {
+		process.env[key] = dir;
+	}
+}
+
+/**
+ * 恢复之前保存的 home 相关环境变量
+ * @param {Record<string, string | undefined>} saved
+ */
+export function restoreHomedir(saved) {
+	for (const key of HOME_VARS) {
+		if (saved[key] === undefined) {
+			delete process.env[key];
+		} else {
+			process.env[key] = saved[key];
+		}
+	}
+}

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

@@ -100,7 +100,7 @@ function extractRawTextFromContent(content) {
 }
 
 function findFirstUserRawText(filePath, logger) {
-	const lines = fs.readFileSync(filePath, 'utf8').split('\n');
+	const lines = fs.readFileSync(filePath, 'utf8').split(/\r?\n/);
 	for (const line of lines) {
 		if (!line) continue;
 		try {
@@ -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) {
@@ -249,7 +267,7 @@ export function createSessionManager(options = {}) {
 		if (!file) throw new Error(`session transcript not found: ${sessionId}`);
 
 		const all = [];
-		for (const line of fs.readFileSync(file, 'utf8').split('\n').filter(Boolean)) {
+		for (const line of fs.readFileSync(file, 'utf8').split(/\r?\n/).filter(Boolean)) {
 			try {
 				all.push(JSON.parse(line));
 			}