@phnx-labs/agents-cli 1.20.86 → 1.20.88

package/dist/lib/versions.js

@@ -43,7 +43,7 @@ import { discoverPlugins, marketplaceSpecForName } from './plugins.js';
 import { loadManifest, saveManifest, buildManifest as buildSyncManifest, isStale } from './staleness/index.js';
 import { emit } from './events.js';
 import { safeJoin } from './paths.js';
-import { readSkillSourceCommandMarker, shouldInstallCommandAsSkill } from './command-skills.js';
+import { readSkillSourceCommandMarker, shouldAlsoInstallCommandAsSkill, shouldInstallCommandAsSkill, } from './command-skills.js';
 import { getWriter, getDetector } from './staleness/registry.js';
 import { syncMemoryToVersionHome } from './memory.js';
 import { listPluginSkillNames, resolveCommandSource, resolveSkillSource } from './staleness/writers/sources.js';
@@ -2555,21 +2555,30 @@ export function syncResourcesToVersion(agent, version, selection, options = {})
     };
     const trustedCommandNames = (names) => names.filter((name) => resolveCommandSource(name) !== null);
     // Sync commands — dispatch through WRITERS.commands. The writer dispatches
-    // between native (file copy / TOML conversion) and commands-as-skills
-    // (grok, Codex >= 0.117.0) based on `shouldInstallCommandAsSkill`. The
-    // previous COMMANDS_CAPABLE_AGENTS gate excluded grok even though it
-    // takes the commands-as-skills path — silently dropping every command.
+    // between native (file copy / TOML conversion), commands-as-skills, and the
+    // registry-driven dual-write path based on the command-skill predicates. The
+    // previous COMMANDS_CAPABLE_AGENTS gate excluded skills-only targets such as
+    // Kimi, silently dropping every converted command.
     const commandsWriter = getWriter('commands', agent);
     const commandsToSync = selection
         ? trustedCommandNames(resolveSelection(selection.commands, available.commands))
         : trustedCommandNames(available.commands); // No selection = sync all trusted commands, excluding project-only commands
     const commandsAsSkills = shouldInstallCommandAsSkill(agent, version);
+    const commandsAlsoAsSkills = shouldAlsoInstallCommandAsSkill(agent, version);
+    const commandsInstallAsSkills = commandsAsSkills || commandsAlsoAsSkills;
+    let writtenCommands = [];
     if (commandsToSync.length > 0 && commandsWriter) {
-        const commandsTarget = path.join(agentDir, agentConfig.commandsSubdir);
+        // Agents that replace native command files with skills (codex >= 0.117.0,
+        // kimi) must have their legacy command dir removed, or files written by an
+        // older version linger forever: the orphan sweep below is gated off for
+        // them, and `agents prune` only sees their skills. Gated on
+        // `commandsAsSkills`, never `commandsAlsoAsSkills` -- a dual-write agent's
+        // native dir is a live product surface (Cursor IDE) and must not be wiped.
         if (commandsAsSkills && agentConfig.commandsSubdir) {
-            removePath(commandsTarget);
+            removePath(path.join(agentDir, agentConfig.commandsSubdir));
         }
         const r = commandsWriter.write({ version, versionHome, selection: commandsToSync, cwd });
+        writtenCommands = r.synced;
         result.commands = r.synced.length > 0;
     }
     // Orphan-sweep stale top-level command files from previous syncs under a
@@ -2584,13 +2593,19 @@ export function syncResourcesToVersion(agent, version, selection, options = {})
         if (fs.existsSync(commandsTargetSweep)) {
             const ext = agentConfig.format === 'toml' ? '.toml' : '.md';
             const trustedCommands = new Set(commandsToSync);
+            // A dual-write target's native directory also belongs to another product
+            // surface (Cursor IDE). Delete only names the command writer recorded as
+            // successfully emitted during the preceding full sync.
+            const previouslyManagedCommands = commandsAlsoAsSkills
+                ? new Set(loadManifest(agent, version)?.writtenCommands ?? [])
+                : null;
             for (const entry of fs.readdirSync(commandsTargetSweep, { withFileTypes: true })) {
                 if (!entry.isFile() || entry.name.startsWith('.'))
                     continue;
                 if (!entry.name.endsWith(ext))
                     continue;
                 const name = entry.name.slice(0, -ext.length);
-                if (!trustedCommands.has(name)) {
+                if (!trustedCommands.has(name) && (!previouslyManagedCommands || previouslyManagedCommands.has(name))) {
                     removePath(safeJoin(commandsTargetSweep, entry.name));
                 }
             }
@@ -2612,7 +2627,7 @@ export function syncResourcesToVersion(agent, version, selection, options = {})
     let skillsToSync = userPassedSelection
         ? selectedSkillsToSync
         : Array.from(new Set([...selectedSkillsToSync, ...pluginSkillsToSync]));
-    if (commandsAsSkills && commandsToSync.length > 0 && skillsToSync.length > 0) {
+    if (commandsInstallAsSkills && commandsToSync.length > 0 && skillsToSync.length > 0) {
         const commandNames = new Set(commandsToSync);
         const skillRoots = [
             path.join(getUserAgentsDir(), 'skills'),
@@ -2639,13 +2654,13 @@ export function syncResourcesToVersion(agent, version, selection, options = {})
         // dot-dirs to keep plugin-managed subtrees (.plugins/, .promptcuts) intact.
         const skillsTargetSweep = path.join(agentDir, 'skills');
         if (!userPassedSelection && fs.existsSync(skillsTargetSweep) && !fs.lstatSync(skillsTargetSweep).isSymbolicLink()) {
-            // Trust real skills AND command-skills: when commandsAsSkills, the
+            // Trust real skills AND command-skills: when commandsInstallAsSkills, the
             // commands writer (above) materialized each command as a skill dir under
             // skills/. Those names are not in skillsToSync, so without this they'd be
             // swept as orphans — silently deleting every converted command (e.g.
-            // /recap on kimi/grok).
+            // /recap on Kimi or newer Codex releases).
             const trustedSkills = new Set(skillsToSync);
-            if (commandsAsSkills)
+            if (commandsInstallAsSkills)
                 for (const cmd of commandsToSync)
                     trustedSkills.add(cmd);
             for (const entry of fs.readdirSync(skillsTargetSweep, { withFileTypes: true })) {
@@ -2866,7 +2881,9 @@ export function syncResourcesToVersion(agent, version, selection, options = {})
     // one-off override, so the resulting state matches what the manifest
     // records as the synced set.
     if (!userPassedSelection) {
-        saveManifest(agent, version, buildSyncManifest(agent, version, cwd));
+        const manifest = buildSyncManifest(agent, version, cwd);
+        manifest.writtenCommands = writtenCommands;
+        saveManifest(agent, version, manifest);
     }
     return result;
 }

package/package.json

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