pinokiod 7.1.27 → 7.1.29

package/kernel/bin/bluefairy.js

@@ -4,7 +4,7 @@ const semver = require('semver')
 
 class Bluefairy {
   description = "Installs Bluefairy, a standalone package freshness guard."
-  version = ">=0.0.7"
+  version = ">=0.0.14"
 
   packageName() {
     return "bluefairy"
@@ -84,12 +84,12 @@ class Bluefairy {
       return []
     }
     if (shell.isCmdShell()) {
-      return [`bluefairy-activate.cmd`, `bluefairy doctor --short`]
+      return [`bluefairy-activate.cmd`]
     }
     if (shell.isPowerShell()) {
-      return [`& bluefairy-activate.ps1`, `bluefairy doctor --short`]
+      return [`& bluefairy-activate.ps1`]
     }
-    return [`. bluefairy-activate`, `bluefairy doctor --short`]
+    return [`. bluefairy-activate`]
   }
 }
 

package/package.json

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

package/server/index.js

@@ -2782,6 +2782,7 @@ class Server {
             execUrl: "~" + req.originalUrl.replace(/^\/_api/, "\/api"),
             proxies: this.kernel.api.proxies[filepath],
             cwd: req.query.cwd,
+            taskSaveWorkspacesRoot: this.kernel.path("workspaces"),
             script_id: (req.base ? `${full_filepath}?cwd=${req.query.cwd}` : null),
             script_path: (req.base ? full_filepath : null),
           }
