dsh-gitbash-shell 0.45.0 → 0.46.0

package/CHANGELOG.md

@@ -3,6 +3,32 @@
 > 倒序排列,新版本条目在最上面。条目格式:`## vX.Y.Z — YYYY-MM-DD` + 类型(feat / fix / docs / chore)+ 要点 + 相关链接。
 > 纪律见 AGENTS.md「变更记录纪律」:发版前先更新本文件并随版本提交;事故复盘、复现与真机验证记录也记在这里。
 
+## [0.46.0] — 2026-10-28
+
+### fix:跟随 dsh-ops 0.4.3 的 preset-mode 行集(ops_bash 剥离不再失效)
+
+- **背景(dsh-ops 0.4.3 Breaking change)**:dsh-ops 把七个组件行换成了八行 preset-mode 开关
+  (`dsh-ops-mode-minimal` / `-standard` / `-ptc` / `-cordis` / `dsh-ops-discovery` /
+  `dsh-ops-compat` / `dsh-ops-panel` / `dsh-ops-tui`),旧的 `dsh-ops-shell` / `dsh-ops-file` /
+  `dsh-ops-ptc` / `dsh-ops-hide-official` 行在 bundle 中不再存在。v0.42.0 的剥离逻辑只认
+  `dsh-ops-shell` 一行,升级 0.4.3 后 `planOpsAdopt` 恒为 `skip-row-absent`——配置层的
+  `ops_bash` 剥离静默失效(可见性层面只剩本插件对 `ops_bash`/`ops_run` 的逐 agent deny 兜底)。
+- **修复**:`src/ops-adopt.js` 的行集扩为 `OPS_SHELL_ROW_IDS`(旧行 + 四个 mode 行)。四行都
+  可能发 Windows shell(dsh-ops `MODE_PLANS[*].shell = true`),因此对**在场的每一行**都写
+  `publishBashTool=false`;行不存在绝不写,混合 profile(旧行 + 新行同时在场,或只装旧版 dsh-ops)
+  也能正确处理。写入/回读/还原仍是官方 `configEditor` 通道,回读逐行验证;`disabled` 的 mode 行
+  不写(它本来就不发布),但还原仍会撤回我们留在其上的值。日志行会列出实际处理的每个行 id。
+- **还原**:dispose 钩子逐行撤回我们写的 `false`(恢复 inherited 值或删键),用户自己把值改回
+  `true` 的行视为其选择、不动(与 v0.42.0 同规则)。
+- **边界(写进 README)**:dsh-ops 0.4.3+ 还按 **preset id** 门控工具,只认官方四个 preset;
+  本插件的 `ptc-cordis` 与「· Git Bash」变体 id 不在其中 → 那些会话里 dsh-ops 既不发布也不隐藏
+  任何工具,我们的 bash 是唯一命令工具,四条 mode 行的开关在那里不会触发。旧版 dsh-ops 升级到
+  0.4.3 时,profile patch 里遗留的旧行覆盖会产生 dsh-ops 自己的 `patch: entry ... not found`
+  警告——那是 dsh-ops 官方升级须知里要求手动删除的残留,与本插件的写入无关(我们只写活行)。
+- **测试(343 项:342 pass + 1 平台 skip)**:`tests/ops-adopt.mjs` 新增四组 case——行集完整性
+  (旧行 + 四 mode 行、顺序)、0.4.3 profile 逐行写入 + 日志行 id、混合 profile 只写仍在发布的行、
+  disabled 行不写且全 disabled 静默收口、逐行还原(恢复 inherited / 删键 / 保留用户改成 true 的行)。
+
 ## [0.45.0] — 2026-10-28
 
 ### feat:bash 初始化脚本 `initScript`(BASH_ENV;issue #37 的 fnm/nvm 场景)

package/README.md

@@ -47,23 +47,26 @@ POSIX 宿主上完整保留;
   `/c/` 方言统一:`ops_*` 的入参(含 `root`/`operations[].path`/`protect`)
   自动转换、返回与报错路径自动回流 `/c/`。
 
