Merge branch 'v2'

Author: tonyxiao

.envrc

@@ -0,0 +1,5 @@
+# shellcheck shell=bash
+source_env_if_exists .envrc.local
+
+alias pipelines='bun apps/service/src/bin/sync-service.ts pipelines'
+alias tsx='node --conditions bun --import tsx --no-warnings --use-env-proxy'

.github/workflows/ci.yml

@@ -24,7 +24,7 @@ jobs:
       code: ${{ steps.filter.outputs.code }}
     steps:
       - uses: actions/checkout@v5
-      - uses: dorny/paths-filter@v3
+      - uses: dorny/paths-filter@v4
         id: filter
         with:
           filters: |
@@ -447,7 +447,20 @@ jobs:
             ghcr.io/${{ github.repository }}-service:${{ github.sha }}-arm64
 
       - name: Docker smoke test
-        run: docker run --rm ghcr.io/${{ github.repository }}:${{ github.sha }} --version
+        run: |
+          docker run -d --name smoke -p 3000:3000 ghcr.io/${{ github.repository }}:${{ github.sha }}
+          trap 'docker rm -f smoke 2>/dev/null || true' EXIT
+          for i in $(seq 1 30); do
+            body=$(curl -sf http://localhost:3000/health 2>/dev/null || true)
+            if echo "$body" | grep -q '"ok":true'; then
+              echo "health check passed: $body"
+              exit 0
+            fi
+            sleep 1
+          done
+          echo "health check timed out"
+          docker logs smoke
+          exit 1
 
   # ---------------------------------------------------------------------------
   # E2E Docker — Docker image smoke + engine tests (runs on every push/PR)

.github/workflows/prod-e2e-test.yml

@@ -25,6 +25,9 @@ jobs:
         with:
           node-version: '24'
 
+      - name: Setup Bun
+        uses: oven-sh/setup-bun@v2
+
       - name: Install Stripe CLI
         run: |
           curl -s https://packages.stripe.dev/api/security/keypair/stripe-cli-gpg/public | gpg --dearmor -o /usr/share/keyrings/stripe.gpg
@@ -132,7 +135,7 @@ jobs:
           DATABASE_URL: ${{ steps.create-db.outputs.db_string }}
         run: |
           set +e
-          node scripts/reconcile-sigma-vs-postgres.js
+          bun scripts/reconcile-sigma-vs-postgres.ts
           STATUS=$?
           if [ "$STATUS" -ne 0 ]; then
             echo "::warning title=Sigma reconciliation::Postgres is missing rows that exist in Sigma. See the job log for the per-table diff and the list of missing IDs with their created timestamps."

.gitignore

@@ -9,7 +9,7 @@ node_modules/
 *.tgz
 .mcp*
 private/
-.envrc
+.envrc.local
 
 .mcp.*
 .vercel
@@ -27,6 +27,10 @@ private/
 
 # Local cred storage
 .credentials/
+.stripe-sync/
+
+# Local test scripts
+scripts/test-all-accounts.sh
 
 # Git worktrees
 .worktrees/
@@ -50,3 +54,9 @@ test-results/
 apps/visualizer/out/
 
 .sync-state*.json
+*.log
+
+# Reconcile / verification output
+tmp/
+prev-run.txt
+verify-*.json

AGENTS.md

@@ -79,8 +79,14 @@ See [docs/architecture/principles.md](docs/architecture/principles.md) for the c
 - Generated OpenAPI specs live in each package's `src/__generated__/openapi.json`. Run `./scripts/generate-openapi.sh` and commit the output before pushing when schemas change. Never edit generated files by hand.
 - Non-trivial PRs should be accompanied by a plan artifact in `docs/plans/YYYY-MM-DD-<slug>.md`. Save it before or alongside the first implementation commit.
 
+## Debugging
+
+- **[Debugging the sync CLI](docs/guides/debugging-sync-cli.md)** — subprocess log location, pnpm store staleness, dist vs bun condition.
+
 ## Key Gotchas
 
+- **No build step for local dev** — the sync CLI uses `--conditions bun --import tsx` so it reads `.ts` source directly. Edits to workspace packages propagate immediately. `pnpm build` is only needed for vitest (which resolves `dist/`) and Docker.
+- **Do NOT add `injectWorkspacePackages: true`** to `pnpm-workspace.yaml` — it copies files into the pnpm store as hardlinks, which break silently when editors save (write-temp-then-rename). Without it, pnpm uses symlinks and edits always propagate. Docker builds use `pnpm deploy --legacy` instead.
 - `tsx` fails on `apps/supabase` — `?raw` imports pull in Deno-only code. Other packages work fine with `npx tsx`.
 - `packages/sync-engine/src/supabase` is Deno, not Node. Don't run those files with Node/tsx.
 - E2E tests need Stripe keys with **write** permissions (they create real objects).

Dockerfile

@@ -33,7 +33,7 @@ RUN pnpm install --frozen-lockfile
 
 # ---- Build layer ----
 COPY . ./
-RUN pnpm --filter @stripe/sync-engine deploy --prod /deploy
+RUN pnpm --filter @stripe/sync-engine deploy --legacy --prod /deploy
 
 FROM node:24-alpine AS engine
 WORKDIR /app
@@ -71,7 +71,7 @@ RUN pnpm install --frozen-lockfile
 
 # ---- Build layer ----
 COPY . ./
-RUN pnpm --filter @stripe/sync-service deploy --prod /deploy
+RUN pnpm --filter @stripe/sync-service deploy --legacy --prod /deploy
 
 FROM node:24 AS service
 WORKDIR /app

apps/dashboard/package.json

@@ -20,8 +20,8 @@
     "clsx": "^2",
     "lucide-react": "^0.511",
     "openapi-fetch": "^0.13",
-    "react": "^19",
-    "react-dom": "^19",
+    "react": "19.2.5",
+    "react-dom": "19.2.5",
     "tailwind-merge": "^3"
   },
   "devDependencies": {
@@ -33,8 +33,8 @@
     "@stripe/sync-service": "workspace:*",
     "@stripe/sync-source-stripe": "workspace:*",
     "@tailwindcss/vite": "^4",
-    "@types/react": "^19",
-    "@types/react-dom": "^19",
+    "@types/react": "19.2.14",
+    "@types/react-dom": "19.2.3",
     "@vitejs/plugin-react": "^4",
     "tailwindcss": "^4",
     "typescript": "^5",

apps/engine/package.json

@@ -28,46 +28,51 @@
       "bun": "./src/api/openapi-utils.ts",
       "types": "./dist/api/openapi-utils.d.ts",
       "import": "./dist/api/openapi-utils.js"
+    },
+    "./progress": {
+      "bun": "./src/lib/progress/index.ts",
+      "types": "./dist/lib/progress/index.d.ts",
+      "import": "./dist/lib/progress/index.js"
     }
   },
   "scripts": {
-    "build": "tsc",
+    "build": "tsc && cp -r src/__generated__ dist/__generated__",
     "x:watch": "sh -c 'if command -v bun > /dev/null 2>&1; then bun --watch \"$@\"; else tsx --watch --conditions bun \"$@\"; fi' --",
-    "dev": "LOG_LEVEL=${LOG_LEVEL:-trace} LOG_PRETTY=${LOG_PRETTY:-true} DANGEROUSLY_VERBOSE_LOGGING=true pnpm x:watch src/bin/serve.ts",
+    "dev": "LOG_LEVEL=${LOG_LEVEL:-trace} pnpm x:watch src/bin/serve.ts",
     "test": "vitest run",
     "generate:types": "openapi-typescript src/__generated__/openapi.json -o src/__generated__/openapi.d.ts"
   },
   "files": [
-    "dist",
-    "src"
+    "src",
+    "dist"
   ],
   "dependencies": {
     "@hono/node-server": "^1",
     "@scalar/hono-api-reference": "^0.6",
     "@stripe/sync-destination-google-sheets": "workspace:*",
     "@stripe/sync-destination-postgres": "workspace:*",
     "@stripe/sync-hono-zod-openapi": "workspace:*",
-    "@stripe/sync-integration-supabase": "workspace:*",
+    "@stripe/sync-logger": "workspace:*",
     "@stripe/sync-protocol": "workspace:*",
     "@stripe/sync-source-stripe": "workspace:*",
-    "@stripe/sync-state-postgres": "workspace:*",
     "@stripe/sync-ts-cli": "workspace:*",
     "@stripe/sync-util-postgres": "workspace:*",
     "citty": "^0.1.6",
     "dotenv": "^16.4.7",
     "googleapis": "^148.0.0",
     "hono": "^4",
+    "ink": "^7.0.1",
     "openapi-fetch": "^0.17.0",
     "pg": "^8.16.3",
-    "pino": "^10",
-    "pino-pretty": "^13",
+    "react": "19.2.5",
     "ws": "^8.18.0",
     "zod": "^4.3.6"
   },
   "devDependencies": {
     "@hyperjump/json-schema": "^1.17.5",
     "@types/node": "^24.10.1",
     "@types/pg": "^8.15.4",
+    "@types/react": "19.2.14",
     "openapi-typescript": "^7.13.0",
     "vitest": "^3.2.4"
   },