theirongolddev/gitlore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(cli): Redesign CLI with noun-first subcommands

Browse Source 
Replaces the verb-first pattern ('lore list issues', 'lore show
issue 42') with noun-first subcommands that feel more natural:

  lore issues          # list issues
  lore issues 42       # show issue #42
  lore mrs             # list merge requests
  lore mrs 99          # show MR #99
  lore ingest          # ingest everything
  lore ingest issues   # ingest only issues
  lore count issues    # count issues
  lore status          # sync status
  lore auth            # verify auth
  lore doctor          # health check

Key changes:
- New IssuesArgs, MrsArgs, IngestArgs, CountArgs structs with
  short flags (-n, -s, -p, -a, -l, -o, -f, -J, etc.)
- Global -J/--json flag as shorthand for --robot
- 'lore ingest' with no argument ingests both issues and MRs,
  emitting combined JSON summary in robot mode
- --asc flag replaces --order=asc/desc for brevity
- Renamed flags: --has-due-date -> --has-due, --type -> --for,
  --confirm -> --yes, target_branch -> --target, etc.

Old commands (list, show, auth-test, sync-status) are preserved
as hidden backward-compat aliases that emit deprecation warnings
to stderr before delegating to the new handlers.

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
Taylor Eernisse
2026-01-29 08:42:26 -05:00
parent 8fe5feda7e
commit 856aad1641
2 changed files with 634 additions and 315 deletions
Download Patch File Download Diff File Expand all files Collapse all files

301
src/cli/mod.rs
View File

@@ -11,13 +11,17 @@ use std::io::IsTerminal;
#[command(version, about, long_about = None)]
pub struct Cli {
/// Path to config file
#[arg(short, long, global = true)]
#[arg(short = 'c', long, global = true)]
pub config: Option<String>,
/// Machine-readable JSON output (auto-enabled when piped)
#[arg(long, global = true, env = "LORE_ROBOT")]
pub robot: bool,
/// JSON output (global shorthand)
#[arg(short = 'J', long = "json", global = true)]
pub json: bool,
#[command(subcommand)]
pub command: Commands,
}
@@ -25,17 +29,41 @@ pub struct Cli {
impl Cli {
/// Check if robot mode is active (explicit flag, env var, or non-TTY stdout)
pub fn is_robot_mode(&self) -> bool {
self.robot || !std::io::stdout().is_terminal()
self.robot || self.json || !std::io::stdout().is_terminal()
}
}
#[derive(Subcommand)]
#[allow(clippy::large_enum_variant)]
pub enum Commands {
/// List or show issues
Issues(IssuesArgs),
/// List or show merge requests
Mrs(MrsArgs),
/// Ingest data from GitLab
Ingest(IngestArgs),
/// Count entities in local database
Count(CountArgs),
/// Show sync state
Status,
/// Verify GitLab authentication
Auth,
/// Check environment health
Doctor,
/// Show version information
Version,
/// Initialize configuration and database
Init {
/// Skip overwrite confirmation
#[arg(long)]
#[arg(short = 'f', long)]
force: bool,
/// Fail if prompts would be shown
@@ -43,149 +71,67 @@ pub enum Commands {
non_interactive: bool,
},
/// Verify GitLab authentication
AuthTest,
/// Check environment health
Doctor {
/// Output as JSON
#[arg(long)]
json: bool,
},
/// Show version information
Version,
/// Create timestamped database backup
Backup,
/// Delete database and reset all state
Reset {
/// Skip confirmation prompt
#[arg(long)]
confirm: bool,
#[arg(short = 'y', long)]
yes: bool,
},
/// Run pending database migrations
Migrate,
/// Show sync state
SyncStatus,
/// Ingest data from GitLab
Ingest {
/// Resource type to ingest
#[arg(long, value_parser = ["issues", "mrs"])]
r#type: String,
/// Filter to single project
#[arg(long)]
project: Option<String>,
/// Override stale sync lock
#[arg(long)]
force: bool,
/// Full re-sync: reset cursors and fetch all data from scratch
#[arg(long)]
full: bool,
},
/// List issues or MRs from local database
// --- Hidden backward-compat aliases ---
/// List issues or MRs (deprecated: use 'lore issues' or 'lore mrs')
#[command(hide = true)]
List {
/// Entity type to list
#[arg(value_parser = ["issues", "mrs"])]
entity: String,
/// Maximum results
#[arg(long, default_value = "50")]
limit: usize,
/// Filter by project path
#[arg(long)]
project: Option<String>,
/// Filter by state (opened|closed|all for issues; opened|merged|closed|locked|all for MRs)
#[arg(long)]
state: Option<String>,
/// Filter by author username
#[arg(long)]
author: Option<String>,
/// Filter by assignee username
#[arg(long)]
assignee: Option<String>,
/// Filter by label (repeatable, AND logic)
#[arg(long)]
label: Option<Vec<String>>,
/// Filter by milestone title (issues only)
#[arg(long)]
milestone: Option<String>,
/// Filter by time (7d, 2w, 1m, or YYYY-MM-DD)
#[arg(long)]
since: Option<String>,
/// Filter by due date (before this date, YYYY-MM-DD) (issues only)
#[arg(long)]
due_before: Option<String>,
/// Show only issues with a due date (issues only)
#[arg(long)]
has_due_date: bool,
/// Sort field
#[arg(long, value_parser = ["updated", "created", "iid"], default_value = "updated")]
sort: String,
/// Sort order
#[arg(long, value_parser = ["desc", "asc"], default_value = "desc")]
order: String,
/// Open first matching item in browser
#[arg(long)]
open: bool,
/// Output as JSON
#[arg(long)]
json: bool,
/// Show only draft MRs (MRs only)
#[arg(long, conflicts_with = "no_draft")]
draft: bool,
/// Exclude draft MRs (MRs only)
#[arg(long, conflicts_with = "draft")]
no_draft: bool,
/// Filter by reviewer username (MRs only)
#[arg(long)]
reviewer: Option<String>,
/// Filter by target branch (MRs only)
#[arg(long)]
target_branch: Option<String>,
/// Filter by source branch (MRs only)
#[arg(long)]
source_branch: Option<String>,
},
/// Count entities in local database
Count {
/// Entity type to count
#[arg(value_parser = ["issues", "mrs", "discussions", "notes"])]
entity: String,
/// Filter by noteable type (for discussions/notes)
#[arg(long, value_parser = ["issue", "mr"])]
r#type: Option<String>,
},
/// Show detailed entity information
/// Show detailed entity information (deprecated: use 'lore issues <IID>' or 'lore mrs <IID>')
#[command(hide = true)]
Show {
/// Entity type to show
#[arg(value_parser = ["issue", "mr"])]
@@ -194,12 +140,173 @@ pub enum Commands {
/// Entity IID
iid: i64,
/// Filter by project path (required if iid is ambiguous)
#[arg(long)]
project: Option<String>,
/// Output as JSON
#[arg(long)]
json: bool,
},
/// Verify GitLab authentication (deprecated: use 'lore auth')
#[command(hide = true, name = "auth-test")]
AuthTest,
/// Show sync state (deprecated: use 'lore status')
#[command(hide = true, name = "sync-status")]
SyncStatus,
}
/// Arguments for `lore issues [IID]`
#[derive(Parser)]
pub struct IssuesArgs {
/// Issue IID (omit to list, provide to show details)
pub iid: Option<i64>,
/// Maximum results
#[arg(short = 'n', long = "limit", default_value = "50")]
pub limit: usize,
/// Filter by state (opened, closed, all)
#[arg(short = 's', long)]
pub state: Option<String>,
/// Filter by project path
#[arg(short = 'p', long)]
pub project: Option<String>,
/// Filter by author username
#[arg(short = 'a', long)]
pub author: Option<String>,
/// Filter by assignee username
#[arg(short = 'A', long)]
pub assignee: Option<String>,
/// Filter by label (repeatable, AND logic)
#[arg(short = 'l', long)]
pub label: Option<Vec<String>>,
/// Filter by milestone title
#[arg(short = 'm', long)]
pub milestone: Option<String>,
/// Filter by time (7d, 2w, 1m, or YYYY-MM-DD)
#[arg(long)]
pub since: Option<String>,
/// Filter by due date (before this date, YYYY-MM-DD)
#[arg(long = "due-before")]
pub due_before: Option<String>,
/// Show only issues with a due date
#[arg(long = "has-due")]
pub has_due: bool,
/// Sort field (updated, created, iid)
#[arg(long, value_parser = ["updated", "created", "iid"], default_value = "updated")]
pub sort: String,
/// Sort ascending (default: descending)
#[arg(long)]
pub asc: bool,
/// Open first matching item in browser
#[arg(short = 'o', long)]
pub open: bool,
}
/// Arguments for `lore mrs [IID]`
#[derive(Parser)]
pub struct MrsArgs {
/// MR IID (omit to list, provide to show details)
pub iid: Option<i64>,
/// Maximum results
#[arg(short = 'n', long = "limit", default_value = "50")]
pub limit: usize,
/// Filter by state (opened, merged, closed, locked, all)
#[arg(short = 's', long)]
pub state: Option<String>,
/// Filter by project path
#[arg(short = 'p', long)]
pub project: Option<String>,
/// Filter by author username
#[arg(short = 'a', long)]
pub author: Option<String>,
/// Filter by assignee username
#[arg(short = 'A', long)]
pub assignee: Option<String>,
/// Filter by reviewer username
#[arg(short = 'r', long)]
pub reviewer: Option<String>,
/// Filter by label (repeatable, AND logic)
#[arg(short = 'l', long)]
pub label: Option<Vec<String>>,
/// Filter by time (7d, 2w, 1m, or YYYY-MM-DD)
#[arg(long)]
pub since: Option<String>,
/// Show only draft MRs
#[arg(short = 'd', long, conflicts_with = "no_draft")]
pub draft: bool,
/// Exclude draft MRs
#[arg(short = 'D', long = "no-draft", conflicts_with = "draft")]
pub no_draft: bool,
/// Filter by target branch
#[arg(long)]
pub target: Option<String>,
/// Filter by source branch
#[arg(long)]
pub source: Option<String>,
/// Sort field (updated, created, iid)
#[arg(long, value_parser = ["updated", "created", "iid"], default_value = "updated")]
pub sort: String,
/// Sort ascending (default: descending)
#[arg(long)]
pub asc: bool,
/// Open first matching item in browser
#[arg(short = 'o', long)]
pub open: bool,
}
/// Arguments for `lore ingest [ENTITY]`
#[derive(Parser)]
pub struct IngestArgs {
/// Entity to ingest (issues, mrs). Omit to ingest everything.
#[arg(value_parser = ["issues", "mrs"])]
pub entity: Option<String>,
/// Filter to single project
#[arg(short = 'p', long)]
pub project: Option<String>,
/// Override stale sync lock
#[arg(short = 'f', long)]
pub force: bool,
/// Full re-sync: reset cursors and fetch all data from scratch
#[arg(long)]
pub full: bool,
}
/// Arguments for `lore count <ENTITY>`
#[derive(Parser)]
pub struct CountArgs {
/// Entity type to count (issues, mrs, discussions, notes)
#[arg(value_parser = ["issues", "mrs", "discussions", "notes"])]
pub entity: String,
/// Parent type filter: issue or mr (for discussions/notes)
#[arg(short = 'f', long = "for", value_parser = ["issue", "mr"])]
pub for_entity: Option<String>,
}