Skip to content

Commit 0856197

Browse files
radroidclaude
andcommitted
fix(coil): carry PRs #78 and #84 across the rename (#71)
Both landed on main after this branch was cut, and both added files under the directories it moves. Two were live breaks rather than cosmetics: - apps/coil-home/src/lib/install.ts imported the install-instructions JSON by relative path through scripts/t3x/, which no longer exists. - index.astro derived the upstream version by splitting the manifest on "-t3x". It now splits on either suffix, because the relay serves whatever the LAST release published and a -t3x manifest stays current right up until the first coil build. Splitting on only the new one would have rendered "0.0.33-t3x.26" where "0.0.33" belongs. The release workflow's inline body was replaced by #78's generated one, so the app-name edit this branch made there now belongs to install-instructions.json instead, which carries it. Co-Authored-By: Claude Opus 5 (1M context) <[email protected]>
1 parent bac8741 commit 0856197

8 files changed

Lines changed: 20 additions & 18 deletions

File tree

‎.github/workflows/coil-sync-resolve.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# t3x sync-conflict resolver — on-demand agent for an escalated upstream rebase.
1+
# coil sync-conflict resolver — on-demand agent for an escalated upstream rebase.
22
# See docs/superpowers/specs/2026-07-25-sync-conflict-agent-design.md and
33
# docs/coil/sync-agent-runbook.md.
44
#
@@ -105,7 +105,7 @@ jobs:
105105
# Only trusted, numeric context is interpolated (run_id, issue number) — never the
106106
# comment body — so there is no workflow-injection surface here.
107107
prompt: |
108-
You are the t3x upstream-sync resolver for the radroid/t3code fork. The daily
108+
You are the coil upstream-sync resolver for the radroid/t3code fork. The daily
109109
rebase of fork `main` onto `upstream/main` was escalated because it could not
110110
complete automatically. Resolve it and open a PR. Do NOT push to `main`.
111111
@@ -118,7 +118,7 @@ jobs:
118118
Steps:
119119
1. Create a working branch: `git switch -c coil/sync-${{ github.run_id }}`.
120120
2. `git rebase upstream/main`. Resolve every conflict by understanding intent —
121-
favour upstream's structure while preserving the fork's t3x behaviour. Loop
121+
favour upstream's structure while preserving the fork's coil behaviour. Loop
122122
`git add -A && git rebase --continue` until the rebase completes.
123123
3. Review the upstream commits that touched files listed in docs/coil/SEAMS.md even
124124
where they did NOT textually conflict, and adjust the fork's patches if upstream
@@ -131,7 +131,7 @@ jobs:
131131
come after a `--` separator or it is silently ignored. Fix the fork's patches until
132132
all three pass.
133133
5. Push the branch: `git push -u origin HEAD`.
134-
6. Open a PR into `main` with `gh pr create`, title "t3x: resolve upstream sync
134+
6. Open a PR into `main` with `gh pr create`, title "coil: resolve upstream sync
135135
(run ${{ github.run_id }})". In the body summarise: the upstream range merged,
136136
each conflicted file and how you resolved it, any dropped patches, and the
137137
typecheck/lint/test results.

‎.github/workflows/coil-upstream-sync.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# t3x daily upstream sync — see docs/superpowers/specs/2026-07-23-fork-upstream-sync-design.md (A4).
1+
# coil daily upstream sync — see docs/superpowers/specs/2026-07-23-fork-upstream-sync-design.md (A4).
22
# Rebases the fork's patch series onto pingdotgg/t3code, verifies, and pushes when green.
33
# On conflict or red verification it pushes nothing and escalates via a `coil-sync` issue.
44
#
@@ -20,7 +20,7 @@ permissions:
2020
issues: write
2121

2222
concurrency:
23-
group: t3x-upstream-sync
23+
group: coil-upstream-sync
2424
cancel-in-progress: false
2525

2626
env:

‎.github/workflows/coil-weekly-verify.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# t3x weekly deep verification — see docs/superpowers/specs/2026-07-23-fork-upstream-sync-design.md (A5).
1+
# coil weekly deep verification — see docs/superpowers/specs/2026-07-23-fork-upstream-sync-design.md (A5).
22
# Runs the full monorepo build against the current fork main. Does NOT rebase and never
33
# blocks the daily sync. On failure it escalates via the shared `coil-sync` issue.
44
#
@@ -15,7 +15,7 @@ permissions:
1515
issues: write
1616

1717
concurrency:
18-
group: t3x-weekly-verify
18+
group: coil-weekly-verify
1919
cancel-in-progress: true
2020

