Repository navigation
sync: upstream pstack e73df47 (0.15.32), rebase carried patches - #27
Merged
Merged
Conversation
…s.mjs omp config set stores any string, so a bad selector or unknown alias failed only at spawn. The script checks every selector and effort against omp models --json before writing, touches only the three pstack aliases and their agent mappings, and is idempotent.
worktree-audit-omp.patch now applies on top of upstream #805 and reuses its GNU/BSD stat and date probe instead of carrying a second one. The BSD stub in test-worktree-audit.sh serves `stat -f <format>` with %m and %N the way BSD does, since the reused probe asks for `-f '%m %N'`. Upstream merged #801, #802, #803 and #804 with the same code and tests as the carried #664, #666, #672 and #684 hunks. zzzz-check-plan-fix.patch is gone and zzz-watch-pr-fixes.patch carries #769 alone. zzzz-orch-lock-takeover.patch applies unchanged at exact offsets after #804.
Upstream #807 renumbered swarm's Phase A, so the model-step rule now takes any step number and keeps it, and the Phase B rule matches any step number. ketchup-video joins the `/skill:<name>` alternation. The description rule is one `Use for /<name>` pattern instead of a per-name list that had already missed ketchup, sharpen and correct. The `run_in_background: true` exemption matched three sentence rules as a substring and hid the Phase B rule going stale. It now names the token rule it was written for, and the retired figure-it-out exemption is gone.
Moves the pin from 4ec7ffa across 13 upstream pstack commits: the ketchup-video skill, the statechart Pele renderer, the /statechart read step in generated verify skills, the reflect plugin-cache rule, the swarm renumbering, and the merged watch-pr, check-plan and orch fixes the port used to carry as patches. The READMEs count 60 skills.
PORTING.md named three carried-PR patches that no longer exist in that form. It now names all five patches and what each carries, and records that a merged equivalent can re-apply at an offset instead of failing.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Why
Upstream moved from
4ec7ffatoe73df47(0.15.32) and merged equivalents of four fixes this port carried as patches. The dailyupstream-syncjob cannot build at the new head, because upstream's GNUstatfix (#805) rewrote linesworktree-audit-omp.patchmatches on.What changed
worktree-audit-omp.patchis rebased onto upstream's ownstat_fmtandfmt_dayprobe. It drops our duplicate probe and keeps every audit behaviour.zzzz-check-plan-fix.patchis deleted, andzzz-watch-pr-fixes.patchshrinks to #769. Upstream #801 to #804 contain the same code and tests as our hunks.rules.sedandstale-exempt.tsvfollow the new text: swarm's renumbered steps,ketchup-video, and one pattern for the per-skill "Use for /name" lines.e73df47(60 skills).Scope
stale-exempt.tsveach match more than one rule. I did not check whether they hide a stale rule.Blast Radius
Every marketplace install gets the 0.15.32 skills on upgrade. Moving the pin also turns the daily
upstream-syncjob green again.Verification
bash omp-port/check-port.shprintscheck-port: PASS, withreproducibleate73df47.test-gate-mutations.shandtest-worktree-audit.shpass.e73df47and fail 10 of 14 on raw4ec7ffa, so they detect the defects. #769's tests still fail on rawe73df47.zzzz-orch-lock-takeoverkept: 0 simultaneous holders in 15 trials at K=8, 16 and 32 on a stale lock, against 9 trials with 2 to 4 holders on raw upstream. A fresh marker blocks takers, and a marker older than 10 s is recovered, after a real SIGKILL.bun omp-port/smoke-plugin.mjson omp 18.12.6: 60 of 60 skills register. poteto-mode script tests, setup-pstack tests, extension tests and typecheck pass.