Add support for multiple AI coding assistants with multi-select #20
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -112,62 +112,81 @@ mkdir -p /workspace/.squarebox ~/.local/bin | |
| ai_prev="" | ||
| if [ -f "$AI_CONFIG" ]; then | ||
| ai_prev=$(cat "$AI_CONFIG") | ||
| # Migrate legacy single-choice values | ||
| case "$ai_prev" in | ||
| both) ai_prev="claude,opencode" ;; | ||
| esac | ||
| fi | ||
|
|
||
| if $INTERACTIVE; then | ||
| echo | ||
| if $HAS_GUM; then | ||
| # Build --selected from previously saved AI tools | ||
| gum_selected="" | ||
| for ai in $(echo "$ai_prev" | tr ',' ' '); do | ||
| case "$ai" in | ||
| claude) gum_selected="${gum_selected:+$gum_selected,}Claude Code" ;; | ||
| copilot) gum_selected="${gum_selected:+$gum_selected,}GitHub Copilot CLI" ;; | ||
| gemini) gum_selected="${gum_selected:+$gum_selected,}Google Gemini CLI" ;; | ||
| codex) gum_selected="${gum_selected:+$gum_selected,}OpenAI Codex CLI" ;; | ||
| opencode) gum_selected="${gum_selected:+$gum_selected,}OpenCode" ;; | ||
| esac | ||
| done | ||
| gum_args=(--no-limit --header "Select AI coding assistants (space=toggle, enter=confirm):") | ||
| [ -n "$gum_selected" ] && gum_args+=(--selected "$gum_selected") | ||
| selected=$(gum choose "${gum_args[@]}" \ | ||
| "Claude Code" "GitHub Copilot CLI" "Google Gemini CLI" \ | ||
| "OpenAI Codex CLI" "OpenCode") || true | ||
| ai_choice="" | ||
| while IFS= read -r line; do | ||
| case "$line" in | ||
| "Claude Code") ai_choice="${ai_choice:+$ai_choice,}claude" ;; | ||
| "GitHub Copilot CLI") ai_choice="${ai_choice:+$ai_choice,}copilot" ;; | ||
| "Google Gemini CLI") ai_choice="${ai_choice:+$ai_choice,}gemini" ;; | ||
| "OpenAI Codex CLI") ai_choice="${ai_choice:+$ai_choice,}codex" ;; | ||
| "OpenCode") ai_choice="${ai_choice:+$ai_choice,}opencode" ;; | ||
| esac | ||
| done <<< "$selected" | ||
| else | ||
| echo "Select AI coding assistants (comma-separated, 'all', or press Enter to skip):" | ||
| for ai_item in "1:claude:Claude Code" "2:copilot:GitHub Copilot CLI" "3:gemini:Google Gemini CLI" "4:codex:OpenAI Codex CLI" "5:opencode:OpenCode"; do | ||
| num="${ai_item%%:*}"; rest="${ai_item#*:}"; key="${rest%%:*}"; label="${rest#*:}" | ||
| if [[ ",$ai_prev," == *",${key},"* ]]; then | ||
| echo " ${num}) ${label} [installed]" | ||
| else | ||
| echo " ${num}) ${label}" | ||
| fi | ||
| done | ||
| read -rp "Selection [1,2,3,4,5/all/skip]: " ai_selection | ||
| if [ -z "$ai_selection" ] && [ -n "$ai_prev" ]; then | ||
| ai_choice="$ai_prev" | ||
| else | ||
| ai_choice="" | ||
| if [ "$ai_selection" = "all" ]; then | ||
| ai_choice="claude,copilot,gemini,codex,opencode" | ||
| elif [ -n "$ai_selection" ]; then | ||
| for item in $(echo "$ai_selection" | tr ',' ' '); do | ||
| case "$item" in | ||
| 1) ai_choice="${ai_choice:+$ai_choice,}claude" ;; | ||
| 2) ai_choice="${ai_choice:+$ai_choice,}copilot" ;; | ||
| 3) ai_choice="${ai_choice:+$ai_choice,}gemini" ;; | ||
| 4) ai_choice="${ai_choice:+$ai_choice,}codex" ;; | ||
| 5) ai_choice="${ai_choice:+$ai_choice,}opencode" ;; | ||
| esac | ||
| done | ||
| fi | ||
| fi | ||
| fi | ||
| echo "$ai_choice" > "$AI_CONFIG" | ||
| elif [ -n "$ai_prev" ]; then | ||
| ai_choice="$ai_prev" | ||
| echo "Installing AI tools: $ai_choice (from previous selection)" | ||
| else | ||
| echo "Defaulting to Claude Code (non-interactive)" | ||
| ai_choice="claude" | ||
| echo "$ai_choice" > "$AI_CONFIG" | ||
| fi | ||
|
|
||
| # Pinned versions — update via: scripts/update-versions.sh | ||
| OPENCODE_VERSION="1.3.15" | ||
| MICRO_VERSION="2.0.15" | ||
|
|
@@ -185,27 +204,115 @@ for _var in OPENCODE_VERSION MICRO_VERSION EDIT_VERSION EDIT_ASSET_VERSION FRESH | |
| fi | ||
| done | ||
|
|
||
| # Pinned SDK versions needed early (for npm-based AI tools) | ||
| NVM_VERSION="0.40.3" | ||
|
|
||
| # SDK path setup file (create if missing, preserve on retry) | ||
| touch ~/.squarebox-sdk-paths | ||
|
|
||
| install_node() { | ||
| if command -v node &>/dev/null; then echo "Node.js already installed, skipping."; return 0; fi | ||
| rm -rf "$HOME/.nvm" | ||
| echo "Installing Node.js (via nvm v${NVM_VERSION})..." | ||
| curl -fsSo /tmp/nvm-install.sh "https://raw.githubusercontent.com/nvm-sh/nvm/v${NVM_VERSION}/install.sh" | ||
| verify_checksum /tmp/nvm-install.sh "nvm-install-v${NVM_VERSION}.sh" | ||
| bash /tmp/nvm-install.sh | ||
| rm /tmp/nvm-install.sh | ||
| export NVM_DIR="$HOME/.nvm" | ||
| # shellcheck source=/dev/null | ||
| [ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh" | ||
| # Node.js binary verification is handled by nvm | ||
| nvm install --lts | ||
| if ! grep -q 'NVM_DIR' ~/.squarebox-sdk-paths 2>/dev/null; then | ||
| cat <<'PATHS' >> ~/.squarebox-sdk-paths | ||
| export NVM_DIR="$HOME/.nvm" | ||
| [ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh" | ||
| PATHS | ||
| fi | ||
| if ! command -v node &>/dev/null; then | ||
| echo "Error: Node.js binary not found after installation" >&2 | ||
| exit 1 | ||
| fi | ||
| } | ||
|
|
||
| # Ensure Node.js is available for npm-based AI tools | ||
| ensure_node_for_npm() { | ||
| if command -v node &>/dev/null; then return 0; fi | ||
| echo "Installing Node.js (required for npm-based AI tools)..." | ||
| install_node | ||
| # Ensure node/npm are available in this session | ||
| export NVM_DIR="$HOME/.nvm" | ||
| # shellcheck source=/dev/null | ||
| [ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh" | ||
| # Persist Node.js in SDK config so it survives rebuilds | ||
| local sdk_cfg="/workspace/.squarebox/sdks" | ||
| if [ -f "$sdk_cfg" ]; then | ||
| local sdk_current | ||
| sdk_current=$(cat "$sdk_cfg") | ||
| if [[ ",$sdk_current," != *",node,"* ]] && [ "$sdk_current" != "node" ]; then | ||
| echo "${sdk_current:+$sdk_current,}node" > "$sdk_cfg" | ||
| fi | ||
|
Comment on lines
+252
to
+254
There was a problem hiding this comment.
|
||
| else | ||
| echo "node" > "$sdk_cfg" | ||
| fi | ||
| } | ||
|
|
||
| install_copilot() { | ||
| if command -v github-copilot-cli &>/dev/null; then echo "GitHub Copilot CLI already installed, skipping."; return 0; fi | ||
| ensure_node_for_npm | ||
| echo "Installing GitHub Copilot CLI..." | ||
| npm install -g @githubnext/github-copilot-cli | ||
| } | ||
|
|
||
| install_gemini() { | ||
| if command -v gemini &>/dev/null; then echo "Google Gemini CLI already installed, skipping."; return 0; fi | ||
| ensure_node_for_npm | ||
| echo "Installing Google Gemini CLI..." | ||
| npm install -g @google/gemini-cli | ||
| } | ||
|
|
||
| install_codex() { | ||
| if command -v codex &>/dev/null; then echo "OpenAI Codex CLI already installed, skipping."; return 0; fi | ||
| ensure_node_for_npm | ||
| echo "Installing OpenAI Codex CLI..." | ||
| npm install -g @openai/codex | ||
| } | ||
|
|
||
| for ai_tool in $(echo "$ai_choice" | tr ',' ' '); do | ||
| case "$ai_tool" in | ||
| claude) | ||
| echo "Installing Claude Code..." | ||
| # Trust boundary: the Claude Code install script manages its own binary | ||
| # fetching and verification. We rely on HTTPS for script integrity. | ||
| curl -fsSL https://claude.ai/install.sh | bash | ||
| ;; | ||
| opencode) | ||
| if command -v opencode &>/dev/null; then | ||
| echo "OpenCode already installed, skipping." | ||
| else | ||
| echo "Installing OpenCode v${OPENCODE_VERSION}..." | ||
| sb_install opencode "$OPENCODE_VERSION" | ||
| fi | ||
| ;; | ||
| copilot) install_copilot ;; | ||
| gemini) install_gemini ;; | ||
| codex) install_codex ;; | ||
| esac | ||
| done | ||
|
|
||
| # Set aliases based on selection — c maps to first selected tool in priority order | ||
| { | ||
| c_target="" | ||
| for ai_tool in claude copilot gemini codex opencode; do | ||
| if [[ ",$ai_choice," == *",$ai_tool,"* ]]; then | ||
| [ -z "$c_target" ] && c_target="$ai_tool" | ||
| case "$ai_tool" in | ||
| claude) echo "alias claude-yolo='claude --dangerously-skip-permissions'" ;; | ||
| opencode) echo "alias opencode-yolo='opencode --dangerously-skip-permissions'" ;; | ||
| esac | ||
| fi | ||
| done | ||
| [ -n "$c_target" ] && echo "alias c='$c_target'" | ||
| } > ~/.squarebox-ai-aliases | ||
|
Comment on lines
+314
to
316
There was a problem hiding this comment.
Collaborator
Author
There was a problem hiding this comment. @copilot can you open a github issue for this so i can explore the best fix
Contributor
There was a problem hiding this comment. I wasn't able to create the issue programmatically (the token doesn't have Title: Body: Once the issue is open, option 1 (a |
||
|
|
||
| # Text editors | ||
|
|
@@ -468,44 +575,17 @@ else | |
| echo "$sdk_list" > "$SDK_CONFIG" | ||
| fi | ||
|
|
||
| # Pinned versions — update via: scripts/update-versions.sh | ||
| GO_VERSION="go1.26.1" | ||
|
|
||
| for _var in GO_VERSION; do | ||
| if [ -z "${!_var:-}" ]; then | ||
| echo "Error: ${_var} is empty or unset" >&2 | ||
| exit 1 | ||
| fi | ||
| done | ||
|
|
||
| # install_node is defined earlier (needed by npm-based AI tools) | ||
|
|
||
| install_python() { | ||
| if command -v uv &>/dev/null; then echo "uv already installed, skipping."; return 0; fi | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The Security section still states “All binary tools are pinned to specific versions…”, but the new npm-based AI tools are installed without version pinning (e.g.
npm install -g @google/gemini-cli). This makes the statement misleading. Either pin npm package versions (and document update process) or narrow the wording to distinguish pinned checksum-verified downloads from npm-installed packages.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@copilot apply changes based on this feedback