diff --git a/docs/fork/0029-providers-settings-target-one-machine.md b/docs/fork/0029-providers-settings-target-one-machine.md
new file mode 100644
index 000000000000..907f40cec3ea
--- /dev/null
+++ b/docs/fork/0029-providers-settings-target-one-machine.md
@@ -0,0 +1,28 @@
+# 0029: Provider settings say they apply to one machine
+
+- PR: [TrogonStack/t3code#94](https://github.com/TrogonStack/t3code/pull/94)
+- Upstream: [pingdotgg/t3code#17879](https://github.com/pingdotgg/t3code/pull/17879)
+- Status: submitted
+
+## What you can do now
+
+- Open the Providers page and see only the machine its changes apply to. The
+  project picker no longer appears there, so turning a provider off no longer
+  looks like it affects a single project when it changes the whole machine.
+- Arrive at Providers from a project or checkout link and land on the machine
+  that project or checkout lives on.
+- Switch machines on Providers and keep the project chosen for the other
+  settings pages.
+
+## Why
+
+Provider configuration belongs to a machine, but the page offered a project
+picker that suggested otherwise. Disabling a provider "for a project" quietly
+disabled it everywhere on that machine, which is exactly the surprise the
+scope sentence exists to prevent.
+
+## Upstream considerations
+
+Submitted upstream as is. Once it merges, the divergence and this entry go.
+The change is confined to the settings scope picker, so the rebase burden is
+small.
diff --git a/docs/fork/README.md b/docs/fork/README.md
index 2fa84db094a4..6b72adc920ab 100644
--- a/docs/fork/README.md
+++ b/docs/fork/README.md
@@ -43,3 +43,5 @@ Each entry uses these sections:
   active, [#68](https://github.com/TrogonStack/t3code/pull/68)
 - **0028** [A thread whose worktree was deleted recovers on the next message](./0028-a-thread-with-a-deleted-worktree-recovers.md)
   active, [#89](https://github.com/TrogonStack/t3code/pull/89)
+- **0029** [Provider settings say they apply to one machine](./0029-providers-settings-target-one-machine.md)
+  submitted, [#94](https://github.com/TrogonStack/t3code/pull/94)