mirror of
https://github.com/garrytan/gstack.git
synced 2026-09-18 19:02:18 +02:00
Merge origin/main (v1.60.1.0) into garrytan/gstack-fix-wave
Semantic reconciliation with the parallel time-attack wave (#2264):
- careful: adopt main's anchored full-command whitelist (stricter — also
catches comment-hiding), re-apply this wave's two hardenings on top
(capital -[rR] in the flag cluster; exclude `(` and backtick from safe
targets so $()/backtick substitution cannot ride the whitelist). Union
of both waves' test batteries passes (main's test.each incl. comment
case + this wave's substitution/capital-R/FP-pin cases).
- one-way-doors: main landed the singular noun unification (a2a447a1);
keep this wave's superset (plural s? + --summary-stdin runtime wiring).
- gbrain-local-status: union of states — main's engine-locked (#2194,
exit 124 PGLite lock) + this wave's thin-client (#2051). --is-ok keeps
main's intent (engine-locked = STOP) and this wave's (thin-client =
usable). Test harness unions both fake behaviors.
- sync-gbrain/setup-gbrain tmpls: both Step 1.5 branches kept; generated
SKILL.md resolved via bun run gen:skill-docs (never hand-edited).
- VERSION/package.json -> 1.61.0.0 per bin/gstack-next-version (main took
1.60.1.0; PR #2470 claims 1.60.2.0). CHANGELOG: wave entry renumbered
1.61.0.0 on top of main's 1.60.1.0; careful/#2024 bullets updated to
describe the delta vs current main. TODOS: union.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
+2
-3
@@ -821,9 +821,8 @@ Each item is reverted only after AskUserQuestion confirmation:
|
||||
1. The `DebugBridge` SPM target from `Package.swift`.
|
||||
2. The `#if DEBUG` block in the app's `@main` entry that calls
|
||||
`DebugBridgeManager.shared.start()`.
|
||||
3. Any `@Snapshotable` property wrappers on the canonical app state struct
|
||||
(the codegen-detection markers — the wrapper file lives inside
|
||||
DebugBridge so removing the SPM dep removes the wrapper too).
|
||||
3. Any standalone `// @Snapshotable` generator marker comments on the
|
||||
canonical app state class.
|
||||
4. Generated `StateAccessor.swift` files anywhere under the app source.
|
||||
5. The `gstack-ios-qa.token` file under `NSTemporaryDirectory()` on the
|
||||
device (best-effort — only works if device is connected when /ios-clean
|
||||
|
||||
@@ -50,9 +50,8 @@ Each item is reverted only after AskUserQuestion confirmation:
|
||||
1. The `DebugBridge` SPM target from `Package.swift`.
|
||||
2. The `#if DEBUG` block in the app's `@main` entry that calls
|
||||
`DebugBridgeManager.shared.start()`.
|
||||
3. Any `@Snapshotable` property wrappers on the canonical app state struct
|
||||
(the codegen-detection markers — the wrapper file lives inside
|
||||
DebugBridge so removing the SPM dep removes the wrapper too).
|
||||
3. Any standalone `// @Snapshotable` generator marker comments on the
|
||||
canonical app state class.
|
||||
4. Generated `StateAccessor.swift` files anywhere under the app source.
|
||||
5. The `gstack-ios-qa.token` file under `NSTemporaryDirectory()` on the
|
||||
device (best-effort — only works if device is connected when /ios-clean
|
||||
|
||||
Reference in New Issue
Block a user