Skip to content

feat(ui): rename settings to account & settings with the account avatar - #39385

Open
CrysisDeu wants to merge 2 commits into
mainfrom
feat/account-and-settings-rail
Open

CrysisDeu wants to merge 2 commits into
mainfrom
feat/account-and-settings-rail

Conversation

@CrysisDeu

@CrysisDeu CrysisDeu commented Nov 19, 2026 •

Copy link
Copy Markdown
Contributor

Problem / Motivation

Goal: The rail's Settings row becomes Account & Settings with the signed-in account's avatar, and the phone shows its Kiro credits inside Settings -> Kiro account instead of a separate Kiro Account row.

Account things are hard to find. The account lives inside Settings, but the rail row is a plain gear, so nothing says the account is there or which one is signed in. On the phone the nav drawer and the chat drawer's rail carry two rows that both mean "my account": Kiro Account (opens the credit popup) and Settings (which holds the Kiro account tab).

Why it matters

Everyone who checks their credits or switches accounts has to guess between two entries for one thing on the phone, and on every screen there is no glance-level sign of which account is signed in. This was raised and approved by the owner on #39372 from real-SPA mocks.

Not a goal

  • No avatar upload or account picture: the circle uses the email initials the Kiro Account popup already draws.
  • No change to the desktop topbar credit capsule or its Kiro Account popup.
  • No rewrite of backend or docs text that says Settings -> <tab>: tab names are unchanged, so those paths still name real tabs.
  • No restyling of the popup's body (its inner "Overage used" box stays, by owner decision).

What changed (motivation → approach → change)

Goal: make the account visible where it lives, and give the phone one account entry. Approach: rename the one row instead of adding a new one, reuse the popup's own identity and usage blocks on the page instead of building a second credit view.

  • Label: nav.settings and pages.settingsPage.settings read Account & Settings in all 12 catalogs plus the pseudolocale. Every UI path built from nav.settings (follow-up cards, command palette provider, find_ui) follows.
  • Avatar: new components/AccountAvatar.tsx draws the reading's initials (lib/emailInitials.ts, moved out of KiroAccountModal.tsx unchanged) or an empty UserRound circle with no reading. It is the row's icon in the desktop rail (26px), the phone nav drawer and the chat drawer's rail (30px). The nav row pins its icon slot to 20px, so the circle is drawn centred on that slot instead of resized by it.
  • Phone account row removed: the Kiro Account row in shell/nav/navRail.tsx and the tile in App.tsx are gone, with their find_ui location shell.kiro-account and its kiro_account_entry condition.
  • Credits on the Kiro account tab: new pages/developer/KiroCreditsCard.tsx renders the popup's AccountIdentity and CreditUsage (now exported) as a Credits section above Kiro sign-in, with the popup's Manage account & subscription link (now the shared ManageKiroAccountLink), gated on the same kiroAccountEntry the phone row used. The tab now shows when the build offers Kiro sign-in or that section has something to show, so a Kiro-harness build without KAS sign-in still gives the phone a way to its credits.
  • Read-only hook split: the reading half of useKiroUsageReadout moved to shell/topbar/kiroAccountReading.ts (useKiroAccountReading) so the Settings page reads the balance without the popup's open state or the sign-in navigation hook. useKiroUsageReadout composes it and behaves as before.
  • Docs: website/docs/narrow-viewport.md describes the new phone shape; the feature-request skill and its prompt fallback name the path Account & Settings › About › Support › Report a Problem; command-palette keywords for the Kiro account tab gain credits/balance/usage/plan, and find_ui search terms (uiLocations/descriptors.ts) send balance and credits questions to that tab.

Backwards compatibility

Compatible: routes, tab keys and config are unchanged; /settings/kiro-account deep links still land, and the desktop popup is untouched.

Reader: website/src/uiLocations/areas/shell.ts:shell.kiro-account -- entry: chat (find_ui) -- removed with the row it described; src/kiro_crew/docs/ui-index.generated.json and website/src/uiLocations/guidePlans.gen.ts regenerated by npm run gen:ui
Reader: website/src/uiLocations/conditions.ts:kiro_account_entry -- entry: chat (find_ui) -- its only placement was shell.kiro-account; no other location requires it (git grep)
Reader: website/src/uiLocations/shell-notifications.locations.test.ts:shell.kiro-account -- entry: release (CI) -- row removed with the location
Reader: website/src/shell/appShell.tsx:kiroAccountEntry -- entry: crew page -- its two readers (navRail.tsx, App.tsx) were the removed rows; SettingsPage reads it from useKiroAccountReading
Reader: website/src/components/KiroAccountModal.tsx:emailInitials -- entry: crew page -- moved to lib/emailInitials.ts and imported back; AccountAvatar.test.tsx pins it

