Skip to content

revert(desktop): take upstream apps/desktop wholesale (fork-PR audit D9, 37 rows) - #1134

Closed
Kyzcreig wants to merge 4 commits into
mainfrom
audit/final-revert-desktop-retired
Closed

Kyzcreig wants to merge 4 commits into
mainfrom
audit/final-revert-desktop-retired

Conversation

@Kyzcreig

@Kyzcreig Kyzcreig commented Sep 25, 2026 •

Copy link
Copy Markdown
Collaborator

HOLD FOR ACE. Held by choice per Ace's 09-27 ruling: deferred to the upstream parity merge (t_e45c8c8d). Owner card t_ee58e530 un-holds it after that merge (rebase, or close as SUPERSEDED-BY). RED/DIRTY here is expected while held.

Fork-PR audit (lead t_03e35f0e, FINAL.md in #1128) DROP class D9 "auto-desktop-retired", 37 rows:
#488, #461, #450, #424, #423, #421, #398, #368, #367, #366, #363, #362, #361, #354, #340, #338, #332, #331, #330, #305, #296, #292, #287, #283, #279, #274, #187, #185, #181, #167, nopr:0159f3ec2d, nopr:427d020ef2, nopr:51147803c6, nopr:66989fbeca, nopr:923516adda, nopr:9fabd8a3da, nopr:dd58e242b9.

Change: path-based git rm -r apps/desktop && git checkout upstream/main -- apps/desktop. Only apps/desktop/ is touched.
Rebased on fork main aff7aea; apps/desktop refreshed to upstream/main 0bd1991.
Proof: git diff upstream/main -- apps/desktop is empty. The diffstat includes upstream desktop drift since the 08-07 merge-base.

Verify: test-gate venv python -m pytest -q -p no:randomly tests/tui_gateway/test_desktop_runtime_footer.py tests/test_hermes_state_search.py -> 152 passed.

Kanban: t_899f0539


View with [code]smith Autofix with [code]smith
Need help on this PR? Tag @codesmith-bot with what you need. Autofix is disabled.


Owner card: t_ee58e530 (re-carry from STRANDED-DONE adjudication t_3e02f3f8)

Owner card: t_ee58e530 (HELD-BY-CHOICE until the upstream parity sync t_e45c8c8d lands; prs.ace joins this PR to t_ee58e530).

Kyzcreig and others added 4 commits September 27, 2026 00:50
…dit auto-desktop-retired, 37 rows)

git rm -r apps/desktop && git checkout upstream/main -- apps/desktop.
Proof: git diff upstream/main -- apps/desktop is empty.
Lead card t_03e35f0e.

Refreshed apps/desktop to upstream/main 0bd1991 after rebase on fork main aff7aea (t_899f0539). git diff upstream/main -- apps/desktop is empty.
…l identity tokens)

Taken wholesale with apps/desktop (t_899f0539). secret_scan run 36197434074 flagged
generic-api-key in electron/updater/channel.test.ts:142 and
scripts/side-by-side.windows.test.mjs:94, both hex fixture tokens. Local gitleaks 8.30.1: no leaks.
…ure which('uv')

Ported verbatim from upstream/main's _ALLOWED entry; the fixture arrived with the
wholesale apps/desktop take (t_899f0539). CI slice 9/16 (run 36197954191) failed on it.
Local: test_managed_runtime_resolution + desktop footer + state search -> 159 passed.
…imports

Verbatim from upstream 0bd1991 (the apps/desktop pin of this PR):
scripts/build/frontend-common.mjs, scripts/build/python.mjs,
scripts/msix-shared.mjs, scripts/release-content-types.json (imported by
msix-shared). Additive only; no existing fork file changed. apps/shared
and other root drift stay with the next parity merge (Ace ruling
2026-09-27, option C).

Kanban: t_899f0539
@ang-fleet-workers
ang-fleet-workers Bot force-pushed the audit/final-revert-desktop-retired branch from 1e166eb to 572b86b Compare September 27, 2026 07:52
@ang-fleet-interactive

Copy link
Copy Markdown

🅷 HELD-BY-CHOICE (Apollo 2026-09-27): card t_899f0539 archived as DEFERRED to the upstream parity merge (Ace ruling via Aegis, 09-27). Not stale, not abandoned; un-holds when the parity merge lands, then rebase or close as superseded.

@ang-fleet-workers

Copy link
Copy Markdown

STRANDED-DONE adjudication (card t_3e02f3f8): HELD-BY-CHOICE (Ace ruling 09-27, deferred to upstream parity merge) had no live owner card. Hold kept; Owner card: t_ee58e530. by daedalus

@ang-fleet-interactive

Copy link
Copy Markdown

CLOSED: SUPERSEDED-BY 0c16eec -- the parity merge commit (branch sync/upstream-2026-10-01, card t_e45c8c8d) takes upstream apps/desktop wholesale; git diff 612d8e4..0c16eec -- apps/desktop is empty, which is this PR's entire intent. card t_ee58e530 by apollo

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant