@phnx-labs/agents-cli 1.22.42 → 1.22.43

package/dist/lib/secrets/list-filter.js

@@ -21,7 +21,7 @@ import { parseCommaSeparatedList } from '../format.js';
 // From the leaf module, NOT discover.js — the latter imports `../sqlite.js`, so
 // reaching through it for one parser would pull node:sqlite into every `agents
 // secrets` invocation and print Node's SQLite ExperimentalWarning on stderr.
-import { parseTimeFilter } from '../session/relative-time.js';
+import { parseTimeFilter } from '../text/relative-time.js';
 import { describeBundle, bundlePolicy, SECRET_TYPES, } from './bundles.js';
 /** Ref kinds a var's value can have, from `describeBundle`. */
 export const REF_KINDS = ['literal', 'keychain', 'env', 'file', 'exec'];

package/dist/lib/service-manifest.d.ts

@@ -27,3 +27,23 @@ export declare function serviceManifestHomeEnv(): {
     HOME: string;
     AGENTS_REAL_HOME: string;
 };
+/**
+ * Whether this process may safely register (or tear down) a service with the
+ * user's real service manager.
+ *
+ * `launchctl` and `systemctl --user` are per-user-session and HOME-independent:
+ * a process running under a redirected HOME still talks to the SAME launchd or
+ * systemd instance as a normal login session. service-manifest.ts namespaces the
+ * job label under a redirected HOME, but that only changes the identifier — the
+ * registration still lands in the real service manager. A hermetic test fork (or
+ * any CLI running under a sandbox HOME) must therefore never touch launchd/
+ * systemd unless it has explicitly opted in.
+ *
+ * `AGENTS_SERVICE_MANAGER_ALLOW_REDIRECTED_HOME=1` is the test seam for the
+ * shim/PATH-based tests that intentionally exercise the registration code path
+ * under a redirected HOME. Production code must never set it.
+ */
+export declare function serviceManagerRegistrationAllowed(): {
+    allowed: boolean;
+    reason: string;
+};

package/dist/lib/service-manifest.js

@@ -78,3 +78,37 @@ export function serviceManifestHomeEnv() {
     const home = process.env.HOME || os.homedir();
     return { HOME: home, AGENTS_REAL_HOME: process.env.AGENTS_REAL_HOME || home };
 }
+/**
+ * Whether this process may safely register (or tear down) a service with the
+ * user's real service manager.
+ *
+ * `launchctl` and `systemctl --user` are per-user-session and HOME-independent:
+ * a process running under a redirected HOME still talks to the SAME launchd or
+ * systemd instance as a normal login session. service-manifest.ts namespaces the
+ * job label under a redirected HOME, but that only changes the identifier — the
+ * registration still lands in the real service manager. A hermetic test fork (or
+ * any CLI running under a sandbox HOME) must therefore never touch launchd/
+ * systemd unless it has explicitly opted in.
+ *
+ * `AGENTS_SERVICE_MANAGER_ALLOW_REDIRECTED_HOME=1` is the test seam for the
+ * shim/PATH-based tests that intentionally exercise the registration code path
+ * under a redirected HOME. Production code must never set it.
+ */
+export function serviceManagerRegistrationAllowed() {
+    const suffix = isolatedHomeSuffix();
+    if (!suffix) {
+        return { allowed: true, reason: 'production HOME: service-manager registration allowed' };
+    }
+    if (process.env.AGENTS_SERVICE_MANAGER_ALLOW_REDIRECTED_HOME === '1') {
+        return {
+            allowed: true,
+            reason: `test seam AGENTS_SERVICE_MANAGER_ALLOW_REDIRECTED_HOME allows registration under sandbox-${suffix}`,
+        };
+    }
+    return {
+        allowed: false,
+        reason: `refusing service-manager registration under redirected HOME (sandbox-${suffix}): ` +
+            `launchctl/systemd are per-user-session and HOME-independent, so a sandboxed process ` +
+            `would register in the real service manager (RUSH-2968)`,
+    };
+}

package/dist/lib/session/cloud.js

@@ -13,7 +13,7 @@ import * as fs from 'fs';
 import * as path from 'path';
 import * as os from 'os';
 import * as yaml from 'yaml';
