pinokiod 7.2.7 → 7.2.8

package/kernel/api/index.js

@@ -11,6 +11,7 @@ const fastq = require('fastq')
 const Loader = require("../loader")
 const Environment = require("../environment")
 const Util = require('../util')
+const ShellRunTemplate = require('./shell_run_template')
 
 class Api {
   constructor(kernel) {
@@ -1010,6 +1011,7 @@ class Api {
     }
     // replace {{{ }}} with {{ }}
     rpc = this.kernel.template.flatten(rpc)
+    rpc = ShellRunTemplate.renderEnvArgs(this.kernel, rpc, memory)
 
     // 6. rpc must have method names
     if (rpc.method) {

package/kernel/api/shell_run_template.js

@@ -0,0 +1,273 @@
+function isCmdShellName(shellName) {
+  const name = (shellName || '').toLowerCase()
+  return name.includes('cmd.exe') || name === 'cmd'
+}
+
+function isPowerShellName(shellName) {
+  const name = (shellName || '').toLowerCase()
+  return name.includes('powershell') || name.includes('pwsh')
+}
+
+const ENV_ARG_MARKER_RE = /__PINOKIO_ENVARG_(\d+)__/g
+
+function envArgMarker(index) {
+  return `__PINOKIO_ENVARG_${index}__`
+}
+
+function isPinokioEnvArgKey(key) {
+  return /^PINOKIO_ARG_\d+$/.test(key || "")
+}
+
+function hasEnvArgMarker(value) {
+  ENV_ARG_MARKER_RE.lastIndex = 0
+  return ENV_ARG_MARKER_RE.test(String(value))
+}
+
+function quotePosixLiteral(value) {
+  const input = value == null ? "" : String(value)
+  return `'${input.split("'").join("'\"'\"'")}'`
+}
+
+function quotePowerShellComposite(value) {
+  const input = value == null ? "" : String(value)
+  ENV_ARG_MARKER_RE.lastIndex = 0
+  let output = '"'
+  let lastIndex = 0
+  for (const match of input.matchAll(ENV_ARG_MARKER_RE)) {
+    const literal = input.slice(lastIndex, match.index)
+    output += literal.replace(/[`"$]/g, (char) => "`" + char)
+    output += "${env:PINOKIO_ARG_" + match[1] + "}"
+    lastIndex = match.index + match[0].length
+  }
+  output += input.slice(lastIndex).replace(/[`"$]/g, (char) => "`" + char)
+  output += '"'
+  return output
+}
+
+function quoteCmdComposite(value) {
+  const input = value == null ? "" : String(value)
+  ENV_ARG_MARKER_RE.lastIndex = 0
+  let output = '"'
+  let lastIndex = 0
+  for (const match of input.matchAll(ENV_ARG_MARKER_RE)) {
+    const literal = input.slice(lastIndex, match.index)
+    output += literal.replace(/([()%!^"<>&|])/g, '^$1')
+    output += "!PINOKIO_ARG_" + match[1] + "!"
+    lastIndex = match.index + match[0].length
+  }
+  output += input.slice(lastIndex).replace(/([()%!^"<>&|])/g, '^$1')
+  output += '"'
+  return output
+}
+
+function quoteEnvArgComposite(value, shellName) {
+  const input = value == null ? "" : String(value)
+  if (isCmdShellName(shellName)) {
+    return quoteCmdComposite(input)
+  }
+  if (isPowerShellName(shellName)) {
+    return quotePowerShellComposite(input)
+  }
+
+  ENV_ARG_MARKER_RE.lastIndex = 0
+  const parts = []
+  let lastIndex = 0
+  for (const match of input.matchAll(ENV_ARG_MARKER_RE)) {
+    const literal = input.slice(lastIndex, match.index)
+    if (literal) {
+      parts.push(quotePosixLiteral(literal))
+    }
+    parts.push('"$PINOKIO_ARG_' + match[1] + '"')
+    lastIndex = match.index + match[0].length
+  }
+  const tail = input.slice(lastIndex)
+  if (tail) {
+    parts.push(quotePosixLiteral(tail))
+  }
+  return parts.length > 0 ? parts.join("") : "''"
+}
+
+function shellNameFor(kernel, params) {
+  let shellName = kernel && kernel.platform === "win32" ? "cmd.exe" : "bash"
+  if (params && typeof params.shell === "string" && params.shell.trim()) {
+    shellName = params.shell
+  }
+  return shellName
+}
+
+function isPlainObject(value) {
+  return value && value.constructor === Object
+}
+
+function hasMultiline(value) {
+  return typeof value === "string" && /[\r\n]/.test(value)
+}
+
+function isStructuredArgvMessage(value) {
+  return isPlainObject(value) && Array.isArray(value._)
+}
+
+function hasStructuredArgvMessage(value) {
+  if (isStructuredArgvMessage(value)) {
+    return true
+  }
+  if (Array.isArray(value)) {
+    return value.some((item) => isStructuredArgvMessage(item))
+  }
+  return false
+}
+
+function protectStructuredString(value, state) {
+  if (!hasMultiline(value)) {
+    return value
+  }
+  const name = `PINOKIO_ARG_${state.args.length}`
+  state.args.push({
+    name,
+    value: value == null ? "" : String(value)
+  })
+  return envArgMarker(state.args.length - 1)
+}
+
+function protectStructuredValue(value, state) {
+  if (typeof value === "string") {
+    return protectStructuredString(value, state)
+  }
+  if (Array.isArray(value)) {
+    return value.map((item) => protectStructuredValue(item, state))
+  }
+  if (isPlainObject(value)) {
+    const rendered = {}
+    for (const [key, item] of Object.entries(value)) {
+      rendered[key] = protectStructuredValue(item, state)
+    }
+    return rendered
+  }
+  return value
+}
+
+function protectStructuredMessage(value, state) {
+  if (isStructuredArgvMessage(value)) {
+    return protectStructuredValue(value, state)
+  }
+  if (Array.isArray(value)) {
+    return value.map((item) => isStructuredArgvMessage(item) ? protectStructuredValue(item, state) : item)
+  }
+  return value
+}
+
+function renderEnvArgs(kernel, rpc, memory) {
+  if (!rpc || rpc.method !== "shell.run" || !rpc.params || !hasStructuredArgvMessage(rpc.params.message)) {
+    return rpc
+  }
+
+  const shellName = shellNameFor(kernel, rpc.params)
+  const state = { args: [] }
+  const message = protectStructuredMessage(rpc.params.message, state)
+
+  if (state.args.length === 0) {
+    return rpc
+  }
+
+  const env = Object.assign({}, rpc.params.env || {})
+  for (const arg of state.args) {
+    env[arg.name] = arg.value
+  }
+
+  return {
+    ...rpc,
+    params: {
+      ...rpc.params,
+      message,
+      env,
+      _pinokio_env_args: state.args,
+      _pinokio_cmd_delayed_expansion: isCmdShellName(shellName)
+    }
+  }
+}
+
+function envArgDetails(value) {
+  const normalized = String(value == null ? "" : value)
+    .replace(/\r\n/g, "\n")
+    .replace(/\r/g, "\n")
+    .replace(/[\x00-\x08\x0B\x0C\x0E-\x1F\x7F]/g, "?")
+  const lines = normalized.split("\n")
+  const previewLines = []
+  const maxLines = 8
+  const maxChars = 800
+  let used = 0
+
+  for (const line of lines.slice(0, maxLines)) {
+    const remaining = maxChars - used
+    if (remaining <= 0) {
+      break
+    }
+    if (line.length > remaining) {
+      previewLines.push(line.slice(0, remaining) + "...")
+      used = maxChars
+      break
+    }
+    previewLines.push(line)
+    used += line.length + 1
+  }
+
+  const preview = previewLines.join("\n")
+  const truncated = lines.length > previewLines.length || normalized.length > preview.length
+  if (truncated && previewLines[previewLines.length - 1] !== "...") {
+    previewLines.push("...")
+  }
+
+  return {
+    lineCount: normalized.length === 0 ? 0 : lines.length,
+    previewLines,
+    truncated
+  }
+}
+
+function formatEnvArgsPreview(args) {
+  if (!Array.isArray(args) || args.length === 0) {
+    return ""
+  }
+  const lines = ["\r\nPinokio shell args", ""]
+  for (const arg of args) {
+    const details = envArgDetails(arg.value)
+    lines.push(`${arg.name}  ${details.lineCount} lines`)
+    for (const previewLine of details.previewLines) {
+      lines.push(`  ${previewLine}`)
+    }
+    lines.push("")
+  }
+  return lines.join("\r\n") + "\r\n"
+}
+
+function envArgSummary(value) {
+  const details = envArgDetails(value)
+  return {
+    type: "pinokio env arg",
+    lines: details.lineCount,
+    preview: details.previewLines.join("\n"),
+    truncated: details.truncated
+  }
+}
+
+function redactEnvArgs(env) {
+  if (!env || typeof env !== "object") {
+    return env
+  }
+  const redacted = { ...env }
+  for (const key of Object.keys(redacted)) {
+    if (isPinokioEnvArgKey(key)) {
+      redacted[key] = envArgSummary(redacted[key])
+    }
+  }
+  return redacted
+}
+
+module.exports = {
+  renderEnvArgs,
+  quoteEnvArgComposite,
+  hasEnvArgMarker,
+  isPinokioEnvArgKey,
+  formatEnvArgsPreview,
+  redactEnvArgs
+}

package/kernel/shell.js

@@ -20,6 +20,7 @@ const { applyWindowsNodePackageManagerEnv } = require('./windows_node_package_ma
 const ShellParser = require('./shell_parser')
 const AnsiStreamTracker = require('./ansi_stream_tracker')
 const ShellStateSync = require('./shell_state_sync')
+const ShellRunTemplate = require('./api/shell_run_template')
 const home = os.homedir()
 
 function normalizeComparablePath(filePath, platform) {
@@ -308,7 +309,7 @@ class Shell {
         delete this.env[key]
       }
       let val = this.env[key]
-      if (/[\r\n]/.test(val)) {
+      if (!ShellRunTemplate.isPinokioEnvArgKey(key) && /[\r\n]/.test(val)) {
         const replaced = val.replaceAll(/[\r\n]+/g, ' ');
         this.env[key] = replaced
 //        delete this.env[key]
@@ -362,6 +363,9 @@ class Shell {
   }
   quoteArgForShell(value, shellName=this.shell) {
     const input = value == null ? "" : String(value)
+    if (ShellRunTemplate.hasEnvArgMarker(input)) {
+      return ShellRunTemplate.quoteEnvArgComposite(input, shellName)
+    }
     if (this.isCmdShell(shellName)) {
       return `"${input.replace(/([()%!^"<>&|])/g, '^$1')}"`
     }
@@ -409,6 +413,7 @@ class Shell {
     this.userActive = false
     this.decsyncBuffer = ''
     this.stateSync.reset()
+    this.envArgsPreviewed = false
 
     /*
       params := {
@@ -540,6 +545,9 @@ class Shell {
         //}
       }
     }
+    if (params._pinokio_cmd_delayed_expansion && this.isCmdShell(this.shell) && !this.args.includes("/V:ON")) {
+      this.args.push("/V:ON")
+    }
 
     // 3. path => path can be http, relative, absolute
     this.path = params.path
@@ -757,6 +765,16 @@ class Shell {
     }
     this.stateSync.invalidate({ clearTail: true })
   }
+  emitEnvArgsPreview(params) {
+    if (!params || !Array.isArray(params._pinokio_env_args) || params._pinokio_env_args.length === 0 || this.envArgsPreviewed) {
+      return
+    }
+    this.envArgsPreviewed = true
+    const raw = ShellRunTemplate.formatEnvArgsPreview(params._pinokio_env_args)
+    if (raw && this.ondata) {
+      this.ondata({ raw })
+    }
+  }
   async run(params, cb) {
     let r = await this.request(params, cb)
     return r
@@ -1362,6 +1380,7 @@ class Shell {
   }
   async exec(params) {
     this.parser = new ShellParser()
+    this.emitEnvArgsPreview(params)
     params = await this.activate(params)
     this.cmd = this.build(params)
     let res = await new Promise((resolve, reject) => {
@@ -1729,7 +1748,7 @@ class Shell {
       cmd: this.cmd,
       index: this.index,
       group: this.group,
-      env: this.env,
+      env: ShellRunTemplate.redactEnvArgs(this.env),
       done: this.done,
       ready: this.ready,
       id: this.id,

package/package.json

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

package/server/index.js

@@ -28,6 +28,8 @@ const system = require('systeminformation')
 const serveIndex = require('./serveIndex')
 const registerFileRoutes = require('./routes/files')
 const registerAppRoutes = require('./routes/apps')
+const registerWorkspacesRoutes = require('./routes/workspaces')
+const registerDraftImportRoutes = require('./routes/draft_import')
 const Git = require("../kernel/git")
 const TerminalApi = require('../kernel/api/terminal')
 
@@ -78,6 +80,9 @@ const { createDesktopEventRouter } = require("./lib/desktop_event_router")
 const { createInjectRouter, resolveInjectList } = require("./lib/inject_router")
 const { createTaskPackageService } = require("./lib/task_packages")
 const { createTaskWorkspaceLinkService } = require("./lib/task_workspace_links")
+const { createDraftService } = require("./lib/drafts")
+const { createWorkspaceRuntimeService } = require("./lib/workspace_runtime")
+const { createWorkspaceCatalogService } = require("./lib/workspace_catalog")
 const { createContentValidationService } = require("./lib/content_validation")
 const { buildSecureRouterDebugSnapshot, createSecureRouterDebugStore } = require("./lib/secure_router_debug")
 const AppRegistryService = require("./lib/app_registry")
@@ -8403,6 +8408,35 @@ class Server {
     const taskWorkspaceLinks = createTaskWorkspaceLinkService({
       kernel: this.kernel
     })
+    const workspaceRuntime = createWorkspaceRuntimeService({
+      kernel: this.kernel
+    })
+    this.workspaceRuntime = workspaceRuntime
+    const drafts = createDraftService({
+      kernel: this.kernel,
+      taskWorkspaceLinks
+    })
+    this.drafts = drafts
+    const workspaceCatalog = createWorkspaceCatalogService({
+      kernel: this.kernel,
+      workspaceRuntime,
+      drafts
+    })
+    drafts.start().catch((error) => {
+      console.warn("[drafts] failed to start", error && error.message ? error.message : error)
+    })
+    registerDraftImportRoutes(this.app, {
+      drafts,
+      defaultRegistryUrl: DEFAULT_REGISTRY_URL
+    })
+    registerWorkspacesRoutes(this.app, {
+      workspaceCatalog,
+      composePeerAccessPayload: () => this.composePeerAccessPayload(),
+      getTheme: () => this.theme,
+      getPeers: () => this.getPeers(),
+      getCurrentHost: () => this.kernel.peer.host,
+      getPortal: () => this.portal
+    })
     const TASK_INPUT_NAME_PATTERN = /^[a-zA-Z0-9_][a-zA-Z0-9_.-]*$/
     const suggestTaskFolderName = async (rootDir, preferredName) => {
       const normalizedRoot = path.resolve(rootDir)
@@ -9836,6 +9870,9 @@ class Server {
           }
           try {
             await taskWorkspaceLinks.touchTaskWorkspace(task.id, workspaceRef)
+            drafts.trackWorkspace({ taskId: task.id, ref: workspaceRef }).catch((error) => {
+              console.warn("[drafts] failed to track workspace", error && error.message ? error.message : error)
+            })
           } catch (error) {
             await taskPackages.deleteTaskPackage(task.id).catch(() => {})
             throw error
@@ -10179,6 +10216,9 @@ class Server {
 	        }
 	        try {
 	          await taskWorkspaceLinks.touchTaskWorkspace(task.id, workspaceRef)
+	          drafts.trackWorkspace({ taskId: task.id, ref: workspaceRef }).catch((error) => {
+	            console.warn("[drafts] failed to track workspace", error && error.message ? error.message : error)
+	          })
 	        } catch (error) {
 	          await renderTaskLaunchPage(req, res, task, {
 	            selectedTool,
@@ -10198,6 +10238,20 @@ class Server {
     })
     this.app.post("/task/start", handleTaskStartRequest)
 
+    this.app.get("/drafts", ex(async (req, res) => {
+      const cwd = typeof req.query.cwd === "string" ? req.query.cwd : ""
+      const items = await drafts.listPending({ cwd })
+      res.json({
+        ok: true,
+        items
+      })
+    }))
+
+    this.app.post("/drafts/:id/dismiss", ex(async (req, res) => {
+      const ok = await drafts.dismiss(req.params.id)
+      res.json({ ok })
+    }))
+
     this.app.get("/home", renderHomePage)
 
     const normalizePathForComparison = (value) => {
@@ -10594,6 +10648,9 @@ class Server {
 	        }
 
 	        await taskWorkspaceLinks.touchTaskWorkspace(task.id, workspaceRef)
+	        drafts.trackWorkspace({ taskId: task.id, ref: workspaceRef }).catch((error) => {
+	          console.warn("[drafts] failed to track workspace", error && error.message ? error.message : error)
+	        })
 
         const params = new URLSearchParams()
         params.set("cwd", targetPath)
@@ -11851,11 +11908,14 @@ class Server {
         // but allow it when the request originates from the local machine
         if (payload.audience === 'device' && typeof payload.device_id === 'string' && payload.device_id) {
           try {
-            if (this.socket && typeof this.socket.isLocalDevice === 'function') {
-              payload.host = !!this.socket.isLocalDevice(payload.device_id)
-            } else {
-              payload.host = false
-            }
+            const remoteAddress = req.socket && req.socket.remoteAddress ? req.socket.remoteAddress : req.ip
+            const isLocalRequest = this.socket && typeof this.socket.isLocalAddress === 'function'
+              ? this.socket.isLocalAddress(remoteAddress)
+              : false
+            const isLocalDevice = this.socket && typeof this.socket.isLocalDevice === 'function'
+              ? this.socket.isLocalDevice(payload.device_id)
+              : false
+            payload.host = !!(isLocalRequest || isLocalDevice)
           } catch (_) {
             payload.host = false
           }