feat(mobile): provider-aware new-session and layout extract

[iscekic]

Summary

• A new Cloud Agent session can now start from a GitHub, GitLab, or Bitbucket repository. Bitbucket appears only for an organization, never for a personal account.
• The repository picker sorts your repositories into Recently used and per-provider sections and shows each row's provider next to its name.
• Every provider shows its own connect prompt, empty list, or error message, so one provider's failure does not hide the repositories of another.
• If a Bitbucket connection fails, the app explains the Bitbucket problem directly instead of showing a generic message.
• Organization credit activity and invoices load a page at a time behind a Load more button rather than fetching the whole list in one request.
• The credits card shows the balance of the account you are signed in as after switching accounts, and an empty personal account shows an Add credits action.
• The web chat Mode control now displays the session's actual mode, including a custom mode's name, and shows Select mode when the mode is empty.
• On a resumed web chat, the Mode picker lists only the custom agents that session can run, not agents added to the profile later.
• A personal Bitbucket code-review link now opens a Page not found screen with a Go back action instead of GitHub settings.
• A malformed pull-request review link now opens an invalid-link screen with a back action instead of a broken screen.

---

The new-session repository row becomes provider-aware. NewSessionRepository requires a platform and carries optional Bitbucket workspace and repository uuids, and per-provider state is a RepositoryProviderStatus union (loading, error, connect, connected-empty, repos) resolved by resolveProviderStatus for GitHub and GitLab and by resolveBitbucketStatus for Bitbucket's discriminated-union response; the old RepositorySectionView and its connect-fallback status are retired. resolveRepositoryGroups orders GitHub, GitLab, then Bitbucket only when an organization is set, and dedupeRepositoriesByPlatformAndFullName keys deduping on platform plus fullName.

Files

• apps/mobile/src/components/agents/new-session-repository-state.ts — defines NewSessionRepository, RepositoryProviderStatus, RepositoryGroup, RepositoryGroups, the two status resolvers, grouping, deduping, and platform detection; removes RepositorySectionView and shouldShowRepositoryError.

useNewSessionRepos queries GitHub, GitLab (personal and organization), and organization-only Bitbucket, then merges recently used rows that resolve against a connected row, recents first. Its result replaces the single view and openGitHubIntegration pair with groups, repositories, recents, reposSettled, openIntegration, and refreshReposForceFresh; GitLab and Bitbucket connect and force-fresh refresh run through a foreground return listener, and a Bitbucket connect failure toasts the bitbucketError string.

Files

• apps/mobile/src/lib/use-new-session-repos.ts — runs the three provider queries plus the recents query, maps rows to NewSessionRepository, resolves per-provider status, and drives per-provider connect and force-fresh refresh.

The repository section renders one card per provider group, and the picker treats the selection value as platform:fullName. A provider in connect or connected-empty shows its own connect or refresh card, an error shows a retryable query error per provider, and repos groups feed rows into the shared picker trigger; the picker shows Recently used plus per-provider sections when the search box is empty, the flat filtered list while searching, and a platform label on each row.

Files

• apps/mobile/src/components/agents/new-session-repository-section.tsx — replaces the single GitHub view card with per-group connect, connected-empty, and error cards driven by groups and onConnect(platform).
• apps/mobile/src/components/agents/new-session-configure-form.tsx — swaps the view, onOpenGitHubIntegration, and {fullName, isPrivate}[] props for groups, onConnectProvider, repositories, recents, and NewSessionRepository.
• apps/mobile/src/components/agents/repo-selector.tsx — builds the Recently used plus per-provider sections, shows the platform next to the fullName, and forwards workspace and repository uuids.
• apps/mobile/src/app/(app)/agent-chat/repo-picker.tsx — renders grouped headers and platform-labeled rows, matching the selection by platform:fullName.

The create body writes exactly one platform-specific repository field. PrepareSessionInput.githubRepo becomes optional and gains gitlabProject and bitbucketRepo, written by setRepositoryField from the selected row's platform; the safe-retry fingerprint now includes the platform and Bitbucket uuids and still matches pre-change GitHub rows through a legacy bare-name fallback that migrates the consumed outbox row. resolvePrefillRepoSelection returns a github:fullName key, and the Start gate disables when the selected key no longer resolves to a row.

