@1yefuwang1/dsh-worktrees 0.2.13 → 0.2.18

package/CHANGELOG.md

@@ -1,5 +1,117 @@
 # @1yefuwang1/dsh-worktrees changelog
 
+## 0.2.18 — Theme-aligned conversation controls and local starting branches
+
+- Replace the native Local/New worktree dropdown and the mismatched Local-only
+  button with the same compact, theme-aware menu control.
+- Default the starting branch to the current local branch (or the detached HEAD
+  commit), display its name, and replace “Base branch” with “Starting branch”.
+- Offer Local and Remote branch sources. Local worktrees pin an exact committed
+  local branch without fetching, including repositories with no configured remote;
+  remote worktrees keep the fresh-fetch creation path.
+- Load one bounded branch generation and search it locally. Keystrokes preserve
+  selection and never rediscover remote branches; source/remote switching reuses
+  loaded lists until explicit Refresh or target/connection invalidation.
+- Select and dismiss immediately on branch click, with Escape/focus dismissal and
+  keyboard navigation instead of a Close button.
+- Preserve source-checkout, permission, cancellation and native-draft guards;
+  refuse moved local selections rather than silently substituting another commit.
+- Use the native desktop menu fill/elevation rather than the light overlay token;
+  match native hover/segment colors and keep the search icon/input on one row.
+  Fence the search reset against generic input/focus rules to avoid double borders.
+- Keep the branch picker open during Refresh: move focus to the stable search
+  field before disabling Refresh, and distinguish loading-related null blur from
+  actual outside focus. Preserve search and selection across local/remote reloads.
+- Add backend, protocol/cache and real React interaction/style-cascade coverage.
+
+## 0.2.17 — Folder entries follow the composed picker, with a working default
+
+- Stop offering an add interaction the session cannot serve. The Host composes
+  either the system chooser (loopback desktop: `pick` only) or the in-app browser
+  (remote, SSH or browse-composed sessions: `listDirectory`/`createDirectory`
+  only), and the other verb set fails with `directory-picker/unavailable`. The
+  dialog now probes listing once and shows **Browse for folders** only when the
+  in-app browser can actually list Host folders.
+- Keep **Choose a folder…** for a session with any reachable chooser (desktop
+  bridge or `uiWorkspace.pickDirectory`) and **Enter a folder path** everywhere, so
+  project creation stays possible in every composition, including desktop where
+  multi-folder projects are built by repeating the system dialog or pasting paths.
+- Fall back deterministically when a selected entry disappears: to the system
+  chooser when there is one, otherwise to path entry.
+- Ask one dialog source at a time for the native entry: the shell bridge first,
+  `uiWorkspace.pickDirectory` only when the bridge is absent or fails. A cancelled
+  dialog is an answer and is never handed to the second source, so cancelling opens
+  no follow-up dialog, while a broken bridge still falls through to a working Host
+  verb. A source that never settles stays with the operator to dismiss — the client
+  bundle is timer-free by contract, so no deadline can be imposed.
+- Default to the entry that needs no typing: the system chooser where one exists,
+  the in-app browser where the Host lists directories, and path entry only when
+  neither is reachable. Path entry stays the pre-probe placeholder and is
+  promoted once the capability answer arrives, never overriding a user choice.
+- Assert executable-bit and unreadable-file behaviour only where the platform carries
+  POSIX permission bits; Windows has neither, so those checks reported failures
+  instead of uncovered behaviour. Path expectations use the platform separator
+  throughout.
+- Use portable fixture names (no newline in a filename, which Windows rejects), and
+  make the handoff fixture's line endings independent of the runner: the source
+  pins `core.autocrlf` before its first add, and the clone's working tree is
+  re-materialised under the same pin. A fresh target clone must then read clean with
+  the exact status command the engine's cleanliness gate runs — measured, because a
+  Windows runner materialised the clone with endings that differed from the blob and
+  every handoff preview failed as `TARGET_DIRTY` far from the cause.
+- Compare worktree registrations canonically when verifying a checkout: Git reports
+  `worktree list` in machine format, so a raw string comparison against the
+  canonical root failed on Windows, where separators and short names differ. An
+  entry that cannot be resolved now stays unmatched instead of turning a stale
+  registration into a failure to enumerate.
+- Use the platform separator in fixture ownership assertions and accept CRLF when
+  parsing the checked-out client bundle, so the suites can pass on Windows.
+- Test fixtures create their owned directories under one canonical temporary root.
+  macOS resolves `/var` through a symlink to `/private/var` and Windows can return
+  short or differently-cased names, so fixtures that mixed `os.tmpdir()` with
+  `realpath(tmpdir())` failed their own containment assertions on both platforms
+  while passing on Linux. A filesystem that rejects non-UTF-8 names now reports that
+  decoding coverage is not exercisable instead of failing the suite.
+
+- Deferred, not implemented: serving directory listing from this plugin's own Host
+  half, which would restore the in-app multi-folder browser on desktop. The design,
+  the measured reason DSH's composed picker cannot serve both verb sets, and the
+  test matrix to carry over are recorded in
+  [docs/host-directory-listing.md](docs/host-directory-listing.md).
+
+## 0.2.16 — Clearer folder-entry labels
+
+- Rename the three Add entries so each states its interaction: **Browse for
+  folders** (in-app multi-select), **Choose a folder…** (one folder from the
+  system dialog) and **Enter a folder path**, in English and Chinese. The
+  resource keys are unchanged, so only the visible text moves.
+- Lock the mapping with coverage that reads the rendered options and fails when a
+  value is missing, renamed or labelled like another entry.
+
+## 0.2.15 — Capability-aware folder chooser
+
+- Resolve the native add option from the picker that really exists in the current
+  session instead of a fixed dropdown entry: the desktop shell's renderer bridge
+  first, then the Host directory-picker plugin's `uiWorkspace.pickDirectory`.
+  Hide the option entirely when neither is present, and fall back to browsing if
+  it disappears while selected.
+- Keep the in-app browser and the manual absolute-path entry available in every
+  session, including desktop, where the native option previously failed with a
+  picker error.
+- Add regression coverage for desktop, browser, missing and non-callable picker
+  sources plus the unavailable-mode fallback.
+
+## 0.2.14 — Native sidebar view switch
+
+- Move the view switch from the footer into native sidebar navigation, between
+  Automation tasks and Worktrees, using the native row styling and icon sizing.
+- Label the action by its destination: **Switch to Projects View** or
+  **Switch to Workspace View**, with matching Chinese translations.
+- Preserve native sidebar declarations and extensions through owned slot aliases;
+  switching views leaves the current conversation and other panel actions intact.
+- Add regression coverage for navigation order, labels, callback routing and
+  native sidebar restoration on plugin unload.
+
 ## 0.2.13 — First scoped release preparation
 
 - Package as `@1yefuwang1/dsh-worktrees` to avoid an unrelated unscoped npm name;