-- **与 dsh-ops 并存:bash 只留一份(v0.42.0)**:宿主机制决定「可见但拒绝」到不了「看不见」——
+- **与 dsh-ops 并存:bash 只留一份(v0.42.0;v0.46.0 跟随 0.4.3 行集)**:宿主机制决定「可见但拒绝」到不了「看不见」——
   `tools.restrict` 只能过滤继承面,而 `ops_bash` 注册在 agent 自有层。于是本插件直接接管 dsh-ops
   自带的 `publishBashTool` 开关(经官方 configEditor 通道写为 `false`):安装本插件时 `ops_bash`
   不再出现在模型工具面;**ops 的 pwsh7 overlay(给官方 pwsh 工具供路径)与文件/后台增强不受影响**
   ——publishBashTool 的门只套在 `mountSessionBash` 上,pwsh 走 `mountBundledPwsh` 独立路径。
-  **`ops_run` 无需处理:它在 dsh-ops 的 bundle 装配中本就没有发布路径**——bundle 只有
-  shell/file/background/ptc 四行,全插件唯一一处 `new FastCtxTools` 只在 background 组件挂
-  后台四件套(`run_background`/`job_*`),前台 `ops_run` 只是未被任何调用点使用的默认参数;
-  本机 `dsh-ops-background` 行默认关闭,后台四件套同样不存在。
+  **行集随 dsh-ops 0.4.3 变化**:旧版开关在 `dsh-ops-shell` 组件行上;0.4.3 起该行消失,改成四个
+  preset-mode 行 `dsh-ops-mode-minimal` / `-standard` / `-ptc` / `-cordis`(四行的执行计划都含
+  Windows shell,都能发 `ops_bash`),本插件对**在场的每一行**都写 `false`,旧行仍在的混合 profile
+  也照样处理。**`ops_run` 无需处理:它在 dsh-ops 的 bundle 装配中本就没有发布路径**——bundle 只有
+  mode/discovery/compat/panel/tui 八行,前台 `ops_run` 只是未被任何调用点使用的默认参数。
   **停用或卸载本插件的瞬间自动还原**(dispose 钩子撤回覆盖,同 row 的其它设置原样保留),重新启用
-  又会自动接管。两个边界:①关机状态下卸载的残余覆盖,用 dsh-ops 设置卡「恢复默认」一键撤回;
-  ②停用时若覆盖值已被你手动改回 `true`,视为你的选择、不动它。无设置开关——想用 `ops_bash`
-  就停用本插件,还原是自动的。
-   **后台任务与文件/PTC 增强全部让给 dsh-ops(2026-10-19 用户决策)**:剔除清单被守卫测试
-   锁死为 `ops_bash` + `ops_run` 两项,永不含 `ops_run_background`/`ops_job_*`——你启用
-   dsh-ops 的「后台任务」组件后,这组全局工具在普通会话与 PTC 创造模式下原样可见可用,
-   本插件不做任何 deny。bash 归 gitbash,后台与增强归 dsh-ops,职责互不越界。
+  又会自动接管。三个边界:①关机状态下卸载的残余覆盖,用 dsh-ops 设置卡「恢复默认」一键撤回;
+  ②停用时若覆盖值已被你手动改回 `true`,视为你的选择、不动它;③**dsh-ops 0.4.3 起按 preset id
+  门控**:它只认官方四个 preset,本插件的 `ptc-cordis` 与「· Git Bash」变体 id 不在其中——那些
+  会话里 dsh-ops 什么也不发布(也不隐藏官方 pwsh/read/glob/grep),我们的 bash 是唯一命令工具。
+  无设置开关——想用 `ops_bash` 就停用本插件,还原是自动的。
+  **后台任务与文件/PTC 增强全部让给 dsh-ops(2026-10-19 用户决策)**:剔除清单被守卫测试
+  锁死为 `ops_bash` + `ops_run` 两项,永不含 `ops_run_background`/`ops_job_*`——你启用
+  dsh-ops 的「后台任务」组件后,这组全局工具在普通会话与 PTC 创造模式下原样可见可用,
+  本插件不做任何 deny。bash 归 gitbash,后台与增强归 dsh-ops,职责互不越界。
 
 四个「· Git Bash」**变体 preset 仍保留,默认关闭**(`variantPresets` 开关,
 设置卡可开):开启后注册 `standard-gitbash`/`minimal-gitbash`/`code-gitbash`/

