diff options
Diffstat (limited to 'makima/src/daemon/cli')
| -rw-r--r-- | makima/src/daemon/cli/mod.rs | 16 | ||||
| -rw-r--r-- | makima/src/daemon/cli/view.rs | 111 |
2 files changed, 44 insertions, 83 deletions
diff --git a/makima/src/daemon/cli/mod.rs b/makima/src/daemon/cli/mod.rs index 44c7a06..3394b35 100644 --- a/makima/src/daemon/cli/mod.rs +++ b/makima/src/daemon/cli/mod.rs @@ -12,7 +12,7 @@ pub use contract::ContractArgs; pub use daemon::DaemonArgs; pub use server::ServerArgs; pub use supervisor::SupervisorArgs; -pub use view::{ViewArgs, ViewCommand}; +pub use view::ViewArgs; /// Makima - unified CLI for server, daemon, and task management. #[derive(Parser, Debug)] @@ -39,16 +39,16 @@ pub enum Commands { #[command(subcommand)] Contract(ContractCommand), - /// Interactive TUI browser for tasks, contracts, and files + /// Interactive TUI browser for contracts and tasks /// - /// Provides a fuzzy-searchable interface with keyboard navigation. + /// Provides a drill-down interface for browsing contracts, viewing their + /// tasks, and streaming real-time task output. /// /// Keyboard shortcuts: - /// ↑/k: Move up ↓/j: Move down Enter: Select - /// /: Search Tab: Toggle preview q: Quit - /// e: Edit d: Delete c: cd to worktree - #[command(subcommand)] - View(ViewCommand), + /// ↑/k: Move up ↓/j: Move down Enter/l: Drill in + /// Esc/h: Go back /: Search q: Quit + /// e: Edit d: Delete c: cd to worktree + View(ViewArgs), } /// Supervisor subcommands for contract orchestration. diff --git a/makima/src/daemon/cli/view.rs b/makima/src/daemon/cli/view.rs index f42c490..b5b516f 100644 --- a/makima/src/daemon/cli/view.rs +++ b/makima/src/daemon/cli/view.rs @@ -1,94 +1,69 @@ -//! View subcommand - interactive TUI browser for tasks, contracts, and files. +//! View subcommand - interactive TUI browser for contracts and tasks. //! //! The `makima view` command provides an interactive Terminal User Interface (TUI) -//! for browsing and managing makima entities. It features fuzzy search filtering, -//! keyboard navigation, and quick actions. +//! for browsing and managing makima contracts and their tasks. It features +//! drill-down navigation, fuzzy search filtering, and real-time task output streaming. //! //! # Usage //! //! ```bash -//! # Browse tasks interactively -//! makima view tasks +//! # Browse contracts interactively +//! makima view //! -//! # Browse contracts with an initial search query -//! makima view contracts "my project" -//! -//! # Browse files without preview pane -//! makima view files --no-preview -//! -//! # Browse tasks for a specific contract -//! makima view tasks --contract-id <uuid> +//! # Browse with an initial search query +//! makima view "my project" //! //! # Change directory to selected task's worktree -//! cd $(makima view tasks) +//! cd $(makima view) //! ``` //! //! # Keyboard Shortcuts //! -//! | Key | Action | -//! |-------------|---------------------------| -//! | `↑` / `k` | Move selection up | -//! | `↓` / `j` | Move selection down | -//! | `Enter` | View/select item | -//! | `e` | Open in editor ($EDITOR) | -//! | `d` | Delete item (with confirm)| -//! | `Tab` | Toggle preview pane | -//! | `/` | Focus search input | -//! | `Esc` | Clear search / cancel | -//! | `q` | Quit | -//! | `c` | Navigate to worktree (cd) | -//! | `Ctrl+r` | Refresh data | -//! | `?` | Show help | +//! | Key | Action | +//! |---------------|-------------------------------| +//! | `↑` / `k` | Move selection up | +//! | `↓` / `j` | Move selection down | +//! | `Enter` / `l` | Drill into item | +//! | `Esc` / `h` | Go back to previous view | +//! | `e` | Edit item (inline) | +//! | `d` | Delete item (with confirm) | +//! | `/` | Focus search input | +//! | `Space` | Show details in preview pane | +//! | `q` | Quit | +//! | `c` | Navigate to worktree (cd) | +//! | `r` | Refresh data | +//! +//! # Navigation +//! +//! - **Contracts view**: Lists all contracts. Press Enter to see tasks. +//! - **Tasks view**: Shows tasks for a contract. Press Enter to view output. +//! - **Output view**: Streams real-time task output with tool call formatting. //! //! # Features //! +//! - **Drill-down Navigation**: Contracts → Tasks → Task Output //! - **Fuzzy Search**: Type to filter items in real-time -//! - **Multi-term Search**: Use space-separated terms (e.g., "fix bug") -//! - **Recency Sorting**: Recent items appear higher in results +//! - **Real-time Streaming**: View live task output via WebSocket //! - **Preview Pane**: See item details without leaving the list -//! - **Status Indicators**: Visual icons for task states -use clap::{Args, Subcommand}; -use uuid::Uuid; +use clap::Args; -/// Interactive TUI browser for tasks, contracts, and files. +/// Interactive TUI browser for contracts and tasks. /// -/// Provides a fuzzy-searchable interface for browsing and managing -/// makima entities with keyboard navigation and quick actions. +/// Provides a fuzzy-searchable interface for browsing contracts, +/// viewing their tasks, and streaming real-time task output. /// /// # Examples /// -/// Browse tasks: +/// Browse contracts: /// ```bash -/// makima view tasks +/// makima view /// ``` /// /// Browse with initial search: /// ```bash -/// makima view contracts "auth" +/// makima view "auth" /// ``` -#[derive(Subcommand, Debug)] -pub enum ViewCommand { - /// Browse tasks interactively - /// - /// Shows all tasks for the current contract with status indicators, - /// fuzzy search filtering, and quick actions. - Tasks(ViewArgs), - - /// Browse contracts interactively - /// - /// Lists all contracts with their phase, status, and task counts. - Contracts(ViewArgs), - - /// Browse files interactively - /// - /// Shows contract files with preview of their content. - Files(ViewArgs), -} - -/// Common arguments for view commands. -/// -/// These arguments are shared across all view subcommands (tasks, contracts, files). #[derive(Args, Debug, Clone)] pub struct ViewArgs { /// API URL for the makima server @@ -99,12 +74,6 @@ pub struct ViewArgs { #[arg(long, env = "MAKIMA_API_KEY")] pub api_key: String, - /// Contract ID to filter results (optional) - /// - /// When specified, only shows items belonging to this contract. - #[arg(long, env = "MAKIMA_CONTRACT_ID")] - pub contract_id: Option<Uuid>, - /// Initial search query /// /// Pre-populates the search field with this query when the TUI opens. @@ -117,12 +86,4 @@ pub struct ViewArgs { /// Useful for smaller terminal windows. #[arg(long)] pub no_preview: bool, - - /// Sort order for results - /// - /// - `recent`: Sort by last updated time (default) - /// - `name`: Sort alphabetically by name - /// - `status`: Group by status, then by name - #[arg(long, default_value = "recent")] - pub sort: String, } |