package/README.md

@@ -1,8 +1,8 @@
 # @1yefuwang1/dsh-worktrees
 
 Multi-folder projects with Local and isolated Git worktree threads for DeepSeek
-Harness. This experimental Host + Web Client package is **`0.2.13`**, prepared for
-scoped npm release with maintainer review/2FA. It does not require Copilot, the
+Harness. This experimental Host + Web Client package is **`0.2.18`**; new releases
+use staged npm publishing with maintainer review/2FA. It does not require Copilot, the
 catalog plugin, or the search plugin. The scoped name avoids collision with the
 unrelated npm package `dsh-worktrees`; stable tool, command and metadata names are
 unchanged.
@@ -14,6 +14,9 @@ A **thread** belongs to that project and executes in one selected folder: either
 its Local directory or a managed linked Git checkout. Project membership is not
 native Workspace membership, a working-directory change or a permission grant.
 
+- The native sidebar navigation places the view switch between **Automation tasks**
+  and **Worktrees**. Its destination label is **Switch to Projects View** or
+  **Switch to Workspace View**; switching leaves the current conversation intact.
 - The compact **Projects** header uses Search, View options and Add project icon
   controls. Search appears only when opened; Escape/Close clears it and restores
   focus. Archive filters are in View options, not an always-visible dropdown.
@@ -40,8 +43,19 @@ native Workspace membership, a working-directory change or a permission grant.
   navigation. Repeat Add to extend the list; each selected folder shows its name,
   full path and a remove action. A project supports **1–32 folders**; duplicate
   picks are ignored and over-limit batches are refused without dropping entries.