package/README_EN.md

@@ -215,6 +215,32 @@ Two boundaries: whatever the script prints lands in the command's output (do not
 in it), and the file must exist — bash silently ignores a missing `BASH_ENV`, so a typo
 behaves exactly like "not set". `~` expands to the home directory.
 
+## Cooperation with dsh-ops: one bash per face (v0.42.0; rows follow 0.4.3)
+
+The host cannot turn "visible but denied" into "hidden": `tools.restrict` filters
+only the inherited surface, while dsh-ops registers `ops_bash` in each agent's
+OWN layer. So this plugin drives dsh-ops's own `publishBashTool` switch instead —
+`false`, through the official `configEditor` channel — and `ops_bash` stops
+being registered at all. dsh-ops keeps its pwsh7 overlay, file tools and
+background jobs (`publishBashTool` gates `mountSessionBash` only).
+
+**dsh-ops 0.4.3 replaced the component roster with preset-mode rows.** The
+switch used to live on the single `dsh-ops-shell` row; today four rows carry it —
+`dsh-ops-mode-minimal`, `-standard`, `-ptc`, `-cordis` — and every one of them
+plans a Windows shell (`MODE_PLANS[*].shell`), so every one can publish
+`ops_bash`. v0.46.0 walks the whole set: the legacy row when an older dsh-ops is
+mounted, the four mode rows on 0.4.3+, and a mixed profile handles whichever
+rows are actually mounted. Disabling or uninstalling this plugin lifts the
+override again (dispose hook) and leaves every unrelated setting in the same row
+untouched.
+
+Two edges: (1) an override left behind by uninstalling while dsh was shut down
+is one click away from gone — dsh-ops's own settings card offers "restore
+defaults" for each row; (2) dsh-ops 0.4.3+ also gates its tools on the agent's
+preset id and knows only the four official ones — this plugin's `ptc-cordis`
+preset and the `· Git Bash` variant ids match no mode, so dsh-ops publishes
+nothing there (and hides nothing either): our bash is the only command tool.
+
 ## Cooperation with dsh-ptc-cordis-preset
 
 This plugin publishes a `gitBash` host capability (`{ active, bashPath }`,

package/dsh.plugin.json

@@ -1,6 +1,6 @@
 {
   "id": "dsh-external/dsh-gitbash-shell",
-  "version": "0.45.0",
+  "version": "0.46.0",
   "main": "./src/index.js",
   "description": "Windows 全模式 Git Bash:自带 bash 工具(私有 Git Bash 执行器实例,官方 PowerShell 执行器原样保留),官方四个模式经行内工具补位直接获得 Git Bash(v0.35.0 起;v0.39.0 起不再替换宿主执行器),四个 *·Git Bash 变体 preset 可开关;官方 pwsh 工具默认隐藏、开关可见(真 PowerShell);附带 gb_* FastCtx 文件工具,检测到 dsh-ops 自动让位。联动:dsh-ptc-cordis-preset(PTC 创造模式带 Git Bash 行且可去重)+ dsh-better-sidebar(终端标签自动切 Git Bash)。",
   "engines": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-gitbash-shell",
-  "version": "0.45.0",
+  "version": "0.46.0",
   "description": "Windows 上给 agent 一个真正的 Git Bash 命令工具:私有 Git Bash 执行器实例(官方 PowerShell 执行器原样保留),统一 MSYS 盘根路径方言,官方 pwsh 工具默认隐藏可开关,物化四个内置预设的 Git Bash 变体,侧栏终端接管可开关。· Give agents a real Git Bash tool on Windows: a private Git Bash executor instance (the official PowerShell executor stays untouched), a unified MSYS drive-root path dialect, an opt-in official pwsh tool, and four Git Bash preset variants.",
   "type": "module",
   "repository": {

package/src/ops-adopt.js

@@ -23,6 +23,24 @@
  * prompt-policy tool table drops the bash row. Setting it is therefore not a
  * hack into someone else's plugin; it is their own supported configuration.
  *
+ * WHICH ROWS CARRY IT (v0.46.0, dsh-ops 0.4.3 breaking change): up to 0.4.2
+ * the switch lived on the single `dsh-ops-shell` component row. 0.4.3 replaced
+ * the component roster with preset-mode switches — `dsh-ops-mode-minimal`,
+ * `-standard`, `-ptc` and `-cordis` — and EVERY one of them plans a Windows
+ * shell (`MODE_PLANS[*].shell = true` in src/modes/plan.ts), so every one of
+ * them can publish ops_bash. This module therefore walks the whole set
+ * ({@link OPS_SHELL_ROW_IDS}): the legacy row when an older dsh-ops is
+ * mounted, the four mode rows when 0.4.3+ is. A row that is not mounted is
+ * never written to (hard rule 1), which is what makes one walk serve both
+ * eras and mixed/partially-overridden profiles.
+ *
+ * NOT COVERED BY THIS MODULE (documented, not a bug): dsh-ops 0.4.3+ gates
+ * its tools on the AGENT'S PRESET ID (`modeOf` -> `modeByPreset`), and the
+ * four ids are the official ones. A custom preset such as ours (`ptc-cordis`)
+ * or the `· Git Bash` variant ids matches no mode, so dsh-ops publishes
+ * nothing there and the row switches we write simply never fire — the face
+ * keeps only our bash.
+ *
  * WHY THIS MODULE TALKS TO configEditor (same discipline as
  * terminal-shell.js): the write must survive restarts and must be undoable.
  * configEditor.edit(entry, change) is the channel the official settings UI
@@ -56,11 +74,24 @@
  *   3. NEVER claim success without reading the value back.
  *   4. Restore returns the INHERITED value for OUR key only: unrelated
  *      overrides in the same row (the user's own dsh-ops settings) survive.
+ *   5. NEVER write to a disabled row (it publishes nothing); restore still
+ *      lifts our value from a row the user disabled afterwards.
  */
 
-/** The Loader row id of the dsh-ops shell component. */
+/** The Loader row id of the dsh-ops shell component (dsh-ops <= 0.4.2). */
 export const OPS_SHELL_ROW_ID = 'dsh-ops-shell'
 
+/** dsh-ops 0.4.3+ preset-mode rows; every one plans a Windows shell. */
+export const OPS_MODE_ROW_IDS = Object.freeze([
+  'dsh-ops-mode-minimal',
+  'dsh-ops-mode-standard',
+  'dsh-ops-mode-ptc',
+  'dsh-ops-mode-cordis',
+])
+
+/** Every row that can carry the publishBashTool switch, legacy first. */
+export const OPS_SHELL_ROW_IDS = Object.freeze([OPS_SHELL_ROW_ID, ...OPS_MODE_ROW_IDS])
+
 /**
  * The effective publishBashTool of the row: the profile patch override wins
  * over the inherited layer value; a missing key means the dsh-ops default
@@ -82,17 +113,20 @@ export function effectivePublishBashTool(row) {
 }
 
 /**
- * Decide what to do about ops_bash. Pure: every fact arrives as an argument,
- * so the whole matrix (absent / already overridden / off at the source /
- * to-adopt) is unit-testable anywhere.
- * @param {object|undefined} row - the dsh-ops-shell row from
- *   configEditor.configuration(), or undefined when not mounted.
+ * Decide what to do about ops_bash FOR ONE ROW. Pure: every fact arrives as
+ * an argument, so the whole matrix (absent / already overridden / off at the
+ * source / disabled row / to-adopt) is unit-testable anywhere.
+ * @param {object|undefined} row - one row from configEditor.configuration(),
+ *   or undefined when not mounted.
  * @returns {{action: string, reason: string}} the plan.
  */
 export function planOpsAdopt(row) {
   if (row === undefined || row === null) {
     return { action: 'skip-row-absent', reason: 'the dsh-ops shell row is not mounted in this profile' }
   }
+  if (row.entry?.options?.disabled === true) {
+    return { action: 'skip-disabled', reason: 'the row is disabled, so it publishes no bash tool' }
+  }
   const overrideValue = row.override !== null && row.override !== undefined ? row.override.publishBashTool : undefined
   if (typeof overrideValue === 'boolean' && overrideValue === false) {
     return { action: 'present', reason: 'the row override already sets publishBashTool=false' }
@@ -107,52 +141,105 @@ export function planOpsAdopt(row) {
 }
 
 /**
- * Find the dsh-ops shell row in an editor view, or undefined.
+ * The row id of one editor entry, '' when the shape is malformed.
+ * @param {object|undefined} row - one configEditor.configuration() entry.
+ * @returns {string} the id.
+ */
+function rowIdOf(row) {
+  const id = row?.entry?.options?.id
+  return typeof id === 'string' ? id : ''
+}
+
+/**
+ * Every shell-carrying dsh-ops row in an editor view, legacy first then the
+ * mode rows in roster order. Rows for other dsh-ops ids are ignored.
+ * @param {object} editor - ctx.configEditor (or a stand-in in tests).
+ * @returns {object[]} the rows (possibly empty).
+ */
+function opsRowsOf(editor) {
+  const rows = editor.configuration()
+  if (!Array.isArray(rows)) return []
+  const found = []
+  for (const id of OPS_SHELL_ROW_IDS) {
+    for (const candidate of rows) {
+      if (rowIdOf(candidate) === id) found.push(candidate)
+    }
+  }
+  return found
+}
+
+/**
+ * Read one row back by id, or undefined when it vanished.
  * @param {object} editor - ctx.configEditor (or a stand-in in tests).
- * @returns {object|undefined} the row.
+ * @param {string} id - the row id.
+ * @returns {object|undefined} the fresh row.
  */
-function opsRowOf(editor) {
+function freshRowOf(editor, id) {
   const rows = editor.configuration()
-  return Array.isArray(rows) ? rows.find((candidate) => candidate.entry?.options?.id === OPS_SHELL_ROW_ID) : undefined
+  return Array.isArray(rows) ? rows.find((candidate) => rowIdOf(candidate) === id) : undefined
 }
 
 /**
- * Apply the plan through the official config editor, then READ THE VALUE BACK.
+ * Apply the plan through the official config editor, then READ EVERY VALUE
+ * BACK. One walk serves both eras: the legacy `dsh-ops-shell` row and the four
+ * 0.4.3+ `dsh-ops-mode-*` rows; absent rows are skipped, never written.
  * @param {object} editor - ctx.configEditor (or a stand-in in tests).
- * @returns {Promise<{status: string, detail?: string}>} the outcome; the caller
- *   logs it — this function never lies about success and never throws for an
- *   expected condition.
+ * @returns {Promise<{status: string, rows: object[], detail?: string}>} the
+ *   outcome; the caller logs it — this function never lies about success and
+ *   never throws for an expected condition.
  */
 export async function adoptOpsBashRemoval(editor) {
   if (editor === null || editor === undefined || typeof editor.configuration !== 'function') {
-    return { status: 'skip-row-absent', detail: 'the config editor is unavailable, so the dsh-ops row cannot be configured' }
+    return { status: 'skip-row-absent', rows: [], detail: 'the config editor is unavailable, so the dsh-ops row cannot be configured' }
   }
-  const row = opsRowOf(editor)
-  const plan = planOpsAdopt(row)
-  if (plan.action !== 'adopt') return { status: plan.action, detail: plan.reason }
-  if (typeof editor.edit !== 'function') {
-    return { status: 'write-failed', detail: 'the config editor exposes no edit()' }
+  const rows = opsRowsOf(editor)
+  if (rows.length === 0) {
+    return { status: 'skip-row-absent', rows: [], detail: 'no dsh-ops shell or mode row is mounted in this profile' }
   }
-  try {
-    await editor.edit(row.entry, (raw) => ({ ...raw, publishBashTool: false }))
-  } catch (error) {
-    return { status: 'write-failed', detail: 'the official config editor refused the write: ' + (error && error.message ? error.message : String(error)) }
+  const plans = rows.map((row) => planOpsAdopt(row))
+  const results = rows.map((row, index) => ({ id: rowIdOf(row), action: plans[index].action, reason: plans[index].reason }))
+  const targets = rows.filter((row, index) => results[index].action === 'adopt')
+  if (targets.length > 0 && typeof editor.edit !== 'function') {
+    return { status: 'write-failed', rows: results, detail: 'the config editor exposes no edit()' }
   }
-  // Read back: edit() resolving is NOT proof the row now carries our value.
-  let after
-  try {
-    after = opsRowOf(editor)
-  } catch (error) {
-    return { status: 'write-failed', detail: 'the write succeeded but reading it back failed: ' + (error && error.message ? error.message : String(error)) }
+  for (const row of targets) {
+    const id = rowIdOf(row)
+    try {
+      await editor.edit(row.entry, (raw) => ({ ...raw, publishBashTool: false }))
+    } catch (error) {
+      return {
+        status: 'write-failed',
+        rows: results,
+        detail: 'the official config editor refused the write for ' + id + ': ' + (error && error.message ? error.message : String(error)),
+      }
+    }
   }
-  if (after === undefined || after.override === null || after.override === undefined || after.override.publishBashTool !== false) {
-    return {
-      status: 'write-failed',
-      detail: 'the write did not stick: the dsh-ops row does not read publishBashTool=false'
-        + (after === undefined ? ' (the row vanished during the write)' : ''),
+  // Read back: edit() resolving is NOT proof the rows now carry our value.
+  for (const row of targets) {
+    const id = rowIdOf(row)
+    let after
+    try {
+      after = freshRowOf(editor, id)
+    } catch (error) {
+      return {
+        status: 'write-failed',
+        rows: results,
+        detail: 'the write succeeded but reading ' + id + ' back failed: ' + (error && error.message ? error.message : String(error)),
+      }
+    }
+    if (after === undefined || after.override === null || after.override === undefined || after.override.publishBashTool !== false) {
+      return {
+        status: 'write-failed',
+        rows: results,
+        detail: 'the write did not stick on ' + id + ': it does not read publishBashTool=false'
+          + (after === undefined ? ' (the row vanished during the write)' : ''),
+      }
     }
   }
-  return { status: 'adopted' }
+  if (targets.length > 0) return { status: 'adopted', rows: results }
+  if (results.some((result) => result.action === 'present')) return { status: 'present', rows: results }
+  if (results.some((result) => result.action === 'unchanged-inherited-off')) return { status: 'unchanged-inherited-off', rows: results }
+  return { status: 'skip-disabled-rows', rows: results, detail: 'every dsh-ops shell row is disabled' }
 }
 
 /**
@@ -160,53 +247,88 @@ export async function adoptOpsBashRemoval(editor) {
  * fiber dispose hook (plugin disabled / uninstalled while dsh runs). Only OUR
  * key is touched: unrelated overrides in the same row survive.
  * @param {object} editor - ctx.configEditor (or a stand-in in tests).
- * @returns {Promise<{status: string, detail?: string}>} the outcome.
+ * @returns {Promise<{status: string, rows: object[], detail?: string}>} the outcome.
  */
 export async function restoreOpsBash(editor) {
   if (editor === null || editor === undefined || typeof editor.configuration !== 'function') {
-    return { status: 'restore-failed', detail: 'the config editor is unavailable, so the override cannot be lifted' }
+    return { status: 'restore-failed', rows: [], detail: 'the config editor is unavailable, so the override cannot be lifted' }
   }
-  const row = opsRowOf(editor)
-  if (row === undefined) {
-    return { status: 'skip-row-absent', detail: 'the dsh-ops shell row is no longer mounted — nothing to restore' }
+  const rows = opsRowsOf(editor)
+  if (rows.length === 0) {
+    return { status: 'skip-row-absent', rows: [], detail: 'no dsh-ops shell or mode row is mounted — nothing to restore' }
   }
-  const overrideValue = row.override !== null && row.override !== undefined ? row.override.publishBashTool : undefined
-  if (typeof overrideValue !== 'boolean') {
-    return { status: 'unchanged', detail: 'no publishBashTool override to lift' }
+  // Only rows where OUR value is in force are touched. A row the user flipped
+  // back ON afterwards is their own later choice — leave it exactly where it is.
+  const results = []
+  const targets = []
+  for (const row of rows) {
+    const id = rowIdOf(row)
+    const overrideValue = row.override !== null && row.override !== undefined ? row.override.publishBashTool : undefined
+    if (typeof overrideValue !== 'boolean') {
+      results.push({ id, action: 'unchanged', reason: 'no publishBashTool override to lift' })
+      continue
+    }
+    if (overrideValue !== false) {
+      results.push({ id, action: 'unchanged', reason: 'the override reads publishBashTool=true — a later choice of the user, left alone' })
+      continue
+    }
+    results.push({ id, action: 'restore' })
+    targets.push(row)
   }
-  if (overrideValue !== false) {
-    // Somebody (the user, through the settings card) turned it back ON after
-    // us. Lifting that would REPLACE their choice with the inherited default —
-    // leave their value exactly where it is.
-    return { status: 'unchanged', detail: 'the override reads publishBashTool=true — a later choice of the user, left alone' }
+  if (targets.length === 0) {
+    return { status: 'unchanged', rows: results, detail: results.map((row) => row.id + ': ' + row.reason).join('; ') }
   }
   if (typeof editor.edit !== 'function') {
-    return { status: 'restore-failed', detail: 'the config editor exposes no edit()' }
+    return { status: 'restore-failed', rows: results, detail: 'the config editor exposes no edit()' }
   }
-  try {
-    await editor.edit(row.entry, (raw, inherited) => {
-      const next = { ...raw }
-      if (inherited !== null && inherited !== undefined && Object.hasOwn(inherited, 'publishBashTool')) {
-        next.publishBashTool = inherited.publishBashTool
-      } else {
-        delete next.publishBashTool
+  for (const row of targets) {
+    const id = rowIdOf(row)
+    try {
+      await editor.edit(row.entry, (raw, inherited) => {
+        const next = { ...raw }
+        if (inherited !== null && inherited !== undefined && Object.hasOwn(inherited, 'publishBashTool')) {
+          next.publishBashTool = inherited.publishBashTool
+        } else {
+          delete next.publishBashTool
+        }
+        return next
+      })
+    } catch (error) {
+      return {
+        status: 'restore-failed',
+        rows: results,
+        detail: 'the official config editor refused the restore for ' + id + ': ' + (error && error.message ? error.message : String(error)),
       }
-      return next
-    })
-  } catch (error) {
-    return { status: 'restore-failed', detail: 'the official config editor refused the restore: ' + (error && error.message ? error.message : String(error)) }
-  }
-  let after
-  try {
-    after = opsRowOf(editor)
-  } catch (error) {
-    return { status: 'restore-failed', detail: 'the restore succeeded but reading it back failed: ' + (error && error.message ? error.message : String(error)) }
+    }
   }
-  const left = after !== undefined && after.override !== null && after.override !== undefined ? after.override.publishBashTool : undefined
-  if (typeof left === 'boolean' && left === false) {
-    return { status: 'restore-failed', detail: 'the restore did not stick: the row still reads publishBashTool=false' }
+  for (const row of targets) {
+    const id = rowIdOf(row)
+    let after
+    try {
+      after = freshRowOf(editor, id)
+    } catch (error) {
+      return {
+        status: 'restore-failed',
+        rows: results,
+        detail: 'the restore succeeded but reading ' + id + ' back failed: ' + (error && error.message ? error.message : String(error)),
+      }
+    }
+    const left = after !== undefined && after.override !== null && after.override !== undefined ? after.override.publishBashTool : undefined
+    if (typeof left === 'boolean' && left === false) {
+      return { status: 'restore-failed', rows: results, detail: 'the restore did not stick on ' + id + ': it still reads publishBashTool=false' }
+    }
   }
-  return { status: 'restored' }
+  return { status: 'restored', rows: results }
+}
+
+/**
+ * The row ids one result touched, for the log line.
+ * @param {object} result - an adopt/restore result.
+ * @returns {string} comma-joined ids, or ''.
+ */
+export function opsRowList(result) {
+  const rows = Array.isArray(result?.rows) ? result.rows : []
+  return rows.map((row) => row.id).filter((id) => typeof id === 'string' && id !== '').join(', ')
 }
 
 /**
@@ -216,19 +338,22 @@ export async function restoreOpsBash(editor) {
  * @returns {string} the log line, without the plugin tag.
  */
 export function opsAdoptReport(result) {
+  const listed = opsRowList(result)
   switch (result.status) {
     case 'adopted':
-      return 'dsh-ops bash removed from the agent face (publishBashTool=false through the official config editor): the host cannot hide own-layer tools, so dsh-ops must simply not register it — disable this plugin any time you want ops_bash back (the removal is lifted automatically)'
+      return 'dsh-ops bash removed from the agent face (publishBashTool=false on ' + listed + ' through the official config editor): the host cannot hide own-layer tools, so dsh-ops must simply not register it — disable this plugin any time you want ops_bash back (the removal is lifted automatically)'
     case 'present':
-      return 'dsh-ops bash already removed: the dsh-ops-shell row override already reads publishBashTool=false (nothing written)'
+      return 'dsh-ops bash already removed: ' + listed + ' already read publishBashTool=false (nothing written)'
     case 'unchanged-inherited-off':
-      return 'dsh-ops bash already off at the source: publishBashTool=false in the dsh-ops configuration (nothing written)'
+      return 'dsh-ops bash already off at the source: publishBashTool=false in the dsh-ops configuration of ' + listed + ' (nothing written)'
+    case 'skip-disabled-rows':
+      return 'dsh-ops bash removal not needed: ' + (result.detail ?? 'every dsh-ops shell row is disabled')
     case 'skip-row-absent':
       return 'dsh-ops bash removal skipped: ' + (result.detail ?? 'the dsh-ops shell row is not mounted')
     case 'write-failed':
       return 'dsh-ops bash removal FAILED — ' + (result.detail ?? '')
         + ' | next steps: ops_bash stays VISIBLE and our pre-execute denial keeps answering its calls;'
-        + ' retry by restarting dsh, or set publishBashTool=false on the dsh-ops-shell row by hand'
+        + ' retry by restarting dsh, or set publishBashTool=false on the dsh-ops shell/mode row by hand'
         + ' (Settings -> the dsh-ops card -> publishBashTool), or turn to the README for the manual patch row.'
     default:
       return 'dsh-ops bash removal skipped: ' + (result.detail ?? result.status)
@@ -241,16 +366,17 @@ export function opsAdoptReport(result) {
  * @returns {string} the log line, without the plugin tag.
  */
 export function opsRestoreReport(result) {
+  const listed = opsRowList(result)
   switch (result.status) {
     case 'restored':
-      return 'dsh-ops bash setting restored: the publishBashTool override is lifted, ops_bash follows the dsh-ops settings again'
+      return 'dsh-ops bash setting restored: the publishBashTool override is lifted on ' + (listed || 'the rows') + ', ops_bash follows the dsh-ops settings again'
     case 'unchanged':
       return 'dsh-ops bash restore not needed: ' + (result.detail ?? 'no override of ours to lift')
     case 'skip-row-absent':
       return 'dsh-ops bash restore skipped: ' + (result.detail ?? 'the dsh-ops shell row is gone')
     case 'restore-failed':
       return 'dsh-ops bash restore FAILED — ' + (result.detail ?? '')
-        + ' | the dsh-ops-shell override may survive this plugin: lift it by hand'
+        + ' | the dsh-ops override may survive this plugin: lift it by hand'
         + ' (Settings -> the dsh-ops card -> restore defaults) if ops_bash should come back.'
     default:
       return 'dsh-ops bash restore skipped: ' + (result.detail ?? result.status)