ctb 1.0.0 → 1.2.1

package/src/bookmarks.ts

@@ -99,8 +99,12 @@ export function isBookmarked(path: string): boolean {
 
 /**
  * Resolve path with ~ expansion.
+ * If baseDir is provided, relative paths are resolved from there.
  */
-export function resolvePath(path: string): string {
+export function resolvePath(path: string, baseDir?: string): string {
 	const expanded = path.replace(/^~/, homedir());
+	if (baseDir && !expanded.startsWith("/")) {
+		return resolve(baseDir, expanded);
+	}
 	return resolve(expanded);
 }

package/src/bot.ts

@@ -18,16 +18,24 @@ import {
 	handleBookmarks,
 	handleCallback,
 	handleCd,
+	handleCompact,
+	handleCost,
 	handleDocument,
+	handleFile,
+	handleModel,
 	handleNew,
 	handlePhoto,
+	handlePlan,
 	handleRestart,
 	handleResume,
 	handleRetry,
+	handleSkill,
 	handleStart,
 	handleStatus,
 	handleStop,
 	handleText,
+	handleThink,
+	handleUndo,
 	handleVoice,
 } from "./handlers";
 
@@ -60,11 +68,22 @@ bot.use(
 bot.command("start", handleStart);
 bot.command("new", handleNew);
 bot.command("stop", handleStop);
+bot.command("c", handleStop);
+bot.command("kill", handleStop);
+bot.command("dc", handleStop);
 bot.command("status", handleStatus);
 bot.command("resume", handleResume);
 bot.command("restart", handleRestart);
 bot.command("retry", handleRetry);
 bot.command("cd", handleCd);
+bot.command("skill", handleSkill);
+bot.command("file", handleFile);
+bot.command("model", handleModel);
+bot.command("cost", handleCost);
+bot.command("think", handleThink);
+bot.command("plan", handlePlan);
+bot.command("compact", handleCompact);
+bot.command("undo", handleUndo);
 bot.command("bookmarks", handleBookmarks);
 
 // ============== Message Handlers ==============
@@ -104,6 +123,28 @@ console.log("Starting bot...");
 const botInfo = await bot.api.getMe();
 console.log(`Bot started: @${botInfo.username}`);
 
+// Set up Telegram menu commands
+await bot.api.setMyCommands([
+	{ command: "start", description: "Show status and user ID" },
+	{ command: "new", description: "Start a fresh session" },
+	{ command: "resume", description: "Resume last session" },
+	{ command: "stop", description: "Interrupt current query" },
+	{ command: "status", description: "Check what Claude is doing" },
+	{ command: "model", description: "Switch model (sonnet/opus/haiku)" },
+	{ command: "cost", description: "Show token usage and cost" },
+	{ command: "think", description: "Force extended thinking" },
+	{ command: "plan", description: "Toggle planning mode" },
+	{ command: "compact", description: "Trigger context compaction" },
+	{ command: "undo", description: "Revert file changes" },
+	{ command: "cd", description: "Change working directory" },
+	{ command: "skill", description: "Invoke a Claude Code skill" },
+	{ command: "file", description: "Download a file" },
+	{ command: "bookmarks", description: "Manage directory bookmarks" },
+	{ command: "retry", description: "Retry last message" },
+	{ command: "restart", description: "Restart the bot" },
+]);
+console.log("Menu commands registered");
+
 // Check for pending restart message to update
 if (existsSync(RESTART_FILE)) {
 	try {

package/src/cli.ts

@@ -23,6 +23,7 @@ interface CliOptions {
 	dir?: string;
 	help?: boolean;
 	version?: boolean;
+	tut?: boolean;
 }
 
 function parseArgs(args: string[]): CliOptions {
@@ -33,6 +34,8 @@ function parseArgs(args: string[]): CliOptions {
 			options.help = true;
 		} else if (arg === "--version" || arg === "-v") {
 			options.version = true;
+		} else if (arg === "tut" || arg === "tutorial") {
+			options.tut = true;
 		} else if (arg.startsWith("--token=")) {
 			options.token = arg.slice(8);
 		} else if (arg.startsWith("--users=")) {
@@ -53,6 +56,7 @@ Run a Telegram bot that controls Claude Code in your project directory.
 
 USAGE:
   ctb [options]
+  ctb tut              Show setup tutorial
 
 OPTIONS:
   --help, -h       Show this help message
@@ -75,6 +79,91 @@ Multiple instances can run simultaneously in different directories.
 `);
 }
 
+function showTutorial(): void {
+	console.log(`
+╔══════════════════════════════════════════════════════════════════╗
+║                    CTB Setup Tutorial                            ║
+╚══════════════════════════════════════════════════════════════════╝
+
+Follow these steps to set up your Claude Telegram Bot:
+
+━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+STEP 1: Create a Telegram Bot
+━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+
+1. Open Telegram and search for @BotFather
+2. Send /newbot
+3. Follow the prompts:
+   - Choose a name (e.g., "My Claude Bot")
+   - Choose a username (must end in "bot", e.g., "my_claude_bot")
+4. Copy the token that looks like:
+   1234567890:ABCdefGHIjklMNOpqrsTUVwxyz
+
+━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+STEP 2: Get Your Telegram User ID
+━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+
+1. Open Telegram and search for @userinfobot
+2. Send any message to it
+3. It will reply with your user ID (a number like 123456789)
+4. Copy this number
+
+   Tip: Add multiple user IDs separated by commas for team access
+
+━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+STEP 3: Configure the Bot
+━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+
+Option A: Interactive setup (easiest)
+  Just run: ctb
+  It will prompt you for the token and user IDs.
+
+Option B: Create a .env file
+  Create a file named .env in your project directory:
+
+  TELEGRAM_BOT_TOKEN=1234567890:ABCdefGHIjklMNOpqrsTUVwxyz
+  TELEGRAM_ALLOWED_USERS=123456789,987654321
+
+Option C: Use command-line arguments
+  ctb --token=YOUR_TOKEN --users=YOUR_USER_ID
+
+━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+STEP 4: Set Up Bot Commands (Optional)
+━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+
+1. Go back to @BotFather
+2. Send /setcommands
+3. Select your bot
+4. Paste this command list:
+
+start - Show status and user ID
+new - Start a fresh session
+resume - Resume last session
+stop - Interrupt current query
+status - Check what Claude is doing
+undo - Revert file changes
+cd - Change working directory
+file - Download a file
+bookmarks - Manage directory bookmarks
+retry - Retry last message
+restart - Restart the bot
+
+━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+STEP 5: Start the Bot
+━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+
+  cd ~/your-project
+  ctb
+
+The bot will start and show "Bot started: @your_bot_username"
+Open Telegram and message your bot to start using Claude!
+
+━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+Need help? https://github.com/htlin/claude-telegram-bot
+━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+`);
+}
+
 async function prompt(question: string): Promise<string> {
 	const rl = createInterface({
 		input: process.stdin,
@@ -226,6 +315,11 @@ async function main(): Promise<void> {
 		process.exit(0);
 	}
 
+	if (options.tut) {
+		showTutorial();
+		process.exit(0);
+	}
+
 	// Determine working directory
 	const workingDir = options.dir ? resolve(options.dir) : process.cwd();