@cerbur/clutch-dsh-worktree 0.1.17 → 0.1.19

package/README.md

@@ -8,18 +8,17 @@ Workspace identity, Session metadata, native lists, messages, and conversation h
 
 Tool preferences are stored in separate Host-owned files, outside relationship indexes and native
 Session metadata. The plugin stores Worktree relationships, acquisition facts, shared Worktree instructions, and Workspace-root
-Main instructions in its own sidecar. Managed Worktrees expose a read-only baseline-relative Git & Changes dashboard, while Main exposes
-its Workspace-root HEAD history; the plugin does not copy transcripts or rewrite DSH Sessions.
+Main instructions in its own sidecar. Managed Worktrees expose a read-only baseline-relative Git & Changes dashboard, while Local/Main exposes
+its Workspace-root HEAD history with an optional comparison branch; the plugin does not copy transcripts or rewrite DSH Sessions.
 
 > **Preview:** Worktree Dashboard is an early, plugin-only MVP preview. Worktree navigation, lifecycle actions,
-> Session actions, Worktree/Main instructions, and the managed Worktree or Main Git & Changes view are connected.
-> Derived Worktrees and other unfinished actions remain marked
-> **Coming soon**.
+> Session actions, Worktree/Main instructions, Derived Worktrees, and the managed Worktree or Main Git & Changes view are connected.
+> Baseline synchronization creates an Agent task Session with your selected Rebase or Merge strategy.
 
 ## Installation
 
 After installing into a running DSH instance, restart DSH Desktop, or restart the DSH Web
-server and refresh the page, to load the plugin Host and permission configuration. Finish
+server and refresh the page, if the plugin Host has not loaded. Finish
 active tasks before restarting. If the Client loads while the Host is still unavailable, a
 native toast reminds you once per Client load. If a Worktree Session permission check reports
 that **Worktree Full Access** is unavailable and falls back to `workspace-write`, a separate
@@ -29,6 +28,13 @@ Workspace errors, unverified permissions, and explicit user restrictions do not
 missing-preset reminder. The reminder does not reload services or grant Full Access; if the
 preset remains unavailable after restarting, check the DSH plugin and permission configuration.
 
+Once the Host is available, a missing named preset alone no longer requires a restart on
+supported DSH profiles. The existing Full Access confirmation still requires acknowledgement;
+after confirmation, Worktree applies and verifies native per-Session file access and `ask`
+approval. The native menu may display **Custom** until the named preset loads. This changes
+neither the native preset catalog nor its defaults or Auto review integration. Unsupported
+profiles retain the fallback/recovery guidance above.
+
 ### Install from npm
 
 With an installed DSH CLI:
@@ -60,6 +66,17 @@ pnpm dsh web
 The DSH Web profile must be able to start before this plugin is added. Re-run the absolute-path
 install command after changing `package.json` or `cordis.patch.yml`.
 
+For Desktop, fully quit DeepSeek Harness after active tasks finish, then use the installed DSH CLI:
+
+```bash
+dsh plugin --profile desktop add /absolute/path/to/clutch-dsh/packages/clutch-dsh-worktree
+```
+
+Reopen Desktop after installation. Keep the local checkout and its installed `node_modules`
+available while it is linked; copying only `lib/` or removing the checkout's dependencies can
+cause the Host and permission-preset entries to fail to import. Client implementation dependencies
+are bundled during the build, so Desktop does not need separate Zustand or Immer modules.
+
 ### Install from GitHub source (optional)
 
 The package also supports the source dependency form used by the DSH plugin market:
@@ -76,8 +93,10 @@ development details, see [docs/DEVELOPMENT.md](docs/DEVELOPMENT.md).
 | Feature                         | Preview                                                                                                                                      | What it does                                                                                                                                                                                                                                                                                                                                                                                                                                                        |
 | ------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
 | **Worktree navigation**         | <img src="assets/screenshots/screenshots-en.png" width="420" alt="DSH Worktree navigation with Workspace, Main, Worktree, and Session rows"> | Adds a Worktree mode to the native DSH Sidebar. On macOS desktop, the panel shares DSH's native glass material without a second background layer or duplicate navigation showing through. Other platforms retain the theme fill; reduced transparency uses a stronger fill. Workspace expansion and new Session rows use native-style fades and movement. Browse each Workspace through Local/Main and Git Worktree rows, then open the Sessions bound to each row. |
