reslop 0.1.2 → 0.1.3

package/lib/session.js

@@ -82,6 +82,8 @@ const itemFeedKey = (item) => {
   return feedbackKey({ file, oldStart, newStart, blockId });
 };
 
+const isAbortError = (error) => !!(error && error.code === 'ABORT');
+
 const sameCursor = (a, b) => {
   if (!a && !b) return true;
   if (!a || !b) return false;
@@ -128,6 +130,10 @@ const HANDLERS = {
   quit: (session) => session.onQuit(),
   scrollUp: (session) => session.onScroll(-1),
   scrollDown: (session) => session.onScroll(1),
+  pageUp: (session) => session.onScroll(session.scrollStep(-1)),
+  pageDown: (session) => session.onScroll(session.scrollStep(1)),
+  halfUp: (session) => session.onScroll(session.scrollStep(-0.5)),
+  halfDown: (session) => session.onScroll(session.scrollStep(0.5)),
 };
 
 const KEY_MODE = {
@@ -233,6 +239,16 @@ class Session {
     this.saveTimer = null;
     this.blinkTimer = null;
     this.blinkOn = true;
+    this.loadGen = 0;
+    this.loadAbort = null;
+    this.loadPromise = null;
+    this.busy = '';
+    this.emptyReview = false;
+    this.loadError = null;
+    this.didLoad = false;
+    this.pendingExtras = false;
+    this.uiOpen = false;
+    this.finishReadLoop = null;
   }
 
   constructor(options) {
@@ -240,14 +256,35 @@ class Session {
     this.resetState();
   }
 
-  load() {
-    const here = itemKey(this.items[this.index]);
+  loadOptions(extra = {}) {
     const commit = this.rev;
     const audit = this.audit;
     const outdatedMap = this.outdatedMap;
     const auditMap = this.auditMap;
-    const options = { commit, audit, outdatedMap, auditMap };
-    const loaded = this.repo.load(this.cwd, this.paths, options);
+    return { commit, audit, outdatedMap, auditMap, ...extra };
+  }
+
+  shouldDeferExtras() {
+    if (!this.audit) return false;
+    if (this.outdatedMap !== undefined && this.auditMap !== undefined) {
+      return false;
+    }
+    return true;
+  }
+
+  bumpLoad() {
+    this.loadGen += 1;
+    if (this.loadAbort) this.loadAbort.abort();
+    this.loadAbort = new AbortController();
+  }
+
+  ensureRepo() {
+    if (!this.repo.toplevel) return;
+    this.top = this.repo.toplevel(this.cwd);
+  }
+
+  applyLoaded(loaded) {
+    const here = itemKey(this.items[this.index]);
     this.top = loaded.top ?? this.cwd;
     const items = loaded.items;
     this.items = items.filter((item) => !this.dismissed.has(itemKey(item)));
@@ -277,6 +314,121 @@ class Session {
     this.clampIndex();
     this.syncReviewPath();
     this.syncFileCursor();
+    this.didLoad = true;
+    this.pendingExtras = loaded.pending === true;
+  }
+
+  load() {
+    const loaded = this.repo.load(this.cwd, this.paths, this.loadOptions());
+    this.applyLoaded(loaded);
+  }
+
+  paint() {
+    if (!this.uiOpen) return;
+    this.draw();
+  }
+
+  viewStatus() {
+    if (this.status) return this.status;
+    return this.busy;
+  }
+
+  finishIfEmpty(kind) {
+    if (this.items.length) return;
+    if (this.notes && hasNotes(this.notes)) this.flushReview();
+    this.done = true;
+    this.exitCode = 0;
+    this.status = 'nothing to review';
+    this.emptyReview = kind === 'open';
+    if (this.finishReadLoop) this.finishReadLoop();
+  }
+
+  failOpen(error) {
+    if (isAbortError(error)) return;
+    this.loadError = error;
+    this.done = true;
+    this.exitCode = 1;
+    this.busy = '';
+    if (this.finishReadLoop) this.finishReadLoop();
+  }
+
+  async followExtras(loaded, gen, kind) {
+    if (!this.repo.loadExtras) {
+      this.busy = '';
+      this.pendingExtras = false;
+      this.paint();
+      this.finishIfEmpty(kind);
+      return;
+    }
+    const signal = this.loadAbort ? this.loadAbort.signal : undefined;
+    const extra = this.loadOptions({
+      paths: this.paths,
+      signal,
+    });
+    let next;
+    try {
+      next = await this.repo.loadExtras(loaded, extra);
+    } catch (error) {
+      if (gen !== this.loadGen) return;
+      this.failOpen(error);
+      return;
+    }
+    if (gen !== this.loadGen || this.done) return;
+    this.applyLoaded(next);
+    this.busy = '';
+    this.paint();
+    this.finishIfEmpty(kind);
+  }
+
+  openLoad() {
+    if (this.loadPromise) return this.loadPromise;
+    if (this.didLoad && !this.pendingExtras) {
+      this.loadPromise = Promise.resolve();
+      return this.loadPromise;
+    }
+    this.bumpLoad();
+    this.loadPromise = this.runOpenLoad();
+    return this.loadPromise;
+  }
+
+  async runOpenLoad() {
+    const gen = this.loadGen;
+    const signal = this.loadAbort.signal;
+    const options = this.loadOptions({
+      deferExtras: this.shouldDeferExtras(),
+      signal,
+    });
+    this.busy = 'loading';
+    this.paint();
+    let loaded;
+    try {
+      if (this.repo.loadAsync) {
+        loaded = await this.repo.loadAsync(this.cwd, this.paths, options);
+      } else {
+        loaded = this.repo.load(this.cwd, this.paths, options);
+      }
+    } catch (error) {
+      if (gen !== this.loadGen) return;
+      this.failOpen(error);
+      return;
+    }
+    if (gen !== this.loadGen || this.done) return;
+    this.applyLoaded(loaded);
+    if (loaded.pending) {
+      this.busy = 'checking npm';
+      this.paint();
+      await this.followExtras(loaded, gen, 'open');
+      return;
+    }
+    this.busy = '';
+    this.paint();
+    this.finishIfEmpty('open');
+  }
+
+  async loadReady() {
+    this.ensureRepo();
+    await this.openLoad();
+    if (this.loadError) throw this.loadError;
   }
 
   initReview() {
@@ -393,7 +545,7 @@ class Session {
       index: this.index,
       total: this.items.length,
       scroll: this.scroll,
-      status: this.status,
+      status: this.viewStatus(),
       layout: this.layout,
       counts: this.counts(),
       selection: this.selection,
@@ -466,20 +618,25 @@ class Session {
 
   reloadAfterChange() {
     const here = this.index;
-    this.load();
-    if (!this.items.length) {
-      if (hasNotes(this.notes)) this.flushReview();
-      this.done = true;
-      this.exitCode = 0;
-      this.status = 'nothing to review';
-      return;
-    }
+    this.loadPromise = null;
+    this.bumpLoad();
+    const options = this.loadOptions({
+      deferExtras: this.shouldDeferExtras(),
+    });
+    const loaded = this.repo.load(this.cwd, this.paths, options);
+    this.applyLoaded(loaded);
     this.index = here;
     this.clampIndex();
     this.syncReviewPath();
     this.syncFileCursor();
     this.scroll = 0;
     this.clearSelection();
+    if (loaded.pending) {
+      this.busy = 'checking npm';
+      this.followExtras(loaded, this.loadGen, 'reload');
+      return;
+    }
+    this.finishIfEmpty('reload');
   }
 
   clearSelection() {
@@ -578,12 +735,13 @@ class Session {
   onFileAdd() {
     const items = this.fileActionItems();
     if (!this.guardFileGit(items)) return;
+    const rel = itemPath(items[0]);
     const targets = items.filter((item) => item.origin !== 'staged');
     if (!targets.length) {
       this.status = 'already staged';
+      this.selectNextFileAfter(rel);
       return;
     }
-    const rel = itemPath(targets[0]);
     const proposed = targets.some((item) => needsReload(item));
     const ok = this.applyFileGit(
       targets,
@@ -598,12 +756,13 @@ class Session {
   onFileUnstage() {
     const items = this.fileActionItems();
     if (!this.guardFileGit(items)) return;
+    const rel = itemPath(items[0]);
     const targets = items.filter((item) => item.origin === 'staged');
     if (!targets.length) {
       this.status = 'not staged';
+      this.selectNextFileAfter(rel);
       return;
     }
-    const rel = itemPath(targets[0]);
     const ok = this.applyFileGit(
       targets,
       'unstaged',
@@ -1267,13 +1426,12 @@ class Session {
       this.status = 'nothing to review';
       return;
     }
-    const next = this.fileCursor + delta;
-    if (next < 0) {
-      this.status = 'first file';
-      return;
-    }
-    if (next >= files.length) {
-      this.status = 'last file';
+    const next = Math.min(
+      files.length - 1,
+      Math.max(0, this.fileCursor + delta),
+    );
+    if (next === this.fileCursor) {
+      this.status = next <= 0 ? 'first file' : 'last file';
       return;
     }
     this.fileCursor = next;
@@ -1283,6 +1441,16 @@ class Session {
     this.status = '';
   }
 
+  scrollStep(fraction) {
+    const bodyH = this.lastFrame?.bodyH;
+    const size = this.lastSize ?? this.getSize();
+    const fallback = Math.max(1, (size.height ?? 24) - 4);
+    const height = Math.max(1, bodyH ?? fallback);
+    const n = Math.max(1, Math.floor(height * Math.abs(fraction)));
+    if (fraction < 0) return -n;
+    return n;
+  }
+
   onScroll(delta) {
     if (this.pane === 'files') {
       this.onFileMove(delta);
@@ -1428,12 +1596,20 @@ class Session {
   }
 
   async startUi() {
+    if (this.didLoad && !this.items.length) {
+      this.emptyReview = true;
+      return 0;
+    }
+    this.uiOpen = true;
     this.enterTerm();
     try {
+      this.openLoad();
       this.draw();
       await this.readLoop();
     } finally {
+      this.uiOpen = false;
       this.leaveTerm();
+      if (this.loadAbort) this.loadAbort.abort();
     }
     return this.exitCode;
   }
@@ -1442,7 +1618,10 @@ class Session {
     return new Promise((resolve) => {
       this.abortController = new AbortController();
       const { signal } = this.abortController;
+      let settled = false;
       const finish = () => {
+        if (settled) return;
+        settled = true;
         if (this.saveTimer !== null) {
           this.clearInterval(this.saveTimer);
           this.saveTimer = null;
@@ -1452,8 +1631,14 @@ class Session {
           this.blinkTimer = null;
         }
         this.abortController.abort();
+        this.finishReadLoop = null;
         resolve();
       };
+      this.finishReadLoop = finish;
+      if (this.done) {
+        finish();
+        return;
+      }
       const onData = (chunk) => {
         this.pushInput(chunk.toString('utf8'));
         if (this.done) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "reslop",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "Interactive code review and repair planning for AI-assisted changes",
   "keywords": [
     "code-review",