@locusai/locus-telegram 0.22.15 → 0.23.0

package/bin/locus-telegram.js

@@ -9309,13 +9309,123 @@ var require_mod2 = __commonJS((exports) => {
   __exportStar(require_worker(), exports);
 });
 
+// ../pm2/dist/index.js
+import { execSync } from "node:child_process";
+import { existsSync } from "node:fs";
+import { dirname, join } from "node:path";
+import { fileURLToPath } from "node:url";
+function getPm2Bin() {
+  let dir = process.cwd();
+  while (dir !== dirname(dir)) {
+    const candidate = join(dir, "node_modules", ".bin", "pm2");
+    if (existsSync(candidate))
+      return candidate;
+    dir = dirname(dir);
+  }
+  if (process.argv[1]) {
+    let scriptDir = dirname(process.argv[1]);
+    while (scriptDir !== dirname(scriptDir)) {
+      const candidate = join(scriptDir, "node_modules", ".bin", "pm2");
+      if (existsSync(candidate))
+        return candidate;
+      scriptDir = dirname(scriptDir);
+    }
+  }
+  try {
+    const result = execSync("which pm2", {
+      encoding: "utf-8",
+      stdio: ["pipe", "pipe", "pipe"]
+    }).trim();
+    if (result)
+      return result;
+  } catch {}
+  return "npx pm2";
+}
+function pm2Exec(args) {
+  const pm2 = getPm2Bin();
+  try {
+    return execSync(`${pm2} ${args}`, {
+      encoding: "utf-8",
+      stdio: ["pipe", "pipe", "pipe"],
+      env: process.env
+    });
+  } catch (error) {
+    const err = error;
+    throw new Error(err.stderr?.trim() || err.message || "PM2 command failed");
+  }
+}
+function pm2Start(config) {
+  const { processName, scriptPath, scriptArgs = [] } = config;
+  const pm2 = getPm2Bin();
+  try {
+    const list = pm2Exec("jlist");
+    const processes = JSON.parse(list);
+    const existing = processes.find((p) => p.name === processName);
+    if (existing) {
+      pm2Exec(`restart ${processName}`);
+      return `Restarted ${processName}`;
+    }
+  } catch {}
+  const argsStr = scriptArgs.length > 0 ? ` -- ${scriptArgs.join(" ")}` : "";
+  execSync(`${pm2} start ${JSON.stringify(scriptPath)} --name ${processName}${argsStr}`, {
+    encoding: "utf-8",
+    stdio: "inherit",
+    env: process.env
+  });
+  return `Started ${processName}`;
+}
+function pm2Stop(config) {
+  pm2Exec(`stop ${config.processName}`);
+  return `Stopped ${config.processName}`;
+}
+function pm2Restart(config) {
+  pm2Exec(`restart ${config.processName}`);
+  return `Restarted ${config.processName}`;
+}
+function pm2Delete(config) {
+  pm2Exec(`delete ${config.processName}`);
+  return `Deleted ${config.processName}`;
+}
+function pm2Status(config) {
+  try {
+    const list = pm2Exec("jlist");
+    const processes = JSON.parse(list);
+    const proc = processes.find((p) => p.name === config.processName);
+    if (!proc)
+      return null;
+    return {
+      name: config.processName,
+      status: proc.pm2_env?.status ?? "unknown",
+      pid: proc.pid ?? null,
+      uptime: proc.pm2_env?.pm_uptime ?? null,
+      memory: proc.monit?.memory ?? null,
+      restarts: proc.pm2_env?.restart_time ?? 0
+    };
+  } catch {
+    return null;
+  }
+}
+function pm2Logs(config, lines = 50) {
+  try {
+    return pm2Exec(`logs ${config.processName} --nostream --lines ${lines}`);
+  } catch {
+    return "No logs available.";
+  }
+}
+function resolvePackageScript(importMetaUrl, binName) {
+  const currentFile = fileURLToPath(importMetaUrl);
+  const packageRoot = dirname(dirname(currentFile));
+  return join(packageRoot, "bin", `${binName}.js`);
+}
+var init_dist = () => {};
+
 // ../sdk/dist/index.js
-import { existsSync, readFileSync } from "node:fs";
+import { existsSync as existsSync2, readFileSync } from "node:fs";
 import { homedir } from "node:os";
