Merge branch 'main' into migrate/issue-71-vanity-imports

fix(ci): pass GITEA_TOKEN to setup-node — fixes 60/hr/IP rate limit (internal#75)
2026-05-08 01:27:51 +00:00 · 2026-05-08 00:54:24 +00:00 · 2026-05-08 00:52:33 +00:00 · 2026-05-08 00:21:00 +00:00 · 2026-05-07 23:52:28 +00:00 · 2026-05-07 22:57:21 +00:00
251 changed files with 1053 additions and 6641 deletions
@@ -37,7 +37,7 @@ CANONICAL_FILE = Path(".github/workflows/secret-scan.yml")
 CONSUMERS: list[tuple[str, str]] = [
    (
        "molecule-ai-workspace-runtime/molecule_runtime/scripts/pre-commit-checks.sh",
-        "https://git.moleculesai.app/molecule-ai/molecule-ai-workspace-runtime/raw/branch/main/molecule_runtime/scripts/pre-commit-checks.sh",
+        "https://raw.githubusercontent.com/Molecule-AI/molecule-ai-workspace-runtime/main/molecule_runtime/scripts/pre-commit-checks.sh",
    ),
 ]

@@ -108,7 +108,7 @@ jobs:
              echo
              echo "One or more canary secrets are unset (\`CANARY_TENANT_URLS\`, \`CANARY_ADMIN_TOKENS\`, \`CANARY_CP_SHARED_SECRET\`)."
              echo "Phase 2 canary fleet has not been stood up yet —"
-              echo "see [canary-tenants.md](https://git.moleculesai.app/molecule-ai/molecule-controlplane/blob/main/docs/canary-tenants.md)."
+              echo "see [canary-tenants.md](https://github.com/molecule-ai/molecule-controlplane/blob/main/docs/canary-tenants.md)."
              echo
              echo "**Skipped — promote-to-latest will NOT auto-fire.** Dispatch \`promote-latest.yml\` manually when ready."
            } >> "$GITHUB_STEP_SUMMARY"
@@ -218,6 +218,7 @@ jobs:
        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
        with:
          node-version: '22'
+          token: ${{ secrets.GITEA_TOKEN }}
      - if: needs.changes.outputs.canvas == 'true'
        run: rm -f package-lock.json && npm install
      - if: needs.changes.outputs.canvas == 'true'
@@ -12,59 +12,6 @@ name: E2E API Smoke Test
 # spending CI cycles. See the in-job comment on the `e2e-api` job for
 # why this is one job (not two-jobs-sharing-name) and the 2026-04-29
 # PR #2264 incident that drove the consolidation.
-#
-# Parallel-safety (Class B Hongming-owned CICD red sweep, 2026-05-08)
-# -------------------------------------------------------------------
-# Same substrate hazard as PR #98 (handlers-postgres-integration). Our
-# Gitea act_runner runs with `container.network: host` (operator host
-# `/opt/molecule/runners/config.yaml`), which means:
-#
-#   * Two concurrent runs both try to bind their `-p 15432:5432` /
-#     `-p 16379:6379` host ports — the second postgres/redis FATALs
-#     with `Address in use` and `docker run` returns exit 125 with
-#     `Conflict. The container name "/molecule-ci-postgres" is already
-#     in use by container ...`. Verified in run a7/2727 on 2026-05-07.
-#   * The fixed container names `molecule-ci-postgres` / `-redis` (the
-#     pre-fix shape) collide on name AS WELL AS port. The cleanup-with-
-#     `docker rm -f` at the start of the second job KILLS the first
-#     job's still-running postgres/redis.
-#
-# Fix shape (mirrors PR #98's bridge-net pattern, adapted because
-# platform-server is a Go binary on the host, not a containerised
-# step):
-#
-#   1. Unique container names per run:
-#         pg-e2e-api-${RUN_ID}-${RUN_ATTEMPT}
-#         redis-e2e-api-${RUN_ID}-${RUN_ATTEMPT}
-#      `${RUN_ID}-${RUN_ATTEMPT}` is unique even across reruns of the
-#      same run_id.
-#   2. Ephemeral host port per run (`-p 0:5432`), then read the actual
-#      bound port via `docker port` and export DATABASE_URL/REDIS_URL
-#      pointing at it. No fixed host-port → no port collision.
-#   3. `127.0.0.1` (NOT `localhost`) in URLs — IPv6 first-resolve was
-#      the original flake fixed in #92 and the script's still IPv6-
-#      enabled.
-#   4. `if: always()` cleanup so containers don't leak when test steps
-#      fail.
-#
-# Issue #94 items #2 + #3 (also fixed here):
-#   * Pre-pull `alpine:latest` so the platform-server's provisioner
-#     (`internal/handlers/container_files.go`) can stand up its
-#     ephemeral token-write helper without a daemon.io round-trip.
-#   * Create `molecule-monorepo-net` bridge network if missing so the
-#     provisioner's container.HostConfig {NetworkMode: ...} attach
-#     succeeds.
-# Item #1 (timeouts) — evidence on recent runs (77/3191, ae/4270, 0e/
-# 2318) shows Postgres ready in 3s, Redis in 1s, Platform in 1s when
-# they DO come up. Timeouts are not the bottleneck; not bumped.
-#
-# Item explicitly NOT fixed here: failing test `Status back online`
-# fails because the platform's langgraph workspace template image
-# (ghcr.io/molecule-ai/workspace-template-langgraph:latest) returns
-# 403 Forbidden post-2026-05-06 GitHub org suspension. That is a
-# template-registry resolution issue (ADR-002 / local-build mode) and
-# belongs in a separate change that touches workspace-server, not
-# this workflow file.

 on:
  push:
@@ -131,14 +78,11 @@ jobs:
    runs-on: ubuntu-latest
    timeout-minutes: 15
    env:
-      # Unique per-run container names so concurrent runs on the host-
-      # network act_runner don't collide on name OR port.
-      # `${RUN_ID}-${RUN_ATTEMPT}` stays unique across reruns of the
-      # same run_id. PORT is set later (after docker port lookup) since
-      # we let Docker assign an ephemeral host port.
-      PG_CONTAINER: pg-e2e-api-${{ github.run_id }}-${{ github.run_attempt }}
-      REDIS_CONTAINER: redis-e2e-api-${{ github.run_id }}-${{ github.run_attempt }}
+      DATABASE_URL: postgres://dev:dev@localhost:15432/molecule?sslmode=disable
+      REDIS_URL: redis://localhost:16379
      PORT: "8080"
+      PG_CONTAINER: molecule-ci-postgres
+      REDIS_CONTAINER: molecule-ci-redis
    steps:
      - name: No-op pass (paths filter excluded this commit)
        if: needs.detect-changes.outputs.api != 'true'
@@ -153,53 +97,11 @@ jobs:
          go-version: 'stable'
          cache: true
          cache-dependency-path: workspace-server/go.sum
