@hermannbjorgvin/kirby-desktop 1.0.0-beta.5 → 1.0.0-beta.6

package/main/main.js

@@ -7296,14 +7296,26 @@ import {
   shell
 } from "electron";
 
-// apps/desktop/src/host/contract.ts
-var SECRET_PLACEHOLDER = "\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022";
+// apps/desktop/src/host/contract-events.ts
 var MENU_EVENTS = {
   command: "kirby/menu/command"
 };
 var SYNC_EVENTS = {
-  notice: "kirby/sync/notice"
+  notice: "kirby/sync/notice",
+  /**
+   * Background remote data (the pull request list) has landed and the
+   * sidebar model would now answer differently.
+   *
+   * `getSidebarModel` deliberately never waits for the network, so
+   * without this the first pull requests of a session would appear
+   * whenever the renderer's poll interval next came round — up to four
+   * seconds after the host already had them.
+   */
+  remote: "kirby/sync/remote"
 };
+
+// apps/desktop/src/host/contract.ts
+var SECRET_PLACEHOLDER = "\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022";
 var IPC = {
   getVersion: "kirby/version",
   openRepo: "kirby/repo/open",
@@ -7523,7 +7535,7 @@ function detectProviderFields(cfg, providers, detected) {
   if (!provider?.autoDetectFields)
     return;
   try {
-    const extra = provider.autoDetectFields();
+    const extra = provider.autoDetectFields(cfg.vendorProject ?? {});
     if (!extra)
       return;
     cfg.vendorProject ??= {};
@@ -9910,7 +9922,9 @@ var githubProvider = {
   parseRemoteUrl(url) {
     return parseGitHubRemoteUrl(url);
   },
-  autoDetectFields() {
+  autoDetectFields(project = {}) {
+    if (project.username)
+      return null;
     try {
       const out = execSync2("gh api /user", {
         encoding: "utf8",
@@ -11865,6 +11879,10 @@ var cache = null;
 var inflight = null;
 var lastError = null;
 var fetchSeq = 0;
+var remoteUpdated = null;
+function setRemoteUpdatedNotifier(fn) {
+  remoteUpdated = fn;
+}
 function remoteIntervalMs(interval) {
   return interval ?? DEFAULT_REMOTE_MS;
 }
@@ -11874,17 +11892,24 @@ function resolveProvider(cwd) {
   const configured = provider != null && provider.isConfigured(config.vendorAuth, config.vendorProject);
   return { config, provider, configured };
 }
-async function fetchRemote2(cwd, force = false) {
+function cachedPrMap(cwd) {
+  return cache && cache.cwd === cwd ? cache.prMap : {};
+}
+function freshCache(cwd, ttl) {
+  if (!cache || cache.cwd !== cwd)
+    return null;
+  return Date.now() - cache.fetchedAt < ttl ? cache : null;
+}
+async function fetchRemote2(cwd, force = false, onCommit) {
   const { config, provider, configured } = resolveProvider(cwd);
   if (!provider || !configured) {
     cache = { cwd, prMap: {}, fetchedAt: Date.now() };
     lastError = null;
     return {};
   }
-  const ttl = remoteIntervalMs(config.prPollInterval);
-  if (!force && cache && cache.cwd === cwd && Date.now() - cache.fetchedAt < ttl) {
-    return cache.prMap;
-  }
+  const fresh = force ? null : freshCache(cwd, remoteIntervalMs(config.prPollInterval));
+  if (fresh)
+    return fresh.prMap;
   if (inflight && inflight.cwd === cwd && !force)
     return inflight.promise;
   const seq = ++fetchSeq;
@@ -11892,6 +11917,7 @@ async function fetchRemote2(cwd, force = false) {
     if (seq === fetchSeq) {
       cache = { cwd, prMap, fetchedAt: Date.now() };
       lastError = null;
+      onCommit?.();
     }
     return prMap;
   }).catch((err) => {
@@ -11908,13 +11934,16 @@ async function fetchRemote2(cwd, force = false) {
   inflight = { cwd, promise };
   return promise;
 }
+function refreshRemoteInBackground(cwd) {
+  void fetchRemote2(cwd, false, () => remoteUpdated?.()).catch(() => {
+  });
+}
 async function getSidebarModel() {
   const cwd = requireRepo();
   const { config, provider } = resolveProvider(cwd);
-  const [worktrees, prMap] = await Promise.all([
-    listWorktrees(),
-    fetchRemote2(cwd)
-  ]);
+  refreshRemoteInBackground(cwd);
+  const worktrees = await listWorktrees();
+  const prMap = cachedPrMap(cwd);
   const sessions2 = worktrees.map((wt) => {
     const name = worktreeSessionName(wt);
     return {
@@ -12609,6 +12638,7 @@ function createHostApi() {
     showAppMenu: () => appMenuPopup(),
     onMenuCommand: () => () => void 0,
     onSyncNotice: () => () => void 0,
+    onRemoteUpdated: () => () => void 0,
     getDesktopPrefs: () => Promise.resolve(loadDesktopPrefs()),
     setDesktopPrefs: (patch) => {
       const next = saveDesktopPrefs(patch);
@@ -12703,6 +12733,24 @@ function registerHostHandlers(register, api = createHostApi()) {
   }
 }
 
+// apps/desktop/src/main/boot-marks.ts
+var MAIN_MARKS = {
+  /** Entry module evaluated — Electron is up, our bundle is loaded. */
+  module: "kirby:main:module",
+  /** `app.whenReady()` resolved. */
+  ready: "kirby:main:ready",
+  /** The startup repository is open (or there was none). */
+  repo: "kirby:main:repo",
+  /** `new BrowserWindow` returned and the load has been kicked off. */
+  window: "kirby:main:window"
+};
+function mark(name) {
+  try {
+    performance.mark(name);
+  } catch {
+  }
+}
+
 // apps/desktop/src/main/menu.ts
 function buildMenuTemplate(env, send) {
   const isMac = env.platform === "darwin";
@@ -12907,6 +12955,7 @@ function loadTarget(devServerUrl, indexHtmlPath) {
 }
 
 // apps/desktop/src/main/main.ts
+mark(MAIN_MARKS.module);
 var DIST = join9(import.meta.dirname, "..");
 var DEV_SERVER_URL = process.env.KIRBY_VITE_URL;
 var APP_VERSION = process.env.KIRBY_DESKTOP_VERSION ?? "dev";
@@ -13106,6 +13155,11 @@ setSyncNotifier((notice) => {
     win.webContents.send(SYNC_EVENTS.notice, notice);
   }
 });
+setRemoteUpdatedNotifier(() => {
+  for (const win of BrowserWindow.getAllWindows()) {
+    win.webContents.send(SYNC_EVENTS.remote);
+  }
+});
 if (!app.requestSingleInstanceLock()) {
   app.quit();
 } else {
@@ -13118,12 +13172,15 @@ if (!app.requestSingleInstanceLock()) {
     }
   });
   app.whenReady().then(() => {
+    mark(MAIN_MARKS.ready);
     nativeTheme.themeSource = prefs.theme;
     installAppMenu();
     void probeTmuxAvailability().catch(() => void 0);
     const opened = openStartupRepo();
+    mark(MAIN_MARKS.repo);
     console.log(`[desktop] startup repo: ${opened ? opened.cwd : "none"}`);
     void createMainWindow();
+    mark(MAIN_MARKS.window);
     app.on("activate", () => {
       if (BrowserWindow.getAllWindows().length === 0) {
         void createMainWindow();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hermannbjorgvin/kirby-desktop",
-  "version": "1.0.0-beta.5",
+  "version": "1.0.0-beta.6",
   "description": "Kirby Desktop — GUI shell over the same app core as the Kirby TUI",
   "author": "Hermann Bjorgvin",
   "license": "MIT",

package/preload/preload.cjs

@@ -3,7 +3,7 @@
 // apps/desktop/src/preload/preload.ts
 var import_electron = require("electron");
 
-// apps/desktop/src/host/contract.ts
+// apps/desktop/src/host/contract-events.ts
 var SESSION_EVENTS = {
   data: "kirby/session/data",
   exit: "kirby/session/exit"
@@ -12,8 +12,20 @@ var MENU_EVENTS = {
   command: "kirby/menu/command"
 };
 var SYNC_EVENTS = {
-  notice: "kirby/sync/notice"
+  notice: "kirby/sync/notice",
+  /**
+   * Background remote data (the pull request list) has landed and the
+   * sidebar model would now answer differently.
+   *
+   * `getSidebarModel` deliberately never waits for the network, so
+   * without this the first pull requests of a session would appear
+   * whenever the renderer's poll interval next came round — up to four
+   * seconds after the host already had them.
+   */
+  remote: "kirby/sync/remote"
 };
+
+// apps/desktop/src/host/contract.ts
 var IPC = {
   getVersion: "kirby/version",
   openRepo: "kirby/repo/open",
@@ -136,6 +148,11 @@ var api = {
     import_electron.ipcRenderer.on(SYNC_EVENTS.notice, listener);
     return () => import_electron.ipcRenderer.removeListener(SYNC_EVENTS.notice, listener);
   },
+  onRemoteUpdated: (cb) => {
+    const listener = () => cb();
+    import_electron.ipcRenderer.on(SYNC_EVENTS.remote, listener);
+    return () => import_electron.ipcRenderer.removeListener(SYNC_EVENTS.remote, listener);
+  },
   getDesktopPrefs: () => import_electron.ipcRenderer.invoke(IPC.getDesktopPrefs),
   setDesktopPrefs: (patch) => import_electron.ipcRenderer.invoke(IPC.setDesktopPrefs, patch),
   showAbout: () => import_electron.ipcRenderer.invoke(IPC.showAbout)