node-command 2.0.4 → 2.0.5

package/bin/nc.mjs

@@ -2875,7 +2875,7 @@ async function runRemoval(args, { command, emptyMessage, elevateOnWindows = fals
   }
   if (unreadable.length > 0) {
     console.log(
-      `Elevated removal needed for system install(s): ${unreadable.join(', ')} (not readable as the current user).`
+      `Explicit root maintenance required for system install(s): ${unreadable.join(', ')} (not readable as the current user).`
     );
   }
   if (!yes) {
@@ -2924,33 +2924,13 @@ async function runRemoval(args, { command, emptyMessage, elevateOnWindows = fals
       lock.release();
     }
   }
-  // Unreadable system roots remain visible, but never trigger implicit sudo.
+  // Unreadable system roots remain visible, but are never executed: an
+  // ordinary caller cannot verify the tree, so removal is explicit root
+  // maintenance. This deliberately adds no implicit sudo.
   for (const root of unreadable) {
-    const script = uninstallerForRoot(root);
-    let lock = null;
-    try {
-      lock = acquireInstallLock(root);
-    } catch (err) {
-      if (err instanceof PairingError && err.code === 'SETUP_IN_PROGRESS') {
-        reportSetupError(err);
-        failed += 1;
-        continue;
-      }
-      // Best effort: an unreadable system root usually cannot host a writable
-      // lock from an ordinary caller. The privileged uninstaller remains the
-      // authority; do not turn a lock-permission failure into a false refusal.
-    }
-    try {
-      runUninstallerScript(script);
-      console.log(`Removed ${root} (exit 0).`);
-    } catch (err) {
-      const rc = typeof err?.status === 'number' ? err.status : 1;
-      console.error(`error: [UNINSTALL_FAILED] uninstaller for ${root} exited with status ${rc}: ${sanitizeForDisplay(err.message, 300)}`);
-      console.error(uninstallFailureSuggestion());
-      failed += 1;
-    } finally {
-      lock?.release();
-    }
+    console.error(`error: [TRUSTED_ROOT_MAINTENANCE_REQUIRED] The system installation at ${root} is not readable by the current user; it was not modified.`);
+    console.error('suggested_action: Run `sudo npx --yes node-command@latest uninstall --yes` to remove this trusted root installation explicitly.');
+    failed += 1;
   }
   if (failed > 0) process.exit(1);
   console.log(completionMessage);

package/lib/setup.mjs

@@ -391,6 +391,44 @@ export function probeInstallRoot(root, io = {}) {
   return 'foreign';
 }
 
+/**
+ * Removal-strict install-tree probe. Removing a tree is destructive, so a
+ * readable `config/nc-client.env` marker is required; an `app/` directory
+ * alone (an incomplete or foreign tree) is never a removal target.
+ * Distinguishes:
+ *   - 'install'    config marker is readable
+ *   - 'absent'     root directory does not exist
+ *   - 'foreign'    root exists but is not a directory, or the config marker is
+ *                  missing / not a regular file
+ *   - 'unreadable' root or config marker denies access (EACCES/EPERM)
+ * @param {string} root
+ * @param {{ statSync?: (p: string) => { isDirectory(): boolean, isFile?(): boolean }, accessSync?: (p: string, mode?: number) => void }} [io]
+ * @returns {'install'|'absent'|'foreign'|'unreadable'}
+ */
+export function probeRemovalRoot(root, io = {}) {
+  const statSync = io.statSync || fs.statSync;
+  const accessSync = io.accessSync || fs.accessSync;
+  try {
+    const st = statSync(root);
+    if (!st.isDirectory()) return 'foreign';
+  } catch (err) {
+    return err && err.code === 'ENOENT' ? 'absent' : 'unreadable';
+  }
+  const marker = path.join(root, 'config', 'nc-client.env');
+  try {
+    const st = statSync(marker);
+    if (typeof st.isFile === 'function' && !st.isFile()) return 'foreign';
+  } catch (err) {
+    return err && (err.code === 'EACCES' || err.code === 'EPERM') ? 'unreadable' : 'foreign';
+  }
+  try {
+    accessSync(marker, fs.constants.R_OK);
+    return 'install';
+  } catch (err) {
+    return err && (err.code === 'EACCES' || err.code === 'EPERM') ? 'unreadable' : 'foreign';
+  }
+}
+
 /**
  * Canonical machine-wide roots that exist but cannot be inspected by the
  * current unprivileged caller. Setup must escalate before deciding anything
@@ -424,7 +462,7 @@ export function findRemovalTargets({ io = {}, ...rest } = {}) {
   const roots = candidateInstallRoots(pair ? { ...rest, env: { ...env, NC_ROOT: undefined } } : rest);
   for (const root of pair ? [...new Set([...roots, pair.ncRoot])] : roots) {
     if (root === pair?.helperRoot && root !== pair.ncRoot) continue;
-    const status = probeInstallRoot(root, io);
+    const status = probeRemovalRoot(root, io);
     if (status === 'install') install.push(root);
     else if (status === 'unreadable') unreadable.push(root);
   }

package/package.json

@@ -1,8 +1,11 @@
 {
   "name": "node-command",
-  "version": "2.0.4",
+  "version": "2.0.5",
   "type": "module",
   "license": "Apache-2.0",
+  "engines": {
+    "node": ">=20"
+  },
   "bin": {
     "nc": "bin/nc.mjs",
     "nodecommand": "bin/nc.mjs",
@@ -12,22 +15,5 @@
   "files": [
     "bin/",
     "lib/"
-  ],
-  "description": "Node Command agent CLI — connect this machine to your AI assistant fleet",
-  "repository": {
-    "url": "git+https://github.com/huseyincig/NodeCommand.git",
-    "type": "git"
-  },
-  "engines": {
-    "node": ">=20"
-  },
-  "keywords": [
-    "node-command",
-    "nodecommand",
-    "mcp",
-    "remote",
-    "ai-assistant",
-    "agent",
-    "cli"
   ]
 }