@sarkar-ai/deskmate 0.2.1 → 0.3.0

package/dist/cli.js

@@ -35,9 +35,19 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildAllowedUsers = buildAllowedUsers;
-require("dotenv/config");
+const dotenv = __importStar(require("dotenv"));
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
+const os = __importStar(require("os"));
+// Load .env: try cwd first (source install / service), then ~/.config/deskmate/ (npm global)
+const cwdEnv = path.join(process.cwd(), ".env");
+const configEnv = path.join(os.homedir(), ".config", "deskmate", ".env");
+if (fs.existsSync(cwdEnv)) {
+    dotenv.config({ path: cwdEnv });
+}
+else if (fs.existsSync(configEnv)) {
+    dotenv.config({ path: configEnv });
+}
 const pkg = JSON.parse(fs.readFileSync(path.join(__dirname, "..", "package.json"), "utf-8"));
 const VERSION = pkg.version;
 const BOT_NAME = process.env.BOT_NAME || "Deskmate";
@@ -49,10 +59,9 @@ Usage:
   deskmate <command> [options]
 
 Commands:
-  telegram    Start the Telegram bot (default)
+  (default)   Start the gateway (multi-client)
   mcp         Start the MCP server
-  both        Start both Telegram bot and MCP server
-  gateway     Start the multi-client gateway
+  both        Start gateway + MCP server
   init        Interactive setup wizard
 
 Options:
@@ -60,18 +69,17 @@ Options:
   -v, --version   Show version number
 
 Examples:
-  deskmate                  Start in Telegram mode
-  deskmate telegram         Start the Telegram bot
+  deskmate                  Start the gateway
   deskmate mcp              Start the MCP server
-  deskmate gateway          Start multi-client gateway
+  deskmate both             Start gateway + MCP
   deskmate init             Run the setup wizard
   deskmate --version        Print version
 
 Environment:
-  AGENT_PROVIDER            Agent provider (default: claude-code)
+  ALLOWED_USERS             Multi-client allowlist (e.g. telegram:123,discord:456)
   TELEGRAM_BOT_TOKEN        Telegram bot token
   ANTHROPIC_API_KEY         Anthropic API key
