pinokiod 3.331.0 → 3.332.0

package/kernel/api/index.js

@@ -836,6 +836,48 @@ class Api {
       memory.next = null
     }
 
+    // snapshot minimal memory state before executing this step
+    let sanitizedInput = input
+    if (sanitizedInput && typeof sanitizedInput === "object") {
+      const clone = Array.isArray(sanitizedInput) ? [...sanitizedInput] : { ...sanitizedInput }
+      if ("stdout" in clone) delete clone.stdout
+      if ("response" in clone) delete clone.response
+      sanitizedInput = clone
+    }
+
+    const memoryLog = {
+      ts: Date.now(),
+      step: i,
+      input: sanitizedInput,
+      args,
+      global: memory.global,
+      local: memory.local,
+      port
+    }
+    try {
+      this.ondata({
+        id,
+        type: "memory",
+        data: {
+          raw: JSON.stringify(memoryLog) + "\r\n"
+        },
+        rpc: rawrpc,
+        rawrpc
+      })
+      if (i === 0 && request.path) {
+        // also emit using the script path id so it is guaranteed to hit disk logs
+        this.ondata({
+          id: request.path,
+          type: "memory",
+          data: {
+            raw: JSON.stringify(memoryLog) + "\r\n"
+          },
+          rpc: rawrpc,
+          rawrpc
+        })
+      }
+    } catch (_) {}
+
 
     this.state = memory
     this.executing = request

package/package.json

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

package/server/public/logs.js

