@usemeno/meno-cli 0.1.2 → 0.1.3

package/README.md

@@ -32,13 +32,13 @@ Paste your API key when prompted.
 
 ### `meno select`
 
-Select a project to work on. The selected project will be used for `meno start`.
+Select a project first, then select a task to work on. The selected task will be used for `meno start`.
 
 ```bash
 meno select
 ```
 
-Use arrow keys to select a project, or choose "[Clear Selection]" to unset.
+Use arrow keys to select a project and task, or choose "[Clear Selection]" to unset both.
 
 ### `meno start [project-id]`
 
@@ -92,9 +92,10 @@ meno status
 ## Workflow Example
 
 ```bash
-# Morning: Select your project
+# Morning: Select your project and task
 meno select
-> Website Redesign (Acme Corp) •  $150/hr
+> Website Redesign (Acme Corp)
+> Build hero section → Website Redesign [InProgress]
 
 # Start working
 meno start
@@ -119,8 +120,8 @@ Config is stored at `~/.config/meno-cli/config.json` (cross-platform).
 
 Contains:
 - `apiKey` - Your Meno API key
-- `baseUrl` - API endpoint (default: http://localhost:3000)
 - `selectedProject` - Currently selected project
+- `selectedTask` - Currently selected task
 - `activeTimer` - Running timer state (persists across restarts)
 
 ## Troubleshooting
@@ -132,7 +133,7 @@ Run `meno login` to authenticate.
 Run `meno select` to choose a project, or pass `--project <id>` to commands.
 
 **Connection errors:**
-Check your `baseUrl` in config. For production, use `https://menohq.app`.
+Check your internet connection. CLI uses `https://menohq.app`.
 
 ## Development
 

package/dist/index.js

@@ -20,14 +20,17 @@ function setApiKey(key) {
   config.set("apiKey", key);
 }
 function getBaseUrl() {
-  return config.get("baseUrl") || process.env.MENO_BASE_URL || "https://menohq.app";
-}
-function setBaseUrl(url) {
-  config.set("baseUrl", url);
+  return "https://menohq.app";
 }
 function getSelectedProject() {
   return config.get("selectedProject");
 }
+function setSelectedProject(project) {
+  config.set("selectedProject", project);
+}
+function clearSelectedProject() {
+  config.delete("selectedProject");
+}
 function getActiveTimer() {
   return config.get("activeTimer");
 }
@@ -142,19 +145,9 @@ async function login() {
       }
     });
     const apiKey = apiKeyPrompt.apiKey;