-| **Create and import Worktrees** | <img src="assets/screenshots/screenshots-import.png" width="420" alt="Worktree create and import dialog">                                    | Create a Worktree from a local branch, or register an existing branch-attached Worktree in place. Import does not move, copy, or edit the existing directory.                                                                                                                                                                                                                                                                                                       |
-| **Worktree Dashboard**          | <img src="assets/screenshots/screenshots-dashboard.png" width="420" alt="Worktree Dashboard preview with Sessions and Worktree actions">     | The preview Dashboard shows Worktree identity, path, Sessions, Worktree/Main instructions, connected actions, the host-provided Open In action, and the read-only Git & Changes view for managed Worktrees or Main. Derived Worktrees and other unfinished cards remain **Coming soon**.                                                                                                                                                                 |
+| **Create and import Worktrees** | <img src="assets/screenshots/screenshots-import.png" width="420" alt="Worktree create and import dialog">                                    | Create a Worktree from a local or fetched remote branch, or register an existing branch-attached Worktree in place. Import does not move, copy, or edit the existing directory.                                                                                                                                                                                                                                                                                                       |
+| **Worktree Dashboard**          | <img src="assets/screenshots/screenshots-dashboard.png" width="420" alt="Worktree Dashboard preview with Sessions and Worktree actions">     | The preview Dashboard shows Worktree identity, path, Sessions, Worktree/Main instructions, connected actions, the host-provided Open In action, and the read-only Git & Changes view for managed Worktrees or Main. Derived Worktrees lists direct saved-baseline matches with paths, availability, and Dashboard navigation. Sync with Base creates an Agent task Session using Rebase or Merge baseline.                                                                                                                                                                 |
+| **Baseline synchronization** | <img src="assets/screenshots/screenshots-baseline-sync.png" width="420" alt="Sync with Base dialog with Rebase and Merge baseline choices"> | Choose Rebase or Merge baseline and create a native Agent task Session in the current Worktree. |
+| **Agent steer feedback** | <img src="assets/screenshots/screenshots-agent-steer.jpg" width="420" alt="Agent steer receipt above the input box, with sender and content"> | Inspect pending and received steer messages in the recipient Session without treating receipt as task completion. |
 | **Agent tool settings (Experimental)** | <img src="assets/screenshots/screenshots-worktree-tool.png" width="420" alt="Worktree tool settings preview">                               | Choose capabilities for `/cluworktree` in General, and independently configure automatic injection in Local/Main and managed Worktree Dashboards. Delegated Sessions receive result reporting only by default. |
 
 ## Usage
@@ -117,11 +136,51 @@ New Worktree actions use the same branch icon as Worktree rows. The Workspace ro
 on hover, keyboard focus, or while its options menu is open, matching the menu button.
 
 1. Open the options menu for Local/Main or an active Worktree and choose **Create Worktree**.
-2. Choose the local base branch. You can also provide a new branch name.
+2. Choose a local or fetched remote base branch and a new local branch name. The dialog suggests an available name.
 3. Confirm the dialog. The plugin creates the Git Worktree, records its acquisition facts, and
    continues through the normal Session and binding flow when you open a Session from that Worktree.
 
