feat(amicus): v2 UI wiring — trust footer, study actions, thread surfaces (3/3) - #1661
Merged
Conversation
…aces Part 3 of splitting codex/amicus-auth-access-hardening. This PR stacks on PR #1660 (v2 foundation) and wires all the UI surfaces that consume the services, queries, and types that PR ships. Base: feat/amicus-v2-foundation (NOT master). The GitHub UI should show only UI diffs; service/type/DB changes live in PR #1660. ## What's in ### Components - components/amicus/TrustFooter.tsx (new) — renders summarizeAmicusTrust output in message tails: source count, labels, debated-stance chip when citations reference debate_topic content. - components/amicus/StudyActionRow.tsx (new) — renders buildStudyActionSeeds into a horizontal row of one-tap action buttons on chapter-aware Amicus surfaces. - components/amicus/AmicusFab.tsx — respects useAmicusAccess changes and new chapter-aware context. - components/amicus/AmicusPeekSheet.tsx — wires promotePeekToAmicusThread so a promoted peek resumes the right thread if one already exists. - components/amicus/AssistantMessageBubble.tsx — renders TrustFooter below each assistant message. ### Hooks - hooks/useAmicusContext.ts (new) — shared source of chapter/session/ entry-point context across Amicus surfaces. - hooks/useAmicusChapterStudyThread.ts (new) — resolves 'is there an existing study thread for this chapter' for FAB/peek routing. - hooks/useAmicusGuidedRouteContext.ts (new) — extracts guided-study context from the current route so AmicusNewThreadScreen can seed the right envelope without prop drilling. - hooks/useAmicusThread.ts — extended for thread-context awareness (linked question reopen, guided-step badge). - hooks/usePeekConversation.ts — promote flow integration. - hooks/useAmicusChipContext.ts — extended context shape. - hooks/index.ts — barrel exports. ### Screens - screens/AmicusThreadScreen.tsx — major rewrite: thread-context banner (chapter, guided step, linked question status), StudyActionRow, TrustFooter per assistant message, resolve/reopen linked question from within the thread, auto-rename via deriveThreadIntelligence. - screens/AmicusThreadListScreen.tsx — renders the enriched thread metadata (summary_text, guided_step, linked-question status) from the LEFT JOIN'd listAmicusThreads query shipped in PR #1660. - screens/AmicusNewThreadScreen.tsx — seeds from guided-study context + StudyActionRow. - screens/StudySessionScreen.tsx — askAmicus rewritten to use launchAmicusStudyThread with full context, dedupe to existing thread by question > session/step, dynamic 'Investigate question / Trace connection / Help me refine' button label. - screens/MyStudyScreen.tsx — left at the codex branch's version per standing direction (see #1652 re-plan). ### Navigation - navigation/types.ts — Thread + NewThread params extended with seedGuidedContext, seedChapterRef, promotedMessages for the launch flow. ## Critical preservation — #1654 in StudySessionScreen The codex branch was cut before #1654 (stepper bounce-back fix) merged, so it reverts that fix. The bounce-back bug makes Scene/Observe/ Explore/Synthesize taps appear inert because a naive useEffect fires on every currentStep change and snaps the user back to initialStep. This PR re-applies #1654's useRef-guarded one-shot sync, with a comment in the code explicitly naming the issue so a future rebase or merge resolution doesn't silently regress it. The guard is keyed on sessionId so moving between chapters (which spawns a new session) still applies initialStep once for the new session. ## Test coverage - __tests__/screens/AmicusThreadListScreen.test.tsx (new) - __tests__/screens/AmicusThreadScreen.test.tsx (new) - __tests__/screens/MyStudyScreen.test.tsx (new) - __tests__/screens/AmicusNewThreadScreen.test.tsx (extended) - __tests__/hooks/useAmicusChipContext.test.tsx (extended) - hooks/__tests__/useAmicusThread.test.tsx (new) - hooks/__tests__/usePeekConversation.test.tsx (extended) - components/amicus/__tests__/AmicusPeekSheet.test.tsx (extended) - components/amicus/__tests__/AssistantMessageBubble.test.tsx (extended) ## Out of scope - MyStudyScreen redesign (#1652) - Thread-intelligence server-side summaries (future) - Additional trust-layer signals beyond 'debated' (future) ## Rollback Revert the single merge. All UI changes disappear; the foundation (PR #1660) stays and the DB tables remain, but nothing reads or writes to them from the UI. Amicus returns to its pre-PR-3 behavior. The #1654 guard stays preserved (it's shipped in master via #1654 — this PR just ensures the codex-branch work wasn't a silent regression).
# Conflicts: # app/src/db/userMutations.ts
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 freeto join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Part 3 of 3 — salvaging codex/amicus-auth-access-hardening
UI wiring layer for the Amicus v2 work. Stacks on PR #1660 (foundation).
Base branch:
feat/amicus-v2-foundation(not master). The diff shown here is the UI surface only; DB migrations, services, types, queries, and mutations live in the parent PR. Do not merge this before #1660.Independent of PR #1658 (auth/access hardening) — can merge in either order relative to PR 1.
Critical preservation: #1654
The codex branch was cut before #1654 (stepper bounce-back fix) merged, so the codex version of
StudySessionScreen.tsxreverts that fix. The bug makes Scene/Observe/Explore/Synthesize taps appear inert: a naïveuseEffectfires on everycurrentStepchange and snaps the user back toinitialStep.This PR re-applies #1654's
useRef-guarded one-shot sync, with an inline comment naming the issue so a future rebase or merge resolution doesn't silently regress it. The guard is keyed onsessionIdso moving between chapters (which spawns a new session) still appliesinitialSteponce for the new session.What's in
Components
components/amicus/TrustFooter.tsxsummarizeAmicusTrustoutput: source count, labels, debated-stance chip when citations referencedebate_topiccontentcomponents/amicus/StudyActionRow.tsxbuildStudyActionSeedsinto a horizontal row of one-tap chapter-aware actionscomponents/amicus/AmicusFab.tsxuseAmicusAccesschangescomponents/amicus/AmicusPeekSheet.tsxpromotePeekToAmicusThread— promoted peek resumes the right thread if one existscomponents/amicus/AssistantMessageBubble.tsxTrustFooterbelow each assistant messageHooks
hooks/useAmicusContext.tshooks/useAmicusChapterStudyThread.tshooks/useAmicusGuidedRouteContext.tshooks/useAmicusThread.tshooks/usePeekConversation.tshooks/useAmicusChipContext.tsScreens
AmicusThreadScreen.tsx— major rewrite (+352/-31). Thread-context banner (chapter, guided step, linked-question status),StudyActionRow,TrustFooterper assistant message, resolve/reopen linked question from within the thread, auto-rename viaderiveThreadIntelligence.AmicusThreadListScreen.tsx— renders the enriched thread metadata (summary_text,guided_step, linked-question status) from the LEFT JOIN'dlistAmicusThreadsquery shipped in PR feat(amicus): v2 foundation — migrations, services, types, FK enforcement (2/3) #1660.AmicusNewThreadScreen.tsx— seeds from guided-study context +StudyActionRow.StudySessionScreen.tsx—askAmicusrewritten to uselaunchAmicusStudyThreadwith full context, dedupe to existing thread by question → session/step, dynamic "Investigate question / Trace connection / Help me refine" button label. fix(guided-study): stepper taps no longer bounce back to initialStep #1654useRefguard preserved (see above).MyStudyScreen.tsx— left at the codex branch's version per standing direction. Will be revisited in Guided Study: current UX is a framework, not a guided flow — capture current state and re-plan #1652's re-plan.Navigation
navigation/types.ts—Thread+NewThreadparams extended withseedGuidedContext,seedChapterRef,promotedMessagesfor the launch flow.Tests
AmicusThreadListScreen,AmicusThreadScreen,MyStudyScreen,useAmicusThreadtestsAmicusNewThreadScreen,useAmicusChipContext,usePeekConversation,AmicusPeekSheet,AssistantMessageBubbleOut of scope
MyStudyScreenredesign (tracked by Guided Study: current UX is a framework, not a guided flow — capture current state and re-plan #1652)debated(future)Test plan
tsc --noEmit+jestvia CIlaunchAmicusStudyThreaddedup and seed-query variantsDebatedstance when adebate_topiccitation is in the setRollback
Revert the single merge. All UI changes disappear; the foundation (PR #1660) stays and the DB tables remain, but nothing reads or writes to them from the UI. Amicus returns to its pre-PR-3 behavior. #1654's fix stays in place via the parallel work on master.