-  ALLOWED_USERS             Multi-client allowlist (e.g. telegram:123,discord:456)
+  AGENT_PROVIDER            Agent provider (default: claude-code)
 `);
 }
 function buildAllowedUsers() {
@@ -99,7 +107,7 @@ function buildAllowedUsers() {
 }
 async function main() {
     const args = process.argv.slice(2);
-    const command = args.find((a) => !a.startsWith("-")) || "telegram";
+    const command = args.find((a) => !a.startsWith("-")) || "gateway";
     const flags = new Set(args.filter((a) => a.startsWith("-")));
     if (flags.has("--help") || flags.has("-h")) {
         printHelp();
@@ -109,16 +117,35 @@ async function main() {
         console.log(VERSION);
         process.exit(0);
     }
-    // If no explicit command and no .env found, suggest running init
+    // If no explicit command and no .env found anywhere, suggest running init
     if (!args.find((a) => !a.startsWith("-")) &&
-        !fs.existsSync(path.join(process.cwd(), ".env"))) {
+        !fs.existsSync(cwdEnv) &&
+        !fs.existsSync(configEnv)) {
         console.log(`No .env file found. Run "deskmate init" to get started.\n`);
     }
     switch (command) {
-        case "telegram": {
-            console.log(`Starting ${BOT_NAME} in telegram mode...`);
-            const { startTelegramBot } = await Promise.resolve().then(() => __importStar(require("./telegram/bot")));
-            await startTelegramBot();
+        case "telegram":
+            console.warn('[deprecated] "deskmate telegram" is deprecated. The gateway is now the default. Starting gateway...');
+        // fall through
+        case "gateway": {
+            console.log(`Starting ${BOT_NAME} in gateway mode...`);
+            const { Gateway } = await Promise.resolve().then(() => __importStar(require("./gateway")));
+            const { TelegramClient } = await Promise.resolve().then(() => __importStar(require("./clients/telegram")));
+            const allowedUsers = buildAllowedUsers();
+            if (allowedUsers.length === 0) {
+                console.error("No allowed users configured. Set ALLOWED_USERS or ALLOWED_USER_ID in your .env");
+                process.exit(1);
+            }
+            const gateway = new Gateway({
+                botName: BOT_NAME,
+                workingDir: process.env.WORKING_DIR || process.env.HOME || "/",
+                allowedUsers,
+                maxTurns: 10,
+            });
+            if (process.env.TELEGRAM_BOT_TOKEN) {
+                gateway.registerClient(new TelegramClient(process.env.TELEGRAM_BOT_TOKEN));
+            }
+            await gateway.start();
             break;
         }
         case "mcp": {
@@ -128,19 +155,10 @@ async function main() {
             break;
         }
         case "both": {
-            console.log(`Starting ${BOT_NAME} in both mode...`);
-            const [{ startTelegramBot: startBot }, { startMcpServer: startMcp }] = await Promise.all([
-                Promise.resolve().then(() => __importStar(require("./telegram/bot"))),
-                Promise.resolve().then(() => __importStar(require("./mcp/server"))),
-            ]);
-            startBot().catch(console.error);
-            await startMcp();
-            break;
-        }
-        case "gateway": {
-            console.log(`Starting ${BOT_NAME} in gateway mode...`);
+            console.log(`Starting ${BOT_NAME} in gateway + mcp mode...`);
             const { Gateway } = await Promise.resolve().then(() => __importStar(require("./gateway")));
             const { TelegramClient } = await Promise.resolve().then(() => __importStar(require("./clients/telegram")));
+            const { startMcpServer } = await Promise.resolve().then(() => __importStar(require("./mcp/server")));
             const allowedUsers = buildAllowedUsers();
             if (allowedUsers.length === 0) {
                 console.error("No allowed users configured. Set ALLOWED_USERS or ALLOWED_USER_ID in your .env");
@@ -155,7 +173,8 @@ async function main() {
             if (process.env.TELEGRAM_BOT_TOKEN) {
                 gateway.registerClient(new TelegramClient(process.env.TELEGRAM_BOT_TOKEN));
             }
-            await gateway.start();
+            gateway.start().catch(console.error);
+            await startMcpServer();
             break;
         }
         case "setup":

package/dist/index.js

@@ -33,8 +33,20 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-require("dotenv/config");
-const mode = process.argv[2] || "telegram";
+const dotenv = __importStar(require("dotenv"));
+const fs = __importStar(require("fs"));
+const path = __importStar(require("path"));
+const os = __importStar(require("os"));
+// Load .env: try cwd first (source install / service), then ~/.config/deskmate/ (npm global)
+const cwdEnv = path.join(process.cwd(), ".env");
+const configEnv = path.join(os.homedir(), ".config", "deskmate", ".env");
+if (fs.existsSync(cwdEnv)) {
+    dotenv.config({ path: cwdEnv });
+}
+else if (fs.existsSync(configEnv)) {
+    dotenv.config({ path: configEnv });
+}
+const mode = process.argv[2] || "gateway";
 const BOT_NAME = process.env.BOT_NAME || "Deskmate";
 /** Parse ALLOWED_USERS (multi-client) and ALLOWED_USER_ID (legacy) into UserIdentity[] */
 function buildAllowedUsers() {
@@ -64,31 +76,12 @@ function buildAllowedUsers() {
     return users;
 }
 async function main() {
-    console.log(`🚀 Starting ${BOT_NAME} in ${mode} mode...`);
     switch (mode) {
         case "telegram":
-            // Telegram bot mode - natural language interface
-            const { startTelegramBot } = await Promise.resolve().then(() => __importStar(require("./telegram/bot")));
-            await startTelegramBot();
-            break;
-        case "mcp":
-            // MCP server mode - for Claude.ai / MCP clients
-            const { startMcpServer } = await Promise.resolve().then(() => __importStar(require("./mcp/server")));
-            await startMcpServer();
-            break;
-        case "both":
-            // Run both (MCP on stdio, Telegram in background)
-            console.log("Starting both Telegram bot and MCP server...");
-            const [{ startTelegramBot: startBot }, { startMcpServer: startMcp }] = await Promise.all([
-                Promise.resolve().then(() => __importStar(require("./telegram/bot"))),
-                Promise.resolve().then(() => __importStar(require("./mcp/server"))),
-            ]);
-            // Start Telegram in background (for approval notifications)
-            startBot().catch(console.error);
-            // Start MCP (this blocks on stdio)
-            await startMcp();
-            break;
+            console.warn('[deprecated] "telegram" mode is deprecated. The gateway is now the default. Starting gateway...');
+        // fall through
         case "gateway": {
+            console.log(`Starting ${BOT_NAME} in gateway mode...`);
             const { Gateway } = await Promise.resolve().then(() => __importStar(require("./gateway")));
             const { TelegramClient } = await Promise.resolve().then(() => __importStar(require("./clients/telegram")));
             const allowedUsers = buildAllowedUsers();
@@ -109,9 +102,38 @@ async function main() {
             await gateway.start();
             break;
         }
+        case "mcp": {
+            console.log(`Starting ${BOT_NAME} in mcp mode...`);
+            const { startMcpServer } = await Promise.resolve().then(() => __importStar(require("./mcp/server")));
+            await startMcpServer();
+            break;
+        }
+        case "both": {
+            console.log(`Starting ${BOT_NAME} in gateway + mcp mode...`);
+            const { Gateway } = await Promise.resolve().then(() => __importStar(require("./gateway")));
+            const { TelegramClient } = await Promise.resolve().then(() => __importStar(require("./clients/telegram")));
+            const { startMcpServer } = await Promise.resolve().then(() => __importStar(require("./mcp/server")));
+            const allowedUsers = buildAllowedUsers();
+            if (allowedUsers.length === 0) {
+                throw new Error("No allowed users configured. Set ALLOWED_USERS or ALLOWED_USER_ID in your .env");
+            }
+            const gateway = new Gateway({
+                botName: BOT_NAME,
+                workingDir: process.env.WORKING_DIR || process.env.HOME || "/",
+                allowedUsers,
+                maxTurns: 10,
+            });
+            if (process.env.TELEGRAM_BOT_TOKEN) {
+                gateway.registerClient(new TelegramClient(process.env.TELEGRAM_BOT_TOKEN));
+            }
+            // Start gateway in background, MCP on stdio
+            gateway.start().catch(console.error);
+            await startMcpServer();
+            break;
+        }
         default:
             console.error(`Unknown mode: ${mode}`);
-            console.error("Usage: npm start [telegram|mcp|both|gateway]");
+            console.error("Usage: npm start [gateway|mcp|both]");
             process.exit(1);
     }
 }
@@ -121,10 +143,10 @@ main().catch((error) => {
 });
 // Graceful shutdown
 process.on("SIGINT", () => {
-    console.log("\n👋 Shutting down...");
+    console.log("\nShutting down...");
     process.exit(0);
 });
 process.on("SIGTERM", () => {
-    console.log("\n👋 Shutting down...");
+    console.log("\nShutting down...");
     process.exit(0);
 });

package/install.sh

@@ -1,4 +1,13 @@
 #!/bin/bash
+#
+# Deskmate Installer (source clone path)
+#
+# This script is for users who cloned the repo from source:
+#   git clone https://github.com/sarkar-ai-taken/deskmate.git
+#   cd deskmate && ./install.sh
+#
+# For npm global installs, use: deskmate init
+#
 
 set -e
 
@@ -116,61 +125,127 @@ echo -e "\n${BLUE}━━━━━━━━━━━━━━━━━━━━
 echo -e "${YELLOW}Configuring environment...${NC}"
 echo ""
 
-CONFIGURE_ENV=true
+# Helper: read a value from existing .env
+env_get() {
+    local key="$1"
+    if [ -f "$PROJECT_DIR/.env" ]; then
+        grep -E "^${key}=" "$PROJECT_DIR/.env" 2>/dev/null | head -1 | cut -d'=' -f2-
+    fi
+}
 
-if [ -f "$PROJECT_DIR/.env" ]; then
-    echo -e "${GREEN}Found existing .env file.${NC}"
-    read -p "Reconfigure? [y/N]: " RECONFIGURE
-    if [ "$RECONFIGURE" != "y" ] && [ "$RECONFIGURE" != "Y" ]; then
-        CONFIGURE_ENV=false
-        echo -e "${GREEN}✓ Keeping existing .env${NC}"
+# Helper: mask a secret value for display
+mask_value() {
+    local val="$1"
+    local len=${#val}
+    if [ "$len" -le 8 ]; then
+        echo "****"
+    else
+        echo "${val:0:4}...${val: -4}"
     fi
+}
+
+# Load existing values (if any)
+EXISTING_API_KEY=$(env_get ANTHROPIC_API_KEY)
+EXISTING_TOKEN=$(env_get TELEGRAM_BOT_TOKEN)
+EXISTING_USER_ID=$(env_get ALLOWED_USER_ID)
+EXISTING_USERS=$(env_get ALLOWED_USERS)
+EXISTING_WORKING_DIR=$(env_get WORKING_DIR)
+EXISTING_BOT_NAME=$(env_get BOT_NAME)
+EXISTING_LOG_LEVEL=$(env_get LOG_LEVEL)
+EXISTING_REQUIRE_APPROVAL=$(env_get REQUIRE_APPROVAL_FOR_ALL)
+EXISTING_ALLOWED_FOLDERS=$(env_get ALLOWED_FOLDERS)
+
+HAS_EXISTING=false
+if [ -f "$PROJECT_DIR/.env" ] && [ -n "$EXISTING_TOKEN$EXISTING_API_KEY$EXISTING_USERS$EXISTING_USER_ID" ]; then
+    HAS_EXISTING=true
+    echo -e "${GREEN}Found existing .env — press Enter to keep current values.${NC}"
 fi
 
-if [ "$CONFIGURE_ENV" = true ]; then
-    echo ""
-    echo -e "${YELLOW}Enter your credentials (press Enter to skip optional fields):${NC}"
-    echo ""
+echo ""
+echo -e "${YELLOW}Enter your credentials (press Enter to keep existing / skip):${NC}"
+echo ""
 
+# Anthropic API Key
+if [ -n "$EXISTING_API_KEY" ]; then
+    read -p "  Anthropic API Key [$(mask_value "$EXISTING_API_KEY")]: " ANTHROPIC_API_KEY
+    ANTHROPIC_API_KEY=${ANTHROPIC_API_KEY:-$EXISTING_API_KEY}
+else
     read -p "  Anthropic API Key: " ANTHROPIC_API_KEY
     if [ -z "$ANTHROPIC_API_KEY" ]; then
         echo -e "  ${RED}Warning: No API key entered. You'll need to set ANTHROPIC_API_KEY in .env later.${NC}"
     fi
+fi
 
-    echo ""
+# Telegram
+echo ""
+if [ -z "$EXISTING_TOKEN" ]; then
     echo -e "  ${BLUE}Telegram setup — get these from Telegram:${NC}"
     echo -e "  Bot token → message @BotFather, send /newbot"
     echo -e "  User ID   → message @userinfobot, copy the number"
     echo ""
+fi
 
+if [ -n "$EXISTING_TOKEN" ]; then
+    read -p "  Telegram Bot Token [$(mask_value "$EXISTING_TOKEN")]: " TELEGRAM_BOT_TOKEN
+    TELEGRAM_BOT_TOKEN=${TELEGRAM_BOT_TOKEN:-$EXISTING_TOKEN}
+else
     read -p "  Telegram Bot Token (from @BotFather): " TELEGRAM_BOT_TOKEN
+fi
+
+# User ID / Allowed Users
+if [ -n "$EXISTING_USERS" ]; then
+    read -p "  Allowed users [$EXISTING_USERS]: " ALLOWED_USERS_INPUT
+    ALLOWED_USERS_VAL=${ALLOWED_USERS_INPUT:-$EXISTING_USERS}
+    TELEGRAM_USER_ID="$EXISTING_USER_ID"
+elif [ -n "$EXISTING_USER_ID" ]; then
+    read -p "  Telegram User ID [$EXISTING_USER_ID]: " TELEGRAM_USER_ID
+    TELEGRAM_USER_ID=${TELEGRAM_USER_ID:-$EXISTING_USER_ID}
+    ALLOWED_USERS_VAL="telegram:${TELEGRAM_USER_ID}"
+else
     read -p "  Telegram User ID (from @userinfobot): " TELEGRAM_USER_ID
+    ALLOWED_USERS_VAL="telegram:${TELEGRAM_USER_ID}"
+fi
 
-    echo ""
-    read -p "  Working directory (default: $HOME): " WORKING_DIR
-    WORKING_DIR=${WORKING_DIR:-$HOME}
+echo ""
+WORKING_DIR_DEFAULT=${EXISTING_WORKING_DIR:-$HOME}
+read -p "  Working directory [$WORKING_DIR_DEFAULT]: " WORKING_DIR
+WORKING_DIR=${WORKING_DIR:-$WORKING_DIR_DEFAULT}
 
-    read -p "  Bot name (default: Deskmate): " BOT_NAME
-    BOT_NAME=${BOT_NAME:-Deskmate}
+BOT_NAME_DEFAULT=${EXISTING_BOT_NAME:-Deskmate}
+read -p "  Bot name [$BOT_NAME_DEFAULT]: " BOT_NAME
+BOT_NAME=${BOT_NAME:-$BOT_NAME_DEFAULT}
 
-    # Write .env
-    cat > "$PROJECT_DIR/.env" << EOF
+# Carry over existing values we don't prompt for
+LOG_LEVEL=${EXISTING_LOG_LEVEL:-info}
+REQUIRE_APPROVAL=${EXISTING_REQUIRE_APPROVAL:-false}
+ALLOWED_FOLDERS_VAL=${EXISTING_ALLOWED_FOLDERS}
+
+# Write .env
+cat > "$PROJECT_DIR/.env" << EOF
 # Deskmate Configuration (generated by install.sh)
 
+ALLOWED_USERS=${ALLOWED_USERS_VAL}
 TELEGRAM_BOT_TOKEN=${TELEGRAM_BOT_TOKEN}
-ALLOWED_USER_ID=${TELEGRAM_USER_ID}
-ALLOWED_USERS=telegram:${TELEGRAM_USER_ID}
 ANTHROPIC_API_KEY=${ANTHROPIC_API_KEY}
 AGENT_PROVIDER=claude-code
 WORKING_DIR=${WORKING_DIR}
 BOT_NAME=${BOT_NAME}
-LOG_LEVEL=info
-REQUIRE_APPROVAL_FOR_ALL=false
+LOG_LEVEL=${LOG_LEVEL}
+REQUIRE_APPROVAL_FOR_ALL=${REQUIRE_APPROVAL}
 EOF
 
-    echo -e "\n${GREEN}✓ .env file written${NC}"
+# Add legacy user ID if we have one
+if [ -n "$TELEGRAM_USER_ID" ]; then
+    echo "ALLOWED_USER_ID=${TELEGRAM_USER_ID}" >> "$PROJECT_DIR/.env"
+fi
+
+# Carry over allowed folders
+if [ -n "$ALLOWED_FOLDERS_VAL" ]; then
+    echo "ALLOWED_FOLDERS=${ALLOWED_FOLDERS_VAL}" >> "$PROJECT_DIR/.env"
 fi
 
+echo -e "\n${GREEN}✓ .env file written${NC}"
+
 # =============================================================================
 # 3. Build
 # =============================================================================
@@ -283,6 +358,10 @@ if [ "$PLATFORM" = "macos" ]; then
     echo -e "\n${BLUE}━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━${NC}"
     echo -e "${YELLOW}Configuring folder access...${NC}"
     echo ""
+    if [ -n "$ALLOWED_FOLDERS_VAL" ]; then
+        echo -e "  Current allowed folders: ${GREEN}${ALLOWED_FOLDERS_VAL}${NC}"
+        echo ""
+    fi
     echo -e "macOS will ask for permission when the agent accesses protected folders."
     echo -e "Let's configure which folders the agent should have access to."
     echo ""

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sarkar-ai/deskmate",
-  "version": "0.2.1",
+  "version": "0.3.0",
   "description": "Control your local machine from anywhere using natural language via Telegram or MCP.",
   "author": "Deskmate Contributors",
   "license": "MIT",
@@ -47,12 +47,11 @@
   },
   "scripts": {
     "build": "tsc",
-    "start": "node dist/index.js telegram",
-    "start:telegram": "node dist/index.js telegram",
+    "start": "node dist/index.js",
     "start:mcp": "node dist/index.js mcp",
     "start:gateway": "node dist/index.js gateway",
     "start:both": "node dist/index.js both",
-    "dev": "tsx src/index.ts telegram",
+    "dev": "tsx src/index.ts",
     "dev:mcp": "tsx src/index.ts mcp",
     "test": "vitest run",
     "prepublishOnly": "npm run build"
@@ -60,6 +59,7 @@
   "dependencies": {
     "@anthropic-ai/claude-agent-sdk": "^0.2.6",
     "@modelcontextprotocol/sdk": "^1.0.0",
+    "@sarkar-ai/deskmate": "^0.2.1",
     "dotenv": "^16.3.1",
     "grammy": "^1.21.1",
     "zod": "^4.0.0"