@hwip/cli 0.1.2 → 0.1.3

package/dist/listener.d.ts

@@ -22,6 +22,7 @@
  */
 import { type HwipConfig } from './config.js';
 import { type ShellAuditEntry } from './shell-audit.js';
+import { type KnownSession } from './session-registry.js';
 import { type AgentKind } from './remote-agents.js';
 import { type TranscriptSource } from './transcript-tail.js';
 import { type AgentState } from './agent-state.js';
@@ -219,6 +220,8 @@ export interface ReportedKnownSession {
     /** The seq block the run's chunks took (Q24): the server reads its conversation from that key range alone. */
     firstSeq?: number;
     lastSeq?: number;
+    /** The later tmux sessions the run went on in (Q35): the server ends another run's push window at their start. */
+    tmuxRunIds?: string[];
     lastSeenAt: string;
 }
 /** Each live run's first seq, for the report (Q24). A run that has recorded nothing yet has none. */
@@ -296,6 +299,13 @@ export declare const __checkoutCacheSize: () => number;
  * must agree: `epochToIso` keeps whole seconds and this floors them.
  */
 export declare const runIdOfEpoch: (epoch: string | undefined) => string | undefined;
+/**
+ * Each live session's run once the sweep has read the conversations (hwip
+ * docs/session-runs.md §3): a session carrying on an earlier run's
+ * conversation reports — and its recorder tags — that run instead of its new
+ * tmux session. `sessions` and `recordable` are this sweep's, changed in place.
+ */
+export declare const continueRuns: (sessions: AgentSession[], recordable: Record<string, RecordableSession>, conversationOf: (name: string) => string | null | undefined, known?: readonly KnownSession[]) => void;
 /** Test hook. */
 export declare const resetSessionStates: () => void;
 /**

package/dist/listener.js

@@ -25,9 +25,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fileViewBytes = exports.handleScreenRequest = exports.setSubscriberTrust = exports.collectWatchHits = exports.resetPatternWatches = exports.setPatternWatches = exports.withSettledPrompts = exports.PROMPT_SEAL_WAIT_MS = exports.withBlockedPrompts = exports.setPromptSealer = exports.deriveSessionState = exports.resetSessionStates = exports.runIdOfEpoch = exports.__checkoutCacheSize = exports.parseSessionName = exports.tmuxTargetFor = exports.subagentTranscriptFor = exports.recordTargets = exports.recordSubagentTranscripts = exports.isSubagentSessionName = exports.detectRemoteAgent = exports.sessionLiveness = exports.sessionExists = exports.liveSessionNames = exports.tmuxArgs = exports.silenceListenerLog = exports.invalidateTmuxSocketCache = exports.resolveKeys = exports.probePane = exports.checkRateLimit = exports.AUTH_FAILURE_CODES = exports.commandsReportDue = exports.commandsFingerprint = exports.COMMAND_SCAN_INTERVAL_MS = exports.sessionsReportDue = exports.sessionsFingerprint = exports.knownSessionsFingerprint = exports.knownSessionsToReport = exports.withRunSeqs = exports.KNOWN_SESSIONS_REPORTED = exports.staleConnectionAction = exports.askedToReconnect = exports.MAX_STALE_CONNECTION_DROPS = exports.createReportAckWatch = exports.REPORT_ACK_TIMEOUT_MS = exports.SESSION_REPORT_HEARTBEAT_MS = exports.SESSION_REPORT_INTERVAL_MS = exports.heartbeatVerdict = exports.pingDue = exports.PING_IDLE_MS = void 0;
-exports.writeRemoteMarker = exports.isInventoried = exports.syncTmuxAgentNames = exports.recordInventory = exports.collectSessionsVerbose = exports.handleCommandInput = exports.pendingInputDecrypts = exports.MAX_PENDING_DECRYPTS = exports.MAX_INPUT_LANES = exports.validateInputMessage = exports.MAX_INPUT_BODY_CHARS = exports.MAX_INPUT_KEYS = exports.handleStreamControl = exports.buildStreamFrame = exports.isStreamCapReached = exports.fitSealedFrame = exports.SEALED_FRAME_MAX_BYTES = exports.stopAllStreams = exports.stopStream = exports.stopStreamOf = exports.handleTurnWatch = exports.sealTurnBatch = exports.resolveWatchTranscript = exports.MAX_CONCURRENT_STREAMS = exports.STREAM_RENEW_FRESH_MS = exports.STREAM_LEASE_MS = exports.claimFrameSend = exports.hasFrameBudget = exports.streamCadence = exports.MAX_FRAMES_PER_SEC = exports.BURST_WINDOW_MS = exports.BURST_INTERVAL_MS = exports.STREAM_INTERVAL_MS = exports.STREAM_CAPTURE_LINES = exports.scheduleInjectSnapshots = exports.historyLinesIn = exports.cursorLineFor = exports.parsePaneGeometry = exports.STREAM_GEOMETRY_FORMAT = exports.handleScreenHistoryRequest = exports.SCREEN_HISTORY_MAX_LINES = exports.handleSessionForgetRequest = exports.handleSessionExitRequest = exports.SESSION_EXIT_STEP_MS = exports.handleSessionResumeRequest = exports.handleScheduleListRequest = exports.handleFileBlobRequest = exports.handleFileTreeRequest = exports.handleDiffFileRequest = exports.handleDiffFilesRequest = void 0;
-exports.handleListener = exports.liveScheduleRunnerDeps = exports.listenerSettings = exports.resolveWsUrl = exports.streamSession = exports.computeListenerDeviceId = exports.computeBackoff = exports.handlePush = exports.gcAttachments = exports.displayFolder = exports.claimLanFile = exports.saveFileFromS3 = exports.downloadSealedEach = exports.answerFileBound = exports.downloadAttachments = exports.setAttachmentContext = exports.shellTextRefusal = void 0;
+exports.handleScreenRequest = exports.setSubscriberTrust = exports.collectWatchHits = exports.resetPatternWatches = exports.setPatternWatches = exports.withSettledPrompts = exports.PROMPT_SEAL_WAIT_MS = exports.withBlockedPrompts = exports.setPromptSealer = exports.deriveSessionState = exports.resetSessionStates = exports.continueRuns = exports.runIdOfEpoch = exports.__checkoutCacheSize = exports.parseSessionName = exports.tmuxTargetFor = exports.subagentTranscriptFor = exports.recordTargets = exports.recordSubagentTranscripts = exports.isSubagentSessionName = exports.detectRemoteAgent = exports.sessionLiveness = exports.sessionExists = exports.liveSessionNames = exports.tmuxArgs = exports.silenceListenerLog = exports.invalidateTmuxSocketCache = exports.resolveKeys = exports.probePane = exports.checkRateLimit = exports.AUTH_FAILURE_CODES = exports.commandsReportDue = exports.commandsFingerprint = exports.COMMAND_SCAN_INTERVAL_MS = exports.sessionsReportDue = exports.sessionsFingerprint = exports.knownSessionsFingerprint = exports.knownSessionsToReport = exports.withRunSeqs = exports.KNOWN_SESSIONS_REPORTED = exports.staleConnectionAction = exports.askedToReconnect = exports.MAX_STALE_CONNECTION_DROPS = exports.createReportAckWatch = exports.REPORT_ACK_TIMEOUT_MS = exports.SESSION_REPORT_HEARTBEAT_MS = exports.SESSION_REPORT_INTERVAL_MS = exports.heartbeatVerdict = exports.pingDue = exports.PING_IDLE_MS = void 0;
+exports.isInventoried = exports.syncTmuxAgentNames = exports.recordInventory = exports.collectSessionsVerbose = exports.handleCommandInput = exports.pendingInputDecrypts = exports.MAX_PENDING_DECRYPTS = exports.MAX_INPUT_LANES = exports.validateInputMessage = exports.MAX_INPUT_BODY_CHARS = exports.MAX_INPUT_KEYS = exports.handleStreamControl = exports.buildStreamFrame = exports.isStreamCapReached = exports.fitSealedFrame = exports.SEALED_FRAME_MAX_BYTES = exports.stopAllStreams = exports.stopStream = exports.stopStreamOf = exports.handleTurnWatch = exports.sealTurnBatch = exports.resolveWatchTranscript = exports.MAX_CONCURRENT_STREAMS = exports.STREAM_RENEW_FRESH_MS = exports.STREAM_LEASE_MS = exports.claimFrameSend = exports.hasFrameBudget = exports.streamCadence = exports.MAX_FRAMES_PER_SEC = exports.BURST_WINDOW_MS = exports.BURST_INTERVAL_MS = exports.STREAM_INTERVAL_MS = exports.STREAM_CAPTURE_LINES = exports.scheduleInjectSnapshots = exports.historyLinesIn = exports.cursorLineFor = exports.parsePaneGeometry = exports.STREAM_GEOMETRY_FORMAT = exports.handleScreenHistoryRequest = exports.SCREEN_HISTORY_MAX_LINES = exports.handleSessionForgetRequest = exports.handleSessionExitRequest = exports.SESSION_EXIT_STEP_MS = exports.handleSessionResumeRequest = exports.handleScheduleListRequest = exports.handleFileBlobRequest = exports.handleFileTreeRequest = exports.handleDiffFileRequest = exports.handleDiffFilesRequest = exports.fileViewBytes = void 0;
+exports.handleListener = exports.liveScheduleRunnerDeps = exports.listenerSettings = exports.resolveWsUrl = exports.streamSession = exports.computeListenerDeviceId = exports.computeBackoff = exports.handlePush = exports.gcAttachments = exports.displayFolder = exports.claimLanFile = exports.saveFileFromS3 = exports.downloadSealedEach = exports.answerFileBound = exports.downloadAttachments = exports.setAttachmentContext = exports.shellTextRefusal = exports.writeRemoteMarker = void 0;
 const child_process_1 = require("child_process");
 const crypto_1 = require("crypto");
 const fs_1 = require("fs");
@@ -318,11 +318,12 @@ const knownSessionsToReport = (live, now = Date.now(), seqs = (0, run_seqs_js_1.
         ...(e.runId ? { runId: e.runId } : {}),
         ...(e.startedAt ? { startedAt: e.startedAt } : {}),
         ...(e.runId ? seqs.get((0, run_seqs_js_1.runSeqsKey)(e.name, e.runId)) : undefined),
+        ...(e.tmuxRunIds?.length ? { tmuxRunIds: e.tmuxRunIds } : {}),
         lastSeenAt: e.lastSeenAt,
     }));
 };
 exports.knownSessionsToReport = knownSessionsToReport;
-const knownSessionsFingerprint = (known) => known.map((k) => `${k.name}${k.agentKind}${k.runId ?? ''}${k.lastSeenAt}${k.firstSeq ?? ''}${k.lastSeq ?? ''}`).sort().join('|');
+const knownSessionsFingerprint = (known) => known.map((k) => `${k.name}${k.agentKind}${k.runId ?? ''}${k.lastSeenAt}${k.firstSeq ?? ''}${k.lastSeq ?? ''}${k.tmuxRunIds?.join(',') ?? ''}`).sort().join('|');
 exports.knownSessionsFingerprint = knownSessionsFingerprint;
 const sessionsFingerprint = (sessions) => sessions
     .map((s) => JSON.stringify([
@@ -638,11 +639,33 @@ const epochToIso = (epoch) => {
  * from `createdAt` for listeners that do not send one (`runIdOf`), so the two
  * must agree: `epochToIso` keeps whole seconds and this floors them.
  */
