@skillcap/gdh 3.2.1 → 3.2.3

package/node_modules/@gdh/runtime/dist/index.d.ts

@@ -1,6 +1,6 @@
 import { type GdhJsonValue, type GdhProjectConfig, type GdhRuntimeBridgeEntryListResult, type GdhRuntimeBridgeInvocationResult, type GdhRuntimeBridgeSessionStartResult, type GdhRuntimeBridgeSessionStopResult, type GdhRuntimeInspectionSource, type GdhRuntimeRecipeCheckResult, type GdhRuntimeRecipeListResult, type GdhRuntimeRecipeRunResult, type GdhRuntimeRecipeShowResult, type GdhRuntimeWorkspaceMode } from "@gdh/core";
 export { ensureRuntimeBridgeBroker, inspectRuntimeBridgeBroker, pruneRuntimeBridgeBroker, type RuntimeBridgeBrokerEnsureResult, type RuntimeBridgeBrokerPruneResult, resolveRuntimeBridgeBrokerPaths, serveRuntimeBridgeBroker, } from "./bridge-broker.js";
-export { getRuntimeBridgeBrokerSession, invokeRuntimeBridgeBroker, invokeRuntimeBridgeBrokerEntry, listRuntimeBridgeBrokerEntries, listRuntimeBridgeBrokerSessions, type RuntimeBridgeBrokerClientInput, startRuntimeBridgeBrokerSession, stopAllRuntimeBridgeBrokerSessions, stopRuntimeBridgeBrokerSession, } from "./bridge-broker-client.js";
+export { getRuntimeBridgeBrokerSession, invokeRuntimeBridgeBroker, invokeRuntimeBridgeBrokerEntry, listRuntimeBridgeBrokerEntries, listRuntimeBridgeBrokerSessions, pruneRuntimeBridgeBrokerProcess, type RuntimeBridgeBrokerClientInput, startRuntimeBridgeBrokerSession, stopAllRuntimeBridgeBrokerSessions, stopRuntimeBridgeBrokerSession, } from "./bridge-broker-client.js";
 export { BROKER_DEFAULT_HEARTBEAT_STALE_AFTER_MS, BROKER_LOOPBACK_HOST, BROKER_PROTOCOL_VERSION, type GdhRuntimeBridgeBrokerPathStyle, type NormalizeBrokerTargetIdentityInput, normalizeBrokerTargetIdentity, type ValidateBrokerHandshakeInput, validateBrokerHandshake, } from "./bridge-broker-contract.js";
 export { inspectRuntimeBridgeSurface, installRuntimeBridgeSurface, removeRuntimeBridgeSurface, repairRuntimeBridgeSurface, resolveRuntimeBridgeConfig, } from "./bridge-surface.js";
 export { inspectRuntimeKnowledgeSurface } from "./knowledge-surface.js";

package/node_modules/@gdh/runtime/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/node_modules/@gdh/runtime/dist/index.js

@@ -5,13 +5,13 @@ import net from "node:net";
 import os from "node:os";
 import path from "node:path";
 import { promisify } from "node:util";
-import { definePackageBoundary, detectFatalGodotStderr, GDH_RECIPE_SCHEMA_VERSION, GDH_RUNTIME_RECIPE_RUN_VERSION, presentPublicRuntimeTerms, resolveConfiguredGodotEditorBin, } from "@gdh/core";
+import { definePackageBoundary, detectFatalGodotStderr, GDH_RECIPE_SCHEMA_VERSION, GDH_RUNTIME_RECIPE_RUN_VERSION, presentPublicRuntimeTerms, resolveConfiguredGodotEditorBin, terminateProcess, } from "@gdh/core";
 import WebSocket, {} from "ws";
 import { parse } from "yaml";
 import { inspectRuntimeBridgeSurface } from "./bridge-surface.js";
 import { buildDockerRuntimeLaunchPreview, ensureDockerRuntimeImagePlan, inspectDockerRuntimeProvider, toDockerContainerPath, } from "./docker-provider.js";
 export { ensureRuntimeBridgeBroker, inspectRuntimeBridgeBroker, pruneRuntimeBridgeBroker, resolveRuntimeBridgeBrokerPaths, serveRuntimeBridgeBroker, } from "./bridge-broker.js";
-export { getRuntimeBridgeBrokerSession, invokeRuntimeBridgeBroker, invokeRuntimeBridgeBrokerEntry, listRuntimeBridgeBrokerEntries, listRuntimeBridgeBrokerSessions, startRuntimeBridgeBrokerSession, stopAllRuntimeBridgeBrokerSessions, stopRuntimeBridgeBrokerSession, } from "./bridge-broker-client.js";
+export { getRuntimeBridgeBrokerSession, invokeRuntimeBridgeBroker, invokeRuntimeBridgeBrokerEntry, listRuntimeBridgeBrokerEntries, listRuntimeBridgeBrokerSessions, pruneRuntimeBridgeBrokerProcess, startRuntimeBridgeBrokerSession, stopAllRuntimeBridgeBrokerSessions, stopRuntimeBridgeBrokerSession, } from "./bridge-broker-client.js";
 export { BROKER_DEFAULT_HEARTBEAT_STALE_AFTER_MS, BROKER_LOOPBACK_HOST, BROKER_PROTOCOL_VERSION, normalizeBrokerTargetIdentity, validateBrokerHandshake, } from "./bridge-broker-contract.js";
 export { inspectRuntimeBridgeSurface, installRuntimeBridgeSurface, removeRuntimeBridgeSurface, repairRuntimeBridgeSurface, resolveRuntimeBridgeConfig, } from "./bridge-surface.js";
 export { inspectRuntimeKnowledgeSurface } from "./knowledge-surface.js";
