@yunsoft/yuncms 0.1.24 → 0.1.25

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yunsoft/yuncms",
-  "version": "0.1.24",
+  "version": "0.1.25",
   "description": "Command-line setup and runtime launcher for YunCMS.",
   "license": "MIT",
   "type": "module",
@@ -30,8 +30,8 @@
     "test": "node --test"
   },
   "dependencies": {
-    "@yunsoft/yuncms-api": "0.1.24",
-    "@yunsoft/yuncms-core": "0.1.24"
+    "@yunsoft/yuncms-api": "0.1.25",
+    "@yunsoft/yuncms-core": "0.1.25"
   },
   "funding": {
     "type": "github",

package/src/runtime-probe.js

@@ -1,7 +1,10 @@
-import { spawn } from 'node:child_process';
+import { execFileSync, spawn } from 'node:child_process';
 import { resolve } from 'node:path';
 
 import { MAINTENANCE_BYPASS_ENV } from '@yunsoft/yuncms-core';
+import { ATTACHED_RUNTIME_ENV } from './start-command.js';
+
+export const DEFAULT_PROBE_SHUTDOWN_GRACE_MS = 12_000;
 
 function delay(ms) {
   return new Promise((resolveDelay) => setTimeout(resolveDelay, ms));
@@ -9,8 +12,10 @@ function delay(ms) {
 
 function probeError(code, message, details = {}) {
   const error = new Error(message);
+  const { code: exitCode, ...otherDetails } = details;
+  Object.assign(error, otherDetails);
+  if (Object.hasOwn(details, 'code')) error.exitCode = exitCode;
   error.code = code;
-  Object.assign(error, details);
   return error;
 }
 
@@ -22,7 +27,7 @@ export async function verifyInstalledRuntime({
   fetchFn = globalThis.fetch,
   spawnProcess = spawn,
   timeoutMs = 15_000,
-  shutdownGraceMs = 3_000,
+  shutdownGraceMs = DEFAULT_PROBE_SHUTDOWN_GRACE_MS,
 } = {}) {
   if (!Number.isInteger(port) || port < 1 || port > 65535) {
     throw probeError('UPDATE_PROBE_PORT_INVALID', `Invalid probe port: ${port}`);
@@ -48,6 +53,7 @@ export async function verifyInstalledRuntime({
     PORT: String(port),
     STUDIO_ORIGIN: origin,
     AUTH_PUBLIC_URL: origin,
+    [ATTACHED_RUNTIME_ENV]: '1',
   };
   if (maintenanceBypassToken !== null) childEnv[MAINTENANCE_BYPASS_ENV] = maintenanceBypassToken;
 
@@ -55,6 +61,7 @@ export async function verifyInstalledRuntime({
     cwd,
     env: childEnv,
     stdio: ['ignore', 'ignore', 'pipe'],
+    detached: process.platform !== 'win32',
   });
 
   let stderr = '';
@@ -65,6 +72,7 @@ export async function verifyInstalledRuntime({
 
   let settled = false;
   let shutdownAttempted = false;
+  let readyAndStopped = false;
   const exitPromise = new Promise((resolveExit, rejectExit) => {
     child.once('error', (error) => {
       if (settled) return;
@@ -81,9 +89,18 @@ export async function verifyInstalledRuntime({
 
   function requestKill(signal) {
     try {
+      if (signal === 'SIGKILL' && Number.isInteger(child.pid)) {
+        if (process.platform === 'win32') {
+          execFileSync('taskkill', ['/pid', String(child.pid), '/T', '/F'], { stdio: 'ignore', timeout: 1000 });
+        } else {
+          process.kill(-child.pid, signal);
+        }
+        return;
+      }
       child.kill(signal);
     } catch {
-      // The bounded shutdown path still escalates and reports a timeout.
+      // ESRCH is expected for an exited group; keep a bounded direct-child fallback.
+      try { child.kill(signal); } catch {}
     }
   }
 
@@ -145,6 +162,7 @@ export async function verifyInstalledRuntime({
             if (result.code !== 0 && result.signal !== 'SIGTERM') {
               throw probeError('UPDATE_PROBE_SHUTDOWN_FAILED', 'Updated runtime did not stop cleanly', result);
             }
+            readyAndStopped = true;
             return { ready: true, origin };
           }
         }
@@ -161,5 +179,6 @@ export async function verifyInstalledRuntime({
     if (!settled && !shutdownAttempted) {
       await stopProbe({ strict: false }).catch(() => null);
     }
+    if (settled && !readyAndStopped && Number.isInteger(child.pid)) requestKill('SIGKILL');
   }
 }

package/src/start-command.js

@@ -3,6 +3,9 @@ import { fileURLToPath } from 'node:url';
 
 import { assertMaintenanceStartupAllowed } from '@yunsoft/yuncms-core';
 
+// Internal updater transport flag: the probe owns the entire process group.
+export const ATTACHED_RUNTIME_ENV = 'YUNCMS_CLI_ATTACHED_RUNTIME';
+
 export async function runStartCommand({
   env = process.env,
   cwd = process.cwd(),
@@ -21,7 +24,7 @@ export async function runStartCommand({
     cwd,
     env: { ...env },
     stdio: 'inherit',
-    detached: process.platform !== 'win32',
+    detached: process.platform !== 'win32' && env[ATTACHED_RUNTIME_ENV] !== '1',
   });
 
   return new Promise((resolve, reject) => {