@rightkit/release 0.2.118 → 0.2.119

package/development.mjs

@@ -34,6 +34,10 @@ export function developmentEnvironment(env = process.env) {
       const pathKey = Object.keys(result).find((key) => key.toLowerCase() === "path") ?? "PATH";
       result[pathKey] = [agentBin, result[pathKey]].filter(Boolean).join(path.delimiter);
     }
+    // Same default as the agent-bin `rightkit` shim: children that run the managed client directly
+    // (resolveCommand("rightkit"), build scripts) must not lose the broker endpoint.
+    const socket = managedRoot && path.join(managedRoot, "broker.sock");
+    if (!result.RIGHTKIT_BUILD_BROKER_SOCKET && socket && existsSync(socket)) result.RIGHTKIT_BUILD_BROKER_SOCKET = socket;
   }
   return result;
 }
@@ -196,7 +200,7 @@ function execute(command, { root, env, dryRun, run, label }) {
   const args = (command.args ?? []).map(String);
   if (dryRun) return { cmd: command.cmd, args, cwd };
   const launch = resolveCommand(command.cmd, args, { root, env });
-  const result = run(launch.command, launch.args, { cwd, env, stdio: "inherit", windowsHide: true, shell: false, timeout: command.timeoutMs });
+  const result = run(launch.command, launch.args, { cwd, env: launch.env ?? env, stdio: "inherit", windowsHide: true, shell: false, timeout: command.timeoutMs });
   if (result.status !== 0) throw new Error(`development ${label} command failed (${result.status}): ${command.name ?? command.cmd}`);
 }
 export function resolveCommand(command, args, { root, env = process.env } = {}) {
@@ -205,7 +209,9 @@ export function resolveCommand(command, args, { root, env = process.env } = {})
   if (command === "rightkit") {
     const client = managedRuntimeClient(env);
     if (!client) throw new Error("installed RightKit runtime client is unavailable for development command");
-    return { command: process.execPath, args: [client, ...args] };
+    const socket = path.join(path.dirname(path.dirname(path.dirname(path.dirname(client)))), "broker.sock");
+    const childEnv = !env.RIGHTKIT_BUILD_BROKER_SOCKET && existsSync(socket) ? { ...env, RIGHTKIT_BUILD_BROKER_SOCKET: socket } : undefined;
+    return { command: process.execPath, args: [client, ...args], ...(childEnv ? { env: childEnv } : {}) };
   }
   return { command, args };
 }

package/direct-bootstrap.mjs