-const runIdOfEpoch = (epoch) => {
-    const iso = epochToIso(epoch);
-    return iso ? String(Math.floor(Date.parse(iso) / 1000)) : undefined;
-};
+const runIdOfEpoch = (epoch) => runIdOfIso(epochToIso(epoch));
 exports.runIdOfEpoch = runIdOfEpoch;
+/** The run id of the tmux session that started at `iso` (a session's `createdAt`). */
+const runIdOfIso = (iso) => {
+    const ms = iso ? Date.parse(iso) : NaN;
+    return Number.isFinite(ms) ? String(Math.floor(ms / 1000)) : undefined;
+};
+/**
+ * Each live session's run once the sweep has read the conversations (hwip
+ * docs/session-runs.md §3): a session carrying on an earlier run's
+ * conversation reports — and its recorder tags — that run instead of its new
+ * tmux session. `sessions` and `recordable` are this sweep's, changed in place.
+ */
+const continueRuns = (sessions, recordable, conversationOf, known = (0, session_registry_js_1.knownSessions)()) => {
+    for (const s of sessions) {
+        if (s.parentName || !s.runId)
+            continue;
+        const runId = (0, session_registry_js_1.continuedRunId)(known, s.name, s.agentKind, s.runId, conversationOf(s.name));
+        if (runId === s.runId)
+            continue;
+        s.runId = runId;
+        const source = recordable[s.name];
+        if (source)
+            recordable[s.name] = { ...source, runId };
+    }
+};
+exports.continueRuns = continueRuns;
 // ─── Agent state detection (SPEC-AGENT-AWARENESS §S1) ──────────────
 // How many pane lines the state rules see. The live status area every
 // agent renders sits in the last handful of lines; 40 leaves margin for