-import { deriveShortId } from './short-id.js';
+import { deriveShortId } from '../text/short-id.js';
 import { getCacheDir } from '../state.js';
 const PROXY_BASE = process.env.RUSH_PROXY_BASE ?? 'https://api.prix.dev';
 const USER_YAML = path.join(os.homedir(), '.rush', 'user.yaml');

package/dist/lib/session/db.js

@@ -13,7 +13,7 @@ import { parseSession, sessionFilePathContainer } from './parse.js';
 import { extractRecentDirectoriesTouched, extractTodoProgressFromEvents } from './state.js';
 import { getSessionsDir, getSessionsDbPath } from '../state.js';
 import { query as queryEvents, queryToolUsageForSessions } from '../feed/events.js';
-import { machineForSessionFile } from './origin-machine.js';
+import { machineForSessionFile } from '../origin-machine.js';
 import { loadSessionActorIndex, readSessionActorRecord } from './actor-sidecar.js';
 import { toolCallsFromEvents } from './tool-calls.js';
 import { persistToolCalls, toolEvidenceSourcePath } from './tool-store.js';

package/dist/lib/session/fork.js

@@ -19,7 +19,7 @@ import * as fs from 'fs';
 import * as path from 'path';
 import { upsertSession } from './db.js';
 import { recordRunName } from './run-names.js';
-import { deriveShortId } from './short-id.js';
+import { deriveShortId } from '../text/short-id.js';
 /** Agents that `fork` can branch today (see the module doc for why). */
 export const FORKABLE_AGENTS = ['claude'];
 /** Whether a session's agent can be forked by {@link forkSession}. */

package/dist/lib/session/live-metadata.js

@@ -16,7 +16,7 @@
 // state the live registry already computed. When the transcript IS on disk, the
 // synthesized row carries its path, so the downstream `buildPreview` renders the
 // real digest; otherwise it renders the header + a "not indexed here" note.
-import { deriveShortId } from './short-id.js';
+import { deriveShortId } from '../text/short-id.js';
 import { isSessionTrackedAgent } from './types.js';
 /**
  * Reshape one live `ActiveSession` into a `SessionMeta` candidate for the id

package/dist/lib/session/origin-machine.d.ts

@@ -1,18 +1 @@
-/**
- * Resolve which machine a session transcript originated on.
- *
- * Cross-machine sync mirrors a remote transcript to
- * `backups/<agent>/<machine>/<subdir>/…`. Every other transcript is a live-home
- * file on this box, so the origin is the local machine id.
- *
- * Kept in a leaf module (no session/db imports) so both discovery and the
- * sessions DB upsert path can stamp `machine` without circular deps.
- */
-/** Local machine id, cached for the process lifetime. */
-export declare function localMachineId(): string;
-/**
- * The machine a discovered session originated on.
- * When the path sits under the agent's backups root, the first segment below it
- * is the origin machine id; otherwise it's the local machine.
- */
-export declare function machineForSessionFile(filePath: string, agent: string): string;
+export * from '../origin-machine.js';

package/dist/lib/session/origin-machine.js

@@ -1,34 +1,4 @@
-/**
- * Resolve which machine a session transcript originated on.
- *
- * Cross-machine sync mirrors a remote transcript to
- * `backups/<agent>/<machine>/<subdir>/…`. Every other transcript is a live-home
- * file on this box, so the origin is the local machine id.
- *
- * Kept in a leaf module (no session/db imports) so both discovery and the
- * sessions DB upsert path can stamp `machine` without circular deps.
- */
-import * as path from 'path';
-import { getHistoryDir } from '../state.js';
-import { machineId } from '../machine-id.js';
-let _localMachineId;
-/** Local machine id, cached for the process lifetime. */
-export function localMachineId() {
-    return (_localMachineId ??= machineId());
-}
-/**
- * The machine a discovered session originated on.
- * When the path sits under the agent's backups root, the first segment below it
- * is the origin machine id; otherwise it's the local machine.
- */
-export function machineForSessionFile(filePath, agent) {
-    if (!filePath)
-        return localMachineId();
-    const base = path.join(getHistoryDir(), 'backups', agent) + path.sep;
-    if (filePath.startsWith(base)) {
-        const seg = filePath.slice(base.length).split(path.sep)[0];
-        if (seg)
-            return seg;
-    }
-    return localMachineId();
-}
+// Moved to ../origin-machine.ts (move 1 of the core-module refactor — see
+// .agents/artifacts/2026-08-20/plan-*.md). Kept as a re-export shim so
+// existing importers don't break.
+export * from '../origin-machine.js';