Files

• apps/mobile/src/components/agents/use-new-session-creator.ts — takes selectedRepository, writes the platform field via setRepositoryField, and keys the fingerprint on platform plus uuids with a GitHub-only legacy fallback.
• apps/mobile/src/components/agents/new-session-prefill.ts — adds resolvePrefillRepoSelection returning a GitHub-qualified key.
• apps/mobile/src/components/agents/use-new-session-prefill.ts — resolves the prefill through resolvePrefillRepoSelection and reports the matched state.
• apps/mobile/src/lib/new-session-submit.ts — disables Start when the selected key does not resolve to a row.

The new-session route is thin, and its screen logic lives in a new screen body. NewSessionScreenBody owns the form, draft, model, attachment, profile, and repository wiring and resolves the platform-qualified selection to a full row for the creator, while the route keeps only the model provider and the body.

Files

• apps/mobile/src/app/(app)/agent-chat/new.tsx — reduced to NewSessionModelProvider wrapping NewSessionScreenBody.
• apps/mobile/src/components/agents/new-session-screen-body.tsx — new; holds all screen state and effects and wires useNewSessionRepos into the form.

A route-scoped registry replaces the process-global navigation bridges. Each bridge value is stored under a routeKey — a session id, a PR owner, repo, and number, or a branded scope — and useRouteRegistry(routeKey) clears every slot under that key when the route unmounts, so a stale bridge never leaks into the next visit; picker screens receive their routeKey through route params. The picker-bridge module now exports only types and pure selection helpers, and the diff-selection and file-navigator bridges store per PR.

Files

• apps/mobile/src/lib/route-registry.ts — new; defines the per-kind slot maps, the picker, PR, and security slots, prRouteKey, and useRouteRegistry.
• apps/mobile/src/lib/picker-bridge.ts — keeps the bridge types, RepoPlatform, RepoOption, RepoPickerSection, and the selection helpers; drops the module-level set/get/clear functions.
• apps/mobile/src/lib/security-finding-filter-bridge.ts — stores the filter bridge under the securityFilterSlot fixed key.
• apps/mobile/src/lib/pr-review/diff-selection-bridge.ts — stores and reads the diff selection under the PR route key.
• apps/mobile/src/lib/pr-review/file-navigator-bridge.ts — stores per-PR listener sets under the PR route key.
• apps/mobile/src/app/(app)/(tabs)/(3_profile)/security-agent/[scope]/filter.tsx — reads and clears the filter slot via the registry.
• apps/mobile/src/app/(app)/agent-chat/instance-picker.tsx — reads and clears the instance slot and registers the unscoped key.
• apps/mobile/src/app/(app)/agent-chat/mode-picker.tsx — reads the mode slot keyed by the routeKey param.
• apps/mobile/src/components/agents/model-picker-content.tsx — reads and clears the model slot keyed by the routeKey param.
• apps/mobile/src/components/agents/instance-selector.tsx — sets the instance slot under the unscoped key.
• apps/mobile/src/components/agents/mode-selector.tsx — sets the mode slot under the session-id key and passes it to the picker route.
• apps/mobile/src/components/agents/model-selector.tsx — sets the model slot under the session-id key and passes it to the picker route.

Route-param parsing becomes strict and typed. parseReviewerPlatform returns a ReviewerScopePlatform discriminated union — a personal github or gitlab variant, or an org variant carrying the organization id — and rejects personal Bitbucket, and toPersonalPlatform moves into the config module and throws on Bitbucket instead of aliasing it to GitHub. The PR review route validates owner, repo, and number and renders the invalid-route state for malformed params.

Files

• apps/mobile/src/lib/code-reviewer-config.ts — adds ReviewerScopePlatform, rewrites parseReviewerPlatform, moves and hardens toPersonalPlatform, and derives ReviewConfigData and ConfigPatch from the router outputs.
• apps/mobile/src/lib/hooks/use-reviewer-route-params.ts — returns ReviewerScopePlatform or null.
• apps/mobile/src/lib/hooks/use-code-reviewer.ts — invokes toPersonalPlatform only for the active personal scope and re-exports it.
• apps/mobile/src/app/(app)/pr-review/[owner]/[repo]/[number]/index.tsx — parses owner, repo, and number with parseParam and renders InvalidRouteState when they are invalid.

