@zswarm/core 0.3.0 → 0.3.1

package/dist/host/crew-windows.js

@@ -337,11 +337,26 @@ export function buildCrewClientScript(action, params) {
         PS_CLIENT_PREAMBLE,
         `$marker = '${marker}'`,
         psClientPidLine(marker),
+        "$all = @(Get-CimInstance Win32_Process)",
         "$closed = @()",
         "foreach ($clientPid in $clientPids) {",
-        "  # The window is the launcher's console, so the tree has to go with it:",
-        "  # /T reaches the attached `zellij` client that shares that console.",
-        "  & taskkill.exe /PID $clientPid /T /F 2>$null | Out-Null",
+        "  # The window is the launcher's console, so its tree goes with it: the",
+        "  # attached `zellij` client shares that console. The Zellij server is in the",
+        "  # tree too (the client that created the session spawned it) and must stay,",
+        "  # or the session dies with its window: skip it and everything under it.",
+        "  # A child is never older than its parent, so a reused parent PID never",
+        "  # links an unrelated process.",
+        "  $tree = New-Object System.Collections.Generic.List[object]",
+        "  $queue = New-Object System.Collections.Generic.Queue[object]",
+        "  $queue.Enqueue(($all | Where-Object { $_.ProcessId -eq $clientPid } | Select-Object -First 1))",
+        "  while ($queue.Count -gt 0) {",
+        "    $proc = $queue.Dequeue()",
+        "    if (-not $proc) { continue }",
+        "    if ($proc.Name -eq 'zellij.exe' -and $proc.CommandLine -match '(^|\\s)--server(\\s|=)') { continue }",
+        "    $tree.Add($proc)",
+        "    foreach ($child in @($all | Where-Object { $_.ParentProcessId -eq $proc.ProcessId -and $_.CreationDate -ge $proc.CreationDate })) { $queue.Enqueue($child) }",
+        "  }",
+        "  for ($i = $tree.Count - 1; $i -ge 0; $i--) { Stop-Process -Id $tree[$i].ProcessId -Force -ErrorAction SilentlyContinue }",
         "  $closed += $clientPid",
         "}",
         "Write-ZswarmJson @{ closed = @($closed); count = $closed.Count }",

package/dist/host/crew.js

@@ -212,6 +212,14 @@ export async function crewStart(session, deps = {}) {
         // `zellij --layout ... attach --create`, which `crew client` starts. That
         // window is what `crew start` reopens when it is gone.
         const client = windowsClient(deps, env);
+        // A live session that already has its layout is the crew: keep it and only
+        // make sure its window is there. Rebuilding would restart every pane.
+        if ((await sessions(env)).includes(session)
+            && checkLayout(await panes(session, env), files.first, names).state === "ok") {
+            const opened = await client.ensure(session);
+            log(`session ${session} already up; client window ${opened.opened ? "opened" : "already open"}`);
+            return 0;
+        }
         for (let attempt = 1; attempt <= 3; attempt++) {
             zellij(["delete-session", session], env); // clears only a dead session of this name
             await client.close(session); // a window left over from the previous attempt

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zswarm/core",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "type": "module",
   "description": "zSwarm Zellij client and shared ops dispatch",
   "exports": {