pinokiod 7.2.17 → 7.3.0

package/server/index.js

@@ -28,8 +28,6 @@ const system = require('systeminformation')
 const serveIndex = require('./serveIndex')
 const registerFileRoutes = require('./routes/files')
 const registerAppRoutes = require('./routes/apps')
-const registerWorkspacesRoutes = require('./routes/workspaces')
-const { mountFeatures } = require('./features')
 const Git = require("../kernel/git")
 const TerminalApi = require('../kernel/api/terminal')
 
@@ -78,11 +76,8 @@ const { createLauncherInstructionBootstrap } = require("./lib/launcher_instructi
 const { createTerminalGitResetHandler } = require("./lib/terminal_git_reset")
 const { createDesktopEventRouter } = require("./lib/desktop_event_router")
 const { createInjectRouter, resolveInjectList } = require("./lib/inject_router")
-const PluginSources = require("../kernel/plugin_sources")
 const { createTaskPackageService } = require("./lib/task_packages")
 const { createTaskWorkspaceLinkService } = require("./lib/task_workspace_links")
-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")
@@ -496,12 +491,14 @@ class Server {
                 assignProjectSlug(obj)
                 running_dynamic.push(obj)
               }
-            } else if (PluginSources.isRunPath(href)) {
-              let filepath = PluginSources.resolveRunPath(this.kernel, href)
+            } else if (href.startsWith("/run")) {
+              let uri_path = new URL("http://localhost" + href).pathname
+              let _filepath = uri_path.split("/").filter(x=>x).slice(1)
+              let filepath = this.kernel.path(..._filepath)
               let id = `${filepath}?cwd=${cwd}`
               obj.script_id = id
               //if (this.kernel.api.running[filepath]) {
-              if (PluginSources.pluginSelectionMatches(obj.src, selected_query && selected_query.plugin)) {
+              if (obj.src.startsWith("/run" + selected_query.plugin)) {
                 obj.running = true
                 obj.display = "indent"
                 obj.default = true
@@ -2396,10 +2393,8 @@ class Server {
       filepath = full_filepath
     }
 
-    if ((req.action || PluginSources.isRunPath(req.originalUrl)) && this.contentValidation) {
-      const validation = await this.contentValidation.validateRunPath(pathComponents, {
-        system: req.pinokioSystem === true,
-      })
+    if ((req.action || req.originalUrl.startsWith("/run/")) && this.contentValidation) {
+      const validation = await this.contentValidation.validateRunPath(pathComponents)
       if (validation && !validation.valid) {
         await this.renderInvalidContentPage(req, res, validation, {
           sidebarSelected: validation.type === "plugin" ? "plugins" : validation.type === "task" ? "tasks" : "home",
@@ -2870,27 +2865,11 @@ class Server {
           const protectionPreference = protectionAppId && this.appPreferences && typeof this.appPreferences.getPreference === "function"
             ? await this.appPreferences.getPreference(protectionAppId)
             : null
-          const draftWatchEnabled = this.kernel.watch && typeof this.kernel.watch.hasHandler === "function"
-            ? this.kernel.watch.hasHandler(resolved, "draft")
-            : false
-          const draftWatchCwd = draftWatchEnabled
-            ? (req.query.cwd || path.dirname(filepath))
-            : ""
-          const activeProcessWait = this.kernel.activeProcessWaits && this.kernel.activeProcessWaits[filepath]
-            ? this.kernel.activeProcessWaits[filepath]
-            : null
           const result = {
             portal: this.portal,
             projectName: (pathComponents.length > 0 ? pathComponents[0] : ''),
             protection_app_id: protectionAppId,
             protection_enabled: protectionPreference ? protectionPreference.protection_enabled !== false : false,
-            draft_watch_enabled: draftWatchEnabled,
-            draft_watch_cwd: draftWatchCwd,
-            active_process_wait: activeProcessWait ? {
-              title: activeProcessWait.title,
-              description: activeProcessWait.description,
-              message: activeProcessWait.message
-            } : null,
             kill_message,
             callback,
             callback_target,
@@ -2905,7 +2884,6 @@ class Server {
             //run: true,    // run mode by default
             run: (req.query && req.query.mode === "source" ? false : true),
             stop: (req.query && req.query.stop ? true : false),
-            readonly: req.pinokioSystem === true,
             pinokioPath,
             action: actionKey,
             runnable,
@@ -3122,7 +3100,6 @@ class Server {
       if (pathComponents.length === 0) {
         const normalizedApiRoot = path.normalize(this.kernel.path("api"))
         const normalizedPluginRoot = path.normalize(this.kernel.path("plugin"))
-        const normalizedSystemPluginRoot = path.normalize(PluginSources.systemPluginRoot(this.kernel))
         const isPathWithinRoot = (candidatePath, rootPath) => {
           if (typeof candidatePath !== "string" || typeof rootPath !== "string") {
             return false
@@ -3148,9 +3125,6 @@ class Server {
           if (isPathWithinRoot(normalizedCandidate, normalizedPluginRoot)) {
             return true
           }
-          if (isPathWithinRoot(normalizedCandidate, normalizedSystemPluginRoot)) {
-            return true
-          }
           const relativeToApiRoot = path.relative(normalizedApiRoot, normalizedCandidate)
           if (!relativeToApiRoot || relativeToApiRoot.startsWith("..") || path.isAbsolute(relativeToApiRoot)) {
             return false
@@ -3964,7 +3938,8 @@ class Server {
           if (menuitem.href.startsWith("http")) {
             menuitem.src = menuitem.href
           } else if (menuitem.href.startsWith("/")) {
-            if (PluginSources.isRunPath(menuitem.href)) {
+            let run_path = "/run"
+            if (menuitem.href.startsWith(run_path)) {
               menuitem.src = menuitem.href
 //              u = new URL("http://localhost" + menuitem.href.slice(run_path.length))
 //              cwd = u.searchParams.get("cwd")
@@ -3984,14 +3959,7 @@ class Server {
           }
 
           // check running
-          let srcPathname = menuitem.src
-          try {
-            srcPathname = new URL("http://localhost" + menuitem.src).pathname
-          } catch (_) {
-          }
-          let fullpath = PluginSources.isRunPath(srcPathname)
-            ? PluginSources.resolveRunPath(this.kernel, srcPathname)
-            : this.kernel.path(srcPathname.slice(1))
+          let fullpath = this.kernel.path(menuitem.src.slice(1))
           let relpath = path.relative(this.kernel.homedir, fullpath)
           if (relpath.startsWith("api")) {
             // api script
@@ -5705,6 +5673,7 @@ class Server {
       "prototype/PTERM.md",
     ]
     const managedRefreshTargets = [
+      "plugin/code",
       "prototype/system",
       "network/system",
       "prototype/PINOKIO.md",
@@ -5726,16 +5695,6 @@ class Server {
 
         needsManagedRefresh = true
         console.log("[TRY] Updating to the new version")
-        let envPath = path.resolve(home, "ENVIRONMENT")
-        let envExists = await this.kernel.exists(envPath)
-        if (!envExists) {
-          let str = await Environment.ENV("system", home, this.kernel)
-          await fs.promises.writeFile(envPath, str)
-        }
-        await Environment.ensurePinokioCacheDirs(this.kernel, {
-          throwOnFailure: true,
-          elevatedRepair: this.kernel.elevatedCacheRepair.bind(this.kernel)
-        })
         this.kernel.store.set("version", this.version.pinokiod)
         console.log("[DONE] Updating to the new version")
         console.log("not up to date. update py.")
@@ -5748,6 +5707,9 @@ class Server {
         let p2 = path.resolve(home, "prototype/system")
         await fse.remove(p2)
 
+        let p3 = path.resolve(home, "plugin/code")
+        await fse.remove(p3)
+
         let p4 = path.resolve(home, "network/system")
         await fse.remove(p4)
 
@@ -5816,6 +5778,10 @@ class Server {
             await this.kernel.proto.init()
           }
           if (needsManagedRefresh) {
+            const pluginReady = await this.kernel.exists("plugin/code")
+            if (!pluginReady && this.kernel.plugin && typeof this.kernel.plugin.init === "function") {
+              await this.kernel.plugin.init()
+            }
             const networkReady = await this.kernel.exists("network/system")
             if (!networkReady && this.kernel.router && typeof this.kernel.router.init === "function") {
               await this.kernel.router.init()
@@ -5996,10 +5962,6 @@ class Server {
     })
     this.app.use(express.static(path.resolve(__dirname, 'public')));
     this.app.use("/web", express.static(path.resolve(__dirname, "..", "..", "web")))
-    this.app.use(PluginSources.SYSTEM_ASSET_PREFIX, express.static(PluginSources.systemRoot(this.kernel), {
-      index: false,
-      fallthrough: true,
-    }))
     this.app.set('view engine', 'ejs');
     this.app.use((req, res, next) => {
       const peerForwarded = (req.get('X-Pinokio-Peer') || '').trim().toLowerCase()
@@ -6782,7 +6744,24 @@ class Server {
       }
     }
     const normalizePluginPath = (value) => {
-      return PluginSources.normalizePluginPath(value)
+      let normalized = typeof value === "string" ? value.trim() : ""
+      if (!normalized) {
+        return ""
+      }
+      normalized = normalized.replace(/\\/g, "/")
+      if (/^https?:\/\//i.test(normalized)) {
+        try {
+          const parsed = new URL(normalized)
+          normalized = parsed.pathname || ""
+        } catch (_) {
+        }
+      }
+      normalized = normalized.replace(/^\/run(?=\/)/, "")
+      if (!normalized.startsWith("/")) {
+        normalized = `/${normalized}`
+      }
+      normalized = normalized.replace(/\/{2,}/g, "/").replace(/\/+$/, "")
+      return normalized
     }
     const normalizePluginLookupKey = (value) => {
       const normalized = normalizePluginPath(value)
@@ -6929,7 +6908,7 @@ class Server {
         index: -1,
         title: context.title || "Plugin",
         description: typeof config.description === "string" ? config.description : "",
-        href: PluginSources.pluginRunHrefForPath(normalizedPluginPath),
+        href: `/run${normalizedPluginPath}`,
         link: typeof config.link === "string" ? config.link : "",
         image: context.image || null,
         icon: null,
@@ -6954,31 +6933,24 @@ class Server {
     }
     const resolvePluginLocalState = async (plugin) => {
       const pluginRoot = path.resolve(this.kernel.path("plugin"))
+      const managedRoot = path.resolve(pluginRoot, "code")
       const normalizedPath = normalizePluginPath(plugin && plugin.pluginPath ? plugin.pluginPath : "")
       const emptyState = {
         ownership: "bundled",
         manageable: false,
         canOpenFolder: false,
         pluginRoot,
+        managedRoot,
         pluginFilePath: "",
         pluginDir: "",
         relativeDir: "",
         relativeFile: "",
         localLabel: "",
-      }
-      if (PluginSources.isSystemPluginPath(normalizedPath)) {
-        return {
-          ...emptyState,
-          ownership: "system",
-          localLabel: normalizedPath.replace(/^\/pinokio\/run\//, ""),
-        }
+        managedPrefix: "",
       }
       if (!normalizedPath.startsWith("/plugin/")) {
         return emptyState
       }
-      if (PluginSources.isLegacyPluginCodePath(normalizedPath)) {
-        return emptyState
-      }
       const pluginFilePath = path.resolve(this.kernel.path(normalizedPath.slice(1)))
       if (!isPathInsideRoot(pluginFilePath, pluginRoot)) {
         return emptyState
@@ -6998,16 +6970,22 @@ class Server {
       }
       const relativeFile = path.relative(pluginRoot, pluginFilePath).split(path.sep).join("/")
       const relativeDir = path.relative(pluginRoot, pluginDir).split(path.sep).join("/")
+      const isManaged = isPathInsideRoot(pluginFilePath, managedRoot)
+      const managedPrefix = isManaged
+        ? path.relative(managedRoot, pluginDir).split(path.sep).join("/")
+        : ""
       return {
-        ownership: "local",
-        manageable: Boolean(pluginFileExists && pluginDirExists),
+        ownership: isManaged ? "managed" : "local",
+        manageable: Boolean(pluginFileExists && pluginDirExists && !isManaged),
         canOpenFolder: Boolean(pluginFileExists && pluginDirExists),
         pluginRoot,
+        managedRoot,
         pluginFilePath,
         pluginDir,
         relativeDir,
         relativeFile,
         localLabel: relativeDir ? `plugin/${relativeDir}` : "plugin",
+        managedPrefix,
       }
     }
     const collectPluginApps = async (boundAppName = "") => {
@@ -7051,31 +7029,11 @@ class Server {
       })
       return apps
     }
-	    const buildPluginShareState = async (plugin) => {
-	      const localState = await resolvePluginLocalState(plugin)
-      if (localState.ownership === "system") {
+    const buildPluginShareState = async (plugin) => {
+      const localState = await resolvePluginLocalState(plugin)
+      if (localState.ownership === "bundled") {
         return {
-          ownership: "system",
-          manageable: false,
-          canOpenFolder: false,
-          dir: "",
-          localLabel: localState.localLabel || "",
-          remoteUrl: "",
-          remoteWebUrl: "",
-          githubConnected: false,
-          gitInitialized: false,
-          hasCommit: false,
-          changeCount: 0,
-          changes: [],
-          branch: "HEAD",
-          commitUrl: "",
-          createUrl: "",
-          pushUrl: "",
-        }
-      }
-	      if (localState.ownership === "bundled") {
-	        return {
-	          ownership: "bundled",
+          ownership: "bundled",
           manageable: false,
           canOpenFolder: false,
           dir: "",
@@ -7095,21 +7053,49 @@ class Server {
       }
 
       if (localState.ownership === "managed") {
+        let changes = []
+        try {
+          const headStatus = await this.getRepoHeadStatusByDir(localState.managedRoot)
+          const allChanges = Array.isArray(headStatus && headStatus.changes) ? headStatus.changes : []
+          const managedPrefix = typeof localState.managedPrefix === "string" ? localState.managedPrefix.trim() : ""
+          changes = allChanges
+            .filter((change) => {
+              const file = change && typeof change.file === "string" ? change.file : ""
+              if (!managedPrefix) {
+                return true
+              }
+              return file === managedPrefix || file.startsWith(`${managedPrefix}/`)
+            })
+            .map((change) => {
+              const file = change && typeof change.file === "string" ? change.file : ""
+              if (!managedPrefix || !file) {
+                return change
+              }
+              const relativeFile = file === managedPrefix
+                ? path.posix.basename(managedPrefix)
+                : file.slice(managedPrefix.length + 1)
+              return {
+                ...change,
+                file: relativeFile || file
+              }
+            })
+        } catch (_) {
+        }
         return {
-          ownership: "bundled",
+          ownership: "managed",
           manageable: false,
-          canOpenFolder: false,
-          dir: "",
-          localLabel: "",
-          relativeDir: "",
-          relativeFile: "",
+          canOpenFolder: Boolean(localState.canOpenFolder),
+          dir: localState.pluginDir,
+          localLabel: localState.localLabel,
+          relativeDir: localState.relativeDir,
+          relativeFile: localState.relativeFile,
           remoteUrl: "",
           remoteWebUrl: "",
           githubConnected: false,
           gitInitialized: false,
           hasCommit: false,
-          changeCount: 0,
-          changes: [],
+          changeCount: changes.length,
+          changes,
           branch: "HEAD",
           commitUrl: "",
           createUrl: "",
@@ -7185,19 +7171,14 @@ class Server {
         : ""
       const remoteLabel = summarizeTaskRemoteLabel(remoteCandidate)
       const badges = []
-	      if (ownership === "local") {
-	        badges.push({
-	          label: "Local plugin",
-	          tone: "accent"
-	        })
-      } else if (ownership === "system") {
+      if (ownership === "local") {
         badges.push({
-          label: "Built-in plugin",
-          tone: "neutral"
+          label: "Local plugin",
+          tone: "accent"
         })
-	      } else if (ownership === "managed") {
-	        badges.push({
-	          label: "Managed by Pinokio",
+      } else if (ownership === "managed") {
+        badges.push({
+          label: "Managed by Pinokio",
           tone: "neutral"
         })
       } else {
@@ -7242,12 +7223,13 @@ class Server {
           : (shareState.gitInitialized ? "No local changes" : "Not version tracked yet")
         githubPanelTitle = "GitHub"
         githubPanelCopy = ""
-      } else if (ownership === "system") {
-        sourceLabel = "System plugin"
-        sourceValue = shareState.localLabel || sourceValue
-        statusValue = "Read-only"
-        githubPanelTitle = "Built in to Pinokio"
-        githubPanelCopy = "This plugin ships with Pinokio and is not editable from the local plugin workspace."
+      } else if (ownership === "managed") {
+        sourceLabel = "Managed folder"
+        sourceValue = shareState.localLabel
+        statusValue = changes.length > 0 ? pluralizeTaskFiles(changes.length) : "Updated with Pinokio"
+        githubPanelTitle = "Managed by Pinokio"
+        githubPanelCopy = "This plugin lives inside <code>plugin/code</code>, which Pinokio refreshes as part of its managed source. Open the folder if you need to inspect it, but don&apos;t treat it as your own publishable repo."
+        localChangesCopy = "These edits live inside Pinokio-managed source and may be overwritten by future Pinokio updates."
       }
       const changePreview = changes.slice(0, 6).map((change) => ({
         file: change && change.file ? change.file : "",
@@ -8112,7 +8094,24 @@ class Server {
       }
       return targetPath
     }
-    const resolveUniversalLauncherPluginHref = PluginSources.resolveLauncherPluginHref
+	    const resolveUniversalLauncherPluginHref = (toolValue) => {
+	      let normalizedTool = typeof toolValue === "string" ? toolValue.trim() : ""
+	      normalizedTool = normalizedTool.replace(/^https?:\/\/[^/]+/i, "")
+	      normalizedTool = normalizedTool.replace(/^\/+|\/+$/g, "")
+	      normalizedTool = normalizedTool.replace(/^run\//, "")
+	      if (!normalizedTool || normalizedTool.includes("..") || !/^[A-Za-z0-9._/-]+$/.test(normalizedTool)) {
+	        const error = new Error("Invalid plugin.")
+	        error.status = 400
+	        throw error
+	      }
+	      if (normalizedTool.startsWith("plugin/") || normalizedTool.startsWith("api/")) {
+	        const scriptPath = normalizedTool.endsWith(".js")
+	          ? normalizedTool
+	          : `${normalizedTool}/pinokio.js`
+	        return `/run/${scriptPath}`
+	      }
+	      return `/run/plugin/${normalizedTool}/pinokio.js`
+	    }
 	    const persistLauncherPromptContext = async (targetPath, options = {}) => {
 	      const prompt = typeof options.prompt === "string" ? options.prompt.trim() : ""
 	      if (!prompt) {
@@ -8404,32 +8403,6 @@ class Server {
     const taskWorkspaceLinks = createTaskWorkspaceLinkService({
       kernel: this.kernel
     })
-    const workspaceRuntime = createWorkspaceRuntimeService({
-      kernel: this.kernel
-    })
-    this.workspaceRuntime = workspaceRuntime
-    const features = await mountFeatures({
-      app: this.app,
-      kernel: this.kernel,
-      taskWorkspaceLinks,
-      defaultRegistryUrl: DEFAULT_REGISTRY_URL
-    })
-    this.features = features
-    const drafts = features.drafts.service
-    this.drafts = drafts
-    const workspaceCatalog = createWorkspaceCatalogService({
-      kernel: this.kernel,
-      workspaceRuntime,
-      drafts
-    })
-    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)
@@ -10100,8 +10073,7 @@ class Server {
         }
       }
 
-      const filledInputValues = filterFilledTaskInputValues(inputValues)
-      const prompt = taskPackages.applyTemplateValues(task.template, filledInputValues).trim()
+      const prompt = taskPackages.applyTemplateValues(task.template, filterFilledTaskInputValues(inputValues)).trim()
       if (!prompt) {
         await renderTaskLaunchPage(req, res, task, {
           selectedTool,
@@ -10222,9 +10194,6 @@ class Server {
       params.set("cwd", targetPath)
       params.set("chrome", "full")
       params.set("prompt", prompt)
-      if (filledInputValues.url) {
-        params.set("url", filledInputValues.url)
-      }
       res.redirect(`${pluginHref}?${params.toString()}`)
     })
     this.app.post("/task/start", handleTaskStartRequest)
@@ -10531,8 +10500,7 @@ class Server {
           return
         }
 
-        const filledInputValues = filterFilledTaskInputValues(inputValues)
-        const prompt = taskPackages.applyTemplateValues(task.template, filledInputValues).trim()
+        const prompt = taskPackages.applyTemplateValues(task.template, filterFilledTaskInputValues(inputValues)).trim()
         if (!prompt) {
           res.status(400).json({
             ok: false,
@@ -10632,9 +10600,6 @@ class Server {
         params.set("chrome", "full")
         params.set("session", createUniversalLauncherSessionId())
         params.set("prompt", prompt)
-        if (filledInputValues.url) {
-          params.set("url", filledInputValues.url)
-        }
 
         res.json({
           ok: true,
@@ -11886,14 +11851,11 @@ 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 {
-            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)
+            if (this.socket && typeof this.socket.isLocalDevice === 'function') {
+              payload.host = !!this.socket.isLocalDevice(payload.device_id)
+            } else {
+              payload.host = false
+            }
           } catch (_) {
             payload.host = false
           }
@@ -12794,6 +12756,23 @@ class Server {
         })
       }
     }))
+    this.app.post("/plugin/update", ex(async (req, res) => {
+      try {
+        await this.kernel.exec({
+          message: "git pull",
+          path: this.kernel.path("plugin/code")
+        }, (e) => {
+          console.log(e)
+        })
+        res.json({
+          success: true
+        })
+      } catch (e) {
+        res.json({
+          error: e.stack
+        })
+      }
+    }))
     this.app.post("/network/reset", ex(async (req, res) => {
       let caddy_path = this.kernel.path("cache/XDG_DATA_HOME/caddy")
       await rimraf(caddy_path)
@@ -14225,17 +14204,6 @@ class Server {
         res.status(404).send(e.message)
       }
     }))
-    this.app.get(`${PluginSources.SYSTEM_RUN_PREFIX}/*`, ex(async (req, res) => {
-      const runPath = typeof req.params[0] === "string" ? req.params[0] : ""
-      let pathComponents = runPath.split("/")
-      req.base = PluginSources.systemRoot(this.kernel)
-      req.pinokioSystem = true
-      try {
-        await this.render(req, res, pathComponents)
-      } catch (e) {
-        res.status(404).send(e.message)
-      }
-    }))
     this.app.get("/run/*", ex(async (req, res) => {
       const runPath = typeof req.params[0] === "string" ? req.params[0] : ""
       let pathComponents = runPath.split("/")
@@ -15661,7 +15629,12 @@ class Server {
     }))
     this.app.get("/bin_ready", ex(async (req, res) => {
       if (this.kernel.bin && !this.kernel.bin.requirements_pending) {
-        res.json({ success: true })
+        let code_exists = await this.kernel.exists("plugin/code")
+        if (code_exists) {
+          res.json({ success: true })
+        } else {
+          res.json({ success: false })
+        }
       } else {
         res.json({ success: false })
       }