Organization credit activity and invoices become cursor-paginated. Two new procedures, creditTransactionsPage and invoicesPage, page 25 rows at a time and return entries, hasMore, and a cursor; the web helpers add getCreditTransactionsForOrganizationPage (with a summary) and getStripeInvoicesPage, and the old array-form helpers remain for non-paged clients. The mobile screens switch to infinite-query hooks with a Load more footer and permanent not-found and permission error variants.

Files

• apps/web/src/routers/organizations/organization-router.ts — adds creditTransactionsPage and invoicesPage with cursor input schemas.
• apps/web/src/lib/creditTransactions.ts — adds getCreditTransactionsSummaryForOrganization and getCreditTransactionsForOrganizationPage with a 25-row offset cursor.
• apps/web/src/lib/stripe/index.ts — extracts mapStripeInvoicesToUnified and adds getStripeInvoicesPage with a starting_after cursor.
• apps/mobile/src/lib/hooks/use-organization-queries.ts — adds useOrgCreditTransactionsPage and useOrgInvoicesPage and derives CreditTransaction and OrgInvoice from the router outputs.
• apps/mobile/src/components/organization/credit-activity-screen.tsx — renders the load-more footer, later-page retry, and permanent error variants.
• apps/mobile/src/components/organization/invoices-screen.tsx — renders the load-more footer, later-page retry, and permanent error variants.

The profile credits card keys its balance query on the signed-in owner. It waits for the current user id before enabling the balance, credit-blocks, and org credit queries, so an account switch can no longer render the previous account's balance, and it treats a failed user query as a balance failure that retry re-resolves.

Files

• apps/mobile/src/components/profile-credits-card.tsx — gates the three queries on useCurrentUserId, fails fast on a regressed query key, and merges the user error into the balance error surface.

The code-review and security-finding lists refresh when their route returns to the foreground, through the existing foreground-refresh helper.

Files

• apps/mobile/src/components/code-reviewer/review-list-screen.tsx — registers the codeReviews refresh key.
• apps/mobile/src/components/security-agent/finding-list-screen.tsx — registers the securityAgent refresh key.

Hand-rolled wire response casts become zod-parsed contracts. The stream-ticket, admission-challenge, openrouter models, and org-defaults responses are parsed with exported schemas, so a malformed body fails at parse time instead of propagating a wrong shape.

Files

• apps/mobile/src/components/agents/mobile-session-manager.ts — adds StreamTicketResponseSchema and parses the stream-ticket response.
• apps/mobile/src/lib/auth/admission.ts — adds AdmissionChallengeResponseSchema and parses the challenge response.
• apps/mobile/src/lib/hooks/use-available-models.ts — adds OpenRouterModelsResponseSchema and OrganizationDefaultsResponseSchema and parses both endpoints.

PR review wire types are derived from the tRPC router instead of hand-written duplicates. Merge, check-run, review-comment, and review-submit inputs plus the merge result and overview DTO come from the inferred router types, so the client types cannot drift from the server contract; the merge-result union re-adds the branch-delete-error variant that declaration emit folds away.

Files

• apps/mobile/src/components/pr-review/merge/pr-merge-sheet.tsx — derives MergePullRequestInput and AutoMergeInput from the router.
• apps/mobile/src/components/pr-review/pr-review-checks-section.tsx — derives CheckRun from the listChecks output.
• apps/mobile/src/lib/pr-review/merge/merge-blocked-reasons.ts — derives PrOverviewDto and PrOverviewRepoSettings from getPullRequest.
• apps/mobile/src/lib/pr-review/merge/merge-result-gate.ts — derives MergePullRequestResult and re-adds the branch-delete-error variant.
• apps/mobile/src/lib/pr-review/merge/use-pr-merge-mutations.ts — derives MergePullRequestInput.
• apps/mobile/src/lib/pr-review/use-pr-review-mutations.ts — derives CreateReviewCommentInput, SubmitReviewInput, and SubmitReviewComment.
• apps/mobile/src/lib/hooks/use-code-reviews.ts — derives CreateManualReviewInput.

