roger-roger 0.1.4 → 0.1.13

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

@@ -2,8 +2,9 @@
 // `<directory> <tab label> <agent label>`. Out of the box that reads "code-red 2 claude" — the tab
 // number and the agent's kind — which says nothing about *which* claude, while the user's Slack
 // messages arrive signed "🍯 amber". This closes that gap: when a session runs inside a Herdr pane,
-// its tab is labelled with the session's badge (`🍯 amber`) and its agent with the kind and the work
-// (`claude-build-process-improvements`), so the sidebar and Slack name the same thing.
+// its tab is labelled with the session's badge and a word or two of the work (`🍯 amber | build
+// process`) and its agent with the work
+// (`build-process-improvements`), so the sidebar and Slack name the same thing.
 //
 // The pane's context comes from the environment Herdr injects into the pane (HERDR_ENV=1 and the
 // ids). The CLI runs there and passes it along with its identity; the daemon, which runs somewhere
@@ -40,20 +41,46 @@ export function herdrContext(env = process.env) {
 
 /** What the tab says: the session's badge, `🍯 amber`. */
 export function tabLabel(session) {
-  return session?.nickname ? badge(session.nickname) : "";
+  if (!session?.nickname) return "";
+  const work = shortWork(session.name);
+  return work ? `${badge(session.nickname)} | ${work}` : badge(session.nickname);
 }
 
+// Words that say nothing on their own, skipped when the work is cut down to two.
+const FILLER = new Set(["a", "an", "the", "and", "or", "of", "for", "to", "in", "on", "with", "my", "our", "some", "into", "from", "about", "new"]);
+const MAX_TAB_WORK = 24;
+
 /**
- * What the agent is called: its kind and its work, in the only shape Herdr accepts —
- * `claude-build-process-improvements`. Without a `--session` name there is nothing to add to what
+ * The work in a word or two, for the tab: "security audit of the billing service" → "security
+ * audit", "Home Assistant MCP setup" → "home assistant". Lowercase, punctuation gone, filler words
+ * skipped, and never longer than a tab can show.
+ */
+export function shortWork(text) {
+  const words = String(text ?? "")
+    .toLowerCase()
+    .replace(/[^\p{L}\p{N}\s-]+/gu, " ")
+    .split(/\s+/)
+    .map((w) => w.replace(/^-+|-+$/g, ""))
+    .filter((w) => w && !FILLER.has(w));
+  let out = "";
+  for (const word of words.slice(0, 2)) {
+    const next = out ? `${out} ${word}` : word;
+    if (next.length > MAX_TAB_WORK) break;
+    out = next;
+  }
+  return out || (words[0] ?? "").slice(0, MAX_TAB_WORK);
+}
+
+/**
+ * What the agent is called: its work, in the only shape Herdr accepts —
+ * `build-process-improvements`. Without a `--session` name there is nothing to add to what
  * Herdr already shows (the kind), so the agent is left alone.
  */
 export function agentName(session) {
-  const work = slug(session?.name);
-  if (!work) return "";
-  const kind = slug(session?.agent) || "agent";
-  const name = `${kind}-${work}`.slice(0, MAX_AGENT_NAME).replace(/[-_]+$/, "");
-  return AGENT_NAME.test(name) ? name : "";
+  // The work alone: which agent it is (claude, codex) was a guess from the environment, and Herdr
+  // already shows the kind beside it.
+  const name = slug(session?.name).slice(0, MAX_AGENT_NAME).replace(/[-_]+$/, "");
+  return name && AGENT_NAME.test(name) ? name : "";
 }
 
 function slug(text) {
@@ -110,17 +137,62 @@ function errorText(text) {
   }
 }
 
+/**
+ * What the pane's agent is working on, from its terminal title: Claude Code, Codex and others set it
+ * to the conversation's topic ("Home Assistant MCP setup"). Empty when the title is only the shell
+ * or the program's own name, which says nothing about the work.
+ */
+export function workFromTitle(title, agent = "") {
+  const t = str(title).replace(/^[^\p{L}\p{N}]+/u, "").trim();
+  if (!t) return "";
+  if (/[\\/]|\.exe$|^(powershell|pwsh|cmd|bash|zsh|fish|sh|node)$/i.test(t)) return "";
+  if (agent && t.toLowerCase() === String(agent).toLowerCase()) return "";
+  if (/^(claude( code)?|codex|opencode|gemini|cursor|copilot)$/i.test(t)) return "";
+  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 = "";
+  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);
+  } catch {
+    // No title is no label, not an error: the tab still gets the badge.
+  }
+  titleAsked.set(session.id, { at: now, work });
+  return work;
+}
+
 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.
  */
 export async function labelPane(session, { log = () => {}, touch = () => {}, run = runHerdr } = {}) {
-  const commands = labelCommands(session);
-  if (!commands.length || inFlight.has(session.id)) return { labelled: false };
+  if (!session?.herdr?.tab || !session?.herdr?.pane || inFlight.has(session.id)) return { labelled: false };
   inFlight.add(session.id);
+  let commands;
+  try {
+    commands = labelCommands({ ...session, name: await workFor(session, run) });
+  } catch {
+    commands = [];
+  }
+  if (!commands.length) {
+    inFlight.delete(session.id);
+    return { labelled: false };
+  }
   const done = { ...(session.herdrLabel ?? {}) };
   try {
     for (const args of commands) {

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

@@ -18,6 +18,7 @@ import { routeMessage } from "./router.mjs";
 import * as progressStore from "./progress.mjs";
 import * as sessions from "./sessions.mjs";
 import * as decisions from "./decisions.mjs";
+import * as activity from "./activity.mjs";
 
 const KEEP = 200;
 
@@ -166,6 +167,20 @@ export async function ingest(message, { log = () => {}, live = false, waiting =
   const route = entry.route;
   const files = entry.files ?? [];
   log(`message ${message.ts} → ${route.kind}${route.key ? ` ${route.key}` : route.id ? ` ${route.id}` : ""}`);
+  // An answer in a question's thread is logged when the question settles, as the answer it is.
+  if (route.kind !== "decision") {
+    const to = route.kind === "session" ? sessions.get(route.id) : route.kind === "progress" && route.session ? sessions.get(route.session) : null;
+    const where = { progress: "a note on the progress message", ask: "asked which agent", inbox: "saved for the next agent" }[route.kind] ?? "";
+    activity.record({
+      from: "user",
+      kind: "message",
+      agent: to ? activity.agentOf(sessions.decorate(to)) : null,
+      text: text || (files.length ? files.map((f) => f.name).join(", ") : ""),
+      detail: where,
+      at: tsIso(message.ts),
+      ref: message.ts,
+    });
+  }
 
   await addReaction(channel, message.ts, reactionFor(route)).catch((e) => log(`reaction failed: ${e.message}`));
 
@@ -268,6 +283,7 @@ export async function resolvePick(messageTs, sessionId, log = () => {}) {
   const chosen = sessionId === NOBODY ? null : sessions.get(sessionId);
   const route = chosen ? { kind: "session", id: chosen.id, via: "picked" } : { kind: "inbox" };
   writeState({ ...state, messages: state.messages.map((m) => (m.ts === messageTs ? { ...m, route } : m)) });
+  activity.retarget(messageTs, chosen ? activity.agentOf(sessions.decorate(chosen)) : null, chosen ? "" : "saved for the next agent");
 
   if (chosen) {
     deliver(chosen.id, { text: entry.text, by: entry.user, at: tsIso(entry.ts), ts: entry.ts, channel: entry.channel, via: "picked" });