@phnx-labs/agents-cli 1.22.17 → 1.22.19

package/CHANGELOG.md

@@ -1,5 +1,38 @@
 # Changelog
 
+## 1.22.19
+
+### Fixed
+
+- **`agents sync --local -y` refreshes every installed version, not only the default.**
+  Unattended reconcile (`refresh({ skipPrompts })`) previously wrote resources and
+  registered hooks into each agent's default version alone, so non-default homes
+  kept stale hooks after a system update. Unattended refresh now loops
+  `listInstalledVersions` for both resource sync and hook registration.
+  Interactive refresh still targets the default only. Source:
+  `apps/cli/src/lib/refresh.ts`.
+
+## 1.22.18
+
+### Fixed
+
+- **`agents sync` re-copies nested system hooks after content changes.**
+  `listResources('hooks')` treated event-group directories (`pre-tool-use/`) as
+  resource names, so `system:*` pattern expansion never included nested scripts
+  like `git-guard.sh`. Force sync then left stale flat copies in version homes
+  forever. Hooks discovery now expands one-level group dirs the same way as
+  `getAvailableResources` / `listHookEntriesFromDir`. Source:
+  `apps/cli/src/lib/resources.ts`.
+
+- Route owner iMessage notifications through Rush's verified owner message endpoint instead of requiring a live daemon channel registration. (RUSH-2193)
+
+- **`agents sessions --active` now carries `terminalId` on tmux-hosted rows (RUSH-2192).**
+  Grok/Codex (and every `ag-*` tmux pane) get their `AGENT_TERMINAL_ID` from the launch
+  registry's by-pid entry. The ps-scan path already set `terminalId`; the tmux source —
+  which wins dedupe for interactive agents — omitted it, so Factory could never join a
+  tab to its live session even when SessionStart preserved the key. Source:
+  `apps/cli/src/lib/session/active.ts`.
+
 ## 1.22.17
 
 - **Codex versions no longer share one account — each keeps its own login.** Installing a new Codex version used to copy the current default version's `.codex/auth.json` into the new version home, so `agents view` reported the same ChatGPT account for every installed Codex and you could never sign two versions into two accounts. The credential is now excluded from settings carry-forward (config, prompts, and rules still carry), matching how Claude omits `.claude.json`. A fresh Codex version installs signed-out; run `codex login` (or `agents run codex --version <v>`) inside it to authenticate that version's own account. Source: `apps/cli/src/lib/settings-manifest.ts`, `apps/cli/src/commands/versions.ts`.

package/dist/lib/channels/providers/rush.d.ts

@@ -3,4 +3,6 @@ export type RushChannel = 'telegram' | 'imessage' | 'slack' | 'discord';
 export declare const RUSH_CHANNELS: RushChannel[];
 /** Build the `rush send` argv (exported for tests). */
 export declare function buildRushSendArgs(channel: RushChannel, text: string, opts: SendOptions): string[];
+/** Build the owner-scoped iMessage argv. */
+export declare function buildRushOwnerMessageArgs(text: string): string[];
 export declare const rushProviders: ChannelProvider[];

package/dist/lib/channels/providers/rush.js

@@ -1,10 +1,9 @@
 /**
- * Rush-daemon channel providers — telegram / imessage / slack / discord.
+ * Rush channel providers — telegram / imessage / slack / discord.
  *
- * These shell out to the already-built `rush send` CLI, which routes through the
- * rush daemon's live channel gateways over ~/.rush/daemon.sock. We do NOT import
- * rush's Go internals (different repo, internal package) — the CLI boundary is
- * the contract. `rush send --json` prints {"ok":true,"channel":..,"id":..}.
+ * Addressable channels use `rush send`, which routes through the daemon's live
+ * gateways. Owner-scoped iMessage uses `rush message send`; it is backed by the
+ * verified Rush owner account and does not require a daemon channel registration.
  */
 import { execFile } from 'child_process';
 import { promisify } from 'util';
@@ -19,6 +18,10 @@ export function buildRushSendArgs(channel, text, opts) {
         args.push('--attachment', a);
     return args;
 }
