Merge remote-tracking branch 'origin/main' into refs/catnip/amber

Author: vanpelt

.devcontainer/devcontainer.json

@@ -27,8 +27,12 @@
     "source=${localWorkspaceFolderBasename}-node_modules,target=${containerWorkspaceFolder}/node_modules,type=volume",
     "source=${localWorkspaceFolderBasename}-go-mods,target=/go/pkg/mod,type=volume"
   ],
+  "runArgs": ["--device=/dev/net/tun"],
   "features": {
     "ghcr.io/devcontainers/features/git:1": {},
+    "ghcr.io/tailscale/codespace/tailscale": {
+      "version": "latest"
+    },
     "ghcr.io/devcontainers/features/node:1": {
       "version": "latest"
     },

.devcontainer/features/feature/catnip-init

@@ -29,9 +29,9 @@ do_start()
     #   0 if daemon has been started
     #   1 if daemon was already running
     #   2 if daemon could not be started
-    start-stop-daemon --start --quiet --pidfile $PIDFILE --chuid vscode:vscode --exec $DAEMON --test > /dev/null \
+    start-stop-daemon --start --quiet --pidfile $PIDFILE --chuid CATNIP_USER:CATNIP_GROUP --exec $DAEMON --test > /dev/null \
         || return 1
-    start-stop-daemon --start --quiet --pidfile $PIDFILE --chuid vscode:vscode --exec $DAEMON
+    start-stop-daemon --start --quiet --pidfile $PIDFILE --chuid CATNIP_USER:CATNIP_GROUP --exec $DAEMON
     RETVAL="$?"
     return "$RETVAL"
 }
@@ -46,11 +46,11 @@ do_stop()
 
     # Try to stop by pidfile first
     if [ -f "$PIDFILE" ] && kill -0 $(cat "$PIDFILE") 2>/dev/null; then
-        start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --chuid vscode:vscode
+        start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --chuid CATNIP_USER:CATNIP_GROUP
         RETVAL="$?"
     else
         # Fallback: stop by process name/exec
-        start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --exec $DAEMON --chuid vscode:vscode
+        start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --exec $DAEMON --chuid CATNIP_USER:CATNIP_GROUP
         RETVAL="$?"
     fi
 

.devcontainer/features/feature/devcontainer-feature.json

@@ -1,6 +1,6 @@
 {
   "id": "feature",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "name": "catnip",
   "description": "Ensures SSH, installs catnip, Claude CLI, GitHub CLI, and Catnip VS Code sidebar extension.",
   "options": {

.devcontainer/features/feature/install.sh

@@ -224,8 +224,10 @@ install_init_service() {
   cp "$(dirname $0)/catnip-init" "$init_script"
   run_as_root chmod +x "$init_script"
 
-  # Update the script to use correct user paths
+  # Update the script to use correct user paths, username, and group
   run_as_root sed -i "s|/home/vscode|$USERHOME|g" "$init_script"
+  run_as_root sed -i "s|CATNIP_USER|$USERNAME|g" "$init_script"
+  run_as_root sed -i "s|CATNIP_GROUP|$USERGROUP|g" "$init_script"
 
   # Create /etc/default/catnip template (will be populated by post-start)
   log "Creating /etc/default/catnip template..."

.github/workflows/deploy-worker.yml

@@ -0,0 +1,64 @@
+name: Deploy Cloudflare Worker
+
+on:
+  push:
+    branches:
+      - main
+    paths:
+      - "worker/**"
+      - "wrangler.jsonc"
+      - "tsconfig.worker.json"
+      - "worker-configuration.d.ts"
+      - "package.json"
+      - "pnpm-lock.yaml"
+      - ".github/workflows/deploy-worker.yml"
+
+  # Allow manual trigger
+  workflow_dispatch:
+    inputs:
+      environment:
+        description: "Deployment environment"
+        required: true
+        type: choice
+        options:
+          - production
+          - qa
+
+permissions:
+  contents: read
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    name: Deploy to Cloudflare Workers
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: "22"
+
+      - name: Install pnpm
+        uses: pnpm/action-setup@v4
+        with:
+          version: 10
+
+      - name: Install dependencies
+        run: pnpm install --frozen-lockfile
+
+      - name: Build project
+        run: pnpm run build
+
+      - name: Deploy to Cloudflare Workers (Production)
+        if: github.event_name == 'push' || github.event.inputs.environment == 'production'
+        run: pnpm run deploy:prod
+        env:
+          CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }}
+
+      - name: Deploy to Cloudflare Workers (QA)
+        if: github.event.inputs.environment == 'qa'
+        run: pnpm run build && wrangler deploy --env qa
+        env:
+          CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }}

