@phnx-labs/agents-cli 1.22.39 → 1.22.41

package/dist/lib/permissions.js

@@ -17,6 +17,10 @@ import { safeJoin } from './paths.js';
 import { agentConfigDirName } from './agents.js';
 import { supports } from './capabilities.js';
 import { updateGeminiSettings } from './gemini-settings.js';
+// The canonical<->native tool vocabularies live in the registry, which also owns
+// the reverse projections — so the serializers below and the readers there can
+// never disagree about what `fs_read` or `developer__shell` means.
+import { ANTIGRAVITY_ACTION_BY_TOOL, CANONICAL_TO_OPENCLAW_TOOL, stripJsonComments, GROK_TOOL_BY_CANONICAL, KIRO_CAPABILITY_BY_TOOL, PERMISSION_TARGETS, readCanonicalPermissions, } from './permissions-registry.js';
 const HOME = os.homedir();
 // PERMISSIONS_CAPABLE_AGENTS removed — use `capableAgents('allowlist')`
 // from lib/capabilities.ts. The capability matrix on AgentConfig is the
@@ -622,19 +626,6 @@ export function convertToDroidFormat(set) {
         commandDenylist: commands(set.deny ?? []),
     };
 }
-/**
- * Canonical tool -> OpenClaw tool id. OpenClaw gates at TOOL granularity only
- * (no sub-command/path/domain patterns), so only these whole-tool ids exist.
- * Any canonical tool not in this map is unsupported and skipped.
- */
-const CANONICAL_TO_OPENCLAW_TOOL = {
-    bash: 'exec',
-    read: 'read',
-    write: 'write',
-    edit: 'write',
-    webfetch: 'web_fetch',
-    websearch: 'web_search',
-};
 /**
  * Convert canonical permission set to OpenClaw's `tools.alsoAllow`/`tools.deny`.
  *
@@ -740,55 +731,6 @@ function serializeAntigravityEntries(perms) {
     }
     return Array.from(out);
 }
-const ANTIGRAVITY_ACTION_BY_TOOL = {
-    bash: 'command',
-    read: 'read_file',
-    write: 'write_file',
-    webfetch: 'read_url',
-};
-const GOOSE_TOOL_BY_CANONICAL = {
-    bash: 'developer__shell',
-    read: 'developer__text_editor',
-    write: 'developer__text_editor',
-    edit: 'developer__text_editor',
-    grep: 'developer__analyze',
-    glob: 'developer__analyze',
-    webfetch: 'developer__fetch',
-    mcp: undefined,
-};
-function canonicalToGooseTool(permission) {
-    if (BLANKET_BASH_FORMS.has(permission))
-        return 'developer__shell';
-    const parsed = parseCanonicalPattern(permission);
-    if (!parsed)
-        return null;
-    return GOOSE_TOOL_BY_CANONICAL[parsed.tool] ?? null;
-}
-/** Convert canonical permissions to Goose's per-tool permission.yaml shape. */
-export function convertToGooseFormat(set) {
-    const alwaysAllow = new Set();
-    const neverAllow = new Set();
-    for (const permission of set.allow) {
-        const tool = canonicalToGooseTool(permission);
-        if (tool)
-            alwaysAllow.add(tool);
-    }
-    for (const permission of set.deny ?? []) {
-        const tool = canonicalToGooseTool(permission);
-        if (tool)
-            neverAllow.add(tool);
-    }
-    for (const tool of neverAllow) {
-        alwaysAllow.delete(tool);
-    }
-    return {
-        user: {
-            always_allow: Array.from(alwaysAllow).sort(),
-            ask_before: [],
-            never_allow: Array.from(neverAllow).sort(),
-        },
-    };
-}
 /**
  * Convert canonical permission set to Grok format.
  * Grok reads ~/.grok/config.toml with
@@ -813,13 +755,6 @@ export function convertToGrokFormat(set) {
     }
     return { permission: { rules } };
 }
-const GROK_TOOL_BY_CANONICAL = {
-    bash: 'bash',
-    read: 'read',
-    write: 'edit',
-    grep: 'grep',
-    webfetch: 'webfetch',
-};
 function canonicalToGrokRule(perm, action) {
     if (BLANKET_BASH_FORMS.has(perm)) {
         return { action, tool: 'bash', pattern: '*' };
@@ -873,20 +808,6 @@ function canonicalToKiroRule(perm, effect) {
             : parsed.pattern;
     return { capability, effect, match: [pattern] };
 }
-const KIRO_CAPABILITY_BY_TOOL = {
-    bash: 'shell',
-    read: 'fs_read',
-    grep: 'fs_read',
-    glob: 'fs_read',
-    write: 'fs_write',
-    edit: 'fs_write',
-    notebookedit: 'fs_write',
-    webfetch: 'web_fetch',
-    websearch: 'web_search',
-    mcp: 'mcp',
-    subagent: 'subagent',
-    skill: 'skill',
-};
 /**
  * Parse a canonical permission string preserving the tool's original casing.
  * `parseCanonicalPattern` lowercases the tool name, which is fine for Grok
@@ -1100,56 +1021,6 @@ export function convertToCodexFormat(set, cwd) {
 // ============================================================================
 // Read agent permissions from native configs
 // ============================================================================
-/**
- * Strip JSON comments for JSONC parsing.
- */
-function stripJsonComments(content) {
-    let result = '';
-    let inString = false;
-    let escape = false;
-    let i = 0;
-    while (i < content.length) {
-        const char = content[i];
-        const next = content[i + 1];
-        if (escape) {
-            result += char;
-            escape = false;
-            i++;
-            continue;
-        }
-        if (char === '\\' && inString) {
-            result += char;
-            escape = true;
-            i++;
-            continue;
-        }
-        if (char === '"') {
-            inString = !inString;
-            result += char;
-            i++;
-            continue;
-        }
-        if (!inString) {
-            if (char === '/' && next === '/') {
-                while (i < content.length && content[i] !== '\n') {
-                    i++;
-                }
-                continue;
-            }
-            if (char === '/' && next === '*') {
-                i += 2;
-                while (i < content.length && !(content[i] === '*' && content[i + 1] === '/')) {
-                    i++;
-                }
-                i += 2;
-                continue;
-            }
-        }
-        result += char;
-        i++;
-    }
-    return result;
-}
 /**
  * Read Claude's current permissions from settings.json.
  */
