opencode-courier 0.4.0 → 0.4.1

package/README.md

@@ -116,7 +116,7 @@ line to the server log naming both ([more](docs/reference.md#the-opencode-versio
 
 | opencode-courier | OpenCode V2 (`opencode` and `@opencode/plugin`) |
 |---|---|
-| 0.4.0 | 2.0.28 |
+| 0.4.0, 0.4.1 | 2.0.28 |
 | 0.2.3, 0.3.0 | 2.0.26 |
 | 0.2.2 | 2.0.24 |
 | 0.2.1 | 2.0.23 |
@@ -264,14 +264,19 @@ courier 2 running · 1 waiting on you · group pair 1/2
 by depth, with what it does, its report and its group's standing; a session that started others gets
 a bar of the parts reported, a leaf how long it ran, its last tool call and its cost. `↑`/`↓` select,
 `enter` opens the session, `s` stops it and everything under it after you confirm, as `courier_stop`
-would, and `q` closes the panel; `/courier stop <session>` stops from the prompt.
+would, and `q` closes the panel; `/courier stop <session>` stops from the prompt. While open, the panel
+follows you between sessions: into one of its tree it keeps that tree, the session on screen marked
+`(on screen)`; elsewhere it shows that session's tree, or closes if it started none.
 
-`ctrl+x k` (the leader key, then `k`), `/asks`, the palette's "Courier: what waits on you" or a click
+`ctrl+x k` (the leader key, then `k`), `/asks` (or `/ask`), the palette's "Courier: what waits on you" or a click
 on "waiting on you" opens the asks inbox: every permission request, question and form waiting
 anywhere in the tree, oldest first, with where it comes from, answered in a dialog with no model in
 between; the session that started the tree hears once that you settled it. The TUI plays OpenCode's
 sounds for a child's report, a group's release and a new ask ([more](docs/reference.md#in-the-terminal)).
 
+While a permission prompt or form is shown in the session, OpenCode hides the footer, so open the
+inbox with `ctrl+x k` (or `/asks` once the prompt is back).
+
 ## Native child sessions
 
 Off by default. With `"nativeChildren": true` in the plugin's `options`, a child started without

package/dist/tree/tui.d.ts

@@ -41,8 +41,8 @@ export declare function stoppedLine({ stopped, cancelled }: Stopped): string;
 /** The usage the `/courier` command shows for an input it does not know. */
 export declare const USAGE = "/courier tree opens the session tree; /courier stop [session] stops a session and those under it";
 /**
- * Adds the tree panel to the `session.panel` slot, opened by `/courier tree` or the command palette, and `/courier
- * stop <session>`, which stops a session under the open one after the person confirms.
+ * Adds the tree panel to the `session.panel` slot, opened by `/courier tree` or the palette, which follows the person
+ * between sessions while open, and `/courier stop <session>`, which stops a session under the open one once confirmed.
  */
 export declare function addTreePanel(ctx: Context): () => void;
 /**

package/dist/tui.js

@@ -518,6 +518,7 @@ function addAsksInbox(ctx) {
     }, SETTLE_MS);
   });
   ctx.keymap.layer(() => ({
+    mode: "global",
     commands: [{
       id: INBOX_COMMAND,
       title: "Courier: what waits on you",
@@ -526,7 +527,8 @@ function addAsksInbox(ctx) {
       bind: "<leader>k",
       palette: true,
       slash: {
-        name: "asks"
+        name: "asks",
+        aliases: ["ask"]
       },
       run: () => void open()
     }]
@@ -550,7 +552,7 @@ import { createTextNode as _$createTextNode } from "@opentui/solid";
 import { insertNode as _$insertNode } from "@opentui/solid";
 import { setProp as _$setProp } from "@opentui/solid";
 import { createElement as _$createElement } from "@opentui/solid";
-import { createEffect, createResource, createSignal, For, onCleanup, Show } from "solid-js";
+import { createEffect, createResource, createRoot, createSignal, For, onCleanup, onMount, Show, untrack } from "solid-js";
 
 // src/tree/rpc.ts
 import { Rpc as Rpc2 } from "@opencode/plugin/rpc";
@@ -813,10 +815,12 @@ async function confirmStop(ctx, courier, location, by, target) {
   }
   return true;
 }
+var FOCUS_PROMPT = "pane.focus.left";
 function TreePanel(props) {
   const {
     ctx,
     input,
+    view,
     courier,
     location
   } = props;
@@ -824,7 +828,7 @@ function TreePanel(props) {
   const [read, {
     refetch
   }] = createResource(() => ({
-    sessionID: input.sessionID,
+    sessionID: view.root,
     changed: props.changed()
   }), ({
     sessionID
@@ -839,12 +843,40 @@ function TreePanel(props) {
     sessionID,
     error: reason(error)
   })));
-  const latest = () => read.state === "ready" || read.state === "refreshing" ? read.latest : undefined;
+  const latest = () => read.state === "ready" || read.state === "refreshing" ? read.latest : view.tree && {
+    sessionID: view.root,
+    tree: view.tree
+  };
   const rows = () => latest()?.tree?.rows ?? [];
+  createEffect(() => {
+    const tree = latest()?.tree;
+    if (tree)
+      view.note({
+        tree
+      });
+  });
+  createEffect(() => view.note({
+    presentation: input.presentation,
+    focused: input.focused
+  }));
+  onMount(() => {
+    if (!view.refocus)
+      return;
+    const giveBack = setTimeout(() => ctx.keymap.dispatch(FOCUS_PROMPT));
+    onCleanup(() => clearTimeout(giveBack));
+  });
   const [now, setNow] = createSignal(Date.now());
   const tick = setInterval(() => setNow(Date.now()), TICK_MS);
   onCleanup(() => clearInterval(tick));
   const [selected, setSelected] = createSignal(0);
+  let placed = false;
+  createEffect(() => {
+    const index = placed ? -1 : rows().findIndex((row) => row.sessionID === input.sessionID);
+    if (index < 0)
+      return;
+    placed = true;
+    setSelected(index);
+  });
   const current = () => rows()[Math.min(selected(), rows().length - 1)];
   let scroll;
   createEffect(() => {
@@ -864,7 +896,7 @@ function TreePanel(props) {
   const stopSelected = () => {
     const row = current();
     if (row)
-      confirmStop(ctx, courier, location, input.sessionID, {
+      confirmStop(ctx, courier, location, view.root, {
         sessionID: row.sessionID,
         title: row.title,
         under: reach(rows(), row.sessionID) - 1
@@ -920,7 +952,7 @@ function TreePanel(props) {
       run: () => input.close()
     }]
   }));
-  const root = () => parts(rows(), input.sessionID);
+  const root = () => parts(rows(), view.root);
   const rowColor = (row) => {
     if (row.state === "waiting")
       return theme.text.feedback.warning.base;
@@ -1010,6 +1042,7 @@ function TreePanel(props) {
           _$insert(_el$17, indent, _el$18);
           _$insert(_el$17, () => chosen() ? "\u25B8 " : "  ", _el$18);
           _$insert(_el$17, () => row.title, _el$18);
+          _$insert(_el$17, () => row.sessionID === input.sessionID ? " (on screen)" : "", _el$18);
           _$insert(_el$19, () => statusLine(row));
           _$insert(_el$16, _$createComponent(For, {
             get each() {
@@ -1066,6 +1099,23 @@ function addTreePanel(ctx) {
     location
   } = courierOf(ctx);
   const [changed, stopListening] = changes(ctx, PANEL_CHANGES, PANEL_SETTLE_MS);
+  let following;
+  let attempt = 0;
+  const viewOf = (sessionID) => {
+    const here = following?.at === sessionID ? following : undefined;
+    const refocus = here?.refocus === true;
+    if (here)
+      here.refocus = false;
+    return {
+      root: here?.root ?? sessionID,
+      tree: here?.tree,
+      refocus,
+      note: (fields) => {
+        if (here && following === here)
+          Object.assign(here, fields);
+      }
+    };
+  };
   const release = ctx.ui.slot({
     append: "session.panel",
     render: (input) => _$createComponent(Show, {
@@ -1076,6 +1126,9 @@ function addTreePanel(ctx) {
         return _$createComponent(TreePanel, {
           ctx,
           input,
+          get view() {
+            return viewOf(input.sessionID);
+          },
           courier,
           location,
           changed
@@ -1083,13 +1136,82 @@ function addTreePanel(ctx) {
       }
     })
   });
-  const openPanel = () => {
-    if (!ctx.ui.panel.open(PANEL))
-      ctx.ui.toast.show({
-        title: "courier",
-        message: "Open a session first",
-        variant: "warning"
+  const show = (from, at, root, tree) => {
+    following = {
+      ...from,
+      root,
+      at,
+      to: undefined,
+      tree,
+      refocus: !from.focused
+    };
+    ctx.ui.panel.open(PANEL, {
+      presentation: from.presentation
+    });
+  };
+  const treeOf = (sessionID) => courier.tree({
+    sessionID
+  }, {
+    location: location(sessionID)
+  }).catch(() => {
+    return;
+  });
+  const follow = (from, sessionID) => {
+    const token = ++attempt;
+    const under = (tree) => tree?.rows.some((row) => row.sessionID === sessionID) === true;
+    Object.assign(from, {
+      at: undefined,
+      to: sessionID
+    });
+    if (sessionID === from.root || under(from.tree))
+      return show(from, sessionID, from.root, from.tree);
+    (async () => {
+      const inside = await treeOf(from.root);
+      const own = under(inside) ? undefined : await treeOf(sessionID);
+      if (token !== attempt || following !== from)
+        return;
+      if (under(inside))
+        show(from, sessionID, from.root, inside);
+      else if (own?.rows.length)
+        show(from, sessionID, sessionID, own);
+      else
+        following = undefined;
+    })();
+  };
+  const stopFollowing = createRoot((dispose) => {
+    createEffect(() => {
+      const route = ctx.ui.router.current();
+      const sessionID = route.type === "session" ? route.sessionID : undefined;
+      const shown2 = ctx.ui.panel.current();
+      untrack(() => {
+        if (!following || shown2 && shown2.sessionID === sessionID || !following.at && following.to === sessionID)
+          return;
+        if (!shown2 && following.at === sessionID || !sessionID)
+          following = undefined;
+        else
+          follow(following, sessionID);
       });
+    });
+    return dispose;
+  });
+  const openPanel = () => {
+    const route = ctx.ui.router.current();
+    const before = following;
+    if (route.type === "session" && following?.at !== route.sessionID)
+      following = {
+        root: route.sessionID,
+        at: route.sessionID,
+        presentation: "panel",
+        focused: true
+      };
+    if (ctx.ui.panel.open(PANEL))
+      return;
+    following = before;
+    ctx.ui.toast.show({
+      title: "courier",
+      message: "Open a session first",
+      variant: "warning"
+    });
   };
   const stopUnder = async (target) => {
     const route = ctx.ui.router.current();
@@ -1153,6 +1275,7 @@ function addTreePanel(ctx) {
     }]
   }));
   return () => {
+    stopFollowing();
     stopListening();
     release();
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-courier",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "description": "Multi-session orchestration for OpenCode V2: spawn child sessions, be woken by them. No polling.",
   "license": "MIT",
   "author": "Ivo Pogace <71701666+ivopogace@users.noreply.github.com>",