commandmate 0.45.1 → 0.46.1

package/dist/server/src/lib/verification/scope-gate.js

@@ -30,11 +30,16 @@
  * @module lib/verification/scope-gate
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SCOPE_SKIP_NOT_REQUIRED = exports.SCOPE_SKIP_NO_CONTRACT = exports.ScopeMatcher = exports.CONTRACT_DIR_PREFIX = exports.SCOPE_EXEMPT_CONTRACT_PATH = exports.SCOPE_EXEMPT_ALWAYS_ALLOWED = exports.SCOPE_PATTERN_ARROW = exports.ALWAYS_ALLOWED_PREFIX = exports.SCOPE_ALLOW_GUIDANCE = exports.MAX_REPORTED_VIOLATIONS = void 0;
+exports.SCOPE_SKIP_NOT_REQUIRED = exports.SCOPE_SKIP_NO_CONTRACT = exports.ScopeMatcher = exports.ORCHESTRATOR_FOLD_TRAILER_VALUE = exports.ORCHESTRATOR_FOLD_TRAILER_KEY = exports.ORCHESTRATOR_FILES = exports.CONTRACT_DIR_PREFIX = exports.SCOPE_EXEMPT_CONTRACT_PATH = exports.SCOPE_EXEMPT_ALWAYS_ALLOWED = exports.SCOPE_PATTERN_ARROW = exports.ALWAYS_ALLOWED_PREFIX = exports.SCOPE_ALLOW_GUIDANCE = exports.MAX_REPORTED_VIOLATIONS = void 0;
+exports.isOrchestratorOnlyCommit = isOrchestratorOnlyCommit;
+exports.parseBranchCommits = parseBranchCommits;
+exports.isFoldCommit = isFoldCommit;
+exports.orchestratorOnlyPaths = orchestratorOnlyPaths;
 exports.isContractPath = isContractPath;
 exports.parsePorcelainEntries = parsePorcelainEntries;
 exports.parsePorcelainStatusEntries = parsePorcelainStatusEntries;
 exports.isSkillInstalledUntrackedEntry = isSkillInstalledUntrackedEntry;
+exports.collectBranchCommitChanges = collectBranchCommitChanges;
 exports.collectChangedPaths = collectChangedPaths;
 exports.scopeSkipDetachedContract = scopeSkipDetachedContract;
 exports.evaluateScope = evaluateScope;
@@ -117,6 +122,88 @@ exports.SCOPE_EXEMPT_CONTRACT_PATH = '(exempt: contract path)';
  * explicit `deny` can still catch an agent weakening its own gates.
  */
 exports.CONTRACT_DIR_PREFIX = '.commandmate/tasks/';
