@phnx-labs/agents-cli 1.20.89 → 1.20.90

package/dist/commands/sessions.js

@@ -11,6 +11,7 @@ import * as fs from 'fs';
 import * as os from 'os';
 import * as path from 'path';
 import { spawn } from 'child_process';
+import { Option } from 'commander';
 import chalk from 'chalk';
 import { truncate, padRight } from '../lib/format.js';
 import ora from 'ora';
@@ -27,7 +28,7 @@ import { gatherRemoteList, runOnPeer } from '../lib/session/remote-list.js';
 import { stringWidth, truncateToWidth, padToWidth, terminalWidth } from '../lib/session/width.js';
 import { inferSessionState } from '../lib/session/state.js';
 import { discoverSessions, countSessionsInScope, resolveSessionById, isCompleteSessionId, looksLikeSessionId, searchContentIndex, getSessionRoots } from '../lib/session/discover.js';
-import { findSessionsById } from '../lib/session/db.js';
+import { findSessionsById, querySessions } from '../lib/session/db.js';
 import { filterTeamSessions, safeTeamText } from '../lib/session/team-filter.js';
 import { parseSession } from '../lib/session/parse.js';
 import { runRemoteSessions, buildForwardedArgs, ensureWholeIndex } from '../lib/session/remote.js';
@@ -45,6 +46,8 @@ import { setHelpSections } from '../lib/help.js';
 import { registerSessionsTailCommand } from './sessions-tail.js';
 import { registerSessionsSyncCommand } from './sessions-sync.js';
 import { registerSessionsResumeCommand } from './sessions-resume.js';
+import { registerSessionsFavoriteCommand } from './sessions-favorite.js';
+import { isFavorite, listFavorites } from '../lib/session/favorites.js';
 import { registerGoCommand } from './go.js';
 import { registerFocusCommand } from './focus.js';
 import { registerDetachCommand } from './detach.js';
