* feat(source-control): resolve conflicts with one host operation shared by desktop and mobile
* feat(mobile): resolve merge conflicts and complete merges from Source Control
* test(mobile): pin Complete merge refusals and the older-desktop message
* fix(source-control): only resolve paths Git still reports as conflicted
* fix(source-control): refuse to keep a missing file and serialize conflict resolution per worktree
* fix(source-control): resolve only the exact conflicted path
* fix(source-control): match conflicted paths in Git's separator form on Windows and WSL
* fix(source-control): accept only the resolutions the live conflict offers
* fix(source-control): refuse to keep a both-modified file that is gone from disk
* feat(mobile): translate the merge conflict actions
* test(runtime): keep the mobile allowlist test under its line cap
* fix(mobile): let VoiceOver reach conflict action buttons
* Unify dedicated agent launch choices and argument badges
* Enable action model and effort menus with argument migration
* Bound argument choice edit range processing
* Preserve independent action effort through launch and migration
* Preserve literal config arguments and explicit launch permissions
* Respect repository action argument groups and share launch controls
* Remove duplicate action launch command coverage
* Add agent setup search and controls to the new tab menu
* Show inherited choices beside picker reset options
* Keep terminal Arguments separate from shared launch choices
* Launch default agents from rows and select resolved setup values
* Keep terminal settings available while Chat defaults load
* Reuse existing launch setup controls and Arguments editor
* Unify Source Control action choices and repository overrides
* Use precise types in action choice contracts
* Consolidate action choice test imports
* Correct action choice types and integration test boundaries
* Complete prepared terminal test result contract
* Align action integration expectations with canonical choices
* Keep launch defaults authoritative and couple CLI controls
* Assert production Chat preparation runs in launch contract
* Preserve alternate Chat launches and bound picker argument derivation
* Publish committed picker priority and satisfy control contracts
* test(mobile): type the file preview retry test helpers so the test typecheck passes (#35431)
(cherry picked from commit 0774fc9373)
* fix: keep picker integration tests within compiler boundaries
* fix: revalidate completed picker defaults on reopen
* test: give exported launch fixture mocks portable signatures
* fix: keep fallback launch carriers out of action mode controls
* Preserve Fast argument badges outside dialog mode controls
* Project existing Fast carriers independently of model capabilities
* Keep setup focus during launch row pointer transitions
* Allow declared tier choices without an inherited selection
* fix: place agent setup beside the launch menu
* Commit edited action arguments before planning and launch
Reconcile deliberate raw edits once into the submitted action recipe so replacement model and effort flags reach Save and Start together. Preserve captured sources and untouched load conflicts.
* Name portable Source Control dialog fixture results
* Keep agent setup contained and preserve known argument policy
* Use checked style properties in popup geometry fixture
* Keep setup scrolling inside a plain content wrapper
* fix(agent-picker): match the setup panel to the approved layout
Flush model search and list, one settings section with label-left rows
(Effort, compact Permissions menu, Fast mode), a fixed Arguments
disclosure row with its hint, and a summary footer with Launch chat /
Launch terminal. Settled defaults with nothing chosen keep the model
list and Effort pickable. Hovering another menu row no longer closes
the open panel.
* fix(agent-picker): use primitive-owned spacing and update launch labels in tests
* fix(agent-picker): add panel labels to localization catalogs
* Keep one launch setup open and align picker spacing
* Tighten launch model rows and clarify terminal hint
* Keep keyboard focus in replacement launch setup
* fix(tab-bar): keep a long agent setup result's chevron inside the menu
* test(agent-picker): wait for outgoing focus cleanup event
* Show empty model search feedback and name setup dialog
* test: register selection catalog in launch guard fixture
* fix(agent-picker): retain setup drafts and contain Arguments
* fix(agent-picker): retain authored setup route after alternate launch
* style(agent-picker): use a ghost setup chevron with divider
* style(agent-picker): apply muted color to setup glyph
* test(agent-picker): declare retained catalog default
* feat(sidebar): let card properties hide agent model badges
* Disable model visibility control until preferences load
* Register model label and separate WSL test projects
* test: complete serialized WSL routing fixture
* test: align legacy row snapshots with model badge token
* refactor(sidebar): colocate compact card reveal helper
* feat: warn macOS 12 users about upcoming support changes
* fix: use explicit border tokens in macOS support notice
* fix: route compatibility guides through the app link setting
* fix: balance support notice columns in narrow windows
* test: include macOS notice in suppressed feature-tip history
* Simplify macOS 12 notice and isolate compatibility checks
* Clarify Apple compatibility wording in macOS notice
* feat(settings): choose chat or CLI per agent in the Agents list
Each agent's open-as-chat choice lived in two places: Settings > Chat >
Providers and a Chat | CLI control under Default Agent. The choice now
lives only in each chat agent's row of Settings > Agents > Installed,
writing the same per-agent setting. Agents whose chat runs without their
CLI (a downloaded chat runtime) are listed as installed with CLI
unavailable, and the downloaded runtime and chat sign-in move into the
agent's row. Search and the install card's hint point at Agents. Shown
only while Chat UI is on, as before.
* Preserve agent choices and setup across inventory changes
* Fix settings regression test type conformity
* fix(source-control): resolve delete/modify conflicts and complete merges from the panel
* fix(source-control): address review findings on conflict resolution
* fix(source-control): save every view of the file before marking a conflict resolved
* fix(source-control): match unsaved conflict views by physical file only
* test(source-control): prove completeMerge refuses with a commit template set
* refactor(source-control): reuse autosave view matching and refresh only after a completed merge
* fix(source-control): drop the untranslated Complete merge fallback text
* fix(source-control): refuse Keep file when the file is gone and re-read unsaved views on retry
* fix(source-control): let Keep file stage conflicted symlinks with missing targets
* fix(source-control): run one conflict resolution per file at a time
* fix(explorer): open folder links that lead outside the project again
#24489 replaced in-memory path grants with declared file access, and the
explorer started refusing folder links out of the project with a toast.
fs:readDir now accepts user-named access; the explorer retries a contained
listing that main refuses only as outside the project, and files listed
that way open by absolute path so their tabs keep access after restart.
* fix(explorer): let main verify outside folder links, and list them only on a gesture
Review follow-ups:
- New project-folder-link access kind, accepted only for fs:readDir: main
lists a folder only when the nearest project folder above it holds a
symlink on the path, so an unregistered root's child or an arbitrary
folder stays refused. user-file no longer lists folders.
- The explorer follows a link only on a user act or under a folder already
listed as outside; refreshes never upgrade a contained listing.
- A link target that fails to list (EPERM, ENOENT) shows its own error.
- Open Markdown Preview opens outside rows by absolute path too.
- New/Duplicate/Rename/Delete are disabled on rows listed through an
outside link, since writes stay inside projects.
* fix(explorer): keep keyboard edits off outside-link rows, and follow listed link rows on reveal
- Enter-to-rename and the delete binding skip rows listed through an outside
folder link, matching the disabled context-menu items.
- A folder the parent listing shows as a symlink may follow the link without
a click, so reveal and re-expansion after a workspace switch list it; a
folder that only became a link stays refused until clicked.
- Pass followProjectFolderLink only when set, so existing read-call
expectations hold.
* fix(explorer): limit folder-link listings to project roots; no rename on outside-row double-click
- Orca's floating folder is not a project, so a link there no longer
authorizes an outside listing (direct IPC callers included).
- Double-clicking an outside-link row's name pins the preview instead of
starting a rename main would refuse.
* fix(mobile): retain editor styling when switching color schemes
* test(mobile): fit theme-switch harness hooks under the file line cap
---------
Co-authored-by: OrcaWin <293788423+OrcaWin@users.noreply.github.com>
* fix(pi): the thinking menu before the first message matches the chat's
Pi's pre-session catalog now asks Pi for its models over RPC and builds each
menu with the same projection a running chat uses, falling back to the text
listing only when Pi cannot answer over RPC.
* fix(pi): preserve remembered off effort on precise model lists
* test(pi): focus effort regression and stop fallback contracts
* test(pi): allow metadata reads between ordered option writes
* fix(pi): derive supported effort without replacing accepted intent
* test: cover host effort projection and refreshed frozen queues
* test: consolidate session option imports
* test: normalize absent catalog fixture records
* test: isolate host fixture types from client projects
* Preserve legacy effort capture for other agents
* fix(windows): start the WSL holder outside Orca's jobs so a crash doesn't take it down
* test(windows): prove the job closed with a non-breakaway control before checking the holder
Task checkboxes take their own text (excluding the checkbox label, nested lists and code blocks) as an aria-label, refreshed on every change, with 'Task' as the fallback for an empty item.
Co-authored-by: OrcaWin <293788423+OrcaWin@users.noreply.github.com>
* fix(mobile): keep table-cell and list-item line breaks on their own source line
Table cells and list items save line breaks as <br /> (and sibling P/DIV
blocks inside an item as breaks), and reopen attribute-free <br> tokens
as breaks, so Shift+Enter or Enter no longer splits a row or ends a list.
Typed '<br>' text gets only its '<' entity-escaped, raw text newlines
become spaces, and browser caret placeholder breaks are dropped (a cell
that holds only a placeholder saves empty; a cleared item keeps a <br />
so its marker still parses).
* fix(mobile): keep fenced code blocks inside Markdown list items
Indented fences under a list item (README steps such as
'1. Install:' followed by an indented bash fence) now read as a code
block inside the item and save back under the item's continuation
indent. Only items whose continuation holds a fence change; headings,
quotes, rules and tables after the fence end the item and read as
before. Top-level and list code blocks share one PRE writer, blank
separator lines are not indented, and a fence needs no blank line
beside it so tight items stay tight.
* fix(mobile): keep caret code blocks out of the paragraph they follow
Code block with a collapsed caret after text in its block ran native
insertHTML, which merged the PRE into that paragraph as prose. Prepend
a <br> only when content precedes the caret, so block-start, empty-line
and empty-document insertions stay as they were.
* fix(mobile): keep authored runs of trailing table-cell breaks
* fix(mobile): use template literal for list code-fence probe
---------
Co-authored-by: OrcaWin <293788423+OrcaWin@users.noreply.github.com>
A host-native hook path proves the agent ran on the host, so the 5s
session-ID fallback no longer walks every running distro's roots over 9P
while the transcript is unflushed. Mirrors the existing guest-hook-path rule.
The Asia drain and departing-redial runs asserted a 20ms-sampled mean of lock-waiting director
backends under 0.5; it flaked at 0.56 and 0.57 on loaded runners. A focused test now holds the
source cell row and proves a reconnect placement still lands on a target (and that holding the
target rows does block one); the load runs keep their outcome assertions and report the mean.
* fix(native-chat): keep chats stopped by a delivered kill readable after a downgrade
v1.4.244 accepts only three death kinds and sets aside any other record,
so a chat Stop force-killed (exit never observed) vanished after a
downgrade. Store the delivered kill as the absent pid an older build's
restart probe would itself record, plus an exact marker this build reads
back; in-memory code still sees kill-delivered.
* test(native-chat): explain release-checkout timeout
* test(native-chat): cover downgrade recovery and workspace rekeying
* test(native-chat): preserve checked record types at test boundaries
* fix(editor): preserve sibling tasks beneath ordered list items
* fix(editor): preserve wrapped inline markup in task items
* fix(editor): keep nested task continuations valid and editable
* fix(editor): keep literal task markers out of mixed checklists
* fix(editor): apply review fixes to task-list parsing stack
- Trim synthetic test matrices to the behavioral cases
- Regenerate pnpm-lock (drops a stale github-slugger importer entry)
- Assert the plain bullet's node type under an ordered parent
* fix(editor): keep one-column-deeper ordered tasks as sibling checkboxes
Dedent an ordered item's task block by the first task's column instead of
keeping its leading whitespace. A task one column deeper stays a sibling
checkbox, and text at or within the first task's column stays nested as
before. Strip leftover paragraph indent from task children.
---------
Co-authored-by: OrcaWin <293788423+OrcaWin@users.noreply.github.com>
* fix(mobile): preserve literal code through rich Markdown edits
* fix(mobile): preserve inline code containing backticks
* Preserve adjacent inline-code text when saving mobile Markdown
* Preserve quote paragraphs and blocks in mobile Markdown
* fix(mobile): preserve selected text when creating code blocks
* test(mobile): choose native history shortcut from browser host
* Preserve paragraph-owned mobile code blocks when saving
* Preserve code selected inside mobile headings after saving
* fix(mobile): keep code serialization space-normalized and trim review tests
- Inline code and code blocks keep turning browser-created NBSPs into spaces;
only the reader-side entity fix is needed for literal code.
- Inline code line breaks save as spaces so table rows and headings stay intact.
- Code blocks keep trimming trailing newlines left by placeholder <br>s.
- Heading- and paragraph-owned code blocks join adjacent inline code runs.
- Empty nested quotes reopen as a plain empty paragraph.
- Trim synthetic and behavior-locking tests.
* fix(mobile): keep quoted text literal when block reading would rewrite it
Quoted list continuations and lazy lines were restructured on save because the list reader drops them; reopen quote blocks only when they save the source or the same bytes as the literal paragraph.
* test(mobile): use template literal for saved code-block markdown
---------
Co-authored-by: OrcaWin <293788423+OrcaWin@users.noreply.github.com>
Catch-up pages called the native ledger once per dismissal, each call
re-reading, encoding and writing the full 24h UserDefaults ledger. A new
rememberAll bridge merges a whole page in one locked read/encode/write with
identical semantics (max seq per identity, refreshed 24h expiry).
* Plugins settings: one list with an Installed badge, inline switch and install-state filter
* test(plugins): drive card enablement through the inline switch
* plugins: keep the installed-read error on Not installed; cover installed cards past the cap
* plugins: inline category filter chips with icons from one category-icon module
* plugins: single-select category chips, marketing icon table, Remote/VMs label, trusted-code access copy
* plugins: Not installed waits for the installed-plugin read
* ci: retrigger
* fix(editor): keep keyboard completion results visible
* fix(editor): keep completion menus placed and keyboard results visible
* fix(editor): restore link bubble anchor and keep completion menus tied to their editor
Restore the link bubble's required anchorElement, keep editor clicks and
refocus from dismissing completion menus (selection sync still governs),
close them when the editor is hidden, and cover keyboard scrolling and
outside dismissal.
* fix(editor): share #34980's editor-visibility dismissal so completion menus close when their workspace is hidden but painted
* fix(editor): read latest dismiss callback via useEffectEvent instead of render-time ref write
---------
Co-authored-by: OrcaWin <293788423+OrcaWin@users.noreply.github.com>
* fix(editor): give the emoji picker dismissal and app theme behavior
Move the slash-command emoji picker onto the shared Popover so Escape and
outside clicks dismiss it, follow the app theme instead of the OS theme,
name the dialog for assistive tools, and close it when its editor is hidden
so the portaled picker cannot float over another tab or workspace.
* fix(editor): dismiss emoji picker when its workspace is hidden but still painted
Extract the link bubble's ancestor visibility check (opacity-0, inert, aria-hidden,
hidden, display/visibility) into editor-anchor-visibility.ts and reuse it, with an
ancestor MutationObserver, for the portaled emoji picker.
* fix(editor): read latest dismiss callback via useEffectEvent instead of render-time ref write
---------
Co-authored-by: OrcaWin <293788423+OrcaWin@users.noreply.github.com>
Removed paired workspaces kept their cached frame and reported pane until
environment teardown, and every workspace switch scanned those tombstones.
Clear them with the other per-worktree tracking and never cache removal frames.
useNativeChatTurnStatus returned a fresh object each render, busting the
slots memo and re-running buildNativeChatTranscriptSlots' transcript-length
passes on turnActivity/stopping/awaitingInput-only renders.
Hosted-review eligibility (baseRefExistsOnRemote) and PR remote-base probes
spawned one `show-ref --verify` per configured remote. Eligibility re-runs on
every source-control state change (commit, ahead/behind, dirty toggle, worktree
switch), so a repo with many remotes bursts dozens of git children each time.
Add probeExactRefsViaForEachRef: one stdin-free `for-each-ref -- <refs>` child,
keeping only exact matches (descendants do not count), with fallback to the
existing per-ref probes on any failure. On a 77-remote repo: 77 children /
~570ms -> 1 child / ~40ms, identical present/absent results.
Exact probes are now case-sensitive on every filesystem (for-each-ref matches
refnames byte-for-byte, unlike loose-ref show-ref on macOS/Windows), which
matches packed-ref and hosting-provider semantics.
Refs STA-8433, STA-6289
* fix(wsl): refuse a drive/UNC conversion that would split a nested duplicate project
A refused duplicate inside a converting folder had its path rewritten while its ids stayed,
so its terminal history and sessions no longer matched. Another spelling of the same folder
still converts with it.
Co-Authored-By: Claude <noreply@anthropic.com>
* fix(wsl): refuse only duplicates inside a converting folder, as an overlap
Review: an enclosing duplicate never splits, the same-spelling exemption keys on the main folder,
the blocker reads as an overlap instead of naming the clicked row, and the scan is skipped when
nothing is a duplicate.
Co-Authored-By: Claude <noreply@anthropic.com>
---------
Co-authored-by: Claude <noreply@anthropic.com>
* fix(editor): match Unicode heading anchors across rich and preview modes
* test(editor): drop slugger tests that only re-test github-slugger
The preview-parity test in markdown-anchor-scroll.test.ts covers the behavior that matters.
---------
Co-authored-by: OrcaWin <293788423+OrcaWin@users.noreply.github.com>
* fix(editor): open the link that received the modifier-click
* fix(editor): read clicked link href from its mark, not the sanitized DOM
Tiptap blanks rendered hrefs for file:, Windows drive paths and custom schemes; resolve the clicked anchor's document position and read the link mark instead.
---------
Co-authored-by: OrcaWin <293788423+OrcaWin@users.noreply.github.com>
* fix(terminal): retain only timings in typing diagnostics
* Remove typed text from latency diagnostics and cover task overlap
* Preserve text metadata in diagnostic lifecycle test
Catch-up scanned the whole chat journal once per retained prompt. Index prompt-to-turn matches once per reader, the same way the reader already indexes local prompts, keeping every match as a commit dependency in journal order.
Tracked in STA-12049.