package/dist/lib/session/relative-time.d.ts

@@ -1,44 +1 @@
-/**
- * Human-readable "time since" formatting for session timestamps. Lives here (not
- * inline in `sessions.ts`) so both the session list renderer and the remote
- * offline-cache banner (`remote.ts`) share one formatter — `sessions.ts` imports
- * `remote.ts`, so a back-import would cycle.
- */
-export declare function formatRelativeTime(isoTimestamp: string): string;
-/**
- * Compact age — `now`, `45m`, `3h`, `2d`, then the calendar date. This is the
- * *creation* half of a session's time cell: it renders right next to the long
- * last-activity label, and one row can afford one long form, not two.
- */
-export declare function formatCompactAge(isoTimestamp: string): string;
-/** The two time fields a session listing shows for one row. */
-export interface SessionAgeParts {
-    /**
-     * Compact age of the session's creation, set only when the session ran long
-     * enough (>= a minute) for it to say something `last` does not.
-     */
-    created?: string;
-    /** Last-activity label — the long relative form the listing sorts by. */
-    last: string;
-}
-/**
- * Split a session's timestamps into the two fields a listing renders: when it
- * was created and when it was last active. One last-activity label answers
- * neither "is this the old session I'm looking for" nor "how long did it run" —
- * a session touched an hour ago may have started last week.
- */
-export declare function sessionAgeParts(createdIso: string, lastActivityIso?: string): SessionAgeParts;
-/**
- * Parse a time filter string (relative like '7d' or an ISO timestamp) into epoch
- * milliseconds. Backs `--since` on `sessions`, `cost`, `teams`, and `output`, and
- * `--unused` on `secrets list`.
- *
- * It lives here, in a module with no imports, rather than in `discover.ts` where
- * it started: `discover.ts` loads `../sqlite.js`, so importing this one function
- * from there pulls `node:sqlite` into the caller's module graph and Node prints
- * `ExperimentalWarning: SQLite …` on stderr. That is invisible in a command that
- * already touches the session DB, and a broken contract in one that doesn't —
- * `monitors --json` asserts a clean stderr. `discover.ts` re-exports it, so
- * existing importers are unaffected.
- */
-export declare function parseTimeFilter(input: string): number;
+export * from '../text/relative-time.js';

package/dist/lib/session/relative-time.js