-Git must have a usable repository, local branch, and initial commit. If setup is incomplete, DSH
+The Create and Import tabs share aligned, full-width controls and consistent spacing between fields.
+
+Creation, saved baselines, and Git comparison use the same searchable selector, grouped into **Local branches**
+and **Remote branches**, with current/checked-out markers and filters for all, local, or remote branches.
+Dropdowns use DSH’s native menu material in light and dark themes.
+Dropdown lists are compact and prefer opening below the field, shrinking to available space with internal scrolling;
+they open above only when there is too little useful space below.
+Search ignores case; use Arrow Up/Down to move, Enter to choose, and Escape to close. Clicking within the dropdown keeps it open, including headings,
+empty space, search, filters, and fetch controls; selecting an option or clicking outside closes it.
+Branch and import selectors open immediately while candidates load, show a loading indicator inside,
+and update in place when data arrives. Search and filters stay intact; refreshes keep existing rows visible.
+Closing and reopening the baseline editor discards pending results from the previous dialog.
+Only the latest branch read or Fetch can update its candidates and loading state.
+Even with cached candidates, the dropdown paints its compact loading shell before preparing the list.
+The initial shell and loading state keep the same height; ready results size to their content within the scrolling limit.
+Large lists render only rows near the viewport; search, filters, and keyboard selection still cover every candidate.
+Switching between **Create** and **Import** replaces the form content in the same dialog without replaying its opening animation.
+Opening any branch selector rereads local Git refs, including changes made in a terminal. Returning to
+the browser does not reload candidates. Fetch reads the updated list once and supplies it directly to the selector.
+Opening the New Worktree dialog does not preload branches; its default comes from the current branch or HEAD.
+The full branch list is loaded only when a picker opens or Fetch completes. Workspace navigation
+reads Git readiness and the current root-checkout branch separately; entering Git & Changes loads history without preloading branches.
+The current local branch is preferred by default. Remote refs are read
+from the local repository. Use the download-arrow button beside **Remote branches** to fetch all configured
+remotes, including when the remote list is empty. Fetch updates remote branch refs and refreshes this Workspace;
+it preserves your current selection, local branches, tags and working files, and does not prune deleted refs.
+The button shows a loading icon during fetch, then displays **Remote branches updated** in place for two
+seconds before restoring the download icon. Failures retain the list and show a retry on the same button;
+the button details retain the error code, message, and diagnostics, also available in **Errors & Repair**.
+no extra status row is added beneath the list.
+Listing branches never contacts a remote automatically.
+Remote baselines require a new local branch when creating a Worktree; its short name may match the remote baseline
+when that local branch does not exist. Symbolic remote HEAD entries are excluded.
+
+Git must have a usable repository and initial commit. Choose a local branch, or choose **HEAD** to
+create a new branch from Main's current checkout, including an exact Tag or detached Commit.
+The localized HEAD option includes the current reference name, for example **HEAD (v1.0.0)**.
+Creation uses the commit shown when selected. If HEAD changes before submission, creation is rejected
+with `WORKTREE_STATE_CONFLICT`; refresh the dialog and select the source again.
+Main displays the current branch, exact Tag, or short Commit and retains its creation action when detached.
+If setup is incomplete, DSH
 shows the relevant readiness message and copyable setup guidance.
 
 When the Workspace is a repository subdirectory, its Worktrees preserve that relative directory.
@@ -134,8 +193,8 @@ Already-bound Sessions with a legacy Git-root cwd remain usable after a subdirec
 including automatic tool injection, Session discovery, follow-ups, result reports and default
 Worktree creation from their own checkout's HEAD. Their original cwd and history remain unchanged;
 new Session bindings still require the Workspace directory inside the checkout. Git file previews use
-relative addresses inside the current Session cwd and absolute addresses for other checkout files,
-subject to DSH's native file-access checks.
+relative addresses inside the target Session cwd. Files outside that cwd show a prompt to use an IDE
+or a Session at the repository root; already-bound Git-root Sessions keep their original preview scope.
 
 ### Enable Agent Worktree tools
 
@@ -175,8 +234,8 @@ The six selectable capabilities correspond to these tools:
 
 | Tool                    | Parameters                                                         | Behavior                                                                                                                                                                                                                           |
 | ----------------------- | ------------------------------------------------------------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `clutch_new_worktree`   | `name`, optional `baseBranch`, `instructions`                      | Creates a new branch from the calling Session's healthy Worktree branch; Local/Main uses the root checkout's current branch. An explicit local `baseBranch` overrides this. Returns the acquisition `baseBranch` and `baseCommit`. |
-| `clutch_list_worktrees` | optional `workspaceId`                                             | Lists managed Worktree ids, branches, paths, lifecycle and health, plus available local base branches. Defaults to the calling Workspace.                                                                                          |
+| `clutch_new_worktree`   | `name`, optional `baseBranch`, `instructions`                      | Creates a new branch at the calling Session's committed Worktree HEAD; Local/Main captures root HEAD, including detached HEAD. An explicit local or fetched remote `baseBranch` overrides this. Returns the acquisition `baseBranch` and `baseCommit`. |
+| `clutch_list_worktrees` | optional `workspaceId`                                             | Lists managed Worktree ids, branches, paths, lifecycle and health, plus available local and fetched remote base branches. Defaults to the calling Workspace.                                                                                          |
 | `clutch_span_worktree`  | `worktreeId` or legacy `name`, `prompt`, optional `model`, `title` | Creates a fresh native Session, binds it, configures its initial model and submits the prompt. Returns its `sessionId` and admission status.                                                                                       |
 | `clutch_list_models`    | optional `provider`                                                | Lists native provider/model routes, reasoning efforts and provider failures, alongside the current Session model and deployment default.                                                                                           |
 | `clutch_list_sessions`  | optional `workspaceId`, `worktreeId`                               | Finds existing Sessions, binding state, status and title. Unavailable relations return a diagnostic without reading their history.                                                                                                 |
