fix(release): refresh carried patches and confirmed ACP Stop for nightly 4004

.github/workflows/ci.yml

@@ -10,7 +10,7 @@ permissions:
   contents: read
 
 concurrency:
-  group: ci-${{ github.event.pull_request.number || github.sha }}
+  group: ci-github-hosted-${{ github.event.pull_request.number || github.sha }}
   cancel-in-progress: ${{ github.event_name == 'pull_request' }}
 
 jobs:
@@ -22,7 +22,7 @@ jobs:
   # open: if the diff cannot be resolved, everything runs.
   changes:
     name: Changes
-    runs-on: blacksmith-2vcpu-ubuntu-2404
+    runs-on: ubuntu-24.04
     timeout-minutes: 5
     outputs:
       typecheck: ${{ steps.detect.outputs.typecheck }}
@@ -60,7 +60,7 @@ jobs:
   # when every other job passes or was skipped by `changes`.
   lint:
     name: Lint
-    runs-on: blacksmith-8vcpu-ubuntu-2404
+    runs-on: ubuntu-24.04
     timeout-minutes: 10
     steps:
       - name: Checkout
@@ -111,7 +111,7 @@ jobs:
     name: Build and Typecheck
     needs: changes
     if: ${{ !cancelled() && (needs.changes.outputs.build != 'false' || needs.changes.outputs.typecheck != 'false') }}
-    runs-on: blacksmith-8vcpu-ubuntu-2404
+    runs-on: ubuntu-24.04
     timeout-minutes: 10
     steps:
       - name: Checkout
@@ -200,7 +200,7 @@ jobs:
     name: Test
     needs: changes
     if: ${{ !cancelled() && needs.changes.outputs.test != 'false' }}
-    runs-on: blacksmith-8vcpu-ubuntu-2404
+    runs-on: ubuntu-24.04
     timeout-minutes: 10
     steps:
       - name: Checkout
@@ -212,7 +212,7 @@ jobs:
             !/apps/mobile/modules/t3-terminal/Vendor/**/*.a
           sparse-checkout-cone-mode: false
 
-      # Blacksmith boots GitHub's Ubuntu runner image (gcc is usually present),
+      # GitHub's Ubuntu runner image usually has gcc,
       # but ACP process-tree live tests compile a small pthread fixture with `cc`
       # and soft-skip when it is missing. Install build-essential so that path
       # always runs in CI instead of silently no-oping.
@@ -281,7 +281,7 @@ jobs:
     name: Test Web
     needs: changes
     if: ${{ !cancelled() && needs.changes.outputs.test_web != 'false' }}
-    runs-on: blacksmith-8vcpu-ubuntu-2404
+    runs-on: ubuntu-24.04
     timeout-minutes: 10
     steps:
       - name: Checkout
@@ -334,7 +334,7 @@ jobs:
   # ~15s for `changes`: a shard the change cannot affect stops after checkout.
   test_server:
     name: Test Server ${{ matrix.shard }}
-    runs-on: blacksmith-4vcpu-ubuntu-2404
+    runs-on: ubuntu-24.04
     timeout-minutes: 10
     strategy:
       fail-fast: false
@@ -435,7 +435,7 @@ jobs:
     name: Rust
     needs: changes
     if: ${{ !cancelled() && needs.changes.outputs.rust != 'false' }}
-    runs-on: blacksmith-4vcpu-ubuntu-2404
+    runs-on: ubuntu-24.04
     timeout-minutes: 10
     steps:
       - name: Checkout
@@ -468,7 +468,7 @@ jobs:
     name: Mobile Native Static Analysis
     needs: changes
     if: ${{ !cancelled() && needs.changes.outputs.mobile_native != 'false' }}
-    runs-on: blacksmith-6vcpu-macos-26
+    runs-on: macos-26
     timeout-minutes: 10
     steps:
       - name: Checkout
@@ -498,7 +498,7 @@ jobs:
     name: Release Smoke
     needs: changes
     if: ${{ !cancelled() && needs.changes.outputs.release_smoke != 'false' }}
-    runs-on: blacksmith-8vcpu-ubuntu-2404
+    runs-on: ubuntu-24.04
     timeout-minutes: 10
     steps:
       - name: Checkout
@@ -536,7 +536,7 @@ jobs:
         mobile_native_static_analysis,
         release_smoke,
       ]
-    runs-on: blacksmith-2vcpu-ubuntu-2404
+    runs-on: ubuntu-24.04
     timeout-minutes: 5
     steps:
       - name: Require every job to pass

.github/workflows/mobile-fingerprint-check.yml

@@ -24,7 +24,7 @@ concurrency:
 jobs:
   fingerprint:
     name: Native fingerprint diff
-    runs-on: blacksmith-8vcpu-ubuntu-2404
+    runs-on: ubuntu-24.04
     permissions:
       contents: read
       issues: write

.github/workflows/personal-release.yml

@@ -102,7 +102,9 @@ jobs:
           vp test run apps/server/src/orchestration-v2/Adapters/AcpAdapterV2.test.ts -t 'OMP wrapper truncates'
           vp test run packages/effect-codex-app-server/src/client.test.ts apps/server/src/orchestration-v2/Adapters/CodexAdapterV2.test.ts
           vp test run apps/server/src/orchestration-v2/ProviderSessionManager.test.ts -t 'releases sessions when provider event streams fail'
-          vp test run apps/server/src/orchestration-v2/Adapters/AcpAdapterV2.test.ts -t 'closes unfinished ACP tools|terminalizes an empty|direct Stop on a deferred|background work when interrupted|quarantine drops late|recovers from .* cancellation|preserves ACP agent tool labels|command description|elicitation'
+          vp test run apps/server/src/orchestration-v2/Adapters/AcpAdapterV2.test.ts
+          vp test run apps/server/src/orchestration-v2/Adapters/FxAdapterV2.test.ts apps/server/src/orchestration-v2/Adapters/AntigravityAdapterV2.test.ts
+          vp test run packages/provider-acp/src/server/clientTerminals.test.ts
           vp test run apps/server/src/orchestration-v2/Adapters/AcpRegistryAdapterV2.test.ts packages/effect-acp/src/protocol.test.ts
           vp test run packages/provider-acp-registry/src/server/omp-acp.test.ts packages/effect-acp/src/schema.test.ts
           vp test run packages/provider-acp-registry/src/server/omp-maintenance.test.ts packages/provider-acp-registry/src/server/driver.test.ts apps/server/src/provider/providerMaintenanceRunner.test.ts

.github/workflows/windows-tests.yml

@@ -26,7 +26,7 @@ permissions:
 jobs:
   test:
     name: Test (${{ inputs.package || 'all non-server' }})
-    runs-on: blacksmith-8vcpu-windows-2025
+    runs-on: windows-2025
     timeout-minutes: 45
     steps:
       - name: Checkout

apps/server/scripts/acp-mock-agent.ts

@@ -1595,6 +1595,13 @@ const program = Effect.gen(function* () {
       }
 
       if (emitActiveToolThenHang || activeToolOutcome !== undefined) {
+        if (process.env.T3_ACP_CREATE_CLIENT_TERMINAL === "1") {
+          yield* agent.raw.request("terminal/create", {
+            sessionId: requestedSessionId,
+            command: process.execPath,
+            args: ["-e", "setInterval(() => {}, 1000)"],
+          });
+        }
         const toolCallId = "tool-call-long-running-1";
         yield* agent.client.sessionUpdate({
           sessionId: requestedSessionId,