@wrongstack/desktop 0.283.1 → 0.284.0

package/dist/main/main.js

@@ -404,6 +404,7 @@ import { spawn } from "child_process";
 import { randomBytes } from "crypto";
 import { EventEmitter } from "events";
 import * as fs2 from "fs/promises";
+import { existsSync } from "fs";
 import * as http from "http";
 import { createRequire } from "module";
 import * as net from "net";
@@ -588,6 +589,7 @@ var DesktopRuntimeManager = class extends EventEmitter {
     this.emitChanged();
     try {
       const entry = resolveWebUiEntry();
+      const distDir = resolveWebUiDistDir();
       const child = spawn(
         process.execPath,
         [
@@ -598,6 +600,8 @@ var DesktopRuntimeManager = class extends EventEmitter {
           String(httpPort),
           "--ws-port",
           String(wsPort),
+          "--dist-dir",
+          distDir,
           "--token",
           token,
           "--require-token"
@@ -628,9 +632,19 @@ var DesktopRuntimeManager = class extends EventEmitter {
         this.scheduleLogChanged(runtime);
         process.stderr.write(`[desktop:${runtime.id}] ${text}`);
       });
+      child.once("error", (err) => {
+        runtime.status = "error";
+        runtime.error = toErrorMessage(err);
+        runtime.child = null;
+        if (this.activeRuntimeId === runtime.id) {
+          this.activeRuntimeId = firstRunningRuntimeId(this.runtimes);
+        }
+        this.emitChanged();
+      });
       child.once("exit", (code, signal) => {
-        runtime.status = runtime.status === "error" ? "error" : "stopped";
-        runtime.error = runtime.status === "error" ? runtime.error : code === 0 ? void 0 : `Exited with ${signal ?? `code ${code ?? "unknown"}`}`;
+        if (runtime.status === "error") return;
+        runtime.status = "stopped";
+        runtime.error = code === 0 ? void 0 : `Exited with ${signal ?? `code ${code ?? "unknown"}`}`;
         runtime.child = null;
         if (this.activeRuntimeId === runtime.id) {
           this.activeRuntimeId = firstRunningRuntimeId(this.runtimes);
@@ -638,15 +652,25 @@ var DesktopRuntimeManager = class extends EventEmitter {
         this.emitChanged();
       });
       await waitForHttpReady(runtime.url, token, START_TIMEOUT_MS);
+      if (runtime.status !== "starting") {
+        throw new Error(runtime.error ?? "WebUI process exited during startup");
+      }
       runtime.status = "running";
       await this.persistWorkspaceState();
       this.emitChanged();
       return publicRuntime(runtime);
     } catch (err) {
-      runtime.status = "error";
-      runtime.error = toErrorMessage(err);
+      if (runtime.status !== "stopped" && runtime.status !== "error") {
+        runtime.status = "error";
+      }
+      if (runtime.error === void 0) {
+        runtime.error = toErrorMessage(err);
+      }
       await terminateProcessTree(runtime.child);
       runtime.child = null;
+      if (this.activeRuntimeId === runtime.id) {
+        this.activeRuntimeId = firstRunningRuntimeId(this.runtimes);
+      }
       this.emitChanged();
       throw err;
     }
@@ -692,7 +716,6 @@ var DesktopRuntimeManager = class extends EventEmitter {
   async unregisterProject(projectRoot) {
     const resolved = path2.resolve(projectRoot);
     this.registeredProjects = await removeGlobalProjectManifest(resolved);
-    this.recentProjects = this.recentProjects.filter((project) => !samePath(project.root, resolved));
     await this.saveDesktopState();
     this.emitChanged();
   }
@@ -750,7 +773,7 @@ var DesktopRuntimeManager = class extends EventEmitter {
         openProjects
       );
       return {
-        recentProjects: Array.isArray(parsed.recentProjects) ? parsed.recentProjects : [],
+        recentProjects: normalizeProjectEntries(parsed.recentProjects),
         openProjects,
         openProjectSessions,
         activeRuntimeId: normalizeRuntimeId(parsed.activeRuntimeId) ?? null,
@@ -1011,25 +1034,81 @@ function resolveWebUiEntry() {
     return path2.resolve(process.env["WRONGSTACK_WEBUI_ENTRY"]);
   }
   const require2 = createRequire(import.meta.url);
+  try {
+    const serverPkgPath = require2.resolve("@wrongstack/webui-server/package.json");
+    const candidate = path2.join(path2.dirname(serverPkgPath), "dist", "server", "entry.js");
+    if (existsSync(candidate)) return candidate;
+  } catch {
+  }
   const serverIndex = require2.resolve("@wrongstack/webui/server");
   return path2.join(path2.dirname(serverIndex), "entry.js");
 }
+function resolveWebUiDistDir() {
+  if (process.env["WRONGSTACK_WEBUI_DIST"]) {
+    return path2.resolve(process.env["WRONGSTACK_WEBUI_DIST"]);
+  }
+  const require2 = createRequire(import.meta.url);
+  const serverIndex = require2.resolve("@wrongstack/webui/server");
+  const candidate = path2.resolve(path2.dirname(serverIndex), "..");
+  if (existsSync(candidate)) return candidate;
+  throw new Error(
+    `WebUI frontend assets not found at ${candidate}. Build @wrongstack/webui or set WRONGSTACK_WEBUI_DIST.`
+  );
+}
 async function readGlobalProjectManifest() {
   const manifestFile = path2.join(wstackGlobalRoot2(), "projects.json");
   try {
     const raw = await fs2.readFile(manifestFile, "utf8");
-    const parsed = JSON.parse(raw);
-    const projects = Array.isArray(parsed.projects) ? parsed.projects : [];
-    return projects.filter((project) => typeof project?.root === "string" && project.root.trim()).map((project) => ({
-      ...project,
-      name: project.name || path2.basename(project.root) || project.root,
-      root: path2.resolve(project.root),
-      slug: project.slug || projectSlug(path2.resolve(project.root))
-    })).sort((a, b) => (b.lastSeen ?? b.createdAt ?? "").localeCompare(a.lastSeen ?? a.createdAt ?? "")).slice(0, 80);
+    return normalizeProjectManifest(JSON.parse(raw));
   } catch {
     return [];
   }
 }
+function normalizeProjectManifest(value) {
+  if (Array.isArray(value)) return normalizeProjectEntries(value).slice(0, 80);
+  if (!value || typeof value !== "object") return [];
+  const manifest = value;
+  const source = Array.isArray(manifest.projects) ? manifest.projects : Array.isArray(manifest.recentProjects) ? manifest.recentProjects : Array.isArray(manifest.recents) ? manifest.recents : [];
+  return normalizeProjectEntries(source).slice(0, 80);
+}
+function normalizeProjectEntries(value) {
+  if (!Array.isArray(value)) return [];
+  const seen = /* @__PURE__ */ new Set();
+  const projects = [];
+  for (const item of value) {
+    const project = normalizeProjectEntry(item);
+    if (!project) continue;
+    const key = pathKey(project.root);
+    if (seen.has(key)) continue;
+    seen.add(key);
+    projects.push(project);
+  }
+  return projects.sort(
+    (a, b) => (b.lastSeen ?? b.createdAt ?? "").localeCompare(a.lastSeen ?? a.createdAt ?? "")
+  );
+}
+function normalizeProjectEntry(value) {
+  if (!value || typeof value !== "object") return null;
+  const candidate = value;
+  if (typeof candidate.root !== "string" || !candidate.root.trim()) return null;
+  const root = path2.resolve(candidate.root);
+  const name = typeof candidate.name === "string" && candidate.name.trim() ? candidate.name.trim() : path2.basename(root) || root;
+  const entry = {
+    name,
+    root,
+    slug: typeof candidate.slug === "string" && candidate.slug.trim() ? candidate.slug.trim() : projectSlug(root)
+  };
+  if (typeof candidate.lastSeen === "string" && candidate.lastSeen.trim()) {
+    entry.lastSeen = candidate.lastSeen.trim();
+  }
+  if (typeof candidate.createdAt === "string" && candidate.createdAt.trim()) {
+    entry.createdAt = candidate.createdAt.trim();
+  }
+  if (typeof candidate.lastWorkingDir === "string" && candidate.lastWorkingDir.trim()) {
+    entry.lastWorkingDir = path2.resolve(candidate.lastWorkingDir);
+  }
+  return entry;
+}
 async function touchGlobalProjectManifest(entry) {
   const manifestFile = path2.join(wstackGlobalRoot2(), "projects.json");
   const projects = await readGlobalProjectManifest();