Sync fork with upstream/main and preserve multi-provider integrations

.gitattributes

@@ -0,0 +1,2 @@
+# git autocrlf=true converts LF to CRLF on Windows, causing issues with oxfmt
+* text=auto eol=lf

.github/VOUCHED.td

@@ -13,7 +13,6 @@ github:adityavardhansharma
 github:binbandit
 github:chuks-qua
 github:cursoragent
-github:eggfriedrice24
 github:gbarros-dev
 github:github-actions[bot]
 github:hwanseoc
@@ -28,4 +27,6 @@ github:PatrickBauer
 github:realAhmedRoach
 github:shiroyasha9
 github:Yash-Singh1
+github:eggfriedrice24
 github:Ymit24
+github:shivamhwp

.github/workflows/pr-size.yml

@@ -124,25 +124,49 @@ jobs:
       group: pr-size-${{ github.event.pull_request.number }}
       cancel-in-progress: true
     steps:
+      - name: Checkout base repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
       - name: Sync PR size label
         uses: actions/github-script@v8
         env:
           PR_SIZE_LABELS_JSON: ${{ needs.prepare-config.outputs.labels_json }}
         with:
           script: |
+            const { execFileSync } = require("node:child_process");
+
             const issueNumber = context.payload.pull_request.number;
+            const baseSha = context.payload.pull_request.base.sha;
+            const headSha = context.payload.pull_request.head.sha;
+            const headTrackingRef = `refs/remotes/pr-size/${issueNumber}`;
             const managedLabels = JSON.parse(process.env.PR_SIZE_LABELS_JSON ?? "[]");
             const managedLabelNames = new Set(managedLabels.map((label) => label.name));
             // Keep this aligned with the repo's test entrypoints and test-only support files.
