@persistmemory/cli 0.3.0 → 0.3.2

package/dist/index.js

@@ -1,4 +1,4 @@
-// ../sdk-js/dist/index.js
+// node_modules/@persistmemory/sdk/dist/index.js
 function encodeQuery(params) {
   if (!params) return "";
   const search = new URLSearchParams();
@@ -232,27 +232,6 @@ var HttpClient = class {
       ...options ? { options } : {}
     });
   }
-  /** POST with a file as the body. The type describes the bytes, not JSON. */
-  async postBytes(path, bytes, contentType, query, options) {
-    return this.#request({
-      method: "POST",
-      path,
-      rawBody: bytes,
-      contentType,
-      ...query ? { query } : {},
-      ...options ? { options } : {}
-    });
-  }
-  /** GET that returns bytes rather than JSON, for downloading a file. */
-  async getBytes(path, query, options) {
-    return this.#request({
-      method: "GET",
-      path,
-      rawResponse: true,
-      ...query ? { query } : {},
-      ...options ? { options } : {}
-    });
-  }
   async patch(path, body, options) {
     return this.#request({
       method: "PATCH",
@@ -305,20 +284,11 @@ var HttpClient = class {
         this.#fetch(url, {
           method: request.method,
           headers: this.#headers(request),
-          ...request.rawBody !== void 0 ? { body: request.rawBody } : request.body !== void 0 ? { body: JSON.stringify(request.body) } : {},
+          ...request.body !== void 0 ? { body: JSON.stringify(request.body) } : {},
           signal: deadline.signal
         }),
         deadline.signal
       );
-      if (request.rawResponse && response.ok) {
-        const disposition = response.headers.get("content-disposition") ?? "";
-        const named = /filename="([^"]+)"/.exec(disposition)?.[1];
-        return {
-          bytes: new Uint8Array(await response.arrayBuffer()),
-          contentType: response.headers.get("content-type") ?? "application/octet-stream",
-          ...named ? { filename: named } : {}
-        };
-      }
       const payload = await readBody(response);
       if (!response.ok) throw errorFromResponse(response.status, payload, response.headers);
       return payload;
@@ -339,11 +309,9 @@ var HttpClient = class {
     return {
       // The only place the key is ever read.
       authorization: `Bearer ${this.#apiKey}`,
-      // A download route answers with the file's own type, so `*/*` rather
-      // than a promise to accept only JSON that the server would have to break.
-      accept: request.rawResponse ? "*/*" : "application/json",
+      accept: "application/json",
       "user-agent": this.#userAgent,
-      ...request.rawBody !== void 0 ? { "content-type": request.contentType ?? "application/octet-stream" } : request.body !== void 0 ? { "content-type": "application/json" } : {},
+      ...request.body !== void 0 ? { "content-type": "application/json" } : {},
       ...request.options?.idempotencyKey ? { "idempotency-key": request.options.idempotencyKey } : {}
     };
   }
@@ -920,119 +888,6 @@ var Conversations = class {
     );
   }
 };
