@yorz/cli 0.6.1 → 0.6.4

package/dist/cli/index.js

@@ -1,13 +1,14 @@
 #!/usr/bin/env node
-import { homedir, platform, networkInterfaces } from "node:os";
+import { homedir, platform } from "node:os";
 import { Command, Option } from "commander";
 import { stat, mkdir, readFile, writeFile, rename, rm, access, readdir, appendFile, copyFile } from "node:fs/promises";
 import { join, isAbsolute, resolve, basename as basename$1, dirname, extname, sep, relative, normalize } from "node:path";
 import { createHash, randomUUID, randomBytes } from "node:crypto";
 import { existsSync, openSync, closeSync, statSync, readSync, mkdirSync, watch, createReadStream } from "node:fs";
-import { spawn, execFile } from "node:child_process";
+import { spawn, execFile, execFileSync } from "node:child_process";
 import { promisify } from "node:util";
 import { serve } from "@hono/node-server";
+import { isIP } from "node:net";
 import { Hono } from "hono";
 import { streamSSE } from "hono/streaming";
 import { fileURLToPath } from "node:url";
@@ -22,7 +23,7 @@ import { createOpencode } from "@opencode-ai/sdk";
 import { createInterface as createInterface$1 } from "node:readline/promises";
 import MarkdownIt from "markdown-it";
 const name = "@yorz/cli";
-const version = "0.6.1";
+const version = "0.6.4";
 const type = "module";
 const description = "";
 const bin = { "yorz": "./dist/cli/index.js" };
@@ -861,12 +862,13 @@ function sanitize(text) {
   return cleaned.replace(/^-+|-+$/g, "").slice(0, 64);
 }
 function uniquify(name2, existing) {
-  if (!existing.includes(name2)) return name2;
+  const occupied = new Set(existing.map((item) => item.toLocaleLowerCase("en-US")));
+  if (!occupied.has(name2.toLocaleLowerCase("en-US"))) return name2;
   const ext = extname(name2);
   const base = stripExt(name2);
   for (let i = 1; i < 1e3; i++) {
     const candidate = `${base}-${i}${ext}`;
-    if (!existing.includes(candidate)) return candidate;
+    if (!occupied.has(candidate.toLocaleLowerCase("en-US"))) return candidate;
   }
   return `${base}-${randomUUID().slice(0, 4)}${ext}`;
 }
@@ -1712,6 +1714,22 @@ function createSessionsRoutes(resolveProject) {
   return app;
 }
 const execFileP$1 = promisify(execFile);
