@lunora/cli 1.0.0-alpha.66 → 1.0.0-alpha.68

package/dist/packem_chunks/planDevCommand.mjs

@@ -1,5 +1,5 @@
 import { spawnSync, spawn } from 'node:child_process';
-import { detectAgentRules, claimDevServerState, clearDevServerState, readDevServerState, readLiveDevServerState, readProjectDependencyNames, DEV_HANDOFF_ENV, isRecordedProcessCurrent, DEV_LOG_FILE, DEV_LOG_FILE_ENV, DEV_DAEMON_ENV, detectAiAgent, resolveRemoteEnabled, readProjectRemotePreference, detectFramework, inferLunoraBindings, packageNamesFromBindings, ensureDevVarsExample, ensureDevVariables, isInteractive, DEV_VARS_FILE, DEV_VARS_EXAMPLE_FILE, fillDevSecrets, updateDevServerState, claimAgentRulesHint, AGENT_RULES_HINT, discoverContainerInfo, streamContainerLogs, materializeRemoteWranglerConfig, formatLunoraEvent } from '@lunora/config';
+import { detectAgentRules, claimDevServerState, clearDevServerState, readDevServerState, readLiveDevServerState, readProjectDependencyNames, DEV_HANDOFF_ENV, isRecordedProcessCurrent, DEV_LOG_FILE, DEV_LOG_FILE_ENV, DEV_DAEMON_ENV, updateDevServerState, detectAiAgent, resolveRemoteEnabled, readProjectRemotePreference, detectFramework, inferLunoraBindings, packageNamesFromBindings, ensureDevVarsExample, ensureDevVariables, isInteractive, DEV_VARS_FILE, DEV_VARS_EXAMPLE_FILE, fillDevSecrets, claimAgentRulesHint, AGENT_RULES_HINT, discoverContainerInfo, streamContainerLogs, materializeRemoteWranglerConfig, formatLunoraEvent } from '@lunora/config';
 import { p as parseApiSpec } from '../packem_shared/api-spec-Bx0iKbxA.mjs';
 import { existsSync, watch, readFileSync, statSync, openSync, readSync, closeSync, mkdirSync } from 'node:fs';
 import { join, dirname } from 'node:path';
@@ -437,11 +437,18 @@ const runDevBackground = async (options) => {
     for (const line of readLogTail(logPath, FAILURE_LOG_TAIL_LINES)) {
       logger.error(`  ${line}`);
     }
-    clearDevServerState(cwd, child.pid);
+    clearDevServerState(cwd, child.pid ?? process.pid);
     return { code: outcome.exitCode === 0 ? 1 : outcome.exitCode };
   }
+  if (child.pid !== void 0) {
+    const current = readDevServerState(cwd);
+    if (current?.pid === process.pid) {
+      updateDevServerState(cwd, { logFile: logPath, pid: child.pid });
+    }
+  }
+  const pidHint = child.pid === void 0 ? "" : ` (pid ${String(child.pid)})`;
   logger.warn(
-    `dev server did not confirm ready within ${String(Math.round(timeout / 1e3))}s — it may still be compiling. Check \`lunora dev status\` and \`lunora dev logs\`; \`lunora dev stop\` shuts it down.`
+    `dev server did not confirm ready within ${String(Math.round(timeout / 1e3))}s — it may still be compiling${pidHint}. Check \`lunora dev status\` and \`lunora dev logs\`; \`lunora dev stop\` shuts it down.`
   );
   return { code: 1 };
 };
@@ -516,10 +523,10 @@ const processGroupId = (pid) => {
     return void 0;
   }
 };
-const forceKillRecordedServer = (state, signal) => {
-  if (process.platform === "win32") {
+const forceKillRecordedServer = (state, signal, platform = process.platform, spawnSyncImpl = spawnSync) => {
+  if (platform === "win32") {
     try {
-      spawnSync("taskkill", ["/pid", String(state.pid), "/T", "/F"], { stdio: "ignore" });
+      spawnSyncImpl("taskkill", ["/pid", String(state.pid), "/T", "/F"], { stdio: "ignore" });
     } catch {
     }
     return;
@@ -536,6 +543,16 @@ const forceKillRecordedServer = (state, signal) => {
   } catch {
   }
 };
+const reportSurvivedForceKill = (state, options) => {
+  if (options.json) {
+    printJson({ pid: state.pid, stopped: false });
+  } else {
+    options.logger.error(
+      `dev server (pid ${String(state.pid)}) survived the force-kill — record kept; retry \`lunora dev stop\` or kill the process manually.`
+    );
+  }
+  return { code: 1 };
+};
 const runDevStop = async (options) => {
   const { cwd, logger } = options;
   const state = readDevServerState(cwd);
@@ -545,6 +562,8 @@ const runDevStop = async (options) => {
   });
   const pollInterval = options.pollIntervalMs ?? POLL_INTERVAL_MS;
   const grace = options.stopGraceMs ?? STOP_GRACE_MS;
+  const platform = options.platform ?? process.platform;
+  const spawnSyncImpl = options.spawnSyncImpl ?? spawnSync;
   if (state === void 0 || !alive(state.pid)) {
     if (state !== void 0) {
       clearDevServerState(cwd, state.pid);
@@ -565,7 +584,11 @@ const runDevStop = async (options) => {
     await sleep(pollInterval);
   }
   if (alive(state.pid)) {
-    forceKillRecordedServer(state, signal);
+    forceKillRecordedServer(state, signal, platform, spawnSyncImpl);
+    await sleep(pollInterval);
+    if (alive(state.pid)) {
+      return reportSurvivedForceKill(state, options);
+    }
   }
   clearDevServerState(cwd, state.pid);
   if (options.json) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lunora/cli",
-  "version": "1.0.0-alpha.66",
+  "version": "1.0.0-alpha.68",
   "description": "The Lunora CLI: init, dev, deploy, codegen, run, reset, and migrate commands",
   "keywords": [
     "agent-skills",
@@ -51,13 +51,13 @@
     "access": "public"
   },
   "dependencies": {
-    "@bomb.sh/tab": "0.0.17",
-    "@lunora/codegen": "1.0.0-alpha.33",
-    "@lunora/config": "1.0.0-alpha.54",
-    "@lunora/container": "1.0.0-alpha.6",
-    "@lunora/d1": "1.0.0-alpha.23",
-    "@lunora/errors": "1.0.0-alpha.1",
-    "@lunora/seed": "1.0.0-alpha.16",
+    "@bomb.sh/tab": "0.0.16",
+    "@lunora/codegen": "1.0.0-alpha.34",
+    "@lunora/config": "1.0.0-alpha.56",
+    "@lunora/container": "1.0.0-alpha.7",
+    "@lunora/d1": "1.0.0-alpha.24",
+    "@lunora/errors": "1.0.0-alpha.2",
+    "@lunora/seed": "1.0.0-alpha.17",
     "@visulima/cerebro": "3.0.0-alpha.32",
     "@visulima/error": "6.0.0-alpha.34",
     "@visulima/fs": "5.0.0-alpha.32",