summaryrefslogtreecommitdiff
path: root/makima/src/bin/makima.rs
diff options
context:
space:
mode:
authorsoryu <soryu@soryu.co>2026-02-19 23:40:07 +0000
committerGitHub <noreply@github.com>2026-02-19 23:40:07 +0000
commited84d7ec5ece272a2cb8dabd36cbd6074df0887e (patch)
treead8bd85b44c577e656274bc846b0051837907038 /makima/src/bin/makima.rs
parent28b191cc0b0e69b864191673df9c141730c93e4f (diff)
downloadsoryu-ed84d7ec5ece272a2cb8dabd36cbd6074df0887e.tar.gz
soryu-ed84d7ec5ece272a2cb8dabd36cbd6074df0887e.zip
feat: add git/gh auth checks, git fetch on worktree, fix contracts overflow (#72)
* feat: soryu-co/soryu - makima: Fix contracts page overflow - constrain layout to viewport height * feat: soryu-co/soryu - makima: Add git fetch to create_worktree and improve completion prompt merge conflict handling * WIP: heartbeat checkpoint
Diffstat (limited to 'makima/src/bin/makima.rs')
-rw-r--r--makima/src/bin/makima.rs35
1 files changed, 5 insertions, 30 deletions
diff --git a/makima/src/bin/makima.rs b/makima/src/bin/makima.rs
index 406f6e1..070e28e 100644
--- a/makima/src/bin/makima.rs
+++ b/makima/src/bin/makima.rs
@@ -85,36 +85,8 @@ async fn run_daemon(
// Check for missing critical dependencies
if !dep_result.claude.installed {
let os = setup::OperatingSystem::detect();
-
- // If npm is available, offer to install Claude Code
- if dep_result.npm_available() {
- eprintln!();
- if setup::read_yes_no("Would you like to install Claude Code now?") {
- match setup::install_claude_with_npm().await {
- Ok(()) => {
- eprintln!();
- // Re-check to verify installation
- let recheck = setup::check_dependencies().await;
- if !recheck.claude.installed {
- eprintln!("\x1b[31mClaude Code installation could not be verified.\x1b[0m");
- eprintln!("Please try installing manually and restart the daemon.");
- std::process::exit(1);
- }
- }
- Err(e) => {
- eprintln!("\x1b[31mFailed to install Claude Code: {}\x1b[0m", e);
- setup::print_claude_install_instructions(os, true);
- std::process::exit(1);
- }
- }
- } else {
- setup::print_claude_install_instructions(os, true);
- std::process::exit(1);
- }
- } else {
- setup::print_claude_install_instructions(os, false);
- std::process::exit(1);
- }
+ setup::print_claude_install_instructions(os);
+ std::process::exit(1);
}
if !dep_result.git.installed {
@@ -122,6 +94,9 @@ async fn run_daemon(
setup::print_git_install_instructions(os);
std::process::exit(1);
}
+
+ // Print git authentication warnings (non-fatal)
+ setup::print_git_auth_warnings(&dep_result);
}
// Install Claude Code skills for makima commands