@phnx-labs/agents-cli 1.20.57 → 1.20.59

package/dist/commands/secrets.js

@@ -12,14 +12,14 @@ import { terminalWidth, truncateToWidth, stringWidth } from '../lib/session/widt
 import * as fs from 'fs';
 import { SSH_TARGET_RE, assertValidSshTarget, sshExec } from '../lib/ssh-exec.js';
 import { quoteWin32ExecArg, composeWin32CommandLine } from '../lib/platform/index.js';
-import { ensureDaemonStarted } from '../lib/daemon.js';
+import { ensureDaemonStarted, isDaemonRunning } from '../lib/daemon.js';
 import { parseHostsOption, remoteResolveEnv, remoteSecretsRaw, remoteSecretsStream, resolveSshTarget, } from '../lib/secrets/remote.js';
 import { remoteShellFor, buildWindowsStdinImportCommand } from '../lib/hosts/remote-cmd.js';
 import { resolveRemoteOsSync } from '../lib/hosts/remote-os.js';
 import { bundleExists, bundleItemStore, bundlePolicy, deleteBundle, describeBundle, keychainItemsForBundle, keychainRef, listBundles, migrateLegacyBundles, parseDotenv, readAndResolveBundleEnv, readBundle, renameBundle, rotateBundleSecret, sanitizeProcessEnv, validateBundleName, validateEnvKey, validateExpiresFutureDated, validateSecretType, writeBundle, } from '../lib/secrets/bundles.js';
 import { getKeychainToken, getKeychainTokens, hasKeychainToken, secretsKeychainItem, setKeychainToken, } from '../lib/secrets/index.js';
 import { assertOpAvailable, createPasswordItem, deleteItemByTitle, extractSecrets, itemExistsByTitle, listItems, listVaults, } from '../lib/onepassword.js';
-import { DEFAULT_TTL_MS, agentLoad, agentLock, agentStatus, ensureAgentRunning, installSecretsAgentService, runAgentLoadFromStdin, runSecretsAgent, secretsAgentServiceInstalled, uninstallSecretsAgentService, } from '../lib/secrets/agent.js';
+import { DEFAULT_TTL_MS, agentLoad, agentLock, agentPing, agentStatus, ensureAgentRunning, runAgentLoadFromStdin, runSecretsAgent, uninstallSecretsAgentService, } from '../lib/secrets/agent.js';
 import { parseDuration } from '../lib/hooks/cache.js';
 import { emit } from '../lib/events.js';
 import { registerCommandGroups, setHelpSections } from '../lib/help.js';
@@ -328,12 +328,12 @@ async function browseRemote(targets, args, tty) {
     if (tty) {
         for (const t of targets) {
             const target = await resolveSshTarget(t);
-            render(t, remoteSecretsRaw(target, args, { tty: true }));
+            render(t, remoteSecretsRaw(target, args, { tty: true, osLookupName: t }));
         }
     }
     else {
-        const resolved = await Promise.all(targets.map((t) => resolveSshTarget(t)));
-        const results = resolved.map((target) => remoteSecretsRaw(target, args));
+        const resolved = await Promise.all(targets.map(async (t) => ({ name: t, target: await resolveSshTarget(t) })));
+        const results = resolved.map(({ name, target }) => remoteSecretsRaw(target, args, { osLookupName: name }));
         targets.forEach((t, i) => render(t, results[i]));
     }
     if (failures > 0)
@@ -1476,7 +1476,7 @@ Examples:
                         // engine (BatchMode, ConnectTimeout, keepalive, control-socket
                         // reuse) via the same path the READ inverse (`remoteResolveEnv`)
                         // uses. `--from -` reads the .env off ssh stdin.
-                        res = remoteSecretsRaw(host, ['import', resolvedBundleName, '--from', '-', ...(opts.force ? ['--force'] : [])], { input: dotenv });
+                        res = remoteSecretsRaw(host, ['import', resolvedBundleName, '--from', '-', ...(opts.force ? ['--force'] : [])], { input: dotenv, osLookupName: host });
                     }
                     if (res.code === null) {
                         failures++;
@@ -1584,7 +1584,7 @@ Examples:
                 // locally instead.
                 const { assertRemoteBundleFlagsUnsupported } = await import('../lib/secrets/bundles.js');
                 assertRemoteBundleFlagsUnsupported(bundleName, execOpts.host, { keys: keysSubset, allowExpired: execOpts.allowExpired }, { keysFlag: '--keys', allowExpiredFlag: '--allow-expired' });
-                secretEnv = await remoteResolveEnv(await resolveSshTarget(execOpts.host), bundleName);
+                secretEnv = await remoteResolveEnv(await resolveSshTarget(execOpts.host), bundleName, { osLookupName: execOpts.host });
             }
             else {
                 const { readAndResolveBundleEnv } = await import('../lib/secrets/bundles.js');
@@ -1738,7 +1738,7 @@ Examples:
                 // sees a real TTY, which requires our local terminal to pass straight
                 // through. The remote's prompt + output stream to this terminal; we get
                 // back only the exit code.
-                const code = remoteSecretsStream(target, unlockArgs);
+                const code = remoteSecretsStream(target, unlockArgs, { osLookupName: h });
                 if (code === 0) {
                     console.log(chalk.green(`${h}: unlocked`));
                 }
@@ -1770,13 +1770,13 @@ Examples:
             ttlMs = secs * 1000;
         }
         if (!(await ensureAgentRunning())) {
-            console.error(chalk.red('Could not start the secrets-agent.'));
+            console.error(chalk.red('Could not start the secrets broker.'));
             process.exit(1);
         }
         // #415: the daemon should be always-on for any background need, not only