@@ -1,120 +1,4 @@
-/**
- * Human-readable "time since" formatting for session timestamps. Lives here (not
- * inline in `sessions.ts`) so both the session list renderer and the remote
- * offline-cache banner (`remote.ts`) share one formatter — `sessions.ts` imports
- * `remote.ts`, so a back-import would cycle.
- */
-const MONTHS = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'];
-/**
- * Calendar label for a timestamp older than the relative window. A 2-digit year
- * is appended outside the current year so "Jun 28" is never ambiguous across
- * years (e.g. "Jun 28 '25").
- */
-function calendarLabel(thenMs, nowMs) {
-    const d = new Date(thenMs);
-    const label = `${MONTHS[d.getMonth()]} ${d.getDate()}`;
-    return d.getFullYear() === new Date(nowMs).getFullYear()
-        ? label
-        : `${label} '${String(d.getFullYear()).slice(-2)}`;
-}
-export function formatRelativeTime(isoTimestamp) {
-    const now = Date.now();
-    const then = new Date(isoTimestamp).getTime();
-    if (isNaN(then))
-        return isoTimestamp;
-    const diffMs = now - then;
-    const diffMin = Math.floor(diffMs / 60_000);
-    const diffHrs = Math.floor(diffMs / 3_600_000);
-    const diffDays = Math.floor(diffMs / 86_400_000);
-    if (diffMin < 1)
-        return 'just now';
-    if (diffMin < 60)
-        return `${diffMin} min ago`;
-    if (diffHrs < 24)
-        return `${diffHrs} hour${diffHrs === 1 ? '' : 's'} ago`;
-    if (diffDays < 7)
-        return `${diffDays} day${diffDays === 1 ? '' : 's'} ago`;
-    // Older: show the date.
-    return calendarLabel(then, now);
-}
-/**
- * Compact age — `now`, `45m`, `3h`, `2d`, then the calendar date. This is the
- * *creation* half of a session's time cell: it renders right next to the long
- * last-activity label, and one row can afford one long form, not two.
- */
-export function formatCompactAge(isoTimestamp) {
-    const now = Date.now();
-    const then = new Date(isoTimestamp).getTime();
-    if (isNaN(then))
-        return isoTimestamp;
-    const diffMs = now - then;
-    const diffMin = Math.floor(diffMs / 60_000);
-    const diffHrs = Math.floor(diffMs / 3_600_000);
-    const diffDays = Math.floor(diffMs / 86_400_000);
-    if (diffMin < 1)
-        return 'now';
-    if (diffMin < 60)
-        return `${diffMin}m`;
-    if (diffHrs < 24)
-        return `${diffHrs}h`;
-    if (diffDays < 7)
-        return `${diffDays}d`;
-    return calendarLabel(then, now);
-}
-/**
- * Shortest creation→last-activity gap worth rendering as two fields. Below it
- * both halves name the same minute, so the row would carry a duplicate instead
- * of information.
- */
-const SPAN_MIN_MS = 60_000;
-/**
- * Split a session's timestamps into the two fields a listing renders: when it
- * was created and when it was last active. One last-activity label answers
- * neither "is this the old session I'm looking for" nor "how long did it run" —
- * a session touched an hour ago may have started last week.
- */
-export function sessionAgeParts(createdIso, lastActivityIso) {
-    const lastIso = lastActivityIso ?? createdIso;
-    const last = formatRelativeTime(lastIso);
-    const createdMs = new Date(createdIso).getTime();
-    const lastMs = new Date(lastIso).getTime();
-    if (isNaN(createdMs) || isNaN(lastMs) || lastMs - createdMs < SPAN_MIN_MS)
-        return { last };
-    return { created: formatCompactAge(createdIso), last };
-}
-/**
- * Parse a time filter string (relative like '7d' or an ISO timestamp) into epoch
- * milliseconds. Backs `--since` on `sessions`, `cost`, `teams`, and `output`, and
- * `--unused` on `secrets list`.
- *
- * It lives here, in a module with no imports, rather than in `discover.ts` where
- * it started: `discover.ts` loads `../sqlite.js`, so importing this one function
- * from there pulls `node:sqlite` into the caller's module graph and Node prints
- * `ExperimentalWarning: SQLite …` on stderr. That is invisible in a command that
- * already touches the session DB, and a broken contract in one that doesn't —
- * `monitors --json` asserts a clean stderr. `discover.ts` re-exports it, so
- * existing importers are unaffected.
- */
-export function parseTimeFilter(input) {
-    // Units: m=minute, h=hour, d=day, w=week, mo=month(30d), y=year(365d). `mo`
-    // must precede the single-letter alternatives so "1mo" isn't read as "1m"+"o".
-    const relativeMatch = input.match(/^(\d+)(mo|[mhdwy])$/i);
-    if (relativeMatch) {
-        const value = parseInt(relativeMatch[1], 10);
-        const unit = relativeMatch[2].toLowerCase();
-        if (unit === 'm')
-            return Date.now() - value * 60_000;
-        if (unit === 'h')
-            return Date.now() - value * 3_600_000;
-        if (unit === 'd')
-            return Date.now() - value * 86_400_000;
-        if (unit === 'w')
-            return Date.now() - value * 7 * 86_400_000;
-        if (unit === 'mo')
-            return Date.now() - value * 30 * 86_400_000;
-        if (unit === 'y')
-            return Date.now() - value * 365 * 86_400_000;
-    }
-    const ts = new Date(input).getTime();
-    return Number.isNaN(ts) ? 0 : ts;
-}
+// Moved to ../text/relative-time.ts (move 1 of the core-module refactor — see
+// .agents/artifacts/2026-08-20/plan-*.md). Kept as a re-export shim so
+// existing importers don't break.
+export * from '../text/relative-time.js';

package/dist/lib/session/remote-list.js

