@rightkit/release 0.2.144 → 0.2.145

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rightkit/release",
-  "version": "0.2.144",
+  "version": "0.2.145",
   "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/pe-imports.mjs

@@ -55,5 +55,7 @@ export function readPeImports(bytes) {
       delayImports.add(cstring(name));
     }
   }
-  return { machine, architecture: PE_MACHINES[machine] ?? `0x${machine.toString(16)}`, imports: [...imports], delayImports: [...delayImports] };
+  // Optional header Subsystem is at offset 68 in both PE32 and PE32+ (2 = WINDOWS_GUI, 3 = WINDOWS_CUI).
+  const subsystem = buf.readUInt16LE(optional + 68);
+  return { machine, architecture: PE_MACHINES[machine] ?? `0x${machine.toString(16)}`, subsystem, imports: [...imports], delayImports: [...delayImports] };
 }

package/rightkit-versions.json

@@ -29,7 +29,7 @@
     "@rightkit/platform-ui": "0.2.0",
     "@rightkit/qa": "0.4.0",
     "@rightkit/qa-chrome": "0.1.3",
-    "@rightkit/release": "0.2.144",
+    "@rightkit/release": "0.2.145",
     "@rightkit/settings-ui": "0.3.0",
     "@rightkit/shell": "0.1.0",
     "@rightkit/tauri": "0.2.0",
@@ -176,7 +176,8 @@
       "0.2.140",
       "0.2.141",
       "0.2.142",
-      "0.2.143"
+      "0.2.143",
+      "0.2.144"
     ],
     "@rightkit/qa": [
       "0.1.0",
@@ -276,7 +277,7 @@
     "rightkit-browser": "0.2.3",
     "rightkit-cache": "0.1.0",
     "rightkit-contracts": "0.1.2",
-    "rightkit-control": "0.1.9",
+    "rightkit-control": "0.1.11",
     "rightkit-crash": "0.2.0",
     "rightkit-db": "0.3.2",
     "rightkit-embed": "0.3.1",
@@ -333,7 +334,7 @@
       "rightkit-audio": "0.2.0",
       "rightkit-browser": "0.2.2",
       "rightkit-cache": "0.1.0",
-      "rightkit-control": "0.1.9",
+      "rightkit-control": "0.1.11",
       "rightkit-crash": "0.2.0",
       "rightkit-db": "0.3.2",
       "rightkit-embed": "0.3.1",
@@ -388,7 +389,7 @@
       "@rightkit/platform-ui": "0.2.0",
       "@rightkit/qa": "0.4.0",
       "@rightkit/qa-chrome": "0.1.3",
-      "@rightkit/release": "0.2.144",
+      "@rightkit/release": "0.2.145",
       "@rightkit/settings-ui": "0.3.0",
       "@rightkit/shell": "0.1.0",
       "@rightkit/tauri": "0.2.0",
@@ -504,7 +505,9 @@
     "rightkit-control": [
       "0.1.6",
       "0.1.7",
-      "0.1.8"
+      "0.1.8",
+      "0.1.9",
+      "0.1.10"
     ],
     "rightkit-secrets": [
       "0.1.0",

package/swift-package-command.mjs

@@ -29,7 +29,7 @@ export function windowsStageOptions({ config, base }) {
   const w = config.windows;
   if (!w?.exe || !w?.out) throw fail("SWIFT_PACKAGE_CONFIG", "windows.exe and windows.out are required");
   return { exe: rel(base, w.exe), out: rel(base, w.stageDir ?? `${w.out}.stage`), searchDirs: relList(base, w.searchDirs),
-    include: relList(base, w.include), systemDlls: w.systemDlls, dependencies: w.dependencies, architecture: w.architecture };
+    include: relList(base, w.include), systemDlls: w.systemDlls, dependencies: w.dependencies, architecture: w.architecture, subsystem: w.subsystem };
 }
 
 export function msixOptions({ config, base }, staged) {

package/swift-windows-stage.mjs

@@ -41,7 +41,9 @@ function findInDirs(name, dirs) {
  *   systemDlls[] (extra allowed), dependencies[{ name, provides[] }], architecture }
  * Returns a manifest; throws SWIFT_STAGE_UNRESOLVED listing every missing DLL.
  */
-export function stageSwiftWindows({ exe, out, searchDirs = [], include = [], systemDlls = [], dependencies = [], architecture, clean = true } = {}) {
+const PE_SUBSYSTEMS = { gui: 2, console: 3 };
+
+export function stageSwiftWindows({ exe, out, searchDirs = [], include = [], systemDlls = [], dependencies = [], architecture, subsystem, clean = true } = {}) {
   if (!exe || !out) throw fail("SWIFT_STAGE_OPTIONS", "exe and out are required");
   exe = path.resolve(exe); out = path.resolve(out);
   if (!/\.exe$/i.test(exe) || !existsSync(exe) || !statSync(exe).isFile()) throw fail("SWIFT_STAGE_OPTIONS", `exe must be an existing .exe: ${exe}`);
@@ -71,6 +73,14 @@ export function stageSwiftWindows({ exe, out, searchDirs = [], include = [], sys
     const info = readPeImports(readFileSync(item.source));
     if (!["x64", "arm64"].includes(info.architecture)) throw fail("SWIFT_STAGE_ARCH", `${item.source} is ${info.architecture}; only x64 and arm64 are supported`);
     arch ??= info.architecture;
+    if (item.from === "<root>" && subsystem) {
+      const want = PE_SUBSYSTEMS[subsystem];
+      if (!want) throw fail("SWIFT_STAGE_OPTIONS", `windows.subsystem must be "gui" or "console", got ${JSON.stringify(subsystem)}`);
+      if (info.subsystem !== want) {
+        throw fail("SWIFT_STAGE_SUBSYSTEM", `${item.source} has PE subsystem ${info.subsystem}, expected ${want} (${subsystem})` +
+          (subsystem === "gui" ? "; link with -Xlinker /SUBSYSTEM:WINDOWS -Xlinker /ENTRY:mainCRTStartup so launching it opens no console window" : ""));
+      }
+    }
     if (info.architecture !== arch) throw fail("SWIFT_STAGE_ARCH", `${item.source} is ${info.architecture} but package architecture is ${arch}`);
     for (const dep of [...info.imports, ...info.delayImports]) {
       const dk = lower(dep);