-        // after `routines add`. A user who only ever unlocks secrets still gets
-        // the daemon installed + running here. `ensureAgentRunning` above only
-        // brings up the standalone secrets broker, not the daemon. Idempotent
+        // after `routines add`. `ensureAgentRunning` prefers the daemon (it hosts
+        // the broker, #416), but can fall back to a one-off broker spawn when the
+        // daemon can't come up — so ensure the daemon is up regardless. Idempotent
         // (single-instance start lock, #414) and best-effort — never blocks unlock.
         ensureDaemonStarted();
         let loaded = 0;
@@ -1830,13 +1830,14 @@ Examples:
             console.log(chalk.gray('secrets-agent is macOS-only.'));
             return;
         }
-        console.log(chalk.gray('service: ') +
-            (secretsAgentServiceInstalled()
-                ? chalk.green('installed (persistent)')
-                : chalk.yellow('not installed — run `agents secrets start` for a persistent broker')));
+        const brokerUp = (await agentPing()).reachable;
+        console.log(chalk.gray('broker: ') +
+            (brokerUp
+                ? chalk.green('running') + chalk.gray(isDaemonRunning() ? ' (hosted by the daemon)' : ' (standalone)')
+                : chalk.yellow('not running — starts on demand, or run `agents secrets start` to bring the daemon up now')));
         const entries = await agentStatus();
         if (entries.length === 0) {
-            console.log(chalk.gray('No bundles unlocked. The secrets-agent is idle or not running.'));
+            console.log(chalk.gray('No bundles unlocked. The secrets broker is idle or not running.'));
             console.log(chalk.gray('Try: agents secrets unlock <bundle>'));
             return;
         }
@@ -1887,29 +1888,37 @@ Examples:
     });
     cmd
         .command('start')