Tests

  • KiroCreditsCard.test.tsx (new): the Credits section carries the Manage account & subscription link after the usage block.
  • test_find_ui_shell.py: "kiro account balance" and "Kiro 账户" find settings.tab.kiro-account; the phone-only row test is gone with the row.
  • test_docs_connections_paths.py: the nav label pin reads Account & Settings.
  • AccountAvatar.test.tsx (new): initials rule, and the empty circle for null, none, failed, signin-required.
  • App.mobileSingleTopbar.test.tsx: the phone tile and nav-drawer row are named Account & Settings, draw ZX for a reading and the empty circle without one, and neither drawer offers a Kiro Account entry.
  • SettingsPage.agentHarnessSignIn.test.tsx: no Kiro account tab on a non-Kiro harness that cannot use the sign-in; the tab stays, with Credits and no sign-in card, on a Kiro harness that cannot.
  • App.test.tsx, navShortcutHint.test.tsx, App.navPendingRoute.test.tsx, test_find_ui.py, test_find_ui_auto.py, featureRequestRouting.test.ts: the row and path label read Account & Settings.

Proof: not provable -- frontend test

Manual verification

Both sides run as isolated pods with the minimal seed and the usage read stubbed to a fake account (zezhen.xu@example.com): before = main 75424e9, after = head b6317bc. All shots below are from those two builds.

Real-machine verification

Machine: Linux dev desktop (AL2, x86_64), pods via kirocrew pod up --seed minimal
Before (main 75424e9): gear row labelled Settings; phone drawers show a Kiro Account row; the Kiro account tab has only Kiro sign-in.
After (head b6317bc): ZX / empty-person row labelled Account & Settings; no Kiro Account row; the tab shows Credits above Kiro sign-in; the desktop popup is unchanged.
Cleanup: both pods stopped with kirocrew pod down, own computer

Screenshots / video

#1 Desktop rail, signed in

Before After

#6 Phone drawer rail, signed in

Before After

#5 Phone, Settings -> Kiro account

