@phnx-labs/agents-cli 1.20.28 → 1.20.30

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

@@ -46,6 +46,7 @@ export const loadTmux = async () => (await import('../../commands/tmux.js')).reg
 export const loadBrowser = async () => (await import('../../commands/browser.js')).registerBrowserCommand;
 export const loadComputer = async () => (await import('../../commands/computer.js')).registerComputerCommand;
 export const loadHosts = async () => (await import('../../commands/hosts.js')).registerHostsCommand;
+export const loadSsh = async () => (await import('../../commands/ssh.js')).registerSshCommands;
 export const loadPull = async () => (await import('../../commands/pull.js')).registerPullCommand;
 export const loadPush = async () => (await import('../../commands/push.js')).registerPushCommand;
 export const loadRepo = async () => (await import('../../commands/repo.js')).registerRepoCommands;
@@ -128,6 +129,8 @@ export const COMMAND_LOADERS = {
     browser: [loadBrowser],
     computer: [loadComputer],
     hosts: [loadHosts],
+    ssh: [loadSsh],
+    devices: [loadSsh],
     pull: [loadPull],
     push: [loadPush],
     repo: [loadRepo],

package/dist/lib/state.d.ts

@@ -99,6 +99,8 @@ export declare function getSystemWorkflowsDir(): string;
 export declare function getUserWorkflowsDir(): string;
 export declare function getUserSecretsDir(): string;
 export declare function getUserPromptcutsPath(): string;
+/** Canonical home anchor (HOME env override or os.homedir()). */
+export declare function getHomeDir(): string;
 /** Bucket root for durable runtime data (~/.agents/.history/). */
 export declare function getHistoryDir(): string;
 /** Bucket root for regenerable runtime data (~/.agents/.cache/). */
@@ -152,6 +154,8 @@ export declare function getTeamsDir(): string;
 export declare function getTeamsAgentsDir(): string;
 /** Path to the team registry — list of named teams with timestamps. Durable runtime, per-machine. */
 export declare function getTeamsRegistryPath(): string;
+/** Path to the device registry — SSH device profiles with platform/auth metadata. Durable runtime, per-machine (host list + addresses are NOT pulled by `agents repo push`). */
+export declare function getDevicesRegistryPath(): string;
 /** Path to cloud dispatch cache (~/.agents/.cache/cloud/). */
 export declare function getCloudDir(): string;
 /** Path to terminal session metadata (~/.agents/.cache/terminals/). */

package/dist/lib/state.js

@@ -29,6 +29,20 @@ import * as yaml from 'yaml';
 import { ensureLockTarget, atomicWriteFileSync, withFileLock } from './fs-atomic.js';
 import { SEEDED_REGISTRIES } from './types.js';
 const HOME = process.env.HOME ?? os.homedir();
+/**
+ * Compare two filesystem paths for identity, resolving symlinks and (on
+ * Windows) 8.3 short-name vs long-name divergence via the OS realpath.
+ * Falls back to a case-folded normalize when a path doesn't exist on disk.
+ */
+function isSamePath(a, b) {
+    try {
+        return fs.realpathSync.native(a) === fs.realpathSync.native(b);
+    }
+    catch {
+        const norm = (p) => process.platform === 'win32' ? path.resolve(p).toLowerCase() : path.resolve(p);
+        return norm(a) === norm(b);
+    }
+}
 // ─── Root directories ─────────────────────────────────────────────────────────
 /** User repo — user-authored resources and agents.yaml. Always-on. */
 const USER_AGENTS_DIR = path.join(HOME, '.agents');
@@ -161,7 +175,7 @@ export function getProjectAgentsDir(startPath = process.cwd()) {
     while (true) {
         const agentsPath = path.join(dir, '.agents');
         if (fs.existsSync(agentsPath) && fs.statSync(agentsPath).isDirectory()) {
-            if (agentsPath !== SYSTEM_AGENTS_DIR && agentsPath !== USER_AGENTS_DIR) {
+            if (!isSamePath(agentsPath, SYSTEM_AGENTS_DIR) && !isSamePath(agentsPath, USER_AGENTS_DIR)) {
                 return agentsPath;
             }
         }
@@ -269,6 +283,8 @@ export function getUserPromptcutsPath() { return USER_PROMPTCUTS_FILE; }
 //
 // Top-level dirs hold definitions/configs only; runtime data lives under
 // .history/ (durable) or .cache/ (regenerable). See file header.
+/** Canonical home anchor (HOME env override or os.homedir()). */
+export function getHomeDir() { return HOME; }
 /** Bucket root for durable runtime data (~/.agents/.history/). */
 export function getHistoryDir() { return HISTORY_DIR; }
 /** Bucket root for regenerable runtime data (~/.agents/.cache/). */
@@ -334,6 +350,8 @@ export function getTeamsDir() { return TEAMS_DIR; }
 export function getTeamsAgentsDir() { return TEAMS_AGENTS_DIR; }
 /** Path to the team registry — list of named teams with timestamps. Durable runtime, per-machine. */
 export function getTeamsRegistryPath() { return path.join(HISTORY_DIR, 'teams', 'registry.json'); }
+/** Path to the device registry — SSH device profiles with platform/auth metadata. Durable runtime, per-machine (host list + addresses are NOT pulled by `agents repo push`). */
+export function getDevicesRegistryPath() { return path.join(HISTORY_DIR, 'devices', 'registry.json'); }
 /** Path to cloud dispatch cache (~/.agents/.cache/cloud/). */
 export function getCloudDir() { return CLOUD_DIR; }
 /** Path to terminal session metadata (~/.agents/.cache/terminals/). */

package/dist/lib/teams/agents.d.ts

@@ -50,7 +50,17 @@ type Mode = 'plan' | 'edit' | 'auto' | 'skip';
 export declare function resolveMode(requestedMode: string | null | undefined, defaultMode?: Mode): Mode;
 /** Ensure Gemini's settings.json has experimental.plan enabled for headless plan mode. */
 export declare function ensureGeminiPlanMode(): Promise<void>;
-/** Check whether the CLI binary for a given agent type exists in PATH. Returns [available, pathOrError]. */
+/**
+ * Check whether the CLI binary for a given agent type is installed.
+ * Returns [available, pathOrError].
+ *
+ * The agents-managed shims dir (`~/.agents/.cache/shims`) is the canonical
+ * install location, so a shim there means installed regardless of the caller's
+ * PATH. Non-interactive callers — the menu-bar helper, cron, CI — run with a
+ * minimal launchd PATH that omits the shims dir; a bare PATH lookup false-flags
+ * every shim-based CLI as "not installed". Check the shim first, PATH second
+ * (for CLIs the user installed outside agents-cli).
+ */
 export declare function checkCliAvailable(agentType: AgentType): [boolean, string | null];
 /** Check availability of all known agent CLIs. Returns a map of agent type to install status. */
 export declare function checkAllClis(): Record<string, {

package/dist/lib/teams/agents.js

@@ -18,7 +18,7 @@ import { findExecutable } from '../platform/index.js';
 import { normalizeEvents } from './parsers.js';
 import { debug } from './debug.js';
 import { setGeminiAutoUpdateDisabled, updateGeminiSettings } from '../gemini-settings.js';
-import { getAgentsDir as getSystemAgentsDir } from '../state.js';
+import { getAgentsDir as getSystemAgentsDir, getShimsDir } from '../state.js';
 import { AGENTS } from '../agents.js';
 import { sanitizeProcessEnv } from '../secrets/bundles.js';
 let lastMemoryWarnAt = 0;
@@ -314,12 +314,26 @@ export async function ensureGeminiPlanMode() {
         console.warn('[Swarm] Could not enable Gemini plan mode:', err);
     }
 }
-/** Check whether the CLI binary for a given agent type exists in PATH. Returns [available, pathOrError]. */
+/**
+ * Check whether the CLI binary for a given agent type is installed.
+ * Returns [available, pathOrError].
+ *
+ * The agents-managed shims dir (`~/.agents/.cache/shims`) is the canonical
+ * install location, so a shim there means installed regardless of the caller's
+ * PATH. Non-interactive callers — the menu-bar helper, cron, CI — run with a
+ * minimal launchd PATH that omits the shims dir; a bare PATH lookup false-flags
+ * every shim-based CLI as "not installed". Check the shim first, PATH second
+ * (for CLIs the user installed outside agents-cli).
+ */
 export function checkCliAvailable(agentType) {
     const executable = AGENTS[agentType]?.cliCommand;
     if (!executable) {
         return [false, `Unknown agent type: ${agentType}`];
     }
+    const shimPath = path.join(getShimsDir(), executable);
+    if (fsSync.existsSync(shimPath)) {
+        return [true, shimPath];
+    }
     const resolved = findExecutable(executable);
     return resolved
         ? [true, resolved]

package/dist/lib/types.d.ts

@@ -74,6 +74,7 @@ export interface AgentConfig {
     installScript?: string;
     configDir: string;
     homeFiles?: string[];
+    authFiles?: string[];
     commandsDir: string;
     commandsSubdir: string;
     skillsDir: string;

package/dist/lib/versions.d.ts

@@ -314,6 +314,25 @@ export interface ResourceDiff {
  * Uses filesystem state - no tracking needed.
  */
 export declare function getResourceDiff(agent: AgentId, version: string): ResourceDiff;
+/**
+ * Enumerate the DotAgent repo names that resources can be scoped to:
+ * the fixed `project` / `user` / `system` layers plus every enabled extra
+ * repo alias. Used to validate `agents sync <agent> --repo <name>`.
+ */
+export declare function listRepoNames(): string[];
+/**
+ * Build a ResourceSelection scoped to a single DotAgent repo (`system`,
+ * `user`, `project`, or an extra-repo alias). Every resource kind is filtered
+ * to the entries whose source layer matches `repo`, reusing the same
+ * name→source maps and `source:*` pattern expansion the persisted-pattern
+ * sync path uses. Passing the result as an explicit `selection` means the sync
+ * touches only that repo's resources — no orphan-sweep of the other layers.
+ *
+ * `memory` is set to `[]` (not omitted): that empty-array sentinel is what
+ * `syncResourcesToVersion`'s `skipMemory` gate keys on to leave the memory
+ * file untouched — it's a merge of all layers, not a per-repo artifact.
+ */
+export declare function buildRepoScopedSelection(repo: string, cwd?: string): ResourceSelection;
 /**
  * Sync central resources (~/.agents/) into a specific version's config directory.
  * Copies selected resources from central storage into {versionHome}/.{agent}/.

package/dist/lib/versions.js

@@ -16,13 +16,12 @@
  */
 import * as fs from 'fs';
 import * as path from 'path';
-import * as os from 'os';
 import * as yaml from 'yaml';
 import { exec, execFile } from 'child_process';
 import { promisify } from 'util';
 import chalk from 'chalk';
 import { checkbox, select } from '@inquirer/prompts';
-import { getVersionsDir, ensureAgentsDir, readMeta, writeMeta, getCommandsDir, getSkillsDir, getHooksDir, getResolvedRulesDir, getUserRulesDir, getVersionResources, ensureVersionResourcePatterns, getProjectAgentsDir, getPromptcutsPath, getUserPromptcutsPath, getEnabledExtraRepos, getAgentsDir, getUserAgentsDir, getTrashVersionsDir, getActiveRulesPreset } from './state.js';
+import { getVersionsDir, ensureAgentsDir, readMeta, writeMeta, getCommandsDir, getSkillsDir, getHooksDir, getResolvedRulesDir, getUserRulesDir, getVersionResources, ensureVersionResourcePatterns, getProjectAgentsDir, getPromptcutsPath, getUserPromptcutsPath, getEnabledExtraRepos, getAgentsDir, getUserAgentsDir, getTrashVersionsDir, getActiveRulesPreset, getHomeDir } from './state.js';
 import { defaultPatterns, expandPatterns } from './resource-patterns.js';
 import { listResources } from './resources.js';
 import { AGENTS, agentConfigDirName, getAccountEmail, resolveAgentName, formatAgentError, findInPath } from './agents.js';
@@ -30,6 +29,7 @@ import { discoverPermissionGroups, getActivePermissionPresetName, readPermission
 import { parseMcpServerConfig } from './mcp.js';
 import { createVersionedAlias, removeVersionedAlias, getConfigSymlinkVersion, ensureClaudeInsideSymlink } from './shims.js';
 import { importInstallScriptBinary } from './import.js';
+import { IS_WINDOWS } from './platform/index.js';
 import { supports, explainSkip } from './capabilities.js';
 import { discoverPlugins } from './plugins.js';
 import { loadManifest, saveManifest, buildManifest as buildSyncManifest, isStale } from './staleness/index.js';
@@ -819,12 +819,17 @@ export function getBinaryPath(agent, version) {
         return path.join(grokDownloads, `grok-${version}`);
     }
     if (agent === 'droid') {
-        // Factory's installer drops a standalone native binary at ~/.local/bin/droid
-        // (no npm package, nothing in node_modules/.bin). The binary is global, not
-        // per-version — config isolation rides the ~/.factory symlink switch, not a
-        // separate binary per version. Mirror the shim's `droid` branch so
-        // isVersionInstalled/`agents view` agree with what actually executes.
-        return path.join(os.homedir(), '.local', 'bin', 'droid');
+        // Factory's installer drops a standalone native binary (no npm package,
+        // nothing in node_modules/.bin). The binary is global, not per-version —
+        // config isolation rides the ~/.factory symlink switch, not a separate
+        // binary per version. Install location is platform-specific:
+        //   macOS/Linux: ~/.local/bin/droid       (curl app.factory.ai/cli | sh)
+        //   Windows:     %USERPROFILE%\bin\droid.exe  (irm app.factory.ai/cli/windows | iex)
+        // Mirror the shim's `droid` branch so isVersionInstalled/`agents view`
+        // agree with what actually executes.
+        return IS_WINDOWS
+            ? path.join(getHomeDir(), 'bin', 'droid.exe')
+            : path.join(getHomeDir(), '.local', 'bin', 'droid');
     }
     const versionDir = getVersionDir(agent, version);
     return path.join(versionDir, 'node_modules', '.bin', agentConfig.cliCommand);
@@ -1302,7 +1307,7 @@ export function removeVersion(agent, version) {
     // Clean up dangling config symlink if it pointed to the removed version
     const symlinkVersion = getConfigSymlinkVersion(agent);
     if (symlinkVersion === version) {
-        const configPath = path.join(os.homedir(), agentConfigDirName(agent));
+        const configPath = path.join(getHomeDir(), agentConfigDirName(agent));
         try {
             fs.unlinkSync(configPath);
         }
@@ -1636,6 +1641,68 @@ export function getResourceDiff(agent, version) {
         diff.hooks.dangling.length + diff.memory.dangling.length;
     return diff;
 }
+/**
+ * Enumerate the DotAgent repo names that resources can be scoped to:
+ * the fixed `project` / `user` / `system` layers plus every enabled extra
+ * repo alias. Used to validate `agents sync <agent> --repo <name>`.
+ */
+export function listRepoNames() {
+    return ['project', 'user', 'system', ...getEnabledExtraRepos().map(e => e.alias)];
+}
+/**
+ * Build the name→source-layer map for one resource kind, the input
+ * `expandPatterns` matches `source:*` patterns against. This is the single
+ * source of truth for how each kind attributes its source layer:
+ *   - commands/skills/hooks/subagents → real layer from `listResources`
+ *   - permissions                     → always the system repo
+ *   - mcp                             → project vs user scope preserved
+ *   - plugins/workflows               → user repo
+ * Both the persisted-pattern sync path and `buildRepoScopedSelection` use it
+ * so the attribution can't drift between the two.
+ */
+function resourceSourceMap(kind, cwd, available) {
+    switch (kind) {
+        case 'commands':
+        case 'skills':
+        case 'hooks':
+        case 'subagents':
+            return new Map(listResources(kind, cwd).map(r => [r.name, r.source]));
+        case 'permissions':
+            return new Map(available.permissions.map(n => [n, 'system']));
+        case 'mcp':
+            return new Map(getScopedMcpResources(cwd).map(r => [r.name, r.scope]));
+        case 'plugins':
+            return new Map(available.plugins.map(n => [n, 'user']));
+        case 'workflows':
+            return new Map(available.workflows.map(n => [n, 'user']));
+    }
+}
+/**
+ * Build a ResourceSelection scoped to a single DotAgent repo (`system`,
+ * `user`, `project`, or an extra-repo alias). Every resource kind is filtered
+ * to the entries whose source layer matches `repo`, reusing the same
+ * name→source maps and `source:*` pattern expansion the persisted-pattern
+ * sync path uses. Passing the result as an explicit `selection` means the sync
+ * touches only that repo's resources — no orphan-sweep of the other layers.
+ *
+ * `memory` is set to `[]` (not omitted): that empty-array sentinel is what
+ * `syncResourcesToVersion`'s `skipMemory` gate keys on to leave the memory
+ * file untouched — it's a merge of all layers, not a per-repo artifact.
+ */
+export function buildRepoScopedSelection(repo, cwd = process.cwd()) {
+    const patterns = [`${repo}:*`];
+    const available = getAvailableResources(cwd);
+    const selection = {};
+    const kinds = ['commands', 'skills', 'hooks', 'subagents', 'permissions', 'mcp', 'plugins', 'workflows'];
+    for (const kind of kinds) {
+        const names = expandPatterns(patterns, resourceSourceMap(kind, cwd, available));
+        if (names.length > 0)
+            selection[kind] = names;
+    }
+    // Empty-array sentinel → skip the memory writer (see skipMemory below).
+    selection.memory = [];
+    return selection;
+}
 /**
  * Sync central resources (~/.agents/) into a specific version's config directory.
  * Copies selected resources from central storage into {versionHome}/.{agent}/.
@@ -1701,28 +1768,21 @@ export function syncResourcesToVersion(agent, version, selection, options = {})
                 const patterns = vr[type];
                 if (!Array.isArray(patterns) || patterns.length === 0)
                     continue;
-                const sourceMap = new Map(listResources(kind, cwd).map(r => [r.name, r.source]));
-                patternSelection[type] = expandPatterns(patterns, sourceMap);
+                patternSelection[type] = expandPatterns(patterns, resourceSourceMap(kind, cwd, available));
             }
-            // permissions: all groups are 'system' source.
+            // permissions / mcp / plugins / workflows: source attribution lives in
+            // resourceSourceMap so it can't drift from buildRepoScopedSelection.
             if (Array.isArray(vr.permissions) && vr.permissions.length > 0) {
-                const permMap = new Map(available.permissions.map(n => [n, 'system']));
-                patternSelection.permissions = expandPatterns(vr.permissions, permMap);
+                patternSelection.permissions = expandPatterns(vr.permissions, resourceSourceMap('permissions', cwd, available));
             }
-            // mcp: pattern matching must preserve project vs user scope.
             if (Array.isArray(vr.mcp) && vr.mcp.length > 0) {
-                const mcpMap = new Map(getScopedMcpResources(cwd).map(resource => [resource.name, resource.scope]));
-                patternSelection.mcp = expandPatterns(vr.mcp, mcpMap);
+                patternSelection.mcp = expandPatterns(vr.mcp, resourceSourceMap('mcp', cwd, available));
             }
-            // plugins: treat all as 'user' source for now.
             if (Array.isArray(vr.plugins) && vr.plugins.length > 0) {
-                const pluginMap = new Map(available.plugins.map(n => [n, 'user']));
-                patternSelection.plugins = expandPatterns(vr.plugins, pluginMap);
+                patternSelection.plugins = expandPatterns(vr.plugins, resourceSourceMap('plugins', cwd, available));
             }
-            // workflows: treat all as 'user' source.
             if (Array.isArray(vr.workflows) && vr.workflows.length > 0) {
-                const workflowMap = new Map(available.workflows.map(n => [n, 'user']));
-                patternSelection.workflows = expandPatterns(vr.workflows, workflowMap);
+                patternSelection.workflows = expandPatterns(vr.workflows, resourceSourceMap('workflows', cwd, available));
             }
             // memory is not pattern-controlled (rulesPreset handles it) — always sync.
             patternSelection.memory = 'all';
@@ -2071,7 +2131,7 @@ export function getEffectiveHome(agentId) {
     if (resolved && isVersionInstalled(agentId, resolved)) {
         return getVersionHomePath(agentId, resolved);
     }
-    return os.homedir();
+    return getHomeDir();
 }
 /**
  * Thrown when the user references an agent@version that is not installed.

package/package.json

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