@surething/cockpit 1.0.248 → 1.0.250

package/.next-prod/trace-build

@@ -1 +1 @@
-[{"name":"run-webpack","duration":19542636,"timestamp":265259864,"id":14,"parentId":1,"tags":{},"startTime":1784734691672,"traceId":"6e82f9e117ec3c81"},{"name":"run-typescript","duration":18233820,"timestamp":284806379,"id":1661,"parentId":1,"tags":{},"startTime":1784734711218,"traceId":"6e82f9e117ec3c81"},{"name":"static-check","duration":1143131,"timestamp":303082866,"id":1664,"parentId":1,"tags":{},"startTime":1784734729495,"traceId":"6e82f9e117ec3c81"},{"name":"static-generation","duration":6391359,"timestamp":304328236,"id":1950,"parentId":1,"tags":{},"startTime":1784734730740,"traceId":"6e82f9e117ec3c81"},{"name":"collect-build-traces","duration":19716907,"timestamp":304226644,"id":1947,"parentId":1,"tags":{},"startTime":1784734730639,"traceId":"6e82f9e117ec3c81"},{"name":"telemetry-flush","duration":57,"timestamp":323948071,"id":1959,"parentId":1,"tags":{},"startTime":1784734750360,"traceId":"6e82f9e117ec3c81"},{"name":"next-build","duration":58859929,"timestamp":265088212,"id":1,"tags":{"buildMode":"default","version":"16.2.6","bundler":"webpack","has-custom-webpack-config":"true","use-build-worker":"false"},"startTime":1784734691500,"traceId":"6e82f9e117ec3c81"}]
+[{"name":"run-webpack","duration":21204513,"timestamp":158342350,"id":14,"parentId":1,"tags":{},"startTime":1785123289742,"traceId":"1d7c019e30e11c5a"},{"name":"run-typescript","duration":19338369,"timestamp":179556878,"id":1661,"parentId":1,"tags":{},"startTime":1785123310957,"traceId":"1d7c019e30e11c5a"},{"name":"static-check","duration":1190470,"timestamp":198938299,"id":1664,"parentId":1,"tags":{},"startTime":1785123330338,"traceId":"1d7c019e30e11c5a"},{"name":"static-generation","duration":6633722,"timestamp":200241609,"id":1950,"parentId":1,"tags":{},"startTime":1785123331642,"traceId":"1d7c019e30e11c5a"},{"name":"collect-build-traces","duration":20373640,"timestamp":200129415,"id":1947,"parentId":1,"tags":{},"startTime":1785123331529,"traceId":"1d7c019e30e11c5a"},{"name":"telemetry-flush","duration":59,"timestamp":220507279,"id":1959,"parentId":1,"tags":{},"startTime":1785123351907,"traceId":"1d7c019e30e11c5a"},{"name":"next-build","duration":62338525,"timestamp":158168826,"id":1,"tags":{"buildMode":"default","version":"16.2.6","bundler":"webpack","has-custom-webpack-config":"true","use-build-worker":"false"},"startTime":1785123289569,"traceId":"1d7c019e30e11c5a"}]

package/dist/scheduledTasks.mjs