+/** Build the owner-scoped iMessage argv. */
+export function buildRushOwnerMessageArgs(text) {
+    return ['message', 'send', '--text', text];
+}
 function rushProvider(channel) {
     return {
         name: channel,
@@ -34,6 +37,18 @@ function rushProvider(channel) {
                 return { ok: false, channel, id: opts.target, error: 'rush CLI not found on PATH' };
             }
             try {
+                if (channel === 'imessage' && opts.ownerScoped) {
+                    if ((opts.attachments?.length ?? 0) > 0) {
+                        return {
+                            ok: false,
+                            channel,
+                            id: opts.target,
+                            error: 'owner-scoped iMessage does not support attachments',
+                        };
+                    }
+                    await execFileAsync('rush', buildRushOwnerMessageArgs(text));
+                    return { ok: true, channel, id: opts.target };
+                }
                 const { stdout } = await execFileAsync('rush', buildRushSendArgs(channel, text, opts));
                 const parsed = JSON.parse(stdout);
                 return {

package/dist/lib/channels/registry.d.ts

@@ -17,6 +17,8 @@ export interface SendOptions {
     attachments?: string[];
     /** Sender label (used by the mailbox provider). */
     from?: string;
+    /** Destination was resolved through the verified owner alias. */
+    ownerScoped?: boolean;
     /** Resolve + build the delivery but do not actually send. */
     dryRun?: boolean;
 }

package/dist/lib/channels/send.d.ts

@@ -18,6 +18,7 @@ export interface SendEnvelope {
     thread?: string;
     attachments?: string[];
     from?: string;
+    ownerScoped?: boolean;
     dryRun?: boolean;
 }
 export interface ResolveSendInput {

package/dist/lib/channels/send.js

@@ -86,6 +86,7 @@ export function resolveSendEnvelope(input, meta) {
             thread: input.thread?.trim() || undefined,
             attachments: attachments.length ? attachments : undefined,
             from: input.from?.trim() || undefined,
+            ownerScoped: usedOwnerAlias || (input.ownerMode === true && !input.to?.trim()),
             dryRun: input.dryRun,
         },
     };
@@ -102,6 +103,7 @@ export async function deliverEnvelope(envelope, meta) {
         thread: envelope.thread,
         attachments: envelope.attachments,
         from: envelope.from,
+        ownerScoped: envelope.ownerScoped,
         dryRun: envelope.dryRun,
     });
 }

package/dist/lib/notify.js

@@ -57,7 +57,11 @@ export async function sendToOwner(text, options = {}) {
     if (!provider) {
         return { ok: false, channel, id: target, error };
     }
-    return provider.send(text, { target, dryRun: options.dryRun });
+    return provider.send(text, {
+        target,
+        ownerScoped: options.target === undefined,
+        dryRun: options.dryRun,
+    });
 }
 export async function notifyUrgentBlock(block, options = {}) {
     if (block.notifiedAt) {

package/dist/lib/refresh.js

@@ -114,7 +114,11 @@ export async function refresh(options = {}) {
             }
         }
     }
-    // 3. Sync resources to default version homes
+    // 3. Sync resources into version homes.
+    // Unattended (`skipPrompts` / `agents sync --yes --local`): every installed
+    // version — otherwise non-default homes keep stale hooks after a system
+    // update (fleet multi-harness: only the default version was refreshed).
+    // Interactive: default only; re-run `agents sync <agent>@all` for the rest.
     const cliStates = await getAllCliStates();
     const agentsToSync = agentFilter ? [agentFilter] : MANAGED_AGENT_IDS;
     const available = getAvailableResources();
@@ -124,6 +128,9 @@ export async function refresh(options = {}) {
         const defaultVer = getGlobalDefault(agentId);
         if (!defaultVer)
             continue;
+        const versionsToSync = skipPrompts
+            ? listInstalledVersions(agentId)
+            : [defaultVer];
         const actuallySynced = getActuallySyncedResources(agentId, defaultVer);
         const newResources = getNewResources(available, actuallySynced, getProjectOnlyResources());
         const hasAnySynced = actuallySynced.commands.length > 0 ||
@@ -155,24 +162,29 @@ export async function refresh(options = {}) {
                 forceFullSync = true;
             }
             if (forceFullSync || (selection && Object.keys(selection).length > 0)) {
-                const syncResult = syncResourcesToVersion(agentId, defaultVer, selection, forceFullSync ? { force: true } : undefined);
-                const synced = [];
-                if (syncResult.commands)
-                    synced.push('commands');
-                if (syncResult.skills)
-                    synced.push('skills');
-                if (syncResult.hooks)
-                    synced.push('hooks');
-                if (syncResult.memory.length > 0)
-                    synced.push('memory');
-                if (syncResult.permissions)
-                    synced.push('permissions');
-                if (syncResult.mcp.length > 0)
-                    synced.push('mcp');
-                if (syncResult.plugins.length > 0)
-                    synced.push('plugins');
-                if (synced.length > 0) {
-                    console.log(chalk.green(`  Synced: ${synced.join(', ')}`));
+                const kinds = new Set();
+                for (const ver of versionsToSync) {
+                    const syncResult = syncResourcesToVersion(agentId, ver, selection, forceFullSync ? { force: true } : undefined);
+                    if (syncResult.commands)
+                        kinds.add('commands');
+                    if (syncResult.skills)
+                        kinds.add('skills');
+                    if (syncResult.hooks)
+                        kinds.add('hooks');
+                    if (syncResult.memory.length > 0)
+                        kinds.add('memory');
+                    if (syncResult.permissions)
+                        kinds.add('permissions');
+                    if (syncResult.mcp.length > 0)
+                        kinds.add('mcp');
+                    if (syncResult.plugins.length > 0)
+                        kinds.add('plugins');
+                }
+                if (kinds.size > 0) {
+                    const verNote = versionsToSync.length > 1
+                        ? chalk.gray(` (${versionsToSync.length} versions)`)
+                        : '';
+                    console.log(chalk.green(`  Synced: ${[...kinds].join(', ')}`) + verNote);
                 }
             }
         }
@@ -185,7 +197,7 @@ export async function refresh(options = {}) {
             }
         }
     }
-    // 4. Register hooks as lifecycle events
+    // 4. Register hooks as lifecycle events (same version set as resource sync)
     const hookManifest = parseHookManifest();
     if (Object.keys(hookManifest).length > 0) {
         let hookRegistered = 0;
@@ -195,7 +207,9 @@ export async function refresh(options = {}) {
                 continue;
             const versions = listInstalledVersions(agentId);
             const defaultVer = getGlobalDefault(agentId);
-            const targetVersions = defaultVer ? [defaultVer] : versions.slice(-1);
+            const targetVersions = skipPrompts
+                ? versions
+                : (defaultVer ? [defaultVer] : versions.slice(-1));
             for (const ver of targetVersions) {
                 const home = getVersionHomePath(agentId, ver);
                 const result = registerHooksToSettings(agentId, home, hookManifest);

package/dist/lib/resources.js

@@ -128,6 +128,130 @@ export function listResources(kind, cwd) {
         [path.join(getSystemAgentsDir(), kind), 'system', getSystemAgentsDir()],
         ...extraRepos.map((e) => [path.join(e.dir, kind), e.alias, e.dir]),
     ];
+    // Hooks use a one-level event-group layout (hooks/pre-tool-use/git-guard.sh).
+    // A flat readdir treats `pre-tool-use` as the resource name, so `system:*`
+    // pattern expansion never includes nested scripts — and `agents sync --force`
+    // leaves stale flat copies in version homes forever. Mirror getAvailableResources:
+    // expand group dirs that hold scripts (install name = basename with extension),
+    // keep fixture-only dirs as bundles, and keep top-level scripts as resources.
+    // Keep this logic self-contained (no hooks.ts import) so vi.mock of hooks.js
+    // in versions tests does not break listResources.
+    if (kind === 'hooks') {
+        const HOOK_SCRIPT_EXTS = new Set([
+            '.sh', '.bash', '.zsh', '.py', '.js', '.ts', '.mjs', '.cjs', '.rb', '.pl', '.ps1', '.cmd', '.bat',
+        ]);
+        const HOOK_NON_SCRIPT_EXTS = new Set([
+            '.md', '.markdown', '.rst', '.txt', '.yaml', '.yml', '.json', '.toml', '.ini', '.conf',
+        ]);
+        const HOOK_GROUP_SKIP = new Set(['node_modules', '.git', '.cache']);
+        const isHookScriptName = (fileName, mode) => {
+            const ext = path.extname(fileName).toLowerCase();
+            if (HOOK_SCRIPT_EXTS.has(ext))
+                return true;
+            return (mode & 0o111) !== 0 && !HOOK_NON_SCRIPT_EXTS.has(ext);
+        };
+        for (const [dir, source, repoRoot] of roots) {
+            if (!fs.existsSync(dir))
+                continue;
+            let top;
+            try {
+                top = fs.readdirSync(dir);
+            }
+            catch {
+                continue;
+            }
+            for (const name of top) {
+                if (name.startsWith('.'))
+                    continue;
+                const full = path.join(dir, name);
+                let stat;
+                try {
+                    stat = fs.lstatSync(full);
+                }
+                catch {
+                    continue;
+                }
+                if (stat.isSymbolicLink())
+                    continue;
+                if (stat.isFile()) {
+                    if (!isHookScriptName(name, stat.mode))
+                        continue;
+                    // Docs that live beside hooks (README/AGENTS) are not resources.
+                    const raw = name.replace(/\.(md|yaml|yml)$/, '');
+                    if (isDirectoryDoc(kind, raw))
+                        continue;
+                    if (seen.has(name))
+                        continue;
+                    if (!resourceIsActive(kind, name, source))
+                        continue;
+                    seen.add(name);
+                    results.push(withProvenance({
+                        name,
+                        path: full,
+                        source,
+                        repoRoot,
+                    }));
+                    continue;
+                }
+                if (!stat.isDirectory() || HOOK_GROUP_SKIP.has(name))
+                    continue;
+                let nested;
+                try {
+                    nested = fs.readdirSync(full);
+                }
+                catch {
+                    continue;
+                }
+                const scripts = [];
+                for (const nestedName of nested) {
+                    if (nestedName.startsWith('.'))
+                        continue;
+                    const nfull = path.join(full, nestedName);
+                    let nstat;
+                    try {
+                        nstat = fs.lstatSync(nfull);
+                    }
+                    catch {
+                        continue;
+                    }
+                    if (nstat.isSymbolicLink() || !nstat.isFile())
+                        continue;
+                    if (isHookScriptName(nestedName, nstat.mode))
+                        scripts.push(nestedName);
+                }
+                if (scripts.length > 0) {
+                    for (const script of scripts) {
+                        if (seen.has(script))
+                            continue;
+                        if (!resourceIsActive(kind, script, source))
+                            continue;
+                        seen.add(script);
+                        results.push(withProvenance({
+                            name: script,
+                            path: path.join(full, script),
+                            source,
+                            repoRoot,
+                        }));
+                    }
+                }
+                else {
+                    // Fixture-only directory bundle (hooks/tests/fixtures/…).
+                    if (seen.has(name))
+                        continue;
+                    if (!resourceIsActive(kind, name, source))
+                        continue;
+                    seen.add(name);
+                    results.push(withProvenance({
+                        name,
+                        path: full,
+                        source,
+                        repoRoot,
+                    }));
+                }
+            }
+        }
+        return results;
+    }
     for (const [dir, source, repoRoot] of roots) {
         if (!fs.existsSync(dir))
             continue;

package/dist/lib/session/active.js

@@ -1419,12 +1419,16 @@ export async function listTmuxAgentSessions() {
             topic,
             tokPerSec,
             sessionFile,
-            // tmux panes carry no start timestamp; derive both from the transcript
-            // (creation ≈ start, last write ≈ last activity).
-            startedAtMs: birthtimeMs,
+            // Prefer the launch registry's start when known (more accurate than
+            // transcript birth for a resumed/reused file); else transcript times.
+            startedAtMs: liveEntry?.startedAtMs ?? birthtimeMs,
             lastActivityMs: mtimeMs,
             provenance,
             owner: resolveOwner(liveEntry?.actor, id.sessionId ?? sessionIdFromFile(sessionFile)),
+            // Factory / --active join key: AGENT_TERMINAL_ID stamped on the launch
+            // registry and preserved by SessionStart. Without this, Grok/Codex tmux
+            // panes never surface terminalId even when by-pid has it (RUSH-2192).
+            terminalId: liveEntry?.terminalId,
             // An id-less pane keys its dedupe on the unique pane, so two anonymous
             // co-located panes stay two rows instead of folding into one.
             paneId: id.sessionId ?? sessionIdFromFile(sessionFile) ? undefined : pane,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@phnx-labs/agents-cli",
-  "version": "1.22.17",
+  "version": "1.22.19",
   "description": "One CLI for all your AI coding agents - versions, config, cloud dispatch, sessions, and teams (now with first-class Grok Build CLI support)",
   "type": "module",
   "main": "dist/index.js",