@coclaw/openclaw-coclaw 0.21.2 → 0.21.3

package/index.js

@@ -5,6 +5,7 @@ import { notBound, bindOk, unbindOk, claimCodeCreated } from './src/common/messa
 import { coclawChannelPlugin } from './src/channel-plugin.js';
 import { ensureAgentSession, gatewayAgentRpc, restartRealtimeBridge, stopRealtimeBridge, waitForSessionsReady, broadcastPluginEvent } from './src/realtime-bridge.js';
 import { getHostName, readSettings, writeName, MAX_NAME_LENGTH } from './src/settings.js';
+import { readConfig } from './src/config.js';
 import { setRuntime } from './src/runtime.js';
 import { createSessionManager } from './src/session-manager/manager.js';
 import { TopicManager } from './src/topic-manager/manager.js';
@@ -157,6 +158,13 @@ const plugin = {
 		setRuntime(api.runtime);
 		const logger = api?.logger ?? console;
 		installAbortRegistryDiag(logger);
+
+		// 未 bind 时打条提示，便于 hub 装机用户看到下一步动作
+		readConfig().then((cfg) => {
+			if (!cfg?.token) {
+				logger.info?.('[coclaw] not bound — run `openclaw coclaw enroll` to connect to CoClaw');
+			}
+		}).catch(() => {});
 		const manager = createSessionManager({ logger });
 		const topicManager = new TopicManager({ logger });
 		const chatHistoryManager = new ChatHistoryManager({ logger });

package/openclaw.plugin.json

@@ -1,7 +1,7 @@
 {
   "id": "openclaw-coclaw",
   "name": "CoClaw",
-  "description": "OpenClaw CoClaw channel plugin for remote chat",
+  "description": "OpenClaw CoClaw channel plugin for remote chat. Run `openclaw coclaw enroll` after install to connect to CoClaw.",
   "activation": {
     "onStartup": true
   },
@@ -11,9 +11,6 @@
     "properties": {
       "serverUrl": {
         "type": "string"
-      },
-      "gatewayWsUrl": {
-        "type": "string"
       }
     }
   }

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@coclaw/openclaw-coclaw",
-  "version": "0.21.2",
+  "version": "0.21.3",
   "type": "module",
   "license": "Apache-2.0",
-  "description": "OpenClaw CoClaw channel plugin for remote chat",
+  "description": "OpenClaw CoClaw channel plugin for remote chat. Run `openclaw coclaw enroll` after install to connect to CoClaw.",
   "repository": {
     "type": "git",
     "url": "https://github.com/coclaw/coclaw.git",

package/src/realtime-bridge.js

@@ -25,8 +25,17 @@ const SERVER_HB_PING_MS = 25_000;
 const SERVER_HB_TIMEOUT_MS = 45_000;
 const SERVER_HB_MAX_MISS = 3; // 连续 3 次无响应才断连（~135s）。上游主线程 spike 实测最坏 ~89.5s（issue #75069），余量 ~1.5x
 // gateway 握手失败的指数退避表：每个元素是"上一次失败"之后、"下一次尝试"之前的等待时间。
-// 最多 5 次重试（加上首次尝试共 6 次），全部失败后进入 gave-up 终态，不再自动尝试。
-const GATEWAY_RETRY_DELAYS_MS = [5_000, 10_000, 20_000, 20_000, 20_000];
+// 最多 N 次重试（N=length；加上首次尝试共 N+1 次），全部失败后进入 gave-up 终态，
+// 终态后必须 stop+start 才能恢复（无运行期自动复活）——所以预算要够覆盖慢启动场景。
+// 表前置 4 档（1s + 3×1.5s）专门压低"server 启动期 sidecars 还没就绪"窗口（推荐
+// retryAfterMs=500）；尾段 9 × 20s 把总预算拉到 ~200s（>3 分钟），覆盖 profile 初始化、
+// 笔记本刚开机磁盘忙、pion 子进程首次 spawn 等慢启动场景，避免误判"放弃"。
+// export 是为了让测试 helper 通过同一份常量识别 retry timer，避免硬编码副本与生产代码漂移。
+export const GATEWAY_RETRY_DELAYS_MS = [
+	1_000, 1_500, 1_500, 1_500,
+	5_000, 10_000,
+	20_000, 20_000, 20_000, 20_000, 20_000, 20_000, 20_000, 20_000, 20_000,
+];
 // v3 握手失败时，只有错误消息匹配此正则才回退到不带 device 的 legacy 握手。
 // 严格限定在"签名/设备/scope/协议"相关错误，避免对网络/内部错误做无意义的降级尝试。
 const GATEWAY_HANDSHAKE_FALLBACK_PATTERN = /signature|device|scope|protocol/i;
@@ -90,20 +99,26 @@ function maskUrlToken(url) {
 }
 
 // 仅在未注入 resolveGatewayAuthToken 时使用，依赖 runtime / 环境变量
+// 优先级：config.gateway.auth.token > env OPENCLAW_GATEWAY_TOKEN
+// 与上游 server 的 auth-surface-resolution 同方向：config 主、env 兜底。
+// env 路径保留是为 ensureGatewayStartupAuth 的 env-only 边角（token 由 env 提供时
+// 上游不会写回 cfg），cfg 读不到时仍能拿到正确 token。
 export function defaultResolveGatewayAuthToken() {
-	const envToken = process.env.OPENCLAW_GATEWAY_TOKEN?.trim();
-	if (envToken) {
-		return envToken;
-	}
 	try {
 		const cfg = getClawConfig();
 		const token = cfg?.gateway?.auth?.token;
-		return typeof token === 'string' && token.trim() ? token.trim() : '';
+		if (typeof token === 'string' && token.trim()) {
+			return token.trim();
+		}
 	}
 	catch (err) {
 		console.warn?.(`[coclaw] resolve gateway auth token failed: ${String(err?.message ?? err)}`);
-		return '';
 	}
+	const envToken = process.env.OPENCLAW_GATEWAY_TOKEN?.trim();
+	if (envToken) {
+		return envToken;
+	}
+	return '';
 }
 
 /**
@@ -247,9 +262,7 @@ export class RealtimeBridge {
 	}
 
 	__resolveGatewayWsUrl() {
-		return this.pluginConfig?.gatewayWsUrl
-			?? process.env.COCLAW_GATEWAY_WS_URL
-			?? DEFAULT_GATEWAY_WS_URL;
+		return process.env.COCLAW_GATEWAY_WS_URL ?? DEFAULT_GATEWAY_WS_URL;
 	}
 
 	async __clearTokenLocal(unboundClawId) {