@@ -1238,7 +1109,17 @@ function readCodexPermissions(scope = 'user', cwd, options) {
     }
 }
 /**
- * Read agent permissions based on agent ID.
+ * Read an agent's currently installed permissions.
+ *
+ * claude/opencode/codex return their NATIVE shape, because `agents permissions
+ * list` renders those three specially — Codex especially, whose config records a
+ * sandbox mode rather than a rule list, so its own fields say more than the
+ * blanket grants that mode widens into.
+ *
+ * Every other allowlist-capable harness returns the canonical `PermissionSet`
+ * that `PERMISSION_TARGETS` reads back. Before RUSH-2676 they returned `null`,
+ * so permissions written for cursor, antigravity, grok, kimi, droid,
+ * copilot, kiro, openclaw and hermes were reported as absent.
  */
 export function readAgentPermissions(agentId, scope = 'user', cwd, options) {
     switch (agentId) {
@@ -1249,7 +1130,7 @@ export function readAgentPermissions(agentId, scope = 'user', cwd, options) {
         case 'codex':
             return readCodexPermissions(scope, cwd, options);
         default:
-            return null;
+            return readCanonicalPermissions(agentId, scope, cwd, options?.home);
     }
 }
 // ============================================================================
@@ -1582,47 +1463,6 @@ export function applyPermissionsToVersion(agentId, set, versionHome, merge = tru
             fs.writeFileSync(configPath, TOML.stringify(config), 'utf-8');
             return { success: true };
         }
-        if (agentId === 'goose') {
-            const permissionsPath = path.join(versionHome, '.config', 'goose', 'permission.yaml');
-            let config = {};
-            if (fs.existsSync(permissionsPath)) {
-                const parsed = yaml.parse(fs.readFileSync(permissionsPath, 'utf-8'));
-                if (parsed && typeof parsed === 'object' && !Array.isArray(parsed)) {
-                    config = parsed;
-                }
-            }
-            const converted = convertToGooseFormat(set).user;
-            const user = (typeof config.user === 'object' && config.user !== null && !Array.isArray(config.user))
-                ? config.user
-                : {};
-            const currentAlways = Array.isArray(user.always_allow) ? user.always_allow.filter((v) => typeof v === 'string') : [];
-            const currentAsk = Array.isArray(user.ask_before) ? user.ask_before.filter((v) => typeof v === 'string') : [];
-            const currentNever = Array.isArray(user.never_allow) ? user.never_allow.filter((v) => typeof v === 'string') : [];
-            if (merge) {
-                const incomingAlways = new Set(converted.always_allow);
-                const incomingNever = new Set(converted.never_allow);
-                const touched = new Set([...incomingAlways, ...incomingNever]);
-                const always = new Set(currentAlways.filter(tool => !touched.has(tool)));
-                const ask = new Set(currentAsk.filter(tool => !touched.has(tool)));
-                const never = new Set(currentNever.filter(tool => !touched.has(tool)));
-                for (const tool of incomingAlways)
-                    always.add(tool);
-                for (const tool of incomingNever)
-                    never.add(tool);
-                user.always_allow = Array.from(always).sort();
-                user.ask_before = Array.from(ask).sort();
-                user.never_allow = Array.from(never).sort();
-            }
-            else {
-                user.always_allow = converted.always_allow;
-                user.ask_before = converted.ask_before;
-                user.never_allow = converted.never_allow;
-            }
-            config.user = user;
-            fs.mkdirSync(path.dirname(permissionsPath), { recursive: true });
-            fs.writeFileSync(permissionsPath, yaml.stringify(config), 'utf-8');
-            return { success: true };
-        }
         if (agentId === 'kimi') {
             const configPath = path.join(versionHome, '.kimi-code', 'config.toml');
             let config = {};
@@ -1918,109 +1758,50 @@ export function codexToCanonical(perms) {
     };
 }
 /**
- * Export agent's current permissions to canonical format.
+ * Export permissions from a specific config file path to canonical format,
+ * auto-detecting the harness from the path.
+ *
+ * Detection walks `PERMISSION_TARGETS` and matches each harness's own declared
+ * filename + parent directory, so it covers all 13 rather than the three
+ * hardcoded `.claude`/`.opencode`/`.codex` fragments it used to know about.
  */
-function exportAgentPermissions(agentId, scope = 'user', cwd) {
-    const perms = readAgentPermissions(agentId, scope, cwd);
-    if (!perms)
+export function exportPermissionsFromPath(filePath) {
+    if (!fs.existsSync(filePath))
         return null;
-    switch (agentId) {
-        case 'claude':
-            return claudeToCanonical(perms);
-        case 'opencode':
-            return openCodeToCanonical(perms);
-        case 'codex':
-            return codexToCanonical(perms);
-        default:
-            return null;
-    }
+    const agentId = detectPermissionAgentFromPath(filePath);
+    if (!agentId)
+        return null;
+    return PERMISSION_TARGETS[agentId].toCanonical(filePath);
 }
 /**
- * Export permissions from a specific config file path to canonical format.
- * Auto-detects agent type from file path/name.
+ * Which harness owns `filePath`, by comparing against the trailing path segments
+ * each registry target declares. Longer (more specific) suffixes win, so
+ * `.kiro/settings/permissions.yaml` is never mistaken for a bare `permissions.yaml`.
  */
-export function exportPermissionsFromPath(filePath) {
-    if (!fs.existsSync(filePath)) {
-        return null;
-    }
-    const content = fs.readFileSync(filePath, 'utf-8');
-    const fileName = path.basename(filePath);
-    const parentDir = path.basename(path.dirname(filePath));
-    // Detect agent type from path
-    let agentId = null;
-    if (fileName === 'settings.json' && parentDir === '.claude') {
-        agentId = 'claude';
-    }
-    else if (fileName === 'opencode.jsonc' || fileName === 'opencode.json' || parentDir === 'opencode' || parentDir === '.opencode') {
-        agentId = 'opencode';
-    }
-    else if (fileName === 'config.toml' && parentDir === '.codex') {
-        agentId = 'codex';
-    }
-    else if (filePath.includes('.claude')) {
-        agentId = 'claude';
-    }
-    else if (filePath.includes('.opencode')) {
-        agentId = 'opencode';
-    }
-    else if (filePath.includes('.codex')) {
-        agentId = 'codex';
-    }
-    if (!agentId) {
-        return null;
-    }
-    try {
-        switch (agentId) {
-            case 'claude': {
-                const config = JSON.parse(content);
-                if (config.permissions) {
-                    return claudeToCanonical({
-                        permissions: {
-                            allow: config.permissions.allow || [],
-                            deny: config.permissions.deny || [],
-                        },
-                    });
-                }
-                return null;
-            }
-            case 'opencode': {
-                // Strip JSONC comments
-                const jsonContent = content.replace(/\/\/.*$/gm, '').replace(/\/\*[\s\S]*?\*\//g, '');
-                const config = JSON.parse(jsonContent);
-                if (config.permission) {
-                    return openCodeToCanonical({
-                        permission: {
-                            bash: config.permission.bash || {},
-                        },
-                    });
-                }
-                return null;
-            }
-            case 'codex': {
-                const config = TOML.parse(content);
-                const perms = {};
-                if (config.approval_policy) {
-                    perms.approval_policy = config.approval_policy;
-                }
-                if (config.sandbox_mode) {
-                    perms.sandbox_mode = config.sandbox_mode;
-                }
-                if (config.sandbox_workspace_write) {
-                    const sw = config.sandbox_workspace_write;
-                    perms.sandbox_workspace_write = {
-                        network_access: sw.network_access,
-                        writable_roots: sw.writable_roots,
-                    };
-                }
-                return codexToCanonical(perms);
+export function detectPermissionAgentFromPath(filePath) {
+    const normalized = path.resolve(filePath).split(path.sep).join('/');
+    let best = null;
+    for (const [agent, target] of Object.entries(PERMISSION_TARGETS)) {
+        const agentId = agent;
+        // `altSuffixes` first: home()/project() may probe the filesystem to choose
+        // between accepted spellings, and with an empty root that probe resolves
+        // against process.cwd() -- so detection must not depend on it.
+        const candidates = [
+            ...(target.altSuffixes ?? []),
+            target.home(''),
+            ...(target.project ? [target.project('')] : []),
+        ];
+        for (const candidate of candidates) {
+            const suffix = candidate.split(path.sep).join('/').replace(/^\/+/, '');
+            if (!suffix)
+                continue;
+            if (normalized === suffix || normalized.endsWith(`/${suffix}`)) {
+                if (!best || suffix.length > best.length)
+                    best = { agentId, length: suffix.length };
             }
-            default:
-                return null;
         }
     }
-    catch {
-        return null;
-    }
+    return best?.agentId ?? null;
 }
 /**
  * Save a permission set to central storage.

package/dist/lib/picker.d.ts

@@ -26,7 +26,21 @@ export interface PickerConfig<T> {
     filter: (query: string) => Array<T | Separator>;
     labelFor: (item: T, query: string) => string;
     buildPreview?: (item: T) => string;
+    /**
+     * Called once with a repaint trigger for the open prompt. An async preview
+     * source (e.g. a remote row's digest arriving over SSH) invokes the trigger
+     * when data `buildPreview` reported as pending is now ready, so the pane
+     * refreshes without a keypress. The trigger is inert after the prompt closes.
+     */
+    registerPreviewRepaint?: (repaint: () => void) => void;
     shortIdFor?: (item: T) => string;
+    /**
+     * Prefix each selectable row with its 1-based position in the current
+     * filtered list (`  1.`, ` 12.`), right-aligned so the labels stay columnar
+     * and a user scanning a long list can tell where they are. Separators are
+     * never numbered.
+     */
+    numbered?: boolean;
     pageSize?: number;
     initialSearch?: string;
     emptyMessage?: string;
@@ -120,6 +134,8 @@ export interface DynamicPickerConfig<T, F, A = never> {
     /** Client-side text filter over the loaded pool (the `S` search). */
     matches?: (item: T, query: string) => boolean;
     buildPreview?: (item: T) => string;
+    /** See {@link PickerConfig.registerPreviewRepaint}. */
+    registerPreviewRepaint?: (repaint: () => void) => void;
     /** Dim summary of the current filter state, rendered in the header. */
     headerFor?: (filter: F) => string;
     /** The hotkey-legend help line; receives the mode so it can adapt. */

package/dist/lib/picker.js

@@ -136,12 +136,35 @@ export function itemPicker(config) {
         const [status, setStatus] = useState('idle');
         const [searchTerm, setSearchTerm] = useState(cfg.initialSearch ?? '');
         const [previewOpen, setPreviewOpen] = useState(Boolean(cfg.buildPreview));
+        // An async preview source repaints the pane by bumping this nonce; the
+        // counter lives in a ref because the trigger closure would otherwise hold a
+        // stale value and the second repaint would silently no-op (the same
+        // stale-closure trap dynamicPicker's reloadNonce documents).
+        const [, setPreviewNonce] = useState(0);
+        const previewNonce = useRef(0);
+        useEffect(() => {
+            cfg.registerPreviewRepaint?.(() => setPreviewNonce((previewNonce.current += 1)));
+        }, []);
         const prefix = usePrefix({ status, theme });
         const results = useMemo(() => {
             const filtered = cfg.filter(searchTerm).slice(0, 50);
-            return filtered.map((item) => Separator.isSeparator(item)
-                ? item
-                : { value: item, label: cfg.labelFor(item, searchTerm) });
+            // Ordinals count only selectable rows, in filtered order, and are padded
+            // to the widest index so single- and double-digit rows stay aligned.
+            const selectableCount = filtered.filter((it) => !Separator.isSeparator(it)).length;
+            const ordinalWidth = String(Math.max(1, selectableCount)).length;
+            let ordinal = 0;
+            return filtered.map((item) => {
+                if (Separator.isSeparator(item))
+                    return item;
+                const label = cfg.labelFor(item, searchTerm);
+                if (!cfg.numbered)
+                    return { value: item, label };
+                ordinal += 1;
+                return {
+                    value: item,
+                    label: `${chalk.gray(`${String(ordinal).padStart(ordinalWidth)}.`)} ${label}`,
+                };
+            });
         }, [searchTerm]);
         // A row is selectable unless it is a divider (Separator). Navigation and the
         // initial cursor skip dividers, and enter never resolves one.
@@ -472,6 +495,13 @@ export function dynamicPicker(config) {
         // changed) can keep the cursor where the user left it. Snapping back to the
         // top every time you star a row would make the key unusable for a second one.
         const loadedFilter = useRef(undefined);
+        // Async preview repaint — same ref-counter shape as reloadNonce above, but
+        // it only re-renders (buildPreview runs in render) without re-running load.
+        const [, setPreviewNonce] = useState(0);
+        const previewNonce = useRef(0);
+        useEffect(() => {
+            cfg.registerPreviewRepaint?.(() => setPreviewNonce((previewNonce.current += 1)));
+        }, []);
         useEffect(() => {
             const my = ++gen.current;
             const filterChanged = loadedFilter.current !== filter;

package/dist/lib/placement.d.ts

@@ -2,7 +2,7 @@
  * Placement — one model for "where does the body run?"
  *
  * The CLI grew several doors that all mean execution target:
- *   run --host / --device / --lease / --box / --cloud
+ *   run --device / --lease / --box / --cloud
  *   routines --placement / --run-on / hostStrategy
  *   monitors --run-on (body) vs --device (owner — NOT placement)
  *   teams --device (teammate pin)

package/dist/lib/placement.js

@@ -2,7 +2,7 @@
  * Placement — one model for "where does the body run?"
  *
  * The CLI grew several doors that all mean execution target:
- *   run --host / --device / --lease / --box / --cloud
+ *   run --device / --lease / --box / --cloud
  *   routines --placement / --run-on / hostStrategy
  *   monitors --run-on (body) vs --device (owner — NOT placement)
  *   teams --device (teammate pin)
@@ -98,7 +98,7 @@ export function placementFromRunFlags(flags) {
     if (where)
         placementFlags.push('--where');
     if (hostT)
-        placementFlags.push('--host/--device');
+        placementFlags.push('--device');
     if (hasLease)
         placementFlags.push('--lease');
     if (hasBox)
@@ -120,7 +120,7 @@ export function placementFromRunFlags(flags) {
         return { kind: 'lease', target: backend, source: '--lease' };
     }
     if (hostT)
-        return { kind: 'device', target: hostT, source: '--host/--device' };
+        return { kind: 'device', target: hostT, source: '--device' };
     return { kind: 'local', source: 'default' };
 }
 /**
@@ -182,7 +182,7 @@ export const PLACEMENT_MATRIX = `
   Intent                         Flag / path
   ─────────────────────────────  ──────────────────────────────────────────
   This machine                   (default)  or  --where local
-  Named fleet box                --where device:<name>   (= --host / --device)
+  Named fleet box                --where device:<name>   (= --device)
   Affinity pick (14d usage)      --where auto            (= --device auto)
   Disposable cloud box           --where lease           (= --lease)
   Reuse warm crabbox             --box <slug>

package/dist/lib/platform/paths.d.ts

@@ -34,6 +34,14 @@ export declare function isWindowsAbsolutePath(p: string): boolean;
  * (no backslashes) it returns the value unchanged.
  */
 export declare function toPosix(p: string): string;
+/**
+ * Fold forward slashes to the platform's native separator. The inverse of
+ * {@link toPosix}: use when a path from a source that emits POSIX separators on
+ * every OS — notably `git`, whose `rev-parse` prints `C:/Users/...` on Windows —
+ * must become a native filesystem path so it compares equal to one built with
+ * `path.*`. On POSIX (`path.sep === '/'`) it returns the value unchanged.
+ */
+export declare function toNativePath(p: string, sep?: string): string;
 /**
  * Derive a filesystem-safe key/slug from an absolute path. Drops the Windows
  * drive colon (`:` is illegal in NTFS filenames / is the ADS separator) and

package/dist/lib/platform/paths.js

@@ -2,6 +2,7 @@
  * Path classification + normalization, platform-aware.
  */
 import * as os from 'os';
+import * as path from 'path';
 /** Windows drive-letter absolute path: `C:\` or `C:/`. */
 const WIN_DRIVE_RE = /^[a-zA-Z]:[\\/]/;
 /**
@@ -65,6 +66,16 @@ export function isWindowsAbsolutePath(p) {
 export function toPosix(p) {
     return p.replace(/\\/g, '/');
 }
+/**
+ * Fold forward slashes to the platform's native separator. The inverse of
+ * {@link toPosix}: use when a path from a source that emits POSIX separators on
+ * every OS — notably `git`, whose `rev-parse` prints `C:/Users/...` on Windows —
+ * must become a native filesystem path so it compares equal to one built with
+ * `path.*`. On POSIX (`path.sep === '/'`) it returns the value unchanged.
+ */
+export function toNativePath(p, sep = path.sep) {
+    return sep === '/' ? p : p.replace(/\//g, sep);
+}
 /**
  * Derive a filesystem-safe key/slug from an absolute path. Drops the Windows
  * drive colon (`:` is illegal in NTFS filenames / is the ADS separator) and

package/dist/lib/platform/posixpath.js

@@ -5,9 +5,9 @@
  * bin symlink into the npm global-bin dir; under nvm (and other per-user node
  * prefixes) that dir is absent from a *non-interactive login* shell's PATH, so
  * `bash -lc 'agents …'` fails with command-not-found. That breaks every
- * consumer that drives a login shell on the box: `agents secrets export --host`
+ * consumer that drives a login shell on the box: `agents secrets export --device`
  * (which runs `bash -lc 'agents secrets import …'` on the remote) and the
- * routines daemon (`src/lib/daemon.ts`, which falls back to bare `agents`).
+ * routines daemon (`src/lib/daemon/daemon.ts`, which falls back to bare `agents`).
  *
  * The fix mirrors the Windows postinstall branch (which registers npm's
  * global-bin dir on the user PATH): symlink the entrypoint into ~/.local/bin —
@@ -65,7 +65,7 @@ export function ensureLocalBinSymlink(name, target, dir = localBinDir()) {
 /**
  * Absolute path to `bash`. We probe bash specifically — NOT the user's $SHELL —
  * because the consumers we are healing run `bash -lc` regardless of login shell:
- * `secrets export --host` builds `bash -lc 'agents secrets import …'` for the
+ * `secrets export --device` builds `bash -lc 'agents secrets import …'` for the
  * remote, and the routines daemon resolves `agents` the same way. On a box whose
  * login shell is zsh, zsh's login PATH may lack ~/.local/bin while bash's
  * includes it (Debian/Ubuntu ~/.profile) — so probing $SHELL would give the

package/dist/lib/{plugin-marketplace.d.ts → plugins/plugin-marketplace.d.ts}

@@ -25,7 +25,7 @@
  * / registerMarketplace / syncAllMarketplaces) all key off a MarketplaceSpec so
  * the catalog name and on-disk layout are derived, never hard-coded per call.
  */
-import type { AgentId, DiscoveredPlugin, MarketplaceSpec, DiscoveredMarketplace } from './types.js';
+import type { AgentId, DiscoveredPlugin, MarketplaceSpec, DiscoveredMarketplace } from '../types.js';
 /**
  * Canonical name for the user-repo marketplace (~/.agents/plugins/). Kept as an
  * exported constant for callers that operate on the user repo directly and for

package/dist/lib/{plugin-marketplace.js → plugins/plugin-marketplace.js}

@@ -26,9 +26,9 @@
  * the catalog name and on-disk layout are derived, never hard-coded per call.
  */
 import * as fs from 'fs';
-import { agentConfigDirName } from './agents.js';
+import { agentConfigDirName } from '../agents.js';
 import * as path from 'path';
-import { getPluginsDir, getEnabledExtraRepos, getProjectPluginsDir, getSystemPluginsDir } from './state.js';
+import { getPluginsDir, getEnabledExtraRepos, getProjectPluginsDir, getSystemPluginsDir } from '../state.js';
 /**
  * Canonical name for the user-repo marketplace (~/.agents/plugins/). Kept as an
  * exported constant for callers that operate on the user repo directly and for

package/dist/lib/{plugins.d.ts → plugins/plugins.d.ts}

@@ -9,7 +9,7 @@
  * contents into agent version homes. Workflows under a plugin’s workflows/
  * are resolved at run time by resolveWorkflowRef (Phase 5 packaging).
  */
-import type { AgentId, DiscoveredPlugin, PluginManifest, MarketplaceSpec } from './types.js';
+import type { AgentId, DiscoveredPlugin, PluginManifest, MarketplaceSpec } from '../types.js';
 export interface PluginCapabilities {
     hasHooks: boolean;
     hasMcp: boolean;

package/dist/lib/{plugins.js → plugins/plugins.js}

@@ -13,13 +13,13 @@ import * as fs from 'fs';
 import * as path from 'path';
 import * as yaml from 'yaml';
 import { execFileSync } from 'child_process';
-import { getPluginsDir, getTrashPluginsDir, getExtraPluginsDir, getProjectPluginsDir, getSystemPluginsDir } from './state.js';
-import { IS_WINDOWS, isWindowsAbsolutePath, homeDir } from './platform/index.js';
-import { assertSafeGitTransport, resolveSnapshotSha } from './git.js';
-import { listInstalledVersions, getVersionHomePath } from './versions.js';
-import { AGENTS, agentConfigDirName } from './agents.js';
-import { capableAgents, isCapable } from './capabilities.js';
-import { shouldInstallCommandAsSkill, installCommandSkillToVersion } from './command-skills.js';
+import { getPluginsDir, getTrashPluginsDir, getExtraPluginsDir, getProjectPluginsDir, getSystemPluginsDir } from '../state.js';
+import { IS_WINDOWS, isWindowsAbsolutePath, homeDir } from '../platform/index.js';
+import { assertSafeGitTransport, resolveSnapshotSha } from '../git.js';
+import { listInstalledVersions, getVersionHomePath } from '../installations/versions.js';
+import { AGENTS, agentConfigDirName } from '../agents.js';
+import { capableAgents, isCapable } from '../capabilities.js';
+import { shouldInstallCommandAsSkill, installCommandSkillToVersion } from '../command-skills.js';
 import { copyPluginToMarketplace, syncMarketplaceManifest, registerMarketplace, unregisterMarketplace, addPluginToSettings, removePluginFromSettings, removePluginFromMarketplace, registerDroidInstalledPlugin, unregisterDroidInstalledPlugin, isDroidPluginInstalled, registerCopilotInstalledPlugin, unregisterCopilotInstalledPlugin, marketplaceIsEmpty, removeEmptyMarketplaceDir, isInstalledInMarketplace, marketplaceRoot, discoverMarketplaces, marketplaceNameFor, MARKETPLACE_NAME, PROJECT_MARKETPLACE_NAME, SYSTEM_MARKETPLACE_NAME, } from './plugin-marketplace.js';
 const PLUGIN_MANIFEST_DIR = '.claude-plugin';
 const PLUGIN_MANIFEST_FILE = 'plugin.json';

package/dist/lib/{skills.d.ts → plugins/skills.d.ts}

@@ -6,7 +6,7 @@
  * (rules/, examples/, etc.). This module handles parsing skill metadata,
  * installing skills into agent version homes, and tracking installation state.
  */
-import type { AgentId, SkillMetadata, InstalledSkill } from './types.js';
+import type { AgentId, SkillMetadata, InstalledSkill } from '../types.js';
 /** User-scoped skills dir (~/.agents/skills/). Used for installs. */
 export declare function getSkillsDir(): string;
 export declare function ensureCentralSkillsDir(): void;