.gitignore

@@ -42,13 +42,17 @@ worker/**/*.js.map
 # crush
 .crush/
 
+# worktrees
+.worktrees/
+
 # secrets
 *.pem
 
 # reference files
 reference
 container/Dockerfile.backup
 public/*.jsonl
+docs/plans/
 
 # fallback frontend assets for local go builds (real assets are built in docker)
 # keep the dummy index.html but ignore anything else that gets copied here

README.md

@@ -3,53 +3,45 @@
 
 # 🐾 Catnip
 
-**Run Claude Code Everywhere!**
+**Run Claude Code Everywhere**
 
-Catnip helps you stay organized, run many agents in parallel, and operate agents on the go with web our native mobile interface.
+Catnip helps you stay organized, run many agents in parallel, and operate agents remotely with our web and native mobile interfaces.
 
 [![GitHub Stars](https://img.shields.io/github/stars/wandb/catnip?style=social)](https://github.com/wandb/catnip)
 [![Docker Pulls](https://img.shields.io/docker/pulls/wandb/catnip)](https://hub.docker.com/r/wandb/catnip)
 [![Version](https://img.shields.io/github/v/release/wandb/catnip)](https://github.com/wandb/catnip/releases)
 <br/>
 
-**🔥 Parallel vibe coding in containers. Stay organized, get notified, create anything! 😎**
-
 <img src="public/screenshot.png" alt="Catnip UI Screenshot"/>
 
 </div>
 
-## 💡 When to Use Catnip
-
-**You should use Catnip if you:**
-
-- Want a quick environment to code with agents like Claude. Catnip runs in a universal docker container or your existing Dev Container, making it easy to start new projects or continue developing existing git repositories.
-- Have so many idea's that you want to try multiple things at once. Catnip creates git worktrees enabling parallel development.
-- Want a safe, isolated environment where AI assistants can run terminal commands without the risk of messing up your primary system and asking for permission all the time.
-- Are so addicted to Claude you want to be able to create and monitor agents from your phone. Catnip has a mobile UI making it a super tool when added to a cloud based runtime like Github Codespaces.
-
 ## 🚀 Why Catnip?
 
-Think of Catnip as a **multi-agent coding workspace** that solves the chaos of having AI assistants work on multiple tasks in parallel.
+Catnip is a web service that automates git worktree creation and runs in a container. You can run Catnip in the cloud using GitHub Codespaces or locally on your machine.
 
 **The Problem:** You want to keep Claude Code running as long as possible.
 
-- It's annoying to manage multiple git worktree's and commit changes
-- Previewing the changes across multiple worktree's and more importantly giving the agent a way to test the changes is tricky and Catnip does everything it can to help
-- You lose track of what each AI assistant has been working on
-- You want to be able to review changes on the go / from your phone
+- Claude Code works best when it's sandboxed and has all the tools it needs to test or debug your code.
+- It's difficult to keep track of multiple claude sessions and manage git worktrees.
+- You want to be able to review changes / keep claude working when you're on the go from your phone
 
-**The Solution:** Catnip gives each AI assistant its own isolated workspace while keeping everything synchronized:
+**The Solution:** Catnip runs in a container, manages worktrees for you, and exposes API's and UI's to interact with it:
 
-- **🔒 Isolated Sandbox**: All code runs containerized environment using either Docker or Apple's new [Container SDK]
-  (https://github.com/apple/container). We can use --dangerously-skip-permissions without fear!
+- **🔒 Isolated Sandbox**: All code runs containerized environment using either Docker or Apple's new
+  [Container SDK](https://github.com/apple/container). We can use `--dangerously-skip-permissions` without fear!
 - **🧑‍💻 Worktree Management**: Worktree's let you spawn multiple agents in parallel. Catnip keeps everything organized.
-- **📱 Mobile Interface**: Catnip works on a mobile device. It's like having your own OpenAI Codex service.
-- **💻 Full Terminal Access**: Open multiple terminals via the web interface, CLI, or directly via SSH.
-- **👀 Preview Changes**: Catnip has a built in proxy and port detection. Start a web service and preview it live!
+- **📱 Mobile Interface**: Catnip has a native mobile interface. You can even interact with the Claude Code terminal interface on your phone!
+- **💻 Full Terminal Access**: The Claude Code terminal interface is 🔥. Open multiple terminals via the web interface, CLI, or directly via SSH.
+- **👀 Preview Changes**: Catnip has a built in proxy and port detection in the container. Start a web service and preview it live locally!
 - **🌐 Universal Access**: Still a big fan of Cursor or VS Code? No problem, full remote development directly in your IDE is supported.
 
 ## ⚡ Quick Start
 
+### Mobile App
+
+Our iOS native interface is currently in beta. You can join the [TestFlight group](https://testflight.apple.com/join/dm8GahU7) to try the app today. The app will help you configure an existing GitHub repository with catnip as described below. Once setup you can fire up claude code on the go! Please share any bug reports or feedback.
+
 ### Github Codespaces / Devcontainers
 
 You can add Catnip to a `.devcontainer/devcontainer.json` in an existing GitHub repository. This gives you complete control over the environment that claude operates in. If you don't have a devcontainer config, add the following to your repo's github url: `/new/main?dev_container_template=1&filename=.devcontainer%2Fdevcontainer.json` to create one. Just add the catnip feature and ensure the port is forwarded:
@@ -100,18 +92,16 @@ CATNIP_GO_VERSION=1.22
 > [!NOTE]
 > If you want complete control of your environment, run catnip in a devcontainer as described above
 
-### Environment Setup
+## Advanced Setup
 
 Catnip currently looks for a file named `setup.sh` in the root of your repo and runs it when a workspace is created. This is a great place to run `pnpm install`, `pip install -r requirements.txt`, or `uv sync` - perfect for AI projects with complex dependencies.
 
 ```bash
 #!/bin/bash
-# Example setup.sh for LLM application development
 pip install -r requirements.txt
-# Pre-load common dependencies for LLM apps
 pip install openai anthropic chromadb
-npm install  # For full-stack AI applications
-# Set up vector database or other services
+npm install
+# Assuming --dind passed locally, or the docker-in-docker feature was added
 docker-compose up -d --build
 ```
 
@@ -120,17 +110,16 @@ docker-compose up -d --build
 `catnip run` accepts `-e` arguments. For instance if you want to pass `ANTHROPIC_API_KEY` from your host into the container you can simply add `-e ANTHROPIC_API_KEY` and then all terminals and AI agent sessions within the container will see that variable. You can also explicitly set variables, `-e ANTHROPIC_BASE_URL=https://some.otherprovider.com/v1`
 
 ```bash
-# Essential for LLM application development
 catnip run -e ANTHROPIC_API_KEY -e OPENAI_API_KEY -e PINECONE_API_KEY
 ```
 
 ### SSH
 
-The `catnip run` command configures SSH within the container by default. It creates a key pair named `catnip_remote` and configures a `catnip` host allowing you to run `ssh catnip` or open a remote development environment via the [Remote-SSH extension](https://marketplace.cursorapi.com/items/?itemName=anysphere.remote-ssh). This works perfectly with Cursor, VS Code, and other editors that AI engineers commonly use. You can disable ssh by adding `--disable-ssh` to the run command.
+The `catnip run` command configures SSH within the container by default. It creates a key pair named `catnip_remote` and configures a `catnip` host allowing you to run `ssh catnip` or open a remote development environment via the [Remote-SSH extension](https://marketplace.cursorapi.com/items/?itemName=anysphere.remote-ssh). This works perfectly with Cursor, VS Code, and other editors that support remote development. You can disable ssh by adding `--disable-ssh` to the run command.
 
 ### Docker in Docker
 
-If you want the catnip container to be able to run `docker` commands, pass the `--dind` flag to the `catnip run` command. This mounts the docker socket from the host into the container allowing your terminals and AI agents to build or run containers - useful for containerized ML services or complex multi-service applications.
+If you want the catnip container to be able to run `docker` commands, pass the `--dind` flag to the `catnip run` command. This mounts the docker socket from the host into the container allowing your terminals and AI agents to build or run containers - useful for containerized ML services or complex multi-service applications. If you're running in GitHub codespaces make sure you've
 
 ### Git
 
@@ -168,16 +157,14 @@ This is especially powerful for LLM and agentic application development where yo
 
 - [x] 🎯 Native devcontainer support
 - [x] 📱 Mobile UI
-- [ ] 🔄 Restore to previous checkpoints
 - [ ] 🤖 Support for more AI coding agents
-- [ ] 🌐 Cloud based deployments
-- [ ] 🔧 Plugin ecosystem
+- [ ] 🌐 Other cloud native environment
 
 ## ❓ FAQ
 
 <details>
-<summary><b>How is Catnip different from Jules, Open SWE, or Conductor</b></summary>
-Catnip is Open Source, built to be extensible, and prioritizes local development first with support for cloud based deployments on the roadmap. It's specifically designed for AI engineers who need sophisticated multi-agent orchestration with powerful Git worktree management and real-time service discovery.
+<summary><b>How is Catnip different from Openai Codex, Claude Code on the web, Jules, or Conductor</b></summary>
+Catnip is Open Source, built to be extensible, and prioritizes deploying to GitHub Codespaces in the cloud so you can access Claude from anywhere.  The native cloud agent environments from OpenAI, Anthropic, and Google have limitations that GitHub Codespaces unlock such as resources and customizability.
 </details>
 <details>
 <summary><b>What AI assistants does Catnip support?</b></summary>
@@ -189,13 +176,8 @@ Currently optimized for Claude Code, with support for additional AI coding assis
 <summary><b>Can I use this for LLM and AI application projects?</b></summary>
 Absolutely! Catnip is perfect for LLM app development. The containerized environment handles complex dependencies (vector databases, embedding models, etc.), automatic port detection works great with Jupyter/Streamlit/FastAPI, and the multi-agent system lets you parallelize RAG backend development, chat interface building, and data pipeline work.
 </details>
-<details>
-<summary><b>How does the Git worktree system work with multiple AI agents?</b></summary>
-Each agent works in an isolated worktree using custom `refs/catnip/*` references, preventing Git checkout conflicts. Catnip automatically creates and syncs "nice" feature branches for PRs, so you get the isolation you need for parallel agents while maintaining clean Git workflows.
-</details>
-<details>
 <summary><b>Did you develop Catnip with Catnip?</b></summary>
-Big time... Inception 🤯 We've been using Catnip to build Catnip, which has been invaluable for dogfooding the multi-agent workflow experience.
+Big time... Inception 🤯 We've been using Catnip to build Catnip, which has been invaluable for dog fooding the multi-agent workflow experience.
 </details>
 
 ## 🤝 Contributing