@clawling/clawchat-plugin-openclaw 2026.7.25-1 → 2026.7.26-1

package/dist/src/login.runtime.js

@@ -14,6 +14,13 @@ export const AGENTS_CONNECT_PLATFORM = "openclaw";
  * always a bot; humans don't log in through this flow.
  */
 export const AGENTS_CONNECT_TYPE = "clawbot";
+/**
+ * `/v1/agents/connect` envelope code for "the supplied user_id matches no
+ * agent". Servers that predate the server-side stale-user_id fallback return
+ * this instead of degrading to a fresh pairing, so the client sheds the id and
+ * retries once.
+ */
+export const AGENT_NOT_FOUND_CODE = 16001;
 /**
  * Prompt the operator for an invite code.
  *
@@ -140,8 +147,8 @@ export async function runOpenclawClawlingLogin(params) {
     });
     runtime.log("Verifying invite code …");
     let result;
+    const existingUserId = account.userId.trim();
     try {
-        const existingUserId = account.userId.trim();
         result = await apiClient.agentsConnect({
             code: inviteCode,
             platform: AGENTS_CONNECT_PLATFORM,
@@ -151,9 +158,37 @@ export async function runOpenclawClawlingLogin(params) {
     }
     catch (err) {
         if (err instanceof ClawlingApiError) {
-            throw new Error(`agents/connect failed (${err.kind}): ${err.message}`);
+            // The stored userId is a re-pair hint, not a credential — the invite
+            // code alone decides ownership. AGENT_NOT_FOUND means it names an agent
+            // this server has never had (owner account deleted, or the config was
+            // repointed at another deployment), so replaying it would fail
+            // identically for every future invite code. A 16001 leaves the code
+            // `pending` server-side, so shedding the id and retrying once cannot
+            // double-spend it. Nothing else is retried: an owner mismatch is a real
+            // rejection, and a request that sent no id has no stale state to shed.
+            if (existingUserId && err.meta?.code === AGENT_NOT_FOUND_CODE) {
+                runtime.log(`Stored userId ${existingUserId} no longer exists on this server — retrying as a fresh pairing …`);
+                try {
+                    result = await apiClient.agentsConnect({
+                        code: inviteCode,
+                        platform: AGENTS_CONNECT_PLATFORM,
+                        type: AGENTS_CONNECT_TYPE,
+                    });
+                }
+                catch (retryErr) {
+                    if (retryErr instanceof ClawlingApiError) {
+                        throw new Error(`agents/connect failed (${retryErr.kind}): ${retryErr.message}`);
+                    }
+                    throw retryErr;
+                }
+            }
+            else {
+                throw new Error(`agents/connect failed (${err.kind}): ${err.message}`);
+            }
+        }
+        else {
+            throw err;
         }
-        throw err;
     }
     const accessToken = requireConnectString(result?.access_token, "access_token");
     const agentUserId = requireConnectString(result?.agent?.user_id, "agent.user_id");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clawling/clawchat-plugin-openclaw",
-  "version": "2026.7.25-1",
+  "version": "2026.7.26-1",
   "description": "OpenClaw ClawChat channel plugin",
   "license": "MIT",
   "author": "CLAWLING PTE. LTD.",

package/src/login.runtime.ts

@@ -21,6 +21,13 @@ export const AGENTS_CONNECT_PLATFORM = "openclaw" as const;
  * always a bot; humans don't log in through this flow.
  */
 export const AGENTS_CONNECT_TYPE = "clawbot" as const;
+/**
+ * `/v1/agents/connect` envelope code for "the supplied user_id matches no
+ * agent". Servers that predate the server-side stale-user_id fallback return
+ * this instead of degrading to a fresh pairing, so the client sheds the id and
+ * retries once.
+ */
+export const AGENT_NOT_FOUND_CODE = 16001 as const;
 
 export type OpenclawClawchatMutateConfigFile = <T = void>(params: {
   afterWrite: { mode: "auto" } | { mode: "none" | "restart"; reason: string };
@@ -203,8 +210,8 @@ export async function runOpenclawClawlingLogin(params: LoginParams): Promise<voi
 
   runtime.log("Verifying invite code …");
   let result;
+  const existingUserId = account.userId.trim();
   try {
-    const existingUserId = account.userId.trim();
     result = await apiClient.agentsConnect({
       code: inviteCode,
       platform: AGENTS_CONNECT_PLATFORM,
@@ -213,9 +220,36 @@ export async function runOpenclawClawlingLogin(params: LoginParams): Promise<voi
     });
   } catch (err) {
     if (err instanceof ClawlingApiError) {
-      throw new Error(`agents/connect failed (${err.kind}): ${err.message}`);
+      // The stored userId is a re-pair hint, not a credential — the invite
+      // code alone decides ownership. AGENT_NOT_FOUND means it names an agent
+      // this server has never had (owner account deleted, or the config was
+      // repointed at another deployment), so replaying it would fail
+      // identically for every future invite code. A 16001 leaves the code
+      // `pending` server-side, so shedding the id and retrying once cannot
+      // double-spend it. Nothing else is retried: an owner mismatch is a real
+      // rejection, and a request that sent no id has no stale state to shed.
+      if (existingUserId && err.meta?.code === AGENT_NOT_FOUND_CODE) {
+        runtime.log(
+          `Stored userId ${existingUserId} no longer exists on this server — retrying as a fresh pairing …`,
+        );
+        try {
+          result = await apiClient.agentsConnect({
+            code: inviteCode,
+            platform: AGENTS_CONNECT_PLATFORM,
+            type: AGENTS_CONNECT_TYPE,
+          });
+        } catch (retryErr) {
+          if (retryErr instanceof ClawlingApiError) {
+            throw new Error(`agents/connect failed (${retryErr.kind}): ${retryErr.message}`);
+          }
+          throw retryErr;
+        }
+      } else {
+        throw new Error(`agents/connect failed (${err.kind}): ${err.message}`);
+      }
+    } else {
+      throw err;
     }
-    throw err;
   }
 
   const accessToken = requireConnectString(result?.access_token, "access_token");