@@ -189,16 +248,33 @@ within the calling Workspace; prefer stable `worktreeId` for dispatch. Creating
 Only committed state is inherited; staged, unstaged and untracked files are not copied.
 An unhealthy binding never silently falls back to Main. The default captures the calling checkout's
 committed HEAD, including a detached root HEAD. Detached sources return `baseCommit` without inventing
-a `baseBranch`; an explicit local `baseBranch` remains available as an override.
+a `baseBranch`; an explicit local or fetched remote `baseBranch` remains available as an override.
 
 Newly delegated Sessions automatically receive only
 `clutch_report_result({ status, summary, evidence?, requestId? })`. The Host fixes the destination
 to the delegating Session. `status` is `completed`, `blocked`, or `failed`; `summary` and `evidence`
 are each limited to 2,000 characters. The other six capabilities require `/cluworktree` or the
-Worktree's explicit automatic-injection selection. Reports arrive as ordinary queued native messages;
+Worktree's explicit automatic-injection selection. Reports arrive as queued native Agent relays, not human messages;
 verify their claims and evidence before accepting completion. Reports are model-driven:
 a crash, stopped Agent or unanswered human approval may prevent reporting. `idle` is not success.
 
+Agent-originated task dispatch, continuation and reporting record native `agent-message` /
+`relay` provenance with the actual sending Session. The Host derives that identity; tool inputs
+cannot impersonate another sender. Model-visible content includes an Agent-source envelope while
+preserving the supplied prompt body. Supported native Chat renders a relay/context disclosure with
+the sending Session, or an Agent turn trigger when it wakes the recipient, rather than a human
+message bubble. Protocol-level `user` role does not make it human input or elevate its authority.
+Human prompts and user-originated Dashboard synchronization keep their existing native user route.
+Old history is not rewritten or reclassified by guessing from text.
+
+Agent steer messages sent by this plugin also appear in an **Agent steer** strip above the
+recipient's input box. Expand an entry to see its sender and content. The strip distinguishes
+waiting, preparation, entry into conversation context, cancellation, and unconfirmed status;
+receipt does not mean task completion. Up to eight recent received/canceled entries remain
+after the turn ends and clear when a new turn starts; pending entries remain visible.
+Ordinary queued messages stay in the native queue. History outside the loaded window may
+not have enough evidence to reconstruct a steer receipt.
+
 Reporting is limited to the active delegated task. One successfully admitted `completed`, `blocked`,
 or `failed` report consumes and clears its in-memory token. The reporting tool, SDK and guidance
 stay stable; calls without a token are rejected. Later user input clears any remaining token;
@@ -228,7 +304,34 @@ history returns one `unavailable` diagnostic while keeping healthy list entries
 
 In PTC mode, the generated SDK exposes concrete argument types, including required report
 `status` and `summary`. Length limits remain in field descriptions and are enforced at execution;
-mutually exclusive dispatch targets use `oneOf` compatible with DSH's schema subset.
+all tool inputs use closed object roots without unions, including the nested model object.
+Dispatch keeps legacy exact branch names, but requires exactly one nonempty target at runtime;
+invalid targets or unknown fields fail before Session creation. Optional fields accept omission or
+`null` as omission, including model.reasoningEffort and mode (default queue); required fields still
+reject null. Blank identities/title/evidence are not defaults; empty instructions mean no save.
+For defaults, omit optional keys or use JSON `null`; neither `""`, `"null"`, nor a model
+object with empty provider/model fields means inheritance. New messages and first reports
+must omit `requestId` or use JSON `null`: the Host generates it. A rejected first report
+with an invented id explains how to correct it without consuming the report token.
+After uncertain admission, preserve the returned id and identical content for retry.
+
+Native schemas keep genuinely optional fields. For routes that otherwise generate empty optional
+values, opt in by exact provider id in the Host configuration:
+
+```yaml
+- id: clutch-dsh-worktree-host
+  config:
+    dshHome: !!js dshHomePath()
+    nullableToolProviders: [ocx]
+```
+
+This defaults to an empty list. For these providers, plugin tools in native model requests use
+required properties with nullable optional values and closed nested objects, retaining length bounds.
+A first report accepts only null for its wire requestId; an uncertain attempt restores the retry id
+field. The native catalog, PTC SDK, other plugins and execution validation keep their existing contracts.
+This does not enable a provider's strict mode or promise support across gateways. The local DSH pi-ai
+adapter and a real ocx/Luna route have been checked; other routes need their own verification. See the
+[tool schema standard](docs/TOOL-SCHEMA-STANDARD.md) for official sources, tested layers and limits.
 
 `model` is `{ provider, model, reasoningEffort? }`. Omission inherits the calling Session's
 effective selection, including reasoning effort; no catalog lookup is required for that default.
