seclaw 0.1.11 → 0.1.13

package/dist/cli.js

@@ -73,7 +73,20 @@ async function fetchTunnelUrlFromLogs(cwd) {
 }
 async function setTelegramWebhook(botToken, tunnelUrl) {
   const webhookUrl = `${tunnelUrl}/webhook`;
-  for (let attempt = 0; attempt < 3; attempt++) {
+  const hostname = tunnelUrl.replace("https://", "");
+  for (let i = 0; i < 30; i++) {
+    try {
+      const { resolve4: resolve42 } = await import("dns/promises");
+      await resolve42(hostname);
+      break;
+    } catch {
+      if (i === 29) {
+        break;
+      }
+      await new Promise((r) => setTimeout(r, 2e3));
+    }
+  }
+  for (let attempt = 0; attempt < 5; attempt++) {
     try {
       const res = await fetch(
         `https://api.telegram.org/bot${botToken}/setWebhook`,
@@ -89,9 +102,13 @@ async function setTelegramWebhook(botToken, tunnelUrl) {
       );
       const data = await res.json();
       if (data.ok) return true;
+      if (data.description?.includes("resolve host")) {
+        await new Promise((r) => setTimeout(r, 5e3));
+        continue;
+      }
     } catch {
     }
-    if (attempt < 2) await new Promise((r) => setTimeout(r, 2e3));
+    if (attempt < 4) await new Promise((r) => setTimeout(r, 3e3));
   }
   try {
     const res = await fetch(
@@ -542,10 +559,20 @@ ENTRYPOINT ["/bin/sh"]
   const script = `#!/bin/sh
 # Auto-updates Telegram webhook when tunnel URL changes on restart.
 
+wait_for_dns() {
+  HOST=$(echo "$1" | sed 's|https://||')
+  for i in $(seq 1 30); do
+    nslookup "$HOST" >/dev/null 2>&1 && return 0
+    printf '[tunnel] Waiting for DNS (%s, attempt %d/30)...\\n' "$HOST" "$i" >&2
+    sleep 2
+  done
+  return 1
+}
+
 set_webhook() {
   URL="$1"
-  for i in 1 2 3; do
-    sleep 10
+  wait_for_dns "$URL" || { printf '[tunnel] DNS resolution failed for %s\\n' "$URL" >&2; return 1; }
+  for i in 1 2 3 4 5; do
     RESP=$(curl -s -X POST "https://api.telegram.org/bot$TELEGRAM_BOT_TOKEN/setWebhook" \\
       -H "Content-Type: application/json" \\
       -d "{\\"url\\":\\"$URL/webhook\\",\\"allowed_updates\\":[\\"message\\",\\"callback_query\\"]}")
@@ -556,6 +583,7 @@ set_webhook() {
         ;;
     esac
     printf '[tunnel] Webhook attempt %d failed: %s\\n' "$i" "$RESP" >&2
+    sleep 5
   done
   return 1
 }
@@ -2428,10 +2456,10 @@ async function checkTelegram(projectDir, tunnelCheck) {
     const wh = whData.result;
     const tunnelUrl = tunnelCheck.tunnelUrl || "";
     const webhookFix = async () => {
-      const freshUrl = await getTunnelUrl(projectDir, 5);
+      const freshUrl = await getTunnelUrl(projectDir, 15);
       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";
+      return ok ? `Webhook set to ${freshUrl}` : "Could not set webhook \u2014 DNS may still be propagating, try again in 30s";
     };
     if (!wh.url) {
       return {

package/dist/runtime/agent.js

@@ -1115,12 +1115,7 @@ var AUTO_BASE_PROMPT = `You are a personal AI assistant running on seclaw. You h
 ## Communication
 - Detect the user's language and respond in the same language
 - Keep Telegram messages concise \u2014 use bullet points and short paragraphs
-- Be proactive when you have relevant context to share
-
-## Response Format
-At the end of every response, write on a new line:
---- CapabilityName
-Where CapabilityName is the capability you primarily used (e.g. "Inbox Management", "Research & Intelligence"). If no specific capability applies, write: --- General`;
+- Be proactive when you have relevant context to share`;
 function focusBasePrompt(capId) {
   const displayName = capId.split("-").map((w) => w.charAt(0).toUpperCase() + w.slice(1)).join(" ");
   return `You are a specialized AI agent running on seclaw, focused exclusively on: ${displayName}.
@@ -1130,11 +1125,7 @@ IMPORTANT: You are in FOCUS MODE. Only use the capability described below. Do NO
 ## Communication
 - Detect the user's language and respond in the same language
 - Keep Telegram messages concise \u2014 use bullet points and short paragraphs
-- Be proactive when you have relevant context to share
-
-## Response Format
-At the end of every response, write on a new line:
---- ${displayName}`;
+- Be proactive when you have relevant context to share`;
 }
 function loadConfig() {
   return {
@@ -1228,7 +1219,18 @@ function composeCapabilityPrompt(capabilities, mode) {
     console.warn("[config] No capability prompts loaded, using base prompt only");
     return base;
   }
-  return base + "\n\n" + sections.join("\n\n");
+  const capNames = capabilities.map(
+    (id) => id.split("-").map((w) => w.charAt(0).toUpperCase() + w.slice(1)).join(" ")
+  );
+  const footerInstruction = mode === "auto" ? `## MANDATORY Response Footer
+You MUST end EVERY response with this exact format on a new line:
+--- CapabilityName
+Replace CapabilityName with the capability you used (one of: ${capNames.join(", ")}). If none applies, write: --- General
+This line is REQUIRED. Never skip it.` : `## MANDATORY Response Footer
+You MUST end EVERY response with this exact format on a new line:
+--- ${capNames[0]}
+This line is REQUIRED. Never skip it.`;
+  return base + "\n\n" + sections.join("\n\n") + "\n\n" + footerInstruction;
 }
 function loadInstalledCapabilities(workspace) {
   const installedPath = resolve2(workspace, "config", "installed.json");
@@ -1477,12 +1479,12 @@ ${userText}`;
     let response = await runAgent(config2, toolCtx2, history, augmented);
     console.log(`[telegram] Reply (${response.length} chars): ${response.substring(0, 120)}`);
     let footer = "";
-    const footerMatch = response.match(/\n--- (.+)$/);
+    const footerMatch = response.match(/\n[-—]{2,3}\s*(.+?)\s*$/);
     if (footerMatch) {
-      response = response.replace(/\n--- .+$/, "");
+      response = response.replace(/\n[-—]{2,3}\s*.+?\s*$/, "").trimEnd();
       footer = `
 
-_\u2014 ${footerMatch[1]}_`;
+\u2014 ${footerMatch[1].trim()}`;
     }
     saveHistory(chatId, config2.workspace, [
       ...history,
@@ -2024,14 +2026,43 @@ async function editMessageWithButtons(token, chatId, messageId, text, keyboard)
   } catch {
   }
 }
+var TEMPLATE_CATALOG = [
+  { id: "productivity-agent", name: "Productivity Agent", price: "Free" },
+  { id: "data-analyst", name: "Data Analyst", price: "Free" },
+  { id: "inbox-agent", name: "Inbox Agent", price: "$19" },
+  { id: "reddit-hn-digest", name: "Reddit & HN Digest", price: "$19" },
+  { id: "youtube-digest", name: "YouTube Digest", price: "$19" },
+  { id: "health-tracker", name: "Health Tracker", price: "$29" },
+  { id: "earnings-tracker", name: "Earnings Tracker", price: "$29" },
+  { id: "research-agent", name: "Research Agent", price: "$39" },
+  { id: "knowledge-base", name: "Knowledge Base", price: "$39" },
+  { id: "family-calendar", name: "Family Calendar", price: "$39" },
+  { id: "content-agent", name: "Content Agent", price: "$49" },
+  { id: "personal-crm", name: "Personal CRM", price: "$49" },
+  { id: "youtube-creator", name: "YouTube Creator", price: "$69" },
+  { id: "devops-agent", name: "DevOps Agent", price: "$79" },
+  { id: "customer-service", name: "Customer Service", price: "$79" },
+  { id: "sales-agent", name: "Sales Agent", price: "$79" },
+  { id: "six-agent-company", name: "6-Agent Company", price: "$149" }
+];
 async function handleTemplates(chatId, config2) {
   const capabilities = loadInstalledCapabilities(config2.workspace);
   if (capabilities.length === 0) {
-    await sendMessage(
-      config2.telegramToken,
-      chatId,
-      "No templates installed. Using default single-prompt mode.\n\nAdd templates: `npx seclaw add <template>`\nBrowse: seclawai.com/templates"
-    );
+    const lines2 = TEMPLATE_CATALOG.map((t) => {
+      const tag = t.price === "Free" ? "FREE" : t.price;
+      return `\u2022 *${t.name}* \u2014 ${tag}`;
+    });
+    const text2 = `*seclaw Templates (${TEMPLATE_CATALOG.length})*
+
+` + lines2.join("\n") + "\n\n_Tap a template to view details:_";
+    const keyboard2 = [];
+    for (const t of TEMPLATE_CATALOG) {
+      keyboard2.push([{
+        text: `${t.name} \u2014 ${t.price}`,
+        url: `https://seclawai.com/templates/${t.id}`
+      }]);
+    }
+    await sendMessageWithButtons(config2.telegramToken, chatId, text2, keyboard2);
     return;
   }
   const activeMode = getActiveMode(config2.workspace);
@@ -2062,13 +2093,19 @@ async function handleTemplates(chatId, config2) {
     const activeName = activeMode.split("-").map((w) => w.charAt(0).toUpperCase() + w.slice(1)).join(" ");
     modeLabel = `${activeName} (focus mode)`;
   }
-  const text = `*Installed Templates (${capabilities.length})*
+  const notInstalled = TEMPLATE_CATALOG.filter((t) => !capabilities.includes(t.id));
+  let text = `*Installed Templates (${capabilities.length})*
 
 ${lines.join("\n")}
 
 Mode: *${modeLabel}*`;
+  if (notInstalled.length > 0) {
+    text += `
+
+${notInstalled.length} more available:`;
+  }
+  const keyboard = [];
   if (capabilities.length >= 2) {
-    const keyboard = [];
     const autoLabel = activeMode === "auto" ? "\u2705 Auto (All Templates)" : "\u{1F504} Auto (All Templates)";
     keyboard.push([{ text: autoLabel, callback_data: "cap_switch:auto" }]);
     const capButtons = [];
@@ -2080,14 +2117,14 @@ Mode: *${modeLabel}*`;
     for (let i = 0; i < capButtons.length; i += 2) {
       keyboard.push(capButtons.slice(i, i + 2));
     }
-    await sendMessageWithButtons(config2.telegramToken, chatId, text, keyboard);
-  } else {
-    await sendMessage(
-      config2.telegramToken,
-      chatId,
-      text + "\n\nAdd more templates to switch modes:\n`npx seclaw add <template> --key YOUR_KEY`"
-    );
   }
+  for (const t of notInstalled) {
+    keyboard.push([{
+      text: `${t.name} \u2014 Details`,
+      url: `https://seclawai.com/templates/${t.id}`
+    }]);
+  }
+  await sendMessageWithButtons(config2.telegramToken, chatId, text, keyboard);
 }
 async function handleSwitchCallback(chatId, msgId, capId, config2) {
   const capabilities = loadInstalledCapabilities(config2.workspace);
@@ -2106,7 +2143,7 @@ async function handleSwitchCallback(chatId, msgId, capId, config2) {
 async function sendMessageWithButtons(token, chatId, text, keyboard) {
   if (!token || !chatId) return;
   try {
-    await fetch(`https://api.telegram.org/bot${token}/sendMessage`, {
+    const res = await fetch(`https://api.telegram.org/bot${token}/sendMessage`, {
       method: "POST",
       headers: { "Content-Type": "application/json" },
       body: JSON.stringify({
@@ -2116,7 +2153,25 @@ async function sendMessageWithButtons(token, chatId, text, keyboard) {
         reply_markup: { inline_keyboard: keyboard }
       })
     });
-  } catch {
+    const data = await res.json();
+    if (!data.ok) {
+      console.log(`[telegram] Markdown failed (buttons): ${data.description} \u2014 retrying plain`);
+      const retryRes = await fetch(`https://api.telegram.org/bot${token}/sendMessage`, {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify({
+          chat_id: chatId,
+          text,
+          reply_markup: { inline_keyboard: keyboard }
+        })
+      });
+      const retryData = await retryRes.json();
+      if (!retryData.ok) {
+        console.error(`[telegram] Plain also failed (buttons): ${retryData.description}`);
+      }
+    }
+  } catch (err) {
+    console.error(`[telegram] sendMessageWithButtons error:`, err.message);
     try {
       await fetch(`https://api.telegram.org/bot${token}/sendMessage`, {
         method: "POST",

package/package.json

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