The web chat mode control resumes the session's real mode and supports legacy aliases. normalizeAlias maps build to code and architect to plan, modeControlValue turns an empty mode into the Select mode placeholder, and the provider and the send path normalize the stored mode the same way. The chat picker builds custom options from the session's runtime agents plus the effective profile's visible agents, but only profile agents whose slug is already in the frozen runtime-agents set are offered — a newer profile agent would be rejected on send — and the options are deduped with the selected slug always present.

Files

• apps/web/src/components/cloud-agent-next/session-config.ts — adds normalizeAlias, modeControlValue, isBuiltinAgentMode, dedupeCustomModeOptions, ensureSelectedCustomOption, and CustomModeOption.
• apps/web/src/components/cloud-agent-next/CloudAgentProvider.tsx — normalizes the runtime mode alias when building the session config.
• apps/web/src/components/cloud-agent-next/CloudChatPage.tsx — resolves the mode via modeControlValue, filters profile agents to the runtime-agents slugs, and builds custom options from both sources.

Full mobile-artifact inspection now prints a signed-artifact size table alongside the existing contract checks. The script unzips the IPA and AAB and lists JS bundles, fonts, and highlight grammar modules with byte sizes sorted descending; a measurement or unzip failure logs a warning and never changes the exit code.

Files

• scripts/inspect-mobile-artifacts.mjs — adds classify, walkFiles, measureArtifactSizes, and printSizeTable; full mode calls printSizeTable before exiting.

The mobile catalog gains the strings for the three-provider repository picker, the Bitbucket connect error, and the org ledger Load more footers. The non-English catalogs receive the same keys translated.

Files

• apps/mobile/src/i18n/locales/en.json — adds bitbucketError, the provider connect, empty, error, and platform-label keys, and the credit-activity and invoice loadMore, truncated, and loadMoreFailed keys.

Tests: 19 test files changed (5 new, 14 updated).
Generated: 86 locale catalogs updated.

---

Visual Changes

Profile credits card (mobile). The card shows the signed-in account's own balance, and a zero-balance personal account offers an Add credits action. In the picture, the CREDITS section reads $0.00 above the "Add credits to keep usage running." line and the Add credits button, with the linked account zero-balance-w7b@kilocode.dev below.

Org credit ledger (mobile). The Credit activity screen lists the organization's credit rows in one list, and the empty state does not cover them. In the picture, eight "Dev seed org credit" rows each show +$1.00; the load-more footer sits below the visible frame.

New-session repo picker (mobile). The picker groups repositories under Recently used and platform headers and puts a platform label on each row. In the picture, the open Select repository sheet shows the RECENTLY USED header above the selected row and the GITHUB header above the remaining labeled rows.

Personal Bitbucket route (mobile). The invalid personal Bitbucket link shows a Page not found screen with a Go back action instead of GitHub settings. In the picture, the screen center reads "Page not found" and "This link is no longer valid." above the Go back button.

Home saved-sessions banner (mobile). No picture shows this change. The banner "Showing saved sessions — live status may be out of date" never rendered in any round; the candidate pictures show only the generic "No internet connection" banner with the saved rows retained and no promo, so the screen is not pictured.

Cloud chat Mode control (web). The Mode control resolves the session's mode and shows its label instead of a fallback. In the picture, the composer's Mode control reads "Audit W7B Custom" next to the model selector.

Verification

Rounds 1-3 tracked 13 cases on backend, iOS, Android, and web; 11 ran and passed, 2 were not run.

Case	What it proves	Platform	Result
BE-1	Backend data-contract behavior verified in round 1 and unaffected by the mobile-only fix.	backend	passed
BE-2	Backend data-contract behavior verified in round 1 and unaffected by the mobile-only fix.	backend	passed
I-1	After an account switch and relaunch, the profile credits card shows the selected account's own balance, not the previous account's figures.	iOS	passed after the fix in round 2
I-2	The org credit ledger pages with a load-more footer and never renders the empty state over existing rows.	iOS	passed
I-3	The repo picker groups repositories under platform headers, labels each row with its platform, and hides Bitbucket without an org.	iOS	passed
I-4	The personal Bitbucket deep link renders Page not found with Go back instead of GitHub settings.	iOS	passed
I-5	Home shows a saved-sessions banner when a live poll fails while saved rows exist.	iOS	not run — offline cannot be induced on the iOS simulator
A-1	A zero-balance personal account shows its own $0.00 balance and an Add credits action on the credits card.	Android	passed
A-2	The Android repo picker shows the same group headers and platform-labeled rows as iOS.	Android	passed
A-3	Home keeps saved rows and shows the saved-sessions banner, not a promo, while offline.	Android	not run — the offline banner was not inducible; adb reverse kept the API reachable (r3b) and after reverse removal the banner still did not appear (r3c)
W-1	The Mode control renders a custom mode's label instead of a fallback.	web	passed
W-2	An empty-mode session shows the Select mode placeholder, not Code.	web	passed
W-3	Sending a message on a resumed session does not open the Resume Session dialog.	web	passed

