@retasc/cli 1.2.2 → 1.2.4

package/dist/commands/mcp.js

@@ -1,5 +1,5 @@
 import { spawnSync } from "node:child_process";
-import { readFileSync, writeFileSync, existsSync } from "node:fs";
+import { readFileSync, writeFileSync, existsSync, chmodSync } from "node:fs";
 import { join } from "node:path";
 export const SERVER_NAME = "retasc";
 /** Normalize a user-supplied scope string. `user` (global) is refused and
@@ -128,8 +128,12 @@ export function fallbackNote(res) {
         ? "(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) {
+/** Merge a given server entry into ./.mcp.json (project scope on disk).
+ *  The inline-key fallback forms (mcpServerEntry / mcpProxyEntry) embed the API
+ *  key, so lock the file to 0600. The secret-free marker (mcpMarkerEntry) doesn't
+ *  need it, but chmod'ing unconditionally is harmless and keeps this the single
+ *  correct path. Exported for the permission test. */
+export function writeProjectMcpJson(entry) {
     const path = join(process.cwd(), ".mcp.json");
     let doc = {};
     if (existsSync(path)) {
@@ -142,7 +146,16 @@ function writeProjectMcpJson(entry) {
     }
     doc.mcpServers = doc.mcpServers ?? {};
     doc.mcpServers[SERVER_NAME] = entry;
-    writeFileSync(path, JSON.stringify(doc, null, 2) + "\n", "utf8");
+    // May carry an inline API key — create it 0600 so it's never world-readable,
+    // even for the sub-ms before the chmod (which only closes an existing 0644 file,
+    // since the write mode above doesn't apply when overwriting).
+    writeFileSync(path, JSON.stringify(doc, null, 2) + "\n", { encoding: "utf8", mode: 0o600 });
+    try {
+        chmodSync(path, 0o600);
+    }
+    catch {
+        /* best effort (e.g. Windows) */
+    }
     return path;
 }
 /**

package/dist/config.js

@@ -36,9 +36,13 @@ export function loadConfig() {
     };
 }
 export function saveConfig(cfg) {
-    mkdirSync(DIR, { recursive: true });
-    writeFileSync(FILE, JSON.stringify(cfg, null, 2) + "\n", "utf8");
-    // Tokens live here — keep it user-only readable.
+    // Create the dir user-only and the file 0600 on the initial write, so tokens
+    // never exist world-readable even briefly (the chmod below only closes a
+    // pre-existing 0644 file — it can't undo a world-readable creation window).
+    mkdirSync(DIR, { recursive: true, mode: 0o700 });
+    writeFileSync(FILE, JSON.stringify(cfg, null, 2) + "\n", { encoding: "utf8", mode: 0o600 });
+    // Tokens live here — keep it user-only readable (covers overwriting an
+    // existing 0644 file, where the write mode above doesn't apply).
     try {
         chmodSync(FILE, 0o600);
     }

package/dist/lib/keystore.js

@@ -23,11 +23,13 @@ export function loadKeystore() {
     }
 }
 export function saveKeystore(ks) {
-    mkdirSync(keystoreDir(), { recursive: true });
+    // Dir user-only, file 0600 on the initial write — the keystore holds API keys,
+    // so it must never exist world-readable even for the sub-ms before the chmod.
+    mkdirSync(keystoreDir(), { recursive: true, mode: 0o700 });
     const p = keystorePath();
-    writeFileSync(p, JSON.stringify(ks, null, 2) + "\n", "utf8");
+    writeFileSync(p, JSON.stringify(ks, null, 2) + "\n", { encoding: "utf8", mode: 0o600 });
     try {
-        chmodSync(p, 0o600); // secrets — user-only
+        chmodSync(p, 0o600); // secrets — user-only (covers overwriting an existing 0644 file)
     }
     catch {
         /* best effort (e.g. Windows) */

package/dist/lib/watchdog.js

@@ -57,10 +57,33 @@ export function heartbeatRequest(rpcId, issueId, claimToken) {
         params: { name: "heartbeat", arguments: { identifier: issueId, claimToken } },
     };
 }
-/** A heartbeat result of CLAIM_LOST means the lease is gone — stop tracking it. */
+/**
+ * A heartbeat CLAIM_LOST means the lease is gone — stop tracking it.
+ *
+ * The server throws `Error("CLAIM_LOST: …")` (convex/lib/claims.ts), and http.ts
+ * surfaces that as an MCP tool ERROR: `{ isError: true, content:[{text:"CLAIM_LOST: …"}] }`.
+ * Match ONLY that signal (or a top-level `error`/`code` field, for a future
+ * structured shape) — NEVER `JSON.stringify` the whole result and regex it, or a
+ * benign payload field that merely CONTAINS "CLAIM_LOST" (an issue title, a
+ * checkpoint note quoting an error, a comment body) would silently drop a live
+ * lease and let the reclaimer hand our work to someone else (RTSC-150).
+ */
 export function isClaimLost(result) {
     if (!result || typeof result !== "object")
         return false;
-    const text = JSON.stringify(result);
-    return /CLAIM_LOST/.test(text);
+    const r = result;
+    // A structured error signal on a top-level field (belt-and-suspenders; also the
+    // shape the older unit test asserts). Bounded to top-level scalars, not nested.
+    if (r.code === "CLAIM_LOST")
+        return true;
+    if (typeof r.error === "string" && /CLAIM_LOST/.test(r.error))
+        return true;
+    // The live shape: only an MCP error envelope, and only its text blocks — success
+    // payloads (isError absent/false) are never treated as a lost claim.
+    if (r.isError !== true || !Array.isArray(r.content))
+        return false;
+    return r.content.some((c) => c !== null &&
+        typeof c === "object" &&
+        typeof c.text === "string" &&
+        /CLAIM_LOST/.test(c.text));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@retasc/cli",
-  "version": "1.2.2",
+  "version": "1.2.4",
   "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": {