@kenkaiiii/ggcoder 5.37.0 → 5.39.0

package/dist/app-sidecar.js

@@ -62,6 +62,7 @@ import { discoverProjects } from "./core/project-discovery.js";
 import { listSidecarSessions } from "./app-sidecar-sessions.js";
 import { loadTasksSync, saveTasksSync, pruneDoneTasksSync, getNextPendingTask, markTaskInProgress, } from "./core/tasks-store.js";
 import { initLogger, log } from "./core/logger.js";
+import { installTerminationHandlers } from "./core/shutdown.js";
 import { RADIO_STATIONS, getCurrentStation, getRadioVolume, playRadio, setRadioVolume, stopRadio, } from "./core/radio.js";
 import { enrichProcessPath } from "./core/shell-path.js";
 import { downscaleForPreview, shrinkToFit, validateVisionImage } from "./utils/image.js";
@@ -451,6 +452,8 @@ async function runJsonModeIfRequested() {
             model: { type: "string" },
             "max-turns": { type: "string" },
             "system-prompt": { type: "string" },
+            "agent-prompt": { type: "string" },
+            "agent-context": { type: "string" },
             tools: { type: "string" },
             "mcp-servers": { type: "string" },
             "prompt-cache-key": { type: "string" },
@@ -484,6 +487,8 @@ async function runJsonModeIfRequested() {
         model: values.model ?? "claude-opus-5",
         cwd: process.cwd(),
         systemPrompt: values["system-prompt"],
+        agentPrompt: values["agent-prompt"],
+        agentContext: values["agent-context"] === "none" ? "none" : undefined,
         maxTurns: maxTurnsRaw ? parseInt(maxTurnsRaw, 10) : undefined,
         allowedTools,
         allowedMcpServers,
@@ -880,23 +885,31 @@ async function main() {
         log("INFO", "app-sidecar", "daemon listening", { port: String(addr.port), host });
     });
     const shellPid = process.ppid;
-    let shuttingDown = false;
-    async function shutdown() {
-        if (shuttingDown)
-            return;
-        shuttingDown = true;
-        clearInterval(parentWatch);
-        // Radio playback is app-wide (one stream across all windows), so it stops
-        // at the daemon level, not per session.
-        stopRadio();
-        // Close the ~/.gg progress fs.watch handle (baseline #8 leak fix).
-        progress.dispose();
-        await Promise.all([...sessions.values()].map((c) => c.dispose().catch(() => { })));
-        server.close();
-        process.exit(0);
-    }
-    process.on("SIGINT", () => void shutdown());
-    process.on("SIGTERM", () => void shutdown());
+    // Session teardown awaits MCP servers, LSP servers and third-party extension
+    // `deactivate()` hooks. Any of those can hang, and an unbounded await here
+    // means the daemon never exits: the app looks quit while this process keeps
+    // the port and the radio stream alive. The deadline exits regardless.
+    const shutdown = installTerminationHandlers({
+        scope: "app-sidecar",
+        teardown: async () => {
+            clearInterval(parentWatch);
+            // Radio playback is app-wide (one stream across all windows), so it stops
+            // at the daemon level, not per session.
+            stopRadio();
+            // Close the ~/.gg progress fs.watch handle (baseline #8 leak fix).
+            progress.dispose();
+            await Promise.all([...sessions.values()].map((c) => c.dispose().catch(() => { })));
+            server.close();
+        },
+        onTimeout: (timeoutMs) => {
+            // Radio is audible, so it must stop even when the rest is wedged.
+            stopRadio();
+            log("WARN", "app-sidecar", "daemon teardown hung; exiting on deadline", {
+                timeoutMs: String(timeoutMs),
+                sessions: String(sessions.size),
+            });
+        },
+    });
     process.once("exit", stopRadio);
     // Tauri can disappear without delivering a signal (force-quit, dev runner
     // teardown, crash). Detect reparenting or a dead shell so the daemon and its
@@ -912,7 +925,7 @@ async function main() {
             }
         }
         if (!parentAlive)
-            void shutdown();
+            shutdown();
     }, 1_000);
     parentWatch.unref?.();
 }