Merge upstream/main (Cursor/ACP + Opus 4.5)

Integrates 7 upstream commits, headlined by Cursor provider via ACP
(pingdotgg#1355, new effect-acp package + AcpSessionRuntime) and Claude Opus 4.5.

Conflicts resolved (see untangle.md for full policy/playbook):

- ClaudeAdapter.ts queryOptions — took upstream's effort type cast +
  kept our isOpus47 thinking-adaptive line.
- MessagesTimeline.tsx SimpleWorkEntryRow — took upstream's cleaner
  outer rawCommand ternary (ours had dead inner checks).
- ProviderRuntimeIngestion.ts assistant-delta flow — adopted upstream's
  new getOrCreateAssistantMessageId / flushBufferedAssistantMessagesForTurn
  / finalizeActiveAssistantSegmentForTurn helpers + pauseForUserTurnId
  block; re-injected our timed 150ms streaming flush, reasoningDelta/
  reasoningCompletion dispatch, agentKind plumbing on top.

Downstream adaptations required by upstream's new code:

- Cursor/ACP agentKind plumbing — upstream emitted ProviderRuntimeEvent
  values without agentKind; our thinking-blocks tweak made it required.
  Fixed via a single makeEventStamp helper change in CursorAdapter
  (hard-codes "primary") + AcpEventStamp interface extension. Mirrors
  the OpenCode pattern; ~14 event constructions cascade.
- Session reaper — removed dead Effect.catch on a reconcile effect whose
  error channel is now `never` (lint hint in our own tweak code).

Test adaptations:

- Fast-mode tests in ClaudeAdapter.test.ts + ClaudeTextGeneration.test.ts
  migrated from claude-opus-4-6 (fast mode disabled by our tweak) to
  claude-opus-4-5 (upstream's new model, currently the only one that
  still supports fast mode).
- Buffered-streaming tests in ProviderRuntimeIngestion.test.ts updated
  to pass enableAssistantStreaming: false explicitly, since our tweak
  flipped the default to true.
- dev-runner.test.ts — T3CODE_NO_BROWSER assertion updated from
  undefined to "1" to match our previously-undocumented tweak.

Docs:

- tweakings.md — added T3CODE_NO_BROWSER + Cursor/ACP agentKind entries.
- untangle.md — added Policy + Active resolution entries for the three
  conflicted files, plus reconciliation pattern for future upstream
  restructures of the ingestion flow.

Author: orlaya

.github/workflows/release.yml

@@ -171,6 +171,7 @@ jobs:
   build:
     name: Build ${{ matrix.label }}
     needs: preflight
+    if: ${{ !failure() && !cancelled() && needs.preflight.result == 'success' }}
     runs-on: ${{ matrix.runner }}
     timeout-minutes: 30
     strategy:
@@ -353,6 +354,7 @@ jobs:
   publish_cli:
     name: Publish CLI to npm
     needs: [preflight, build]
+    if: ${{ !failure() && !cancelled() && needs.preflight.result == 'success' && needs.build.result == 'success' }}
     runs-on: ubuntu-24.04 # blacksmith-8vcpu-ubuntu-2404
     timeout-minutes: 10
     steps:
@@ -387,9 +389,18 @@ jobs:
   release:
     name: Publish GitHub Release
     needs: [preflight, build, publish_cli]
+    if: ${{ !failure() && !cancelled() && needs.preflight.result == 'success' && needs.build.result == 'success' && needs.publish_cli.result == 'success' }}
     runs-on: ubuntu-24.04 # blacksmith-8vcpu-ubuntu-2404
     timeout-minutes: 10
     steps:
+      - id: app_token
+        name: Mint release app token
+        uses: actions/create-github-app-token@v2
+        with:
+          app-id: ${{ secrets.RELEASE_APP_ID }}
+          private-key: ${{ secrets.RELEASE_APP_PRIVATE_KEY }}
+          owner: ${{ github.repository_owner }}
+
       - name: Checkout
         uses: actions/checkout@v6
         with:
@@ -474,6 +485,7 @@ jobs:
             release-assets/*.blockmap
             release-assets/*.yml
           fail_on_unmatched_files: true
+          token: ${{ steps.app_token.outputs.token }}
 
       - name: Publish first release
         if: needs.preflight.outputs.previous_tag == ''
@@ -493,10 +505,11 @@ jobs:
             release-assets/*.blockmap
             release-assets/*.yml
           fail_on_unmatched_files: true
+          token: ${{ steps.app_token.outputs.token }}
 
   finalize:
     name: Finalize release
-    if: needs.preflight.outputs.release_channel == 'stable'
+    if: ${{ !failure() && !cancelled() && needs.preflight.result == 'success' && needs.release.result == 'success' && needs.preflight.outputs.release_channel == 'stable' }}
     needs: [preflight, release]
     runs-on: blacksmith-8vcpu-ubuntu-2404
     timeout-minutes: 10

apps/desktop/package.json

@@ -23,6 +23,7 @@
     "@t3tools/contracts": "workspace:*",
     "@t3tools/shared": "workspace:*",
     "@types/node": "catalog:",
+    "effect-acp": "workspace:*",
     "tsdown": "catalog:",
     "typescript": "catalog:",
     "vitest": "catalog:"

apps/desktop/tsdown.config.ts

@@ -12,7 +12,7 @@ export default defineConfig([
     ...shared,
     entry: ["src/main.ts"],
     clean: true,
-    noExternal: (id) => id.startsWith("@t3tools/"),
+    noExternal: (id) => id.startsWith("@t3tools/") || id.startsWith("effect-acp"),
   },
   {
     ...shared,

apps/server/integration/OrchestrationEngineHarness.integration.ts

@@ -58,6 +58,7 @@ import {
   OrchestrationEngineService,
   type OrchestrationEngineShape,
 } from "../src/orchestration/Services/OrchestrationEngine.ts";
+import { ThreadDeletionReactor } from "../src/orchestration/Services/ThreadDeletionReactor.ts";
 import { OrchestrationReactor } from "../src/orchestration/Services/OrchestrationReactor.ts";
 import { ProjectionSnapshotQuery } from "../src/orchestration/Services/ProjectionSnapshotQuery.ts";
 import {
@@ -351,6 +352,12 @@ export const makeOrchestrationIntegrationHarness = (
       Layer.provideMerge(runtimeIngestionLayer),
       Layer.provideMerge(providerCommandReactorLayer),
       Layer.provideMerge(checkpointReactorLayer),
+      Layer.provideMerge(
+        Layer.succeed(ThreadDeletionReactor, {
+          start: () => Effect.void,
+          drain: Effect.void,
+        }),
+      ),
     );
     const layer = Layer.empty.pipe(
       Layer.provideMerge(runtimeServicesLayer),

apps/server/package.json

@@ -43,6 +43,7 @@
     "@t3tools/web": "workspace:*",
     "@types/bun": "catalog:",
     "@types/node": "catalog:",
+    "effect-acp": "workspace:*",
     "tsdown": "catalog:",
     "typescript": "catalog:",
     "vitest": "catalog:"