feat(source-control): add Tangled support

apps/server/package.json

@@ -57,6 +57,7 @@
     "@t3tools/source-control-gitcafe": "workspace:*",
     "@t3tools/source-control-github": "workspace:*",
     "@t3tools/source-control-gitlab": "workspace:*",
+    "@t3tools/source-control-tangled": "workspace:*",
     "character-entities": "2.0.2",
     "diff": "8.0.3",
     "effect": "catalog:",

apps/server/src/sourceControl/sourceControlDefinitions.ts

@@ -4,13 +4,15 @@ import { builtInSourceControlDefinitions } from "@t3tools/source-control-definit
 import * as ForgejoDriver from "@t3tools/source-control-forgejo/server/driver";
 import * as GitCafeDriver from "@t3tools/source-control-gitcafe/server/driver";
 import * as GitHubDriver from "@t3tools/source-control-github/server/driver";
+import * as TangledDriver from "@t3tools/source-control-tangled/server/driver";
 import * as GitLabDriver from "@t3tools/source-control-gitlab/server/driver";
 
 /** In the shared registry's order, which is the order hosts are listed and probed in. */
 export const BUILT_IN_SOURCE_CONTROL_DRIVER_LIST = [
   GitHubDriver.driver,
   GitLabDriver.driver,
   GitCafeDriver.driver,
+  TangledDriver.driver,
   ForgejoDriver.driver,
   BitbucketDriver.driver,
   AzureDevOpsDriver.driver,

apps/web/src/components/BranchToolbar.logic.test.ts

@@ -7,6 +7,7 @@ import {
   resolveDraftEnvModeAfterBranchChange,
   resolveEffectiveEnvMode,
   resolveBranchToolbarPrBranch,
+  resolveBranchToolbarPullRequest,
   resolveLocalCheckoutBranchMismatch,
   sanitizeNewRefName,
   shouldIncludeBranchPickerItem,
@@ -254,3 +255,33 @@ describe("sanitizeNewRefName", () => {
     expect(sanitizeNewRefName("foo--bar")).toBe("foo--bar");
   });
 });
+
+describe("resolveBranchToolbarPullRequest", () => {
+  const old = {
+    number: 1,
+    title: "Old PR",
+    url: "https://tangled.org/noz.am/t3-test/pulls/1",
+    headRef: "test/pull-request",
+    baseRef: "main",
+    state: "closed" as const,
+  };
+  const current = { ...old, number: 3, headRef: "test/another-branch", state: "open" as const };
+
+  it("uses the displayed branch's PR instead of a linked PR from another branch", () => {
+    expect(resolveBranchToolbarPullRequest("test/another-branch", old, current)).toBe(current);
+  });
+
+  it("shows none when the displayed branch has no PR or is switching", () => {
+    expect(resolveBranchToolbarPullRequest("no-pr", old, null)).toBeNull();
+    expect(resolveBranchToolbarPullRequest(null, current, current)).toBeNull();
+  });
+
+  it("keeps a linked PR when it belongs to the displayed branch", () => {
+    expect(resolveBranchToolbarPullRequest("test/pull-request", old, null)).toBe(old);
+  });
+
+  it("prefers a newly detected PR when a branch has been reused", () => {
+    const reopened = { ...current, headRef: old.headRef };
+    expect(resolveBranchToolbarPullRequest(old.headRef, old, reopened)).toBe(reopened);
+  });
+});

apps/web/src/components/BranchToolbar.logic.ts

@@ -4,6 +4,7 @@ import type {
   VcsRef,
   ProjectId,
   WorktreeSubmodules,
+  VcsStatusResult,
 } from "@t3tools/contracts";
 import * as Schema from "effect/Schema";
 import { sanitizeNewRefName } from "@t3tools/shared/git";