@@ -6890,10 +6891,13 @@ class Server {
       try {
         if (!this.kernel.plugin.config) {
           await this.kernel.plugin.init()
+        } else {
+          await this.kernel.plugin.setConfig()
         }
         const pluginMenu = this.kernel.plugin && this.kernel.plugin.config && Array.isArray(this.kernel.plugin.config.menu)
           ? this.kernel.plugin.config.menu
           : []
+        res.set("Cache-Control", "no-store")
         res.json({ menu: pluginMenu })
       } catch (error) {
         console.warn('Failed to load plugin menu for create launcher modal', error)
@@ -7596,6 +7600,7 @@ class Server {
       }
       return copied
     }
+    const shellQuote = (value) => JSON.stringify(String(value))
     const createLauncherTargetFolder = async (rootDir, folderName, options = {}) => {
       if (!isValidTerminalWorkspaceName(folderName)) {
         const error = new Error("Invalid folder name.")
@@ -7616,8 +7621,11 @@ class Server {
         error.status = 409
         throw error
       }
-      await fs.promises.mkdir(targetPath, { recursive: false })
-      if (options.initializeGit !== false) {
+      const shouldCreateDirectory = options.createDirectory !== false
+      if (shouldCreateDirectory) {
+        await fs.promises.mkdir(targetPath, { recursive: false })
+      }
+      if (shouldCreateDirectory && options.initializeGit !== false) {
         try {
           await initializeLauncherTargetGitRepository(targetPath)
         } catch (error) {
@@ -7655,9 +7663,6 @@ class Server {
       if (!rawValue) {
         return ""
       }
-      if (this.kernel && this.kernel.git && typeof this.kernel.git.canonicalRepoUrl === "function") {
-        return this.kernel.git.canonicalRepoUrl(rawValue) || rawValue
-      }
       return rawValue
     }
     const cloneLauncherRemoteRepo = async ({ rootDir, folderName, ref }) => {
@@ -7668,17 +7673,14 @@ class Server {
         throw error
       }
       const targetPath = await createLauncherTargetFolder(rootDir, folderName, {
+        createDirectory: false,
         initializeGit: false
       })
       try {
-        await git.clone({
-          fs,
-          http,
-          dir: targetPath,
-          url: normalizedRef,
-          singleBranch: true,
-          depth: 1
-        })
+        await this.kernel.exec({
+          message: [`git clone --depth 1 --single-branch ${shellQuote(normalizedRef)} ${shellQuote(targetPath)}`],
+          path: path.resolve(rootDir)
+        }, () => {})
         return targetPath
       } catch (error) {
         await fs.promises.rm(targetPath, { recursive: true, force: true }).catch(() => {})
@@ -7832,15 +7834,46 @@ class Server {
       const nextInputs = JSON.parse(value)
       return Array.isArray(nextInputs) ? nextInputs : []
     }
-    const buildTaskBuilderDefaults = (body, inputs) => ({
-      title: typeof body?.title === "string" ? body.title : "",
-      description: typeof body?.description === "string" ? body.description : "",
-      path: typeof body?.path === "string" && body.path.trim()
-        ? body.path.trim()
-        : "workspaces",
-      template: typeof body?.template === "string" ? body.template : "",
-      inputs: Array.isArray(inputs) ? inputs : []
-    })
+    const normalizeTaskBuilderSourceWorkspace = (value) => {
+      const raw = typeof value === "string" ? value.trim() : ""
+      if (!raw) {
+        return {
+          cwd: "",
+          label: ""
+        }
+      }
+      const workspacesRoot = path.resolve(this.kernel.path("workspaces"))
+      const normalizedPath = path.resolve(raw)
+      const relative = path.relative(workspacesRoot, normalizedPath)
+      if (!relative || relative === "." || relative.startsWith("..") || path.isAbsolute(relative)) {
+        return {
+          cwd: "",
+          label: ""
+        }
+      }
+      return {
+        cwd: normalizedPath,
+        label: path.basename(normalizedPath) || relative.split(path.sep).pop() || "workspace"
+      }
+    }
+    const buildTaskBuilderDefaults = (body, inputs, options = {}) => {
+      const sourceWorkspace = options.sourceWorkspace && typeof options.sourceWorkspace === "object"
+        ? options.sourceWorkspace
+        : normalizeTaskBuilderSourceWorkspace(body?.sourceWorkspaceCwd)
+      return {
+        title: typeof body?.title === "string" ? body.title : "",
+        description: typeof body?.description === "string" ? body.description : "",
+        path: typeof body?.path === "string" && body.path.trim()
+          ? body.path.trim()
+          : "workspaces",
+        template: typeof body?.template === "string" ? body.template : "",
+        inputs: Array.isArray(inputs) ? inputs : [],
+        sourceWorkspaceCwd: sourceWorkspace.cwd || "",
+        sourceWorkspaceLabel: sourceWorkspace.label || "",
+        rememberCurrentWorkspace: body?.rememberCurrentWorkspace === "1" || body?.rememberCurrentWorkspace === "on" || body?.rememberCurrentWorkspace === true,
+        lockPathSelection: body?.lockPathSelection === "1" || body?.lockPathSelection === "on" || body?.lockPathSelection === true
+      }
+    }
     const summarizeTaskRemoteLabel = (value) => {
       const raw = typeof value === "string" ? value.trim() : ""
       if (!raw) {
@@ -8914,7 +8947,10 @@ class Server {
     }))
 
     this.app.get("/tasks/new", ex(async (req, res) => {
+      const sourceWorkspace = normalizeTaskBuilderSourceWorkspace(req.query.sourceWorkspaceCwd)
+      const lockPathSelection = req.query.lockPath === "1" || req.query.lockPath === "true"
       await renderTaskBuilderPage(req, res, {
+        allowPathSelection: !lockPathSelection,
         defaults: {
           path: typeof req.query.path === "string" && req.query.path.trim()
             ? req.query.path.trim()
@@ -8922,7 +8958,11 @@ class Server {
           title: typeof req.query.title === "string" ? req.query.title : "",
           description: typeof req.query.description === "string" ? req.query.description : "",
           template: typeof req.query.template === "string" ? req.query.template : "",
-          inputs: []
+          inputs: [],
+          sourceWorkspaceCwd: sourceWorkspace.cwd,
+          sourceWorkspaceLabel: sourceWorkspace.label,
+          rememberCurrentWorkspace: false,
+          lockPathSelection
         }
       })
     }))
@@ -8960,14 +9000,45 @@ class Server {
 
     this.app.post("/tasks", ex(async (req, res) => {
       const body = req.body && typeof req.body === "object" ? req.body : {}
+      const sourceWorkspace = normalizeTaskBuilderSourceWorkspace(body.sourceWorkspaceCwd)
       let parsedInputs = []
       if (typeof body.inputsJson === "string" && body.inputsJson.trim()) {
         try {
           parsedInputs = parseTaskBuilderInputs(body.inputsJson)
         } catch (error) {
+          const defaults = buildTaskBuilderDefaults(body, [], { sourceWorkspace })
           await renderTaskBuilderPage(req, res, {
             error: "Inputs JSON is invalid.",
-            defaults: buildTaskBuilderDefaults(body, [])
+            allowPathSelection: !defaults.lockPathSelection,
+            defaults
+          })
+          return
+        }
+      }
+      const defaults = buildTaskBuilderDefaults(body, parsedInputs, { sourceWorkspace })
+      if (defaults.rememberCurrentWorkspace) {
+        if (defaults.path !== "workspaces") {
+          await renderTaskBuilderPage(req, res, {
+            error: "Current workspace can only be remembered for workspace tasks.",
+            allowPathSelection: !defaults.lockPathSelection,
+            defaults
+          })
+          return
+        }
+        if (!sourceWorkspace.cwd) {
+          await renderTaskBuilderPage(req, res, {
+            error: "Current workspace is no longer available to remember.",
+            allowPathSelection: !defaults.lockPathSelection,
+            defaults
+          })
+          return
+        }
+        const sourceStats = await fs.promises.stat(sourceWorkspace.cwd).catch(() => null)
+        if (!sourceStats || !sourceStats.isDirectory()) {
+          await renderTaskBuilderPage(req, res, {
+            error: "Current workspace could not be found.",
+            allowPathSelection: !defaults.lockPathSelection,
+            defaults
           })
           return
         }
@@ -8983,11 +9054,25 @@ class Server {
           },
           template: typeof body.template === "string" ? body.template : ""
         })
+        if (defaults.rememberCurrentWorkspace) {
+          const workspaceRef = taskWorkspaceLinks.createWorkspaceRef("workspaces", sourceWorkspace.cwd)
+          if (!workspaceRef) {
+            await taskPackages.deleteTaskPackage(task.id).catch(() => {})
+            throw new Error("Failed to remember current workspace.")
+          }
+          try {
+            await taskWorkspaceLinks.touchTaskWorkspace(task.id, workspaceRef)
+          } catch (error) {
+            await taskPackages.deleteTaskPackage(task.id).catch(() => {})
+            throw error
+          }
+        }
         res.redirect(buildTaskPath({ id: task.id }))
       } catch (error) {
         await renderTaskBuilderPage(req, res, {
           error: error && error.message ? error.message : "Failed to create task.",
-          defaults: buildTaskBuilderDefaults(body, parsedInputs)
+          allowPathSelection: !defaults.lockPathSelection,
+          defaults
         })
       }
     }))
@@ -11683,7 +11768,8 @@ class Server {
         done_message,
         callback,
         callback_target,
-        running: (shell ? true : false)
+        running: (shell ? true : false),
+        taskSaveWorkspacesRoot: this.kernel.path("workspaces")
       })
     }))
     this.app.get("/pro", ex(async (req, res) => {

package/server/lib/task_packages.js

@@ -1,7 +1,6 @@
 const fs = require("fs");
 const path = require("path");
 const git = require("isomorphic-git");
-const http = require("isomorphic-git/http/node");
 
 const TASK_INDEX_VERSION = 1;
 const TASK_INDEX_FILENAME = "index.json";
@@ -10,6 +9,10 @@ const TASK_TEMPLATE_FILENAME = "task.md";
 const TASK_ID_PATTERN = /^t[1-9][0-9]*$/;
 const TASK_INPUT_NAME_PATTERN = /^[a-zA-Z0-9_][a-zA-Z0-9_.-]*$/;
 
+function shellQuote(value) {
+  return JSON.stringify(String(value));
+}
+
 function slugify(value, fallback = "task") {
   const normalized = typeof value === "string" ? value : "";
   const slug = normalized
@@ -562,14 +565,10 @@ function createTaskPackageService({ kernel }) {
     const taskDir = taskDirForId(allocation.id);
     await fs.promises.mkdir(tasksRoot(), { recursive: true });
     try {
-      await git.clone({
-        fs,
-        http,
-        dir: taskDir,
-        url: rawRef,
-        singleBranch: true,
-        depth: 1
-      });
+      await kernel.exec({
+        message: [`git clone --depth 1 --single-branch ${shellQuote(rawRef)} ${shellQuote(taskDir)}`],
+        path: tasksRoot()
+      }, () => {});
       await readTaskPackageById(allocation.id);
       allocation.index.items.push({
         id: allocation.id,

package/server/public/common.js

@@ -2688,7 +2688,16 @@ if (typeof hotkeys === 'function') {
       try { overlay.remove(); } catch (_) {}
       try { window.__pinokioConnectCurtainInstalled = true; window.__pinokioConnectCurtainInstalling = false; } catch (_) {}
     };
-    overlay.addEventListener('pointerdown', onTap, { once: true, capture: true });
+    overlay.addEventListener('click', onTap, { once: true, capture: true });
+    overlay.addEventListener('keydown', (e) => {
+      if (!e) {
+        return;
+      }
+      const key = e.key || '';
+      if (key === 'Enter' || key === ' ' || key === 'Spacebar') {
+        onTap(e);
+      }
+    }, { capture: true });
     document.body.appendChild(overlay);
   };
 
@@ -3701,18 +3710,6 @@ document.addEventListener("DOMContentLoaded", () => {
     } else {
       api.showModal();
     }
-    wait_ready(null, { showLoader: false, requireStartup: true }).then(({ ready }) => {
-      createLauncherDebugLog('guardUniversalLauncher wait_ready resolved', { ready });
-      if (ready) {
-        return;
-      }
-      if (api && typeof api.hideModal === 'function') {
-        api.hideModal();
-      }
-      const callback = encodeURIComponent(window.location.pathname + window.location.search + window.location.hash);
-      createLauncherDebugLog('guardUniversalLauncher redirecting to /setup/dev', { callback });
-      window.location.href = `/setup/dev?callback=${callback}`;
-    });
   }
 
   function initializeCreateLauncherIntegration() {

package/server/public/run-task-save.js

@@ -0,0 +1,109 @@
+(function(window, document) {
+  "use strict";
+
+  function normalizePath(value) {
+    return typeof value === "string" && value.trim()
+      ? value.trim().replace(/\\/g, "/").replace(/\/+$/, "")
+      : "";
+  }
+
+  function isPathWithin(candidate, parent) {
+    const normalizedCandidate = normalizePath(candidate);
+    const normalizedParent = normalizePath(parent);
+    if (!normalizedCandidate || !normalizedParent) {
+      return false;
+    }
+    if (normalizedCandidate === normalizedParent) {
+      return true;
+    }
+    return normalizedCandidate.startsWith(`${normalizedParent}/`);
+  }
+
+  function getFirstPromptLine(prompt) {
+    const lines = String(prompt || "").split(/\r?\n/);
+    for (let index = 0; index < lines.length; index += 1) {
+      const line = lines[index].trim();
+      if (line) {
+        return line;
+      }
+    }
+    return "";
+  }
+
+  function getWorkspaceName(cwd) {
+    const normalized = normalizePath(cwd);
+    if (!normalized) {
+      return "";
+    }
+    const segments = normalized.split("/").filter(Boolean);
+    return segments.length > 0 ? segments[segments.length - 1] : "";
+  }
+
+  function suggestTitle(prompt, cwd) {
+    const firstLine = getFirstPromptLine(prompt);
+    if (firstLine) {
+      return firstLine.slice(0, 120);
+    }
+    const workspaceName = getWorkspaceName(cwd);
+    return workspaceName ? `Task for ${workspaceName}` : "New task";
+  }
+
+  function getPrompt() {
+    try {
+      const params = new URLSearchParams(window.location.search || "");
+      return typeof params.get("prompt") === "string"
+        ? params.get("prompt").trim()
+        : "";
+    } catch (_) {
+      return "";
+    }
+  }
+
+  function openTaskBuilder(url) {
+    const popup = window.open(url.toString(), "_blank", "noopener");
+    if (!popup) {
+      window.location.href = url.toString();
+    }
+  }
+
+  function initRunTaskSave() {
+    const button = document.querySelector("[data-save-task-button]");
+    const body = document.body;
+    if (!button || !body) {
+      return;
+    }
+
+    const cwd = body.dataset.taskSaveCwd || "";
+    const workspacesRoot = body.dataset.taskSaveWorkspacesRoot || "";
+    const prompt = getPrompt();
+    if (!cwd || !workspacesRoot || !prompt) {
+      return;
+    }
+
+    const normalizedCwd = normalizePath(cwd);
+    const normalizedRoot = normalizePath(workspacesRoot);
+    if (!isPathWithin(normalizedCwd, normalizedRoot) || normalizedCwd === normalizedRoot) {
+      return;
+    }
+
+    const url = new URL("/tasks/new", window.location.origin);
+    url.searchParams.set("path", "workspaces");
+    url.searchParams.set("lockPath", "1");
+    url.searchParams.set("title", suggestTitle(prompt, normalizedCwd));
+    url.searchParams.set("template", prompt);
+    url.searchParams.set("sourceWorkspaceCwd", cwd);
+
+    button.hidden = false;
+    button.classList.remove("hidden");
+    button.addEventListener("click", (event) => {
+      event.preventDefault();
+      openTaskBuilder(url);
+    });
+  }
+
+  if (document.readyState === "loading") {
+    document.addEventListener("DOMContentLoaded", initRunTaskSave, { once: true });
+  } else {
+    initRunTaskSave();
+  }
+})(window, document);

package/server/public/task-launcher.js

@@ -2,6 +2,12 @@
   "use strict";
 
   const CATEGORY_ORDER = ["CLI", "IDE"];
+  const TOOL_PREFERENCE_KEY = "pinokio.universalLauncher.tool";
+  const TOOL_VALUE_ALIASES = {
+    claude: "code/claude",
+    codex: "code/codex",
+    gemini: "code/gemini"
+  };
   const FALLBACK_TOOLS = [
     {
       value: "code/claude",
@@ -71,6 +77,35 @@
     return category === "IDE" ? "Desktop app" : category;
   }
 
+  function normalizeToolValue(value) {
+    const trimmed = typeof value === "string"
+      ? value.trim().replace(/^\/+|\/+$/g, "")
+      : "";
+    if (!trimmed) {
+      return "";
+    }
+    return TOOL_VALUE_ALIASES[trimmed] || trimmed;
+  }
+
+  function getStoredToolPreference() {
+    try {
+      return normalizeToolValue(window.localStorage.getItem(TOOL_PREFERENCE_KEY));
+    } catch (_) {
+      return "";
+    }
+  }
+
+  function setStoredToolPreference(value) {
+    try {
+      const normalizedValue = normalizeToolValue(value);
+      if (normalizedValue) {
+        window.localStorage.setItem(TOOL_PREFERENCE_KEY, normalizedValue);
+      } else {
+        window.localStorage.removeItem(TOOL_PREFERENCE_KEY);
+      }
+    } catch (_) {}
+  }
+
   function buildTaskToolPicker(tools, host, hiddenInput) {
     if (!host || !hiddenInput) {
       return null;
@@ -291,11 +326,15 @@
     }
 
     const api = {
-      setValue(value) {
-        const nextValue = typeof value === "string" ? value.trim() : "";
+      setValue(value, options) {
+        const opts = options && typeof options === "object" ? options : {};
+        const nextValue = normalizeToolValue(value);
         const entry = nextValue ? getEntryByValue(nextValue) : null;
         selectedValue = entry ? entry.meta.value : "";
         hiddenInput.value = selectedValue;
+        if (opts.persist !== false) {
+          setStoredToolPreference(selectedValue);
+        }
         syncTrigger();
       },
       openMenu() {
@@ -352,13 +391,20 @@
       api.closeMenu();
     }, true);
 
-    const initialValue = hiddenInput.value.trim();
-    const defaultTool = tools.find((tool) => tool.value === initialValue)
+    const initialValue = normalizeToolValue(hiddenInput.value);
+    const storedValue = getStoredToolPreference();
+    const explicitEntry = initialValue ? getEntryByValue(initialValue) : null;
+    const storedEntry = explicitEntry ? null : (storedValue ? getEntryByValue(storedValue) : null);
+    if (!explicitEntry && storedValue && !storedEntry) {
+      setStoredToolPreference("");
+    }
+    const defaultTool = (explicitEntry && explicitEntry.meta)
+      || (storedEntry && storedEntry.meta)
       || tools.find((tool) => tool.isDefault)
       || tools[0]
       || null;
     if (defaultTool) {
-      api.setValue(defaultTool.value);
+      api.setValue(defaultTool.value, { persist: false });
     } else {
       syncTrigger();
     }
@@ -368,7 +414,9 @@
 
   async function getTools() {
     try {
-      const response = await fetch("/api/plugin/menu");
+      const response = await fetch("/api/plugin/menu", {
+        cache: "no-store"
+      });
       if (!response.ok) {
         throw new Error(String(response.status));
       }

package/server/public/terminal-settings.js

@@ -120,33 +120,38 @@
         event.preventDefault();
         this.closeModal();
       };
+      this.prefersModalInput = this.shouldPreferModalInput();
       const stored = this.loadDirectTypingPreference();
-      if (stored === null) {
-        this.directTypingEnabled = !this.shouldPreferModalInput();
+      if (!this.prefersModalInput) {
+        this.directTypingEnabled = true;
+      } else if (stored === null) {
+        this.directTypingEnabled = false;
       } else {
         this.directTypingEnabled = stored;
       }
     }
 
     shouldPreferModalInput() {
-      if (typeof window !== 'undefined' && typeof window.matchMedia === 'function') {
-        try {
-          if (window.matchMedia('(pointer: coarse)').matches) {
-            return true;
-          }
-        } catch (_) {}
+      if (typeof navigator !== 'undefined') {
         try {
-          if (window.matchMedia('(max-width: 768px)').matches) {
-            return true;
+          if (navigator.userAgentData && typeof navigator.userAgentData.mobile === 'boolean') {
+            if (navigator.userAgentData.mobile) {
+              return true;
+            }
           }
         } catch (_) {}
-      }
-      if (typeof navigator !== 'undefined') {
         const ua = navigator.userAgent || '';
         if (/Mobi|Android|iPhone|iPad|Tablet/i.test(ua)) {
           return true;
         }
       }
+      if (typeof window !== 'undefined' && typeof window.matchMedia === 'function') {
+        try {
+          if (window.matchMedia('(pointer: coarse)').matches) {
+            return true;
+          }
+        } catch (_) {}
+      }
       return false;
     }
 
@@ -294,7 +299,7 @@
     }
 
     setDirectTypingEnabled(enabled) {
-      const next = Boolean(enabled);
+      const next = this.prefersModalInput ? Boolean(enabled) : true;
       if (next === this.directTypingEnabled) {
         return;
       }
@@ -1358,6 +1363,23 @@
       });
     }
 
+    applyMobileRunnerLayout(runner) {
+      if (!runner || !this.mobileInput || !this.mobileInput.prefersModalInput) {
+        return;
+      }
+      const nodes = runner.querySelectorAll('#open-fs');
+      if (!nodes || !nodes.length) {
+        return;
+      }
+      nodes.forEach((node) => {
+        if (!node) {
+          return;
+        }
+        node.hidden = true;
+        node.setAttribute('aria-hidden', 'true');
+      });
+    }
+
     initRunnerMenus() {
       if (typeof document === 'undefined') {
         return;
@@ -1383,12 +1405,13 @@
         if (menu) {
           this.menus.add(menu);
         }
-        if (this.mobileInput && !this.minimalRunnerMode) {
+        if (this.mobileInput && this.mobileInput.prefersModalInput && !this.minimalRunnerMode) {
           this.mobileInput.attachKeyboardButton(runner, utilities);
         }
         if (!this.minimalRunnerMode) {
           this.attachForceResizeButton(runner, utilities);
         }
+        this.applyMobileRunnerLayout(runner);
         this.applyMinimalRunnerLayout(runner);
       });
     }

package/server/public/universal-launcher.css

@@ -250,6 +250,10 @@ body.universal-launcher-open {
   display: none !important;
 }
 
+.universal-launcher-overlay [hidden] {
+  display: none !important;
+}
+
 .universal-launcher-panel {
   position: relative;
   width: min(620px, calc(100vw - 28px));

package/server/views/shell.ejs

@@ -21,6 +21,7 @@
 <script src="/terminal-settings.js"></script>
 <script src="/pinokio-touch.js"></script>
 <script src="/common.js"></script>
+<script src="/run-task-save.js"></script>
 <script src="/he.js"></script>
 <script src="/opener.js"></script>
 <!--
@@ -1848,7 +1849,7 @@ document.addEventListener("DOMContentLoaded", async () => {
 
 </script>
 </head>
-<body class='<%=theme%>' data-agent="<%=agent%>">
+<body class='<%=theme%>' data-agent="<%=agent%>" data-task-save-cwd="<%= cwd || '' %>" data-task-save-workspaces-root="<%= taskSaveWorkspacesRoot || '' %>">
   <% if (target === "_top") { %>
     <header class='navheader grabbable'>
   <% } else { %>
@@ -1867,6 +1868,7 @@ document.addEventListener("DOMContentLoaded", async () => {
       <div class='hidden btn run stop-btn'>
         <span class='stop'><i class="fa-solid fa-stop"></i> Stop</span>
       </div>
+      <button class='hidden btn' type='button' data-save-task-button hidden><i class="fa-solid fa-bookmark"></i> Save task</button>
       <div class='hidden btn stopped-btn'>
         <span class='stopped'><i class="fa-solid fa-hand"></i> Stopped</span>
       </div>

package/server/views/task_builder.ejs

@@ -103,6 +103,24 @@
       </section>
 
       <input type="hidden" name="inputsJson" value="[]" data-task-inputs-json>
+      <input type="hidden" name="sourceWorkspaceCwd" value="<%= defaults.sourceWorkspaceCwd || '' %>">
+      <input type="hidden" name="lockPathSelection" value="<%= defaults.lockPathSelection ? '1' : '0' %>">
+
+      <% if (defaults.sourceWorkspaceCwd && (defaults.path || 'workspaces') === 'workspaces') { %>
+        <section class="task-section task-builder-workspace-section">
+          <div class="task-section-head">
+            <div>
+              <h2 class="task-section-title">Workspace</h2>
+              <p class="task-section-subcopy">Optional. Keep the task generic unless you want it to remember this workspace.</p>
+            </div>
+          </div>
+          <label class="task-toggle">
+            <input type="checkbox" name="rememberCurrentWorkspace" value="1" <%= defaults.rememberCurrentWorkspace ? 'checked' : '' %>>
+            <span>Remember current workspace</span>
+          </label>
+          <p class="task-inline-help">This lets the task offer "Continue in <%= defaults.sourceWorkspaceLabel || 'this workspace' %>" later. No files are copied or saved.</p>
+        </section>
+      <% } %>
 
       <div class="task-actions task-builder-actions">
         <button class="task-button primary" type="submit">

package/server/views/terminal.ejs

@@ -21,6 +21,7 @@
 <script src="/terminal-settings.js"></script>
 <script src="/pinokio-touch.js"></script>
 <script src="/common.js"></script>
+<script src="/run-task-save.js"></script>
 <script src="/he.js"></script>
 <script src="/opener.js"></script>
 <script src="/loading.js"></script>
@@ -2631,9 +2632,9 @@ const reloadMemory = async () => {
 </script>
 </head>
 <% if (install_required) { %>
-<body class='terminal-page frozen <%=theme%> <%= locals.full_navbar ? "has-full-navbar" : "" %>'>
+<body class='terminal-page frozen <%=theme%> <%= locals.full_navbar ? "has-full-navbar" : "" %>' data-task-save-cwd="<%= cwd || '' %>" data-task-save-workspaces-root="<%= taskSaveWorkspacesRoot || '' %>">
 <% } else { %>
-<body class='terminal-page <%=theme%> <%= locals.full_navbar ? "has-full-navbar" : "" %>'>
+<body class='terminal-page <%=theme%> <%= locals.full_navbar ? "has-full-navbar" : "" %>' data-task-save-cwd="<%= cwd || '' %>" data-task-save-workspaces-root="<%= taskSaveWorkspacesRoot || '' %>">
 <% } %>
   <% if (locals.full_navbar) { %>
     <header class="navheader grabbable">
@@ -2675,8 +2676,9 @@ const reloadMemory = async () => {
           <span class='stop hidden'><i class="fa-solid fa-stop"></i> Stop</span>
         </div>
         <% if (locals.filepath) { %>
-          <button class='btn' id='open-fs' data-filepath="<%=filepath%>"><i class="fa-solid fa-eye"></i> Script</button>
+          <button class='btn' id='open-fs' data-filepath="<%=filepath%>" data-command="view"><i class="fa-solid fa-folder-open"></i> File Explorer</button>
         <% } %>
+        <button class='btn hidden' type='button' data-save-task-button hidden><i class="fa-solid fa-bookmark"></i> Save task</button>
         <div id='status-window'></div>
         <div id='progress-window' class='hidden'><div id='progress-bar'></div></div>
     </div>