[codecane] [render preview] Colony

.bin/bun

@@ -22,94 +22,92 @@ if [ -z "$REAL_BUN" ]; then
     REAL_BUN=$(PATH=$(echo "$PATH" | tr ':' '\n' | grep -v "^$SCRIPT_DIR$" | tr '\n' ':') which bun)
 fi
 
-# Function to check if a script needs secrets by looking in package.json
-needs_secrets() {
-    local script_name="$1"
-    local cwd="${2:-.}"
-
-    # Check if package.json exists in the specified directory
-    if [ ! -f "$cwd/package.json" ]; then
-        return 1  # No package.json, assume no secrets needed
+# Function to check if command doesn't need secrets
+# Returns 0 if secrets are NOT needed, 1 if they ARE needed
+doesnt_need_secrets() {
+    # If we're already running under infisical, don't need to wrap again
+    if [ -n "$NEXT_PUBLIC_INFISICAL_UP" ]; then
+        return 0
     fi
 
-    # Extract the script command from package.json
-    local script_command
-    script_command=$(node -pe "
-        try {
-            const pkg = require('$cwd/package.json');
-            const script = pkg.scripts && pkg.scripts['$script_name'];
-            script || '';
-        } catch (e) {
-            '';
-        }
-    " 2>/dev/null)
+    # Find the first non-flag argument, which is the command
+    local cmd=""
+    for arg in "$@"; do
+        if [[ ! "$arg" =~ ^- ]]; then
+            cmd="$arg"
+            break
+        fi
+    done
+
+    # Handle version/help flags which can appear anywhere
+    for arg in "$@"; do
+        case "$arg" in
+            --version|-v|--help|-h|--revision)
+                return 0
+                ;;
+        esac
+    done
 
-    # If script doesn't exist, assume no secrets needed
-    if [ -z "$script_command" ]; then
-        return 1
+    # If no command is found (e.g., just 'bun'), it doesn't need secrets
+    if [ -z "$cmd" ]; then
+        return 0
     fi
 
-    # Check if script needs secrets:
-    # 1. Already uses infisical
-    # 2. Contains dev server patterns that obviously need secrets
-    case "$script_command" in
-        *"infisical"*)
-            return 0  # Already uses infisical, needs secrets
+    # Commands that don't need secrets
+    case "$cmd" in
+        # Package management
+        install|i|add|remove|rm|link|unlink|pm|update|upgrade)
+            return 0
             ;;
-        *"dev"*|*"start"*|*"studio"*|*"db:start"*|*"db:studio"*)
-            return 0  # Dev servers and database tools need secrets
+        # Project initialization
+        init|create)
+            return 0
+            ;;
+        # Info/utility
+        info|outdated|audit|typecheck)
+            return 0
+            ;;
+        # Run command needs special handling
+        run)
+            # Find the script name after 'run'
+            local script=""
+            local found_run=false
+            for arg in "$@"; do
+                if $found_run && [[ ! "$arg" =~ ^- ]]; then
+                    script="$arg"
+                    break
+                fi
+                if [[ "$arg" == "run" ]]; then
+                    found_run=true
+                fi
+            done
+
+            # 'bun run' with no script lists scripts, no secrets needed
+            if [ -z "$script" ]; then
+                return 0
+            fi
+
+            # Scripts that typically don't need secrets
+            case "$script" in
+                format|lint|typecheck|compile)
+                    return 0
+                    ;;
+                *)
+                    # Default run scripts to needing secrets
+                    return 1
+                    ;;
+            esac
             ;;
         *)
-            return 1  # Default to no secrets for maintainability
+            # Default to needing secrets for all other commands
+            return 1
             ;;
     esac
 }
 
