pinokiod 7.5.21 → 7.5.24

package/server/public/task-launcher.css

@@ -276,6 +276,10 @@ body.task-page .task-shell {
   padding-top: 18px;
 }
 
+.task-detail-layout-single {
+  grid-template-columns: minmax(0, 1fr);
+}
+
 .task-detail-main {
   min-width: 0;
 }
@@ -374,6 +378,52 @@ body.connect-page .task-shell {
   text-transform: uppercase;
 }
 
+.task-breadcrumb {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  min-width: 0;
+  margin-bottom: 8px;
+  padding: 0;
+  min-height: 0;
+  background: transparent;
+  color: var(--task-muted);
+  font-size: 12px;
+  font-weight: 600;
+  line-height: 1.2;
+}
+
+body.task-launcher-page .task-breadcrumb {
+  background: transparent;
+}
+
+.task-breadcrumb-link {
+  display: inline-flex;
+  align-items: center;
+  min-width: 0;
+  padding: 0;
+  color: inherit;
+  text-decoration: none;
+}
+
+.task-breadcrumb-link:hover,
+.task-breadcrumb-link:focus-visible {
+  color: var(--task-text);
+  text-decoration: none;
+  outline: none;
+}
+
+.task-breadcrumb-separator {
+  color: var(--task-border-strong);
+  font-size: 11px;
+}
+
+.task-breadcrumb-current {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
 .task-back-link {
   display: inline-flex;
   align-items: center;
@@ -2566,16 +2616,57 @@ body.connect-page .connect-service-open {
   max-width: none;
 }
 
+.plugin-detail-page .task-shell-header {
+  padding: 12px 28px 14px;
+}
+
+.plugin-detail-page .task-shell-body {
+  padding: 18px 28px 24px;
+}
+
+.plugin-detail-page .task-detail-layout {
+  grid-template-columns: minmax(0, 1fr) 320px;
+  gap: 32px;
+  max-width: 1520px;
+  padding-top: 4px;
+}
+
+.plugin-detail-page .task-detail-sidebar {
+  padding-left: 28px;
+}
+
+.plugin-detail-page .task-detail-sidebar::before {
+  left: 0;
+}
+
+.plugin-detail-page .task-header-badges {
+  margin-top: 8px;
+}
+
+.plugin-detail-breadcrumb .task-breadcrumb-link:first-child {
+  color: var(--task-muted);
+}
+
+.plugin-detail-breadcrumb .task-breadcrumb-link:first-child:hover,
+.plugin-detail-breadcrumb .task-breadcrumb-link:first-child:focus-visible {
+  color: var(--task-text);
+}
+
+.plugin-detail-breadcrumb .task-breadcrumb-current {
+  color: var(--task-text);
+  font-weight: 650;
+}
+
 .plugin-detail-title-row {
   display: flex;
   align-items: center;
-  gap: 12px;
+  gap: 10px;
 }
 
 .plugin-detail-title-art {
-  width: 44px;
-  height: 44px;
-  border-radius: 12px;
+  width: 38px;
+  height: 38px;
+  border-radius: 9px;
   object-fit: cover;
   flex-shrink: 0;
   border: 1px solid var(--task-border);
@@ -2587,7 +2678,7 @@ body.connect-page .connect-service-open {
   align-items: center;
   justify-content: center;
   color: var(--task-accent);
-  font-size: 20px;
+  font-size: 18px;
 }
 
 .plugin-detail-page .task-detail-sidebar .task-meta-row-compact {
@@ -2598,14 +2689,77 @@ body.connect-page .connect-service-open {
   grid-template-columns: minmax(0, 1fr);
 }
 
+.plugin-detail-status-list {
+  display: grid;
+  border-top: 1px solid var(--task-border);
+  border-bottom: 1px solid var(--task-border);
+}
+
+.plugin-detail-status-row {
+  display: grid;
+  grid-template-columns: minmax(0, 0.92fr) minmax(0, 1fr);
+  gap: 12px;
+  align-items: baseline;
+  min-height: 0;
+  padding: 8px 0;
+  border-top: 1px solid var(--task-border);
+}
+
+.plugin-detail-status-row:first-child {
+  border-top: 0;
+}
+
+.plugin-detail-status-label {
+  min-width: 0;
+  color: var(--task-muted);
+  font-size: 12px;
+  line-height: 1.35;
+}
+
+.plugin-detail-status-value {
+  min-width: 0;
+  color: var(--task-text);
+  font-size: 12px;
+  font-weight: 650;
+  line-height: 1.35;
+  text-align: right;
+  word-break: break-word;
+}
+
+.plugin-detail-page .task-detail-status-actions {
+  gap: 8px;
+  align-items: center;
+}
+
+.plugin-detail-page .task-side-group {
+  gap: 12px;
+}
+
+.plugin-detail-page .task-share-next-step-main {
+  gap: 8px;
+  padding-top: 0;
+  border-top: 0;
+}
+
+.plugin-detail-page .task-share-next-step-title {
+  font-size: 15px;
+  line-height: 1.2;
+}
+
 .plugin-detail-actions-section .task-section-subcopy {
   max-width: 56ch;
 }
 
+.plugin-detail-actions-section .task-section-head {
+  margin-bottom: 8px;
+}
+
 .plugin-detail-action-grid {
   display: grid;
-  gap: 10px;
-  margin-top: 14px;
+  gap: 0;
+  margin-top: 10px;
+  border-top: 1px solid var(--task-border);
+  border-bottom: 1px solid var(--task-border);
 }
 
 .plugin-detail-next-step-banner {
@@ -2625,21 +2779,37 @@ body.connect-page .connect-service-open {
   grid-template-columns: minmax(0, 1fr) auto;
   align-items: center;
   gap: 14px;
-  padding: 12px;
-  border: 1px solid var(--task-border);
-  border-radius: 12px;
-  background: color-mix(in srgb, var(--task-panel) 94%, var(--task-soft));
+  min-height: 0;
+  padding: 9px 12px;
+  border: 0;
+  border-top: 1px solid var(--task-border);
+  border-radius: 0;
+  background: transparent;
+}
+
+.plugin-detail-action-card:first-child {
+  border-top: 0;
+}
+
+.plugin-detail-action-card:hover,
+.plugin-detail-action-card:focus-within {
+  background: color-mix(in srgb, var(--task-soft) 64%, transparent);
 }
 
 .plugin-detail-action-card.is-recommended {
-  border-color: color-mix(in srgb, var(--task-accent) 28%, var(--task-border));
-  background: color-mix(in srgb, var(--task-accent) 7%, var(--task-panel));
+  background: color-mix(in srgb, var(--task-accent) 7%, transparent);
+  box-shadow: inset 2px 0 0 color-mix(in srgb, var(--task-accent) 42%, var(--task-border));
+}
+
+.plugin-detail-action-card.is-recommended:hover,
+.plugin-detail-action-card.is-recommended:focus-within {
+  background: color-mix(in srgb, var(--task-accent) 10%, transparent);
 }
 
 .plugin-detail-action-copy {
   min-width: 0;
   display: grid;
-  gap: 3px;
+  gap: 2px;
 }
 
 .plugin-detail-next-step-chip {
@@ -2659,7 +2829,7 @@ body.connect-page .connect-service-open {
 }
 
 .plugin-detail-action-label {
-  font-size: 14px;
+  font-size: 13px;
   font-weight: 700;
   letter-spacing: -0.02em;
   line-height: 1.2;
@@ -2667,8 +2837,8 @@ body.connect-page .connect-service-open {
 
 .plugin-detail-action-meta {
   color: var(--task-muted);
-  font-size: 12px;
-  line-height: 1.45;
+  font-size: 11px;
+  line-height: 1.35;
 }
 
 .plugin-share-static-actions {
@@ -3053,6 +3223,13 @@ body.dark .plugin-option .option-icon {
     padding-top: 10px;
   }
 
+  .plugin-detail-page .task-detail-layout {
+    grid-template-columns: minmax(0, 1fr);
+    gap: 18px;
+    max-width: none;
+    padding-top: 8px;
+  }
+
   .task-detail-sidebar {
     margin-top: 0;
     padding: 18px 0 0;
@@ -3063,6 +3240,10 @@ body.dark .plugin-option .option-icon {
     display: none;
   }
 
+  .plugin-detail-page .task-detail-sidebar {
+    padding: 18px 0 0;
+  }
+
   .task-shell {
     width: min(100vw - 20px, 100%);
     margin: 12px auto 20px;
@@ -3075,6 +3256,14 @@ body.dark .plugin-option .option-icon {
     padding-right: 18px;
   }
 
+  .plugin-detail-page .task-shell-header {
+    padding: 12px 18px 14px;
+  }
+
+  .plugin-detail-page .task-shell-body {
+    padding: 16px 18px 22px;
+  }
+
   .task-shell-header {
     grid-template-columns: minmax(0, 1fr);
   }
@@ -3125,6 +3314,21 @@ body.dark .plugin-option .option-icon {
   .plugin-detail-action-card {
     grid-template-columns: minmax(0, 1fr);
     align-items: stretch;
+    justify-items: start;
+  }
+
+  .plugin-detail-action-card .task-button,
+  .plugin-detail-action-card .task-link-button {
+    justify-self: start;
+  }
+
+  .plugin-detail-status-row {
+    grid-template-columns: minmax(0, 1fr);
+    gap: 3px;
+  }
+
+  .plugin-detail-status-value {
+    text-align: left;
   }
 
   .setup-layout {

package/server/public/universal-launcher.js

@@ -4393,6 +4393,7 @@
     const prompt = typeof options.prompt === 'string' ? options.prompt : '';
     const name = typeof options.name === 'string' ? options.name.trim() : '';
     const tool = typeof options.tool === 'string' ? options.tool.trim().replace(/^\/+|\/+$/g, '') : '';
+    const mode = options.mode === 'download' ? 'download' : 'primary';
 
     ui.error.textContent = '';
     ui.promptDrafts = {
@@ -4428,7 +4429,7 @@
       ui.intentWrap.setAttribute('aria-hidden', hasPresetIntent ? 'true' : 'false');
     }
     ui.setIntent(type);
-    ui.setMode('primary');
+    ui.setMode(mode);
     if (name) {
       ui.nameInput.value = name;
       scheduleNameValidation(ui);

package/server/socket.js

@@ -681,26 +681,62 @@ class Socket {
     return false
   }
 
+  homeRelativePath(targetPath) {
+    const home = this.parent && this.parent.kernel ? this.parent.kernel.homedir : ''
+    if (!home || !targetPath || !path.isAbsolute(targetPath)) return null
+    const relative = path.relative(path.resolve(home), path.resolve(targetPath))
+    if (relative === '..' || relative.startsWith('..' + path.sep) || path.isAbsolute(relative)) return null
+    return relative
+  }
+
+  validLogCwd(cwd) {
+    if (typeof cwd !== 'string') return ''
+    const trimmed = cwd.trim()
+    if (!trimmed || trimmed.toLowerCase() === 'undefined' || trimmed.toLowerCase() === 'null') return ''
+    if (this.homeRelativePath(trimmed) === null) return ''
+    return path.resolve(trimmed)
+  }
+
+  async appLogRootFromCwd(cwd) {
+    cwd = this.validLogCwd(cwd)
+    if (!cwd) return ''
+    const relative = this.homeRelativePath(cwd)
+    if (relative === null) return ''
+    const parts = relative.split(path.sep).filter(Boolean)
+    if (parts[0] !== "api" || !parts[1]) return ''
+    const appDir = this.parent.kernel.path("api", parts[1])
+    const root = await Environment.get_root({ path: appDir }, this.parent.kernel)
+    const appRoot = root.root
+    if (path.resolve(cwd) !== path.resolve(appDir) && path.resolve(cwd) !== path.resolve(appRoot)) return ''
+    return appRoot
+  }
+
+  async appLogRootFromKey(key) {
+    let m = /\?.*$/.exec(key)
+    if (!m || m.length === 0) return ''
+    let paramStr = m[0]
+    let cwd = new URL("http://localhost" + paramStr).searchParams.get("cwd")
+    return this.appLogRootFromCwd(cwd)
+  }
+
   async resolveLogDir(key) {
     if (path.isAbsolute(key)) {
       let p = key.replace(/\?.*$/, '')
-      let relative = path.relative(this.parent.kernel.homedir, p)
-      if (relative.startsWith("plugin")) {
-        let m = /\?.*$/.exec(key)
-        if (m && m.length > 0) {
-          let paramStr = m[0]
-          let cwd = new URL("http://localhost" + paramStr).searchParams.get("cwd")
-          let root = await Environment.get_root({ path: cwd }, this.parent.kernel)
-          cwd = root.root
-          return path.resolve(cwd, "logs/dev", relative)
-        }
-      } else if (relative.startsWith("api")) {
-        let filepath_chunks = relative.split(path.sep).slice(2)
-        let cwd = this.parent.kernel.path(...relative.split(path.sep).slice(0, 2))
+      let relative = this.homeRelativePath(p)
+      if (relative === null) return null
+      let relative_parts = relative.split(path.sep).filter(Boolean)
+      if (relative_parts[0] === "api" && relative_parts[1]) {
+        let filepath_chunks = relative_parts.slice(2)
+        let cwd = this.parent.kernel.path(...relative_parts.slice(0, 2))
         let root = await Environment.get_root({ path: cwd }, this.parent.kernel)
         cwd = root.root
         return path.resolve(cwd, "logs/api", ...filepath_chunks)
       }
+      let appRoot = await this.appLogRootFromKey(key)
+      if (appRoot) {
+        return path.resolve(appRoot, "logs/dev", relative)
+      }
+      return path.resolve(this.parent.kernel.homedir, "logs", relative)
     } else {
       if (typeof key === 'string' && key.startsWith("shell/")) {
         let unix_id = key.slice(6)
@@ -772,94 +808,18 @@ class Socket {
 
   async log_buffer(key, buf, meta) {
     const resolvedMeta = meta || this.logMeta[key] || { source: 'shell', method: 'shell' }
+    const logpath = await this.resolveLogDir(key)
+    if (!logpath) return
+    let session = this.sessions[key]
 
-    /*
-      
-      dev
-        /Users/x/pinokio/plugin/dev/claude.json?cwd=/Users/x/pinokio/api/audioplay
-        /Users/x/pinokio/plugin/dev/gemini.json?cwd=/Users/x/pinokio/api/audioplay
-
-      api 
-        /Users/x/pinokio/api/audioplay/start.json
-
-      shell
-        facefusion-pinokio.git_0.0_a56eb7d48c9e96d8a5217d625d83d204
-        facefusion-pinokio.git_0.0_a56eb7d48c9e96d8a5217d625d83d204
-        audioplay_0.0_a56eb7d48c9e96d8a5217d625d83d204
-    */
-
-    // 1. dev
-    if (path.isAbsolute(key)) {
-      let p = key.replace(/\?.*$/, '')
-      let relative = path.relative(this.parent.kernel.homedir, p)
-      if (relative.startsWith("plugin")) {
-        // dev
-        let m = /\?.*$/.exec(key)
-        if (m && m.length > 0) {
-          /*
-          DEV Changed {
-            cwd: '/Users/x/pinokio/api/audioplay',
-            relative: 'plugin/dev/claude.json'
-          }
-          */
-          let paramStr = m[0]
-          let cwd = new URL("http://localhost" + paramStr).searchParams.get("cwd")
-          let root = await Environment.get_root({ path: cwd }, this.parent.kernel)
-          cwd = root.root
-          let session = this.sessions[key]
-          //let logpath = path.resolve(cwd, "logs/dev", path.parse(relative).base)
-          let logpath = path.resolve(cwd, "logs/dev", relative)
-          const raw = this.rawLog[key] || ""
-          const tagged = buf ? this.tagLines(resolvedMeta, buf) : ""
-          const content = [raw, tagged].filter(Boolean).join("\n")
-          await Util.log(logpath, content, session)
-        }
-      } else if (relative.startsWith("api")) {
-        // api
-        /*
-        API Changed {
-          cwd: '/Users/x/pinokio/api/audioplay/start.json',
-          filepath: [ 'start.json' ]
-        }
-        */
-        let filepath_chunks = relative.split(path.sep).slice(2)
-        let cwd = this.parent.kernel.path(...relative.split(path.sep).slice(0, 2))
-        let root = await Environment.get_root({ path: cwd }, this.parent.kernel)
-        cwd = root.root
-        let session = this.sessions[key]
-        let logpath = path.resolve(cwd, "logs/api", ...filepath_chunks)
-        const raw = this.rawLog[key] || ""
-        const tagged = buf ? this.tagLines(resolvedMeta, buf) : ""
-        const content = [raw, tagged].filter(Boolean).join("\n")
-        await Util.log(logpath, content, session)
-      }
+    if (typeof key === 'string' && key.startsWith("shell/")) {
+      const content = buf || ""
+      await Util.log(logpath, content, session)
     } else {
-      // Only log SHELL
-      /*
-        examples:
-          key: facefusion-pinokio.git_0.0_a56eb7d48c9e96d8a5217d625d83d204
-          key: facefusion-pinokio.git_0.0_a56eb7d48c9e96d8a5217d625d83d204
-          key: audioplay_0.0_a56eb7d48c9e96d8a5217d625d83d204
-
-          key: shell:/Users/x/pinokio/api/comfy.git_0.0.0_session_6e89dd5ef73b94e728634729d08a3cf1
-
-      */
-
-      if (key.startsWith("shell/")) {
-        let unix_id = key.slice(6)
-        let unix_path = unix_id.split("_")[0]
-        let native_path = Util.u2p(unix_path)
-        let native_path_exists = await new Promise(r=>fs.access(native_path, fs.constants.F_OK, e => r(!e)))
-        if (native_path_exists) {
-          let cwd = native_path
-          let root = await Environment.get_root({ path: cwd }, this.parent.kernel)
-          cwd = root.root
-          let session = this.sessions[key]
-          let logpath = path.resolve(cwd, "logs/shell")
-          const content = buf || ""
-          await Util.log(logpath, content, session)
-        }
-      }
+      const raw = this.rawLog[key] || ""
+      const tagged = buf ? this.tagLines(resolvedMeta, buf) : ""
+      const content = [raw, tagged].filter(Boolean).join("\n")
+      await Util.log(logpath, content, session)
     }
   }
 }