-    const baseUrlPrompt = await enquirer.prompt({
-      type: "input",
-      name: "baseUrl",
-      message: "Base URL (press Enter for default):",
-      initial: "http://localhost:3000"
-    });
-    const baseUrl = baseUrlPrompt.baseUrl;
     const spinner = ora("Validating API key...").start();
     try {
       setApiKey(apiKey);
-      if (baseUrl) {
-        setBaseUrl(baseUrl);
-      }
       await apiRequest("/api/external/projects");
       spinner.succeed(chalk.green("\u2713 Logged in successfully!"));
       console.log(chalk.dim(`
@@ -207,67 +200,119 @@ function formatTaskDisplay(task, isSelected) {
   return `${prefix}${chalk2.bold(task.title)} ${chalk2.dim("\u2192")} ${task.project.name} ${statusColor(`[${task.status}]`)}${estimateText}`;
 }
 async function selectProject() {
-  console.log(chalk2.bold("\n\u{1F4CB} Select Task\n"));
-  const spinner = ora2("Loading tasks...").start();
+  console.log(chalk2.bold("\n\u{1F4CB} Select Project & Task\n"));
+  const spinner = ora2("Loading projects and tasks...").start();
   try {
-    const tasks = await getTasks();
+    const [tasks, projectsResponse] = await Promise.all([
+      getTasks(),
+      apiRequest("/api/external/projects")
+    ]);
+    const projects = projectsResponse.projects || [];
     spinner.stop();
-    if (tasks.length === 0) {
-      console.log(chalk2.yellow("No tasks found."));
-      console.log(chalk2.dim("Create tasks in the Meno dashboard first.\n"));
+    if (projects.length === 0) {
+      console.log(chalk2.yellow("No active projects found."));
+      console.log(chalk2.dim("Create projects in the Meno dashboard first.\n"));
       return;
     }
-    const currentTask = getSelectedTask();
-    const choices = [
+    const currentSelection = getSelectedTask();
+    const projectChoices = [
       {
         name: "clear",
         message: chalk2.dim("[Clear Selection]")
       },
-      ...tasks.map((task) => {
-        const isSelected = currentTask?.id === task.id;
+      ...projects.map((project) => {
+        const projectTaskCount = tasks.filter((task2) => task2.projectId === project.id).length;
         return {
-          name: task.id,
-          message: formatTaskDisplay(task, isSelected),
-          value: task
+          name: project.id,
+          message: `${chalk2.bold(project.name)} ${chalk2.dim("\u2022")} ${project.clientName} ${chalk2.dim(`(${projectTaskCount} task${projectTaskCount === 1 ? "" : "s"})`)}`,
+          value: project
         };
       })
     ];
-    const result = await enquirer2.prompt({
+    const projectResult = await enquirer2.prompt({
       type: "select",
-      name: "task",
-      message: "Select a task:",
-      choices
+      name: "project",
+      message: "Select a project:",
+      choices: projectChoices
     });
-    const answer = result.task;
-    if (answer === "clear") {
+    const projectAnswer = projectResult.project;
+    if (projectAnswer === "clear") {
       clearSelectedTask();
+      clearSelectedProject();
       console.log(chalk2.green("\n\u2713 Selection cleared\n"));
-    } else {
-      const task = tasks.find((t) => t.id === answer);
-      if (!task) {
-        console.log(chalk2.red("\n\u2717 Task not found\n"));
-        return;
-      }
-      setSelectedTask({
-        id: task.id,
-        title: task.title,
-        projectId: task.projectId,
-        projectName: task.project.name,
-        status: task.status,
-        estimatedHours: task.estimatedHours,
-        hourlyRate: task.project.hourlyRate
-      });
-      const statusColor = getStatusColor(task.status);
-      console.log(
-        chalk2.green(`
+      return;
+    }
+    const selectedProject = projects.find((project) => project.id === projectAnswer);
+    if (!selectedProject) {
+      console.log(chalk2.red("\n\u2717 Project not found\n"));
+      return;
+    }
+    setSelectedProject({
+      id: selectedProject.id,
+      name: selectedProject.name,
+      clientName: selectedProject.clientName,
+      hourlyRate: selectedProject.hourlyRate
+    });
+    const projectTasks = tasks.filter((task2) => task2.projectId === selectedProject.id);
+    if (projectTasks.length === 0) {
+      clearSelectedTask();
+      console.log(chalk2.green(`
+\u2713 Selected project: ${chalk2.bold(selectedProject.name)}`));
+      console.log(chalk2.dim("No tasks found for this project yet.\n"));
+      return;
+    }
+    const taskChoices = [
+      {
+        name: "clear_task",
+        message: chalk2.dim("[Clear Task Selection]")
+      },
+      ...projectTasks.map((task2) => {
+        const isSelected = currentSelection?.id === task2.id;
+        return {
+          name: task2.id,
+          message: formatTaskDisplay(task2, isSelected),
+          value: task2
+        };
+      })
+    ];
+    const taskResult = await enquirer2.prompt({
+      type: "select",
+      name: "task",
+      message: `Select a task in ${selectedProject.name}:`,
+      choices: taskChoices
+    });
+    const taskAnswer = taskResult.task;
+    if (taskAnswer === "clear_task") {
+      clearSelectedTask();
+      console.log(chalk2.green(`
+\u2713 Project selected: ${chalk2.bold(selectedProject.name)}`));
+      console.log(chalk2.dim("Task selection cleared.\n"));
+      return;
+    }
+    const task = projectTasks.find((t) => t.id === taskAnswer);
+    if (!task) {
+      console.log(chalk2.red("\n\u2717 Task not found\n"));
+      return;
+    }
+    setSelectedTask({
+      id: task.id,
+      title: task.title,
+      projectId: task.projectId,
+      projectName: task.project.name,
+      status: task.status,
+      estimatedHours: task.estimatedHours,
+      hourlyRate: task.project.hourlyRate
+    });
+    const statusColor = getStatusColor(task.status);
+    console.log(
+      chalk2.green(`
 \u2713 Selected: ${chalk2.bold(task.title)}
 `) + chalk2.dim(`  Project: ${task.project.name} \u2022 $${task.project.hourlyRate}/hr
 `) + chalk2.dim(`  Status: `) + statusColor(task.status) + (task.estimatedHours ? chalk2.dim(` \u2022 Estimated: ${task.estimatedHours}h
 `) : "\n")
-      );
-    }
+    );
   } catch (error) {
-    spinner.fail(chalk2.red("Failed to load tasks"));
+    spinner.fail(chalk2.red("Failed to load projects/tasks"));
     if (error instanceof ApiError) {
       console.log(chalk2.red(`
 Error: ${error.message}
@@ -773,63 +818,11 @@ Unexpected error: ${error.message}
   }
 }
 
-// src/logo-ascii.ts
-var SVG_EMBED = `<?xml version="1.0" encoding="UTF-8"?>
-<svg id="Layer_2" data-name="Layer 2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 55.44 45.4">
-  <g id="MenoLogo">
-    <path d="M43.78,28.72l-3.22-14.3-13.31,13.4c-2.15-1.65-3.92-3.4-5.43-5.75L42.15.78c.61-.64,3.06-1.02,3.67-.61s1.52,1.79,1.66,2.64l4.05,25.48-7.75.43Z"/>
-    <path d="M19.61,20.03l-6.25-5.12-2.48,13.76-8.11-.12L7.13,1.25c.22-1.13,4.18-1.52,5.05-.57l12.62,13.69-5.2,5.66Z"/>
-    <path d="M55.44,38.35c0,3.89-3.15,7.04-7.04,7.04-2.53,0-4.77-1.35-6.01-3.37H.36c-.4-1.61-.44-3.89-.23-6.03l41.85-.55c1.1-2.45,3.57-4.14,6.42-4.14,3.9,0,7.04,3.15,7.04,7.04Z"/>
-  </g>
-</svg>`;
-function fallbackAscii() {
-  return [
-    "                      ____  __        ",
-    "       /\\            / __ \\/ /___ _   _ ",
-    "      /  \\   _ __   / / / / / __ \\ | | |",
-    "     / /\\ \\ | '_ \\ / /_/ / / /_/ / |_| |",
-    "    / ____ \\| | | |\\____/_/\\____/\\__,_|",
-    "   /_/    \\_\\_| |_|                      ",
-    "",
-    "            M E N O  (logo)               "
-  ].join("\n");
-}
-async function printLogoAscii(width = 64) {
-  try {
-    const sharpImport = await import("sharp");
-    const sharp = sharpImport.default ?? sharpImport;
-    const svgBuffer = Buffer.from(SVG_EMBED, "utf8");
-    const img = sharp(svgBuffer).resize({ width }).flatten({ background: { r: 255, g: 255, b: 255 } }).grayscale();
-    const { data, info } = await img.raw().toBuffer({ resolveWithObject: true });
-    const chars = " .,:;i1tfLCG08@";
-    const rows = [];
-    const aspect = 0.5;
-    const rowStep = Math.max(1, Math.round(1 / aspect));
-    for (let y = 0; y < info.height; y += rowStep) {
-      let line = "";
-      for (let x = 0; x < info.width; x++) {
-        const idx = y * info.width + x;
-        const val = data[idx];
-        const charIdx = Math.floor((1 - val / 255) * (chars.length - 1));
-        line += chars[charIdx];
-      }
-      rows.push(line);
-    }
-    console.log(rows.join("\n"));
-    return;
-  } catch (err) {
-    console.log(fallbackAscii());
-    return;
-  }
-}
-
 // src/index.ts
 var program = new Command();
 program.name("meno").description("CLI for Meno time tracking").version("0.1.0");
-printLogoAscii().catch(() => {
-});
 program.command("login").description("Authenticate with your Meno API key").action(login);
-program.command("select").description("Select a task to work on").action(selectProject);
+program.command("select").description("Select a project, then select a task to work on").action(selectProject);
 program.command("start [task-id]").description("Start a timer on selected task or specific task ID").action(startTimer);
 program.command("stop").description("Stop the running timer and log the entry").option("--discard", "Discard the timer without logging").option("-d, --description <text>", "Entry description (skip prompt)").option("-y, --yes", "Auto-confirm (skip confirmation prompt)").option("--no-confirm", "Skip confirmation prompt").option("--commit <hash>", "Git commit hash for evidence").option("--repo <url>", "Git repository URL for evidence").action(stopTimer);
 program.command("log <description>").description("Log time manually").option("-d, --duration <duration>", "Duration (e.g., 45m, 1.5h, 90)").option("-p, --project <id>", "Project ID").action(logTime);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@usemeno/meno-cli",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "Command-line interface for Meno time tracking",
   "main": "dist/index.js",
   "bin": {

package/src/commands/login.ts

@@ -1,7 +1,7 @@
 import enquirer from "enquirer";
 import ora from "ora";
 import chalk from "chalk";
-import { setApiKey, setBaseUrl } from "../config.js";
+import { setApiKey } from "../config.js";
 import { apiRequest, ApiError} from "../utils/api.js";
 
 export async function login() {
@@ -23,25 +23,12 @@ export async function login() {
 
     const apiKey = (apiKeyPrompt as any).apiKey;
 
-    // Optional: Custom base URL
-    const baseUrlPrompt = await enquirer.prompt({
-      type: "input",
-      name: "baseUrl",
-      message: "Base URL (press Enter for default):",
-      initial: "http://localhost:3000",
-    });
-
-    const baseUrl = (baseUrlPrompt as any).baseUrl;
-
     // Validate API key by making a test request
     const spinner = ora("Validating API key...").start();
 
     try {
       // Temporarily set the key to test it
       setApiKey(apiKey as string);
-      if (baseUrl) {
-        setBaseUrl(baseUrl as string);
-      }
 
       // Test the key
       await apiRequest("/api/external/projects");

package/src/commands/select.ts

@@ -1,8 +1,8 @@
 import enquirer from "enquirer";
 import ora from "ora";
 import chalk from "chalk";
-import { setSelectedTask, clearSelectedTask, getSelectedTask } from "../config.js";
-import { getTasks, ApiError, Task } from "../utils/api.js";
+import { setSelectedTask, clearSelectedTask, getSelectedTask, setSelectedProject, clearSelectedProject } from "../config.js";
+import { getTasks, ApiError, Task, apiRequest, Project } from "../utils/api.js";
 
 function getStatusColor(status: string): (text: string) => string {
   switch (status) {
@@ -24,32 +24,88 @@ function formatTaskDisplay(task: Task, isSelected: boolean): string {
 }
 
 export async function selectProject() {
-  console.log(chalk.bold("\n📋 Select Task\n"));
+  console.log(chalk.bold("\n📋 Select Project & Task\n"));
 
-  const spinner = ora("Loading tasks...").start();
+  const spinner = ora("Loading projects and tasks...").start();
 
   try {
-    const tasks = await getTasks();
+    const [tasks, projectsResponse] = await Promise.all([
+      getTasks(),
+      apiRequest<{ projects: Project[] }>("/api/external/projects"),
+    ]);
+    const projects = projectsResponse.projects || [];
 
     spinner.stop();
 
-    if (tasks.length === 0) {
-      console.log(chalk.yellow("No tasks found."));
-      console.log(chalk.dim("Create tasks in the Meno dashboard first.\n"));
+    if (projects.length === 0) {
+      console.log(chalk.yellow("No active projects found."));
+      console.log(chalk.dim("Create projects in the Meno dashboard first.\n"));
       return;
     }
 
-    const currentTask = getSelectedTask();
+    const currentSelection = getSelectedTask();
 
-    // Build choices - group by status or show all
-    const choices = [
+    const projectChoices = [
       {
         name: "clear",
         message: chalk.dim("[Clear Selection]"),
       },
-      ...tasks.map((task) => {
-        const isSelected = currentTask?.id === task.id;
-        
+      ...projects.map((project) => {
+        const projectTaskCount = tasks.filter((task) => task.projectId === project.id).length;
+
+        return {
+          name: project.id,
+          message: `${chalk.bold(project.name)} ${chalk.dim("•")} ${project.clientName} ${chalk.dim(`(${projectTaskCount} task${projectTaskCount === 1 ? "" : "s"})`)}`,
+          value: project,
+        };
+      }),
+    ];
+
+    const projectResult = await enquirer.prompt({
+      type: "select",
+      name: "project",
+      message: "Select a project:",
+      choices: projectChoices,
+    });
+
+    const projectAnswer = (projectResult as any).project;
+
+    if (projectAnswer === "clear") {
+      clearSelectedTask();
+      clearSelectedProject();
+      console.log(chalk.green("\n✓ Selection cleared\n"));
+      return;
+    }
+
+    const selectedProject = projects.find((project) => project.id === projectAnswer);
+    if (!selectedProject) {
+      console.log(chalk.red("\n✗ Project not found\n"));
+      return;
+    }
+
+    setSelectedProject({
+      id: selectedProject.id,
+      name: selectedProject.name,
+      clientName: selectedProject.clientName,
+      hourlyRate: selectedProject.hourlyRate,
+    });
+
+    const projectTasks = tasks.filter((task) => task.projectId === selectedProject.id);
+    if (projectTasks.length === 0) {
+      clearSelectedTask();
+      console.log(chalk.green(`\n✓ Selected project: ${chalk.bold(selectedProject.name)}`));
+      console.log(chalk.dim("No tasks found for this project yet.\n"));
+      return;
+    }
+
+    const taskChoices = [
+      {
+        name: "clear_task",
+        message: chalk.dim("[Clear Task Selection]"),
+      },
+      ...projectTasks.map((task) => {
+        const isSelected = currentSelection?.id === task.id;
+
         return {
           name: task.id,
           message: formatTaskDisplay(task, isSelected),
@@ -58,47 +114,46 @@ export async function selectProject() {
       }),
     ];
 
-    const result = await enquirer.prompt({
+    const taskResult = await enquirer.prompt({
       type: "select",
       name: "task",
-      message: "Select a task:",
-      choices,
+      message: `Select a task in ${selectedProject.name}:`,
+      choices: taskChoices,
     });
 
-    const answer = (result as any).task;
-
-    if (answer === "clear") {
+    const taskAnswer = (taskResult as any).task;
+    if (taskAnswer === "clear_task") {
       clearSelectedTask();
-      console.log(chalk.green("\n✓ Selection cleared\n"));
-    } else {
-      // Find the full task object by ID
-      const task = tasks.find((t) => t.id === answer);
-      
-      if (!task) {
-        console.log(chalk.red("\n✗ Task not found\n"));
-        return;
-      }
-      
-      setSelectedTask({
-        id: task.id,
-        title: task.title,
-        projectId: task.projectId,
-        projectName: task.project.name,
-        status: task.status,
-        estimatedHours: task.estimatedHours,
-        hourlyRate: task.project.hourlyRate,
-      });
-      
-      const statusColor = getStatusColor(task.status);
-      console.log(
-        chalk.green(`\n✓ Selected: ${chalk.bold(task.title)}\n`) +
-        chalk.dim(`  Project: ${task.project.name} • $${task.project.hourlyRate}/hr\n`) +
-        chalk.dim(`  Status: `) + statusColor(task.status) +
-        (task.estimatedHours ? chalk.dim(` • Estimated: ${task.estimatedHours}h\n`) : "\n")
-      );
+      console.log(chalk.green(`\n✓ Project selected: ${chalk.bold(selectedProject.name)}`));
+      console.log(chalk.dim("Task selection cleared.\n"));
+      return;
     }
+
+    const task = projectTasks.find((t) => t.id === taskAnswer);
+    if (!task) {
+      console.log(chalk.red("\n✗ Task not found\n"));
+      return;
+    }
+
+    setSelectedTask({
+      id: task.id,
+      title: task.title,
+      projectId: task.projectId,
+      projectName: task.project.name,
+      status: task.status,
+      estimatedHours: task.estimatedHours,
+      hourlyRate: task.project.hourlyRate,
+    });
+
+    const statusColor = getStatusColor(task.status);
+    console.log(
+      chalk.green(`\n✓ Selected: ${chalk.bold(task.title)}\n`) +
+      chalk.dim(`  Project: ${task.project.name} • $${task.project.hourlyRate}/hr\n`) +
+      chalk.dim(`  Status: `) + statusColor(task.status) +
+      (task.estimatedHours ? chalk.dim(` • Estimated: ${task.estimatedHours}h\n`) : "\n")
+    );
   } catch (error) {
-    spinner.fail(chalk.red("Failed to load tasks"));
+    spinner.fail(chalk.red("Failed to load projects/tasks"));
     
     if (error instanceof ApiError) {
       console.log(chalk.red(`\nError: ${error.message}\n`));

package/src/config.ts

@@ -2,7 +2,6 @@ import Conf from "conf";
 
 interface Config {
   apiKey?: string;
-  baseUrl?: string;
   selectedProject?: {
     id: string;
     name: string;
@@ -41,11 +40,7 @@ export function setApiKey(key: string): void {
 }
 
 export function getBaseUrl(): string {
-  return config.get("baseUrl") || process.env.MENO_BASE_URL || "https://menohq.app";
-}
-
-export function setBaseUrl(url: string): void {
-  config.set("baseUrl", url);
+  return "https://menohq.app";
 }
 
 export function getSelectedProject() {

package/src/index.ts

@@ -7,7 +7,6 @@ import { startTimer } from "./commands/start.js";
 import { stopTimer } from "./commands/stop.js";
 import { logTime } from "./commands/log.js";
 import { showStatus } from "./commands/status.js";
-import { printLogoAscii } from "./logo-ascii.js";
 
 const program = new Command();
 
@@ -16,9 +15,6 @@ program
   .description("CLI for Meno time tracking")
   .version("0.1.0");
 
-// Print ASCII logo at CLI startup (sharp used if installed, otherwise a fallback)
-printLogoAscii().catch(() => {});
-
 program
   .command("login")
   .description("Authenticate with your Meno API key")
@@ -26,7 +22,7 @@ program
 
 program
   .command("select")
-  .description("Select a task to work on")
+  .description("Select a project, then select a task to work on")
   .action(selectProject);
 
 program