feat: update Justfile for improved architecture detection and add new installation recipes

Signed-off-by: Aaron Wislang <aaron.wislang@microsoft.com>

Author: asw101

.devcontainer/just/Justfile

@@ -1,12 +1,13 @@
 set shell := ["bash", "-uc"]
 
-arch := `dpkg --print-architecture`
+arch := `uname -m | sed 's/x86_64/amd64/;s/aarch64/arm64/'`
 GO_VERSION := env_var_or_default("GO_VERSION", "1.25.1")
 TARGETARCH := env_var_or_default("TARGETARCH", arch)
 IMAGE := env_var_or_default("JUST_IMAGE", "just-dev:latest")
 CONTAINER_CMD := env_var_or_default("JUST_CONTAINER_CMD", "bash")
 WASSETTE_REF := env_var_or_default("WASSETTE_REF", "main")
 WASSETTE_REF_TYPE := env_var_or_default("WASSETTE_REF_TYPE", "branch")
+PORT := env_var_or_default("PORT", "8080")
 
 export CARGO_HOME := "/home/vscode/.cargo"
 export RUSTUP_HOME := "/home/vscode/.rustup"
@@ -18,6 +19,37 @@ alias default := list
 list:
     just --list
 
+run-sequential *recipes:
+    #!/usr/bin/env bash
+    set -euxo pipefail
+    for recipe in {{recipes}}; do
+        echo "Running recipe: $recipe"
+        just "$recipe"
+    done
+
+setup-completions:
+    #!/usr/bin/env bash
+    set -euxo pipefail
+    # Setup bash completion
+    mkdir -p /etc/bash_completion.d
+    just --completions bash > /etc/bash_completion.d/just
+    # Setup zsh completion for vscode user
+    mkdir -p /home/vscode/.zsh/completion
+    just --completions zsh > /home/vscode/.zsh/completion/_just
+    chown -R vscode:vscode /home/vscode/.zsh
+    # Add to vscode's .zshrc if not already there
+    if [ -f /home/vscode/.zshrc ]; then
+        if ! grep -q "fpath=(.*\.zsh/completion" /home/vscode/.zshrc; then
+            echo 'fpath=(~/.zsh/completion $fpath)' >> /home/vscode/.zshrc
+            echo 'autoload -Uz compinit && compinit' >> /home/vscode/.zshrc
+        fi
+    else
+        echo 'fpath=(~/.zsh/completion $fpath)' > /home/vscode/.zshrc
+        echo 'autoload -Uz compinit && compinit' >> /home/vscode/.zshrc
+        chown vscode:vscode /home/vscode/.zshrc
+    fi
+    echo "Completions installed. Restart your shell or run: source ~/.bashrc (or ~/.zshrc)"
+
 install-go:
     #!/usr/bin/env bash
     set -euxo pipefail
@@ -55,7 +87,42 @@ install-node:
     node --version
     npm --version
 
