aethel 0.3.6 → 0.3.7

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.3.7 (2026-04-05)
+
+- Fix orphan checker not recognizing My Drive root — all files under synced folders were silently dropped
+
 ## 0.3.6 (2026-04-05)
 
 - Optimize status and saveSnapshot performance: parallelize loadState, skip redundant fetches, increase hash concurrency

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aethel",
-  "version": "0.3.6",
+  "version": "0.3.7",
   "description": "Git-style Google Drive sync CLI with interactive TUI",
   "type": "module",
   "license": "MIT",

package/src/cli.js

@@ -60,12 +60,36 @@ async function openRepo(options, { requireWorkspace = true, silent = false } = {
   return repo;
 }
 
+function fmtMs(ms) {
+  return ms >= 1000 ? `${(ms / 1000).toFixed(1)}s` : `${ms}ms`;
+}
+
 async function loadStateWithProgress(repo, opts) {
   const spinner = createSpinner("Loading workspace state...");
   try {
-    const state = await repo.loadState(opts);
-    const n = state.diff.changes.length;
-    spinner.succeed(n ? `Loaded state — ${n} change(s) detected` : "Loaded state — everything up to date");
+    const state = await repo.loadState({
+      ...opts,
+      onPhase(phase, ms) {
+        if (phase === "local") spinner.update(`Scanned local files (${fmtMs(ms)}), waiting for remote...`);
+        else if (phase === "remote") spinner.update(`Fetched remote state (${fmtMs(ms)}), computing diff...`);
+      },
+    });
+    const { timings, diff } = state;
+    const n = diff.changes.length;
+
+    const parts = [
+      `${timings.localFiles} local`,
+      `${timings.remoteFiles} remote`,
+    ];
+    const times = [
+      `scan ${fmtMs(timings.localMs)}`,
+      timings.remoteCached ? `remote cache hit` : `fetch ${fmtMs(timings.remoteMs)}`,
+      `diff ${fmtMs(timings.diffMs)}`,
+      `total ${fmtMs(timings.totalMs)}`,
+    ];
+
+    const summary = n ? `${n} change(s)` : "up to date";
+    spinner.succeed(`${summary} (${parts.join(", ")}) [${times.join(" | ")}]`);
     return state;
   } catch (err) {
     spinner.fail("Failed to load workspace state");
@@ -408,11 +432,16 @@ async function handleCommit(options, { repo: existingRepo, snapshotHint } = {})
     }
   }
 
+  const snapshotStart = Date.now();
   const spinner = createSpinner("Saving snapshot...");
   // snapshotHint lets callers (pull/push) pass pre-loaded state
   // so saveSnapshot skips redundant API calls / fs scans.
   await repo.saveSnapshot(message, snapshotHint);
-  spinner.succeed(`Snapshot saved: "${message}"`);
+  const skipped = [];
+  if (snapshotHint?.remote) skipped.push("remote reused");
+  if (snapshotHint?.local) skipped.push("local reused");
+  const hint = skipped.length ? ` (${skipped.join(", ")})` : "";
+  spinner.succeed(`Snapshot saved in ${fmtMs(Date.now() - snapshotStart)}${hint}`);
 }
 
 function handleLog(options) {
@@ -436,10 +465,11 @@ async function handleFetch(options) {
   const repo = await openRepo(options);
 
   repo.invalidateRemoteCache();
+  const fetchStart = Date.now();
   const spinner = createSpinner("Fetching remote file list...");
   const remoteState = await repo.getRemoteState({ useCache: false });
   const remote = remoteState.files;
-  spinner.succeed(`Found ${remote.length} file(s) on Drive`);
+  spinner.succeed(`Found ${remote.length} file(s) on Drive [${fmtMs(Date.now() - fetchStart)}]`);
 
   const snapshot = repo.getSnapshot();
   if (snapshot) {

package/src/core/drive-api.js

@@ -226,6 +226,15 @@ async function fetchAllItems(drive, { fields, includeSharedDrives = false } = {}
   const files = [];
   let pageToken = null;
 
+  // Fetch the real My Drive root folder metadata in parallel with
+  // the main list.  Google Drive API returns actual folder IDs in
+  // `parents` (e.g. "0AJ…"), NOT the alias "root".  Without this,
+  // the orphan checker can't recognise the root and marks every
+  // top-level folder as orphaned — silently dropping all files.
+  const rootPromise = drive.files
+    .get({ fileId: "root", fields: "id,name,mimeType,parents,createdTime" })
+    .catch(() => null);
+
   const listOpts = {
     q: "trashed = false",
     fields: allFields,
@@ -252,6 +261,12 @@ async function fetchAllItems(drive, { fields, includeSharedDrives = false } = {}
     pageToken = response.data.nextPageToken;
   } while (pageToken);
 
+  // Add the real root folder so the orphan checker can walk up to it.
+  const rootRes = await rootPromise;
+  if (rootRes?.data?.id) {
+    folders.set(rootRes.data.id, rootRes.data);
+  }
+
   return { folders, files };
 }
 

package/src/core/repository.js

@@ -109,25 +109,48 @@ export class Repository {
    * Load full workspace state in parallel, replacing the old
    * loadWorkspaceState() helper from cli.js.
    */
-  async loadState({ useCache = true } = {}) {
+  async loadState({ useCache = true, onPhase } = {}) {
     const config = this.getConfig();
+    const t0 = Date.now();
 
     // Run all three in parallel — remote fetch is the slowest, overlap it
     // with local scan and snapshot read.
+    const timings = {};
+
     const [local, snapshot, remoteState] = await Promise.all([
-      scanLocal(this._root),
-      Promise.resolve(readLatestSnapshot(this._root)),
-      this._loadRemoteState({ useCache }),
+      scanLocal(this._root).then((r) => {
+        timings.localMs = Date.now() - t0;
+        onPhase?.("local", timings.localMs);
+        return r;
+      }),
+      Promise.resolve(readLatestSnapshot(this._root)).then((r) => {
+        timings.snapshotMs = Date.now() - t0;
+        return r;
+      }),
+      this._loadRemoteState({ useCache }).then((r) => {
+        timings.remoteMs = Date.now() - t0;
+        timings.remoteCached = useCache && timings.remoteMs < 100;
+        onPhase?.("remote", timings.remoteMs);
+        return r;
+      }),
     ]);
     const remote = remoteState.files;
 
+    const diffStart = Date.now();
+    const diff = computeDiff(snapshot, remote, local, { root: this._root });
+    timings.diffMs = Date.now() - diffStart;
+    timings.totalMs = Date.now() - t0;
+    timings.localFiles = Object.keys(local).length;
+    timings.remoteFiles = remote.length;
+
     return {
       config,
       remote,
       remoteState,
       local,
       snapshot,
-      diff: computeDiff(snapshot, remote, local, { root: this._root }),
+      diff,
+      timings,
     };
   }