@@ -229,6 +230,16 @@ export function resolveBranchToolbarPrBranch(input: {
   return input.activeThreadBranch === input.resolvedActiveBranch ? input.activeThreadBranch : null;
 }
 
+export function resolveBranchToolbarPullRequest(
+  branch: string | null,
+  linked: VcsStatusResult["pr"],
+  detected: VcsStatusResult["pr"],
+): VcsStatusResult["pr"] {
+  if (branch === null) return null;
+  if (detected?.headRef === branch) return detected;
+  return linked?.headRef === branch ? linked : null;
+}
+
 export function resolveLocalCheckoutBranchMismatch(input: {
   effectiveEnvMode: EnvMode;
   activeWorktreePath: string | null;

apps/web/src/components/BranchToolbarBranchSelector.tsx

@@ -49,6 +49,7 @@ import {
   deriveLocalBranchNameFromRemoteRef,
   resolveBranchTriggerLabel,
   resolveBranchToolbarPrBranch,
+  resolveBranchToolbarPullRequest,
   resolveBranchSelectionTarget,
   resolveBranchToolbarValue,
   resolveDraftEnvModeAfterBranchChange,
@@ -550,16 +551,23 @@ export function BranchToolbarBranchSelector({
     serverThread?.pullRequests,
     serverThread?.branchPullRequest,
   );
-  const currentLinkedPr = supportsMultiplePullRequests
+  const threadLinkedPr = supportsMultiplePullRequests
     ? resolveThreadCurrentPullRequestLink(serverThread?.pullRequests ?? [])
     : null;
   const prBadge = supportsMultiplePullRequests
     ? resolveThreadPullRequestBadge(serverThread?.pullRequests)
     : null;
-  const displayedPr = linkedStatus?.pr ?? (currentLinkedPr === null ? branchPr : null);
+  const displayedPr =
+    displayMode === "panel"
+      ? resolveBranchToolbarPullRequest(branchPrBranch, linkedStatus?.pr ?? null, branchPr)
+      : (linkedStatus?.pr ?? (threadLinkedPr === null ? branchPr : null));
+  const currentLinkedPr =
+    displayMode === "panel" && threadLinkedPr?.url !== displayedPr?.url ? null : threadLinkedPr;
   const displayedPrStatus = prStatusIndicator(
     displayedPr,
-    linkedStatus?.sourceControlProvider ?? branchStatusQuery.data?.sourceControlProvider,
+    displayedPr === linkedStatus?.pr
+      ? linkedStatus.sourceControlProvider
+      : branchStatusQuery.data?.sourceControlProvider,
   );
   const prNumber = currentLinkedPr?.number ?? displayedPr?.number;
   const prUrl = currentLinkedPr?.url ?? displayedPr?.url;

apps/web/src/components/pullRequest/PullRequestSummaryTab.browser.test.tsx

@@ -108,3 +108,21 @@ it("keeps an unsaved description when collapsed and reopened", async () => {
   await screen.click("Description");
   expect(screen.container.querySelector("textarea")!.value).toBe("Unsaved description");
 });
+
+it("explains that comment text is unavailable and directs to host when comments are truncated and empty", async () => {
+  await using screen = await render({
+    ...detail,
+    commentCount: 1,
+    comments: [],
+    commentsTruncated: true,
+  });
+  await vi.waitFor(() => {
+    const renderedTexts = screen.visibleText();
+    expect(renderedTexts.toLowerCase()).not.toContain("longer");
+    expect(renderedTexts.toLowerCase()).not.toContain("no comments");
+    expect(renderedTexts.toLowerCase()).toContain("host");
+    expect(renderedTexts).toContain(
+      "Comments are not available here. Open this pull request on the host to read them.",
+    );
+  });
+});

apps/web/src/components/pullRequest/PullRequestSummaryTab.tsx

@@ -913,12 +913,21 @@ export function PullRequestSummaryTab({
           <>
             {detail.commentsTruncated ? (
               <p className="mb-2 rounded-md border border-warning/30 bg-warning-surface px-2 py-1.5 text-xs">
-                This conversation is only partially loaded. {commentCount} comment
-                {commentCount === 1 ? " is" : "s are"} loaded; open it on the host to read the rest.
+                {commentCount === 0 ? (
+                  "Comments are not available here. Open this pull request on the host to read them."
+                ) : (
+                  <>
+                    This conversation is only partially loaded. {commentCount} comment
+                    {commentCount === 1 ? " is" : "s are"} loaded; open it on the host to read the
+                    rest.
+                  </>
+                )}
               </p>
             ) : null}
             {items.length === 0 ? (
-              <p className="py-2 text-xs text-muted-foreground">No comments yet.</p>
+              detail.commentCount > 0 || detail.commentsTruncated ? null : (
+                <p className="py-2 text-xs text-muted-foreground">No comments yet.</p>
+              )
             ) : filteredItems.length === 0 ? (
               <p className="py-2 text-xs text-muted-foreground">
                 {filteredOutCount === 1

docs/user/source-control.md

@@ -1,7 +1,7 @@
 # Source control
 
-T3 Code integrates with GitHub, GitLab, Forgejo, Gitea, Bitbucket, Azure DevOps, and GitCafe to clone
-and publish repositories, create pull requests, and review changes.
+T3 Code integrates with GitHub, GitLab, Forgejo, Gitea, Bitbucket, Azure DevOps, GitCafe, and
+Tangled to clone and publish repositories, create pull requests, and review changes.
 
 ## Review turn changes
 
@@ -129,6 +129,33 @@ sent to `git.cafe`; `CAFE_TOKEN` follows `CAFE_HOST` if you set it. Repositories
 Line comments are not available for GitCafe pull requests yet.
 Merging a stack lands it through GitCafe, and updating a branch restacks the layers above it.
 
+### Tangled
+
+Install v0.8.0 or later of the [Tangled CLI (`tg`)](https://tangled.org/aly.codes/tg) and sign in:
+
+```bash
+tg auth login
+```
+
+After upgrading from an older release, sign in again if `tg` reports that OAuth permissions changed.
+
+Git push and clone use SSH, so add a key under **Settings → Keys** on tangled.org first.
+**Settings → Source Control → Tangled** holds the two values `tg` needs: the **knot** that hosts
+new repositories (`knot1.tangled.sh` by default) and the **appview** that resolves handles and
+repositories (`https://api.tangled.org` by default). If you previously saved
+`https://api.next.tangled.org`, update the Appview field. Leave a field blank to let `tg` use its
+own configuration in `~/.config/tg/config.toml`.
+
+Tangled has no private repositories, so a project published to it is public.
+
+T3 Code creates Tangled pull requests, and checks first that the branch does not already have an
+open one, so it will not make a second. The branch panel shows the pull request for the current
+branch. You can also browse and link pull requests from the **Pull requests** panel.
+Descriptions and authors are available; `tg` does not return comments, reviews, or commit activity.
+
+Checking out a pull request by reference is not available. Use
+**Open on Tangled**, or run `tg pr` yourself.
+
 ## Start, clone, or publish a project
 
 To start from nothing, choose **New project** in the command palette (`Cmd/Ctrl+K`), or

package.json

@@ -31,7 +31,7 @@
     "report:renders": "node scripts/render-metrics.ts",
     "lint": "vp lint --report-unused-disable-directives",
     "knip": "knip --preprocessor ./scripts/knip-schemas.ts",
-    "knip:check": "knip --include files,dependencies --no-config-hints && knip --workspace apps/server --workspace apps/desktop --workspace apps/web --workspace packages/client-runtime --workspace packages/contracts --workspace packages/effect-acp --workspace packages/effect-codex-app-server --workspace packages/shared --workspace packages/ssh --workspace packages/tailscale --workspace packages/provider-core --workspace packages/provider-acp --workspace packages/provider-acp-registry --workspace packages/provider-testing --workspace packages/provider-pi --workspace packages/provider-muse --workspace packages/provider-opencode --workspace packages/provider-cursor --workspace packages/provider-fx --workspace packages/provider-grok --workspace packages/secret-provider-core --workspace packages/secret-provider-definitions --workspace packages/secret-provider-onepassword --workspace packages/source-control-core --workspace packages/source-control-definitions --workspace packages/source-control-azure-devops --workspace packages/source-control-bitbucket --workspace packages/source-control-forgejo --workspace packages/source-control-gitcafe --workspace packages/source-control-github --workspace packages/source-control-gitlab --workspace packages/source-control-testing --exports --preprocessor ./scripts/knip-schemas.ts --no-config-hints",
+    "knip:check": "knip --include files,dependencies --no-config-hints && knip --workspace apps/server --workspace apps/desktop --workspace apps/web --workspace packages/client-runtime --workspace packages/contracts --workspace packages/effect-acp --workspace packages/effect-codex-app-server --workspace packages/shared --workspace packages/ssh --workspace packages/tailscale --workspace packages/provider-core --workspace packages/provider-acp --workspace packages/provider-acp-registry --workspace packages/provider-testing --workspace packages/provider-pi --workspace packages/provider-muse --workspace packages/provider-opencode --workspace packages/provider-cursor --workspace packages/provider-fx --workspace packages/provider-grok --workspace packages/secret-provider-core --workspace packages/secret-provider-definitions --workspace packages/secret-provider-onepassword --workspace packages/source-control-core --workspace packages/source-control-definitions --workspace packages/source-control-azure-devops --workspace packages/source-control-bitbucket --workspace packages/source-control-forgejo --workspace packages/source-control-gitcafe --workspace packages/source-control-github --workspace packages/source-control-gitlab --workspace packages/source-control-tangled --workspace packages/source-control-testing --exports --preprocessor ./scripts/knip-schemas.ts --no-config-hints",
     "knip:production": "knip --production --preprocessor ./scripts/knip-schemas.ts",
     "lint:mobile": "node scripts/mobile-native-static-check.ts",
     "mobile:install": "node scripts/mobile-native-client.ts ensure",

packages/client-runtime/src/sourceControlClients.test.ts

@@ -249,6 +249,15 @@ describe("sourceControlClients.recognizeRemote", () => {
     expect(kindOfRemote("https://bitbucket.gitlab.example/o/r")).toBe("gitlab");
     expect(kindOfRemote("https://bitbucket.visualstudio.com/p/_git/r")).toBe("azure-devops");
     expect(kindOfRemote("git@git.cafe:pingdotgg/t3code.git")).toBe("gitcafe");
+    for (const remote of [
+      "git@tangled.org:alice.example/repo",
+      "https://tangled.org/alice.example/repo.git",
+      "https://knot1.tangled.sh/alice.example/repo",
+      "ssh://git@knot.tangled.org/alice.example/repo.git",
+      "git@tangled.org:did:plc:abc123",
+    ]) {
+      expect(kindOfRemote(remote), remote).toBe("tangled");
+    }
   });
 
   it("reads a remote no host claims as an unknown host, and a local path as no host", () => {
@@ -385,4 +394,20 @@ describe("appSignInTargetForRemote", () => {
     expect(appSignInTargetForRemote("https://ghe.acme.test/acme/web.git")).toBeNull();
     expect(appSignInTargetForRemote("https://gitlab.com/acme/web.git")).toBeNull();
   });
+
+  it("gives Tangled its own hostnames even though Forgejo claims /pulls/ everywhere", () => {
+    const kindOf = (url: string) => sourceControlClients.findByChangeRequestUrl(url)?.kind;
+    expect(kindOf("https://tangled.org/acme.example/web/pulls/7")).toBe("tangled");
+    expect(kindOf("https://knot1.tangled.sh/acme.example/web/pulls/7")).toBe("tangled");
+    // A knot the appview does not serve still falls through to the host that claims any domain.
+    expect(kindOf("https://forge.example/acme/web/pulls/7")).toBe("forgejo");
+  });
+
+  it("offers Tangled no change request actions, because no server provider backs them", () => {
+    expect(sourceControlClients.get("tangled").changeRequestActions.size).toBe(0);
+    // `tg pr checkout` takes a record key, not the number a pull request URL shows.
+    expect(
+      sourceControlClients.get("tangled").checkoutCommand({ number: 7, headBranch: "f" }),
+    ).toBeNull();
+  });
 });

packages/source-control-definitions/package.json

@@ -18,6 +18,7 @@
     "@t3tools/source-control-forgejo": "workspace:*",
     "@t3tools/source-control-gitcafe": "workspace:*",
     "@t3tools/source-control-github": "workspace:*",
-    "@t3tools/source-control-gitlab": "workspace:*"
+    "@t3tools/source-control-gitlab": "workspace:*",
+    "@t3tools/source-control-tangled": "workspace:*"
   }
 }

packages/source-control-definitions/src/registry.ts

@@ -4,6 +4,7 @@ import { makeSourceControlDefinitionRegistry } from "@t3tools/source-control-cor
 import * as Forgejo from "@t3tools/source-control-forgejo/shared/definition";
 import * as GitCafe from "@t3tools/source-control-gitcafe/shared/definition";
 import * as GitHub from "@t3tools/source-control-github/shared/definition";
+import * as Tangled from "@t3tools/source-control-tangled/shared/definition";
 import * as GitLab from "@t3tools/source-control-gitlab/shared/definition";
 
 export { canonicalizePullRequestUrl as canonicalizeGitCafePullRequestUrl } from "@t3tools/source-control-gitcafe/shared/definition";
@@ -18,14 +19,20 @@ export const builtInSourceControlDefinitions = makeSourceControlDefinitionRegist
     GitHub.definition,
     GitLab.definition,
     GitCafe.definition,
+    Tangled.definition,
     Forgejo.definition,
     Bitbucket.definition,
     AzureDevOps.definition,
   ],
   {
-    claimChangeRequestUrlsFirst: [GitCafe.definition.kind, AzureDevOps.definition.kind],
+    claimChangeRequestUrlsFirst: [
+      GitCafe.definition.kind,
+      Tangled.definition.kind,
+      AzureDevOps.definition.kind,
+    ],
     recognizeRemotesIn: [
       GitCafe.definition.kind,
+      Tangled.definition.kind,
       Forgejo.definition.kind,
       GitHub.definition.kind,
       GitLab.definition.kind,

packages/source-control-tangled/package.json

@@ -0,0 +1,33 @@
+{
+  "name": "@t3tools/source-control-tangled",
+  "private": true,
+  "type": "module",
+  "exports": {
+    "./shared/definition": {
+      "types": "./src/shared/definition.ts",
+      "import": "./src/shared/definition.ts"
+    },
+    "./server/driver": {
+      "types": "./src/server/driver.ts",
+      "import": "./src/server/driver.ts"
+    }
+  },
+  "scripts": {
+    "typecheck": "tsc --noEmit",
+    "test": "vp test run --config ../../vite.config.ts --dir ."
+  },
+  "dependencies": {
+    "@t3tools/contracts": "workspace:*",
+    "@t3tools/provider-core": "workspace:*",
+    "@t3tools/shared": "workspace:*",
+    "@t3tools/source-control-core": "workspace:*",
+    "effect": "catalog:",
+    "entities": "4.5.0"
+  },
+  "devDependencies": {
+    "@effect/vitest": "catalog:",
+    "@t3tools/source-control-testing": "workspace:*",
+    "@types/node": "catalog:",
+    "vite-plus": "catalog:"
+  }
+}