Repository navigation
Isolate test runs from every app-support store, plus the SP4 port spec and plan (SP4 batch A) - #20
Merged
Merged
Conversation
Classify all 191 non-merge commits in main..upstream/main (v2.5.6, 77f789d): 56 already in the fork, 87 not applicable, 26 port candidates grouped into batches A-H, 22 needing a user decision (new providers, small UX features, save backups). Also checks open upstream issues chattymin#337, chattymin#443 and chattymin#439 against the fork's code; all three apply.
The user confirmed the triage recommendations: new providers, the pet size ceiling, variable menu-bar width, the Low Power GIF policy and save backups stay out; the right-click menu (chattymin#373) joins batch E; chattymin#337 and chattymin#443 are in, with chattymin#443 skipping claude-code mirror rows unconditionally. chattymin#216 is deferred.
Eight batches (A-H), one PR each, executed A -> D -> G -> B -> C -> E -> F -> H.
…in#359) `swift test` uses the same storage name as the installed app, so any code that reached a store's default path read or wrote the user's real Application Support folder. Upstream chattymin#359 measured usage-cache.json being rewritten by one suite run. A sweep found the same class in more places: the sprite cache (a test wrote fake GIFs into it), and the save, base-index.json and weather.json, which were safe only because every test happened to inject a path. Instead of gating each store, isolate at the root: for non-bundled runs AppEnv.supportDirectory() returns a per-process temporary folder, and every Application Support path now goes through it. The session-key store already did this on its own and now shares the root. AppEnv.userSupportDirectory names the real location for comparisons without creating it. Guards: AppStorageIsolationTests pins the root branch, each store's default path, and a source scan that forbids composing Application Support paths outside AppEnv. All three fail when the isolation branch is reverted. The upstream regression test is ported as testDefaultPathCacheNeverRewritesTheUserFile. The screenshot generator clones the installed app's sprite cache read-only into the isolated cache so its renders still have sprites. CLAUDE.md: the test-storage rule now covers all app storage, not only credentials.
…in#166) TokenFormatter.grouped follows the system region, as macOS does, but the test hardcoded comma grouping, so it failed on machines whose region groups digits differently. grouped now takes a locale defaulting to .current (production unchanged); the test pins en_US and adds an es_ES case that fails if the argument is ignored.
…ymin#222) Interpolation tests only see strings that already go through L, so a literal that never reaches the table is invisible to them. Scan the UI sources (plus the app entry file, which holds UI copy in this fork) and fail on any Hangul string literal; Korean comments stay allowed. Core and Player are left out because their per-language data tables hold Hangul legitimately. Only the test is ported; the Antigravity notice it shipped with does not exist here.
…ated testEveryStoredPathDerivesFromTheNamespace asserted that the support folder ends in the storage name, which held only because swift test used the real folder. Check the bundled path with the pure supportDirectoryURL(isBundledApp:) and keep the save-under-the-root check for the running process.
testPayloadIsNotReadableInTheFile searched the envelope for "42". The seal uses a fresh AES-GCM nonce each time, so those two characters show up in the base64 by chance in roughly 1.5% of runs, which failed the gate intermittently. Assert that the plaintext payload bytes are absent instead.
This was referenced Oct 16, 2026
…on (review) - Put @discardableResult back on writeFile. The new tests had been inserted between the attribute and the helper, which added 41 unused-result warnings. - The source scan now also forbids AppEnv.userSupportDirectory outside AppEnv.swift. A future store could otherwise reach the real folder through the new accessor and pass every guard. - Comment stripping in the scan walks characters (shared SourceScan, also used by LocalizedUILiteralTests), so a "//" inside a string no longer hides the rest of the line. - The isolated folder is named with a UUID instead of the PID. PIDs are reused, so a later run could inherit an earlier run's cache. - Correct the claim in 6b52c9e and CLAUDE.md that all three isolation tests fail when the root branch is reverted. Mutation checks show: reverting the root fails the root-branch and per-store tests (plus the session-key test); the source scan does not react to that, and instead fails when a store composes the path itself (the old LocalUsageCache.defaultFileURL, restored) or uses userSupportDirectory.
This was referenced Oct 16, 2026
Merged
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.
Summary
First PR of the SP4 upstream port (batch A of A–H). It carries the SP4 triage spec and plan, plus the test-isolation batch that every later batch's tests rely on.
Spec and plan.
docs/superpowers/specs/2026-10-16-sp4-upstream-port-design.mdtriages all 191 commits inmain..upstream/main(v2.5.6) and records the confirmed scope.docs/superpowers/plans/2026-10-16-sp4-upstream-port.mdlays out batches A–H, one PR each, in the order A → D → G → B → C → E → F → H.Isolate every app-support store from test runs (upstream fix: stop the test suite from reading and rewriting the user's usage cache chattymin/PokeTokenBar#359 + class sweep).
swift testuses the same storage name as the installed app, so code that reached a store's default path read or wrote the real~/Library/Application Support/PokeDexBar/. Upstream fix: stop the test suite from reading and rewriting the user's usage cache chattymin/PokeTokenBar#359 fixed this forusage-cache.jsonwith a per-store gate. A sweep found the same class in more places:usage-cache.jsonLocalUsageCache.shared)FormTestsput fake GIFs into itplayer-state.json,base-index.json,weather.jsonsession-key.jsonInstead of gating each store, the fix isolates at the root. For non-bundled runs,
AppEnv.supportDirectory()returns a temporary folder named with a UUID, fresh for each run, and every Application Support path now goes through it.AppEnv.userSupportDirectorynames the real location for test comparisons without creating it. The session-key store now shares the root.Guards. Each one catches a different change; all were mutation-checked.
AppStorageIsolationTestspins the root branch and each store's default path. Reverting the root branch fails both, plus the session-key location test (11 failures).testNoAppSupportPathIsComposedOutsideAppEnv) forbidsapplicationSupportDirectoryanduserSupportDirectoryoutsideAppEnv.swift. It does not react to a reverted root branch. It fails when a store composes the path itself (checked by restoring the oldLocalUsageCache.defaultFileURL) or usesuserSupportDirectory.testDefaultPathCacheNeverRewritesTheUserFile.Screenshot generator. It clones the installed app's sprite cache read-only into the isolated cache, so its renders still have sprites.
test: pin the locale when asserting grouped numbers chattymin/PokeTokenBar#166.
TokenFormatter.groupedtakes a locale (default.current, so production is unchanged), and the test pinsen_USandes_ES.fix: route the Antigravity session notice through the localization table chattymin/PokeTokenBar#222 (test only).
LocalizedUILiteralTestsfails on Hangul string literals inUI/andPokeDexBarApp.swift. There are 0 today, and a planted literal is caught.Two test fixes found by the gate.
testEveryStoredPathDerivesFromTheNamespacenow checks the bundled path.testPayloadIsNotReadableInTheFilestopped searching random AES-GCM ciphertext for "42". That matched by chance in about 1.5% of runs.CLAUDE.md. The test-storage rule now covers all app storage, not only credentials.
Upstream commits: chattymin#359 (
d6d24a0), chattymin#166 (f9ae41d), chattymin#222 (a6ed409, test only; the Antigravity notice it shipped with does not exist here).Trade-off vs. upstream chattymin#359
Upstream gates each store (
persistsToUserLocation,persistsToDisk,cachedBlobCount == 1). With that design, a default-path store underswift testreads and writes nothing, so fixtures can never mix with user-derived data. This PR redirects the root folder instead. It closes the class for every current and future store, but within one test process the default-path stores share the same temporary files. For example, an earlierUsageStore()refresh can fill the shared temporaryusage-cache.jsonfrom the developer's real~/.claudelogs. The real user files are never read or written, but upstream's "no user-derived data next to fixtures" guarantee does not hold. Tests that assert on cache contents inject a path (as this suite already does). Accepted by design; CLAUDE.md records it.Review changes (61666c7)
@discardableResultis back onwriteFile. It had drifted onto a test function and caused 41 warnings.userSupportDirectoryoutsideAppEnv.swift. Its comment stripping walks characters through a sharedSourceScanhelper, so a//inside a string no longer cuts the line.Type of change
UI changes
None visible.
UI/SpriteLoader.swiftonly changes how its cache path is derived. I ran the screenshot generator (PTB_SCREENSHOTS=1) on this branch: every sprite-heavy static PNG came out byte-identical to the committed assets. Only the animated GIFs and two time-dependent PNGs differed, and I discarded those regenerated files.Verification
./scripts/test-gate.sh(after the review changes):Executed 1992 tests, with 11 tests skipped and 0 failures (0 unexpected)✓ 게이트 통과 — 로직 코어 라인 커버리지 94.18% >= 75%Mutation checks:
defaultFileURLcomposition restoreduserSupportDirectory"https://…"stringLocalizedUILiteralTestsReal-folder check: the installed app was running during the gate and rewrites
usage-cache.jsonabout once a minute on its own. I observed that by watching the file for 7 minutes with no tests running. So "unchanged mtime across the suite" cannot be observed on this machine. The isolation is proven by the path tests instead.Hotspot files
Core/UsageStore.swift: 2 lines (the parity snapshot now usesAppEnv.supportDirectory(); it was already bundled-only).UI/PopoverView.swift,Core/Localization.swift,UI/SettingsView.swift: not touched.Checklist
swift buildandswift testpass locally