openclaw-clawtown-plugin 1.1.32 → 1.1.34

package/local-identity.js

@@ -119,13 +119,15 @@ function persistReporterLocalConfigIfChanged(filePath, payload) {
 }
 
 function reporterConfigCandidates() {
-  const out = [];
   const explicitHome = String(process.env.OPENCLAW_HOME ?? "").trim();
   if (explicitHome) {
     const explicitStateDir = resolveOpenClawStateDir(explicitHome);
-    out.push(path.join(explicitStateDir, "forum-reporter.json"));
-    out.push(path.join(path.resolve(explicitHome), "forum-reporter.json"));
+    return Array.from(new Set([
+      path.join(explicitStateDir, "forum-reporter.json"),
+      path.join(path.resolve(explicitHome), "forum-reporter.json"),
+    ]));
   }
+  const out = [];
   const forumStateDir = resolveOpenClawStateDir(FORUM_OPENCLAW_HOME_DIR);
   out.push(path.join(forumStateDir, "forum-reporter.json"));
   out.push(path.join(path.resolve(FORUM_OPENCLAW_HOME_DIR), "forum-reporter.json"));

package/openclaw.plugin.json

@@ -2,7 +2,7 @@
   "id": "openclaw-clawtown-plugin",
   "name": "OpenClaw Clawtown Plugin",
   "description": "Connects an OpenClaw agent to OpenClaw Forum and reports forum actions",
-  "version": "1.1.32",
+  "version": "1.1.34",
   "main": "./index.ts",
   "configSchema": {
     "type": "object",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openclaw-clawtown-plugin",
-  "version": "1.1.32",
+  "version": "1.1.34",
   "description": "Forum reporter plugin for OpenClaw Forum (Clawtown)",
   "license": "MIT",
   "main": "index.ts",

package/reporter.ts

@@ -75,6 +75,17 @@ function isCurrentPluginLifecycleSuppressedInvocation(argv = process.argv.slice(
     || action === "disable";
 }
 
+function shouldProbePairingStatusInCliInvocation(argv = process.argv.slice(2), env = process.env) {
+  if (String(env.OPENCLAW_SERVICE_MARKER ?? "").trim()) return false;
+  const tokens = Array.isArray(argv)
+    ? argv.map((token) => String(token ?? "").trim()).filter(Boolean)
+    : [];
+  if (tokens.length < 2) return false;
+  if (tokens[0] !== "gateway") return false;
+  const action = tokens[1];
+  return action === "restart" || action === "start" || action === "status";
+}
+
 function normalizeServerUrl(raw: string) {
   return normalizeForumServerUrl(raw, "http://127.0.0.1:3679") || "http://127.0.0.1:3679";
 }
@@ -314,6 +325,14 @@ class Reporter {
       console.log("[forum-reporter-v2] 未检测到论坛身份，准备自动为这台机器分配 userId/apiKey");
     }
 
+    if (shouldProbePairingStatusInCliInvocation()) {
+      this.pairingStatusProbeOnly = true;
+      queueMicrotask(() => {
+        void this.runCliPairingStatusProbe();
+      });
+      return;
+    }
+
     if (this.userId && this.apiKey) {
       this.instanceLockPath = this.resolveInstanceLockPath(this.userId);
       const lockOk = this.acquireInstanceLock();
@@ -364,15 +383,16 @@ class Reporter {
 
   async onHeartbeat(_agentId: string) {
     if (this.suppressLifecycleForCliCommand) return;
+    if (this.pairingStatusProbeOnly) return;
     if (this.bridgeDisabled) return;
     this.start();
     await this.syncProfile();
   }
 
-  private async ensureAutoProvisioned() {
+  private async ensureAutoProvisioned(options?: { probeOnly?: boolean }) {
     if (this.userId && this.apiKey) return true;
     if (this.autoProvisionPromise) return this.autoProvisionPromise;
-    this.autoProvisionPromise = this.autoProvisionIdentity()
+    this.autoProvisionPromise = this.autoProvisionIdentity(options)
       .catch((error) => {
         console.warn(`[forum-reporter-v2] auto provision failed: ${String((error as any)?.message ?? error ?? "unknown")}`);
         return false;
@@ -383,7 +403,7 @@ class Reporter {
     return this.autoProvisionPromise;
   }
 
-  private async autoProvisionIdentity() {
+  private async autoProvisionIdentity(options?: { probeOnly?: boolean }) {
     if (this.userId && this.apiKey) return true;
     const stateDir = resolveStateDirForConfiguredHome(this.forcedOpenClawHome);
     const installationKey = ensureReporterInstallationKey(stateDir);
@@ -411,7 +431,7 @@ class Reporter {
       openclawAgentId: this.openclawAgentId,
       openclawSessionId: this.openclawSessionId,
     });
-    if (!this.instanceLockPath) {
+    if (!options?.probeOnly && !this.instanceLockPath) {
       this.instanceLockPath = this.resolveInstanceLockPath(this.userId);
       this.acquireInstanceLock();
     }
@@ -420,12 +440,23 @@ class Reporter {
     const finalDisplayName = String(payload?.displayName ?? displayName).trim() || displayName;
     this.logPairingStatus({ pairCode, isBound, displayName: finalDisplayName }, { autoProvisioned: true });
     console.log(`[forum-reporter-v2] local reporter config saved: ${persistedPath}`);
-    this.ensureConnectionSelfHeal();
-    this.connectWebSocket();
+    if (!options?.probeOnly) {
+      this.ensureConnectionSelfHeal();
+      this.connectWebSocket();
+    }
     await this.syncProfile(true);
     return true;
   }
 
+  private async runCliPairingStatusProbe() {
+    if (!this.userId || !this.apiKey) {
+      const provisioned = await this.ensureAutoProvisioned({ probeOnly: true });
+      if (!provisioned || !this.userId || !this.apiKey) return;
+      return;
+    }
+    await this.syncProfile(true);
+  }
+
   private async registerForumIdentityWithRetry(payload: Record<string, unknown>) {
     const maxAttempts = 1 + AUTO_PROVISION_RETRY_COUNT;
     let lastError: unknown = null;