@@ -353,6 +353,10 @@ function Invoke-BoundedExe($Path, [string[]]$Arguments, [int]$TimeoutSeconds) {
       "$ReleaseBase = if ($Version) { " + psQuote("https://github.com/" + repository + "/releases/download/v") + " + $Version } else { $null }",
       "$Work = Join-Path ([IO.Path]::GetTempPath()) (" + psQuote(product + "-install-") + " + [guid]::NewGuid())",
       "New-Item -ItemType Directory -Force -Path $Work | Out-Null",
+      // Early failures (download, catalog, checksum, preflight) throw before the activation
+      // try/finally; the trap removes $Work for them, and stale dirs from older bootstraps are swept.
+      "trap { try { if ($Work -and (Test-Path -LiteralPath $Work)) { Remove-Item -LiteralPath $Work -Recurse -Force -ErrorAction SilentlyContinue } } catch {}; break }",
+      "Get-ChildItem ([IO.Path]::GetTempPath()) -Directory -Filter " + psQuote(product + "-install-*") + " -ErrorAction SilentlyContinue | Where-Object { $_.FullName -ne $Work -and $_.LastWriteTime -lt (Get-Date).AddDays(-1) } | ForEach-Object { Remove-Item -LiteralPath $_.FullName -Recurse -Force -ErrorAction SilentlyContinue }",
       "$ManifestPath = Join-Path $Work 'release-manifest.json'; $SignaturePath = Join-Path $Work 'release-manifest.cat'; $ChecksumsPath = Join-Path $Work 'checksums.json'",
       "function Receive-ReleaseFile([string]$Name, [string]$Destination) { if ($LocalReleaseRoot) { $RootPrefix = $LocalReleaseRoot.TrimEnd([IO.Path]::DirectorySeparatorChar, [IO.Path]::AltDirectorySeparatorChar) + [IO.Path]::DirectorySeparatorChar; $Source = [IO.Path]::GetFullPath((Join-Path $LocalReleaseRoot $Name)); if (-not $Source.StartsWith($RootPrefix, [StringComparison]::OrdinalIgnoreCase) -or -not (Test-Path -LiteralPath $Source -PathType Leaf)) { throw ('Local release asset is missing or escapes root: ' + $Name) }; Copy-Item -LiteralPath $Source -Destination $Destination } else { Invoke-WebRequest ($ReleaseBase + '/' + $Name) -OutFile $Destination } }",
       "Receive-ReleaseFile 'release-manifest.json' $ManifestPath",
@@ -367,6 +371,10 @@ function Invoke-BoundedExe($Path, [string[]]$Arguments, [int]$TimeoutSeconds) {
       "$ReleaseBase = " + psQuote("https://github.com/" + repository + "/releases/download/v") + " + $Version",
       "$Work = Join-Path ([IO.Path]::GetTempPath()) (" + psQuote(product + "-install-") + " + [guid]::NewGuid())",
       "New-Item -ItemType Directory -Force -Path $Work | Out-Null",
+      // Early failures (download, catalog, checksum, preflight) throw before the activation
+      // try/finally; the trap removes $Work for them, and stale dirs from older bootstraps are swept.
+      "trap { try { if ($Work -and (Test-Path -LiteralPath $Work)) { Remove-Item -LiteralPath $Work -Recurse -Force -ErrorAction SilentlyContinue } } catch {}; break }",
+      "Get-ChildItem ([IO.Path]::GetTempPath()) -Directory -Filter " + psQuote(product + "-install-*") + " -ErrorAction SilentlyContinue | Where-Object { $_.FullName -ne $Work -and $_.LastWriteTime -lt (Get-Date).AddDays(-1) } | ForEach-Object { Remove-Item -LiteralPath $_.FullName -Recurse -Force -ErrorAction SilentlyContinue }",
       "$ManifestPath = Join-Path $Work 'release-manifest.json'; $SignaturePath = Join-Path $Work 'release-manifest.cat'; $ChecksumsPath = Join-Path $Work 'checksums.json'",
       "Invoke-WebRequest ($ReleaseBase + '/release-manifest.json') -OutFile $ManifestPath",
       "Invoke-WebRequest ($ReleaseBase + '/release-manifest.cat') -OutFile $SignaturePath",
@@ -440,6 +448,10 @@ function Invoke-BoundedExe($Path, [string[]]$Arguments, [int]$TimeoutSeconds) {
     "  $StableBin = Split-Path $StableExe -Parent; $InstallRootResolved = [IO.Path]::GetFullPath($InstallRoot).TrimEnd([IO.Path]::DirectorySeparatorChar); $UserPath = [Environment]::GetEnvironmentVariable('Path','User'); $Kept = @($UserPath -split ';' | Where-Object { $Entry = $_.Trim(); $Entry -ne '' -and -not ($Entry.TrimEnd([IO.Path]::DirectorySeparatorChar).StartsWith(($InstallRootResolved + [IO.Path]::DirectorySeparatorChar), [StringComparison]::OrdinalIgnoreCase) -and -not $Entry.TrimEnd([IO.Path]::DirectorySeparatorChar).Equals($StableBin.TrimEnd([IO.Path]::DirectorySeparatorChar), [StringComparison]::OrdinalIgnoreCase)) }); $NewPath = ((@($StableBin) + $Kept) -join ';'); if ($NewPath -ne $UserPath) { [Environment]::SetEnvironmentVariable('Path', $NewPath, 'User') }",
     // Journal cleanup must succeed before discarding the prior pointer. If
     // cleanup fails, catch still has a rollback anchor to restore.
+    // Retention: after a healthy activation keep only the new version and the prior target (the
+    // app's first-start probation may still roll back to it, then deletes it). Every other version
+    // is removed; one a running process still holds fails the rename and is retried next install.
+    "  $KeepVersions = @([IO.Path]::GetFullPath($VersionRoot).TrimEnd([IO.Path]::DirectorySeparatorChar)); if ($PriorTarget) { $KeepVersions += [IO.Path]::GetFullPath([string]$PriorTarget).TrimEnd([IO.Path]::DirectorySeparatorChar) }; Get-ChildItem -LiteralPath $VersionsRoot -Directory -Force -ErrorAction SilentlyContinue | Where-Object { $Candidate = $_.FullName.TrimEnd([IO.Path]::DirectorySeparatorChar); -not ($KeepVersions | Where-Object { $_.Equals($Candidate, [StringComparison]::OrdinalIgnoreCase) }) } | ForEach-Object { try { $Doomed = Join-Path $VersionsRoot ('.prune-' + [guid]::NewGuid()); Rename-Item -LiteralPath $_.FullName -NewName (Split-Path -Leaf $Doomed) -ErrorAction Stop; Remove-Item -LiteralPath $Doomed -Recurse -Force -ErrorAction SilentlyContinue } catch { } }",
     "  Remove-Item -Force $Journal; Remove-StableJunction $PreviousLink; Write-Output (" + psQuote(product + " ") + " + $Version + ' installed')",
     "} catch {",
     "  $InstallError = $_; $RollbackErrors = New-Object 'System.Collections.Generic.List[string]'",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rightkit/release",
-  "version": "0.2.118",
+  "version": "0.2.119",
   "description": "Portable release CLI/SDK with fail-closed public GitHub Releases and private R2 + RightApps distribution.",
   "license": "MIT OR Apache-2.0",
   "type": "module",

package/portable-development.mjs

@@ -1,6 +1,7 @@
 import fs from "node:fs";
 import path from "node:path";
 import { createHash } from "node:crypto";
+import { spawnSync } from "./background-process.mjs";
 
 const CHUNK_BYTES = 1024 * 1024;
 
@@ -62,6 +63,7 @@ export function installPortableDevelopment(descriptor, { root, platform = proces
       const entryDigest = hashFile(entrypoint);
       if (entryDigest !== hashFile(path.join(source, descriptor.entrypoint))) throw new Error("development entrypoint readback did not match source");
       if (backup) removeIfExists(backup);
+      emit("PRUNE", pruneDevelopmentVersions(installRoot, versionRoot, { platform }));
       emit("SUCCEEDED", { installRoot, current, versionRoot, digest, entrypoint: descriptor.entrypoint, entrypointDigest: entryDigest });
       return { installRoot, current, versionRoot, digest, entrypoint: path.join(current, descriptor.entrypoint), entrypointDigest: entryDigest };
     } catch (error) {
@@ -75,6 +77,60 @@ export function installPortableDevelopment(descriptor, { root, platform = proces
   }
 }
 
+/**
+ * Development installs keep only the active version: dev builds are rebuilt from source, so there is
+ * no rollback copy. A version a running process still uses is skipped and removed by the next
+ * install. Never throws: a prune problem must not fail an install that already activated.
+ */
+export function pruneDevelopmentVersions(installRoot, keepRoot, { platform = process.platform, runningExecutables = null } = {}) {
+  const versionsRoot = path.join(installRoot, "versions");
+  const removed = []; const skipped = []; let reclaimedBytes = 0;
+  let running = null;
+  const inUse = (dir) => {
+    if (platform === "win32") return false; // Windows: a loaded image or DLL makes the rename below fail.
+    running ??= runningExecutables ?? listRunningExecutables();
+    return running.some((exe) => isWithin(dir, exe, platform));
+  };
+  const candidates = [];
+  for (const [dir, pattern] of [[versionsRoot, /^(dev-[0-9a-f]+|\.stage-.+|\.prune-.+)$/], [installRoot, /^\.(current-backup|prune)-.+$/]]) {
+    let names = [];
+    try { names = fs.readdirSync(dir); } catch { continue; }
+    for (const name of names) if (pattern.test(name)) candidates.push(path.join(dir, name));
+  }
+  for (const candidate of candidates) {
+    if (samePath(candidate, keepRoot, platform)) continue;
+    if (path.basename(candidate).includes(`-${process.pid}-`)) continue; // this process's own stage/backup
+    try {
+      if (inUse(candidate)) { skipped.push({ path: candidate, reason: "in-use" }); continue; }
+      const bytes = treeBytes(candidate);
+      // Rename first: on Windows this fails while any file inside is loaded, so a running version is skipped whole.
+      const doomed = path.basename(candidate).startsWith(".prune-") ? candidate : path.join(path.dirname(candidate), `.prune-${randomSuffix()}`);
+      if (doomed !== candidate) fs.renameSync(candidate, doomed);
+      fs.rmSync(doomed, { recursive: true, force: true });
+      removed.push(candidate); reclaimedBytes += bytes;
+    } catch (error) {
+      skipped.push({ path: candidate, reason: error?.code ?? error?.message ?? String(error) });
+    }
+  }
+  return { kept: keepRoot, removed: removed.length, skipped, reclaimedBytes };
+}
+
+function listRunningExecutables() {
+  const result = spawnSync("ps", ["-axo", "comm="], { encoding: "utf8" });
+  return result.status === 0 ? result.stdout.split(/\r?\n/).map((line) => line.trim()).filter((line) => path.isAbsolute(line)) : [];
+}
+
+function treeBytes(target) {
+  let total = 0;
+  const stat = fs.lstatSync(target);
+  if (!stat.isDirectory()) return stat.size;
+  for (const entry of fs.readdirSync(target, { withFileTypes: true })) {
+    const child = path.join(target, entry.name);
+    total += entry.isDirectory() && !entry.isSymbolicLink() ? treeBytes(child) : fs.lstatSync(child).size;
+  }
+  return total;
+}
+
 function validateDescriptor(descriptor, root, platform) {
   if (!descriptor || descriptor.kind !== "portable" || descriptor.activation?.kind !== "current") throw new Error("unsupported portable development descriptor");
   if (typeof root !== "string" || !path.isAbsolute(root)) throw new Error("repository root must be absolute");

package/rightkit-versions.json

@@ -24,12 +24,12 @@
     "@rightkit/license": "0.1.8",
     "@rightkit/logs": "0.1.4",
     "@rightkit/media-ui": "0.2.5",
-    "@rightkit/onboarding": "0.2.1",
+    "@rightkit/onboarding": "0.2.2",
     "@rightkit/pdf-ui": "0.1.1",
     "@rightkit/platform-ui": "0.1.2",
     "@rightkit/qa": "0.2.1",
-    "@rightkit/release": "0.2.118",
-    "@rightkit/settings-ui": "0.2.2",
+    "@rightkit/release": "0.2.119",
+    "@rightkit/settings-ui": "0.2.3",
     "@rightkit/shell": "0.1.0",
     "@rightkit/tauri": "0.1.1",
     "@rightkit/theme": "0.2.0",
@@ -139,7 +139,8 @@
       "0.2.114",
       "0.2.115",
       "0.2.116",
-      "0.2.117"
+      "0.2.117",
+      "0.2.118"
     ],
     "@rightkit/qa": [
       "0.1.0",
@@ -161,11 +162,13 @@
     ],
     "@rightkit/settings-ui": [
       "0.1.0",
-      "0.2.0"
+      "0.2.0",
+      "0.2.2"
     ],
     "@rightkit/onboarding": [
       "0.1.0",
-      "0.2.0"
+      "0.2.0",
+      "0.2.1"
     ],
     "@rightkit/doc-render": [
       "0.1.0",
@@ -200,14 +203,14 @@
     "rightkit-audio": "0.1.0",
     "rightkit-browser": "0.1.1",
     "rightkit-cache": "0.1.0",
-    "rightkit-control": "0.1.1",
+    "rightkit-control": "0.1.2",
     "rightkit-crash": "0.1.0",
-    "rightkit-db": "0.2.0",
+    "rightkit-db": "0.2.1",
     "rightkit-framed-sidecar": "0.1.0",
     "rightkit-fs": "0.1.0",
-    "rightkit-jobs": "0.1.0",
+    "rightkit-jobs": "0.2.0",
     "rightkit-logs": "0.2.0",
-    "rightkit-media": "0.1.0",
+    "rightkit-media": "0.2.0",
     "rightkit-models": "0.1.0",
     "rightkit-pdf": "0.1.0",
     "rightkit-playback": "0.1.0",