Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ path = "lib.rs"
[dependencies]
git-ai = { git = "https://github.com/git-ai-project/git-ai", branch = "main" }
rtk = { git = "https://github.com/rtk-ai/rtk", branch = "master" }
worktrunk = "0.33.0"
worktrunk = "0.34.2"
yek = "0.22.1"
9 changes: 9 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,9 @@ rtk-rewrite-sync: ## Sync rtk-rewrite.sh from upstream rtk repo.
.PHONY: update
update: nix-update neovim-update gitalias-update llm-update overlays-update ## Update Nix flake, overlays, Neovim plugins, LLM configs, gitalias, and bun deps

.PHONY: update-lock
update-lock: nix-flake-update bun-update cargo-update ## Update lock files for Nix flake, bun, and Cargo.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

The update-lock target depends on nix-flake-update, which is not defined in the visible portions of the Makefile, while the update target (line 247) uses nix-update. This inconsistency may lead to failures if nix-flake-update is missing or was intended to be nix-update.


Comment on lines +249 to +251

Copilot AI Apr 7, 2026

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

update-lock claims to only update lock files, but it invokes bun-update, which runs bun update --latest --recursive and will also modify dependency versions in package.json (not just bun.lock). Consider renaming the target / adjusting the description, or splitting into separate targets (e.g., one that only regenerates bun.lock via bun install, and another that bumps dependency ranges).

Copilot uses AI. Check for mistakes.
.PHONY: bun-update
bun-update: ## Update bun dependencies to latest and regenerate lock file.
@echo "📦 Updating bun dependencies..."
Expand All @@ -254,6 +257,12 @@ bun-update: ## Update bun dependencies to latest and regenerate lock file.
@bun install
@echo "✅ bun dependencies updated"

.PHONY: cargo-update
cargo-update: ## Update Rust dependencies to latest and regenerate lock file.
@echo "🦀 Updating Cargo dependencies..."
@cargo +nightly update --breaking -Z unstable-options

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

Using cargo +nightly with unstable flags (-Z unstable-options, --breaking) introduces a hard dependency on the nightly toolchain and experimental features. This can lead to reproducibility issues and failures in environments where only the stable toolchain is available.

@echo "✅ Cargo dependencies updated"

Comment on lines +260 to +265

Copilot AI Apr 7, 2026

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cargo-update uses cargo +nightly update --breaking -Z unstable-options, which forces nightly Cargo and explicitly opts into semver-breaking dependency updates. If this target is meant for routine updates, consider making breaking updates opt-in (e.g., a separate cargo-update-breaking target or a flag variable) and/or add a short guard/error message when rustup/cargo aren’t available so failures are clearer.

Suggested change
.PHONY: cargo-update
cargo-update: ## Update Rust dependencies to latest and regenerate lock file.
@echo "🦀 Updating Cargo dependencies..."
@cargo +nightly update --breaking -Z unstable-options
@echo "✅ Cargo dependencies updated"
.PHONY: cargo-update cargo-update-breaking
cargo-update: ## Update Rust dependencies and regenerate lock file.
@echo "🦀 Updating Cargo dependencies..."
@command -v cargo >/dev/null 2>&1 || { echo "❌ cargo is required for 'make cargo-update'"; exit 1; }
@cargo update
@echo "✅ Cargo dependencies updated"
cargo-update-breaking: ## Update Rust dependencies with semver-breaking upgrades (requires rustup nightly).
@echo "🦀 Updating Cargo dependencies with breaking changes..."
@command -v rustup >/dev/null 2>&1 || { echo "❌ rustup is required for 'make cargo-update-breaking'"; exit 1; }
@command -v cargo >/dev/null 2>&1 || { echo "❌ cargo is required for 'make cargo-update-breaking'"; exit 1; }
@cargo +nightly update --breaking -Z unstable-options
@echo "✅ Cargo dependencies updated with breaking changes"

Copilot uses AI. Check for mistakes.
.PHONY: gitalias-update
gitalias-update: ## Download latest gitalias.txt from upstream.
@echo "📥 Updating gitalias.txt..."
Expand Down
Loading
Loading