@@ -264,13 +367,13 @@ a resumed Session can enable `/cluworktree` and use `clutch_send_message` with a
 ### Import an existing Worktree
 
 1. Select a Workspace, open its branch-icon **New Worktree** action, and switch to **Import**.
-2. Choose a candidate from the branch-and-path list.
+2. Open the searchable Worktree selector and filter by branch name or path. Each candidate shows its branch and directory; choose the Worktree to import.
 3. Select **Import Worktree**. The plugin registers the existing directory without moving,
    copying, or changing its files, then uses the same Session flow as a created Worktree.
 
 The first version lists only ready, branch-attached, non-root Git Worktrees that are not already
 managed by the plugin. Detached, bare, prunable, missing, and invalid entries are omitted. Imported
-Worktrees can still use Git & Changes after you choose a local baseline branch.
+Worktrees can still use Git & Changes after you choose a local or fetched remote baseline branch.
 
 Import uses the same Workspace-relative directory rule and offers only candidates where that
 directory is available. Existing records are projected with the corrected path when the original
@@ -314,10 +417,46 @@ Use **Back to session**, Escape, a Sidebar Session, or Worktree mode exit to clo
 Sessions, the top-right action becomes **New Session** and starts one in that Worktree. The connected MVP surface
 can show Overview and Sessions, create a Session or Worktree, archive a Worktree, edit instructions, copy a
 path, open the recorded directory in VS Code, and inspect Git & Changes.
-Derived Worktrees and other marked quick actions remain placeholders. VS Code must be
+Quick Actions offers baseline synchronization and archive. VS Code must be
 installed on the browser's machine and able to access the recorded path; the link does not verify
 launch success.
 
+**Derived Worktrees** shows managed Worktrees in the same Workspace whose saved baseline matches
+this checkout's current local branch. Overview previews five entries; the tab shows all matches,
+including archived entries with their availability and paths. Click an entry to open its Dashboard.
+Changing a saved baseline updates the relationship; this view represents direct baseline matches,
+not Git ancestry or delegated Session history. Local branch names and `refs/heads/` refs match;
+explicit remote refs do not. Detached HEAD or an unknown Main branch has no matches. When a
+managed checkout's current branch is unavailable, its recorded branch is used.
+In a derived Worktree's Dashboard header, click the **Base** branch to open the matching
+Worktree or Local/Main Dashboard. The edit button remains separate. A link appears only
+when exactly one checkout in this Workspace matches; remote, missing, and ambiguous bases
+remain plain text. The link follows the saved baseline when you edit it.
+
+**Sync with Base** opens a dialog with **Rebase** and **Merge baseline**. Confirming creates and
+opens a fresh native task Session in the current managed Worktree. Escape closes only this dialog;
+while task admission is pending, Escape closes neither the dialog nor the Dashboard. The Session uses
+the configured default model and normal native permissions. The saved local or fetched remote baseline is used, and the
+Host rejects stale, missing, ambiguous or unhealthy targets before creating a Session. A baseline saved
+while branch enumeration is pending invalidates the old request with `WORKTREE_STATE_CONFLICT`;
+reopen the dialog to use the new baseline. Baseline saves wait for any final task admission already
+in progress for that Worktree. Local/Main
+has no synchronization task. The Agent checks for a clean working tree and stops on conflicts;
+Rebase rewrites the current branch's commits. Admission means the task started, not that Git finished.
+Inspect the Session's result before starting further work. Partial creation preserves the Session
+and offers **Open created Session**; retrying a failed transport request reuses its admission identity
+within the current Host lifetime. Binding, model, title, reporting, and task-submission failures also
+show a toast and a localized problem and recovery entry in **Errors & recovery**, including the
+created Session identity. Recovery opens that Session without creating or dispatching another task.
+Closing the Dashboard preserves diagnostic history and revokes its recovery callbacks.
+Partial failures arriving after closing the Dashboard or changing its target or baseline also
+retain the created Session identity in inactive history, without navigating away from the current view.
+Task creation supports plain-HTTP LAN browser access as well as localhost and HTTPS.
+Plugin restart clears admission memory. No automatic push or publish
+is performed. Terminal, Git Diff, Pull Request and Run Tests placeholders have been removed.
+After reconnecting, replayed synchronization notifications refresh the affected Workspace and
+current context while keeping ready content visible; unrelated Workspaces retain their views.
+
 ### Open the recorded directory in an app
 
 The Dashboard **Open in ...** split button is plugin UI backed by DSH's official Host routes:
