@lkangd/cc-settings-preset 1.1.1 → 1.1.2

package/dist/core/spawn.js

@@ -1,20 +1,111 @@
+import { constants } from 'node:os';
 import spawn from 'cross-spawn';
 import { CliError } from './errors.js';
+// Signals whose default disposition is to terminate the process. We must handle
+// these explicitly: otherwise Node tears ccsp down immediately (without firing
+// the 'exit' event) and the inherited `claude` child is left orphaned to pid 1.
+//
+// tty-generated signals (SIGINT/SIGQUIT via Ctrl+C / Ctrl+\) are intentionally
+// excluded: the tty delivers them to the whole foreground process group, so
+// claude already receives them directly — forwarding would double-deliver and
+// break claude's own interrupt handling. SIGHUP (terminal close) and SIGTERM
+// (external kill) are not tty-generated, so forwarding them is unambiguous.
+const TERMINATION_SIGNALS = ['SIGHUP', 'SIGTERM'];
+// Grace period between forwarding the terminating signal and force-killing a
+// child that refuses to exit (e.g. claude ignores SIGHUP while in raw mode).
+const FORCE_KILL_DELAY_MS = 5000;
 export async function spawnClaude(settingsPath, claudeArgs) {
     return new Promise((resolve, reject) => {
         const child = spawn('claude', ['--settings', settingsPath, ...claudeArgs], {
             stdio: 'inherit',
         });
+        let settled = false;
+        let forceKillTimer;
+        // Liveness must be derived from exit/signal codes, not `child.killed`:
+        // `killed` only records that kill() was *called* (true the moment we forward
+        // SIGHUP), so using it here would make the escalation timer skip the SIGKILL
+        // it exists to deliver. Both codes stay null until the child actually exits.
+        const childAlive = () => child.exitCode === null && child.signalCode === null;
+        // Forward a terminating signal to the child so it can shut down gracefully,
+        // then escalate to SIGKILL if it ignores the signal. This binds claude's
+        // lifetime to ccsp's, so closing the terminal can't leave an orphan behind.
+        const forwardSignal = (signal) => {
+            if (!childAlive())
+                return;
+            try {
+                child.kill(signal);
+            }
+            catch {
+                // Child is already gone; nothing to forward.
+            }
+            if (!forceKillTimer) {
+                forceKillTimer = setTimeout(() => {
+                    if (childAlive()) {
+                        try {
+                            child.kill('SIGKILL');
+                        }
+                        catch {
+                            // Already exited between the check and the kill.
+                        }
+                    }
+                }, FORCE_KILL_DELAY_MS);
+                // Don't let the escalation timer keep ccsp alive on its own.
+                forceKillTimer.unref?.();
+            }
+        };
+        // Last-resort guarantee: if ccsp exits through any path while the child is
+        // still alive, take the child down with it. The 'exit' handler runs
+        // synchronously, so only a synchronous kill is reliable here.
+        const onProcessExit = () => {
+            if (childAlive()) {
+                try {
+                    child.kill('SIGKILL');
+                }
+                catch {
+                    // Already exited.
+                }
+            }
+        };
+        for (const signal of TERMINATION_SIGNALS) {
+            process.on(signal, forwardSignal);
+        }
+        process.on('exit', onProcessExit);
+        const cleanup = () => {
+            if (forceKillTimer) {
+                clearTimeout(forceKillTimer);
+                forceKillTimer = undefined;
+            }
+            for (const signal of TERMINATION_SIGNALS) {
+                process.removeListener(signal, forwardSignal);
+            }
+            process.removeListener('exit', onProcessExit);
+        };
         child.once('error', error => {
-            if (error.code === 'ENOENT') {
+            if (settled)
+                return;
+            settled = true;
+            cleanup();
+            const err = error;
+            if (err.code === 'ENOENT') {
                 reject(new CliError('Claude Code executable not found. Install Claude Code or check PATH.'));
                 return;
             }
-            reject(error);
+            // Wrap every other spawn failure (EACCES, EMFILE, …) in a CliError so the
+            // caller sets a non-zero process.exitCode and prints a clean message,
+            // instead of surfacing a raw unhandled rejection.
+            reject(new CliError(`Failed to launch Claude Code: ${err.message}`));
         });
         child.once('close', (exitCode, signal) => {
+            if (settled)
+                return;
+            settled = true;
+            cleanup();
             if (signal) {
-                reject(new CliError(`Command terminated by signal ${signal}`));
+                // Signal death is the expected outcome of our own forwarding (terminal
+                // close / external kill), not an error. Report it with the conventional
+                // 128+signum exit status so callers can both detect it and stay quiet.
+                const signum = constants.signals[signal] ?? 0;
+                resolve(128 + signum);
                 return;
             }
             if (exitCode === null) {

package/dist/core/spawn.js.map

@@ -1 +1 @@
-{"version":3,"file":"spawn.js","sourceRoot":"","sources":["../../src/core/spawn.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,aAAa,CAAA;AAE/B,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AAEtC,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,YAAoB,EAAE,UAAoB;IAC1E,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,MAAM,KAAK,GAAG,KAAK,CAAC,QAAQ,EAAE,CAAC,YAAY,EAAE,YAAY,EAAE,GAAG,UAAU,CAAC,EAAE;YACzE,KAAK,EAAE,SAAS;SACjB,CAAC,CAAA;QAEF,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE;YAC1B,IAAK,KAA+B,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;gBACvD,MAAM,CAAC,IAAI,QAAQ,CAAC,sEAAsE,CAAC,CAAC,CAAA;gBAC5F,OAAM;YACR,CAAC;YACD,MAAM,CAAC,KAAK,CAAC,CAAA;QACf,CAAC,CAAC,CAAA;QAEF,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,QAAuB,EAAE,MAA6B,EAAE,EAAE;YAC7E,IAAI,MAAM,EAAE,CAAC;gBACX,MAAM,CAAC,IAAI,QAAQ,CAAC,gCAAgC,MAAM,EAAE,CAAC,CAAC,CAAA;gBAC9D,OAAM;YACR,CAAC;YAED,IAAI,QAAQ,KAAK,IAAI,EAAE,CAAC;gBACtB,MAAM,CAAC,IAAI,QAAQ,CAAC,yCAAyC,CAAC,CAAC,CAAA;gBAC/D,OAAM;YACR,CAAC;YAED,IAAI,QAAQ,KAAK,CAAC,EAAE,CAAC;gBACnB,MAAM,CAAC,IAAI,QAAQ,CAAC,4BAA4B,QAAQ,EAAE,EAAE,QAAQ,CAAC,CAAC,CAAA;gBACtE,OAAM;YACR,CAAC;YAED,OAAO,CAAC,CAAC,CAAC,CAAA;QACZ,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;AACJ,CAAC"}
+{"version":3,"file":"spawn.js","sourceRoot":"","sources":["../../src/core/spawn.ts"],"names":[],"mappings":"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"}

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const VERSION = "1.1.1";
+export declare const VERSION = "1.1.2";

package/dist/version.js

@@ -1,3 +1,3 @@
 // Generated by scripts/generate-version.mjs. Do not edit.
-export const VERSION = "1.1.1";
+export const VERSION = "1.1.2";
 //# sourceMappingURL=version.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lkangd/cc-settings-preset",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "A switchable, reusable runtime settings preset selector for Claude Code",
   "keywords": [
     "claude-code",