@phnx-labs/agents-cli 1.22.60 → 1.22.61

package/dist/lib/uninstall.js

@@ -19,7 +19,7 @@ import * as fs from 'fs';
 import * as os from 'os';
 import * as path from 'path';
 import { AGENTS, ALL_AGENT_IDS } from './agents.js';
-import { getAgentConfigPath, getConfigSymlinkVersion, stripShimPathLines, releaseAdoptedLauncher, } from './installations/shims.js';
+import { getAgentConfigPath, getConfigSymlinkVersion, stripShimPathLines, releaseAdoptedLauncher, removeGhOverloadShim, } from './installations/shims.js';
 import { moveDirCrossDevice, copyDirStrippingAgentsSymlinks } from './config-transfer.js';
 import { getUserAgentsDir, getBackupsDir, getHistoryDir, getShimsDir, getLegacySystemAgentsDir, } from './state.js';
 /** Home dir honoring the AGENTS_REAL_HOME test/override, mirroring shims.ts. */
@@ -252,6 +252,15 @@ export function executeUninstall(plan, opts) {
             result.errors.push(`launcher ${cli}: ${err.message}`);
         }
     }
+    // 3b. Remove the gh overload shim explicitly, so a real gh returns even if the
+    // shims dir itself is left in place. (The shim self-heals to real gh regardless,
+    // but leaving no orphan is cleaner — PHNX-3501.)
+    try {
+        removeGhOverloadShim();
+    }
+    catch (err) {
+        result.errors.push(`gh overload shim: ${err.message}`);
+    }
     // 4. Strip the shim directory from the user's PATH across all rc files.
     const shimsDir = getShimsDir();
     for (const rc of plan.rcFiles) {

package/dist/lib/workflows.d.ts

@@ -375,6 +375,17 @@ export declare function removeWorkflow(name: string): {
 };
 /** List workflow names synced into a specific agent version home. */
 export declare function listWorkflowsForAgent(agent: AgentId, versionHome: string): string[];
+/**
+ * True when workflow `name` materialized in `agent`'s version home byte-matches
+ * what the writer would produce NOW from `sourcePath` — the content-drift
+ * predicate `agents doctor` uses. Layout-aware per the same per-harness map the
+ * writer (`syncWorkflowToVersion`) and detector use: Claude/default copy the
+ * whole WORKFLOW.md tree (recursive dir compare); Kimi/Antigravity/OpenClaw/Grok
+ * render one transformed file; Goose renders a recipe YAML. Antigravity's target
+ * is the shared HOME-global dir, not a per-version path. Returns false when the
+ * home copy is absent (surfaced as `missing` at the name level, not here).
+ */
+export declare function workflowContentMatches(agent: AgentId, versionHome: string, name: string, sourcePath: string): boolean;
 /** Copy a workflow directory into a version home at {versionHome}/workflows/<name>/. */
 export declare function syncWorkflowToVersion(workflowPath: string, name: string, agent: AgentId, versionHome: string): {
     success: boolean;

package/dist/lib/workflows.js

@@ -12,6 +12,7 @@ import * as yaml from 'yaml';
 import { capableAgents, supports } from './capabilities.js';
 import { getProjectAgentsDir, getSystemWorkflowsDir, getUserWorkflowsDir, getTrashWorkflowsDir, getEnabledExtraRepos, getPluginsDir, getSystemPluginsDir, getProjectPluginsDir, } from './state.js';
 import { listInstalledVersions, getVersionHomePath } from './installations/versions.js';
+import { dirsContentMatch, normalizeResourceContent } from './resource-content-diff.js';
 /**
  * Hard upper bound on items a single `for_each` expands, absent an explicit
  * `max_items`. A guard against a runaway producer spawning unbounded teammates
@@ -937,14 +938,16 @@ function writeGooseSubrecipe(workflowPath, subrecipeName, destDir) {
     fs.mkdirSync(destDir, { recursive: true });
     fs.writeFileSync(path.join(destDir, `${subrecipeName}.yaml`), yaml.stringify(recipe), 'utf-8');
 }
-function syncWorkflowToGooseRecipe(workflowPath, name, versionHome) {
+/**
+ * Render the main Goose recipe YAML for a workflow — the exact bytes
+ * `syncWorkflowToGooseRecipe` writes to `<name>.yaml`. Extracted so the sync
+ * writer and the doctor content-drift check (`workflowContentMatches`) render
+ * from ONE source and can never disagree. Returns null on invalid frontmatter.
+ */
+function renderGooseRecipeYaml(workflowPath, name) {
     const frontmatter = parseWorkflowFrontmatter(workflowPath);
-    if (!frontmatter) {
-        return { success: false, error: `Workflow '${name}' has invalid WORKFLOW.md frontmatter` };
-    }
-    const recipesDir = path.join(versionHome, '.config', 'goose', 'recipes');
-    const recipePath = path.join(recipesDir, `${name}.yaml`);
-    const subrecipesDir = path.join(recipesDir, `${name}.subrecipes`);
+    if (!frontmatter)
+        return null;
     const body = readWorkflowBody(workflowPath) || frontmatter.description || name;
     const subagents = selectedWorkflowSubagents(workflowPath, frontmatter.allowedAgents);
     const recipe = {
@@ -964,6 +967,21 @@ function syncWorkflowToGooseRecipe(workflowPath, name, versionHome) {
             description: `Workflow subrecipe ${subagentName}`,
         }));
     }
+    return yaml.stringify(recipe);
+}
+function syncWorkflowToGooseRecipe(workflowPath, name, versionHome) {
+    const frontmatter = parseWorkflowFrontmatter(workflowPath);
+    if (!frontmatter) {
+        return { success: false, error: `Workflow '${name}' has invalid WORKFLOW.md frontmatter` };
+    }
+    const recipesDir = path.join(versionHome, '.config', 'goose', 'recipes');
+    const recipePath = path.join(recipesDir, `${name}.yaml`);
+    const subrecipesDir = path.join(recipesDir, `${name}.subrecipes`);
+    const subagents = selectedWorkflowSubagents(workflowPath, frontmatter.allowedAgents);
+    const recipeYaml = renderGooseRecipeYaml(workflowPath, name);
+    if (recipeYaml == null) {
+        return { success: false, error: `Workflow '${name}' has invalid WORKFLOW.md frontmatter` };
+    }
     try {
         fs.mkdirSync(recipesDir, { recursive: true });
         if (fs.existsSync(subrecipesDir)) {
@@ -972,13 +990,54 @@ function syncWorkflowToGooseRecipe(workflowPath, name, versionHome) {
         for (const subagentName of subagents) {
             writeGooseSubrecipe(workflowPath, subagentName, subrecipesDir);
         }
-        fs.writeFileSync(recipePath, yaml.stringify(recipe), 'utf-8');
+        fs.writeFileSync(recipePath, recipeYaml, 'utf-8');
         return { success: true };
     }
     catch (err) {
         return { success: false, error: err.message };
     }
 }
+/**
+ * True when workflow `name` materialized in `agent`'s version home byte-matches
+ * what the writer would produce NOW from `sourcePath` — the content-drift
+ * predicate `agents doctor` uses. Layout-aware per the same per-harness map the
+ * writer (`syncWorkflowToVersion`) and detector use: Claude/default copy the
+ * whole WORKFLOW.md tree (recursive dir compare); Kimi/Antigravity/OpenClaw/Grok
+ * render one transformed file; Goose renders a recipe YAML. Antigravity's target
+ * is the shared HOME-global dir, not a per-version path. Returns false when the
+ * home copy is absent (surfaced as `missing` at the name level, not here).
+ */
+export function workflowContentMatches(agent, versionHome, name, sourcePath) {
+    const root = workflowTargetRoot(agent, versionHome);
+    const renderedMatches = (homePath, expected) => {
+        let actual;
+        try {
+            actual = fs.readFileSync(homePath, 'utf-8');
+        }
+        catch {
+            return false;
+        }
+        return normalizeResourceContent(actual) === normalizeResourceContent(expected);
+    };
+    switch (agent) {
+        case 'kimi':
+            return renderedMatches(path.join(root, name, 'SKILL.md'), transformWorkflowForKimi(sourcePath, name));
+        case 'antigravity':
+            return renderedMatches(path.join(root, `${name}.md`), transformWorkflowForAntigravity(sourcePath, name));
+        case 'openclaw':
+            return renderedMatches(path.join(root, `${name}.lobster`), transformWorkflowForOpenClaw(sourcePath, name));
+        case 'grok':
+            return renderedMatches(path.join(root, `${name}.rhai`), transformWorkflowForGrok(sourcePath, name));
+        case 'goose': {
+            const expected = renderGooseRecipeYaml(sourcePath, name);
+            if (expected == null)
+                return false;
+            return renderedMatches(path.join(versionHome, '.config', 'goose', 'recipes', `${name}.yaml`), expected);
+        }
+        default:
+            return dirsContentMatch(sourcePath, path.join(root, name));
+    }
+}
 /** Copy a workflow directory into a version home at {versionHome}/workflows/<name>/. */
 export function syncWorkflowToVersion(workflowPath, name, agent, versionHome) {
     if (agent === 'goose') {

package/package.json

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