pinokiod 3.207.0 → 3.209.0

package/kernel/api/terminal/index.js

@@ -137,13 +137,19 @@ class Terminal {
     }
 
     const marker = '[attachment] '
+    let shellEmitAttempted = false
+    let shellEmitSucceeded = false
     if (params && params.id && kernel && kernel.shell && typeof kernel.shell.emit === 'function') {
       try {
-        kernel.shell.emit({
+        shellEmitAttempted = true
+        shellEmitSucceeded = kernel.shell.emit({
           id: params.id,
           emit: marker,
           paste: true
-        })
+        }) === true
+        if (!shellEmitSucceeded && ondata) {
+          ondata({ raw: marker })
+        }
       } catch (error) {
         if (ondata) {
           ondata({ raw: marker })
@@ -164,7 +170,7 @@ class Terminal {
       req.params.buffers = {}
     }
 
-    return { files: saved, errors: failures }
+    return { files: saved, errors: failures, shellEmit: shellEmitSucceeded, shellEmitAttempted }
   }
 
   resolveShellInstance(params, kernel) {

package/kernel/shells.js

@@ -393,12 +393,14 @@ class Shells {
       } else {
         session.emit(params.emit)
       }
+      return true
     } else {
       const preview = typeof params.emit === 'string' ? params.emit.slice(0, 64) : ''
       console.warn('[shell.emit] missing session for id', params.id, {
         paste: !!params.paste,
         preview
       })
+      return false
     }
   }
   async send(params, ondata, enter) {

package/package.json

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

package/server/index.js

@@ -4868,7 +4868,9 @@ class Server {
         const result = await terminalApi.upload(requestPayload, () => {}, this.kernel)
         const files = result && Array.isArray(result.files) ? result.files : []
         const errors = result && Array.isArray(result.errors) ? result.errors : []
-        res.json({ files, errors })
+        const shellEmit = result && typeof result.shellEmit === 'boolean' ? result.shellEmit : false
+        const shellEmitAttempted = result && typeof result.shellEmitAttempted === 'boolean' ? result.shellEmitAttempted : false
+        res.json({ files, errors, shellEmit, shellEmitAttempted })
       } catch (error) {
         res.status(500).json({ error: error && error.message ? error.message : 'remote upload failed' })
       }

package/server/views/shell.ejs

@@ -207,6 +207,28 @@ body.dark #status-window b {
 <script>
 let shell_id
 let lastNotifiedShellId = null
+const formatUploadNotification = (files, sessionId, shellEmit, shellEmitAttempted) => {
+  if (!Array.isArray(files) || files.length === 0) {
+    return 'Upload complete (no files reported)'
+  }
+  const countLabel = files.length > 1 ? `${files.length} files attached` : 'File attached'
+  const sessionLabel = sessionId ? sessionId : '(unknown session)'
+  const summaries = files.map((file) => {
+    const name = file && (file.originalName || file.name || file.storedAs) ? (file.originalName || file.name || file.storedAs) : 'unknown'
+    const target = file && (file.cliRelativePath || file.displayPath || file.path) ? (file.cliRelativePath || file.displayPath || file.path) : ''
+    const summary = target ? `${name} → ${target}` : name
+    return summary.length > 180 ? `${summary.slice(0, 177)}…` : summary
+  })
+  let emitStatus
+  if (shellEmitAttempted) {
+    emitStatus = shellEmit ? 'Shell emit: delivered to terminal session' : 'Shell emit: failed – fallback used'
+  } else if (shellEmitAttempted === false) {
+    emitStatus = 'Shell emit: not attempted'
+  } else {
+    emitStatus = 'Shell emit: status unknown'
+  }
+  return `${countLabel}<br>Session: ${sessionLabel}<br>${emitStatus}<br>${summaries.join('<br>')}`
+}
 const postMessageToAncestors = (payload) => {
   if (!payload || typeof payload !== "object") {
     return false
@@ -932,9 +954,11 @@ document.addEventListener("DOMContentLoaded", async () => {
               reloadMemory()
             }
           } catch (_) {}
+          const shellEmit = typeof result.shellEmit === 'boolean' ? result.shellEmit : undefined
+          const shellEmitAttempted = typeof result.shellEmitAttempted === 'boolean' ? result.shellEmitAttempted : undefined
           n.Noty({
-            text: files.length > 1 ? `${files.length} files attached` : `File attached`,
-            timeout: 4000
+            text: formatUploadNotification(files, shell_id, shellEmit, shellEmitAttempted),
+            timeout: 6000
           })
         }
         if (failures.length > 0) {

package/server/views/terminal.ejs

@@ -182,6 +182,28 @@ body.frozen {
 <link href="/terminal.css" rel="stylesheet"/>
 <script>
 let shell_id
+const formatUploadNotification = (files, sessionId, shellEmit, shellEmitAttempted) => {
+  if (!Array.isArray(files) || files.length === 0) {
+    return 'Upload complete (no files reported)'
+  }
+  const countLabel = files.length > 1 ? `${files.length} files attached` : 'File attached'
+  const sessionLabel = sessionId ? sessionId : '(unknown session)'
+  const summaries = files.map((file) => {
+    const name = file && (file.originalName || file.name || file.storedAs) ? (file.originalName || file.name || file.storedAs) : 'unknown'
+    const target = file && (file.cliRelativePath || file.displayPath || file.path) ? (file.cliRelativePath || file.displayPath || file.path) : ''
+    const summary = target ? `${name} → ${target}` : name
+    return summary.length > 180 ? `${summary.slice(0, 177)}…` : summary
+  })
+  let emitStatus
+  if (shellEmitAttempted) {
+    emitStatus = shellEmit ? 'Shell emit: delivered to terminal session' : 'Shell emit: failed – fallback used'
+  } else if (shellEmitAttempted === false) {
+    emitStatus = 'Shell emit: not attempted'
+  } else {
+    emitStatus = 'Shell emit: status unknown'
+  }
+  return `${countLabel}<br>Session: ${sessionLabel}<br>${emitStatus}<br>${summaries.join('<br>')}`
+}
 Dropzone.autoDiscover = false;
 function postMessageToAncestors(payload) {
   if (!payload || typeof payload !== "object") {
@@ -785,9 +807,11 @@ document.addEventListener("DOMContentLoaded", async () => {
                   type: "terminal.upload",
                   files: mappedFiles
                 })
+                const shellEmit = packet.data && typeof packet.data.shellEmit === 'boolean' ? packet.data.shellEmit : undefined
+                const shellEmitAttempted = packet.data && typeof packet.data.shellEmitAttempted === 'boolean' ? packet.data.shellEmitAttempted : undefined
                 n.Noty({
-                  text: mappedFiles.length > 1 ? `${mappedFiles.length} files attached` : `File attached`,
-                  timeout: 4000
+                  text: formatUploadNotification(mappedFiles, shell_id, shellEmit, shellEmitAttempted),
+                  timeout: 6000
                 })
               } else {
                 refreshParent({
@@ -1029,9 +1053,11 @@ document.addEventListener("DOMContentLoaded", async () => {
               reloadMemory()
             }
           } catch (_) {}
+          const shellEmit = typeof result.shellEmit === 'boolean' ? result.shellEmit : undefined
+          const shellEmitAttempted = typeof result.shellEmitAttempted === 'boolean' ? result.shellEmitAttempted : undefined
           n.Noty({
-            text: mappedFiles.length > 1 ? `${mappedFiles.length} files attached` : `File attached`,
-            timeout: 4000
+            text: formatUploadNotification(mappedFiles, shell_id, shellEmit, shellEmitAttempted),
+            timeout: 6000
           })
         }
         if (failures.length > 0) {