+function withHiddenWindowsConsole(options, platform2 = process.platform) {
+  if (platform2 !== "win32") return options;
+  return { ...options, windowsHide: true };
+}
+async function execFileWithoutWindow(file, args, options) {
+  const result = await execFileP$1(file, args, withHiddenWindowsConsole(options));
+  return { stdout: result.stdout, stderr: result.stderr };
+}
+function spawnWithoutWindow(command, args, options) {
+  return spawn(command, args, withHiddenWindowsConsole(options));
+}
+function resolveBrowserOpenInvocation(platform2, url) {
+  if (platform2 === "win32") return { command: "explorer.exe", args: [url] };
+  if (platform2 === "darwin") return { command: "open", args: [url] };
+  return { command: "xdg-open", args: [url] };
+}
 class GitError extends Error {
   code;
   stderr;
@@ -1766,7 +1784,7 @@ function assertSafeRelativePath(cwd, p) {
 }
 async function runGit(cwd, args) {
   try {
-    const result = await execFileP$1("git", args, {
+    const result = await execFileWithoutWindow("git", args, {
       cwd,
       encoding: "utf8",
       maxBuffer: 16 * 1024 * 1024
@@ -1785,7 +1803,7 @@ async function runGitChecked(cwd, args) {
 }
 async function runGitRaw(cwd, args) {
   try {
-    const result = await execFileP$1("git", args, {
+    const result = await execFileWithoutWindow("git", args, {
       cwd,
       encoding: "utf8",
       maxBuffer: 16 * 1024 * 1024
@@ -3404,6 +3422,8 @@ class CommandManager {
    */
   pendingEnds = /* @__PURE__ */ new Map();
   persisted = /* @__PURE__ */ new Set();
+  /** 记录由 API 主动停止的运行，防止 Windows exit 事件把 killed 覆盖成 exited。 */
+  intentionalStops = /* @__PURE__ */ new Set();
   initPromise = null;
   /** Idempotent startup pass: reap leftovers, drop expired records. */
   init() {
@@ -3494,7 +3514,9 @@ class CommandManager {
         shell: true,
         cwd: this.projectPath,
         env: process.env,
-        detached: true,
+        // POSIX 依赖独立进程组发送负 PID 信号；Windows 使用 taskkill /T，且 detached
+        // 会导致继承的日志文件描述符失效，所以 Windows 必须保持 attached。
+        detached: process.platform !== "win32",
         // No pipes: the child writes straight into the log fd. Keeps a chatty
         // dev server from buffering through this process, and lets the REST
         // first paint and the SSE tail read from one single source.
@@ -3570,6 +3592,7 @@ class CommandManager {
     this.runSubscribers.delete(runId);
     this.persisted.delete(runId);
     this.pendingEnds.delete(runId);
+    this.intentionalStops.delete(runId);
     this.notifyRuns();
     return true;
   }
@@ -3628,23 +3651,12 @@ class CommandManager {
     for (const [runId, child] of this.children) {
       const pid = child.pid;
       if (!pid) continue;
-      try {
-        process.kill(-pid, "SIGKILL");
-      } catch {
-        try {
-          process.kill(pid, "SIGKILL");
-        } catch {
-        }
-      }
+      killKnownProcessTreeSync(pid);
       this.children.delete(runId);
     }
     for (const t of this.tailers.values()) t.stop();
   }
-  /**
-   * Startup pass. Any record still marked `running` belongs to a previous
-   * service process: kill it if it somehow survived (service SIGKILLed), then
-   * mark it `killed`. Also drops records that finished long ago.
-   */
+  /** 将上次运行遗留的记录标记为结束，并清理超过保留期的记录。 */
   async reap() {
     const runs = await this.store.list().catch(() => []);
     if (runs.length === 0) return;
@@ -3654,8 +3666,10 @@ class CommandManager {
     for (const run of runs) {
       if (run.status === "running") {
         if (run.pid > 0 && isAlive(run.pid)) {
-          killGroup(run.pid, "SIGKILL");
-          log$3().warn("reaped orphan command process", { runId: run.runId, pid: run.pid });
+          log$3().warn("ignored unverified persisted command pid", {
+            runId: run.runId,
+            pid: run.pid
+          });
         }
         kept.push({ ...run, status: "killed", endedAt: run.endedAt ?? now, exitCode: null });
         continue;
@@ -3671,22 +3685,37 @@ class CommandManager {
     }
   }
   async terminate(run) {
+    this.intentionalStops.add(run.runId);
     if (run.pid > 0) {
-      killGroup(run.pid, "SIGTERM");
-      const exited = await waitForExit(run.pid, STOP_GRACE_MS);
-      if (!exited) {
-        log$3().warn("command did not exit on SIGTERM, escalating", {
-          runId: run.runId,
-          pid: run.pid
-        });
-        killGroup(run.pid, "SIGKILL");
-        await waitForExit(run.pid, STOP_GRACE_MS);
+      const child = this.children.get(run.runId);
+      if (process.platform === "win32") {
+        if (child?.pid === run.pid) {
+          await killWindowsProcessTree(run.pid);
+          const exited = await waitForExit(run.pid, STOP_GRACE_MS);
+          if (!exited) throw new Error(`Windows command process tree did not exit: ${run.pid}`);
+        } else {
+          if (isAlive(run.pid)) {
+            throw new Error(`refused to kill unverified Windows command pid: ${run.pid}`);
+          }
+        }
+      } else {
+        killPosixProcessGroup(run.pid, "SIGTERM");
+        const exited = await waitForExit(run.pid, STOP_GRACE_MS);
+        if (!exited) {
+          log$3().warn("command did not exit on SIGTERM, escalating", {
+            runId: run.runId,
+            pid: run.pid
+          });
+          killPosixProcessGroup(run.pid, "SIGKILL");
+          await waitForExit(run.pid, STOP_GRACE_MS);
+        }
       }
     }
     this.children.delete(run.runId);
     await this.markRunEnded(run.runId, "killed", null, "SIGTERM");
   }
   async handleExit(runId, status, exitCode, signal) {
+    if (this.intentionalStops.has(runId)) return;
     if (!this.persisted.has(runId)) {
       this.pendingEnds.set(runId, { status, exitCode, signal: signal ?? null });
       return;
@@ -3796,7 +3825,7 @@ function isAlive(pid) {
     return false;
   }
 }
-function killGroup(pid, signal) {
+function killPosixProcessGroup(pid, signal) {
   try {
     process.kill(-pid, signal);
   } catch {
@@ -3806,6 +3835,27 @@ function killGroup(pid, signal) {
     }
   }
 }
+async function killWindowsProcessTree(pid) {
+  await new Promise((resolve2, reject) => {
+    execFile("taskkill.exe", ["/PID", String(pid), "/T", "/F"], { windowsHide: true }, (error) => {
+      if (!error || !isAlive(pid)) resolve2();
+      else reject(error);
+    });
+  });
+}
+function killKnownProcessTreeSync(pid) {
+  if (process.platform === "win32") {
+    try {
+      execFileSync("taskkill.exe", ["/PID", String(pid), "/T", "/F"], {
+        stdio: "ignore",
+        windowsHide: true
+      });
+    } catch {
+    }
+    return;
+  }
+  killPosixProcessGroup(pid, "SIGKILL");
+}
 async function waitForExit(pid, timeoutMs) {
   const until = Date.now() + timeoutMs;
   while (Date.now() < until) {
@@ -4289,11 +4339,9 @@ class WorktreeManager {
     const head = await runGitChecked(mainPath, ["rev-parse", "HEAD"]);
     const mergeCommit = head.stdout.trim();
     await this.migrateSessions(wtPath, mainPath);
-    await runGitRaw(mainPath, ["worktree", "remove", wtPath]);
-    if (existsSync(wtPath)) {
-      await runGitRaw(mainPath, ["worktree", "remove", "--force", wtPath]);
-    }
-    await runGitRaw(mainPath, ["branch", "-d", branch]);
+    await this.registry.release(entry.id);
+    await removeMergedWorktree(mainPath, wtPath);
+    await deleteWorktreeBranch(mainPath, branch, "-d");
     await this.registry.remove(entry.id);
     if (mainEntry) {
       await this.registry.reload(mainEntry.id);
@@ -4320,15 +4368,21 @@ class WorktreeManager {
     const { mainPath, branch } = entry.worktree;
     const wtPath = entry.path;
     if (existsSync(wtPath)) {
-      const status = await runGitChecked(wtPath, ["status", "--porcelain"]);
-      if (status.stdout.trim().length > 0) {
-        throw new GitError("dirty", "存在未提交 git 的变更");
+      if (existsSync(join(wtPath, ".git"))) {
+        const status = await runGitChecked(wtPath, ["status", "--porcelain"]);
+        if (status.stdout.trim().length > 0) {
+          throw new GitError("dirty", "存在未提交 git 的变更");
+        }
       }
-      await trash(wtPath);
     }
+    await this.registry.release(worktreeProjectId);
+    await trashWorktreePath(wtPath);
     if (existsSync(mainPath)) {
-      await runGitRaw(mainPath, ["worktree", "prune"]);
-      await runGitRaw(mainPath, ["branch", "-D", branch]);
+      const prune = await runGitRaw(mainPath, ["worktree", "prune"]);
+      if (prune.code !== 0) {
+        throw new GitError("worktree_prune_failed", "git worktree prune 失败", prune.stderr);
+      }
+      await deleteWorktreeBranch(mainPath, branch, "-D");
     }
     await this.registry.remove(worktreeProjectId);
     this.onProjectsChanged?.();
@@ -4413,6 +4467,41 @@ class WorktreeManager {
     };
   }
 }
+async function removeMergedWorktree(mainPath, wtPath) {
+  const normal = await runGitRaw(mainPath, ["worktree", "remove", wtPath]);
+  if (existsSync(wtPath)) {
+    await runGitRaw(mainPath, ["worktree", "remove", "--force", wtPath]);
+  }
+  if (existsSync(wtPath)) await trashWorktreePath(wtPath);
+  const prune = await runGitRaw(mainPath, ["worktree", "prune"]);
+  if (prune.code !== 0) {
+    throw new GitError("worktree_prune_failed", "git worktree prune 失败", prune.stderr);
+  }
+  if (normal.code !== 0) {
+    worktreeLog().warn("normal worktree removal required recovery cleanup", {
+      path: wtPath,
+      stderr: normal.stderr
+    });
+  }
+}
+async function trashWorktreePath(wtPath) {
+  if (!existsSync(wtPath)) return;
+  try {
+    await trash(wtPath);
+  } catch (error) {
+    const detail = error instanceof Error ? error.message : String(error);
+    throw new GitError("worktree_remove_failed", `worktree 目录删除失败：${wtPath}；${detail}`);
+  }
+  if (existsSync(wtPath)) {
+    throw new GitError("worktree_remove_failed", `worktree 目录仍然存在：${wtPath}`);
+  }
+}
+async function deleteWorktreeBranch(mainPath, branch, mode) {
+  const result = await runGitRaw(mainPath, ["branch", mode, branch]);
+  if (result.code !== 0) {
+    throw new GitError("branch_remove_failed", `worktree 分支删除失败：${branch}`, result.stderr);
+  }
+}
 async function detectDefaultBranch(mainPath) {
   const res = await runGitChecked(mainPath, ["rev-parse", "--abbrev-ref", "HEAD"]);
   const name2 = res.stdout.trim();
@@ -4569,6 +4658,14 @@ function createApp(opts) {
     else httpLog.debug("request", meta);
   });
   const api = new Hono();
+  if (opts.shutdown) {
+    api.post("/internal/shutdown", (c) => {
+      const token = c.req.header("x-yorz-shutdown-token");
+      if (token !== opts.shutdown.token) return c.json({ error: "Forbidden" }, 403);
+      setTimeout(opts.shutdown.request, 0);
+      return c.json({ accepted: true }, 202);
+    });
+  }
   const resolveProject = (id) => opts.registry.getOrCreate(id);
   const projectsBus = new RegistryEventBus();
   projectsBus.start(opts.registry.configPath());
@@ -5775,7 +5872,10 @@ class SessionManager {
   running = /* @__PURE__ */ new Set();
   /** Kind of sessions discovered via `listSessions()` but absent from the store. */
   discoveredKinds = /* @__PURE__ */ new Map();
+  /** 后台派发任务；项目关闭必须等待它们完成后才能删除 worktree。 */
+  inFlight = /* @__PURE__ */ new Set();
   statusEmitter = new EventEmitter();
+  disposing = false;
   emitterFor(sid) {
     let e = this.emitters.get(sid);
     if (!e) {
@@ -5909,6 +6009,7 @@ class SessionManager {
     const session = await adapter.resumeSession(sid);
     const ls = { kind, session };
     this.live.set(sid, ls);
+    if (this.disposing) session.abort();
     return ls;
   }
   async send(sid, prompt) {
@@ -5920,7 +6021,7 @@ class SessionManager {
     });
     this.setRunning(sid, true);
     agentLog().info("dispatch start", { sessionId: sid, runId, promptLength: prompt.length });
-    void (async () => {
+    const task = (async () => {
       try {
         const ls = await this.ensureLive(sid);
         for await (const ev of ls.session.send(prompt)) {
@@ -5957,6 +6058,11 @@ class SessionManager {
         emitter.emit("done", currentSid);
       }
     })();
+    this.inFlight.add(task);
+    void task.then(
+      () => this.inFlight.delete(task),
+      () => this.inFlight.delete(task)
+    );
     return {
       runId,
       sessionId: sid,
@@ -5999,9 +6105,15 @@ class SessionManager {
     return true;
   }
   async dispose() {
+    this.disposing = true;
+    for (const session of new Set([...this.live.values()].map((item) => item.session))) {
+      session.abort();
+    }
+    await Promise.allSettled([...this.inFlight]);
     await this.adapters.dispose();
     this.live.clear();
     this.emitters.clear();
+    this.running.clear();
   }
 }
 const execFileP = promisify(execFile);
@@ -6143,15 +6255,24 @@ class ProjectRegistry {
     return await addProject(normalized, this.globalConfigPath);
   }
   async remove(id) {
+    await this.release(id).catch(() => {
+    });
+    return await removeProject(id, this.globalConfigPath);
+  }
+  /**
+   * 关闭并移除项目的缓存实例，但保留全局 registry 配置供失败恢复。
+   *
+   * @param id 要释放的项目 id。
+   * @returns 缓存实例关闭完成后结束；关闭失败会原样抛出。
+   */
+  async release(id) {
     const cached = this.cache.get(id);
-    if (cached) {
-      try {
-        await cached.instance.close();
-      } catch {
-      }
+    if (!cached) return;
+    try {
+      await cached.instance.close();
+    } finally {
       this.cache.delete(id);
     }
-    return await removeProject(id, this.globalConfigPath);
   }
   /**
    * Drop the cached instance for a project so the next getOrCreate() rebuilds
@@ -6159,13 +6280,8 @@ class ProjectRegistry {
    * project's `.yorz/config.json` changes (e.g. specsDir or agent override).
    */
   async reload(id) {
-    const cached = this.cache.get(id);
-    if (!cached) return;
-    try {
-      await cached.instance.close();
-    } catch {
-    }
-    this.cache.delete(id);
+    await this.release(id).catch(() => {
+    });
   }
   async closeAll() {
     const tasks = [];
@@ -6465,10 +6581,20 @@ const DEFAULT_PORT = 7423;
 const MAX_PORT_TRIES = 10;
 const DEFAULT_HOST = "127.0.0.1";
 function isLoopbackHost(host) {
-  return host === "127.0.0.1" || host === "localhost" || host === "::1";
+  const normalized = host.trim().toLowerCase().replace(/^\[|\]$/g, "");
+  if (normalized === "localhost") return true;
+  if (isIP(normalized) === 4) return normalized.startsWith("127.");
+  if (isIP(normalized) === 6) {
+    return normalized === "::1" || normalized === "0:0:0:0:0:0:0:1";
+  }
+  return false;
 }
 const log$1 = () => getLogger().child("serve");
 async function start(opts = {}) {
+  const host = opts.host?.trim() || DEFAULT_HOST;
+  if (!isLoopbackHost(host)) {
+    throw new Error(`host must be a loopback address: ${host}`);
+  }
   const registry = new ProjectRegistry({ globalConfigPath: opts.globalConfigPath });
   const cwd = opts.cwd ?? process.cwd();
   if (!opts.noRegisterCwd && existsSync(join(cwd, ".yorz"))) {
@@ -6480,18 +6606,17 @@ async function start(opts = {}) {
   const projects = await registry.list();
   const systemNotifications = new SystemNotificationCenter();
   systemNotifications.startVersionChecks();
-  const app = createApp({ registry, guiRoot: opts.guiRoot, systemNotifications });
-  const host = opts.host?.trim() || DEFAULT_HOST;
+  const app = createApp({
+    registry,
+    guiRoot: opts.guiRoot,
+    systemNotifications,
+    shutdown: opts.shutdownToken && opts.onShutdownRequest ? { token: opts.shutdownToken, request: opts.onShutdownRequest } : void 0
+  });
   const port = await listen(app.fetch, opts.port ?? DEFAULT_PORT, host);
   const url = `http://localhost:${port.port}/`;
-  console.log(`YorZ Service ready at ${url} (${projects.length} project${projects.length === 1 ? "" : "s"})`);
-  if (!isLoopbackHost(host)) {
-    console.log(`  WARNING: bound to ${host} — reachable from the network.`);
-    for (const lanUrl of listLanUrls(port.port)) {
-      console.log(`  LAN: ${lanUrl}`);
-    }
-    log$1().warn("service bound to a non-loopback address", { host, port: port.port });
-  }
+  console.log(
+    `YorZ Service ready at ${url} (${projects.length} project${projects.length === 1 ? "" : "s"})`
+  );
   for (const p of projects) {
     console.log(`  - ${p.name} -> ${p.path}`);
   }
@@ -6563,23 +6688,16 @@ async function listen(fetchHandler, preferredPort, hostname) {
   log$1().error("failed to bind any port", { preferredPort, tries: MAX_PORT_TRIES, err: fatal });
   throw fatal;
 }
-function listLanUrls(port) {
-  const urls = [];
-  const ifaces = networkInterfaces();
-  for (const name2 of Object.keys(ifaces)) {
-    for (const info of ifaces[name2] ?? []) {
-      if (info.family === "IPv4" && !info.internal) {
-        urls.push(`http://${info.address}:${port}/`);
-      }
-    }
-  }
-  return urls;
-}
 async function tryOpenBrowser(url) {
-  const { spawn: spawn2 } = await import("node:child_process");
-  const cmd = process.platform === "darwin" ? "open" : process.platform === "win32" ? "start" : "xdg-open";
+  const invocation = resolveBrowserOpenInvocation(process.platform, url);
   try {
-    spawn2(cmd, [url], { stdio: "ignore", detached: true }).unref();
+    const child = spawnWithoutWindow(invocation.command, invocation.args, {
+      stdio: "ignore",
+      detached: true
+    });
+    child.once("error", () => {
+    });
+    child.unref();
   } catch {
   }
 }
@@ -6632,12 +6750,28 @@ async function runServe(opts) {
   if (!opts.foreground) {
     return startBackgroundServe(opts);
   }
-  const handle = await start({
+  const shutdownToken = opts.recordRuntime ? randomUUID() : void 0;
+  let handle = null;
+  let shuttingDown = false;
+  const shutdown = async () => {
+    if (shuttingDown || !handle) return;
+    shuttingDown = true;
+    console.log("\nShutting down YorZ Service…");
+    try {
+      await handle.close();
+    } finally {
+      if (opts.recordRuntime) await removeRuntimeForPid(process.pid);
+      process.exit(0);
+    }
+  };
+  handle = await start({
     port: opts.port,
     host: opts.host,
     open: opts.open,
     cwd: opts.cwd ?? process.cwd(),
-    noRegisterCwd: opts.noRegisterCwd
+    noRegisterCwd: opts.noRegisterCwd,
+    shutdownToken,
+    onShutdownRequest: shutdownToken ? () => void shutdown() : void 0
   });
   if (opts.recordRuntime) {
     const snapshot = await readProcessSnapshot(process.pid);
@@ -6648,21 +6782,13 @@ async function runServe(opts) {
       startedAt: (/* @__PURE__ */ new Date()).toISOString(),
       execPath: process.execPath,
       argv: process.argv,
-      processStartedAt: snapshot?.processStartedAt
+      processStartedAt: snapshot?.processStartedAt,
+      shutdownToken
     });
     console.log(`Stop with: yorz serve stop`);
   } else {
     console.log(`Stop with: Ctrl-C`);
   }
-  const shutdown = async () => {
-    console.log("\nShutting down YorZ Service…");
-    try {
-      await handle.close();
-    } finally {
-      if (opts.recordRuntime) await removeRuntimeForPid(process.pid);
-      process.exit(0);
-    }
-  };
   process.once("SIGINT", () => void shutdown());
   process.once("SIGTERM", () => void shutdown());
   return handle;
@@ -6687,7 +6813,7 @@ function startBackgroundServe(opts) {
     const entry = process.argv[1];
     if (!entry) throw new Error("Cannot resolve CLI entrypoint for background service");
     const stdio = backgroundStdio();
-    const child = spawn(process.execPath, [entry, "serve", ...backgroundArgs(opts)], {
+    const child = spawnWithoutWindow(process.execPath, [entry, "serve", ...backgroundArgs(opts)], {
       detached: true,
       stdio: stdio.stdio
     });
@@ -6773,7 +6899,7 @@ async function ensureSkillsInstalledWithLog(cwd) {
       console.log(`[skill][legacy] ${r.skill} kept (not a YorZ skill): ${r.path}`);
   }
 }
-async function runStopServe() {
+async function runStopServe(opts = {}) {
   silenceConsoleMirror();
   const all = await readAllProcesses();
   if (all.length === 0) {
@@ -6807,16 +6933,38 @@ async function runStopServe() {
   const stoppedPids = [];
   const stoppedUrls = [];
   const failedPids = [];
+  const platform2 = opts.platform ?? process.platform;
   for (const { proc } of alive) {
-    try {
-      process.kill(proc.pid, "SIGTERM");
-      log().info("sent SIGTERM", { pid: proc.pid, url: proc.url });
-    } catch (err) {
-      log().warn("SIGTERM failed", { pid: proc.pid, err });
-      failedPids.push(proc.pid);
-      continue;
+    let stopped = false;
+    if (platform2 === "win32") {
+      if (proc.shutdownToken) {
+        try {
+          await requestGracefulShutdown(proc);
+          log().info("requested graceful shutdown", { pid: proc.pid, url: proc.url });
+          stopped = await waitForProcessExit(proc.pid, 5e3);
+        } catch (err) {
+          log().warn("graceful shutdown request failed", { pid: proc.pid, err });
+          stopped = await waitForProcessExit(proc.pid, 2e3);
+        }
+      } else {
+        log().warn("refused to stop unverified legacy Windows runtime pid", { pid: proc.pid });
+      }
+      if (!stopped) {
+        failedPids.push(proc.pid);
+        continue;
+      }
+    }
+    if (!stopped) {
+      try {
+        process.kill(proc.pid, "SIGTERM");
+        log().info("sent SIGTERM", { pid: proc.pid, url: proc.url });
+      } catch (err) {
+        log().warn("SIGTERM failed", { pid: proc.pid, err });
+        failedPids.push(proc.pid);
+        continue;
+      }
+      stopped = await waitForProcessExit(proc.pid, 2e3);
     }
-    let stopped = await waitForProcessExit(proc.pid, 2e3);
     if (!stopped) {
       log().warn("still alive after SIGTERM, escalating to SIGKILL", { pid: proc.pid });
       try {
@@ -6855,6 +7003,16 @@ async function runStopServe() {
     message: `Stopped ${stoppedPids.length} YorZ Service process(es): ${pidList}.`
   };
 }
+async function requestGracefulShutdown(proc) {
+  const response = await fetch(`http://127.0.0.1:${proc.port}/api/internal/shutdown`, {
+    method: "POST",
+    headers: { "x-yorz-shutdown-token": proc.shutdownToken },
+    signal: AbortSignal.timeout(2e3)
+  });
+  if (!response.ok) {
+    throw new Error(`Service rejected graceful shutdown with HTTP ${response.status}`);
+  }
+}
 function runtimePath() {
   return join(resolveGlobalConfigDir(), RUNTIME_FILE);
 }
@@ -6949,7 +7107,8 @@ function toProcessEntry(obj) {
     startedAt: obj.startedAt,
     execPath: typeof obj.execPath === "string" ? obj.execPath : void 0,
     argv: Array.isArray(obj.argv) && obj.argv.every((v) => typeof v === "string") ? obj.argv : void 0,
-    processStartedAt: typeof obj.processStartedAt === "string" ? obj.processStartedAt : void 0
+    processStartedAt: typeof obj.processStartedAt === "string" ? obj.processStartedAt : void 0,
+    shutdownToken: typeof obj.shutdownToken === "string" ? obj.shutdownToken : void 0
   };
 }
 function tryV1Entry(parsed) {
@@ -6963,7 +7122,8 @@ function tryV1Entry(parsed) {
     startedAt: parsed.startedAt,
     execPath: typeof parsed.execPath === "string" ? parsed.execPath : void 0,
     argv: Array.isArray(parsed.argv) && parsed.argv.every((v) => typeof v === "string") ? parsed.argv : void 0,
-    processStartedAt: typeof parsed.processStartedAt === "string" ? parsed.processStartedAt : void 0
+    processStartedAt: typeof parsed.processStartedAt === "string" ? parsed.processStartedAt : void 0,
+    shutdownToken: typeof parsed.shutdownToken === "string" ? parsed.shutdownToken : void 0
   };
 }
 async function upsertProcess(entry) {

package/dist/gui/assets/{abnfDiagram-VRR7QNED-CpQSXKD3.js → abnfDiagram-VRR7QNED-Dysui3FU.js}

@@ -1 +1 @@
-import{g as p,r as u,d as a}from"./chunk-MOJQB5TN-DenA9g0A.js";import{p as f}from"./chunk-JWPE2WC7-BoSzxOe1.js";import{_ as n,l as o}from"./mermaid.core-bsNbTKFB.js";import{M as c,b as d}from"./cynefin-VYW2F7L2-BXFPytZ_.js";import"./index-DzV2HQw-.js";var v=d().RailroadAbnf.parser.LangiumParser,i=n(e=>{const r=e.alternatives.map(g);return r.length===1?r[0]:{type:"choice",alternatives:r}},"transformAlternation"),g=n(e=>{const r=e.elements.map(y);return r.length===1?r[0]:{type:"sequence",elements:r}},"transformConcatenation"),b=n(e=>{if(e.includes("*")){const[t,s]=e.split("*"),l=t?parseInt(t,10):0,m=s?parseInt(s,10):1/0;return{min:l,max:m}}const r=parseInt(e,10);return{min:r,max:r}},"parseRepeat"),y=n(e=>{const r=A(e.primary);if(!e.repeat)return r;const{min:t,max:s}=b(e.repeat);return t===0&&s===1?{type:"optional",element:r}:{type:"repetition",element:r,min:t,max:s}},"transformElement"),A=n(e=>{switch(e.$type){case"AbnfStringLiteral":return{type:"terminal",value:e.value};case"AbnfNumVal":return{type:"terminal",value:e.value};case"AbnfRuleName":return{type:"nonterminal",name:e.name};case"AbnfGroup":return i(e.element);case"AbnfOptionalGroup":return{type:"optional",element:i(e.element)};default:throw new Error(`Unsupported ABNF primary node: ${e.$type}`)}},"transformPrimary"),P=n(e=>({name:e.name,definition:i(e.definition)}),"transformRule"),h=n(e=>{f(e,a),e.title&&a.setTitle(e.title),e.rules.map(r=>a.addRule(P(r)))},"populateDb"),R={parse:n(e=>{a.clear(),o.debug("[ABNF Parser] Starting Langium parse");const r=v.parse(e);if(r.lexerErrors.length>0||r.parserErrors.length>0)throw new c(r);const t=r.value;o.debug("[ABNF Parser] Parsed rules:",t.rules.length),h(t),o.debug("[ABNF Parser] Parse complete")},"parse"),parser:{yy:a}},B={parser:R,db:a,renderer:u,styles:p};export{B as diagram};
+import{g as p,r as u,d as a}from"./chunk-MOJQB5TN-BmLvCJEW.js";import{p as f}from"./chunk-JWPE2WC7-i8qqnqZU.js";import{_ as n,l as o}from"./mermaid.core-wGjSg1h-.js";import{M as c,b as d}from"./cynefin-VYW2F7L2-BLZ43yIC.js";import"./index-DDGLj_Fo.js";var v=d().RailroadAbnf.parser.LangiumParser,i=n(e=>{const r=e.alternatives.map(g);return r.length===1?r[0]:{type:"choice",alternatives:r}},"transformAlternation"),g=n(e=>{const r=e.elements.map(y);return r.length===1?r[0]:{type:"sequence",elements:r}},"transformConcatenation"),b=n(e=>{if(e.includes("*")){const[t,s]=e.split("*"),l=t?parseInt(t,10):0,m=s?parseInt(s,10):1/0;return{min:l,max:m}}const r=parseInt(e,10);return{min:r,max:r}},"parseRepeat"),y=n(e=>{const r=A(e.primary);if(!e.repeat)return r;const{min:t,max:s}=b(e.repeat);return t===0&&s===1?{type:"optional",element:r}:{type:"repetition",element:r,min:t,max:s}},"transformElement"),A=n(e=>{switch(e.$type){case"AbnfStringLiteral":return{type:"terminal",value:e.value};case"AbnfNumVal":return{type:"terminal",value:e.value};case"AbnfRuleName":return{type:"nonterminal",name:e.name};case"AbnfGroup":return i(e.element);case"AbnfOptionalGroup":return{type:"optional",element:i(e.element)};default:throw new Error(`Unsupported ABNF primary node: ${e.$type}`)}},"transformPrimary"),P=n(e=>({name:e.name,definition:i(e.definition)}),"transformRule"),h=n(e=>{f(e,a),e.title&&a.setTitle(e.title),e.rules.map(r=>a.addRule(P(r)))},"populateDb"),R={parse:n(e=>{a.clear(),o.debug("[ABNF Parser] Starting Langium parse");const r=v.parse(e);if(r.lexerErrors.length>0||r.parserErrors.length>0)throw new c(r);const t=r.value;o.debug("[ABNF Parser] Parsed rules:",t.rules.length),h(t),o.debug("[ABNF Parser] Parse complete")},"parse"),parser:{yy:a}},B={parser:R,db:a,renderer:u,styles:p};export{B as diagram};