@monster-orange/den 0.4.9 → 0.4.11

package/CHANGELOG.md

@@ -4,6 +4,56 @@ All notable changes to Den are documented here. Each release lists the
 config and manifest changes a distribution must make to move to it under
 **Migrations**.
 
+## [0.4.11] - 2026-11-07
+
+### Changed
+
+- **Picking a workspace in the top bar also makes it the CLI default.**
+  There is one "current workspace": choosing one in the Workspace menu
+  sets what pages show and where `<cli>` commands run (workspaces.yml, as
+  Local Dev's "Make CLI default" does). "All active (n)" changes only what
+  pages show; the CLI default stays. If the CLI default can't be set,
+  nothing changes and the error shows.
+- **The menu's separate "Make <ws> the CLI default" item is gone**, since
+  picking a workspace does it. The "CLI default" tag stays on its row, and
+  Local Dev keeps its "Make CLI default" button, to set it without
+  changing what pages show. Each workspace row's tooltip says so.
+- **Picking the workspace already in view makes it the CLI default** when
+  it isn't one (after Local Dev's "Make CLI default" or `<cli> workspace
+  focus` moved it). The view stays as it is.
+- **Pages whose address names a workspace follow the pick.** Workspaces'
+  detail pane and breadcrumb now show the workspace the top bar picked,
+  not the one in the old `?ws=`.
+
+### Migrations
+
+None.
+
+## [0.4.10] - 2026-11-07
+
+### Changed
+
+- **A confirmed merge stays confirmed.** Once `gh pr view` says an agent's
+  pull request is MERGED, its record keeps that (`prMergeConfirmed`), and
+  `usage` doesn't ask GitHub about it again. A later run that can't check
+  no longer drops it. A merged flag from before 0.4.10, with no
+  confirmation, is checked again.
+- **`usage agents` counts only real asks.** "Asked GitHub for the state of
+  N pull requests" counts the times gh ran. When gh is not installed, it
+  says "Couldn't check N merges: gh is not installed." instead.
+- **The PR column** shows the confirmed pull request, with "(merged)", when
+  the agent merged one it didn't open.
+- **A bare `gh pr merge`** (the branch's own pull request) is confirmed by
+  the number gh gives: the check is now `gh pr view --json number,state`.
+  With no number, it is not marked; an empty ref is never a key.
+- **Dropping a mark drops its rotation.** When gh no longer confirms a
+  merged flag, a "PR merged" rotation it made due is cleared too. A
+  rotation due after compactions is left alone.
+
+### Migrations
+
+None.
+
 ## [0.4.9] - 2026-11-07
 
 A session ends when its pull request merges, or after 3 compactions. The

package/README.md

@@ -10,8 +10,8 @@
 </p>
 
 <picture>
-  <source media="(prefers-color-scheme: dark)" srcset="docs/images/0.4.9/hero-dark.png">
-  <img src="docs/images/0.4.9/hero-light.png" width="100%" alt="Den's Graph page: the demo workspace's services grouped by application, all healthy, with the status chip and the left rail">
+  <source media="(prefers-color-scheme: dark)" srcset="docs/images/0.4.11/hero-dark.png">
+  <img src="docs/images/0.4.11/hero-light.png" width="100%" alt="Den's Graph page: the demo workspace's services grouped by application, all healthy, with the status chip and the left rail">
 </picture>
 
 ## Set up by your agent
@@ -38,7 +38,7 @@ It doesn't replace your tools. Your repos, Docker, your test runners, your secre
 yours. Den connects them and turns on good practice from the start.
 
 <p align="center">
-  <img src="docs/images/0.4.9/up.gif" width="100%" alt="make up in the Graph page: every stack down, then demo-api, demo-web and demo-notes come up in dependency order until the status chip reads All 3 healthy">
+  <img src="docs/images/0.4.11/up.gif" width="100%" alt="make up in the Graph page: every stack down, then demo-api, demo-web and demo-notes come up in dependency order until the status chip reads All 3 healthy">
 </p>
 
 ## How it helps
@@ -68,10 +68,10 @@ yours. Den connects them and turns on good practice from the start.
   lives in your own repo.
 
 <p align="center">
-  <img src="docs/images/0.4.9/agents.png" width="49%" alt="The Agents tab: the demo workspace's sessions on the left, and one open in a terminal pane on the right, running demo-api's test and then the service">
-  <img src="docs/images/0.4.9/workspaces.png" width="49%" alt="The Workspaces page: the demo workspace's repos with their health, mode and Start, Stop, Restart and Logs actions">
-  <img src="docs/images/0.4.9/status-drawer.png" width="49%" alt="The status drawer: nothing needs attention, and every service in the demo workspace, by application, with its latency">
-  <img src="docs/images/0.4.9/edge.png" width="49%" alt="The Edge page: the edge container up, its ports and TLS, and every route it serves, Den's own and each stack's, with its upstream">
+  <img src="docs/images/0.4.11/agents.png" width="49%" alt="The Agents tab: the demo workspace's sessions on the left, and one open in a terminal pane on the right, running demo-api's test and then the service">
+  <img src="docs/images/0.4.11/workspaces.png" width="49%" alt="The Workspaces page: the demo workspace's repos with their health, mode and Start, Stop, Restart and Logs actions">
+  <img src="docs/images/0.4.11/status-drawer.png" width="49%" alt="The status drawer: nothing needs attention, and every service in the demo workspace, by application, with its latency">
+  <img src="docs/images/0.4.11/edge.png" width="49%" alt="The Edge page: the edge container up, its ports and TLS, and every route it serves, Den's own and each stack's, with its upstream">
 </p>
 
 ## Get started

package/docs/distributions.md

@@ -2482,7 +2482,7 @@ report. It works on den-claude for personas with Den's hooks on.
    A merge is never taken from text. The agent must have run `gh pr merge`
    as a command (after any `cd` or `VAR=value` prefix; not `--help`, not
    `echo gh pr merge`), and it must have exited 0. Then `usage` asks
-   `gh pr view <ref> --json state` in the agent's folder, and only
+   `gh pr view <ref> --json number,state` in the agent's folder, and only
    `MERGED` counts. With no gh, or on any error, it is not marked. That
    query is the one thing `usage` asks outside this machine; it says so
    when it does.
@@ -2762,9 +2762,13 @@ and its wall-clock time. It matches transcripts to agents by the
 conversation id Den saved at start. It prints the share of agents with
 both. Transcripts never leave the machine, and their text is never kept:
 only counts. "Whether it merged" is checked: when an agent ran
-`gh pr merge`, `usage` asks `gh pr view <ref> --json state` to confirm it.
+`gh pr merge`, `usage` asks `gh pr view <ref> --json number,state` to confirm it.
 That query, the pull request's number or URL, is the only thing it asks
-outside, and the output says when it asked.
+outside, and the output says when it asked (or that it couldn't, because
+gh is not installed). A merge gh confirmed is kept in the record
+(`prMergeConfirmed`, the pull request's ref or, for a bare `gh pr merge`,
+the number gh gave) and not asked about again. A mark gh no longer
+confirms is dropped, with the "PR merged" rotation it made due.
 
 `<cli> usage report [--days 7] [--json]` writes a weekly summary to
 `<state dir>/usage/<date>.json` and `.md`, compared with the last one:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@monster-orange/den",
-  "version": "0.4.9",
+  "version": "0.4.11",
   "description": "Den: a local multi-repo dev orchestrator, HTTPS edge and E2E harness",
   "type": "module",
   "bin": {

package/src/shared/agents/records.ts

@@ -80,6 +80,11 @@ export interface AgentOutcome {
   prOpened?: string;
   /** That pull request merged in the run. */
   prMerged?: boolean;
+  /**
+   * The pull request gh said is MERGED (0.4.10): a merge confirmed once
+   * stays, and is not asked again.
+   */
+  prMergeConfirmed?: string;
   /** The last test run it made passed (true) or failed (false). */
   testsGreen?: boolean;
   /** From its start to its last activity, in milliseconds. */

package/src/shared/agents/rotation.ts

@@ -235,6 +235,15 @@ export function markDue(
   return true;
 }
 
+/** Clear a rotation due for `reason` (a merge mark gh no longer confirms). */
+export function clearDue(filesDir: string, reason: RotateReason): boolean {
+  const s = readRotation(filesDir);
+  if (!s || s.due !== reason) return false;
+  const { due: _d, dueAt: _a, ...rest } = s;
+  writeRotation(filesDir, rest);
+  return true;
+}
+
 /** Whether the state says a rotation is due, for this conversation. */
 export function dueFor(
   s: RotationState | null,

package/src/shared/git/gh-pr-state.ts

@@ -6,27 +6,39 @@
 import { execFile } from "child_process";
 
 /**
- * `gh pr view [<ref>] [-R <repo>] --json state -q .state`;
- * rejects on any error. Only the ref and repo go out, to GitHub, by gh.
+ * `gh pr view [<ref>] [-R <repo>] --json number,state`: the state and the
+ * number (a bare ref is the branch's PR, and the number names it). Rejects
+ * on any error, or an answer that isn't that JSON. Only the ref and repo
+ * go out, to GitHub, by gh.
  */
 export function ghPrState(env: NodeJS.ProcessEnv) {
   return (ref: string, o: { repo?: string; cwd: string }) =>
-    new Promise<string | undefined>((res, rej) => {
+    new Promise<{ state: string; number?: number }>((res, rej) => {
       const args = [
         "pr",
         "view",
         ...(ref ? [ref] : []),
         ...(o.repo ? ["-R", o.repo] : []),
         "--json",
-        "state",
-        "-q",
-        ".state",
+        "number,state",
       ];
       execFile(
         "gh",
         args,
         { cwd: o.cwd, env, timeout: 15_000, maxBuffer: 64 * 1024 },
-        (e, stdout) => (e ? rej(e) : res(String(stdout).trim())),
+        (e, stdout) => {
+          if (e) return rej(e);
+          try {
+            const o = JSON.parse(String(stdout)) as Record<string, unknown>;
+            if (typeof o.state !== "string") throw new Error("no state");
+            res({
+              state: o.state,
+              ...(typeof o.number === "number" ? { number: o.number } : {}),
+            });
+          } catch (err) {
+            rej(err);
+          }
+        },
       );
     });
 }

package/src/shared/usage/report.ts

@@ -102,6 +102,19 @@ export function outcomeOf(
   return out;
 }
 
+/**
+ * What a pull request check answers: its state ("MERGED"), and its number
+ * when gh gave one (a bare `gh pr merge` is the branch's PR: the number is
+ * how it is kept).
+ */
+export type PrStateAnswer = string | { state: string; number?: number };
+
+/** Checks one pull request's state (gh pr view), in the agent's folder. */
+export type PrStateCheck = (
+  ref: string,
+  o: { repo?: string; cwd: string },
+) => Promise<PrStateAnswer | undefined>;
+
 /**
  * Whether one of the transcripts' `gh pr merge` claims is a pull request
  * gh says is MERGED. A bare `gh pr merge` (the branch's PR) is checked by
@@ -111,12 +124,9 @@ async function mergeVerified(
   rec: AgentRecord,
   stats: readonly TranscriptStats[],
   outcome: AgentOutcome,
-  prState?: (
-    ref: string,
-    o: { repo?: string; cwd: string },
-  ) => Promise<string | undefined>,
-): Promise<boolean> {
-  if (!prState) return false;
+  prState?: PrStateCheck,
+): Promise<string | undefined> {
+  if (!prState) return undefined;
   const seen = new Set<string>();
   for (const c of stats.flatMap((s) => s.prMerges)) {
     const ref = c.ref || outcome.prOpened || "";
@@ -128,12 +138,17 @@ async function mergeVerified(
         ...(c.repo ? { repo: c.repo } : {}),
         cwd: rec.cwd,
       });
-      if (st?.trim().toUpperCase() === "MERGED") return true;
+      const state = typeof st === "string" ? st : st?.state;
+      if (state?.trim().toUpperCase() !== "MERGED") continue;
+      // Kept by its ref, or by the number gh gave; never by "".
+      const n = typeof st === "object" ? st.number : undefined;
+      const key = ref || (Number.isInteger(n) && n! > 0 ? String(n) : "");
+      if (key) return key;
     } catch {
       // Not checked: not marked.
     }
   }
-  return false;
+  return undefined;
 }
 
 /**
@@ -146,14 +161,11 @@ export async function agentUsage(
     env?: NodeJS.ProcessEnv;
     source?: (runtime: string) => UsageSource | undefined;
     /**
-     * A pull request's state (`gh pr view <ref> --json state`), run in the
+     * A pull request's state (`gh pr view <ref> --json number,state`), run in the
      * agent's folder: "MERGED" marks the outcome merged. Without it, or on
      * any error, nothing is marked: a merge is never taken from text.
      */
-    prState?: (
-      ref: string,
-      o: { repo?: string; cwd: string },
-    ) => Promise<string | undefined>;
+    prState?: PrStateCheck;
   } = {},
 ): Promise<AgentUsageRow[]> {
   const pick = opts.source ?? sourceFor;
@@ -198,8 +210,15 @@ export async function agentUsage(
     }
     const usage = sumUsage(stats);
     const outcome = outcomeOf(rec, stats);
-    if (await mergeVerified(rec, stats, outcome, opts.prState))
+    // Confirmed once, kept: GitHub is not asked again.
+    const confirmed =
+      rec.outcome?.prMerged && rec.outcome.prMergeConfirmed
+        ? rec.outcome.prMergeConfirmed
+        : await mergeVerified(rec, stats, outcome, opts.prState);
+    if (confirmed) {
       outcome.prMerged = true;
+      outcome.prMergeConfirmed = confirmed;
+    }
     rows.push({
       ...base,
       transcripts: files.length,

package/src/ui/cli/usage-command.ts

@@ -3,7 +3,7 @@
  * runtimes' own transcripts on this machine (usage sources, plugin kind
  * `usage`). None of it is sent anywhere: it reads local files and writes
  * local files. The one question it asks outside: when an agent ran
- * `gh pr merge`, `gh pr view <ref> --json state` confirms the merge
+ * `gh pr merge`, `gh pr view <ref> --json number,state` confirms the merge
  * (gh-pr-state.ts) before it counts.
  *
  *   agents [-w <ws>] [--json]    each agent's tokens and outcome (PR opened
@@ -22,8 +22,9 @@ import {
   readRecord,
   writeRecord,
 } from "../../shared/agents/records.js";
-import { markDue } from "../../shared/agents/rotation.js";
+import { clearDue, markDue } from "../../shared/agents/rotation.js";
 import { ghPrState } from "../../shared/git/gh-pr-state.js";
+import type { PrStateCheck } from "../../shared/usage/report.js";
 import { readAgentsConfig } from "../../shared/den-config.js";
 import { getStateDir } from "../../shared/paths.js";
 import { product } from "../../shared/product.js";
@@ -77,24 +78,31 @@ export interface UsageDeps {
   rotateAfter?: () => { afterCompactions: number } | undefined;
   /**
    * A pull request's state, to confirm a `gh pr merge` the agent ran
-   * (default: `gh pr view <ref> --json state` in the agent's folder).
+   * (default: `gh pr view <ref> --json number,state` in the agent's folder).
    */
-  prState?: (
-    ref: string,
-    o: { repo?: string; cwd: string },
-  ) => Promise<string | undefined>;
+  prState?: PrStateCheck;
 }
 
-/** The check, counting how often it asked (the summary line says so). */
+/**
+ * The check, counting how often gh ran (`asked`) and how often it could not
+ * run because gh is not installed (`missing`); the summary says both.
+ */
 function counted(
   f: NonNullable<UsageDeps["prState"]>,
-): NonNullable<UsageDeps["prState"]> & { asked: number } {
+): NonNullable<UsageDeps["prState"]> & { asked: number; missing: number } {
   const g = Object.assign(
-    (ref: string, o: { repo?: string; cwd: string }) => {
-      g.asked++;
-      return f(ref, o);
+    async (ref: string, o: { repo?: string; cwd: string }) => {
+      try {
+        const st = await f(ref, o);
+        g.asked++;
+        return st;
+      } catch (e) {
+        if ((e as NodeJS.ErrnoException)?.code === "ENOENT") g.missing++;
+        else g.asked++;
+        throw e;
+      }
     },
-    { asked: 0 },
+    { asked: 0, missing: 0 },
   );
   return g;
 }
@@ -144,6 +152,9 @@ function save(stateDir: string, rows: readonly AgentUsageRow[]): void {
     });
     if (r.outcome?.prMerged)
       markDue(agentFilesDir(stateDir, rec.id), "pr-merged", rec.resumeToken);
+    // A mark gh no longer confirms is dropped, and its rotation with it.
+    else if (rec.outcome?.prMerged)
+      clearDue(agentFilesDir(stateDir, rec.id), "pr-merged");
   }
 }
 
@@ -211,7 +222,9 @@ async function agents(
           : "red",
       r.outcome?.prOpened
         ? `${r.outcome.prOpened}${r.outcome.prMerged ? " (merged)" : ""}`
-        : "-",
+        : r.outcome?.prMergeConfirmed
+          ? `${r.outcome.prMergeConfirmed} (merged)`
+          : "-",
       r.compactions === undefined ? "-" : String(r.compactions),
       String(r.rotations),
     ]),
@@ -226,6 +239,10 @@ async function agents(
     d.out(
       `To confirm a merge, it asked GitHub for the state of ${d.prState.asked} pull request${d.prState.asked === 1 ? "" : "s"} (gh pr view).`,
     );
+  if (d.prState.missing)
+    d.out(
+      `Couldn't check ${d.prState.missing} merge${d.prState.missing === 1 ? "" : "s"}: gh is not installed.`,
+    );
   return 0;
 }
 

package/src/ui/server/public/header.js

@@ -792,10 +792,11 @@ export function groupReposByApplication(repos, apps) {
 
 /**
  * Feed the shell's Workspace part (shell.js #ws-pill, a menu): "All active"
- * and each active workspace, the focused one marked. Choosing one sets the
- * view scope (POST /api/scope, a preference) for every page. It replaces
- * dev.17's workspace pill and its focus menu (one control, not two): the
- * focus moves only through the menu's separate "Set <ws> as focus".
+ * and each active workspace, the focused one marked. Choosing a workspace
+ * makes it the CLI default (POST /api/workspaces `focus`, workspaces.yml)
+ * and sets the view (POST /api/scope, a preference) for every page: one
+ * "current workspace" (Ward's decision, 0.4.11). "All active" sets only the
+ * view; the CLI default stays.
  *
  * The arguments are dev.17's (an env select, an onSwitch callback) and are
  * no longer used: the view applies to every env.
@@ -822,7 +823,6 @@ async function _renderScopeMenu() {
     sh.setWorkspaces({
       ...buildScopeMenuModel(pageScope(scope, data), data, t),
       onSelect: _switchScope,
-      onFocus: _setFocus,
     });
   } catch {
     sh.setWorkspaces(null);
@@ -852,25 +852,34 @@ function pageScope(scope, data) {
 }
 
 /**
- * On the Graph page a choice replaces ?ws= (All active drops it, a
- * workspace sets it), so the reload shows the choice rather than the old
- * ?ws=, which would win over it. The history entry is replaced, not
- * pushed: Back does not return to a view the picker has left.
+ * A choice replaces ?ws= (All active drops it, a workspace sets it) on the
+ * Graph and Agents pages, and on any page whose URL names a workspace
+ * (Workspaces' detail pane), so the reload shows the choice rather than
+ * the old ?ws=. The history entry is replaced, not pushed: Back does not
+ * return to a view the picker has left.
  */
 function followScopeInUrl(value) {
-  if (!WS_URL_PAGES.has(location.pathname)) return;
   const u = new URL(location.href);
+  if (!WS_URL_PAGES.has(location.pathname) && !u.searchParams.has("ws")) return;
   if (value === "all") u.searchParams.delete("ws");
   else u.searchParams.set("ws", value);
   history.replaceState(history.state, "", u.pathname + u.search + u.hash);
 }
 
 /**
- * A view filter only: POST /api/scope stores the preference (user.yml
- * `view`), then the page reloads to show the new view whole. No service,
- * container, daemon or route changes, and the focus stays where it is.
+ * A workspace: first the CLI default (workspaces.yml), then the view. When
+ * the CLI default can't be set, nothing changes and the error shows. "All
+ * active": the view only. POST /api/scope stores the view (user.yml
+ * `view`), then the page reloads to show it whole. The workspace already
+ * in view (`inView`): the CLI default only, the view untouched. No
+ * service, container, daemon or route changes.
  */
-async function _switchScope(value) {
+async function _switchScope(value, focus, inView) {
+  if (value !== "all" && value !== focus && !(await _setFocus(value))) return;
+  if (inView) {
+    location.reload();
+    return;
+  }
   try {
     await window.denShell.api("POST", "/api/scope", { scope: value });
   } catch (err) {
@@ -885,9 +894,9 @@ async function _switchScope(value) {
 }
 
 /**
- * "Set <ws> as focus": Local Dev's focus action (POST /api/workspaces
- * `focus`, which writes workspaces.yml and retargets the CLI). Separate
- * from the view: it is the only thing in the menu that moves the focus.
+ * Make `name` the CLI default: Local Dev's focus action (POST
+ * /api/workspaces `focus`, which writes workspaces.yml and retargets the
+ * CLI). False, with the error shown, when it couldn't.
  */
 async function _setFocus(name) {
   try {
@@ -900,9 +909,9 @@ async function _setFocus(name) {
       err.message = t("ws.focusFailed", { msg: err.message });
       window.denShell.errorToast(err);
     } else window.denShell?.toast?.(t("ws.focusFailed", { msg: err.message }));
-    return;
+    return false;
   }
-  location.reload();
+  return true;
 }
 
 // ── Health: the status chip and drawer (topbar.js, R6 and R15) ─────────────

package/src/ui/server/public/i18n/es.js

@@ -29,7 +29,9 @@
     "ws.all": "Todos los activos",
     "ws.focus": "predeterminado de la CLI",
     "ws.focusTip":
-      "Los comandos de la CLI se ejecutan aquí si no indicas un espacio de trabajo. Elegir un espacio en la barra superior solo cambia lo que muestran las páginas.",
+      "Los comandos de la CLI se ejecutan aquí si no indicas un espacio de trabajo. Elegir un espacio en la barra superior también lo convierte en el predeterminado de la CLI.",
+    "ws.pickTip":
+      "Elegir un espacio de trabajo aquí también lo convierte en el predeterminado de la CLI, así que los comandos de __DEN_CLI__ se ejecutan allí.",
     "ws.none": "No hay espacios de trabajo activos",
     "ws.manage": "Gestionar espacios de trabajo…",
     "ws.allN": "Todos los activos ({n})",
@@ -39,10 +41,7 @@
     "ws.viewTitle":
       "Vista: lo que muestra cada página ({ws}). Es solo un filtro: no inicia, detiene ni enruta nada.",
     "ws.viewTitleFocus":
-      "Vista: lo que muestra cada página ({ws}). Es solo un filtro: no inicia, detiene ni enruta nada, y el predeterminado de la CLI ({focus}) sigue siendo el destino de los comandos.",
-    "ws.setFocus": "Hacer de {ws} el predeterminado de la CLI",
-    "ws.setFocusTip":
-      "Lo convierte en el destino por defecto de los comandos (escribe workspaces.yml)",
+      "Vista: lo que muestra cada página ({ws}). No inicia, detiene ni enruta nada. Predeterminado de la CLI: {focus}.",
     "ws.viewFailed": "No se pudo cambiar la vista: {msg}",
     "ws.focusFailed": "No se pudo poner el foco: {msg}",
     "org.n": "{n} espacios de trabajo",

package/src/ui/server/public/i18n/ja.js

@@ -29,7 +29,9 @@
     "ws.all": "すべてのアクティブ",
     "ws.focus": "CLI の既定",
     "ws.focusTip":
-      "ワークスペースを指定しないとき、CLI のコマンドはここで実行されます。上部バーでワークスペースを選んでも、ページの表示が変わるだけです。",
+      "ワークスペースを指定しないと CLI のコマンドはここで実行されます。上部バーでワークスペースを選ぶと、それが CLI の既定にもなります。",
+    "ws.pickTip":
+      "ここでワークスペースを選ぶと CLI の既定にもなり、__DEN_CLI__ のコマンドはそこで実行されます。",
     "ws.none": "アクティブなワークスペースはありません",
     "ws.manage": "ワークスペースを管理…",
     "ws.allN": "すべてのアクティブ ({n})",
@@ -39,10 +41,7 @@
     "ws.viewTitle":
       "表示: すべてのページに表示する範囲 ({ws})。表示の絞り込みだけで、何も起動・停止・ルーティングしません。",
     "ws.viewTitleFocus":
-      "表示: すべてのページに表示する範囲 ({ws})。表示の絞り込みだけで、何も起動・停止・ルーティングしません。コマンドの対象は CLI の既定 ({focus}) のままです。",
-    "ws.setFocus": "{ws} を CLI の既定にする",
-    "ws.setFocusTip":
-      "コマンドの既定の対象にします (workspaces.yml に書き込みます)",
+      "表示: 各ページに出るもの ({ws})。起動・停止・ルーティングは行いません。CLI の既定: {focus}。",
     "ws.viewFailed": "表示を変更できませんでした: {msg}",
     "ws.focusFailed": "フォーカスを設定できませんでした: {msg}",
     "org.n": "{n} 個のワークスペース",

package/src/ui/server/public/local-dev.html

@@ -1613,7 +1613,7 @@
                   ? `<button class="danger" data-action="delete">Delete</button>`
                   : "";
               return `<div class="ws-item ${n === activeWs ? "active" : ""}" data-name="${escHtml(n)}" data-action="select">
-          <span>${escHtml(n)}${isWsActive(n) ? ' <span style="font-size:10px;color:var(--muted)">(active)</span>' : ""}${n === focusName() ? ` <span class="ws-cli-default" title="${escHtml(wsT("ws.focusTip", "CLI commands run here when you don't name a workspace. Picking a workspace in the top bar only changes what pages show."))}">${escHtml(wsT("ws.focus", "CLI default"))}</span>` : ""}</span>
+          <span>${escHtml(n)}${isWsActive(n) ? ' <span style="font-size:10px;color:var(--muted)">(active)</span>' : ""}${n === focusName() ? ` <span class="ws-cli-default" title="${escHtml(wsT("ws.focusTip", "CLI commands run here when you don't name a workspace. Picking a workspace in the top bar also makes it the CLI default."))}">${escHtml(wsT("ws.focus", "CLI default"))}</span>` : ""}</span>
           <span class="ws-item-right">
             <button class="ws-term-btn" title="Open in terminal" data-open-term="${escHtml(dirPath)}">&#62;_</button>
             <button class="ws-open-btn" title="Open in editor" data-open-path="${escHtml(wsData.codeWorkspacePaths?.[n] || dirPath)}">↗</button>

package/src/ui/server/public/shell.js

@@ -62,7 +62,7 @@
  *   setOrgs([{ id, title, workspaces? }], currentId, onSelect?)
  *                                    two or more: the Org ▾ menu; a pick
  *                                    calls onSelect(id), fires `den:org`
- *   setWorkspaces({ label, title, items, focusable, onSelect, onFocus })
+ *   setWorkspaces({ label, title, items, focus, onSelect })
  *                                    the Workspace ▾ menu (header.js)
  *   syncEnv()                        repaint Env ▾ from #env-sel
  *   registerCommand({ id, label, keywords?, kind?, run })
@@ -134,7 +134,9 @@
     "ws.all": "All active",
     "ws.focus": "CLI default",
     "ws.focusTip":
-      "CLI commands run here when you don't name a workspace. Picking a workspace in the top bar only changes what pages show.",
+      "CLI commands run here when you don't name a workspace. Picking a workspace in the top bar also makes it the CLI default.",
+    "ws.pickTip":
+      "Picking a workspace here also makes it the CLI default, so __DEN_CLI__ commands run there.",
     "ws.none": "No active workspaces",
     "ws.manage": "Manage workspaces…",
     "ws.allN": "All active ({n})",
@@ -144,10 +146,7 @@
     "ws.viewTitle":
       "View: what every page shows ({ws}). A view filter only: it starts, stops and routes nothing.",
     "ws.viewTitleFocus":
-      "View: what every page shows ({ws}). A view filter only: it starts, stops and routes nothing, and the CLI default ({focus}) stays the target for commands.",
-    "ws.setFocus": "Make {ws} the CLI default",
-    "ws.setFocusTip":
-      "CLI commands run in it when you don't name a workspace (writes workspaces.yml)",
+      "View: what every page shows ({ws}). It starts, stops and routes nothing. CLI default: {focus}.",
     "ws.viewFailed": "Could not change the view: {msg}",
     "ws.focusFailed": "Could not change the CLI default: {msg}",
     // A count's singular is its .one (0.3.0-dev.40: en had none, so the org
@@ -1722,8 +1721,9 @@
   /**
    * The Workspace part: { label, title, items: [{ value, label, checked,
    * focused, title? }], onSelect(value) }. "All active" and the active
-   * workspaces, the focused one marked; then, apart, "Set <ws> as focus"
-   * (model.focusable, model.onFocus(name)) and a link to manage them.
+   * workspaces, the focused one (model.focus, the CLI default) marked; then
+   * a link to manage them. onSelect(value, focus): choosing a workspace
+   * also makes it the CLI default (header.js).
    */
   function setWorkspaces(model) {
     var btn = document.getElementById("ws-pill");
@@ -1748,22 +1748,16 @@
         tag: it.focused ? t("ws.focus") : null,
         title: it.title || null,
         onSelect: function () {
-          if (!it.checked && typeof model.onSelect === "function")
-            model.onSelect(it.value);
+          if (typeof model.onSelect !== "function") return;
+          // The workspace in view still becomes the CLI default when it
+          // isn't one; picking what is both already does nothing.
+          if (it.checked && (it.value === "all" || it.value === model.focus))
+            return;
+          model.onSelect(it.value, model.focus || null, !!it.checked);
         },
       });
     });
     items.push({ hr: true });
-    // Focus is a separate action (it writes workspaces.yml and retargets
-    // the CLI); picking a view above never moves it.
-    if (model.focusable && typeof model.onFocus === "function")
-      items.push({
-        label: t("ws.setFocus", { ws: model.focusable }),
-        title: t("ws.setFocusTip"),
-        onSelect: function () {
-          model.onFocus(model.focusable);
-        },
-      });
     items.push({ label: t("ws.manage"), href: navHref("local-dev") });
     scopeMenus.ws = { label: t("k.ws"), items: items };
   }

package/src/ui/server/public/workspace-picker.js

@@ -25,7 +25,9 @@ export const EN_FALLBACK = {
   "ws.viewTitle":
     "View: what every page shows ({ws}). A view filter only: it starts, stops and routes nothing.",
   "ws.viewTitleFocus":
-    "View: what every page shows ({ws}). A view filter only: it starts, stops and routes nothing, and the CLI default ({focus}) stays the target for commands.",
+    "View: what every page shows ({ws}). It starts, stops and routes nothing. CLI default: {focus}.",
+  "ws.pickTip":
+    "Picking a workspace here also makes it the CLI default, so __DEN_CLI__ commands run there.",
 };
 function enT(key, vars) {
   return String(EN_FALLBACK[key] ?? key).replace(/\{(\w+)\}/g, (m, k) =>
@@ -50,10 +52,10 @@ function focusName(data) {
 /**
  * The top bar's Workspace ▾ menu (R4, 0.3.0-dev.18), from the `/api/scope`
  * and `/api/workspaces` payloads. It is the view scope: what every page,
- * the health row and `status` show. Choosing an entry never moves the
- * focus (the default target for commands); the focused workspace is
- * marked, and `focusable` names the workspace in view when it is not the
- * focus, for the menu's separate "Set <ws> as focus" item.
+ * the health row and `status` show. Choosing a workspace also makes it the
+ * focus (the CLI default, Ward's decision in 0.4.11); "All active" leaves
+ * the focus where it is. The focused workspace is marked, and `focus`
+ * names it, so the caller can skip a choice that is already the focus.
  *
  * "All active" is offered with two or more active workspaces; with one,
  * it and that workspace are the same view.
@@ -85,12 +87,13 @@ export function buildScopeMenuModel(scope, data, t = enT) {
       label: n,
       checked: n === one,
       focused: n === focus,
+      title: t("ws.pickTip"),
     })),
   ];
   return {
     label: active.length === 0 ? t("ws.noneLabel") : (one ?? t("ws.all")),
     items,
-    focusable: one && one !== focus ? one : null,
+    focus: focus ?? null,
     title: t(focus ? "ws.viewTitleFocus" : "ws.viewTitle", {
       ws: inView.join(", ") || t("ws.noneLabel"),
       focus,