The prior merge resolved conflicts to the desktop/main (graft) side,
which silently reverted lsdefine's recent upstream fix (inMixin check,
ask_user schema, turn-25 prompt). Restore the 4 files to origin/main.
Replace the card/button wizard with a lightweight notice block: users reply in the main composer with dynamic placeholders. Add formatAskUserQuestion to merge numbered lines and break between questions only. Update tool schemas to guide multi-question Markdown in question and single-question candidates. Hide redundant candidates lists by default (preview flag on).
Roll back ga.py, agent_loop, and tool schemas to the pre-wizard protocol so ask_user stays question + candidates only.
Co-authored-by: Cursor <cursoragent@cursor.com>
Replace single question/candidates params with a required questions array
({question, options?}, 1–5 items) in ga.py and tool schemas. Add desktop
wizard rendering with per-question options, inline custom input, and
batch submit after all answers.
Content-overlay update of all GA framework files from upstream base
b4393af (2026-05-18) to 1eb8c4c (2026-05-25). Applied as an overlay
because GADesktop and upstream share no common git history.
- 26 framework files brought to upstream: tui_v3 (new), fsapp rework,
llmcore hardening, plugins/hooks lifecycle hooks, goal_mode prompt
rewrite, supergrok_proxy, qq/tg/wechat/st apps, cost_tracker py3.9
compat, docs; removed obsolete install scripts.
- Desktop frontend (frontends/desktop/*) and desktop_bridge.py left
untouched. Upstream's only overlapping change (bridge mykey.txt->
mykey.py) is already present in our version, so it is a no-op.
dd3xp