[fork] downstream changes

.env.example

@@ -18,6 +18,17 @@
 # Get this from your relay deployment. `infra/relay` deploys update it automatically.
 # T3CODE_RELAY_URL=https://relay.example.com
 
+# Optional: GitHub App bridge for continuing an existing worktree-backed T3 thread
+# from a pull-request comment. See docs/integrations/github-app-setup.md.
+# The webhook route stays disabled unless all four required values are set.
+# T3CODE_GITHUB_APP_ID=123456
+# T3CODE_GITHUB_APP_PRIVATE_KEY_PATH=/absolute/path/to/private-key.pem
+# T3CODE_GITHUB_WEBHOOK_SECRET=replace-with-a-random-secret
+# T3CODE_GITHUB_APP_MENTION=t3-code-dev
+# T3CODE_GITHUB_ALLOWED_REPOSITORIES=owner/repository,owner/another-repository
+# T3CODE_GITHUB_MIN_PERMISSION=write
+# T3CODE_GITHUB_TURN_TIMEOUT_MS=1800000
+
 # Optional: hosted app origin used by the CLI's out-of-band OAuth flow.
 # Defaults to https://app.t3.codes; override to test against a staging deployment.
 # T3CODE_HOSTED_APP_URL=https://nightly.app.t3.codes
@@ -26,3 +37,13 @@
 # T3CODE_MOBILE_OTLP_TRACES_URL=https://api.axiom.co/v1/traces
 # T3CODE_MOBILE_OTLP_TRACES_DATASET=t3-code-mobile-traces-dev
 # T3CODE_MOBILE_OTLP_TRACES_TOKEN=xaat-...
+
+# Optional: sign and publish the mobile app from your own Expo and Apple teams.
+# Development and preview builds append .dev and .preview to the bundle identifier.
+# T3CODE_MOBILE_IOS_TEAM_ID=ABC1234567
+# T3CODE_MOBILE_IOS_BUNDLE_IDENTIFIER=com.example.t3code
+# Set to 1 only for free Xcode Personal Team builds. This disables paid-only
+# widgets, push capabilities, App Groups, associated domains, and EAS updates.
+# T3CODE_MOBILE_IOS_PERSONAL_TEAM=1
+# T3CODE_MOBILE_EAS_PROJECT_ID=00000000-0000-0000-0000-000000000000
+# T3CODE_MOBILE_EXPO_OWNER=your-expo-username

.github/client-overlay-ownership.json

@@ -0,0 +1,40 @@
+{
+  "overlays": [
+    {
+      "id": "desktop-links",
+      "branch": "t3-discord/f7d37879-desktop-deeplinks",
+      "pullRequest": 10,
+      "paths": [
+        "apps/desktop/src/app/DesktopApp.ts",
+        "apps/desktop/src/app/DesktopClerk.test.ts",
+        "apps/desktop/src/app/DesktopClerk.ts",
+        "apps/desktop/src/app/DesktopDeepLinks.test.ts",
+        "apps/desktop/src/app/DesktopDeepLinks.ts",
+        "apps/desktop/src/backend/DesktopBackendPool.test.ts",
+        "apps/desktop/src/electron/ElectronProtocol.ts",
+        "apps/desktop/src/main.ts",
+        "apps/desktop/src/window/DesktopApplicationMenu.test.ts",
+        "apps/desktop/src/window/DesktopWindow.test.ts",
+        "apps/desktop/src/window/DesktopWindow.ts",
+        "scripts/build-desktop-artifact.ts"
+      ]
+    },
+    {
+      "id": "discord",
+      "branch": "fork/discord",
+      "pullRequest": 80,
+      "paths": [
+        "apps/discord-bot/**",
+        "docs/integrations/discord-bot.md",
+        "docs/architecture/discord-browser-automation.md",
+        "docs/examples/project-aliases.yaml"
+      ]
+    },
+    {
+      "id": "vscode",
+      "branch": "fork/vscode",
+      "pullRequest": 79,
+      "paths": ["apps/vscode/**", ".vscode/launch.json"]
+    }
+  ]
+}

.github/pr-stack.json

@@ -0,0 +1,42 @@
+{
+  "upstreamRemote": "upstream",
+  "upstreamBranch": "main",
+  "forkChangesBranch": "fork/changes",
+  "integrationBranch": "fork/integration",
+  "pullRequests": [
+    {
+      "number": 1,
+      "branch": "fork/tim"
+    },
+    {
+      "number": 27,
+      "branch": "fork/candidates"
+    },
+    {
+      "number": 2,
+      "branch": "fork/changes"
+    }
+  ],
+  "integrationOverlays": [
+    {
+      "number": 10,
+      "branch": "t3-discord/f7d37879-desktop-deeplinks"
+    },
+    {
+      "number": 80,
+      "branch": "fork/discord"
+    },
+    {
+      "number": 79,
+      "branch": "fork/vscode"
+    }
+  ],
+  "conflictResolutions": [
+    {
+      "branch": "fork/changes",
+      "commit": "10de598e790218c772ada3d908bc7b1eb1e54f0e",
+      "path": "apps/mobile/src/lib/threadActivity.ts",
+      "strategy": "theirs"
+    }
+  ]
+}

.github/pull_request_template.md

@@ -19,12 +19,30 @@ we may close it without merging it, or never review it.
 
 <!-- Explain the problem being solved and why this approach is the right one. -->
 
+## Downstream Fork Relationship
+
+<!--
+For downstream-fork work, name the base branch, affected areas, and whether this depends on another
+open PR. Delete this section for upstream contributions.
+-->
+
+## External-Fork Provenance
+
+<!--
+For an external-fork import, list what was imported unchanged, adapted locally, intentionally
+excluded, and the fully qualified source links. Delete this section for original work.
+-->
+
 ## UI Changes
 
 <!-- If this PR changes UI, include clear before/after screenshots.
      If the change involves motion or interaction, include a short video.
      Delete this section if not applicable. -->
 
+## Verification
+
+<!-- List focused tests and checks run for this change. -->
+
 ## Checklist
 
 - [ ] This PR is small and focused

.github/workflows/deploy-relay.yml

@@ -17,7 +17,8 @@ concurrency:
 jobs:
   deploy_relay:
     name: Deploy production relay
-    runs-on: blacksmith-8vcpu-ubuntu-2404
+    if: github.repository == 'pingdotgg/t3code'
+    runs-on: ubuntu-24.04
     timeout-minutes: 15
     environment:
       name: production