@@ -124,7 +124,17 @@
       if (!this.outputEl) return
       const text = this.outputEl.textContent || ''
       if (text.length > MAX_VIEWER_CHARS) {
+        // Preserve the user's scroll position while trimming large buffers
+        const distanceFromBottom = Math.max(
+          0,
+          this.outputEl.scrollHeight - this.outputEl.clientHeight - this.outputEl.scrollTop
+        )
         this.outputEl.textContent = text.slice(text.length - MAX_VIEWER_CHARS)
+        const nextScrollTop = Math.max(
+          0,
+          this.outputEl.scrollHeight - this.outputEl.clientHeight - distanceFromBottom
+        )
+        this.outputEl.scrollTop = nextScrollTop
       }
     }
     appendChunk(chunk) {

package/server/socket.js

@@ -9,6 +9,8 @@ class Socket {
   constructor(parent) {
     this.buffer = {}
     this.old_buffer = {}
+    this.rawLog = {}
+    this.logMeta = {}
     this.sessions = {}
     this.connected = {}
     this.active_shell = {}
@@ -271,7 +273,7 @@ class Socket {
       for(let key in this.buffer) {
         let buf = this.buffer[key]
         if (this.old_buffer[key] !== buf) {
-          this.log_buffer(key, buf)
+          this.log_buffer(key, buf, this.logMeta[key])
         } else {
 //          console.log(`State hasn't changed: ${key}`)
         }
@@ -323,6 +325,9 @@ class Socket {
       id = e.id
     }
 
+    const meta = this.extractMeta(e)
+    this.logMeta[id] = meta
+
     const subscribers = this.subscriptions.get(id) || new Set();
     if (subscribers.size > 0) {
       //const subscribers = this.subscriptions.get(e.id) || new Set();
@@ -343,10 +348,12 @@ class Socket {
     }
 
     if (e.data && e.data.type === "shell.kill") {
-      this.log_buffer(id, this.buffer[id]).then(() => {
+      this.log_buffer(id, this.buffer[id], meta).then(() => {
         // when shell is killed, reset the buffer
         delete this.buffer[id]
         delete this.sessions[id]
+        delete this.rawLog[id]
+        delete this.logMeta[id]
       })
     }
 
@@ -356,6 +363,14 @@ class Socket {
         this.sessions[id] = "" + Date.now()
       }
     }
+    if (e.data && e.data.raw) {
+      if (e.type === "memory") {
+        console.log("[memory event id]", id, "caller", e.caller)
+      }
+      const tagged = this.tagLines(meta, e.data.raw)
+      this.rawLog[id] = (this.rawLog[id] || "") + (this.rawLog[id] ? "\n" : "") + tagged
+      this.log_buffer(id, this.buffer[id], meta)
+    }
     //if (e.data && e.data.raw) this.buffer[id] += e.data.raw
     if (e.data && e.data.buf) this.buffer[id] = e.data.buf
 
@@ -474,7 +489,43 @@ class Socket {
     }
   }
 
-  async log_buffer(key, buf) {
+  logTag(meta) {
+    if (meta && meta.memory) {
+      return `[memory]`
+    }
+    const source = (meta && meta.source) ? meta.source : 'shell'
+    const method = (meta && meta.method) ? meta.method : (source === 'shell' ? 'shell' : '')
+    return `[${source}${method ? ' ' + method : ''}]`
+  }
+
+  tagLines(meta, text) {
+    const tag = this.logTag(meta)
+    return String(text || '').split(/\r?\n/).map((line) => `${tag} ${line}`).join("\n")
+  }
+
+  extractMeta(e) {
+    const meta = { source: 'shell', method: 'shell' }
+    if (e && e.type === "memory") {
+      meta.memory = true
+    }
+    if (e && e.kernel) {
+      meta.source = 'kernel'
+      meta.method = 'kernel'
+    }
+    if (e && (e.rpc || e.rawrpc)) {
+      meta.source = 'api'
+      const method = (e.rpc && e.rpc.method) || (e.rawrpc && e.rawrpc.method)
+      if (method) {
+        meta.method = method
+      } else {
+        meta.method = 'api'
+      }
+    }
+    return meta
+  }
+
+  async log_buffer(key, buf, meta) {
+    const resolvedMeta = meta || this.logMeta[key] || { source: 'shell', method: 'shell' }
 
     /*
       
@@ -512,7 +563,10 @@ class Socket {
           let session = this.sessions[key]
           //let logpath = path.resolve(cwd, "logs/dev", path.parse(relative).base)
           let logpath = path.resolve(cwd, "logs/dev", relative)
-          await Util.log(logpath, buf, session)
+          const raw = this.rawLog[key] || ""
+          const tagged = buf ? this.tagLines(resolvedMeta, buf) : ""
+          const content = [raw, tagged].filter(Boolean).join("\n")
+          await Util.log(logpath, content, session)
         }
       } else if (relative.startsWith("api")) {
         // api
@@ -528,7 +582,10 @@ class Socket {
         cwd = root.root
         let session = this.sessions[key]
         let logpath = path.resolve(cwd, "logs/api", ...filepath_chunks)
-        await Util.log(logpath, buf, session)
+        const raw = this.rawLog[key] || ""
+        const tagged = buf ? this.tagLines(resolvedMeta, buf) : ""
+        const content = [raw, tagged].filter(Boolean).join("\n")
+        await Util.log(logpath, content, session)
       }
     } else {
       // Only log SHELL
@@ -553,7 +610,10 @@ class Socket {
           cwd = root.root
           let session = this.sessions[key]
           let logpath = path.resolve(cwd, "logs/shell")
-          await Util.log(logpath, buf, session)
+          const raw = this.rawLog[key] || ""
+          const tagged = buf ? this.tagLines(resolvedMeta, buf) : ""
+          const content = [raw, tagged].filter(Boolean).join("\n")
+          await Util.log(logpath, content, session)
         }
       }
     }

package/server/views/app.ejs

@@ -2070,6 +2070,46 @@ body.dark {
   color: var(--pinokio-modal-subtitle-color);
 }
 
+.pinokio-modal-tabs {
+  display: inline-flex;
+  gap: 8px;
+  padding: 0 6px;
+}
+
+.pinokio-modal-tab {
+  border: none;
+  background: transparent;
+  color: var(--pinokio-modal-subtitle-color);
+  padding: 8px 12px;
+  border-radius: 10px;
+  font-weight: 700;
+  letter-spacing: 0.01em;
+  cursor: pointer;
+  transition: background 0.15s ease, color 0.15s ease, transform 0.15s ease;
+}
+
+.pinokio-modal-tab:hover {
+  background: rgba(59, 130, 246, 0.12);
+  color: var(--pinokio-modal-title-color);
+}
+
+.pinokio-modal-tab:focus-visible {
+  outline: 2px solid rgba(59, 130, 246, 0.4);
+  outline-offset: 2px;
+}
+
+.pinokio-modal-tab:disabled {
+  opacity: 0.55;
+  cursor: not-allowed;
+  transform: none;
+}
+
+.pinokio-modal-tab--active {
+  background: rgba(59, 130, 246, 0.16);
+  color: var(--pinokio-modal-title-color);
+  transform: translateY(-1px);
+}
+
 .pinokio-history-meta {
   display: flex;
   gap: 10px;
@@ -2281,6 +2321,42 @@ body.dark {
   font-style: italic;
 }
 
+.pinokio-history-inline-head {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: 10px;
+  margin-bottom: 10px;
+}
+
+.pinokio-history-inline-actions {
+  display: inline-flex;
+  align-items: center;
+  gap: 8px;
+}
+
+.pinokio-history-inline-btn {
+  border: 1px solid rgba(59, 130, 246, 0.35);
+  background: transparent;
+  color: var(--pinokio-modal-title-color);
+  padding: 7px 12px;
+  border-radius: 9px;
+  font-weight: 600;
+  cursor: pointer;
+  transition: background 0.15s ease, border 0.15s ease, transform 0.15s ease;
+}
+
+.pinokio-history-inline-btn:hover {
+  background: rgba(59, 130, 246, 0.16);
+  border-color: rgba(59, 130, 246, 0.5);
+  transform: translateY(-1px);
+}
+
+.pinokio-history-inline-btn:focus-visible {
+  outline: 2px solid rgba(59, 130, 246, 0.45);
+  outline-offset: 2px;
+}
+
 .pinokio-fork-name-input {
   display: flex;
   flex-direction: column;
@@ -5642,6 +5718,23 @@ const rerenderMenuSection = (container, html) => {
       return value.split('/').map(encodeURIComponent).join('/')
     }
 
+    const buildHistoryUrl = (param) => {
+      if (!param) {
+        return null
+      }
+      return `/info/git/HEAD/${encodeRepoPath(param)}`
+    }
+
+    const resolveHistoryUrl = (repoParam, repoData, explicitUrl = null) => {
+      let url = explicitUrl || (repoData && repoData.git_history_url) || historyUri || null
+      if (!url && repoParam) {
+        url = buildHistoryUrl(repoParam)
+      } else if (repoParam && typeof url === 'string' && url.startsWith('/info/git/HEAD/')) {
+        url = buildHistoryUrl(repoParam)
+      }
+      return url
+    }
+
     function escapeHtml(value) {
       if (value === null || value === undefined) {
         return ''
@@ -6745,6 +6838,12 @@ const rerenderMenuSection = (container, html) => {
         commitUrl = gitCommitUrl
       }
 
+      let historyUrl = resolveHistoryUrl(
+        repoParam,
+        repoData,
+        diffDataIsObject ? (diffData.git_history_url || null) : null
+      )
+
       const shouldForceRefresh = Boolean(diffDataIsObject && diffData.forceRefresh)
 
       if (!changes || changes.length === 0 || shouldForceRefresh) {
@@ -6770,6 +6869,7 @@ const rerenderMenuSection = (container, html) => {
           }
           repoStatusCache.set(repoParam, updatedRepo)
           repoData = updatedRepo
+          historyUrl = resolveHistoryUrl(repoParam, updatedRepo)
           const listEntry = lastRepoList.find((entry) => entry.repoParam === repoParam)
           if (listEntry) {
             listEntry.changes = changes
@@ -6810,7 +6910,7 @@ const rerenderMenuSection = (container, html) => {
           await showGitHistoryModal({
             repoParam,
             repoName: repoDisplayName,
-            historyUrl: repoData && repoData.git_history_url ? repoData.git_history_url : null,
+            historyUrl,
           })
         } catch (error) {
           console.error('Failed to open history for clean repository:', error)
@@ -6843,6 +6943,8 @@ const rerenderMenuSection = (container, html) => {
         </div>
       ` : ''
 
+      const historyTabDisabled = historyUrl ? '' : ' disabled'
+
       const modalHtml = `
         <div class="pinokio-modal-surface pinokio-modal-surface--diff">
           <div class="pinokio-modal-header">
@@ -6852,8 +6954,16 @@ const rerenderMenuSection = (container, html) => {
               <div class="pinokio-modal-subtitle">${changeSummary}</div>
             </div>
           </div>
+          <div class="pinokio-modal-tabs">
+            <button type="button" class="pinokio-modal-tab pinokio-modal-tab--active" data-tab-target="changes">
+              <i class="fa-solid fa-code-compare"></i> Changes
+            </button>
+            <button type="button" class="pinokio-modal-tab"${historyTabDisabled} data-tab-target="history">
+              <i class="fa-solid fa-clock-rotate-left"></i> History
+            </button>
+          </div>
           ${badgeFragments.length ? `<div class="pinokio-history-meta">${badgeFragments.join('')}</div>` : ''}
-          <div class="pinokio-modal-body pinokio-modal-body--diff">
+          <div class="pinokio-modal-body pinokio-modal-body--diff" data-tab-panel="changes">
             <div class="pinokio-git-diff-main-container">
               <div class="pinokio-git-diff-file-list-panel">
                 ${changes.map((change, index) => `
@@ -6868,6 +6978,9 @@ const rerenderMenuSection = (container, html) => {
               </div>
             </div>
           </div>
+          <div class="pinokio-modal-body pinokio-modal-body--history" data-tab-panel="history" style="display:none">
+            <div class="pinokio-git-diff-empty-state">${historyUrl ? 'Loading history…' : 'History unavailable'}</div>
+          </div>
           ${commitSection}
         </div>
       `
@@ -6903,6 +7016,11 @@ const rerenderMenuSection = (container, html) => {
           if (!container) return
           const fileItems = container.querySelectorAll('.pinokio-git-diff-file-item-row')
           const diffViewer = container.querySelector('.pinokio-git-diff-viewer-panel')
+          const tabButtons = container.querySelectorAll('.pinokio-modal-tab')
+          const tabPanels = container.querySelectorAll('[data-tab-panel]')
+          const historyPanel = container.querySelector('[data-tab-panel="history"]')
+          const commitFooter = container.querySelector('.pinokio-modal-footer--commit')
+          let historyLoaded = false
 
           const saveBtn = container.querySelector('.pinokio-save-version-btn')
           if (saveBtn) {
@@ -6938,6 +7056,108 @@ const rerenderMenuSection = (container, html) => {
             })
           })
 
+          const renderHistoryInline = (historyData) => {
+            if (!historyPanel) {
+              return
+            }
+            const commits = Array.isArray(historyData.log) ? historyData.log : []
+            const remoteName = historyData.remote || ''
+            const currentRef = historyData.ref || 'HEAD'
+            const metaBadges = [`<span class="pinokio-pill"><i class="fa-solid fa-code-branch"></i>${escapeHtml(currentRef)}</span>`]
+            if (remoteName) {
+              metaBadges.push(`<span class="pinokio-pill"><i class="fa-solid fa-cloud-arrow-up"></i>${escapeHtml(remoteName)}</span>`)
+            }
+            const commitMarkup = commits.length
+              ? `<div class="pinokio-git-history-list">${commits.map(commit => createCommitItem(commit)).join('')}</div>`
+              : '<div class="pinokio-history-empty">No commits found</div>'
+
+            historyPanel.innerHTML = `
+              <div class="pinokio-history-inline-head">
+                <div class="pinokio-history-meta">${metaBadges.join('')}</div>
+                <div class="pinokio-history-inline-actions">
+                  <button type="button" class="pinokio-history-inline-btn" data-open-full-history>
+                    <i class="fa-solid fa-up-right-from-square"></i> Open full history
+                  </button>
+                </div>
+              </div>
+              ${commitMarkup}
+            `
+
+            historyPanel.querySelectorAll('.pinokio-git-commit-item').forEach(item => {
+              item.addEventListener('click', async () => {
+                const commitInfo = item.getAttribute('data-commit-info')
+                if (commitInfo) {
+                  await showCommitDiffModal(commitInfo)
+                }
+              })
+            })
+
+            const fullHistoryBtn = historyPanel.querySelector('[data-open-full-history]')
+            if (fullHistoryBtn) {
+              if (!historyUrl) {
+                fullHistoryBtn.disabled = true
+              } else {
+                fullHistoryBtn.addEventListener('click', () => {
+                  Swal.close()
+                  showGitHistoryModal({ repoParam, repoName: repoDisplayName, historyUrl })
+                })
+              }
+            }
+          }
+
+          const loadHistory = async () => {
+            if (historyLoaded || !historyPanel) {
+              return
+            }
+            if (!historyUrl) {
+              historyPanel.innerHTML = '<div class="pinokio-git-diff-empty-state">History unavailable</div>'
+              return
+            }
+            historyPanel.innerHTML = '<div class="pinokio-git-diff-empty-state">Loading history…</div>'
+            try {
+              const response = await fetch(historyUrl)
+              if (!response.ok) {
+                throw new Error(`HTTP ${response.status}`)
+              }
+              const data = await response.json()
+              historyLoaded = true
+              renderHistoryInline(data)
+            } catch (error) {
+              historyLoaded = false
+              console.error('Error loading inline history:', error)
+              historyPanel.innerHTML = '<div class="pinokio-git-diff-empty-state">Unable to load history</div>'
+            }
+          }
+
+          const setActiveTab = (tabName) => {
+            tabButtons.forEach((btn) => {
+              const isActive = btn.getAttribute('data-tab-target') === tabName
+              btn.classList.toggle('pinokio-modal-tab--active', isActive)
+            })
+            tabPanels.forEach((panel) => {
+              const isTarget = panel.getAttribute('data-tab-panel') === tabName
+              panel.style.display = isTarget ? '' : 'none'
+            })
+            if (commitFooter) {
+              commitFooter.style.display = tabName === 'changes' ? '' : 'none'
+            }
+            if (tabName === 'history') {
+              loadHistory()
+            }
+          }
+
+          tabButtons.forEach((btn) => {
+            if (btn.disabled) {
+              return
+            }
+            btn.addEventListener('click', () => {
+              const target = btn.getAttribute('data-tab-target') || 'changes'
+              setActiveTab(target)
+            })
+          })
+
+          setActiveTab('changes')
+
           if (fileItems.length) {
             fileItems[0].click()
           }
@@ -6985,12 +7205,6 @@ const rerenderMenuSection = (container, html) => {
     
     const showGitHistoryModal = async (options = {}) => {
       const opts = options && typeof options === 'object' ? options : {}
-      const buildHistoryUrl = (param) => {
-        if (!param) {
-          return null
-        }
-        return `/info/git/HEAD/${encodeRepoPath(param)}`
-      }
 
       let repoParam = opts.repoParam ?? null
       let repoName = opts.repoName ?? null
@@ -7010,17 +7224,7 @@ const rerenderMenuSection = (container, html) => {
         historyUrl = repoData.git_history_url
       }
 
-      const fallbackHistoryUri = readDataAttr(fsStatusEl, 'data-history-uri')
-
-      if (!historyUrl) {
-        if (repoParam) {
-          historyUrl = buildHistoryUrl(repoParam)
-        } else if (fallbackHistoryUri) {
-          historyUrl = fallbackHistoryUri
-        }
-      } else if (repoParam && typeof historyUrl === 'string' && historyUrl.startsWith('/info/git/HEAD/')) {
-        historyUrl = buildHistoryUrl(repoParam)
-      }
+      historyUrl = resolveHistoryUrl(repoParam, repoData, historyUrl)
 
       if (!repoName) {
         if (repoParam) {

package/server/views/shell.ejs

@@ -1407,6 +1407,16 @@ document.addEventListener("DOMContentLoaded", async () => {
           }
           return urls
         }
+        const getClipboardPlainText = (clipboardData) => {
+          if (!clipboardData || typeof clipboardData.getData !== "function") {
+            return ""
+          }
+          try {
+            return clipboardData.getData("text/plain") || ""
+          } catch (_) {
+            return ""
+          }
+        }
         const isLikelyImagePaste = (clipboardData) => {
           if (!clipboardData) {
             return false
@@ -1498,6 +1508,8 @@ document.addEventListener("DOMContentLoaded", async () => {
         })
         terminalContainer.addEventListener("paste", async (event) => {
           const clipboard = event && event.clipboardData ? event.clipboardData : null
+          const plainText = getClipboardPlainText(clipboard)
+          const hasPlainText = typeof plainText === "string" && plainText.trim().length > 0
           const { files: directFiles, hasFileFlavor } = collectClipboardFiles(clipboard)
           let files = directFiles
           let remoteUrls = []
@@ -1511,9 +1523,11 @@ document.addEventListener("DOMContentLoaded", async () => {
             files: files.map((file) => ({ name: file.name, size: file.size, type: file.type })),
             remoteUrls,
             hasFileFlavor,
+            hasPlainText,
             types: clipboard ? Array.from(clipboard.types || []) : []
           })
-          if (files.length === 0 && remoteUrls.length === 0) {
+          const shouldHandleUpload = files.length > 0 || (remoteUrls.length > 0 && !hasPlainText)
+          if (!shouldHandleUpload) {
             suppressClipboardText = false
             return
           }
@@ -1521,7 +1535,7 @@ document.addEventListener("DOMContentLoaded", async () => {
           event.stopPropagation()
           suppressClipboardText = true
           try {
-            if (remoteUrls.length > 0) {
+            if (remoteUrls.length > 0 && !hasPlainText) {
               await this.uploadRemoteResources(remoteUrls, dropOverlay)
             }
             if (files.length > 0) {

package/server/views/terminal.ejs

@@ -1509,6 +1509,16 @@ document.addEventListener("DOMContentLoaded", async () => {
           }
           return urls
         }
+        const getClipboardPlainText = (clipboardData) => {
+          if (!clipboardData || typeof clipboardData.getData !== "function") {
+            return ""
+          }
+          try {
+            return clipboardData.getData("text/plain") || ""
+          } catch (_) {
+            return ""
+          }
+        }
         const isLikelyImagePaste = (clipboardData) => {
           if (!clipboardData) {
             return false
@@ -1600,6 +1610,8 @@ document.addEventListener("DOMContentLoaded", async () => {
         })
         terminalContainer.addEventListener("paste", async (event) => {
           const clipboard = event && event.clipboardData ? event.clipboardData : null
+          const plainText = getClipboardPlainText(clipboard)
+          const hasPlainText = typeof plainText === "string" && plainText.trim().length > 0
           const { files: directFiles, hasFileFlavor } = collectClipboardFiles(clipboard)
           let files = directFiles
           let remoteUrls = []
@@ -1613,9 +1625,11 @@ document.addEventListener("DOMContentLoaded", async () => {
             files: files.map((file) => ({ name: file.name, size: file.size, type: file.type })),
             remoteUrls,
             hasFileFlavor,
+            hasPlainText,
             types: clipboard ? Array.from(clipboard.types || []) : []
           })
-          if (files.length === 0 && remoteUrls.length === 0) {
+          const shouldHandleUpload = files.length > 0 || (remoteUrls.length > 0 && !hasPlainText)
+          if (!shouldHandleUpload) {
             suppressClipboardText = false
             return
           }
@@ -1623,7 +1637,7 @@ document.addEventListener("DOMContentLoaded", async () => {
           event.stopPropagation()
           suppressClipboardText = true
           try {
-            if (remoteUrls.length > 0) {
+            if (remoteUrls.length > 0 && !hasPlainText) {
               await this.uploadRemoteResources(remoteUrls, dropOverlay)
             }
             if (files.length > 0) {