@surething/cockpit 1.0.224 → 1.0.226

package/dist/{chunk-BM3ZNL5S.mjs → chunk-R564FMS3.mjs}

@@ -13,7 +13,7 @@ import {
   getTerminalOutputPath,
   readJsonFile,
   writeJsonFile
-} from "./chunk-5BOGGUGT.mjs";
+} from "./chunk-GFI4IHYM.mjs";
 
 // packages/feature/console/src/server/plugins/browser/BrowserBridge.ts
 import { WebSocket } from "ws";
@@ -437,24 +437,24 @@ var REVERSE_KEY = /* @__PURE__ */ Symbol.for("terminal_bridge_reverse");
 var OUTPUT_LISTENERS_KEY = /* @__PURE__ */ Symbol.for("terminal_bridge_output_listeners");
 var EXIT_LISTENERS_KEY = /* @__PURE__ */ Symbol.for("terminal_bridge_exit_listeners");
 function getRegistry() {
-  const g2 = globalThis;
-  if (!g2[REGISTRY_KEY]) g2[REGISTRY_KEY] = /* @__PURE__ */ new Map();
-  return g2[REGISTRY_KEY];
+  const g3 = globalThis;
+  if (!g3[REGISTRY_KEY]) g3[REGISTRY_KEY] = /* @__PURE__ */ new Map();
+  return g3[REGISTRY_KEY];
 }
 function getReverseIndex() {
-  const g2 = globalThis;
-  if (!g2[REVERSE_KEY]) g2[REVERSE_KEY] = /* @__PURE__ */ new Map();
-  return g2[REVERSE_KEY];
+  const g3 = globalThis;
+  if (!g3[REVERSE_KEY]) g3[REVERSE_KEY] = /* @__PURE__ */ new Map();
+  return g3[REVERSE_KEY];
 }
 function getOutputListeners() {
-  const g2 = globalThis;
-  if (!g2[OUTPUT_LISTENERS_KEY]) g2[OUTPUT_LISTENERS_KEY] = /* @__PURE__ */ new Map();
-  return g2[OUTPUT_LISTENERS_KEY];
+  const g3 = globalThis;
+  if (!g3[OUTPUT_LISTENERS_KEY]) g3[OUTPUT_LISTENERS_KEY] = /* @__PURE__ */ new Map();
+  return g3[OUTPUT_LISTENERS_KEY];
 }
 function getExitListeners() {
-  const g2 = globalThis;
-  if (!g2[EXIT_LISTENERS_KEY]) g2[EXIT_LISTENERS_KEY] = /* @__PURE__ */ new Map();
-  return g2[EXIT_LISTENERS_KEY];
+  const g3 = globalThis;
+  if (!g3[EXIT_LISTENERS_KEY]) g3[EXIT_LISTENERS_KEY] = /* @__PURE__ */ new Map();
+  return g3[EXIT_LISTENERS_KEY];
 }
 function registerTerminal(tabId, commandId, command, projectCwd) {
   const fullId = tabId + commandId;
@@ -538,6 +538,33 @@ function notifyExitListeners(commandId, exitCode) {
 
 // packages/feature/console/src/server/terminal/RunningCommandRegistry.ts
 import fs from "fs/promises";
+import { writeFileSync, mkdirSync } from "fs";
+import { dirname } from "path";
+
+// packages/feature/console/src/server/terminal/consoleBroadcast.ts
+var WS_OPEN = 1;
+var g2 = globalThis;
+function broadcastConsoleDelta(cwd, tabId, delta, sourceId) {
+  const set = g2.__cockpitGlobalStateClients;
+  if (!set || set.size === 0) return;
+  const data = JSON.stringify({
+    type: "console-delta",
+    cwd,
+    tabId,
+    sourceId,
+    ...delta
+  });
+  for (const ws of set) {
+    if (ws.readyState === WS_OPEN) {
+      try {
+        ws.send(data);
+      } catch {
+      }
+    }
+  }
+}
+
+// packages/feature/console/src/server/terminal/RunningCommandRegistry.ts
 var MAX_OUTPUT_LINES = 5e3;
 var OUTPUT_FILE_THRESHOLD = 4096;
 var PTY_RING_BUFFER_MAX = 2 * 1024 * 1024;
@@ -603,20 +630,20 @@ function findSafeStart(s) {
 var GLOBAL_KEY2 = /* @__PURE__ */ Symbol.for("terminal_running_commands");
 var SERVER_ID_KEY = /* @__PURE__ */ Symbol.for("terminal_server_id");
 function getServerId() {
-  const g2 = globalThis;
-  if (!g2[SERVER_ID_KEY]) {
-    g2[SERVER_ID_KEY] = `srv_${Date.now()}_${process.pid}`;
-    console.log(`[registry] server started, id=${g2[SERVER_ID_KEY]}, pid=${process.pid}`);
+  const g3 = globalThis;
+  if (!g3[SERVER_ID_KEY]) {
+    g3[SERVER_ID_KEY] = `srv_${Date.now()}_${process.pid}`;
+    console.log(`[registry] server started, id=${g3[SERVER_ID_KEY]}, pid=${process.pid}`);
   }
-  return g2[SERVER_ID_KEY];
+  return g3[SERVER_ID_KEY];
 }
 getServerId();
 function getRegistry2() {
-  const g2 = globalThis;
-  if (!g2[GLOBAL_KEY2]) {
-    g2[GLOBAL_KEY2] = /* @__PURE__ */ new Map();
+  const g3 = globalThis;
+  if (!g3[GLOBAL_KEY2]) {
+    g3[GLOBAL_KEY2] = /* @__PURE__ */ new Map();
   }
-  return g2[GLOBAL_KEY2];
+  return g3[GLOBAL_KEY2];
 }
 function registerCommand(cmd) {
   console.log(`[registry] register: id=${cmd.commandId}, cmd="${cmd.command}", pid=${cmd.pid}, pty=${!!cmd.ptyProcess}, server=${getServerId()}`);
@@ -630,7 +657,7 @@ function registerCommand(cmd) {
   };
   getRegistry2().set(cmd.commandId, entry);
   registerTerminal(cmd.tabId, cmd.commandId, cmd.command, cmd.projectCwd);
-  writeHistoryPlaceholder(cmd.commandId, cmd.command, cmd.timestamp, cmd.cwd, cmd.projectCwd, cmd.tabId, !!cmd.usePty).catch(() => {
+  writeHistoryPlaceholder(cmd.commandId, cmd.command, cmd.timestamp, cmd.cwd, cmd.projectCwd, cmd.tabId, !!cmd.usePty, cmd.sourceId).catch(() => {
   });
   if (cmd.ptyProcess) {
     const pty = cmd.ptyProcess;
@@ -735,7 +762,7 @@ function getAllProjectCwds() {
   }
   return [...cwds];
 }
-async function writeHistoryPlaceholder(commandId, command, timestamp, cwd, projectCwd, tabId, usePty) {
+async function writeHistoryPlaceholder(commandId, command, timestamp, cwd, projectCwd, tabId, usePty, sourceId) {
   const historyPath = getTerminalHistoryPath(projectCwd, tabId);
   await ensureParentDir(historyPath);
   const entry = {
@@ -753,20 +780,39 @@ async function writeHistoryPlaceholder(commandId, command, timestamp, cwd, proje
     existingLines = content.trim().split("\n").filter(Boolean);
   } catch {
   }
-  if (existingLines.length >= 100) {
-    const removedLines = existingLines.slice(0, existingLines.length - 99);
-    for (const line of removedLines) {
-      try {
-        const old = JSON.parse(line);
-        if (old.outputFile) await fs.unlink(old.outputFile).catch(() => {
-        });
-      } catch {
+  let isRerun = false;
+  for (let i = 0; i < existingLines.length; i++) {
+    try {
+      if (JSON.parse(existingLines[i]).id === commandId) {
+        existingLines[i] = JSON.stringify(entry);
+        isRerun = true;
+        break;
+      }
+    } catch {
+    }
+  }
+  if (!isRerun) {
+    if (existingLines.length >= 100) {
+      const removedLines = existingLines.slice(0, existingLines.length - 99);
+      for (const line of removedLines) {
+        try {
+          const old = JSON.parse(line);
+          if (old.outputFile) await fs.unlink(old.outputFile).catch(() => {
+          });
+        } catch {
+        }
       }
+      existingLines = existingLines.slice(-99);
     }
-    existingLines = existingLines.slice(-99);
+    existingLines.push(JSON.stringify(entry));
   }
-  existingLines.push(JSON.stringify(entry));
   await fs.writeFile(historyPath, existingLines.join("\n") + "\n", "utf-8");
+  broadcastConsoleDelta(
+    projectCwd,
+    tabId,
+    isRerun ? { op: "rerun", entry } : { op: "add", entry },
+    sourceId
+  );
 }
 async function finalizeCommand(commandId, exitCode, pid) {
   const registry2 = getRegistry2();
@@ -818,6 +864,69 @@ async function finalizeCommand(commandId, exitCode, pid) {
     existingLines.push(JSON.stringify(entry));
   }
   await fs.writeFile(historyPath, existingLines.join("\n") + "\n", "utf-8");
+  broadcastConsoleDelta(cmd.projectCwd, cmd.tabId, {
+    op: "update",
+    id: cmd.commandId,
+    fields: { running: false, exitCode }
+  }, cmd.sourceId);
+}
+var INTERRUPTED_EXIT_CODE = -1;
+function flushAllRunningSync() {
+  const registry2 = getRegistry2();
+  for (const cmd of registry2.values()) {
+    const buf = cmd.ptyRingBuffer;
+    if (!buf || buf.length === 0) continue;
+    try {
+      const outputPath = getTerminalOutputPath(cmd.projectCwd, cmd.commandId);
+      mkdirSync(dirname(outputPath), { recursive: true });
+      writeFileSync(outputPath, buf.snapshot(), "utf-8");
+    } catch {
+    }
+  }
+}
+async function reconcileOrphanedRunning(projectCwd, tabId) {
+  const historyPath = getTerminalHistoryPath(projectCwd, tabId);
+  let content;
+  try {
+    content = await fs.readFile(historyPath, "utf-8");
+  } catch {
+    return;
+  }
+  const lines = content.trim().split("\n").filter(Boolean);
+  if (lines.length === 0) return;
+  const byId = /* @__PURE__ */ new Map();
+  let changed = false;
+  for (const line of lines) {
+    let entry;
+    try {
+      entry = JSON.parse(line);
+    } catch {
+      changed = true;
+      continue;
+    }
+    const id = entry.id;
+    if (!id) continue;
+    if (byId.has(id)) changed = true;
+    byId.delete(id);
+    byId.set(id, entry);
+  }
+  for (const entry of byId.values()) {
+    if (entry.running !== true) continue;
+    const id = entry.id;
+    if (getRunningCommand(id)) continue;
+    delete entry.running;
+    entry.exitCode = INTERRUPTED_EXIT_CODE;
+    const outputPath = getTerminalOutputPath(projectCwd, id);
+    try {
+      const stat = await fs.stat(outputPath);
+      if (stat.size > 0) entry.outputFile = outputPath;
+    } catch {
+    }
+    changed = true;
+  }
+  if (!changed) return;
+  const rewritten = [...byId.values()].map((e) => JSON.stringify(e)).join("\n") + "\n";
+  await fs.writeFile(historyPath, rewritten, "utf-8");
 }
 
 // packages/feature/console/src/server/terminal/writeStdin.ts
@@ -1145,6 +1254,22 @@ var POST = handler(
       try: () => writeJsonFile(orderPath, next),
       catch: (cause) => new FSError({ path: orderPath, op: "write", cause })
     });
+    if (hasOrder) {
+      broadcastConsoleDelta(
+        body.cwd,
+        body.tabId,
+        { op: "reorder", order: next.order },
+        body.sourceId
+      );
+    }
+    if (hasTitles) {
+      broadcastConsoleDelta(
+        body.cwd,
+        body.tabId,
+        { op: "rename", titles: body.titles },
+        body.sourceId
+      );
+    }
     return ok({ success: true });
   })
 );
@@ -1191,6 +1316,9 @@ export {
   getRegistrySize,
   getAllProjectCwds,
   finalizeCommand,
+  INTERRUPTED_EXIT_CODE,
+  flushAllRunningSync,
+  reconcileOrphanedRunning,
   writeStdinToCommand,
   stripAnsi,
   collapseCarriageReturn,

package/dist/httpApi.mjs

@@ -2,6 +2,7 @@ import {
   addExitListener,
   addOutputListener,
   createPendingRequest,
+  flushAllRunningSync,
   getBrowserByShortId,
   getBrowserHealth,
   getFirstAvailableLine,
@@ -21,10 +22,10 @@ import {
   unregisterBrowser,
   unregisterTerminal,
   writeStdinToCommand
-} from "./chunk-BM3ZNL5S.mjs";
+} from "./chunk-R564FMS3.mjs";
 import {
   getTerminalHistoryPath
-} from "./chunk-5BOGGUGT.mjs";
+} from "./chunk-GFI4IHYM.mjs";
 import "./chunk-7P6ASYW6.mjs";
 
 // src/lib/httpApi.ts
@@ -552,6 +553,7 @@ async function handleConnectionApi(req, res) {
   return true;
 }
 export {
+  flushAllRunningSync,
   handleBrowserApi,
   handleConnectionApi,
   handleTerminalApi