@@ -336,18 +475,22 @@ existing VS Code protocol-link fallback.
 
 Open the **Git & Changes** tab from a managed Worktree or Main Dashboard. Main reads the current Workspace-root
 commit history directly and prepends an **Uncommitted changes** entry when the root has tracked, staged, unstaged, or
-untracked changes. It shows at most the first 200 committed commits, selects the first visible target, and uses the same
+untracked changes. Its baseline selector defaults to **None**, showing HEAD history without a total commit count.
+Choose a local or fetched remote comparison branch to show Baseline summary, the full comparison commit count,
+and ahead/behind facts. Selecting **None** returns to direct history. These choices stay in page memory.
+Direct history selects the first visible target and uses the same
 changed-file and diff panes for either a live working-tree target or a committed history entry. For a managed Worktree with a
 persisted `baseBranch` that differs from the current branch, or with a captured acquisition commit that
 supplies the implicit baseline, the Overview performs one compact, on-demand Git status read through the
 existing `/api` Connection. It shows ahead/behind commit counts plus separate
 committed (baseline-to-HEAD) and uncommitted (live working-tree) line totals; this is an ephemeral
-projection, not a watcher or a Worktree-record field. Main has no Worktree baseline comparison, so Overview remains
+projection, not a watcher or a Worktree-record field. Local/Main's comparison is a transient Git-tab choice, so Overview remains
 **Not connected** for ahead/behind facts while its Git tab still exposes Main history. Unavailable or baseline-unselected
-managed views honestly remain **Not connected**. Opening Overview does not load the branch list; the first Git tab
-activation loads local branches and, once a baseline is resolved, managed Worktree commit history. To replace that baseline, click the pencil icon beside the Base fact to open the branch
+managed views honestly remain **Not connected**. Opening Overview does not load the branch list; mounting the Git tab
+reads history against the saved branch or captured acquisition commit. Branch candidates load only when a
+selector opens; Fetch supplies its returned candidates directly. To replace that baseline, click the pencil icon beside the Base fact to open the branch
 picker: its search field sits permanently above a bounded branch list that shows roughly seven rows and
-scrolls internally, so the dialog keeps one size while you filter. Choose any local branch except the
+scrolls internally, so the dialog keeps one size while you filter. Choose any local or fetched remote branch except the
 current Worktree branch and save.
 The save replaces the persisted `baseBranch` in the plugin sidecar; the saved value becomes the default for
 the Git selector. Once the Git tab is open, changing its selector remains a transient view choice and reloads
@@ -356,19 +499,22 @@ history, changed files, and diffs without another Worktree-record write. If no u
 immutable captured acquisition commit and show that resolved commit as the Base fact; only a Worktree with
 neither a usable saved baseline nor a captured commit stays baseline-unselected and prompts you to choose
 one. When the selected branch has diverged, Git resolves the two heads' common ancestor. The
-Git & Changes view reports Worktree commits after that ancestor as `+N` ahead and base-branch commits after it
-as `-N` behind; history and file reads remain available. If the two heads have no common ancestor, the
+Git & Changes view reports Worktree commits after that ancestor as `↑ N` ahead and base-branch commits after it
+as `↓ N` behind; history and file reads remain available. If the two heads have no common ancestor, the
 committed summary falls back to the full tree diff between the base branch tip and Worktree `HEAD`, while
 history uses the Worktree commits not reachable from that base tip.
 With a valid managed Worktree baseline loaded, the Git & Changes tab initially selects **Baseline summary** rather than the
 first commit; changing the baseline branch also returns to that summary. Choose a commit or **Uncommitted
