seclaw 0.1.10 → 0.1.12

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(
@@ -331,9 +348,9 @@ function openUrl(url) {
   });
 }
 function discoverInstalledTemplates(targetDir) {
-  const templates = [];
+  const templates2 = [];
   const templatesDir = join(targetDir, "templates");
-  if (!existsSync2(templatesDir)) return templates;
+  if (!existsSync2(templatesDir)) return templates2;
   try {
     const entries = readdirSync(templatesDir);
     for (const entry of entries) {
@@ -342,7 +359,7 @@ function discoverInstalledTemplates(targetDir) {
       if (!existsSync2(manifestPath)) continue;
       try {
         const manifest = JSON.parse(readFileSync(manifestPath, "utf-8"));
-        templates.push({
+        templates2.push({
           id: manifest.id || entry,
           name: manifest.name || entry,
           description: manifest.description || "",
@@ -353,7 +370,7 @@ function discoverInstalledTemplates(targetDir) {
     }
   } catch {
   }
-  return templates;
+  return templates2;
 }
 function readComposioLocalKey() {
   try {
@@ -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 {
@@ -2561,6 +2589,75 @@ async function upgrade() {
   p9.outro("Upgrade complete!");
 }
 
+// src/commands/templates.ts
+import { resolve as resolve12 } from "path";
+import { existsSync as existsSync9 } from "fs";
+import { readFile as readFile9 } from "fs/promises";
+import * as p10 from "@clack/prompts";
+import pc10 from "picocolors";
+async function templates() {
+  const { configDir, installed } = await loadInstalled();
+  if (!installed || installed.capabilities.length === 0) {
+    p10.intro(`${pc10.bgCyan(pc10.black(" seclaw "))} Templates`);
+    p10.log.warning("No templates installed.");
+    p10.log.info(`Add one: ${pc10.cyan("npx seclaw add <template>")}`);
+    p10.log.info(`Browse:  ${pc10.cyan("https://seclawai.com/templates")}`);
+    p10.outro("");
+    return;
+  }
+  const capabilities = installed.capabilities;
+  const activeMode = installed.active || "auto";
+  p10.intro(`${pc10.bgCyan(pc10.black(" seclaw "))} Installed Templates (${capabilities.length})`);
+  for (const capId of capabilities) {
+    const displayName = capId.split("-").map((w) => w.charAt(0).toUpperCase() + w.slice(1)).join(" ");
+    const promptPath = resolve12(configDir, "capabilities", capId, "system-prompt.md");
+    const hasPrompt = existsSync9(promptPath);
+    const schedPath = resolve12(configDir, "capabilities", capId, "schedules.json");
+    let schedCount = 0;
+    if (existsSync9(schedPath)) {
+      try {
+        const schedData = JSON.parse(await readFile9(schedPath, "utf-8"));
+        schedCount = schedData.schedules.filter((s) => s.enabled !== false).length;
+      } catch {
+      }
+    }
+    const icon = hasPrompt ? pc10.green("\u2713") : pc10.yellow("\u26A0");
+    const schedLabel = schedCount > 0 ? pc10.dim(` \u2014 ${schedCount} schedule${schedCount > 1 ? "s" : ""}`) : "";
+    p10.log.info(`${icon} ${pc10.bold(displayName)}${schedLabel}`);
+  }
+  let modeLabel;
+  if (activeMode === "auto") {
+    modeLabel = `Auto \u2014 all ${capabilities.length} capabilities active`;
+  } else {
+    const activeName = activeMode.split("-").map((w) => w.charAt(0).toUpperCase() + w.slice(1)).join(" ");
+    modeLabel = `${activeName} (focus mode)`;
+  }
+  p10.log.info("");
+  p10.log.info(`Mode: ${pc10.cyan(modeLabel)}`);
+  if (capabilities.length >= 2) {
+    p10.log.info(`Switch: ${pc10.dim("npx seclaw switch")}`);
+  }
+  p10.outro("");
+}
+async function loadInstalled() {
+  let wsHostPath = "shared";
+  try {
+    const envContent = await readFile9(resolve12(process.cwd(), ".env"), "utf-8");
+    const wsMatch = envContent.match(/WORKSPACE_HOST_PATH=(.+)/);
+    if (wsMatch?.[1]?.trim()) wsHostPath = wsMatch[1].trim();
+  } catch {
+  }
+  const configDir = resolve12(process.cwd(), wsHostPath, "config");
+  const installedPath = resolve12(configDir, "installed.json");
+  if (!existsSync9(installedPath)) return { configDir, installed: null };
+  try {
+    const installed = JSON.parse(await readFile9(installedPath, "utf-8"));
+    return { configDir, installed };
+  } catch {
+    return { configDir, installed: null };
+  }
+}
+
 // src/cli.ts
 program.name("seclaw").description("Secure autonomous AI agents in 60 seconds").version("0.1.0");
 program.command("create", { isDefault: true }).alias("init").description("Set up a new seclaw project").argument("[directory]", "Project directory", ".").action(create);
@@ -2571,4 +2668,5 @@ program.command("stop").description("Stop all services").action(stop);
 program.command("reconnect").description("Reconnect tunnel + Telegram webhook").action(reconnect);
 program.command("doctor").description("Diagnose and fix common issues").action(doctor);
 program.command("upgrade").description("Pull latest images and restart").action(upgrade);
+program.command("templates").description("List installed templates and capabilities").action(templates);
 program.parse();

package/dist/runtime/agent.js

@@ -1107,20 +1107,26 @@ import { readFileSync as readFileSync4, existsSync as existsSync4 } from "fs";
 import { resolve as resolve3 } from "path";
 
 // config.ts
-import { readFileSync as readFileSync3, writeFileSync as writeFileSync2, existsSync as existsSync3 } from "fs";
+import { readFileSync as readFileSync3, writeFileSync as writeFileSync2, existsSync as existsSync3, readdirSync as readdirSync2 } from "fs";
 import { resolve as resolve2 } from "path";
 var WORKSPACE = process.env.WORKSPACE_PATH || "/workspace";
-var BASE_PROMPT = `You are a personal AI assistant running on seclaw. You have multiple capabilities installed \u2014 use the right one based on the user's request.
+var AUTO_BASE_PROMPT = `You are a personal AI assistant running on seclaw. You have multiple capabilities installed \u2014 use the right one based on the user's request.
 
 ## 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
+- 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}.
 
-## 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`;
+IMPORTANT: You are in FOCUS MODE. Only use the capability described below. Do NOT answer questions outside your specialization \u2014 politely redirect the user to switch to the right agent via /templates.
+
+## 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`;
+}
 function loadConfig() {
   return {
     // LLM
@@ -1153,11 +1159,9 @@ function reloadSystemPrompt(workspace) {
       if (installed.capabilities && installed.capabilities.length > 0) {
         const active = installed.active || "auto";
         if (active === "auto") {
-          return composeCapabilityPrompt(installed.capabilities);
+          return composeCapabilityPrompt(installed.capabilities, "auto");
         }
-        const base = installed.capabilities[0];
-        const caps = base === active ? [active] : [base, active];
-        return composeCapabilityPrompt(caps);
+        return composeCapabilityPrompt([active], active);
       }
     } catch (err) {
       console.error(`[config] Failed to parse installed.json: ${err.message}`);
@@ -1198,7 +1202,7 @@ function setActiveMode(workspace, active) {
     console.error(`[config] Failed to update installed.json: ${err.message}`);
   }
 }
-function composeCapabilityPrompt(capabilities) {
+function composeCapabilityPrompt(capabilities, mode) {
   const sections = [];
   for (const id of capabilities) {
     const promptPath = resolve2(WORKSPACE, "config", "capabilities", id, "system-prompt.md");
@@ -1210,21 +1214,58 @@ function composeCapabilityPrompt(capabilities) {
       console.warn(`[config] Capability prompt not found: ${promptPath}`);
     }
   }
+  const base = mode === "auto" ? AUTO_BASE_PROMPT : focusBasePrompt(mode);
   if (sections.length === 0) {
     console.warn("[config] No capability prompts loaded, using base prompt only");
-    return BASE_PROMPT;
+    return base;
   }
-  return BASE_PROMPT + "\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");
-  if (!existsSync3(installedPath)) return [];
-  try {
-    const installed = JSON.parse(readFileSync3(installedPath, "utf-8"));
-    return installed.capabilities || [];
-  } catch {
-    return [];
+  const capsDir = resolve2(workspace, "config", "capabilities");
+  let installed = { capabilities: [] };
+  if (existsSync3(installedPath)) {
+    try {
+      installed = JSON.parse(readFileSync3(installedPath, "utf-8"));
+      if (!installed.capabilities) installed.capabilities = [];
+    } catch {
+    }
   }
+  if (existsSync3(capsDir)) {
+    let dirty = false;
+    try {
+      const dirs = readdirSync2(capsDir, { withFileTypes: true }).filter((d) => d.isDirectory()).map((d) => d.name);
+      for (const dir of dirs) {
+        const promptPath = resolve2(capsDir, dir, "system-prompt.md");
+        if (existsSync3(promptPath) && !installed.capabilities.includes(dir)) {
+          installed.capabilities.push(dir);
+          dirty = true;
+          console.log(`[config] Auto-discovered capability: ${dir}`);
+        }
+      }
+    } catch {
+    }
+    if (dirty) {
+      try {
+        writeFileSync2(installedPath, JSON.stringify(installed, null, 2) + "\n");
+        console.log(`[config] Updated installed.json: ${installed.capabilities.length} capabilities`);
+      } catch {
+      }
+    }
+  }
+  return installed.capabilities;
 }
 
 // scheduler.ts
@@ -1427,12 +1468,8 @@ async function handleWebhook(req, res, config2, toolCtx2, inngestClient) {
     await handleSchedules(chatId, config2);
     return;
   }
-  if (userText.startsWith("/capabilities")) {
-    await handleCapabilities(chatId, config2);
-    return;
-  }
-  if (userText.startsWith("/switch")) {
-    await handleSwitch(chatId, config2);
+  if (userText.startsWith("/templates")) {
+    await handleTemplates(chatId, config2);
     return;
   }
   try {
@@ -1442,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,
@@ -1468,7 +1505,7 @@ async function sendMessage(token, chatId, text) {
   const chunks = splitMessage(text, 4e3);
   for (const chunk of chunks) {
     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({
@@ -1477,6 +1514,15 @@ async function sendMessage(token, chatId, text) {
           parse_mode: "Markdown"
         })
       });
+      const data = await res.json();
+      if (!data.ok) {
+        console.log(`[telegram] Markdown failed: ${data.description} \u2014 retrying plain`);
+        await fetch(`https://api.telegram.org/bot${token}/sendMessage`, {
+          method: "POST",
+          headers: { "Content-Type": "application/json" },
+          body: JSON.stringify({ chat_id: chatId, text: chunk })
+        });
+      }
     } catch {
       try {
         await fetch(`https://api.telegram.org/bot${token}/sendMessage`, {
@@ -1980,16 +2026,46 @@ async function editMessageWithButtons(token, chatId, messageId, text, keyboard)
   } catch {
   }
 }
-async function handleCapabilities(chatId, config2) {
+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 capabilities installed. Using default single-prompt mode."
-    );
+    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);
   const scheduleConfig = loadScheduleConfig(config2.workspace);
   const scheduleCountByCapability = {};
   if (scheduleConfig) {
@@ -2010,49 +2086,46 @@ async function handleCapabilities(chatId, config2) {
     const statusIcon = hasPrompt ? "\u2705" : "\u26A0\uFE0F";
     return `${statusIcon} *${displayName}*${schedLabel}`;
   });
-  await sendMessage(
-    config2.telegramToken,
-    chatId,
-    `*Installed Capabilities*
+  let modeLabel;
+  if (activeMode === "auto") {
+    modeLabel = `Auto \u2014 all ${capabilities.length} templates active`;
+  } else {
+    const activeName = activeMode.split("-").map((w) => w.charAt(0).toUpperCase() + w.slice(1)).join(" ");
+    modeLabel = `${activeName} (focus mode)`;
+  }
+  const notInstalled = TEMPLATE_CATALOG.filter((t) => !capabilities.includes(t.id));
+  let text = `*Installed Templates (${capabilities.length})*
 
-${lines.join("\n")}`
-  );
-}
-async function handleSwitch(chatId, config2) {
-  const capabilities = loadInstalledCapabilities(config2.workspace);
-  const activeMode = getActiveMode(config2.workspace);
-  if (capabilities.length <= 1) {
-    await sendMessage(
-      config2.telegramToken,
-      chatId,
-      "Only one capability installed. Add more templates to use /switch.\n\nBrowse templates: seclawai.com/templates"
-    );
-    return;
+${lines.join("\n")}
+
+Mode: *${modeLabel}*`;
+  if (notInstalled.length > 0) {
+    text += `
+
+*Browse More (${notInstalled.length})*
+_Tap to view details:_`;
   }
   const keyboard = [];
-  const autoLabel = activeMode === "auto" ? "\u2705 Auto (All Capabilities)" : "\u{1F504} Auto (All Capabilities)";
-  keyboard.push([{ text: autoLabel, callback_data: "cap_switch:auto" }]);
-  const capButtons = [];
-  for (const capId of capabilities) {
-    const displayName = capId.split("-").map((w) => w.charAt(0).toUpperCase() + w.slice(1)).join(" ");
-    const icon = activeMode === capId ? "\u2705" : "\u25CB";
-    capButtons.push({ text: `${icon} ${displayName}`, callback_data: `cap_switch:${capId}` });
-  }
-  for (let i = 0; i < capButtons.length; i += 2) {
-    keyboard.push(capButtons.slice(i, i + 2));
+  if (capabilities.length >= 2) {
+    const autoLabel = activeMode === "auto" ? "\u2705 Auto (All Templates)" : "\u{1F504} Auto (All Templates)";
+    keyboard.push([{ text: autoLabel, callback_data: "cap_switch:auto" }]);
+    const capButtons = [];
+    for (const capId of capabilities) {
+      const displayName = capId.split("-").map((w) => w.charAt(0).toUpperCase() + w.slice(1)).join(" ");
+      const icon = activeMode === capId ? "\u2705" : "\u25CB";
+      capButtons.push({ text: `${icon} ${displayName}`, callback_data: `cap_switch:${capId}` });
+    }
+    for (let i = 0; i < capButtons.length; i += 2) {
+      keyboard.push(capButtons.slice(i, i + 2));
+    }
   }
-  let statusText = "*Agent Mode*\n\n";
-  if (activeMode === "auto") {
-    statusText += `Current: *Auto* \u2014 all ${capabilities.length} capabilities active
-`;
-    statusText += "The agent uses the right capability based on your message.";
-  } else {
-    const activeName = activeMode.split("-").map((w) => w.charAt(0).toUpperCase() + w.slice(1)).join(" ");
-    statusText += `Current: *${activeName}* (focus mode)
-`;
-    statusText += "Only this capability + base is active.";
+  for (const t of notInstalled) {
+    keyboard.push([{
+      text: `${t.name} \u2014 ${t.price}`,
+      url: `https://seclawai.com/templates/${t.id}`
+    }]);
   }
-  await sendMessageWithButtons(config2.telegramToken, chatId, statusText, keyboard);
+  await sendMessageWithButtons(config2.telegramToken, chatId, text, keyboard);
 }
 async function handleSwitchCallback(chatId, msgId, capId, config2) {
   const capabilities = loadInstalledCapabilities(config2.workspace);

package/package.json

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