passalong 0.20.0 → 0.21.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "passalong",
-  "version": "0.20.0",
+  "version": "0.21.0",
   "description": "Hand tasks, bugs and finished work to AI coding agents, and get back a write-up with evidence.",
   "mcpName": "io.github.codellyson/passalong",
   "keywords": [

package/src/api.js

@@ -120,6 +120,19 @@ export function loggedIn() {
   return Boolean(token());
 }
 
+/**
+ * Every login this machine holds, as `{ token, api }` for a call's `as`: each kept account and the
+ * one in use, once each. For work that belongs to all of them, like `tidy`, rather than to one.
+ */
+export function logins() {
+  const all = Object.values(readAccounts())
+    .filter((a) => a.token)
+    .map((a) => ({ token: a.token, api: a.api || readConfig().api || DEFAULT_API }));
+  if (token()) all.push({ token: token(), api: baseUrl() });
+  const seen = new Set();
+  return all.filter((a) => !seen.has(`${a.token} ${a.api}`) && seen.add(`${a.token} ${a.api}`));
+}
+
 /** The team this account works in. It belongs to the account, not the machine. */
 export function currentTeam() {
   const p = picked();
@@ -149,12 +162,12 @@ export { nameFor };
 
 async function call(
   path,
-  { method = "GET", body, auth = true, raw = false, uploadName = "" } = {},
+  { method = "GET", body, auth = true, raw = false, uploadName = "", as = null } = {},
 ) {
   const headers = { ...CLIENT };
   if (auth) {
-    if (needsChoice()) throw new ApiError(409, choiceMessage());
-    const t = token();
+    if (!as && needsChoice()) throw new ApiError(409, choiceMessage());
+    const t = as ? as.token : token();
     if (!t) throw new ApiError(401, "not logged in — run `passalong login` to enable sync");
     headers.authorization = `Bearer ${t}`;
   }
@@ -166,9 +179,10 @@ async function call(
         : "application/json";
   }
   if (uploadName) headers["x-file-name"] = uploadName.replace(/[^\x20-\x7e]/g, "").slice(0, 120);
+  const base = as ? as.api.replace(/\/$/, "") : baseUrl();
   let res;
   try {
-    res = await fetch(`${baseUrl()}${path}`, {
+    res = await fetch(`${base}${path}`, {
       method,
       headers,
       body:
@@ -179,7 +193,7 @@ async function call(
             : JSON.stringify(body),
     });
   } catch (err) {
-    throw new ApiError(0, `could not reach ${baseUrl()} (${err.message})`);
+    throw new ApiError(0, `could not reach ${base} (${err.message})`);
   }
   if (!res.ok) {
     const text = await res.text();
@@ -379,10 +393,10 @@ export const inbox = () => call("/v1/inbox");
 export const createReport = (body) => call("/v1/reports", { method: "POST", body });
 /** One report and the issues filed under it, grouped by product area. */
 export const report = (id) => call(`/v1/reports/${encodeURIComponent(id)}`);
-export const get = (id, { peek = false } = {}) =>
-  call(`/v1/guides/${id}${q({ peek: peek ? "1" : "" })}`, { raw: true });
+export const get = (id, { peek = false, as = null } = {}) =>
+  call(`/v1/guides/${id}${q({ peek: peek ? "1" : "" })}`, { raw: true, as });
 /** One page of every guide this account can read, for `export`. Records no pull. */
-export const exportPage = (after = "") => call(`/v1/export${q({ after })}`);
+export const exportPage = (after = "", as = null) => call(`/v1/export${q({ after })}`, { as });
 /**
  * A guide's follow-ups, one level down. `markdown` adds each one's content, oldest first and
  * capped server-side; neither form counts as opening them.
@@ -485,7 +499,7 @@ export async function uploadFile(bytes, type, name = "") {
   try {
     res = await fetch(`${baseUrl()}/v1/attachments`, { method: "POST", headers, body: bytes });
   } catch (err) {
-    throw new ApiError(0, `could not reach ${baseUrl()} (${err.message})`);
+    throw new ApiError(0, `could not reach ${base} (${err.message})`);
   }
   if (!res.ok) {
     const body = await res.text();
@@ -509,7 +523,7 @@ export async function uploadShot(bytes, type, name = "") {
   try {
     res = await fetch(`${baseUrl()}/v1/shots`, { method: "POST", headers, body: bytes });
   } catch (err) {
-    throw new ApiError(0, `could not reach ${baseUrl()} (${err.message})`);
+    throw new ApiError(0, `could not reach ${base} (${err.message})`);
   }
   if (!res.ok) {
     const body = await res.text();

package/src/passalong.js

@@ -1181,26 +1181,70 @@ export async function exportAll(dir) {
   });
 }
 
+// The host this product answered on before passalong.dev. It serves the same data, so a copy
+// whose url names it belongs to the default API.
+const OLD_HOST = "passalong.kreativekorna.com";
+const hostOf = (url) => {
+  try {
+    const { host, hostname } = new URL(url);
+    if (["localhost", "127.0.0.1", "[::1]"].includes(hostname)) return "";
+    return host === OLD_HOST ? new URL(api.DEFAULT_API).host : host;
+  } catch {
+    return "";
+  }
+};
+// Raised whenever tidy learns to remove something it used to keep, so machines that tidied run it once more.
+const TIDIED = 2;
+
 /**
  * Once per machine, signed in: drop the local copies the server says it holds. They were written
- * by every share, pull and take before `keep()`, and nothing ever removed one. What the server
- * does not return — shared while signed out, or from another account — is left where it is.
+ * by every share, pull and take before `keep()`, and nothing ever removed one. Every login on the
+ * machine is asked, since a copy may be any of theirs. A copy whose `url:` is on a login's own host
+ * and that the server answers 404 for is a guide since deleted, and goes too. Anything else — no
+ * url, localhost, another host, or an answer that was neither 200 nor 404 — is left where it is,
+ * and an export that failed leaves the flag unset so the next start tries again.
  */
 export async function tidy() {
-  if (!api.loggedIn() || store.readConfig().tidied) return 0;
-  const local = new Set(store.list().map((g) => g.meta.id));
+  const logins = api.logins();
+  if (!logins.length || store.readConfig().tidied === TIDIED) return 0;
+  const local = new Map(store.list().map((g) => [g.meta.id, hostOf(g.meta.url)]));
   let removed = 0;
-  let after = "";
-  while (local.size) {
-    const page = await api.exportPage(after);
-    for (const g of page.guides)
-      if (local.delete(g.id)) {
-        store.remove(g.id);
-        removed++;
-      }
-    after = page.next;
-    if (!after) break;
+  let sure = true;
+  const drop = (id) => {
+    if (!local.delete(id)) return;
+    store.remove(id);
+    removed++;
+  };
+  for (const as of logins) {
+    try {
+      let after = "";
+      do {
+        const page = await api.exportPage(after, as);
+        for (const g of page.guides) drop(g.id);
+        after = page.next;
+      } while (after && local.size);
+    } catch {
+      sure = false;
+    }
+  }
+  const said = new Map();
+  for (const as of logins) {
+    const host = hostOf(as.api);
+    const ids = [...local].filter(([, h]) => h && h === host).map(([id]) => id);
+    // Eight at a time: a few hundred copies is a few seconds, not a few hundred open requests.
+    for (let i = 0; i < ids.length; i += 8)
+      await Promise.all(
+        ids.slice(i, i + 8).map(async (id) => {
+          const status = await api.get(id, { peek: true, as }).then(
+            () => 200,
+            (err) => err.status ?? 0,
+          );
+          said.set(id, [...(said.get(id) ?? []), status]);
+        }),
+      );
   }
-  store.writeConfig({ tidied: true });
+  for (const [id, statuses] of said)
+    if (statuses.includes(200) || statuses.every((s) => s === 404)) drop(id);
+  if (sure) store.writeConfig({ tidied: TIDIED });
   return removed;
 }