shennian 0.2.83 → 0.2.85

package/dist/src/commands/daemon.d.ts

@@ -51,6 +51,7 @@ export declare function clearDaemonPidIfOwner(pid: number, instanceId: string):
 export declare function writeDaemonLauncher(pid: number, launcher?: DaemonLauncher, instanceId?: string): void;
 export declare function clearDaemonLauncher(instanceId?: string): void;
 export declare function recordStartedDaemon(childPid: number | undefined): void;
+export declare function isShennianRunServiceCommand(command: string): boolean;
 export declare function findRunningDaemonProcessIds(excludePid?: number): number[];
 export declare function getDaemonStatus(opts?: {
     cleanupStale?: boolean;

package/dist/src/commands/daemon.js

@@ -248,13 +248,11 @@ function inferDaemonLauncherFromProcess(pid) {
     }
     return 'unknown';
 }
-function isShennianRunServiceCommand(command) {
-    const normalized = command.replace(/\\/g, '/');
-    return (normalized.includes(' run-service') &&
-        (normalized.includes('/node_modules/shennian/') ||
-            normalized.includes('/dist/bin/shennian.js') ||
-            normalized.includes(' shennian run-service') ||
-            normalized.includes(' shennian.js run-service')));
+export function isShennianRunServiceCommand(command) {
+    const normalized = command.replace(/\\/g, '/').trim();
+    return (/^(?:\S*\/)?node\s+\S*(?:\/node_modules\/shennian\/|\/dist\/bin\/shennian\.js)\s+run-service(?:\s|$)/.test(normalized) ||
+        /^(?:\S*\/)?shennian(?:\.cmd)?\s+run-service(?:\s|$)/.test(normalized) ||
+        /^(?:\S*\/)?npx(?:\.cmd)?\s+(?:--yes\s+)?shennian\s+run-service(?:\s|$)/.test(normalized));
 }
 export function findRunningDaemonProcessIds(excludePid = process.pid) {
     if (getPlatform() === 'win32')
@@ -569,21 +567,7 @@ export function startDaemonProcess(opts = {}) {
         }
         return;
     }
-    if (status.pid !== null && status.running && status.adopted) {
-        try {
-            process.kill(status.pid, 'SIGTERM');
-            waitForPidExitSync(status.pid);
-            try {
-                fs.unlinkSync(PID_FILE);
-            }
-            catch {
-                // The adopted daemon may have cleaned up or another start may have taken over.
-            }
-        }
-        catch {
-            // The adopted orphan may already have exited; continue with a clean start.
-        }
-    }
+    stopAdoptedDaemonForStart(status);
     const logFd = fs.openSync(LOG_FILE, 'a');
     const launch = buildDetachedLaunchSpec(resolveCurrentServiceLaunchSpec());
     const child = spawn(launch.command, launch.args, buildDaemonSpawnOptions(launch, logFd));
@@ -595,6 +579,23 @@ export function startDaemonProcess(opts = {}) {
         console.log(chalk.gray(`  Logs: ${LOG_FILE}`));
     }
 }
+function stopAdoptedDaemonForStart(status = getDaemonStatus({ cleanupStale: true })) {
+    if (status.pid === null || !status.running || !status.adopted)
+        return;
+    try {
+        process.kill(status.pid, 'SIGTERM');
+        waitForPidExitSync(status.pid);
+        try {
+            fs.unlinkSync(PID_FILE);
+        }
+        catch {
+            // The adopted daemon may have cleaned up or another start may have taken over.
+        }
+    }
+    catch {
+        // The adopted orphan may already have exited; continue with a clean start.
+    }
+}
 /**
  * Install the platform-native auto-start service.
  * Returns true if the service was immediately started (so caller can skip startDaemonProcess).
@@ -724,6 +725,7 @@ async function stopDaemonProcessAndWait(timeoutMs = 5000) {
 function enableRemoteAccess(opts = {}) {
     persistServerUrlOverride(resolveServerUrlOverride(opts.api));
     clearRemoteAccessDisabled();
+    stopAdoptedDaemonForStart();
     const startedByService = installService();
     if (!startedByService) {
         startDaemonProcess({ quiet: opts.json });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shennian",
-  "version": "0.2.83",
+  "version": "0.2.85",
   "description": "Shennian — AI Agent Control Plane CLI",
   "type": "module",
   "bin": {