@memrosetta/cli 0.4.4 → 0.4.5

package/dist/index.js

@@ -56,7 +56,11 @@ Global Options:
   --version, -v       Show version
 
 Sync Subcommands:
-  memrosetta sync enable --server <url> [key-source]
+  memrosetta sync enable --server <url> [--user <id>] [key-source]
+    --user <id>                 Logical user id shared across devices
+                                (defaults to OS username). Different
+                                devices of the same person MUST share
+                                the same --user to see each other.
     Key sources (mutually exclusive, exactly one):
       --key <value>             Direct (visible in shell history)
       --key-stdin               Read from stdin (echo key | memrosetta ...)
@@ -189,7 +193,7 @@ async function main() {
         break;
       }
       case "sync": {
-        const mod = await import("./sync-GMGC66NK.js");
+        const mod = await import("./sync-JSEQ4AM3.js");
         await mod.run(commandOptions);
         break;
       }

package/dist/sync-JSEQ4AM3.js

@@ -0,0 +1,401 @@
+import {
+  hasFlag,
+  optionalOption,
+  requireOption
+} from "./chunk-NU5ZJJXP.js";
+import {
+  output,
+  outputError
+} from "./chunk-ET6TNQOJ.js";
+import {
+  getConfig,
+  getDefaultDbPath,
+  writeConfig
+} from "./chunk-SEPYQK3J.js";
+
+// src/commands/sync.ts
+import { randomUUID } from "crypto";
+import { readFileSync } from "fs";
+import { userInfo, platform } from "os";
+import { createInterface } from "readline";
+var ENV_API_KEY = "MEMROSETTA_SYNC_API_KEY";
+var KEY_SOURCE_HINT = [
+  "API key required. Use exactly one of:",
+  "  --key <value>              (direct, visible in history)",
+  "  --key-stdin                (pipe from stdin)",
+  "  --key-file <path>          (read from file)",
+  `  ${ENV_API_KEY}=<value>    (environment variable)`,
+  "",
+  "On POSIX TTYs an interactive hidden prompt is also available.",
+  "See: memrosetta sync enable --help"
+].join("\n");
+function parseSubcommand(args) {
+  const first = args[0];
+  if (!first || first.startsWith("--")) return null;
+  if (first === "enable" || first === "disable" || first === "status" || first === "now" || first === "device-id") {
+    return first;
+  }
+  return null;
+}
+var CONTROL_CHAR_REGEX = /[\x00-\x1F\x7F]/;
+function validateApiKey(key, sourceLabel) {
+  const trimmed = key.trim();
+  if (trimmed.length === 0) {
+    throw new Error(`API key from ${sourceLabel} is empty.`);
+  }
+  if (CONTROL_CHAR_REGEX.test(trimmed)) {
+    throw new Error(
+      `API key from ${sourceLabel} contains control characters. Try --key-file or MEMROSETTA_SYNC_API_KEY instead.`
+    );
+  }
+  return trimmed;
+}
+function readKeyFile(path) {
+  try {
+    return readFileSync(path, "utf-8");
+  } catch (err) {
+    const msg = err instanceof Error ? err.message : String(err);
+    throw new Error(`Could not read --key-file '${path}': ${msg}`);
+  }
+}
+async function resolveApiKey(args) {
+  const directKey = optionalOption(args, "--key");
+  const keyFile = optionalOption(args, "--key-file");
+  const useStdin = hasFlag(args, "--key-stdin");
+  const explicitCount = [directKey !== void 0, keyFile !== void 0, useStdin].filter(Boolean).length;
+  if (explicitCount > 1) {
+    throw new Error(
+      "Specify only one of --key, --key-stdin, --key-file."
+    );
+  }
+  if (directKey !== void 0) {
+    return validateApiKey(directKey, "--key");
+  }
+  if (useStdin) {
+    const raw = await readStdinKey();
+    if (!raw) {
+      throw new Error(
+        "--key-stdin produced no input. On Windows PowerShell, prefer --key-file or MEMROSETTA_SYNC_API_KEY."
+      );
+    }
+    return validateApiKey(raw, "--key-stdin");
+  }
+  if (keyFile !== void 0) {
+    return validateApiKey(readKeyFile(keyFile), `--key-file ${keyFile}`);
+  }
+  const envKey = process.env[ENV_API_KEY];
+  if (envKey !== void 0 && envKey.length > 0) {
+    return validateApiKey(envKey, ENV_API_KEY);
+  }
+  if (platform() !== "win32" && process.stdin.isTTY) {
+    const raw = await readHiddenInput("API key: ");
+    return validateApiKey(raw, "hidden prompt");
+  }
+  throw new Error(KEY_SOURCE_HINT);
+}
+async function readHiddenInput(prompt) {
+  const stdin = process.stdin;
+  const stdout = process.stdout;
+  if (!stdin.isTTY) {
+    throw new Error("Interactive input requires a TTY. Use --key-stdin to pipe the key instead.");
+  }
+  stdout.write(prompt);
+  const originalWrite = stdout.write.bind(stdout);
+  let muted = true;
+  stdout.write = (chunk, ...rest) => {
+    if (!muted) {
+      return originalWrite(chunk, ...rest);
+    }
+    const str = typeof chunk === "string" ? chunk : chunk?.toString?.("utf-8") ?? "";
+    if (str === "\n" || str === "\r\n" || str === "\r") {
+      return originalWrite(chunk, ...rest);
+    }
+    return true;
+  };
+  const rl = createInterface({
+    input: stdin,
+    output: stdout,
+    terminal: true
+  });
+  try {
+    const answer = await new Promise((resolve, reject) => {
+      rl.once("close", () => {
+        reject(new Error("Aborted"));
+      });
+      rl.question("", (value) => {
+        resolve(value);
+      });
+    });
+    return answer;
+  } finally {
+    muted = false;
+    stdout.write = originalWrite;
+    rl.close();
+  }
+}
+async function readStdinKey() {
+  const chunks = [];
+  for await (const chunk of process.stdin) {
+    chunks.push(chunk);
+  }
+  return Buffer.concat(chunks).toString("utf-8").trim();
+}
+async function testConnection(serverUrl, apiKey) {
+  const url = `${serverUrl.replace(/\/$/, "")}/sync/health`;
+  try {
+    const res = await fetch(url, {
+      headers: { Authorization: `Bearer ${apiKey}` }
+    });
+    if (!res.ok) {
+      throw new Error(`HTTP ${res.status} ${res.statusText}`);
+    }
+  } catch (err) {
+    const msg = err instanceof Error ? err.message : String(err);
+    throw new Error(`Sync server health check failed: ${msg}`);
+  }
+}
+async function withSyncClient(dbPath, config, fn) {
+  const Database = (await import("better-sqlite3")).default;
+  const { SyncClient, ensureSyncSchema } = await import("@memrosetta/sync-client");
+  if (!config.syncServerUrl || !config.syncApiKey || !config.syncDeviceId) {
+    throw new Error("Sync is not configured. Run: memrosetta sync enable --server <url>");
+  }
+  if (CONTROL_CHAR_REGEX.test(config.syncApiKey)) {
+    throw new Error(
+      `Stored API key is invalid (contains control characters from a previous terminal input). Re-run with one of:
+  memrosetta sync enable --server ${config.syncServerUrl} --key <api-key>
+  memrosetta sync enable --server ${config.syncServerUrl} --key-file path/to/key
+  $env:${ENV_API_KEY}='<api-key>'; memrosetta sync enable --server ${config.syncServerUrl}`
+    );
+  }
+  const db = new Database(dbPath);
+  try {
+    ensureSyncSchema(db);
+    const client = new SyncClient(db, {
+      serverUrl: config.syncServerUrl,
+      apiKey: config.syncApiKey,
+      deviceId: config.syncDeviceId,
+      userId: config.syncUserId ?? userInfo().username
+    });
+    return await fn(client, db);
+  } finally {
+    db.close();
+  }
+}
+async function runEnable(options) {
+  const { args, format } = options;
+  let serverUrl;
+  try {
+    serverUrl = requireOption(args, "--server", "server URL");
+  } catch (err) {
+    outputError(err instanceof Error ? err.message : String(err), format);
+    process.exitCode = 1;
+    return;
+  }
+  let apiKey;
+  try {
+    apiKey = await resolveApiKey(args);
+  } catch (err) {
+    outputError(err instanceof Error ? err.message : String(err), format);
+    process.exitCode = 1;
+    return;
+  }
+  const skipTest = hasFlag(args, "--no-test");
+  if (!skipTest) {
+    try {
+      await testConnection(serverUrl, apiKey);
+    } catch (err) {
+      outputError(
+        `${err instanceof Error ? err.message : String(err)}
+Use --no-test to skip the health check.`,
+        format
+      );
+      process.exitCode = 1;
+      return;
+    }
+  }
+  const existing = getConfig();
+  const deviceId = existing.syncDeviceId ?? `device-${randomUUID().slice(0, 8)}`;
+  const userOverride = optionalOption(args, "--user");
+  const syncUserId = userOverride ?? existing.syncUserId ?? userInfo().username;
+  writeConfig({
+    ...existing,
+    syncEnabled: true,
+    syncServerUrl: serverUrl,
+    syncApiKey: apiKey,
+    syncDeviceId: deviceId,
+    syncUserId
+  });
+  if (format === "text") {
+    process.stdout.write("Sync enabled.\n");
+    process.stdout.write(`  Server:   ${serverUrl}
+`);
+    process.stdout.write(`  UserId:   ${syncUserId}
+`);
+    process.stdout.write(`  DeviceId: ${deviceId}
+`);
+    if (skipTest) {
+      process.stdout.write("  (health check skipped)\n");
+    }
+    return;
+  }
+  output(
+    { enabled: true, serverUrl, userId: syncUserId, deviceId, healthCheckSkipped: skipTest },
+    format
+  );
+}
+function runDisable(options) {
+  const { format } = options;
+  const existing = getConfig();
+  writeConfig({
+    ...existing,
+    syncEnabled: false
+  });
+  if (format === "text") {
+    process.stdout.write("Sync disabled. (server URL and API key preserved for re-enable)\n");
+    return;
+  }
+  output({ enabled: false }, format);
+}
+async function runStatus(options) {
+  const { format, db } = options;
+  const config = getConfig();
+  const dbPath = db ?? config.dbPath ?? getDefaultDbPath();
+  if (!config.syncEnabled) {
+    if (format === "text") {
+      process.stdout.write("Sync: disabled\n");
+      if (config.syncServerUrl) {
+        process.stdout.write(`  Server:   ${config.syncServerUrl}
+`);
+      }
+      if (config.syncUserId) {
+        process.stdout.write(`  UserId:   ${config.syncUserId}
+`);
+      }
+      if (config.syncDeviceId) {
+        process.stdout.write(`  DeviceId: ${config.syncDeviceId}
+`);
+      }
+      return;
+    }
+    output(
+      {
+        enabled: false,
+        serverUrl: config.syncServerUrl ?? null,
+        userId: config.syncUserId ?? null,
+        deviceId: config.syncDeviceId ?? null
+      },
+      format
+    );
+    return;
+  }
+  try {
+    const status = await withSyncClient(dbPath, config, async (client) => client.getStatus());
+    if (format === "text") {
+      process.stdout.write("Sync: enabled\n");
+      process.stdout.write(`  Server:          ${status.serverUrl}
+`);
+      process.stdout.write(`  UserId:          ${status.userId}
+`);
+      process.stdout.write(`  DeviceId:        ${status.deviceId}
+`);
+      process.stdout.write(`  Pending ops:     ${status.pendingOps}
+`);
+      process.stdout.write(`  Current cursor:  ${status.cursor}
+`);
+      process.stdout.write(
+        `  Last push:       ${status.lastPush.successAt ?? "never"}` + (status.lastPush.attemptAt && status.lastPush.attemptAt !== status.lastPush.successAt ? ` (last attempt: ${status.lastPush.attemptAt})` : "") + "\n"
+      );
+      process.stdout.write(
+        `  Last pull:       ${status.lastPull.successAt ?? "never"}` + (status.lastPull.attemptAt && status.lastPull.attemptAt !== status.lastPull.successAt ? ` (last attempt: ${status.lastPull.attemptAt})` : "") + "\n"
+      );
+      return;
+    }
+    output(status, format);
+  } catch (err) {
+    outputError(err instanceof Error ? err.message : String(err), format);
+    process.exitCode = 1;
+  }
+}
+async function runNow(options) {
+  const { args, format, db } = options;
+  const config = getConfig();
+  const dbPath = db ?? config.dbPath ?? getDefaultDbPath();
+  if (!config.syncEnabled) {
+    outputError("Sync is disabled. Run: memrosetta sync enable --server <url>", format);
+    process.exitCode = 1;
+    return;
+  }
+  const pushOnly = hasFlag(args, "--push-only");
+  const pullOnly = hasFlag(args, "--pull-only");
+  try {
+    const result = await withSyncClient(dbPath, config, async (client) => {
+      let pushed = 0;
+      let pulled = 0;
+      if (!pullOnly) {
+        const pushResult = await client.push();
+        pushed = pushResult.pushed;
+      }
+      if (!pushOnly) {
+        pulled = await client.pull();
+      }
+      return { pushed, pulled };
+    });
+    if (format === "text") {
+      process.stdout.write(`Sync complete. pushed=${result.pushed} pulled=${result.pulled}
+`);
+      return;
+    }
+    output(result, format);
+  } catch (err) {
+    outputError(err instanceof Error ? err.message : String(err), format);
+    process.exitCode = 1;
+  }
+}
+function runDeviceId(options) {
+  const { format } = options;
+  const config = getConfig();
+  if (!config.syncDeviceId) {
+    outputError("No deviceId set. Run: memrosetta sync enable --server <url>", format);
+    process.exitCode = 1;
+    return;
+  }
+  if (format === "text") {
+    process.stdout.write(`${config.syncDeviceId}
+`);
+    return;
+  }
+  output({ deviceId: config.syncDeviceId }, format);
+}
+async function run(options) {
+  const sub = parseSubcommand(options.args);
+  if (!sub) {
+    outputError(
+      "Usage: memrosetta sync <enable|disable|status|now|device-id>\n\n  enable    --server <url> [--key <key> | --key-stdin] [--no-test]\n  disable\n  status\n  now       [--push-only | --pull-only]\n  device-id\n",
+      options.format
+    );
+    process.exitCode = 1;
+    return;
+  }
+  const rest = { ...options, args: options.args.slice(1) };
+  switch (sub) {
+    case "enable":
+      await runEnable(rest);
+      return;
+    case "disable":
+      runDisable(rest);
+      return;
+    case "status":
+      await runStatus(rest);
+      return;
+    case "now":
+      await runNow(rest);
+      return;
+    case "device-id":
+      runDeviceId(rest);
+      return;
+  }
+}
+export {
+  run
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@memrosetta/cli",
-  "version": "0.4.4",
+  "version": "0.4.5",
   "type": "module",
   "main": "./dist/index.js",
   "bin": {
@@ -17,7 +17,7 @@
     "better-sqlite3": "^11.0.0",
     "@memrosetta/core": "0.4.0",
     "@memrosetta/embeddings": "0.3.0",
-    "@memrosetta/sync-client": "0.1.1",
+    "@memrosetta/sync-client": "0.1.2",
     "@memrosetta/types": "0.4.0"
   },
   "optionalDependencies": {