@phnx-labs/agents-cli 1.22.41 → 1.22.43

package/dist/commands/sessions-picker.js

@@ -386,7 +386,7 @@ export function buildPreview(session) {
     const header = formatHeader(safe, events);
     const body = parseError
         ? '  ' + chalk.red(`Failed to parse session: ${parseError}`)
-        : formatCompactPreview(digest, safe);
+        : formatCompactPreview(digest, safe, events);
     const output = [header, '', body].filter(Boolean).join('\n');
     previewCache.set(cacheKey, output);
     return output;
@@ -398,8 +398,6 @@ const DOT = chalk.gray(' · ');
 function formatHeader(session, events) {
     const model = extractModel(events) || session.model;
     const { createdAgo, lastActiveAgo, duration } = extractTiming(session, events);
-    const totalMessages = session.messageCount ?? countMessages(events);
-    const totalTokens = session.tokenCount;
     // Line 1: Agent v version · shortId · model · account
     const line1 = [];
     line1.push(chalk.gray(`${displayAgent(session.agent)}${session.version ? ` v${session.version}` : ''}`));
@@ -429,18 +427,6 @@ function formatHeader(session, events) {
         line2.push(chalk.gray('last active ') + chalk.white(lastActiveAgo + ' ago'));
     if (duration)
         line2.push(chalk.gray('lasted ') + chalk.white(duration));
-    // Line 3: N msgs · T tokens · [label ·] uuid
-    const line3 = [];
-    if (totalMessages !== undefined) {
-        line3.push(chalk.bold.white(String(totalMessages)) + chalk.gray(` msg${totalMessages === 1 ? '' : 's'}`));
-    }
-    if (totalTokens !== undefined) {
-        line3.push(chalk.bold.white(formatTokens(totalTokens)) + chalk.gray(' tokens'));
-    }
-    if (session.filePath)
-        line3.push(chalk.gray(linkPath(session.filePath, session.id)));
-    else
-        line3.push(chalk.gray(session.id));
     // Line 4: ticket + PR — clickable when a URL is resolvable (OSC 8 hyperlink),
     // plain text otherwise. Only rendered when the session carries either.
     const line4 = [];
@@ -467,7 +453,6 @@ function formatHeader(session, events) {
         ...titleLines,
         line1.join(DOT),
         line2.join(DOT),
-        line3.join(DOT),
         ...(line4.length ? [line4.join(DOT)] : []),
     ].join('\n');
 }
@@ -512,24 +497,20 @@ export function formatTeamLineage(session) {
 }
 function formatMetaOnlyBody(session) {
     const lines = [];
+    const termWidth = process.stdout.columns || 80;
+    const valueWidth = termWidth - VERB_GUTTER - 5;
+    // Same verb-led rows as the digest body (RUSH-2757), from SessionMeta alone.
     if (session.topic) {
-        lines.push(chalk.cyan('Prompt: ') + chalk.white(truncate(session.topic.trim(), (process.stdout.columns || 80) - 12)));
-    }
-    const teamLine = formatTeamLineage(session);
-    if (teamLine) {
-        lines.push(chalk.cyan('Team:   ') + teamLine);
+        lines.push(verbLabel('Asked') + chalk.white(`"${truncate(session.topic.trim(), valueWidth)}"`));
     }
     const compact = formatTodoCompact(session.todos);
-    if (compact) {
-        lines.push(chalk.cyan('Todos: ') + chalk.white(compact));
+    const teamLine = formatTeamLineage(session);
+    const doing = [compact ? chalk.white(compact) : '', teamLine].filter(Boolean);
+    if (doing.length) {
+        lines.push(verbLabel('Doing') + doing.join(DOT));
     }
-    const termWidth = process.stdout.columns || 80;
     for (const l of session.todos?.items?.length ? renderTodos(session.todos.items, termWidth) : []) {
-        lines.push(l);
-    }
-    const dirs = session.recentDirectoriesTouched?.slice(0, DIRS_TOUCHED_MAX) ?? [];
-    if (dirs.length) {
-        lines.push(chalk.cyan('Dirs:   ') + chalk.white(dirs.join(chalk.gray(' · '))));
+        lines.push('  ' + l);
     }
     // `plan` is the whole ExitPlanMode markdown, not a path — summarize it. The
     // pane is height-clamped anyway, so pasting the blob would just push every
@@ -537,10 +518,24 @@ function formatMetaOnlyBody(session) {
     const planLines = session.plan?.trim() ? session.plan.trim().split('\n') : [];
     if (planLines.length) {
         const head = truncate(planLines[0].replace(/^#+\s*/, ''), termWidth - 20);
-        lines.push(chalk.cyan('Plan:   ') + chalk.white(head) + chalk.gray(` · ${planLines.length} lines`));
+        lines.push(verbLabel('Made') + chalk.white(head) + chalk.gray(` · plan, ${planLines.length} lines`));
     }
-    if (lines.length === 0)
-        return '';
+    const cost = [];
+    if (session.messageCount !== undefined) {
+        cost.push(chalk.white(String(session.messageCount)) + chalk.gray(` msg${session.messageCount === 1 ? '' : 's'}`));
+    }
+    if (session.tokenCount !== undefined) {
+        cost.push(chalk.white(formatTokens(session.tokenCount)) + chalk.gray(' tokens'));
+    }
+    if (cost.length) {
+        lines.push(verbLabel('Cost') + cost.join(DOT));
+    }
+    const dirs = session.recentDirectoriesTouched?.slice(0, DIRS_TOUCHED_MAX) ?? [];
+    const details = [
+        session.filePath ? chalk.gray(linkPath(session.filePath, session.id.slice(0, 8))) : chalk.gray(session.id.slice(0, 8)),
+        ...dirs.map(d => chalk.gray(d)),
+    ];
+    lines.push(verbLabel('Details ▸') + joinWidthCapped(details, valueWidth));
     return lines.map(l => '  ' + l).join('\n');
 }
 function extractModel(events) {
@@ -720,45 +715,42 @@ export function buildSessionPreviewDigest(events, session) {
         test: detectTestResult(events),
     };
 }
-function formatCompactPreview(digest, session) {
+// Verb-led row gutter (RUSH-2757): every row label pads to this width so the
+// values align into one scannable column. 'Details ▸' is the widest label.
+const VERB_GUTTER = 9;
+function verbLabel(v) {
+    return chalk.cyan(v.padEnd(VERB_GUTTER)) + ' ';
+}
+function formatCompactPreview(digest, session, events) {
     const { firstUser, lastAssistant, filesRead, toolCalls, planFile, todos, subAgentCount, toolTags, changes: chg, dirs, repos, artifacts, skills, plugins, hooks, links, errorCount, firstError, toolHistogram: hist, test, } = digest;
     const lines = [];
     const termWidth = process.stdout.columns || 80;
-    // Originating user prompt (first non-system user turn).
-    if (firstUser) {
-        const first = extractSessionTopic(firstUser) || cleanSessionPrompt(firstUser).split('\n').find(l => l.trim()) || '';
-        if (first) {
-            lines.push(chalk.cyan('Prompt: ') + chalk.white(truncate(first.trim(), termWidth - 12)));
-        }
+    const valueWidth = termWidth - VERB_GUTTER - 5;
+    // Asked — the originating user prompt (first non-system user turn), quoted.
+    const asked = firstUser
+        ? (extractSessionTopic(firstUser) || cleanSessionPrompt(firstUser).split('\n').find(l => l.trim()) || '')
+        : (session.topic && !isSyntheticUserMessage(session.topic) ? session.topic : '');
+    if (asked.trim()) {
+        lines.push(verbLabel('Asked') + chalk.white(`"${truncate(asked.trim(), valueWidth)}"`));
     }
-    else if (session.topic && !isSyntheticUserMessage(session.topic)) {
-        lines.push(chalk.cyan('Prompt: ') + chalk.white(truncate(session.topic.trim(), termWidth - 12)));
-    }
-    // Compact checklist: ✓done/total · current step (RUSH-2045).
+    // Doing — the work in motion: checklist progress (RUSH-2045), team lineage,
+    // sub-agent fan-out. The full checklist renders indented beneath.
     const compact = formatTodoCompact(todos);
-    if (compact) {
-        lines.push(chalk.cyan('Todos: ') + chalk.white(compact));
-    }
-    const todosRendered = todos?.items?.length ? renderTodos(todos.items, termWidth) : [];
-    if (todosRendered.length > 0) {
-        for (const l of todosRendered)
-            lines.push('  ' + l);
-    }
-    // Recent activity = directories touched (not raw tool calls). Prefer a
-    // parser-supplied dirsTouched when present; else derive from event paths.
-    // Width-capped: a long Dirs line used to wrap and swamp the whole pane.
-    if (dirs.length) {
-        lines.push(chalk.cyan('Dirs:    ') + joinWidthCapped(dirs, termWidth - 12));
-    }
-    // Repos worked in (basename of each `.git` root under the touched paths).
-    if (repos.length) {
-        lines.push(chalk.cyan('Repos:   ') + chalk.white(repos.slice(0, 4).join(chalk.gray(' · '))));
-    }
     const teamLine = formatTeamLineage(session);
-    if (teamLine) {
-        lines.push(chalk.cyan('Team:    ') + teamLine);
+    const doing = [
+        compact ? chalk.white(compact) : '',
+        teamLine,
+        subAgentCount ? chalk.gray(`${subAgentCount} sub-agent${subAgentCount === 1 ? '' : 's'}`) : '',
+    ].filter(Boolean);
+    if (doing.length) {
+        lines.push(verbLabel('Doing') + doing.join(DOT));
     }
-    const activity = [];
+    const todosRendered = todos?.items?.length ? renderTodos(todos.items, termWidth) : [];
+    for (const l of todosRendered)
+        lines.push('  ' + l);
+    // Made — what the session produced: file deltas, reads, artifacts (named +
+    // clickable), the plan file, and the PR when the session carries one.
+    const made = [];
     const changed = chg.created + chg.modified + chg.deleted;
     if (changed) {
         const parts = [
@@ -766,71 +758,61 @@ function formatCompactPreview(digest, session) {
             chg.modified ? chalk.yellow(`~${chg.modified}`) : '',
             chg.deleted ? chalk.red(`−${chg.deleted}`) : '',
         ].filter(Boolean).join(' ');
-        activity.push(`${parts} ${chalk.gray('changed')}`);
+        made.push(`${parts} ${chalk.gray('changed')}`);
     }
     if (filesRead)
-        activity.push(chalk.gray(`${filesRead} read`));
-    if (toolCalls)
-        activity.push(chalk.gray(`${toolCalls} tool${toolCalls === 1 ? '' : 's'}`));
-    if (activity.length) {
-        lines.push(chalk.cyan('Changes:  ') + activity.join(chalk.gray(' · ')));
-    }
-    // Documents the session produced (`.agents/artifacts|plans|reports`, other
-    // *.md/*.html creations) — the files a human browses later, named + clickable.
+        made.push(chalk.gray(`${filesRead} read`));
     if (artifacts.length) {
-        const shown = artifacts.slice(0, 5).map(a => linkPath(a.path, a.basename));
-        const more = artifacts.length > 5 ? chalk.gray(` · +${artifacts.length - 5} more`) : '';
-        lines.push(chalk.cyan('Artifacts: ') + shown.join(chalk.gray(' · ')) + more);
-    }
-    // Skills invoked (plugin skills included — they ride the same Skill tool).
-    if (skills.length) {
-        const shown = skills.slice(0, 5).map(s => chalk.white(s.name) + (s.count > 1 ? chalk.gray(` ×${s.count}`) : ''));
-        const more = skills.length > 5 ? chalk.gray(` · +${skills.length - 5} more`) : '';
-        lines.push(chalk.cyan('Skills:  ') + shown.join(chalk.gray(' · ')) + more);
+        const shown = artifacts.slice(0, 2).map(a => linkPath(a.path, a.basename));
+        const more = artifacts.length > 2 ? chalk.gray(` +${artifacts.length - 2}`) : '';
+        made.push(shown.join(chalk.gray(' · ')) + more);
     }
-    if (plugins.length) {
-        lines.push(chalk.cyan('Plugins: ') + chalk.white(plugins.slice(0, 5).join(chalk.gray(' · '))));
+    if (planFile) {
+        made.push(chalk.white(linkPath(planFile, planFile.split('/').pop() || planFile)));
     }
-    // Hooks fired (Claude transcripts record firings; other harnesses don't).
-    if (hooks.length) {
-        const shown = hooks.slice(0, 4).map(h => chalk.white(h.name) + (h.count > 1 ? chalk.gray(` ×${h.count}`) : '') + (h.failed ? chalk.red(` (${h.failed} failed)`) : ''));
-        const more = hooks.length > 4 ? chalk.gray(` · +${hooks.length - 4} more`) : '';
-        lines.push(chalk.cyan('Hooks:   ') + shown.join(chalk.gray(' · ')) + more);
+    if (session.prUrl) {
+        made.push(chalk.blue(linkUrl(session.prUrl, session.prNumber ? `PR#${session.prNumber}` : 'PR')));
     }
-    // Links mentioned in the conversation — clickable (OSC 8), tracker-classified.
-    if (links.length) {
-        const shown = links.slice(0, 5).map(l => chalk.blue(linkUrl(l.url, l.label)));
-        const more = links.length > 5 ? chalk.gray(` · +${links.length - 5} more`) : '';
-        lines.push(chalk.cyan('Links:   ') + shown.join(chalk.gray(' · ')) + more);
+    if (made.length) {
+        lines.push(verbLabel('Made') + made.join(DOT));
     }
-    // Error tally, mirroring the full summary's Errors section in one line.
+    // Health — error tally + the last test/build verdict; absent when both clean.
+    const health = [];
     if (errorCount) {
-        lines.push(chalk.cyan('Errors:  ') + chalk.red(`${errorCount} failure${errorCount === 1 ? '' : 's'}`) + chalk.gray(` — first: ${firstError || 'unknown'}`));
-    }
-    const metadata = [
-        ...toolTags,
-        subAgentCount ? `${subAgentCount} sub-agent${subAgentCount === 1 ? '' : 's'}` : '',
-    ].filter(Boolean);
-    if (metadata.length) {
-        lines.push(chalk.cyan('Meta:     ') + chalk.gray(metadata.join(' · ')));
-    }
-    // Tool mix (top 4) — what kind of work this was.
-    if (hist.length) {
-        lines.push(chalk.cyan('Tools:    ') + chalk.gray(hist.map(h => `${h.tool} ${h.count}`).join(' · ')));
+        health.push(chalk.red(`${errorCount} failure${errorCount === 1 ? '' : 's'}`) + chalk.gray(` — first: ${firstError || 'unknown'}`));
     }
-    // Last test/build verdict.
     if (test?.ok) {
         const bits = [
             test.passed !== undefined ? chalk.green(`${test.passed} pass`) : '',
             test.failed ? chalk.red(`${test.failed} fail`) : '',
         ].filter(Boolean).join(chalk.gray(' · '));
         const mark = test.failed ? chalk.red('✗') : chalk.green('✓');
-        lines.push(chalk.cyan('Tests:    ') + `${mark} ${test.runner}${bits ? ' ' + bits : ''}`);
+        health.push(`${mark} ${test.runner}${bits ? ' ' + bits : ''}`);
     }
-    if (planFile) {
-        const basename = planFile.split('/').pop() || planFile;
-        lines.push(chalk.cyan('Plan: ') + chalk.white(linkPath(planFile, basename)));
+    if (health.length) {
+        lines.push(verbLabel('Health') + health.join(DOT));
+    }
+    // Cost — volume: messages, tokens (moved here from the header's old line 3),
+    // and the top of the tool mix.
+    const totalMessages = session.messageCount ?? (events ? countMessages(events) : undefined);
+    const cost = [];
+    if (totalMessages !== undefined) {
+        cost.push(chalk.white(String(totalMessages)) + chalk.gray(` msg${totalMessages === 1 ? '' : 's'}`));
+    }
+    if (session.tokenCount !== undefined) {
+        cost.push(chalk.white(formatTokens(session.tokenCount)) + chalk.gray(' tokens'));
+    }
+    if (hist.length) {
+        cost.push(chalk.gray(hist.map(h => `${h.tool} ${h.count}`).join(' · ')));
     }
+    else if (toolCalls) {
+        cost.push(chalk.gray(`${toolCalls} tool${toolCalls === 1 ? '' : 's'}`));
+    }
+    if (cost.length) {
+        lines.push(verbLabel('Cost') + cost.join(DOT));
+    }
+    // Latest — the agent's last message, full and wrapped to the pane (the densest
+    // line in the preview; parts 1-2 of RUSH-2757 made it wrap instead of clip).
     if (lastAssistant) {
         const maxLines = todosRendered.length > 0 || compact ? LAST_RESPONSE_MAX_LINES_WITH_TODOS : LAST_RESPONSE_MAX_LINES;
         // Content sits at column 4 (outer body indent + the '  ' prefix below), so
@@ -838,14 +820,28 @@ function formatCompactPreview(digest, session) {
         const rendered = renderLastResponse(lastAssistant, maxLines, terminalWidth() - 4);
         if (rendered.length > 0) {
             lines.push('');
-            lines.push(chalk.cyan('Last response:'));
+            lines.push(chalk.cyan('Latest'));
             for (const l of rendered)
                 lines.push('  ' + l);
         }
     }
-    if (lines.length === 0) {
-        lines.push(chalk.gray('No activity recorded in this session.'));
-    }
+    // Details ▸ — the folded long tail: session id, skills, plugins, hooks, links,
+    // dirs, repos, capability tags. One width-capped line instead of seven labeled
+    // rows (a long tail used to wrap and swamp the whole pane); links stay
+    // clickable (OSC 8), hook failures stay red. Full lists go to the cap — it is
+    // the ONLY bounding, so its `… +N more` tail accounts for every hidden item
+    // (pre-slicing here made overflow vanish with no trace).
+    const details = [
+        session.filePath ? chalk.gray(linkPath(session.filePath, session.id.slice(0, 8))) : chalk.gray(session.id.slice(0, 8)),
+        ...skills.map(s => chalk.white(s.name) + (s.count > 1 ? chalk.gray(` ×${s.count}`) : '')),
+        ...plugins.map(p => chalk.white(p)),
+        ...hooks.map(h => chalk.white(h.name) + (h.failed ? chalk.red(` (${h.failed} failed)`) : '')),
+        ...links.map(l => chalk.blue(linkUrl(l.url, l.label))),
+        ...dirs.map(d => chalk.gray(d)),
+        ...repos.map(r => chalk.gray(r)),
+        ...toolTags.map(t => chalk.gray(t)),
+    ];
+    lines.push(verbLabel('Details ▸') + joinWidthCapped(details, valueWidth));
     return lines.map(l => '  ' + l).join('\n');
 }
 function classifySessionTool(tool, command) {
@@ -928,20 +924,26 @@ const SLUG_WORKTREE_RE = /--agents-worktrees-(.+)$/;
  * Join display tokens with ` · `, stopping before the line exceeds `maxWidth`
  * and appending `… +N more` for the rest. Keeps the Dirs line on one row.
  */
+/**
+ * Join pre-styled items with ` · ` up to a visible width, then `… +N more`.
+ * Width is measured ANSI-aware (stringWidth), so colored / OSC 8-linked items
+ * are not miscounted; items arrive already styled and are not recolored.
+ */
 function joinWidthCapped(items, maxWidth) {
-    const sep = ' · ';
     let out = '';
+    let width = 0;
     let shown = 0;
     for (const item of items) {
-        const next = shown === 0 ? item : out + sep + item;
-        if (shown > 0 && next.length > maxWidth)
+        const itemWidth = stringWidth(item);
+        const nextWidth = shown === 0 ? itemWidth : width + 3 + itemWidth;
+        if (shown > 0 && nextWidth > maxWidth)
             break;
-        out = next;
+        out = shown === 0 ? item : out + DOT + item;
+        width = nextWidth;
         shown++;
     }
     const remaining = items.length - shown;
-    const suffix = remaining > 0 ? ` … +${remaining} more` : '';
-    return chalk.white(out) + (suffix ? chalk.gray(suffix) : '');
+    return out + (remaining > 0 ? chalk.gray(` … +${remaining} more`) : '');
 }
 /** Relativize a file path to its parent dir, short enough for one preview line. */
 export function relativizeDir(filePath, cwd) {

package/dist/commands/setup-browser.js

@@ -10,7 +10,7 @@
 import chalk from 'chalk';
 import { setConfigValue } from '../lib/device-config.js';
 import { findFirstInstalledBrowser, listInstalledBrowsers } from '../lib/browser/chrome.js';
-import { DEFAULT_BROWSER_PROFILE_NAME, createProfile, findFreeProfilePort, getConfiguredDefaultProfileName, getProfile, } from '../lib/browser/profiles.js';
+import { DEFAULT_BROWSER_PROFILE_NAME, getAutoDetectedProfile, createProfile, findFreeProfilePort, getConfiguredDefaultProfileName, } from '../lib/browser/profiles.js';
 import { DEFAULT_VIEWPORT } from '../lib/browser/devices.js';
 import { isInteractiveTerminal, isPromptCancelled } from './utils.js';
 import { defaultBrowserChoice } from './setup-preferences.js';
@@ -29,9 +29,9 @@ export async function runBrowserWizard() {
             console.error(chalk.red('No supported browser found.\n') + chalk.dim(INSTALL_HINT));
             return false;
         }
-        const existing = await getProfile(DEFAULT_BROWSER_PROFILE_NAME);
+        const existing = await getAutoDetectedProfile();
         if (existing) {
-            console.log(chalk.dim(`Browser profile "${DEFAULT_BROWSER_PROFILE_NAME}" already exists.`));
+            console.log(chalk.dim(`Browser profile "${existing.name}" already exists.`));
             return true;
         }
         const created = await createAutoDefault();
@@ -46,7 +46,7 @@ export async function runBrowserWizard() {
     }
     const { confirm, select } = await import('@inquirer/prompts');
     // If a default profile already exists, this is a reconfigure.
-    const existing = await getProfile(DEFAULT_BROWSER_PROFILE_NAME);
+    const existing = await getAutoDetectedProfile();
     if (existing) {
         console.log(chalk.dim(`Browser profile "${existing.name}" already exists (${existing.browser}${existing.binary ? ` · ${existing.binary}` : ''}).`));
         const change = await confirm({ message: 'Re-create it (e.g. to pin a different browser)?', default: false });

package/dist/commands/setup-mine.js

@@ -11,7 +11,7 @@
 import chalk from 'chalk';
 import { initBrand, registerMineManageCommands } from './mine.js';
 import { validateBrandName, getBrandConfig } from '../lib/brand.js';
-import { isShimsInPath } from '../lib/shims.js';
+import { isShimsInPath } from '../lib/installations/shims.js';
 import { isInteractiveTerminal, isPromptCancelled } from './utils.js';
 /**
  * Optional/heavier top-level commands a brand commonly turns off. Kept short so

package/dist/commands/setup-preferences.js

@@ -14,7 +14,7 @@
  */
 import chalk from 'chalk';
 import { listInstalledBrowsers } from '../lib/browser/chrome.js';
-import { DEFAULT_BROWSER_PROFILE_NAME, createProfile, findFreeProfilePort, getConfiguredDefaultProfileName, getProfile, } from '../lib/browser/profiles.js';
+import { DEFAULT_BROWSER_PROFILE_NAME, getAutoDetectedProfile, createProfile, findFreeProfilePort, getConfiguredDefaultProfileName, } from '../lib/browser/profiles.js';
 import { DEFAULT_VIEWPORT } from '../lib/browser/devices.js';
 import { getConfigValue, setConfigValue } from '../lib/device-config.js';
 import { loadDevices } from '../lib/devices/registry.js';
@@ -88,7 +88,7 @@ export async function maybePickBrowserProfile() {
         return false;
     if (getConfiguredDefaultProfileName())
         return false;
-    if (await getProfile(DEFAULT_BROWSER_PROFILE_NAME))
+    if (await getAutoDetectedProfile())
         return false;
     const installed = listInstalledBrowsers();
     if (installed.length === 0)

package/dist/commands/setup.js

@@ -16,7 +16,7 @@ import { isGitRepo, cloneIntoExisting, pullRepo } from '../lib/git.js';
 import { isPromptCancelled, isInteractiveTerminal } from './utils.js';
 import { AGENTS, agentConfigDirName, getUnmanagedAgentInstalls, countSessionFiles, agentLabel } from '../lib/agents.js';
 import { setGlobalDefault } from '../lib/installations/versions.js';
-import { ensureShimCurrent, switchHomeFileSymlinks, isShimsInPath, addShimsToPath, getPathSetupInstructions, assertIsolationBoundary } from '../lib/shims.js';
+import { ensureShimCurrent, switchHomeFileSymlinks, isShimsInPath, addShimsToPath, getPathSetupInstructions, assertIsolationBoundary } from '../lib/installations/shims.js';
 import { setHelpSections } from '../lib/help.js';
 import { registerSetupBrowserCommand, runBrowserWizard } from './setup-browser.js';
 import { registerSetupComputerCommand, runComputerWizard } from './setup-computer.js';
@@ -25,8 +25,9 @@ import { registerSetupMineCommand } from './setup-mine.js';
 import { registerSetupSecretsCommand } from './setup-secrets.js';
 import { registerSetupFleetCommand } from './setup-fleet.js';
 import { registerSetupWatchdogCommand, runWatchdogSetupWizard } from './setup-watchdog.js';
+import { registerAliasCommand } from './alias.js';
 import { runPreferencesStep } from './setup-preferences.js';
-import { getConfiguredDefaultProfileName, getProfile, isProfileLaunchableHere, DEFAULT_BROWSER_PROFILE_NAME } from '../lib/browser/profiles.js';
+import { getConfiguredDefaultProfileName, getProfile, getAutoDetectedProfile, isProfileLaunchableHere } from '../lib/browser/profiles.js';
 import { listInstalledBrowsers } from '../lib/browser/chrome.js';
 import { probeComputerTrust } from './computer.js';
 import { readShareConfig } from '../lib/share/config.js';
@@ -265,7 +266,9 @@ export async function ensureInitialized(program) {
 }
 export async function getSetupStatus() {
     const configuredBrowserProfile = getConfiguredDefaultProfileName();
-    const browserProfile = await getProfile(configuredBrowserProfile ?? DEFAULT_BROWSER_PROFILE_NAME);
+    const browserProfile = configuredBrowserProfile
+        ? await getProfile(configuredBrowserProfile)
+        : await getAutoDetectedProfile();
     const browserReady = browserProfile !== null && isProfileLaunchableHere(browserProfile);
     const installedBrowsers = listInstalledBrowsers();
     const computerState = process.platform === 'darwin' ? (await probeComputerTrust() ? 'ready' : 'missing') : 'n/a';
@@ -360,7 +363,7 @@ export function registerSetupCommand(program) {
         .description('Set up agents-cli, or re-open the capability onboarding hub.')
         .option('-f, --force', 'Re-run setup even if ~/.agents/.system/ already exists (use with caution)')
         .option('--no-system-repo', 'Skip cloning the system repo (you must populate ~/.agents/.system/ yourself)');
-    // Capability subcommands: `agents setup browser|computer|mine|secrets|fleet`.
+    // Capability subcommands: `agents setup browser|computer|mine|secrets|fleet|alias`.
     // Share/artifact publishing is set up by `agents artifacts setup` (RUSH-2580);
     // the hub below still offers it as a phase via runShareWizard.
     registerSetupBrowserCommand(setupCmd);
@@ -369,6 +372,7 @@ export function registerSetupCommand(program) {
     registerSetupSecretsCommand(setupCmd);
     registerSetupFleetCommand(setupCmd);
     registerSetupWatchdogCommand(setupCmd);
+    registerAliasCommand(setupCmd);
     setupCmd.command('status')
         .description('Show setup readiness for core, browser, computer, secrets, fleet, share, watchdog, and preferences.')
         .option('--json', 'print machine-readable JSON')
@@ -395,6 +399,7 @@ export function registerSetupCommand(program) {
       agents setup secrets
       agents setup fleet
       agents setup watchdog
+      agents setup alias add teams
     `,
         notes: `
       What it does:
@@ -410,6 +415,7 @@ export function registerSetupCommand(program) {
         agents setup secrets     # choose secrets backend/policy defaults + import
         agents setup fleet       # discover Tailscale devices + configure SSH access
         agents setup watchdog    # choose which devices run the daemon watchdog pass
+        agents setup alias add teams  # PATH shorthand: teams runs agents teams
 
       To install CLIs from agents.yaml and sync resources into version homes:
         agents sync --local -y

package/dist/commands/snapshot.d.ts

@@ -2,7 +2,7 @@
  * `agents devices snapshot` — one-process consumer snapshot for pollers.
  *
  * Replaces the N× `view --json` + `sessions --active --json` (+ optional feed)
- * fork storm with a single command. Does NOT replace `agents status`, which
+ * fork storm with a single command. Does NOT replace `agents sync status`, which
  * remains the UnifiedSyncStatus sync contract for menubar / Agency drift.
  *
  * JSON shape: {@link FleetSnapshot} in `lib/snapshot.ts` (version: 1).

package/dist/commands/snapshot.js

@@ -2,7 +2,7 @@
  * `agents devices snapshot` — one-process consumer snapshot for pollers.
  *
  * Replaces the N× `view --json` + `sessions --active --json` (+ optional feed)
- * fork storm with a single command. Does NOT replace `agents status`, which
+ * fork storm with a single command. Does NOT replace `agents sync status`, which
  * remains the UnifiedSyncStatus sync contract for menubar / Agency drift.
  *
  * JSON shape: {@link FleetSnapshot} in `lib/snapshot.ts` (version: 1).
@@ -60,16 +60,16 @@ function renderHuman(snap) {
         console.log(`  ${'Sync'.padEnd(12)} ${sys} · ${need} version${need === 1 ? '' : 's'} need sync`);
     }
     console.log(chalk.gray('\n  Machine-readable: agents devices snapshot --json\n' +
-        '  Sync-only (unchanged): agents status --json'));
+        '  Sync-only (unchanged): agents sync status --json'));
 }
 export function registerSnapshotCommand(devicesCmd) {
     const cmd = addHostOption(devicesCmd
         .command('snapshot')
-        .description('One-process poll snapshot: install inventory + active sessions (optional feed/sync). Not the sync-status command — use `agents status` for drift.'))
+        .description('One-process poll snapshot: install inventory + active sessions (optional feed/sync). Not the sync-status command — use `agents sync status` for drift.'))
         .option('--json', 'Emit the machine-readable FleetSnapshot contract (version 1)')
         .option('--all-hosts', 'Include remote devices in the sessions gather (same fan-out as `sessions --active`; default is this machine only)')
         .option('--with-feed', 'Include open feed-block summary (needs-you count + compact rows)')
-        .option('--with-sync', 'Include UnifiedSyncStatus (same engine as `agents status`; opt-in)')
+        .option('--with-sync', 'Include UnifiedSyncStatus (same engine as `agents sync status`; opt-in)')
         .option('--agent <name>', 'Restrict inventory to one agent (e.g. claude)');
     setHelpSections(cmd, {
         examples: `

package/dist/commands/status.d.ts

@@ -1,6 +1,7 @@
 /**
- * `agents status` — the unified sync-status surface.
+ * `agents sync status` — the unified sync-status surface.
  *
+ * Nested under `sync` because this is sync drift, not a separate noun (RUSH-2864).
  * One command that answers "is my fleet in sync?" the same way every other
  * surface does, because it reads the same engine (computeSyncStatus). Human mode
  * renders the summary and, when a TTY finds drift, offers the interactive
@@ -9,4 +10,5 @@
  * prompts (the "kick it" path, safe in scripts).
  */
 import { Command } from 'commander';
-export declare function registerStatusCommand(program: Command): void;
+/** Attach `status` under the `sync` group. The former top-level `agents status` is retired. */
+export declare function registerStatusCommand(syncCmd: Command): void;

package/dist/commands/status.js

@@ -1,6 +1,7 @@
 /**
- * `agents status` — the unified sync-status surface.
+ * `agents sync status` — the unified sync-status surface.
  *
+ * Nested under `sync` because this is sync drift, not a separate noun (RUSH-2864).
  * One command that answers "is my fleet in sync?" the same way every other
  * surface does, because it reads the same engine (computeSyncStatus). Human mode
  * renders the summary and, when a TTY finds drift, offers the interactive
@@ -11,6 +12,7 @@
 import chalk from 'chalk';
 import { AGENTS } from '../lib/agents.js';
 import { setHelpSections } from '../lib/help.js';
+import { addHostOption } from '../lib/hosts/option.js';
 import { computeSyncStatus } from '../lib/sync-status.js';
 import { promptDriftSync } from '../lib/drift-sync.js';
 import { resolveConfiguredModel } from '../lib/models.js';
@@ -29,23 +31,24 @@ function versionSummary(v) {
     }
     return chalk.green('in sync');
 }
-export function registerStatusCommand(program) {
-    const cmd = program
+/** Attach `status` under the `sync` group. The former top-level `agents status` is retired. */
+export function registerStatusCommand(syncCmd) {
+    const cmd = addHostOption(syncCmd
         .command('status')
-        .description('Unified sync status across the fleet — what is drifted, missing, or behind, with an option to sync it.')
+        .description('Unified sync status across the fleet — what is drifted, missing, or behind, with an option to sync it.'))
         .option('--json', 'Output the machine-readable UnifiedSyncStatus contract')
         .option('--yes', 'Reconcile everything detected (pull .system if behind + sync drifted/missing resources) without prompting')
         .option('--cwd <path>', 'Resolution cwd for project layer detection (default: process.cwd())');
     setHelpSections(cmd, {
         examples: `
       # Show what's out of sync; offer to fix it (interactive)
-      agents status
+      agents sync status
 
       # Machine-readable status for the menu-bar / Agency
-      agents status --json
+      agents sync status --json
 
       # Reconcile everything with no prompts (CI / scripts / the "kick it" path)
-      agents status --yes
+      agents sync status --yes
     `,
     });
     cmd.action(async (opts, command) => {

package/dist/commands/sync.d.ts

@@ -3,6 +3,7 @@
  *
  * Forms:
  *   agents sync                                         # umbrella: fetch config repos -> reconcile all (secrets opt-in)
+ *   agents sync status                                  # report fleet drift (former top-level `agents status`)
  *   agents sync --repos|--secrets                       # umbrella: fetch only those, then reconcile
  *   agents sync --cloud                                 # umbrella: fetch all, skip reconcile
  *   agents sync --local                                 # umbrella: reconcile all, no fetch