From 417bb666b2461b865bac62d5da41a95c3b5dbe14 Mon Sep 17 00:00:00 2001
From: Chris Wanstrath <chris@ozmm.org>
Date: Sat, 21 Feb 2026 08:45:32 -0800
Subject: [PATCH] Refactor tooling install steps and extract PATH constant

---
 src/vm.ts | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/vm.ts b/src/vm.ts
index 6a69762..46c85d8 100644
--- a/src/vm.ts
+++ b/src/vm.ts
@@ -6,6 +6,7 @@ import { getApiKey } from "./env.ts"
 const CONTAINER_NAME = "sandlot"
 const USER = "ubuntu"
 const CLAUDE_BIN = `/home/${USER}/.local/bin/claude`
+const CONTAINER_PATH = `/home/${USER}/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin`
 
 /** Translate a host path to its corresponding container path. */
 export function containerPath(hostPath: string): string {
@@ -74,11 +75,20 @@ async function hasCachedTooling(): Promise<boolean> {
 
 /** Install Bun, Claude Code, neofetch, and Neovim using cached binaries when available. */
 async function installTooling(cached: boolean, log?: (msg: string) => void): Promise<void> {
+  // Ensure cache directory exists on the host (mounted at /sandlot/.cache in the container)
+  await $`mkdir -p ${CACHE_DIR}`.quiet()
+
   if (cached) {
     log?.("Installing packages (cached)")
     await run(
-      $`container exec --user ${USER} ${CONTAINER_NAME} bash -c ${"mkdir -p ~/.local/bin && cp /sandlot/.cache/bun /sandlot/.cache/claude /sandlot/.cache/neofetch ~/.local/bin/ && chmod +x ~/.local/bin/bun ~/.local/bin/claude ~/.local/bin/neofetch && ln -sf bun ~/.local/bin/bunx && tar xzf /sandlot/.cache/nvim.tar.gz -C ~/.local --strip-components=1"}`,
-      "Install from cache")
+      $`container exec --user ${USER} ${CONTAINER_NAME} bash -c ${"mkdir -p ~/.local/bin"}`,
+      "Create bin directory")
+    await run(
+      $`container exec --user ${USER} ${CONTAINER_NAME} bash -c ${"cp /sandlot/.cache/bun /sandlot/.cache/claude /sandlot/.cache/neofetch ~/.local/bin/ && chmod +x ~/.local/bin/bun ~/.local/bin/claude ~/.local/bin/neofetch && ln -sf bun ~/.local/bin/bunx"}`,
+      "Install cached binaries")
+    await run(
+      $`container exec --user ${USER} ${CONTAINER_NAME} bash -c ${"tar xzf /sandlot/.cache/nvim.tar.gz -C ~/.local --strip-components=1"}`,
+      "Install cached Neovim")
     return
   }
 
@@ -99,11 +109,11 @@ async function installTooling(cached: boolean, log?: (msg: string) => void): Pro
 
   log?.("Installing Neovim")
   await run(
-    $`container exec --user ${USER} ${CONTAINER_NAME} bash -c ${"curl -fsSL https://github.com/neovim/neovim/releases/latest/download/nvim-linux-arm64.tar.gz -o /sandlot/.cache/nvim.tar.gz && tar xzf /sandlot/.cache/nvim.tar.gz -C ~/.local --strip-components=1"}`,
+    $`container exec --user ${USER} ${CONTAINER_NAME} bash -c ${"curl -fsSL https://github.com/neovim/neovim/releases/latest/download/nvim-linux-arm64.tar.gz -o /tmp/nvim.tar.gz && tar xzf /tmp/nvim.tar.gz -C ~/.local --strip-components=1"}`,
     "Neovim installation")
 
   // Cache binaries for next time
-  await $`container exec --user ${USER} ${CONTAINER_NAME} bash -c ${"cp ~/.local/bin/bun ~/.local/bin/claude ~/.local/bin/neofetch /sandlot/.cache/"}`.nothrow().quiet()
+  await $`container exec --user ${USER} ${CONTAINER_NAME} bash -c ${"cp ~/.local/bin/bun ~/.local/bin/claude ~/.local/bin/neofetch /sandlot/.cache/ && cp /tmp/nvim.tar.gz /sandlot/.cache/nvim.tar.gz"}`.nothrow().quiet()
 }
 
 /** Configure git identity, API key helper, activity hook, and Claude settings. */
@@ -242,7 +252,7 @@ export async function claude(workdir: string, opts?: { prompt?: string; print?:
   const systemPrompt = systemPromptLines.join("\n")
 
   const term = process.env.TERM || "xterm-256color"
-  const args = ["container", "exec", "-it", "--user", USER, "--workdir", cwd, CONTAINER_NAME, "env", `TERM=${term}`, `PATH=/home/${USER}/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin`, CLAUDE_BIN, "--dangerously-skip-permissions", "--model", "claude-opus-4-6", "--append-system-prompt", systemPrompt]
+  const args = ["container", "exec", "-it", "--user", USER, "--workdir", cwd, CONTAINER_NAME, "env", `TERM=${term}`, `PATH=${CONTAINER_PATH}`, CLAUDE_BIN, "--dangerously-skip-permissions", "--model", "claude-opus-4-6", "--append-system-prompt", systemPrompt]
   if (opts?.continue) args.push("--continue")
   if (opts?.print) args.push("-p", opts.print)
   else if (opts?.prompt) args.push(opts.prompt)
@@ -262,7 +272,7 @@ export async function claude(workdir: string, opts?: { prompt?: string; print?:
 export async function shell(workdir?: string): Promise<void> {
   const args = ["container", "exec", "-it", "--user", USER]
   if (workdir) args.push("--workdir", containerPath(workdir))
-  args.push(CONTAINER_NAME, "env", "TERM=xterm-256color", `PATH=/home/${USER}/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin`, "fish", "--login")
+  args.push(CONTAINER_NAME, "env", "TERM=xterm-256color", `PATH=${CONTAINER_PATH}`, "fish", "--login")
   const proc = Bun.spawn(args, { stdin: "inherit", stdout: "inherit", stderr: "inherit" })
   await proc.exited
 }
@@ -270,7 +280,7 @@ export async function shell(workdir?: string): Promise<void> {
 /** Run neofetch in the container. */
 export async function info(): Promise<void> {
   const proc = Bun.spawn(
-    ["container", "exec", "--user", USER, CONTAINER_NAME, "env", `PATH=/home/${USER}/.local/bin:/usr/bin:/bin`, "neofetch"],
+    ["container", "exec", "--user", USER, CONTAINER_NAME, "env", `PATH=${CONTAINER_PATH}`, "neofetch"],
     { stdin: "inherit", stdout: "inherit", stderr: "inherit" },
   )
   await proc.exited