Before After
All pairs (#2, #3, #4, #7, #8, #9)

#2 Desktop rail, signed out

Before After

#3 Settings page title

Before After

#4 Desktop, Settings -> Kiro account

Before After

#7 Phone nav drawer, signed in

Before After

#8 Phone drawer rail, signed out

Before After

#9 Desktop credit popup (unchanged)

Before After

Related Issues

Closes #39372

Checklist

  • A Conventional Commits title (feat|fix|docs|style|refactor|perf|test|chore|ci|build|revert: ...); PR Hygiene does not count commits
  • Existing tests pass and new tests added for new functionality
  • Self-review completed; code follows project style guidelines
  • Documentation updated (if applicable)
  • No secrets, credentials, or internal references in the diff

Contribution License Agreement

Contributions are accepted under the project's Apache-2.0 license.

@CrysisDeu
CrysisDeu requested review from a team and KiroCrewCaptain as code owners November 19, 2026 04:24
@github-actions github-actions Bot added the readiness: checking Automated validation is still running label Nov 19, 2026
@github-actions

github-actions Bot commented Nov 19, 2026 •

Copy link
Copy Markdown
Contributor

Design Review (Opus 5.5) — ✅ PASS

Design-level review of ab93aaffd0da568894d106cc3db92e7b8f4a7728 — updated in place on each push. A BLOCK verdict blocks PR readiness; PASS does not.

Design-Verdict: PASS

Nothing blocks: the change renames the existing row instead of adding a new one, reuses the popup's own blocks, and comes with before/after screenshots for every surface it changes.

Notes

  • The new kiroAccountEntry term in SettingsPage's tab filter means a reading that is still loading can briefly hide the tab on a non-sign-in Kiro build. /settings/kiro-account deep links would then land before the tab exists, so a test pinning that deep link on a non-sign-in Kiro harness would be useful.

[DESIGN-REVIEWED] ab93aaf

Description read

[DESCRIPTION-READ] 582e3871276b3d8bab3f217ea1f02b177f7bfce5cb6dfd7e99916435f5408e7e

That sha256 names everything this verdict read: the PR description, plus the 1 evidence file(s) the workflow collected from it and handed this review. It covers that evidence because the media strip replaces every attachment URL with the same placeholder, so an edit swapping one attachment for another would leave the description's captured text identical while what this review judged changed. Recompute it with .github/scripts/pr-description-capture.sh over the same inputs; if it differs, the description or that evidence changed after this verdict was formed and any finding drawn from either is unproven.

@github-actions

github-actions Bot commented Nov 19, 2026 •

Copy link
Copy Markdown
Contributor

First Principles Review (Opus 5.5) — 🔴 BLOCK

Premise-level review of ab93aaffd0da568894d106cc3db92e7b8f4a7728 — why this exists and whether the shipped surface is the smallest honest version. Updated in place on each push. A BLOCK verdict blocks PR readiness; PASS does not.

First-Principles-Verdict: BLOCK

Product-shape change without accepted RFC: the change renames the Settings row for everyone and takes away the phone's Kiro Account entry. No RFC on the base or maintainer override records either decision. Owner approval on #39372 is neither of the two accepted forms.

What this change ships

Inventory (9 items) — 7 justified

Intent: give the account a visible home and give the phone a single account entry. This is an ADDITION (plus a relabel and a removal).

  1. The Settings rail row, page title, palette entry and find_ui paths now read "Account & Settings" — product shape, no recorded decision
  2. The gear icon on that row becomes the account's initials, or an empty person circle when no one is signed in, on desktop and phone — justified
  3. The Kiro Account row is gone from the phone nav drawer, and its tile is gone from the chat drawer's rail — product shape, no recorded decision
  4. Settings → Kiro account gains a Credits section (identity, usage, Manage account link) — justified
  5. The Kiro account tab now also shows when sign-in isn't offered but a credit reading exists — justified
  6. The find_ui shell.kiro-account location and the kiro_account_entry condition are removed, and balance searches now point at the tab — justified
  7. The command palette gains credits/balance/usage/plan keywords for Kiro sign-in — justified
  8. The feature-request skill and prompt now name the "Account & Settings" path — justified
  9. The read-only useKiroAccountReading hook is split out of useKiroUsageReadout — justified

Blockers

product-shape change without accepted RFC: Settings relabel and phone account-entry replacement — product shape
Trigger: items 1 and 3. nav.settings reads "Account & Settings" in every catalog, and the NavItem navId="account" blocks are deleted from navRail.tsx and App.tsx. On the base RFC list, rfc-dashboard-chrome-shell.md (accepted) does not cover this shape, and rfc-navigation-placement-seam.md is draft.
Outcome: every user gets a renamed first-class nav row, and phone users lose a one-tap entry, with no decision recorded on the repository.
Clears when: an RFC covering the "Account & Settings" relabel and the replacement of the phone Kiro Account row is merged non-draft on the base (then push or rebase), or a maintainer posts /ai-review override first-principles ab93aaffd0da568894d106cc3db92e7b8f4a7728 product-shape: <decision>.

[FIRST-PRINCIPLES-REVIEWED] ab93aaf

Description read

[DESCRIPTION-READ] 079db764b9eb2c3a21b1ebb2899c086ad9fa8048c7fcf8a85f8266057f57c7a7

That sha256 names the PR description this verdict read. Recompute it with .github/scripts/pr-description-capture.sh; if it differs, the description changed after this verdict was formed and any finding drawn from the description is unproven.

@github-actions

github-actions Bot commented Nov 19, 2026 •

Copy link
Copy Markdown
Contributor

GPT 6.1 Review — 🔴 changes requested (blocking)

GPT 6.1 found at least one blocking issue that must be resolved before merging fc6ccdaeb20538233862c9611327ee116cf1b5ef. Adjudication upheld 1 of 1 blocking finding(s); those must be resolved before merging.

This comment is updated in place on each push.

BLOCKING -- website/src/pages/developer/KiroCreditsCard.tsx:23 -- Preserve the phone’s subscription-management action

<CreditUsage usage={usage} onClose={noop} />
Trigger: On a phone with a Kiro usage reading, open Account & Settings → Kiro account; SettingsPage renders this card, both drawer entries that opened KiroAccountModal are removed, and ShellHeader hides the credit capsule on mobile.
Outcome: “Manage account & subscription” is unreachable from the phone dashboard: its link remains in KiroAccountModal, outside the two components this card reuses.
Anchor: defect
Fix: Render the modal’s subscription-management link in KiroCreditsCard, sharing the link component between both surfaces.

[BLOCK-MERGE] fc6ccda
[GPT-REVIEWED] fc6ccda

Adjudication (Opus 5.5) — is blocking on each finding proportionate?

F1 — MEDIUM: on the phone, the dashboard no longer has any link to manage the account or subscription. Confirmed in code:

  • The only "Manage account & subscription" link (app.manage_account, pointing to KIRO_ACCOUNT_URL) is in website/src/components/KiroAccountModal.tsx:826-831.
  • This PR removes the phone drawer's entry that opened that modal (website/src/shell/nav/navRail.tsx, removed hunk near line 380).
  • website/src/pages/developer/KiroCreditsCard.tsx:21-23 renders only AccountIdentity and CreditUsage, not the link.

The real fix is cheap: move the link into its own exported component and render it in both the modal and the card. That adds no state or coordination, so blocking on it costs one small edit.

[ADJUDICATION] fc6ccdaeb20538233862c9611327ee116cf1b5ef total=1 uphold=1 downgrade=0
UPHOLD F1 website/src/pages/developer/KiroCreditsCard.tsx:23 reason=harm-warrants-remedy
[GPT-ADJUDICATED] fc6ccdaeb20538233862c9611327ee116cf1b5ef

False positive or not applicable? A repository writer can comment:
/ai-review override gpt fc6ccdaeb20538233862c9611327ee116cf1b5ef false-positive: <reason, 20 to 500 characters>

@CrysisDeu

Copy link
Copy Markdown
Contributor Author

Owner decision (Zezhen, product owner): rename the rail's Settings row and page title to Account & Settings with the signed-in account's initials as its icon (an empty person circle when signed out), and remove the phone's separate Kiro Account row, moving its credits into a Credits section on Settings -> Kiro account. The desktop topbar credit popup stays. Decided on real-SPA mocks reviewed in #39372; this PR implements exactly that decision.

@CrysisDeu

Copy link
Copy Markdown
Contributor Author

/ai-review override first-principles fc6ccda product-shape: owner decision by Zezhen on #39372 (approved mocks) to rename Settings to Account & Settings with the account avatar and fold the phone Kiro Account row into Settings -> Kiro account; desktop popup unchanged.

@github-actions

Copy link
Copy Markdown
Contributor

AI-review override not recorded: product-shape is not a release class. Use /ai-review override <fable|gpt|design|ux|first-principles|scope|all> <current-sha> <class>[ #N]: <reason, 20 to 500 characters>, where <class> is one of false-positive, not-applicable, pre-existing, evidence-supplied, infra-failure, reissue, deferred, owner-decision. What each class needs: docs/ci/ci-and-reviews.md#risk-release-records.

@github-actions

github-actions Bot commented Nov 19, 2026 •

Copy link
Copy Markdown
Contributor

UX Review (Opus 5.5) — 🔴 BLOCK

UX-level review of ab93aaffd0da568894d106cc3db92e7b8f4a7728 — updated in place on each push. A BLOCK verdict blocks PR readiness; PASS does not.

UX-Verdict: BLOCK

The Kiro account tab now shows "Signed in with IAM Identity Center" and, right below it, an unexplained "Sign in" button. A user can't tell whether they are signed in, and won't press the one button that fixes "Not signed in".

Blockers

The new Credits section contradicts the sign-in card below it
Trigger: a user whose credit reading loads (from kiro-cli) but whose Kiro sign-in is not authenticated opens Account & Settings › Kiro account. This is the state in the PR's own after shots, shot-06 and shot-12.
Outcome: SettingsPage.tsx now renders <KiroCreditsCard> (built on AccountIdentity, which shows "Signed in with …") above an unchanged <KiroSignInCard> that offers "Sign in". The page reports two sign-in states for one account. The blind reader: "I don't know if pressing it would sign me in again, swap accounts, or break something -> no, I wouldn't dare." The chat errors meanwhile say "Not signed in to Kiro. Sign in from Settings → Kiro account." So the user stalls on the very page those errors send them to. Severity: high. It hits every phone user who looks up credits in this state (the tab is now their only place for credits), it blocks the sign-in task, and it happens on every visit.
Fix: say what each block is for. Give the sign-in card a heading or line naming what that sign-in does that the Credits identity doesn't. Or don't show the "Signed in with …" line in the Credits section while Kiro sign-in is unauthenticated.

Notes

  • The purple dot on the new avatar (shot-02, -04, -08, -14, -16) left the reader asking "what the dot is warning about". The row now shows the account, so the badge reads as an account warning. Give the dot an accessible label, or a tooltip that names its cause.
  • The chat error string "Sign in from Settings → Kiro account" no longer matches the rail label "Account & Settings". The reader noticed: "a word that no longer appears in the menu".

[UX-REVIEWED] ab93aaf

Description read

[DESCRIPTION-READ] 37041cb40dc3e0e17d3770c4c92d5ecbb7805aac6bc48b40c17bb14b93c1bbcd

That sha256 names everything this verdict read: the PR description, plus the 21 evidence file(s) the workflow collected from it and handed this review. It covers that evidence because the media strip replaces every attachment URL with the same placeholder, so an edit swapping one attachment for another would leave the description's captured text identical while what this review judged changed. Recompute it with .github/scripts/pr-description-capture.sh over the same inputs; if it differs, the description or that evidence changed after this verdict was formed and any finding drawn from either is unproven.

@github-actions

github-actions Bot commented Nov 19, 2026 •

Copy link
Copy Markdown
Contributor

Opus 5.5 Review — ✅ no blocking findings

Reviewed ab93aaffd0da568894d106cc3db92e7b8f4a7728 — this comment is updated in place on each push.

Review details

No findings.

[OPUS-REVIEWED] ab93aaf

Verdict parsed from the review's SHA-scoped output markers for commit ab93aaffd0da568894d106cc3db92e7b8f4a7728.

False positive or not applicable? A repository writer can comment:
/ai-review override fable ab93aaffd0da568894d106cc3db92e7b8f4a7728 false-positive: <reason, 20 to 500 characters>

@github-actions github-actions Bot added readiness: action required A blocking check or review needs attention and removed readiness: checking Automated validation is still running labels Nov 19, 2026
@CrysisDeu

Copy link
Copy Markdown
Contributor Author

/ai-review override first-principles b6317bc product-shape: owner decision by Zezhen on #39372 (approved mocks) to rename Settings to Account & Settings with the account avatar and fold the phone Kiro Account row into Settings -> Kiro account; desktop popup unchanged.

@github-actions

Copy link
Copy Markdown
Contributor

AI-review override not recorded: product-shape is not a release class. Use /ai-review override <fable|gpt|design|ux|first-principles|scope|all> <current-sha> <class>[ #N]: <reason, 20 to 500 characters>, where <class> is one of false-positive, not-applicable, pre-existing, evidence-supplied, infra-failure, reissue, deferred, owner-decision. What each class needs: docs/ci/ci-and-reviews.md#risk-release-records.

The rail's Settings row becomes Account & Settings and draws the signed-in
account's initials (an empty person circle with no reading), so a glance
shows where the account lives and which one is signed in.

The phone's separate Kiro Account row is gone from both drawers: its
balance now shows as a Credits section at the top of Settings -> Kiro
account, which also appears on a Kiro harness whose build does not offer
the sign-in, so the phone keeps a way to its credits. The desktop keeps
the topbar capsule and its popup.

Closes #39372
The Credits section on Settings -> Kiro account now carries the
popup's Manage account & subscription link, so the phone keeps it
after its Kiro Account row left. Balance and credits searches find
that tab, and the find_ui and nav-label pins follow the rename. The
feature map names the new Credits card and avatar files.
@CrysisDeu
CrysisDeu force-pushed the feat/account-and-settings-rail branch from b6317bc to ab93aaf Compare November 19, 2026 05:35
@CrysisDeu

Copy link
Copy Markdown
Contributor Author

/ai-review override first-principles ab93aaf product-shape: owner decision by Zezhen on #39372 (approved mocks) to rename Settings to Account & Settings with the account avatar and fold the phone Kiro Account row into Settings -> Kiro account; desktop popup unchanged.

@github-actions

Copy link
Copy Markdown
Contributor

AI-review override not recorded: product-shape is not a release class. Use /ai-review override <fable|gpt|design|ux|first-principles|scope|all> <current-sha> <class>[ #N]: <reason, 20 to 500 characters>, where <class> is one of false-positive, not-applicable, pre-existing, evidence-supplied, infra-failure, reissue, deferred, owner-decision. What each class needs: docs/ci/ci-and-reviews.md#risk-release-records.

@CrysisDeu

Copy link
Copy Markdown
Contributor Author

Rebased onto main 7f8f9d8 to get a full CI dispatch (the previous head's Fast Gate, Build, CodeQL and AI review runs were cancelled with no newer run). git range-diff shows both commits identical (=), so the screenshots in the description, taken from b6317bc, show this head's code.

@github-actions github-actions Bot added readiness: checking Automated validation is still running and removed readiness: action required A blocking check or review needs attention labels Nov 19, 2026
@KiroCrewAutoBuilder

Copy link
Copy Markdown
Collaborator

feels overloaded... maybe separate account and settings?

@github-actions github-actions Bot added readiness: action required A blocking check or review needs attention and removed readiness: checking Automated validation is still running labels Nov 19, 2026

This branch has not been deployed

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

Labels

readiness: action required A blocking check or review needs attention

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Rename Settings to Account & Settings with the account avatar, and fold the phone Kiro Account row into it

2 participants