@@ -23,7 +23,7 @@ import { remoteShellFor, buildWindowsAgentsCommand, stripClixml } from '../hosts
 import { gatherRemoteAgentsJson } from '../remote-agents-json.js';
 import { machineId, normalizeHost } from './sync/config.js';
 import { NO_FANOUT_ENV } from './remote-active.js';
-import { terminalWidth } from './width.js';
+import { terminalWidth } from '../text/width.js';
 import { sanitizeForTerminal } from '../redact.js';
 import { mapBounded } from '../concurrency.js';
 import { TOOL_QUERY_MAX_CLAUSE_BYTES, TOOL_QUERY_MAX_CALL_ROWS, TOOL_QUERY_MAX_CLAUSES, TOOL_QUERY_MAX_RESULT_SESSIONS, TOOL_QUERY_MAX_SERIALIZED_BYTES, serializedToolSearchEnvelopeBytes, } from './tool-index.js';

package/dist/lib/session/remote.js

@@ -32,8 +32,8 @@ import { SSH_OPTS, controlOpts, assertValidSshTarget } from '../ssh-exec.js';
 import { remoteShellFor, buildWindowsAgentsCommand } from '../hosts/remote-cmd.js';
 import { resolveRemoteOsSync } from '../hosts/remote-os.js';
 import { NO_FANOUT_ENV } from './remote-active.js';
-import { formatRelativeTime } from './relative-time.js';
-import { terminalWidth } from './width.js';
+import { formatRelativeTime } from '../text/relative-time.js';
+import { terminalWidth } from '../text/width.js';
 /**
  * POSIX single-quote a string for safe interpolation into a remote shell command.
  * Always wraps (unlike the bare-passthrough variant in `ssh-exec.ts`) — the

package/dist/lib/session/short-id.d.ts

@@ -1,17 +1 @@
-/**
- * Canonical derivation of a session's 8-char `shortId`.
- *
- * Every session parser used to inline `id.slice(0, 8)` — some with a
- * `.replace(prefix, '')` strip first (`session_`, `api-`, `ses_`). That strip is
- * the bug: an id that is *only* its prefix (a bare `session_` directory, an id of
- * exactly `api-`) strips to `''`, and `''.slice(0, 8)` is still `''`. An empty
- * shortId then passes the `short_id TEXT NOT NULL` constraint (empty string is not
- * NULL) yet matches nothing in the `short_id LIKE ?` picker lookups — a silently
- * corrupt index row.
- *
- * This helper is the single source of truth: it strips the optional prefix, takes
- * the first 8 chars, and — the whole point — guarantees a NON-EMPTY result by
- * falling back to the unstripped id when the strip empties it, so a row always
- * stays addressable by its shortId.
- */
-export declare function deriveShortId(id: string, stripPrefix?: RegExp): string;
+export * from '../text/short-id.js';

package/dist/lib/session/short-id.js

@@ -1,20 +1,4 @@
-/**
- * Canonical derivation of a session's 8-char `shortId`.
- *
- * Every session parser used to inline `id.slice(0, 8)` — some with a
- * `.replace(prefix, '')` strip first (`session_`, `api-`, `ses_`). That strip is
- * the bug: an id that is *only* its prefix (a bare `session_` directory, an id of
- * exactly `api-`) strips to `''`, and `''.slice(0, 8)` is still `''`. An empty
- * shortId then passes the `short_id TEXT NOT NULL` constraint (empty string is not
- * NULL) yet matches nothing in the `short_id LIKE ?` picker lookups — a silently
- * corrupt index row.
- *
- * This helper is the single source of truth: it strips the optional prefix, takes
- * the first 8 chars, and — the whole point — guarantees a NON-EMPTY result by
- * falling back to the unstripped id when the strip empties it, so a row always
- * stays addressable by its shortId.
- */
-export function deriveShortId(id, stripPrefix) {
-    const stripped = stripPrefix ? id.replace(stripPrefix, '') : id;
-    return stripped.slice(0, 8) || id.slice(0, 8) || id;
-}
+// Moved to ../text/short-id.ts (move 1 of the core-module refactor — see
+// .agents/artifacts/2026-08-20/plan-*.md). Kept as a re-export shim so
+// existing importers don't break.
+export * from '../text/short-id.js';

package/dist/lib/session/width.d.ts