@@ -19,7 +19,7 @@ export const runtimePackage = definePackageBoundary({
     name: "@gdh/runtime",
     layer: "capability",
     responsibility: "Local run adapters, runtime bridge coordination, and runtime readiness surfaces.",
-    allowedInternalDependencies: ["@gdh/core", "@gdh/editor"],
+    allowedInternalDependencies: ["@gdh/core"],
 });
 const PRIMARY_RUN_CONFIGURATION_DIRECTORY = ".gdh/run-configurations";
 const LEGACY_RECIPE_DIRECTORY = ".gdh/recipes";
@@ -1374,15 +1374,53 @@ async function executeCommand(preview, artifactDirectory, launchKind, maxRuntime
             let stdout = "";
             let stderr = "";
             let timedOut = false;
+            let settled = false;
             let timeoutHandle = null;
-            let forceKillHandle = null;
             if (maxRuntimeSeconds !== null && maxRuntimeSeconds > 0) {
                 timeoutHandle = setTimeout(() => {
                     timedOut = true;
-                    child.kill("SIGTERM");
-                    forceKillHandle = setTimeout(() => {
-                        child.kill("SIGKILL");
-                    }, 5000);
+                    if (child.pid !== undefined) {
+                        void terminateProcess({
+                            pid: child.pid,
+                            gracefulTimeoutMs: 5000,
+                        }).then((termination) => {
+                            if (settled)
+                                return;
+                            if (!termination.stillRunning) {
+                                setTimeout(() => {
+                                    if (settled)
+                                        return;
+                                    settled = true;
+                                    resolve({
+                                        exitCode: 1,
+                                        signal: termination.signalSent,
+                                        stdout,
+                                        stderr,
+                                        timedOut,
+                                    });
+                                }, 250).unref();
+                                return;
+                            }
+                            settled = true;
+                            resolve({
+                                exitCode: 1,
+                                signal: null,
+                                stdout,
+                                stderr: `${stderr}GDH runtime process remained alive after SIGKILL.\n`,
+                                timedOut,
+                            });
+                        });
+                    }
+                    else if (!settled) {
+                        settled = true;
+                        resolve({
+                            exitCode: 1,
+                            signal: null,
+                            stdout,
+                            stderr: `${stderr}GDH runtime process timed out before a PID was available.\n`,
+                            timedOut,
+                        });
+                    }
                 }, maxRuntimeSeconds * 1000);
             }
             child.stdout.on("data", (chunk) => {
@@ -1393,12 +1431,12 @@ async function executeCommand(preview, artifactDirectory, launchKind, maxRuntime
             });
             child.on("error", reject);
             child.on("close", (exitCode, signal) => {
+                if (settled)
+                    return;
+                settled = true;
                 if (timeoutHandle !== null) {
                     clearTimeout(timeoutHandle);
                 }
-                if (forceKillHandle !== null) {
-                    clearTimeout(forceKillHandle);
-                }
                 resolve({
                     exitCode: exitCode ?? (timedOut ? 0 : 1),
                     signal: signal ?? null,
@@ -1762,8 +1800,8 @@ export function createRuntimeBridgeManager() {
                 if (startedSocket && startedSocket.readyState === WebSocket.OPEN) {
                     startedSocket.close();
                 }
-                if (startedChild) {
-                    startedChild.kill("SIGTERM");
+                if (startedChild?.pid !== undefined) {
+                    await terminateProcess({ pid: startedChild.pid }).catch(() => null);
                 }
                 await applyLaunchCleanupHints(executionLaunchPreview?.cleanupHints ?? []).catch(() => { });
                 await workspace.cleanup();
@@ -1943,11 +1981,19 @@ async function stopBridgeSessionHandle(session) {
         session.ws.close();
     }
     if (session.exitCode.value === null) {
-        session.child.kill("SIGTERM");
-        const exited = await Promise.race([session.exitPromise, waitMs(2000).then(() => null)]);
-        if (exited === null) {
-            session.child.kill("SIGKILL");
-            await session.exitPromise;
+        if (session.child.pid !== undefined) {
+            const termination = await terminateProcess({
+                pid: session.child.pid,
+                gracefulTimeoutMs: 2000,
+            });
+            if (!termination.stillRunning) {
+                await Promise.race([session.exitPromise, waitMs(250).then(() => null)]);
+            }
+            else {
+                recordBridgeEvent(session, "process_stop_incomplete", {
+                    termination: JSON.parse(JSON.stringify(termination)),
+                });
+            }
         }
     }
     session.finishedAt = new Date().toISOString();
@@ -2764,6 +2810,7 @@ async function connectBridgeSocket(input) {
             const retryable = code === "ECONNREFUSED" ||
                 code === "ECONNRESET" ||
                 code === "ENOENT" ||
+                failure.message === "[object ErrorEvent]" ||
                 failure.message.includes("socket hang up");
             if (!retryable && !failure.message.includes("Timed out waiting")) {
                 throw failure;