roger-roger 0.1.13 → 0.1.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "roger-roger",
-  "version": "0.1.13",
+  "version": "0.1.14",
   "description": "Bring yourself back to the conversation: your coding agents reach you by Slack, a sound or a spoken line when they finish, get stuck, or need a decision, and you answer from your phone.",
   "type": "module",
   "bin": {
@@ -15,7 +15,7 @@
     "node": ">=18"
   },
   "scripts": {
-    "test": "node --test",
+    "test": "node --test --import ./test/setup.mjs",
     "make-sounds": "node tools/make-sounds.mjs",
     "version": "node tools/sync-version.mjs && git add skills/roger-roger/herdr-plugin.toml"
   },

package/skills/roger-roger/herdr-plugin.toml

@@ -6,7 +6,7 @@
 
 id = "roger-roger"
 name = "roger-roger"
-version = "0.1.13"
+version = "0.1.14"
 min_herdr_version = "0.9.0"
 description = "Slack, a sound or a spoken line from the agents in your panes, and questions you answer from your phone"
 platforms = ["linux", "macos", "windows"]

package/skills/roger-roger/scripts/herdr.mjs

@@ -151,25 +151,28 @@ export function workFromTitle(title, agent = "") {
   return t;
 }
 
-// Herdr is asked for the title at most this often per session; a label follows the topic, not keystrokes.
-const TITLE_EVERY_MS = 60_000;
-const titleAsked = new Map();
-
-/** The work to label with: the `--session` name if the agent gave one, else the pane's title. */
-async function workFor(session, run, now = Date.now()) {
-  if (str(session.name)) return str(session.name);
-  const last = titleAsked.get(session.id);
-  if (last && now - last.at < TITLE_EVERY_MS) return last.work;
-  let work = "";
+// Herdr is asked about the pane at most this often per session; a label follows the topic, not keystrokes.
+const ASK_EVERY_MS = 60_000;
+const asked = new Map();
+
+/**
+ * What Herdr says is in the pane: whether an agent is there at all, and the work its terminal title
+ * names. A pane with no agent in it, a shell where someone ran `roger-roger install` say, is never
+ * labelled: its tab belongs to whatever else is in it, and nothing there is an agent to name.
+ */
+export async function paneAgent(session, run = runHerdr, now = Date.now()) {
+  const last = asked.get(session.id);
+  if (last && now - last.at < ASK_EVERY_MS) return last.found;
+  let found = { agent: false, work: "" };
   try {
     const out = await run(["agent", "get", session.herdr.pane], { bin: session.herdr.bin, socket: session.herdr.socket });
-    const agent = JSON.parse(out)?.result?.agent ?? {};
-    work = workFromTitle(agent.terminal_title_stripped ?? agent.terminal_title, agent.agent ?? session.agent);
+    const agent = JSON.parse(out)?.result?.agent;
+    if (agent) found = { agent: true, work: workFromTitle(agent.terminal_title_stripped ?? agent.terminal_title, agent.agent ?? session.agent) };
   } catch {
-    // No title is no label, not an error: the tab still gets the badge.
+    // Herdr says there is no agent there (agent_not_found), or can't be asked: either way, no labels.
   }
-  titleAsked.set(session.id, { at: now, work });
-  return work;
+  asked.set(session.id, { at: now, found });
+  return found;
 }
 
 const inFlight = new Set();
@@ -178,14 +181,17 @@ const inFlight = new Set();
  * Put the session's labels on its Herdr pane, if it has one and they are not there yet. Never
  * throws: a pane that can't be labelled is a line in the log, not a failed command. `touch` records
  * what was put on, so it isn't done again; `run` is the herdr invocation (replaced in tests).
- * Without a `--session` name, the work is taken from the pane's terminal title.
+ * Only a pane Herdr says has an agent in it is labelled. Without a `--session` name, the work is
+ * taken from the pane's terminal title.
  */
 export async function labelPane(session, { log = () => {}, touch = () => {}, run = runHerdr } = {}) {
   if (!session?.herdr?.tab || !session?.herdr?.pane || inFlight.has(session.id)) return { labelled: false };
   inFlight.add(session.id);
-  let commands;
+  let commands = [];
   try {
-    commands = labelCommands({ ...session, name: await workFor(session, run) });
+    const pane = await paneAgent(session, run);
+    // The --session name wins; the terminal title stands in when there is none.
+    if (pane.agent) commands = labelCommands({ ...session, name: str(session.name) || pane.work });
   } catch {
     commands = [];
   }

package/skills/roger-roger/scripts/install.mjs

@@ -882,7 +882,7 @@ export async function runInstall(args, { script, hooks, input = process.stdin, o
     await ui.run("Starting the daemon", () => daemon("ping"), { done: (r) => ({ text: "Daemon running", detail: `pid ${r.data?.pid ?? "?"}, it stays up for every agent on this machine` }) }).catch(() => {});
     const touchedDelivery = ["reach", "sound", "voice"].some(asking);
     if (first || touchedDelivery) {
-      const session = { identity: identity(env, process.cwd(), { session: "roger-roger install" }), about: { name: "roger-roger install", agent: "install" } };
+      const session = { identity: identity({ ...env, HERDR_ENV: "" }, process.cwd(), { session: "roger-roger install" }), about: { name: "roger-roger install", agent: "install" } };
       const test = await ui.confirm({ message: "Send a test notification now?", initial: first });
       if (test) {
         await attempt(ui, "Sending the test", () =>

package/skills/roger-roger/scripts/tui.mjs

@@ -211,16 +211,24 @@ export function createUI({ input = process.stdin, output = process.stdout, env =
     write("\x1b[?25l");
     rawOn();
     const keys = keyReader(input);
+    // Something started by a key can finish after the question is answered (a voice preview still
+    // speaking when Enter was pressed). Its redraw must not bring the answered question back, drawn
+    // under the next one.
+    let open = true;
+    const redraw = () => {
+      if (open) paint.draw(draw());
+    };
     try {
       paint.draw(draw());
       for (;;) {
         const key = await keys.next();
         if (cancelKey(key)) throw new Cancelled();
-        const result = await onKey(key, () => paint.draw(draw()));
+        const result = await onKey(key, redraw);
         if (result === true) break;
         paint.draw(draw());
       }
     } finally {
+      open = false;
       keys.close();
       rawOff();
       paint.clear();