Defects reproduced on the unfixed build:

• I-1 balance query (round 1): the credits card showed the previous account's balance after a switch; fixed in ef9c599; it does not reproduce on the current head.

Recording: none.

Human steps

No human steps needed.

Reviewer Notes

This is level 5 (the tip) of a 5-level stack. Full E2E verification, the simplify pass, and bot review run on this PR over every level.

• The Home saved-sessions banner and the first-use promo (E2E cases I-5 and A-3) are superseded by a later base merge with origin/main. Main's Home redesign (Mobile: splash reveal, language picker, RTL layout and i18n consistency #5506/feat(mobile): kilo remote hint, Live now slots, and remote remap #5463) removed the saved-sessions banner, deleted the promo card, and renamed the section to Live now, so those two cases no longer apply; the report's banner entry means the screen is not pictured.
• The level-5 root-layout extraction (thin _layout.tsx plus root-layout-controller.tsx) was reverted during the base merge; main's _layout.tsx is now the source, so the extraction no longer appears in the diff.

Stacked PRs — merge bottom to top. Each level shows only its own diff.

Full verification (E2E, user advocacy, simplify, bot review) runs on the tip PR over every level.
A finding on a level is repaired on that level, then carried upward with stack.sh forward.

1. audit-w7b-data-contracts-dffd — refactor(mobile): parse raw HTTP and infer review contracts #5460
2. audit-w7b-data-contracts-dffd-s2 — feat(web): add org credit and invoice page procedures #5462
3. audit-w7b-data-contracts-dffd-s3 — feat(mobile): owner-keyed credits, ledger paging, list freshness #5468
4. audit-w7b-data-contracts-dffd-s4 — refactor: route-scoped registry and live custom mode #5472
5. audit-w7b-data-contracts-dffd-s5 — feat(mobile): provider-aware new-session and layout extract #5479 ← this PR (tip)

[kilo-code-bot]

Code Review Summary

Status: No Issues Found | Recommendation: Merge

Files Reviewed (10 files)

• apps/mobile/src/components/pr-review/diff/pr-diff-file-list.tsx
• apps/mobile/src/components/pr-review/diff/pr-diff-floating-actions.tsx
• apps/mobile/src/components/pr-review/diff/use-diff-selection.ts
• apps/mobile/src/lib/pr-review/diff-selection-bridge.ts
• apps/mobile/src/lib/pr-review/pr-bridges.test.ts
• apps/web/src/lib/creditTransactions.page.test.ts
• apps/web/src/lib/creditTransactions.ts
• apps/web/src/lib/stripe/index.test.ts
• apps/web/src/lib/stripe/index.ts
• apps/web/src/routers/organizations/organization-router.ts

Previous Review Summaries (3 snapshots, latest commit c7cbe4e)

Current summary above is authoritative. Previous snapshots are kept for context only.

Previous review (commit c7cbe4e)

Status: No Issues Found | Recommendation: Merge

Files Reviewed (8 files)

• apps/mobile/src/components/agents/use-new-session-creator.ts
• apps/mobile/src/components/agents/use-new-session-creator.test.ts
• apps/mobile/src/components/organization/credit-activity-screen.tsx
• apps/mobile/src/components/organization/credit-activity-screen.mounted.test.tsx
• apps/mobile/src/components/organization/invoices-screen.tsx
• apps/mobile/src/components/organization/invoices-screen.mounted.test.tsx
• apps/mobile/src/components/profile-credits-card.tsx
• apps/mobile/src/i18n/locales/en.json

