@clawling/clawchat-plugin-openclaw 2026.9.9-1 → 2026.9.10-1

package/dist/src/liveware-sample.js

@@ -378,6 +378,28 @@ export async function startTunnelAgent(opts) {
     await waitForOutput(child, (acc) => parseAgentReady(acc), opts.timeoutMs ?? TUNNEL_START_TIMEOUT_MS, "liveware agent start");
     return { child };
 }
+/** Where the liveware CLI keeps its login state, relative to its `HOME`. */
+const LIVEWARE_CREDENTIAL_DIRNAME = ".clawling";
+/**
+ * True when the liveware CLI has usable cached credentials under `cliHome`.
+ *
+ * Tolerates either shape the CLI might use: a credential file (non-empty) or a
+ * directory (non-empty). Anything unreadable answers "no" — the caller's only
+ * use is deciding whether it is safe to skip a login, and guessing "yes" there
+ * is exactly the failure this check exists to prevent.
+ */
+export async function hasCachedLivewareCredentials(cliHome) {
+    const target = path.join(cliHome, LIVEWARE_CREDENTIAL_DIRNAME);
+    try {
+        const stat = await fs.promises.stat(target);
+        if (stat.isDirectory())
+            return (await fs.promises.readdir(target)).length > 0;
+        return stat.size > 0;
+    }
+    catch {
+        return false;
+    }
+}
 export async function livewareLogin(opts) {
     const execFileFn = opts.execFileFn ?? nodeExecFile;
     await new Promise((resolve, reject) => {
@@ -833,12 +855,14 @@ export class LivewareSampleSupervisor {
         // lifetime. `login` is idempotent; best-effort, so a stale token still falls
         // through to whatever credentials the CLI already has.
         const token = deps.resolveToken();
+        let loggedIn = false;
         if (token) {
             try {
                 await livewareLogin({ livewarePath, token, execFileFn: deps.execFileFn, env: cliEnv });
+                loggedIn = true;
             }
             catch (err) {
-                deps.log?.warn?.(`liveware-sample: relaunch re-login failed; continuing with cached CLI credentials: ${String(err)}`);
+                deps.log?.warn?.(`liveware-sample: relaunch re-login failed; continuing only if the CLI has cached credentials: ${String(err)}`);
             }
             if (this.bailIfStopped())
                 return;
@@ -846,6 +870,20 @@ export class LivewareSampleSupervisor {
         else {
             deps.log?.debug?.("liveware-sample: no token; relaunch without re-login");
         }
+        // Falling through without a fresh login is only safe when the CLI actually
+        // has credentials cached. Since the private-HOME redirect those live in
+        // `<cliHome>/.clawling`, and a first relaunch after upgrading finds that
+        // home EMPTY — the old ones are still under the ambient `$HOME`. Continuing
+        // there makes every tunnelBind/agent call below fail auth, which surfaces as
+        // a confusing tunnel error rather than the credential problem it is, and
+        // burns the whole retry ladder on a state that cannot recover on its own.
+        // Throwing hands it to `startAttempt`'s ladder instead, so the worst case is
+        // a delayed sample rather than a silent auth failure.
+        if (!loggedIn && cliEnv && deps.cliHome) {
+            if (!(await hasCachedLivewareCredentials(deps.cliHome))) {
+                throw new Error(`liveware CLI has no cached credentials under ${deps.cliHome} and no token was available to log in`);
+            }
+        }
         // Kept after the re-login above so the lookup runs against a CLI that is
         // actually authenticated: a pending row's app id came straight from
         // `app create`'s parser and was never confirmed by the liveware side, so

package/package.json

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

package/src/liveware-sample.ts

@@ -467,6 +467,28 @@ export async function startTunnelAgent(opts: {
   return { child };
 }
 
+/** Where the liveware CLI keeps its login state, relative to its `HOME`. */
+const LIVEWARE_CREDENTIAL_DIRNAME = ".clawling";
+
+/**
+ * True when the liveware CLI has usable cached credentials under `cliHome`.
+ *
+ * Tolerates either shape the CLI might use: a credential file (non-empty) or a
+ * directory (non-empty). Anything unreadable answers "no" — the caller's only
+ * use is deciding whether it is safe to skip a login, and guessing "yes" there
+ * is exactly the failure this check exists to prevent.
+ */
+export async function hasCachedLivewareCredentials(cliHome: string): Promise<boolean> {
+  const target = path.join(cliHome, LIVEWARE_CREDENTIAL_DIRNAME);
+  try {
+    const stat = await fs.promises.stat(target);
+    if (stat.isDirectory()) return (await fs.promises.readdir(target)).length > 0;
+    return stat.size > 0;
+  } catch {
+    return false;
+  }
+}
+
 export async function livewareLogin(opts: {
   livewarePath: string;
   token: string;
@@ -980,18 +1002,36 @@ export class LivewareSampleSupervisor {
     // lifetime. `login` is idempotent; best-effort, so a stale token still falls
     // through to whatever credentials the CLI already has.
     const token = deps.resolveToken();
+    let loggedIn = false;
     if (token) {
       try {
         await livewareLogin({ livewarePath, token, execFileFn: deps.execFileFn, env: cliEnv });
+        loggedIn = true;
       } catch (err) {
         deps.log?.warn?.(
-          `liveware-sample: relaunch re-login failed; continuing with cached CLI credentials: ${String(err)}`,
+          `liveware-sample: relaunch re-login failed; continuing only if the CLI has cached credentials: ${String(err)}`,
         );
       }
       if (this.bailIfStopped()) return;
     } else {
       deps.log?.debug?.("liveware-sample: no token; relaunch without re-login");
     }
+    // Falling through without a fresh login is only safe when the CLI actually
+    // has credentials cached. Since the private-HOME redirect those live in
+    // `<cliHome>/.clawling`, and a first relaunch after upgrading finds that
+    // home EMPTY — the old ones are still under the ambient `$HOME`. Continuing
+    // there makes every tunnelBind/agent call below fail auth, which surfaces as
+    // a confusing tunnel error rather than the credential problem it is, and
+    // burns the whole retry ladder on a state that cannot recover on its own.
+    // Throwing hands it to `startAttempt`'s ladder instead, so the worst case is
+    // a delayed sample rather than a silent auth failure.
+    if (!loggedIn && cliEnv && deps.cliHome) {
+      if (!(await hasCachedLivewareCredentials(deps.cliHome))) {
+        throw new Error(
+          `liveware CLI has no cached credentials under ${deps.cliHome} and no token was available to log in`,
+        );
+      }
+    }
     // Kept after the re-login above so the lookup runs against a CLI that is
     // actually authenticated: a pending row's app id came straight from
     // `app create`'s parser and was never confirmed by the liveware side, so