diff --git a/.claude/skills/quest-afk/SKILL.md b/.claude/skills/quest-afk/SKILL.md new file mode 100644 index 00000000000..dfb76ed9923 --- /dev/null +++ b/.claude/skills/quest-afk/SKILL.md @@ -0,0 +1,7 @@ +--- +name: quest-afk +description: Keep quest work moving while the user is away, leaving every decision for their return. +--- + +Run `quest skill afk` and follow its output. +If `quest` is not installed, follow https://github.com/kixelated/quest/blob/main/SETUP.md first. diff --git a/.claude/skills/quest-recurring/SKILL.md b/.claude/skills/quest-recurring/SKILL.md index 060fa1ef5cc..2995e5fcdd1 100644 --- a/.claude/skills/quest-recurring/SKILL.md +++ b/.claude/skills/quest-recurring/SKILL.md @@ -1,6 +1,6 @@ --- name: quest-recurring -description: Plan a quest that repeats every milestone, such as a periodic audit. Use when the user invokes /quest-recurring or wants the same work redone each milestone. +description: Plan a quest that repeats, such as a periodic audit or a release cut. Use when the user invokes /quest-recurring or wants the same work redone each milestone or release. --- Run `quest skill recurring` and follow its output. diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000000..23c67e447eb --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +quest/** merge=quest diff --git a/flake.lock b/flake.lock index a113a345389..420b70f3be5 100644 --- a/flake.lock +++ b/flake.lock @@ -59,17 +59,17 @@ ] }, "locked": { - "lastModified": 1792787654, - "narHash": "sha256-JBD+zRwbeSjP7ndq+XeBmv7jbPbMU1t0slgyDg/j6Ac=", + "lastModified": 1792888692, + "narHash": "sha256-H69+iaQta8etZytbKFS5gERiX3aD+aGvS9pHrBDMhCI=", "owner": "kixelated", "repo": "quest", - "rev": "cbd939adf5043f083e24e0302d40f7618c09f427", + "rev": "42c49e898fdfafaf805a28302a7a11013ebb9316", "type": "github" }, "original": { "owner": "kixelated", "repo": "quest", - "rev": "cbd939adf5043f083e24e0302d40f7618c09f427", + "rev": "42c49e898fdfafaf805a28302a7a11013ebb9316", "type": "github" } }, diff --git a/flake.nix b/flake.nix index 2882faf1700..a8e20e3da26 100644 --- a/flake.nix +++ b/flake.nix @@ -32,7 +32,7 @@ # The quest CLI, which also serves the quest guide and skills the stubs in # .claude/skills call. Bump the rev to upgrade them. quest = { - url = "github:kixelated/quest/cbd939adf5043f083e24e0302d40f7618c09f427"; + url = "github:kixelated/quest/42c49e898fdfafaf805a28302a7a11013ebb9316"; inputs.nixpkgs.follows = "nixpkgs"; inputs.flake-utils.follows = "flake-utils"; }; diff --git a/quest/m0/README.md b/quest/m0/README.md index e79e34f1aca..1d5261d6082 100644 --- a/quest/m0/README.md +++ b/quest/m0/README.md @@ -28,5 +28,4 @@ Each lands its fixes in its own PR and plans only what needs a decision. - [MALFORMED_AUTH_TOKEN session code](/quest/m0/malformed-auth-token-code.md) - a 0x16 close reports a malformed token instead of `unknown code=22`, and moq-net sends it for an unparseable token - [Nightly passes on main](/quest/m0/nightly/README.md) - the scheduled Nightly passes end to end, so red means a new break - [Release shutdown backport](/quest/m0/ffi-shutdown-backport.md) - `release` publishes a non-breaking moq-ffi with an async `drain()` and qmux sessions on the QUIC stream limit -- [Adopt quest resolve](/quest/m0/quest-resolve.md) - local merges resolve concurrent quest link-list edits once kixelated/quest ships its merge driver - [CI cost and latency](/quest/m0/ci/README.md) - cloud CI runs only in the merge queue as one `just ci` pass, expensive checks run nightly and gate `release`, caches move to R2, and runners are chosen last diff --git a/quest/m0/quest-resolve.md b/quest/m0/quest-resolve.md deleted file mode 100644 index aa51b0f83bb..00000000000 --- a/quest/m0/quest-resolve.md +++ /dev/null @@ -1,22 +0,0 @@ -# [XS] Adopt the quest merge driver - -## Goal - -Local merges in this repository resolve concurrent quest link-list edits -without conflict markers. Waits on kixelated/quest shipping `quest resolve`, -planned in [kixelated/quest#199](https://github.com/kixelated/quest/pull/199): -check whether `quest resolve --help` works on kixelated/quest `main`. - -## Plan - -Decided 2026-10-23 (maintainer), from a replay of 280 merges of `main` into -PR branches: 29 of 128 conflicted merges conflicted only in quest files, -mostly `quest/m1/README.md`'s Required list. Git's `merge=union` was rejected -because it resurrects lines for quests `main` had deleted. - -Bump the `quest` input in `flake.nix` to a revision with `quest resolve`, then -run `quest init` and commit the `.gitattributes` line it writes. Other clones -need no setup: any `quest` command registers `merge.quest.driver` in a clone -whose `.gitattributes` names it, and the dev shell puts `quest` on PATH. GitHub's own -merges ignore drivers, so a PR still shows as conflicting until a local merge -from `main` is pushed; that merge then resolves itself.