-changes** when you need a narrower target. Main skips this comparison-only summary but presents the same committed history and multi-commit selection behavior, plus a live working-tree target when the
+changes** when you need a narrower target. Local/Main with **None** skips this comparison-only summary but presents the same committed history and multi-commit selection behavior, plus a live working-tree target when the
 Workspace root has changes. Selecting **Uncommitted changes** compares the current Workspace root with `HEAD`; it does not
 create a baseline or write any Git state.
 
-The selected local branch is resolved again for each read. The browser can choose only a plain local branch
-name, not a raw commit SHA or arbitrary Git ref: a full ref path, tag, or remote-tracking ref is rejected
-outright, while a selected branch that no longer exists shows the honest unavailable state instead of a
+The selected local or fetched remote branch is resolved again for each read. Selectors display short names and
+use the enumerated `refs/heads/...` or `refs/remotes/...` as stable identities. New remote baseline saves retain
+the exact remote ref, so adding or removing a same-named local branch cannot change the baseline.
+Legacy short names are accepted only when unambiguous; an ambiguous saved value reports
+`WORKTREE_STATE_CONFLICT` and requires selecting the intended branch again. Raw commit SHAs, tags, and
+arbitrary revision expressions remain rejected. A selected exact branch that no longer exists shows the honest unavailable state instead of a
 generic Git failure. `baseCommit` is immutable acquisition metadata, is never user-selectable directly, and
 is the implicit baseline whenever no saved branch baseline is usable; creation recovery never overwrites
 it. When a managed Worktree or Main Workspace root has staged, unstaged, or untracked files, the list prepends an
@@ -382,18 +528,32 @@ one net diff from the same comparison boundary to the current working tree, incl
 unstaged, untracked, deleted, and renamed changes. This is a
 fresh on-demand projection rather than a concatenation of two diffs. Clicking a commit shows that
 commit's own diff. For managed Worktrees and Main, turn on **Multi-select commits** in the commits header to pick several committed rows
-and view the exact union of their first-parent deltas; Main has no baseline-summary or working-tree-inclusion controls, and the switch is off by default; turning it off
+and view the exact union of their first-parent deltas; Local/Main with **None** has no baseline-summary or working-tree-inclusion controls, and the switch is off by default; turning it off
 collapses the selection back to the focused commit. The changed-file list
 records the contributing commits, and each selected commit is rendered as its own diff segment; this is
 not an implicit range and does not include unselected commits. The changed-files column header shows the
 aggregate green `+N` and red `-N` totals for the current target, including the Baseline summary, selected
 commits, or Uncommitted changes; binary-only totals show Unknown. The working-tree entry remains mutually
-exclusive with committed multi-selection. The **Open in Sidebar** action in the summary diff toolbar
-reveals the current file in the native right sidebar using the current Session, only when that Session
-belongs to the Dashboard Worktree. An empty Worktree
-or an unrelated current Session cannot open a file through this action.
-
-Managed Worktree and Main history are each capped at 200 commits and mark longer histories as truncated. A changed-file list larger
+exclusive with committed multi-selection. **Open in Sidebar** is available in the diff toolbar and on
+existing changed-file rows. It uses the current Session when it belongs to the Dashboard group,
+otherwise the group's first visible Session, and explicitly expands the native right sidebar.
+With no target Session it prompts you to create one; the Overview's empty Session card includes **New Session**.
+File-tree paths, Diff titles and file requests are relative to the Workspace directory, for both Main and
+managed Worktrees. At `/repo/packages/app`, `src/index.ts` names `/repo/packages/app/src/index.ts`;
+repository-root `README.md` appears as `../../README.md`. The view retains changes across the checkout.
+Files outside the target Session cwd show a prompt instead of an invalid resource address.
+
+Main shows a local checkout status and omits derived Worktree creation-time and baseline facts.
+Ahead/Behind uses neutral commit counts (`↑ N` / `↓ N`), while added/deleted code lines keep their green/red counts.
+The sticky top bar truncates long references on one line, and only the reference text copies to the clipboard.
+
+Managed Worktree and Local/Main history load the newest 50 commits first. Scrolling to the bottom appends
+the next 50 without replacing the current selection or diff; the load-more button also supports keyboard use.
+Comparison views show the full committed total from ahead counts, independent of loaded pages.
+If HEAD or the baseline moves between pages, refresh before continuing; existing rows remain visible.
+The load-more button becomes **Refresh** after this conflict. Commit file and Diff reads also require
+a stable HEAD throughout authorization and reading.
+Multi-selection supports up to 200 selected commits. A changed-file list larger
 than the Git adapter's output bound reports an explicit truncated state instead of a generic error.
 Commit details use
 first-parent comparisons; root commits compare against the empty tree; rename and copy rows retain
