pinokiod 7.5.41 → 7.5.42

package/package.json

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

package/server/index.js

@@ -15991,12 +15991,21 @@ class Server {
         }
         return
       }
-      const redactionOverridesRequested = Boolean(req.body && Object.prototype.hasOwnProperty.call(req.body, 'redacted_overrides'))
+      const reviewedArchiveRequested = Boolean(req.body && (
+        Object.prototype.hasOwnProperty.call(req.body, 'redacted_overrides') ||
+        Object.prototype.hasOwnProperty.call(req.body, 'excluded_paths')
+      ))
+      const allowPartialOverrides = Boolean(req.body && (
+        req.body.allow_partial_overrides === true ||
+        req.body.allow_partial_overrides === 'true'
+      ))
       let redactionOverrides = []
+      let redactionExclusions = []
       try {
         redactionOverrides = logRedaction.normalizeLogRedactionOverrides(req.body || {})
+        redactionExclusions = logRedaction.normalizeLogRedactionExclusions(req.body || {})
       } catch (error) {
-        res.status(400).json({ error: error && error.message ? error.message : 'Invalid redaction overrides' })
+        res.status(400).json({ error: error && error.message ? error.message : 'Invalid redaction request' })
         return
       }
 
@@ -16014,22 +16023,26 @@ class Server {
 
       let folder = this.kernel.path("exported_logs")
       let zipPath = this.kernel.path("logs.zip")
-      if (redactionOverridesRequested) {
+      if (reviewedArchiveRequested) {
         await fs.promises.rm(zipPath, { force: true }).catch(() => {})
       }
       let appliedRedactionOverrides = 0
+      let appliedRedactionExclusions = 0
       try {
-        if (redactionOverridesRequested) {
-          await logRedaction.assertCompleteLogRedactionOverrides(folder, redactionOverrides)
+        if (reviewedArchiveRequested) {
+          await logRedaction.assertCompleteLogRedactionOverrides(folder, redactionOverrides, redactionExclusions, {
+            requireComplete: !allowPartialOverrides
+          })
         }
+        appliedRedactionExclusions = await logRedaction.applyLogRedactionExclusions(folder, redactionExclusions)
         appliedRedactionOverrides = await logRedaction.applyLogRedactionOverrides(folder, redactionOverrides)
       } catch (error) {
-        res.status(400).json({ error: error && error.message ? error.message : 'Failed to apply redaction overrides' })
+        res.status(400).json({ error: error && error.message ? error.message : 'Failed to apply redaction request' })
         return
       }
       await fs.promises.rm(zipPath, { force: true }).catch(() => {})
       await compressing.zip.compressDir(folder, zipPath)
-      res.json({ success: true, download: '/pinokio/logs.zip', redacted_overrides: appliedRedactionOverrides })
+      res.json({ success: true, download: '/pinokio/logs.zip', redacted_overrides: appliedRedactionOverrides, excluded_paths: appliedRedactionExclusions })
     }))
     this.app.get("/pinokio/version", ex(async (req, res) => {
       let version = this.version

package/server/lib/log_redaction.js

@@ -5,6 +5,7 @@ const { isBinaryFile } = require('isbinaryfile')
 const LOG_REDACTION_FILE_MAX_BYTES = 2 * 1024 * 1024
 const LOG_REDACTION_OVERRIDE_MAX_BYTES = 8 * 1024 * 1024
 const LOG_REDACTION_TEXT_EXTENSIONS = new Set(['.json', '.log', '.txt'])
+const LOG_REDACTION_TAIL_LINE_COUNTS = new Set([500, 1000, 2000])
 const CADDY_LOG_PATTERN = /^caddy(?:-.+)?\.log$/i
 
 function isTopLevelRedactableLogPath(relativePath = '') {
@@ -21,8 +22,84 @@ function isTopLevelRedactableLogPath(relativePath = '') {
   return LOG_REDACTION_TEXT_EXTENSIONS.has(path.extname(value).toLowerCase())
 }
 
+function normalizeTailLineCount(value) {
+  const parsed = Number.parseInt(String(value || ''), 10)
+  return LOG_REDACTION_TAIL_LINE_COUNTS.has(parsed) ? parsed : 0
+}
+
+async function readTailTextFile(filePath, stats, tailLines) {
+  const readBytes = Math.min(stats.size, LOG_REDACTION_FILE_MAX_BYTES - 2048)
+  const start = Math.max(0, stats.size - readBytes)
+  const buffer = Buffer.alloc(readBytes)
+  const handle = await fs.promises.open(filePath, 'r')
+  let bytesRead = 0
+  try {
+    const result = await handle.read(buffer, 0, readBytes, start)
+    bytesRead = result.bytesRead
+  } finally {
+    await handle.close()
+  }
+  let text = buffer.slice(0, bytesRead).toString('utf8')
+  if (start > 0) {
+    const firstNewline = text.indexOf('\n')
+    if (firstNewline >= 0) {
+      text = text.slice(firstNewline + 1)
+    }
+  }
+  const lines = text.split(/\r?\n/)
+  const selected = lines.length > tailLines ? lines.slice(-tailLines) : lines
+  const omittedLines = Math.max(0, lines.length - selected.length)
+  const prefix = start > 0 || omittedLines > 0
+    ? `[Older log content omitted by user. Showing the last ${tailLines.toLocaleString()} lines.]\n`
+    : ''
+  return {
+    text: `${prefix}${selected.join('\n')}`,
+    truncated: start > 0 || omittedLines > 0,
+    included_lines: selected.length
+  }
+}
+
+function clonePlainObject(value) {
+  return value && typeof value === 'object' && !Array.isArray(value)
+    ? { ...value }
+    : {}
+}
+
+function createRuntimeEnvSnapshot(kernel) {
+  const baseEnv = {
+    ...clonePlainObject(process.env),
+    ...clonePlainObject(kernel && kernel.envs)
+  }
+  if (kernel && kernel.bin && typeof kernel.bin.envs === 'function') {
+    try {
+      return clonePlainObject(kernel.bin.envs(baseEnv))
+    } catch (_) {}
+  }
+  return baseEnv
+}
+
+function createFallbackStateSnapshot(kernel) {
+  const env = createRuntimeEnvSnapshot(kernel)
+  if (Object.keys(env).length === 0) {
+    return null
+  }
+  return {
+    state: 'snapshot',
+    id: 'runtime-environment',
+    group: 'system',
+    env,
+    path: kernel && kernel.homedir,
+    cmd: 'pinokio environment snapshot',
+    done: true,
+    ready: true
+  }
+}
+
 function createCurrentLogSnapshot(kernel, version) {
-  const states = kernel.shell.shells.map((s) => {
+  const liveShells = kernel && kernel.shell && Array.isArray(kernel.shell.shells)
+    ? kernel.shell.shells
+    : []
+  const states = liveShells.map((s) => {
     return {
       state: s.state,
       id: s.id,
@@ -34,6 +111,12 @@ function createCurrentLogSnapshot(kernel, version) {
       ready: s.ready,
     }
   })
+  if (states.length === 0) {
+    const fallbackState = createFallbackStateSnapshot(kernel)
+    if (fallbackState) {
+      states.push(fallbackState)
+    }
+  }
 
   const info = {
     platform: kernel.platform,
@@ -104,12 +187,45 @@ function normalizeLogRedactionOverrides(body = {}) {
   return overrides
 }
 
-async function assertCompleteLogRedactionOverrides(exportRoot, overrides = []) {
+function normalizeLogRedactionExclusions(body = {}) {
+  if (!body || !Object.prototype.hasOwnProperty.call(body, 'excluded_paths')) {
+    return []
+  }
+  const source = body.excluded_paths
+  if (!Array.isArray(source)) {
+    throw new Error('excluded_paths must be an array')
+  }
+  const exclusions = []
+  const seen = new Set()
+  for (const candidate of source) {
+    const relativePath = typeof candidate === 'string' ? candidate.trim() : ''
+    if (!isTopLevelRedactableLogPath(relativePath)) {
+      throw new Error(`Invalid excluded path: ${relativePath || '(empty)'}`)
+    }
+    if (seen.has(relativePath)) {
+      throw new Error(`Duplicate excluded path: ${relativePath}`)
+    }
+    seen.add(relativePath)
+    exclusions.push(relativePath)
+  }
+  return exclusions
+}
+
+async function assertCompleteLogRedactionOverrides(exportRoot, overrides = [], exclusions = [], options = {}) {
   const overridePaths = new Set((Array.isArray(overrides) ? overrides : []).map((override) => override && override.path).filter(Boolean))
+  const excludedPaths = new Set(Array.isArray(exclusions) ? exclusions.filter(Boolean) : [])
+  for (const excludedPath of excludedPaths) {
+    if (overridePaths.has(excludedPath)) {
+      throw new Error(`File cannot be both redacted and excluded: ${excludedPath}`)
+    }
+  }
+  if (options && options.requireComplete === false) {
+    return
+  }
   const missing = []
   const entries = await fs.promises.readdir(exportRoot, { withFileTypes: true })
   for (const entry of entries) {
-    if (entry.isFile() && isTopLevelRedactableLogPath(entry.name) && !overridePaths.has(entry.name)) {
+    if (entry.isFile() && isTopLevelRedactableLogPath(entry.name) && !overridePaths.has(entry.name) && !excludedPaths.has(entry.name)) {
       missing.push(entry.name)
     }
   }
@@ -119,6 +235,35 @@ async function assertCompleteLogRedactionOverrides(exportRoot, overrides = []) {
   }
 }
 
+async function applyLogRedactionExclusions(exportRoot, exclusions = []) {
+  if (!Array.isArray(exclusions) || exclusions.length === 0) {
+    return 0
+  }
+  let removed = 0
+  for (const relativePath of exclusions) {
+    if (!isTopLevelRedactableLogPath(relativePath)) {
+      throw new Error(`Invalid excluded path: ${relativePath || '(empty)'}`)
+    }
+    const target = path.resolve(exportRoot, relativePath)
+    const relative = path.relative(exportRoot, target)
+    if (!relative || relative.startsWith('..') || path.isAbsolute(relative) || relative.includes(path.sep)) {
+      throw new Error(`Invalid excluded path: ${relativePath}`)
+    }
+    let stats
+    try {
+      stats = await fs.promises.stat(target)
+    } catch (_) {
+      throw new Error(`Excluded path target not found: ${relativePath}`)
+    }
+    if (!stats.isFile()) {
+      throw new Error(`Excluded path target is not a file: ${relativePath}`)
+    }
+    await fs.promises.rm(target, { force: true })
+    removed += 1
+  }
+  return removed
+}
+
 async function applyLogRedactionOverrides(exportRoot, overrides = []) {
   if (!Array.isArray(overrides) || overrides.length === 0) {
     return 0
@@ -215,6 +360,7 @@ function createTopLevelLogFileHandler(server) {
       res.status(400).json({ error: 'Only top-level text log files can be read for redaction' })
       return
     }
+    const tailLines = normalizeTailLineCount(req.query.tail_lines || req.query.lines)
     let stats
     try {
       stats = await fs.promises.stat(descriptor.absolutePath)
@@ -226,7 +372,7 @@ function createTopLevelLogFileHandler(server) {
       res.status(400).json({ error: 'Path is not a file' })
       return
     }
-    if (stats.size > LOG_REDACTION_FILE_MAX_BYTES) {
+    if (stats.size > LOG_REDACTION_FILE_MAX_BYTES && !tailLines) {
       res.status(413).json({
         error: 'File is too large to redact in the browser',
         size: stats.size,
@@ -242,8 +388,14 @@ function createTopLevelLogFileHandler(server) {
       }
     } catch (_) {}
     let text
+    let tail = null
     try {
-      text = await fs.promises.readFile(descriptor.absolutePath, 'utf8')
+      if (tailLines) {
+        tail = await readTailTextFile(descriptor.absolutePath, stats, tailLines)
+        text = tail.text
+      } else {
+        text = await fs.promises.readFile(descriptor.absolutePath, 'utf8')
+      }
     } catch (error) {
       res.status(500).json({ error: 'Failed to read file', detail: error.message })
       return
@@ -254,6 +406,9 @@ function createTopLevelLogFileHandler(server) {
       name: path.basename(relativePath),
       size: stats.size,
       modified: stats.mtime,
+      tail_lines: tailLines || null,
+      truncated: tail ? tail.truncated : false,
+      included_lines: tail ? tail.included_lines : null,
       text
     })
   }
@@ -262,10 +417,13 @@ function createTopLevelLogFileHandler(server) {
 module.exports = {
   LOG_REDACTION_FILE_MAX_BYTES,
   isTopLevelRedactableLogPath,
+  normalizeTailLineCount,
   createCurrentLogSnapshot,
   writeCurrentLogSnapshot,
   normalizeLogRedactionOverrides,
+  normalizeLogRedactionExclusions,
   assertCompleteLogRedactionOverrides,
+  applyLogRedactionExclusions,
   applyLogRedactionOverrides,
   createLogRedactionBodyParser,
   createLogRedactionBodyParsers,

package/server/public/logs-top-redaction.css

@@ -19,39 +19,6 @@ body.dark .logs-redact-button:focus-visible {
   border-color: rgba(96, 165, 250, 0.34);
   background: rgba(96, 165, 250, 0.14);
 }
-.logs-redaction-chip {
-  border: 1px solid rgba(28, 96, 186, 0.18);
-  border-radius: 999px;
-  min-height: 26px;
-  padding: 0 9px;
-  display: inline-flex;
-  align-items: center;
-  justify-content: center;
-  gap: 6px;
-  background: rgba(28, 96, 186, 0.055);
-  color: #174a8b;
-  font-size: 10px;
-  line-height: 1;
-  font-weight: 760;
-  cursor: pointer;
-  white-space: nowrap;
-}
-.logs-redaction-chip:hover,
-.logs-redaction-chip:focus-visible {
-  border-color: rgba(28, 96, 186, 0.32);
-  background: rgba(28, 96, 186, 0.1);
-  outline: none;
-}
-body.dark .logs-redaction-chip {
-  border-color: rgba(96, 165, 250, 0.2);
-  background: rgba(96, 165, 250, 0.08);
-  color: #bfdbfe;
-}
-body.dark .logs-redaction-chip:hover,
-body.dark .logs-redaction-chip:focus-visible {
-  border-color: rgba(96, 165, 250, 0.32);
-  background: rgba(96, 165, 250, 0.13);
-}
 body.dark .logs-report-status.is-error {
   color: #ff8373;
 }
@@ -81,18 +48,29 @@ body.dark .logs-report-status.is-error {
   justify-content: space-between;
   gap: 10px;
 }
+.logs-top-redaction-header-actions {
+  display: inline-flex;
+  align-items: center;
+  justify-content: flex-end;
+  gap: 6px;
+  flex: 0 0 auto;
+}
+.logs-top-redaction-header-actions .logs-icon-button.is-busy i {
+  animation: spin 1s linear infinite;
+}
 .logs-top-redaction-files {
   display: flex;
   flex-direction: column;
   gap: 6px;
   margin-top: 10px;
-  max-height: 176px;
+  max-height: 244px;
   overflow: auto;
 }
 .logs-top-redaction-file {
   display: grid;
-  grid-template-columns: minmax(0, 1fr);
-  align-items: center;
+  grid-template-columns: minmax(0, 1fr) auto;
+  align-items: start;
+  gap: 8px;
   border: 1px solid transparent;
   border-radius: 7px;
   padding: 7px 8px;
@@ -101,6 +79,10 @@ body.dark .logs-report-status.is-error {
   cursor: pointer;
   text-align: left;
 }
+.logs-top-redaction-file.is-warning {
+  border-color: rgba(186, 133, 28, 0.2);
+  background: rgba(186, 133, 28, 0.055);
+}
 .logs-top-redaction-file:hover,
 .logs-top-redaction-file.is-active {
   border-color: var(--logs-border-strong);
@@ -133,10 +115,76 @@ body.dark .logs-top-redaction-file {
   font-size: 10px;
   line-height: 1.2;
 }
-.logs-top-redaction-note {
+.logs-top-redaction-file-badge {
+  display: inline-flex;
+  align-items: center;
+  border-radius: 999px;
+  padding: 2px 6px;
+  background: rgba(186, 133, 28, 0.11);
+  color: #7a5413;
+  font-size: 9px;
+  line-height: 1.2;
+  font-weight: 800;
+  white-space: nowrap;
+}
+body.dark .logs-top-redaction-file-badge {
+  background: rgba(245, 189, 75, 0.12);
+  color: #e1b261;
+}
+.logs-top-redaction-mode {
+  grid-column: 1 / -1;
+  width: 100%;
+  min-width: 0;
+  min-height: 26px;
+  box-sizing: border-box;
+  border: 1px solid var(--logs-border);
+  border-radius: 6px;
+  padding: 0 7px;
+  background: var(--logs-bg);
+  color: var(--logs-text);
+  font-size: 10px;
+  font-weight: 700;
+}
+.logs-top-redaction-mode:focus-visible {
+  border-color: var(--logs-border-strong);
+  outline: none;
+}
+.logs-top-redaction-mode:disabled {
+  opacity: 0.7;
+  cursor: not-allowed;
+}
+.logs-top-redaction-footer {
   flex: 0 0 auto;
+  min-width: 0;
   border-top: 1px solid var(--logs-border);
   padding: 10px 12px;
+  display: block;
+  overflow: hidden;
+}
+.logs-top-redaction-actions {
+  display: grid;
+  grid-template-columns: repeat(2, minmax(0, 1fr));
+  gap: 6px;
+  align-items: stretch;
+  min-width: 0;
+}
+.logs-top-redaction-actions .logs-primary-button,
+.logs-top-redaction-actions .logs-secondary-button,
+.logs-top-redaction-actions .logs-flat-button {
+  box-sizing: border-box;
+  width: 100%;
+  min-width: 0;
+  max-width: 100%;
+}
+.logs-top-redaction-actions #logs-download-archive {
+  grid-column: 1 / -1;
+}
+.logs-top-redaction-footer .logs-zip-status {
+  display: block;
+  width: 100%;
+  box-sizing: border-box;
+  margin-top: 8px;
+  text-align: left;
   color: var(--logs-muted);
   font-size: 11px;
   line-height: 1.35;