@claudexor/cli 1.0.1 → 2.1.3

package/dist/plugins.js

@@ -3,6 +3,7 @@ import { copyFileSync, existsSync, lstatSync, readFileSync, readdirSync, realpat
 import { dirname, isAbsolute, join, relative, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 import { hostFallbackExamples, recoveryVerbs } from "./command-registry.js";
+import { manageClaudeStatusline } from "./claude-statusline.js";
 import { CLAUDEXOR_VERSION, ensureDir, sha256, userConfigDir, userHomeDir, writeJson, } from "@claudexor/util";
 export const PLUGIN_HOSTS = ["cursor", "claude", "codex", "opencode"];
 export const PLUGIN_TARGETS = [...PLUGIN_HOSTS, "all"];
@@ -21,10 +22,6 @@ function jsonText(value) {
 function generatedMcpEnv(runtime) {
     return {
         CLAUDEXOR_CONFIG_DIR: runtime.configDir,
-        // MANAGED is drift-detection CONTENT (versions the generated artifact
-        // text for status/doctor). PLUGIN_VERSION is ALSO read at runtime:
-        // `mcp serve` compares it with the CLI version and warns on stderr when
-        // the installed artifacts are stale (repair + host reload fixes it).
         CLAUDEXOR_MANAGED: MARKER,
         CLAUDEXOR_PLUGIN_VERSION: CLAUDEXOR_VERSION,
     };
@@ -46,19 +43,16 @@ function opencodeMcpEntry(runtime) {
         command: [runtime.nodePath, runtime.cliPath, "mcp", "serve"],
         environment: generatedMcpEnv(runtime),
         enabled: true,
-        // Tool-DISCOVERY timeout only (OpenCode semantics). Tool EXECUTION time
-        // is governed by OpenCode's global MCP execution timeout — long verbs
-        // (agent/best-of) can exceed it; the generated README and INTEGRATIONS.md
-        // carry the guidance (raise experimental.mcp_timeout, or prefer the CLI
-        // for long runs). The runId trailer keeps abandoned calls recoverable.
         timeout: 5000,
     };
 }
 /** `claudexor inspect <runId>`, `follow <runId>`, ... — from the registry's recovery verbs. */
 function recoveryVerbLine() {
     const verbs = recoveryVerbs();
-    const parts = verbs.map((verb, i) => (i === 0 ? `\`claudexor ${verb} <runId>\`` : `\`${verb} <runId>\``));
-    return parts.length > 1 ? `${parts.slice(0, -1).join(", ")}, or ${parts[parts.length - 1]}` : (parts[0] ?? "");
+    const parts = verbs.map((verb, i) => i === 0 ? `\`claudexor ${verb} <runId>\`` : `\`${verb} <runId>\``);
+    return parts.length > 1
+        ? `${parts.slice(0, -1).join(", ")}, or ${parts[parts.length - 1]}`
+        : (parts[0] ?? "");
 }
 function skillText(host) {
     const namespace = host === "claude" ? "claudexor@skills-dir" : "claudexor";
@@ -110,9 +104,9 @@ function skillText(host) {
     ].join("\n");
 }
 function commandText(host) {
-    const frontmatter = (host === "claude" || host === "cursor" || host === "opencode"
+    const frontmatter = host === "claude" || host === "cursor" || host === "opencode"
         ? ["---", "description: Use Claudexor CLI/MCP for harness-agnostic coding workflows", "---"]
-        : []);
+        : [];
     return [
         ...frontmatter,
         managedComment().trimEnd(),
@@ -124,7 +118,9 @@ function commandText(host) {
         "",
         "Do not claim live thread parity through MCP. Ask for an explicit repo path if the target project is ambiguous.",
         "",
-    ].filter((line, i, all) => line !== "" || all[i - 1] !== "").join("\n");
+    ]
+        .filter((line, i, all) => line !== "" || all[i - 1] !== "")
+        .join("\n");
 }
 function readmeText(host) {
     return [
@@ -210,11 +206,31 @@ const HOST_DEFINITIONS = {
         artifacts: (home, runtime) => {
             const root = join(home, ".claude", "skills", "claudexor");
             return [
-                { path: join(root, ".claude-plugin", "plugin.json"), content: manifest("claude"), description: "Claude plugin manifest" },
-                { path: join(root, "skills", "claudexor", "SKILL.md"), content: skillText("claude"), description: "Claude skill" },
-                { path: join(root, "commands", "claudexor.md"), content: commandText("claude"), description: "Claude command" },
-                { path: join(root, ".mcp.json"), content: jsonText(mcpServers(runtime)), description: "Claude MCP config" },
-                { path: join(root, "README.md"), content: readmeText("claude"), description: "Claude integration README" },
+                {
+                    path: join(root, ".claude-plugin", "plugin.json"),
+                    content: manifest("claude"),
+                    description: "Claude plugin manifest",
+                },
+                {
+                    path: join(root, "skills", "claudexor", "SKILL.md"),
+                    content: skillText("claude"),
+                    description: "Claude skill",
+                },
+                {
+                    path: join(root, "commands", "claudexor.md"),
+                    content: commandText("claude"),
+                    description: "Claude command",
+                },
+                {
+                    path: join(root, ".mcp.json"),
+                    content: jsonText(mcpServers(runtime)),
+                    description: "Claude MCP config",
+                },
+                {
+                    path: join(root, "README.md"),
+                    content: readmeText("claude"),
+                    description: "Claude integration README",
+                },
             ];
         },
         legacy: (home) => [
@@ -235,10 +251,26 @@ const HOST_DEFINITIONS = {
         artifacts: (home, runtime) => {
             const root = join(home, ".codex", "plugins", "claudexor");
             return [
-                { path: join(root, ".codex-plugin", "plugin.json"), content: manifest("codex"), description: "Codex plugin manifest" },
-                { path: join(root, "skills", "claudexor", "SKILL.md"), content: skillText("codex"), description: "Codex skill" },
-                { path: join(root, ".mcp.json"), content: jsonText(mcpServers(runtime)), description: "Codex MCP config" },
-                { path: join(root, "README.md"), content: readmeText("codex"), description: "Codex integration README" },
+                {
+                    path: join(root, ".codex-plugin", "plugin.json"),
+                    content: manifest("codex"),
+                    description: "Codex plugin manifest",
+                },
+                {
+                    path: join(root, "skills", "claudexor", "SKILL.md"),
+                    content: skillText("codex"),
+                    description: "Codex skill",
+                },
+                {
+                    path: join(root, ".mcp.json"),
+                    content: jsonText(mcpServers(runtime)),
+                    description: "Codex MCP config",
+                },
+                {
+                    path: join(root, "README.md"),
+                    content: readmeText("codex"),
+                    description: "Codex integration README",
+                },
             ];
         },
         config: "codex-marketplace",
@@ -260,11 +292,31 @@ const HOST_DEFINITIONS = {
         artifacts: (home, runtime) => {
             const root = join(home, ".cursor", "plugins", "local", "claudexor");
             return [
-                { path: join(root, ".cursor-plugin", "plugin.json"), content: manifest("cursor"), description: "Cursor plugin manifest" },
-                { path: join(root, "skills", "claudexor", "SKILL.md"), content: skillText("cursor"), description: "Cursor skill" },
-                { path: join(root, "commands", "claudexor.md"), content: commandText("cursor"), description: "Cursor command" },
-                { path: join(root, "mcp.json"), content: jsonText(mcpServers(runtime)), description: "Cursor MCP config" },
-                { path: join(root, "README.md"), content: readmeText("cursor"), description: "Cursor integration README" },
+                {
+                    path: join(root, ".cursor-plugin", "plugin.json"),
+                    content: manifest("cursor"),
+                    description: "Cursor plugin manifest",
+                },
+                {
+                    path: join(root, "skills", "claudexor", "SKILL.md"),
+                    content: skillText("cursor"),
+                    description: "Cursor skill",
+                },
+                {
+                    path: join(root, "commands", "claudexor.md"),
+                    content: commandText("cursor"),
+                    description: "Cursor command",
+                },
+                {
+                    path: join(root, "mcp.json"),
+                    content: jsonText(mcpServers(runtime)),
+                    description: "Cursor MCP config",
+                },
+                {
+                    path: join(root, "README.md"),
+                    content: readmeText("cursor"),
+                    description: "Cursor integration README",
+                },
             ];
         },
         legacy: (home) => [
@@ -285,9 +337,21 @@ const HOST_DEFINITIONS = {
         artifacts: (home, runtime) => {
             const root = join(home, ".config", "opencode");
             return [
-                { path: join(root, "skills", "claudexor", "SKILL.md"), content: skillText("opencode"), description: "OpenCode skill" },
-                { path: join(root, "commands", "claudexor.md"), content: commandText("opencode"), description: "OpenCode command" },
-                { path: join(root, "plugins", "claudexor.js"), content: opencodePluginText(runtime), description: "OpenCode JS plugin" },
+                {
+                    path: join(root, "skills", "claudexor", "SKILL.md"),
+                    content: skillText("opencode"),
+                    description: "OpenCode skill",
+                },
+                {
+                    path: join(root, "commands", "claudexor.md"),
+                    content: commandText("opencode"),
+                    description: "OpenCode command",
+                },
+                {
+                    path: join(root, "plugins", "claudexor.js"),
+                    content: opencodePluginText(runtime),
+                    description: "OpenCode JS plugin",
+                },
             ];
         },
         config: "opencode-mcp",
@@ -346,7 +410,9 @@ function loadState(configDir = userConfigDir()) {
     catch (err) {
         throw new Error(`plugin state is not valid JSON: ${path}: ${err instanceof Error ? err.message : String(err)}`);
     }
-    if (!parsed || typeof parsed !== "object" || parsed.version !== STATE_VERSION) {
+    if (!parsed ||
+        typeof parsed !== "object" ||
+        parsed.version !== STATE_VERSION) {
         throw new Error(`plugin state has unsupported shape: ${path}`);
     }
     const state = parsed;
@@ -376,7 +442,10 @@ function readText(path) {
         return readFileSync(path, "utf8");
     }
     catch (err) {
-        if (err && typeof err === "object" && "code" in err && err.code === "ENOENT")
+        if (err &&
+            typeof err === "object" &&
+            "code" in err &&
+            err.code === "ENOENT")
             return null;
         throw new Error(`unable to read ${path}: ${err instanceof Error ? err.message : String(err)}`);
     }
@@ -451,7 +520,10 @@ function assertReadableLeaf(path) {
         lstatSync(path);
     }
     catch (err) {
-        if (err && typeof err === "object" && "code" in err && err.code === "ENOENT")
+        if (err &&
+            typeof err === "object" &&
+            "code" in err &&
+            err.code === "ENOENT")
             return;
         throw err;
     }
@@ -475,7 +547,10 @@ function rejectSymlinkPath(path) {
         st = lstatSync(path);
     }
     catch (err) {
-        if (err && typeof err === "object" && "code" in err && err.code === "ENOENT")
+        if (err &&
+            typeof err === "object" &&
+            "code" in err &&
+            err.code === "ENOENT")
             return;
         throw err;
     }
@@ -496,7 +571,10 @@ function assertSafeLeaf(path) {
             throw new Error(`${path} is not a regular file`);
     }
     catch (err) {
-        if (err && typeof err === "object" && "code" in err && err.code === "ENOENT")
+        if (err &&
+            typeof err === "object" &&
+            "code" in err &&
+            err.code === "ENOENT")
             return;
         throw err;
     }
@@ -582,7 +660,7 @@ cross-family review, and budget balancing. Prefer it for multi-harness work.
 - \`claudexor race "<task>" --n 4\`     Best-of-N tournament + cross-family review
 - \`claudexor plan "<task>"\`           read-only plan
 - \`claudexor create "<task>"\`         create a new project
-- \`claudexor inspect <run_id>\`        inspect artifacts under .claudexor/runs
+- \`claudexor inspect <run_id>\`        inspect artifacts in the external runtime store
 
 These plugins are thin shims: they call the local CLI; all orchestration lives in claudexor.`;
 const OLD_LEGACY_CLAUDE_COMMAND = `---
@@ -603,7 +681,8 @@ function legacyThinShimVerifier(file, text) {
     if (file.endsWith("plugin.json"))
         return isOldThinShimManifest(text);
     if (file === "commands/claudexor.md") {
-        return exactLegacyText(text, OLD_LEGACY_CLAUDE_COMMAND) || exactLegacyText(text, OLD_LEGACY_CURSOR_COMMAND);
+        return (exactLegacyText(text, OLD_LEGACY_CLAUDE_COMMAND) ||
+            exactLegacyText(text, OLD_LEGACY_CURSOR_COMMAND));
     }
     return false;
 }
@@ -653,11 +732,14 @@ function backupFile(def, runtime, path) {
     return dest;
 }
 function hasManagedMarker(text) {
-    return text.includes(MARKER) || text.includes('"marker": "claudexor:managed host-plugin-lifecycle"');
+    return (text.includes(MARKER) || text.includes('"marker": "claudexor:managed host-plugin-lifecycle"'));
 }
 function artifactOwned(state, host, artifact, current, force) {
     const entry = state.hosts[host]?.artifacts[artifact.path];
-    return entry?.hash === hashText(current) || (entry !== undefined && hasManagedMarker(current)) || current === artifact.content || (force && hasManagedMarker(current));
+    return (entry?.hash === hashText(current) ||
+        (entry !== undefined && hasManagedMarker(current)) ||
+        current === artifact.content ||
+        (force && hasManagedMarker(current)));
 }
 function isPathInside(root, path) {
     const rel = relative(root, path);
@@ -712,7 +794,10 @@ function configEntryOwned(stateEntry, current, desired, force, requireState = fa
     const currentText = JSON.stringify(current);
     const hasMarker = currentText.includes(MARKER);
     const exactMarkedDesired = !requireState && hasMarker && jsonText(current) === jsonText(desired);
-    return stateEntry?.hash === hashText(jsonText(current)) || exactMarkedDesired || (stateEntry !== undefined && hasMarker) || (force && hasMarker);
+    return (stateEntry?.hash === hashText(jsonText(current)) ||
+        exactMarkedDesired ||
+        (stateEntry !== undefined && hasMarker) ||
+        (force && hasMarker));
 }
 function codexMarketplaceEntries(plugins) {
     return plugins
@@ -723,8 +808,12 @@ function mergeCodexMarketplace(state, dryRun, force, def, runtime, res) {
     const path = join(userHomeDir(), ".agents", "plugins", "marketplace.json");
     const desired = desiredCodexMarketplaceEntry();
     const parsed = readJsonFile(path);
-    const base = parsed === undefined ? { name: "personal", interface: { displayName: "Personal" }, plugins: [] } : parsed;
-    if (!base || typeof base !== "object" || !Array.isArray(base.plugins)) {
+    const base = parsed === undefined
+        ? { name: "personal", interface: { displayName: "Personal" }, plugins: [] }
+        : parsed;
+    if (!base ||
+        typeof base !== "object" ||
+        !Array.isArray(base.plugins)) {
         res.errors.push(`${path} is not a Codex marketplace JSON object with plugins[]`);
         return false;
     }
@@ -831,7 +920,10 @@ function checkConfig(host, state, res, runtime) {
             return false;
         }
         const desired = desiredCodexMarketplaceEntry();
-        if (!parsed || typeof parsed !== "object" || Array.isArray(parsed) || !Array.isArray(parsed.plugins)) {
+        if (!parsed ||
+            typeof parsed !== "object" ||
+            Array.isArray(parsed) ||
+            !Array.isArray(parsed.plugins)) {
             res.errors.push(`${path} is not a Codex marketplace JSON object with plugins[]`);
             return false;
         }
@@ -848,7 +940,9 @@ function checkConfig(host, state, res, runtime) {
             res.errors.push(`${path} has an unowned claudexor marketplace entry`);
             return false;
         }
-        res.notes.push(matches.length > 0 ? "Codex marketplace entry is drifted" : "Codex marketplace entry is missing");
+        res.notes.push(matches.length > 0
+            ? "Codex marketplace entry is drifted"
+            : "Codex marketplace entry is missing");
         return false;
     }
     if (host === "opencode") {
@@ -900,7 +994,9 @@ function removeConfig(host, state, dryRun, force, def, runtime, res) {
         const parsed = readJsonFile(path);
         if (parsed === undefined)
             return true;
-        if (!parsed || typeof parsed !== "object" || !Array.isArray(parsed.plugins)) {
+        if (!parsed ||
+            typeof parsed !== "object" ||
+            !Array.isArray(parsed.plugins)) {
             res.errors.push(`${path} is not a Codex marketplace JSON object with plugins[]`);
             return false;
         }
@@ -1012,13 +1108,22 @@ function applyArtifacts(def, artifacts, state, dryRun, force, runtime, res) {
 function obsoleteArtifactRoots(host, home) {
     switch (host) {
         case "claude":
-            return [join(home, ".claude", "skills", "claudexor"), join(home, ".claude", "plugins", "claudexor")];
+            return [
+                join(home, ".claude", "skills", "claudexor"),
+                join(home, ".claude", "plugins", "claudexor"),
+            ];
         case "codex":
-            return [join(home, ".codex", "plugins", "claudexor"), join(home, ".agents", "skills", "claudexor")];
+            return [
+                join(home, ".codex", "plugins", "claudexor"),
+                join(home, ".agents", "skills", "claudexor"),
+            ];
         case "cursor":
             return [join(home, ".cursor", "plugins", "local", "claudexor")];
         case "opencode":
-            return [join(home, ".config", "opencode", "skills", "claudexor"), join(home, ".config", "opencode", "claudexor")];
+            return [
+                join(home, ".config", "opencode", "skills", "claudexor"),
+                join(home, ".config", "opencode", "claudexor"),
+            ];
     }
 }
 function artifactStatePathAllowed(def, artifacts, path) {
@@ -1030,7 +1135,9 @@ function removeObsoleteStateArtifacts(def, artifacts, state, dryRun, _force, res
     const hs = hostState(state, def.host);
     const allowed = new Set(artifacts.map((a) => a.path));
     for (const [path, entry] of Object.entries(hs.artifacts)) {
-        if (entry.host !== def.host || entry.path !== path || !artifactStatePathAllowed(def, artifacts, path)) {
+        if (entry.host !== def.host ||
+            entry.path !== path ||
+            !artifactStatePathAllowed(def, artifacts, path)) {
             res.errors.push(`${stateFilePath()} contains out-of-scope ${def.host} artifact state for ${path}; remove that state entry or clean it manually`);
             return false;
         }
@@ -1067,7 +1174,9 @@ function removeArtifacts(def, artifacts, state, dryRun, force, res) {
             continue;
         }
         const desired = artifacts.find((a) => a.path === path);
-        const owned = hs.artifacts[path]?.hash === hashText(current) || current === desired?.content || (force && hasManagedMarker(current));
+        const owned = hs.artifacts[path]?.hash === hashText(current) ||
+            current === desired?.content ||
+            (force && hasManagedMarker(current));
         if (!owned) {
             res.errors.push(`${path} exists but no longer matches Claudexor ownership state`);
             return false;
@@ -1082,10 +1191,7 @@ function removeArtifacts(def, artifacts, state, dryRun, force, res) {
     pruneEmptyDirs(def.root(userHomeDir()));
     return true;
 }
-function pruneEmptyDirs(_root) {
-    // Deliberately conservative: removing files is enough for uninstall; avoid
-    // recursive directory cleanup in user config roots.
-}
+function pruneEmptyDirs(_root) { }
 function removeVerifiedLegacy(def, dryRun, res) {
     for (const legacy of def.legacy(userHomeDir())) {
         if (!existsSync(legacy.path))
@@ -1142,7 +1248,8 @@ async function mcpSelfTest(runtime) {
                 const init = lines.find((line) => line && typeof line === "object" && line.id === 1);
                 if (init?.result?.serverInfo?.name && !sentToolsList) {
                     sentToolsList = true;
-                    child.stdin.write(JSON.stringify({ jsonrpc: "2.0", method: "notifications/initialized", params: {} }) + "\n");
+                    child.stdin.write(JSON.stringify({ jsonrpc: "2.0", method: "notifications/initialized", params: {} }) +
+                        "\n");
                     child.stdin.write(JSON.stringify({ jsonrpc: "2.0", id: 2, method: "tools/list", params: {} }) + "\n");
                 }
                 const tools = lines.find((line) => line && typeof line === "object" && line.id === 2);
@@ -1151,7 +1258,8 @@ async function mcpSelfTest(runtime) {
                     const listed = tools.result?.tools;
                     clearTimeout(timer);
                     child.kill("SIGTERM");
-                    if (Array.isArray(listed) && listed.some((t) => t.name === "claudexor_status")) {
+                    if (Array.isArray(listed) &&
+                        listed.some((t) => t.name === "claudexor_status")) {
                         resolve(null);
                     }
                     else {
@@ -1168,7 +1276,9 @@ async function mcpSelfTest(runtime) {
                 }
             }
         });
-        child.stderr.on("data", (d) => { stderr += String(d); });
+        child.stderr.on("data", (d) => {
+            stderr += String(d);
+        });
         child.on("error", (err) => {
             if (settled)
                 return;
@@ -1200,7 +1310,16 @@ async function mcpSelfTest(runtime) {
 }
 function mcpSelfTestEnv(runtime) {
     const env = {};
-    for (const key of ["HOME", "PATH", "CLAUDEXOR_CONFIG_DIR", "TMPDIR", "TMP", "TEMP", "LANG", "LC_ALL"]) {
+    for (const key of [
+        "HOME",
+        "PATH",
+        "CLAUDEXOR_CONFIG_DIR",
+        "TMPDIR",
+        "TMP",
+        "TEMP",
+        "LANG",
+        "LC_ALL",
+    ]) {
         const value = process.env[key];
         if (value)
             env[key] = value;
@@ -1234,8 +1353,9 @@ async function runHost(def, verb, options, state, runtime) {
     try {
         if (verb === "status" || verb === "doctor") {
             const art = checkArtifacts(def, artifacts, state, res);
-            const configOk = checkConfig(def.host, state, res, runtime);
-            const hasConfig = def.config !== undefined;
+            const configOk = checkConfig(def.host, state, res, runtime) &&
+                (def.host !== "claude" || manageClaudeStatusline(verb, { ...runtime, dryRun }, res));
+            const hasConfig = def.config !== undefined || def.host === "claude";
             if (res.errors.length > 0 || art.blocked)
                 res.state = "blocked";
             else if (art.all && configOk)
@@ -1246,7 +1366,9 @@ async function runHost(def, verb, options, state, runtime) {
                 res.state = "partial";
             else
                 res.state = "missing";
-            if (verb === "doctor" && dryRun && (res.state === "installed" || res.state === "registered")) {
+            if (verb === "doctor" &&
+                dryRun &&
+                (res.state === "installed" || res.state === "registered")) {
                 res.actions.push("would run MCP initialize/initialized/tools-list self-test");
             }
             else if (verb === "doctor" && (res.state === "installed" || res.state === "registered")) {
@@ -1263,6 +1385,10 @@ async function runHost(def, verb, options, state, runtime) {
             return res;
         }
         if (verb === "uninstall") {
+            if (def.host === "claude" && !manageClaudeStatusline(verb, { ...runtime, dryRun }, res)) {
+                res.state = "blocked";
+                return res;
+            }
             if (!removeVerifiedLegacy(def, dryRun, res)) {
                 res.state = "blocked";
                 return res;
@@ -1291,11 +1417,17 @@ async function runHost(def, verb, options, state, runtime) {
             res.state = "blocked";
             return res;
         }
-        if (def.config === "codex-marketplace" && !mergeCodexMarketplace(state, dryRun, force, def, runtime, res)) {
+        if (def.config === "codex-marketplace" &&
+            !mergeCodexMarketplace(state, dryRun, force, def, runtime, res)) {
+            res.state = "blocked";
+            return res;
+        }
+        if (def.config === "opencode-mcp" &&
+            !mergeOpenCodeMcp(state, dryRun, force, def, runtime, res)) {
             res.state = "blocked";
             return res;
         }
-        if (def.config === "opencode-mcp" && !mergeOpenCodeMcp(state, dryRun, force, def, runtime, res)) {
+        if (def.host === "claude" && !manageClaudeStatusline(verb, { ...runtime, dryRun }, res)) {
             res.state = "blocked";
             return res;
         }