@@ -1,29 +1 @@
-/**
- * Terminal display-width helpers.
- *
- * `String.length` is the wrong ruler for a terminal: it over-counts ANSI colour
- * escapes (chalk output) and under-counts wide glyphs (CJK, emoji) which occupy
- * two cells. The result is the drifting, wrapping session-table line users see
- * under tmux and over `--device` SSH. Every renderer that sizes a session-table
- * cell measures and truncates through this module so alignment is computed once,
- * correctly, from the same source of truth.
- */
-/** Strip SGR colour + OSC-8 hyperlink escapes so width is measured on visible characters only. */
-export declare function stripAnsi(s: string): string;
-/** Visible display width of a string, ANSI-aware and wide-char-aware. */
-export declare function stringWidth(s: string): number;
-/**
- * Truncate to a target display width, appending '…' when shortened. Operates on
- * the visible (ANSI-stripped) string; callers colour the result afterwards so
- * the ellipsis is never inserted mid-escape.
- */
-export declare function truncateToWidth(s: string, max: number): string;
-/** Right-pad with spaces to a target display width. Never truncates. */
-export declare function padToWidth(s: string, width: number): string;
-/**
- * Effective terminal width. Reads `$COLUMNS` first so it survives tmux and
- * `--device` SSH (where `process.stdout.columns` is unset or wrong), falls back to
- * the TTY's reported width, then to `fallback`. Clamped to a sane band so a
- * bogus value can't produce a 0-wide or absurdly long table.
- */
-export declare function terminalWidth(fallback?: number): number;
+export * from '../text/width.js';

package/dist/lib/session/width.js

@@ -1,101 +1,4 @@
-/**
- * Terminal display-width helpers.
- *
- * `String.length` is the wrong ruler for a terminal: it over-counts ANSI colour
- * escapes (chalk output) and under-counts wide glyphs (CJK, emoji) which occupy
- * two cells. The result is the drifting, wrapping session-table line users see
- * under tmux and over `--device` SSH. Every renderer that sizes a session-table
- * cell measures and truncates through this module so alignment is computed once,
- * correctly, from the same source of truth.
- */
-/** SGR colour sequences emitted by chalk (e.g. `\x1b[32m`). */
-const SGR_REGEX = /\x1b\[[0-9;]*m/g;
-/**
- * OSC-8 hyperlink sequences (`\x1b]8;;<url>\x1b\\` … `\x1b]8;;\x1b\\`, or with a
- * BEL `\x07` terminator) emitted by `osc8()` in render.ts for clickable
- * ticket/PR/path badges. These carry the URL, which is NOT visible — leaving it
- * in over-counts width and, worse, lets a truncation land *inside* the escape and
- * corrupt it. Stripping both the opener and closer leaves only the visible label
- * between them, so width is measured on what the user sees and `truncateToWidth`
- * can never cut a hyperlink in half.
- */
-const OSC8_REGEX = /\x1b\]8;[^;]*;.*?(?:\x1b\\|\x07)/g;
-/** Strip SGR colour + OSC-8 hyperlink escapes so width is measured on visible characters only. */
-export function stripAnsi(s) {
-    return s.replace(OSC8_REGEX, '').replace(SGR_REGEX, '');
-}
-/**
- * Display cells for one code point: 0 for zero-width combining/ZWJ/variation
- * selectors, 2 for East-Asian-wide and emoji ranges, 1 otherwise. Compact and
- * dependency-free — covers the glyphs that actually show up in prompts/titles.
- */
-function charWidth(cp) {
-    if (cp === 0)
-        return 0;
-    // Zero-width: combining marks, zero-width joiner, variation selectors.
-    if ((cp >= 0x0300 && cp <= 0x036f) ||
-        cp === 0x200b || cp === 0x200d ||
-        (cp >= 0xfe00 && cp <= 0xfe0f))
-        return 0;
-    // Wide (2 cells): CJK, Hangul, fullwidth forms, emoji & pictographs.
-    if ((cp >= 0x1100 && cp <= 0x115f) || // Hangul Jamo
-        (cp >= 0x2e80 && cp <= 0xa4cf) || // CJK radicals … Yi
-        (cp >= 0xac00 && cp <= 0xd7a3) || // Hangul syllables
-        (cp >= 0xf900 && cp <= 0xfaff) || // CJK compatibility ideographs
-        (cp >= 0xfe30 && cp <= 0xfe4f) || // CJK compatibility forms
-        (cp >= 0xff00 && cp <= 0xff60) || // Fullwidth forms
-        (cp >= 0xffe0 && cp <= 0xffe6) || // Fullwidth signs
-        (cp >= 0x1f300 && cp <= 0x1faff) || // emoji & symbols
-        (cp >= 0x20000 && cp <= 0x3fffd) // CJK Ext-B and beyond
-    )
-        return 2;
-    return 1;
-}
-/** Visible display width of a string, ANSI-aware and wide-char-aware. */
-export function stringWidth(s) {
-    const plain = stripAnsi(s);
-    let w = 0;
-    for (const ch of plain)
-        w += charWidth(ch.codePointAt(0));
-    return w;
-}
-/**
- * Truncate to a target display width, appending '…' when shortened. Operates on
- * the visible (ANSI-stripped) string; callers colour the result afterwards so
- * the ellipsis is never inserted mid-escape.
- */
-export function truncateToWidth(s, max) {
-    if (max <= 0)
-        return '';
-    const plain = stripAnsi(s);
-    if (stringWidth(plain) <= max)
-        return plain;
-    let w = 0;
-    let out = '';
-    for (const ch of plain) {
-        const cw = charWidth(ch.codePointAt(0));
-        if (w + cw > max - 1)
-            break; // reserve one cell for the ellipsis
-        out += ch;
-        w += cw;
-    }
-    return out + '…';
-}
-/** Right-pad with spaces to a target display width. Never truncates. */
-export function padToWidth(s, width) {
-    const pad = width - stringWidth(s);
-    return pad > 0 ? s + ' '.repeat(pad) : s;
-}
-/**
- * Effective terminal width. Reads `$COLUMNS` first so it survives tmux and
- * `--device` SSH (where `process.stdout.columns` is unset or wrong), falls back to
- * the TTY's reported width, then to `fallback`. Clamped to a sane band so a
- * bogus value can't produce a 0-wide or absurdly long table.
- */
-export function terminalWidth(fallback = 100) {
-    const env = Number.parseInt(process.env.COLUMNS ?? '', 10);
-    const raw = Number.isFinite(env) && env > 0
-        ? env
-        : (process.stdout.columns || fallback);
-    return Math.max(60, Math.min(200, raw));
-}
+// Moved to ../text/width.ts (move 1 of the core-module refactor — see
+// .agents/artifacts/2026-08-20/plan-*.md). Kept as a re-export shim so
+// existing importers don't break.
+export * from '../text/width.js';

