peely 0.9.4 → 0.9.5

package/src/interfaces/discord/index.js

@@ -21,11 +21,17 @@ const getDb = async () => {
 };
 
 // ── Per-user conversation memory (persistent) ──
-// In-memory cache backed by disk
+// In-memory cache backed by disk, with LRU eviction
+const MAX_CACHED_CONVERSATIONS = 100;
 const conversations = new Map();
 
 const getConversation = (userId) => {
   if (!conversations.has(userId)) {
+    // Evict oldest entry if cache is full
+    if (conversations.size >= MAX_CACHED_CONVERSATIONS) {
+      const oldest = conversations.keys().next().value;
+      conversations.delete(oldest);
+    }
     // Load from disk on first access
     conversations.set(userId, memory.load(`discord-${userId}`));
   }
@@ -141,9 +147,10 @@ client.on(Events.InteractionCreate, async (interaction) => {
     if (commandName === "pair") {
       const database = await getDb();
       const code = Math.random().toString(36).substring(2, 8).toUpperCase();
-      await database.set(`pairCode_${code}`, user.id);
+      // Store with timestamp so expiry survives process restarts
+      await database.set(`pairCode_${code}`, { userId: user.id, createdAt: Date.now() });
 
-      // Expire after 5 minutes
+      // Best-effort in-process cleanup after 5 minutes
       setTimeout(async () => {
         await database.delete(`pairCode_${code}`).catch(() => {});
       }, 5 * 60 * 1000);
@@ -229,9 +236,15 @@ client.on(Events.InteractionCreate, async (interaction) => {
   }
 });
 
-// ── Message handler (all messages) ──
+// ── Message handler (DMs and mentions only) ──
 client.on(Events.MessageCreate, async (message) => {
   if (message.author.bot) return;
+
+  // Only respond in DMs or when the bot is mentioned
+  const isDM = !message.guild;
+  const isMentioned = message.mentions.has(client.user);
+  if (!isDM && !isMentioned) return;
+
   console.log(chalk.dim(`  [msg] ${message.author.tag}: ${message.content.slice(0, 50)}`));
 
   let content = message.content.replace(/<@!?\d+>/g, "").trim();

package/src/interfaces/terminal/commands.js

@@ -0,0 +1,401 @@
+/**
+ * Command & action helpers used by both cli.js (via terminal re-export)
+ * and the interactive REPL.  Everything lives here so there is a single
+ * source of truth — no separate "shared" directory.
+ */
+
+const chalk = require("chalk");
+const fs = require("fs");
+const path = require("path");
+const config = require("../../utils/config");
+const PATHS = require("../../utils/paths");
+
+// ═══════════════════════════════════════════════════════════════════
+//  Branding
+// ═══════════════════════════════════════════════════════════════════
+
+const logo = `
+  ${chalk.magenta("╔══════════════════════════════╗")}
+  ${chalk.magenta("║")}  ${chalk.bold.white("🍌 peely")} ${chalk.dim("— your AI assistant")} ${chalk.magenta("║")}
+  ${chalk.magenta("╚══════════════════════════════╝")}
+`;
+
+const interactiveLogo = (() => {
+  try {
+    const p = path.join(__dirname, "..", "..", "assets", "ascii-logo.txt");
+    const art = fs.readFileSync(p, "utf8");
+    return (
+      art
+        .split("\n")
+        .map((line) => (line.trim() === "" ? "" : chalk.magenta("  " + line)))
+        .join("\n") +
+      "\n\n" +
+      chalk.bold.white("  🍌 peely") +
+      " " +
+      chalk.dim("— interactive mode") +
+      "\n"
+    );
+  } catch (_) {
+    return logo;
+  }
+})();
+
+// ═══════════════════════════════════════════════════════════════════
+//  Status
+// ═══════════════════════════════════════════════════════════════════
+
+const getStatusInfo = () => ({
+  model: config.get("ai.model") || null,
+  discordConfigured: !!config.get("interfaces.discord.token"),
+  githubConfigured: !!config.get("github.token"),
+});
+
+/**
+ * Print a formatted status block to stdout.
+ * @param {{ messageCount?: number, background?: string }} extra
+ */
+const printStatus = (extra = {}) => {
+  const info = getStatusInfo();
+  const model = info.model || chalk.dim("not set");
+  const discord = info.discordConfigured
+    ? chalk.green("configured")
+    : chalk.red("not set");
+  const github = info.githubConfigured
+    ? chalk.green("authorized")
+    : chalk.red("not set");
+
+  console.log();
+  console.log(chalk.bold("  Status:"));
+  console.log(`    AI Model:      ${model}`);
+  console.log(`    GitHub:        ${github}`);
+  console.log(`    Discord:       ${discord}`);
+  if (typeof extra.messageCount === "number") {
+    console.log(`    Messages:      ${extra.messageCount}`);
+  }
+  if (typeof extra.background === "string") {
+    console.log(`    Background:    ${extra.background}`);
+  }
+  console.log();
+};
+
+// ═══════════════════════════════════════════════════════════════════
+//  Discord pairing
+// ═══════════════════════════════════════════════════════════════════
+
+/**
+ * @param {string} code — 6-char pair code
+ * @returns {{ ok: boolean, userId?: string, error?: string }}
+ */
+const pairDiscord = async (code) => {
+  if (!code) return { ok: false, error: "Usage: peely pair discord <code>" };
+
+  const { SqliteDriver, QuickDB } = require("quick.db");
+  const db = new QuickDB({ driver: new SqliteDriver(PATHS.quickDb) });
+  const record = await db.get(`pairCode_${code.toUpperCase()}`);
+
+  let userId;
+  if (record && typeof record === "object" && record.userId) {
+    if (record.createdAt && Date.now() - record.createdAt > 5 * 60 * 1000) {
+      await db.delete(`pairCode_${code.toUpperCase()}`);
+      return { ok: false, error: `Invalid or expired pair code: ${code}` };
+    }
+    userId = record.userId;
+  } else if (typeof record === "string") {
+    userId = record;
+  } else {
+    return { ok: false, error: `Invalid or expired pair code: ${code}` };
+  }
+
+  await db.set(`paired_${userId}`, true);
+  await db.delete(`pairCode_${code.toUpperCase()}`);
+  config.set("interfaces.discord.pairedUsers", [
+    ...(config.get("interfaces.discord.pairedUsers") || []),
+    userId,
+  ]);
+
+  return { ok: true, userId };
+};
+
+// ═══════════════════════════════════════════════════════════════════
+//  PID helpers
+// ═══════════════════════════════════════════════════════════════════
+
+/**
+ * @param {string} pidFile — absolute path
+ * @returns {{ alive: boolean, pid: string|null }}
+ */
+const checkPidFile = (pidFile) => {
+  if (!fs.existsSync(pidFile)) return { alive: false, pid: null };
+  const pid = fs.readFileSync(pidFile, "utf-8").trim();
+  try {
+    process.kill(Number(pid), 0);
+    return { alive: true, pid };
+  } catch (_) {
+    return { alive: false, pid };
+  }
+};
+
+// ═══════════════════════════════════════════════════════════════════
+//  Command handlers (AI, settings, interfaces …)
+// ═══════════════════════════════════════════════════════════════════
+
+const chooseModel = async () => {
+  const ai = require("../../ai");
+  await ai.chooseModel();
+};
+
+const openSettings = async () => {
+  const { settingsMenu } = require("../../utils/settings");
+  await settingsMenu();
+};
+
+/**
+ * Prompt for a Discord Bot Token and save it.
+ * @returns {{ ok: boolean }}
+ */
+const setupDiscordToken = async () => {
+  const { text, isCancel } = require("@clack/prompts");
+  const token = await text({ message: "Enter your Discord Bot Token:" });
+  if (!isCancel(token) && token && token.trim()) {
+    config.set("interfaces.discord.token", token.trim());
+    return { ok: true };
+  }
+  return { ok: false };
+};
+
+// ── Timers ────────────────────────────────────────────────────────
+
+const getTimers = () => {
+  const { events } = require("../../utils/events");
+  return events.listScheduled();
+};
+
+const printTimers = () => {
+  const scheduled = getTimers();
+  console.log();
+  if (scheduled.length === 0) {
+    console.log(chalk.dim("  No active timers."));
+  } else {
+    console.log(chalk.bold("  Active timers:"));
+    for (const t of scheduled) {
+      const secs = Math.ceil(t.remainingMs / 1000);
+      const desc = t.meta?.task || t.meta?.message || t.id;
+      console.log(`    ⏱️  ${t.id} — ${secs}s left — ${desc}`);
+    }
+  }
+  console.log();
+};
+
+// ── Plugins ───────────────────────────────────────────────────────
+
+const getPlugins = () => {
+  const pluginModule = require("../../plugins");
+  return pluginModule.plugins;
+};
+
+const printPlugins = () => {
+  const plugins = getPlugins();
+  console.log();
+  console.log(chalk.bold("  Loaded plugins:"));
+  for (const p of plugins) {
+    const toolCount = p.tools ? Object.keys(p.tools).length : 0;
+    console.log(`    • ${chalk.cyan(p.name)} — ${toolCount} tool(s) — ${p.description || ""}`);
+  }
+  console.log();
+};
+
+// ── Interfaces ────────────────────────────────────────────────────
+
+const getInterfaces = () => {
+  const { listInterfaces } = require("../create_interface");
+  return listInterfaces();
+};
+
+const printInterfaces = () => {
+  const all = getInterfaces();
+  console.log();
+  console.log(chalk.bold("  Interfaces:"));
+  for (const iface of all) {
+    const tag =
+      iface.type === "built-in"
+        ? chalk.dim("[built-in]")
+        : chalk.cyan("[custom]");
+    console.log(`    ${tag} ${chalk.bold(iface.name)} — ${iface.description}`);
+  }
+  console.log();
+};
+
+const createInterface = async () => {
+  const creator = require("../create_interface");
+  await creator.createInterface();
+};
+
+const deleteInterface = (name) => {
+  const { deleteInterface: del } = require("../create_interface");
+  return del(name);
+};
+
+const startInterface = async (name) => {
+  const interfaces = require("../");
+  const { loadCustomInterface } = require("../create_interface");
+  const mod = interfaces[name] || loadCustomInterface(name);
+  if (!mod || typeof mod.start !== "function") return false;
+  await mod.start();
+  return true;
+};
+
+/**
+ * Interactive interface management menu (@clack).
+ */
+const interfaceMenu = async () => {
+  const { select, isCancel, log: cLog } = require("@clack/prompts");
+
+  printInterfaces();
+
+  const all = getInterfaces();
+  const action = await select({
+    message: "What would you like to do?",
+    options: [
+      { value: "create", label: "🔧  Create new interface" },
+      {
+        value: "delete",
+        label: "🗑️   Delete a custom interface",
+        hint:
+          all.filter((i) => i.type === "custom").length === 0
+            ? "none yet"
+            : undefined,
+      },
+      { value: "back", label: "←   Back" },
+    ],
+  });
+
+  if (isCancel(action) || action === "back") return;
+
+  if (action === "create") {
+    await createInterface();
+    return;
+  }
+
+  if (action === "delete") {
+    const customs = all.filter((i) => i.type === "custom");
+    if (customs.length === 0) {
+      cLog.warn("No custom interfaces to delete.");
+      return;
+    }
+    const which = await select({
+      message: "Which interface to delete?",
+      options: [
+        ...customs.map((i) => ({
+          value: i.name,
+          label: i.name,
+          hint: i.description,
+        })),
+        { value: "back", label: "←  Back" },
+      ],
+    });
+    if (isCancel(which) || which === "back") return;
+    if (deleteInterface(which)) {
+      cLog.success(`Deleted "${which}".`);
+    } else {
+      cLog.error(`Interface "${which}" not found.`);
+    }
+  }
+};
+
+// ═══════════════════════════════════════════════════════════════════
+//  Help text
+// ═══════════════════════════════════════════════════════════════════
+
+const CLI_COMMANDS = [
+  { usage: "peely", desc: "Start interactive TUI" },
+  { usage: "peely setup", desc: "First-time onboarding wizard" },
+  { usage: "peely chat <message>", desc: "One-shot chat (connects to daemon)" },
+  { usage: "peely daemon start", desc: "Start daemon in background" },
+  { usage: "peely daemon stop", desc: "Stop daemon" },
+  { usage: "peely daemon restart", desc: "Restart daemon (for updates)" },
+  { usage: "peely daemon status", desc: "Show daemon status" },
+  { usage: "peely start", desc: "Legacy: Run Discord bot in background" },
+  { usage: "peely stop", desc: "Legacy: Stop background process" },
+  { usage: "peely discord", desc: "Start Discord bot only" },
+  { usage: "peely pair discord <code>", desc: "Pair Discord account" },
+  { usage: "peely pair discord setup", desc: "Set Discord bot token" },
+  { usage: "peely model", desc: "Choose AI model" },
+  { usage: "peely settings", desc: "Edit config, tokens & API keys" },
+  { usage: "peely interface create", desc: "Create a new custom interface" },
+  { usage: "peely interface list", desc: "List all interfaces" },
+  { usage: "peely interface start <name>", desc: "Start a custom interface" },
+  { usage: "peely interface delete <name>", desc: "Delete a custom interface" },
+  { usage: "peely status", desc: "Show config status" },
+  { usage: "peely help", desc: "Show this help" },
+];
+
+const SLASH_COMMANDS = [
+  { usage: "/help", desc: "Show this help" },
+  { usage: "/clear", desc: "Clear conversation history" },
+  { usage: "/model", desc: "Switch AI model" },
+  { usage: "/settings", desc: "Edit config, tokens & API keys" },
+  { usage: "/timers", desc: "Show active timers" },
+  { usage: "/plugins", desc: "List loaded plugins" },
+  { usage: "/interfaces", desc: "List & create interfaces" },
+  { usage: "/pair discord <code>", desc: "Pair a Discord account" },
+  { usage: "/status", desc: "Show system status" },
+  { usage: "/exit", desc: "Exit peely" },
+];
+
+const printCliHelp = (headerLogo) => {
+  console.log(headerLogo);
+  console.log(chalk.bold("  Usage:"));
+  for (const { usage, desc } of CLI_COMMANDS) {
+    console.log(`    ${chalk.cyan(usage.padEnd(30))} ${desc}`);
+  }
+  console.log();
+};
+
+const buildSlashHelp = () => {
+  const lines = [chalk.bold("  Commands:")];
+  for (const { usage, desc } of SLASH_COMMANDS) {
+    lines.push(`    ${chalk.cyan(usage.padEnd(24))} ${desc}`);
+  }
+  return "\n" + lines.join("\n") + "\n";
+};
+
+// ═══════════════════════════════════════════════════════════════════
+//  Exports
+// ═══════════════════════════════════════════════════════════════════
+
+module.exports = {
+  // Branding
+  logo,
+  interactiveLogo,
+
+  // Status
+  getStatusInfo,
+  printStatus,
+
+  // Discord
+  pairDiscord,
+
+  // PID
+  checkPidFile,
+
+  // Commands
+  chooseModel,
+  openSettings,
+  setupDiscordToken,
+  getTimers,
+  printTimers,
+  getPlugins,
+  printPlugins,
+  getInterfaces,
+  printInterfaces,
+  createInterface,
+  deleteInterface,
+  startInterface,
+  interfaceMenu,
+
+  // Help
+  CLI_COMMANDS,
+  SLASH_COMMANDS,
+  printCliHelp,
+  buildSlashHelp,
+};

package/src/interfaces/terminal/index.js

@@ -3,44 +3,18 @@ const chalk = require("chalk");
 const config = require("../../utils/config");
 const ai = require("../../ai");
 const memory = require("../../utils/memory");
-const PATHS = require("../../utils/paths");
 const ora = require("ora");
+const cmds = require("./commands");
 
 // ── State ── (loaded from disk)
 const conversationHistory = memory.load("terminal");
 let running = true;
 
 // ── UI helpers ──
-const LOGO = (() => {
-  try {
-    const fs = require("fs");
-    const path = require("path");
-    const p = path.join(__dirname, "..", "..", "assets", "ascii-logo.txt");
-    const art = fs.readFileSync(p, "utf8");
-    return art
-      .split("\n")
-      .map((line) => (line.trim() === "" ? "" : chalk.magenta("  " + line)))
-      .join("\n")
-      + "\n\n" + chalk.bold.white("  🍌 peely") + " " + chalk.dim("— interactive mode") + "\n";
-  } catch (err) {
-    // Fallback banner
-    return `\n${chalk.magenta("  ____            _ _ _       ")}\n${chalk.magenta(" |  _ \\ ___  __ _(_) (_) ___  ")}\n${chalk.magenta(" | |_) / _ \\/ _\\` | | | |/ _ \\ ")}\n${chalk.magenta(" |  __/  __/ (_| | | | | (_) |")}\n${chalk.magenta(" |_|   \\___|\\__, |_|_|_|\\___/ ")}\n${chalk.magenta("            |___/              ")}\n\n${chalk.bold.white("  🍌 peely")} ${chalk.dim("— interactive mode")}\n`;
-  }
-})();
-
-const HELP_TEXT = `
-${chalk.bold("  Commands:")}
-    ${chalk.cyan("/help")}                  Show this help
-    ${chalk.cyan("/clear")}                 Clear conversation history
-    ${chalk.cyan("/model")}                 Switch AI model
-    ${chalk.cyan("/settings")}              Edit config, tokens & API keys
-    ${chalk.cyan("/timers")}                Show active timers
-    ${chalk.cyan("/plugins")}               List loaded plugins
-    ${chalk.cyan("/interfaces")}            List & create interfaces
-    ${chalk.cyan("/pair discord <code>")}   Pair a Discord account
-    ${chalk.cyan("/status")}                Show system status
-    ${chalk.cyan("/exit")}                  Exit peely
-`;
+const LOGO = cmds.interactiveLogo;
+const { printStatus, pairDiscord } = cmds;
+
+const HELP_TEXT = cmds.buildSlashHelp();
 
 const printSeparator = () => {
   console.log(chalk.dim("  " + "─".repeat(50)));
@@ -84,56 +58,23 @@ const handleSlashCommand = async (input, rl) => {
       return true;
 
     case "model":
-      return { clack: true, run: async () => {
-        await ai.chooseModel();
-      }};
-
-    case "status": {
-      const model = config.get("ai.model") || chalk.dim("not set");
-      const discord = config.get("interfaces.discord.token")
-        ? chalk.green("configured")
-        : chalk.red("not set");
-      const github = config.get("github.token")
-        ? chalk.green("authorized")
-        : chalk.red("not set");
-      const msgs = conversationHistory.length;
+      return { clack: true, run: () => cmds.chooseModel() };
 
-      console.log();
-      console.log(chalk.bold("  Status:"));
-      console.log(`    AI Model:      ${model}`);
-      console.log(`    GitHub:        ${github}`);
-      console.log(`    Discord:       ${discord}`);
-      console.log(`    Messages:      ${msgs}`);
-      console.log();
+    case "status":
+      printStatus({ messageCount: conversationHistory.length });
       return true;
-    }
 
     case "pair": {
       if (parts[1] === "discord" && parts[2]) {
         const code = parts[2].toUpperCase();
         try {
-          const { SqliteDriver, QuickDB } = require("quick.db");
-          const db = new QuickDB({
-            driver: new SqliteDriver(PATHS.quickDb),
-          });
-
-          const userId = await db.get(`pairCode_${code}`);
-          if (!userId) {
-            console.log();
-            printError(`Invalid or expired pair code: ${code}`);
-            console.log();
-            return true;
-          }
-
-          await db.set(`paired_${userId}`, true);
-          await db.delete(`pairCode_${code}`);
-          config.set("interfaces.discord.pairedUsers", [
-            ...(config.get("interfaces.discord.pairedUsers") || []),
-            userId,
-          ]);
-
+          const result = await pairDiscord(code);
           console.log();
-          printSuccess(`Paired Discord user ${userId}!`);
+          if (result.ok) {
+            printSuccess(`Paired Discord user ${result.userId}!`);
+          } else {
+            printError(result.error);
+          }
           console.log();
         } catch (err) {
           console.log();
@@ -157,99 +98,22 @@ const handleSlashCommand = async (input, rl) => {
       return true;
 
     case "timers": {
-      const { events } = require("../../utils/events");
-      const scheduled = events.listScheduled();
-      console.log();
-      if (scheduled.length === 0) {
-        console.log(chalk.dim("  No active timers."));
-      } else {
-        console.log(chalk.bold("  Active timers:"));
-        for (const t of scheduled) {
-          const secs = Math.ceil(t.remainingMs / 1000);
-          const desc = t.meta?.task || t.meta?.message || t.id;
-          console.log(`    ⏱️  ${t.id} — ${secs}s left — ${desc}`);
-        }
-      }
-      console.log();
+      cmds.printTimers();
       return true;
     }
 
     case "plugins": {
-      const pluginModule = require("../../plugins");
-      console.log();
-      console.log(chalk.bold("  Loaded plugins:"));
-      for (const p of pluginModule.plugins) {
-        const toolCount = p.tools ? Object.keys(p.tools).length : 0;
-        console.log(`    • ${chalk.cyan(p.name)} — ${toolCount} tool(s) — ${p.description || ""}`);
-      }
-      console.log();
+      cmds.printPlugins();
       return true;
     }
 
     case "interfaces":
     case "interface": {
-      // @clack/prompts wizard needs exclusive stdin
-      return { clack: true, run: async () => {
-        const { listInterfaces, createInterface, deleteInterface } = require("../create_interface");
-        const { select, isCancel, log: cLog } = require("@clack/prompts");
-
-        const all = listInterfaces();
-        console.log();
-        console.log(chalk.bold("  Interfaces:"));
-        for (const iface of all) {
-          const tag = iface.type === "built-in"
-            ? chalk.dim("[built-in]")
-            : chalk.cyan("[custom]");
-          console.log(`    ${tag} ${chalk.bold(iface.name)} \u2014 ${iface.description}`);
-        }
-        console.log();
-
-        const action = await select({
-          message: "What would you like to do?",
-          options: [
-            { value: "create", label: "\uD83D\uDD27  Create new interface" },
-            { value: "delete", label: "\uD83D\uDDD1\uFE0F   Delete a custom interface",
-              hint: all.filter(i => i.type === "custom").length === 0 ? "none yet" : undefined },
-            { value: "back",   label: "\u2190   Back" },
-          ],
-        });
-
-        if (isCancel(action) || action === "back") return;
-
-        if (action === "create") {
-          await createInterface();
-          return;
-        }
-
-        if (action === "delete") {
-          const customs = all.filter(i => i.type === "custom");
-          if (customs.length === 0) {
-            cLog.warn("No custom interfaces to delete.");
-            return;
-          }
-          const which = await select({
-            message: "Which interface to delete?",
-            options: [
-              ...customs.map(i => ({ value: i.name, label: i.name, hint: i.description })),
-              { value: "back", label: "\u2190  Back" },
-            ],
-          });
-          if (isCancel(which) || which === "back") return;
-          if (deleteInterface(which)) {
-            cLog.success(`Deleted "${which}".`);
-          } else {
-            cLog.error(`Interface "${which}" not found.`);
-          }
-        }
-      }};
+      return { clack: true, run: () => cmds.interfaceMenu() };
     }
 
     case "settings": {
-      // @clack/prompts needs exclusive stdin — signal processLine to handle it
-      return { clack: true, run: async () => {
-        const { settingsMenu } = require("../../utils/settings");
-        await settingsMenu();
-      }};
+      return { clack: true, run: () => cmds.openSettings() };
     }
 
     default:
@@ -276,6 +140,12 @@ const handleChat = async (input) => {
 
     const reply = response.content || "...";
     conversationHistory.push({ role: "assistant", content: reply });
+
+    // Keep history manageable (same limits as daemon/discord)
+    if (conversationHistory.length > 80) {
+      conversationHistory.splice(0, conversationHistory.length - 60);
+    }
+
     memory.save("terminal", conversationHistory);
 
     console.log();
@@ -419,4 +289,4 @@ const start = async () => {
   });
 };
 
-module.exports = { start };
+module.exports = { start, ...cmds };