-configure-npm-prefix:
+install-java:
+    #!/usr/bin/env bash
+    set -euxo pipefail
+    apt-get update
+    apt-get install -y --no-install-recommends openjdk-21-jdk
+    rm -rf /var/lib/apt/lists/*
+    java -version
+    javac -version
+
+install-maven: install-java
+    #!/usr/bin/env bash
+    set -euxo pipefail
+    MAVEN_VERSION="3.9.9"
+    apt-get update
+    apt-get install -y --no-install-recommends wget tar
+    rm -rf /var/lib/apt/lists/*
+    wget -q -O /tmp/maven.tar.gz "https://archive.apache.org/dist/maven/maven-3/${MAVEN_VERSION}/binaries/apache-maven-${MAVEN_VERSION}-bin.tar.gz"
+    tar -C /opt -xzf /tmp/maven.tar.gz
+    ln -sf "/opt/apache-maven-${MAVEN_VERSION}/bin/mvn" /usr/local/bin/mvn
+    rm /tmp/maven.tar.gz
+    mvn --version
+
+install-gradle: install-java
+    #!/usr/bin/env bash
+    set -euxo pipefail
+    GRADLE_VERSION="8.11.1"
+    apt-get update
+    apt-get install -y --no-install-recommends wget unzip
+    rm -rf /var/lib/apt/lists/*
+    wget -q -O /tmp/gradle.zip "https://services.gradle.org/distributions/gradle-${GRADLE_VERSION}-bin.zip"
+    unzip -q /tmp/gradle.zip -d /opt
+    ln -sf "/opt/gradle-${GRADLE_VERSION}/bin/gradle" /usr/local/bin/gradle
+    rm /tmp/gradle.zip
+    gradle --version
+
+configure-npm-prefix: install-node
     #!/usr/bin/env bash
     set -euxo pipefail
     mkdir -p /home/vscode/.npm-global
@@ -92,11 +159,17 @@ install-homebrew:
     apt-get install -y --no-install-recommends build-essential procps curl file git
     rm -rf /var/lib/apt/lists/*
     {{vscode}} bash -lc 'if [ ! -d /home/linuxbrew/.linuxbrew ]; then NONINTERACTIVE=1 /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"; fi'
-    {{vscode}} bash -lc 'eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)" && brew update && brew install codex sst/tap/opencode'
+    {{vscode}} bash -lc 'eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)" && brew update'
     printf 'eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"\n' > /etc/profile.d/homebrew.sh
     {{vscode}} bash -lc 'if ! grep -q "brew shellenv" ~/.bashrc; then echo "eval \"$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)\"" >> ~/.bashrc; fi'
 
-install-cli-npm: configure-npm-prefix install-node
+install-brew-codex: install-homebrew
+    {{vscode}} bash -lc 'eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)" && brew install codex'
+
+install-brew-opencode: install-homebrew
+    {{vscode}} bash -lc 'eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)" && brew install sst/tap/opencode'
+
+install-cli-npm: configure-npm-prefix
     {{vscode}} bash -lc 'npm install -g @anthropic-ai/claude-code @google/gemini-cli @charmland/crush @github/copilot'
 
 install-llm:
@@ -108,7 +181,18 @@ install-llm:
     python3 -m venv /opt/llm-env
     chown -R vscode:vscode /opt/llm-env
     {{vscode}} bash -lc '/opt/llm-env/bin/pip install --upgrade pip'
-    {{vscode}} bash -lc '/opt/llm-env/bin/pip install llm llm-gpt4all llm-claude-3 llm-gemini llm-ollama llm-foundry'
+    {{vscode}} bash -lc '/opt/llm-env/bin/pip install llm'
+
+install-llm-plugins: install-llm
+    #!/usr/bin/env bash
+    set -euxo pipefail
+    {{vscode}} bash -lc '/opt/llm-env/bin/pip install llm-claude-3 llm-gemini llm-ollama llm-foundry'
+
+install-llm-gpt4all: install-llm
+    #!/usr/bin/env bash
+    set -euxo pipefail
+    # Note: gpt4all may have shared library dependencies issues on some systems
+    {{vscode}} bash -lc '/opt/llm-env/bin/pip install llm-gpt4all'
 
 install-wassette:
     #!/usr/bin/env bash
@@ -124,11 +208,43 @@ link-wassette: install-wassette
     ln -sf /home/vscode/.cargo/bin/wassette /usr/local/bin/wassette
     ls -la /usr/local/bin/wassette
 
-install-all: install-go install-rust install-node configure-npm-prefix install-azure-cli install-github-cli install-homebrew install-cli-npm install-llm install-wassette link-wassette
+install-all: install-go install-rust install-node install-java install-maven install-gradle configure-npm-prefix install-azure-cli install-github-cli install-homebrew install-brew-codex install-brew-opencode install-cli-npm install-llm install-llm-plugins install-wassette link-wassette
     @echo "All components installed"
 
+build-docker:
+    docker build -t {{IMAGE}} --build-arg TARGETARCH={{TARGETARCH}} --build-arg GO_VERSION={{GO_VERSION}} .
+
+build-docker-all:
+    #!/usr/bin/env bash
+    set -euxo pipefail
+    IMAGE_BASE="$(echo {{IMAGE}} | cut -d: -f1)"
+    docker build -t "${IMAGE_BASE}:all" --build-arg TARGETARCH={{TARGETARCH}} --build-arg GO_VERSION={{GO_VERSION}} --build-arg INSTALL_ALL=true .
+
+build-macos-container:
+    #!/usr/bin/env bash
+    set -euxo pipefail
+    container system start || true
+    container build -t {{IMAGE}} --build-arg TARGETARCH={{TARGETARCH}} --build-arg GO_VERSION={{GO_VERSION}} .
+
+build-macos-container-all:
+    #!/usr/bin/env bash
+    set -euxo pipefail
+    container system start || true
+    IMAGE_BASE="$(echo {{IMAGE}} | cut -d: -f1)"
+    container build -t "${IMAGE_BASE}:all" --build-arg TARGETARCH={{TARGETARCH}} --build-arg GO_VERSION={{GO_VERSION}} --build-arg INSTALL_ALL=true .
+
+stop-containers:
+    #!/usr/bin/env bash
+    set -eux
+    # Stop all running containers based on the image
+    container ps -q -f ancestor={{IMAGE}} | xargs -r container stop || true
+    docker ps -q -f ancestor={{IMAGE}} | xargs -r docker stop || true
+
 run-docker:
-    docker run --rm -it -p 8080:8080 -v "$(pwd)":/pwd -w /pwd {{IMAGE}} {{CONTAINER_CMD}}
+    docker run --rm -it -p {{PORT}}:8080 -v "$(pwd)":/pwd -w /pwd {{IMAGE}} {{CONTAINER_CMD}}
 
 run-macos-container:
-    container run --rm --publish 8080:8080 --volume "$(pwd)":/pwd --workdir /pwd {{IMAGE}} {{CONTAINER_CMD}}
+    #!/usr/bin/env bash
+    set -euxo pipefail
+    container system start || true
+    container run --rm -it --publish {{PORT}}:8080 --volume "$(pwd)":/pwd --workdir /pwd {{IMAGE}} {{CONTAINER_CMD}}