pinokiod 3.306.0 → 3.308.0

package/kernel/api/htmlmodal/index.js

@@ -32,12 +32,16 @@ class HtmlModalAPI {
       req.params = {}
     }
     const packet = this.buildPacket(req, action)
+    const awaitKey = this.resolveParentPath(req)
     if (options.forceAwait === false) {
       packet.await = false
     }
+    if (packet.await) {
+      packet.awaitKey = awaitKey
+    }
     ondata(packet, 'htmlmodal')
     if (packet.await) {
-      const waitKey = this.resolveParentPath(req)
+      const waitKey = packet.awaitKey || awaitKey
       const response = await kernel.api.wait(waitKey)
       return response
     }

package/kernel/api/index.js

@@ -277,10 +277,22 @@ class Api {
     }
   }
   respond(req) {
-    let requestPath = this.filePath(req.uri)
-    if (this.waiter[requestPath]) {
-      this.waiter[requestPath].resolve(req.response)
-      delete this.waiter[requestPath]
+    let requestPath
+    try {
+      requestPath = this.filePath(req.uri)
+    } catch (_) {
+      requestPath = req.uri
+    }
+    const candidates = [requestPath]
+    if (req && req.uri && req.uri !== requestPath) {
+      candidates.push(req.uri)
+    }
+    for (const key of candidates) {
+      if (this.waiter[key]) {
+        this.waiter[key].resolve(req.response)
+        delete this.waiter[key]
+        return
+      }
     }
   }
   wait(scriptPath) {

package/kernel/environment.js

@@ -587,6 +587,11 @@ const init = async (options, kernel) => {
         await fs.promises.writeFile(destination, rendered_recipe)
       }
     }
+    await fs.promises.writeFile(path.resolve(root, ".geminiignore"), `ENVIRONMENT
+!/logs
+!/GEMINI.md
+!/SPEC.md
+!/app`)
   }
 
   const gitDir = path.resolve(root, ".git")

package/kernel/prototype.js

