agentlife 1.1.6 → 1.1.7

package/dist/index.js

@@ -4726,16 +4726,24 @@ function ensureDirs() {
   if (!fs6.existsSync(BIN_DIR))
     fs6.mkdirSync(BIN_DIR, { recursive: true, mode: 448 });
 }
-function loadOrCreateDeviceIdentity() {
-  if (fs6.existsSync(DEVICE_FILE)) {
-    try {
-      const raw = fs6.readFileSync(DEVICE_FILE, "utf-8");
-      const parsed = JSON.parse(raw);
-      if (typeof parsed.deviceId === "string" && typeof parsed.deviceSecret === "string") {
-        return { deviceId: parsed.deviceId, deviceSecret: parsed.deviceSecret };
-      }
-    } catch {}
+function loadDeviceIdentity() {
+  if (!fs6.existsSync(DEVICE_FILE))
+    return null;
+  try {
+    const raw = fs6.readFileSync(DEVICE_FILE, "utf-8");
+    const parsed = JSON.parse(raw);
+    if (typeof parsed.deviceId === "string" && typeof parsed.deviceSecret === "string") {
+      return { deviceId: parsed.deviceId, deviceSecret: parsed.deviceSecret };
+    }
+    return null;
+  } catch {
+    return null;
   }
+}
+function loadOrCreateDeviceIdentity() {
+  const existing = loadDeviceIdentity();
+  if (existing)
+    return existing;
   const identity = {
     deviceId: crypto2.randomUUID(),
     deviceSecret: crypto2.randomBytes(32).toString("base64url")
@@ -4747,6 +4755,7 @@ function loadOrCreateDeviceIdentity() {
   console.log(`[cloudflared-supervisor] generated new device identity (deviceId=${identity.deviceId})`);
   return identity;
 }
+var AGENTLIFE_API_BASE = API_BASE;
 function loadCachedTunnel() {
   if (!fs6.existsSync(TUNNEL_FILE))
     return null;
@@ -5124,57 +5133,22 @@ function registerWebApp(api) {
 
 // services/pairing.ts
 var TUNNEL_READY_TIMEOUT_MS = 90000;
-async function detectTunnelUrl(port) {
-  try {
-    const cfgPath = path10.join(os6.homedir(), ".cloudflared", "config.yml");
-    if (!fsSync3.existsSync(cfgPath))
-      return null;
-    const cfg = fsSync3.readFileSync(cfgPath, "utf-8");
-    const lines = cfg.split(`
-`);
-    for (let i = 0;i < lines.length; i++) {
-      const hostMatch = lines[i].match(/hostname:\s*(.+)/);
-      if (hostMatch) {
-        const nextLine = lines[i + 1] || "";
-        const svcMatch = nextLine.match(/service:\s*http:\/\/localhost:(\d+)/);
-        if (svcMatch && parseInt(svcMatch[1]) === port) {
-          return `wss://${hostMatch[1].trim()}`;
-        }
-      }
-    }
-    return null;
-  } catch {
-    return null;
-  }
-}
 function registerPairingServices(api) {
   api.registerService({
     id: "agentlife-pairing-qr",
     start: async (_ctx) => {
       try {
         const cfg = api.runtime.config.loadConfig();
-        const bind = cfg.gateway?.bind ?? "loopback";
         const port = cfg.gateway?.port ?? 18789;
         const token = cfg.gateway?.auth?.token;
         if (!token)
           return;
         const supervisorTunnel = await awaitTunnelReady(TUNNEL_READY_TIMEOUT_MS) ?? getTunnelInfo();
-        let url;
-        if (supervisorTunnel?.tunnelUrl) {
-          url = supervisorTunnel.tunnelUrl;
-        } else {
-          console.warn("[agentlife] Tunnel not ready after " + TUNNEL_READY_TIMEOUT_MS / 1000 + "s — falling back to LAN URL. Phone pairing will only work on the same Wi-Fi.");
-          const userTunnel = await detectTunnelUrl(port);
-          if (userTunnel) {
-            url = userTunnel;
-          } else if (bind === "lan" || bind === "auto" || bind === "custom") {
-            const nets = os6.networkInterfaces();
-            const lanIp = Object.values(nets).flat().find((n) => n && !n.internal && n.family === "IPv4")?.address;
-            url = `ws://${lanIp ?? "127.0.0.1"}:${port}`;
-          } else {
-            url = `ws://127.0.0.1:${port}`;
-          }
+        if (!supervisorTunnel?.tunnelUrl) {
+          console.warn(`[agentlife] Cloudflared tunnel did not come up within ${TUNNEL_READY_TIMEOUT_MS / 1000}s — ` + `pairing QR will not be emitted. Check cloudflared-supervisor logs in the gateway output.`);
+          return;
         }
+        const url = supervisorTunnel.tunnelUrl;
         const bootstrapToken = mintBootstrapToken();
         const payload = JSON.stringify({ url, bootstrapToken });
         const setupCode = Buffer.from(payload).toString("base64url");
@@ -6709,6 +6683,33 @@ function registerAdminGateway(api, state2) {
     try {
       const cleaned = [];
       const baseDir = state2.agentlifeStateDir ?? path12.join(os7.homedir(), ".openclaw", "agentlife");
+      const identity = loadDeviceIdentity();
+      if (!identity) {
+        cleaned.push("server deprovision skipped (no device identity)");
+      } else {
+        try {
+          const res = await fetch(`${AGENTLIFE_API_BASE}/api/v1/devices/deprovision`, {
+            method: "POST",
+            headers: { "Content-Type": "application/json" },
+            body: JSON.stringify({
+              deviceId: identity.deviceId,
+              deviceSecret: identity.deviceSecret
+            }),
+            signal: AbortSignal.timeout(1e4)
+          });
+          if (res.ok) {
+            cleaned.push("deprovisioned tunnel on server");
+          } else if (res.status === 404) {
+            cleaned.push("server had no record of this device (already gone)");
+          } else {
+            cleaned.push(`server deprovision returned HTTP ${res.status} (continuing)`);
+            console.warn(`[agentlife] uninstall: deprovision HTTP ${res.status}, continuing with local cleanup`);
+          }
+        } catch (err) {
+          cleaned.push(`server deprovision failed (continuing): ${err?.message ?? "unknown error"}`);
+          console.warn(`[agentlife] uninstall: deprovision failed (${err?.message ?? err}), continuing with local cleanup`);
+        }
+      }
       if (state2.runCommand) {
         try {
           const result = await state2.runCommand(["openclaw", "cron", "list", "--json"], { timeoutMs: 1e4 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agentlife",
-  "version": "1.1.6",
+  "version": "1.1.7",
   "type": "module",
   "scripts": {
     "build": "bun build index.ts --outfile dist/index.js --target node --external openclaw/plugin-sdk",