@hwip/cli 0.1.0 → 0.1.2

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.handleDiffFileRequest = exports.handleDiffFilesRequest = 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.__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.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.setAttachmentContext = exports.shellTextRefusal = 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 = 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.downloadAttachments = void 0;
+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;
 const child_process_1 = require("child_process");
 const crypto_1 = require("crypto");
 const fs_1 = require("fs");
@@ -100,6 +100,7 @@ const tmux_liveness_js_1 = require("./tmux-liveness.js");
 Object.defineProperty(exports, "liveSessionNames", { enumerable: true, get: function () { return tmux_liveness_js_1.liveSessionNames; } });
 Object.defineProperty(exports, "sessionExists", { enumerable: true, get: function () { return tmux_liveness_js_1.sessionExists; } });
 Object.defineProperty(exports, "sessionLiveness", { enumerable: true, get: function () { return tmux_liveness_js_1.sessionLiveness; } });
+const run_seqs_js_1 = require("./run-seqs.js");
 const args_js_1 = require("./args.js");
 const schedule_js_1 = require("./schedule.js");
 const schedule_launch_js_1 = require("./schedule-launch.js");
@@ -292,31 +293,41 @@ const staleConnectionAction = (message, drops) => {
     return drops < exports.MAX_STALE_CONNECTION_DROPS ? 'drop' : 'exhausted';
 };
 exports.staleConnectionAction = staleConnectionAction;
