@use-aistack/cli 0.6.1 → 0.6.3

package/README.md

@@ -18,7 +18,7 @@ The default command. Scan your local transcripts (rolling 30 days), review the f
 npx @use-aistack/cli sync
 ```
 
-Requires a one-time `login` first.
+On an unlinked machine, `sync` starts the login flow inline — your browser opens to approve the machine, then the sync continues. One command is the whole onboarding.
 
 ### `npx @use-aistack/cli sync --auto on` / `off`
 
@@ -34,7 +34,7 @@ The silent run (`sync --auto`) never prompts and publishes only under this opt-i
 
 ### `npx @use-aistack/cli login`
 
-Link this machine to your AI Stack account via browser.
+Link this machine to your AI Stack account via browser. Optional — `sync` runs this inline when the machine is not linked yet.
 
 ```sh
 npx @use-aistack/cli login

package/dist/index.js

@@ -3,6 +3,9 @@
 // src/index.ts
 import { Command } from "commander";
 
+// src/version.ts
+var CLI_VERSION = true ? "0.6.3" : "0.0.0-dev";
+
 // src/api.ts
 var BASE_URL = process.env.AISTACK_URL || "https://aistack.to";
 async function request(path3, options = {}) {
@@ -34,7 +37,12 @@ function failure(what, res) {
 async function authStart(machineName) {
   const res = await request("/api/cli/auth/start", {
     method: "POST",
-    body: JSON.stringify(machineName ? { machineName } : {})
+    // `cliVersion` rides along so `cli_login_completed` can report which
+    // version linked the machine (#78). The server carries it on the pending
+    // session and reads it at the token exchange.
+    body: JSON.stringify(
+      machineName ? { machineName, cliVersion: CLI_VERSION } : { cliVersion: CLI_VERSION }
+    )
   });
   if (!res.ok) throw failure("Auth start failed", res);
   return res.json();
@@ -1572,8 +1580,7 @@ function proposedMachineName(read = hostname) {
     return void 0;
   }
 }
-async function loginCommand() {
-  intro2("login");
+async function performLogin() {
   const s = p5.spinner();
   s.start("Starting authentication...");
   let session;
@@ -1583,8 +1590,7 @@ async function loginCommand() {
   } catch (err) {
     s.stop("Failed to start authentication");
     p5.log.error(err instanceof Error ? err.message : String(err));
-    outroError("error");
-    process.exit(1);
+    return false;
   }
   p5.log.info(`${dim("CODE")} ${limeBold(session.userCode)}`);
   p5.log.info(`${dim("OPEN")} ${dim(session.authUrl)}`);
@@ -1604,29 +1610,33 @@ async function loginCommand() {
       if (result.status === "approved" && result.token) {
         s.stop(lime("Authenticated"));
         saveToken(result.token, result.userId);
-        p5.log.success(
-          `Token saved. Run ${limeBold("npx @use-aistack/cli collect")} to get started.`
-        );
-        outro2(lime("done"));
-        return;
+        return true;
       }
       if (result.status === "expired") {
         s.stop("Session expired");
         p5.log.error("Authentication session expired. Please try again.");
-        outroError("expired");
-        process.exit(1);
+        return false;
       }
     } catch (err) {
       s.stop("Error polling");
       p5.log.error(err instanceof Error ? err.message : String(err));
-      outroError("error");
-      process.exit(1);
+      return false;
     }
   }
   s.stop("Timed out");
   p5.log.error("Authentication timed out after 3 minutes. Please try again.");
-  outroError("timed out");
-  process.exit(1);
+  return false;
+}
+async function loginCommand() {
+  intro2("login");
+  if (!await performLogin()) {
+    outroError("error");
+    process.exit(1);
+  }
+  p5.log.success(
+    `Token saved. Run ${limeBold("npx @use-aistack/cli sync")} to publish your usage.`
+  );
+  outro2(lime("done"));
 }
 
 // src/commands/sync.ts
@@ -2748,7 +2758,11 @@ function emptyScanStats() {
     filesRead: 0,
     filesSkippedByMtime: 0,
     filesSkippedAsDuplicate: 0,
-    filesUnreadable: 0
+    filesUnreadable: 0,
+    filesForeign: 0,
+    foreignOriginators: /* @__PURE__ */ new Map(),
+    unreadableFiles: [],
+    filesZstdUnsupported: 0
   };
 }
 
@@ -3040,11 +3054,12 @@ async function scan2(agg, opts = {}) {
       } catch {
         resolved = file;
       }
-      if (visited.has(resolved)) {
+      const dedupKey = resolved.endsWith(".zst") ? resolved.slice(0, -".zst".length) : resolved;
+      if (visited.has(dedupKey)) {
         stats.filesSkippedAsDuplicate++;
         continue;
       }
-      visited.add(resolved);
+      visited.add(dedupKey);
       if (opts.sinceMs !== void 0) {
         try {
           const st = await stat3(file);
@@ -3058,11 +3073,20 @@ async function scan2(agg, opts = {}) {
       agg.files++;
       stats.filesRead++;
       if (opts.onProgress && agg.files % 200 === 0) opts.onProgress(agg.files);
-      try {
-        ingestFile2(agg, file, opts.sinceMs);
-      } catch {
+      const outcome = ingestWithRetry(agg, file, opts);
+      if (!outcome.ok) {
         stats.filesUnreadable++;
         stats.filesRead--;
+        if (outcome.reason === "zstd-unsupported") stats.filesZstdUnsupported++;
+        stats.unreadableFiles.push({
+          path: path2.relative(root, file),
+          reason: outcome.reason
+        });
+      } else if (!outcome.genuine) {
+        stats.filesForeign++;
+        stats.filesRead--;
+        const seen = stats.foreignOriginators.get(outcome.originator) ?? 0;
+        stats.foreignOriginators.set(outcome.originator, seen + 1);
       }
     }
   }
@@ -3077,29 +3101,81 @@ async function exists3(p8) {
     return false;
   }
 }
-function ingestFile2(agg, file, sinceMs) {
+function errorClass(e) {
+  const code = e?.code;
+  if (typeof code === "string" && code.length > 0) return code;
+  return e instanceof Error ? e.constructor.name : "unknown";
+}
+var readError = (reason) => Object.assign(new Error(reason), { code: reason });
+function ingestWithRetry(agg, file, opts) {
+  try {
+    return ingestFile2(agg, file, opts);
+  } catch (e) {
+    if (errorClass(e) === "ENOENT" && !file.endsWith(".zst")) {
+      try {
+        return ingestFile2(agg, `${file}.zst`, opts);
+      } catch (e2) {
+        return { ok: false, reason: errorClass(e2) };
+      }
+    }
+    return { ok: false, reason: errorClass(e) };
+  }
+}
+function ingestFile2(agg, file, opts) {
+  const readFile = opts.readFileImpl ?? readFileSync9;
   let text;
   if (file.endsWith(".zst")) {
-    if (zstdDecompress === null) {
-      throw new Error("zstd not supported by this Node runtime");
+    if (zstdDecompress === null) throw readError("zstd-unsupported");
+    const raw = readFile(file);
+    try {
+      text = zstdDecompress(
+        Buffer.isBuffer(raw) ? raw : Buffer.from(raw)
+      ).toString("utf8");
+    } catch {
+      throw readError("zstd-corrupt");
     }
-    text = zstdDecompress(readFileSync9(file)).toString("utf8");
   } else {
-    text = readFileSync9(file, "utf8");
+    text = readFile(file).toString("utf8");
   }
-  const state = createFileState();
+  const records = [];
+  let nonEmptyLines = 0;
+  let parseErrors = 0;
   for (const line of text.split("\n")) {
     if (!line) continue;
-    agg.lines++;
-    let rec;
+    nonEmptyLines++;
     try {
-      rec = JSON.parse(line);
+      records.push(JSON.parse(line));
     } catch {
-      agg.parseErrors++;
-      continue;
+      parseErrors++;
     }
-    ingestLine(agg, rec, state, sinceMs);
   }
+  const verdict = classifyRollout(records);
+  if (!verdict.genuine) return { ok: true, ...verdict };
+  agg.lines += nonEmptyLines;
+  agg.parseErrors += parseErrors;
+  const state = createFileState();
+  for (const rec of records) ingestLine(agg, rec, state, opts.sinceMs);
+  return { ok: true, genuine: true };
+}
+function classifyRollout(records) {
+  let originator = null;
+  let sawTurnContext = false;
+  let genuine = records.length > 0;
+  for (const [i, raw] of records.entries()) {
+    const rec = asObj(raw);
+    const type = rec ? asStr(rec.type) : null;
+    const payload = rec ? asObj(rec.payload) : null;
+    if (i === 0 && type !== "session_meta") genuine = false;
+    if (type === "session_meta" && payload && originator === null) {
+      originator = asStr(payload.originator);
+    } else if (type === "turn_context") {
+      sawTurnContext = true;
+    } else if (type === "event_msg" && payload && asStr(payload.type) === "token_count" && !sawTurnContext) {
+      genuine = false;
+    }
+  }
+  if (genuine) return { genuine: true };
+  return { genuine: false, originator: originator ?? "(none)" };
 }
 function readConfiguredMcpServers(agg, configFile) {
   const file = configFile ?? path2.join(codexHome2(), "config.toml");
@@ -3368,11 +3444,12 @@ function mergeKeptPrivate(halves) {
   }
   return out;
 }
-function buildSyncBody(built, syncConfig) {
+function buildSyncBody(built, syncConfig, autoSync) {
   const payloads = built.map((b) => b.payload);
-  if (!syncConfig.reviewKeptPrivate) return { payloads };
+  const base = autoSync ? { payloads, autoSync } : { payloads };
+  if (!syncConfig.reviewKeptPrivate) return base;
   return {
-    payloads,
+    ...base,
     keptPrivate: mergeKeptPrivate(built.map((b) => b.keptPrivate))
   };
 }
@@ -3468,7 +3545,32 @@ function harnessLabel(name) {
   if (name === "codex") return "Codex";
   return name;
 }
-function payloadBlock(payload, showHeader) {
+var UNREADABLE_FILES_SHOWN = 5;
+function scanNoteLines(stats, label) {
+  const out = [];
+  const shown = stats.unreadableFiles.slice(0, UNREADABLE_FILES_SHOWN);
+  for (const f of shown) {
+    out.push(`          ${f.path} (${f.reason})`);
+  }
+  if (stats.unreadableFiles.length > shown.length) {
+    out.push(
+      `          ...${stats.unreadableFiles.length - shown.length} more`
+    );
+  }
+  if (stats.filesZstdUnsupported > 0) {
+    out.push(
+      `          ${stats.filesZstdUnsupported} compressed rollout${stats.filesZstdUnsupported === 1 ? "" : "s"} need Node 22.15 or newer`
+    );
+  }
+  if (stats.filesForeign > 0) {
+    const origins = [...stats.foreignOriginators].sort((a, b) => b[1] - a[1] || a[0].localeCompare(b[0])).map(([name, n]) => n > 1 ? `${name} \xD7${n}` : name).join(", ");
+    out.push(
+      `skipped   ${stats.filesForeign} file${stats.filesForeign === 1 ? "" : "s"} not written by ${label} \u2014 left out (originators: ${origins})`
+    );
+  }
+  return out;
+}
+function payloadBlock(payload, showHeader, stats) {
   const out = [];
   if (showHeader) {
     out.push(
@@ -3491,6 +3593,9 @@ function payloadBlock(payload, showHeader) {
       `coverage  ${cov.filesUnreadable} files unreadable \xB7 ${cov.linesFailed} lines failed \u2014 this reading is a floor`
     );
   }
+  if (stats) {
+    out.push(...scanNoteLines(stats, harnessLabel(payload.harness.name)));
+  }
   out.push("");
   out.push("models");
   for (const m of payload.models) {
@@ -3522,7 +3627,8 @@ function buildGateSummary(ctx) {
     );
   }
   for (const payload of payloads) {
-    out.push(...payloadBlock(payload, payloads.length > 1));
+    const stats = ctx.scanStats?.[payload.harness.name];
+    out.push(...payloadBlock(payload, payloads.length > 1, stats));
     out.push("");
   }
   if (out[out.length - 1] === "") out.pop();
@@ -3548,6 +3654,12 @@ function buildGateSummary(ctx) {
       out.push("  they stay on this machine");
     }
   }
+  if (body.autoSync !== void 0) {
+    out.push("");
+    out.push(
+      `auto-sync ${body.autoSync.enabled ? `on, about every ${body.autoSync.frequencyHours}h` : "off"}`
+    );
+  }
   if (source === "bundled") {
     out.push("");
     out.push(
@@ -3575,9 +3687,11 @@ async function stageSync(deps) {
     ...token ? { token } : {}
   });
   const built = [];
+  const scanStats = {};
   const sinceMs = windowStartMs(now, windowDays);
   for (const adapter of await adapters()) {
     const { aggregate, stats } = await adapter.scan({ sinceMs });
+    scanStats[adapter.name] = stats;
     built.push(
       buildPayload({
         aggregate,
@@ -3591,7 +3705,8 @@ async function stageSync(deps) {
       })
     );
   }
-  const body = buildSyncBody(built, config);
+  const settings = (deps.getSettingsImpl ?? getSettings)();
+  const body = buildSyncBody(built, config, settings.autoSync);
   const bodyJson = JSON.stringify(body);
   const keptPrivate = mergeKeptPrivate(built.map((b) => b.keptPrivate));
   const ctx = {
@@ -3599,7 +3714,8 @@ async function stageSync(deps) {
     keptPrivate,
     config,
     source,
-    baseUrl: deps.baseUrl
+    baseUrl: deps.baseUrl,
+    scanStats
   };
   let blockedReason = null;
   if (built.length === 0) {
@@ -3607,7 +3723,7 @@ async function stageSync(deps) {
   } else if (token === null) {
     blockedReason = "This machine is not linked. Run `npx @use-aistack/cli login` first.";
   } else if (config.stack === null) {
-    blockedReason = source === "bundled" ? "Could not fetch your settings from aistack, so the destination stack is unknown. Publish needs it. Check the network and preview again." : "The token resolves no destination stack. Run `npx @use-aistack/cli login` again to re-link this machine.";
+    blockedReason = source === "bundled" ? "Could not fetch your settings from aistack, so the destination stack is unknown. Publish needs it. Check the network and preview again." : `The token resolves no destination stack. Create one at ${deps.baseUrl}/stacks/new, then sync again.`;
   }
   return {
     id: stageId(bodyJson),
@@ -3751,6 +3867,16 @@ async function syncCommand(options = {}) {
     process.exitCode = 1;
     return;
   }
+  if (getToken() === null) {
+    p7.log.message(
+      "This machine is not linked to an aistack account yet \u2014 linking it first."
+    );
+    if (!await performLogin()) {
+      outroError("login failed \u2014 nothing was sent");
+      process.exitCode = 1;
+      return;
+    }
+  }
   const s = p7.spinner();
   s.start("Scanning local agent transcripts");
   let staged;
@@ -4060,7 +4186,7 @@ function runStdioSyncServer(deps) {
 
 // src/index.ts
 var program = new Command();
-program.name("aistack").description("Measure and share your AI stack from your terminal").version("0.5.0");
+program.name("aistack").description("Measure and share your AI stack from your terminal").version(CLI_VERSION);
 program.command("login").description("Authenticate with AI Stack").action(loginCommand);
 program.command("collect").description("Scan and upload AI config files from your project").option("--no-global", "Exclude global config files (~/.claude, etc.)").action((options) => collectCommand({ global: options.global ?? true }));
 program.command("create").description("Download and write your stack's AI config files").action(createCommand);