-  The source dropdown also offers manual absolute paths and the optional native
-  system chooser (one folder per pick). Use **Cancel** to discard unsaved edits;
+  The source dropdown names each interaction — **Browse for folders** (the in-app
+  multi-select dialog), **Choose a folder…** (the system dialog, one folder per
+  pick) and **Enter a folder path** — and offers each only where the session's
+  composed directory picker can serve it. A loopback desktop composes the system
+  chooser only, so it gets **Choose a folder…** and path entry; the in-app browser
+  appears where the Host lists directories (remote, SSH or browse-composed
+  sessions). Since the picker choice is composed at boot, it is not a setting. The dropdown
+  defaults to that share — the system chooser on desktop, the in-app browser where
+  the Host lists directories, and path entry only when neither exists.
+  Because that composition is fixed at boot, the in-app browser cannot be reached on
+  desktop through DSH's picker seam; [host-directory-listing.md](docs/host-directory-listing.md)
+  records the deferred design for serving listing from this plugin's own Host half.
+  Use **Cancel** to discard unsaved edits;
   saving/native picking blocks dismissal until it settles, and Host refusals preserve the
   draft. The same folder-list design is used by **Manage project**. Removal edits
   membership only, never deletes files; ownership/use restrictions remain Host-
@@ -98,9 +112,10 @@ canonical execution paths; DSH core and the application shell are not modified.
 ## New Conversation: Local or New worktree
 
 Start a new conversation through the default UI. Its **normal composer** offers
-**New worktree** only after its actual selected folder passes local Git validation
-and has a configured remote. Ordinary non-Git folders, unverified/unsupported
-sources and failed checks show **Local** only, with no remote-branch controls.
+**New worktree** only after its actual selected folder passes local Git validation.
+A configured remote is not required. Ordinary non-Git folders, unverified/unsupported
+sources and failed checks show **Local** only, using the same compact, theme-aware
+control as Git folders and no branch picker.
 Git repository subfolders remain eligible; no `.git`-directory heuristic is used.
 The workspace picker, rich editor, attachments, native Enter/Send and rollback
 stay installed; there is no separate first-message dialog.
@@ -123,11 +138,12 @@ tree support; normal creation checks still apply.
    native keyboard gesture). Native command adjudication and chip serialization
    run first; claimed/handled commands keep their original command path and do
    not provision a checkout.
-3. A full-width progress panel shows **Fetching latest remote branch → Creating
-   worktree → Generating and applying branch name**. The Host freshly fetches the
-   chosen base, creates a random directory/initial local branch, then runs the
-   configured fast auxiliary naming model and renames only that branch. Naming
-   completes before the new conversation receives the prompt.
+3. A full-width progress panel shows **Creating worktree → Generating and applying
+   branch name**, preceded by **Fetching latest remote branch** only for a remote
+   selection. The Host pins the selected local commit without fetching, or freshly
+   fetches the selected remote branch, creates a random directory/initial branch,
+   then runs the configured fast auxiliary naming model and renames only that
+   branch. Naming completes before the new conversation receives the prompt.
 4. After the named checkout and exact blank session are ready, generic file drafts
    are re-uploaded for that exact session (receipts cannot cross sessions). The
    original, natively serialized prompt and ordered attachments are admitted once
@@ -139,10 +155,19 @@ of the normal conversation model. The foreground naming deadline is at most
 15 seconds (or a shorter configured deadline); unavailable or invalid output
 uses a deterministic safe fallback, never another-model retry.
 
-The optional **Base branch** control explicitly reads advertised branches so you
-can choose any configured remote/base before Send. Selecting the worktree mode
-itself does not query Git. `origin`/`main` are preferences, not restrictions. The
-actual checkout always uses a fresh selected-branch fetch; failed fetches never
+The **Starting branch** control displays the current local branch by default,
+not an ambiguous “Base branch” placeholder. Open it to choose **Local branches**
+(no remote access) or **Remote branches**. A detached checkout defaults to its
+current `HEAD` commit. The search filters the complete loaded branch generation
+locally: keystrokes never refetch, change selection or lose its pinned commit.
+Switching back to a previously loaded source/remote reuses that list; **Refresh**
+explicitly loads a new generation. Clicking a branch selects it and dismisses the
+picker immediately. Escape or moving focus outside also dismisses it; there is
+no Close button. Selecting worktree mode itself does not query Git.
+
+Local selection starts from a committed local branch, not uncommitted files; a
+selected commit that moved before creation is refused rather than substituted.
+Remote creation always fetches the selected branch afresh; failed fetches never
 substitute cached commits. Only the selected project folder is isolated.
 
 Progress uses bounded, event-driven wait requests over authenticated Connection