Previous review (commit 4702af6)

Status: 2 Issues Found | Recommendation: Address before merge

Overview

Severity	Count
CRITICAL	0
WARNING	2
SUGGESTION	0

Issue Details (click to expand)

WARNING

File	Line	Issue
apps/mobile/src/components/profile-credits-card.tsx	65	Unscoped balance cache can show another account's credits
apps/mobile/src/components/agents/use-new-session-creator.ts	183	Legacy fingerprint migration drops the hoisted retry key

Files Reviewed (24 files)

• apps/mobile/src/app/(app)/agent-chat/repo-picker.tsx
• apps/mobile/src/components/agents/new-session-configure-form.test.ts
• apps/mobile/src/components/agents/new-session-configure-form.tsx
• apps/mobile/src/components/agents/new-session-prefill.test.ts
• apps/mobile/src/components/agents/new-session-prefill.ts
• apps/mobile/src/components/agents/new-session-repository-section.tsx
• apps/mobile/src/components/agents/new-session-repository-state.ts
• apps/mobile/src/components/agents/new-session-screen-body.tsx
• apps/mobile/src/components/agents/repo-selector.tsx
• apps/mobile/src/components/agents/use-new-session-creator.test.ts
• apps/mobile/src/components/agents/use-new-session-creator.ts - 1 issue
• apps/mobile/src/components/agents/use-new-session-prefill.ts
• apps/mobile/src/components/organization/credit-activity-screen.mounted.test.tsx
• apps/mobile/src/components/organization/credit-activity-screen.tsx
• apps/mobile/src/components/organization/invoices-screen.mounted.test.tsx
• apps/mobile/src/components/organization/invoices-screen.tsx
• apps/mobile/src/components/profile-credits-card.mounted.test.tsx
• apps/mobile/src/components/profile-credits-card.tsx - 1 issue
• apps/mobile/src/i18n/locales/en.json
• apps/mobile/src/lib/new-session-submit.test.ts
• apps/mobile/src/lib/new-session-submit.ts
• apps/mobile/src/lib/picker-bridge.ts
• apps/mobile/src/lib/use-new-session-repos.test.ts
• apps/mobile/src/lib/use-new-session-repos.ts

Fix these issues in Kilo Cloud

Previous review (commit 58dd6b4)

Status: 3 Issues Found | Recommendation: Address before merge

Overview

Severity	Count
CRITICAL	0
WARNING	3
SUGGESTION	0

Issue Details (click to expand)

WARNING

File	Line	Issue
apps/mobile/src/lib/use-new-session-repos.ts	246	Force-fresh Bitbucket overwrites cache with temporarily_unavailable
apps/mobile/src/components/agents/new-session-screen-body.tsx	181	Bare-fullName fallback can bind the wrong provider
apps/mobile/src/components/agents/new-session-screen-body.tsx	434	Start gated on string; create uses resolved row

Files Reviewed (16 files)

• apps/mobile/src/app/(app)/agent-chat/new.tsx
• apps/mobile/src/app/(app)/agent-chat/repo-picker.tsx
• apps/mobile/src/app/_layout.tsx
• apps/mobile/src/components/agents/new-session-configure-form.test.ts
• apps/mobile/src/components/agents/new-session-configure-form.tsx
• apps/mobile/src/components/agents/new-session-repository-section.tsx
• apps/mobile/src/components/agents/new-session-repository-state.test.ts
• apps/mobile/src/components/agents/new-session-repository-state.ts
• apps/mobile/src/components/agents/new-session-screen-body.tsx - 2 issues
• apps/mobile/src/components/agents/repo-selector.tsx
• apps/mobile/src/components/agents/use-new-session-creator.test.ts
• apps/mobile/src/components/agents/use-new-session-creator.ts
• apps/mobile/src/components/root-layout-controller.tsx
• apps/mobile/src/i18n/locales/en.json
• apps/mobile/src/lib/use-new-session-repos.ts - 1 issue
• scripts/inspect-mobile-artifacts.mjs

Fix these issues in Kilo Cloud

---

_{Reviewed by grok-4.6 · Input: 83.9K · Output: 11.1K · Cached: 551K}

_{Review guidance: REVIEW.md from base branch audit-w7b-data-contracts-dffd-s4}