@hwip/cli 0.1.2 → 0.1.4

package/dist/remote-agents.d.ts

@@ -1,5 +1,6 @@
 import { spawnSync } from 'child_process';
 import { type TranscriptProjector, type TranscriptReader } from './transcript-tail.js';
+import { type ProviderName } from './session-title.js';
 export interface RemoteAgent {
     /** Wire value for AgentSession.agentKind (server/phone contract). */
     kind: string;
@@ -57,8 +58,11 @@ export interface RemoteAgent {
      * carries this only once that agent's name store is confirmed. Cursor and
      * Gemini never will — their state files hold ids, cwds and timestamps and no
      * name at all, so there is nothing to read and the computed label stands.
+     *
+     * The answer says who chose the name (`source`) when the store can tell:
+     * the user setting that hides agent-made names hides `'auto'` only.
      */
-    resolveSessionName?: (paneCwd: string, panePid?: number) => string | null;
+    resolveSessionName?: (paneCwd: string, panePid?: number) => ProviderName | null;
     /**
      * Resolve the file this agent is writing its session transcript to, for the
      * live chat timeline (`turn-watch`).
@@ -117,6 +121,11 @@ export interface PidSessionRecord {
      * without it, and a record without a name is still a valid id match.
      */
     name?: string;
+    /**
+     * Who chose `name`: `"derived"` (from the cwd — CC's placeholder) or
+     * `"user"` (`/rename`). Absent from an older CC, which cannot say.
+     */
+    nameSource?: string;
 }
 export interface ProcTable {
     /** ppid → its direct children, for walking a pane's process tree. */
@@ -208,12 +217,21 @@ export declare const pidSessionRecordsExist: () => boolean;
 export declare const detectClaudeSessionByPid: (panePid: number, paneCwd: string | null, deps?: PidResolveDeps) => PidSessionRecord | null;
 export declare const detectClaudeSessionIdByPid: (panePid: number, paneCwd: string | null, deps?: PidResolveDeps) => string | null;
 /**
- * The name of the session running in this pane. No mtime fallback exists here:
- * the transcript filenames the heuristic walks carry a UUID and nothing else,
- * so an older CC without `~/.claude/sessions` yields no name and the phone
- * keeps the computed label.
+ * What the phone should call the Claude Code session in this pane, and who
+ * chose it.
+ *
+ * A `/rename` (`nameSource: "user"`) wins. Otherwise the newest `ai-title` CC
+ * wrote into the transcript — its own summary of the work, which is what tells
+ * parallel sessions apart. A derived name (`hybrid-shell-8f`, from the cwd)
+ * is never sent: it says no more than the tmux name the phone falls back to.
+ * A record from an older CC carries a name but no `nameSource`; that one is
+ * sent as before, with no source, ahead of any ai-title, since it may be the
+ * user's rename. No mtime
+ * fallback: only the pid match says which session this pane is.
  */
-export declare const detectClaudeSessionNameByPid: (panePid: number, paneCwd: string | null, deps?: PidResolveDeps) => string | null;
+export declare const detectClaudeProviderName: (panePid: number, paneCwd: string | null, deps?: PidResolveDeps & {
+    transcriptOf?: (cwd: string, sessionId: string) => string | null;
+}) => ProviderName | null;
 /**
  * The transcript file for the Claude Code session running in a tmux pane.
  *
@@ -241,6 +259,15 @@ export declare const claudeTranscriptPath: (paneCwd: string | null, panePid?: nu
  * until the TTL ran out.
  */
 export declare const piTranscriptPath: (paneCwd: string | null, panePid?: number) => string | null;
+/**
+ * The name a pi pane's session goes by, and who chose it: the newest
+ * `session_info` name, which is the agent's (`'auto'`) when the hwip
+ * extension's tool set it — the tool leaves a marker entry with the same name
+ * (`PI_TITLE_MARKER`) — and the user's (`/name`) otherwise. Read from the
+ * transcript tail, so a name written before the last 256 KB of a session the
+ * listener first meets late is not found until the next one is written.
+ */
+export declare const detectPiSessionName: (paneCwd: string, panePid: number | undefined, transcriptOf?: (paneCwd: string, panePid?: number) => string | null) => ProviderName | null;
 /**
  * The row whose timestamp is closest to when one of the pane's processes started,
  * within {@link PROC_MATCH_TOLERANCE_MS}. Null when nothing qualifies — including
@@ -248,6 +275,18 @@ export declare const piTranscriptPath: (paneCwd: string | null, panePid?: number
  * are collected before any row is compared rather than defaulted to zero.
  */
 export declare const pickRowByProcStart: <T>(rows: readonly T[], tsMsOf: (row: T) => number | null, startTimes: Map<number, number>, pids: Set<number>) => T | null;
+/**
+ * From when a conversation written to is this pane's: its earliest process start, less {@link PANE_WRITE_MARGIN_MS}. A
+ * resume writes to the conversation it picked back up, so that one is written to after the start; a fresh start
+ * has not written yet, so the folder's older conversations are all before it. Null when no start is known.
+ */
+export declare const paneSince: (panePid: number, deps?: StoreResolveDeps) => number | null;
+/**
+ * The conversation a transcript file holds — its name without `.jsonl` — when it was written to since `since`.
+ * For the agents whose resume appends to the file it picks back up (pi `-c`, Codex `resume`, Gemini `--resume`,
+ * measured 2026-10-20): the file is the conversation.
+ */
+export declare const transcriptIdSince: (path: string | null, since: number | null) => string | null;
 /**
  * Read rows from a SQLite file as JSON. Null on every failure — no `sqlite3` on
  * PATH, a locked or corrupt database, a schema that moved — because a missing
@@ -267,7 +306,12 @@ export interface StoreResolveDeps {
     startTimes?: Map<number, number>;
     descendants?: Set<number>;
 }
-export declare const detectHermesSessionName: (paneCwd: string, panePid?: number, deps?: StoreResolveDeps) => string | null;
+export declare const detectHermesSessionName: (paneCwd: string, panePid?: number, deps?: StoreResolveDeps) => ProviderName | null;
+/**
+ * The Hermes session this pane carries on: in its directory, with a message since the pane started — the newest.
+ * A `-c` picks back up a session started long before the pane, which the start-time match above cannot see.
+ */
+export declare const detectHermesResumeId: (paneCwd: string, panePid?: number, deps?: StoreResolveDeps) => string | null;
 /**
  * The highest-numbered match, numerically. Codex versions its state file
  * (`state_5.sqlite` today) and moves to the next number on a schema migration,
@@ -286,7 +330,7 @@ export declare const newestVersionedDb: (entries: readonly string[], pattern: Re
  * AND a creation time within the tolerance of a process in this pane. Add the
  * filter once the values can be observed.
  */
-export declare const detectCodexSessionName: (paneCwd: string, panePid?: number, deps?: StoreResolveDeps) => string | null;
+export declare const detectCodexSessionName: (paneCwd: string, panePid?: number, deps?: StoreResolveDeps) => ProviderName | null;
 export declare const codexTranscriptPath: (paneCwd: string | null, panePid?: number) => string | null;
 /**
  * The transcript a Gemini pane is writing, or null when there is none to follow.
@@ -322,7 +366,7 @@ declare const REMOTE_AGENT_TABLE: readonly [{
     readonly subcommands: readonly ["cc", "claude"];
     readonly quitCommand: "/exit";
     readonly resolveSessionId: (paneCwd: string, panePid: number | undefined) => string | null;
-    readonly resolveSessionName: (paneCwd: string, panePid: number | undefined) => string | null;
+    readonly resolveSessionName: (paneCwd: string, panePid: number | undefined) => ProviderName | null;
     readonly resolveTranscript: (paneCwd: string, panePid: number | undefined) => string | null;
     readonly projectTranscript: TranscriptProjector;
     readonly resolveResumeId: (paneCwd: string, panePid: number | undefined) => string | null;
@@ -332,9 +376,10 @@ declare const REMOTE_AGENT_TABLE: readonly [{
     readonly displayName: "Codex CLI";
     readonly binary: "codex";
     readonly subcommands: readonly ["codex"];
-    readonly resolveSessionName: (paneCwd: string, panePid?: number, deps?: StoreResolveDeps) => string | null;
+    readonly resolveSessionName: (paneCwd: string, panePid?: number, deps?: StoreResolveDeps) => ProviderName | null;
     readonly resolveTranscript: (paneCwd: string, panePid: number | undefined) => string | null;
     readonly projectTranscript: TranscriptProjector;
+    readonly resolveResumeId: (paneCwd: string, panePid: number | undefined) => string | null;
 }, {
     readonly kind: "cursor";
     readonly displayName: "Cursor CLI";
@@ -347,12 +392,14 @@ declare const REMOTE_AGENT_TABLE: readonly [{
     readonly subcommands: readonly ["gemini"];
     readonly resolveTranscript: (paneCwd: string, panePid: number | undefined) => string | null;
     readonly projectTranscript: TranscriptProjector;
+    readonly resolveResumeId: (paneCwd: string, panePid: number | undefined) => string | null;
 }, {
     readonly kind: "hermes";
     readonly displayName: "Hermes";
     readonly binary: "hermes";
     readonly subcommands: readonly ["hermes"];
-    readonly resolveSessionName: (paneCwd: string, panePid?: number, deps?: StoreResolveDeps) => string | null;
+    readonly resolveSessionName: (paneCwd: string, panePid?: number, deps?: StoreResolveDeps) => ProviderName | null;
+    readonly resolveResumeId: (paneCwd: string, panePid?: number, deps?: StoreResolveDeps) => string | null;
 }, {
     readonly kind: "pi";
     readonly displayName: "Pi";
@@ -360,6 +407,8 @@ declare const REMOTE_AGENT_TABLE: readonly [{
     readonly subcommands: readonly ["pi"];
     readonly resolveTranscript: (paneCwd: string, panePid: number | undefined) => string | null;
     readonly projectTranscript: TranscriptProjector;
+    readonly resolveResumeId: (paneCwd: string, panePid: number | undefined) => string | null;
+    readonly resolveSessionName: (paneCwd: string, panePid: number | undefined) => ProviderName | null;
 }, {
     readonly kind: "opencode";
     readonly displayName: "OpenCode";
@@ -367,7 +416,10 @@ declare const REMOTE_AGENT_TABLE: readonly [{
     readonly subcommands: readonly ["opencode"];
     readonly quitCommand: "/exit";
     readonly resolveSessionId: (paneCwd: string, panePid: number | undefined) => string | null;
-    readonly resolveSessionName: (paneCwd: string, panePid: number | undefined) => string | null;
+    readonly resolveSessionName: (paneCwd: string, panePid: number | undefined) => {
+        name: string;
+        source: "auto";
+    } | null;
     readonly resolveTranscript: (paneCwd: string, panePid: number | undefined) => string | null;
     readonly projectTranscript: TranscriptProjector;
     readonly readTranscript: (path: string, prev: import("./transcript-tail.js").TailState | null) => import("./transcript-tail.js").TailRead | null;

package/dist/remote-agents.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.matchAgentByPaneCommand = exports.findAgentBySubcommand = exports.REMOTE_AGENTS = exports.opencodeTranscriptPath = exports.detectOpencodeSession = exports.geminiTranscriptPath = exports.codexTranscriptPath = exports.detectCodexSessionName = exports.newestVersionedDb = exports.detectHermesSessionName = exports.sqliteJson = exports.pickRowByProcStart = exports.piTranscriptPath = exports.claudeTranscriptPath = exports.detectClaudeSessionNameByPid = exports.detectClaudeSessionIdByPid = exports.detectClaudeSessionByPid = exports.pidSessionRecordsExist = exports.collectDescendantPids = exports.psStartTimes = exports.foregroundAgentFor = exports.readProcTable = exports.parseProcTable = exports.detectClaudeSessionId = exports.claudeProjectDirName = void 0;
+exports.matchAgentByPaneCommand = exports.findAgentBySubcommand = exports.REMOTE_AGENTS = exports.opencodeTranscriptPath = exports.detectOpencodeSession = exports.geminiTranscriptPath = exports.codexTranscriptPath = exports.detectCodexSessionName = exports.newestVersionedDb = exports.detectHermesResumeId = exports.detectHermesSessionName = exports.sqliteJson = exports.transcriptIdSince = exports.paneSince = exports.pickRowByProcStart = exports.detectPiSessionName = exports.piTranscriptPath = exports.claudeTranscriptPath = exports.detectClaudeProviderName = exports.detectClaudeSessionIdByPid = exports.detectClaudeSessionByPid = exports.pidSessionRecordsExist = exports.collectDescendantPids = exports.psStartTimes = exports.foregroundAgentFor = exports.readProcTable = exports.parseProcTable = exports.detectClaudeSessionId = exports.claudeProjectDirName = void 0;
 /**
  * Remote-control agent registry — the single table behind every
  * `hwip <agent>` subcommand, the listener's pane matching, and the
@@ -22,6 +22,7 @@ const path_1 = require("path");
 const child_process_1 = require("child_process");
 const transcript_tail_js_1 = require("./transcript-tail.js");
 const pi_transcript_js_1 = require("./pi-transcript.js");
+const session_title_js_1 = require("./session-title.js");
 const codex_transcript_js_1 = require("./codex-transcript.js");
 const gemini_transcript_js_1 = require("./gemini-transcript.js");
 const opencode_transcript_js_1 = require("./opencode-transcript.js");
@@ -158,6 +159,7 @@ const readPidSessionRecords = () => {
                         sessionId: raw.sessionId,
                         cwd: raw.cwd,
                         ...(typeof raw.name === 'string' ? { name: raw.name } : {}),
+                        ...(typeof raw.nameSource === 'string' ? { nameSource: raw.nameSource } : {}),
                     });
                 }
             }
@@ -395,14 +397,35 @@ const detectClaudeSessionByPid = (panePid, paneCwd, deps = {}) => {
 exports.detectClaudeSessionByPid = detectClaudeSessionByPid;
 const detectClaudeSessionIdByPid = (panePid, paneCwd, deps = {}) => (0, exports.detectClaudeSessionByPid)(panePid, paneCwd, deps)?.sessionId ?? null;
 exports.detectClaudeSessionIdByPid = detectClaudeSessionIdByPid;
+/** Claude transcripts whose latest `ai-title` the listener keeps, read incrementally. */
+const claudeTitles = (0, session_title_js_1.createTailWatch)(session_title_js_1.latestClaudeAiTitle);
 /**
- * The name of the session running in this pane. No mtime fallback exists here:
- * the transcript filenames the heuristic walks carry a UUID and nothing else,
- * so an older CC without `~/.claude/sessions` yields no name and the phone
- * keeps the computed label.
+ * What the phone should call the Claude Code session in this pane, and who
+ * chose it.
+ *
+ * A `/rename` (`nameSource: "user"`) wins. Otherwise the newest `ai-title` CC
+ * wrote into the transcript — its own summary of the work, which is what tells
+ * parallel sessions apart. A derived name (`hybrid-shell-8f`, from the cwd)
+ * is never sent: it says no more than the tmux name the phone falls back to.
+ * A record from an older CC carries a name but no `nameSource`; that one is
+ * sent as before, with no source, ahead of any ai-title, since it may be the
+ * user's rename. No mtime
+ * fallback: only the pid match says which session this pane is.
  */
-const detectClaudeSessionNameByPid = (panePid, paneCwd, deps = {}) => nonBlank((0, exports.detectClaudeSessionByPid)(panePid, paneCwd, deps)?.name);
-exports.detectClaudeSessionNameByPid = detectClaudeSessionNameByPid;
+const detectClaudeProviderName = (panePid, paneCwd, deps = {}) => {
+    const record = (0, exports.detectClaudeSessionByPid)(panePid, paneCwd, deps);
+    if (!record)
+        return null;
+    const recordName = nonBlank(record.name);
+    if (recordName && record.nameSource === 'user')
+        return { name: recordName, source: 'user' };
+    if (recordName && record.nameSource === undefined)
+        return { name: recordName };
+    const transcript = (deps.transcriptOf ?? claudeConversationFile)(record.cwd, record.sessionId);
+    const title = transcript ? claudeTitles.read(transcript) : undefined;
+    return title ? { name: title, source: 'auto' } : null;
+};
+exports.detectClaudeProviderName = detectClaudeProviderName;
 /**
  * The transcript file for the Claude Code session running in a tmux pane.
  *
@@ -559,6 +582,23 @@ const piTranscriptPath = (paneCwd, panePid) => {
     return piSessionCache.set(key, doDetectPiTranscript(paneCwd));
 };
 exports.piTranscriptPath = piTranscriptPath;
+const piNames = (0, session_title_js_1.createTailWatch)(session_title_js_1.piNamesStep);
+/**
+ * The name a pi pane's session goes by, and who chose it: the newest
+ * `session_info` name, which is the agent's (`'auto'`) when the hwip
+ * extension's tool set it — the tool leaves a marker entry with the same name
+ * (`PI_TITLE_MARKER`) — and the user's (`/name`) otherwise. Read from the
+ * transcript tail, so a name written before the last 256 KB of a session the
+ * listener first meets late is not found until the next one is written.
+ */
+const detectPiSessionName = (paneCwd, panePid, transcriptOf = exports.piTranscriptPath) => {
+    const file = transcriptOf(paneCwd, panePid);
+    const names = file ? piNames.read(file) : undefined;
+    if (!names?.name)
+        return null;
+    return { name: names.name, source: names.marked === names.name ? 'auto' : 'user' };
+};
+exports.detectPiSessionName = detectPiSessionName;
 // ── Agents whose session store keeps no pid ──────────────────────
 //
 // Hermes and Codex both record a session per cwd with a creation timestamp and
@@ -596,6 +636,43 @@ const pickRowByProcStart = (rows, tsMsOf, startTimes, pids) => {
     return best?.row ?? null;
 };
 exports.pickRowByProcStart = pickRowByProcStart;
+/**
+ * How far before the pane's start a write may land and still be the pane's: `ps` `lstart` is whole seconds. Not
+ * {@link PROC_MATCH_TOLERANCE_MS} — the last sitting's final write lands seconds before an `exit` and a fresh
+ * start, and a margin that wide would read the fresh pane as carrying it on.
+ */
+const PANE_WRITE_MARGIN_MS = 2_000;
+/**
+ * From when a conversation written to is this pane's: its earliest process start, less {@link PANE_WRITE_MARGIN_MS}. A
+ * resume writes to the conversation it picked back up, so that one is written to after the start; a fresh start
+ * has not written yet, so the folder's older conversations are all before it. Null when no start is known.
+ */
+const paneSince = (panePid, deps = {}) => {
+    const startTimes = deps.startTimes ?? (0, exports.psStartTimes)();
+    const starts = [...(deps.descendants ?? (0, exports.collectDescendantPids)(panePid))]
+        .map((pid) => startTimes.get(pid))
+        .filter((t) => t !== undefined && Number.isFinite(t));
+    return starts.length === 0 ? null : Math.min(...starts) - PANE_WRITE_MARGIN_MS;
+};
+exports.paneSince = paneSince;
+/**
+ * The conversation a transcript file holds — its name without `.jsonl` — when it was written to since `since`.
+ * For the agents whose resume appends to the file it picks back up (pi `-c`, Codex `resume`, Gemini `--resume`,
+ * measured 2026-10-20): the file is the conversation.
+ */
+const transcriptIdSince = (path, since) => {
+    if (!path || since === null)
+        return null;
+    try {
+        return (0, fs_1.statSync)(path).mtimeMs >= since ? (0, path_1.basename)(path, '.jsonl') : null;
+    }
+    catch {
+        return null;
+    }
+};
+exports.transcriptIdSince = transcriptIdSince;
+/** {@link transcriptIdSince} for a pane: what `resolveResumeId` answers for an agent whose transcript is a file. */
+const paneTranscriptId = (path, panePid) => panePid === undefined ? null : (0, exports.transcriptIdSince)(path, (0, exports.paneSince)(panePid));
 /**
  * Read rows from a SQLite file as JSON. Null on every failure — no `sqlite3` on
  * PATH, a locked or corrupt database, a schema that moved — because a missing
@@ -652,10 +729,44 @@ const detectHermesSessionName = (paneCwd, panePid, deps = {}) => {
         return null;
     const row = (0, exports.pickRowByProcStart)(rows, (r) => (typeof r.started_at === 'number' ? r.started_at * 1_000 : null), deps.startTimes ?? (0, exports.psStartTimes)(), deps.descendants ?? (0, exports.collectDescendantPids)(panePid));
     // The auto-title is written asynchronously after the first response, so an
-    // untitled row is a young session, not a broken one.
-    return nonBlank(row?.title ?? undefined) ?? nonBlank(row?.display_name ?? undefined);
+    // untitled row is a young session, not a broken one. `title` is Hermes'
+    // own; `display_name` comes from outside its titler (a gateway fills it
+    // from the chat it serves), so it is never one to hide.
+    const title = nonBlank(row?.title ?? undefined);
+    if (title)
+        return { name: title, source: 'auto' };
+    const display = nonBlank(row?.display_name ?? undefined);
+    return display ? { name: display, source: 'user' } : null;
 };
 exports.detectHermesSessionName = detectHermesSessionName;
+const readHermesActive = ttlMemo(SNAPSHOT_TTL_MS, () => (0, exports.sqliteJson)(HERMES_STATE_DB, `SELECT s.id AS id, s.cwd AS cwd, (SELECT max(m.timestamp) FROM messages m WHERE m.session_id = s.id) AS active
+     FROM sessions s WHERE s.source = 'cli' ORDER BY s.started_at DESC LIMIT ${STORE_ROW_LIMIT}`));
+/**
+ * The Hermes session this pane carries on: in its directory, with a message since the pane started — the newest.
+ * A `-c` picks back up a session started long before the pane, which the start-time match above cannot see.
+ */
+const detectHermesResumeId = (paneCwd, panePid, deps = {}) => {
+    if (panePid === undefined)
+        return null;
+    const raw = deps.rows !== undefined ? deps.rows : readHermesActive();
+    if (raw === null)
+        return null;
+    const since = (0, exports.paneSince)(panePid, deps);
+    if (since === null)
+        return null;
+    let best = null;
+    // The query's own columns; each is checked with typeof below before it is used.
+    for (const row of raw) {
+        if (row.cwd !== paneCwd || typeof row.id !== 'string' || !row.id)
+            continue;
+        if (typeof row.active !== 'number' || row.active * 1_000 < since)
+            continue;
+        if (!best || row.active > (best.active ?? 0))
+            best = row;
+    }
+    return best?.id ?? null;
+};
+exports.detectHermesResumeId = detectHermesResumeId;
 // ── Codex ────────────────────────────────────────────────────────
 const CODEX_DIR = (0, path_1.join)((0, os_1.homedir)(), '.codex');
 const CODEX_STATE_DB = /^state_(\d+)\.sqlite$/;
@@ -715,7 +826,13 @@ const detectCodexSessionName = (paneCwd, panePid, deps = {}) => {
     if (rows.length === 0)
         return null;
     const row = (0, exports.pickRowByProcStart)(rows, (r) => r.created_at_ms ?? (typeof r.created_at === 'number' ? r.created_at * 1_000 : null), deps.startTimes ?? (0, exports.psStartTimes)(), deps.descendants ?? (0, exports.collectDescendantPids)(panePid));
-    return nonBlank(row?.name ?? undefined) ?? nonBlank(row?.title ?? undefined);
+    // `name` is what the user typed (`/rename`); `title` is Codex's own —
+    // the first prompt, verbatim.
+    const name = nonBlank(row?.name ?? undefined);
+    if (name)
+        return { name, source: 'user' };
+    const title = nonBlank(row?.title ?? undefined);
+    return title ? { name: title, source: 'auto' } : null;
 };
 exports.detectCodexSessionName = detectCodexSessionName;
 /**
@@ -1031,13 +1148,9 @@ const detectOpencodeSession = (paneCwd, panePid, deps = {}) => {
     const raw = deps.rows !== undefined ? deps.rows : readOpencodeSessions();
     if (raw === null)
         return null;
-    const startTimes = deps.startTimes ?? (0, exports.psStartTimes)();
-    const starts = [...(deps.descendants ?? (0, exports.collectDescendantPids)(panePid))]
-        .map((pid) => startTimes.get(pid))
-        .filter((t) => t !== undefined && Number.isFinite(t));
-    if (starts.length === 0)
+    const since = (0, exports.paneSince)(panePid, deps);
+    if (since === null)
         return null;
-    const since = Math.min(...starts) - PROC_MATCH_TOLERANCE_MS;
     const dir = realDir(paneCwd);
     let best = null;
     for (const row of raw) {
@@ -1079,7 +1192,7 @@ const REMOTE_AGENT_TABLE = [
         // (older CC without ~/.claude/sessions, or ps failure).
         resolveSessionId: (paneCwd, panePid) => (panePid !== undefined ? (0, exports.detectClaudeSessionIdByPid)(panePid, paneCwd) : null)
             ?? (0, exports.detectClaudeSessionId)(paneCwd),
-        resolveSessionName: (paneCwd, panePid) => panePid !== undefined ? (0, exports.detectClaudeSessionNameByPid)(panePid, paneCwd) : null,
+        resolveSessionName: (paneCwd, panePid) => panePid !== undefined ? (0, exports.detectClaudeProviderName)(panePid, paneCwd) : null,
         resolveTranscript: (paneCwd, panePid) => (0, exports.claudeTranscriptPath)(paneCwd, panePid),
         projectTranscript: transcript_tail_js_1.projectTranscriptEntries,
         // The pid match alone: the mtime fallback above can name another
@@ -1098,6 +1211,8 @@ const REMOTE_AGENT_TABLE = [
         resolveSessionName: exports.detectCodexSessionName,
         resolveTranscript: (paneCwd, panePid) => (0, exports.codexTranscriptPath)(paneCwd, panePid),
         projectTranscript: codex_transcript_js_1.projectCodexEntries,
+        // Read only to tell a resumed conversation's run (no `resumeArgs`): the rollout a resume appends to.
+        resolveResumeId: (paneCwd, panePid) => paneTranscriptId((0, exports.codexTranscriptPath)(paneCwd, panePid), panePid),
     },
     {
         // The pane binary is `cursor-agent`, Cursor's terminal TUI — NOT the
@@ -1118,6 +1233,7 @@ const REMOTE_AGENT_TABLE = [
         // limit pi has (newest file wins).
         resolveTranscript: (paneCwd, panePid) => (0, exports.geminiTranscriptPath)(paneCwd, panePid),
         projectTranscript: gemini_transcript_js_1.projectGeminiEntries,
+        resolveResumeId: (paneCwd, panePid) => paneTranscriptId((0, exports.geminiTranscriptPath)(paneCwd, panePid), panePid),
     },
     {
         // `hermes` on PATH is a bash script that execs a venv Python, so the
@@ -1133,6 +1249,7 @@ const REMOTE_AGENT_TABLE = [
         // No `resolveSessionId` counterpart: the store's own id is a
         // `<timestamp>_<hash>` string, and nothing on the wire consumes it yet.
         resolveSessionName: exports.detectHermesSessionName,
+        resolveResumeId: exports.detectHermesResumeId,
     },
     {
         kind: 'pi',
@@ -1141,6 +1258,8 @@ const REMOTE_AGENT_TABLE = [
         subcommands: ['pi'],
         resolveTranscript: (paneCwd, panePid) => (0, exports.piTranscriptPath)(paneCwd, panePid),
         projectTranscript: pi_transcript_js_1.projectPiEntries,
+        resolveResumeId: (paneCwd, panePid) => paneTranscriptId((0, exports.piTranscriptPath)(paneCwd, panePid), panePid),
+        resolveSessionName: (paneCwd, panePid) => (0, exports.detectPiSessionName)(paneCwd, panePid),
     },
     {
         kind: 'opencode',
@@ -1150,7 +1269,11 @@ const REMOTE_AGENT_TABLE = [
         // Typed into a 2.0.24 TUI pane: `/exit` + Enter closed it.
         quitCommand: '/exit',
         resolveSessionId: (paneCwd, panePid) => (0, exports.detectOpencodeSession)(paneCwd, panePid)?.id ?? null,
-        resolveSessionName: (paneCwd, panePid) => (0, exports.detectOpencodeSession)(paneCwd, panePid)?.title ?? null,
+        // opencode titles a session itself after the first exchange.
+        resolveSessionName: (paneCwd, panePid) => {
+            const title = (0, exports.detectOpencodeSession)(paneCwd, panePid)?.title;
+            return title ? { name: title, source: 'auto' } : null;
+        },
         resolveTranscript: (paneCwd, panePid) => (0, exports.opencodeTranscriptPath)(paneCwd, panePid),
         projectTranscript: opencode_transcript_js_1.projectOpencodeEntries,
         readTranscript: (path, prev) => (0, opencode_transcript_js_1.readOpencodeTranscript)(path, prev, { query: queryOpencodeTranscript }),

package/dist/session-registry.d.ts

@@ -37,6 +37,12 @@ export interface KnownSession {
      * agent whose id this machine cannot read, and in files written before it.
      */
     agentSessionId?: string;
+    /**
+     * The later tmux sessions this run went on in (`session_created`, as
+     * `runId`): the same conversation carried on after an `exit` is the same
+     * run (`continuedRunId`). Absent for a run that has had one tmux session.
+     */
+    tmuxRunIds?: string[];
     /** Last time this machine saw the session running. */
     lastSeenAt: string;
 }
@@ -86,6 +92,20 @@ export declare const recallSession: (name: string, now?: number) => KnownSession
  * decides whether to fall back to the newest run or refuse.
  */
 export declare const recallRun: (name: string, agentKind: string, now?: number) => KnownSession | null;
+/** tmux sessions remembered per run: an `exit` and `-c` every few minutes all day stays a short list. */
+export declare const MAX_TMUX_RUNS_PER_RUN = 10;
+/**
+ * Which run the tmux session `tmuxRunId` of `name` is (hwip docs/session-runs.md §3).
+ *
+ * Its own, unless it carries on an earlier run: it was already joined to one
+ * (a sweep or a listener restart since), or the agent's conversation
+ * `conversationId` is the one an earlier run of the same name and agent last
+ * had. A tmux session that has had a conversation of its own stays its own run
+ * — a fresh start `/resume`d into an old conversation keeps what it wrote first.
+ */
+export declare const continuedRunId: (entries: readonly KnownSession[], name: string, agentKind: string, tmuxRunId: string, conversationId: string | null | undefined) => string;
+/** The run going on in tmux session `tmuxRunId` of `name`: the one it was joined to, else its own. */
+export declare const runOfTmuxSession: (name: string, tmuxRunId: string, now?: number) => string;
 /**
  * Make this process a reader of the registry: `rememberSessions` writes nothing from here on. For the
  * CLI commands that look at the sweep (`hwip agent list|read`) — the file is the listener's resume
@@ -110,6 +130,8 @@ export declare const rememberSessions: (live: Array<{
     label?: string | null;
     runId?: string;
     startedAt?: string;
+    /** The tmux session it runs in; one other than `runId` means the run goes on in it (`continuedRunId`). */
+    tmuxRunId?: string;
     /**
      * The conversation a resume may pick up. Absent: not readable this
      * sweep, so the run keeps the one it had. Null: read, but not this

package/dist/session-registry.js

@@ -16,7 +16,7 @@
  * another program.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sessionDirectoryExists = exports.knownSessionsPath = exports.isKnownSession = exports.forgetEnded = exports.forgetSession = exports.rememberSessions = exports.keepRegistryUntouched = exports.recallRun = exports.recallSession = exports.knownSessions = exports.runKey = exports.KNOWN_SESSION_TTL_MS = exports.MAX_RUNS_PER_NAME = exports.MAX_KNOWN_SESSIONS = void 0;
+exports.sessionDirectoryExists = exports.knownSessionsPath = exports.isKnownSession = exports.forgetEnded = exports.forgetSession = exports.rememberSessions = exports.keepRegistryUntouched = exports.runOfTmuxSession = exports.continuedRunId = exports.MAX_TMUX_RUNS_PER_RUN = exports.recallRun = exports.recallSession = exports.knownSessions = exports.runKey = exports.KNOWN_SESSION_TTL_MS = exports.MAX_RUNS_PER_NAME = exports.MAX_KNOWN_SESSIONS = void 0;
 const fs_1 = require("fs");
 const path_1 = require("path");
 const turn_ring_js_1 = require("./turn-ring.js");
@@ -35,6 +35,7 @@ exports.MAX_RUNS_PER_NAME = 10;
  *  likely to have moved than to be what the user meant. */
 exports.KNOWN_SESSION_TTL_MS = 30 * 24 * 60 * 60 * 1000;
 const registryPath = () => (0, path_1.join)((0, gate_js_1.stateDir)(), 'known-sessions.json');
+const isTmuxRunIds = (v) => v === undefined || (Array.isArray(v) && v.every((id) => typeof id === 'string'));
 const readAll = () => {
     try {
         const raw = (0, fs_1.readFileSync)(registryPath(), 'utf-8');
@@ -49,7 +50,8 @@ const readAll = () => {
             typeof e.cwd === 'string' &&
             typeof e.agentKind === 'string' &&
             typeof e.lastSeenAt === 'string' &&
-            (e.runId === undefined || typeof e.runId === 'string'));
+            (e.runId === undefined || typeof e.runId === 'string') &&
+            isTmuxRunIds(e.tmuxRunIds));
     }
     catch {
         return [];
@@ -109,6 +111,41 @@ exports.recallSession = recallSession;
  */
 const recallRun = (name, agentKind, now = Date.now()) => (0, exports.knownSessions)(now).find((e) => e.name === name && e.agentKind === agentKind) ?? null;
 exports.recallRun = recallRun;
+/** tmux sessions remembered per run: an `exit` and `-c` every few minutes all day stays a short list. */
+exports.MAX_TMUX_RUNS_PER_RUN = 10;
+/**
+ * Agents whose own resume is measured to keep the conversation id: Claude Code 2.1.300's `-c`, opencode 2.0.29's
+ * `-c`, pi 1.2.0's `-c`, Codex 0.163.0's `resume --last`, Gemini 0.46.0's `--resume latest` and Hermes 0.20.0's
+ * `-c` (2026-10-20). Cursor's was not measured (signed out) and the others are not installed here.
+ */
+const CONTINUING_KINDS = new Set(['claude', 'opencode', 'pi', 'codex', 'gemini', 'hermes']);
+/**
+ * Which run the tmux session `tmuxRunId` of `name` is (hwip docs/session-runs.md §3).
+ *
+ * Its own, unless it carries on an earlier run: it was already joined to one
+ * (a sweep or a listener restart since), or the agent's conversation
+ * `conversationId` is the one an earlier run of the same name and agent last
+ * had. A tmux session that has had a conversation of its own stays its own run
+ * — a fresh start `/resume`d into an old conversation keeps what it wrote first.
+ */
+const continuedRunId = (entries, name, agentKind, tmuxRunId, conversationId) => {
+    const ofName = entries.filter((e) => e.name === name && e.agentKind === agentKind && e.runId);
+    const joined = ofName.find((e) => e.runId !== tmuxRunId && e.tmuxRunIds?.includes(tmuxRunId));
+    if (joined?.runId)
+        return joined.runId;
+    if (!conversationId || !CONTINUING_KINDS.has(agentKind))
+        return tmuxRunId;
+    if (ofName.some((e) => e.runId === tmuxRunId && e.agentSessionId))
+        return tmuxRunId;
+    const earlier = ofName
+        .filter((e) => e.agentSessionId === conversationId && Number(e.runId) < Number(tmuxRunId))
+        .sort((a, b) => b.lastSeenAt.localeCompare(a.lastSeenAt))[0];
+    return earlier?.runId ?? tmuxRunId;
+};
+exports.continuedRunId = continuedRunId;
+/** The run going on in tmux session `tmuxRunId` of `name`: the one it was joined to, else its own. */
+const runOfTmuxSession = (name, tmuxRunId, now = Date.now()) => (0, exports.knownSessions)(now).find((e) => e.name === name && e.tmuxRunIds?.includes(tmuxRunId))?.runId ?? tmuxRunId;
+exports.runOfTmuxSession = runOfTmuxSession;
 let readOnly = false;
 /**
  * Make this process a reader of the registry: `rememberSessions` writes nothing from here on. For the
@@ -146,6 +183,10 @@ const rememberSessions = (live, now = Date.now()) => {
             if (before && before.lastSeenAt >= s.startedAt)
                 byRun.delete((0, exports.runKey)(s.name, s.agentKind));
         }
+        // Carried on in a new tmux session: what an earlier sweep wrote under that session is this run.
+        const continued = !!s.runId && !!s.tmuxRunId && s.tmuxRunId !== s.runId;
+        if (continued)
+            byRun.delete((0, exports.runKey)(s.name, s.agentKind, s.tmuxRunId));
         const key = (0, exports.runKey)(s.name, s.agentKind, s.runId);
         // A sweep that could not read the id — the agent has not written its
         // record yet — keeps the one this run already had. Keyed by run and
@@ -154,6 +195,11 @@ const rememberSessions = (live, now = Date.now()) => {
         const prev = byRun.get(key);
         const keepPrev = s.agentSessionId === undefined && prev?.cwd === s.cwd;
         const agentSessionId = s.agentSessionId || (keepPrev ? prev?.agentSessionId : undefined);
+        // A run keeps its first start whichever tmux session it goes on in.
+        const startedAt = continued ? prev?.startedAt ?? s.startedAt : s.startedAt;
+        const tmuxRunIds = continued && s.tmuxRunId
+            ? [...(prev?.tmuxRunIds ?? []).filter((id) => id !== s.tmuxRunId), s.tmuxRunId].slice(-exports.MAX_TMUX_RUNS_PER_RUN)
+            : prev?.tmuxRunIds;
         byRun.set(key, {
             name: s.name,
             cwd: s.cwd,
@@ -161,8 +207,9 @@ const rememberSessions = (live, now = Date.now()) => {
             ...(s.project ? { project: s.project } : {}),
             ...(s.label ? { label: s.label } : {}),
             ...(s.runId ? { runId: s.runId } : {}),
-            ...(s.startedAt ? { startedAt: s.startedAt } : {}),
+            ...(startedAt ? { startedAt } : {}),
             ...(agentSessionId ? { agentSessionId } : {}),
+            ...(tmuxRunIds?.length ? { tmuxRunIds } : {}),
             lastSeenAt: seenAt,
         });
     }

package/dist/session-title.d.ts

@@ -0,0 +1,46 @@
+/**
+ * The latest value a session transcript states for something — Claude Code's
+ * `ai-title`, pi's `session_info` name — kept current without re-reading the
+ * file every report cycle.
+ *
+ * The listener resolves every session's name every ~5 s, and a transcript runs
+ * to tens of megabytes. So each file is read the way the chat tail reads it:
+ * the last `TRANSCRIPT_BACKFILL_BYTES` once, then only what was appended, and
+ * nothing at all while the file is unchanged. `step` folds each new line into
+ * the value, so a chunk with no line it cares about leaves the value as it was.
+ */
+import { type TailRead, type TailState } from './transcript-tail.js';
+/** Who named a session: someone in the agent (`/rename`, `/name`), or the agent itself. */
+export type ProviderNameSource = 'user' | 'auto';
+/** A session name as an agent reports it. No `source` when the agent's store does not say. */
+export interface ProviderName {
+    readonly name: string;
+    readonly source?: ProviderNameSource;
+}
+export declare const createTailWatch: <T>(step: (value: T | undefined, line: string) => T | undefined, read?: (path: string, prev: TailState | null) => TailRead | null, capacity?: number) => {
+    read: (path: string) => T | undefined;
+    size: () => number;
+    has: (path: string) => boolean;
+};
+/**
+ * The title out of a Claude Code `{"type":"ai-title","aiTitle":"…"}` line.
+ * The substring test runs first so the other few thousand lines of a
+ * transcript are never handed to `JSON.parse`.
+ */
+export declare const claudeAiTitleOf: (line: string) => string | undefined;
+/** The newest ai-title so far: a line without one keeps the last. */
+export declare const latestClaudeAiTitle: (title: string | undefined, line: string) => string | undefined;
+/** The custom entry the hwip pi extension leaves beside a name its tool set (PI_EXTENSION). */
+export declare const PI_TITLE_MARKER = "hwip-session-name";
+/**
+ * A pi session's naming state: the newest `session_info` name (`/name`, or the
+ * hwip tool through `pi.setSessionName`) and the newest hwip marker's name.
+ * pi records no author for a name, so the marker is how the tool's own are
+ * told apart: the name is the agent's only while it equals the marker's.
+ */
+export interface PiNames {
+    readonly name?: string;
+    readonly marked?: string;
+}
+export declare const piNamesStep: (names: PiNames | undefined, line: string) => PiNames | undefined;
+//# sourceMappingURL=session-title.d.ts.map