@@ -183,7 +208,7 @@ namingMaxTokens: 256
 
 These are plugin Config fields, not another New Chat form. The first ordinary
 prompt is bounded before branch naming. Inference happens only after successful
-fresh fetch and checkout creation, and the exact generated result is persisted
+local pinning or remote fetch and checkout creation, and the exact generated result is persisted
 before rename; ready same-operation replay does no fetch, inference or creation.
 The foreground deadline is `min(namingTimeoutMs, 15000)`. Disabled/unavailable,
 timed-out or malformed naming yields a safe deterministic branch name and can
@@ -201,7 +226,7 @@ new lazy UI supplies `firstPrompt` and never schedules that background rename.
 
 ## Manager, reminders and guarded Local handoff
 
-The advanced **Worktrees** sidebar panel shows recorded checkouts, fetched bases,
+The advanced **Worktrees** sidebar panel shows recorded checkouts, pinned bases,
 current/last-known branch and dirty state, conversations, protection, archive
 state and errors. The started-conversation header reads cached project/backing
 metadata only; there is no Worktrees button beside the project name in the chat
@@ -231,7 +256,7 @@ For handoff, open a conversation belonging to the chosen worktree first:
 
 1. Stop all writers in both checkouts, including external editors, processes,
    terminals, jobs and other sessions.
-2. Preview the patch relative to the saved fetched base. The default target is
+2. Preview the patch relative to the saved pinned base. The default target is
    the original Local checkout; an optional explicit Local path must pass the
    same repository and identity checks.
 3. Review changed files, binary markers, byte count, base identity and retained
@@ -300,7 +325,7 @@ or applied patch may already be committed when cancellation arrives. Inspect
 **operation status** and the manager before retrying; recovery-required records
 are retained with errors. A successfully committed operation replay with the
 **same immutable request and operation UUID** returns its original session and
-fetched commit, rather than allocating another blank session or fetching again.
+pinned commit, rather than allocating another blank session or fetching again.
 Changed settings, changed request or a new fresh preparation require a new UUID.
 
 The adapter never writes/clears the source draft; native submit machinery owns
@@ -331,7 +356,7 @@ After the staged release is approved and appears on npm, install the scoped
 package (the similarly named unscoped package is unrelated):
 
 ```sh
-dsh plugin --profile <profile> add @1yefuwang1/dsh-worktrees@0.2.13
+dsh plugin --profile <profile> add @1yefuwang1/dsh-worktrees@0.2.18
 ```
 
 For local development or while release approval is pending, build explicitly from
@@ -403,14 +428,19 @@ means `list`. IDs and operation/preview IDs are UUIDs. Example read operations:
 ```text
 /worktree status
 /worktree list {"includeArchived":true,"limit":50}
+/worktree branches {"branchSource":"local","query":"feature","limit":50}
 /worktree branches {"remote":"upstream","query":"feature","limit":50}
 ```
 
 Actions: `list`, `status`, `branches`, `create`, `start`, `branch`, `protect`,
 `archive`, `preview`, `export`, `handoff`. `repoPath` defaults to the caller's
-execution directory where supported. `create` requires a new `operationId`,
-remote and remote branch; the UI also captures remote identity/settings hash and
-requires an unchanged blank source. `sessionMode: "new"` starts empty history;
+execution directory where supported. `create` requires a new `operationId` and
+either `branchSource: "local"` with `localBranch` (plus `localOid` to refuse a
+moved selection), or a remote and `remoteBranch` (the backwards-compatible default
+when `branchSource` is omitted). Detached `localBranch: "HEAD"` requires `localOid`.
+Local requests cannot contain remote fields, and vice versa. The UI captures the
+expected local commit or remote identity, settings hash, and requires an unchanged
+blank source. `sessionMode: "new"` starts empty history;
 `"continue"` inherits through a completed turn. `status` can inspect a worktree
 `id` or an `operationId`, not both. `export` consumes a retained `previewId`;
 `handoff` requires that preview and its own operation UUID.