@martintrojer/murmur 0.2.0 → 0.2.1

package/ARCHITECTURE.md

@@ -354,7 +354,7 @@ where the system interpreter is least yours to touch.
   "murmur_snapshot": 1,
   "host_id": "1d2ee96e-3a94-41b2-90fa-5f1ee2f04276",  // from identity.json
   "display_name": "mtrojer-mac",
-  "murmur_version": "0.2.0",         // read from package.json, never restated
+  "murmur_version": "0.2.1",         // read from package.json, never restated
   "generated_at": 1788105698997,     // this node's clock at build time
   "panes": [
     {

package/CHANGELOG.md

@@ -3,6 +3,28 @@
 Notable changes per release. Written for someone deciding whether to upgrade,
 so it says what changed for a user rather than listing every commit.
 
+## 0.2.1
+
+**Agents are named by their tmux session, not by whatever process tmux found
+running in the window.** The picker's `agent` column showed `Python`, `node` and
+`zsh` for real agents — pi's own interpreter, labelled "agent".
+
+tmux's `automatic-rename` is on by default, which makes a window name simply the
+foreground command, and murmur preferred that name over the session name. So any
+agent without a mu agent name or a pi `/name` was listed under a process name,
+and `hacking/murmur` — the string you actually search for — was hidden. A window
+name is now recorded only when someone chose it, which means a window you renamed
+yourself still wins, as does mu's own naming.
+
+A row also no longer prints one string twice: the name and the stream column both
+fell back to the session name, so an unnamed agent read `hacking/murmur
+hacking/murmur` and spent thirteen columns saying nothing new.
+
+Upgrading does not retroactively fix agents that are already running. The name is
+recorded by the pane's own owner, so each agent's row is corrected when its pi
+process next starts. A pi `/reload` is not enough — it re-runs the extension
+inside the same process, which has the old code cached.
+
 ## 0.2.0
 
 **murmur now stores current state instead of an event log, and every node

package/README.md

@@ -235,7 +235,7 @@ already full-screen, and you land back at your shell prompt on exit.
 
 ## Status
 
-**0.2.0.** In daily use on one machine and verified across two over real ssh.
+**0.2.1.** In daily use on one machine and verified across two over real ssh.
 It is new and not battle-tested. The known gaps and the accepted limitations are
 listed at the end of [ARCHITECTURE.md](ARCHITECTURE.md#known-gaps).
 

package/dist/cli.js

@@ -27,6 +27,10 @@ function runTmux(args) {
     return null;
   }
 }
+function chosenWindowName(name, autoRename) {
+  if (autoRename === "1") return null;
+  return name || null;
+}
 function exactSession(session) {
   return `=${session}`;
 }
@@ -46,16 +50,16 @@ var tmux = {
       "-t",
       pane,
       "-p",
-      "#{session_id}	#{window_id}	#{session_name}	#{window_name}"
+      "#{session_id}	#{window_id}	#{session_name}	#{window_name}	#{?automatic-rename,1,0}"
     ]);
-    const [session, window, sessionName, windowName] = fields?.split("	") ?? [];
+    const [session, window, sessionName, windowName, autoRename] = fields?.split("	") ?? [];
     if (!session || !window) return null;
     return {
       session: asSessionId(session),
       window: asWindowId(window),
       pane,
       session_name: sessionName || null,
-      window_name: windowName || null
+      window_name: chosenWindowName(windowName, autoRename)
     };
   },
   // Which of this host's PANES still exist. The only liveness question tmux is
@@ -955,7 +959,7 @@ function describeFailure(peer, message) {
   const detail = collapsed.length > 160 ? `${collapsed.slice(0, 157)}...` : collapsed;
   return `${peer}: ${detail}`;
 }
-async function collect(store, channel, now = Date.now(), deadline) {
+async function collect(store, channel, now = Date.now(), deadline, mux = tmux) {
   const results = [];
   let timer;
   try {
@@ -1002,7 +1006,7 @@ async function collect(store, channel, now = Date.now(), deadline) {
     clearTimeout(timer);
   }
   try {
-    store.reconcileLocal({ panes: tmux.livePanes(), now });
+    store.reconcileLocal({ panes: mux.livePanes(), now });
   } catch {
   }
   return results;
@@ -1708,9 +1712,9 @@ function status(store, identity, now = Date.now()) {
     }))
   };
 }
-async function statusWithCollect(store, identity, now = Date.now(), channel = ssh) {
+async function statusWithCollect(store, identity, now = Date.now(), channel = ssh, mux = tmux) {
   try {
-    await collect(store, channel, now);
+    await collect(store, channel, now, void 0, mux);
   } catch {
   }
   return status(store, identity, now);
@@ -1824,7 +1828,7 @@ function pickerRow(agent, showHost, current, local = agent.local) {
   const name = agent.agent_name ?? agent.pi_session ?? agentLabel(agent);
   const host = showHost ? local ? `${DIM}  here${RESET}` : `${REMOTE}\u2192 ${terminalText(agent.host)}${RESET}` : "";
   const group = agent.workstream ?? agent.session_name;
-  const workstream = group ? `${DIM}${terminalText(group)}${RESET}` : "";
+  const workstream = group && group !== name ? `${DIM}${terminalText(group)}${RESET}` : "";
   const extra = agent.attention.filter((kind) => kind !== state);
   const flags = [
     agent.driver === "orchestrated" ? "crew" : "",
@@ -1897,7 +1901,7 @@ async function runPick(store, options = {}, deps = {}) {
   const jumpTo = deps.jump ?? jumpToAgent;
   const identity = requireIdentity();
   if (!identity) return;
-  const view = await statusWithCollect(store, identity);
+  const view = await statusWithCollect(store, identity, Date.now(), ssh, deps.mux ?? tmux);
   const agents = view.panes.filter((agent2) => options.all || isVisible(agent2));
   const hidden = view.panes.length - agents.length;
   if (agents.length === 0) {