@@ -14,38 +14,37 @@ class Proto {
 
       // if ~/pinokio/prototype doesn't exist, clone
       let exists = await this.kernel.exists("prototype/system")
-      if (!exists) {
+      if (exists) {
+        await this.kernel.exec({
+          message: "git pull",
+          path: this.kernel.path("prototype/system")
+        }, (e) => {
+          process.stdout.write(e.raw)
+        })
+      } else {
         console.log("prototype doesn't exist. cloning...")
         await fs.promises.mkdir(this.kernel.path("prototype"), { recursive: true }).catch((e) => { })
         await this.kernel.exec({
-          //message: "git clone https://github.com/peanutcocktail/prototype system",
-          //message: "git clone https://github.com/pinokiocomputer/prototype system",
           message: "git clone https://github.com/pinokiocomputer/proto system",
           path: this.kernel.path("prototype")
         }, (e) => {
           process.stdout.write(e.raw)
         })
       }
-      let exists2 = await this.kernel.exists("prototype/PINOKIO.md")
-      if (!exists2) {
-        await this.kernel.download({
-          uri: "https://raw.githubusercontent.com/pinokiocomputer/home/refs/heads/main/docs/README.md",
-          path: this.kernel.path("prototype"),
-          filename: "PINOKIO.md"
-        }, (e) => {
-          process.stdout.write(e.raw)
-        })
-      }
-      let exists3 = await this.kernel.exists("prototype/PTERM.md")
-      if (!exists3) {
-        await this.kernel.download({
-          uri: "https://raw.githubusercontent.com/pinokiocomputer/pterm/refs/heads/main/README.md",
-          path: this.kernel.path("prototype"),
-          filename: "PTERM.md"
-        }, (e) => {
-          process.stdout.write(e.raw)
-        })
-      }
+      await this.kernel.download({
+        uri: "https://raw.githubusercontent.com/pinokiocomputer/home/refs/heads/main/docs/README.md",
+        path: this.kernel.path("prototype"),
+        filename: "PINOKIO.md"
+      }, (e) => {
+        process.stdout.write(e.raw)
+      })
+      await this.kernel.download({
+        uri: "https://raw.githubusercontent.com/pinokiocomputer/pterm/refs/heads/main/README.md",
+        path: this.kernel.path("prototype"),
+        filename: "PTERM.md"
+      }, (e) => {
+        process.stdout.write(e.raw)
+      })
     }
   }
   async ai() {

package/kernel/util.js

@@ -770,15 +770,38 @@ function u2p(urlPath) {
 }
 
 function classifyChange(head, workdir, stage) {
-  if (head === 0 && workdir === 0 && stage === 0) return null; // shouldn't appear
-  if (head === 0 && workdir === 3) return 'untracked';
-  if (head === 0 && stage === 3) return 'added (staged)';
-  if (head === 1 && workdir === 0 && stage === 0) return 'deleted (unstaged)';
-  if (head === 1 && workdir === 0 && stage === 0) return 'deleted (staged)';
-  if (head === 1 && workdir === 2 && stage === 0) return 'modified (unstaged)';
-  if (head === 1 && workdir === 1 && stage === 2) return 'modified (staged)';
-  if (head === 1 && workdir === 2 && stage === 2) return 'modified (staged + unstaged)';
-  if (head === 1 && workdir === 1 && stage === 0) return 'clean';
+  // isomorphic-git statusMatrix codes:
+  // 0: absent, 1: unmodified, 2: modified, 3: added
+  const headExists = head !== 0;
+  const workdirMissing = workdir === 0;
+  const workdirUnmodified = workdir === 1;
+  const workdirTouched = !workdirMissing && !workdirUnmodified; // modified or added
+  const stageMissing = stage === 0;
+  const stageUnmodified = stage === 1;
+  const stageTouched = !stageMissing && !stageUnmodified; // staged change (added/modified/deleted)
+
+  // Untracked file: nothing in HEAD, something in workdir, nothing staged
+  if (!headExists && workdirTouched && stageMissing) return 'untracked';
+
+  // Added (staged): nothing in HEAD, staged entry present
+  if (!headExists && stageTouched) return 'added (staged)';
+
+  // Deleted
+  if (headExists && workdirMissing) {
+    if (stageMissing || stageUnmodified) return 'deleted (unstaged)';
+    return 'deleted (staged)';
+  }
+
+  // Modified
+  if (headExists && workdirTouched) {
+    if (stageMissing || stageUnmodified) return 'modified (unstaged)';
+    if (!workdirUnmodified && stageTouched) return 'modified (staged + unstaged)';
+  }
+
+  // Staged-only modification (workdir clean, stage touched)
+  if (headExists && workdirUnmodified && stageTouched) return 'modified (staged)';
+
+  if (headExists && workdirUnmodified && stageUnmodified) return 'clean';
   return `unknown (${head},${workdir},${stage})`;
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pinokiod",
-  "version": "3.306.0",
+  "version": "3.308.0",
   "description": "",
   "main": "index.js",
   "scripts": {

package/server/index.js

@@ -24,6 +24,7 @@ const fse = require('fs-extra')
 const QRCode = require('qrcode')
 const axios = require('axios')
 const crypto = require('crypto')
+const system = require('systeminformation')
 const serveIndex = require('./serveIndex')
 const registerFileRoutes = require('./routes/files')
 const TerminalApi = require('../kernel/api/terminal')
@@ -647,6 +648,25 @@ class Server {
   async getGit(ref, filepath) {
     const dir = this.kernel.path("api", filepath)
 
+    const gitDirPath = path.join(dir, '.git')
+    let gitDirExists = false
+    try {
+      const gitStats = await fs.promises.stat(gitDirPath)
+      gitDirExists = gitStats.isDirectory()
+    } catch (_) {
+      gitDirExists = false
+    }
+
+    let hasHead = false
+    if (gitDirExists) {
+      try {
+        await git.resolveRef({ fs, dir, ref: 'HEAD' })
+        hasHead = true
+      } catch (_) {
+        hasHead = false
+      }
+    }
+
     let branchList = []
     try {
       branchList = await git.listBranches({ fs, dir })
@@ -752,6 +772,8 @@ class Server {
       log,
       branch: currentBranch,
       branches,
+      gitDirExists,
+      hasHead,
       dir,
       detached: isDetached,
       logError: logError ? String(logError.message || logError) : null
@@ -3480,6 +3502,54 @@ class Server {
           throw new Error("Invalid path: " + config.home)
         }
 
+        const findExistingAncestor = async (p) => {
+          let current = p
+          while (true) {
+            if (await fse.pathExists(current)) {
+              return current
+            }
+            const parent = path.dirname(current)
+            if (!parent || parent === current) {
+              return null
+            }
+            current = parent
+          }
+        }
+
+        const normalizeMountPath = (p) => {
+          if (!p) return null
+          const normalized = path.normalize(p)
+          const { root } = path.parse(normalized)
+          if (normalized === root) {
+            return root.replace(/\\/g, '/')
+          }
+          return normalized.replace(/[\\/]+$/g, '').replace(/\\/g, '/')
+        }
+
+        const resolvedHome = path.resolve(config.home)
+        const ancestor = await findExistingAncestor(resolvedHome)
+        if (!ancestor) {
+          throw new Error("Invalid path: unable to locate parent volume for " + config.home)
+        }
+
+        const mounts = await system.fsSize().catch(() => [])
+        const normalizedAncestor = normalizeMountPath(ancestor)
+        let bestMount = null
+        for (const volume of mounts) {
+          const mountPath = normalizeMountPath(volume.mount)
+          if (!mountPath || !normalizedAncestor) continue
+          const isParent = mountPath === "/" ? normalizedAncestor.startsWith("/") : (normalizedAncestor === mountPath || normalizedAncestor.startsWith(mountPath + "/"))
+          if (isParent) {
+            if (!bestMount || mountPath.length > bestMount.mount.length) {
+              bestMount = { mount: mountPath, type: (volume.type || '').toLowerCase() }
+            }
+          }
+        }
+
+        if (bestMount && bestMount.type.includes("exfat")) {
+          throw new Error("Pinokio home cannot be located on an exFAT drive. Please choose a different location.")
+        }
+
 //        // check if the destination already exists => throw error
 //        let exists = await fse.pathExists(config.home)
 //        if (exists) {
@@ -5315,18 +5385,12 @@ class Server {
       let list = this.getPeers()
       let current_urls = await this.current_urls(req.originalUrl.slice(1))
       let items = [{
-        image: "/pinokio-black.png",
-        name: "pinokio",
-        title: "pinokio.co",
-        description: "Connect with pinokio.co",
-        url: "/connect/pinokio"
-      }, {
-        icon: "fa-brands fa-square-x-twitter",
-        name: "x",
-        title: "x.com",
-        description: "Connect with X.com",
-        url: "/connect/x"
-      }, {
+//        image: "/pinokio-black.png",
+//        name: "pinokio",
+//        title: "pinokio.co",
+//        description: "Connect with pinokio.co",
+//        url: "/connect/pinokio"
+//      }, {
         emoji: "🤗",
         name: "huggingface",
         title: "huggingface.co",
@@ -5338,6 +5402,12 @@ class Server {
         title: "github.com",
         description: "Connect with GitHub.com",
         url: "/github"
+      }, {
+        icon: "fa-brands fa-square-x-twitter",
+        name: "x",
+        title: "x.com",
+        description: "Connect with X.com",
+        url: "/connect/x"
       }]
       let github_hosts = await this.get_github_hosts()
       for(let i=0; i<items.length; i++) {
@@ -7396,8 +7466,12 @@ class Server {
                 mode = "shell"
                 break
               }
+              if (step.method === "app.launch") {
+                mode = "launch"
+                break
+              }
             }
-            if (mode === "exec") {
+            if (mode === "exec" || mode === "launch") {
               item.type = "Open"
               exec_menus.push(item)
             } else if (mode === "shell") {
@@ -8797,7 +8871,7 @@ class Server {
         let message = await this.setConfig(req.body)
         res.json({ success: true, message })
       } catch (e) {
-        res.json({ error: e.stack })
+        res.json({ error: e && e.message ? e.message : e })
       }
 
       // update homedir

package/server/public/common.js

@@ -8,6 +8,49 @@ const createLauncherDebugLog = (...args) => {
   }
 };
 
+const guardedRoutePrefixes = [
+  '/pinokio/launch/',
+  '/pinokio/browser/',
+  '/v/',
+  '/p/',
+  '/api/',
+  '/_api/',
+  '/run/',
+  '/tools',
+  '/bundle/',
+  '/init',
+  '/connect/',
+  '/github',
+  '/setup/',
+  '/requirements_check/',
+  '/agents',
+  '/network',
+  '/net/',
+  '/git/',
+  '/dev/',
+];
+
+function needsRequirementsGuard(targetUrl) {
+  try {
+    const url = typeof targetUrl === 'string' ? new URL(targetUrl, window.location.href) : targetUrl;
+    const path = url.pathname || '';
+    const query = url.searchParams || new URLSearchParams(url.search || '');
+    if (path === '/home') {
+      const mode = (query.get('mode') || '').toLowerCase();
+      return mode === 'download';
+    }
+    for (const prefix of guardedRoutePrefixes) {
+      if (path === prefix || path.startsWith(prefix)) {
+        return true;
+      }
+    }
+    return false;
+  } catch (_) {
+    // Be safe and keep guarding if we cannot parse
+    return true;
+  }
+}
+
 function createMinimalLoadingSwal () {
   if (typeof window === 'undefined' || typeof window.Swal === 'undefined') {
     return () => {};
@@ -22,7 +65,7 @@ function createMinimalLoadingSwal () {
     }
   };
   swal.fire({
-    html: "<i class='fa-solid fa-circle-notch fa-spin'></i> Loading...",
+    html: "<i class='fa-solid fa-circle-notch fa-spin'></i> Backend still warming up...",
     allowOutsideClick: false,
     allowEscapeKey: false,
     showConfirmButton: false,
@@ -97,8 +140,20 @@ if (onfinish) {
 }
 // The original task
 */
-function wait_ready () {
+function wait_ready (targetUrl = null) {
   createLauncherDebugLog('wait_ready invoked');
+  let navTarget = null;
+  if (targetUrl) {
+    try {
+      navTarget = targetUrl instanceof URL ? targetUrl : new URL(targetUrl, window.location.href);
+    } catch (_) {
+      navTarget = null;
+    }
+    if (navTarget && !needsRequirementsGuard(navTarget)) {
+      createLauncherDebugLog('wait_ready short-circuit (unguarded route)', { path: navTarget.pathname });
+      return Promise.resolve({ ready: true, closeModal: null });
+    }
+  }
   return new Promise((resolve, reject) => {
     check_ready().then((ready) => {
       createLauncherDebugLog('wait_ready initial requirements readiness', ready);

package/server/public/files-app/app.css

@@ -399,6 +399,10 @@ body.dark .files-app__tab--stale .files-app__tab-label::after {
   font-size: 13px;
 }
 
+.files-app__tree-action--open {
+  font-size: 13px;
+}
+
 .files-app__tree-action:hover {
   background: rgba(127, 91, 243, 0.15);
   color: var(--text-color);

package/server/public/files-app/app.js

@@ -12,6 +12,49 @@
     return String(value).replace(/[^a-zA-Z0-9_-]/g, (char) => `\\${char}`);
   };
 
+  const decodeBase64 = (value) => {
+    if (!value) return '';
+    try {
+      return window.atob(value);
+    } catch (err) {
+      console.warn('Failed to decode workspace root', err);
+      return '';
+    }
+  };
+
+  const joinFsPath = (base, relativePosix) => {
+    if (!base) return '';
+    if (!relativePosix) return base;
+    const separator = base.includes('\\') ? '\\' : '/';
+    const normalizedBase = base.endsWith(separator) ? base.slice(0, -1) : base;
+    const rel = relativePosix
+      .split('/')
+      .filter(Boolean)
+      .join(separator);
+    return `${normalizedBase}${separator}${rel}`;
+  };
+
+  async function openInFileExplorer(path) {
+    if (!path) return;
+    try {
+      const response = await fetch('/openfs', {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json',
+        },
+        body: JSON.stringify({ path, mode: 'view' }),
+      });
+      if (!response.ok) {
+        throw new Error(`Failed to open file explorer (${response.status})`);
+      }
+    } catch (error) {
+      console.error('Failed to open file explorer', error);
+      if (this && typeof setStatus === 'function') {
+        setStatus.call(this, 'Failed to open in file explorer', 'error');
+      }
+    }
+  }
+
   const createElement = (tag, className) => {
     const el = document.createElement(tag);
     if (className) {
@@ -44,6 +87,7 @@
         initialPath: config.initialPath || '',
         initialPathType: config.initialPathType || null,
         workspaceRoot: config.workspaceRoot || '',
+        workspaceRootDecoded: decodeBase64(config.workspaceRoot || ''),
         treeElements: new Map(),
         sessions: new Map(),
         openOrder: [],
@@ -453,8 +497,30 @@
     label.textContent = entry.name;
     row.appendChild(label);
 
+    const actions = createElement('span', 'files-app__tree-actions');
+    const absoluteFsPath = resolveAbsolutePath.call(this, entry.path);
+    if (absoluteFsPath) {
+      const openBtn = createElement('span', 'files-app__tree-action files-app__tree-action--open');
+      openBtn.setAttribute('role', 'button');
+      openBtn.setAttribute('aria-label', 'Open in file explorer');
+      openBtn.tabIndex = 0;
+      openBtn.title = 'Open in file explorer';
+      openBtn.innerHTML = '<i class="fa-solid fa-up-right-from-square"></i>';
+      const triggerOpen = (event) => {
+        event.preventDefault();
+        event.stopPropagation();
+        openInFileExplorer.call(this, absoluteFsPath);
+      };
+      openBtn.addEventListener('click', triggerOpen);
+      openBtn.addEventListener('keydown', (event) => {
+        if (event.key === 'Enter' || event.key === ' ') {
+          triggerOpen(event);
+        }
+      });
+      actions.appendChild(openBtn);
+    }
+
     if (!entry.isRoot) {
-      const actions = createElement('span', 'files-app__tree-actions');
       const renameBtn = createElement('span', 'files-app__tree-action files-app__tree-action--rename');
       renameBtn.setAttribute('role', 'button');
       renameBtn.setAttribute('aria-label', entry.type === 'directory' ? 'Rename folder' : 'Rename file');
@@ -492,6 +558,8 @@
         }
       });
       actions.appendChild(deleteBtn);
+    }
+    if (actions.children.length > 0) {
       row.appendChild(actions);
     }
 
@@ -985,6 +1053,17 @@
     }
   }
 
+  function resolveAbsolutePath(relativePosix) {
+    if (!this || !this.state) {
+      return null;
+    }
+    const root = this.state.workspaceRootDecoded || '';
+    if (!root) {
+      return null;
+    }
+    return joinFsPath(root, relativePosix);
+  }
+
   async function expandInitialPath(initialPath, initialType) {
     const segments = String(initialPath).split('/').filter(Boolean);
     if (segments.length === 0) {

package/server/public/htmlmodal.js

@@ -35,8 +35,8 @@
       .htmlmodal-actions .btn.primary:hover { background: #0ea5e9; transform: translateY(-1px); }
       .htmlmodal-actions .btn.secondary { background: rgba(148,163,184,0.18); color: #f8fafc; border-color: rgba(148,163,184,0.35); }
       .htmlmodal-actions .btn.secondary:hover { background: rgba(148,163,184,0.3); }
-      .htmlmodal-actions .btn.link { background: transparent; border-color: transparent; color: #38bdf8; padding-left: 0; }
-      .htmlmodal-actions .btn.link:hover { color: #7dd3fc; }
+      .htmlmodal-actions .btn.link { background: rgba(56,189,248,0.12); border-color: rgba(56,189,248,0.55); color: #38bdf8; padding: 10px 18px; }
+      .htmlmodal-actions .btn.link:hover { background: rgba(56,189,248,0.2); color: #7dd3fc; transform: translateY(-1px); }
       .htmlmodal-actions .btn:disabled { opacity: 0.6; cursor: not-allowed; }
     `
     document.head.appendChild(style)
@@ -104,9 +104,10 @@
         this.render(payload)
       }
       if (Object.prototype.hasOwnProperty.call(payload, 'await')) {
+        const awaitTarget = payload.awaitKey || packet.id
         if (payload.await) {
-          this.current.awaiting = packet.id
-        } else if (this.current.awaiting === packet.id) {
+          this.current.awaiting = awaitTarget
+        } else if (this.current.awaiting === awaitTarget) {
           this.current.awaiting = null
         }
       }

package/server/public/tab-idle-notifier.js

@@ -689,6 +689,7 @@
         hasRecentInput: false,
         awaitingLive: false,
         awaitingIdle: false,
+        autoDetected: false,
         isLive: false,
         notified: false,
         lastInput: '',
@@ -1231,9 +1232,17 @@ const ensureTabAccessories = aggregateDebounce(() => {
     }
     if (changedAttribute === 'data-timestamp') {
       updateActivityTimestamp(indicator, state);
+      state.isLive = indicator.classList.contains(LIVE_CLASS);
+      if (!state.hasRecentInput && !state.awaitingLive && !state.awaitingIdle && state.isLive && Number.isFinite(state.lastActivityTimestamp)) {
+        state.commandStartTimestamp = state.commandStartTimestamp || state.lastActivityTimestamp || Date.now();
+        state.awaitingIdle = true;
+        state.autoDetected = true;
+        state.notified = false;
+      }
       return;
     }
 
+    const wasLive = state.isLive;
     const isLive = indicator.classList.contains(LIVE_CLASS);
     state.isLive = isLive;
     updateActivityTimestamp(indicator, state);
@@ -1246,11 +1255,18 @@ const ensureTabAccessories = aggregateDebounce(() => {
       if (state.awaitingLive && state.hasRecentInput) {
         state.awaitingLive = false;
         state.awaitingIdle = true;
+      } else if (!state.hasRecentInput && !state.awaitingLive && !state.awaitingIdle && !wasLive && Number.isFinite(state.lastActivityTimestamp)) {
+        // Auto-run scenario: activity started without explicit terminal input.
+        state.awaitingIdle = true;
+        state.autoDetected = true;
+        state.notified = false;
       }
       return;
     }
 
-    if (state.awaitingIdle && state.hasRecentInput && !state.notified) {
+    const shouldProcessIdle = state.awaitingIdle && !state.notified && (state.hasRecentInput || state.autoDetected);
+
+    if (shouldProcessIdle) {
       const activityTs = Number.isFinite(state.lastActivityTimestamp)
         ? state.lastActivityTimestamp
         : Number(indicator.dataset?.timestamp);
@@ -1276,6 +1292,7 @@ const ensureTabAccessories = aggregateDebounce(() => {
     state.hasRecentInput = false;
     state.awaitingIdle = false;
     state.awaitingLive = false;
+    state.autoDetected = false;
     state.commandStartTimestamp = 0;
     state.lastLiveTimestamp = 0;
     state.lastActivityTimestamp = 0;
@@ -1336,6 +1353,7 @@ const ensureTabAccessories = aggregateDebounce(() => {
     state.hasRecentInput = true;
     state.awaitingLive = true;
     state.awaitingIdle = false;
+    state.autoDetected = false;
     state.notified = false;
     state.lastInput = sanitisePreview(data.line || '');
     state.commandStartTimestamp = Date.now();

package/server/views/app.ejs

@@ -1516,9 +1516,9 @@ body.dark #fs-changes-menu .git-changes-item.git-changes-item--active {
 }
 
 #fs-status .app-info-card img {
-  width: 34px;
-  height: 34px;
-  border-radius: 8px;
+  width: 25px;
+  height: 25px;
+  border-radius: 4px;
   object-fit: cover;
 }
 
@@ -2349,6 +2349,12 @@ body.dark .pinokio-fork-dropdown-remote, body.dark .pinokio-publish-dropdown-rem
   color: rgba(255, 255, 255, 0.45);
 }
 
+.pinokio-modal-icon--warning {
+  background: rgba(255, 189, 68, 0.16);
+  color: #ffbd44;
+}
+
+
 .fs-dropdown-item--disabled {
   opacity: 0.5;
   cursor: not-allowed;
@@ -3070,6 +3076,11 @@ body.dark .pinokio-fork-dropdown-remote, body.dark .pinokio-publish-dropdown-rem
   <div class='container'>
     <% if (type === "browse") { %>
       <div id='fs-status' data-workspace="<%=name%>" data-create-uri="<%=git_create_url%>" data-history-uri="<%=git_history_url%>" data-status-uri="<%=git_status_url%>" data-uri="<%=git_monitor_url%>" data-push-uri="<%=git_push_url%>" data-fork-uri="<%=git_fork_url%>">
+        <div class="app-info" title="<%=config.title || name%>">
+          <div class="app-info-card">
+            <img src="<%= config.icon %>" onerror="this.onerror=null; this.src='/pinokio-black.png'" alt="Project icon">
+          </div>
+        </div>
         <!--
         <div class='fs-status-dropdown nested-menu git blue'>
           <button type='button' class='fs-status-btn frame-link reveal'>
@@ -3126,6 +3137,11 @@ body.dark .pinokio-fork-dropdown-remote, body.dark .pinokio-publish-dropdown-rem
       </div>
     <% } else if (type === 'files') { %>
       <div id='fs-status' data-workspace="<%=name%>" data-create-uri="<%=git_create_url%>" data-history-uri="<%=git_history_url%>" data-status-uri="<%=git_status_url%>" data-uri="<%=git_monitor_url%>" data-push-uri="<%=git_push_url%>" data-fork-uri="<%=git_fork_url%>">
+        <div class="app-info" title="<%=config.title || name%>">
+          <div class="app-info-card">
+            <img src="<%= config.icon %>" onerror="this.onerror=null; this.src='/pinokio-black.png'" alt="Project icon">
+          </div>
+        </div>
         <!--
         <div class='fs-status-dropdown nested-menu git blue'>
           <button type='button' class='fs-status-btn frame-link reveal'>
@@ -3823,7 +3839,7 @@ body.dark .pinokio-fork-dropdown-remote, body.dark .pinokio-publish-dropdown-rem
     if (typeof timestamp === "number") {
       const relative = formatRelativeTime(timestamp)
       updatedEl.dataset.timestamp = String(timestamp)
-      const isLive = (Date.now() - timestamp) < 1500
+      const isLive = (Date.now() - timestamp) < 3000
       updatedEl.classList.toggle('is-live', isLive)
       if (label) {
         label.textContent = isLive ? `${relative} · live` : `idle · ${relative}`
@@ -3856,7 +3872,7 @@ body.dark .pinokio-fork-dropdown-remote, body.dark .pinokio-publish-dropdown-rem
     const dot = updatedEl.querySelector('.indicator .dot')
     const relative = formatRelativeTime(timestamp)
     updatedEl.dataset.timestamp = String(timestamp)
-    const isLive = (Date.now() - timestamp) < 1500
+    const isLive = (Date.now() - timestamp) < 3000
     updatedEl.classList.toggle('is-live', isLive)
     if (label) {
       label.textContent = isLive ? `${relative} · live` : `idle · ${relative}`
@@ -4022,7 +4038,7 @@ const rerenderMenuSection = (container, html) => {
         }
         const label = node.querySelector('.indicator .label')
         const relative = formatRelativeTime(value)
-        const isLive = (now - value) < 1500
+        const isLive = (now - value) < 3000
         node.classList.toggle('is-live', isLive)
         if (label) {
           label.textContent = isLive ? `${relative} · live` : `idle · ${relative}`
@@ -5923,6 +5939,196 @@ const rerenderMenuSection = (container, html) => {
       forkMenu.appendChild(fragment)
     }
 
+    const fetchPublishPreflightState = async (repoParam) => {
+      if (!repoParam) {
+        return { ok: false, reason: 'missing-repo' }
+      }
+      const encodedParam = encodeRepoPath(repoParam)
+      const infoUrl = `/info/git/HEAD/${encodedParam}`
+      try {
+        const response = await fetch(infoUrl, { cache: 'no-store' })
+        if (!response.ok) {
+          throw new Error(`HTTP ${response.status}`)
+        }
+        const payload = await response.json()
+        const repoExists = typeof payload.gitDirExists === 'boolean' ? payload.gitDirExists : true
+        const hasHead = typeof payload.hasHead === 'boolean'
+          ? payload.hasHead
+          : (Array.isArray(payload.log) && payload.log.length > 0)
+        let reason = null
+        if (!repoExists) {
+          reason = 'missing-git'
+        } else if (!hasHead) {
+          reason = 'missing-commit'
+        }
+        return {
+          ok: !reason,
+          reason,
+          repoExists,
+          hasHead,
+          payload,
+        }
+      } catch (error) {
+        console.error('publish preflight error:', error)
+        return { ok: false, reason: 'network', error }
+      }
+    }
+
+    async function getRepoData(repoParam) {
+      if (!repoParam) {
+        return null
+      }
+      let repoData = repoStatusCache.get(repoParam) || null
+      if (!repoData && typeof check_git === 'function') {
+        await check_git()
+        repoData = repoStatusCache.get(repoParam) || null
+      }
+      return repoData
+    }
+
+    async function ensureRemoteForPublish({ repoParam, repoName }) {
+      const label = repoName || repoParam || 'Repository'
+      const initialRepo = await getRepoData(repoParam)
+      if (hasRemoteConfigured(initialRepo)) {
+        return true
+      }
+
+      const creationResult = await showCreateModal({ skipReload: true })
+      if (!creationResult || creationResult.completed === false) {
+        return false
+      }
+
+      if (typeof check_git === 'function') {
+        await check_git()
+      }
+      const refreshedRepo = await getRepoData(repoParam)
+      if (hasRemoteConfigured(refreshedRepo)) {
+        return true
+      }
+
+      Swal.fire({
+        icon: 'info',
+        title: `${escapeHtml(label)} still needs a Git remote`,
+        text: 'Add a remote (for example, origin) and try publishing again.'
+      })
+      return false
+    }
+
+    const buildPublishPreflightCopy = (repoName, reason) => {
+      const name = repoName && repoName.trim().length > 0 ? repoName.trim() : 'Repository'
+      if (reason === 'missing-git') {
+        return {
+          title: `${name} isn't a Git repository yet`,
+          message: 'Initialize git in this folder and save a version before publishing.',
+          actionLabel: 'Review files'
+        }
+      }
+      if (reason === 'missing-commit') {
+        return {
+          title: `Create your first commit for ${name}`,
+          message: 'Save a version on the main branch before publishing to GitHub.',
+          actionLabel: 'Review files'
+        }
+      }
+      return {
+        title: 'Unable to publish',
+        message: 'Resolve the repository issues before retrying.',
+        actionLabel: 'Review files'
+      }
+    }
+
+    const showPublishPreflightModal = ({ title, message, actionLabel, onAction }) => {
+      const safeTitle = escapeHtml(title || 'Repository is not ready to publish')
+      const safeMessage = escapeHtml(message || 'Resolve the issue and try again.')
+      const safeLabel = escapeHtml(actionLabel || 'Review files')
+      const html = `
+        <div class="pinokio-modal-surface">
+          <div class="pinokio-modal-header">
+            <div class="pinokio-modal-icon pinokio-modal-icon--warning"><i class="fa-solid fa-circle-exclamation"></i></div>
+            <div class="pinokio-modal-heading">
+              <div class="pinokio-modal-title">${safeTitle}</div>
+              <div class="pinokio-modal-subtitle">${safeMessage}</div>
+            </div>
+          </div>
+        </div>
+      `
+
+      Swal.fire({
+        html,
+        backdrop: 'rgba(9,11,15,0.65)',
+        width: 'min(440px, 92vw)',
+        showConfirmButton: true,
+        showCancelButton: false,
+        showCloseButton: true,
+        buttonsStyling: false,
+        focusConfirm: true,
+        confirmButtonText: safeLabel,
+        customClass: {
+          popup: 'pinokio-modern-modal pinokio-publish-preflight-modal',
+          htmlContainer: 'pinokio-modern-html',
+          closeButton: 'pinokio-modern-close',
+          confirmButton: 'pinokio-modern-confirm'
+        }
+      })
+      .then(async (result) => {
+        if (result.isConfirmed && typeof onAction === 'function') {
+          try {
+            await onAction()
+          } catch (error) {
+            console.error('preflight action failed:', error)
+          }
+        }
+      })
+    }
+
+    const launchPublishPreflightDiffFlow = async ({ repoParam, repoName }) => {
+      try {
+        await showGitDiffModal({ repoParam, repoName, forceRefresh: true })
+      } catch (error) {
+        console.error('Failed to open diff modal for publish preflight:', error)
+        return
+      }
+      try {
+        const retryState = await fetchPublishPreflightState(repoParam)
+        if (retryState.ok) {
+          closeStatusDropdowns()
+          const remoteReady = await ensureRemoteForPublish({ repoParam, repoName })
+          if (remoteReady) {
+            showPublishModal({ repoParam, repoName })
+          }
+        }
+      } catch (error) {
+        console.error('Failed to retry publish after diff:', error)
+      }
+    }
+
+    const handlePublishDropdownClick = async ({ repoParam, repoName }) => {
+      closeStatusDropdowns()
+      const preflight = await fetchPublishPreflightState(repoParam)
+      if (preflight.ok) {
+        const remoteReady = await ensureRemoteForPublish({ repoParam, repoName })
+        if (remoteReady) {
+          showPublishModal({ repoParam, repoName })
+        }
+        return
+      }
+      if (preflight.reason === 'network') {
+        Swal.fire({
+          icon: 'error',
+          title: 'Unable to check repository state',
+          text: 'Please try again in a moment.'
+        })
+        return
+      }
+      const copy = buildPublishPreflightCopy(repoName, preflight.reason)
+      showPublishPreflightModal({
+        title: copy.title,
+        message: copy.message,
+        actionLabel: copy.actionLabel,
+        onAction: () => launchPublishPreflightDiffFlow({ repoParam, repoName })
+      })
+    }
+
     const renderPublishDropdown = (repos, options = {}) => {
       if (!publishMenu) {
         return
@@ -5972,21 +6178,11 @@ const rerenderMenuSection = (container, html) => {
           <div class="${remoteClass}">${remoteDisplay}</div>
         `
 
-        if (!canPublish) {
-          item.addEventListener('click', (event) => {
-            event.preventDefault()
-            event.stopPropagation()
-            closeStatusDropdowns()
-            showCreateModal()
-          })
-        } else {
-          item.addEventListener('click', (event) => {
-            event.preventDefault()
-            event.stopPropagation()
-            closeStatusDropdowns()
-            showPublishModal({ repoParam: key, repoName: name })
-          })
-        }
+        item.addEventListener('click', (event) => {
+          event.preventDefault()
+          event.stopPropagation()
+          handlePublishDropdownClick({ repoParam: key, repoName: name })
+        })
 
         fragment.appendChild(item)
       })
@@ -7239,8 +7435,8 @@ const rerenderMenuSection = (container, html) => {
       reloadOnModalClose(publishModalPromise)
     }
 
-    const showCreateModal = () => {
-      showCreateRepoModal()
+    const showCreateModal = (options = {}) => {
+      return showCreateRepoModal(options)
     }
 
     const showRemoteSelectionModal = (remotes, pushUri) => {
@@ -7363,7 +7559,9 @@ const rerenderMenuSection = (container, html) => {
       reloadOnModalClose(forkShellModalPromise)
     }
 
-    const showCreateRepoModal = () => {
+    const showCreateRepoModal = (options = {}) => {
+      const opts = typeof options === 'object' && options !== null ? options : {}
+      const skipReload = Boolean(opts.skipReload)
       const modalHtml = `
         <div class="pinokio-modal-surface">
           <div class="pinokio-modal-header">
@@ -7419,17 +7617,27 @@ const rerenderMenuSection = (container, html) => {
         }
       })
 
-      reloadOnModalClose(createRepoModalPromise, (result) => !result || result.isDismissed)
+      if (!skipReload) {
+        reloadOnModalClose(createRepoModalPromise, (result) => !result || result.isDismissed)
+      }
 
-      createRepoModalPromise.then((result) => {
-        if (result.isConfirmed) {
-          const { name, isPrivate } = result.value
-          showCreateRepoIframeModal(name, isPrivate)
+      return createRepoModalPromise.then((result) => {
+        if (!result || !result.isConfirmed) {
+          return { completed: false, result }
         }
+        const { name, isPrivate } = result.value
+        return showCreateRepoIframeModal(name, isPrivate, opts).then((iframeResult) => {
+          if (iframeResult && iframeResult.completed === false) {
+            return { completed: false, result: iframeResult }
+          }
+          return { completed: true, result: iframeResult }
+        })
       })
     }
 
-    const showCreateRepoIframeModal = (name, isPrivate) => {
+    const showCreateRepoIframeModal = (name, isPrivate, options = {}) => {
+      const opts = typeof options === 'object' && options !== null ? options : {}
+      const skipReload = Boolean(opts.skipReload)
       const createUri = document.querySelector('#fs-status').getAttribute('data-create-uri')
       
       if (!createUri) {
@@ -7438,7 +7646,7 @@ const rerenderMenuSection = (container, html) => {
           text: 'Create repository URL not available.',
           icon: 'error'
         })
-        return
+        return Promise.resolve({ completed: false })
       }
 
       const urlParams = new URLSearchParams()
@@ -7475,7 +7683,11 @@ const rerenderMenuSection = (container, html) => {
         focusConfirm: false
       })
 
-      reloadOnModalClose(createRepoIframePromise)
+      if (!skipReload) {
+        reloadOnModalClose(createRepoIframePromise)
+      }
+
+      return createRepoIframePromise
     }
 
     async function showForkModalForRepo(repoParam) {
@@ -7808,9 +8020,6 @@ const rerenderMenuSection = (container, html) => {
       }
 
       const repos = getRepoListSnapshot()
-      const publishTargets = Array.isArray(repos)
-        ? repos.filter((repo) => hasRemoteConfigured(repo) && resolvePushUri(repo))
-        : []
 
       detachHandlers()
 
@@ -7822,7 +8031,8 @@ const rerenderMenuSection = (container, html) => {
         setPublishMenuMessage('Git integration unavailable')
         setLabel('Publish')
         disableDropdown()
-        pushBtn.disabled = publishTargets.length === 0
+        const hasRepos = Array.isArray(repos) && repos.length > 0
+        pushBtn.disabled = !hasRepos
         if (pushBtn.disabled) {
           pushBtn.classList.add('fs-status-btn--disabled')
         } else {
@@ -7879,15 +8089,6 @@ const rerenderMenuSection = (container, html) => {
         pushBtn.disabled = false
         pushBtn.classList.remove('fs-status-btn--disabled')
 
-        if (publishTargets.length === 0) {
-          setLabel('Create')
-          pushBtn.setAttribute('title', 'Create a GitHub repository for this project')
-          disableDropdown()
-          pushBtn.addEventListener('click', showCreateModal)
-          syncForkButton()
-          return
-        }
-
         setLabel('Publish')
         pushBtn.removeAttribute('title')
         enableDropdown()
@@ -7908,8 +8109,13 @@ const rerenderMenuSection = (container, html) => {
 
     // Initialize the publish/create button
     updatePublishButton()
-    
+
     check_git()
+    setInterval(() => {
+      if (typeof check_git === 'function') {
+        check_git()
+      }
+    }, 5000)
   <% } %>
 
   setInterval(() => {

package/server/views/index.ejs

@@ -761,12 +761,13 @@ window.PinokioHomeGuardNavigate = null;
 document.addEventListener("DOMContentLoaded", () => {
   // Run wait_ready for every /home navigation so we only leave when requirements are satisfied
   const guardNavigate = (href, options = {}) => {
-    wait_ready().then(({ closeModal, ready }) => {
+    const url = new URL(href, location.href);
+    wait_ready(url).then(({ closeModal, ready }) => {
       if (ready) {
         if (closeModal) {
           closeModal()
         }
-        options?.replace ? location.replace(href) : location.assign(href);
+        options?.replace ? location.replace(url) : location.assign(url);
       } else {
         const callback = encodeURIComponent(window.location.pathname + window.location.search + window.location.hash);
         window.location.href = `/setup/dev?callback=${callback}`;