opencode-forgekeeper 2.1.0 → 2.1.1

package/README.md

@@ -148,6 +148,11 @@ reuses a branch's PR/MR number for up to 10 minutes.
 Explicit targets that aren't PRs/MRs, such as issues, show no status. Unresolved explicit
 PRs/MRs never fall back to the branch.
 
+Without a PR/MR to show, the footer stays empty, even when a lookup fails, such as in a new
+session before the server answers. It shows `PR/MR status unavailable` only when none of
+the session's explicit PR/MR targets can be looked up or found. `/forge-status` explains
+why.
+
 The server runs at most four `glab` or `gh` commands at once for status and review
 feedback, across all sessions. When some target lookups fail, the footer shows the others
 and counts the failures as `N unavailable`. A target whose lookup failed with an error

package/dist/index.js

@@ -1255,6 +1255,175 @@ function createFeedbackWatcher(options) {
   };
 }
 
+// packages/forgekeeper/src/store.ts
+class TargetLookupError extends Error {
+  cause;
+  constructor(cause) {
+    super(cause instanceof Error ? cause.message : String(cause));
+    this.cause = cause;
+  }
+}
+function createStatusStore(options) {
+  const now = options.now ?? Date.now;
+  const setTimer = options.setTimer ?? ((callback, delay) => setTimeout(callback, delay));
+  const clearTimer = options.clearTimer ?? ((timer) => clearTimeout(timer));
+  const interval = options.interval ?? 120000;
+  const maxBackoff = options.maxBackoff ?? 900000;
+  const minEventInterval = options.minEventInterval ?? 15000;
+  const entries = new Map;
+  let disposed = false;
+  let revision = now() * 1000;
+  const entry = (key2) => {
+    let value = entries.get(key2);
+    if (!value) {
+      value = { snapshot: { loading: false }, refs: 0, failures: 0 };
+      entries.set(key2, value);
+    }
+    return value;
+  };
+  const update = (key2, value, patch) => {
+    value.snapshot = { ...value.snapshot, ...patch, revision: ++revision };
+    if (!disposed)
+      options.onChange(key2);
+  };
+  const cancelTimer = (value) => {
+    if (value.timer === undefined)
+      return;
+    clearTimer(value.timer);
+    value.timer = undefined;
+  };
+  const baseInterval = (value) => options.active?.(value.snapshot.lookup) ? options.activeInterval ?? interval : interval;
+  const pollDelay = (value) => Math.min(baseInterval(value) * 2 ** value.failures, maxBackoff);
+  const lastAttempt = (value) => Math.max(value.snapshot.fetchedAt ?? -Infinity, value.snapshot.error?.at ?? -Infinity);
+  const schedule = (key2, value, delay = pollDelay(value)) => {
+    cancelTimer(value);
+    if (disposed || value.refs === 0)
+      return;
+    const lookup = value.snapshot.lookup;
+    if (!value.snapshot.error && (lookup?.kind !== "found" || lookup.requests.length === 0))
+      return;
+    value.timer = setTimer(() => {
+      value.timer = undefined;
+      refresh(key2);
+    }, delay);
+  };
+  function refresh(key2) {
+    if (disposed)
+      return Promise.resolve({ loading: false });
+    const value = entry(key2);
+    if (value.inflight)
+      return value.inflight;
+    value.stale = false;
+    update(key2, value, { loading: true });
+    value.inflight = options.load(key2).then((lookup) => {
+      if (disposed || value.invalidated)
+        return;
+      const previous = value.snapshot.lookup;
+      value.failures = 0;
+      update(key2, value, {
+        lookup,
+        fetchedAt: now(),
+        error: undefined,
+        targeted: lookup.explicitTarget === true ? true : undefined,
+        loading: false
+      });
+      try {
+        if (!disposed)
+          options.onLoad?.(key2, previous, lookup);
+      } catch (error) {
+        try {
+          options.onLoadError?.(error);
+        } catch {}
+      }
+    }, (error) => {
+      if (disposed || value.invalidated)
+        return;
+      value.failures++;
+      const target2 = error instanceof TargetLookupError;
+      const cause = target2 ? error.cause : error;
+      update(key2, value, {
+        loading: false,
+        error: {
+          kind: cause instanceof ForgeError ? cause.kind : "request",
+          message: cause instanceof Error ? cause.message : String(cause),
+          at: now()
+        },
+        ...target2 ? { targeted: true } : {}
+      });
+    }).then(() => {
+      value.inflight = undefined;
+      if (value.invalidated && !disposed) {
+        value.invalidated = false;
+        return refresh(key2);
+      }
+      schedule(key2, value);
+      return value.snapshot;
+    });
+    return value.inflight;
+  }
+  return {
+    get(key2) {
+      return entries.get(key2)?.snapshot ?? { loading: false };
+    },
+    acquire(key2) {
+      const value = entry(key2);
+      value.refs++;
+      if (value.refs === 1 && !value.inflight) {
+        const remaining = lastAttempt(value) + pollDelay(value) - now();
+        if (value.stale || remaining <= 0)
+          refresh(key2);
+        else
+          schedule(key2, value, remaining);
+      }
+      let released = false;
+      return () => {
+        if (released)
+          return;
+        released = true;
+        value.refs--;
+        if (value.refs === 0)
+          cancelTimer(value);
+      };
+    },
+    refresh,
+    keys() {
+      return [...entries.keys()];
+    },
+    notify(key2) {
+      const value = entries.get(key2);
+      if (!value || value.refs === 0 || value.inflight)
+        return;
+      const last = Math.max(value.snapshot.fetchedAt ?? 0, value.snapshot.error?.at ?? 0);
+      if (now() - last < minEventInterval)
+        return;
+      refresh(key2);
+    },
+    invalidate(key2) {
+      const value = entries.get(key2);
+      if (!value)
+        return;
+      if (value.inflight)
+        value.invalidated = true;
+      else if (value.refs > 0)
+        refresh(key2);
+      else
+        value.stale = true;
+    },
+    setTargeted(key2, targeted) {
+      const value = entries.get(key2);
+      if (!value || disposed || value.snapshot.targeted === true === targeted)
+        return;
+      update(key2, value, { targeted: targeted ? true : undefined });
+    },
+    dispose() {
+      disposed = true;
+      for (const value of entries.values())
+        cancelTimer(value);
+      entries.clear();
+    }
+  };
+}
+
 // packages/forgekeeper/src/target.ts
 var MAX_TARGETS = 50;
 var PREFIX_REFERENCES = 4;