@@ -419,7 +579,7 @@ and refresh behavior remains unchanged.
 
 The view is read-only and does not provide commit or staging controls. For managed Worktrees, the plugin validates committed
 entries against the selected branch-to-`HEAD` projection and re-reads working-tree paths against a fresh status projection;
-Main validates committed entries against its bounded HEAD-history projection. These endpoints are not generic Git object or file readers. Refresh keeps ready
+Local/Main validates committed entries against HEAD reachability, excluding baseline ancestors when comparing. These endpoints are not generic Git object or file readers. Refresh keeps ready
 content visible while replacement data loads, and late responses for an older commit or file selection
 are ignored.
 
@@ -480,7 +640,7 @@ text, actions and diagnostic details follow the font size selected in **Settings
   messages, prompts, transcripts, and history. The plugin never copies or rewrites those values.
 - The plugin's external index stores Worktree paths, branches, sources, lifecycle state, bindings,
   ordering, instructions, acquisition facts, and related metadata. For managed Worktrees, the
-  Dashboard Base fact is the persisted `baseBranch`; users can replace it with a local branch other
+  Dashboard Base fact is the persisted `baseBranch`; users can replace it with a local or fetched remote branch other
   than the current Worktree branch, and the saved value becomes the Git-tab selector default. The
   immutable acquisition `baseCommit` remains separate and is not rewritten by that edit. The index is
   kept in the DSH host plugin data directory, not in a project directory or DSH's raw data store. It
@@ -507,7 +667,7 @@ text, actions and diagnostic details follow the font size selected in **Settings
   (optionally including one fresh baseline-to-working-tree projection), one **Uncommitted changes**
   snapshot, changed files, and one unified diff at a time. These projections combine staged, unstaged,
   and untracked files when requested but are never written back to Git. The Dashboard does not provide
-  commit, staging, reset, revert, cherry-pick, fetch, push, pull, pull requests, graph lanes, pagination,
+  commit, staging, reset, revert, cherry-pick, push, pull, pull requests, graph lanes,
   or syntax highlighting.
 - Session rows and Dashboard cards use DSH's native status and relative-time presentation. The green
   completion dot is DSH's unread reminder for a Session that stops outside the current main view;
@@ -523,11 +683,16 @@ text, actions and diagnostic details follow the font size selected in **Settings
 - Active Worktree Sessions may request the named `worktree-full-access` preset after an explicit
   confirmation. The plugin appends this preset while preserving DSH's existing presets, default
   selection, and official Auto review integration. It combines DSH `danger-full-access` with `ask`,
-  keeps approval prompts enabled, and does not change network or process policy. If unavailable, the plugin falls back to
+  keeps approval prompts enabled, and does not change network or process policy. If neither the preset nor native Session policy writes are available, the plugin falls back to
   `workspace-write + ask` when possible or reports an unverified, retryable state. Permission
   services may mount late or be replaced: retry uses the currently available capabilities without
   restarting the Worktree Host. A temporarily missing service never grants Full Access, and an
   explicit user restriction is preserved. It cannot exceed the sandbox imposed by the host running DSH.
+- If the named preset is missing but native Session policy services are available, the same
+  confirmation applies `danger-full-access + ask` through native permission events instead.
+  Both effective values are verified before success is reported; the native menu may show
+  **Custom**. No synthetic preset identity is stored. Duplicate pending confirmations for the
+  same Workspace, Worktree, Session and path share one dialog; different targets remain separate.
 - Session-to-Worktree bindings and permission checks compare physical filesystem identity on the Host (`stat`/`realpath`) rather than relying on lexical path equality. This ensures robust compatibility across Windows and macOS path variations (including drive-letter casing, forward/backward slashes, UNC paths, and extended-length prefixes like `\\?\\`). On Windows, sidecar atomic persistence uses file-handle synchronization with best-effort directory sync, and Git CLI integration cleanly handles `NUL` null-device paths and CRLF line endings.
 - Git must be installed and available on `PATH`. A missing Git executable shows install guidance
   and no command block; the plugin does not run setup or installation commands.