-var Google = class {
-  #http;
-  constructor(http) {
-    this.#http = http;
-  }
-  /** Files by name, newest first. Omit the query for recently changed ones. */
-  async searchDrive(params = {}, options) {
-    return this.#http.get(
-      "/api/v1/google/drive/files",
-      {
-        ...params.query !== void 0 ? { query: params.query } : {},
-        ...params.limit !== void 0 ? { limit: params.limit } : {}
-      },
-      options
-    );
-  }
-  async getDriveFile(fileId, options) {
-    return this.#http.get(
-      `/api/v1/google/drive/files/${encodeURIComponent(fileId)}`,
-      void 0,
-      options
-    );
-  }
-  /**
-   * The bytes of a Drive file.
-   *
-   * A Google Doc, Sheet or Slide holds no bytes of its own and is exported on
-   * the way - a document as PDF, a spreadsheet as CSV - so `filename` comes
-   * back describing what it BECAME. Writing it under the id instead produces a
-   * file nothing will open.
-   */
-  async downloadDriveFile(fileId, options) {
-    return this.#http.getBytes(
-      `/api/v1/google/drive/files/${encodeURIComponent(fileId)}/content`,
-      void 0,
-      options
-    );
-  }
-  /**
-   * Writes a file into the user's Drive.
-   *
-   * Needs one of the Drive write permissions on their connection. A read-only
-   * grant is refused by Google, and the error names the missing permission
-   * rather than reporting a failed upload - one is fixed with a checkbox and
-   * the other sends somebody looking for a bug.
-   */
-  async saveToDrive(params, options) {
-    return this.#http.postBytes(
-      "/api/v1/google/drive/files",
-      params.bytes,
-      params.contentType ?? "application/octet-stream",
-      {
-        name: params.name,
-        ...params.folderId !== void 0 ? { folderId: params.folderId } : {}
-      },
-      options
-    );
-  }
-  /**
-   * Recent messages - senders, subjects and a one-line preview, never bodies.
-   *
-   * `query` is Gmail's own syntax passed through as written: `from:priya`,
-   * `has:attachment`, `newer_than:7d`. It selects within the connected mailbox
-   * and cannot reach another one.
-   */
-  async searchMail(params = {}, options) {
-    return this.#http.get(
-      "/api/v1/google/mail",
-      {
-        ...params.query !== void 0 ? { query: params.query } : {},
-        ...params.limit !== void 0 ? { limit: params.limit } : {}
-      },
-      options
-    );
-  }
-  /** One message, with its body and the names of what is attached. */
-  async readMail(messageId, options) {
-    return this.#http.get(
-      `/api/v1/google/mail/${encodeURIComponent(messageId)}`,
-      void 0,
-      options
-    );
-  }
-  /**
-   * The bytes of one attachment.
-   *
-   * Separate from `readMail` so listing a mailbox never drags attachments
-   * across the network: a message with a 40 MB deck should not cost 40 MB to
-   * summarise.
-   */
-  async downloadAttachment(messageId, attachmentId, options) {
-    return this.#http.getBytes(
-      `/api/v1/google/mail/${encodeURIComponent(messageId)}/attachments/${encodeURIComponent(attachmentId)}`,
-      void 0,
-      options
-    );
-  }
-  /** Sends as the connected account. Needs the send permission. */
-  async sendMail(params, options) {
-    return this.#http.post("/api/v1/google/mail/send", params, options);
-  }
-  /** People in the user's contacts. Omit the query to list them. */
-  async contacts(params = {}, options) {
-    return this.#http.get(
-      "/api/v1/google/contacts",
-      {
-        ...params.query !== void 0 ? { query: params.query } : {},
-        ...params.limit !== void 0 ? { limit: params.limit } : {}
-      },
-      options
-    );
-  }
-};
 var Integrations = class {
   #http;
   constructor(http) {
@@ -1163,8 +1018,6 @@ var PersistMemory = class {
   conflicts;
   conversations;
   integrations;
-  /** Drive, mail and contacts on the user's connected Google account. */
-  google;
   health;
   agent;
   #http;
@@ -1181,7 +1034,6 @@ var PersistMemory = class {
     this.conflicts = new Conflicts(this.#http);
     this.conversations = new Conversations(this.#http);
     this.integrations = new Integrations(this.#http);
-    this.google = new Google(this.#http);
     this.health = new Health(this.#http);
     this.agent = new Agent(this.#http);
   }
@@ -1212,6 +1064,14 @@ function parseArgs(argv) {
   const words = [];
   const flags = {};
   const rest = [];
+  const set = (name, value) => {
+    const held = flags[name];
+    if (typeof value === "boolean" || held === void 0 || typeof held === "boolean") {
+      flags[name] = value;
+      return;
+    }
+    flags[name] = typeof held === "string" ? [held, value] : [...held, value];
+  };
   let index = 0;
   while (index < argv.length) {
     const token = argv[index];
@@ -1223,22 +1083,22 @@ function parseArgs(argv) {
       const body = token.slice(2);
       const equals = body.indexOf("=");
       if (equals !== -1) {
-        flags[body.slice(0, equals)] = body.slice(equals + 1);
+        set(body.slice(0, equals), body.slice(equals + 1));
         index += 1;
         continue;
       }
       if (body.startsWith("no-")) {
-        flags[body.slice(3)] = false;
+        set(body.slice(3), false);
         index += 1;
         continue;
       }
       const next = argv[index + 1];
       if (next !== void 0 && !next.startsWith("-")) {
-        flags[body] = next;
+        set(body, next);
         index += 2;
         continue;
       }
-      flags[body] = true;
+      set(body, true);
       index += 1;
       continue;
     }
@@ -1246,11 +1106,11 @@ function parseArgs(argv) {
       const body = token.slice(1);
       const next = argv[index + 1];
       if (next !== void 0 && !next.startsWith("-")) {
-        flags[body] = next;
+        set(body, next);
         index += 2;
         continue;
       }
-      flags[body] = true;
+      set(body, true);
       index += 1;
       continue;
     }
@@ -1263,12 +1123,14 @@ function stringFlag(args, ...names) {
   for (const name of names) {
     const value = args.flags[name];
     if (typeof value === "string") return value;
+    if (Array.isArray(value) && value.length > 0) return value[value.length - 1];
   }
   return void 0;
 }
 function boolFlag(args, ...names) {
   for (const name of names) {
     const value = args.flags[name];
+    if (Array.isArray(value)) continue;
     if (typeof value === "boolean") return value;
     if (value === "true") return true;
     if (value === "false") return false;
@@ -1279,6 +1141,13 @@ function numberFlag(args, ...names) {
   for (const name of names) {
     const value = args.flags[name];
     if (value === void 0 || typeof value === "boolean") continue;
+    if (Array.isArray(value)) {
+      const last = value[value.length - 1];
+      if (last === void 0) continue;
+      const parsed2 = Number(last);
+      if (!Number.isFinite(parsed2)) return "invalid";
+      return parsed2;
+    }
     const parsed = Number(value);
     if (!Number.isFinite(parsed)) return "invalid";
     return parsed;
@@ -1286,9 +1155,17 @@ function numberFlag(args, ...names) {
   return void 0;
 }
 function listFlag(args, ...names) {
-  const raw = stringFlag(args, ...names);
-  if (raw === void 0) return void 0;
-  const items = raw.split(",").map((one) => one.trim()).filter((one) => one.length > 0);
+  const items = [];
+  for (const name of names) {
+    const value = args.flags[name];
+    if (value === void 0 || typeof value === "boolean") continue;
+    for (const one of Array.isArray(value) ? value : [value]) {
+      for (const part of one.split(",")) {
+        const trimmed = part.trim();
+        if (trimmed.length > 0) items.push(trimmed);
+      }
+    }
+  }
   return items.length > 0 ? items : void 0;
 }
 
@@ -1525,7 +1402,7 @@ function shortDate(iso) {
 }
 
 // src/help.ts
-var VERSION = true ? "0.3.0" : versionFromManifest();
+var VERSION = true ? "0.3.2" : versionFromManifest();
 var PACKAGE = "@persistmemory/cli";
 var HELP = `
   pm \u2014 PersistMemory from your terminal
@@ -2303,6 +2180,11 @@ async function said(response, fallback) {
 }
 function locate(roots, requested) {
   const expanded = requested.startsWith("~") ? resolve3(homedir2(), requested.slice(1).replace(/^[/\\]/, "")) : requested;
+  if (!expanded.includes("/") && !expanded.includes("\\")) {
+    const wanted2 = expanded.trim().toLowerCase();
+    const named = roots.find((root) => basename(root).toLowerCase() === wanted2);
+    if (named) return within(named, named);
+  }
   for (const root of roots) {
     try {
       return within(root, expanded);
@@ -2494,10 +2376,14 @@ async function agentCommand(context) {
   };
   process.on("SIGINT", stop);
   process.on("SIGTERM", stop);
+  const authorization = async () => {
+    const held = await currentCredential(context.resolved, context.session);
+    return held.token;
+  };
   const call = async (path, body) => fetch(`${apiUrl}/api/v1/agent/${path}`, {
     method: "POST",
     headers: {
-      authorization: `Bearer ${credential.token}`,
+      authorization: `Bearer ${await authorization()}`,
       "content-type": "application/json"
     },
     body: JSON.stringify(body)
@@ -2538,7 +2424,7 @@ async function agentCommand(context) {
         const { items } = await claimed.json();
         for (const request of items) {
           context.print(`Reading ${request.path}`);
-          const outcome = await answer(context, apiUrl, credential.token, roots, request);
+          const outcome = await answer(context, apiUrl, await authorization(), roots, request);
           const done = await call(
             `complete/${encodeURIComponent(request.id)}`,
             outcome.ok ? { result: { attachToken: outcome.attachToken } } : { error: outcome.error }