@@ -1597,7 +1620,8 @@ const handleSessionForgetRequest = (req, send) => {
     // A name running again is not the run being forgotten: an ended run of it goes on its own (Q29).
     // The running run itself, a request naming no run, or a run tmux could not tell apart stay refused.
     if (liveness === 'running') {
-        const live = runId ? (0, tmux_liveness_js_1.liveRunIdOf)(sessionName) : undefined;
+        const tmuxRun = runId ? (0, tmux_liveness_js_1.liveRunIdOf)(sessionName) : undefined;
+        const live = tmuxRun ? (0, session_registry_js_1.runOfTmuxSession)(sessionName, tmuxRun) : undefined;
         if (!runId || !live || live === runId)
             return reply({ error: 'still_running' });
     }
@@ -3566,6 +3590,7 @@ const collectSessionsVerbose = () => {
             return undefined;
         return resumeIdCount.get(id) === 1 ? id : null;
     };
+    (0, exports.continueRuns)(sessions, recordable, ownResumeId);
     // Write down what each live session IS, while it still exists to be read.
     // tmux forgets a session the moment it ends, which is exactly when the
     // phone wants it back — and a resume must take its directory and its binary
@@ -3584,6 +3609,7 @@ const collectSessionsVerbose = () => {
         label: s.label,
         runId: s.runId,
         startedAt: s.createdAt,
+        tmuxRunId: runIdOfIso(s.createdAt),
         agentSessionId: ownResumeId(s.name),
     })));
     return { sessions, rejected, targets, subagentTranscripts, recordable };

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,37 @@ 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` does. */
+const CONTINUING_KINDS = new Set(['claude']);
+/**
+ * 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 +179,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 +191,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 +203,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hwip/cli",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "Hwip CLI + push notification SDK for AI agents",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",