@retasc/cli 1.1.1 → 1.1.3

package/dist/commands/mcp.js

@@ -58,52 +58,75 @@ export function mcpMarkerEntry(workspaceId) {
 export function mcpMarkerConfigBlock(workspaceId) {
     return JSON.stringify({ mcpServers: { [SERVER_NAME]: mcpMarkerEntry(workspaceId) } }, null, 2);
 }
-/** Try `claude mcp add`. Returns true on success, false if claude is absent or errored. */
-function tryClaudeCli(url, key, scope) {
-    const args = [
+// --- `claude mcp add` argv builders (pure, exported for tests) -------------
+// RTSC-99: the stdio builders put SERVER_NAME *before* the variadic `--env`
+// flags. `--env` consumes every following non-`--` token, so a server name after
+// it was eaten as a bogus env var ("Invalid environment variable format: retasc").
+// Name-first + a closing `--` keeps env values bounded and the command intact.
+/** Build `claude mcp add` argv for the HTTP transport. (`url` is a positional
+ *  BEFORE the variadic `--header`, so the header flag can't swallow it.) */
+export function buildHttpAddArgs(url, key, scope) {
+    return [
         "mcp", "add",
         "--transport", "http",
         "--scope", scope,
         SERVER_NAME, url,
         "--header", `Authorization: Bearer ${key}`,
     ];
-    return runClaudeAdd(args);
 }
-/** Try `claude mcp add` for the stdio watchdog proxy (RTSC-44). */
-function tryClaudeCliWatchdog(url, key, scope) {
-    const args = [
+/** Build argv for the stdio watchdog proxy (RTSC-44). */
+export function buildWatchdogAddArgs(url, key, scope) {
+    return [
         "mcp", "add",
+        SERVER_NAME,
         "--transport", "stdio",
         "--scope", scope,
         "--env", `RETASC_MCP_URL=${url}`,
         "--env", `RETASC_MCP_KEY=${key}`,
-        SERVER_NAME, "--", "retasc", "mcp-proxy",
+        "--", "retasc", "mcp-proxy",
     ];
-    return runClaudeAdd(args);
 }
-/** Try `claude mcp add` for the secret-free stdio marker (RTSC-92). */
-function tryClaudeCliMarker(workspaceId, scope) {
-    const args = [
+/** Build argv for the secret-free stdio marker (RTSC-92). */
+export function buildMarkerAddArgs(workspaceId, scope) {
+    return [
         "mcp", "add",
+        SERVER_NAME,
         "--transport", "stdio",
         "--scope", scope,
         "--env", `RETASC_WORKSPACE=${workspaceId}`,
-        SERVER_NAME, "--", "retasc", "mcp-proxy",
+        "--", "retasc", "mcp-proxy",
     ];
-    return runClaudeAdd(args);
+}
+function tryClaudeCli(url, key, scope) {
+    return runClaudeAdd(buildHttpAddArgs(url, key, scope));
+}
+function tryClaudeCliWatchdog(url, key, scope) {
+    return runClaudeAdd(buildWatchdogAddArgs(url, key, scope));
+}
+function tryClaudeCliMarker(workspaceId, scope) {
+    return runClaudeAdd(buildMarkerAddArgs(workspaceId, scope));
 }
 function runClaudeAdd(args) {
     const r = spawnSync("claude", args, { encoding: "utf8" });
-    if (r.error)
-        return false; // ENOENT — claude not installed
+    if (r.error) {
+        // ENOENT = `claude` not on PATH (genuinely absent). Any other spawn error is
+        // a real failure of a present CLI — report it as such, not as "not detected".
+        const absent = r.error.code === "ENOENT";
+        return { ok: false, absent, msg: absent ? undefined : r.error.message };
+    }
     if (r.status !== 0) {
-        // Surface why it failed but don't throw — we fall back to the file.
-        const msg = (r.stderr || r.stdout || "").trim();
-        if (msg)
-            console.error(`  (claude mcp add: ${msg.split("\n")[0]})`);
-        return false;
+        // CLI ran but rejected the command — present, not absent. Surface the real reason.
+        const msg = (r.stderr || r.stdout || "").trim().split("\n")[0] || `exited ${r.status}`;
+        return { ok: false, absent: false, msg };
     }
-    return true;
+    return { ok: true };
+}
+/** The fallback note printed after writing .mcp.json — names the REAL reason the
+ *  CLI path didn't take, never falsely claiming the CLI is missing (RTSC-99). */
+export function fallbackNote(res) {
+    return res.absent
+        ? "(Claude Code CLI not detected — wrote .mcp.json instead.)"
+        : `(claude mcp add failed${res.msg ? `: ${res.msg}` : ""} — wrote .mcp.json instead.)`;
 }
 /** Merge a given server entry into ./.mcp.json (project scope on disk). */
 function writeProjectMcpJson(entry) {
@@ -131,28 +154,28 @@ export function installMcp(opts) {
     const scope = opts.scope ?? "local";
     // Watchdog mode (RTSC-44): wire the stdio proxy so claims stay alive automatically.
     if (opts.watchdog) {
-        const viaClaude = tryClaudeCliWatchdog(opts.url, opts.key, scope);
-        if (viaClaude) {
+        const res = tryClaudeCliWatchdog(opts.url, opts.key, scope);
+        if (res.ok) {
             console.log(`✓ Registered Retasc with the liveness watchdog (stdio proxy, scope: ${scope}).`);
         }
         else {
             const path = writeProjectMcpJson(mcpProxyEntry(opts.url, opts.key));
             console.log(`✓ Wrote watchdog MCP config to ${path}`);
-            console.log("  (Claude Code CLI not detected or unavailable — used .mcp.json instead.)");
+            console.log(`  ${fallbackNote(res)}`);
         }
         console.log("\nWatchdog MCP config (Codex / OpenCode / any stdio MCP client):\n");
         console.log(mcpProxyConfigBlock(opts.url, opts.key));
         console.log("\nThe watchdog keeps your claims alive automatically — no per-claim heartbeats. If it ever isn't running you just fall back to the normal lease timeout (safe).");
         return;
     }
-    const viaClaude = tryClaudeCli(opts.url, opts.key, scope);
-    if (viaClaude) {
+    const res = tryClaudeCli(opts.url, opts.key, scope);
+    if (res.ok) {
         console.log(`✓ Registered MCP server "${SERVER_NAME}" with Claude Code (scope: ${scope}).`);
     }
     else {
         const path = writeProjectMcpJson(mcpServerEntry(opts.url, opts.key));
         console.log(`✓ Wrote MCP config to ${path}`);
-        console.log("  (Claude Code CLI not detected or unavailable — used .mcp.json instead.)");
+        console.log(`  ${fallbackNote(res)}`);
     }
     console.log("\nMCP config block (for any other agent/client):\n");
     console.log(mcpConfigBlock(opts.url, opts.key));
@@ -165,14 +188,14 @@ export function installMcp(opts) {
  */
 export function installMarker(opts) {
     const scope = opts.scope ?? "local";
-    const viaClaude = tryClaudeCliMarker(opts.workspaceId, scope);
-    if (viaClaude) {
+    const res = tryClaudeCliMarker(opts.workspaceId, scope);
+    if (res.ok) {
         console.log(`✓ Registered Retasc watchdog (secret-free marker, scope: ${scope}).`);
     }
     else {
         const path = writeProjectMcpJson(mcpMarkerEntry(opts.workspaceId));
         console.log(`✓ Wrote secret-free watchdog marker to ${path}`);
-        console.log("  (Claude Code CLI not detected — used .mcp.json instead.)");
+        console.log(`  ${fallbackNote(res)}`);
     }
     console.log("\nMarker block (any stdio MCP client) — no secret, safe to commit:\n");
     console.log(mcpMarkerConfigBlock(opts.workspaceId));

package/dist/index.js

@@ -1,5 +1,8 @@
 #!/usr/bin/env node
 import { Command } from "commander";
+import { readFileSync } from "node:fs";
+import { fileURLToPath } from "node:url";
+import { dirname, join } from "node:path";
 import { loadConfig, patchConfig, saveConfig, configPath, isLoggedIn } from "./config.js";
 import { installMcp, normalizeScope } from "./commands/mcp.js";
 import { installGate } from "./commands/gate.js";
@@ -11,11 +14,16 @@ import { tidyAction, doneAction } from "./commands/tidy.js";
 import { runProxy } from "./proxy.js";
 import { deviceLogin } from "./auth.js";
 import { api } from "./api.js";
+// Single source of truth for the version: read package.json at runtime from the
+// compiled file's location (dist/index.js -> ../package.json). A JSON import won't
+// work here — tsconfig has rootDir "src", so importing ../package.json is outside
+// rootDir and fails tsc.
+const pkg = JSON.parse(readFileSync(join(dirname(fileURLToPath(import.meta.url)), "..", "package.json"), "utf8"));
 const program = new Command();
 program
     .name("retasc")
     .description("Retasc — sign in, create projects, mint agent API keys, and wire your agent to the MCP server.")
-    .version("1.1.1");
+    .version(pkg.version);
 function requireLogin() {
     if (!isLoggedIn()) {
         console.error("Not signed in. Run `retasc login` first.");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@retasc/cli",
-  "version": "1.1.1",
+  "version": "1.1.3",
   "description": "Retasc CLI — sign in with GitHub, create projects, mint agent API keys, and wire your agent to the Retasc MCP server in one command.",
   "type": "module",
   "bin": {