@persistmemory/cli 0.3.2 → 0.4.0

package/dist/bin.js

@@ -1404,7 +1404,7 @@ function shortDate(iso) {
 }
 
 // src/help.ts
-var VERSION = true ? "0.3.2" : versionFromManifest();
+var VERSION = true ? "0.4.0" : versionFromManifest();
 var PACKAGE = "@persistmemory/cli";
 var HELP = `
   pm \u2014 PersistMemory from your terminal
@@ -1446,12 +1446,14 @@ var HELP = `
     remember -                       capture whatever is piped in
     remember --file <path>           capture a file's contents
 
-    agent --root <dir> [--root ...]  answer file requests from this machine \u2014
-                                     nothing outside those folders is read.
-                                     It stays in the foreground. Background it,
-                                     and stop it later, with:
-                                       nohup pm agent --root ~/Desktop &
+    agent                            answer file requests from this machine.
+                                     Reads ~/Desktop, ~/Documents and
+                                     ~/Downloads by default, and nothing
+                                     outside them. It stays in the foreground.
+                                     Background it, and stop it later, with:
+                                       nohup pm agent > ~/agent.log 2>&1 &
                                        pkill -f "pm agent"
+    agent --root <dir> [--root ...]  choose the folders yourself instead
 
     search <query>                   search your memory
     list memories                    the most recent memories
@@ -2320,6 +2322,15 @@ async function upload(apiUrl, token, filename, bytes) {
   if (!stored.attachToken) return { ok: false, error: "the upload returned no reference" };
   return { ok: true, attachToken: stored.attachToken, bytes: bytes.length };
 }
+function defaultRoots(home = homedir2(), isDirectory = (path) => {
+  try {
+    return statSync2(path).isDirectory();
+  } catch {
+    return false;
+  }
+}) {
+  return ["Desktop", "Documents", "Downloads"].map((name) => join4(home, name)).filter(isDirectory);
+}
 var MAX_LISTED = 200;
 function sizeOf(path) {
   const size = statSync2(path).size;
@@ -2337,18 +2348,19 @@ async function agentCommand(context) {
     (one) => resolve3(one.startsWith("~") ? resolve3(homedir2(), one.slice(1).replace(/^[/\\]/, "")) : one)
   );
   if (roots.length === 0) {
-    context.error(
-      "Say which folders this machine may read from, and nothing outside them will be:"
+    const usual = defaultRoots();
+    if (usual.length === 0) {
+      context.error(
+        "This machine has no Desktop, Documents or Downloads folder, so there is nothing to offer by default. Say which folders it may read from:"
+      );
+      context.error("");
+      context.error("  pm agent --root ~/projects");
+      return 1;
+    }
+    roots.push(...usual);
+    context.print(
+      `Reading from ${usual.map((path) => path.replace(homedir2(), "~")).join(", ")} \u2014 nothing outside them. Use --root to choose your own.`
     );
-    context.error("");
-    context.error("  pm agent --root ~/Desktop --root ~/Documents");
-    context.error("");
-    context.error("It stays in the foreground. To leave it running:");
-    context.error("");
-    context.error("  nohup pm agent --root ~/Desktop > ~/agent.log 2>&1 &");
-    context.error("");
-    context.error('And to stop it later:  pkill -f "pm agent"');
-    return 1;
   }
   for (const root of roots) {
     try {
@@ -2993,6 +3005,9 @@ import { existsSync as existsSync7, rmSync } from "node:fs";
 import { spawnSync } from "node:child_process";
 import { dirname as dirname4, resolve as resolve7 } from "node:path";
 import { fileURLToPath } from "node:url";
+function installArgs(pkg = PACKAGE) {
+  return ["install", "-g", "--prefer-online", `${pkg}@latest`];
+}
 async function updateCommand(context) {
   const manager = installer();
   if (!manager) {
@@ -3001,19 +3016,38 @@ async function updateCommand(context) {
     );
     return 1;
   }
+  const before = versionOf(manager);
   context.print(`Installing the newest ${PACKAGE}\u2026`);
-  const result = spawnSync(manager, ["install", "-g", `${PACKAGE}@latest`], {
-    stdio: "inherit"
-  });
+  const result = spawnSync(manager, installArgs(), { stdio: "inherit" });
   if (result.status !== 0) {
     context.error(
-      "That did not work. If it failed on permissions, do NOT re-run it with sudo \u2014\npoint npm at a directory you own instead:\n  npm config set prefix ~/.npm-global\n  export PATH=$HOME/.npm-global/bin:$PATH"
+      'That did not work.\n\nIf npm said ETARGET or "no matching version", its cached list of versions is\nstale. Clear it and try again:\n  npm cache clean --force\n\nIf it failed on permissions, do NOT re-run it with sudo \u2014 point npm at a\ndirectory you own instead:\n  npm config set prefix ~/.npm-global\n  export PATH=$HOME/.npm-global/bin:$PATH'
     );
     return result.status ?? 1;
   }
-  context.print("Done. `pm --version` will show the new one.");
+  const after = versionOf(manager);
+  if (after && before && after === before) {
+    context.print(
+      `npm finished, but ${PACKAGE} is still ${after}. That is usually a second copy
+earlier on your PATH \u2014 check with: which -a pm`
+    );
+    return 1;
+  }
+  context.print(after ? `Done \u2014 now on ${after}.` : "Done.");
   return 0;
 }
+function versionOf(manager) {
+  const result = spawnSync(manager, ["ls", "-g", "--depth", "0", "--json", PACKAGE], {
+    encoding: "utf8"
+  });
+  if (result.status !== 0 || !result.stdout) return void 0;
+  try {
+    const parsed = JSON.parse(result.stdout);
+    return parsed.dependencies?.[PACKAGE]?.version;
+  } catch {
+    return void 0;
+  }
+}
 async function uninstallCommand(context) {
   const manager = installer();
   if (!manager) {