-      - name: Pre-pull alpine + ensure provisioner network (Issue #94 items #2 + #3)
-        if: needs.detect-changes.outputs.api == 'true'
-        run: |
-          # Provisioner uses alpine:latest for ephemeral token-write
-          # containers (workspace-server/internal/handlers/container_files.go).
-          # Pre-pull so the first provision in test_api.sh doesn't race
-          # the daemon's pull cache. Idempotent — `docker pull` is a no-op
-          # when the image is already present.
-          docker pull alpine:latest >/dev/null
-          # Provisioner attaches workspace containers to
-          # molecule-monorepo-net (workspace-server/internal/provisioner/
-          # provisioner.go::DefaultNetwork). The bridge already exists on
-          # the operator host's docker daemon — `network create` is
-          # idempotent via `|| true`.
-          docker network create molecule-monorepo-net >/dev/null 2>&1 || true
-          echo "alpine:latest pre-pulled; molecule-monorepo-net ensured."
      - name: Start Postgres (docker)
        if: needs.detect-changes.outputs.api == 'true'
        run: |
-          # Defensive cleanup — only matches THIS run's container name,
-          # so it cannot kill a sibling run's postgres. (Pre-fix the
-          # name was static and this rm hit other runs' containers.)
          docker rm -f "$PG_CONTAINER" 2>/dev/null || true
-          # `-p 0:5432` requests an ephemeral host port; we read it back
-          # below and export DATABASE_URL.
-          docker run -d --name "$PG_CONTAINER" \
-            -e POSTGRES_USER=dev -e POSTGRES_PASSWORD=dev -e POSTGRES_DB=molecule \
-            -p 0:5432 postgres:16 >/dev/null
-          # Resolve the host-side port assignment. `docker port` prints
-          # `0.0.0.0:NNNN` (and on host-net runners may also print an
-          # IPv6 line — take the first IPv4 line).
-          PG_PORT=$(docker port "$PG_CONTAINER" 5432/tcp | awk -F: '/^0\.0\.0\.0:/ {print $2; exit}')
-          if [ -z "$PG_PORT" ]; then
-            # Fallback: any first line. Some Docker versions print only
-            # one line.
-            PG_PORT=$(docker port "$PG_CONTAINER" 5432/tcp | head -1 | awk -F: '{print $NF}')
-          fi
-          if [ -z "$PG_PORT" ]; then
-            echo "::error::Could not resolve host port for $PG_CONTAINER"
-            docker port "$PG_CONTAINER" 5432/tcp || true
-            docker logs "$PG_CONTAINER" || true
-            exit 1
-          fi
-          # 127.0.0.1 (NOT localhost) — IPv6 first-resolve flake (#92).
-          echo "PG_PORT=${PG_PORT}" >> "$GITHUB_ENV"
-          echo "DATABASE_URL=postgres://dev:dev@127.0.0.1:${PG_PORT}/molecule?sslmode=disable" >> "$GITHUB_ENV"
-          echo "Postgres host port: ${PG_PORT}"
+          docker run -d --name "$PG_CONTAINER" -e POSTGRES_USER=dev -e POSTGRES_PASSWORD=dev -e POSTGRES_DB=molecule -p 15432:5432 postgres:16
          for i in $(seq 1 30); do
            if docker exec "$PG_CONTAINER" pg_isready -U dev >/dev/null 2>&1; then
              echo "Postgres ready after ${i}s"
@@ -214,20 +116,7 @@ jobs:
        if: needs.detect-changes.outputs.api == 'true'
        run: |
          docker rm -f "$REDIS_CONTAINER" 2>/dev/null || true
-          docker run -d --name "$REDIS_CONTAINER" -p 0:6379 redis:7 >/dev/null
-          REDIS_PORT=$(docker port "$REDIS_CONTAINER" 6379/tcp | awk -F: '/^0\.0\.0\.0:/ {print $2; exit}')
-          if [ -z "$REDIS_PORT" ]; then
-            REDIS_PORT=$(docker port "$REDIS_CONTAINER" 6379/tcp | head -1 | awk -F: '{print $NF}')
-          fi
-          if [ -z "$REDIS_PORT" ]; then
-            echo "::error::Could not resolve host port for $REDIS_CONTAINER"
-            docker port "$REDIS_CONTAINER" 6379/tcp || true
-            docker logs "$REDIS_CONTAINER" || true
-            exit 1
-          fi
-          echo "REDIS_PORT=${REDIS_PORT}" >> "$GITHUB_ENV"
-          echo "REDIS_URL=redis://127.0.0.1:${REDIS_PORT}" >> "$GITHUB_ENV"
-          echo "Redis host port: ${REDIS_PORT}"
+          docker run -d --name "$REDIS_CONTAINER" -p 16379:6379 redis:7
          for i in $(seq 1 15); do
            if docker exec "$REDIS_CONTAINER" redis-cli ping 2>/dev/null | grep -q PONG; then
              echo "Redis ready after ${i}s"
@@ -246,15 +135,13 @@ jobs:
        if: needs.detect-changes.outputs.api == 'true'
        working-directory: workspace-server
        run: |
-          # DATABASE_URL + REDIS_URL exported by the start-postgres /
-          # start-redis steps point at this run's per-run host ports.
          ./platform-server > platform.log 2>&1 &
          echo $! > platform.pid
      - name: Wait for /health
        if: needs.detect-changes.outputs.api == 'true'
        run: |
          for i in $(seq 1 30); do
-            if curl -sf http://127.0.0.1:8080/health > /dev/null; then
+            if curl -sf http://localhost:8080/health > /dev/null; then
              echo "Platform up after ${i}s"
              exit 0
            fi
@@ -298,9 +185,6 @@ jobs:
            kill "$(cat workspace-server/platform.pid)" 2>/dev/null || true
          fi
      - name: Stop service containers
-        # always() so containers don't leak when test steps fail. The
-        # cleanup is best-effort: if the container is already gone
-        # (e.g. concurrent rerun race), don't fail the job.
        if: always() && needs.detect-changes.outputs.api == 'true'
        run: |
          docker rm -f "$PG_CONTAINER" 2>/dev/null || true
@@ -22,9 +22,9 @@ on:
  # spending CI cycles. See e2e-api.yml for the rationale on why this
  # is a single job rather than two-jobs-sharing-name.
  push:
-    branches: [main]
+    branches: [main, staging]
  pull_request:
-    branches: [main]
+    branches: [main, staging]
  workflow_dispatch:
  schedule:
    # Weekly on Sunday 08:00 UTC — catches Chrome / Playwright / Next.js
@@ -124,6 +124,7 @@ jobs:
          node-version: '20'
          cache: 'npm'
          cache-dependency-path: canvas/package-lock.json
+          token: ${{ secrets.GITEA_TOKEN }}

      - name: Install canvas deps
        if: needs.detect-changes.outputs.canvas == 'true'
@@ -32,7 +32,7 @@ name: E2E Staging External Runtime

 on:
  push:
-    branches: [main]
+    branches: [staging, main]
    paths:
      - 'workspace-server/internal/handlers/workspace.go'
      - 'workspace-server/internal/handlers/registry.go'
@@ -44,7 +44,7 @@ on:
      - 'tests/e2e/test_staging_external_runtime.sh'
      - '.github/workflows/e2e-staging-external.yml'
  pull_request:
-    branches: [main]
+    branches: [staging, main]
    paths:
      - 'workspace-server/internal/handlers/workspace.go'
      - 'workspace-server/internal/handlers/registry.go'
@@ -20,12 +20,13 @@ name: E2E Staging SaaS (full lifecycle)
 #     via the same paths watcher that e2e-api.yml uses)

 on:
-  # Trunk-based (Phase 3 of internal#81): main is the only branch.
-  # Previously this fired on staging push too because staging was a
-  # superset of main and ran the gate ahead of auto-promote; with no
-  # staging branch, main is where E2E gates the deploy.
+  # Fire on staging push too — previously this only ran on main, which
+  # meant the most thorough end-to-end test caught regressions AFTER
+  # they shipped to staging (and then to the auto-promote PR). Running
+  # on staging push catches them BEFORE the staging→main promotion
+  # opens, so a green canary into auto-promote is more meaningful.
  push:
-    branches: [main]
+    branches: [staging, main]
    paths:
      - 'workspace-server/internal/handlers/registry.go'
      - 'workspace-server/internal/handlers/workspace_provision.go'
@@ -35,7 +36,7 @@ on:
      - 'tests/e2e/test_staging_full_saas.sh'
      - '.github/workflows/e2e-staging-saas.yml'
  pull_request:
-    branches: [main]
+    branches: [staging, main]
    paths:
      - 'workspace-server/internal/handlers/registry.go'
      - 'workspace-server/internal/handlers/workspace_provision.go'
@@ -14,42 +14,12 @@ name: Handlers Postgres Integration
 # self-review caught it took 2 minutes to set up and would have caught
 # the bug at PR-time.
 #
-# Why this workflow does NOT use `services: postgres:` (Class B fix)
-# ------------------------------------------------------------------
-# Our act_runner config has `container.network: host` (operator host
-# /opt/molecule/runners/config.yaml), which act_runner applies to BOTH
-# the job container AND every service container. With host-net, two
-# concurrent runs of this workflow both try to bind 0.0.0.0:5432 — the
-# second postgres FATALs with `could not create any TCP/IP sockets:
-# Address in use`, and Docker auto-removes it (act_runner sets
-# AutoRemove:true on service containers). By the time the migrations
-# step runs `psql`, the postgres container is gone, hence
-# `Connection refused` then `failed to remove container: No such
-# container` at cleanup time.
+# This job spins a Postgres service container, applies the migration,
+# and runs `go test -tags=integration` against a live DB. Required
+# check on staging branch protection — backend handler PRs cannot
+# merge without a real-DB regression gate.
 #
-# Per-job `container.network` override is silently ignored by
-# act_runner — `--network and --net in the options will be ignored.`
-# appears in the runner log. Documented constraint.
-#
-# So we sidestep `services:` entirely. The job container still uses
-# host-net (inherited from runner config; required for cache server
-# discovery on the bridge IP 172.18.0.17:42631). We launch a sibling
-# postgres on the existing `molecule-monorepo-net` bridge with a
-# UNIQUE name per run — `pg-handlers-${RUN_ID}-${RUN_ATTEMPT}` — and
-# read its bridge IP via `docker inspect`. A host-net job container
-# can reach a bridge-net container directly via the bridge IP (verified
-# manually on operator host 2026-05-08).
-#
-# Trade-offs vs. the original `services:` shape:
-#   + No host-port collision; N parallel runs share the bridge cleanly
-#   + `if: always()` cleanup runs even on test-step failure
-#   - One more step in the workflow (+~3 lines)
-#   - Requires `molecule-monorepo-net` to exist on the operator host
-#     (it does; declared in docker-compose.yml + docker-compose.infra.yml)
-#
-# Class B Hongming-owned CICD red sweep, 2026-05-08.
-#
-# Cost: ~30s job (postgres pull from cache + go build + 4 tests).
+# Cost: ~30s job (postgres pull from GH cache + go build + 4 tests).

 on:
  push:
@@ -89,14 +59,20 @@ jobs:
    name: Handlers Postgres Integration
    needs: detect-changes
    runs-on: ubuntu-latest
-    env:
-      # Unique name per run so concurrent jobs don't collide on the
-      # bridge network. ${RUN_ID}-${RUN_ATTEMPT} is unique even across
-      # workflow_dispatch reruns of the same run_id.
-      PG_NAME: pg-handlers-${{ github.run_id }}-${{ github.run_attempt }}
-      # Bridge network already exists on the operator host (declared
-      # in docker-compose.yml + docker-compose.infra.yml).
-      PG_NETWORK: molecule-monorepo-net
+    services:
+      postgres:
+        image: postgres:15-alpine
+        env:
+          POSTGRES_PASSWORD: test
+          POSTGRES_DB: molecule
+        ports:
+          - 5432:5432
+        # GHA spins this with --health-cmd built in for postgres images.
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 5s
+          --health-timeout 5s
+          --health-retries 10
    defaults:
      run:
        working-directory: workspace-server
@@ -113,57 +89,16 @@ jobs:
        with:
          go-version: 'stable'

-      - if: needs.detect-changes.outputs.handlers == 'true'
-        name: Start sibling Postgres on bridge network
-        working-directory: .
-        run: |
-          # Sanity: the bridge network must exist on the operator host.
-          # Hard-fail loud if it doesn't — easier to spot than a silent
-          # auto-create that diverges from the rest of the stack.
-          if ! docker network inspect "${PG_NETWORK}" >/dev/null 2>&1; then
-            echo "::error::Bridge network '${PG_NETWORK}' missing on operator host. Re-run docker-compose.infra.yml or check ops handbook."
-            exit 1
-          fi
-
-          # If a stale container with the same name exists (rerun on
-          # the same run_id), wipe it first.
-          docker rm -f "${PG_NAME}" >/dev/null 2>&1 || true
-
-          docker run -d \
-            --name "${PG_NAME}" \
-            --network "${PG_NETWORK}" \
-            --health-cmd "pg_isready -U postgres" \
-            --health-interval 5s \
-            --health-timeout 5s \
-            --health-retries 10 \
-            -e POSTGRES_PASSWORD=test \
-            -e POSTGRES_DB=molecule \
-            postgres:15-alpine >/dev/null
-
-          # Read back the bridge IP. Always present immediately after
-          # `docker run -d` for bridge networks.
-          PG_HOST=$(docker inspect "${PG_NAME}" \
-            --format "{{(index .NetworkSettings.Networks \"${PG_NETWORK}\").IPAddress}}")
-          if [ -z "${PG_HOST}" ]; then
-            echo "::error::Could not resolve PG_HOST for ${PG_NAME} on ${PG_NETWORK}"
-            docker logs "${PG_NAME}" || true
-            exit 1
-          fi
-          echo "PG_HOST=${PG_HOST}" >> "$GITHUB_ENV"
-          echo "INTEGRATION_DB_URL=postgres://postgres:test@${PG_HOST}:5432/molecule?sslmode=disable" >> "$GITHUB_ENV"
-          echo "Started ${PG_NAME} at ${PG_HOST}:5432"
-
      - if: needs.detect-changes.outputs.handlers == 'true'
        name: Apply migrations to Postgres service
        env:
          PGPASSWORD: test
        run: |
-          # Wait for postgres to actually accept connections. Docker's
-          # health-cmd handles container-side readiness, but the wire
-          # to the bridge IP is best-tested with pg_isready directly.
+          # Wait for postgres to actually accept connections (the
+          # GHA --health-cmd is best-effort but psql can still race).
          for i in {1..15}; do
-            if pg_isready -h "${PG_HOST}" -p 5432 -U postgres -q; then break; fi
-            echo "waiting for postgres at ${PG_HOST}:5432..."; sleep 2
+            if pg_isready -h localhost -p 5432 -U postgres -q; then break; fi
+            echo "waiting for postgres..."; sleep 2
          done

          # Apply every .up.sql in lexicographic order with
@@ -196,7 +131,7 @@ jobs:
          # not fine once a cross-table atomicity test came in.
          set +e
          for migration in $(ls migrations/*.sql 2>/dev/null | grep -v '\.down\.sql$' | sort); do
-            if psql -h "${PG_HOST}" -U postgres -d molecule -v ON_ERROR_STOP=1 \
+            if psql -h localhost -U postgres -d molecule -v ON_ERROR_STOP=1 \
                  -f "$migration" >/dev/null 2>&1; then
              echo "✓ $(basename "$migration")"
            else
@@ -210,7 +145,7 @@ jobs:
          # fail if any didn't land — that would be a real regression we
          # want loud.
          for tbl in delegations workspaces activity_logs pending_uploads; do
-            if ! psql -h "${PG_HOST}" -U postgres -d molecule -tA \
+            if ! psql -h localhost -U postgres -d molecule -tA \
                -c "SELECT 1 FROM information_schema.tables WHERE table_name = '$tbl'" \
                | grep -q 1; then
              echo "::error::$tbl table missing after migration replay — handler integration tests would be meaningless"
@@ -221,32 +156,16 @@ jobs:

      - if: needs.detect-changes.outputs.handlers == 'true'
        name: Run integration tests
+        env:
+          INTEGRATION_DB_URL: postgres://postgres:test@localhost:5432/molecule?sslmode=disable
        run: |
-          # INTEGRATION_DB_URL is exported by the start-postgres step;
-          # points at the per-run bridge IP, not 127.0.0.1, so concurrent
-          # workflow runs don't fight over a host-net 5432 port.
          go test -tags=integration -timeout 5m -v ./internal/handlers/ -run "^TestIntegration_"

-      - if: failure() && needs.detect-changes.outputs.handlers == 'true'
+      - if: needs.detect-changes.outputs.handlers == 'true' && failure()
        name: Diagnostic dump on failure
        env:
          PGPASSWORD: test
        run: |
-          echo "::group::postgres container status"
-          docker ps -a --filter "name=${PG_NAME}" --format '{{.Status}} {{.Names}}' || true
-          docker logs "${PG_NAME}" 2>&1 | tail -50 || true
-          echo "::endgroup::"
          echo "::group::delegations table state"
-          psql -h "${PG_HOST}" -U postgres -d molecule -c "SELECT * FROM delegations LIMIT 50;" || true
+          psql -h localhost -U postgres -d molecule -c "SELECT * FROM delegations LIMIT 50;" || true
          echo "::endgroup::"
-
-      - if: always() && needs.detect-changes.outputs.handlers == 'true'
-        name: Stop sibling Postgres
-        working-directory: .
-        run: |
-          # always() so containers don't leak when migrations or tests
-          # fail. The cleanup is best-effort: if the container is
-          # already gone (e.g. concurrent rerun race), don't fail the job.
-          docker rm -f "${PG_NAME}" >/dev/null 2>&1 || true
-          echo "Cleaned up ${PG_NAME}"
-
@@ -1,25 +1,14 @@
 name: pr-guards

-# PR-time guards. Today the only guard is "disable auto-merge when a
-# new commit is pushed after auto-merge was enabled" — added 2026-04-27
-# after PR #2174 auto-merged with only its first commit because the
-# second commit was pushed after the merge queue had locked the PR's
-# SHA.
+# Thin caller that delegates to the molecule-ci reusable guard. Today
+# the guard is just "disable auto-merge when a new commit is pushed
+# after auto-merge was enabled" — added 2026-04-27 after PR #2174
+# auto-merged with only its first commit because the second commit
+# was pushed after the merge queue had locked the PR's SHA.
 #
-# Why this is inlined (not delegated to molecule-ci's reusable
-# workflow): the reusable workflow uses `gh pr merge --disable-auto`,
-# which calls GitHub's GraphQL API. Gitea has no GraphQL endpoint and
-# returns HTTP 405 on /api/graphql, so the job failed on every Gitea
-# PR push since the 2026-05-06 migration. Gitea also has no `--auto`
-# merge primitive that this job could be acting on, so the right
-# behaviour on Gitea is "no-op + green status" — not a 405.
-#
-# Inlining (vs. an `if:` on the `uses:` line) keeps the job ALWAYS
-# running, which matters for branch protection: required-check names
-# need a job that emits SUCCESS terminal state, not SKIPPED. See
-# `feedback_branch_protection_check_name_parity` and `feedback_pr_merge_safety_guards`.
-#
-# Issue #88 item 1.
+# When more PR-time guards land in molecule-ci, add them here as
+# additional jobs that share the same pull_request:synchronize
+# trigger.

 on:
  pull_request:
@@ -30,34 +19,4 @@ permissions:

 jobs:
  disable-auto-merge-on-push:
-    runs-on: ubuntu-latest
-    steps:
-      # Detect Gitea Actions. act_runner sets GITEA_ACTIONS=true in the
-      # step env on every job. Belt-and-suspenders: also check the repo
-      # url's host, which is independent of any runner-side env config
-      # (covers a future Gitea host where the env var is forgotten).
-      - name: Detect runner host
-        id: host
-        run: |
-          if [[ "${GITEA_ACTIONS:-}" == "true" ]] || [[ "${{ github.server_url }}" == *moleculesai.app* ]] || [[ "${{ github.event.repository.html_url }}" == *moleculesai.app* ]]; then
-            echo "is_gitea=true" >> "$GITHUB_OUTPUT"
-            echo "::notice::Gitea Actions detected — auto-merge gating is not applicable here (Gitea has no --auto merge primitive). Job will no-op."
-          else
-            echo "is_gitea=false" >> "$GITHUB_OUTPUT"
-          fi
-
-      - name: Disable auto-merge (GitHub only)
-        if: steps.host.outputs.is_gitea != 'true'
-        env:
-          GH_TOKEN: ${{ github.token }}
-          PR: ${{ github.event.pull_request.number }}
-          REPO: ${{ github.repository }}
-          NEW_SHA: ${{ github.sha }}
-        run: |
-          set -eu
-          gh pr merge "$PR" --disable-auto -R "$REPO" || true
-          gh pr comment "$PR" -R "$REPO" --body "🔒 Auto-merge disabled — new commit (\`${NEW_SHA:0:7}\`) pushed after auto-merge was enabled. The merge queue locks SHAs at entry, so subsequent pushes can race. Verify the new commit and re-enable with \`gh pr merge --auto\`."
-
-      - name: Gitea no-op
-        if: steps.host.outputs.is_gitea == 'true'
-        run: echo "Gitea Actions — auto-merge gating not applicable; no-op (job intentionally green so branch protection's required-check name lands SUCCESS)."
+    uses: molecule-ai/molecule-ci/.github/workflows/disable-auto-merge-on-push.yml@main
@@ -282,33 +282,42 @@ jobs:
          echo "::error::Refusing to fan out cascade against stale or corrupt PyPI surfaces."
          exit 1

-      - name: Fan out via push to .runtime-version
+      - name: Fan out repository_dispatch
        env:
-          # Gitea PAT with write:repository scope on the 8 cascade-active
-          # template repos. Used here for `git push` (NOT for an API
-          # dispatch — Gitea 1.22.6 has no repository_dispatch endpoint;
-          # empirically verified across 6 candidate paths in molecule-
-          # core#20 issuecomment-913). The push trips each template's
-          # existing `on: push: branches: [main]` trigger on
-          # publish-image.yml, which then reads the updated
-          # .runtime-version via its resolve-version job.
-          DISPATCH_TOKEN: ${{ secrets.DISPATCH_TOKEN }}
+          # Fine-grained PAT with `actions:write` on the 8 template repos.
+          # GITHUB_TOKEN can't fire dispatches across repos — needs an explicit
+          # token. Stored as a repo secret; rotate per the standard schedule.
+          DISPATCH_TOKEN: ${{ secrets.TEMPLATE_DISPATCH_TOKEN }}
+          # Single source of truth: the publish job's output, which handles
+          # tag/manual-input/auto-bump uniformly. The previous fallback
+          # (`steps.version.outputs.version` from inside the cascade job)
+          # was a dead reference — different job, no shared step scope.
          RUNTIME_VERSION: ${{ needs.publish.outputs.version }}
        run: |
          set +e   # don't abort on a single repo failure — collect them all
-
-          # Soft-skip on workflow_dispatch when the token is missing
-          # (operator ad-hoc test); hard-fail on push so unattended
-          # publishes can't silently skip the cascade. Same shape as
-          # the original v1, intentional split per the schedule-vs-
-          # dispatch hardening 2026-04-28.
+          # Schedule-vs-dispatch behaviour split (hardened 2026-04-28
+          # after the sweep-cf-orphans soft-skip incident — same class
+          # of bug):
+          #
+          # The earlier "skipping cascade. templates will pick up the
+          # new version on their own next rebuild" message was wrong —
+          # templates only build on this dispatch trigger; without it
+          # they stay pinned to whatever runtime version they last saw.
+          # A silent skip here means "PyPI is current, templates are
+          # not" and the gap is invisible until someone notices a
+          # template still on the old version weeks later.
+          #
+          #   - push                → exit 1 (red CI surfaces the gap)
+          #   - workflow_dispatch   → exit 0 with a warning (operator
+          #                           ran this ad-hoc; let them rerun
+          #                           after fixing the secret)
          if [ -z "$DISPATCH_TOKEN" ]; then
            if [ "${{ github.event_name }}" = "workflow_dispatch" ]; then
-              echo "::warning::DISPATCH_TOKEN secret not set — skipping cascade."
+              echo "::warning::TEMPLATE_DISPATCH_TOKEN secret not set — skipping cascade."
              echo "::warning::set it at Settings → Secrets and Variables → Actions, then rerun. Templates will stay on the prior runtime version until either this token is set or each template is rebuilt manually."
              exit 0
            fi
-            echo "::error::DISPATCH_TOKEN secret missing — cascade cannot fan out."
+            echo "::error::TEMPLATE_DISPATCH_TOKEN secret missing — cascade cannot fan out."
            echo "::error::PyPI was published, but the 8 template repos will NOT pick up the new version until this token is restored and a republish dispatches the cascade."
            echo "::error::set it at Settings → Secrets and Variables → Actions; then re-trigger publish-runtime via workflow_dispatch."
            exit 1
@@ -318,119 +327,37 @@ jobs:
            echo "::error::publish job did not expose a version output — cascade cannot fan out"
            exit 1
          fi
-
-          # All 9 workspace templates declared in manifest.json. The list
-          # MUST stay aligned with manifest.json's workspace_templates —
-          # cascade-list-drift-gate.yml enforces this in CI per the
-          # codex-stuck-on-stale-runtime invariant from PR #2556.
-          # Long-term goal: derive this list from manifest.json so it
-          # can't drift even on a manifest edit (RFC #388 Phase-1).
-          #
-          # Per-template publish-image.yml presence is checked at
-          # cascade-time below: codex doesn't ship one today, so the
-          # cascade soft-skips it with an informational message rather
-          # than dropping it from this list (which would re-introduce
-          # the drift the gate exists to catch).
-          GITEA_URL="${GITEA_URL:-https://git.moleculesai.app}"
+          # All 9 active workspace template repos. The PR #2536 pruning
+          # ("deprecated, no shipping images") was empirically wrong:
+          # continuous-synth-e2e.yml defaults to langgraph as its primary
+          # canary (line 44), and every excluded template had successful
+          # publish-image runs as of 2026-05-03 — none were dormant.
+          # Symptom of the prune: today's a2a-sdk strict-mode fix
+          # (#2566 / commit e1628c4) cascaded to 4 templates but never
+          # reached langgraph, so the synth-E2E correctly canary'd a fix
+          # that had landed but not deployed. Re-added the 5 templates.
+          # Long-term: derive this list from manifest.json so cascade
+          # scope can't drift from E2E scope — tracked in RFC #388 as a
+          # Phase-1 invariant.
          TEMPLATES="claude-code hermes openclaw codex langgraph crewai autogen deepagents gemini-cli"
          FAILED=""
-          SKIPPED=""
-
-          # Configure git identity once. The persona owning DISPATCH_TOKEN
-          # is the same identity that authored this commit on each
-          # template; using a generic "publish-runtime cascade" co-author
-          # trailer in the message keeps the audit trail honest about the
-          # workflow-driven origin.
-          git config --global user.name  "publish-runtime cascade"
-          git config --global user.email "publish-runtime@moleculesai.app"
-
-          WORKDIR="$(mktemp -d)"
          for tpl in $TEMPLATES; do
            REPO="molecule-ai/molecule-ai-workspace-template-$tpl"
-            CLONE="$WORKDIR/$tpl"
-
-            # Pre-check: skip templates without a publish-image.yml.
-            # The cascade's job is to trip the template's on-push
-            # rebuild — if there's no rebuild workflow, pushing a
-            # .runtime-version commit is just noise on the target
-            # repo. Use the Gitea contents API (no clone required for
-            # the probe). 200 = present; 404 = absent.
-            HTTP=$(curl -sS -o /dev/null -w "%{http_code}" \
-              -H "Authorization: token $DISPATCH_TOKEN" \
-              "$GITEA_URL/api/v1/repos/$REPO/contents/.github/workflows/publish-image.yml")
-            if [ "$HTTP" = "404" ]; then
-              echo "↷ $tpl has no publish-image.yml — soft-skip (informational; manifest still tracks it)"
-              SKIPPED="$SKIPPED $tpl"
-              continue
-            fi
-            if [ "$HTTP" != "200" ]; then
-              echo "::warning::$tpl publish-image.yml probe returned HTTP $HTTP — proceeding anyway, push will surface the real failure if any"
-            fi
-
-            # Use a per-template attempt loop so a transient race (e.g.
-            # human pushing to the same template at the same instant)
-            # doesn't lose the cascade. Bounded retries (3) — beyond
-            # that we surface the failure and let the operator retry.
-            attempt=0
-            success=false
-            while [ $attempt -lt 3 ]; do
-              attempt=$((attempt + 1))
-              rm -rf "$CLONE"
-              if ! git clone --depth=1 \
-                  "https://x-access-token:${DISPATCH_TOKEN}@${GITEA_URL#https://}/$REPO.git" \
-                  "$CLONE" >/tmp/clone.log 2>&1; then
-                echo "::warning::clone $tpl attempt $attempt failed: $(tail -n3 /tmp/clone.log)"
-                sleep 2
-                continue
-              fi
-
-              cd "$CLONE"
-              echo "$VERSION" > .runtime-version
-
-              # Idempotency guard: if the file already matches, this
-              # publish is a re-run for a version already cascaded.
-              # Don't push a no-op commit (would spuriously re-trip the
-              # template's on-push and rebuild for nothing).
-              if git diff --quiet -- .runtime-version; then
-                echo "✓ $tpl already at $VERSION — no commit needed (idempotent)"
-                success=true
-                cd - >/dev/null
-                break
-              fi
-
-              git add .runtime-version
-              git commit -m "chore: pin runtime to $VERSION (publish-runtime cascade)" \
-                -m "Co-Authored-By: publish-runtime cascade <publish-runtime@moleculesai.app>" \
-                >/dev/null
-
-              if git push origin HEAD:main >/tmp/push.log 2>&1; then
-                echo "✓ $tpl pushed $VERSION on attempt $attempt"
-                success=true
-                cd - >/dev/null
-                break
-              fi
-
-              # Likely a non-fast-forward — pull-rebase and retry.
-              # Don't force-push: that would silently overwrite a racing
-              # human/cascade commit.
-              echo "::warning::push $tpl attempt $attempt failed, pull-rebasing: $(tail -n3 /tmp/push.log)"
-              git pull --rebase origin main >/tmp/rebase.log 2>&1 || true
-              cd - >/dev/null
-            done
-
-            if [ "$success" != "true" ]; then
+            STATUS=$(curl -sS -o /tmp/dispatch.out -w "%{http_code}" \
+              -X POST "https://api.github.com/repos/$REPO/dispatches" \
+              -H "Authorization: Bearer $DISPATCH_TOKEN" \
+              -H "Accept: application/vnd.github+json" \
+              -H "X-GitHub-Api-Version: 2022-11-28" \
+              -d "{\"event_type\":\"runtime-published\",\"client_payload\":{\"runtime_version\":\"$VERSION\"}}")
+            if [ "$STATUS" = "204" ]; then
+              echo "✓ dispatched $tpl ($VERSION)"
+            else
+              echo "::warning::✗ failed to dispatch $tpl: HTTP $STATUS — $(cat /tmp/dispatch.out)"
              FAILED="$FAILED $tpl"
            fi
          done
-          rm -rf "$WORKDIR"
-
          if [ -n "$FAILED" ]; then
-            echo "::error::Cascade incomplete after 3 retries each. Failed templates:$FAILED"
-            echo "::error::PyPI publish succeeded; failed templates lag the new version. Re-run this workflow_dispatch with the same version to retry only the laggers (idempotent — already-cascaded templates skip)."
-            exit 1
-          fi
-          if [ -n "$SKIPPED" ]; then
-            echo "Cascade complete: pinned $VERSION on cascade-active templates. Soft-skipped (no publish-image.yml):$SKIPPED"
-          else
-            echo "Cascade complete: $VERSION pinned across all manifest workspace_templates."
+            echo "::warning::Cascade incomplete. Failed templates:$FAILED"
+            # Don't fail the whole job — PyPI publish already succeeded;
+            # operators can retry the failed templates manually.
          fi
@@ -36,7 +36,7 @@ on:
  workflow_run:
    workflows: ['publish-workspace-server-image']
    types: [completed]
-    branches: [main]
+    branches: [staging]
  workflow_dispatch:
    inputs:
      target_tag:
@@ -110,7 +110,7 @@ causing a render loop when any node position changed.

 1. **Repo-wide:** "Automatically delete head branches" is on. Once a PR merges, the branch is deleted server-side. Any subsequent `git push` to that branch fails with `remote rejected — no such branch`.

-2. **CI:** the `pr-guards` workflow (calling [molecule-ci `disable-auto-merge-on-push`](https://git.moleculesai.app/molecule-ai/molecule-ci/src/branch/main/.github/workflows/disable-auto-merge-on-push.yml)) fires on every push to an open PR. If auto-merge was already enabled, it's disabled and a comment is posted. You must explicitly re-enable after verifying the new commit.
+2. **CI:** the `pr-guards` workflow (calling [molecule-ci `disable-auto-merge-on-push`](https://git.moleculesai.app/molecule-ai/molecule-ci/blob/main/.github/workflows/disable-auto-merge-on-push.yml)) fires on every push to an open PR. If auto-merge was already enabled, it's disabled and a comment is posted. You must explicitly re-enable after verifying the new commit.

 **Workflow rules that follow from the guards:**
 - Push **all** commits before running `gh pr merge --auto`.
@@ -1,28 +0,0 @@
-# Top-level Makefile — convenience wrappers around docker compose.
-#
-# Most molecule-core dev work happens via these shortcuts. CI doesn't
-# use this Makefile; CI calls docker compose / go test directly so the
-# Makefile can evolve without breaking the build.
-
-.PHONY: help dev up down logs build test
-
-help: ## Show this help.
-	@grep -E '^[a-zA-Z_-]+:.*?## ' $(MAKEFILE_LIST) | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-12s\033[0m %s\n", $$1, $$2}'
-
-dev: ## Start the full stack with air hot-reload for the platform service.
-	docker compose -f docker-compose.yml -f docker-compose.dev.yml up
-
-up: ## Start the full stack in production-shape mode (no air, normal Dockerfile).
-	docker compose up
-
-down: ## Stop the stack and remove containers (volumes preserved).
-	docker compose down
-
-logs: ## Tail logs from all services (Ctrl-C to detach).
-	docker compose logs -f
-
-build: ## Force a fresh build of the platform image (no cache).
-	docker compose build --no-cache platform
-
-test: ## Run Go unit tests in workspace-server/.
-	cd workspace-server && go test -race ./...
@@ -1,7 +1,7 @@
 <div align="center">

 <p>
-  <img src="./docs/assets/branding/molecule-icon.svg" alt="Molecule AI" width="160" />
+  <img src="./docs/assets/branding/molecule-icon.png" alt="Molecule AI Icon Logo" width="160" />
 </p>

 <p>
@@ -53,8 +53,8 @@ Molecule AI is the most powerful way to govern an AI agent organization in produ
 It combines the parts that are usually scattered across demos, internal glue code, and framework-specific tooling into one product:

 - one org-native control plane for teams, roles, hierarchy, and lifecycle
- one runtime layer that lets **eight** agent runtimes — LangGraph, DeepAgents, Claude Code, CrewAI, AutoGen, **Hermes**, **Gemini CLI**, and OpenClaw — run side by side behind one workspace contract
- one memory model that keeps recall, sharing, and skill evolution aligned with organizational boundaries (Memory v2 backed by pgvector for semantic recall)
+- one runtime layer that lets LangGraph, DeepAgents, Claude Code, CrewAI, AutoGen, and OpenClaw run side by side
+- one memory model that keeps recall, sharing, and skill evolution aligned with organizational boundaries
 - one operational surface for observing, pausing, restarting, inspecting, and improving live workspaces

 Most teams can build a workflow, a strong single agent, a coding agent, or a custom multi-agent graph.
@@ -75,7 +75,7 @@ You do not wire collaboration paths by hand. Hierarchy defines the default commu

 ### 3. Runtime choice stops being a dead-end decision

-LangGraph, DeepAgents, Claude Code, CrewAI, AutoGen, Hermes, Gemini CLI, and OpenClaw can all plug into the same workspace abstraction. Teams can standardize governance without forcing every group onto one runtime.
+LangGraph, DeepAgents, Claude Code, CrewAI, AutoGen, and OpenClaw can all plug into the same workspace abstraction. Teams can standardize governance without forcing every group onto one runtime.

 ### 4. Memory is treated like infrastructure

@@ -117,8 +117,6 @@ Molecule AI is not trying to replace the frameworks below. It is the system that
 | **Claude Code** | Shipping on `main` | Real coding workflows, CLI-native continuity | Secure workspace abstraction, A2A delegation, org boundaries, shared control plane |
 | **CrewAI** | Shipping on `main` | Role-based crews | Persistent workspace identity, policy consistency, shared canvas and registry |
 | **AutoGen** | Shipping on `main` | Assistant/tool orchestration | Standardized deployment, hierarchy-aware collaboration, shared ops plane |
-| **Hermes 4** | Shipping on `main` | Hybrid reasoning, native tools, json_schema (NousResearch/hermes-agent) | Option B upstream hook, A2A bridge to OpenAI-compat API, multi-provider provider derivation |
-| **Gemini CLI** | Shipping on `main` | Google Gemini CLI continuity | Workspace lifecycle, A2A, hierarchy-aware collaboration, shared ops plane |
 | **OpenClaw** | Shipping on `main` | CLI-native runtime with its own session model | Workspace lifecycle, templates, activity logs, topology-aware collaboration |
 | **NemoClaw** | WIP on `feat/nemoclaw-t4-docker` | NVIDIA-oriented runtime path | Planned to join the same abstraction once merged; not yet part of `main` |

@@ -184,10 +182,9 @@ The result is not just “an agent that learns.” It is **an organization that

 ## What Ships In `main`

-### Canvas (v4)
+### Canvas

 - Next.js 15 + React Flow + Zustand
- **warm-paper theme system** — light / dark / follow-system, SSR cookie + nonce'd boot script + ThemeProvider; terminal + code surfaces stay dark unconditionally
 - drag-to-nest team building
 - empty-state deployment + onboarding wizard
 - template palette
@@ -196,9 +193,8 @@ The result is not just “an agent that learns.” It is **an organization that

 ### Platform

- Go 1.25 / Gin control plane (80+ HTTP endpoints + Gorilla WebSocket fanout)
- workspace CRUD and provisioning (pluggable Provisioner — Docker locally, EC2 + SSM in production)
- **A2A response path is a typed discriminated union (RFC #2967)** — frozen dataclasses + total parser; 100% unit + adversarial fuzz coverage
+- Go/Gin control plane
+- workspace CRUD and provisioning
 - registry and heartbeats
 - browser-safe A2A proxy
 - team expansion/collapse
@@ -208,10 +204,10 @@ The result is not just “an agent that learns.” It is **an organization that

 ### Runtime

- unified `workspace/` image; thin AMI in production (us-east-2)
- adapter-driven execution across **8 runtimes** (Claude Code, Hermes, Gemini CLI, LangGraph, DeepAgents, CrewAI, AutoGen, OpenClaw)
+- unified `workspace/` image
+- adapter-driven execution
 - Agent Card registration
- awareness-backed memory integration; **Memory v2 backed by pgvector** for semantic recall
+- awareness-backed memory integration
 - plugin-mounted shared rules/skills
 - hot-reloadable local skills
 - coordinator-only delegation path
@@ -225,21 +221,6 @@ The result is not just “an agent that learns.” It is **an organization that
 - runtime tiers
 - direct workspace inspection through terminal and files

-### SaaS (via [`molecule-controlplane`](https://git.moleculesai.app/molecule-ai/molecule-controlplane))
-
- multi-tenant on AWS EC2 + Neon (per-tenant Postgres branch) + Cloudflare Tunnels (per-tenant, no public ports)
- WorkOS AuthKit + Stripe Checkout + Customer Portal
- AWS KMS envelope encryption (DB / Redis connection strings); AWS Secrets Manager for tenant bootstrap
- `tenant_resources` audit table + 30-min boot-event-aware reconciler — every CF / AWS lifecycle event recorded, claim vs live state diffed
-
-### Bring your own Claude Code session (via [`molecule-mcp-claude-channel`](https://git.moleculesai.app/molecule-ai/molecule-mcp-claude-channel))
-
- Claude Code plugin that bridges Molecule A2A traffic into a local Claude Code session via MCP
- subscribe to one or more workspaces; peer messages surface as conversation turns; replies route back through Molecule's A2A
- no tunnel, no public endpoint — the plugin self-registers each watched workspace as `delivery_mode=poll` and long-polls `/activity?since_id=…`
- multi-tenant friendly: one plugin install can watch workspaces across multiple Molecule tenants (`MOLECULE_PLATFORM_URLS` per-workspace)
- install via the standard marketplace flow: `/plugin marketplace add Molecule-AI/molecule-mcp-claude-channel` → `/plugin install molecule-channel@molecule-mcp-claude-channel`
-
 ## Built For Teams That Need More Than A Demo

 Molecule AI is especially strong when you need to run:
@@ -252,30 +233,24 @@ Molecule AI is especially strong when you need to run:
 ## Architecture

 ```text
-Canvas (Next.js 15, warm-paper :3000)  <--HTTP / WS-->  Platform (Go 1.25 :8080)  <---> Postgres + Redis
-         |                                                           |
-         |                                                           +--> Provisioner: Docker (local) / EC2 + SSM (prod)
-         |                                                           +--> bundles · templates · secrets · KMS
+Canvas (Next.js :3000)  <--HTTP / WS-->  Platform (Go :8080)  <---> Postgres + Redis
+         |                                          |
+         |                                          +--> Docker provisioner / bundles / templates / secrets
         |
-         +------------------------- shows ------------------------> workspaces, teams, tasks, traces, events
+         +-------------------- shows --------------------> workspaces, teams, tasks, traces, events

-Workspace Runtime (Python ≥3.11, image with adapters)
-  - 8 adapters: LangGraph / DeepAgents / Claude Code / CrewAI / AutoGen / Hermes / Gemini CLI / OpenClaw
-  - Agent Card + A2A server (typed-SSOT response path, RFC #2967)
-  - heartbeat + activity + awareness-backed memory (Memory v2 — pgvector semantic recall)
+Workspace Runtime (Python image with adapters)
+  - LangGraph / DeepAgents / Claude Code / CrewAI / AutoGen / OpenClaw
+  - Agent Card + A2A server
+  - heartbeat + activity + awareness-backed memory
  - skills + plugins + hot reload
-
-SaaS Control Plane (molecule-controlplane, private)
-  - per-tenant EC2 + Neon (Postgres branch) + Cloudflare Tunnel
-  - WorkOS · Stripe · KMS · AWS Secrets Manager
-  - tenant_resources audit + 30-min reconciler
 ```

 ## Quick Start

 ```bash
 git clone https://git.moleculesai.app/molecule-ai/molecule-core.git
-cd molecule-core
+cd molecule-monorepo

 cp .env.example .env
 # Defaults boot the stack locally out of the box. See .env.example for
@@ -328,11 +303,7 @@ Then open `http://localhost:3000`:

 ## Current Scope

-The current `main` branch ships the core platform, Canvas v4 (warm-paper themed), Memory v2 (pgvector semantic recall), the typed-SSOT A2A response path (RFC #2967), **eight production adapters** (Claude Code, Hermes, Gemini CLI, LangGraph, DeepAgents, CrewAI, AutoGen, OpenClaw), skill lifecycle, and operational surfaces.
-
-The companion private repo [`molecule-controlplane`](https://git.moleculesai.app/molecule-ai/molecule-controlplane) provides the SaaS surface — multi-tenant orchestration on EC2 + Neon + Cloudflare Tunnels, KMS envelope encryption, WorkOS auth, Stripe billing, and a `tenant_resources` audit table with a 30-min reconciler.
-
-Adjacent runtime work such as **NemoClaw** remains branch-level until merged, and this README keeps that distinction explicit on purpose.
+The current `main` branch already includes the core platform, canvas, memory model, six production adapters, skill lifecycle, and operational surfaces. Adjacent runtime work such as **NemoClaw** remains branch-level until merged, and this README keeps that distinction explicit on purpose.

 ## License

@@ -1,7 +1,7 @@
 <div align="center">

 <p>
-  <img src="./docs/assets/branding/molecule-icon.svg" alt="Molecule AI" width="160" />
+  <img src="./docs/assets/branding/molecule-icon.png" alt="Molecule AI 图案 Logo" width="160" />
 </p>

 <p>
@@ -52,8 +52,8 @@ Molecule AI 是目前最强的 AI Agent 组织治理方案之一，用来把 age
 它把过去分散在 demo、内部胶水代码和各类 framework 私有工具里的关键能力，收敛成一个产品：

 - 一套组织原生 control plane，管理团队、角色、层级和生命周期
- 一套 runtime abstraction，让 **8 个** agent runtime —— LangGraph、DeepAgents、Claude Code、CrewAI、AutoGen、**Hermes**、**Gemini CLI**、OpenClaw —— 共用一套 workspace 契约
- 一套与组织边界对齐的 memory 模型，把 recall、sharing 和 skill evolution 放进同一体系（Memory v2 由 pgvector 支撑语义召回）
+- 一套 runtime abstraction，让 LangGraph、DeepAgents、Claude Code、CrewAI、AutoGen、OpenClaw 并存运行
+- 一套与组织边界对齐的 memory 模型，把 recall、sharing 和 skill evolution 放进同一体系
 - 一套面向线上 workspace 的运维面，统一完成观测、暂停、重启、检查和持续改进

 今天很多团队能做好 workflow、单 agent、coding agent，或者自定义 multi-agent graph 中的一种。
@@ -74,7 +74,7 @@ Molecule AI 填的就是这个空白。

 ### 3. Runtime 选择不再是死路

-LangGraph、DeepAgents、Claude Code、CrewAI、AutoGen、Hermes、Gemini CLI、OpenClaw 都可以挂到同一个 workspace abstraction 下。团队可以统一治理方式，而不必统一到底层 runtime。
+LangGraph、DeepAgents、Claude Code、CrewAI、AutoGen、OpenClaw 都可以挂到同一个 workspace abstraction 下。团队可以统一治理方式，而不必统一到底层 runtime。

 ### 4. Memory 被当成基础设施来做

@@ -116,8 +116,6 @@ Molecule AI 并不是要替代下面这些 framework，而是把它们纳入更
 | **Claude Code** | `main` 已支持 | 真实编码工作流、CLI-native continuity | 安全 workspace 抽象、A2A delegation、组织边界、共享 control plane |
 | **CrewAI** | `main` 已支持 | 角色型 crew 模式清晰 | 持久 workspace 身份、统一策略、共享 Canvas 和 registry |
 | **AutoGen** | `main` 已支持 | assistant/tool orchestration | 统一部署、层级协作、共享运维平面 |
-| **Hermes 4** | `main` 已支持 | 混合推理、原生工具调用、json_schema 输出（NousResearch/hermes-agent） | Option B 上游 hook、A2A 桥接 OpenAI 兼容 API、多 provider 自动派生 |
-| **Gemini CLI** | `main` 已支持 | Google Gemini CLI 持续会话 | workspace 生命周期、A2A、层级感知协作、共享运维平面 |
 | **OpenClaw** | `main` 已支持 | CLI-native runtime，自有 session 模型 | workspace 生命周期、templates、activity logs、拓扑感知协作 |
 | **NemoClaw** | `feat/nemoclaw-t4-docker` 分支 WIP | NVIDIA 方向 runtime 路线 | 计划并入同一抽象层，但当前还不是 `main` 已合并能力 |

@@ -183,10 +181,9 @@ Molecule AI 并不是要替代下面这些 framework，而是把它们纳入更

 ## `main` 分支已经具备什么

-### Canvas（v4）
+### Canvas

 - Next.js 15 + React Flow + Zustand
- **warm-paper 主题系统** —— light / dark / 跟随系统；SSR cookie + nonce'd boot 脚本 + ThemeProvider；终端与代码面板始终保持深色
 - drag-to-nest 团队构建
 - empty state + onboarding wizard
 - template palette
@@ -195,9 +192,8 @@ Molecule AI 并不是要替代下面这些 framework，而是把它们纳入更

 ### Platform

- Go 1.25 / Gin control plane（80+ HTTP 端点 + Gorilla WebSocket fanout）
- workspace CRUD 和 provisioning（可插拔 Provisioner —— 本地 Docker、生产 EC2 + SSM）
- **A2A 响应路径已收敛为类型化的判别联合（RFC #2967）** —— 冻结 dataclass + 全量 parser；100% 单元测试 + 对抗性 fuzz 覆盖
+- Go/Gin control plane
+- workspace CRUD 和 provisioning
 - registry 与 heartbeat
 - 浏览器安全的 A2A proxy
 - team expansion/collapse
@@ -207,10 +203,10 @@ Molecule AI 并不是要替代下面这些 framework，而是把它们纳入更

 ### Runtime

- 统一 `workspace/` 镜像；生产环境采用 thin AMI（us-east-2）
- adapter 驱动执行，覆盖 **8 个 runtime**（Claude Code、Hermes、Gemini CLI、LangGraph、DeepAgents、CrewAI、AutoGen、OpenClaw）
+- 统一 `workspace/` 镜像
+- adapter 驱动执行
 - Agent Card 注册
- awareness-backed memory；**Memory v2 由 pgvector 支撑**语义召回
+- awareness-backed memory
 - plugin 挂载共享 rules/skills
 - 本地 skills 热加载
 - coordinator-only delegation 路径
@@ -224,21 +220,6 @@ Molecule AI 并不是要替代下面这些 framework，而是把它们纳入更
 - runtime tiers
 - 终端与文件层面的 workspace 直接排障

-### SaaS（由 [`molecule-controlplane`](https://git.moleculesai.app/molecule-ai/molecule-controlplane) 提供）
-
- 多租户运行在 AWS EC2 + Neon（每租户一个 Postgres branch）+ Cloudflare Tunnels（每租户一条隧道，对外不开任何端口）
- WorkOS AuthKit + Stripe Checkout + Customer Portal
- AWS KMS 信封加密（DB / Redis 连接串）；AWS Secrets Manager 负责租户 bootstrap
- `tenant_resources` 审计表 + 30 分钟 boot-event-aware reconciler —— 每个 CF / AWS lifecycle 事件都有记录，每 30 分钟比对 claim 与实际状态
-
-### 在 Claude Code 里直接接入（由 [`molecule-mcp-claude-channel`](https://git.moleculesai.app/molecule-ai/molecule-mcp-claude-channel) 提供）
-
- 把 Molecule A2A 流量桥接到本地 Claude Code 会话的 MCP 插件
- 订阅一个或多个 workspace；peer 的消息会以 user-turn 出现，回复会经 Molecule A2A 路由出去
- 无需公网隧道、无需公开端点 —— 插件启动时自动把每个 watched workspace 注册成 `delivery_mode=poll`，长轮询 `/activity?since_id=…`
- 多租户友好：单次安装即可同时 watch 跨多个 Molecule 租户的 workspace（`MOLECULE_PLATFORM_URLS` 按 workspace 配置）
- 通过标准 marketplace 流程安装：`/plugin marketplace add Molecule-AI/molecule-mcp-claude-channel` → `/plugin install molecule-channel@molecule-mcp-claude-channel`
-
 ## 适合什么团队

 Molecule AI 特别适合下面这些场景：
@@ -251,23 +232,17 @@ Molecule AI 特别适合下面这些场景：
 ## 架构总览

 ```text
-Canvas (Next.js 15, warm-paper :3000)  <--HTTP / WS-->  Platform (Go 1.25 :8080)  <---> Postgres + Redis
-         |                                                           |
-         |                                                           +--> Provisioner: Docker (本地) / EC2 + SSM (生产)
-         |                                                           +--> bundles · templates · secrets · KMS
+Canvas (Next.js :3000)  <--HTTP / WS-->  Platform (Go :8080)  <---> Postgres + Redis
+         |                                          |
+         |                                          +--> Docker provisioner / bundles / templates / secrets
         |
-         +------------------------- 展示 ------------------------> workspaces, teams, tasks, traces, events
+         +-------------------- 展示 --------------------> workspaces, teams, tasks, traces, events

-Workspace Runtime (Python ≥3.11，含 adapter 集合的镜像)
-  - 8 个 adapter: LangGraph / DeepAgents / Claude Code / CrewAI / AutoGen / Hermes / Gemini CLI / OpenClaw
-  - Agent Card + A2A server（typed-SSOT 响应路径，RFC #2967）
-  - heartbeat + activity + awareness-backed memory（Memory v2 —— pgvector 语义召回）
+Workspace Runtime (Python image with adapters)
+  - LangGraph / DeepAgents / Claude Code / CrewAI / AutoGen / OpenClaw
+  - Agent Card + A2A server
+  - heartbeat + activity + awareness-backed memory
  - skills + plugins + hot reload
-
-SaaS Control Plane (molecule-controlplane，私有)
-  - 每租户 EC2 + Neon (Postgres branch) + Cloudflare Tunnel
-  - WorkOS · Stripe · KMS · AWS Secrets Manager
-  - tenant_resources 审计 + 30 分钟 reconciler
 ```

 ## 快速开始
@@ -321,11 +296,7 @@ npm run dev

 ## 当前范围说明

-当前 `main` 已经包含核心平台、Canvas v4（warm-paper 主题）、Memory v2（pgvector 语义召回）、typed-SSOT A2A 响应路径（RFC #2967）、**8 个正式 adapter**（Claude Code、Hermes、Gemini CLI、LangGraph、DeepAgents、CrewAI、AutoGen、OpenClaw）、skill lifecycle，以及主要运维面。
-
-配套的私有仓库 [`molecule-controlplane`](https://git.moleculesai.app/molecule-ai/molecule-controlplane) 提供 SaaS 层 —— 多租户编排（EC2 + Neon + Cloudflare Tunnels）、KMS 信封加密、WorkOS 鉴权、Stripe 计费，以及 `tenant_resources` 审计表加 30 分钟 reconciler。
-
-像 **NemoClaw** 这样的相邻 runtime 路线仍然属于分支级工作，只有合并后才会进入正式支持列表，这里会明确区分。
+当前 `main` 已经包含核心平台、Canvas、memory model、6 个正式 adapter、skill lifecycle 和主要运维面。像 **NemoClaw** 这样的相邻 runtime 路线仍然属于分支级工作，只有合并后才会进入正式支持列表，这里会明确区分。

 ## License

@@ -1,5 +1,5 @@
 {
-  "name": "molecule-monorepo-canvas",
+  "name": "molecule-core-canvas",
  "version": "0.1.0",
  "private": true,
  "scripts": {
@@ -41,7 +41,7 @@ export default function PricingPage() {
        <p className="mt-2 text-ink-mid">
          We publish the{" "}
          <a
-            href="https://git.moleculesai.app/molecule-ai/molecule-monorepo"
+            href="https://git.moleculesai.app/molecule-ai/molecule-core"
            className="text-accent underline hover:text-accent"
          >
            full source on GitHub
@@ -13,6 +13,7 @@ import { AttachmentPreview } from "./chat/AttachmentPreview";
 import { extractFilesFromTask } from "./chat/message-parser";
 import { AgentCommsPanel } from "./chat/AgentCommsPanel";
 import { appendActivityLine } from "./chat/activityLog";
+import { activityRowToMessages, type ActivityRowForHydration } from "./chat/historyHydration";
 import { runtimeDisplayName } from "@/lib/runtime-names";
 import { ConfirmDialog } from "@/components/ConfirmDialog";

@@ -49,12 +50,38 @@ interface A2AResponse {
  };
 }

-// Internal-self-message filtering moved server-side in RFC #2945
-// PR-C/D — the platform's /chat-history endpoint applies the
-// IsInternalSelfMessage predicate before returning rows, so the
-// client no longer needs the local backstop on the history path.
-// The proper fix is still X-Workspace-ID header (source_id=workspace_id);
-// the platform-side prefix filter handles the residual cases.
+/** Detect activity-log rows that the workspace's own runtime fired
+ *  against itself but were misclassified as canvas-source. The proper
+ *  fix is the X-Workspace-ID header from `self_source_headers()` in
+ *  workspace/platform_auth.py, which makes the platform record
+ *  source_id = workspace_id. But three failure modes still leak a
+ *  self-message into "My Chat":
+ *
+ *    1. Historical rows already in the DB with source_id=NULL.
+ *    2. Workspace containers running pre-fix heartbeat.py / main.py
+ *       (the fix only takes effect after an image rebuild + redeploy).
+ *    3. Future internal triggers added without the helper.
+ *
+ *  This client-side filter recognises the heartbeat trigger by its
+ *  exact prefix — the heartbeat assembles
+ *
+ *    "Delegation results are ready. Review them and take appropriate
+ *     action:\n" + summary_lines + report_instruction
+ *
+ *  in workspace/heartbeat.py. The prefix is template-fixed so a
+ *  string match is reliable. If the heartbeat copy ever changes,
+ *  update this constant in the same commit.
+ *
+ *  This is a backstop, not the primary defence — the X-Workspace-ID
+ *  header is. Filtering content is fragile to copy edits, so keep
+ *  the list narrow. */
+const INTERNAL_SELF_MESSAGE_PREFIXES = [
+  "Delegation results are ready. Review them and take appropriate action",
+];
+
+function isInternalSelfMessage(text: string): boolean {
+  return INTERNAL_SELF_MESSAGE_PREFIXES.some((p) => text.startsWith(p));
+}

 // extractReplyText pulls the agent's text reply out of an A2A response.
 // Concatenates ALL text parts (joined with "\n") rather than returning
@@ -107,19 +134,8 @@ const INITIAL_HISTORY_LIMIT = 10;
 const OLDER_HISTORY_BATCH = 20;

 /**
- * Load chat history from the platform's typed /chat-history endpoint.
- *
- * Server-side rendering of activity_logs rows into ChatMessage shape
- * lives in workspace-server/internal/messagestore/postgres_store.go
- * (RFC #2945 PR-C/D). The server already applies the canvas-source
- * filter, the internal-self-message predicate, the role decision
- * (status=error vs agent-error prefix → system), and the v0/v1
- * file-shape extraction. Canvas just renders what it receives.
- *
- * Wire shape (mirrors ChatMessage exactly, no per-row mapping needed):
- *
- *   GET /workspaces/:id/chat-history?limit=N&before_ts=T
- *   200 → {"messages": ChatMessage[], "reached_end": boolean}
+ * Load chat history from the activity_logs database via the platform API.
+ * Uses source=canvas to only get user-initiated messages (not agent-to-agent).
 *
 * Pagination:
 *  - Pass `limit` to bound the page size (newest-first from server).
@@ -127,10 +143,10 @@ const OLDER_HISTORY_BATCH = 20;
 *    timestamp. Combined with limit, this yields the next-older page
 *    when scrolling backward through history.
 *
- * `reachedEnd` is propagated from the server. The server computes it
- * by comparing rowCount vs limit so a partial last page is correctly
- * detected even when the row→bubble fan-out is non-1:1 (each row
- * produces 1-2 bubbles).
+ * `reachedEnd` is true when the server returned fewer rows than asked
+ * for — caller uses this to disable further older-batch fetches.
+ * (Counts row-level returns, not chat-bubble count: each row may
+ * produce 1-2 bubbles.)
 */
 async function loadMessagesFromDB(
  workspaceId: string,
@@ -138,23 +154,25 @@ async function loadMessagesFromDB(
  beforeTs?: string,
 ): Promise<{ messages: ChatMessage[]; error: string | null; reachedEnd: boolean }> {
  try {
-    const params = new URLSearchParams({ limit: String(limit) });
+    const params = new URLSearchParams({
+      type: "a2a_receive",
+      source: "canvas",
+      limit: String(limit),
+    });
    if (beforeTs) params.set("before_ts", beforeTs);
-    const resp = await api.get<{ messages: ChatMessage[]; reached_end: boolean }>(
-      `/workspaces/${workspaceId}/chat-history?${params.toString()}`,
+    const activities = await api.get<ActivityRowForHydration[]>(
+      `/workspaces/${workspaceId}/activity?${params.toString()}`,
    );

-    // Server emits oldest-first within the page (RFC #2945 PR-C-2
-    // post-fix: server reverses row-aware before returning so the
-    // wire is display-ready). Canvas appends/prepends without
-    // reordering — this avoids the pair-flip bug a naive flat
-    // reverse causes when each row produces a (user, agent) pair
-    // with the same timestamp.
-    return {
-      messages: resp.messages ?? [],
-      error: null,
-      reachedEnd: resp.reached_end,
-    };
+    const messages: ChatMessage[] = [];
+    // Activities are newest-first, reverse for chronological order.
+    // Per-row mapping lives in chat/historyHydration.ts so it can be
+    // unit-tested without spinning up the full ChatTab component
+    // (regression cover for the timestamp-collapse bug).
+    for (const a of [...activities].reverse()) {
+      messages.push(...activityRowToMessages(a, isInternalSelfMessage));
+    }
+    return { messages, error: null, reachedEnd: activities.length < limit };
  } catch (err) {
    return {
      messages: [],
@@ -21,39 +21,20 @@ interface Props {
 // --- Agent Card Section ---

 function AgentCardSection({ workspaceId }: { workspaceId: string }) {
-  // Initial card value comes from the canvas store — node.data.agentCard
-  // is hydrated by the platform stream when the workspace appears in the
-  // graph, so reading it here avoids a duplicate `GET /workspaces/${id}`
-  // (the parent ConfigTab.loadConfig already fetches workspace metadata,
-  // and refetching here adds a serialised RTT to the panel-open path —
-  // contributed to the ~20s detail-panel load reported in core#11).
-  // Local state still tracks the edited/saved value so the editor flow
-  // is unchanged.
-  const storeCard = useCanvasStore((s) => {
-    // Defensive against test mocks that omit `nodes` (some test files
-    // stub the store with a minimal shape). In production `nodes` is
-    // always an array — empty or not — so the optional chaining only
-    // matters for the test path.
-    const node = s.nodes?.find?.((n) => n.id === workspaceId);
-    return (node?.data.agentCard as
-      | Record<string, unknown>
-      | null
-      | undefined) ?? null;
-  });
-  const [card, setCard] = useState<Record<string, unknown> | null>(storeCard);
+  const [card, setCard] = useState<Record<string, unknown> | null>(null);
+  const [loading, setLoading] = useState(true);
  const [editing, setEditing] = useState(false);
  const [draft, setDraft] = useState("");
  const [saving, setSaving] = useState(false);
  const [error, setError] = useState<string | null>(null);
  const [success, setSuccess] = useState(false);

-  // If the store updates while this section is mounted (another tab
-  // pushed an update via the platform event stream), reflect that —
-  // unless the user is mid-edit, in which case we don't clobber their
-  // unsaved draft.
  useEffect(() => {
-    if (!editing) setCard(storeCard);
-  }, [storeCard, editing]);
+    api.get<Record<string, unknown>>(`/workspaces/${workspaceId}`)
+      .then((ws) => setCard((ws.agent_card as Record<string, unknown>) || null))
+      .catch(() => {})
+      .finally(() => setLoading(false));
+  }, [workspaceId]);

  const handleSave = async () => {
    setError(null);
@@ -72,7 +53,9 @@ function AgentCardSection({ workspaceId }: { workspaceId: string }) {

  return (
    <Section title="Agent Card" defaultOpen={false}>
-      {editing ? (
+      {loading ? (
+        <div className="text-[10px] text-ink-soft">Loading...</div>
+      ) : editing ? (
        <div className="space-y-2">
          <textarea
            aria-label="Agent card JSON editor"
@@ -238,51 +221,47 @@ export function ConfigTab({ workspaceId }: Props) {
    setLoading(true);
    setError(null);

-    // Load workspace metadata (runtime + model + provider) in parallel.
-    // These are independent GETs against three workspace-server endpoints
-    // and used to be awaited serially — for SaaS workspaces each call
-    // round-trips through an EIC SSH tunnel, so the previous serial
-    // pattern stacked 3-5s of tunnel-setup latency per call (core#11).
-    // Promise.all overlaps them; the per-call cost stays the same but
-    // wall time drops to max() instead of sum().
-    //
-    // Each leg has its own .catch handler that yields a sentinel value,
-    // matching the previous semantics:
-    //   - /workspaces/${id}: required source-of-truth for runtime+tier;
-    //     fall back to YAML if the GET fails (rare, network-class only).
-    //   - /workspaces/${id}/model: non-fatal; empty model lets the form
-    //     fall through to YAML runtime_config.model.
-    //   - /workspaces/${id}/provider: non-fatal; old workspace-servers
-    //     return 404, in which case provider="" and Save skips the PUT.
-    //
-    // See GH #1894 for the workspace-row-as-source-of-truth rationale
-    // that motivated splitting from a single config.yaml read.
-    const [wsRes, modelRes, providerRes] = await Promise.all([
-      api.get<{ runtime?: string; tier?: number }>(`/workspaces/${workspaceId}`)
-        .catch(() => ({} as { runtime?: string; tier?: number })),
-      api.get<{ model?: string }>(`/workspaces/${workspaceId}/model`)
-        .catch(() => ({} as { model?: string })),
-      api.get<{ provider?: string }>(`/workspaces/${workspaceId}/provider`)
-        .catch(() => null),
-    ]);
-    const wsMetadataRuntime = (wsRes.runtime || "").trim();
-    const wsMetadataModel = (modelRes.model || "").trim();
-    const wsMetadataTier: number | null =
-      typeof wsRes.tier === "number" ? wsRes.tier : null;
-    if (providerRes !== null) {
-      const loadedProvider = (providerRes.provider || "").trim();
-      setProvider(loadedProvider);
-      setOriginalProvider(loadedProvider);
-    } else {
-      setProvider("");
-      setOriginalProvider("");
-    }
+    // ALWAYS load workspace metadata first (runtime + model). These are the
+    // source of truth regardless of whether the runtime uses our config.yaml
+    // template. Without this the form falls back to empty/default values on
+    // a hermes workspace (which doesn't use our template), creating the
+    // appearance that the saved runtime is unset — and worse, clicking Save
+    // would silently flip `runtime` from `hermes` back to the dropdown
+    // default `LangGraph`. See GH #1894.
+    let wsMetadataRuntime = "";
+    let wsMetadataModel = "";
+    let wsMetadataTier: number | null = null;
+    try {
+      const ws = await api.get<{ runtime?: string; tier?: number }>(`/workspaces/${workspaceId}`);
+      wsMetadataRuntime = (ws.runtime || "").trim();
+      if (typeof ws.tier === "number") wsMetadataTier = ws.tier;
+    } catch { /* fall back to config.yaml */ }
+    try {
+      const m = await api.get<{ model?: string }>(`/workspaces/${workspaceId}/model`);
+      wsMetadataModel = (m.model || "").trim();
+    } catch { /* non-fatal */ }
    // originalModel is set further down once the YAML has been parsed —
    // we want it to reflect what the form ACTUALLY rendered, which may
    // be the YAML's runtime_config.model fallback when MODEL_PROVIDER
    // is empty. Setting it here from wsMetadataModel alone would be
    // wrong for hermes/pre-#240 workspaces.

+    // Load explicit provider override (Option B PR-5). Endpoint returns
+    // {provider: "", source: "default"} when no override is set, so the
+    // empty string is the legitimate "auto-derive" signal — don't treat
+    // it as a load error. Non-fatal: an older workspace-server that
+    // predates PR-2 returns 404 here; the form falls back to "" and
+    // Save just won't PUT the provider field.
+    try {
+      const p = await api.get<{ provider?: string }>(`/workspaces/${workspaceId}/provider`);
+      const loadedProvider = (p.provider || "").trim();
+      setProvider(loadedProvider);
+      setOriginalProvider(loadedProvider);
+    } catch {
+      setProvider("");
+      setOriginalProvider("");
+    }
+
    // Skip the config.yaml fetch entirely for runtimes that manage
    // their own config (external, hermes, etc.) — they don't have a
    // platform-side template, so the GET would 404. The catch block
@@ -1,11 +1,13 @@
 // @vitest-environment jsdom
 //
-// Pins the lazy-loading chat-history pagination.
+// Pins the lazy-loading chat-history pagination added 2026-05-05.
 //
-// PR-C-2 (RFC #2945): canvas was migrated from /activity?type=a2a_receive
-// to /chat-history. Server now returns typed ChatMessage[] in
-// display-ready oldest-first order. These tests guard the canvas-side
-// pagination invariants against the new endpoint surface.
+// Pre-fix: ChatTab fetched the newest 50 messages on every mount and
+// scrolled to bottom, paying full DOM cost up-front even when the user
+// only wanted to read the last few bubbles. Post-fix: initial load is
+// bounded to 10 newest, and an IntersectionObserver on a top sentinel
+// triggers loadOlder() (batch of 20 with `before_ts` cursor) when the
+// user scrolls up.
 //
 // Pinned branches:
 //   1. Initial fetch carries `limit=10` and NO before_ts (newest-first
@@ -18,10 +20,11 @@
 //      asserting the rendered bubble count matches the full page).
 //   4. The retry button after a failed initial load uses the same
 //      INITIAL_HISTORY_LIMIT (10), not the legacy 50.
-//   5. before_ts cursor is the OLDEST timestamp from the current page,
-//      passed verbatim to walk backward.
-//   6. Inflight guard rejects duplicate IO triggers while a loadOlder
-//      fetch is in flight.
+//
+// IntersectionObserver / scroll-anchor restoration is exercised by the
+// E2E synth-canary suite — pinning it in jsdom would require mocking
+// the observer and faking layout, which is brittler than trusting a
+// live-DOM canary against the staging tenant.

 import { describe, it, expect, vi, afterEach, beforeEach } from "vitest";
 import { render, screen, cleanup, waitFor, fireEvent } from "@testing-library/react";
@@ -30,31 +33,24 @@ import React from "react";
 afterEach(cleanup);

 // Both ChatTab sub-panels (MyChat + AgentComms) mount simultaneously so
-// keyboard tab order and aria-controls land on a real DOM. MyChat's
-// loadMessagesFromDB hits /chat-history; AgentComms's polling hits a
-// different URL. Route the mock by URL so each gets a sensible default
-// and only MyChat's calls land in the assertion array.
-const myChatHistoryCalls: string[] = [];
-let myChatNextResponse:
-  | { ok: true; messages: unknown[]; reachedEnd?: boolean }
-  | { ok: false; err: Error } = { ok: true, messages: [] };
-
+// keyboard tab order and aria-controls land on a real DOM. Both fire
+// /activity GETs on mount: MyChat's hits `type=a2a_receive&source=canvas`,
+// AgentComms's hits a different filter. Route the mock by URL so each
+// gets a sensible default and only MyChat's call is what the assertions
+// scrutinise.
+const myChatActivityCalls: string[] = [];
+let myChatNextResponse: { ok: true; rows: unknown[] } | { ok: false; err: Error } = {
+  ok: true,
+  rows: [],
+};
 const apiGet = vi.fn((path: string): Promise<unknown> => {
-  if (path.includes("/chat-history")) {
-    myChatHistoryCalls.push(path);
-    if (myChatNextResponse.ok) {
-      const reached_end =
-        myChatNextResponse.reachedEnd !== undefined
-          ? myChatNextResponse.reachedEnd
-          : myChatNextResponse.messages.length < 10;
-      return Promise.resolve({
-        messages: myChatNextResponse.messages,
-        reached_end,
-      });
-    }
+  if (path.includes("type=a2a_receive") && path.includes("source=canvas")) {
+    myChatActivityCalls.push(path);
+    if (myChatNextResponse.ok) return Promise.resolve(myChatNextResponse.rows);
    return Promise.reject(myChatNextResponse.err);
  }
-  // AgentComms / heartbeat / anything else — empty array safe default.
+  // AgentComms / heartbeat / anything else — empty array is a safe
+  // default that won't blow up the corresponding component's .then().
  return Promise.resolve([]);
 });
 const apiPost = vi.fn();
@@ -88,8 +84,8 @@ const ioInstances: IOInstance[] = [];
 beforeEach(() => {
  apiGet.mockClear();
  apiPost.mockReset();
-  myChatHistoryCalls.length = 0;
-  myChatNextResponse = { ok: true, messages: [] };
+  myChatActivityCalls.length = 0;
+  myChatNextResponse = { ok: true, rows: [] };
  ioInstances.length = 0;
  class FakeIO {
    private inst: IOInstance;
@@ -105,12 +101,20 @@ beforeEach(() => {
      this.inst.disconnected = true;
    }
  }
+  // Install on every reachable global — different bundlers / module
+  // graphs can resolve `IntersectionObserver` via `window`, `globalThis`,
+  // or the bare global. Without all three, jsdom's own (pre-existing)
+  // stub silently wins and ioInstances stays empty.
  (window as unknown as { IntersectionObserver: unknown }).IntersectionObserver = FakeIO;
  (globalThis as unknown as { IntersectionObserver: unknown }).IntersectionObserver = FakeIO;
+  // jsdom doesn't implement scrollIntoView; ChatTab calls it after every
+  // messages update.
  Element.prototype.scrollIntoView = vi.fn();
 });

 function triggerIntersection(instanceIdx = -1) {
+  // -1 → the latest observer (the live one). Tests targeting an old
+  // (disconnected) instance pass a positive index.
  const inst = ioInstances.at(instanceIdx);
  if (!inst) throw new Error(`no IO instance at ${instanceIdx}`);
  inst.callback(
@@ -121,30 +125,25 @@ function triggerIntersection(instanceIdx = -1) {

 import { ChatTab } from "../ChatTab";

-// makeMessagePair returns a (user, agent) pair sharing a timestamp,
-// matching the wire shape /chat-history emits per activity_logs row.
-// Server-side reverseRowChunks ensures the wire is oldest-first across
-// rows but [user, agent] within each row.
-function makeMessagePair(seq: number): unknown[] {
-  // Zero-pad seq into the minute slot so seq=10 produces a valid
-  // timestamp (00:10:00Z, not 00:010:00Z).
+function makeActivityRow(seq: number): Record<string, unknown> {
+  // Zero-pad seq into the minute slot so "seq=10" doesn't produce
+  // the invalid timestamp "00:010:00Z" (caught by the loadOlder URL
+  // assertion below — first version of the helper used `0${seq}` and
+  // the test failed on `before_ts` having an extra digit).
  const mm = String(seq).padStart(2, "0");
-  const ts = `2026-05-05T00:${mm}:00Z`;
-  return [
-    { id: `u-${seq}`, role: "user", content: `user msg ${seq}`, timestamp: ts },
-    { id: `a-${seq}`, role: "agent", content: `agent reply ${seq}`, timestamp: ts },
-  ];
+  return {
+    activity_type: "a2a_receive",
+    status: "ok",
+    created_at: `2026-05-05T00:${mm}:00Z`,
+    request_body: { params: { message: { parts: [{ kind: "text", text: `user msg ${seq}` }] } } },
+    response_body: { result: `agent reply ${seq}` },
+  };
 }

-// pageOldestFirst builds a wire-shape page (oldest-first within page)
-// of `count` row-pairs starting at seq=`start`. Mirrors the server's
-// post-reverseRowChunks emission order.
-function pageOldestFirst(start: number, count: number): unknown[] {
-  const out: unknown[] = [];
-  for (let i = 0; i < count; i++) {
-    out.push(...makeMessagePair(start + i));
-  }
-  return out;
+// Server returns newest-first; the helper builds a server-shape page
+// so the order in the rendered messages array matches production.
+function newestFirstPage(start: number, count: number): unknown[] {
+  return Array.from({ length: count }, (_, i) => makeActivityRow(start + count - 1 - i));
 }

 const minimalData = {
@@ -154,30 +153,28 @@ const minimalData = {
 } as unknown as Parameters<typeof ChatTab>[0]["data"];

 describe("ChatTab lazy history pagination", () => {
-  it("initial fetch carries limit=10 (not the legacy 50) and hits /chat-history", async () => {
-    myChatNextResponse = { ok: true, messages: makeMessagePair(1) };
+  it("initial fetch carries limit=10 (not the legacy 50)", async () => {
+    myChatNextResponse = { ok: true, rows: [makeActivityRow(1)] };
    render(<ChatTab workspaceId="ws-1" data={minimalData} />);
-    await waitFor(() => expect(myChatHistoryCalls.length).toBe(1));
-    const url = myChatHistoryCalls[0];
-    expect(url).toContain("/chat-history");
+    await waitFor(() => expect(myChatActivityCalls.length).toBe(1));
+    const url = myChatActivityCalls[0];
    expect(url).toContain("limit=10");
    expect(url).not.toContain("limit=50");
    // before_ts should NOT be set on the initial fetch — that's the
    // newest-first slice the user lands on.
    expect(url).not.toContain("before_ts");
-    // /chat-history filters source-canvas server-side; client should
-    // NOT pass type/source params (they belonged to /activity).
-    expect(url).not.toContain("type=a2a_receive");
-    expect(url).not.toContain("source=canvas");
  });

  it("hides the top sentinel when initial fetch returns fewer than the limit", async () => {
    // 3 < 10 → server says "no more older history exists"; sentinel
    // should NOT mount and the "Loading older messages…" line should
-    // never appear.
-    myChatNextResponse = { ok: true, messages: pageOldestFirst(1, 3) };
+    // never appear (it can't, since the sentinel is what triggers it).
+    myChatNextResponse = {
+      ok: true,
+      rows: [makeActivityRow(1), makeActivityRow(2), makeActivityRow(3)],
+    };
    render(<ChatTab workspaceId="ws-2" data={minimalData} />);
-    await waitFor(() => expect(myChatHistoryCalls.length).toBe(1));
+    await waitFor(() => expect(myChatActivityCalls.length).toBe(1));
    await waitFor(() => {
      expect(screen.queryByText(/Loading chat history/i)).toBeNull();
    });
@@ -185,15 +182,15 @@ describe("ChatTab lazy history pagination", () => {
  });

  it("renders all messages when initial fetch returns exactly the limit", async () => {
-    // limit=10 row-pairs → 20 ChatMessages. reachedEnd should be FALSE
-    // so the sentinel mounts. Verified by bubble counts.
-    myChatNextResponse = {
-      ok: true,
-      messages: pageOldestFirst(1, 10),
-      reachedEnd: false,
-    };
+    // 10 == limit → server might have more older rows; sentinel SHOULD
+    // mount so the IO observer can fire loadOlder() on scroll-up. We
+    // verify by checking the rendered bubble count — if hasMore stayed
+    // true the sentinel render path doesn't crash and all 10 rows
+    // produced their pair of bubbles.
+    const fullPage = Array.from({ length: 10 }, (_, i) => makeActivityRow(i + 1));
+    myChatNextResponse = { ok: true, rows: fullPage };
    render(<ChatTab workspaceId="ws-3" data={minimalData} />);
-    await waitFor(() => expect(myChatHistoryCalls.length).toBe(1));
+    await waitFor(() => expect(myChatActivityCalls.length).toBe(1));
    await waitFor(() => {
      expect(screen.queryByText(/Loading chat history/i)).toBeNull();
    });
@@ -205,67 +202,54 @@ describe("ChatTab lazy history pagination", () => {
    myChatNextResponse = { ok: false, err: new Error("network down") };
    render(<ChatTab workspaceId="ws-4" data={minimalData} />);
    const retry = await screen.findByText(/Retry/);
-    myChatNextResponse = { ok: true, messages: makeMessagePair(1) };
+    myChatNextResponse = { ok: true, rows: [makeActivityRow(1)] };
    fireEvent.click(retry);
-    await waitFor(() => expect(myChatHistoryCalls.length).toBe(2));
-    const retryUrl = myChatHistoryCalls[1];
-    expect(retryUrl).toContain("/chat-history");
+    await waitFor(() => expect(myChatActivityCalls.length).toBe(2));
+    const retryUrl = myChatActivityCalls[1];
    expect(retryUrl).toContain("limit=10");
    expect(retryUrl).not.toContain("limit=50");
  });

  it("loadOlder fetches limit=20 with before_ts=oldest.timestamp", async () => {
-    // Initial page = 10 row-pairs in oldest-first order (seq 1..10).
-    // The oldest (and so the cursor for loadOlder) is seq=1's
-    // timestamp 2026-05-05T00:01:00Z.
-    myChatNextResponse = {
-      ok: true,
-      messages: pageOldestFirst(1, 10),
-      reachedEnd: false,
-    };
+    // Initial page = 10 rows in newest-first order (seq 10..1). After
+    // the component reverses to oldest-first for display, messages[0]
+    // is built from seq=1 — the oldest — and its timestamp is what
+    // before_ts should carry.
+    myChatNextResponse = { ok: true, rows: newestFirstPage(1, 10) };
    render(<ChatTab workspaceId="ws-load-older" data={minimalData} />);
-    await waitFor(() => expect(myChatHistoryCalls.length).toBe(1));
+    await waitFor(() => expect(myChatActivityCalls.length).toBe(1));
    await waitFor(() => expect(ioInstances.length).toBeGreaterThan(0));

-    // Stage older-batch response, then fire IO callback.
-    myChatNextResponse = {
-      ok: true,
-      messages: pageOldestFirst(0, 1),
-      reachedEnd: true,
-    };
+    // Stage the older-batch response, then fire the IO callback.
+    myChatNextResponse = { ok: true, rows: newestFirstPage(0, 1) };
    triggerIntersection();

-    await waitFor(() => expect(myChatHistoryCalls.length).toBe(2));
-    const olderUrl = myChatHistoryCalls[1];
-    expect(olderUrl).toContain("/chat-history");
+    await waitFor(() => expect(myChatActivityCalls.length).toBe(2));
+    const olderUrl = myChatActivityCalls[1];
    expect(olderUrl).toContain("limit=20");
    expect(olderUrl).toContain("before_ts=");
    expect(decodeURIComponent(olderUrl)).toContain("before_ts=2026-05-05T00:01:00Z");
  });

  it("inflight guard rejects a second IO trigger while first loadOlder is in flight", async () => {
-    myChatNextResponse = {
-      ok: true,
-      messages: pageOldestFirst(1, 10),
-      reachedEnd: false,
-    };
+    myChatNextResponse = { ok: true, rows: newestFirstPage(1, 10) };
    render(<ChatTab workspaceId="ws-inflight" data={minimalData} />);
-    await waitFor(() => expect(myChatHistoryCalls.length).toBe(1));
+    await waitFor(() => expect(myChatActivityCalls.length).toBe(1));
    await waitFor(() => expect(ioInstances.length).toBeGreaterThan(0));

    // Hold the next loadOlder fetch open with a manual deferred so we
    // can fire the second trigger while the first is in-flight.
-    let release!: (resp: unknown) => void;
-    const deferred = new Promise<unknown>((res) => {
+    let release!: (rows: unknown[]) => void;
+    const deferred = new Promise<unknown[]>((res) => {
      release = res;
    });
    apiGet.mockImplementationOnce((path: string): Promise<unknown> => {
-      myChatHistoryCalls.push(path);
+      myChatActivityCalls.push(path);
      return deferred;
    });

    triggerIntersection(); // start loadOlder #1
-    await waitFor(() => expect(myChatHistoryCalls.length).toBe(2));
+    await waitFor(() => expect(myChatActivityCalls.length).toBe(2));

    // Second IO trigger lands while #1 is still pending.
    triggerIntersection();
@@ -274,62 +258,79 @@ describe("ChatTab lazy history pagination", () => {
    // Without the inflight guard, each of these would have started a
    // new fetch. With the guard, none of them do — call count stays 2.
    await new Promise((r) => setTimeout(r, 10));
-    expect(myChatHistoryCalls.length).toBe(2);
+    expect(myChatActivityCalls.length).toBe(2);

-    // Release the first fetch with a valid wire response shape.
-    release({ messages: [], reached_end: true });
-    await waitFor(() => expect(myChatHistoryCalls.length).toBe(2));
+    // Release the first fetch. Inflight clears in the finally block;
+    // a subsequent IO trigger is permitted again (verified by checking
+    // we can fire a follow-up after release without hanging the test).
+    release([]);
+    await waitFor(() => expect(myChatActivityCalls.length).toBe(2));
  });

  it("empty older response clears the scroll anchor and unmounts the sentinel", async () => {
-    myChatNextResponse = {
-      ok: true,
-      messages: pageOldestFirst(1, 10),
-      reachedEnd: false,
-    };
+    // The bug we're pinning: if loadOlder returns 0 rows, the
+    // scrollAnchorRef must be cleared so the next paint doesn't try to
+    // restore against a no-op prepend (which would fight the natural
+    // bottom-pin for any subsequent live message). hasMore flipping to
+    // false is the same flag-flip path; sentinel disappearing is the
+    // observable proxy.
+    myChatNextResponse = { ok: true, rows: newestFirstPage(1, 10) };
    render(<ChatTab workspaceId="ws-anchor" data={minimalData} />);
-    await waitFor(() => expect(myChatHistoryCalls.length).toBe(1));
+    await waitFor(() => expect(myChatActivityCalls.length).toBe(1));
    await waitFor(() => expect(ioInstances.length).toBeGreaterThan(0));

-    myChatNextResponse = {
-      ok: true,
-      messages: [],
-      reachedEnd: true,
-    };
+    myChatNextResponse = { ok: true, rows: [] }; // empty → reachedEnd
    triggerIntersection();
-    await waitFor(() => expect(myChatHistoryCalls.length).toBe(2));
+    await waitFor(() => expect(myChatActivityCalls.length).toBe(2));

+    // After reachedEnd the sentinel unmounts (hasMore=false). We can't
+    // peek scrollAnchorRef directly, but we can assert the consequence:
+    // scrollIntoView (the bottom-pin for live appends) is not blocked
+    // by a stale anchor. Trigger a re-render via an unrelated state
+    // change… in practice the safest assertion here is that the
+    // sentinel disappeared (proving the empty response propagated to
+    // hasMore correctly, which is the same flag-flip path as anchor
+    // clearing).
    await waitFor(() => {
      expect(screen.queryByText(/Loading older messages/i)).toBeNull();
    });
  });

  it("IntersectionObserver does not churn when older messages prepend", async () => {
-    myChatNextResponse = {
-      ok: true,
-      messages: pageOldestFirst(1, 10),
-      reachedEnd: false,
-    };
+    // Whole-PR perf invariant: prepending older history (the load-bearing
+    // user gesture) must NOT tear down + re-arm the IO observer.
+    // Triggering loadOlder is the cleanest way to drive a messages
+    // mutation from inside the test, since live agent push goes through
+    // a Zustand store that's harder to drive reliably from jsdom.
+    //
+    // Pre-fix, loadOlder depended on `messages`, so every prepend
+    // recreated loadOlder → re-ran the IO effect → new observer. Each
+    // call to triggerIntersection() produced a fresh disconnected
+    // observer + a new live one. Post-fix, the observer survives.
+    myChatNextResponse = { ok: true, rows: newestFirstPage(1, 10) };
    render(<ChatTab workspaceId="ws-stable-io" data={minimalData} />);
-    await waitFor(() => expect(myChatHistoryCalls.length).toBe(1));
+    await waitFor(() => expect(myChatActivityCalls.length).toBe(1));
    await waitFor(() => expect(ioInstances.length).toBeGreaterThan(0));

+    // Snapshot the observer instance after first paint stabilises.
    const observerBefore = ioInstances.at(-1);
    expect(observerBefore).toBeDefined();
    expect(observerBefore!.disconnected).toBe(false);

    // Trigger three older-batch prepends. Each batch returns the full
-    // OLDER_HISTORY_BATCH (20 row-pairs = 40 messages) so reachedEnd
-    // stays false and the sentinel keeps mounting.
+    // OLDER_HISTORY_BATCH (20 rows) so reachedEnd stays false and the
+    // sentinel keeps mounting. Pre-fix, each prepend mutated `messages`
+    // → recreated loadOlder → re-ran the IO effect → new observer.
    for (let batch = 0; batch < 3; batch++) {
      myChatNextResponse = {
        ok: true,
-        messages: pageOldestFirst(-(batch + 1) * 20, 20),
-        reachedEnd: false,
+        rows: newestFirstPage(-(batch + 1) * 20, 20),
      };
-      const callsBefore = myChatHistoryCalls.length;
+      const callsBefore = myChatActivityCalls.length;
      triggerIntersection();
-      await waitFor(() => expect(myChatHistoryCalls.length).toBe(callsBefore + 1));
+      await waitFor(() =>
+        expect(myChatActivityCalls.length).toBe(callsBefore + 1),
+      );
    }

    // The original observer is still the live one — no churn.
@@ -7,32 +7,6 @@ export default defineConfig({
  test: {
    environment: 'node',
    exclude: ['e2e/**', 'node_modules/**', '**/dist/**'],
-    // CI-conditional test timeout (issue #96).
-    //
-    // Vitest's 5000ms default is too tight for the first test in any
-    // file under our CI shape: `npx vitest run --coverage` on the
-    // self-hosted Gitea Actions Docker runner. The cold-start cost
-    // (v8 coverage instrumentation init + JSDOM bootstrap + module-
-    // graph import for @/components/* and @/lib/* + first React
-    // render) consistently consumes 5-7 seconds for the first
-    // synchronous test in heavyweight component files
-    // (ActivityTab.test.tsx, CreateWorkspaceDialog.test.tsx,
-    // ConfigTab.provider.test.tsx) — even though every subsequent
-    // test in the same file completes in 100-1500ms.
-    //
-    // Empirically the worst observed first-test was 6453ms in a
-    // single file (CreateWorkspaceDialog). 30000ms gives ~5x
-    // headroom over that on CI; we still keep 5000ms locally so
-    // genuine waitFor races / hung promises stay sensitive in dev.
-    //
-    // Same vitest pattern documented at:
-    //   https://vitest.dev/config/testtimeout
-    //   https://vitest.dev/guide/coverage#profiling-test-performance
-    //
-    // Per-test duration is still emitted to the CI log; if a test
-    // ever silently approaches 25-30s under this raised ceiling that
-    // will surface as a duration regression and we revisit.
-    testTimeout: process.env.CI ? 30000 : 5000,
    // Coverage is instrumented but NOT yet a CI gate — first land
    // observability so we can see the baseline, then dial in
    // thresholds + a hard gate in a follow-up PR (#1815). Today's
@@ -1,43 +0,0 @@
-# docker-compose.dev.yml — overlay over docker-compose.yml for local dev
-# with air-driven live reload of the platform (workspace-server) service.
-#
-# Usage:
-#   docker compose -f docker-compose.yml -f docker-compose.dev.yml up
-#   (or `make dev` shorthand from repo root)
-#
-# What this overlay changes vs docker-compose.yml alone:
-#   - Platform service uses workspace-server/Dockerfile.dev (air on top of
-#     golang:1.25-alpine) instead of the multi-stage prod Dockerfile.
-#   - Platform service bind-mounts the host's workspace-server/ source
-#     into /app/workspace-server so air sees source edits live.
-#   - Other services (postgres, redis, langfuse, etc.) inherit unchanged
-#     from docker-compose.yml.
-#
-# What stays the same:
-#   - All env vars, volumes, depends_on, healthchecks from docker-compose.yml.
-#   - Network topology + ports.
-#   - Postgres/Redis as service containers (no in-process replacements).
-
-services:
-  platform:
-    build:
-      context: .
-      dockerfile: workspace-server/Dockerfile.dev
-    # Rebind source: edits under host's workspace-server/ propagate live.
-    # The named volume on go-build-cache speeds up first build per container.
-    volumes:
-      - ./workspace-server:/app/workspace-server
-      - go-build-cache:/root/.cache/go-build
-      - go-mod-cache:/go/pkg/mod
-    # Air signals the running binary on rebuild; ensure shell stops cleanly.
-    init: true
-    # Mark the service as dev-mode so the platform can short-circuit any
-    # behavior that's incompatible with hot-reload (e.g. background
-    # cron-style watchers that don't survive process restart). No-op
-    # today; reserved for future flag use.
-    environment:
-      MOLECULE_DEV_HOT_RELOAD: "1"
-
-volumes:
-  go-build-cache:
-  go-mod-cache:
@@ -212,8 +212,8 @@ services:
    #   docker compose pull canvas && docker compose up -d canvas
    # First-time local setup or testing unreleased changes — build from source:
    #   docker compose build canvas && docker compose up -d canvas
-    # Note: ECR images require AWS auth — `aws ecr get-login-password --region us-east-2 | docker login --username AWS --password-stdin 153263036946.dkr.ecr.us-east-2.amazonaws.com` before pull.
-    image: 153263036946.dkr.ecr.us-east-2.amazonaws.com/molecule-ai/canvas:latest
+    # Note: GHCR images are private — `docker login ghcr.io` required before pull.
+    image: ghcr.io/molecule-ai/canvas:latest
    build:
      context: ./canvas
      dockerfile: Dockerfile
@@ -2,7 +2,7 @@

 **Status:** living document — update when you ship a feature that touches one backend.
 **Owner:** workspace-server + controlplane teams.
-**Last audit:** 2026-05-07 (plugin install/uninstall closed for EC2 backend via EIC SSH push to the bind-mounted `/configs/plugins/<name>/`, mirroring the Files API PR #1702 pattern).
+**Last audit:** 2026-05-05 (Claude agent — `provisionWorkspaceAuto` / `StopWorkspaceAuto` / `HasProvisioner` SoT pattern landed in PRs #2811 + #2824).

 ## Why this exists

@@ -54,7 +54,7 @@ For "do we have any backend?", use `HasProvisioner()`, never bare `h.provisioner
 | **Files API** | | | | |
 | List / Read / Write / Replace / Delete | `container_files.go`, `template_import.go` | `docker exec` + tar `CopyToContainer` | SSH via EIC tunnel (PR #1702) | ✅ parity as of 2026-04-22 (previously docker-only) |
 | **Plugins** | | | | |
-| Install / uninstall / list | `plugins_install.go` + `plugins_install_eic.go` | `deliverToContainer()` → exec+`CopyToContainer` on local container | `instance_id` set → EIC SSH push of the staged tarball into the EC2's bind-mounted `/configs/plugins/<name>/` (per `workspaceFilePathPrefix`), `chown 1000:1000`, restart | ✅ parity |
+| Install / uninstall / list | `plugins_install.go` | `deliverToContainer()` + volume rm | **gap — no live plugin delivery** | 🔴 **docker-only** |
 | **Terminal (WebSocket)** | | | | |
 | Dispatch | `terminal.go:90-105` | `instance_id=""` → `handleLocalConnect` → `docker attach` | `instance_id` set → `handleRemoteConnect` → EIC SSH + `docker exec` | ✅ parity (different implementations, same UX) |
 | **A2A proxy** | | | | |
@@ -4,7 +4,7 @@ How a workspace-server code change reaches the prod tenant fleet — and how to

 > **⚠️ State note (2026-04-22):** this doc describes the **intended design**. As of this write, the canary fleet described below is **not actually running** — no canary tenants are provisioned, `CANARY_TENANT_URLS` / `CANARY_ADMIN_TOKENS` / `CANARY_CP_SHARED_SECRET` are empty in repo secrets, and `canary-verify.yml` fails every run.
 >
-> Current merges gate on manual `promote-latest.yml` dispatches, not canary. See [molecule-controlplane/docs/canary-tenants.md](https://git.moleculesai.app/molecule-ai/molecule-controlplane/src/branch/main/docs/canary-tenants.md) for the Phase 1 code work that's already shipped + the Phase 2 plan for actually standing up the fleet + a "should we even do this now?" decision framework.
+> Current merges gate on manual `promote-latest.yml` dispatches, not canary. See [molecule-controlplane/docs/canary-tenants.md](https://git.moleculesai.app/molecule-ai/molecule-controlplane/blob/main/docs/canary-tenants.md) for the Phase 1 code work that's already shipped + the Phase 2 plan for actually standing up the fleet + a "should we even do this now?" decision framework.
 >
 > **Account-specific identifiers (AWS account ID, IAM role name) referenced below in the original design have been redacted from this public doc.** The actual values — if they exist — are in `Molecule-AI/internal/runbooks/canary-fleet.md`. If you're implementing Phase 2, start there.
 >
@@ -1,7 +1,7 @@
 # Molecule AI — Comprehensive Technical Documentation

 > Definitive technical reference for the Molecule AI Agent Team platform.
-> Based on a full non-invasive scan of the [molecule-monorepo](https://git.moleculesai.app/molecule-ai/molecule-monorepo) repository.
+> Based on a full non-invasive scan of the [molecule-monorepo](https://git.moleculesai.app/molecule-ai/molecule-core) repository.

 ---

@@ -1149,11 +1149,11 @@ Molecule AI's workspace abstraction is **runtime-agnostic by design**. A workspa

 ## Links

- **GitHub**: https://git.moleculesai.app/molecule-ai/molecule-monorepo
- **Architecture Docs**: https://git.moleculesai.app/molecule-ai/molecule-monorepo/src/branch/main/docs/architecture
- **API Protocol**: https://git.moleculesai.app/molecule-ai/molecule-monorepo/src/branch/main/docs/api-protocol
- **Agent Runtime**: https://git.moleculesai.app/molecule-ai/molecule-monorepo/src/branch/main/docs/agent-runtime
- **Product Docs**: https://git.moleculesai.app/molecule-ai/molecule-monorepo/src/branch/main/docs/product
+- **GitHub**: https://git.moleculesai.app/molecule-ai/molecule-core
+- **Architecture Docs**: https://git.moleculesai.app/molecule-ai/molecule-core/tree/main/docs/architecture
+- **API Protocol**: https://git.moleculesai.app/molecule-ai/molecule-core/tree/main/docs/api-protocol
+- **Agent Runtime**: https://git.moleculesai.app/molecule-ai/molecule-core/tree/main/docs/agent-runtime
+- **Product Docs**: https://git.moleculesai.app/molecule-ai/molecule-core/tree/main/docs/product

 ---

@@ -79,7 +79,7 @@ For SOC2 / ISO 27001 / customer security questionnaires:

 ## Pointers

- KMS envelope code: [`molecule-controlplane/internal/crypto/kms.go`](https://git.moleculesai.app/molecule-ai/molecule-controlplane/src/branch/main/internal/crypto/kms.go)
- Static-key fallback: [`molecule-controlplane/internal/crypto/aes.go`](https://git.moleculesai.app/molecule-ai/molecule-controlplane/src/branch/main/internal/crypto/aes.go)
+- KMS envelope code: [`molecule-controlplane/internal/crypto/kms.go`](https://git.moleculesai.app/molecule-ai/molecule-controlplane/blob/main/internal/crypto/kms.go)
+- Static-key fallback: [`molecule-controlplane/internal/crypto/aes.go`](https://git.moleculesai.app/molecule-ai/molecule-controlplane/blob/main/internal/crypto/aes.go)
 - Tenant secrets handler: [`workspace-server/internal/crypto/aes.go`](../../workspace-server/internal/crypto/aes.go)
 - Tenant secrets schema: [database-schema.md](./database-schema.md#workspace_secrets)
@@ -1,28 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
-  <style>
-    .bg { fill: #0a1120; }
-    .accent { fill: #7fe8d6; }
-    .accent-stroke { stroke: #7fe8d6; }
-    @media (prefers-color-scheme: light) {
-      .bg { fill: #f5f7fa; }
-      .accent { fill: #1a8a72; }
-      .accent-stroke { stroke: #1a8a72; }
-    }
-  </style>
-  <rect class="bg" width="64" height="64" rx="14"/>
-  <g class="accent-stroke" stroke-width="2.4" stroke-linecap="round" fill="none">
-    <line x1="32" y1="32" x2="12" y2="14"/>
-    <line x1="32" y1="32" x2="52" y2="18"/>
-    <line x1="32" y1="32" x2="10" y2="40"/>
-    <line x1="32" y1="32" x2="54" y2="44"/>
-    <line x1="32" y1="32" x2="32" y2="56"/>
-  </g>
-  <g class="accent">
-    <circle cx="32" cy="32" r="6.5"/>
-    <circle cx="12" cy="14" r="3.5"/>
-    <circle cx="52" cy="18" r="3.5"/>
-    <circle cx="10" cy="40" r="3.5"/>
-    <circle cx="54" cy="44" r="3.5"/>
-    <circle cx="32" cy="56" r="3.5"/>
-  </g>
-</svg>
@@ -1,17 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" role="img" aria-label="Molecule AI">
-  <g stroke="#7fe8d6" stroke-width="2.6" stroke-linecap="round" fill="none">
-    <line x1="32" y1="32" x2="12" y2="14"/>
-    <line x1="32" y1="32" x2="52" y2="18"/>
-    <line x1="32" y1="32" x2="10" y2="40"/>
-    <line x1="32" y1="32" x2="54" y2="44"/>
-    <line x1="32" y1="32" x2="32" y2="56"/>
-  </g>
-  <g fill="#7fe8d6">
-    <circle cx="32" cy="32" r="7"/>
-    <circle cx="12" cy="14" r="3.6"/>
-    <circle cx="52" cy="18" r="3.6"/>
-    <circle cx="10" cy="40" r="3.6"/>
-    <circle cx="54" cy="44" r="3.6"/>
-    <circle cx="32" cy="56" r="3.6"/>
-  </g>
-</svg>
@@ -303,4 +303,4 @@ Or use the Canvas UI: Workspace → Config → MCP Servers → Add browser MCP s

 ---

-*Have a browser automation use case you want to see covered? File an issue with the `enhancement` label on the [molecule-core issue tracker](https://git.moleculesai.app/molecule-ai/molecule-core/issues).*
+*Have a browser automation use case you want to see covered? Open a discussion on [GitHub Discussions](https://git.moleculesai.app/molecule-ai/molecule-core/discussions) — or file an issue with the `enhancement` label.*
@@ -133,4 +133,4 @@ With protocol-native A2A, you get:

 Molecule AI's external agent registration is production-ready. Documentation is live at [External Agent Registration Guide](https://docs.molecule.ai/docs/guides/external-agent-registration). The npm package for the MCP server is available at [`@molecule-ai/mcp-server`](https://www.npmjs.com/package/@molecule-ai/mcp-server).

-Read the full [A2A v1.0 protocol spec](https://git.moleculesai.app/molecule-ai/molecule-core/src/branch/main/docs/api-protocol/a2a-protocol.md) on GitHub.
+Read the full [A2A v1.0 protocol spec](https://git.moleculesai.app/molecule-ai/molecule-core/blob/main/docs/api-protocol/a2a-protocol.md) on GitHub.
@@ -215,7 +215,7 @@ Push mode (this guide) works today but requires an inbound-reachable URL — whi

 Your agent makes only outbound HTTPS calls to the platform, pulling messages from an inbox queue and posting replies back. Works behind any NAT/firewall, tolerates offline laptops, no tunnel needed.

-See the [design doc](https://git.moleculesai.app/molecule-ai/internal/src/branch/main/product/external-workspaces-polling.md) (internal) and the implementation tracking issue (search `polling+mode` on the [molecule-core issue tracker](https://git.moleculesai.app/molecule-ai/molecule-core/issues)).
+See the [design doc](https://git.moleculesai.app/molecule-ai/internal/blob/main/product/external-workspaces-polling.md) (internal) and [implementation tracking issue](https://git.moleculesai.app/molecule-ai/molecule-core/issues?q=polling+mode) once opened.

 ---

@@ -144,4 +144,4 @@ The agent appears on the canvas with a **purple REMOTE badge** within seconds. F

 - **[External Agent Registration Guide →](/docs/guides/external-agent-registration)** — full endpoint reference, Python + Node.js examples, troubleshooting
 - **[molecule-sdk-python →](https://git.moleculesai.app/molecule-ai/molecule-sdk-python)** — SDK source, `RemoteAgentClient` API docs
- **[SDK Examples →](https://git.moleculesai.app/molecule-ai/molecule-sdk-python/src/branch/main/examples/remote-agent)** — `run.py` demo script, annotated walkthrough
+- **[SDK Examples →](https://git.moleculesai.app/molecule-ai/molecule-sdk-python/tree/main/examples/remote-agent)** — `run.py` demo script, annotated walkthrough
@@ -64,7 +64,7 @@ When opencode connects to the Molecule MCP endpoint, the agent gains access to:
  "tool": "delegate_task",
  "arguments": {
    "target": "research-lead",
-    "task": "Summarise the last 7 days of commits in Molecule-AI/molecule-monorepo"
+    "task": "Summarise the last 7 days of commits in molecule-ai/molecule-core"
  }
 }
 ```
@@ -1,6 +1,6 @@
 # Internal content policy

-The `Molecule-AI/molecule-monorepo` repo is **public**. Anything internal
+The `molecule-ai/molecule-core` repo is **public**. Anything internal
 (positioning, competitive briefs, sales playbooks, PMM/press drip, draft
 campaigns, raw research notes, ops runbooks, retrospectives) lives in
 **`Molecule-AI/internal`**.
@@ -18,10 +18,10 @@ This page is the canonical decision tree.
 | Draft campaign asset (still iterating, not yet customer-visible) | `Molecule-AI/internal/marketing/campaigns/` |
 | Roadmap discussion, planning doc, retrospective | `Molecule-AI/internal/PLAN.md` or `Molecule-AI/internal/retrospectives/` |
 | Runbook, ops procedure, incident postmortem | `Molecule-AI/internal/runbooks/` |
-| **Public-ready** blog post (final draft, ready to ship to docs site) | `Molecule-AI/molecule-monorepo/docs/blog/` |
-| **Public-ready** tutorial / quickstart | `Molecule-AI/molecule-monorepo/docs/tutorials/` |
-| Public DevRel content (code samples, demos for users) | `Molecule-AI/molecule-monorepo/docs/devrel/` |
-| API reference, architecture docs for external developers | `Molecule-AI/molecule-monorepo/docs/api/` |
+| **Public-ready** blog post (final draft, ready to ship to docs site) | `molecule-ai/molecule-core/docs/blog/` |
+| **Public-ready** tutorial / quickstart | `molecule-ai/molecule-core/docs/tutorials/` |
+| Public DevRel content (code samples, demos for users) | `molecule-ai/molecule-core/docs/devrel/` |
+| API reference, architecture docs for external developers | `molecule-ai/molecule-core/docs/api/` |
 | Code, tests, infrastructure | wherever is appropriate inside this repo |

 **Rule of thumb:** *"Would I be comfortable if a competitor / journalist / customer
@@ -19,8 +19,8 @@ import (
    "context"
    "testing"

-    mclient "github.com/Molecule-AI/molecule-monorepo/platform/internal/memory/client"
-    "github.com/Molecule-AI/molecule-monorepo/platform/internal/memory/contract"
+    mclient "github.com/go.moleculesai.app/core/platform/internal/memory/client"
+    "github.com/go.moleculesai.app/core/platform/internal/memory/contract"
 )

 func TestMyPlugin_FullRoundTrip(t *testing.T) {
@@ -17,7 +17,7 @@ This path is aligned to the current repository and current UI. It gets you from
 ## The one-command path

 ```bash
-git clone https://git.moleculesai.app/molecule-ai/molecule-monorepo.git
+git clone https://git.moleculesai.app/molecule-ai/molecule-core.git
 cd molecule-monorepo
 ./scripts/dev-start.sh
 ```
@@ -42,7 +42,7 @@ If you'd rather run each component yourself — useful when you're iterating on
 ### Step 1: Clone the repository

 ```bash
-git clone https://git.moleculesai.app/molecule-ai/molecule-monorepo.git
+git clone https://git.moleculesai.app/molecule-ai/molecule-core.git
 cd molecule-monorepo
 ```

@@ -1,137 +0,0 @@
-# Runbook — Handlers Postgres Integration port-collision substrate
-
-**Status:** Resolved 2026-05-08 (PR for class B Hongming-owned CICD red sweep).
-
-## Symptom
-
-`Handlers Postgres Integration` workflow fails on staging push and PRs.
-Step `Apply migrations to Postgres service` shows:
-
-```
-psql: error: connection to server at "127.0.0.1", port 5432 failed: Connection refused
-```
-
-Job-cleanup step further down logs:
-
-```
-Cleaning up services for job Handlers Postgres Integration
-failed to remove container: Error response from daemon: No such container: <id>
-```
-
-…confirming the postgres service container was already gone before
-cleanup ran.
-
-## Root cause
-
-Our Gitea act_runner (operator host `5.78.80.188`,
-`/opt/molecule/runners/config.yaml`) sets:
-
-```yaml
-container:
-  network: host
-```
-
-…which act_runner applies to BOTH the job container AND every
-`services:` container in a workflow. Multiple workflow instances
-running concurrently across the 16 parallel runners each try to bind
-postgres on `0.0.0.0:5432`. The first wins; subsequent instances exit
-immediately with:
-
-```
-LOG:  could not bind IPv4 address "0.0.0.0": Address in use
-HINT: Is another postmaster already running on port 5432?
-FATAL: could not create any TCP/IP sockets
-```
-
-act_runner sets `AutoRemove:true` on service containers, so Docker
-garbage-collects them as soon as they exit. By the time the migrations
-step runs `pg_isready` / `psql`, the container is gone and connection
-refused.
-
-Reproduction (operator host):
-
-```bash
-docker run --rm -d --name pg-A --network host \
-  -e POSTGRES_PASSWORD=test postgres:15-alpine
-docker run -d --name pg-B --network host \
-  -e POSTGRES_PASSWORD=test postgres:15-alpine
-docker logs pg-B   # FATAL: could not create any TCP/IP sockets
-```
-
-## Why per-job override doesn't work
-
-The natural fix — per-job `container.network` override — is silently
-ignored by act_runner. The runner log emits:
-
-```
--network and --net in the options will be ignored.
-```
-
-This is a documented act_runner constraint: container network is a
-runner-wide setting, not per-job. Source: gitea/act_runner config docs
-+ vegardit/docker-gitea-act-runner issue #7.
-
-Flipping the global `container.network` to `bridge` would break every
-other workflow in the repo (cache server discovery,
-`molecule-monorepo-net` peer access during integration tests, etc.) —
-unacceptable blast radius for a per-test bug.
-
-## Fix shape
-
-`handlers-postgres-integration.yml` no longer uses `services: postgres:`.
-It launches a sibling postgres container manually on the existing
-`molecule-monorepo-net` bridge network with a per-run unique name:
-
-```yaml
-env:
-  PG_NAME: pg-handlers-${{ github.run_id }}-${{ github.run_attempt }}
-  PG_NETWORK: molecule-monorepo-net
-
-steps:
-  - name: Start sibling Postgres on bridge network
-    run: |
-      docker run -d --name "${PG_NAME}" --network "${PG_NETWORK}" \
-        ...
-        postgres:15-alpine
-      PG_HOST=$(docker inspect "${PG_NAME}" \
-        --format "{{(index .NetworkSettings.Networks \"${PG_NETWORK}\").IPAddress}}")
-      echo "PG_HOST=${PG_HOST}" >> "$GITHUB_ENV"
-
-  # … migrations + tests use ${PG_HOST}, not 127.0.0.1 …
-
-  - if: always() && …
-    name: Stop sibling Postgres
-    run: docker rm -f "${PG_NAME}" || true
-```
-
-The host-net job container can reach a bridge-net container via the
-bridge IP directly (verified manually, 2026-05-08). Two parallel runs
-use different names + different bridge IPs — no collision.
-
-## Future-proofing
-
-Other workflows that hit the same shape (any `services:` with a
-fixed-port image) will exhibit the same failure mode under
-host-network runner config. Translate using this same pattern:
-
-1. Drop the `services:` block.
-2. Use `${{ github.run_id }}-${{ github.run_attempt }}` for unique
-   container name.
-3. Launch on `molecule-monorepo-net` (already trusted bridge in
-   `docker-compose.infra.yml`).
-4. Read back the bridge IP via `docker inspect` and export as a step env.
-5. `if: always()` cleanup step at the end.
-
-If the count of such workflows grows, factor into a composite action
-(`./.github/actions/sibling-postgres`) so the substrate logic lives
-in one place.
-
-## Related
-
- Issue #88 (closed by #92): localhost → 127.0.0.1 fix that unmasked
-  this collision; the IPv6 fix is correct, port collision is the new
-  layer.
- Issue #94 created `molecule-monorepo-net` + `alpine:latest` as
-  prereqs.
- Saved memory `feedback_act_runner_github_server_url` documents
-  another act_runner-vs-GHA divergence (server URL).
@@ -244,7 +244,7 @@ correctness before pushing a `runtime-v*` tag.
 ## Writing a new adapter

 Use the GitHub template repo
-[`molecule-ai/molecule-ai-workspace-template-starter`](https://git.moleculesai.app/molecule-ai/molecule-ai-workspace-template-starter) (note: the starter repo did not survive the 2026-05-06 GitHub-org-suspension migration; recreation tracked at internal#41)
+[`Molecule-AI/molecule-ai-workspace-template-starter`](https://git.moleculesai.app/molecule-ai/molecule-ai-workspace-template-starter)
 — it ships with the canonical Dockerfile + adapter.py skeleton + config.yaml
 schema + the `repository_dispatch: [runtime-published]` cascade receiver
 already wired up. No follow-up setup PR required.
@@ -256,7 +256,7 @@ gh repo create Molecule-AI/molecule-ai-workspace-template-<runtime> \
  --public \
  --description "Molecule AI workspace template: <runtime>"

-git clone https://git.moleculesai.app/molecule-ai/molecule-ai-workspace-template-<runtime>.git
+git clone https://git.moleculesai.app/molecule-ai/molecule-ai-workspace-template-<runtime>
 cd molecule-ai-workspace-template-<runtime>
 ```

@@ -286,7 +286,7 @@ After `git push`:
 If the canonical shape changes (e.g. `config.yaml` schema gets a new field,
 the `BaseAdapter` interface adds a method, the reusable CI workflow
 signature changes), update the
-[starter](https://git.moleculesai.app/molecule-ai/molecule-ai-workspace-template-starter) (recreation pending — see note above)
+[starter](https://git.moleculesai.app/molecule-ai/molecule-ai-workspace-template-starter)
 **first**. Existing templates can either migrate at their own pace or be
 touched in a coordinated cleanup PR. Either way, future templates pick up
 the new shape from day one.
@@ -2,46 +2,46 @@
  "_comment": "Pin refs to release tags for reproducible builds. 'main' is OK while all repos are internal.",
  "version": 1,
  "plugins": [
-    {"name": "browser-automation", "repo": "molecule-ai/molecule-ai-plugin-browser-automation", "ref": "main"},
-    {"name": "ecc", "repo": "molecule-ai/molecule-ai-plugin-ecc", "ref": "main"},
-    {"name": "gh-identity", "repo": "molecule-ai/molecule-ai-plugin-gh-identity", "ref": "main"},
-    {"name": "molecule-audit", "repo": "molecule-ai/molecule-ai-plugin-molecule-audit", "ref": "main"},
-    {"name": "molecule-audit-trail", "repo": "molecule-ai/molecule-ai-plugin-molecule-audit-trail", "ref": "main"},
-    {"name": "molecule-careful-bash", "repo": "molecule-ai/molecule-ai-plugin-molecule-careful-bash", "ref": "main"},
-    {"name": "molecule-compliance", "repo": "molecule-ai/molecule-ai-plugin-molecule-compliance", "ref": "main"},
-    {"name": "molecule-dev", "repo": "molecule-ai/molecule-ai-plugin-molecule-dev", "ref": "main"},
-    {"name": "molecule-freeze-scope", "repo": "molecule-ai/molecule-ai-plugin-molecule-freeze-scope", "ref": "main"},
-    {"name": "molecule-hitl", "repo": "molecule-ai/molecule-ai-plugin-molecule-hitl", "ref": "main"},
-    {"name": "molecule-prompt-watchdog", "repo": "molecule-ai/molecule-ai-plugin-molecule-prompt-watchdog", "ref": "main"},
-    {"name": "molecule-security-scan", "repo": "molecule-ai/molecule-ai-plugin-molecule-security-scan", "ref": "main"},
-    {"name": "molecule-session-context", "repo": "molecule-ai/molecule-ai-plugin-molecule-session-context", "ref": "main"},
-    {"name": "molecule-skill-code-review", "repo": "molecule-ai/molecule-ai-plugin-molecule-skill-code-review", "ref": "main"},
-    {"name": "molecule-skill-cron-learnings", "repo": "molecule-ai/molecule-ai-plugin-molecule-skill-cron-learnings", "ref": "main"},
-    {"name": "molecule-skill-cross-vendor-review", "repo": "molecule-ai/molecule-ai-plugin-molecule-skill-cross-vendor-review", "ref": "main"},
-    {"name": "molecule-skill-llm-judge", "repo": "molecule-ai/molecule-ai-plugin-molecule-skill-llm-judge", "ref": "main"},
-    {"name": "molecule-skill-update-docs", "repo": "molecule-ai/molecule-ai-plugin-molecule-skill-update-docs", "ref": "main"},
-    {"name": "molecule-workflow-retro", "repo": "molecule-ai/molecule-ai-plugin-molecule-workflow-retro", "ref": "main"},
-    {"name": "molecule-workflow-triage", "repo": "molecule-ai/molecule-ai-plugin-molecule-workflow-triage", "ref": "main"},
-    {"name": "superpowers", "repo": "molecule-ai/molecule-ai-plugin-superpowers", "ref": "main"}
+    {"name": "browser-automation", "repo": "Molecule-AI/molecule-ai-plugin-browser-automation", "ref": "main"},
+    {"name": "ecc", "repo": "Molecule-AI/molecule-ai-plugin-ecc", "ref": "main"},
+    {"name": "gh-identity", "repo": "Molecule-AI/molecule-ai-plugin-gh-identity", "ref": "main"},
+    {"name": "molecule-audit", "repo": "Molecule-AI/molecule-ai-plugin-molecule-audit", "ref": "main"},
+    {"name": "molecule-audit-trail", "repo": "Molecule-AI/molecule-ai-plugin-molecule-audit-trail", "ref": "main"},
+    {"name": "molecule-careful-bash", "repo": "Molecule-AI/molecule-ai-plugin-molecule-careful-bash", "ref": "main"},
+    {"name": "molecule-compliance", "repo": "Molecule-AI/molecule-ai-plugin-molecule-compliance", "ref": "main"},
+    {"name": "molecule-dev", "repo": "Molecule-AI/molecule-ai-plugin-molecule-dev", "ref": "main"},
+    {"name": "molecule-freeze-scope", "repo": "Molecule-AI/molecule-ai-plugin-molecule-freeze-scope", "ref": "main"},
+    {"name": "molecule-hitl", "repo": "Molecule-AI/molecule-ai-plugin-molecule-hitl", "ref": "main"},
+    {"name": "molecule-prompt-watchdog", "repo": "Molecule-AI/molecule-ai-plugin-molecule-prompt-watchdog", "ref": "main"},
+    {"name": "molecule-security-scan", "repo": "Molecule-AI/molecule-ai-plugin-molecule-security-scan", "ref": "main"},
+    {"name": "molecule-session-context", "repo": "Molecule-AI/molecule-ai-plugin-molecule-session-context", "ref": "main"},
+    {"name": "molecule-skill-code-review", "repo": "Molecule-AI/molecule-ai-plugin-molecule-skill-code-review", "ref": "main"},
+    {"name": "molecule-skill-cron-learnings", "repo": "Molecule-AI/molecule-ai-plugin-molecule-skill-cron-learnings", "ref": "main"},
+    {"name": "molecule-skill-cross-vendor-review", "repo": "Molecule-AI/molecule-ai-plugin-molecule-skill-cross-vendor-review", "ref": "main"},
+    {"name": "molecule-skill-llm-judge", "repo": "Molecule-AI/molecule-ai-plugin-molecule-skill-llm-judge", "ref": "main"},
+    {"name": "molecule-skill-update-docs", "repo": "Molecule-AI/molecule-ai-plugin-molecule-skill-update-docs", "ref": "main"},
+    {"name": "molecule-workflow-retro", "repo": "Molecule-AI/molecule-ai-plugin-molecule-workflow-retro", "ref": "main"},
+    {"name": "molecule-workflow-triage", "repo": "Molecule-AI/molecule-ai-plugin-molecule-workflow-triage", "ref": "main"},
+    {"name": "superpowers", "repo": "Molecule-AI/molecule-ai-plugin-superpowers", "ref": "main"}
  ],
  "workspace_templates": [
-    {"name": "claude-code-default", "repo": "molecule-ai/molecule-ai-workspace-template-claude-code", "ref": "main"},
-    {"name": "hermes", "repo": "molecule-ai/molecule-ai-workspace-template-hermes", "ref": "main"},
-    {"name": "openclaw", "repo": "molecule-ai/molecule-ai-workspace-template-openclaw", "ref": "main"},
-    {"name": "codex", "repo": "molecule-ai/molecule-ai-workspace-template-codex", "ref": "main"},
-    {"name": "langgraph", "repo": "molecule-ai/molecule-ai-workspace-template-langgraph", "ref": "main"},
-    {"name": "crewai", "repo": "molecule-ai/molecule-ai-workspace-template-crewai", "ref": "main"},
-    {"name": "autogen", "repo": "molecule-ai/molecule-ai-workspace-template-autogen", "ref": "main"},
-    {"name": "deepagents", "repo": "molecule-ai/molecule-ai-workspace-template-deepagents", "ref": "main"},
-    {"name": "gemini-cli", "repo": "molecule-ai/molecule-ai-workspace-template-gemini-cli", "ref": "main"}
+    {"name": "claude-code-default", "repo": "Molecule-AI/molecule-ai-workspace-template-claude-code", "ref": "main"},
+    {"name": "hermes", "repo": "Molecule-AI/molecule-ai-workspace-template-hermes", "ref": "main"},
+    {"name": "openclaw", "repo": "Molecule-AI/molecule-ai-workspace-template-openclaw", "ref": "main"},
+    {"name": "codex", "repo": "Molecule-AI/molecule-ai-workspace-template-codex", "ref": "main"},
+    {"name": "langgraph", "repo": "Molecule-AI/molecule-ai-workspace-template-langgraph", "ref": "main"},
+    {"name": "crewai", "repo": "Molecule-AI/molecule-ai-workspace-template-crewai", "ref": "main"},
+    {"name": "autogen", "repo": "Molecule-AI/molecule-ai-workspace-template-autogen", "ref": "main"},
+    {"name": "deepagents", "repo": "Molecule-AI/molecule-ai-workspace-template-deepagents", "ref": "main"},
+    {"name": "gemini-cli", "repo": "Molecule-AI/molecule-ai-workspace-template-gemini-cli", "ref": "main"}
  ],
  "org_templates": [
-    {"name": "molecule-dev", "repo": "molecule-ai/molecule-ai-org-template-molecule-dev", "ref": "main"},
-    {"name": "free-beats-all", "repo": "molecule-ai/molecule-ai-org-template-free-beats-all", "ref": "main"},
-    {"name": "medo-smoke", "repo": "molecule-ai/molecule-ai-org-template-medo-smoke", "ref": "main"},
-    {"name": "molecule-worker-gemini", "repo": "molecule-ai/molecule-ai-org-template-molecule-worker-gemini", "ref": "main"},
-    {"name": "reno-stars", "repo": "molecule-ai/molecule-ai-org-template-reno-stars", "ref": "main"},
-    {"name": "ux-ab-lab", "repo": "molecule-ai/molecule-ai-org-template-ux-ab-lab", "ref": "main"},
-    {"name": "mock-bigorg", "repo": "molecule-ai/molecule-ai-org-template-mock-bigorg", "ref": "main"}
+    {"name": "molecule-dev", "repo": "Molecule-AI/molecule-ai-org-template-molecule-dev", "ref": "main"},
+    {"name": "free-beats-all", "repo": "Molecule-AI/molecule-ai-org-template-free-beats-all", "ref": "main"},
+    {"name": "medo-smoke", "repo": "Molecule-AI/molecule-ai-org-template-medo-smoke", "ref": "main"},
+    {"name": "molecule-worker-gemini", "repo": "Molecule-AI/molecule-ai-org-template-molecule-worker-gemini", "ref": "main"},
+    {"name": "reno-stars", "repo": "Molecule-AI/molecule-ai-org-template-reno-stars", "ref": "main"},
+    {"name": "ux-ab-lab", "repo": "Molecule-AI/molecule-ai-org-template-ux-ab-lab", "ref": "main"},
+    {"name": "mock-bigorg", "repo": "Molecule-AI/molecule-ai-org-template-mock-bigorg", "ref": "main"}
  ]
 }
@@ -278,7 +278,7 @@ include = ["molecule_runtime*"]
 README_TEMPLATE = """\
 # molecule-ai-workspace-runtime

-Shared workspace runtime for [Molecule AI](https://git.moleculesai.app/molecule-ai/molecule-core)
+Shared workspace runtime for [Molecule AI](https://github.com/Molecule-AI/molecule-core)
 agent adapters. Installed by every workspace template image
 (`workspace-template-claude-code`, `-langgraph`, `-hermes`, etc.) to provide
 A2A delegation, heartbeat, memory, plugin loading, and skill management.
@@ -376,7 +376,7 @@ hold:
   non-plugin-sourced server, which Claude Code rejects with
   `channel_enable requires a marketplace plugin`. Until the
   official `moleculesai/claude-code-plugin` marketplace lands
-   (tracking [#2936](https://git.moleculesai.app/molecule-ai/molecule-core/issues/2936)),
+   (tracking [#2936](https://github.com/Molecule-AI/molecule-core/issues/2936)),
   operators who want push must scaffold their own local marketplace
   under
   `~/.claude/marketplaces/molecule-local/` containing a
@@ -389,14 +389,14 @@ hold:
 Symptom of any condition failing: messages arrive but only via the
 poll path (every ~1–60s), not real-time. There's currently no
 diagnostic surfaced — `molecule-mcp doctor` (tracking
-[#2937](https://git.moleculesai.app/molecule-ai/molecule-core/issues/2937)) is
+[#2937](https://github.com/Molecule-AI/molecule-core/issues/2937)) is
 planned.

 If you don't need real-time push, the default poll path works
 universally with no extra setup; both modes converge on the same
 `inbox_pop` ack so messages never duplicate.

-See [`docs/workspace-runtime-package.md`](https://git.moleculesai.app/molecule-ai/molecule-core/src/branch/main/docs/workspace-runtime-package.md)
+See [`docs/workspace-runtime-package.md`](https://github.com/Molecule-AI/molecule-core/blob/main/docs/workspace-runtime-package.md)
 for the publish flow and architecture.
 """

@@ -68,19 +68,22 @@ clone_category() {
            continue
        fi

+        # Post-2026-05-06 GitHub-org-suspension: clone from Gitea instead.
+        # manifest.json paths still read "Molecule-AI/..." (the historic
+        # github.com slug); Gitea lowercases the org part to "molecule-ai/".
+        # Lowercase the org segment on the fly so we don't need to rewrite
+        # every manifest entry.
+        repo_gitea="$(echo "$repo" | awk -F/ '{ printf "%s", tolower($1); for (i=2; i<=NF; i++) printf "/%s", $i; print "" }')"
+
        # Build the clone URL. When MOLECULE_GITEA_TOKEN is set (CI path)
        # embed it as basic-auth so private repos succeed. The username
        # part ("oauth2") is conventional and ignored by Gitea — only the
        # token-as-password is verified.
-        #
-        # manifest.json was migrated to lowercase org slugs on
-        # 2026-05-07 (post-suspension reconciliation), so we use $repo
-        # verbatim — no on-the-fly tolower transform needed.
        if [ -n "${MOLECULE_GITEA_TOKEN:-}" ]; then
-            clone_url="https://oauth2:${MOLECULE_GITEA_TOKEN}@git.moleculesai.app/${repo}.git"
-            display_url="https://oauth2:***@git.moleculesai.app/${repo}.git"
+            clone_url="https://oauth2:${MOLECULE_GITEA_TOKEN}@git.moleculesai.app/${repo_gitea}.git"
+            display_url="https://oauth2:***@git.moleculesai.app/${repo_gitea}.git"
        else
-            clone_url="https://git.moleculesai.app/${repo}.git"
+            clone_url="https://git.moleculesai.app/${repo_gitea}.git"
            display_url="$clone_url"
        fi

@@ -10,11 +10,11 @@
 #           → PyPI auto-bumps molecule-ai-workspace-runtime patch version
 #           → repository_dispatch fans out to 8 workspace-template-* repos
 #           → each template repo rebuilds and re-tags
-#             153263036946.dkr.ecr.us-east-2.amazonaws.com/molecule-ai/workspace-template-<runtime>:latest
+#             ghcr.io/molecule-ai/workspace-template-<runtime>:latest
 #
 #   PATH 2: any merge to a workspace-template-* repo's main branch
 #           → that repo's publish-image.yml fires
-#           → 153263036946.dkr.ecr.us-east-2.amazonaws.com/molecule-ai/workspace-template-<runtime>:latest
+#           → ghcr.io/molecule-ai/workspace-template-<runtime>:latest
 #             gets re-tagged
 #
 #   provisioner.go:296 RuntimeImages[runtime] reads `:latest` at every
@@ -51,7 +51,7 @@ log "pulling latest images for: ${RUNTIMES[*]}"
 PULLED=()
 FAILED=()
 for rt in "${RUNTIMES[@]}"; do
-  IMG="153263036946.dkr.ecr.us-east-2.amazonaws.com/molecule-ai/workspace-template-$rt:latest"
+  IMG="ghcr.io/molecule-ai/workspace-template-$rt:latest"
  if docker pull "$IMG" >/dev/null 2>&1; then
    log "  ✓ $rt"
    PULLED+=("$rt")
@@ -1,10 +1,9 @@
 #!/bin/bash
-# rollback-latest.sh — moves the :latest tag on the platform image
-# (and the matching tenant image) on AWS ECR back to a prior
-# :staging-<sha> digest without rebuilding anything. Prod tenants
-# auto-pull :latest every 5 min, so this is the fast path when a
-# canary-verified image turns out to have a runtime regression that
-# canary didn't catch.
+# rollback-latest.sh — moves the :latest tag on ghcr.io/molecule-ai/platform
+# (and the matching tenant image) back to a prior :staging-<sha> digest
+# without rebuilding anything. Prod tenants auto-pull :latest every 5
+# min, so this is the fast path when a canary-verified image turns out
+# to have a runtime regression that canary didn't catch.
 #
 # Usage:
 #   scripts/rollback-latest.sh <sha>
@@ -13,14 +12,12 @@
 # Prereqs:
 #   - crane on $PATH (brew install crane OR download from
 #     https://github.com/google/go-containerregistry/releases)
-#   - aws CLI authenticated for region us-east-2 with ECR pull/push
-#     access to the molecule-ai/platform + platform-tenant repositories.
-#     `aws sts get-caller-identity` should succeed.
+#   - GHCR token exported as GITHUB_TOKEN with write:packages scope
 #
 # What it does (per image — platform + tenant):
-#   crane digest <ecr>:<sha>         # verify the target sha exists
-#   crane tag    <ecr>:<sha> latest  # retag remotely, single API call
-#   crane digest <ecr>:latest        # confirm the move
+#   crane digest ghcr.io/…:<sha>         # verify the target sha exists
+#   crane tag    ghcr.io/…:<sha> latest  # retag remotely, single API call
+#   crane digest ghcr.io/…:latest        # confirm the move
 #
 # Exit codes: 0 = both retagged, 1 = tag missing / crane error, 2 = bad args.

@@ -33,23 +30,21 @@ if [ "${1:-}" = "" ]; then
 fi

 TARGET_SHA="$1"
-ECR_HOST=153263036946.dkr.ecr.us-east-2.amazonaws.com
-PLATFORM=$ECR_HOST/molecule-ai/platform
-TENANT=$ECR_HOST/molecule-ai/platform-tenant
+PLATFORM=ghcr.io/molecule-ai/platform
+TENANT=ghcr.io/molecule-ai/platform-tenant

 if ! command -v crane >/dev/null; then
  echo "ERROR: crane not installed. brew install crane" >&2
  exit 1
 fi
-if ! command -v aws >/dev/null; then
-  echo "ERROR: aws CLI not installed. brew install awscli" >&2
+if [ -z "${GITHUB_TOKEN:-}" ]; then
+  echo "ERROR: GITHUB_TOKEN unset. export it with write:packages scope." >&2
  exit 1
 fi

-# Log in once. ECR auth is via short-lived password from `aws ecr
-# get-login-password`. crane stores creds in a config file keyed by
-# registry; re-running is cheap.
-aws ecr get-login-password --region us-east-2 | crane auth login "$ECR_HOST" -u AWS --password-stdin >/dev/null
+# Log in once. crane stores creds in a config file keyed by registry;
+# re-running is cheap.
+printf '%s\n' "$GITHUB_TOKEN" | crane auth login ghcr.io -u "${GITHUB_ACTOR:-$(whoami)}" --password-stdin >/dev/null

 roll() {
  local image="$1"
@@ -1,7 +1,5 @@
 # Production-shape local harness

-<!-- Retrigger Harness Replays after Class G #168 + clone-manifest fix (#42). -->
-
 The harness brings up the SaaS tenant topology on localhost using the
 same `Dockerfile.tenant` image that ships to production. Tests target
 the cf-proxy on `http://localhost:8080` and pass the tenant identity
@@ -1,14 +0,0 @@
-# cf-proxy harness image — nginx + the harness's tenant-routing config baked
-# in at build time.
-#
-# Why bake (not bind-mount): on Gitea Actions / act_runner, the runner is a
-# container talking to the OUTER docker daemon over the host socket; runc
-# resolves bind-mount source paths on the outer host filesystem, where the
-# repo at `/workspace/.../tests/harness/cf-proxy/nginx.conf` is invisible.
-# Compose `configs:` (with `file:`) falls back to bind mounts when swarm is
-# not active, so it hits the same gap. A build-time COPY uploads the file
-# as part of the docker build context — the daemon receives the tarball
-# directly and never bind-mounts. See issue #88 item 2.
-FROM nginx:1.27-alpine
-
-COPY nginx.conf /etc/nginx/nginx.conf
@@ -167,26 +167,15 @@ services:
  # Production shape: same single CF tunnel front-doors every tenant
  # subdomain — the Host header carries the tenant identity, not the
  # routing destination. Local cf-proxy mirrors this exactly.
-  #
-  # nginx.conf delivery: built into a custom image via cf-proxy/Dockerfile
-  # (a thin nginx:1.27-alpine + COPY). NOT a bind mount and NOT a
-  # compose `configs:` block, both of which break under Gitea's
-  # act_runner: the runner talks to the OUTER docker daemon over the
-  # host socket, and runc resolves bind sources on the outer host
-  # filesystem, where `/workspace/.../tests/harness/cf-proxy/nginx.conf`
-  # is invisible. Compose `configs:` falls back to bind mounts without
-  # swarm, so it hits the same gap. A build context, by contrast, is
-  # uploaded to the daemon as a tarball at build time — no bind. See
-  # issue #88 item 2.
  cf-proxy:
-    build:
-      context: ./cf-proxy
-      dockerfile: Dockerfile
+    image: nginx:1.27-alpine
    depends_on:
      tenant-alpha:
        condition: service_healthy
      tenant-beta:
        condition: service_healthy
+    volumes:
+      - ./cf-proxy/nginx.conf:/etc/nginx/nginx.conf:ro
    # Bind to 127.0.0.1 only — hardcoded ADMIN_TOKENs make 0.0.0.0
    # exposure unsafe even on a local network.
    ports:
@@ -1,3 +1,3 @@
-module github.com/Molecule-AI/molecule-monorepo/tests/harness/cp-stub
+module go.moleculesai.app/core/tests/harness/cp-stub

 go 1.25
@@ -18,7 +18,7 @@
 #
 # Or inline via curl:
 #
-#     bash <(curl -fsSL https://git.moleculesai.app/molecule-ai/molecule-core/raw/branch/main/tools/check-template-parity.sh) \
+#     bash <(curl -fsSL https://raw.githubusercontent.com/Molecule-AI/molecule-core/main/tools/check-template-parity.sh) \
 #          install.sh start.sh
 #
 # Exit codes:
@@ -1,49 +0,0 @@
-# air.toml — live-reload config for local docker-compose dev mode.
-#
-# Active when the platform service runs from workspace-server/Dockerfile.dev
-# (selected via docker-compose.dev.yml overlay). In production, the regular
-# Dockerfile builds a static binary; air is dev-only.
-#
-# Reference: https://github.com/air-verse/air
-
-root = "."
-testdata_dir = "testdata"
-tmp_dir = "tmp"
-
-[build]
-  # Same build invocation as Dockerfile's builder stage minus the
-  # CGO_ENABLED=0 toggle (CGO ok in dev for richer race detector output).
-  cmd = "go build -o ./tmp/server ./cmd/server"
-  bin = "tmp/server"
-  full_bin = ""
-  args_bin = []
-  # Watch every .go and .yaml file under workspace-server/.
-  include_ext = ["go", "yaml", "tmpl"]
-  # Don't watch tests, build artifacts, vendored deps, or migration .sql
-  # (migrations need a clean DB anyway — handled by docker-compose down/up).
-  exclude_dir = ["assets", "tmp", "vendor", "testdata", "node_modules"]
-  exclude_file = []
-  # _test.go and *_mock.go shouldn't trigger a rebuild — saves cycles.
-  exclude_regex = ["_test\\.go$", "_mock\\.go$"]
-  exclude_unchanged = true
-  follow_symlink = false
-  log = "build-errors.log"
-  # Kill running binary 1s before starting new one.
-  kill_delay = "1s"
-  send_interrupt = true
-  stop_on_error = true
-  # Debounce: wait this long after last change before triggering rebuild.
-  delay = 500
-
-[log]
-  time = false
-
-[color]
-  main = "magenta"
-  watcher = "cyan"
-  build = "yellow"
-  runner = "green"
-
-[misc]
-  # Don't keep the tmp/ dir around between runs.
-  clean_on_exit = true
@@ -23,7 +23,7 @@ COPY workspace-server/ .
 # GIT_SHA mirror of Dockerfile.tenant — see that file for the rationale.
 ARG GIT_SHA=dev
 RUN CGO_ENABLED=0 GOOS=linux go build \
-    -ldflags "-X github.com/Molecule-AI/molecule-monorepo/platform/internal/buildinfo.GitSHA=${GIT_SHA}" \
+    -ldflags "-X go.moleculesai.app/core/platform/internal/buildinfo.GitSHA=${GIT_SHA}" \
    -o /platform ./cmd/server
 # Bundle the built-in memory-plugin-postgres binary so an operator can
 # activate Memory v2 by setting MEMORY_V2_CUTOVER=true + (default)
@@ -31,7 +31,7 @@ RUN CGO_ENABLED=0 GOOS=linux go build \
 # binary in the background; main /platform talks to it over loopback.
 # Stays inert until the operator flips the cutover env var.
 RUN CGO_ENABLED=0 GOOS=linux go build \
-    -ldflags "-X github.com/Molecule-AI/molecule-monorepo/platform/internal/buildinfo.GitSHA=${GIT_SHA}" \
+    -ldflags "-X go.moleculesai.app/core/platform/internal/buildinfo.GitSHA=${GIT_SHA}" \
    -o /memory-plugin ./cmd/memory-plugin-postgres

 FROM alpine:3.20
@@ -1,38 +0,0 @@
-# Dockerfile.dev — local-development image with air-driven live reload.
-#
-# Selected by docker-compose.dev.yml (overlay over docker-compose.yml).
-# Production stays on workspace-server/Dockerfile (static binary, no air).
-#
-# Workflow:
-#   1. docker compose -f docker-compose.yml -f docker-compose.dev.yml up
-#   2. Edit any .go file under workspace-server/
-#   3. air detects, rebuilds, kills old binary, starts new one (~3-5s)
-#   4. No `docker compose up --build` needed
-#
-# Templates + plugins are NOT pre-cloned here — air-mode assumes the
-# developer's filesystem has the workspace-configs-templates/ + plugins/
-# dirs available, mounted at runtime via docker-compose.dev.yml.
-
-FROM golang:1.25-alpine
-
-# air + git (for go mod) + ca-certs (for TLS) + tzdata (for time-zone DB).
-RUN apk add --no-cache git ca-certificates tzdata wget \
- && go install github.com/air-verse/air@latest
-
-WORKDIR /app/workspace-server
-
-# Pre-fetch deps so the first `air` rebuild on a fresh container is fast.
-# These are bind-mount-overridden at runtime, so the COPY here is just
-# to warm the module cache.
-COPY workspace-server/go.mod workspace-server/go.sum ./
-RUN go mod download
-
-# Source is bind-mounted at runtime (see docker-compose.dev.yml volumes
-# block) so the Dockerfile doesn't need to COPY it. air watches the
-# bind-mounted dir for changes.
-
-ENV CGO_ENABLED=1
-ENV GOFLAGS="-buildvcs=false"
-
-# Run air with the .air.toml in the bind-mounted source dir.
-CMD ["air", "-c", ".air.toml"]
@@ -53,14 +53,14 @@ COPY workspace-server/ .
 # fails closed — which is the correct fail-direction (#2395 root fix).
 ARG GIT_SHA=dev
 RUN CGO_ENABLED=0 GOOS=linux go build \
-    -ldflags "-X github.com/Molecule-AI/molecule-monorepo/platform/internal/buildinfo.GitSHA=${GIT_SHA}" \
+    -ldflags "-X go.moleculesai.app/core/platform/internal/buildinfo.GitSHA=${GIT_SHA}" \
    -o /platform ./cmd/server
 # Memory v2 sidecar binary (Memory v2 #2728). Bundled so an operator
 # can activate cutover by flipping MEMORY_V2_CUTOVER=true without
 # provisioning a separate service. See entrypoint-tenant.sh for the
 # launch logic.
 RUN CGO_ENABLED=0 GOOS=linux go build \
-    -ldflags "-X github.com/Molecule-AI/molecule-monorepo/platform/internal/buildinfo.GitSHA=${GIT_SHA}" \
+    -ldflags "-X go.moleculesai.app/core/platform/internal/buildinfo.GitSHA=${GIT_SHA}" \
    -o /memory-plugin ./cmd/memory-plugin-postgres

 # ── Stage 2: Canvas Next.js standalone ────────────────────────────────
@@ -30,9 +30,9 @@ import (

 	_ "github.com/lib/pq"

-	mclient "github.com/Molecule-AI/molecule-monorepo/platform/internal/memory/client"
-	"github.com/Molecule-AI/molecule-monorepo/platform/internal/memory/contract"
-	"github.com/Molecule-AI/molecule-monorepo/platform/internal/memory/namespace"
+	mclient "go.moleculesai.app/core/platform/internal/memory/client"
+	"go.moleculesai.app/core/platform/internal/memory/contract"
+	"go.moleculesai.app/core/platform/internal/memory/namespace"
 )

 const defaultLimit = 1000000 // effectively unlimited; cap keeps SQL pageable
@@ -10,8 +10,8 @@ import (

 	"github.com/DATA-DOG/go-sqlmock"

-	"github.com/Molecule-AI/molecule-monorepo/platform/internal/memory/contract"
-	"github.com/Molecule-AI/molecule-monorepo/platform/internal/memory/namespace"
+	"go.moleculesai.app/core/platform/internal/memory/contract"
+	"go.moleculesai.app/core/platform/internal/memory/namespace"
 )

 // stubBackfillPlugin records calls for assertions.
@@ -20,8 +20,8 @@ import (
 	"math/rand"
 	"os"

-	"github.com/Molecule-AI/molecule-monorepo/platform/internal/memory/contract"
-	"github.com/Molecule-AI/molecule-monorepo/platform/internal/textutil"
+	"go.moleculesai.app/core/platform/internal/memory/contract"
+	"go.moleculesai.app/core/platform/internal/textutil"
 )

 // verifyConfig is the typed dependency bundle for verifyParity.
@@ -9,7 +9,7 @@ import (

 	"github.com/DATA-DOG/go-sqlmock"

-	"github.com/Molecule-AI/molecule-monorepo/platform/internal/memory/contract"
+	"go.moleculesai.app/core/platform/internal/memory/contract"
 )

 // stubVerifyPlugin records search calls and returns canned results.
@@ -45,8 +45,8 @@ import (
 	"testing"
 	"time"

-	mclient "github.com/Molecule-AI/molecule-monorepo/platform/internal/memory/client"
-	"github.com/Molecule-AI/molecule-monorepo/platform/internal/memory/contract"
+	mclient "go.moleculesai.app/core/platform/internal/memory/client"
+	"go.moleculesai.app/core/platform/internal/memory/contract"
 )

 const (
@@ -25,7 +25,7 @@ import (

 	_ "github.com/lib/pq"

-	"github.com/Molecule-AI/molecule-monorepo/platform/internal/memory/pgplugin"
+	"go.moleculesai.app/core/platform/internal/memory/pgplugin"
 )

 // migrationsFS bundles the .up.sql files into the binary at build time
@@ -12,28 +12,28 @@ import (
 	"syscall"
 	"time"

-	"github.com/Molecule-AI/molecule-monorepo/platform/internal/channels"
-	"github.com/Molecule-AI/molecule-monorepo/platform/internal/crypto"
-	"github.com/Molecule-AI/molecule-monorepo/platform/internal/db"
-	"github.com/Molecule-AI/molecule-monorepo/platform/internal/events"
-	"github.com/Molecule-AI/molecule-monorepo/platform/internal/handlers"
-	"github.com/Molecule-AI/molecule-monorepo/platform/internal/imagewatch"
-	memwiring "github.com/Molecule-AI/molecule-monorepo/platform/internal/memory/wiring"
-	"github.com/Molecule-AI/molecule-monorepo/platform/internal/middleware"
-	"github.com/Molecule-AI/molecule-monorepo/platform/internal/pendinguploads"
-	"github.com/Molecule-AI/molecule-monorepo/platform/internal/provisioner"
-	"github.com/Molecule-AI/molecule-monorepo/platform/internal/registry"
-	"github.com/Molecule-AI/molecule-monorepo/platform/internal/router"
-	"github.com/Molecule-AI/molecule-monorepo/platform/internal/scheduler"
-	"github.com/Molecule-AI/molecule-monorepo/platform/internal/supervised"
-	"github.com/Molecule-AI/molecule-monorepo/platform/internal/ws"
+	"go.moleculesai.app/core/platform/internal/channels"
+	"go.moleculesai.app/core/platform/internal/crypto"
+	"go.moleculesai.app/core/platform/internal/db"
+	"go.moleculesai.app/core/platform/internal/events"
+	"go.moleculesai.app/core/platform/internal/handlers"
+	"go.moleculesai.app/core/platform/internal/imagewatch"
+	memwiring "go.moleculesai.app/core/platform/internal/memory/wiring"
+	"go.moleculesai.app/core/platform/internal/middleware"
+	"go.moleculesai.app/core/platform/internal/pendinguploads"
+	"go.moleculesai.app/core/platform/internal/provisioner"
+	"go.moleculesai.app/core/platform/internal/registry"
+	"go.moleculesai.app/core/platform/internal/router"
+	"go.moleculesai.app/core/platform/internal/scheduler"
+	"go.moleculesai.app/core/platform/internal/supervised"
+	"go.moleculesai.app/core/platform/internal/ws"

 	// External plugins — each registers EnvMutator(s) that run at workspace
 	// provision time. Loaded via soft-dep gates in main() so self-hosters
 	// without per-agent identity configured keep working.
 	ghidentity "github.com/Molecule-AI/molecule-ai-plugin-gh-identity/pluginloader"

-	"github.com/Molecule-AI/molecule-monorepo/platform/pkg/provisionhook"
+	"go.moleculesai.app/core/platform/pkg/provisionhook"
 )

 func main() {
@@ -249,19 +249,6 @@ func main() {
 		})
 	}

-	// CP-mode orphan sweeper — SaaS counterpart to the Docker sweeper
-	// above. Re-issues cpProv.Stop for any workspace at status='removed'
-	// with a non-NULL instance_id, healing the deprovision split-write
-	// race documented in #2989: tenant marks status='removed' BEFORE
-	// calling CP DELETE, so a transient CP failure leaves the EC2
-	// running with no retry path. cpProv.Stop is idempotent against
-	// already-terminated instances; on success we clear instance_id.
-	if cpProv != nil {
-		go supervised.RunWithRecover(ctx, "cp-orphan-sweeper", func(c context.Context) {
-			registry.StartCPOrphanSweeper(c, cpProv)
-		})
-	}
-
 	// Pending-uploads GC sweep — deletes acked rows past their retention
 	// window plus unacked rows past expires_at. Without this the
 	// pending_uploads table grows unbounded; even with the 24h hard TTL,
@@ -1,4 +1,4 @@
-module github.com/Molecule-AI/molecule-monorepo/platform
+module go.moleculesai.app/core/platform

 go 1.25.0

@@ -8,7 +8,7 @@ import (
 	"testing"
 	"time"

-	"github.com/Molecule-AI/molecule-monorepo/platform/internal/artifacts"
+	"go.moleculesai.app/core/platform/internal/artifacts"
 )

 // cfEnvelope wraps a result value in the Cloudflare v4 response envelope.
@@ -250,7 +250,7 @@ func TestImportRepo_Success(t *testing.T) {

 	client := newTestClient(t, mux)
 	repo, err := client.ImportRepo(context.Background(), "imported", artifacts.ImportRepoRequest{
-		URL:    "https://github.com/Molecule-AI/molecule-core.git",
+		URL:    "https://git.moleculesai.app/molecule-ai/molecule-core.git",
 		Branch: "main",
 		Depth:  1,
 	})
@@ -2,7 +2,7 @@
 //
 // Set at link time:
 //
-//	go build -ldflags "-X github.com/Molecule-AI/molecule-monorepo/platform/internal/buildinfo.GitSHA=<sha>"
+//	go build -ldflags "-X github.com/go.moleculesai.app/core/platform/internal/buildinfo.GitSHA=<sha>"
 //
 // CI passes ${{ github.sha }} via Dockerfile.tenant ARG GIT_SHA; local
 // dev builds default to "dev" so unset never reads as success.
@@ -6,7 +6,7 @@ import (
 	"net/http/httptest"
 	"testing"

-	"github.com/Molecule-AI/molecule-monorepo/platform/internal/buildinfo"
+	"go.moleculesai.app/core/platform/internal/buildinfo"
 	"github.com/gin-gonic/gin"
 )

@@ -11,8 +11,8 @@ import (
 	"path/filepath"
 	"strings"

-	"github.com/Molecule-AI/molecule-monorepo/platform/internal/db"
-	"github.com/Molecule-AI/molecule-monorepo/platform/internal/provisioner"
+	"go.moleculesai.app/core/platform/internal/db"
+	"go.moleculesai.app/core/platform/internal/provisioner"
 	"github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/client"
 	"github.com/docker/docker/pkg/stdcopy"
@@ -5,10 +5,10 @@ import (
 	"fmt"
 	"strings"

-	"github.com/Molecule-AI/molecule-monorepo/platform/internal/db"
-	"github.com/Molecule-AI/molecule-monorepo/platform/internal/events"
-	"github.com/Molecule-AI/molecule-monorepo/platform/internal/models"
-	"github.com/Molecule-AI/molecule-monorepo/platform/internal/provisioner"
+	"go.moleculesai.app/core/platform/internal/db"
+	"go.moleculesai.app/core/platform/internal/events"
+	"go.moleculesai.app/core/platform/internal/models"
+	"go.moleculesai.app/core/platform/internal/provisioner"
 	"github.com/google/uuid"
 )

@@ -6,7 +6,7 @@ import (
 	"time"

 	"github.com/DATA-DOG/go-sqlmock"
-	"github.com/Molecule-AI/molecule-monorepo/platform/internal/db"
+	"go.moleculesai.app/core/platform/internal/db"
 )

 // ==================== Adapter Interface Tests ====================
@@ -9,8 +9,8 @@ import (
 	"sync"
 	"time"

-	"github.com/Molecule-AI/molecule-monorepo/platform/internal/db"
-	"github.com/Molecule-AI/molecule-monorepo/platform/internal/events"
+	"go.moleculesai.app/core/platform/internal/db"
+	"go.moleculesai.app/core/platform/internal/events"
 )

 const (
@@ -29,7 +29,7 @@ import (
 	"encoding/base64"
 	"strings"

-	"github.com/Molecule-AI/molecule-monorepo/platform/internal/crypto"
+	"go.moleculesai.app/core/platform/internal/crypto"
 )

 // sensitiveFields is the set of channel_config keys that get encrypted at
@@ -4,7 +4,7 @@ import (
 	"strings"
 	"testing"

-	"github.com/Molecule-AI/molecule-monorepo/platform/internal/crypto"
+	"go.moleculesai.app/core/platform/internal/crypto"
 )

 // withTestEncryptionKey installs a deterministic 32-byte key for the
@@ -18,7 +18,7 @@ import (
 	"testing"
 )

-const moduleInternalPrefix = "github.com/Molecule-AI/molecule-monorepo/platform/internal/"
+const moduleInternalPrefix = "go.moleculesai.app/core/platform/internal/"

 func TestDBHasNoInternalDependencies(t *testing.T) {
 	t.Parallel()
@@ -7,9 +7,9 @@ import (
 	"sync"
 	"time"

-	"github.com/Molecule-AI/molecule-monorepo/platform/internal/db"
-	"github.com/Molecule-AI/molecule-monorepo/platform/internal/models"
-	"github.com/Molecule-AI/molecule-monorepo/platform/internal/ws"
+	"go.moleculesai.app/core/platform/internal/db"
+	"go.moleculesai.app/core/platform/internal/models"
+	"go.moleculesai.app/core/platform/internal/ws"
 	"github.com/redis/go-redis/v9"
 )

@@ -20,12 +20,12 @@ import (
 	"strings"
 	"time"

-	"github.com/Molecule-AI/molecule-monorepo/platform/internal/db"
-	"github.com/Molecule-AI/molecule-monorepo/platform/internal/events"
-	"github.com/Molecule-AI/molecule-monorepo/platform/internal/models"
-	"github.com/Molecule-AI/molecule-monorepo/platform/internal/provisioner"
-	"github.com/Molecule-AI/molecule-monorepo/platform/internal/registry"
-	"github.com/Molecule-AI/molecule-monorepo/platform/internal/wsauth"
+	"go.moleculesai.app/core/platform/internal/db"
+	"go.moleculesai.app/core/platform/internal/events"
+	"go.moleculesai.app/core/platform/internal/models"
+	"go.moleculesai.app/core/platform/internal/provisioner"
+	"go.moleculesai.app/core/platform/internal/registry"
+	"go.moleculesai.app/core/platform/internal/wsauth"
 	"github.com/gin-gonic/gin"
 	"github.com/google/uuid"
 )
@@ -13,10 +13,10 @@ import (
 	"strconv"
 	"time"

-	"github.com/Molecule-AI/molecule-monorepo/platform/internal/db"
-	"github.com/Molecule-AI/molecule-monorepo/platform/internal/events"
-	"github.com/Molecule-AI/molecule-monorepo/platform/internal/models"
-	"github.com/Molecule-AI/molecule-monorepo/platform/internal/wsauth"
+	"go.moleculesai.app/core/platform/internal/db"
+	"go.moleculesai.app/core/platform/internal/events"
+	"go.moleculesai.app/core/platform/internal/models"
+	"go.moleculesai.app/core/platform/internal/wsauth"
 	"github.com/gin-gonic/gin"
 )

@@ -9,8 +9,8 @@ import (
 	"testing"

 	"github.com/DATA-DOG/go-sqlmock"
-	"github.com/Molecule-AI/molecule-monorepo/platform/internal/models"
-	"github.com/Molecule-AI/molecule-monorepo/platform/internal/provisioner"
+	"go.moleculesai.app/core/platform/internal/models"
+	"go.moleculesai.app/core/platform/internal/provisioner"
 )

 // preflightLocalProv is a controllable LocalProvisionerAPI stub for the
@@ -16,8 +16,8 @@ import (
 	"time"

 	"github.com/DATA-DOG/go-sqlmock"
-	"github.com/Molecule-AI/molecule-monorepo/platform/internal/models"
-	"github.com/Molecule-AI/molecule-monorepo/platform/internal/provisioner"
+	"go.moleculesai.app/core/platform/internal/models"
+	"go.moleculesai.app/core/platform/internal/provisioner"
 	"github.com/gin-gonic/gin"
 )

@@ -20,9 +20,9 @@ import (
 	"net/http"
 	"time"

-	"github.com/Molecule-AI/molecule-monorepo/platform/internal/db"
-	"github.com/Molecule-AI/molecule-monorepo/platform/internal/events"
-	"github.com/Molecule-AI/molecule-monorepo/platform/internal/textutil"
+	"go.moleculesai.app/core/platform/internal/db"
+	"go.moleculesai.app/core/platform/internal/events"
+	"go.moleculesai.app/core/platform/internal/textutil"
 )

 // extractIdempotencyKey pulls params.message.messageId out of an A2A JSON-RPC
@@ -42,8 +42,8 @@ import (
 	"log"
 	"net/http"

-	"github.com/Molecule-AI/molecule-monorepo/platform/internal/db"
-	"github.com/Molecule-AI/molecule-monorepo/platform/internal/wsauth"
+	"go.moleculesai.app/core/platform/internal/db"
+	"go.moleculesai.app/core/platform/internal/wsauth"
 	"github.com/gin-gonic/gin"
 )

@@ -19,7 +19,7 @@ import (
 	"time"

 	"github.com/DATA-DOG/go-sqlmock"
-	"github.com/Molecule-AI/molecule-monorepo/platform/internal/db"
+	"go.moleculesai.app/core/platform/internal/db"
 	"github.com/alicebob/miniredis/v2"
 )

@@ -12,8 +12,8 @@ import (
 	"strings"
 	"time"

-	"github.com/Molecule-AI/molecule-monorepo/platform/internal/db"
-	"github.com/Molecule-AI/molecule-monorepo/platform/internal/events"
+	"go.moleculesai.app/core/platform/internal/db"
+	"go.moleculesai.app/core/platform/internal/events"
 	"github.com/gin-gonic/gin"
 	"github.com/google/uuid"
 )
@@ -14,7 +14,7 @@ import (
 	"time"

 	"github.com/DATA-DOG/go-sqlmock"
-	"github.com/Molecule-AI/molecule-monorepo/platform/internal/db"
+	"go.moleculesai.app/core/platform/internal/db"
 	"github.com/gin-gonic/gin"
 )

@@ -7,7 +7,7 @@ import (
 	"strconv"
 	"time"

-	"github.com/Molecule-AI/molecule-monorepo/platform/internal/db"
+	"go.moleculesai.app/core/platform/internal/db"
 	"github.com/gin-gonic/gin"
 )

@@ -9,10 +9,10 @@ import (
 	"strings"
 	"time"

-	"github.com/Molecule-AI/molecule-monorepo/platform/internal/db"
-	mclient "github.com/Molecule-AI/molecule-monorepo/platform/internal/memory/client"
-	"github.com/Molecule-AI/molecule-monorepo/platform/internal/memory/contract"
-	"github.com/Molecule-AI/molecule-monorepo/platform/internal/memory/namespace"
+	"go.moleculesai.app/core/platform/internal/db"
+	mclient "go.moleculesai.app/core/platform/internal/memory/client"
+	"go.moleculesai.app/core/platform/internal/memory/contract"
+	"go.moleculesai.app/core/platform/internal/memory/namespace"
 	"github.com/gin-gonic/gin"
 )

@@ -14,9 +14,9 @@ import (
 	"github.com/DATA-DOG/go-sqlmock"
 	"github.com/gin-gonic/gin"

-	platformdb "github.com/Molecule-AI/molecule-monorepo/platform/internal/db"
-	"github.com/Molecule-AI/molecule-monorepo/platform/internal/memory/contract"
-	"github.com/Molecule-AI/molecule-monorepo/platform/internal/memory/namespace"
+	platformdb "go.moleculesai.app/core/platform/internal/db"
+	"go.moleculesai.app/core/platform/internal/memory/contract"
+	"go.moleculesai.app/core/platform/internal/memory/namespace"
 )

 // --- stubs ---
@@ -7,8 +7,8 @@ import (

 	"github.com/gin-gonic/gin"

-	"github.com/Molecule-AI/molecule-monorepo/platform/internal/db"
-	"github.com/Molecule-AI/molecule-monorepo/platform/internal/scheduler"
+	"go.moleculesai.app/core/platform/internal/db"
+	"go.moleculesai.app/core/platform/internal/scheduler"
 )

 // AdminSchedulesHealthHandler serves GET /admin/schedules/health — a cross-workspace
@@ -25,8 +25,8 @@ import (
 	"os"
 	"strings"

-	"github.com/Molecule-AI/molecule-monorepo/platform/internal/db"
-	"github.com/Molecule-AI/molecule-monorepo/platform/internal/wsauth"
+	"go.moleculesai.app/core/platform/internal/db"
+	"go.moleculesai.app/core/platform/internal/wsauth"
 	"github.com/gin-gonic/gin"
 )

@@ -8,8 +8,8 @@ import (
 	"testing"

 	"github.com/DATA-DOG/go-sqlmock"
-	"github.com/Molecule-AI/molecule-monorepo/platform/internal/db"
-	"github.com/Molecule-AI/molecule-monorepo/platform/internal/wsauth"
+	"go.moleculesai.app/core/platform/internal/db"
+	"go.moleculesai.app/core/platform/internal/wsauth"
 	"github.com/gin-gonic/gin"
 )

@@ -18,7 +18,7 @@ import (
 	dockerclient "github.com/docker/docker/client"
 	"github.com/gin-gonic/gin"

-	"github.com/Molecule-AI/molecule-monorepo/platform/internal/provisioner"
+	"go.moleculesai.app/core/platform/internal/provisioner"
 )

 // WorkspaceImageService is the production-side end of the runtime CD chain.
@@ -5,8 +5,8 @@ import (
 	"log"
 	"net/http"

-	"github.com/Molecule-AI/molecule-monorepo/platform/internal/db"
-	"github.com/Molecule-AI/molecule-monorepo/platform/internal/events"
+	"go.moleculesai.app/core/platform/internal/db"
+	"go.moleculesai.app/core/platform/internal/events"
 	"github.com/gin-gonic/gin"
 )

@@ -43,8 +43,8 @@ import (
 	"fmt"
 	"log"

-	"github.com/Molecule-AI/molecule-monorepo/platform/internal/events"
-	"github.com/Molecule-AI/molecule-monorepo/platform/internal/textutil"
+	"go.moleculesai.app/core/platform/internal/events"
+	"go.moleculesai.app/core/platform/internal/textutil"
 )

 // ErrWorkspaceNotFound is returned by AgentMessageWriter.Send when the
@@ -10,7 +10,7 @@ import (
 	"unicode/utf8"

 	"github.com/DATA-DOG/go-sqlmock"
-	"github.com/Molecule-AI/molecule-monorepo/platform/internal/db"
+	"go.moleculesai.app/core/platform/internal/db"
 )

 // AgentMessageWriter is the SSOT for agent → user chat delivery
@@ -5,8 +5,8 @@ import (
 	"log"
 	"net/http"

-	"github.com/Molecule-AI/molecule-monorepo/platform/internal/db"
-	"github.com/Molecule-AI/molecule-monorepo/platform/internal/events"
+	"go.moleculesai.app/core/platform/internal/db"
+	"go.moleculesai.app/core/platform/internal/events"
 	"github.com/gin-gonic/gin"
 )

@@ -28,8 +28,8 @@ import (
 	"strings"
 	"time"

-	"github.com/Molecule-AI/molecule-monorepo/platform/internal/artifacts"
-	"github.com/Molecule-AI/molecule-monorepo/platform/internal/db"
+	"go.moleculesai.app/core/platform/internal/artifacts"
+	"go.moleculesai.app/core/platform/internal/db"
 	"github.com/gin-gonic/gin"
 )

@@ -11,7 +11,7 @@ import (
 	"time"

 	"github.com/DATA-DOG/go-sqlmock"
-	"github.com/Molecule-AI/molecule-monorepo/platform/internal/artifacts"
+	"go.moleculesai.app/core/platform/internal/artifacts"
 	"github.com/gin-gonic/gin"
 )

@@ -205,7 +205,7 @@ func TestArtifactsCreate_WithImportURL(t *testing.T) {
 		}
 		var body map[string]interface{}
 		json.NewDecoder(r.Body).Decode(&body)
-		if body["url"] != "https://github.com/Molecule-AI/molecule-core.git" {
+		if body["url"] != "https://git.moleculesai.app/molecule-ai/molecule-core.git" {
 			http.Error(w, "unexpected url", http.StatusBadRequest)
 			return
 		}
@@ -238,7 +238,7 @@ func TestArtifactsCreate_WithImportURL(t *testing.T) {
 	w := httptest.NewRecorder()
 	c, _ := gin.CreateTestContext(w)
 	c.Params = gin.Params{{Key: "id", Value: "ws-import"}}
-	body := `{"name":"imported-repo","description":"Imported from GitHub","import_url":"https://github.com/Molecule-AI/molecule-core.git","import_branch":"main","import_depth":1}`
+	body := `{"name":"imported-repo","description":"Imported from GitHub","import_url":"https://git.moleculesai.app/molecule-ai/molecule-core.git","import_branch":"main","import_depth":1}`
 	c.Request = httptest.NewRequest("POST", "/workspaces/ws-import/artifacts",
 		bytes.NewBufferString(body))
 	c.Request.Header.Set("Content-Type", "application/json")
@@ -55,7 +55,7 @@ import (
 	"sync"
 	"time"

-	"github.com/Molecule-AI/molecule-monorepo/platform/internal/db"
+	"go.moleculesai.app/core/platform/internal/db"
 	"github.com/gin-gonic/gin"
 	"golang.org/x/crypto/pbkdf2"
 )
@@ -5,7 +5,7 @@ import (
 	"log"
 	"net/http"

-	"github.com/Molecule-AI/molecule-monorepo/platform/internal/db"
+	"go.moleculesai.app/core/platform/internal/db"
 	"github.com/gin-gonic/gin"
 )

@@ -3,9 +3,9 @@ package handlers
 import (
 	"net/http"

-	"github.com/Molecule-AI/molecule-monorepo/platform/internal/bundle"
-	"github.com/Molecule-AI/molecule-monorepo/platform/internal/events"
-	"github.com/Molecule-AI/molecule-monorepo/platform/internal/provisioner"
+	"go.moleculesai.app/core/platform/internal/bundle"
+	"go.moleculesai.app/core/platform/internal/events"
+	"go.moleculesai.app/core/platform/internal/provisioner"
 	"github.com/docker/docker/client"
 	"github.com/gin-gonic/gin"
 )
@@ -17,8 +17,8 @@ import (

 	"github.com/gin-gonic/gin"

-	"github.com/Molecule-AI/molecule-monorepo/platform/internal/channels"
-	"github.com/Molecule-AI/molecule-monorepo/platform/internal/db"
+	"go.moleculesai.app/core/platform/internal/channels"
+	"go.moleculesai.app/core/platform/internal/db"
 )

 // ChannelHandler manages workspace social channel integrations.
@@ -14,7 +14,7 @@ import (
 	"testing"

 	sqlmock "github.com/DATA-DOG/go-sqlmock"
-	"github.com/Molecule-AI/molecule-monorepo/platform/internal/channels"
+	"go.moleculesai.app/core/platform/internal/channels"
 	"github.com/gin-gonic/gin"
 )

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
claude-ceo-assistant	79c6f7f04c	Merge branch 'main' into migrate/issue-71-vanity-imports	2026-05-08 01:27:51 +00:00
claude-ceo-assistant	b44d389b50	Merge branch 'main' into migrate/issue-71-vanity-imports	2026-05-08 00:54:24 +00:00
claude-ceo-assistant	17f7bd0b31	fix(ci): pass GITEA_TOKEN to setup-node — fixes 60/hr/IP rate limit (internal#75) setup-node@v6 makes anonymous calls to api.github.com/repos/actions/ node-versions to resolve the requested Node version. The operator host runs 8 act_runners behind 5.78.80.188; under PR-burst load they hit the unauthenticated 60/hr/IP ceiling and the action throws HttpClientError: API rate limit exceeded for 5.78.80.188. (... Authenticated requests get a higher rate limit.) Pass secrets.GITEA_TOKEN as the action input. Gitea Actions auto-populates that secret per workflow run; setup-node attaches it as Authorization: token ... on the api.github.com call which lifts the limit to 5000/hr. Repros internal#71 sweep first showed: core#82 Canvas (Next.js) failed at 9m47s on first run, 7m47s on retrigger — same shape both times, classic rate-limit signature. Per-repo follow-ups (cli, controlplane, plugin-gh-identity workflows) tracked under internal#75.	2026-05-08 00:52:33 +00:00
claude-ceo-assistant	e353b54a85	Merge branch 'main' into migrate/issue-71-vanity-imports	2026-05-08 00:21:00 +00:00
claude-ceo-assistant	bb124da6c5	ci: retrigger after setup-node hit GitHub API rate limit on first run	2026-05-07 23:52:28 +00:00
claude-ceo-assistant	30b8046235	lint+chore: extend gate to .json + rename canvas package to molecule-core-canvas (internal#71)	2026-05-07 22:57:21 +00:00
claude-ceo-assistant	3501e6bfd7	fix(post-suspension): vanity import paths go.moleculesai.app/core/{platform,tests/harness/cp-stub} (closes molecule-ai/internal#71 phase 2) Migrates the two Go modules under molecule-core off the dead github.com/Molecule-AI/molecule-monorepo/... identity onto the vanity host go.moleculesai.app. Also fixes the historical naming inconsistency where the Gitea repo is molecule-core but the Go module path said molecule-monorepo. Module changes: - workspace-server/go.mod: github.com/Molecule-AI/molecule-monorepo/platform -> go.moleculesai.app/core/platform - tests/harness/cp-stub/go.mod: github.com/Molecule-AI/molecule-monorepo/tests/harness/cp-stub -> go.moleculesai.app/core/tests/harness/cp-stub Surfaces touched - 174 *.go files (374 import lines) — every import under workspace-server/ + tests/harness/cp-stub/ - 2 Dockerfiles (workspace-server/Dockerfile + Dockerfile.tenant) — -ldflags strings updated in lockstep with the module rename so buildinfo.GitSHA injection still resolves correctly - README + docs + scripts + comment URLs to git.moleculesai.app form - NEW workspace-server/internal/lint/import_path_lint_test.go — structural lint gate rejecting future github.com/Molecule-AI/ or Molecule-AI/molecule-monorepo references. Identical template to the other migration PRs (plugin-gh-identity#3, molecule-cli#2, molecule-controlplane#32). Cross-repo dep allowlist (documented in lint gate) workspace-server requires molecule-ai-plugin-gh-identity, whose own vanity migration is PR molecule-ai-plugin-gh-identity#3. Until that PR merges + a tag is cut at go.moleculesai.app/plugin/gh-identity, the two locations referencing the legacy github.com path (workspace-server/go.mod require, cmd/server/main.go import) remain allowlisted. Follow-up PR drops the allowlist + updates both refs in one shot once gh-identity is fully migrated. Test plan - go build ./... clean for both modules - go test ./... green except two pre-existing failures (TestStartSweeper_RecordsMetricsOnSuccess flaky-on-suite, TestLocalResolver_BubblesUpCopyFailure relies on read-only fs perms but runs as root on operator host) — both reproduce identically on baseline main pre-migration; NOT regressions of this PR - Mutation-tested: lint gate fails on canaries in .go + .md; allowlist correctly suppresses cross-repo dep references in go.mod while still flagging unrelated additions Open dependency - go.moleculesai.app responder must be deployed before fresh-clone external builds resolve the vanity path. Existing CI / Docker builds ride pinned go.sum + self-referential module path + responder is not on critical path for those. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>	2026-05-07 22:37:42 +00:00