squad-openclaw 2026.2.2012 → 2026.2.2014

package/dist/index.js

@@ -1231,6 +1231,9 @@ import { fileURLToPath } from "url";
 var PACKAGE_NAME = "squad-openclaw";
 var CONFIG_PATH = path6.join(getOpenclawStateDir(), "openclaw.json");
 var updateInProgress = false;
+var VERIFY_TIMEOUT_MS = 2e4;
+var VERIFY_INTERVAL_MS = 500;
+var RESTART_BUFFER_MS = 5e3;
 function getCurrentVersion() {
   const thisFile = fileURLToPath(import.meta.url);
   const pkgPath = path6.resolve(path6.dirname(thisFile), "..", "package.json");
@@ -1255,6 +1258,145 @@ async function fetchLatestVersion() {
     clearTimeout(timeout);
   }
 }
+function runDoctorFixSilently() {
+  try {
+    execSync2("openclaw doctor --fix 2>/dev/null || true", {
+      timeout: 3e4,
+      encoding: "utf-8"
+    });
+  } catch {
+  }
+}
+function sleep(ms) {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
+function verifyInstalledPluginState() {
+  let configRaw;
+  try {
+    configRaw = fs5.readFileSync(CONFIG_PATH, "utf-8");
+  } catch (err2) {
+    const msg = err2 instanceof Error ? err2.message : String(err2);
+    return {
+      ok: false,
+      reason: `Could not read openclaw.json: ${msg}`,
+      installPath: null,
+      configVersion: null,
+      packageVersion: null,
+      requiredFilesMissing: []
+    };
+  }
+  let config;
+  try {
+    config = JSON.parse(configRaw);
+  } catch (err2) {
+    const msg = err2 instanceof Error ? err2.message : String(err2);
+    return {
+      ok: false,
+      reason: `Could not parse openclaw.json: ${msg}`,
+      installPath: null,
+      configVersion: null,
+      packageVersion: null,
+      requiredFilesMissing: []
+    };
+  }
+  const installMeta = config?.plugins?.installs?.[PACKAGE_NAME];
+  const installPath = typeof installMeta?.installPath === "string" ? installMeta.installPath : null;
+  const configVersion = typeof installMeta?.version === "string" ? installMeta.version : null;
+  if (!installPath) {
+    return {
+      ok: false,
+      reason: "Missing plugins.installs entry or installPath for squad-openclaw",
+      installPath: null,
+      configVersion,
+      packageVersion: null,
+      requiredFilesMissing: []
+    };
+  }
+  const requiredFiles = [
+    path6.join(installPath, "package.json"),
+    path6.join(installPath, "openclaw.plugin.json"),
+    path6.join(installPath, "dist", "index.js")
+  ];
+  const requiredFilesMissing = requiredFiles.filter((p) => !fs5.existsSync(p));
+  if (requiredFilesMissing.length > 0) {
+    return {
+      ok: false,
+      reason: "Missing required installed plugin files",
+      installPath,
+      configVersion,
+      packageVersion: null,
+      requiredFilesMissing
+    };
+  }
+  let installedPackage;
+  try {
+    installedPackage = JSON.parse(
+      fs5.readFileSync(path6.join(installPath, "package.json"), "utf-8")
+    );
+  } catch (err2) {
+    const msg = err2 instanceof Error ? err2.message : String(err2);
+    return {
+      ok: false,
+      reason: `Could not parse installed package.json: ${msg}`,
+      installPath,
+      configVersion,
+      packageVersion: null,
+      requiredFilesMissing: []
+    };
+  }
+  try {
+    JSON.parse(
+      fs5.readFileSync(path6.join(installPath, "openclaw.plugin.json"), "utf-8")
+    );
+  } catch (err2) {
+    const msg = err2 instanceof Error ? err2.message : String(err2);
+    return {
+      ok: false,
+      reason: `Could not parse installed openclaw.plugin.json: ${msg}`,
+      installPath,
+      configVersion,
+      packageVersion: null,
+      requiredFilesMissing: []
+    };
+  }
+  const packageVersion = typeof installedPackage?.version === "string" ? installedPackage.version : null;
+  if (!packageVersion) {
+    return {
+      ok: false,
+      reason: "Installed package.json missing version",
+      installPath,
+      configVersion,
+      packageVersion,
+      requiredFilesMissing: []
+    };
+  }
+  if (configVersion && configVersion !== packageVersion) {
+    return {
+      ok: false,
+      reason: `Version mismatch: config=${configVersion}, package=${packageVersion}`,
+      installPath,
+      configVersion,
+      packageVersion,
+      requiredFilesMissing: []
+    };
+  }
+  return {
+    ok: true,
+    installPath,
+    configVersion,
+    packageVersion,
+    requiredFilesMissing: []
+  };
+}
+async function waitForVerifiedInstall() {
+  const deadline = Date.now() + VERIFY_TIMEOUT_MS;
+  let last = verifyInstalledPluginState();
+  while (!last.ok && Date.now() < deadline) {
+    await sleep(VERIFY_INTERVAL_MS);
+    last = verifyInstalledPluginState();
+  }
+  return last;
+}
 function registerVersionMethods(api) {
   api.registerGatewayMethod(
     "squad.version.check",
@@ -1300,29 +1442,48 @@ function registerVersionMethods(api) {
           configBackup = fs5.readFileSync(CONFIG_PATH, "utf-8");
         } catch {
         }
-        try {
-          execSync2("openclaw doctor --fix 2>&1", {
-            timeout: 3e4,
-            encoding: "utf-8"
-          });
-        } catch {
-        }
+        runDoctorFixSilently();
         try {
           updateOutput = execSync2(
             `openclaw plugins update ${PACKAGE_NAME} 2>&1`,
             { timeout: 12e4, encoding: "utf-8" }
           );
-        } catch (installErr) {
+        } catch (firstErr) {
+          runDoctorFixSilently();
+          try {
+            updateOutput = execSync2(
+              `openclaw plugins update ${PACKAGE_NAME} 2>&1`,
+              { timeout: 12e4, encoding: "utf-8" }
+            );
+          } catch (installErr) {
+            if (configBackup) {
+              try {
+                fs5.writeFileSync(CONFIG_PATH, configBackup, "utf-8");
+              } catch {
+              }
+            }
+            const firstMsg = firstErr instanceof Error ? firstErr.message : String(firstErr);
+            const retryMsg = installErr instanceof Error ? installErr.message : String(installErr);
+            respond(false, {
+              error: `Update failed after doctor fix retry: ${retryMsg}`,
+              output: updateOutput,
+              firstError: firstMsg
+            });
+            return;
+          }
+        }
+        const verification = await waitForVerifiedInstall();
+        if (!verification.ok) {
           if (configBackup) {
             try {
               fs5.writeFileSync(CONFIG_PATH, configBackup, "utf-8");
             } catch {
             }
           }
-          const msg = installErr instanceof Error ? installErr.message : String(installErr);
           respond(false, {
-            error: `Update failed: ${msg}`,
-            output: updateOutput
+            error: `Update verification failed: ${verification.reason ?? "unknown error"}`,
+            output: updateOutput.slice(0, 500),
+            verification
           });
           return;
         }
@@ -1332,20 +1493,21 @@ function registerVersionMethods(api) {
           currentVersion: after,
           updated: true,
           restartRequired: true,
+          restartInMs: RESTART_BUFFER_MS,
+          verification,
           output: updateOutput.slice(0, 500)
         });
+        await sleep(RESTART_BUFFER_MS);
         console.log(
-          `[version] Plugin update command succeeded (was ${before}), restarting gateway in 2s...`
+          `[version] Plugin update verified (was ${before}), restarting gateway...`
         );
-        setTimeout(() => {
-          try {
-            execSync2("openclaw gateway restart 2>&1", {
-              timeout: 3e4,
-              encoding: "utf-8"
-            });
-          } catch {
-          }
-        }, 2e3);
+        try {
+          execSync2("openclaw gateway restart 2>&1", {
+            timeout: 3e4,
+            encoding: "utf-8"
+          });
+        } catch {
+        }
       } catch (e) {
         const msg = e instanceof Error ? e.message : String(e);
         respond(false, { error: msg });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "squad-openclaw",
-  "version": "2026.2.2012",
+  "version": "2026.2.2014",
   "description": "Entity registry, filesystem tools, and version management plugin for OpenClaw gateway",
   "type": "module",
   "main": "./dist/index.js",