Phases 0-1 + Sprint A: module split, CLI layer, org-refresh fix, hygiene
- LICENSE (MIT) + README truth-pass; docs/cli.md CLI contract - CLI subcommands (src/cli_cmds/) per "TUI for users, CLI for users+AI" - Hub/detail refactor: keymap dispatch, modal split, action enum, BgMsg bus - Fix: org repos were never refreshed (owner==username match); refresh now parallel — 49 repos in ~11s, surfaced 70 previously invisible PRs - Fix: 3 date bugs in detail/git.rs (format-local, Local::now, 1y month math) - Stash indicator + [m] actions, session persistence, gh CLI token fallback - Legacy UI modules removed; plan/ docs (roadmap, audit, debate, handoff)
This commit is contained in:
dualfroz committed
1 parent
5787b14880
commit
0468c032c6
100 files changed
+11614
-9840
No files matched your search
@@ -0,0 +1,365 @@
|
||||
//! `process_modal_confirm` arms for sort/filter, repo creation entry points,
|
||||
//! select-by-condition, the in-TUI sync flow, the contextual [m] action menu
|
||||
//! (incl. PR/Issue creation), and the code-intelligence action chain.
|
||||
|
||||
use super::modals_spawn::{
|
||||
spawn_convention_preview, spawn_create_issue, spawn_create_pr, spawn_find_usages,
|
||||
spawn_list_functions, spawn_repo_stats, spawn_rename_preview,
|
||||
};
|
||||
use super::state::{HubState, MenuAction, Modal, PhaseResult, SelectTag, SortMode, TextTag};
|
||||
|
||||
/// Handles one step of a sort/filter, repo-creation, sync, Quick Actions, or
|
||||
/// code-intel modal chain. Returns `None` once `modal` has been consumed by
|
||||
/// one of this file's arms, or `Some(modal)` unchanged so the next file in
|
||||
/// the chain (see `modals::process_modal_confirm`) can try it.
|
||||
pub fn try_confirm(state: &mut HubState, modal: Modal) -> Option<Modal> {
|
||||
match modal {
|
||||
Modal::Select { cursor, tag: SelectTag::SortFilter, .. } => {
|
||||
match cursor {
|
||||
0 => state.sort_mode = SortMode::Default,
|
||||
1 => state.sort_mode = SortMode::Name,
|
||||
2 => state.sort_mode = SortMode::Age,
|
||||
3 => state.sort_mode = SortMode::DirtyFirst,
|
||||
4 => state.sort_mode = SortMode::BehindFirst,
|
||||
5 => state.filter_dirty = !state.filter_dirty,
|
||||
6 => state.filter_behind = !state.filter_behind,
|
||||
7 => state.filter_ahead = !state.filter_ahead,
|
||||
8 => state.filter_archived = !state.filter_archived,
|
||||
9 => {
|
||||
state.sort_mode = SortMode::Default;
|
||||
state.filter_dirty = false;
|
||||
state.filter_behind = false;
|
||||
state.filter_ahead = false;
|
||||
state.filter_archived = false;
|
||||
}
|
||||
_ => {}
|
||||
}
|
||||
state.rebuild_display();
|
||||
None
|
||||
}
|
||||
|
||||
Modal::Select { cursor, tag: SelectTag::NewRepo, .. } => {
|
||||
match cursor {
|
||||
0 => {
|
||||
let prompt = format!("Git URL (clones into {}):", state.workspace_root.display());
|
||||
state.modal = Modal::Text { title: "Clone from URL".into(), prompt, value: String::new(), tag: TextTag::CloneUrl, max_len: None };
|
||||
}
|
||||
1 => {
|
||||
state.modal = Modal::Text {
|
||||
title: "Link local folder".into(),
|
||||
prompt: "Absolute path to folder (~ supported):".into(),
|
||||
value: String::new(),
|
||||
tag: TextTag::LinkPath,
|
||||
max_len: None,
|
||||
};
|
||||
}
|
||||
2 => {
|
||||
let prompt = format!("Folder name (in {}):", state.workspace_root.display());
|
||||
state.modal = Modal::Text { title: "Create new repo".into(), prompt, value: String::new(), tag: TextTag::InitName, max_len: Some(60) };
|
||||
}
|
||||
3 => {
|
||||
state.modal = Modal::Text { title: "Link existing folder".into(), prompt: "Absolute path:".into(), value: String::new(), tag: TextTag::LinkPath, max_len: None };
|
||||
}
|
||||
_ => {}
|
||||
}
|
||||
None
|
||||
}
|
||||
|
||||
Modal::Select { cursor, tag: SelectTag::SelectByCondition, .. } => {
|
||||
let repos = &state.repos;
|
||||
let candidates: Vec<usize> = (0..repos.len()).filter(|&ri| state.passes_filter(ri)).collect();
|
||||
state.selected.clear();
|
||||
match cursor {
|
||||
0 => { for ri in candidates { state.selected.insert(ri); } }
|
||||
1 => { for ri in candidates { if repos[ri].is_dirty { state.selected.insert(ri); } } }
|
||||
2 => { for ri in candidates { if repos[ri].behind > 0 { state.selected.insert(ri); } } }
|
||||
3 => { for ri in candidates { if repos[ri].ahead > 0 { state.selected.insert(ri); } } }
|
||||
4 => { for ri in candidates { if !repos[ri].has_license { state.selected.insert(ri); } } }
|
||||
5 => { for ri in candidates { if repos[ri].lang.as_deref() == Some("Rust") { state.selected.insert(ri); } } }
|
||||
6 => { for ri in candidates { if repos[ri].lang.as_deref() == Some("TypeScript") { state.selected.insert(ri); } } }
|
||||
7 => { for ri in candidates { if repos[ri].lang.as_deref() == Some("Python") { state.selected.insert(ri); } } }
|
||||
8 => { for ri in candidates { if repos[ri].lang.as_deref() == Some("Go") { state.selected.insert(ri); } } }
|
||||
_ => {}
|
||||
}
|
||||
state.status_msg = Some(format!("Selected {} repos", state.selected.len()));
|
||||
None
|
||||
}
|
||||
|
||||
// ── Hub sync via in-TUI modals ────────────────────────────────────────
|
||||
Modal::Select { cursor, tag: SelectTag::SyncAction, .. } => {
|
||||
match cursor {
|
||||
0 => { // Pull
|
||||
state.pending_sync_action = Some("pull".into());
|
||||
state.pending_phase = Some(PhaseResult::ExecSync);
|
||||
}
|
||||
1 => { // Commit+Push
|
||||
state.pending_sync_action = Some("commit_push".into());
|
||||
state.modal = Modal::Text {
|
||||
title: "Sync — Commit Message".into(),
|
||||
prompt: "Message (stages all changes):".into(),
|
||||
value: "chore: update".into(),
|
||||
tag: TextTag::SyncMsg,
|
||||
max_len: None,
|
||||
};
|
||||
}
|
||||
_ => { // Push only
|
||||
state.pending_sync_action = Some("push_only".into());
|
||||
state.pending_phase = Some(PhaseResult::ExecSync);
|
||||
}
|
||||
}
|
||||
None
|
||||
}
|
||||
Modal::Text { value, tag: TextTag::SyncMsg, .. } => {
|
||||
state.pending_sync_msg = Some(value);
|
||||
state.pending_phase = Some(PhaseResult::ExecSync);
|
||||
None
|
||||
}
|
||||
|
||||
// ── Contextual [m] action menu ─────────────────────────────────────────
|
||||
Modal::Select { cursor, tag: SelectTag::ActionMenu(actions), .. } => {
|
||||
match actions.get(cursor) {
|
||||
Some(MenuAction::Key(k)) => {
|
||||
// Re-dispatch the entry's key through the global keymap.
|
||||
// `state.modal` is already None here (mem::replace in
|
||||
// process_modal_confirm), so a follow-up modal opened by
|
||||
// the handler lands cleanly.
|
||||
if let Some(phase) = super::keys_dispatch::handle_global_key(state, *k) {
|
||||
state.pending_phase = Some(phase);
|
||||
}
|
||||
}
|
||||
Some(MenuAction::NewPr) => {
|
||||
state.modal = Modal::Text {
|
||||
title: "New PR — Repository".into(),
|
||||
prompt: "Repo name:".into(),
|
||||
value: String::new(),
|
||||
tag: TextTag::PrRepo,
|
||||
max_len: Some(80),
|
||||
};
|
||||
}
|
||||
Some(MenuAction::NewIssue) => {
|
||||
state.modal = Modal::Text {
|
||||
title: "New Issue — Repository".into(),
|
||||
prompt: "Repo name:".into(),
|
||||
value: String::new(),
|
||||
tag: TextTag::IssueRepo,
|
||||
max_len: Some(80),
|
||||
};
|
||||
}
|
||||
Some(MenuAction::OpenAccountProfile) => {
|
||||
if let Some(acc) = state.accounts.first() {
|
||||
let host = acc.base_url.clone().unwrap_or_else(|| match acc.provider.as_str() {
|
||||
"gitlab" => "https://gitlab.com".into(),
|
||||
_ => "https://github.com".into(),
|
||||
});
|
||||
let url = format!("{}/{}", host.trim_end_matches('/'), acc.username);
|
||||
crate::util::open_path(&url);
|
||||
state.status_msg = Some("Opening profile in browser...".into());
|
||||
}
|
||||
}
|
||||
Some(MenuAction::CodeIntelPicker) => super::modals_spawn::open_codeintel_picker(state),
|
||||
Some(MenuAction::StashSave(ri)) | Some(MenuAction::StashPop(ri)) => {
|
||||
let ri = *ri;
|
||||
let repo = state.repos.get(ri)?;
|
||||
let (args, verb): (&[&str], _) = match actions.get(cursor) {
|
||||
Some(MenuAction::StashPop(_)) => (&["stash", "pop"], "popped"),
|
||||
_ => (&["stash"], "stashed"),
|
||||
};
|
||||
let path = repo.path.clone();
|
||||
let name = repo.name.clone();
|
||||
if crate::util::git::git_run_ok(&path, args) {
|
||||
// Point-refresh just this repo — no full rescan needed.
|
||||
if let Ok(fresh) = crate::status::repo_summary(&path) {
|
||||
let bookmarked = state.repos[ri].bookmarked;
|
||||
let (stars, oi, op) = (state.repos[ri].stars, state.repos[ri].open_issues, state.repos[ri].open_prs);
|
||||
state.repos[ri] = fresh;
|
||||
state.repos[ri].bookmarked = bookmarked;
|
||||
state.repos[ri].stars = stars;
|
||||
state.repos[ri].open_issues = oi;
|
||||
state.repos[ri].open_prs = op;
|
||||
}
|
||||
state.status_msg = Some(format!("{}: {}", name, verb));
|
||||
} else {
|
||||
state.status_msg = Some(format!("git stash failed on {} (conflict?)", name));
|
||||
}
|
||||
}
|
||||
None => {}
|
||||
}
|
||||
None
|
||||
}
|
||||
|
||||
Modal::Text { value, tag: TextTag::PrRepo, .. } => {
|
||||
let repo = value.trim().to_string();
|
||||
if repo.is_empty() { return None; }
|
||||
state.modal = Modal::Text {
|
||||
title: format!("New PR — '{}'", repo),
|
||||
prompt: "Title:".into(),
|
||||
value: String::new(),
|
||||
tag: TextTag::PrTitle(repo),
|
||||
max_len: None,
|
||||
};
|
||||
None
|
||||
}
|
||||
Modal::Text { value, tag: TextTag::PrTitle(repo), .. } => {
|
||||
let title = value.trim().to_string();
|
||||
if title.is_empty() { return None; }
|
||||
state.modal = Modal::Text {
|
||||
title: format!("New PR — '{}'", repo),
|
||||
prompt: "Head branch:".into(),
|
||||
value: String::new(),
|
||||
tag: TextTag::PrHead(repo, title),
|
||||
max_len: None,
|
||||
};
|
||||
None
|
||||
}
|
||||
Modal::Text { value, tag: TextTag::PrHead(repo, title), .. } => {
|
||||
let head = value.trim().to_string();
|
||||
if head.is_empty() { return None; }
|
||||
state.modal = Modal::Text {
|
||||
title: format!("New PR — '{}'", repo),
|
||||
prompt: "Base branch:".into(),
|
||||
value: "main".into(),
|
||||
tag: TextTag::PrBase(repo, title, head),
|
||||
max_len: None,
|
||||
};
|
||||
None
|
||||
}
|
||||
Modal::Text { value, tag: TextTag::PrBase(repo, title, head), .. } => {
|
||||
let base = if value.trim().is_empty() { "main".to_string() } else { value.trim().to_string() };
|
||||
spawn_create_pr(state, repo, title, head, base);
|
||||
None
|
||||
}
|
||||
|
||||
Modal::Text { value, tag: TextTag::IssueRepo, .. } => {
|
||||
let repo = value.trim().to_string();
|
||||
if repo.is_empty() { return None; }
|
||||
state.modal = Modal::Text {
|
||||
title: format!("New Issue — '{}'", repo),
|
||||
prompt: "Title:".into(),
|
||||
value: String::new(),
|
||||
tag: TextTag::IssueTitle(repo),
|
||||
max_len: None,
|
||||
};
|
||||
None
|
||||
}
|
||||
Modal::Text { value, tag: TextTag::IssueTitle(repo), .. } => {
|
||||
let title = value.trim().to_string();
|
||||
if title.is_empty() { return None; }
|
||||
spawn_create_issue(state, repo, title);
|
||||
None
|
||||
}
|
||||
|
||||
// ── Code intelligence (Stats tab, [m]) ─────────────────────────────────
|
||||
Modal::Select { cursor, tag: SelectTag::CodeIntelRepoPick, .. } => {
|
||||
if let Some(r) = state.repos.get(cursor) {
|
||||
let repo = r.path.clone();
|
||||
let name = r.name.clone();
|
||||
state.modal = Modal::Select {
|
||||
title: format!("Code Intel — '{}'", name),
|
||||
options: vec![
|
||||
"List functions — names only".into(),
|
||||
"List functions — names + args".into(),
|
||||
"List functions — names + args + meta (length, refs)".into(),
|
||||
"Find usages of an identifier...".into(),
|
||||
"Rename an identifier...".into(),
|
||||
"Convert naming convention...".into(),
|
||||
"Repo code stats".into(),
|
||||
],
|
||||
cursor: 0,
|
||||
tag: SelectTag::CodeIntelAction { repo, name },
|
||||
};
|
||||
}
|
||||
None
|
||||
}
|
||||
Modal::Select { cursor, tag: SelectTag::CodeIntelAction { repo, name }, .. } => {
|
||||
match cursor {
|
||||
0 => spawn_list_functions(state, repo, name, crate::codeintel::FuncFormat::NamesOnly),
|
||||
1 => spawn_list_functions(state, repo, name, crate::codeintel::FuncFormat::WithArgs),
|
||||
2 => spawn_list_functions(state, repo, name, crate::codeintel::FuncFormat::WithMeta),
|
||||
3 => {
|
||||
state.modal = Modal::Text {
|
||||
title: format!("Find usages — '{}'", name),
|
||||
prompt: "Identifier:".into(),
|
||||
value: String::new(),
|
||||
tag: TextTag::CodeIntelFindUsages { repo, name },
|
||||
max_len: Some(80),
|
||||
};
|
||||
}
|
||||
4 => {
|
||||
state.modal = Modal::Text {
|
||||
title: format!("Rename — '{}'", name),
|
||||
prompt: "Current identifier name:".into(),
|
||||
value: String::new(),
|
||||
tag: TextTag::CodeIntelRenameOld { repo, name },
|
||||
max_len: Some(80),
|
||||
};
|
||||
}
|
||||
5 => {
|
||||
state.modal = Modal::Select {
|
||||
title: "Convert naming convention — target".into(),
|
||||
options: vec!["snake_case".into(), "camelCase".into(), "PascalCase".into()],
|
||||
cursor: 0,
|
||||
tag: SelectTag::CodeIntelConvention { repo, name },
|
||||
};
|
||||
}
|
||||
_ => spawn_repo_stats(state, repo, name),
|
||||
}
|
||||
None
|
||||
}
|
||||
Modal::Text { value, tag: TextTag::CodeIntelFindUsages { repo, name }, .. } => {
|
||||
let ident = value.trim().to_string();
|
||||
if ident.is_empty() { return None; }
|
||||
spawn_find_usages(state, repo, name, ident);
|
||||
None
|
||||
}
|
||||
Modal::Text { value, tag: TextTag::CodeIntelRenameOld { repo, name }, .. } => {
|
||||
let old = value.trim().to_string();
|
||||
if old.is_empty() { return None; }
|
||||
state.modal = Modal::Text {
|
||||
title: format!("Rename '{}' to...", old),
|
||||
prompt: "New name:".into(),
|
||||
value: String::new(),
|
||||
tag: TextTag::CodeIntelRenameNew { repo, name, old },
|
||||
max_len: Some(80),
|
||||
};
|
||||
None
|
||||
}
|
||||
Modal::Text { value, tag: TextTag::CodeIntelRenameNew { repo, name, old }, .. } => {
|
||||
let new = value.trim().to_string();
|
||||
if new.is_empty() || new == old { return None; }
|
||||
spawn_rename_preview(state, repo, name, old, new);
|
||||
None
|
||||
}
|
||||
Modal::Select { cursor, tag: SelectTag::CodeIntelConvention { repo, name }, .. } => {
|
||||
let target = match cursor {
|
||||
0 => crate::codeintel::NamingConvention::Snake,
|
||||
1 => crate::codeintel::NamingConvention::Camel,
|
||||
_ => crate::codeintel::NamingConvention::Pascal,
|
||||
};
|
||||
spawn_convention_preview(state, repo, name, target);
|
||||
None
|
||||
}
|
||||
Modal::RenamePreview { plan, .. } => {
|
||||
let n_files = plan.file_count();
|
||||
let n_edits = plan.edits.len();
|
||||
match crate::codeintel::apply_rename_plan(&plan) {
|
||||
Ok(applied) => {
|
||||
state.modal = Modal::Info {
|
||||
title: "✓ Rename applied".into(),
|
||||
lines: vec![format!("{} edit{} across {} file{}", applied, if applied == 1 {""} else {"s"}, n_files, if n_files == 1 {""} else {"s"})],
|
||||
scroll: 0,
|
||||
};
|
||||
}
|
||||
Err(e) => {
|
||||
state.modal = Modal::Info {
|
||||
title: "✗ Rename failed".into(),
|
||||
lines: vec![format!("{} of {} edits may be applied — error: {e}", n_edits, n_edits)],
|
||||
scroll: 0,
|
||||
};
|
||||
}
|
||||
}
|
||||
None
|
||||
}
|
||||
|
||||
other => Some(other),
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user