Add per-project settings

apps/desktop/src/settings/DesktopClientSettings.test.ts

@@ -121,13 +121,14 @@ describe("DesktopClientSettings", () => {
         assert.instanceOf(error, DesktopClientSettings.DesktopClientSettingsWriteError);
         assert.equal(error.operation, "replace-settings-file");
         assert.equal(error.path, environment.clientSettingsPath);
-        assert.instanceOf(error.cause, PlatformError.PlatformError);
-        assert.isString(error.cause.stack);
+        const platformCause = error.cause as PlatformError.PlatformError;
+        assert.equal(platformCause._tag, "PlatformError");
+        assert.isString(platformCause.stack);
         assert.equal(
           error.message,
           `Desktop client settings write failed during replace-settings-file at ${environment.clientSettingsPath}.`,
         );
-        assert.notInclude(error.message, error.cause.message);
+        assert.notInclude(error.message, platformCause.message);
       }),
     ),
   );

apps/server/src/bin.ts

@@ -1,3 +1,5 @@
+// @effect-diagnostics anyUnknownInErrorContext:off - The CLI runner reports framework-owned parse/runtime failures at the process boundary.
+
 import * as NodeRuntime from "@effect/platform-node/NodeRuntime";
 import * as NodeServices from "@effect/platform-node/NodeServices";
 import * as Effect from "effect/Effect";
@@ -56,9 +58,9 @@ export const makeCli = ({ cloudEnabled = hasCloudPublicConfig } = {}) =>
 export const cli = makeCli();
 
 if (import.meta.main) {
-  Command.run(cli, { version: packageJson.version }).pipe(
-    Effect.scoped,
-    Effect.provide(CliRuntimeLayer),
-    NodeRuntime.runMain,
-  );
+  const cliMain = Effect.scoped(
+    Command.run(cli, { version: packageJson.version }).pipe(Effect.provide(CliRuntimeLayer)),
+  ) as Effect.Effect<void, unknown, never>;
+
+  NodeRuntime.runMain(cliMain);
 }

apps/server/src/checkpointing/Diffs.ts

@@ -1,4 +1,4 @@
-import { parsePatchFiles } from "@pierre/diffs/utils/parsePatchFiles";
+import { parsePatchFiles } from "@pierre/diffs";
 
 export interface TurnDiffFileSummary {
   readonly path: string;

apps/server/src/git/GitManager.test.ts

@@ -17,6 +17,7 @@ import type {
   GitActionProgressEvent,
   GitPreparePullRequestThreadInput,
   ModelSelection,
+  SourceControlProviderInfo,
   ThreadId,
 } from "@t3tools/contracts";
 
@@ -639,6 +640,8 @@ function preparePullRequestThread(
 
 function makeManager(input?: {
   ghScenario?: FakeGhScenario;
+  sourceControlProviderContext?: SourceControlProviderRegistry.SourceControlProviderHandle["context"];
+  sourceControlProviderContextSource?: SourceControlProviderRegistry.SourceControlProviderHandle["contextSource"];
   textGeneration?: Partial<FakeGitTextGeneration>;
   setupScriptRunner?: ProjectSetupScriptRunner.ProjectSetupScriptRunner["Service"];
 }) {
@@ -661,7 +664,12 @@ function makeManager(input?: {
       Effect.map((provider) =>
         SourceControlProviderRegistry.SourceControlProviderRegistry.of({
           get: () => Effect.succeed(provider),
-          resolveHandle: () => Effect.succeed({ provider, context: null }),
+          resolveHandle: () =>
+            Effect.succeed({
+              provider,
+              context: input?.sourceControlProviderContext ?? null,
+              contextSource: input?.sourceControlProviderContextSource ?? null,
+            }),
           resolve: () => Effect.succeed(provider),
           discover: Effect.succeed([]),
         }),
@@ -696,6 +704,18 @@ const GitManagerTestLayer = GitVcsDriver.layer.pipe(
   Layer.provideMerge(NodeServices.layer),
 );
 
+const githubProvider = {
+  kind: "github",
+  name: "GitHub",
+  baseUrl: "https://github.com",
+} satisfies SourceControlProviderInfo;
+
+const gitlabProvider = {
+  kind: "gitlab",
+  name: "GitLab",
+  baseUrl: "https://gitlab.com",
+} satisfies SourceControlProviderInfo;
+
 it.layer(GitManagerTestLayer)("GitManager", (it) => {
   it.effect("status includes PR metadata when branch already has an open PR", () =>
     Effect.gen(function* () {
@@ -739,6 +759,30 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
     }),
   );
 
+  it.effect("status prefers branch remote over detected provider context", () =>
+    Effect.gen(function* () {
+      const repoDir = yield* makeTempDir("t3code-git-manager-");
+      yield* initRepo(repoDir);
+      yield* runGit(repoDir, ["remote", "add", "origin", "git@gitlab.com:pingdotgg/t3code.git"]);
+      yield* runGit(repoDir, ["remote", "add", "upstream", "git@github.com:pingdotgg/t3code.git"]);
+      yield* runGit(repoDir, ["checkout", "-b", "branch-remote"]);
+      yield* runGit(repoDir, ["config", "branch.branch-remote.remote", "upstream"]);
+
+      const { manager } = yield* makeManager({
+        sourceControlProviderContext: {
+          provider: gitlabProvider,
+          remoteName: "origin",
+          remoteUrl: "git@gitlab.com:pingdotgg/t3code.git",
+        },
+        sourceControlProviderContextSource: "detected",
+      });
+
+      const status = yield* manager.localStatus({ cwd: repoDir });
+
+      expect(status.sourceControlProvider).toEqual(githubProvider);
+    }),
+  );
+
   it.effect("status trims PR metadata returned by gh before publishing it", () =>
     Effect.gen(function* () {
       const repoDir = yield* makeTempDir("t3code-git-manager-");