seclaw 0.1.2 → 0.1.3

package/dist/cli.js

@@ -61,14 +61,12 @@ async function fetchTunnelUrlFromLogs(cwd) {
   try {
     const result = await execa(
       "docker",
-      ["compose", "logs", "cloudflared", "--no-log-prefix"],
-      { cwd, env: { ...process.env, COMPOSE_PROJECT_NAME: "seclaw" } }
+      ["compose", "logs", "cloudflared", "--no-log-prefix", "--tail", "50"],
+      { cwd }
     );
     const combined = result.stdout + "\n" + result.stderr;
-    const match = combined.match(
-      /https:\/\/[a-z0-9-]+\.trycloudflare\.com/
-    );
-    return match ? match[0] : null;
+    const matches = [...combined.matchAll(/https:\/\/[a-z0-9-]+\.trycloudflare\.com/g)];
+    return matches.length > 0 ? matches[matches.length - 1][0] : null;
   } catch {
     return null;
   }
@@ -2272,9 +2270,6 @@ async function doctor() {
       p9.outro("Run again after fixing manually.");
       return;
     }
-    s.start("Stopping conflicting containers...");
-    await stopExistingSeclaw();
-    s.stop(`${FIX} Cleared conflicting containers`);
     for (const check of fixable) {
       s.start(`Fixing: ${check.name}...`);
       try {
@@ -2423,12 +2418,12 @@ async function checkTunnel(projectDir) {
   try {
     const result = await execa8(
       "docker",
-      ["compose", "logs", "cloudflared", "--no-log-prefix"],
+      ["compose", "logs", "cloudflared", "--no-log-prefix", "--tail", "50"],
       { cwd: projectDir, env: { ...process.env, COMPOSE_PROJECT_NAME: getProjectName(projectDir) } }
     );
     const combined = result.stdout + "\n" + result.stderr;
-    const match = combined.match(/https:\/\/[a-z0-9-]+\.trycloudflare\.com/);
-    if (!match) {
+    const matches = [...combined.matchAll(/https:\/\/[a-z0-9-]+\.trycloudflare\.com/g)];
+    if (matches.length === 0) {
       return {
         name: "Tunnel",
         ok: false,
@@ -2442,7 +2437,7 @@ async function checkTunnel(projectDir) {
         }
       };
     }
-    const tunnelUrl = match[0];
+    const tunnelUrl = matches[matches.length - 1][0];
     try {
       const res = await fetch(`${tunnelUrl}/health`, {
         signal: AbortSignal.timeout(1e4)
@@ -2461,7 +2456,14 @@ async function checkTunnel(projectDir) {
         name: "Tunnel",
         ok: false,
         message: `URL found (${pc9.dim(tunnelUrl)}) but not reachable`,
-        tunnelUrl
+        tunnelUrl,
+        fix: async () => {
+          await clearTunnelCache(projectDir);
+          const env = { ...process.env, COMPOSE_PROJECT_NAME: getProjectName(projectDir) };
+          await execa8("docker", ["compose", "restart", "cloudflared"], { cwd: projectDir, env });
+          const newUrl = await getTunnelUrl(projectDir, 20);
+          return newUrl ? `New tunnel: ${newUrl}` : "Restarted cloudflared \u2014 run doctor again";
+        }
       };
     }
   } catch {
@@ -2498,15 +2500,18 @@ async function checkTelegram(projectDir, tunnelCheck) {
     }
     const wh = whData.result;
     const tunnelUrl = tunnelCheck.tunnelUrl || "";
+    const webhookFix = async () => {
+      const freshUrl = await getTunnelUrl(projectDir, 5);
+      if (!freshUrl) return "No tunnel URL available \u2014 fix tunnel first";
+      const ok = await setTelegramWebhook(botToken, freshUrl);
+      return ok ? `Webhook set to ${freshUrl}` : "Could not set webhook";
+    };
     if (!wh.url) {
       return {
         name: `Telegram (${botName})`,
         ok: false,
         message: "Webhook not set",
-        fix: tunnelUrl ? async () => {
-          const ok = await setTelegramWebhook(botToken, tunnelUrl);
-          return ok ? "Webhook set" : "Could not set webhook";
-        } : void 0
+        fix: webhookFix
       };
     }
     if (tunnelUrl && !wh.url.includes(tunnelUrl.replace("https://", ""))) {
@@ -2514,10 +2519,7 @@ async function checkTelegram(projectDir, tunnelCheck) {
         name: `Telegram (${botName})`,
         ok: false,
         message: "Webhook points to old tunnel",
-        fix: async () => {
-          const ok = await setTelegramWebhook(botToken, tunnelUrl);
-          return ok ? "Webhook updated" : "Could not update webhook";
-        }
+        fix: webhookFix
       };
     }
     if (wh.last_error_message) {
@@ -2525,7 +2527,13 @@ async function checkTelegram(projectDir, tunnelCheck) {
       return {
         name: `Telegram (${botName})`,
         ok: false,
-        message: `Error ${age}m ago: ${wh.last_error_message}`
+        message: `Error ${age}m ago: ${wh.last_error_message}`,
+        fix: async () => {
+          const freshUrl = await getTunnelUrl(projectDir, 5);
+          if (!freshUrl) return "No tunnel URL available \u2014 fix tunnel first";
+          const ok = await setTelegramWebhook(botToken, freshUrl);
+          return ok ? `Webhook re-set to ${freshUrl}` : "Could not set webhook";
+        }
       };
     }
     return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "seclaw",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "Secure autonomous AI agents in 60 seconds",
   "type": "module",
   "bin": {