package/dist/lib/snapshot.d.ts

@@ -8,7 +8,7 @@
  *
  * That is N+2 process starts per poll tick. This module gathers the same
  * shapes in one invocation so poll count drops to 1 without redefining
- * `agents status` (which stays the UnifiedSyncStatus sync contract).
+ * `agents sync status` (which stays the UnifiedSyncStatus sync contract).
  *
  * Stores are not merged — inventory still comes from view, active rows from
  * sessions, blocks from feed. Only the reader is consolidated.
@@ -63,7 +63,7 @@ export interface FleetSnapshot {
     agents: FleetAgentCounts;
     /** Present when --with-feed. */
     feed?: SnapshotFeedSummary;
-    /** Present when --with-sync (UnifiedSyncStatus; does not replace `agents status`). */
+    /** Present when --with-sync (UnifiedSyncStatus; does not replace `agents sync status`). */
     sync?: UnifiedSyncStatus;
 }
 export interface ComputeSnapshotOptions {

package/dist/lib/snapshot.js

@@ -8,7 +8,7 @@
  *
  * That is N+2 process starts per poll tick. This module gathers the same
  * shapes in one invocation so poll count drops to 1 without redefining
- * `agents status` (which stays the UnifiedSyncStatus sync contract).
+ * `agents sync status` (which stays the UnifiedSyncStatus sync contract).
  *
  * Stores are not merged — inventory still comes from view, active rows from
  * sessions, blocks from feed. Only the reader is consolidated.

package/dist/lib/startup/command-registry.d.ts

@@ -21,7 +21,10 @@ export declare const KNOWN_TOP_LEVEL_COMMANDS: ReadonlySet<string>;
  * under `agents artifacts share` (RUSH-2580). login/logout/budget/bench/mine/
  * cost/output/profiles/snapshot/cp/resume/roster moved under nested homes
  * (cli-surface-consolidate). `timeline` was removed as a duplicated surface —
- * use `agents feed --filter updates` (RUSH-2692).
+ * use `agents feed --filter updates` (RUSH-2692). `status` moved under
+ * `agents sync status` (RUSH-2864). `tickets` was removed — use `linear`
+ * (linear-cli) (RUSH-2932). `alias` moved under `agents setup alias` (RUSH-2965).
+ * `inbox` was a pure alias of `agents feed` (RUSH-2984).
  */
 export declare const RETIRED_TOP_LEVEL_COMMANDS: ReadonlySet<string>;
 export declare function isKnownTopLevelCommand(name: string): boolean;

package/dist/lib/startup/command-registry.js

@@ -3,12 +3,12 @@ const LOADED_COMMAND_NAMES = [
     'permissions', 'mcp', 'clis', 'subagents', 'plugins', 'workflows', 'add', 'use', 'list',
     'remove', 'rm', 'purge', 'update', 'prune', 'import', 'registry', 'search', 'install',
     'routines', 'monitors', 'projects', 'run', 'open', 'reconnect', 'fork', 'config',
-    'models', 'modes', 'trash', 'restore', 'doctor', 'apply', 'status',
+    'models', 'modes', 'trash', 'restore', 'doctor', 'apply',
     'route', 'harness', 'harnesses', 'secrets', 'menubar', 'beta', 'sync',
     'refresh-rules', 'factory', 'usage', 'insights', 'perf', 'trends',
-    'alias', 'pty', 'tmux', 'watchdog', 'browser', 'computer', 'logs', 'events',
+    'pty', 'tmux', 'watchdog', 'browser', 'computer', 'logs', 'events',
     'ssh', 'devices', 'fleet', 'repos', 'repo', 'setup', 'uninstall', 'upgrade', 'sessions',
-    'teams', 'tickets', 'cloud', 'message', 'send', 'notify', 'feed', 'inbox',
+    'teams', 'cloud', 'message', 'send', 'notify', 'feed',
     'mailboxes', 'mailbox', 'serve', 'artifacts', 'unshare', 'audit', 'webhooks',
     'humans', 'daemon',
 ];
@@ -41,7 +41,10 @@ export const KNOWN_TOP_LEVEL_COMMANDS = new Set([
  * under `agents artifacts share` (RUSH-2580). login/logout/budget/bench/mine/
  * cost/output/profiles/snapshot/cp/resume/roster moved under nested homes
  * (cli-surface-consolidate). `timeline` was removed as a duplicated surface —
- * use `agents feed --filter updates` (RUSH-2692).
+ * use `agents feed --filter updates` (RUSH-2692). `status` moved under
+ * `agents sync status` (RUSH-2864). `tickets` was removed — use `linear`
+ * (linear-cli) (RUSH-2932). `alias` moved under `agents setup alias` (RUSH-2965).
+ * `inbox` was a pure alias of `agents feed` (RUSH-2984).
  */
 export const RETIRED_TOP_LEVEL_COMMANDS = new Set([
     'webhook',
@@ -60,6 +63,10 @@ export const RETIRED_TOP_LEVEL_COMMANDS = new Set([
     'set',
     'share',
     'timeline',
+    'status',
+    'tickets',
+    'alias',
+    'inbox',
 ]);
 export function isKnownTopLevelCommand(name) {
     return KNOWN_TOP_LEVEL_COMMANDS.has(name);

package/dist/lib/teams/placement-probe.js

@@ -26,7 +26,7 @@ import { probeFleetStats, headroom } from '../devices/health.js';
 import { loadDevicesSync } from '../devices/registry.js';
 import { buildSshInvocation, writeAskpassShim } from '../devices/connect.js';
 import { buildReadyProbeCommand, parseReadyProbe, viewAgentSignedIn, viewHasAgent, } from '../hosts/ready.js';
-import { localMachineId } from '../session/origin-machine.js';
+import { localMachineId } from '../origin-machine.js';
 import { normalizeHost } from '../machine-id.js';
 import { checkCliAvailable, checkCliSignedIn } from './agents.js';
 /** Per-remote readiness probe budget — matches the health probe's short window