2121
env:

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@ We wanted something performant, remote-ready, and truly open. If we ever go the
1717
>
1818
> `winget install T3Tools.T3Code`, `brew install --cask t3-code` and `yay -S t3code-bin` all install upstream's T3 Code — a different app, from a different repository, that updates from a different place. They are correct if upstream is what you want; they are the wrong thing if you got here looking for this fork's build.
1919
>
20-
> **Fork builds live at [coil.curlycloud.dev/download](https://coil.curlycloud.dev/download).** That page carries the per-platform first-launch steps inline, and you will need them: these builds are not code-signed, so macOS calls the app _damaged_ on first launch rather than merely unsigned, and right-click → Open does not get past that. The same steps are in the body of every [GitHub release](https://github.com/radroid/t3code/releases) — both are rendered from `scripts/t3x/install-instructions.json`, so they cannot drift.
20+
> **Fork builds live at [coil.curlycloud.dev/download](https://coil.curlycloud.dev/download).** That page carries the per-platform first-launch steps inline, and you will need them: these builds are not code-signed, so macOS calls the app _damaged_ on first launch rather than merely unsigned, and right-click → Open does not get past that. The same steps are in the body of every [GitHub release](https://github.com/radroid/t3code/releases) — both are rendered from `scripts/coil/install-instructions.json`, so they cannot drift.
2121
>
2222
> | Platform | Built | Notes |
2323
> | -------- | --------------------- | ----------------- |
2424
> | macOS | Apple Silicon (arm64) | No Intel build |
2525
> | Windows | x64 | No arm64 build |
2626
> | Linux | Not built | Build from source |
2727
>
28-
> Everything else in this README is upstream's and applies unchanged — the fork's own docs are under [`docs/t3x/`](docs/t3x/).
28+
> Everything else in this README is upstream's and applies unchanged — the fork's own docs are under [`docs/coil/`](docs/coil/).
2929
3030
> [!WARNING]
3131
> T3 Code currently supports Codex, Claude, Cursor, Grok Build and OpenCode. Install and authenticate at least one provider before use:

‎apps/coil-home/src/lib/install.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
/*
22
* First-run install instructions for the download page.
33
*
4-
* The data is NOT defined here. It lives in scripts/t3x/install-instructions.json, which the
4+
* The data is NOT defined here. It lives in scripts/coil/install-instructions.json, which the
55
* release workflow also renders into every GitHub release body via
6-
* scripts/t3x/render-release-notes.mjs. Two surfaces, one source — before issue #72 the release
6+
* scripts/coil/render-release-notes.mjs. Two surfaces, one source — before issue #72 the release
77
* body was the only copy, and this page merely said the release notes "carry the commands to get
88
* past it" without linking them, so a reader could arrive here, download a build, and meet a
99
* Gatekeeper dialog calling it damaged with nothing on screen to explain it.
@@ -12,7 +12,7 @@
1212
* it renders, including when the update relay is down and there is nothing else to show. The
1313
* types come from the import — hand-written interfaces here would be a third copy of the shape.
1414
*/
15-
import instructions from "../../../../scripts/t3x/install-instructions.json";
15+
import instructions from "../../../../scripts/coil/install-instructions.json";
1616

1717
export const APP_BUNDLE_NAME = instructions.appBundleName;
1818
export const UNSIGNED_NOTE = instructions.unsignedNote;

‎apps/coil-home/src/pages/download.astro‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ import { RELEASES_URL } from "../lib/releases";
4848
<p class="unsigned-note">{UNSIGNED_NOTE}</p>
4949

5050
<!--
51-
Rendered inline, from the same scripts/t3x/install-instructions.json the release workflow
51+
Rendered inline, from the same scripts/coil/install-instructions.json the release workflow
5252
renders into every release body. This used to be one sentence pointing at "the release
5353
notes" without linking them, which meant a first-time reader could download a build and meet
5454
a Gatekeeper dialog calling it damaged with nothing on this page to explain it (issue #72).

‎apps/coil-home/src/pages/index.astro‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -384,9 +384,11 @@ import { GITHUB_REPOSITORY_URL, UPSTREAM_REPOSITORY_URL } from "../lib/site";
384384
// it tracks, and when it was built. Anything less specific would just be a slogan.
385385
const strip = document.querySelector("[data-sync-strip]");
386386
if (strip) {
387-
// Still `-t3x`: the release pipeline keeps that suffix until issue #71 migrates it.
388-
// This parses what the relay actually publishes, not what the site is called.
389-
const upstream = manifest.version.split("-t3x")[0];
387+
// Both suffixes. #71 moved the pipeline to `-coil.<n>`, but the relay serves whatever the
388+
// last release published, and a `-t3x.<n>` manifest stays current until the first coil
389+
// build lands. Splitting on only the new one would leave the old suffix glued to the
390+
// upstream version and render "0.0.33-t3x.26" where "0.0.33" belongs.
391+
const upstream = manifest.version.split(/-(?:coil|t3x)\./)[0];
390392
const built = new Date(manifest.builtAt).toLocaleDateString(undefined, {
391393
month: "short",
392394
day: "numeric",

‎docs/user/install.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
> Fork builds: **[coil.curlycloud.dev/download](https://coil.curlycloud.dev/download)** — macOS
88
> arm64 and Windows x64 only, no Intel, no Linux, not code-signed. The first-launch steps are on
99
> that page and in every [GitHub release](https://github.com/radroid/t3code/releases) body; both
10-
> render `scripts/t3x/install-instructions.json`, so they cannot drift apart.
10+
> render `scripts/coil/install-instructions.json`, so they cannot drift apart.
1111
>
1212
> On macOS the first launch says the app **is damaged and should be moved to the Trash**, not
1313
> that it is from an unidentified developer, and right-click → Open does not get past it. That

0 commit comments

Comments
 (0)