@@ -195,6 +198,12 @@ function statusColor(status) {
         case 'closed': return chalk.dim;
         // Days-stale / dangling: red so a session nobody is driving stands out.
         case 'abandoned': return chalk.red;
+        // The host window died and took the agent with it — an unclean exit, not the
+        // dimmed `closed` of a normal one. Red-bright so a crash reads as an event.
+        case 'crashed': return chalk.redBright;
+        // Alive with nobody attached. Yellow, like `input_required`: both mean the
+        // session is stuck waiting on a human, and this one has no human to wait for.
+        case 'orphaned': return chalk.yellow;
         // Alive but un-introspectable (a harness whose transcript we can't parse).
         // Magenta so it never reads as the gray "idle" it used to be faked as.
         case 'unknown': return chalk.magenta;
@@ -329,8 +338,14 @@ export function formatActiveRowDescription(s) {
 function activityLabel(s) {
     // Lifecycle status wins over any residual parsed activity — a dead/dangling
     // session must read `closed`/`abandoned`, not the `idle` its stale tail infers.
+    // `crashed`/`orphaned` are the same kind of claim about the session as a whole,
+    // and both outrank the `idle` its last parsed turn would otherwise show.
     if (s.status === 'closed' || s.status === 'abandoned')
         return s.status;
+    if (s.status === 'crashed')
+        return 'crashed';
+    if (s.status === 'orphaned')
+        return 'orphan';
     if (s.activity === 'waiting_input')
         return 'waiting';
     if (s.activity === 'working')
@@ -367,10 +382,17 @@ export function liveGlyphAndPreview(a) {
     // so an opaque harness is never mistaken for a finished one. `⊘` = abandoned /
     // dangling; `×` = closed (dead pid) — both distinct from the `○` idle a live,
     // stopped session shows, so a gone session never masquerades as a resting one.
+    // `✗` = crashed (died WITH its host window, uncleanly) — deliberately louder
+    // than the `×` of a clean close. `◍` = orphaned (alive, nothing attached): a
+    // filled ring, so it reads as "still burning" unlike the hollow `○` idle.
     if (a.status === 'abandoned')
         return { glyph: statusColor(a.status)('⊘'), preview: buildSessionDescription(a) };
     if (a.status === 'closed')
         return { glyph: statusColor(a.status)('×'), preview: buildSessionDescription(a) };
+    if (a.status === 'crashed')
+        return { glyph: statusColor(a.status)('✗'), preview: buildSessionDescription(a) };
+    if (a.status === 'orphaned')
+        return { glyph: statusColor(a.status)('◍'), preview: buildSessionDescription(a) };
     const waiting = a.status === 'input_required' || a.activity === 'waiting_input';
     const running = a.status === 'running' || a.activity === 'working';
     const unknown = a.status === 'unknown';
@@ -394,6 +416,11 @@ export function liveStatusWord(a) {
     // Lifecycle status is definitive — surface it ahead of any parsed activity.
     if (a.status === 'closed' || a.status === 'abandoned')
         return a.status;
+    // Same rank: a lost host is a fact about the session, not about its last turn.
+    if (a.status === 'crashed')
+        return 'crashed';
+    if (a.status === 'orphaned')
+        return 'orphan';
     if (a.status === 'input_required' || a.activity === 'waiting_input')
         return 'waiting';
     if (a.status === 'running' || a.activity === 'working')
@@ -404,12 +431,43 @@ export function liveStatusWord(a) {
         return 'queued';
     return '';
 }
+/**
+ * True when a session is blocked on a human — the `--waiting` contract.
+ *
+ * NOT `status === 'input_required'`. `foldHostLink` rewrites that status to
+ * `orphaned` when nothing is attached, and a session waiting on a question with
+ * NOBODY watching is the most acute case `--waiting` exists to surface, not one
+ * it should drop. The underlying `activity` is never rewritten, so it is the
+ * honest signal here.
+ *
+ * But `activity` is never rewritten for a DEAD session either: one that died
+ * mid-question keeps `waiting_input` forever, and answering it is not a thing a
+ * human can do — it needs a relaunch. `--waiting` is a scriptable gate ("does
+ * anything need me?"), so a corpse must not trip it.
+ *
+ * `closed` and `crashed` are unconditionally dead, so they are excluded outright.
+ * `abandoned` is NOT: it fires on transcript staleness before the liveness check,
+ * so it also covers the live-but-forgotten case — an interactive session that
+ * asked a question and sat untouched over a long weekend is still answerable, and
+ * is exactly what this gate exists for. It is excluded only when we positively
+ * know its process is gone; unknown liveness (an older peer, a row with no pid)
+ * stays excluded rather than inventing a human who can answer.
+ */
+export function isAwaitingUser(s) {
+    if (s.status === 'crashed' || s.status === 'closed')
+        return false;
+    if (s.status === 'abandoned' && s.pidAlive !== true)
+        return false;
+    return s.status === 'input_required' || s.activity === 'waiting_input';
+}
+/** Width of the live status column — `crashed` is the longest word it renders. */
+const LIVE_STATUS_W = 8;
 /** The colored, space-padded status cell for a listing row (empty when not live). */
 function liveStatusCell(live) {
     const word = liveStatusWord(live);
     if (!word || !live)
         return { cell: '', width: 0 };
-    return { cell: statusColor(live.status)(padToWidth(word, 8)), width: 8 };
+    return { cell: statusColor(live.status)(padToWidth(word, LIVE_STATUS_W)), width: LIVE_STATUS_W };
 }
 /**
  * The tracker/PR ref for a session's dedicated column: the ticket id when known,
@@ -745,6 +803,25 @@ export function serializeSessionsJson(sessions) {
     });
     return JSON.stringify(serializable, null, 2) + '\n';
 }
+/** The intentionally small metadata contract emitted by `sessions --resolve`.
+ * Transcript locations, extracted plans, account data, costs, and other indexed
+ * payload stay local to the machine that owns them. */
+export function serializeResolvedSessionsJson(sessions) {
+    const safe = sessions.map((session) => ({
+        id: session.id,
+        shortId: session.shortId,
+        agent: session.agent,
+        origin: session.origin,
+        timestamp: session.timestamp,
+        lastActivity: session.lastActivity,
+        project: session.project,
+        version: session.version,
+        label: session.label,
+        topic: session.topic,
+        machine: session.machine,
+    }));
+    return JSON.stringify(safe, null, 2) + '\n';
+}
 /**
  * `agents sessions --json --host <h>` — fan the RECENT (non-active) listing out
  * to the named host(s) and emit ONE clean merged `SessionMeta[]` JSON array,
@@ -777,9 +854,15 @@ function groupTally(sessions) {
     const running = sessions.filter(s => s.status === 'running').length;
     const idle = sessions.filter(s => s.status === 'idle').length;
     const waiting = sessions.filter(s => s.status === 'input_required').length;
+    // Counted by status, deliberately: an orphaned session gets its own bucket
+    // below, so counting it here too would double-count it in the tally.
     const queued = sessions.filter(s => s.status === 'queued').length;
     const closed = sessions.filter(s => s.status === 'closed').length;
     const abandoned = sessions.filter(s => s.status === 'abandoned').length;
+    // Without these two the tally silently loses rows: every status must have a
+    // bucket or "N active (…)" stops adding up to what the list shows.
+    const orphaned = sessions.filter(s => s.status === 'orphaned').length;
+    const crashed = sessions.filter(s => s.status === 'crashed').length;
     const unknown = sessions.filter(s => s.status === 'unknown').length;
     const parts = [];
     if (running)
@@ -794,6 +877,10 @@ function groupTally(sessions) {
         parts.push(`${closed} closed`);
     if (abandoned)
         parts.push(`${abandoned} abandoned`);
+    if (orphaned)
+        parts.push(`${orphaned} orphaned`);
+    if (crashed)
+        parts.push(`${crashed} crashed`);
     if (unknown)
         parts.push(`${unknown} unknown`);
     return parts.join(' · ');
@@ -981,10 +1068,19 @@ export async function gatherActiveSessions(opts = {}) {
  */
 async function renderActiveSessions(asJson, waitingOnly = false, opts = {}) {
     const self = machineId();
-    const { sessions: merged, remoteDeviceCount } = await gatherActiveSessions(opts);
+    const gathered = await gatherActiveSessions(opts);
+    const { remoteDeviceCount } = gathered;
+    // --favorites narrows the live view too. Applied HERE, not only in the
+    // browser: the browser is skipped for --json, --waiting, a pipe, a multi-host
+    // scope, and an SSH-fanout peer, and the flag silently did nothing on every
+    // one of those paths — including `--active --favorites --json`, which is
+    // exactly what the browser's own `y` copy-cmd hands to an agent.
+    const merged = opts.favoritesOnly
+        ? gathered.sessions.filter((s) => !!s.sessionId && listFavorites().has(s.sessionId))
+        : gathered.sessions;
     // --waiting: only sessions blocked on the user. Exits non-zero when any are
     // present so a supervising agent or hook can poll it as a gate.
-    const sessions = waitingOnly ? merged.filter(s => s.status === 'input_required') : merged;
+    const sessions = waitingOnly ? merged.filter(isAwaitingUser) : merged;
     if (asJson) {
         // Resolve who is watching each local tmux pane before serializing: `viewingIn`
         // is how a consumer distinguishes a session someone is looking at from one
@@ -1111,6 +1207,8 @@ function canonicalSessionsCommand(query, options) {
         a.push('--local');
     if (options.waiting)
         a.push('--waiting');
+    if (options.favorites)
+        a.push('--favorites');
     const q = (query ?? '').trim();
     if (q)
         a.push(JSON.stringify(q));
@@ -1139,16 +1237,48 @@ async function renderSessionPreview(query, scope) {
         live = indexActiveBySessionId(await getActiveSessions()).get(session.id);
     }
     catch { /* plain preview on any probe failure */ }
-    if (live) {
-        const { glyph } = liveGlyphAndPreview(live);
-        const word = liveStatusWord(live) || live.status;
-        const needsYou = live.status === 'input_required' || live.activity === 'waiting_input';
-        const reason = live.awaitingReason ? ` (${live.awaitingReason.replace('_', ' ')})` : '';
-        const suffix = needsYou ? chalk.yellow(`  ← needs you${reason}`) : '';
-        console.log(`${glyph} ${statusColor(live.status)(word)}${suffix}`);
-    }
+    const headline = formatLiveStatusHeadline(live, isFavorite(session.id));
+    if (headline)
+        console.log(headline);
     console.log(buildPreview(session));
 }
+/**
+ * The one-line live status banner shown above a session preview: the glyph, the
+ * status word, and — when the session needs a human or has LOST one — a plain
+ * sentence saying so. Shared by `--preview` and the interactive browser's preview
+ * pane so both explain a state the same way.
+ *
+ * `crashed` and `orphaned` are the states a glyph alone cannot carry: nobody
+ * reads "orphan" and knows it means "still running in tmux with no window
+ * attached", so those two spell it out.
+ */
+export function formatLiveStatusHeadline(live, favorite = false) {
+    const star = favorite ? chalk.yellow('★ ') : '';
+    // With no live row there is no status to lead with, so the star has to say
+    // what it means on its own — a bare `★` above a preview reads as noise.
+    if (!live)
+        return favorite ? chalk.yellow('★ favorited') : '';
+    const { glyph } = liveGlyphAndPreview(live);
+    const word = liveStatusWord(live) || live.status;
+    // One definition, shared with `--waiting`. A second local copy drifted: the
+    // preview said "needs you" for a dead session that `--waiting` had (rightly)
+    // stopped counting, so the human and the script disagreed about the same row.
+    const needsYou = isAwaitingUser(live);
+    const reason = live.awaitingReason ? ` (${live.awaitingReason.replace('_', ' ')})` : '';
+    let suffix = needsYou ? chalk.yellow(`  ← needs you${reason}`) : '';
+    if (live.status === 'crashed') {
+        suffix = chalk.redBright('  ← the host app or connection went away and took the agent with it');
+    }
+    else if (live.status === 'orphaned') {
+        // Keep the needs-you half. A session sitting on a real question with nobody
+        // attached is strictly worse than either fact alone, and replacing the
+        // question with the generic orphan line undersells exactly that case.
+        suffix = needsYou
+            ? chalk.yellow(`  ← waiting on you${reason}, and no client is attached to answer it`)
+            : chalk.yellow('  ← still running, but no client is attached — nothing is showing it');
+    }
+    return `${star}${glyph} ${statusColor(live.status)(word)}${suffix}`;
+}
 /** Main action handler for `agents sessions`. Routes to picker, table, or single-session render. */
 async function sessionsAction(query, options, 
 /**
@@ -1182,6 +1312,39 @@ limitSource) {
         process.stdout.write(JSON.stringify(getSessionRoots(), null, 2) + '\n');
         return;
     }
+    // --resolve is the metadata-only contract for downstream context workflows.
+    // It reads indexed SessionMeta rows and never calls renderSession, buildPreview,
+    // parseSession, or any other transcript renderer/parser.
+    if (options.resolve !== undefined || options.resolveSafeV1 !== undefined) {
+        if (options.resolveSafeV1 !== undefined && process.env[NO_FANOUT_ENV] !== '1') {
+            console.error(chalk.red('--resolve-safe-v1 is an internal fleet protocol.'));
+            process.exit(1);
+        }
+        if (!options.json) {
+            console.error(chalk.red('--resolve requires --json.'));
+            process.exit(1);
+        }
+        const selector = (options.resolveSafeV1 ?? options.resolve ?? '').trim();
+        if (!selector) {
+            console.error(chalk.red('--resolve requires a non-empty selector.'));
+            process.exit(1);
+        }
+        if (query) {
+            console.error(chalk.red('Pass the selector to --resolve, not as a positional query.'));
+            process.exit(1);
+        }
+        if (options.local === true && options.host && !shouldIncludeLocal(options.host, machineId())) {
+            console.error(chalk.red('--local and --device name opposite scopes: --local skips the SSH fan-out that --device needs.'));
+            process.exit(1);
+        }
+        await resolveSessionMetadata(selector, {
+            agent: options.agent,
+            project: options.project,
+            local: options.local,
+            hosts: options.host,
+        });
+        return;
+    }
     // --host WITHOUT --active. `--json` fans the recent listing out and emits ONE
     // clean merged SessionMeta[] array (same shape as the local --json path), for
     // scripts/extensions that JSON.parse a remote's history. Without --json it
@@ -1256,6 +1419,7 @@ limitSource) {
                 host: options.host,
                 since: options.since,
                 all: options.all,
+                favorites: options.favorites,
             }), { local: options.local === true, hosts: options.host });
             return;
         }
@@ -1265,6 +1429,7 @@ limitSource) {
         await renderActiveSessions(options.json === true, options.waiting === true, {
             local: forceLocal,
             hosts: options.host,
+            favoritesOnly: options.favorites === true,
         });
         return;
     }
@@ -1286,6 +1451,7 @@ limitSource) {
             since: options.since,
             host: options.host,
             inTeam: options.inTeam,
+            favorites: options.favorites,
         }), { local: options.local === true, hosts: options.host });
         return;
     }
@@ -1410,6 +1576,12 @@ limitSource) {
         // read. Match either, after that pass has populated `teamOrigin`.
         if (options.inTeam)
             sessions = sessions.filter((s) => matchesTeam(s, options.inTeam));
+        // --favorites narrows to the starred set. Applied here, before the JSON
+        // emit, so `--favorites --json` is the machine-readable twin of the `f` key.
+        if (options.favorites) {
+            const starred = listFavorites();
+            sessions = sessions.filter((s) => starred.has(s.id));
+        }
         // Under --in-team the visible list is one team, so the whole-index team-origin
         // count would be a non-sequitur next to it.
         const hiddenCount = options.teams || options.inTeam
@@ -1602,7 +1774,7 @@ function metaSignals(s) {
  * (tracker/PR ref, pulled out of the badge blob so refs align) is only rendered
  * when `showTicket` — otherwise a listing with no refs would waste a column of
  * dashes and needlessly truncate the topic. Worktree stays a trailing badge. */
-export function flatSessionRow(session, live, showTicket = false, cols = {}) {
+export function flatSessionRow(session, live, showTicket = false, cols = {}, favorite = false) {
     const agentColor = colorAgent(session.agent);
     const when = formatRelativeTime(session.lastActivity ?? session.timestamp);
     const project = session.project || '-';
@@ -1638,13 +1810,17 @@ export function flatSessionRow(session, live, showTicket = false, cols = {}) {
     const wtW = wt ? stringWidth(wt) + 1 : 0;
     const width = terminalWidth();
     const requestedModelW = cols.showModel ? (cols.modelWidth ?? PICKER_MODEL_MAX) : 0;
-    const fixedW = (10 + 9 + 8 + 16) + glyphW + statusW + machineW + ticketW + wtW + team.width + stringWidth(when) + 1;
+    // Same conditional 2 cells as the picker's marker, for the same reason.
+    const favW = cols.showFavorite ? 2 : 0;
+    const favCell = cols.showFavorite ? (favorite ? chalk.yellow('★ ') : '  ') : '';
+    const fixedW = favW + (10 + 9 + 8 + 16) + glyphW + statusW + machineW + ticketW + wtW + team.width + stringWidth(when) + 1;
     const modelSlack = width - fixedW - 16;
     const modelW = requestedModelW <= modelSlack
         ? requestedModelW
         : modelSlack >= PICKER_MODEL_MIN ? modelSlack : 0;
     const topicW = Math.max(16, width - fixedW - modelW);
-    return (chalk.white(padToWidth(truncateToWidth(session.shortId, 9), 10)) +
+    return (favCell +
+        chalk.white(padToWidth(truncateToWidth(session.shortId, 9), 10)) +
         agentColor(padToWidth(truncateToWidth(session.agent, 8), 9)) +
         chalk.yellow(padToWidth(truncateToWidth(session.version || '-', 7), 8)) +
         (modelW ? chalk.yellow(padToWidth(truncateToWidth(modelLabel(session.model), modelW - 1), modelW)) : '') +
@@ -1818,8 +1994,10 @@ function printSessionTable(sessions, hiddenCount = 0, tree = false, liveIndex) {
     // column (and its compact labels) is computed the same way the picker does it.
     const showTicket = sessions.some((s) => ticketLabel(s) !== '');
     const cols = pickerColumnsFor(sessions);
-    for (const session of sessions)
-        console.log(flatSessionRow(session, liveIndex?.get(session.id), showTicket, cols));
+    const favorites = listFavorites();
+    for (const session of sessions) {
+        console.log(flatSessionRow(session, liveIndex?.get(session.id), showTicket, cols, favorites.has(session.id)));
+    }
     const countLine = `${sessions.length} session${sessions.length === 1 ? '' : 's'}.`;
     console.log(chalk.gray(`\n${countLine}`));
     if (hiddenCount > 0) {
@@ -2049,6 +2227,11 @@ export function pickerColumnsFor(sessions) {
         showModel: sessions.some((s) => !!s.model),
         modelWidth: modelColumnWidth(sessions),
         showTicket: sessions.some((s) => ticketLabel(s) !== ''),
+        showFavorite: (() => {
+            // One read of the store per pool, not one per row.
+            const starred = listFavorites();
+            return starred.size > 0 && sessions.some((s) => starred.has(s.id));
+        })(),
     };
 }
 /** Width of the host-program column (`tmux→ghostty` is the long realistic case). */
@@ -2067,7 +2250,7 @@ export function liveHostLabel(a) {
     const viewer = a.viewingIn?.app;
     return viewer && viewer !== a.host ? `${a.host}→${viewer}` : a.host;
 }
-export function formatPickerLabel(s, query, cols = {}, ssh, host = '') {
+export function formatPickerLabel(s, query, cols = {}, ssh, host = '', favorite = false, live) {
     const agentColor = colorAgent(s.agent);
     const when = formatRelativeTime(s.lastActivity ?? s.timestamp);
     const project = s.project || '-';
@@ -2109,17 +2292,32 @@ export function formatPickerLabel(s, query, cols = {}, ssh, host = '') {
     const ticketW = cols.showTicket ? TICKET_W + 1 : 0;
     const hostW = cols.showHost ? PICKER_HOST_W : 0;
     const wtW = wt ? stringWidth(wt) + 1 : 0;
-    const topicW = Math.max(16, terminalWidth() - gutter - (10 + 9 + 8 + 16) - machineColW - hostW - ticketW - wtW - sshW - team.width - stringWidth(when) - 1);
-    return (
-    // Truncated, not just padded: an indexed shortId is always 8 chars, but a
-    // live row with no session id is named by its pid or cloud task, which can
-    // run past the column and shunt every later column out of alignment.
-    chalk.white(padRight(truncate(s.shortId, 9), 10)) +
+    // Within a pool that HAS starred rows the marker holds its 2 cells whether this
+    // row is starred or not, so the columns after it never jog; a pool with none
+    // drops the column entirely (`showFavorite`) and costs nothing.
+    const favW = cols.showFavorite ? 2 : 0;
+    const favCell = cols.showFavorite ? (favorite ? chalk.yellow('★ ') : '  ') : '';
+    // The same status word the flat listing shows, so a session that is `orphan`
+    // or `crashed` reads that way in the browser too — not only in its preview.
+    // Constant width whenever the column is on. `liveStatusCell` already pads its
+    // word to LIVE_STATUS_W but returns an EMPTY cell (width 0) for a row with no
+    // live match — blanks fill in for those, so the topic column does not jog on
+    // exactly the rows that are not running.
+    const status = cols.showStatus ? liveStatusCell(live) : { cell: '', width: 0 };
+    const statusW = cols.showStatus ? LIVE_STATUS_W : 0;
+    const statusCell = cols.showStatus ? (status.cell || ' '.repeat(LIVE_STATUS_W)) : '';
+    const topicW = Math.max(16, terminalWidth() - gutter - favW - statusW - (10 + 9 + 8 + 16) - machineColW - hostW - ticketW - wtW - sshW - team.width - stringWidth(when) - 1);
+    return (favCell +
+        // Truncated, not just padded: an indexed shortId is always 8 chars, but a
+        // live row with no session id is named by its pid or cloud task, which can
+        // run past the column and shunt every later column out of alignment.
+        chalk.white(padRight(truncate(s.shortId, 9), 10)) +
         agentColor(padRight(truncate(s.agent, 8), 9)) +
         chalk.yellow(padRight(truncate(versionStr, 7), 8)) +
         machineCell +
         hostCell +
         chalk.cyan(padRight(truncate(project, 14), 16)) +
+        statusCell +
         sshSeg +
         teamSeg +
         renderTopicCell(label, topic, query, topicW, topicW) +
@@ -2526,7 +2724,7 @@ function formatSearchMessage(options) {
  * search (a bare id must not surface every transcript that merely mentions it).
  * A genuine search phrase keeps the ranked metadata+content search.
  */
-export function resolveSessionQuery(pool, query) {
+export function resolveSessionQuery(pool, query, options = {}) {
     // Normalize ONCE here. isCompleteSessionId trims but resolveSessionById does
     // not, so a padded id ("<uuid> ", e.g. pasted from a terminal) would classify
     // as complete and then miss the id lookup — reporting a session that IS on
@@ -2546,7 +2744,8 @@ export function resolveSessionQuery(pool, query) {
         // id" — NOT fall back to fuzzy content search. A short id like "d3470b57"
         // otherwise surfaces every transcript that merely MENTIONS the string (a
         // resume prompt echoes the parent id into the body of many later sessions).
-        return { matches: findSessionsById(normalized), byId: true, completeId };
+        const matches = options.indexFallback === false ? [] : findSessionsById(normalized);
+        return { matches, byId: true, completeId };
     }
     return { matches: filterSessionsByQuery(pool, normalized), byId: false, completeId };
 }
@@ -2863,88 +3062,176 @@ function modeFlag(mode) {
         return '--json';
     return undefined; // summary — the peer's default render
 }
-/** Group a fleet sweep's rows to the DISTINCT machines that hold the id. Each
- * peer answered `sessions <id> --json --local`, which (post-fix) id-resolves and
- * so returns the matching row(s); a peer with a synced MIRROR of the same id can
- * emit more than one row, so we keep the first per machine. Rows the peer somehow
- * returned that do NOT match the id (defensive against version skew) are dropped
- * so a stray content hit can never masquerade as an exact resolution. */
-export function fleetHitsById(rows, id) {
-    const q = id.trim().toLowerCase();
-    const byMachine = new Map();
-    for (const s of rows) {
-        const machine = s.machine;
+/** Resolve a fleet sweep through the same canonical full-id / prefix resolver as
+ * local lookups, then group copies by logical session id. Synced mirrors of one
+ * session therefore stay one candidate even when several machines report them;
+ * distinct ids sharing a prefix remain distinct ambiguity candidates. */
+export function fleetCandidatesByQuery(rows, query) {
+    // An id selector must still be prefix-filtered defensively against older peers
+    // returning content mentioners. Keyword rows, however, were already matched by
+    // each peer's own FTS index; the parent does not own that transcript/index and
+    // must not re-run metadata-only filtering that could discard a content hit.
+    const matched = looksLikeSessionId(query)
+        ? resolveSessionQuery(rows, query, { indexFallback: false }).matches
+        : rows;
+    const byId = new Map();
+    for (const session of matched) {
+        const machine = session.machine;
         if (!machine)
             continue; // an untagged row can't be routed back to a peer
-        if (s.id?.toLowerCase() !== q)
-            continue; // exact id only — never a content hit
+        const logicalId = session.id.toLowerCase();
+        let byMachine = byId.get(logicalId);
+        if (!byMachine) {
+            byMachine = new Map();
+            byId.set(logicalId, byMachine);
+        }
         if (!byMachine.has(machine))
-            byMachine.set(machine, s);
+            byMachine.set(machine, session);
     }
-    return Array.from(byMachine.entries()).map(([machine, session]) => ({ machine, session }));
+    return Array.from(byId.values()).map(byMachine => {
+        const hits = Array.from(byMachine.entries()).map(([machine, session]) => ({ machine, session }));
+        return { id: hits[0].session.id, hits };
+    });
+}
+/** Resolve through the canonical metadata+content union used by keyword search. */
+function resolveIndexedMetadataRows(indexed, selector) {
+    return resolveSessionQuery(indexed, selector, { indexFallback: false }).matches;
+}
+/** Fixed peer argv for the metadata resolver. Scope flags compose identically on
+ * every host; `--all` removes the SSH login cwd/time window, not agent/project filters. */
+export function metadataResolveForwardedArgs(selector, scope) {
+    const args = ['sessions', '--resolve-safe-v1', selector, '--json', '--all', '--local'];
+    if (scope.agent)
+        args.push('--agent', scope.agent);
+    if (scope.project)
+        args.push('--project', scope.project);
+    return args;
+}
+/** Resolution must fail closed when any selected peer did not answer. Choosing
+ * from a partial fleet can turn an unseen candidate into a false unique match. */
+export function metadataResolveOutcome(localMatches, remote, selector) {
+    if (remote.unreachable.length > 0) {
+        return { kind: 'partial', failedPeers: remote.unreachable };
+    }
+    const candidates = fleetCandidatesByQuery([...localMatches, ...remote.sessions], selector);
+    if (candidates.length === 0)
+        return { kind: 'not-found' };
+    if (candidates.length > 1)
+        return { kind: 'ambiguous', candidates };
+    return { kind: 'resolved', session: candidates[0].hits[0].session };
+}
+/** Resolve one selector to indexed metadata across the fleet without reading or
+ * rendering transcript events. A peer answering the parent sweep returns every
+ * local candidate; the parent performs the one logical-session uniqueness gate. */
+async function resolveSessionMetadata(selector, scope, deps = { gatherRemoteList }) {
+    const localMachine = machineId();
+    const includeLocal = !scope.hosts?.length || shouldIncludeLocal(scope.hosts, localMachine);
+    const indexed = includeLocal ? applyScopeFilters(querySessions(), scope) : [];
+    const localMatches = resolveIndexedMetadataRows(indexed, selector)
+        .map(session => ({ ...session, machine: session.machine || localMachine }));
+    // A peer is already inside gatherRemoteList. Return all local candidates so
+    // the parent can distinguish a fleet-wide unique match from an ambiguity.
+    if (process.env[NO_FANOUT_ENV] === '1') {
+        process.stdout.write(serializeResolvedSessionsJson(localMatches));
+        return;
+    }
+    let remoteResult = { sessions: [], unreachable: [] };
+    if (scope.local !== true) {
+        try {
+            const forwarded = metadataResolveForwardedArgs(selector, scope);
+            const result = await deps.gatherRemoteList(forwarded, scope.hosts);
+            remoteResult = { sessions: result.sessions, unreachable: result.unreachable };
+        }
+        catch (error) {
+            remoteResult = { sessions: [], unreachable: [error?.message ?? 'fleet fan-out'] };
+        }
+    }
+    const outcome = metadataResolveOutcome(localMatches, remoteResult, selector);
+    if (outcome.kind === 'partial') {
+        console.error(chalk.red(`Partial session resolution: ${outcome.failedPeers.join(', ')} did not answer.`));
+        console.error(chalk.gray('No unique/no-match decision was made. Upgrade or reconnect every peer, then retry.'));
+        process.exit(2);
+    }
+    if (outcome.kind === 'not-found') {
+        console.error(chalk.red(`No session found matching: ${selector}`));
+        process.exit(1);
+    }
+    if (outcome.kind === 'ambiguous') {
+        console.error(chalk.red(`Multiple sessions match "${selector}" across the fleet:`));
+        for (const candidate of outcome.candidates) {
+            const session = candidate.hits[0].session;
+            const machines = candidate.hits.map(hit => hit.machine).join(', ');
+            console.error(chalk.cyan(`  ${session.shortId}  ${session.id}`) + chalk.gray(`  ${machines}  ${session.label ?? session.topic ?? ''}`));
+        }
+        console.error(chalk.gray(looksLikeSessionId(selector) ? 'Pass a longer ID to narrow it down.' : 'Narrow the keywords to one session.'));
+        process.exit(1);
+    }
+    process.stdout.write(serializeResolvedSessionsJson([outcome.session]));
 }
 /**
- * Locate a full session id across the online fleet and render it from the machine
+ * Locate a full session id or short id prefix across the online fleet and render it from the machine
  * that holds it. The local disk already missed; this fans `sessions <id> --json
  * --all` out to every registered online peer (or the explicit `hosts` set),
  * groups the rows to distinct machines, then:
  *
- *   - exactly one machine  → delegate rendering to that peer via `runOnPeer`
+ *   - exactly one logical session → delegate rendering to one peer via `runOnPeer`
  *     (its transcript and agent binary live there — a local `--host` hop would
  *     re-discover locally and dead-end), returning `'rendered'`.
- *   - more than one machine → print the conflict with machine labels so the user
- *     can disambiguate with `--device <host>`, returning `'conflict'`.
+ *   - more than one logical session → print every full-id candidate with its
+ *     machine labels, returning `'conflict'`.
  *   - none                 → `'not-found'`, letting the caller print the local
  *     "no session on this machine" message.
  *
- * No fuzzy/content fallback: the sweep forwards a UUID, each peer id-resolves it,
- * and `fleetHitsById` drops anything that isn't an exact id match.
+ * No fuzzy/content fallback: the sweep forwards the id selector and every result
+ * is resolved through `resolveSessionQuery`, the same id-only resolver used locally.
  */
-export async function resolveSessionAcrossFleet(id, mode, hosts, deps = { gatherRemoteList, runOnPeer }) {
+export async function resolveSessionAcrossFleet(query, mode, hosts, deps = { gatherRemoteList, runOnPeer }) {
     const spinner = isInteractiveTerminal() ? ora('Searching the fleet...').start() : null;
-    let hits;
+    let candidates;
     try {
         // Force whole-index scope (--all): the peer runs in its SSH-login home dir,
         // whose cwd would otherwise silently narrow the lookup and hide the row.
         // --json so each peer answers a parseable array; --local so it answers for
         // itself and never re-fans-out (belt-and-suspenders with the parent's
         // AGENTS_SESSIONS_LOCAL, which remote-list also sets on the peer).
-        const forwarded = ['sessions', id, '--json', '--all', '--local'];
+        const forwarded = ['sessions', query, '--json', '--all', '--local'];
         const { sessions } = await deps.gatherRemoteList(forwarded, hosts);
-        hits = fleetHitsById(sessions, id);
+        candidates = fleetCandidatesByQuery(sessions, query);
     }
     catch {
         // A fan-out failure is not an exact resolution — treat as not-found so the
         // caller prints the honest local message rather than a half-answer.
-        hits = [];
+        candidates = [];
     }
     finally {
         spinner?.stop();
     }
-    if (hits.length === 0)
+    if (candidates.length === 0)
         return 'not-found';
-    if (hits.length > 1) {
-        console.error(chalk.red(`Session ${id} exists on multiple machines:`));
-        for (const h of hits) {
-            const s = h.session;
+    if (candidates.length > 1) {
+        console.error(chalk.red(`Multiple sessions match "${query}" across the fleet:`));
+        for (const candidate of candidates) {
+            const s = candidate.hits[0].session;
             const label = s.label ?? s.topic ?? '';
-            console.error(chalk.cyan(`  ${h.machine}`) + chalk.gray(`  ${s.agent}${s.version ? ` ${s.version}` : ''}  ${label}`));
+            const machines = candidate.hits.map(hit => hit.machine).join(', ');
+            console.error(chalk.cyan(`  ${s.shortId}  ${s.id}`) + chalk.gray(`  ${machines}  ${s.agent}${s.version ? ` ${s.version}` : ''}  ${label}`));
         }
-        console.error(chalk.gray(`Pick one with: agents sessions ${id} --device <host>`));
+        console.error(chalk.gray('Pass a longer ID to narrow it down.'));
         return 'conflict';
     }
-    const { machine } = hits[0];
+    const candidate = candidates[0];
+    const { machine } = candidate.hits[0];
     // Render the remote summary by re-running `sessions <id>` ON the peer. --local
     // keeps that render on the peer (it owns the transcript); the mode flag matches
     // the mode the user asked for. No TTY: a summary/markdown/json render is a
     // one-shot capture, not an interactive resume.
-    const peerArgs = ['sessions', id, '--local'];
+    const peerArgs = ['sessions', candidate.id, '--local'];
     const flag = modeFlag(mode);
     if (flag)
         peerArgs.push(flag);
     const result = await deps.runOnPeer(peerArgs, machine);
     if (result === 'no-target') {
-        console.error(chalk.red(`Session ${id} is on ${machine}, but it is not a reachable registered device.`));
+        console.error(chalk.red(`Session ${candidate.id} is on ${machine}, but it is not a reachable registered device.`));
         console.error(chalk.gray('Register it with `agents devices` or run the command on that machine.'));
         return 'conflict'; // a definitive answer (found, un-renderable) — do NOT fall to the local not-found line
     }
@@ -2956,6 +3243,8 @@ export function registerSessionsCommands(program) {
         .command('sessions')
         .argument('[query]', 'Session ID, search query, or path (., ../, /path) to filter by project')
         .option('--query <text>', 'Search text — use when the term collides with a subcommand name (e.g. "go")')
+        .option('--resolve <selector>', 'Resolve one full ID, unique prefix, or keyword query to safe session metadata (requires --json; searches the fleet unless --local)')
+        .addOption(new Option('--resolve-safe-v1 <selector>').hideHelp())
         .description('Find, browse, and read agent conversation transcripts across Claude, Codex, Gemini, and OpenCode.')
         .option('-a, --agent <agent>', 'Filter by agent type and version (e.g., claude, codex@0.116.0)')
         .option('--claude', 'Shorthand for --agent claude')
@@ -2987,6 +3276,7 @@ export function registerSessionsCommands(program) {
         .option('--roots', 'With --json: emit the on-disk directories scanned for session transcripts, per agent (for external watchers)')
         .option('--local', 'Only this machine — skip the cross-machine SSH fan-out (default listing and --active)')
         .option('--waiting', 'With --active: show only sessions waiting on your input (exits non-zero if any)')
+        .option('--favorites', 'Show only favorited (starred) sessions — star them with `*` in the browser or `agents sessions favorite <id>`')
         .option('--tree', 'Group the listing by directory; drops the id/version columns for readability')
         .option('--flat', 'Plain flat table (one row per session) instead of the grouped project overview')
         .option('--no-live', 'Do not enrich the listing with live status/preview for running sessions')
@@ -3029,6 +3319,9 @@ export function registerSessionsCommands(program) {
       # Export for analysis
       agents sessions --since 30d --limit 200 --json > sessions.json
 
+      # Resolve one historical selector to metadata only, across the fleet
+      agents sessions --resolve d3470b57 --json
+
       # Search another machine's sessions live over SSH (no sync needed)
       agents sessions "auth bug" --last 3 --host yosemite-s1
 
@@ -3058,6 +3351,7 @@ export function registerSessionsCommands(program) {
     registerSessionsTailCommand(sessionsCmd);
     registerSessionsSyncCommand(sessionsCmd);
     registerSessionsResumeCommand(sessionsCmd);
+    registerSessionsFavoriteCommand(sessionsCmd);
     registerGoCommand(sessionsCmd);
     registerFocusCommand(sessionsCmd);
     registerDetachCommand(sessionsCmd);