-# Function to extract cwd from bun command
-get_cwd_from_args() {
-    local args=("$@")
-    for ((i=0; i<${#args[@]}; i++)); do
-        if [[ "${args[i]}" == "--cwd" && $((i+1)) -lt ${#args[@]} ]]; then
-            echo "${args[$((i+1))]}"
-            return
-        fi
-    done
-    echo "."
-}
-
-# Main logic
-case "$1" in
-  "test")
-    # Tests often need database/API access
+# Main logic - default to using infisical unless command doesn't need secrets
+if doesnt_need_secrets "$@"; then
+    exec "$REAL_BUN" "$@"
+else
     exec infisical run -- "$REAL_BUN" "$@"
-    ;;
-  "dev"|"start")
-    # Development servers need secrets
-    exec infisical run -- "$REAL_BUN" "$@"
-    ;;
-  "run")
-    if [ -n "$2" ]; then
-        # Extract cwd if specified
-        cwd=$(get_cwd_from_args "$@")
-
-        # Check if the script needs secrets
-        if needs_secrets "$2" "$cwd"; then
-            exec infisical run -- "$REAL_BUN" "$@"
-        else
-            exec "$REAL_BUN" "$@"
-        fi
-    else
-        # No script specified, run without secrets
-        exec "$REAL_BUN" "$@"ggp -
-    fi
-    ;;
-  *)
-    # Check if the first argument is a script name in package.json
-    if needs_secrets "$1" "."; then
-        exec infisical run -- "$REAL_BUN" "$@"
-    else
-        # For install, add, remove, format, etc. - no secrets needed
-        exec "$REAL_BUN" "$@"
-    fi
-    ;;
-esac
+fi

.envrc

@@ -0,0 +1 @@
+export PATH="$PWD/.bin:$PATH"

.github/knowledge.md

@@ -2,42 +2,40 @@
 
 ## CI/CD Pipeline Overview
 
-The CI pipeline consists of multiple jobs that run in sequence and parallel:
-
-```mermaid
-graph TD
-    setup[Setup - Install & Cache Dependencies]
-    build[Build & Typecheck]
-    test1[Test npm-app]
-    test2[Test backend]
-    test3[Test common]
-
-    setup --> build
-    build --> test1 & test2 & test3
-
-    classDef setup fill:#e1f5fe,stroke:#01579b
-    classDef build fill:#e8f5e9,stroke:#1b5e20
-    classDef test fill:#f9f,stroke:#333,stroke-width:2px
-
-    class setup setup
-    class build build
-    class test1,test2,test3 test
-```
+The CI pipeline consists of two main jobs:
 
-### Key Jobs
-- **Setup**: Installs and caches dependencies
-- **Build**: Compiles the project and runs typechecking in one combined job
-- **Tests**: Three parallel test jobs for different packages:
-  - npm-app tests
-  - backend tests
-  - common tests
+1. **Build Job**: Installs dependencies, builds web, runs typecheck, and builds npm-app
+2. **Test Job**: Runs tests for npm-app, backend, and common packages in parallel using matrix strategy
 
-### Important Settings
-- Uses Bun v1.1.26 for all jobs
+### Key Configuration
+- Uses Bun v1.2.12 for all jobs
 - Tests use retry logic (max 5 attempts, 10 min timeout)
-- Dependencies are cached between jobs
-- Environment variables are set from secrets
-- Build and typecheck are combined for efficiency
+- Dependencies are cached between jobs using `actions/cache@v3`
+- Environment variables are set from GitHub secrets using `scripts/generate-ci-env.js`
+
+### Test Strategy
+Tests run in parallel using matrix strategy:
+```yaml
+strategy:
+  matrix:
+    package: [npm-app, backend, common]
+```
+
+Each test job:
+- Runs unit tests only (excludes integration tests)
+- Uses `nick-fields/retry@v3` for reliability
+- Sets `CODEBUFF_GITHUB_ACTIONS=true` and `NEXT_PUBLIC_CB_ENVIRONMENT=test`
+
+### Environment Variables
+- Secrets are extracted using `scripts/generate-ci-env.js`
+- Environment variables are set dynamically from GitHub secrets
+- Test environment flags are set for proper test execution
+
+## Workflow Structure
+- Triggered on push/PR to main branch
+- Build job must complete before test jobs start (`needs: build`)
+- Uses `actions/checkout@v3`, `oven-sh/setup-bun@v2`, and `actions/cache@v3`
+- Commented debug shell available for troubleshooting failures
 
 ## Artifact Actions
 

.github/workflows/evals.yml

@@ -7,7 +7,7 @@ on:
 jobs:
   run-evals:
     runs-on: ubuntu-latest
-    timeout-minutes: 180
+    timeout-minutes: 360
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3
@@ -64,7 +64,7 @@ jobs:
 
       - name: Run evals
         if: ${{ steps.check_commit.outputs.should_run_evals == 'true' }}
-        run: bun run --cwd evals run-eval-set
+        run: cd evals && bun run-eval-set --concurrency 1 --email --title "Git Eval (${{ github.sha }} ${{ github.event.head_commit.message }}})"
 
       - name: Workflow completed
         run: echo "Evals workflow completed successfully"

.github/workflows/npm-app-release-staging.yml

@@ -134,8 +134,7 @@ jobs:
       new-version: ${{ needs.prepare-and-commit-staging.outputs.new_version }}
       artifact-name: updated-staging-package
       checkout-ref: ${{ github.event.pull_request.head.sha }}
-      env-overrides: '{"NEXT_PUBLIC_CB_ENVIRONMENT": "prod"}'
-
+      env-overrides: '{"NEXT_PUBLIC_CB_ENVIRONMENT": "prod", "NEXT_PUBLIC_BACKEND_URL": "backend-pr-187-cg9u.onrender.com"}'
     secrets: inherit
 
   # Create GitHub prerelease with all binaries

.gitignore

@@ -25,6 +25,3 @@ debug/
 # Nx cache directories
 .nx/cache
 .nx/workspace-data
-
-# direnv
-.envrc

README.md

@@ -69,6 +69,7 @@ If you want to set up Codebuff for local development:
 1. **Install Bun**: Follow the [Bun installation guide](https://bun.sh/docs/installation)
 
 2. **Install direnv**: This manages environment variables automatically
+
    - macOS: `brew install direnv`
    - Ubuntu/Debian: `sudo apt install direnv`
    - Other systems: See [direnv installation guide](https://direnv.net/docs/installation.html)
@@ -93,54 +94,63 @@ If you want to set up Codebuff for local development:
 ### Setup Steps
 
 1. **Clone and navigate to the project**:
+
    ```bash
    git clone <repository-url>
    cd codebuff
    ```
 
 2. **Set up Infisical for secrets management**:
+
    ```bash
    npm install -g @infisical/cli
    infisical login
    ```
+
    When prompted, select the "US" region, then verify setup:
+
    ```bash
    infisical secrets
    ```
 
 3. **Configure direnv**:
+
    ```bash
    direnv allow
-   cp .envrc.example .envrc
    ```
-   This automatically manages your PATH and environment variables.
+
+   This automatically manages your PATH and environment variables. The `.envrc` file is already committed to the repository and sets up the correct PATH to use the project's bundled version of Bun.
 
 4. **Install dependencies**:
+
    ```bash
    bun install
    ```
 
 5. **Start the development services**:
 
    **Terminal 1 - Backend server**:
+
    ```bash
    bun run start-server
    ```
 
    **Terminal 2 - Web server** (requires Docker):
+
    ```bash
    bun run start-web
    ```
 
    **Terminal 3 - Client**:
+
    ```bash
    bun run start-client
    ```
 
-
 ### Running Tests
 
 After direnv setup, you can run tests from any directory:
+
 ```bash
 bun test                    # Runs with secrets automatically
 bun test --watch           # Watch mode
@@ -152,6 +162,7 @@ bun test specific.test.ts  # Run specific test file
 ### direnv Issues
 
 If direnv isn't working:
+
 1. Ensure it's properly hooked into your shell (see Prerequisites step 3)
 2. Run `direnv allow` in the project root
 3. Check that `.envrc` exists and has the correct content