-            const testFilePatterns = [
-              /(^|\/)__tests__(\/|$)/,
-              /(^|\/)tests?(\/|$)/,
-              /^apps\/server\/integration\//,
-              /\.(test|spec|browser|integration)\.[^.\/]+$/,
+            const testExcludePathspecs = [
+              ":(glob,exclude)**/__tests__/**",
+              ":(glob,exclude)**/test/**",
+              ":(glob,exclude)**/tests/**",
+              ":(glob,exclude)apps/server/integration/**",
+              ":(glob,exclude)**/*.test.*",
+              ":(glob,exclude)**/*.spec.*",
+              ":(glob,exclude)**/*.browser.*",
+              ":(glob,exclude)**/*.integration.*",
             ];
 
-            const isTestFile = (filename) =>
-              testFilePatterns.some((pattern) => pattern.test(filename));
+            const sumNumstat = (text) =>
+              text
+                .split("\n")
+                .filter(Boolean)
+                .reduce((total, line) => {
+                  const [insertionsRaw = "0", deletionsRaw = "0"] = line.split("\t");
+                  const additions =
+                    insertionsRaw === "-" ? 0 : Number.parseInt(insertionsRaw, 10) || 0;
+                  const deletions =
+                    deletionsRaw === "-" ? 0 : Number.parseInt(deletionsRaw, 10) || 0;
+
+                  return total + additions + deletions;
+                }, 0);
 
             const resolveSizeLabel = (totalChangedLines) => {
               if (totalChangedLines < 10) {
@@ -168,50 +192,56 @@ jobs:
               return "size:XXL";
             };
 
-            const files = await github.paginate(
-              github.rest.pulls.listFiles,
+            execFileSync("git", ["fetch", "--no-tags", "origin", baseSha], {
+              stdio: "inherit",
+            });
+
+            execFileSync(
+              "git",
+              ["fetch", "--no-tags", "origin", `+refs/pull/${issueNumber}/head:${headTrackingRef}`],
               {
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                pull_number: issueNumber,
-                per_page: 100,
+                stdio: "inherit",
               },
-              (response) => response.data,
             );
 
-            const isFileListTruncated = files.length >= 3000;
-            if (isFileListTruncated) {
-              core.warning(
-                "The GitHub pull request files API may truncate results at 3,000 files; forcing size:XXL.",
+            const resolvedHeadSha = execFileSync("git", ["rev-parse", headTrackingRef], {
+              encoding: "utf8",
+            }).trim();
+
+            if (resolvedHeadSha !== headSha) {
+              throw new Error(
+                `Fetched head SHA ${resolvedHeadSha} does not match pull request head SHA ${headSha}; retry once refs/pull/${issueNumber}/head catches up.`,
               );
             }
 
-            let testChangedLines = 0;
-            let nonTestChangedLines = 0;
-
-            if (!isFileListTruncated) {
-              for (const file of files) {
-                const changedLinesForFile = (file.additions ?? 0) + (file.deletions ?? 0);
-
-                if (changedLinesForFile === 0) {
-                  continue;
-                }
+            execFileSync("git", ["cat-file", "-e", `${baseSha}^{commit}`], {
+              stdio: "inherit",
+            });
 
-                if (isTestFile(file.filename)) {
-                  testChangedLines += changedLinesForFile;
-                  continue;
-                }
+            const diffArgs = [
+              "diff",
+              "--numstat",
+              "--ignore-all-space",
+              "--ignore-blank-lines",
+              `${baseSha}...${resolvedHeadSha}`,
+            ];
 
-                nonTestChangedLines += changedLinesForFile;
-              }
-            }
+            const totalChangedLines = sumNumstat(
+              execFileSync(
+                "git",
+                diffArgs,
+                { encoding: "utf8" },
+              ),
+            );
+            const nonTestChangedLines = sumNumstat(
+              execFileSync("git", [...diffArgs, "--", ".", ...testExcludePathspecs], {
+                encoding: "utf8",
+              }),
+            );
+            const testChangedLines = Math.max(0, totalChangedLines - nonTestChangedLines);
 
-            const changedLines = isFileListTruncated
-              ? 1000
-              : (nonTestChangedLines === 0 ? testChangedLines : nonTestChangedLines);
-            const nextLabelName = isFileListTruncated
-              ? "size:XXL"
-              : resolveSizeLabel(changedLines);
+            const changedLines = nonTestChangedLines === 0 ? testChangedLines : nonTestChangedLines;
+            const nextLabelName = resolveSizeLabel(changedLines);
 
             const { data: currentLabels } = await github.rest.issues.listLabelsOnIssue({
               owner: context.repo.owner,

.gitignore

@@ -12,6 +12,7 @@ packages/*/dist
 build/
 .logs/
 release/
+release-mock/
 .t3
 .idea/
 apps/web/.playwright

apps/desktop/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@t3tools/desktop",
-  "version": "0.0.14",
+  "version": "0.0.15",
   "private": true,
   "main": "dist-electron/main.js",
   "scripts": {

apps/desktop/src/preload.ts

@@ -9,9 +9,9 @@ const OPEN_EXTERNAL_CHANNEL = "desktop:open-external";
 const MENU_ACTION_CHANNEL = "desktop:menu-action";
 const UPDATE_STATE_CHANNEL = "desktop:update-state";
 const UPDATE_GET_STATE_CHANNEL = "desktop:update-get-state";
+const UPDATE_CHECK_CHANNEL = "desktop:update-check";
 const UPDATE_DOWNLOAD_CHANNEL = "desktop:update-download";
 const UPDATE_INSTALL_CHANNEL = "desktop:update-install";
-const UPDATE_CHECK_CHANNEL = "desktop:update-check";
 const LOG_DIR_CHANNEL = "desktop:log-dir";
 const LOG_LIST_CHANNEL = "desktop:log-list";
 const LOG_READ_CHANNEL = "desktop:log-read";

apps/desktop/src/syncShellEnvironment.test.ts

@@ -62,14 +62,13 @@ describe("syncShellEnvironment", () => {
     expect(env.SSH_AUTH_SOCK).toBe("/tmp/inherited.sock");
   });
 
-  it("does nothing outside macOS", () => {
+  it("hydrates PATH and missing SSH_AUTH_SOCK from the login shell on linux", () => {
     const env: NodeJS.ProcessEnv = {
       SHELL: "/bin/zsh",
       PATH: "/usr/bin",
-      SSH_AUTH_SOCK: "/tmp/inherited.sock",
     };
     const readEnvironment = vi.fn(() => ({
-      PATH: "/opt/homebrew/bin:/usr/bin",
+      PATH: "/home/linuxbrew/.linuxbrew/bin:/usr/bin",
       SSH_AUTH_SOCK: "/tmp/secretive.sock",
     }));
 
@@ -78,8 +77,29 @@ describe("syncShellEnvironment", () => {
       readEnvironment,
     });
 
+    expect(readEnvironment).toHaveBeenCalledWith("/bin/zsh", ["PATH", "SSH_AUTH_SOCK"]);
+    expect(env.PATH).toBe("/home/linuxbrew/.linuxbrew/bin:/usr/bin");
+    expect(env.SSH_AUTH_SOCK).toBe("/tmp/secretive.sock");
+  });
+
+  it("does nothing outside macOS and linux", () => {
+    const env: NodeJS.ProcessEnv = {
+      SHELL: "C:/Program Files/Git/bin/bash.exe",
+      PATH: "C:\\Windows\\System32",
+      SSH_AUTH_SOCK: "/tmp/inherited.sock",
+    };
+    const readEnvironment = vi.fn(() => ({
+      PATH: "/usr/local/bin:/usr/bin",
+      SSH_AUTH_SOCK: "/tmp/secretive.sock",
+    }));
+
+    syncShellEnvironment(env, {
+      platform: "win32",
+      readEnvironment,
+    });
+
     expect(readEnvironment).not.toHaveBeenCalled();
-    expect(env.PATH).toBe("/usr/bin");
+    expect(env.PATH).toBe("C:\\Windows\\System32");
     expect(env.SSH_AUTH_SOCK).toBe("/tmp/inherited.sock");
   });
 });

apps/desktop/src/syncShellEnvironment.ts

@@ -7,7 +7,8 @@ export function syncShellEnvironment(
     readEnvironment?: ShellEnvironmentReader;
   } = {},
 ): void {
-  if ((options.platform ?? process.platform) !== "darwin") return;
+  const platform = options.platform ?? process.platform;
+  if (platform !== "darwin" && platform !== "linux") return;
 
   try {
     const shell = env.SHELL?.trim() || "/bin/zsh";

apps/server/integration/OrchestrationEngineHarness.integration.ts

@@ -124,7 +124,7 @@ function waitFor<A, E>(
   read: Effect.Effect<A, E>,
   predicate: (value: A) => boolean,
   description: string,
-  timeoutMs = 10_000,
+  timeoutMs = 60_000,
 ): Effect.Effect<A, never> {
   const RETRY_SIGNAL = "wait_for_retry";
   const retryIntervalMs = 10;
@@ -306,7 +306,8 @@ export const makeOrchestrationIntegrationHarness = (
         Effect.succeed({ branch: input.newBranch }),
     } as unknown as GitCoreShape);
     const textGenerationLayer = Layer.succeed(TextGeneration, {
-      generateBranchName: () => Effect.succeed({ branch: null }),
+      generateBranchName: () => Effect.succeed({ branch: "update" }),
+      generateThreadTitle: () => Effect.succeed({ title: "New thread" }),
     } as unknown as TextGenerationShape);
     const providerCommandReactorLayer = ProviderCommandReactorLive.pipe(
       Layer.provideMerge(runtimeServicesLayer),
@@ -364,7 +365,7 @@ export const makeOrchestrationIntegrationHarness = (
     const receiptHistory = yield* Ref.make<ReadonlyArray<OrchestrationRuntimeReceipt>>([]);
     yield* Stream.runForEach(runtimeReceiptBus.stream, (receipt) =>
       Ref.update(receiptHistory, (history) => [...history, receipt]).pipe(Effect.asVoid),
-    ).pipe(Effect.forkIn(scope));
+    ).pipe(Effect.forkIn(scope, { startImmediately: true }));
     yield* Effect.sleep(10);
 
     const waitForThread: OrchestrationIntegrationHarness["waitForThread"] = (

apps/server/integration/orchestrationEngine.integration.test.ts

@@ -57,7 +57,7 @@ function waitForSync<A>(
   read: () => A,
   predicate: (value: A) => boolean,
   description: string,
-  timeoutMs = 3000,
+  timeoutMs = 10_000,
 ): Effect.Effect<A, never> {
   return Effect.gen(function* () {
     const deadline = Date.now() + timeoutMs;
@@ -745,6 +745,18 @@ it.live("reverts to an earlier checkpoint and trims checkpoint projections + git
         messageId: "msg-user-revert-1",
         text: "First edit",
       });
+      yield* harness.waitForReceipt(
+        (receipt): receipt is CheckpointDiffFinalizedReceipt =>
+          receipt.type === "checkpoint.diff.finalized" &&
+          receipt.threadId === THREAD_ID &&
+          receipt.checkpointTurnCount === 1,
+      );
+      yield* harness.waitForReceipt(
+        (receipt): receipt is TurnProcessingQuiescedReceipt =>
+          receipt.type === "turn.processing.quiesced" &&
+          receipt.threadId === THREAD_ID &&
+          receipt.checkpointTurnCount === 1,
+      );
 
       yield* harness.waitForThread(
         THREAD_ID,
@@ -803,14 +815,25 @@ it.live("reverts to an earlier checkpoint and trims checkpoint projections + git
         messageId: "msg-user-revert-2",
         text: "Second edit",
       });
+      yield* harness.waitForReceipt(
+        (receipt): receipt is CheckpointDiffFinalizedReceipt =>
+          receipt.type === "checkpoint.diff.finalized" &&
+          receipt.threadId === THREAD_ID &&
+          receipt.checkpointTurnCount === 2,
+      );
+      yield* harness.waitForReceipt(
+        (receipt): receipt is TurnProcessingQuiescedReceipt =>
+          receipt.type === "turn.processing.quiesced" &&
+          receipt.threadId === THREAD_ID &&
+          receipt.checkpointTurnCount === 2,
+      );
 
       yield* harness.waitForThread(
         THREAD_ID,
         (entry) =>
           entry.latestTurn?.turnId === "turn-2" &&
           entry.checkpoints.length === 2 &&
           entry.activities.some((activity) => activity.turnId === "turn-2"),
-        8000,
       );
 
       yield* harness.engine.dispatch({

apps/server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "t3",
-  "version": "0.0.14",
+  "version": "0.0.15",
   "license": "MIT",
   "repository": {
     "type": "git",