@@ -1466,11 +1635,12 @@ async function locateTargets(forges, directory, targets, previous) {
     });
   });
   if (error !== undefined && !outcomes.some((outcome) => ("request" in outcome)))
-    throw error;
+    throw new TargetLookupError(error);
   if (found.length === 0)
     return {
       kind: "none",
-      reason: requests2.length === 1 ? failed[0].reason : "No session target PR/MR could be resolved"
+      reason: requests2.length === 1 ? failed[0].reason : "No session target PR/MR could be resolved",
+      explicitTarget: true
     };
   return {
     kind: "found",
@@ -1516,154 +1686,6 @@ async function locate(forges, hints) {
   };
 }
 
-// packages/forgekeeper/src/store.ts
-function createStatusStore(options) {
-  const now = options.now ?? Date.now;
-  const setTimer = options.setTimer ?? ((callback, delay) => setTimeout(callback, delay));
-  const clearTimer = options.clearTimer ?? ((timer) => clearTimeout(timer));
-  const interval = options.interval ?? 120000;
-  const maxBackoff = options.maxBackoff ?? 900000;
-  const minEventInterval = options.minEventInterval ?? 15000;
-  const entries = new Map;
-  let disposed = false;
-  let revision = now() * 1000;
-  const entry = (key2) => {
-    let value = entries.get(key2);
-    if (!value) {
-      value = { snapshot: { loading: false }, refs: 0, failures: 0 };
-      entries.set(key2, value);
-    }
-    return value;
-  };
-  const update = (key2, value, patch) => {
-    value.snapshot = { ...value.snapshot, ...patch, revision: ++revision };
-    if (!disposed)
-      options.onChange(key2);
-  };
-  const cancelTimer = (value) => {
-    if (value.timer === undefined)
-      return;
-    clearTimer(value.timer);
-    value.timer = undefined;
-  };
-  const baseInterval = (value) => options.active?.(value.snapshot.lookup) ? options.activeInterval ?? interval : interval;
-  const pollDelay = (value) => Math.min(baseInterval(value) * 2 ** value.failures, maxBackoff);
-  const lastAttempt = (value) => Math.max(value.snapshot.fetchedAt ?? -Infinity, value.snapshot.error?.at ?? -Infinity);
-  const schedule = (key2, value, delay = pollDelay(value)) => {
-    cancelTimer(value);
-    if (disposed || value.refs === 0)
-      return;
-    const lookup = value.snapshot.lookup;
-    if (!value.snapshot.error && (lookup?.kind !== "found" || lookup.requests.length === 0))
-      return;
-    value.timer = setTimer(() => {
-      value.timer = undefined;
-      refresh(key2);
-    }, delay);
-  };
-  function refresh(key2) {
-    if (disposed)
-      return Promise.resolve({ loading: false });
-    const value = entry(key2);
-    if (value.inflight)
-      return value.inflight;
-    value.stale = false;
-    update(key2, value, { loading: true });
-    value.inflight = options.load(key2).then((lookup) => {
-      if (disposed || value.invalidated)
-        return;
-      const previous = value.snapshot.lookup;
-      value.failures = 0;
-      update(key2, value, { lookup, fetchedAt: now(), error: undefined, loading: false });
-      try {
-        if (!disposed)
-          options.onLoad?.(key2, previous, lookup);
-      } catch (error) {
-        try {
-          options.onLoadError?.(error);
-        } catch {}
-      }
-    }, (error) => {
-      if (disposed || value.invalidated)
-        return;
-      value.failures++;
-      const known = error instanceof ForgeError;
-      update(key2, value, {
-        loading: false,
-        error: {
-          kind: known ? error.kind : "request",
-          message: error instanceof Error ? error.message : String(error),
-          at: now()
-        }
-      });
-    }).then(() => {
-      value.inflight = undefined;
-      if (value.invalidated && !disposed) {
-        value.invalidated = false;
-        return refresh(key2);
-      }
-      schedule(key2, value);
-      return value.snapshot;
-    });
-    return value.inflight;
-  }
-  return {
-    get(key2) {
-      return entries.get(key2)?.snapshot ?? { loading: false };
-    },
-    acquire(key2) {
-      const value = entry(key2);
-      value.refs++;
-      if (value.refs === 1 && !value.inflight) {
-        const remaining = lastAttempt(value) + pollDelay(value) - now();
-        if (value.stale || remaining <= 0)
-          refresh(key2);
-        else
-          schedule(key2, value, remaining);
-      }
-      let released = false;
-      return () => {
-        if (released)
-          return;
-        released = true;
-        value.refs--;
-        if (value.refs === 0)
-          cancelTimer(value);
-      };
-    },
-    refresh,
-    keys() {
-      return [...entries.keys()];
-    },
-    notify(key2) {
-      const value = entries.get(key2);
-      if (!value || value.refs === 0 || value.inflight)
-        return;
-      const last = Math.max(value.snapshot.fetchedAt ?? 0, value.snapshot.error?.at ?? 0);
-      if (now() - last < minEventInterval)
-        return;
-      refresh(key2);
-    },
-    invalidate(key2) {
-      const value = entries.get(key2);
-      if (!value)
-        return;
-      if (value.inflight)
-        value.invalidated = true;
-      else if (value.refs > 0)
-        refresh(key2);
-      else
-        value.stale = true;
-    },
-    dispose() {
-      disposed = true;
-      for (const value of entries.values())
-        cancelTimer(value);
-      entries.clear();
-    }
-  };
-}
-
 // packages/forgekeeper/src/status-service.ts
 function createStatusService(options) {
   const now = options.now ?? Date.now;
@@ -1791,6 +1813,7 @@ function createStatusService(options) {
       if (!disposed && !holds.has(key2) && liveLeases(key2).length > 0)
         store.refresh(key2);
     },
+    setTargeted: (key2, targeted) => store.setTargeted(key2, targeted),
     notify: (key2) => store.notify(key2),
     keys: () => store.keys(),
     polling: (key2) => holds.has(key2),
@@ -1995,7 +2018,11 @@ async function setupStatus(ctx, settings, deps, host) {
   });
   return {
     service,
-    targetsChanged: (sessionID) => service.invalidate(sessionID),
+    targetsChanged(sessionID, targets) {
+      const classified = classifyTargets(targetOutput(targets)) ?? [];
+      service.setTargeted(sessionID, classified.some((target2) => target2.kind === "merge-request"));
+      service.invalidate(sessionID);
+    },
     async titleChanged(sessionID) {
       if (!service.keys().includes(sessionID))
         return;
@@ -2243,7 +2270,7 @@ async function setupServer(ctx, lookups, status2) {
             targets: result.targets,
             ...state.prefix ? { prefix: state.prefix } : {}
           });
-          watcher?.targetsChanged(sessionID);
+          watcher?.targetsChanged(sessionID, result.targets);
           await rpc.events.emit("targetChanged", { sessionID, ...targetOutput(result.targets) });
           await update(sessionID);
         });

package/dist/tui.js

@@ -731,7 +731,7 @@ function footerSegments(snapshot) {
   const { lookup, error } = snapshot;
   const stale = error ? [{ text: "stale", tone: "warning", essential: true }] : [];
   if (!lookup || lookup.kind === "none" || lookup.requests.length === 0) {
-    return error ? [{ text: "PR/MR status unavailable", tone: "warning" }] : [];
+    return snapshot.targeted && (error || lookup?.explicitTarget) ? [{ text: "PR/MR status unavailable", tone: "warning" }] : [];
   }
   if (lookup.failed?.length) {
     stale.unshift({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-forgekeeper",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "description": "OpenCode plugin that tracks each session's GitHub and GitLab issues and PRs/MRs: title prefixes, a PR/MR status footer, and review notifications",
   "author": {
     "name": "Pedro Pombeiro",