@phnx-labs/agents-cli 1.22.16 → 1.22.18

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/dist/lib/settings-manifest.js

@@ -30,7 +30,13 @@ const SETTINGS_MANIFEST = {
             strategy: 'toml-merge',
             stateKeys: ['notice', 'windows_wsl_setup_acknowledged'],
         },
-        { rel: '.codex/auth.json', strategy: 'copy-if-absent', restrictMode: true },
+        // `.codex/auth.json` is deliberately NOT carried forward. Copying it seeded
+        // every new Codex version with the current default's ChatGPT token, so two
+        // installed versions always reported the same account and could never sign
+        // into separate accounts. Claude omits its credential (`.claude.json`) for
+        // the same reason — a version home holds its own login, keeping accounts
+        // per-version. A fresh Codex version installs signed-out; run `codex login`
+        // (or `agents run codex --version <v>`) inside it to authenticate.
         { rel: '.codex/instructions.md', strategy: 'copy-if-absent' },
         { rel: '.codex/hooks.json', strategy: 'copy-if-absent' },
         { rel: '.codex/prompts', strategy: 'dir-entries' },

package/dist/lib/types.d.ts

@@ -1008,6 +1008,8 @@ export interface HumanChannel {
     id: string;
     /** Provider transport (e.g. "rush", "twilio"). */
     transport: string;
+    /** Provider-specific recipient (phone number, user id, address). */
+    to?: string;
     /** If true the channel is watched for incoming messages. */
     watch?: boolean;
     /** Shell command to invoke (for call channels). */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@phnx-labs/agents-cli",
-  "version": "1.22.16",
+  "version": "1.22.18",
   "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",