@@ -2046,63 +2046,73 @@ function resolveCommandPrompt(prompt, language = "en", _req) {
   const userSkills = listUserSkills();
   const isKnown = (cmd) => !!COMMAND_CONTENT[cmd] || userSkills.some((s) => s.name === cmd);
   const lines = prompt.split("\n");
-  const marks = [];
+  const cmds = [];
   lines.forEach((line, i) => {
     const m = line.match(COMMAND_LINE_RE);
     if (m && isKnown(m[2])) {
-      marks.push({ i, marker: m[1], cmd: m[2], rest: line.slice(m[0].length) });
+      cmds.push({ i, marker: m[1], cmd: m[2], rest: line.slice(m[0].length).trim() });
     }
   });
-  if (marks.length === 0) return prompt;
-  const preamble = lines.slice(0, marks[0].i).join("\n").trim();
-  const steps = marks.map((mk, idx) => {
-    const end = idx + 1 < marks.length ? marks[idx + 1].i : lines.length;
-    const body = [mk.rest, ...lines.slice(mk.i + 1, end)].join("\n").trim();
-    return { marker: mk.marker, cmd: mk.cmd, body };
-  });
+  if (cmds.length === 0) return prompt;
+  const showLocus = cmds.length >= 2 || cmds.some((c) => c.marker === "@");
   const baseUrl = deriveBaseUrl();
-  const resolved = steps.map((s) => resolveStep(s, lang, baseUrl, userSkills));
-  const then = lang === "zh" ? "\u7136\u540E\uFF1A" : "Then: ";
-  if (resolved.length === 1 && resolved[0].marker === "/" && !preamble) {
-    const r = resolved[0];
-    return r.body ? `${r.pointer}
-
-${then}${r.body}` : r.pointer;
-  }
-  const intro = lang === "zh" ? "\u8BF7\u6309\u4EE5\u4E0B\u6B65\u9AA4\u4F9D\u6B21\u5B8C\u6210\uFF1A" : "Complete the following steps in order:";
-  const blocks = resolved.map((r, idx) => {
-    const where = stepHeader(idx + 1, r.marker, lang);
-    const bodyPart = r.body ? `
-${then}${r.body}` : "";
-    return `${where}
-${r.pointer}${bodyPart}`;
+  const rendered = /* @__PURE__ */ new Map();
+  const consumed = /* @__PURE__ */ new Set();
+  const listed = [];
+  const seen = /* @__PURE__ */ new Set();
+  cmds.forEach((c, k) => {
+    const nextCmd = k + 1 < cmds.length ? cmds[k + 1].i : lines.length;
+    const bodyLines = [];
+    if (c.rest) bodyLines.push(c.rest);
+    for (let j = c.i + 1; j < nextCmd; j++) {
+      if (lines[j].trim() === "") break;
+      bodyLines.push(lines[j].trim());
+      consumed.add(j);
+    }
+    const ref = resolveSkillRef(c.cmd, lang, baseUrl, userSkills);
+    rendered.set(c.i, renderCommandLine(c.marker, ref, bodyLines.join("\n"), lang, showLocus));
+    if (ref.path && !seen.has(ref.name)) {
+      seen.add(ref.name);
+      listed.push({ name: ref.name, path: ref.path });
+    }
   });
-  const parts = [];
-  if (preamble) parts.push(preamble);
-  parts.push(intro, blocks.join("\n\n"));
-  return parts.join("\n\n");
+  const out = [];
+  for (let i = 0; i < lines.length; i++) {
+    if (consumed.has(i)) continue;
+    out.push(rendered.get(i) ?? lines[i]);
+  }
+  let result = out.join("\n");
+  if (listed.length > 0) {
+    const header = lang === "zh" ? "\u8BF7\u5148\u8BFB\u53D6\u4EE5\u4E0B skill \u6587\u4EF6\uFF0C\u518D\u636E\u6B64\u6267\u884C\uFF1A" : "Read these skill files first, then act accordingly:";
+    const sep = lang === "zh" ? "\uFF1A" : ": ";
+    const entries = listed.map((s) => `- ${s.name}${sep}${s.path}`).join("\n");
+    result = `${result}
+
+${header}
+${entries}`;
+  }
+  return result;
 }
-function resolveStep(step, lang, baseUrl, userSkills) {
-  const skill = userSkills.find((s) => s.name === step.cmd);
-  if (skill) {
-    return { marker: step.marker, body: step.body, pointer: readSkillPointer(skill.path, lang) };
+function renderCommandLine(marker, ref, body, lang, showLocus) {
+  if (ref.path) {
+    const tag = showLocus ? `[${locusWord(marker, lang)}\xB7${ref.name}]` : `[${ref.name}]`;
+    return body ? `${tag} ${body}` : tag;
   }
-  const entry = COMMAND_CONTENT[step.cmd];
-  const content = entry[lang].replaceAll("{{BASE_URL}}", baseUrl);
-  const skillPath = writeBuiltinSkill(step.cmd, content);
-  const pointer = skillPath ? readSkillPointer(skillPath, lang) : content;
-  return { marker: step.marker, body: step.body, pointer };
+  const locus = showLocus ? `[${locusWord(marker, lang)}] ` : "";
+  const then = body ? lang === "zh" ? `\uFF0C\u7136\u540E\uFF1A${body}` : `, then: ${body}` : "";
+  return `${locus}${ref.content ?? ""}${then}`;
 }
-function readSkillPointer(skillPath, lang) {
-  return lang === "zh" ? `\u8BF7\u8BFB\u53D6\u8FD9\u4E2A skill \u6587\u4EF6\uFF1A
-${skillPath}` : `Please read this skill file:
-${skillPath}`;
+function locusWord(marker, lang) {
+  if (marker === "@") return "subagent";
+  return lang === "zh" ? "\u4E3B\u4F1A\u8BDD" : "main session";
 }
-function stepHeader(n, marker, lang) {
-  if (lang === "zh") {
-    return marker === "@" ? `\u6B65\u9AA4 ${n}\uFF08\u7528 subagent \u6267\u884C\uFF09\uFF1A` : `\u6B65\u9AA4 ${n}\uFF08\u4E3B\u4F1A\u8BDD\u6267\u884C\uFF09\uFF1A`;
-  }
-  return marker === "@" ? `Step ${n} (run in a subagent): ` : `Step ${n} (run in the main session): `;
+function resolveSkillRef(cmd, lang, baseUrl, userSkills) {
+  const skill = userSkills.find((s) => s.name === cmd);
+  if (skill) return { name: cmd, path: skill.path, content: null };
+  const entry = COMMAND_CONTENT[cmd];
+  const content = entry[lang].replaceAll("{{BASE_URL}}", baseUrl);
+  const skillPath = writeBuiltinSkill(cmd, content);
+  return skillPath ? { name: cmd, path: skillPath, content: null } : { name: cmd, path: null, content };
 }
 function listUserSkills() {
   try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@surething/cockpit",
-  "version": "1.0.248",
+  "version": "1.0.250",
   "description": "The open-source Claude Code GUI — an IDE-like workbench for parallel AI coding. Drive Claude (default), Codex, DeepSeek, Kimi, or local Ollama in tabs. Terminal, browser & DB bubbles, code review. Self-host on a shared dev box — a seat for every teammate. Local-first, MIT.",
   "author": "Robert",
   "license": "MIT",
@@ -74,6 +74,7 @@
     "server.mjs",
     "dist",
     ".next-prod",
+    "!.next-prod/cache",
     "kernels",
     "next.config.mjs",
     "scripts/copy-tree-sitter-wasms.mjs",