pinokiod 3.308.0 → 3.309.0

package/kernel/environment.js

@@ -591,7 +591,8 @@ const init = async (options, kernel) => {
 !/logs
 !/GEMINI.md
 !/SPEC.md
-!/app`)
+!/app
+!${kernel.homedir}`)
   }
 
   const gitDir = path.resolve(root, ".git")
@@ -620,13 +621,14 @@ const init = async (options, kernel) => {
       "ENVIRONMENT",
 //      ".*",
 //      "~*",
-      "/.pinokio-temp/",
-      "/logs/",
-      "/cache/",
+      "/.pinokio-temp",
+      "/logs",
+      "/cache",
       "/AGENTS.md",
       "/CLAUDE.md",
       "/GEMINI.md",
-      "/QWEN.md"
+      "/QWEN.md",
+      "/.geminiignore"
     ]
 
     const missingEntries = entriesToEnsure.filter(entry => !existingEntries.has(entry))

package/kernel/index.js

@@ -1035,7 +1035,7 @@ class Kernel {
                   }
                 }
               })
-              if (this.bin.installed.conda.has("git")) {
+              if (this.bin.installed && this.bin.installed.conda && this.bin.installed.conda.has("git")) {
                 await Promise.all([
                   this.proto.init(),
                   this.plugin.init(),

package/package.json

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

package/server/index.js

@@ -178,6 +178,46 @@ class Server {
     process.on('unhandledRejection', (reason) => invoke(reason, 'unhandledRejection'))
     this.fatalHandlersInstalled = true
   }
+
+  async ensureGitconfigDefaults(home) {
+    const gitconfigPath = path.resolve(home, "gitconfig")
+    const templatePath = path.resolve(__dirname, "..", "kernel", "gitconfig_template")
+    const required = [
+      { section: "init", key: "defaultBranch", value: "main" },
+      { section: "push", key: "autoSetupRemote", value: true },
+    ]
+
+    const exists = await this.kernel.exists(gitconfigPath)
+    if (!exists) {
+      await fs.promises.copyFile(templatePath, gitconfigPath)
+      return
+    }
+
+    let config
+    let dirty = false
+    try {
+      const content = await fs.promises.readFile(gitconfigPath, "utf8")
+      config = ini.parse(content)
+    } catch (e) {
+      config = {}
+      dirty = true
+    }
+
+    for (const { section, key, value } of required) {
+      if (!config[section]) {
+        config[section] = {}
+      }
+      const current = config[section][key]
+      if (String(current) !== String(value)) {
+        config[section][key] = value
+        dirty = true
+      }
+    }
+
+    if (dirty) {
+      await fs.promises.writeFile(gitconfigPath, ini.stringify(config))
+    }
+  }
   async handleFatalError(error, origin) {
     if (this.handlingFatalError) {
       console.error(`[Pinokiod] Additional fatal (${origin})`, (error && error.stack) ? error.stack : error)
@@ -219,20 +259,6 @@ class Server {
     } catch (err) {
       console.error('Failed to emit fatal notification:', err)
     }
-    if (!this.fatalExitTimer) {
-      this.fatalExitTimer = setTimeout(() => {
-        try {
-          this.shutdown('Fatal Error')
-        } catch (shutdownErr) {
-          console.error('Failed to shutdown after fatal error:', shutdownErr)
-        }
-        try {
-          process.exit(1)
-        } catch (_) {
-          // ignore
-        }
-      }, 500)
-    }
   }
   stop() {
     this.server.close()
@@ -4155,12 +4181,7 @@ class Server {
         let p4 = path.resolve(home, "network/system")
         await fse.remove(p4)
 
-        let gitconfig = path.resolve(home, "gitconfig")
-        await fse.remove(gitconfig)
-        await fs.promises.copyFile(
-          path.resolve(__dirname, "..", "kernel", "gitconfig_template"),
-          gitconfig
-        )
+        await this.ensureGitconfigDefaults(home)
 
         let prototype_path = path.resolve(home, "prototype")
         await fse.remove(prototype_path)

package/server/views/app.ejs

@@ -2177,6 +2177,10 @@ body.dark {
   padding-top: 12px;
 }
 
+.pinokio-modal-footer--create {
+  padding-top: 12px;
+}
+
 .pinokio-modal-footer.pinokio-modal-footer--publish {
   display: none;
   padding-top: 12px;
@@ -2200,6 +2204,21 @@ body.dark {
   background: rgba(127, 91, 243, 1) !important;
 }
 
+.pinokio-modal-secondary-btn {
+  padding: 10px 22px;
+  border-radius: 999px;
+  border: 1px solid rgba(127, 91, 243, 0.35);
+  background: transparent;
+  color: var(--pinokio-modal-body-text-color);
+  font-weight: 600;
+  cursor: pointer;
+}
+
+.pinokio-modal-secondary-btn:hover {
+  border-color: rgba(127, 91, 243, 0.6);
+  color: #fff;
+}
+
 .pinokio-modal-body--fork {
   display: flex;
   flex-direction: column;
@@ -5699,6 +5718,30 @@ const rerenderMenuSection = (container, html) => {
       return { owner: null, name: null, full: null }
     }
 
+    function buildRemoteWebUrl(remoteUrl) {
+      if (!remoteUrl || typeof remoteUrl !== 'string') {
+        return null
+      }
+      const trimmed = remoteUrl.trim()
+      if (!trimmed) {
+        return null
+      }
+      if (/^https?:\/\//i.test(trimmed)) {
+        return trimmed
+      }
+      const slug = parseRemoteSlug(trimmed)
+      if (slug && slug.full) {
+        return `https://github.com/${slug.full}`
+      }
+      if (trimmed.startsWith('git@')) {
+        const sshSlug = parseRemoteSlug(trimmed.replace(/^git@/, '').replace(/:/, '/'))
+        if (sshSlug && sshSlug.full) {
+          return `https://github.com/${sshSlug.full}`
+        }
+      }
+      return trimmed
+    }
+
     function deriveForkDefaultName(repo) {
       if (!repo) {
         return workspaceName || 'fork'
@@ -5986,16 +6029,30 @@ const rerenderMenuSection = (container, html) => {
       return repoData
     }
 
+    const getRepoChangeCount = (repo) => {
+      if (!repo) {
+        return 0
+      }
+      if (typeof repo.changeCount === 'number') {
+        return repo.changeCount
+      }
+      if (Array.isArray(repo.changes)) {
+        return repo.changes.length
+      }
+      return 0
+    }
+
     async function ensureRemoteForPublish({ repoParam, repoName }) {
       const label = repoName || repoParam || 'Repository'
       const initialRepo = await getRepoData(repoParam)
       if (hasRemoteConfigured(initialRepo)) {
-        return true
+        return { remoteReady: true, shouldOpenPublish: true }
       }
 
-      const creationResult = await showCreateModal({ skipReload: true })
-      if (!creationResult || creationResult.completed === false) {
-        return false
+      const creationResult = await showCreateModal({ skipReload: true, repoParam, repoName })
+      const action = creationResult && creationResult.action ? creationResult.action : null
+      if (!creationResult || creationResult.completed === false || action === 'cancel') {
+        return { remoteReady: false, shouldOpenPublish: false }
       }
 
       if (typeof check_git === 'function') {
@@ -6003,7 +6060,7 @@ const rerenderMenuSection = (container, html) => {
       }
       const refreshedRepo = await getRepoData(repoParam)
       if (hasRemoteConfigured(refreshedRepo)) {
-        return true
+        return { remoteReady: true, shouldOpenPublish: true }
       }
 
       Swal.fire({
@@ -6011,7 +6068,7 @@ const rerenderMenuSection = (container, html) => {
         title: `${escapeHtml(label)} still needs a Git remote`,
         text: 'Add a remote (for example, origin) and try publishing again.'
       })
-      return false
+      return { remoteReady: false, shouldOpenPublish: false }
     }
 
     const buildPublishPreflightCopy = (repoName, reason) => {
@@ -6037,6 +6094,65 @@ const rerenderMenuSection = (container, html) => {
       }
     }
 
+    const promptCommitBeforePublish = async ({ repoParam, repoName }) => {
+      const repoData = await getRepoData(repoParam)
+      const changeCount = getRepoChangeCount(repoData)
+      if (changeCount <= 0) {
+        return { proceed: true, action: 'skip', changeCount }
+      }
+
+      const displayName = repoName || (repoData && repoData.name) || repoParam || 'Repository'
+      const safeName = escapeHtml(displayName)
+      const result = await Swal.fire({
+        html: `
+          <div class="pinokio-modal-surface">
+            <div class="pinokio-modal-header">
+              <div class="pinokio-modal-icon"><i class="fa-solid fa-code-commit"></i></div>
+              <div class="pinokio-modal-heading">
+                <div class="pinokio-modal-title">Commit changes before publishing?</div>
+                <div class="pinokio-modal-subtitle">${safeName} has ${changeCount} uncommitted change${changeCount === 1 ? '' : 's'}.</div>
+              </div>
+            </div>
+          </div>
+        `,
+        customClass: {
+          popup: 'pinokio-modern-modal',
+          htmlContainer: 'pinokio-modern-html',
+          confirmButton: 'pinokio-modern-confirm',
+          cancelButton: 'pinokio-modern-cancel',
+          closeButton: 'pinokio-modern-close'
+        },
+        backdrop: 'rgba(9,11,15,0.65)',
+        width: 'min(520px, 92vw)',
+        showCloseButton: true,
+        showCancelButton: true,
+        showConfirmButton: true,
+        buttonsStyling: false,
+        allowOutsideClick: false,
+        allowEscapeKey: false,
+        reverseButtons: true,
+        confirmButtonText: 'Review & Commit',
+        cancelButtonText: 'Continue without committing',
+        focusConfirm: false
+      })
+
+      if (result.isConfirmed) {
+        try {
+          await showGitDiffModal({ repoParam, repoName: displayName, forceRefresh: true })
+        } catch (error) {
+          console.error('Failed to open commit modal before publish:', error)
+        }
+        if (typeof check_git === 'function') {
+          await check_git()
+        }
+        return { proceed: true, action: 'commit', changeCount }
+      }
+      if (result.dismiss === Swal.DismissReason.cancel) {
+        return { proceed: true, action: 'skip', changeCount }
+      }
+      return { proceed: false, action: 'dismiss', changeCount }
+    }
+
     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.')
@@ -6081,6 +6197,59 @@ const rerenderMenuSection = (container, html) => {
       })
     }
 
+    const handlePreflightFailure = ({ preflight, repoParam, repoName }) => {
+      if (!preflight) {
+        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 runPublishFlow = async ({ repoParam, repoName }) => {
+      let preflight = await fetchPublishPreflightState(repoParam)
+      if (!preflight.ok) {
+        handlePreflightFailure({ preflight, repoParam, repoName })
+        return
+      }
+
+      const commitDecision = await promptCommitBeforePublish({ repoParam, repoName })
+      if (!commitDecision || commitDecision.proceed !== true) {
+        return
+      }
+
+      if (commitDecision.action === 'commit') {
+        preflight = await fetchPublishPreflightState(repoParam)
+        if (!preflight.ok) {
+          handlePreflightFailure({ preflight, repoParam, repoName })
+          return
+        }
+      }
+
+      const remoteOutcome = await ensureRemoteForPublish({ repoParam, repoName })
+      const remoteReady = typeof remoteOutcome === 'object'
+        ? remoteOutcome.remoteReady
+        : Boolean(remoteOutcome)
+      const shouldOpenPublish = typeof remoteOutcome === 'object'
+        ? remoteOutcome.shouldOpenPublish !== false
+        : remoteReady
+      if (remoteReady && shouldOpenPublish) {
+        showPublishModal({ repoParam, repoName })
+      }
+    }
+
     const launchPublishPreflightDiffFlow = async ({ repoParam, repoName }) => {
       try {
         await showGitDiffModal({ repoParam, repoName, forceRefresh: true })
@@ -6092,10 +6261,7 @@ const rerenderMenuSection = (container, html) => {
         const retryState = await fetchPublishPreflightState(repoParam)
         if (retryState.ok) {
           closeStatusDropdowns()
-          const remoteReady = await ensureRemoteForPublish({ repoParam, repoName })
-          if (remoteReady) {
-            showPublishModal({ repoParam, repoName })
-          }
+          await runPublishFlow({ repoParam, repoName })
         }
       } catch (error) {
         console.error('Failed to retry publish after diff:', error)
@@ -6104,29 +6270,7 @@ const rerenderMenuSection = (container, html) => {
 
     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 })
-      })
+      await runPublishFlow({ repoParam, repoName })
     }
 
     const renderPublishDropdown = (repos, options = {}) => {
@@ -7302,10 +7446,28 @@ const rerenderMenuSection = (container, html) => {
           const iframe = popup.querySelector('iframe')
           const footer = popup.querySelector('[data-publish-footer]')
           const closeBtn = popup.querySelector('[data-publish-close]')
+          const viewBtn = popup.querySelector('[data-publish-view-remote]')
+          const remoteHref = viewBtn ? viewBtn.getAttribute('data-remote-url') : null
 
           if (closeBtn) {
             closeBtn.addEventListener('click', () => Swal.close())
           }
+          if (viewBtn) {
+            if (remoteHref) {
+              viewBtn.addEventListener('click', (event) => {
+                event.preventDefault()
+                event.stopPropagation()
+                try {
+                  window.open(remoteHref, '_blank', 'browser')
+                } catch (error) {
+                  console.error('Failed to open remote URL:', error)
+                }
+              })
+            } else {
+              viewBtn.disabled = true
+              viewBtn.setAttribute('title', 'Remote URL not available')
+            }
+          }
 
           if (iframe) {
             iframe.dataset.forceVisible = 'true'
@@ -7388,12 +7550,17 @@ const rerenderMenuSection = (container, html) => {
         return
       }
 
-      const remoteDisplay = repoData && repoData.url ? escapeHtml(repoData.url) : null
+      const remoteUrl = repoData && typeof repoData.url === 'string' ? repoData.url.trim() : ''
+      const remoteWebUrl = buildRemoteWebUrl(remoteUrl)
+      const remoteDisplay = remoteUrl ? escapeHtml(remoteUrl) : null
       const subtitle = `${escapeHtml(repoLabel)} — review your latest changes before publishing.`
       const remoteHtml = remoteDisplay ? `<div class="pinokio-fork-item-url">${remoteDisplay}</div>` : ''
       const timestampedUri = pushUri.includes('?')
         ? `${pushUri}&ts=${Date.now()}`
         : `${pushUri}?ts=${Date.now()}`
+      const viewRemoteButton = remoteWebUrl
+        ? `<button type="button" class="pinokio-modal-secondary-btn" data-publish-view-remote data-remote-url="${escapeHtml(remoteWebUrl)}">View on GitHub</button>`
+        : ''
       
       const modalHtml = `
         <div class="pinokio-modal-surface">
@@ -7409,6 +7576,7 @@ const rerenderMenuSection = (container, html) => {
             <iframe src="${timestampedUri}"></iframe>
           </div>
           <div class="pinokio-modal-footer pinokio-modal-footer--publish" data-publish-footer>
+            ${viewRemoteButton}
             <button type="button" class="pinokio-publish-close-btn" data-publish-close>Close</button>
           </div>
         </div>
@@ -7598,11 +7766,13 @@ const rerenderMenuSection = (container, html) => {
         backdrop: 'rgba(9,11,15,0.65)',
         width: 'min(520px, 90vw)',
         buttonsStyling: false,
-        showCloseButton: true,
+        showCloseButton: false,
         showConfirmButton: true,
         showCancelButton: true,
         confirmButtonText: 'Create on GitHub',
         cancelButtonText: 'Cancel',
+        allowOutsideClick: false,
+        allowEscapeKey: false,
         focusConfirm: false,
         preConfirm: () => {
           const repoName = document.getElementById('create-repo-name-input').value.trim()
@@ -7623,21 +7793,14 @@ const rerenderMenuSection = (container, html) => {
 
       return createRepoModalPromise.then((result) => {
         if (!result || !result.isConfirmed) {
-          return { completed: false, result }
+          return { completed: false, action: 'cancel', 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 }
-        })
+        return showCreateRepoIframeModal(name, isPrivate, opts)
       })
     }
 
     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) {
@@ -7654,40 +7817,71 @@ const rerenderMenuSection = (container, html) => {
       urlParams.append('visibility', isPrivate ? 'private' : 'public')
       
       const finalUri = `${createUri}${createUri.includes('?') ? '&' : '?'}${urlParams.toString()}`
-      
-      const createRepoIframePromise = Swal.fire({
-        html: `
-          <div class="pinokio-modal-surface">
-            <div class="pinokio-modal-header">
-              <div class="pinokio-modal-icon"><i class="fa-brands fa-github"></i></div>
-              <div class="pinokio-modal-heading">
-                <div class="pinokio-modal-title">Create GitHub repository</div>
-                <div class="pinokio-modal-subtitle">${name} · ${isPrivate ? 'Private' : 'Public'}</div>
+
+      return new Promise((resolve) => {
+        let resolved = false
+        const finalize = (payload) => {
+          if (resolved) {
+            return
+          }
+          resolved = true
+          resolve(payload)
+        }
+
+        Swal.fire({
+          html: `
+            <div class="pinokio-modal-surface">
+              <div class="pinokio-modal-header">
+                <div class="pinokio-modal-icon"><i class="fa-brands fa-github"></i></div>
+                <div class="pinokio-modal-heading">
+                  <div class="pinokio-modal-title">Create GitHub repository</div>
+                  <div class="pinokio-modal-subtitle">${name} · ${isPrivate ? 'Private' : 'Public'}</div>
+                </div>
+              </div>
+              <div class="pinokio-modal-body pinokio-modal-body--iframe">
+                <iframe src="${finalUri}"></iframe>
+              </div>
+              <div class="pinokio-modal-footer pinokio-modal-footer--create">
+                <button type="button" class="pinokio-modal-secondary-btn" data-create-cancel>Cancel</button>
+                <button type="button" class="pinokio-publish-close-btn" data-create-next>Next</button>
               </div>
             </div>
-            <div class="pinokio-modal-body pinokio-modal-body--iframe">
-              <iframe src="${finalUri}"></iframe>
-            </div>
-          </div>
-        `,
-        customClass: {
-          popup: 'pinokio-modern-modal',
-          htmlContainer: 'pinokio-modern-html',
-          closeButton: 'pinokio-modern-close'
-        },
-        backdrop: 'rgba(9,11,15,0.65)',
-        width: 'min(760px, 90vw)',
-        showConfirmButton: false,
-        showCloseButton: true,
-        buttonsStyling: false,
-        focusConfirm: false
+          `,
+          customClass: {
+            popup: 'pinokio-modern-modal',
+            htmlContainer: 'pinokio-modern-html',
+            closeButton: 'pinokio-modern-close'
+          },
+          backdrop: 'rgba(9,11,15,0.65)',
+          width: 'min(760px, 90vw)',
+          showConfirmButton: false,
+          showCancelButton: false,
+          showCloseButton: false,
+          buttonsStyling: false,
+          allowOutsideClick: false,
+          allowEscapeKey: false,
+          focusConfirm: false,
+          didOpen: (popup) => {
+            const nextBtn = popup.querySelector('[data-create-next]')
+            const cancelBtn = popup.querySelector('[data-create-cancel]')
+            if (nextBtn) {
+              nextBtn.addEventListener('click', () => {
+                finalize({ completed: true, action: 'next', name, isPrivate })
+                Swal.close()
+              })
+            }
+            if (cancelBtn) {
+              cancelBtn.addEventListener('click', () => {
+                finalize({ completed: false, action: 'cancel', name, isPrivate })
+                Swal.close()
+              })
+            }
+          },
+          willClose: () => {
+            finalize({ completed: false, action: 'dismissed', name, isPrivate })
+          }
+        }).then(() => {})
       })
-
-      if (!skipReload) {
-        reloadOnModalClose(createRepoIframePromise)
-      }
-
-      return createRepoIframePromise
     }
 
     async function showForkModalForRepo(repoParam) {