@hacky.software/opencode-todo-supervisor 0.3.7 → 0.3.9

package/README.md

@@ -23,7 +23,7 @@ Tested against OpenCode `2.0.24`.
 ## Install
 
 ```sh
-opencode plugin add @hacky.software/opencode-todo-supervisor@0.3.7
+opencode plugin add @hacky.software/opencode-todo-supervisor@0.3.9
 ```
 
 This also loads the bundled TUI entry. To pass options, use the object form:
@@ -197,7 +197,11 @@ effective set is `config.markdownFiles ∪ stored files − removed` per session
   - it re-reads every 3 s while open, so edits made outside OpenCode show up
     without waiting for an event.
 - **Side panel** (palette "Todo: open side panel"): the same list docked to
-  `session.panel` (`todo.todos`), with `f` for fullscreen.
+  `session.panel` (`todo.todos`), with `f` for fullscreen. Its keys are live only
+  while the panel is focused *and* no overlay is up (dialog, menu, completions,
+  composer), so a docked panel never steals the arrow keys from the model picker,
+  command palette or the prompt's completions. The gate is applied per key at
+  dispatch, not on the layer: the host ignores a layer-level `enabled`.
 - `/todos add <path>` and `/todos remove <path>` manage subscriptions from the
   prompt.
 - **Toasts** on `nudged` (idle vs stalled wording) and on the all-done transition.
@@ -380,7 +384,7 @@ There is no filesystem watcher. Instead:
   (source edits and config content changes; `touch` alone does not).
 - `opencode2 reload` forces reconciliation; `opencode2 service restart` only as a
   last resort (it interrupts sessions).
-- Tests: `bun test` (121 tests across parser, storage, tools, RPC, state machine,
+- Tests: `bun test` (123 tests across parser, storage, tools, RPC, state machine,
   panel helpers).
 - Watch logs: `tail -f ~/.local/share/opencode/log/todo-supervisor.log`.
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hacky.software/opencode-todo-supervisor",
-  "version": "0.3.7",
+  "version": "0.3.9",
   "description": "OpenCode V2 plugin that gives every session a todo list (todo_write/todo_read), supervises idle sessions until the list is done, and can drive checklists in markdown files from a TUI panel.",
   "type": "module",
   "license": "MIT",

package/src/panel.test.ts

@@ -10,7 +10,9 @@ import {
   isSelectable,
   itemColumns,
   moveCursor,
+  panelKeys,
   popoverBodyHeight,
+  popoverKeys,
   priorityTag,
   progressBar,
   quietLabel,
@@ -200,6 +202,26 @@ describe("panel cursor", () => {
     expect(dialogWidth("xlarge", 20)).toBe(20)
   })
 
+  test("the panel layer yields to overlays that own the keyboard", () => {
+    // Normal session view: live while focused.
+    expect(panelKeys(true, "base")).toBe(true)
+    expect(panelKeys(false, "base")).toBe(false)
+    // The model picker, dialogs, menus and completions all take the keyboard.
+    for (const mode of ["modal", "menu", "autocomplete", "composer"]) {
+      expect(panelKeys(true, mode)).toBe(false)
+    }
+    // Any other mode (including the plain session view) keeps the panel live.
+    expect(panelKeys(true, "base")).toBe(true)
+  })
+
+  test("the popover keeps the keyboard in its own dialog", () => {
+    expect(popoverKeys("modal")).toBe(true)
+    expect(popoverKeys("base")).toBe(true)
+    expect(popoverKeys("menu")).toBe(false)
+    expect(popoverKeys("autocomplete")).toBe(false)
+    expect(popoverKeys("composer")).toBe(false)
+  })
+
   test("id and priority tags and their column widths", () => {
     expect(idTag(undefined)).toBe("")
     expect(idTag("12")).toBe("#12")

package/src/panel.ts

@@ -322,3 +322,29 @@ const DIALOG_WIDTH: Record<DialogSizeName, number> = { medium: 60, large: 88, xl
 export function dialogWidth(size: DialogSizeName, viewportWidth: number): number {
   return Math.min(DIALOG_WIDTH[size], Math.max(20, viewportWidth - 2))
 }
+
+/**
+ * Keymap modes that own the keyboard while they are up: `modal` (dialogs, the
+ * model picker, confirmations), `menu` (the command/palette menus),
+ * `autocomplete` (the prompt's completion list) and `composer` (composer
+ * overlays). They all drive themselves with the arrow keys.
+ */
+const OVERLAY_MODES: ReadonlySet<string> = new Set(["modal", "menu", "autocomplete", "composer"])
+
+/**
+ * Whether the side panel's keys should be live. Only the overlay modes take the
+ * keyboard away; any other mode (the plain session view included) keeps the
+ * panel live while it is focused. Without this a focused docked panel swallows
+ * the model picker's up/down.
+ */
+export function panelKeys(focused: boolean, mode: string): boolean {
+  return focused && !OVERLAY_MODES.has(mode)
+}
+
+/**
+ * Whether the popover's keys should be live. The popover *is* a dialog, so
+ * `modal` is ours; any other overlay takes the keyboard away from it.
+ */
+export function popoverKeys(mode: string): boolean {
+  return mode === "modal" || !OVERLAY_MODES.has(mode)
+}

package/src/tui.tsx

@@ -26,7 +26,9 @@ import {
   idTag,
   itemColumns,
   moveCursor,
+  panelKeys,
   popoverBodyHeight,
+  popoverKeys,
   priorityTag,
   progressBar,
   rowIndex,
@@ -409,8 +411,9 @@ export default Plugin.define({
           })
 
         context.keymap.layer(() => ({
+          // "global" keeps the layer mode-agnostic; the actual gating is done
+          // per command below.
           mode: "global",
-          enabled: () => props.active(),
           priority: 10,
           commands: [
             { title: "Todo: select next", bind: "down", run: () => move(1) },
@@ -491,7 +494,12 @@ export default Plugin.define({
                 }),
             },
             { title: "Todo: close", bind: "escape", run: () => props.close() },
-          ],
+            // The host drops a *layer*-level `enabled`; the *command*-level one
+            // is consulted on every dispatch. Gate each key here so it yields —
+            // and falls through — the moment an overlay (model picker, palette,
+            // completion list, composer) owns the keyboard while a todo surface
+            // happens to still be focused.
+          ].map((command) => ({ ...command, enabled: () => props.active() })),
         }))
 
         const totals = () => {
@@ -625,7 +633,7 @@ export default Plugin.define({
         return (
           <TodoList
             sessionID={props.sessionID}
-            active={() => true}
+            active={() => popoverKeys(context.keymap.mode.current())}
             width={() => dialogWidth(size(), viewportWidth())}
             height={() => popoverBodyHeight(viewportHeight())}
             close={() => context.ui.dialog.clear()}
@@ -660,7 +668,7 @@ export default Plugin.define({
           <Show when={panel.name === "todo.todos"}>
             <TodoList
               sessionID={panel.sessionID}
-              active={() => panel.focused}
+              active={() => panelKeys(panel.focused, context.keymap.mode.current())}
               width={() => panel.width}
               close={() => panel.close()}
               cycleSize={() => panel.toggleFullscreen()}