-        .description('Install + start the secrets-agent as a persistent background service (macOS). Survives heavy load; reads connect instantly.')
+        .description('Bring up the always-on daemon that hosts the secrets broker (macOS). Survives heavy load; reads connect instantly.')
         .action(async () => {
         if (process.platform !== 'darwin') {
-            console.error(chalk.red('secrets-agent service is macOS-only.'));
+            console.error(chalk.red('The secrets broker is macOS-only.'));
             process.exit(1);
         }
-        process.stdout.write(chalk.gray('Installing launchd service…\n'));
-        if (await installSecretsAgentService()) {
-            console.log(chalk.green('secrets-agent service running.') + chalk.gray(' It stays up across your macOS login session; unlock/auto-cache now connect instantly.'));
+        process.stdout.write(chalk.gray('Starting the daemon…\n'));
+        ensureDaemonStarted();
+        // The daemon hosts the broker socket-first; wait briefly for it to answer.
+        const deadline = Date.now() + 10000;
+        let reachable = (await agentPing()).reachable;
+        while (!reachable && Date.now() < deadline) {
+            await new Promise((r) => setTimeout(r, 200));
+            reachable = (await agentPing()).reachable;
+        }
+        if (reachable) {
+            console.log(chalk.green('secrets broker running.') + chalk.gray(' Hosted by the always-on daemon; unlock/auto-cache now connect instantly.'));
         }
         else {
-            console.error(chalk.red('Service installed but did not become reachable in time (machine may be heavily loaded — launchd will keep retrying).'));
+            console.error(chalk.red('Daemon started but the broker did not become reachable in time (machine may be heavily loaded — it will keep retrying).'));
             process.exit(1);
         }
     });
     cmd
         .command('stop')
-        .description('Stop + remove the persistent secrets-agent service and wipe what it held.')
+        .description('Lock all bundles and retire any legacy standalone service. The always-on daemon (which hosts the broker) is left running.')
         .action(async () => {
         if (process.platform !== 'darwin')
             return;
         await uninstallSecretsAgentService();
-        console.log(chalk.green('secrets-agent service stopped and removed.'));
+        console.log(chalk.green('Locked all bundles.') + chalk.gray(' The broker stays hosted by the always-on daemon; a legacy standalone service, if any, was retired.'));
     });
     cmd
         .command('_agent-run', { hidden: true })

package/dist/commands/versions.js

@@ -4,7 +4,7 @@ import ora from 'ora';
 import * as fs from 'fs';
 import * as path from 'path';
 import { select, confirm, checkbox } from '@inquirer/prompts';
-import { AGENTS, ALL_AGENT_IDS, getAccountEmail, getAccountInfo, agentLabel, warnAgentDeprecated, } from '../lib/agents.js';
+import { AGENTS, ALL_AGENT_IDS, getAccountEmail, getAccountInfo, agentLabel, warnAgentDeprecated, isSelfUpdatingAgent, } from '../lib/agents.js';
 import { formatUsageSummary, getUsageInfoForIdentity, getUsageInfoByIdentity, getUsageLookupKey, } from '../lib/usage.js';
 import { viewAction } from './view.js';
 import { readManifest, writeManifest, createDefaultManifest } from '../lib/manifest.js';
@@ -67,7 +67,7 @@ async function setDefaultVersion(agent, installedVersion) {
     createVersionedAlias(agent, installedVersion);
     const symlinkResult = await switchConfigSymlink(agent, installedVersion);
     if (symlinkResult.success) {
-        console.log(chalk.green('  Set as default'));
+        console.log(chalk.green(isSelfUpdatingAgent(agent) ? '  Set as active config profile' : '  Set as default'));
         if (symlinkResult.backupPath) {
             console.log(chalk.gray(`  Backed up existing config to: ${symlinkResult.backupPath}`));
         }
@@ -752,7 +752,15 @@ export function registerVersionsCommands(program) {
                 warnIfShimShadowed(agentId);
                 const useEmail = await getAccountEmail(agentId, getVersionHomePath(agentId, finalVersion));
                 const useEmailStr = useEmail ? chalk.cyan(` (${useEmail})`) : '';
-                console.log(chalk.green(`Set ${agentLabel(agentConfig.id)}@${finalVersion} as global default`) + useEmailStr);
+                // Self-updating agents are one binary; `use` only swaps the config
+                // symlink (the profile), it does not change which binary runs — so say
+                // "profile", not "version", to match what actually happened.
+                if (isSelfUpdatingAgent(agentId)) {
+                    console.log(chalk.green(`Switched ${agentLabel(agentConfig.id)} to config profile ${finalVersion}`) + useEmailStr);
+                }
+                else {
+                    console.log(chalk.green(`Set ${agentLabel(agentConfig.id)}@${finalVersion} as global default`) + useEmailStr);
+                }
             }
         }
         catch (err) {

package/dist/commands/view.js

@@ -7,7 +7,7 @@ import * as path from 'path';
 import { AGENTS, ALL_AGENT_IDS, getAllCliStates, getAccountInfo, resolveAgentName, formatAgentError, agentLabel, colorAgent, } from '../lib/agents.js';
 import { deriveUsageStatusFromSnapshot, formatUsageSection, formatUsageSummary, formatUsageStatusBadge, getUsageInfoForIdentity, getUsageInfoByIdentity, getUsageLookupKey, } from '../lib/usage.js';
 import { readManifest } from '../lib/manifest.js';
-import { listInstalledVersions, listInstalledVersionDirs, getGlobalDefault, getVersionHomePath, getVersionDir, getAvailableResources, getActuallySyncedResources, getNewResources, getProjectOnlyResources, hasNewResources, promptNewResourceSelection, syncResourcesToVersion, removeVersion, printTrashFooter, reconcileStaleLatestForAgent, } from '../lib/versions.js';
+import { listInstalledVersions, listInstalledVersionDirs, getGlobalDefault, getVersionHomePath, getVersionDir, getAvailableResources, getActuallySyncedResources, getNewResources, getProjectOnlyResources, hasNewResources, promptNewResourceSelection, syncResourcesToVersion, removeVersion, printTrashFooter, reconcileStaleLatestForAgent, isGlobalBinaryAgent, getLiveVersion, } from '../lib/versions.js';
 import { ensureVersionedAliasCurrent, removeShim, } from '../lib/shims.js';
 import { getAgentResources } from '../lib/resources.js';
 import { resolveVersionFilter, AgentSpecError } from '../lib/agent-spec/index.js';
@@ -358,6 +358,19 @@ async function showInstalledVersions(filterAgentId) {
             profileOnly.push(agentId);
         }
     }
+    // For self-updating global-binary agents (droid) the on-disk version-dir name
+    // is a stale label — the real version is whatever `<cli> --version` reports.
+    // Resolve it once so every row/width pass shows the live version, while the
+    // per-version home + account lookups keep using the real dir name.
+    const liveVersionByAgent = new Map();
+    await Promise.all(versionManaged
+        .filter((agentId) => isGlobalBinaryAgent(agentId))
+        .map(async (agentId) => {
+        const live = await getLiveVersion(agentId);
+        if (live)
+            liveVersionByAgent.set(agentId, live);
+    }));
+    const displayVersion = (agentId, dirVersion) => liveVersionByAgent.get(agentId) ?? dirVersion;
     // Show version-managed agents
     if (versionManaged.length > 0) {
         // Calculate column widths across all agents for alignment
@@ -370,7 +383,8 @@ async function showInstalledVersions(filterAgentId) {
             const versions = listInstalledVersions(agentId);
             const globalDefault = getGlobalDefault(agentId);
             for (const v of versions) {
-                const label = v === globalDefault ? `${v} (default)` : v;
+                const shown = displayVersion(agentId, v);
+                const label = v === globalDefault ? `${shown} (default)` : shown;
                 maxVerLabel = Math.max(maxVerLabel, label.length);
                 const rawInfo = infoMap.get(`${agentId}:${v}`);
                 const info = rawInfo ? mergeCanonical(rawInfo) : undefined;
@@ -423,9 +437,10 @@ async function showInstalledVersions(filterAgentId) {
             });
             for (const version of sortedVersions) {
                 const isDefault = version === globalDefault;
-                const base = isDefault ? `${version} (default)` : version;
+                const shown = displayVersion(agentId, version);
+                const base = isDefault ? `${shown} (default)` : shown;
                 const padded = base.padEnd(maxVerLabel);
-                const label = isDefault ? `${version}${chalk.green(' (default)')}${' '.repeat(maxVerLabel - base.length)}` : padded;
+                const label = isDefault ? `${shown}${chalk.green(' (default)')}${' '.repeat(maxVerLabel - base.length)}` : padded;
                 const rawInfo = infoMap.get(`${agentId}:${version}`);
                 const vInfo = rawInfo ? mergeCanonical(rawInfo) : undefined;
                 const usageKey = getUsageLookupKey(vInfo);

package/dist/index.js

@@ -50,7 +50,7 @@ if (IS_DEV_BUILD) {
 // module on each invocation (which loaded the whole ~50-module tree before the
 // first byte of output), the registry maps a command name to a thunk that
 // imports only what that command needs. See src/lib/startup/command-registry.ts.
-import { COMMAND_LOADERS, LAZY_COMMAND_NAMES, loadView, loadInspect, loadFeedback, loadCommands, loadHooks, loadSkills, loadRules, loadMemory, loadPermissions, loadMcp, loadCli, loadSubagents, loadPlugins, loadWorkflows, loadWorktree, loadVersions, loadImport, loadPackages, loadDaemon, loadRoutines, loadRun, loadDefaults, loadModels, loadPrune, loadTrash, loadRestore, loadDoctor, loadCheck, loadStatus, loadProfiles, loadSecrets, loadWallet, loadHelper, loadMenubar, loadBeta, loadSync, loadLock, loadRefreshRules, loadDrive, loadFactory, loadUsage, loadCost, loadBudget, loadAlias, loadPty, loadTmux, loadWatchdog, loadBrowser, loadComputer, loadHosts, loadLogs, loadEvents, loadAudit, loadSsh, loadPull, loadPush, loadRepo, loadSetup, loadFeed, } from './lib/startup/command-registry.js';
+import { COMMAND_LOADERS, LAZY_COMMAND_NAMES, loadView, loadInspect, loadFeedback, loadCommands, loadHooks, loadSkills, loadRules, loadMemory, loadPermissions, loadMcp, loadCli, loadSubagents, loadPlugins, loadWorkflows, loadWorktree, loadVersions, loadImport, loadPackages, loadDaemon, loadRoutines, loadRun, loadDefaults, loadModels, loadPrune, loadTrash, loadRestore, loadDoctor, loadCheck, loadStatus, loadProfiles, loadSecrets, loadWallet, loadHelper, loadMenubar, loadBeta, loadSync, loadLock, loadRefreshRules, loadDrive, loadFactory, loadUsage, loadCost, loadOutput, loadBudget, loadAlias, loadPty, loadTmux, loadWatchdog, loadBrowser, loadComputer, loadHosts, loadLogs, loadEvents, loadAudit, loadSsh, loadPull, loadPush, loadRepo, loadSetup, loadFeed, } from './lib/startup/command-registry.js';
 import { applyGlobalHelpConventions } from './lib/help.js';
 import { renderWhatsNew } from './lib/whats-new.js';
 import { emit, redactArgs } from './lib/events.js';
@@ -690,6 +690,7 @@ async function registerAllEagerCommands() {
     await reg(loadFactory);
     await reg(loadUsage);
     await reg(loadCost);
+    await reg(loadOutput);
     await reg(loadBudget);
     await reg(loadAlias);
     await reg(loadPty);

package/dist/lib/agents.d.ts

@@ -34,6 +34,27 @@ export declare function findInPath(command: string): string | null;
 export declare const AGENTS: Record<AgentId, AgentConfig>;
 /** All registered agent IDs derived from the AGENTS registry. */
 export declare const ALL_AGENT_IDS: AgentId[];
+/**
+ * A self-updating agent is a single global binary installed by an official
+ * `curl … | sh` / `brew install` script that carries NO version token — the
+ * installer can only ever fetch the *current* release, and the binary then keeps
+ * itself up to date in place (droid, grok, antigravity, cursor, hermes, forge,
+ * kiro, goose). There is no semver to pin, so agents-cli must not model these as
+ * having multiple installable version-homes the way it does for npm-packaged
+ * agents (claude, codex, kimi, …).
+ *
+ * The predicate is `!npmPackage && installScript && !installScript.includes('VERSION')`:
+ *   - `npmPackage` empty       → not installed from npm, so `agents add x@1.2.3`
+ *                                can't resolve a registry version.
+ *   - `installScript` present  → it IS installed by a script (not unmanaged).
+ *   - no `VERSION` placeholder → the script has no slot for a pinned version
+ *                                (contrast: an installer templated with `VERSION`
+ *                                could pin, and is NOT self-updating).
+ *
+ * Route every "is this a pinnable, multi-version agent?" decision through here —
+ * never a scattered `agent === 'droid'`.
+ */
+export declare function isSelfUpdatingAgent(agent: AgentId): boolean;
 /** Get the chalk color function for an agent. Works for any AgentId or SessionAgentId. */
 export declare function colorAgent(agentId: string): (s: string) => string;
 /** Return the agent's display name, colored. */

package/dist/lib/agents.js

@@ -236,7 +236,7 @@ export const AGENTS = {
         cloudProvider: 'codex',
         // Subagents: multi-agent plumbing since 0.117.0; custom agents as
         // ~/.codex/agents/*.toml (name, description, developer_instructions).
-        capabilities: { hooks: { since: '0.116.0' }, mcp: true, mcpHttp: true, mcpHeaders: false, allowlist: false, skills: true, commands: { until: '0.117.0' }, plugins: { since: '0.128.0' }, subagents: { since: '0.117.0' }, rules: { file: 'AGENTS.md' }, workflows: false, memory: true, modes: ['plan', 'edit', 'skip'] },
+        capabilities: { hooks: { since: '0.116.0' }, mcp: true, mcpHttp: true, mcpHeaders: false, allowlist: { since: '0.138.0' }, skills: true, commands: { until: '0.117.0' }, plugins: { since: '0.128.0' }, subagents: { since: '0.117.0' }, rules: { file: 'AGENTS.md' }, workflows: false, memory: true, modes: ['plan', 'edit', 'skip'] },
     },
     gemini: {
         id: 'gemini',
@@ -290,7 +290,7 @@ export const AGENTS = {
         format: 'markdown',
         variableSyntax: '$ARGUMENTS',
         supportsHooks: true,
-        capabilities: { hooks: true, mcp: true, mcpHttp: false, mcpHeaders: false, allowlist: false, skills: true, commands: true, plugins: true, subagents: false, rules: { file: '.cursorrules' }, workflows: false, memory: false, modes: ['edit', 'skip'] },
+        capabilities: { hooks: true, mcp: true, mcpHttp: false, mcpHeaders: false, allowlist: true, skills: true, commands: true, plugins: true, subagents: false, rules: { file: '.cursorrules' }, workflows: false, memory: false, modes: ['edit', 'skip'] }, // allowlist: ~/.cursor/cli-config.json
     },
     opencode: {
         id: 'opencode',
@@ -310,7 +310,7 @@ export const AGENTS = {
         format: 'markdown',
         variableSyntax: '$ARGUMENTS',
         supportsHooks: false,
-        capabilities: { hooks: false, mcp: true, mcpHttp: false, mcpHeaders: false, allowlist: { since: '1.1.1' }, skills: true, commands: true, plugins: true, subagents: true, rules: { file: 'AGENTS.md' }, workflows: false, memory: false, modes: ['plan', 'edit'] }, // subagents: ~/.config/opencode/agents/*.md
+        capabilities: { hooks: false, mcp: true, mcpHttp: false, mcpHeaders: false, allowlist: { since: '1.1.1' }, skills: true, commands: true, plugins: true, subagents: true, rules: { file: 'AGENTS.md' }, workflows: false, memory: false, modes: ['plan', 'edit'] },
     },
     openclaw: {
         id: 'openclaw',
@@ -353,7 +353,7 @@ export const AGENTS = {
         format: 'markdown',
         variableSyntax: '$ARGUMENTS',
         supportsHooks: true,
-        capabilities: { hooks: true, mcp: true, mcpHttp: false, mcpHeaders: false, allowlist: false, skills: true, commands: true, plugins: true, subagents: false, rules: { file: 'AGENTS.md' }, workflows: false, memory: false, modes: ['plan', 'edit', 'auto', 'skip'] },
+        capabilities: { hooks: true, mcp: true, mcpHttp: false, mcpHeaders: false, allowlist: false, skills: true, commands: true, plugins: true, subagents: { since: '0.0.353' }, rules: { file: 'AGENTS.md' }, workflows: false, memory: false, modes: ['plan', 'edit', 'auto', 'skip'] },
     },
     amp: {
         id: 'amp',
@@ -393,7 +393,7 @@ export const AGENTS = {
         format: 'markdown',
         variableSyntax: '$ARGUMENTS',
         supportsHooks: true,
-        capabilities: { hooks: { since: '0.10.0' }, mcp: true, mcpHttp: false, mcpHeaders: false, allowlist: false, skills: true, commands: true, plugins: false, subagents: false, rules: { file: 'AGENTS.md' }, workflows: false, memory: false, modes: ['edit'] },
+        capabilities: { hooks: { since: '0.10.0' }, mcp: true, mcpHttp: false, mcpHeaders: false, allowlist: { since: '2.8.0' }, skills: true, commands: true, plugins: false, subagents: { since: '1.23.0' }, rules: { file: 'AGENTS.md' }, workflows: false, memory: false, modes: ['edit'] },
     },
     goose: {
         id: 'goose',
@@ -405,7 +405,10 @@ export const AGENTS = {
         configDir: path.join(HOME, '.config', 'goose'),
         commandsDir: path.join(HOME, '.config', 'goose', 'commands'),
         commandsSubdir: 'commands',
-        skillsDir: path.join(HOME, '.config', 'goose', 'skills'),
+        // Goose reads skills directly from central ~/.agents/skills/ via the Summon
+        // extension (block-goose-cli ≥ 1.25.0). No per-version copy is written.
+        skillsDir: path.join(HOME, '.agents', 'skills'),
+        nativeAgentsSkillsDir: true,
         // Hooks: Open Plugins format — auto-discovered from
         // ~/.agents/plugins/<name>/hooks/hooks.json (shipped block-goose-cli
         // ≥ 1.34.0). See registerHooksForGoose.
@@ -416,7 +419,7 @@ export const AGENTS = {
         supportsHooks: true,
         // Plugins: Open Plugins under ~/.agents/plugins/<name>/ (same layout as
         // agents-cli source). Version isolation copies into versionHome/.agents/plugins/.
-        capabilities: { hooks: { since: '1.34.0' }, mcp: true, mcpHttp: false, mcpHeaders: false, allowlist: false, skills: false, commands: false, plugins: true, subagents: false, rules: { file: 'AGENTS.md' }, workflows: false, memory: false, modes: ['edit'] },
+        capabilities: { hooks: { since: '1.34.0' }, mcp: true, mcpHttp: false, mcpHeaders: false, allowlist: false, skills: { since: '1.25.0' }, commands: false, plugins: true, subagents: false, rules: { file: 'AGENTS.md' }, workflows: false, memory: false, modes: ['edit'] },
     },
     // Google Antigravity CLI (`agy`) — official replacement for Gemini CLI as of IO 2026.
     // configDir nests inside `~/.gemini/` since agy shares the parent dir with the Gemini
@@ -560,7 +563,7 @@ export const AGENTS = {
         authFiles: ['auth.v2.file', 'auth.v2.key'],
         commandsDir: path.join(HOME, '.factory', 'commands'),
         commandsSubdir: 'commands',
-        skillsDir: '', // no skills concept
+        skillsDir: path.join(HOME, '.factory', 'skills'),
         hooksDir: 'hooks',
         pluginManifestDir: '.factory-plugin',
         instructionsFile: 'AGENTS.md',
@@ -575,8 +578,8 @@ export const AGENTS = {
             mcp: true,
             mcpHttp: false,
             mcpHeaders: false,
-            allowlist: false,
-            skills: false,
+            allowlist: { since: '0.57.5' },
+            skills: { since: '0.26.0' },
             commands: true,
             plugins: true,
             subagents: true,
@@ -661,6 +664,30 @@ export const AGENTS = {
 };
 /** All registered agent IDs derived from the AGENTS registry. */
 export const ALL_AGENT_IDS = Object.keys(AGENTS);
+/**
+ * A self-updating agent is a single global binary installed by an official
+ * `curl … | sh` / `brew install` script that carries NO version token — the
+ * installer can only ever fetch the *current* release, and the binary then keeps
+ * itself up to date in place (droid, grok, antigravity, cursor, hermes, forge,
+ * kiro, goose). There is no semver to pin, so agents-cli must not model these as
+ * having multiple installable version-homes the way it does for npm-packaged
+ * agents (claude, codex, kimi, …).
+ *
+ * The predicate is `!npmPackage && installScript && !installScript.includes('VERSION')`:
+ *   - `npmPackage` empty       → not installed from npm, so `agents add x@1.2.3`
+ *                                can't resolve a registry version.
+ *   - `installScript` present  → it IS installed by a script (not unmanaged).
+ *   - no `VERSION` placeholder → the script has no slot for a pinned version
+ *                                (contrast: an installer templated with `VERSION`
+ *                                could pin, and is NOT self-updating).
+ *
+ * Route every "is this a pinnable, multi-version agent?" decision through here —
+ * never a scattered `agent === 'droid'`.
+ */
+export function isSelfUpdatingAgent(agent) {
+    const cfg = AGENTS[agent];
+    return !cfg.npmPackage && !!cfg.installScript && !cfg.installScript.includes('VERSION');
+}
 // Capability-filtered agent lists used to live here as `*_CAPABLE_AGENTS`
 // constants. They were a frequent source of silent-skip bugs (e.g. grok
 // rules sync gated on `COMMANDS_CAPABLE_AGENTS`). Use `capableAgents(cap)`
@@ -1802,8 +1829,8 @@ export function getUserMcpConfigPath(agentId) {
             // Codex uses TOML config
             return path.join(agent.configDir, 'config.toml');
         case 'opencode':
-            // OpenCode uses JSONC config
-            return path.join(agent.configDir, 'opencode.jsonc');
+            // OpenCode loads ~/.config/opencode/opencode.jsonc (not ~/.opencode/)
+            return path.join(HOME, '.config', 'opencode', 'opencode.jsonc');
         case 'cursor':
             // Cursor uses mcp.json
             return path.join(agent.configDir, 'mcp.json');
@@ -1841,7 +1868,7 @@ export function getMcpConfigPathForHome(agentId, home) {
         case 'codex':
             return path.join(home, '.codex', 'config.toml');
         case 'opencode':
-            return path.join(home, '.opencode', 'opencode.jsonc');
+            return path.join(home, '.config', 'opencode', 'opencode.jsonc');
         case 'cursor':
             return path.join(home, '.cursor', 'mcp.json');
         case 'openclaw':
@@ -1879,7 +1906,8 @@ function getProjectMcpConfigPath(agentId, cwd = process.cwd()) {
         case 'codex':
             return path.join(cwd, `.${agentId}`, 'config.toml');
         case 'opencode':
-            return path.join(cwd, `.${agentId}`, 'opencode.jsonc');
+            // Project config is opencode.jsonc at project root (not .opencode/)
+            return path.join(cwd, 'opencode.jsonc');
         case 'cursor':
             return path.join(cwd, `.${agentId}`, 'mcp.json');
         case 'openclaw':

package/dist/lib/daemon.d.ts

@@ -82,12 +82,12 @@ export declare function readDaemonClaudeOAuthToken(opts?: {
  */
 export declare function writeOwnerOnlyServiceManifest(filePath: string, content: string): void;
 /** Generate a macOS launchd plist for auto-starting the daemon. */
-export declare function generateLaunchdPlist(oauthToken?: string | null): string;
+export declare function generateLaunchdPlist(oauthToken?: string | null, agentsBin?: string): string;
 /** Generate a Linux systemd user unit for auto-starting the daemon. */
-export declare function generateSystemdUnit(oauthToken?: string | null): string;
+export declare function generateSystemdUnit(oauthToken?: string | null, agentsBin?: string): string;
 export declare function getAgentsBinPath(argv1?: string | undefined, execPath?: string): string;
 /** Start the daemon via launchd, systemd, or as a detached process. */
-export declare function startDaemon(): {
+export declare function startDaemon(agentsBin?: string): {
     pid: number | null;
     method: string;
 };
@@ -129,8 +129,8 @@ export declare function buildDetachedDaemonEnv(baseEnv?: NodeJS.ProcessEnv, oaut
  * Going through `process.execPath` means a real PE/binary is spawned with
  * `detached: true` and no console, so nothing signals the daemon after launch.
  *
- * When the entry isn't a JS file (e.g. a native launcher resolved via
- * `which agents`), run it directly — it owns its own runtime resolution.
+ * When the entry isn't a Node script (e.g. a native compiled launcher), run it
+ * directly — it owns its own runtime resolution.
  */
 export declare function getDaemonLaunch(agentsBin?: string): {
     command: string;

package/dist/lib/daemon.js

@@ -674,8 +674,7 @@ export function writeOwnerOnlyServiceManifest(filePath, content) {
     fs.writeFileSync(filePath, content, { encoding: 'utf-8', mode: 0o600 });
 }
 /** Generate a macOS launchd plist for auto-starting the daemon. */
-export function generateLaunchdPlist(oauthToken = readDaemonClaudeOAuthToken()) {
-    const agentsBin = getAgentsBinPath();
+export function generateLaunchdPlist(oauthToken = readDaemonClaudeOAuthToken(), agentsBin = getAgentsBinPath()) {
     const launch = getDaemonLaunch(agentsBin);
     const logPath = getLogPath();
     const oauthEntry = oauthToken
@@ -704,7 +703,7 @@ ${[launch.command, ...launch.args].map((arg) => `    <string>${xmlEscape(arg)}</
   <key>EnvironmentVariables</key>
   <dict>
     <key>PATH</key>
-    <string>/usr/local/bin:/usr/bin:/bin:/opt/homebrew/bin:${os.homedir()}/.bun/bin:${os.homedir()}/.nvm/versions/node/v24.0.0/bin</string>${oauthEntry}
+    <string>${daemonNodeBinDir()}:/usr/local/bin:/usr/bin:/bin:/opt/homebrew/bin:${os.homedir()}/.bun/bin</string>${oauthEntry}
   </dict>
 </dict>
 </plist>`;
@@ -714,8 +713,7 @@ function systemdExecArg(value) {
     return `"${value.replace(/\\/g, '\\\\').replace(/"/g, '\\"')}"`;
 }
 /** Generate a Linux systemd user unit for auto-starting the daemon. */
-export function generateSystemdUnit(oauthToken = readDaemonClaudeOAuthToken()) {
-    const agentsBin = getAgentsBinPath();
+export function generateSystemdUnit(oauthToken = readDaemonClaudeOAuthToken(), agentsBin = getAgentsBinPath()) {
     const launch = getDaemonLaunch(agentsBin);
     const execStart = [launch.command, ...launch.args].map(systemdExecArg).join(' ');
     const oauthLine = oauthToken
@@ -730,7 +728,7 @@ Type=simple
 ExecStart=${execStart}
 Restart=always
 RestartSec=10
-Environment=PATH=/usr/local/bin:/usr/bin:/bin:${os.homedir()}/.nvm/versions/node/v24.0.0/bin${oauthLine}
+Environment=PATH=${daemonNodeBinDir()}:/usr/local/bin:/usr/bin:/bin${oauthLine}
 
 [Install]
 WantedBy=default.target`;
@@ -802,7 +800,7 @@ function readServiceManagerPid(platform = os.platform()) {
     return null;
 }
 /** Start the daemon via launchd, systemd, or as a detached process. */
-export function startDaemon() {
+export function startDaemon(agentsBin) {
     if (isDaemonRunning()) {
         const pid = readDaemonPid();
         return { pid, method: 'already-running' };
@@ -814,7 +812,7 @@ export function startDaemon() {
         return { pid, method: 'already-starting' };
     }
     try {
-        return startDaemonLocked();
+        return startDaemonLocked(agentsBin ?? getAgentsBinPath());
     }
     finally {
         releaseLock();
@@ -838,7 +836,7 @@ export function ensureDaemonStarted() {
         return null;
     }
 }
-function startDaemonLocked() {
+function startDaemonLocked(agentsBin) {
     const platform = os.platform();
     if (platform === 'darwin') {
         try {
@@ -849,7 +847,7 @@ function startDaemonLocked() {
             }
             // The plist may embed a long-lived OAuth token in EnvironmentVariables;
             // create owner-only atomically (no world-readable window before chmod).
-            writeOwnerOnlyServiceManifest(plistPath, generateLaunchdPlist());
+            writeOwnerOnlyServiceManifest(plistPath, generateLaunchdPlist(undefined, agentsBin));
             try {
                 execFileSync('launchctl', ['unload', plistPath], { encoding: 'utf-8', stdio: ['ignore', 'pipe', 'ignore'] });
             }
@@ -867,7 +865,7 @@ function startDaemonLocked() {
         catch {
             // load threw — fall through to detached spawn
         }
-        return startDetached();
+        return startDetached({ agentsBin });
     }
     if (platform === 'linux') {
         try {
@@ -877,7 +875,7 @@ function startDaemonLocked() {
                 fs.mkdirSync(unitDir, { recursive: true });
             }
             // May embed a long-lived OAuth token in an Environment= line; owner-only.
-            writeOwnerOnlyServiceManifest(unitPath, generateSystemdUnit());
+            writeOwnerOnlyServiceManifest(unitPath, generateSystemdUnit(undefined, agentsBin));
             execFileSync('systemctl', ['--user', 'daemon-reload'], { encoding: 'utf-8' });
             execFileSync('systemctl', ['--user', 'enable', SYSTEMD_UNIT], { encoding: 'utf-8' });
             execFileSync('systemctl', ['--user', 'start', SYSTEMD_UNIT], { encoding: 'utf-8' });
@@ -890,9 +888,9 @@ function startDaemonLocked() {
         catch {
             // start threw — fall through to detached spawn
         }
-        return startDetached();
+        return startDetached({ agentsBin });
     }
-    return startDetached();
+    return startDetached({ agentsBin });
 }
 /**
  * Environment for the detached daemon fallback. The launchd/systemd paths
@@ -925,18 +923,68 @@ export function buildDetachedDaemonEnv(baseEnv = process.env, oauthToken = readD
  * Going through `process.execPath` means a real PE/binary is spawned with
  * `detached: true` and no console, so nothing signals the daemon after launch.
  *
- * When the entry isn't a JS file (e.g. a native launcher resolved via
- * `which agents`), run it directly — it owns its own runtime resolution.
+ * When the entry isn't a Node script (e.g. a native compiled launcher), run it
+ * directly — it owns its own runtime resolution.
  */
 export function getDaemonLaunch(agentsBin = getAgentsBinPath()) {
     const { warnings } = validateDaemonBinary(agentsBin);
     for (const w of warnings)
         process.stderr.write(`[agents] ${w}\n`);
-    if (/\.(c|m)?js$/.test(agentsBin)) {
+    if (isNodeScriptEntry(agentsBin)) {
         return { command: process.execPath, args: [agentsBin, 'daemon', '_run'] };
     }
     return { command: agentsBin, args: ['daemon', '_run'] };
 }
+/**
+ * A daemon entry must be launched through the Node runtime when it is a Node
+ * script — a `.js`/`.cjs`/`.mjs` file, OR a symlink/extension-less shim whose
+ * shebang names `node`. Package installs link `bin/agents` to a `dist/index.js`
+ * (a symlink) or drop an extension-less `#!/usr/bin/env node` shim, so an
+ * extension check alone misses them and they get run directly. Executing such an
+ * entry then relies on the shebang resolving `node` off the daemon's PATH — and
+ * when that PATH points at a pruned nvm version (or an ancient system node), the
+ * daemon crash-loops at import (`node:util` has no `styleText` on Node 18). A
+ * real compiled binary (Mach-O/ELF/PE) has no `#!node` shebang, so it takes the
+ * direct branch and owns its own runtime resolution.
+ */
+function isNodeScriptEntry(agentsBin) {
+    let resolved = agentsBin;
+    try {
+        resolved = fs.realpathSync(agentsBin);
+    }
+    catch {
+        // Unresolvable (e.g. a template path that does not exist on this box): fall
+        // back to the extension check on the path as given.
+    }
+    if (/\.(c|m)?js$/.test(resolved))
+        return true;
+    try {
+        const fd = fs.openSync(resolved, 'r');
+        try {
+            const buf = Buffer.alloc(128);
+            const n = fs.readSync(fd, buf, 0, 128, 0);
+            const firstLine = buf.toString('utf-8', 0, n).split('\n', 1)[0];
+            return firstLine.startsWith('#!') && /\bnode\b/.test(firstLine);
+        }
+        finally {
+            fs.closeSync(fd);
+        }
+    }
+    catch {
+        return false;
+    }
+}
+/**
+ * The directory of the Node runtime that generated this service manifest, kept
+ * first on the daemon's PATH. Both the shim's shebang and any child routine
+ * process then resolve the exact Node that installed the service — never an
+ * ancient system node or a pruned nvm version. Replaces the old hardcoded
+ * `~/.nvm/versions/node/v24.0.0/bin`, which went stale the moment that patch
+ * release was upgraded away and bricked the daemon fleet-wide.
+ */
+function daemonNodeBinDir() {
+    return path.dirname(process.execPath);
+}
 /**
  * Build the argv to relaunch the `agents` CLI with the given subcommand args.
  *