-import { join } from "node:path";
+import { join as join2 } from "node:path";
 import { spawn, spawnSync } from "node:child_process";
 function readJsonFile(filePath) {
-  if (!existsSync(filePath))
+  if (!existsSync2(filePath))
     return null;
   try {
     const raw = readFileSync(filePath, "utf-8");
@@ -9341,8 +9451,8 @@ function deepMerge(target, source) {
 }
 function readLocusConfig(cwd) {
   const workingDir = cwd ?? process.cwd();
-  const globalPath = join(homedir(), ".locus", "config.json");
-  const projectPath = join(workingDir, ".locus", "config.json");
+  const globalPath = join2(homedir(), ".locus", "config.json");
+  const projectPath = join2(workingDir, ".locus", "config.json");
   const globalRaw = readJsonFile(globalPath) ?? {};
   const projectRaw = readJsonFile(projectPath) ?? {};
   const merged = deepMerge(deepMerge(DEFAULT_CONFIG, globalRaw), projectRaw);
@@ -9385,7 +9495,7 @@ function createLogger(name) {
   };
 }
 var DEFAULT_CONFIG, colorEnabled = () => process.stderr.isTTY === true && process.env.NO_COLOR === undefined, wrap = (open, close) => (text) => colorEnabled() ? `${open}${text}${close}` : text, bold, dim, red, yellow, cyan, gray;
-var init_dist = __esm(() => {
+var init_dist2 = __esm(() => {
   DEFAULT_CONFIG = {
     version: "0.21.7",
     github: {
@@ -9452,6 +9562,13 @@ Send /start to your bot, then use the chat ID from the Telegram API.`);
   }
   return { botToken, allowedChatIds };
 }
+function getTelegramPm2Config() {
+  return {
+    processName: "locus-telegram",
+    scriptPath: resolvePackageScript(import.meta.url, "locus-telegram"),
+    scriptArgs: ["bot"]
+  };
+}
 function parseChatIds(raw) {
   if (Array.isArray(raw)) {
     return raw.map((id) => {
@@ -9478,128 +9595,6 @@ function parseChatIds(raw) {
 }
 var init_config = __esm(() => {
   init_dist();
-});
-
-// ../pm2/dist/index.js
-import { execSync } from "node:child_process";
-import { dirname, join as join2 } from "node:path";
-import { fileURLToPath } from "node:url";
-function getPm2Bin() {
-  try {
-    const result = execSync("which pm2", {
-      encoding: "utf-8",
-      stdio: ["pipe", "pipe", "pipe"]
-    }).trim();
-    if (result)
-      return result;
-  } catch {}
-  return "npx pm2";
-}
-function pm2Exec(args) {
-  const pm2 = getPm2Bin();
-  try {
-    return execSync(`${pm2} ${args}`, {
-      encoding: "utf-8",
-      stdio: ["pipe", "pipe", "pipe"],
-      env: process.env
-    });
-  } catch (error) {
-    const err = error;
-    throw new Error(err.stderr?.trim() || err.message || "PM2 command failed");
-  }
-}
-function pm2Start(config) {
-  const { processName, scriptPath, scriptArgs = [] } = config;
-  const pm2 = getPm2Bin();
-  try {
-    const list = pm2Exec("jlist");
-    const processes = JSON.parse(list);
-    const existing = processes.find((p) => p.name === processName);
-    if (existing) {
-      pm2Exec(`restart ${processName}`);
-      return `Restarted ${processName}`;
-    }
-  } catch {}
-  const argsStr = scriptArgs.length > 0 ? ` -- ${scriptArgs.join(" ")}` : "";
-  execSync(`${pm2} start ${JSON.stringify(scriptPath)} --name ${processName}${argsStr}`, {
-    encoding: "utf-8",
-    stdio: "inherit",
-    env: process.env
-  });
-  return `Started ${processName}`;
-}
-function pm2Stop(config) {
-  pm2Exec(`stop ${config.processName}`);
-  return `Stopped ${config.processName}`;
-}
-function pm2Restart(config) {
-  pm2Exec(`restart ${config.processName}`);
-  return `Restarted ${config.processName}`;
-}
-function pm2Delete(config) {
-  pm2Exec(`delete ${config.processName}`);
-  return `Deleted ${config.processName}`;
-}
-function pm2Status(config) {
-  try {
-    const list = pm2Exec("jlist");
-    const processes = JSON.parse(list);
-    const proc = processes.find((p) => p.name === config.processName);
-    if (!proc)
-      return null;
-    return {
-      name: config.processName,
-      status: proc.pm2_env?.status ?? "unknown",
-      pid: proc.pid ?? null,
-      uptime: proc.pm2_env?.pm_uptime ?? null,
-      memory: proc.monit?.memory ?? null,
-      restarts: proc.pm2_env?.restart_time ?? 0
-    };
-  } catch {
-    return null;
-  }
-}
-function pm2Logs(config, lines = 50) {
-  try {
-    return pm2Exec(`logs ${config.processName} --nostream --lines ${lines}`);
-  } catch {
-    return "No logs available.";
-  }
-}
-function resolvePackageScript(importMetaUrl, binName) {
-  const currentFile = fileURLToPath(importMetaUrl);
-  const packageRoot = dirname(dirname(currentFile));
-  return join2(packageRoot, "bin", `${binName}.js`);
-}
-var init_dist2 = () => {};
-
-// src/pm2.ts
-function getConfig() {
-  return {
-    processName: "locus-telegram",
-    scriptPath: resolvePackageScript(import.meta.url, "locus-telegram"),
-    scriptArgs: ["bot"]
-  };
-}
-function pm2Start2() {
-  return pm2Start(getConfig());
-}
-function pm2Stop2() {
-  return pm2Stop(getConfig());
-}
-function pm2Restart2() {
-  return pm2Restart(getConfig());
-}
-function pm2Delete2() {
-  return pm2Delete(getConfig());
-}
-function pm2Status2() {
-  return pm2Status(getConfig());
-}
-function pm2Logs2(lines = 50) {
-  return pm2Logs(getConfig(), lines);
-}
-var init_pm2 = __esm(() => {
   init_dist2();
 });
 
@@ -10813,7 +10808,7 @@ function getPostCommandKeyboard(command, args, exitCode) {
 var EDIT_INTERVAL = 2000;
 var init_locus = __esm(() => {
   init_dist3();
-  init_dist();
+  init_dist2();
   init_tracker();
   init_keyboards();
   init_messages();
@@ -10825,27 +10820,27 @@ async function handleService(ctx, args) {
   try {
     switch (subcommand) {
       case "start": {
-        const result = pm2Start2();
+        const result = pm2Start(getTelegramPm2Config());
         await ctx.reply(formatSuccess(result), { parse_mode: "HTML" });
         break;
       }
       case "stop": {
-        const result = pm2Stop2();
+        const result = pm2Stop(getTelegramPm2Config());
         await ctx.reply(formatSuccess(result), { parse_mode: "HTML" });
         break;
       }
       case "restart": {
-        const result = pm2Restart2();
+        const result = pm2Restart(getTelegramPm2Config());
         await ctx.reply(formatSuccess(result), { parse_mode: "HTML" });
         break;
       }
       case "delete": {
-        const result = pm2Delete2();
+        const result = pm2Delete(getTelegramPm2Config());
         await ctx.reply(formatSuccess(result), { parse_mode: "HTML" });
         break;
       }
       case "status": {
-        const status = pm2Status2();
+        const status = pm2Status(getTelegramPm2Config());
         if (!status) {
           await ctx.reply(serviceNotRunningMessage(), {
             parse_mode: "HTML"
@@ -10857,7 +10852,7 @@ async function handleService(ctx, args) {
       }
       case "logs": {
         const lines = args[1] ? Number(args[1]) : 50;
-        const logs = pm2Logs2(lines);
+        const logs = pm2Logs(getTelegramPm2Config(), lines);
         await ctx.reply(codeBlock(logs), { parse_mode: "HTML" });
         break;
       }
@@ -10872,7 +10867,8 @@ async function handleService(ctx, args) {
   }
 }
 var init_service = __esm(() => {
-  init_pm2();
+  init_dist();
+  init_config();
   init_messages();
 });
 
@@ -11062,7 +11058,7 @@ function parseArgs(text, command) {
 }
 var import_grammy3, logger2;
 var init_bot = __esm(() => {
-  init_dist();
+  init_dist2();
   init_cancel();
   init_git();
   init_locus();
@@ -11106,23 +11102,23 @@ async function main(args) {
   }
 }
 function handleStart() {
-  const result = pm2Start2();
+  const result = pm2Start(getTelegramPm2Config());
   logger3.info(result);
 }
 function handleStop() {
-  const result = pm2Stop2();
+  const result = pm2Stop(getTelegramPm2Config());
   logger3.info(result);
 }
 function handleRestart() {
-  const result = pm2Restart2();
+  const result = pm2Restart(getTelegramPm2Config());
   logger3.info(result);
 }
 function handleDelete() {
-  const result = pm2Delete2();
+  const result = pm2Delete(getTelegramPm2Config());
   logger3.info(result);
 }
 function handleStatus() {
-  const status = pm2Status2();
+  const status = pm2Status(getTelegramPm2Config());
   if (!status) {
     logger3.warn("Bot is not running");
     return;
@@ -11140,7 +11136,7 @@ function handleStatus() {
 }
 function handleLogs(args) {
   const lines = args[0] ? Number(args[0]) : 50;
-  const logs = pm2Logs2(lines);
+  const logs = pm2Logs(getTelegramPm2Config(), lines);
   console.log(logs);
 }
 async function handleBot() {
@@ -11224,8 +11220,8 @@ function printHelp() {
 var import_runner, logger3;
 var init_src = __esm(() => {
   init_dist();
+  init_dist2();
   init_config();
-  init_pm2();
   import_runner = __toESM(require_mod2(), 1);
   logger3 = createLogger("telegram");
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@locusai/locus-telegram",
-  "version": "0.22.15",
+  "version": "0.23.0",
   "description": "Remote-control Locus via Telegram with full CLI mapping, git operations, and PM2 management",
   "type": "module",
   "bin": {
@@ -27,9 +27,9 @@
   },
   "dependencies": {
     "@grammyjs/runner": "^2.0.3",
-    "@locusai/locus-gateway": "^0.22.15",
-    "@locusai/locus-pm2": "^0.22.15",
-    "@locusai/sdk": "^0.22.15",
+    "@locusai/locus-gateway": "^0.23.0",
+    "@locusai/locus-pm2": "^0.23.0",
+    "@locusai/sdk": "^0.23.0",
     "grammy": "^1.35.0"
   },
   "devDependencies": {