-exports.KNOWN_SESSIONS_REPORTED = 30;
-const knownSessionsToReport = (live, now = Date.now()) => {
-    // By name AND kind: a slot that is live under claude may still hold an
-    // ended pi run, and that run is a past session — excluding the whole name
-    // would drop it from the report exactly the way the registry used to drop
-    // it from disk. The live run itself stays out for the reason below.
-    const running = new Set(live.map((s) => (0, session_registry_js_1.runKey)(s.name, s.agentKind)));
+exports.KNOWN_SESSIONS_REPORTED = 50;
+/** Each live run's first seq, for the report (Q24). A run that has recorded nothing yet has none. */
+const withRunSeqs = (sessions, seqs = (0, run_seqs_js_1.runSeqsByRun)()) => sessions.map((s) => {
+    const block = s.runId ? seqs.get((0, run_seqs_js_1.runSeqsKey)(s.name, s.runId)) : undefined;
+    return block ? { ...s, firstSeq: block.firstSeq } : s;
+});
+exports.withRunSeqs = withRunSeqs;
+const knownSessionsToReport = (live, now = Date.now(), seqs = (0, run_seqs_js_1.runSeqsByRun)()) => {
+    // By name, kind AND run: a slot that is live under claude may still hold an
+    // ended pi run — or an ended claude run before this one — and that run is a
+    // past session. Excluding the whole name would drop it from the report
+    // exactly the way the registry used to drop it from disk. The live run
+    // itself stays out for the reason below.
+    const running = new Set(live.map((s) => (0, session_registry_js_1.runKey)(s.name, s.agentKind, s.runId)));
     return (0, session_registry_js_1.knownSessions)(now)
-        .filter((e) => !running.has((0, session_registry_js_1.runKey)(e.name, e.agentKind)))
+        .filter((e) => !running.has((0, session_registry_js_1.runKey)(e.name, e.agentKind, e.runId)))
         .slice(0, exports.KNOWN_SESSIONS_REPORTED)
         .map((e) => ({
         name: e.name,
         agentKind: e.agentKind,
         ...(e.project ? { project: e.project } : {}),
         ...(e.label ? { label: e.label } : {}),
+        ...(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),
         lastSeenAt: e.lastSeenAt,
     }));
 };
 exports.knownSessionsToReport = knownSessionsToReport;
-const knownSessionsFingerprint = (known) => known.map((k) => `${k.name}${k.lastSeenAt}`).sort().join('|');
+const knownSessionsFingerprint = (known) => known.map((k) => `${k.name}${k.agentKind}${k.runId ?? ''}${k.lastSeenAt}${k.firstSeq ?? ''}${k.lastSeq ?? ''}`).sort().join('|');
 exports.knownSessionsFingerprint = knownSessionsFingerprint;
 const sessionsFingerprint = (sessions) => sessions
     .map((s) => JSON.stringify([
     s.name, s.attached, s.agentKind, s.agentSessionId ?? null,
-    s.project, s.label ?? null, s.providerSessionName ?? null, s.createdAt ?? null,
+    s.project, s.label ?? null, s.providerSessionName ?? null, s.createdAt ?? null, s.runId ?? null, s.firstSeq ?? null,
     s.lastActivityAt ?? null, s.state ?? null,
     s.stateChangedAt ?? null, s.stateRuleId ?? null,
     s.blockedPrompt?.id ?? null, s.blockedPrompt?.at ?? null,
@@ -621,6 +632,17 @@ const epochToIso = (epoch) => {
         return undefined;
     return new Date(n * 1000).toISOString();
 };
+/**
+ * A run's id from tmux's `session_created` (hwip docs/session-runs.md): the
+ * whole epoch seconds as a decimal string. The server derives the same string
+ * 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;
+};
+exports.runIdOfEpoch = runIdOfEpoch;
 // ─── 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
@@ -632,13 +654,13 @@ const resetSessionStates = () => {
     sessionStates.clear();
 };
 exports.resetSessionStates = resetSessionStates;
-const capturePaneText = (session, target) => {
+const capturePaneText = (session, target, escapes = false) => {
     // Explicit target for the sweep (subagent rows aren't in the recorded
     // target map yet); otherwise resolve through it.
     const resolved = target ?? (0, tmux_pane_js_1.tmuxTargetFor)(session);
     if (resolved === null)
         return null; // unresolvable subagent — never spawn
-    const r = (0, child_process_1.spawnSync)('tmux', (0, tmux_socket_js_1.tmuxArgs)(['capture-pane', '-p', '-t', resolved, '-S', `-${STATE_CAPTURE_LINES}`]), {
+    const r = (0, child_process_1.spawnSync)('tmux', (0, tmux_socket_js_1.tmuxArgs)(['capture-pane', '-p', ...(escapes ? ['-e'] : []), '-t', resolved, '-S', `-${STATE_CAPTURE_LINES}`]), {
         encoding: 'utf-8',
         stdio: ['ignore', 'pipe', 'pipe'],
     });
@@ -700,8 +722,9 @@ const withBlockedPrompts = ({ sessions, targets }) => {
         const target = targets[session.name];
         if (session.parentName !== undefined || session.agentKind === 'shell' || target === undefined)
             return session;
-        const pane = session.state === 'blocked' ? capturePaneText(session.name, target) : null;
-        const blockedPrompt = sealer.observe(session.name, session.state, pane);
+        // With escapes: OpenCode draws its chosen button as a background colour only. `deliverInput` captures the same way.
+        const pane = session.state === 'blocked' ? capturePaneText(session.name, target, true) : null;
+        const blockedPrompt = sealer.observe(session.name, session.agentKind, session.state, pane);
         return blockedPrompt ? { ...session, blockedPrompt } : session;
     });
     sealer.prune(new Set(sessions.map((s) => s.name)));
@@ -1312,6 +1335,21 @@ const handleScheduleListRequest = (req, send) => {
     return true;
 };
 exports.handleScheduleListRequest = handleScheduleListRequest;
+/** What an agent conversation id looks like — a value, never an option. */
+const CONVERSATION_ID = /^[A-Za-z0-9][A-Za-z0-9_-]{0,127}$/;
+/**
+ * The flags that pick a resumed run's last conversation back up, or null to
+ * start it fresh. The id is one this machine read off the live pane, but the
+ * registry is a file on disk: it reaches argv only once it reads as an id, so
+ * nothing in it can turn into an option of the agent's own.
+ */
+const resumableConversation = (agent, known) => {
+    const id = known.agentSessionId;
+    if (typeof id !== 'string' || !CONVERSATION_ID.test(id))
+        return null;
+    const args = agent.resumeArgs?.(id, known.cwd);
+    return args ? { id, args } : null;
+};
 /**
  * Start a remembered session again, detached, and tell the phone what happened.
  * Returns true when the message was ours to answer.
@@ -1382,12 +1420,14 @@ const handleSessionResumeRequest = (req, send) => {
     const sidecar = known.label && known.project
         ? [';', 'set-option', config_js_1.SESSION_PROJECT_OPTION, known.project, ';', 'set-option', config_js_1.SESSION_LABEL_OPTION, known.label]
         : [];
-    const started = (0, child_process_1.spawnSync)('tmux', (0, tmux_socket_js_1.tmuxArgs)(['new-session', '-d', '-s', sessionName, '-c', known.cwd, agent.binary, ...sidecar]), { encoding: 'utf-8', stdio: ['ignore', 'pipe', 'pipe'] });
+    const conversation = resumableConversation(agent, known);
+    const started = (0, child_process_1.spawnSync)('tmux', (0, tmux_socket_js_1.tmuxArgs)(['new-session', '-d', '-s', sessionName, '-c', known.cwd, agent.binary, ...(conversation?.args ?? []), ...sidecar]), { encoding: 'utf-8', stdio: ['ignore', 'pipe', 'pipe'] });
     if (started.status !== 0) {
         (0, listener_log_js_1.log)(`✗ resume ${sessionName}: tmux refused (${(started.stderr ?? '').trim() || 'no detail'})`);
         return reply({ error: 'start_failed' });
     }
-    (0, listener_log_js_1.log)(`⟲ resume ${sessionName}: ${agent.binary} in ${known.cwd}`);
+    const resumedFrom = conversation ? ` (conversation ${conversation.id.slice(0, 8)})` : '';
+    (0, listener_log_js_1.log)(`⟲ resume ${sessionName}: ${agent.binary}${resumedFrom} in ${known.cwd}`);
     return reply({ resumed: true });
 };
 exports.handleSessionResumeRequest = handleSessionResumeRequest;
@@ -1548,14 +1588,20 @@ const handleSessionForgetRequest = (req, send) => {
     // alternative is an irreversible delete (registry AND scrollback) justified
     // by a question that failed to be asked. It says so in the log, because
     // from the phone the two refusals are the same sentence.
+    const runId = typeof req.runId === 'string' && /^\d{1,12}$/.test(req.runId) ? req.runId : undefined;
     const liveness = (0, tmux_liveness_js_1.sessionLiveness)(sessionName);
     if (liveness === 'unknown') {
         (0, listener_log_js_1.log)(`✗ forget ${sessionName}: no tmux answered, so nothing was deleted`);
         return reply({ error: 'still_running' });
     }
-    if (liveness === 'running')
-        return reply({ error: 'still_running' });
-    const outcome = (0, session_registry_js_1.forgetSession)(sessionName, typeof req.agentKind === 'string' ? req.agentKind : undefined);
+    // 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;
+        if (!runId || !live || live === runId)
+            return reply({ error: 'still_running' });
+    }
+    const outcome = (0, session_registry_js_1.forgetSession)(sessionName, typeof req.agentKind === 'string' ? req.agentKind : undefined, runId, liveness === 'running');
     if (outcome === 'unknown') {
         (0, listener_log_js_1.log)(`✗ forget ${sessionName}: never seen on this machine`);
         return reply({ error: 'unknown_session' });
@@ -2112,6 +2158,7 @@ const startTurnRecorder = (features, apiKey, baseUrl, devices) => {
         uploadReady: () => deviceKeyRegistered,
         devicePublicKey: crypto_js_1.getDevicePublicKey,
         latestSeq: (0, turn_recorder_wire_js_1.createLatestSeqReader)({ baseUrl, apiKey }),
+        noteSeqs: run_seqs_js_1.noteRunSeqs,
         log: (message) => (0, listener_log_js_1.log)(message),
     });
     turnRecorder.start();
@@ -2961,7 +3008,7 @@ const deliverInput = (input) => {
     const deps = { noteRefusal: (r) => { reason ??= r; } };
     // Before anything is spent on it: a key bound to a prompt that is gone must not
     // take a rate-limit token, and must not land on whatever is on screen now.
-    const bound = input.ifPrompt === undefined || (0, blocked_prompt_seal_js_1.promptStillShown)(input.ifPrompt, capturePaneText(input.sessionName));
+    const bound = input.ifPrompt === undefined || (0, blocked_prompt_seal_js_1.promptStillShown)(input.ifPrompt, capturePaneText(input.sessionName, undefined, true));
     if (!bound)
         reason = 'prompt_changed';
     const injected = bound && hasStream(input.sessionName)
@@ -3310,6 +3357,8 @@ const collectSessionsVerbose = () => {
     // rather than in it: AgentSession is a server/phone contract and the
     // directory is local knowledge the registry needs, nothing the phone gets.
     const paneCwdOf = new Map();
+    // The conversation a resume may pick back up, beside it for the same reason.
+    const resumeIdOf = new Map();
     const targets = {};
     const subagentTranscripts = {};
     const recordable = {};
@@ -3340,6 +3389,7 @@ const collectSessionsVerbose = () => {
                 project: parsed.project,
                 label: parsed.label,
                 createdAt: epochToIso(group.created),
+                runId: (0, exports.runIdOfEpoch)(group.created),
                 lastActivityAt: epochToIso(group.activity),
                 // No `state`: the server arms its completion and `gone` pushes
                 // on reported state, and a shell going idle is not news.
@@ -3379,6 +3429,11 @@ const collectSessionsVerbose = () => {
             : null;
         if (info.currentPath)
             paneCwdOf.set(name, info.currentPath);
+        const resumeId = info.currentPath
+            ? main.agent.resolveResumeId?.(info.currentPath, info.panePid ?? undefined)
+            : null;
+        if (resumeId)
+            resumeIdOf.set(name, resumeId);
         targets[name] = main.row.paneId;
         sessions.push({
             name,
@@ -3389,6 +3444,7 @@ const collectSessionsVerbose = () => {
             label: parsed.label,
             providerSessionName,
             createdAt: epochToIso(group.created),
+            runId: (0, exports.runIdOfEpoch)(group.created),
             lastActivityAt: epochToIso(group.activity),
             ...(0, exports.deriveSessionState)(name, main.agent.kind, capturePaneText(name, main.row.paneId)),
         });
@@ -3447,8 +3503,10 @@ const collectSessionsVerbose = () => {
         const mainTranscript = info.currentPath && main.agent.resolveTranscript && main.agent.projectTranscript
             ? (main.agent.resolveTranscript(info.currentPath, info.panePid ?? undefined) ?? null)
             : null;
-        if (mainTranscript)
-            recordable[name] = { path: mainTranscript, kind: main.agent.kind };
+        if (mainTranscript) {
+            const runId = (0, exports.runIdOfEpoch)(group.created);
+            recordable[name] = { path: mainTranscript, kind: main.agent.kind, ...(runId ? { runId } : {}) };
+        }
         const transcriptPath = main.agent.kind === 'claude' ? mainTranscript : null;
         if (transcriptPath) {
             const scan = subagentScans.get(name) ?? (0, subagent_transcripts_js_1.initialSubagentScanState)();
@@ -3493,6 +3551,21 @@ const collectSessionsVerbose = () => {
     }
     pruneToLive(subagentScans, new Set(groups.keys()));
     pruneToLive(sessionStates, new Set(sessions.map((s) => s.name)));
+    // An id two panes both answer to belongs to at most one of them, and the
+    // sweep cannot tell which — opencode names the busiest session in the
+    // folder — so neither may resume it.
+    const resumeIdCount = new Map();
+    for (const id of resumeIdOf.values())
+        resumeIdCount.set(id, (resumeIdCount.get(id) ?? 0) + 1);
+    // Undefined (not read this sweep) keeps the run's last id; null (shared)
+    // forgets it, or a run that had the id alone would keep resuming into
+    // the pane that now answers to it.
+    const ownResumeId = (name) => {
+        const id = resumeIdOf.get(name);
+        if (!id)
+            return undefined;
+        return resumeIdCount.get(id) === 1 ? id : null;
+    };
     // 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
@@ -3509,6 +3582,9 @@ const collectSessionsVerbose = () => {
         agentKind: s.agentKind,
         project: s.project,
         label: s.label,
+        runId: s.runId,
+        startedAt: s.createdAt,
+        agentSessionId: ownResumeId(s.name),
     })));
     return { sessions, rejected, targets, subagentTranscripts, recordable };
 };
@@ -3880,10 +3956,10 @@ const resolveDownloadUrl = async (fileKey, ctx, fetchFn = fetch, timeoutMs = ATT
     return downloadUrl;
 };
 /** A download's body, refused at the headers when it says it is over the limit. */
-const cappedBody = (res) => {
-    if (Number(res.headers.get('content-length')) > file_crypto_js_1.DOWNLOAD_MAX_BYTES) {
+const cappedBody = (res, maxBytes = file_crypto_js_1.DOWNLOAD_MAX_BYTES) => {
+    if (Number(res.headers.get('content-length')) > maxBytes) {
         void res.body?.cancel().catch(() => undefined);
-        throw new Error(`download is over the ${file_crypto_js_1.DOWNLOAD_MAX_BYTES}-byte limit`);
+        throw new Error(`download is over the ${maxBytes}-byte limit`);
     }
     if (!res.body)
         throw new Error('download had no body');
@@ -3891,7 +3967,7 @@ const cappedBody = (res) => {
 };
 /** Resolve fileKey → presigned URL → bytes. Throws on any HTTP failure so
  *  the caller can isolate one file's failure from the rest of the batch. */
-const fetchAttachmentBytes = async (fileKey, ctx, io) => {
+const fetchAttachmentBytes = async (fileKey, ctx, io, maxBytes = file_crypto_js_1.DOWNLOAD_MAX_BYTES) => {
     const fetchFn = io.fetchFn ?? fetch;
     const timeoutMs = io.timeoutMs ?? ATTACHMENT_FETCH_TIMEOUT_MS;
     const url = await resolveDownloadUrl(fileKey, ctx, fetchFn, Math.min(timeoutMs, ATTACHMENT_META_TIMEOUT_MS));
@@ -3900,7 +3976,7 @@ const fetchAttachmentBytes = async (fileKey, ctx, io) => {
     const bin = await fetchFn(url, { signal: AbortSignal.timeout(timeoutMs), redirect: 'error' });
     if (!bin.ok)
         throw new Error(`download ${bin.status}`);
-    const body = cappedBody(bin);
+    const body = cappedBody(bin, maxBytes);
     // Count as it comes: a body with no length, or a false one, is not held in full.
     const chunks = [];
     let seen = 0;
@@ -3910,9 +3986,9 @@ const fetchAttachmentBytes = async (fileKey, ctx, io) => {
         if (done)
             break;
         seen += value.length;
-        if (seen > file_crypto_js_1.DOWNLOAD_MAX_BYTES) {
+        if (seen > maxBytes) {
             await reader.cancel().catch(() => undefined);
-            throw new Error(`download passed the ${file_crypto_js_1.DOWNLOAD_MAX_BYTES}-byte limit`);
+            throw new Error(`download passed the ${maxBytes}-byte limit`);
         }
         chunks.push(value);
     }
@@ -4026,6 +4102,58 @@ const downloadAttachments = async (pushId, files, ctx, sealed, io = {}) => {
     return paths;
 };
 exports.downloadAttachments = downloadAttachments;
+/** Padmé: the size a file is padded to before it is sealed (the apps' `Envelope.padme`). */
+const padme = (size) => {
+    if (size < 2)
+        return size;
+    const e = Math.floor(Math.log2(size));
+    const step = 2 ** (e - (Math.floor(Math.log2(e)) + 1));
+    return Math.ceil(size / step) * step;
+};
+/**
+ * The most a sealed answer file may download as: its seal's size padded, and the tag. The relay
+ * points at the bytes, so it could name a larger object; nothing past this is read.
+ */
+const answerFileBound = (size) => size !== undefined && Number.isSafeInteger(size) && size >= 0 ? Math.min(padme(size) + file_crypto_js_1.GCM_TAG_BYTES, file_crypto_js_1.DOWNLOAD_MAX_BYTES) : file_crypto_js_1.DOWNLOAD_MAX_BYTES;
+exports.answerFileBound = answerFileBound;
+/**
+ * The attachments of a sealed answer (`hwip ask`, answer-files.ts), saved one by one to
+ * `~/.hwip/attachments/<eventId>/<name>`. Unlike a command's, a file that fails does not take the
+ * others with it: the answer is the user's word either way, and each file not saved is named with why.
+ * `sealed.files` gives each file's meta in the same order.
+ */
+const downloadSealedEach = async (eventId, files, ctx, sealed, io = {}) => {
+    const dir = (0, path_1.join)(ATTACHMENTS_DIR, safeSegment(eventId, 'answer'));
+    const taken = new Map();
+    const paths = [];
+    const missing = [];
+    for (const [i, f] of files.entries()) {
+        const meta = sealed.files[i];
+        const name = meta?.name || f.fileName || `file-${i}`;
+        try {
+            if (!f.fileKey)
+                throw new Error('no fileKey');
+            const opened = await openSealedAttachment(await fetchAttachmentBytes(f.fileKey, ctx, io, (0, exports.answerFileBound)(meta?.size)), f, sealed);
+            // Padded before sealing: cut back to the size the seal gives.
+            const bytes = meta && Number.isSafeInteger(meta.size) && meta.size >= 0 ? opened.subarray(0, meta.size) : opened;
+            (0, private_files_js_1.mkdirHandedBack)(dir);
+            const abs = attachmentPath(taken, dir, safeSegment(name, `file-${i}`), bytes);
+            if (abs === null) {
+                // The same bytes under a name already saved: said, so no file goes unaccounted for.
+                missing.push(`${name}: the same file was attached twice`);
+                continue;
+            }
+            (0, fs_1.writeFileSync)(abs, bytes);
+            (0, private_files_js_1.handBackToSudoUser)(abs);
+            paths.push(abs);
+        }
+        catch (err) {
+            missing.push(`${name}: ${err.message}`);
+        }
+    }
+    return { paths, missing };
+};
+exports.downloadSealedEach = downloadSealedEach;
 const defaultDownloadAttachments = (pushId, files, sealed) => {
     if (!attachmentCtx) {
         (0, listener_log_js_1.log)('! attachment context not initialised — skipping files');
@@ -4508,7 +4636,7 @@ const handlePushInner = async (push, deps) => {
         return handleScheduleRequest(push, push.agentSessionName, addressed, deps);
     // A command bound to a blocked prompt types only while that prompt is on screen. Checked
     // before anything is downloaded or typed, and before the rate limit is spent.
-    if (push.ifPrompt !== undefined && !(0, blocked_prompt_seal_js_1.promptStillShown)(push.ifPrompt, (deps.capturePane ?? capturePaneText)(push.agentSessionName))) {
+    if (push.ifPrompt !== undefined && !(0, blocked_prompt_seal_js_1.promptStillShown)(push.ifPrompt, deps.capturePane ? deps.capturePane(push.agentSessionName) : capturePaneText(push.agentSessionName, undefined, true))) {
         (0, listener_log_js_1.log)(`! ${push.agentSessionName}: the blocked prompt this command answers is gone — drop`);
         deps.noteRefusal?.('prompt_changed');
         return false;
@@ -4906,8 +5034,10 @@ const streamSession = (wsUrl, apiKey) => {
             // request of their own: the phone is already reading this device
             // record, and a second round trip would need its own timeout, its
             // own failure wording and its own staleness question.
-            const known = (0, exports.knownSessionsToReport)(sessions);
-            const fingerprint = `${(0, exports.sessionsFingerprint)(sessions)}␞${(0, exports.knownSessionsFingerprint)(known)}`;
+            const seqs = (0, run_seqs_js_1.runSeqsByRun)();
+            const reported = (0, exports.withRunSeqs)(sessions, seqs);
+            const known = (0, exports.knownSessionsToReport)(sessions, Date.now(), seqs);
+            const fingerprint = `${(0, exports.sessionsFingerprint)(reported)}␞${(0, exports.knownSessionsFingerprint)(known)}`;
             if (!(0, exports.sessionsReportDue)(fingerprint, lastSentFingerprint, lastSentAtMs, Date.now())) {
                 return;
             }
@@ -4917,7 +5047,7 @@ const streamSession = (wsUrl, apiKey) => {
             // One message when it fits; past 24 KB, parts (sessions-report.ts): API Gateway closes a
             // socket on a frame over 32 KB, so an uncut report from a machine with ~100 sessions would
             // drop the connection on every send.
-            const plan = (0, sessions_report_js_1.planSessionsReport)(sessions, known);
+            const plan = (0, sessions_report_js_1.planSessionsReport)(reported, known);
             if (plan.messages.length > 1) {
                 (0, listener_log_js_1.log)(`⧉ inventory of ${plan.sessionCount} session(s), ${Math.round(plan.wholeBytes / 1024)} KB, is over the ${sessions_report_js_1.SESSIONS_REPORT_MAX_BYTES / 1024} KB message limit — sent in ${plan.messages.length - 1} parts + names`);
                 for (const name of plan.oversized)

package/dist/remote-agents.d.ts

@@ -30,6 +30,24 @@ export interface RemoteAgent {
      * listener then reports agentSessionId: null.
      */
     resolveSessionId?: (paneCwd: string, panePid?: number) => string | null;
+    /**
+     * The conversation id a resume may hand back to this agent: anchored to
+     * the pane's own process, never a guess at the newest conversation in the
+     * folder — `resolveSessionId` may fall back to one for reporting, and a
+     * resume built on it would continue another session's work. Where the
+     * agent's store cannot tell two panes in one folder apart, both answer the
+     * same id; the sweep records no id that more than one pane answers to.
+     */
+    resolveResumeId?: (paneCwd: string, panePid?: number) => string | null;
+    /**
+     * The arguments that start this agent on the conversation `id` (as
+     * `resolveResumeId` read it) in `cwd`, or null when that conversation
+     * cannot be picked back up and the agent should start fresh. Carried only
+     * where `resolveResumeId` is — an agent whose id is unknown here is never
+     * pointed at "the latest conversation in this folder", which may be
+     * another session's.
+     */
+    resumeArgs?: (id: string, cwd: string) => readonly string[] | null;
     /**
      * Resolve the name the agent calls this session by — what the user sees in
      * their own terminal, which the phone shows instead of the computed
@@ -307,6 +325,8 @@ declare const REMOTE_AGENT_TABLE: readonly [{
     readonly resolveSessionName: (paneCwd: string, panePid: number | undefined) => string | null;
     readonly resolveTranscript: (paneCwd: string, panePid: number | undefined) => string | null;
     readonly projectTranscript: TranscriptProjector;
+    readonly resolveResumeId: (paneCwd: string, panePid: number | undefined) => string | null;
+    readonly resumeArgs: (id: string, cwd: string) => string[] | null;
 }, {
     readonly kind: "codex";
     readonly displayName: "Codex CLI";
@@ -351,6 +371,8 @@ declare const REMOTE_AGENT_TABLE: readonly [{
     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;
+    readonly resolveResumeId: (paneCwd: string, panePid: number | undefined) => string | null;
+    readonly resumeArgs: (id: string) => string[];
 }, {
     readonly kind: "kimi";
     readonly displayName: "Kimi Code";

package/dist/remote-agents.js

@@ -436,10 +436,17 @@ const claudeTranscriptPath = (paneCwd, panePid) => {
         return null;
     // A mis-encoded directory yields a path that never exists, and the watcher
     // would then poll a missing file forever without ever saying so.
-    const projectDir = (0, path_1.join)(CLAUDE_PROJECTS_DIR, (0, exports.claudeProjectDirName)(paneCwd));
-    const path = (0, path_1.join)(projectDir, `${sessionId}.jsonl`);
-    // Prove it before handing it out. The pid path never touches the filesystem,
-    // so without this a mis-encoded directory reads as a healthy silent session.
+    return claudeConversationFile(paneCwd, sessionId);
+};
+exports.claudeTranscriptPath = claudeTranscriptPath;
+/**
+ * Where Claude Code keeps conversation `sessionId` begun in `cwd`, or null
+ * when no such file is there. Proven, not computed: the pid path never touches
+ * the filesystem, so without this a mis-encoded directory reads as a healthy
+ * silent session — and `claude --resume` of a missing id exits at once.
+ */
+const claudeConversationFile = (cwd, sessionId) => {
+    const path = (0, path_1.join)(CLAUDE_PROJECTS_DIR, (0, exports.claudeProjectDirName)(cwd), `${sessionId}.jsonl`);
     try {
         return (0, fs_1.statSync)(path).isFile() ? path : null;
     }
@@ -447,7 +454,6 @@ const claudeTranscriptPath = (paneCwd, panePid) => {
         return null;
     }
 };
-exports.claudeTranscriptPath = claudeTranscriptPath;
 // ── pi ───────────────────────────────────────────────────────────
 /**
  * Where pi keeps its sessions, honouring the override pi itself honours.
@@ -1076,6 +1082,11 @@ const REMOTE_AGENT_TABLE = [
         resolveSessionName: (paneCwd, panePid) => panePid !== undefined ? (0, exports.detectClaudeSessionNameByPid)(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
+        // `claude` in the same directory, which is a report's risk to take but
+        // not a resume's.
+        resolveResumeId: (paneCwd, panePid) => panePid !== undefined ? (0, exports.detectClaudeSessionIdByPid)(panePid, paneCwd) : null,
+        resumeArgs: (id, cwd) => (claudeConversationFile(cwd, id) ? ['--resume', id] : null),
     },
     {
         kind: 'codex',
@@ -1143,6 +1154,12 @@ const REMOTE_AGENT_TABLE = [
         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 }),
+        // Anchored to the pane's process start. Two opencode panes in one
+        // folder both answer the busier session; the sweep drops a shared id.
+        resolveResumeId: (paneCwd, panePid) => (0, exports.detectOpencodeSession)(paneCwd, panePid)?.id ?? null,
+        // Not checked against the store: an unknown id makes opencode start a
+        // new session rather than exit, so a stale one costs nothing.
+        resumeArgs: (id) => ['--session', id],
     },
     // The rows below are the minimum: launch in a tmux pane and be addressable.
     // Binary names come from Happier's provider table; only `copilot` and

package/dist/run-seqs.d.ts

@@ -0,0 +1,28 @@
+/**
+ * The seq block each run of a session took (hwip docs/session-runs.md Q24).
+ *
+ * The recorder numbers a name's chunks in one rising sequence, and a new run
+ * carries the numbering on — so a run's chunks sit between the smallest and the
+ * largest seq it was handed. The listener reports that block with each run, and
+ * the server reads a run's conversation from that key range alone instead of
+ * every chunk the name ever had.
+ *
+ * Kept in a file of its own rather than on the registry entry: the registry is
+ * rewritten from the inventory sweep, and a chunk can be numbered before the
+ * sweep has written its run down. A bound that is lost reads too narrow, and a
+ * block reported too narrow hides chunks — so the smallest seq only goes down
+ * and the largest only up, here and on the server.
+ */
+export interface RunSeqs {
+    firstSeq: number;
+    lastSeq: number;
+}
+/** Widen run `runId` of `name` to cover the seqs `firstSeq`..`lastSeq` it was just handed. */
+export declare const noteRunSeqs: (name: string, runId: string, firstSeq: number, lastSeq: number, now?: number) => void;
+/** Every run's block, keyed by `runSeqsKey`: one read for a whole report. */
+export declare const runSeqsByRun: () => Map<string, RunSeqs>;
+/** NUL-separated, like the registry's `runKey`: a name holding the separator cannot forge another run's key. */
+export declare const runSeqsKey: (name: string, runId: string) => string;
+/** Test seam: the file this module reads and writes. */
+export declare const runSeqsPath: () => string;
+//# sourceMappingURL=run-seqs.d.ts.map

package/dist/run-seqs.js

@@ -0,0 +1,79 @@
+"use strict";
+/**
+ * The seq block each run of a session took (hwip docs/session-runs.md Q24).
+ *
+ * The recorder numbers a name's chunks in one rising sequence, and a new run
+ * carries the numbering on — so a run's chunks sit between the smallest and the
+ * largest seq it was handed. The listener reports that block with each run, and
+ * the server reads a run's conversation from that key range alone instead of
+ * every chunk the name ever had.
+ *
+ * Kept in a file of its own rather than on the registry entry: the registry is
+ * rewritten from the inventory sweep, and a chunk can be numbered before the
+ * sweep has written its run down. A bound that is lost reads too narrow, and a
+ * block reported too narrow hides chunks — so the smallest seq only goes down
+ * and the largest only up, here and on the server.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.runSeqsPath = exports.runSeqsKey = exports.runSeqsByRun = exports.noteRunSeqs = void 0;
+const fs_1 = require("fs");
+const path_1 = require("path");
+const gate_js_1 = require("./gate.js");
+const private_files_js_1 = require("./private-files.js");
+const session_registry_js_1 = require("./session-registry.js");
+/** Ceiling on rows: far above the registry's own 100 runs, only so the file cannot grow without bound. */
+const MAX_ROWS = 500;
+const filePath = () => (0, path_1.join)((0, gate_js_1.stateDir)(), 'run-seqs.json');
+const isSeq = (v) => Number.isSafeInteger(v) && v >= 0;
+/** The last parse, keyed by the file's mtime and size: the 5 s report sweep reads it without parsing again. */
+let cached;
+const readAll = () => {
+    const path = filePath();
+    try {
+        const stat = (0, fs_1.statSync)(path);
+        const stamp = `${stat.mtimeMs}:${stat.size}`;
+        if (cached?.path === path && cached.stamp === stamp)
+            return cached.rows;
+        const parsed = JSON.parse((0, fs_1.readFileSync)(path, 'utf-8'));
+        const rows = !Array.isArray(parsed) ? [] : parsed.filter((r) => !!r && typeof r === 'object' &&
+            typeof r.name === 'string' && typeof r.runId === 'string' && typeof r.at === 'string' &&
+            isSeq(r.firstSeq) && isSeq(r.lastSeq));
+        cached = { path, stamp, rows };
+        return rows;
+    }
+    catch {
+        return [];
+    }
+};
+const writeAll = (rows) => {
+    const path = filePath();
+    try {
+        (0, private_files_js_1.mkdirHandedBack)((0, path_1.dirname)(path), 0o700);
+        (0, fs_1.writeFileSync)(path, JSON.stringify(rows), { mode: 0o600 });
+        (0, private_files_js_1.handBackToSudoUser)(path);
+    }
+    catch {
+        // A block that cannot be written costs the narrow read, not the chunk: the server reads the whole name.
+    }
+};
+/** Widen run `runId` of `name` to cover the seqs `firstSeq`..`lastSeq` it was just handed. */
+const noteRunSeqs = (name, runId, firstSeq, lastSeq, now = Date.now()) => {
+    if (!isSeq(firstSeq) || !isSeq(lastSeq))
+        return;
+    const at = new Date(now).toISOString();
+    const rows = readAll().filter((r) => now - Date.parse(r.at) < session_registry_js_1.KNOWN_SESSION_TTL_MS);
+    const had = rows.find((r) => r.name === name && r.runId === runId);
+    const row = had
+        ? { ...had, firstSeq: Math.min(had.firstSeq, firstSeq), lastSeq: Math.max(had.lastSeq, lastSeq), at }
+        : { name, runId, firstSeq, lastSeq, at };
+    writeAll([row, ...rows.filter((r) => r !== had)].slice(0, MAX_ROWS));
+};
+exports.noteRunSeqs = noteRunSeqs;
+/** Every run's block, keyed by `runSeqsKey`: one read for a whole report. */
+const runSeqsByRun = () => new Map(readAll().map((r) => [(0, exports.runSeqsKey)(r.name, r.runId), { firstSeq: r.firstSeq, lastSeq: r.lastSeq }]));
+exports.runSeqsByRun = runSeqsByRun;
+/** NUL-separated, like the registry's `runKey`: a name holding the separator cannot forge another run's key. */
+const runSeqsKey = (name, runId) => `${name}\u0000${runId}`;
+exports.runSeqsKey = runSeqsKey;
+/** Test seam: the file this module reads and writes. */
+exports.runSeqsPath = filePath;