+/**
+ * Files the orchestrator commits on a PR branch after the worker's checks
+ * (orchestrate 6-4: the module-reference fold) (#3588).
+ *
+ * Copy of `ORCHESTRATOR_FILES` in `scripts/orchestrate/pr-common.mjs`, where
+ * `merge-pr.mjs` uses the same file rule to look past a fold commit to the
+ * worker's HEAD. A test imports the .mjs and compares the two arrays, so the
+ * merge side and this gate cannot drift apart.
+ */
+exports.ORCHESTRATOR_FILES = ['docs/module-reference.md'];
+/**
+ * The trailer that marks a fold commit, read the way `git interpret-trailers`
+ * reads it — from the message's trailer block only, so the same words in the
+ * middle of a body do not count (#3588).
+ *
+ * The file set alone cannot tell the orchestrator's fold from a worker that
+ * committed module-reference on its own, so this gate also requires the
+ * trailer. `workHeads` in pr-common.mjs deliberately does not: the merge side
+ * only decides which HEAD's records to read, and stays permissive.
+ */
+exports.ORCHESTRATOR_FOLD_TRAILER_KEY = 'Orchestrator-Fold';
+exports.ORCHESTRATOR_FOLD_TRAILER_VALUE = 'module-reference';
+/**
+ * Whether a commit's file list is the orchestrator's: at least one file, and
+ * every file in {@link ORCHESTRATOR_FILES} — the file rule of `workHeads` in
+ * `scripts/orchestrate/pr-common.mjs` (#3588).
+ */
+function isOrchestratorOnlyCommit(files) {
+    return files.length > 0 && files.every((file) => exports.ORCHESTRATOR_FILES.includes(file));
+}
+const FIELD_SEPARATOR = '\x1f';
+const TRAILER_SEPARATOR = '\x1e';
+/**
+ * Per commit: sha, parents, fold trailer values. With `-z` each record ends in
+ * NUL, which no commit message can contain; the sha and parent fields are hex,
+ * so only the trailer field is free text, and it is last.
+ */
+const BRANCH_COMMITS_FORMAT = `--format=%H%x1f%P%x1f%(trailers:key=${exports.ORCHESTRATOR_FOLD_TRAILER_KEY},` +
+    'valueonly,unfold,separator=%x1e)';
+/** Parse `git log -z` output in {@link BRANCH_COMMITS_FORMAT} (#3588). */
+function parseBranchCommits(output) {
+    const commits = [];
+    for (const record of output.split('\0')) {
+        const first = record.indexOf(FIELD_SEPARATOR);
+        const second = record.indexOf(FIELD_SEPARATOR, first + 1);
+        if (first <= 0 || second < 0)
+            continue;
+        const trailers = record.slice(second + 1);
+        commits.push({
+            sha: record.slice(0, first),
+            parents: record.slice(first + 1, second).split(' ').filter(Boolean),
+            foldTrailers: trailers === '' ? [] : trailers.split(TRAILER_SEPARATOR),
+        });
+    }
+    return commits;
+}
+/** Whether a non-merge commit is a fold (#3588): the trailer and the file rule both hold. */
+function isFoldCommit(commit, files) {
+    return (commit.parents.length === 1 &&
+        commit.foldTrailers.includes(exports.ORCHESTRATOR_FOLD_TRAILER_VALUE) &&
+        isOrchestratorOnlyCommit(files));
+}
+/**
+ * Paths that only fold commits touched on the branch (#3588).
+ *
+ * A path any other non-merge commit also touched is not returned: a worker
+ * that committed `docs/module-reference.md` itself — alone or with other
+ * files — is still judged on it. Merges are not passed in
+ * ({@link collectBranchCommitChanges} skips them): a merge's own edit inside
+ * {@link ORCHESTRATOR_FILES} is the approved integration of a refresh and
+ * leaves a fold-only path excluded, while its edits elsewhere stay in the
+ * branch diff and are judged as the worker's.
+ */
+function orchestratorOnlyPaths(commits) {
+    const byOrchestrator = new Set();
+    const byWorker = new Set();
+    for (const commit of commits) {
+        const target = commit.fold ? byOrchestrator : byWorker;
+        commit.files.forEach((file) => target.add(file));
+    }
+    return new Set([...byOrchestrator].filter((path) => !byWorker.has(path)));
+}
 /** Whether git reported a path that {@link CONTRACT_DIR_PREFIX} excludes. */
 function isContractPath(path) {
     return path.startsWith(exports.CONTRACT_DIR_PREFIX);
@@ -352,6 +439,61 @@ function parsePorcelainStatusEntries(output) {
 function isSkillInstalledUntrackedEntry(entry, owned) {
     return entry.status === '??' && entry.paths.every((path) => owned.has(path));
 }
+/**
+ * The non-merge commits of `<base>..HEAD` of a worktree, each judged by
+ * {@link isFoldCommit} (#3588). The scope gate drops what only folds touched
+ * ({@link orchestratorOnlyPaths}); the work-evidence gate does not count a
+ * fold as the worker's commit (#3633). Empty when no commit carries the fold
+ * trailer: none can be a fold, so the per-commit calls are skipped.
+ *
+ * File lists come from one `git diff-tree -z` per commit rather than from one
+ * `git log --name-only -z` stream: in that stream a commit header and a path
+ * are both NUL-terminated fields, and a path may start with a newline or a
+ * control character, so no parse of it can tell them apart. diff-tree prints
+ * paths and nothing else.
+ *
+ * A merge's own edits are split by path. Inside {@link ORCHESTRATOR_FILES}
+ * they are the approved integration — orchestrate lets the orchestrator
+ * resolve a refresh conflict in shared files such as module-reference by
+ * machine — so a fold-only path stays excluded. Every other path a merge edits
+ * is never a candidate (a fold changes only ORCHESTRATOR_FILES), so it stays in
+ * the branch diff and scope judges it as the worker's. Merges are therefore
+ * skipped here without asking `git diff-tree --cc`.
+ */
+async function collectBranchCommitChanges(worktreePath, base) {
+    const log = await runGit(['log', '-z', BRANCH_COMMITS_FORMAT, `${base}..HEAD`], worktreePath);
+    if (log.code !== 0) {
+        return {
+            error: `'git log ${base}..HEAD' failed.` + (log.stderr.trim() ? `\n${log.stderr.trim()}` : ''),
+        };
+    }
+    const commits = parseBranchCommits(log.stdout);
+    // Nothing to exclude without a trailer; skip the per-commit calls.
+    if (!commits.some((commit) => commit.foldTrailers.length > 0))
+        return { changes: [] };
+    const changes = [];
+    for (const commit of commits) {
+        if (commit.parents.length !== 1)
+            continue;
+        const tree = await runGit(['diff-tree', '--no-commit-id', '--name-only', '-z', '--no-renames', '-r', commit.sha], worktreePath);
+        if (tree.code !== 0) {
+            return {
+                error: `'git diff-tree ${commit.sha}' failed.` +
+                    (tree.stderr.trim() ? `\n${tree.stderr.trim()}` : ''),
+            };
+        }
+        const files = splitNul(tree.stdout);
+        changes.push({ sha: commit.sha, files, fold: isFoldCommit(commit, files) });
+    }
+    return { changes };
+}
+/** {@link orchestratorOnlyPaths} for `<base>..HEAD` of a worktree (#3588). */
+async function collectOrchestratorOnlyPaths(worktreePath, base) {
+    const result = await collectBranchCommitChanges(worktreePath, base);
+    if ('error' in result)
+        return result;
+    return { paths: orchestratorOnlyPaths(result.changes) };
+}
 /**
  * Every path this worktree changed relative to `baseRef`.
  *
@@ -379,6 +521,18 @@ async function collectChangedPaths(worktreePath, baseRef) {
                 (diff.stderr.trim() ? `\n${diff.stderr.trim()}` : ''),
         };
     }
+    // The orchestrator's fold commit (6-4) can sit under a re-instructed worker's
+    // commits; what only it touched is not the worker's change (#3588).
+    const orchestratorOnly = await collectOrchestratorOnlyPaths(worktreePath, base);
+    if ('error' in orchestratorOnly)
+        return orchestratorOnly;
+    const orchestratorExcluded = new Set();
+    const committed = splitNul(diff.stdout).filter((path) => {
+        if (!orchestratorOnly.paths.has(path))
+            return true;
+        orchestratorExcluded.add(path);
+        return false;
+    });
     // -uall: without it a new directory collapses to a single `?? dir/` entry, and
     // the gate would judge a directory name instead of the files inside it.
     const status = await runGit(['status', '--porcelain', '-z', '--untracked-files=all'], worktreePath);
@@ -405,12 +559,14 @@ async function collectChangedPaths(worktreePath, baseRef) {
         return true;
     });
     // Both sides are filtered, not just the working tree: an orchestrator may
-    // also have committed the contract as a setup commit (#1580).
-    const paths = new Set([...splitNul(diff.stdout), ...workingTree.flatMap((entry) => entry.paths)].filter((path) => !isContractPath(path)));
+    // also have committed the contract as a setup commit (#1580). The working
+    // tree keeps an uncommitted module-reference edit: no fold commit made it.
+    const paths = new Set([...committed, ...workingTree.flatMap((entry) => entry.paths)].filter((path) => !isContractPath(path)));
     return {
         paths: [...paths].sort(),
         mergeBase: base,
         agentStateExcluded: [...agentStateExcluded].sort(),
+        orchestratorExcluded: [...orchestratorExcluded].filter((path) => !paths.has(path)).sort(),
     };
 }
 // =============================================================================
@@ -470,6 +626,15 @@ function formatAgentStateExcluded(excluded) {
         ...(remainder > 0 ? [`  ... (+${remainder} more)`] : []),
     ];
 }
+/** The `excluded:` section naming orchestrator-only committed paths (#3588). */
+function formatOrchestratorExcluded(excluded) {
+    if (excluded.length === 0)
+        return [];
+    return [
+        'excluded (changed only by orchestrator commits, not counted as change):',
+        ...excluded.map((path) => `  ~ ${path}`),
+    ];
+}
 /**
  * Reasons the gate has nothing to judge, phrased for `log_tail`.
  *
@@ -546,6 +711,7 @@ async function evaluateScope(worktreePath, scope, requireScopeClean, baseRef, co
         `deny: ${formatPatterns(scope.deny)}`,
         ...formatAdmitted(admitted),
         ...formatAgentStateExcluded(changed.agentStateExcluded),
+        ...formatOrchestratorExcluded(changed.orchestratorExcluded),
     ].join('\n');
     if (violations.length === 0) {
         // An empty change set passes: work-evidence is the gate that judges "nothing

package/dist/server/src/types/sidebar.js

@@ -337,6 +337,7 @@ function toBranchItem(worktree) {
         exitedInstanceIds,
         unclassifiedInstanceIds,
         worktreePath: worktree.path,
+        worktreeStatus: worktree.status ?? null,
         waitingKind,
         awaitingInstruction,
         // `promptType` mirrors what `/api/worktrees` does with the same data

package/docs/en/architecture.md

@@ -621,41 +621,53 @@ For details, see [Status Indicator](./features/sidebar-status-indicator.md).
 
 ## 11. UI Layout Architecture (PC, Issue #727 / #730 / #747)
 
-> **Note**: The legacy desktop left-pane model (history / files / memo, MobileTabBar) introduced in #600 has been replaced by the ActivityBar model described in this chapter. Reorganizing the older descriptions is out of scope here.
+> **Note**: The legacy desktop left-pane model (history / files / memo, MobileTabBar) introduced in #600 has been replaced by the activity model described in this chapter (since Issue #3591: the header tools + ActivityPane). Reorganizing the older descriptions is out of scope here.
 
 This chapter covers the **responsibility boundaries, state ownership, and data flow** of the top-level PC UI layout (why the structure exists and who owns which state). Visual layout, interactions (keyboard / Tooltip), and the component catalog are owned by [./UI_UX_GUIDE.md](./UI_UX_GUIDE.md) as the single source of truth and are not duplicated here.
 
 ### 11.1 Component Responsibilities and State Ownership
 
-- **ActivityBar** (`src/components/worktree/ActivityBar.tsx`): A fully controlled component that **does not own** the activity-selection state. It receives `active` / `onToggle` as props and renders `ACTIVITIES` from `@/config/activity-bar-config` (the 6 activities: Files / Git / Notes / Schedules / Agent / Timer). The one exception is the sidebar toggle at the top (Issue #747), which reads `{ isOpen, toggle }` directly from `useSidebarContext()` and is placed outside the `role="tablist"` so it does not interfere with tab keyboard navigation.
+> **Note (Issue #3589 / #3591)**: The 48px full-height ActivityBar is gone from PC. Activities are opened from the tools at the right of the header (`HeaderToolBar`) and the Verification chip on the second row, and the ActivityPane opens from the right, laid over the body (pinning it puts it beside the body). The items below describe that layout.
+
+- **HeaderToolBar** (`src/components/worktree/HeaderToolBar.tsx`, Issue #3591): A controlled component that **does not own** the activity-selection state. It receives `active` / `onToggle` as props and draws `HEADER_TOOLS` from `@/config/activity-bar-config` (`ACTIVITIES` without `verification`) as icons at the right of the PC header (`DesktopHeader`). On a narrow header the trailing tools fold into a "…" list (`useDesktopHeaderFit` decides how many).
+- **VerificationStatusChip** (`VerificationStatusChip.tsx`, Issue #1816 / #2064 / #3590): The PC entry point of the `verification` activity (`CHIP_ACTIVITY_ID`). It sits in the second-row action bar and opens/closes the Verification pane when pressed. It is always drawn, reporting "unverified" on a branch with no execution contract (#2064).
+- **ActivityBar** (`src/components/worktree/ActivityBar.tsx`): The former 48px vertical Activity Bar. Since Issue #3591 it is not mounted on any screen (the sidebar open/close button moved to `SidebarPanelToggle` in #3512).
 - **ActivityPane** (`ActivityPane.tsx`): A stateless, table-driven dispatcher. It picks exactly one node — `activities[active]` — from the parent-built `ActivityContentMap` (`Partial<Record<ActivityId, ReactNode>>`) and renders it through an `ErrorBoundary`. Because a single `active` key resolves to a single node, **rendering multiple activities simultaneously is structurally impossible**.
 - **TerminalContainer** (`TerminalContainer.tsx`, Issue #730): Wraps a `terminal` slot (always rendered) and an optional `history` slot. Since Issue #744, the top-level History column is no longer rendered on PC; History was moved inside each terminal split (see §12). The `history` prop and the `useHistoryPaneState` wiring are kept for backward compatibility with the #730 single-column layout.
-- **WorktreeDesktopLayout** (`WorktreeDesktopLayout.tsx`, Issue #730): A **2-column layout** of ActivityPane and the Right pane. Issue #730 simplified it from 4 columns to 2 (History moved into the TerminalContainer in the Right pane, and the ActivityBar moved to full-height rendering in the parent). When `activityPane === null`, both the activity column and its boundary PaneResizer are hidden.
-- **PaneResizer** (`PaneResizer.tsx`): A generic resizer that owns only transient drag state. It **only reports a pixel delta via `onResize(delta)`**; the parent decides the final pane width. It is reused for both the Activity↔Right boundary in WorktreeDesktopLayout and the History↔Terminal boundary in TerminalContainer.
+- **WorktreeDesktopLayout** (`WorktreeDesktopLayout.tsx`, Issue #730 / #3589 / #3591): Lays out the Right pane (the body) and the ActivityPane. The ActivityPane is on the **right** (#3591). Unpinned — the default — it is drawn over the Right pane, which keeps its width (#3589). Only when pinned (`activityPanePinned`) does it take a column beside the body, with a PaneResizer on the boundary. The pane's frame (title, pin, ×, Esc / outside-press dismissal) is `PaneOverlayFrame` in the same file. When `activityPane === null`, neither the pane nor the PaneResizer is drawn.
+- **PaneResizer** (`PaneResizer.tsx`): A generic resizer that owns only transient drag state. It **only reports a pixel delta via `onResize(delta)`**; the parent decides the final pane width. It is reused for both the Right↔Activity boundary in WorktreeDesktopLayout (when pinned) and the History↔Terminal boundary in TerminalContainer.
 
 ### 11.2 State Owners (Custom Hooks)
 
-- **useActivityBarState** (`src/hooks/useActivityBarState.ts`): The single source of truth for the `active` state. It persists to `commandmate.worktree.activeActivity`, but the **closed state (null) is intentionally not persisted** (only the last selected activity is stored so it reopens on revisit). On invalid/missing values it falls back to `DEFAULT_ACTIVITY = 'files'`; the initial render is deterministically `DEFAULT_ACTIVITY` and the localStorage read happens in a post-mount `useEffect` (to avoid hydration mismatch).
-- **SidebarContext** (`src/contexts/SidebarContext.tsx`): Owns the sidebar `isOpen` via `useReducer`. The ActivityBar hamburger (Issue #747) reads this context directly, forming a separate data-flow path from the props-based activity selection.
+- **useActivityBarState** (`src/hooks/useActivityBarState.ts`): The single source of truth for the `active` state. It persists **per worktree** under `commandmate.worktree.activeActivity-<worktreeId>` (`getActivityBarStorageKey`, Issue #858). **The closed state (null) is persisted too**, as `__closed__` (`ACTIVITY_CLOSED_SENTINEL`), so a pane closed on one worktree stays closed after a visit to another and back. An unvisited worktree or an invalid value gives `INITIAL_ACTIVITY` (`null` = closed since Issue #3589; it was `'files'` before). The initial render is deterministically `INITIAL_ACTIVITY` and the localStorage read happens in a `useEffect` after mount and on every `worktreeId` change (to avoid hydration mismatch).
+- **usePanePinnedState** (`src/hooks/useActivityPaneOverlay.ts`, Issue #3589): Whether the ActivityPane is pinned. Stored once under `commandmate.worktree.activityPanePinned` (`ACTIVITY_PANE_PINNED_STORAGE_KEY`) and shared across worktrees. `usePaneOverlayDismiss` in the same file closes an overlaid pane on Esc / an outside press.
+- **SidebarContext** (`src/contexts/SidebarContext.tsx`): Owns the sidebar `isOpen` via `useReducer`. The sidebar's own open/close button (`SidebarPanelToggle`, at the top of the `SidebarRail` icon rail while the sidebar is closed) reads this context, forming a separate data-flow path from the props-based activity selection.
 
-The orchestrator (`WorktreeDetailRefactored.tsx`) calls `useActivityBarState`, builds the `ActivityContentMap`, and wires ActivityBar / ActivityPane / WorktreeDesktopLayout together.
+The controller (`src/hooks/useWorktreeDetailController.ts`) calls `useActivityBarState`, and the PC orchestrator (`WorktreeDetailDesktop.tsx`) builds the `ActivityContentMap` and wires HeaderToolBar (through `DesktopHeader`) / VerificationStatusChip / ActivityPane / WorktreeDesktopLayout together.
 
 ### 11.3 Data-Flow Diagram
 
 ```mermaid
 graph TD
-    Parent["WorktreeDetailRefactored<br/>(orchestrator)"]
-    ActState["useActivityBarState<br/>(owns active / localStorage)"]
+    Ctrl["useWorktreeDetailController<br/>(calls useActivityBarState)"]
+    Parent["WorktreeDetailDesktop<br/>(PC orchestrator)"]
+    ActState["useActivityBarState<br/>(owns active / per-worktree localStorage)"]
+    PinState["usePanePinnedState<br/>(owns the pin / localStorage)"]
     SideCtx["SidebarContext<br/>(owns isOpen)"]
-    Bar["ActivityBar<br/>(stateless)"]
+    SideToggle["SidebarPanelToggle<br/>(sidebar / SidebarRail)"]
+    Tools["HeaderToolBar<br/>(header right, stateless)"]
+    Chip["VerificationStatusChip<br/>(second row)"]
     Pane["ActivityPane<br/>(table-driven dispatch)"]
-    Layout["WorktreeDesktopLayout<br/>(2 columns + PaneResizer)"]
+    Layout["WorktreeDesktopLayout<br/>(overlay / beside the body when pinned)"]
     Term["TerminalContainer<br/>(terminal + optional history)"]
 
-    ActState -->|active| Parent
+    ActState -->|active| Ctrl
+    Ctrl -->|"active / onToggle"| Parent
     Parent -->|onToggle| ActState
-    Parent -->|active / onToggle| Bar
-    Bar -->|"sidebar toggle (Issue #747)"| SideCtx
+    Parent -->|active / onToggle| Tools
+    Parent -->|"open/close verification"| Chip
+    PinState -->|activityPanePinned| Parent
+    SideToggle --> SideCtx
     Parent -->|"activityPane (nullable)"| Layout
     Parent -->|"ActivityContentMap"| Pane
     Pane --> Layout

package/docs/en/user-guide/webapp-guide.md

@@ -302,7 +302,7 @@ the same button; that strip is **gone**, and the terminal takes the width back
 The arrow in the History column's header points the way it **folds** (left).
 Bring it back with [History] in the action bar.
 
-Note that the Activity Bar's **"File Tree"** (the icon column on the far left)
+Note that the **"File Tree"** among the tools at the right of the header
 is for browsing the worktree, and is a different thing from the action bar's
 **"Open Files"** (the panel showing files you opened).
 
@@ -370,15 +370,25 @@ Useful for recording work details and TODOs.
 
 ## Agent Settings
 
-Select which CLI agents to use for each worktree.
+Each worktree has its own list of CLI agent sessions (instances).
+The same agent can appear more than once under different names (e.g. "Claude" and "Claude review").
 
-### How to Configure
+### Adding One (PC)
 
 1. Select a worktree
-2. Click the **"CMATE"** tab
-3. Click the **"Agent"** sub-tab
-4. Select **2** agents using the checkboxes
-5. Settings are saved automatically
+2. Click the **[+]** at the right end of the header's session field ([current session][N more ▾])
+   ("Add session…" in the [N more ▾] list opens the same form)
+3. Choose the agent (installed ones), a name (optional) and **where to open it** (a new split / replace the current split / add only), then click **[Add]**
+4. Adding does not start a session: it starts when you send the first message from that split
+
+Rename, reorder and delete in the **"Agent"** tool at the right of the header.
+
+### Adding and Managing (Mobile)
+
+1. Tap the **"CMATE"** tab
+2. Tap the **"Agent"** sub-tab
+3. Add with **"Add instance"** below the list; rename, reorder and delete on each row
+4. Settings are saved automatically
 
 ### Available Agents
 
@@ -394,11 +404,11 @@ Select which CLI agents to use for each worktree.
 | **Antigravity** | Antigravity CLI (`agy`) |
 | **Command Code** | Command Code CLI (`commandcode`, Issue #2250) |
 
-- You must always select exactly **2** agents
+- A branch holds **1 to 10** of them (the last one cannot be deleted)
 - **Auto Yes behaves differently per agent.** Command Code / Gemini / Vibe-Local only have
   the screen-based route (the dialog is drawn once, then answered automatically). See
   [Approval Routes Differ by Agent](#approval-routes-differ-by-agent)
-- The selected agents appear as tabs in the terminal header
+- These sessions appear in the session field of the header ([current session][N more ▾])
 
 ### Ollama Model Selection (Vibe-Local)
 
@@ -427,7 +437,7 @@ surface** switches — the input surface stays exactly the same in either mode
 
 | Screen | Action |
 |--------|--------|
-| **Desktop** | Click the **Terminal / Chat toggle** in each split's header |
+| **Desktop** | Click the **Terminal / Chat toggle** in each split's header (with a single split it is in the second-row action bar) |
 | **Mobile** | Tap the **round toggle** floating over the top-right corner of the output area |
 | **Keyboard** | **`Cmd/Ctrl + Shift + M`** (press `?` for the shortcut list) |
 
@@ -559,8 +569,9 @@ put it back with the same gesture** (Issue #2261).
 
 | Action | Where |
 |--------|-------|
-| **Maximize / restore** | The button at the right end of each split's title bar (⤢ / ⤡) |
-| **Maximize / restore** | The button in the action bar above the splits (acts on the focused split) |
+| **Maximize / restore** | The button in the second-row action bar (⤢ / ⤡; acts on the focused split) |
+| **Maximize / restore** | Each split's "…" menu |
+| **Maximize / restore** | With two or more splits, the button at the right end of each split's header (⤢ / ⤡) |
 | **Maximize / restore** | `Cmd/Ctrl + Shift + Enter` |
 
 `Cmd/Ctrl + Shift + Enter` follows the same rule as `Cmd/Ctrl + Shift + M` (the output
@@ -590,21 +601,23 @@ The **execution contract** handed to an agent with `commandmate send --contract`
 **gate verdicts** `commandmate verify` produced from it, are readable on screen — no CLI
 stdout required (Issue #1816).
 
-### The header status chip
+### The Verification chip (the second-row status chip)
 
-A worktree that was delegated with a contract shows a status chip in its header, carrying
-the task title, its `TaskStatus`, and the `RESULT` of the most recent verification run.
+The second row of the worktree screen (the action bar) carries the Verification chip (a status
+chip) with the task title, its `TaskStatus`, and the `RESULT` of the most recent verification run.
 
-- A worktree with no task row shows **no chip at all**
+- A worktree with no task row **still shows the chip**, with "Verification" in place of the title
+  and "Not verified" in place of the RESULT (Issue #2064)
+- The chip's ⓘ button shows the **reason** behind the verdict, on a touch device too
 - Hovering the chip (or reading it with a screen reader) gives the **reason** behind the
   verdict, down to the ids of the gates that did not pass
-- Clicking the chip opens the **Verification** pane
+- Clicking the chip opens the **Verification** pane (pressing it again while the pane is open closes it)
 
 ### The Verification pane
 
 | Screen  | How to open |
 |---------|-------------|
-| Desktop | The shield icon (Verification) in the left Activity Bar |
+| Desktop | Press the Verification chip (the chip with the shield icon) on the second row. The pane opens from the right, over the body |
 | Mobile  | **Tools** tab in the bottom bar → **Verification** sub-tab |
 
 The pane has three sections, top to bottom.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "commandmate",
-  "version": "0.45.1",
+  "version": "0.46.1",
   "description": "No long blocks of time? Run an AI team from your phone. Git worktree sessions, task contracts and verification gates for Claude Code, Codex, Gemini CLI, Copilot, OpenCode, Antigravity and Command Code.",
   "keywords": [
     "ai-agents",

package/release-notes/0.46.0.json

@@ -0,0 +1,110 @@
+{
+  "version": "0.46.0",
+  "date": "2026-10-14",
+  "highlight": {
+    "ja": "worktree 画面を作り直し、見出しを 1 行にして道具を右上のアイコンにまとめました。どの画面からでも依頼を送れる「New task」も使えます。",
+    "en": "The worktree screen has been redesigned with a one-line header and tool icons at the top right. You can also send a task from any screen with New task."
+  },
+  "added": [
+    {
+      "ja": "どの画面からでもエージェントへ依頼を送れる「New task」ダイアログを追加しました（⌘⇧O / Ctrl+Shift+O）。",
+      "en": "Added a New task dialog that sends a request to an agent from any screen (Cmd+Shift+O / Ctrl+Shift+O)."
+    }
+  ],
+  "improved": [
+    {
+      "ja": "worktree の見出しを 1 行にし、縦のアイコンの列をなくして道具を見出しの右へ移しました。",
+      "en": "The worktree header is now a single line, and the tools moved from the vertical icon column to the right of the header."
+    },
+    {
+      "ja": "worktree 画面はパネルを閉じた状態で始まり、Files などのパネルは本文の上に重ねて開くようになりました。",
+      "en": "The worktree screen now opens with panels closed, and panels such as Files open over the content."
+    },
+    {
+      "ja": "見出しのセッションを「今のセッション＋ほか N」にし、セッションが増えても欄の幅が変わらないようにしました。",
+      "en": "The header now shows the current session plus \"N more\", so its width no longer changes with the number of sessions."
+    },
+    {
+      "ja": "分割が 1 つのときは、分割の見出しを出さずに中身を 2 段目の行にまとめるようにしました。",
+      "en": "With a single split, its header is gone and its controls sit in the second row."
+    },
+    {
+      "ja": "進み具合（Status）を、サイドバーのブランチの「…」から変えられるようにしました。",
+      "en": "You can now change a branch's status from its \"...\" menu in the sidebar."
+    },
+    {
+      "ja": "サイドバーの一覧を 1 行の行と角丸の札に作り直し、狭い幅でもブランチ名が読めるようにしました。",
+      "en": "The sidebar list was rebuilt as single-line rounded rows, so branch names stay readable at narrow widths."
+    },
+    {
+      "ja": "サイドバーの上の絞り込み・表示・並べ替えを 1 行にまとめました。",
+      "en": "The filter, view and sort controls above the sidebar list now fit on one row."
+    },
+    {
+      "ja": "サイドバーを閉じても、アイコンの列から各画面へ移動できるようになりました。",
+      "en": "With the sidebar closed, you can still move between screens from the icon column."
+    },
+    {
+      "ja": "スマホの引き出しを PC のサイドバーと同じ並びにし、上端に閉じるボタンを置きました。",
+      "en": "The phone drawer now matches the desktop sidebar and has a close button at the top."
+    },
+    {
+      "ja": "設定の入口を 1 つの設定メニューにまとめました。",
+      "en": "Settings are now reached from a single settings menu."
+    },
+    {
+      "ja": "分割が 1 つのときは最大化できないようにそろえました。",
+      "en": "Maximize is no longer offered when there is only one split."
+    }
+  ],
+  "fixed": [
+    {
+      "ja": "メニューや吹き出しを Esc で閉じたとき、下に重ねたパネルまで一緒に閉じる問題を直しました。",
+      "en": "Fixed Escape closing the panel underneath when it was meant to close only a menu or popup."
+    },
+    {
+      "ja": "チャットと履歴の検索で、返答が 2 件以上あると最後の返答しか強調されない問題を直しました。",
+      "en": "Fixed chat and history search highlighting only the last reply when there are several replies."
+    },
+    {
+      "ja": "チャットの検索の強調が、思考の節や特殊な文字の近くでずれる・消える問題を直しました。",
+      "en": "Fixed chat search highlights shifting or disappearing near reasoning sections and special characters."
+    },
+    {
+      "ja": "⌘K のコマンドパレットが、ほかの画面やメニューの上に重なって開く問題を直しました。",
+      "en": "Fixed the Cmd+K command palette opening on top of other dialogs and menus."
+    },
+    {
+      "ja": "分割の見出しや 2 段目で、エージェント名が 1 文字まで縮む問題を直しました。",
+      "en": "Fixed agent names shrinking to a single character in split headers and the second row."
+    },
+    {
+      "ja": "ダークモードで Git のパネル全体が濃い青になる問題を直しました。",
+      "en": "Fixed the Git panel turning dark blue in dark mode."
+    },
+    {
+      "ja": "セッション一覧の吹き出しが、次の行の名前を隠す問題を直しました。",
+      "en": "Fixed tooltips in the session list hiding the name on the next row."
+    },
+    {
+      "ja": "進み具合の保存に失敗したとき、知らせて元の値に戻すようにしました。",
+      "en": "A failed status change is now reported and the previous value is restored."
+    },
+    {
+      "ja": "worktree 画面を直接開いたり戻ったりしたとき、サイドバーの選択がずれる問題を直しました。",
+      "en": "Fixed the sidebar selection not matching the open worktree after a direct visit, reload or back/forward."
+    },
+    {
+      "ja": "日本語の設定でも、一部の説明や見出しが英語のまま表示される問題を直しました。",
+      "en": "Fixed some descriptions and headings staying in English with the Japanese setting."
+    },
+    {
+      "ja": "New task が全画面の表示の上に重なる問題と、Auto-Yes の残り時間の表示の遅れを直しました。",
+      "en": "Fixed New task appearing over full-screen views and the Auto-Yes time left updating late."
+    },
+    {
+      "ja": "worktree の ID が変わったあと、返答が二重に出たり消えたりすることがある問題を直しました。",
+      "en": "Fixed replies that could be duplicated or lost after a worktree's ID changed."
+    }
+  ]
+}

package/release-notes/0.46.1.json

@@ -0,0 +1,40 @@
+{
+  "version": "0.46.1",
+  "date": "2026-10-16",
+  "highlight": {
+    "ja": "Auto-Yes を切った直後や切り替えの最中に、古い回答が送られたり同じ確認に二重に答えたりする問題を直しました。",
+    "en": "Fixed Auto-Yes sending a stale answer, or answering the same prompt twice, right after it was turned off or switched."
+  },
+  "added": [],
+  "improved": [],
+  "fixed": [
+    {
+      "ja": "Auto-Yes を切った直後に、待ちの間に始まっていた回答が 1 回送られてしまう問題を直しました。",
+      "en": "Fixed an answer that had already started being sent once right after Auto-Yes was turned off."
+    },
+    {
+      "ja": "途中まで入力した回答が残っているとき、Auto-Yes が同じ確認にもう一度入力しないようにしました。",
+      "en": "Auto-Yes no longer types into the same prompt again when an earlier answer was left half-entered."
+    },
+    {
+      "ja": "worktree の名前が変わったときも、途中まで入力した回答の記録が引き継がれるようにしました。",
+      "en": "The record of a half-entered answer now carries over when a worktree is renamed."
+    },
+    {
+      "ja": "止めたセッションの古い処理が、返答の保存や完了の通知を遅れて出す問題を直しました。",
+      "en": "Fixed a stopped session's old work saving replies or sending completion notices late."
+    },
+    {
+      "ja": "予約送信をキャンセルしたのに送信されてしまうことがある問題を直しました。",
+      "en": "Fixed a scheduled message sometimes being sent even though it had been cancelled."
+    },
+    {
+      "ja": "Esc キーが、最大化したファイルや検索欄、メニューなどを前面のものから 1 つずつ閉じるようにしました。",
+      "en": "The Esc key now closes the front-most layer first, one at a time, such as a maximized file, a search box or a menu."
+    },
+    {
+      "ja": "チャットの検索で、記号を表す書き方（< など）に一致したときも強調されるようにしました。",
+      "en": "Chat search now highlights matches on character references such as <."
+    }
+  ]
+}