openclaw-clawtown-plugin 1.1.21 → 1.1.24

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.21",
+  "version": "1.1.24",
   "main": "./index.ts",
   "configSchema": {
     "type": "object",

package/package.json

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

package/reporter.ts

@@ -15,9 +15,11 @@ const BRIDGE_DISABLED = process.env[DISABLE_BRIDGE_ENV] === "1";
 
 const PROFILE_SYNC_MIN_INTERVAL_MS = 5 * 60_000;
 const TASK_FIRST_TURN_TIMEOUT_SECONDS = 120;
+const TASK_FIRST_TURN_TIMEOUT_MS = 130_000;
 const TASK_TIMEOUT_RETRY_SECONDS = 180;
-const ACTION_MODEL_TIMEOUT_MS = 185_000;
-const ACTION_CONTEXT_TIMEOUT_MS = 120_000;
+const TASK_TIMEOUT_RETRY_MS = 190_000;
+const ACTION_CONTEXT_TIMEOUT_SECONDS = 115;
+const ACTION_CONTEXT_TIMEOUT_MS = 125_000;
 const API_FETCH_TIMEOUT_MS = 20_000;
 const AUTO_PROVISION_RETRY_COUNT = 3;
 const AUTO_PROVISION_RETRY_DELAYS_MS = [1_500, 3_000, 5_000];
@@ -231,6 +233,7 @@ class Reporter {
   private authHealth: AuthHealthCheck | null = null;
   private autoProvisionPromise: Promise<boolean> | null = null;
   private lastPairingStatusShown = "";
+  private pairingStatusProbeOnly = false;
 
   constructor() {
     const legacyRuntime = handleLegacyRuntimeConflict(this.reporterRuntime);
@@ -286,7 +289,11 @@ class Reporter {
       const lockOk = this.acquireInstanceLock();
       if (!lockOk) {
         this.bridgeDisabled = true;
+        this.pairingStatusProbeOnly = true;
         console.warn(`[forum-reporter-v2] duplicate reporter instance detected for userId=${this.userId}; bridge disabled in this process`);
+        queueMicrotask(() => {
+          void this.syncProfile(true);
+        });
       }
     }
 
@@ -301,6 +308,9 @@ class Reporter {
   }
 
   start() {
+    if (this.pairingStatusProbeOnly) {
+      return;
+    }
     if (this.bridgeDisabled) return;
     if (!this.userId || !this.apiKey) {
       void this.ensureAutoProvisioned();
@@ -729,7 +739,7 @@ class Reporter {
       rawOutput = await runTaskTurn(
         instructions,
         TASK_FIRST_TURN_TIMEOUT_SECONDS,
-        ACTION_MODEL_TIMEOUT_MS,
+        TASK_FIRST_TURN_TIMEOUT_MS,
         tid || qid || taskType,
       );
     } catch (error: any) {
@@ -751,7 +761,7 @@ class Reporter {
           rawOutput = await runTaskTurn(
             instructions,
             TASK_TIMEOUT_RETRY_SECONDS,
-            ACTION_MODEL_TIMEOUT_MS,
+            TASK_TIMEOUT_RETRY_MS,
             `${tid || qid || taskType}-timeout-retry1`,
           );
         } catch (error: any) {
@@ -776,7 +786,7 @@ class Reporter {
           rawOutput = await runTaskTurn(
             instructions,
             TASK_FIRST_TURN_TIMEOUT_SECONDS,
-            ACTION_MODEL_TIMEOUT_MS,
+            TASK_FIRST_TURN_TIMEOUT_MS,
             `${tid || qid || taskType}-retry1`,
           );
         } catch (error: any) {
@@ -811,7 +821,7 @@ class Reporter {
       retryOutput = await runTaskTurn(
         retryInstructions,
         TASK_FIRST_TURN_TIMEOUT_SECONDS,
-        ACTION_MODEL_TIMEOUT_MS,
+        TASK_FIRST_TURN_TIMEOUT_MS,
         `${tid || qid || taskType}-submit-retry1`,
       );
     } catch (error: any) {
@@ -1074,7 +1084,7 @@ class Reporter {
     const prompt = buildV2ActionPrompt(context);
     let text = "";
     try {
-      const turn = await this.runVisibleAgentTurn(prompt, 115, ACTION_CONTEXT_TIMEOUT_MS, {
+      const turn = await this.runVisibleAgentTurn(prompt, ACTION_CONTEXT_TIMEOUT_SECONDS, ACTION_CONTEXT_TIMEOUT_MS, {
         taskKey: `context-${context.userId}`,
       });
       text = turn.extractedText;
@@ -1162,6 +1172,7 @@ class Reporter {
   ): Promise<AgentTurnResult> {
     const isWindows = process.platform === "win32";
     const startedAt = Date.now();
+    const commandTimeoutMs = resolveAgentCommandTimeoutMs(timeoutSeconds, timeoutMs);
     if (isWindows) {
       const script = buildWindowsAgentCommandScript({
         agentId: this.openclawAgentId,
@@ -1185,10 +1196,10 @@ class Reporter {
             ...(this.forcedOpenClawHome ? { OPENCLAW_HOME: this.forcedOpenClawHome } : {}),
           },
           windowsHide: true,
-          timeout: timeoutSeconds * 1_000 + 10_000,
+          timeout: commandTimeoutMs,
           maxBuffer: 1024 * 1024,
         }),
-        timeoutMs,
+        commandTimeoutMs,
       );
       return buildAgentTurnResult({
         stdout: String(result.stdout ?? ""),
@@ -1201,6 +1212,7 @@ class Reporter {
 
     const args = [
       "agent",
+      "--local",
       "--session-id", sessionId,
       "--message", message,
       "--json",
@@ -1217,10 +1229,10 @@ class Reporter {
           [DISABLE_BRIDGE_ENV]: "1",
           ...(this.forcedOpenClawHome ? { OPENCLAW_HOME: this.forcedOpenClawHome } : {}),
         },
-        timeout: timeoutSeconds * 1_000 + 10_000,
+        timeout: commandTimeoutMs,
         maxBuffer: 1024 * 1024,
       }),
-      timeoutMs,
+      commandTimeoutMs,
     );
     return buildAgentTurnResult({
       stdout: String(result.stdout ?? ""),
@@ -1973,7 +1985,7 @@ function buildWindowsAgentCommandScript(input: { agentId: string; sessionId: str
     "$forumMessage = @'",
     safeMessage,
     "'@",
-    `openclaw agent --session-id ${quoteForPowerShell(input.sessionId)}${agentArgs} --message $forumMessage --json --thinking minimal --timeout ${Number(input.timeoutSeconds)}`,
+    `openclaw agent --local --session-id ${quoteForPowerShell(input.sessionId)}${agentArgs} --message $forumMessage --json --thinking minimal --timeout ${Number(input.timeoutSeconds)}`,
   ].join("\n");
 }
 
@@ -2990,4 +3002,10 @@ async function promiseWithTimeout<T>(promise: Promise<T>, timeoutMs: number): Pr
   ]);
 }
 
+function resolveAgentCommandTimeoutMs(timeoutSeconds: number, timeoutMs: number) {
+  const cliBudgetMs = Math.max(0, Math.round(Number(timeoutSeconds) || 0)) * 1_000 + 10_000;
+  const externalBudgetMs = Math.max(0, Math.round(Number(timeoutMs) || 0));
+  return Math.max(cliBudgetMs, externalBudgetMs);
+}
+
 export const reporter = new Reporter();