storyforge 0.5.3 → 0.6.0

package/dist/{bridge-poller-WEKSUZMT.js → bridge-poller-MM6K2GKM.js}

@@ -9,6 +9,7 @@ import * as crypto from "crypto";
 import * as fs from "fs";
 var HEARTBEAT_INTERVAL_MS = 6e4;
 var POLL_INTERVAL_MS = 8e3;
+var CANCEL_POLL_INTERVAL_MS = 5e3;
 var CLI_TIMEOUT_MS = Number(process.env.SCRIPT_GEN_TIMEOUT_MS) || 20 * 60 * 1e3;
 var IMAGE_GEN_TIMEOUT_MS = Number(process.env.CODEX_IMAGE_GEN_TIMEOUT_MS) || Number(process.env.IMAGE_GEN_TIMEOUT_MS) || 8 * 60 * 1e3;
 var MAX_IN_FLIGHT_JOBS = Math.max(1, Math.min(6, Number(process.env.FORGE_BRIDGE_MAX_IN_FLIGHT) || 4));
@@ -21,7 +22,14 @@ var BridgePoller = class {
   instanceId;
   heartbeatTimer = null;
   pollTimer = null;
+  cancelPollTimer = null;
   inFlight = /* @__PURE__ */ new Set();
+  /**
+   * P-Concern-J: track each in-flight job's child process so we can
+   * SIGTERM it when the cancel_requested flag fires. Cleared on
+   * runJob exit.
+   */
+  inFlightChildren = /* @__PURE__ */ new Map();
   stopped = false;
   constructor(opts) {
     this.baseUrl = opts.baseUrl.replace(/\/$/, "");
@@ -39,13 +47,18 @@ var BridgePoller = class {
     this.pollTimer = setInterval(() => {
       void this.poll();
     }, POLL_INTERVAL_MS);
+    this.cancelPollTimer = setInterval(() => {
+      void this.checkCancels();
+    }, CANCEL_POLL_INTERVAL_MS);
   }
   async stop() {
     this.stopped = true;
     if (this.heartbeatTimer) clearInterval(this.heartbeatTimer);
     if (this.pollTimer) clearInterval(this.pollTimer);
+    if (this.cancelPollTimer) clearInterval(this.cancelPollTimer);
     this.heartbeatTimer = null;
     this.pollTimer = null;
+    this.cancelPollTimer = null;
   }
   probeBinary(name) {
     if (!/^[a-z][a-z0-9-]*$/i.test(name)) return { available: false, path: null };
@@ -76,11 +89,68 @@ var BridgePoller = class {
       if (!resp.ok) {
         const text = await resp.text().catch(() => "");
         log.warn(`[bridge] heartbeat HTTP ${resp.status}: ${text.slice(0, 120)}`);
+        return;
       }
+      const data = await resp.json().catch(() => null);
+      this.handleCancelRequestedIds(data?.cancelRequestedJobs ?? []);
     } catch (err) {
       log.warn(`[bridge] heartbeat failed: ${err.message}`);
     }
   }
+  /**
+   * P-Concern-J: tighter-cadence cancel detection. Polls the
+   * heartbeat-style endpoint every 5s asking only for the cancel list
+   * (cheap query — partial index on cancel_requested). When a flagged
+   * job ID matches an in-flight one, SIGTERM the child process.
+   *
+   * We reuse the heartbeat endpoint itself rather than adding a new
+   * route; the endpoint already returns cancelRequestedJobs and the
+   * cost of the inner UPDATE is constant (idempotent).
+   */
+  async checkCancels() {
+    if (this.stopped || this.inFlight.size === 0) return;
+    try {
+      const resp = await fetch(`${this.baseUrl}/api/cli-bridge/heartbeat`, {
+        method: "POST",
+        headers: {
+          Authorization: `Bearer ${this.token}`,
+          "Content-Type": "application/json"
+        },
+        body: JSON.stringify({
+          availableClis: {
+            claude: this.probeBinary("claude"),
+            codex: this.probeBinary("codex")
+          },
+          clientVersion: this.clientVersion,
+          instanceId: this.instanceId
+        }),
+        signal: AbortSignal.timeout(15e3)
+      });
+      if (!resp.ok) return;
+      const data = await resp.json().catch(() => null);
+      this.handleCancelRequestedIds(data?.cancelRequestedJobs ?? []);
+    } catch {
+    }
+  }
+  handleCancelRequestedIds(ids) {
+    if (!ids.length) return;
+    for (const id of ids) {
+      const child = this.inFlightChildren.get(id);
+      if (!child) continue;
+      log.warn(`[bridge] cancel_requested for job ${id.slice(0, 8)} \u2014 SIGTERM-ing child pid=${child.pid}`);
+      try {
+        child.kill("SIGTERM");
+        setTimeout(() => {
+          try {
+            if (!child.killed) child.kill("SIGKILL");
+          } catch {
+          }
+        }, 3e3);
+      } catch (err) {
+        log.warn(`[bridge] SIGTERM failed for ${id.slice(0, 8)}: ${err.message}`);
+      }
+    }
+  }
   async poll() {
     if (this.stopped) return;
     const availableSlots = MAX_IN_FLIGHT_JOBS - this.inFlight.size;
@@ -136,9 +206,10 @@ var BridgePoller = class {
       await this.respond(job.id, { error: err.message, latencyMs });
     } finally {
       this.inFlight.delete(job.id);
+      this.inFlightChildren.delete(job.id);
     }
   }
-  async invokeCli(cli, model, prompt) {
+  async invokeCli(cli, model, prompt, onSpawn) {
     const candidates = cli === "codex" ? model && /^[a-z0-9.\-]+$/i.test(model) ? [model] : ["gpt-5.5", "gpt-5.4", "gpt-5.4-mini"] : model && /^[a-z0-9-]+$/i.test(model) ? [model] : ["opus", "sonnet"];
     let lastErr = "";
     for (const m of candidates) {
@@ -151,7 +222,7 @@ var BridgePoller = class {
           "--allowedTools",
           "WebSearch,WebFetch"
         ];
-        const text = await runSpawn(cli, args, prompt, CLI_TIMEOUT_MS);
+        const text = await runSpawn(cli, args, prompt, CLI_TIMEOUT_MS, onSpawn);
         if (text.trim()) return { text, modelUsed: `${cli}:${m}` };
         lastErr = `${cli}/${m} returned empty stdout`;
       } catch (err) {
@@ -161,24 +232,27 @@ var BridgePoller = class {
     return { error: lastErr || "no model produced output" };
   }
   async invokeJob(job) {
+    const onSpawn = (child) => {
+      this.inFlightChildren.set(job.id, child);
+    };
     const claudePromptEnvelope = parseClaudePromptEnvelope(job.prompt);
     if (claudePromptEnvelope) {
       if (job.cli !== "claude") return { error: `${claudePromptEnvelope.__forgeJobKind} envelope requires claude CLI` };
-      return this.invokeClaudeWithEnvelope(job.model, claudePromptEnvelope);
+      return this.invokeClaudeWithEnvelope(job.model, claudePromptEnvelope, onSpawn);
     }
     const imagePayload = parseImageGenPayload(job.prompt);
     if (imagePayload) {
       if (job.cli !== "codex") return { error: "image-gen bridge jobs require codex CLI" };
-      return this.invokeCodexImageGen(job.model, imagePayload);
+      return this.invokeCodexImageGen(job.model, imagePayload, onSpawn);
     }
-    return this.invokeCli(job.cli, job.model, job.prompt);
+    return this.invokeCli(job.cli, job.model, job.prompt, onSpawn);
   }
   /**
    * Run a Claude prompt envelope. Web tools are gated by envelope.webTools:
    *   ['WebSearch','WebFetch'] for fact-pack-build (research stage)
    *   []                       for script-from-pack (pack-only writing)
    */
-  async invokeClaudeWithEnvelope(jobModel, envelope) {
+  async invokeClaudeWithEnvelope(jobModel, envelope, onSpawn) {
     const requestedModel = envelope.model || jobModel;
     const fallbackChain = envelope.__forgeJobKind === "fact-pack-build" ? ["opus", "sonnet"] : ["sonnet", "haiku"];
     const candidates = requestedModel && /^[a-z0-9-]+$/i.test(requestedModel) ? [requestedModel] : fallbackChain;
@@ -191,7 +265,7 @@ var BridgePoller = class {
     for (const m of candidates) {
       try {
         const args = baseArgs.map((a) => a === "<m>" ? m : a);
-        const text = await runSpawn("claude", args, envelope.prompt, CLI_TIMEOUT_MS);
+        const text = await runSpawn("claude", args, envelope.prompt, CLI_TIMEOUT_MS, onSpawn);
         if (text.trim()) return { text, modelUsed: `claude:${m}${tools.length === 0 ? " (no-web)" : ""}` };
         lastErr = `claude/${m} returned empty stdout`;
       } catch (err) {
@@ -200,7 +274,7 @@ var BridgePoller = class {
     }
     return { error: lastErr || "no model produced output" };
   }
-  async invokeCodexImageGen(model, payload) {
+  async invokeCodexImageGen(model, payload, onSpawn) {
     const candidates = codexImagegenModelCandidates(model);
     const count = Math.max(1, Math.min(4, Number(payload.count) || 1));
     const prompt = [
@@ -220,7 +294,7 @@ var BridgePoller = class {
     let lastErr = "";
     for (const m of candidates) {
       try {
-        const stdout = await runSpawn("codex", ["exec", "-", "--model", m], prompt, IMAGE_GEN_TIMEOUT_MS);
+        const stdout = await runSpawn("codex", ["exec", "-", "--model", m], prompt, IMAGE_GEN_TIMEOUT_MS, onSpawn);
         const images = collectImagesFromCodexStdout(stdout, count);
         if (images.length === 0) {
           lastErr = `codex/${m} imagegen returned no readable image paths`;
@@ -332,9 +406,15 @@ function mimeTypeForPath(p) {
   if (lower.endsWith(".jpg") || lower.endsWith(".jpeg")) return "image/jpeg";
   return "image/png";
 }
-function runSpawn(cmd, args, stdin, timeoutMs) {
+function runSpawn(cmd, args, stdin, timeoutMs, onSpawn) {
   return new Promise((resolve, reject) => {
     const proc = spawn(cmd, args, { stdio: ["pipe", "pipe", "pipe"] });
+    if (onSpawn) {
+      try {
+        onSpawn(proc);
+      } catch {
+      }
+    }
     let stdout = "";
     let stderr = "";
     const timer = setTimeout(() => {
@@ -354,8 +434,12 @@ function runSpawn(cmd, args, stdin, timeoutMs) {
       clearTimeout(timer);
       reject(err);
     });
-    proc.on("close", (code) => {
+    proc.on("close", (code, signal) => {
       clearTimeout(timer);
+      if (signal === "SIGTERM" || signal === "SIGKILL") {
+        reject(new Error(`${cmd} terminated by ${signal} (likely user cancel)`));
+        return;
+      }
       if (code !== 0) reject(new Error(`${cmd} exit ${code}: ${stderr.slice(-300)}`));
       else resolve(stdout);
     });

package/dist/index.js

@@ -1614,7 +1614,7 @@ Return ONLY the complete updated TSX. No markdown fences, no explanation.`;
         return "0.0.0";
       })();
       void (async () => {
-        const { BridgePoller } = await import("./bridge-poller-WEKSUZMT.js");
+        const { BridgePoller } = await import("./bridge-poller-MM6K2GKM.js");
         const poller = new BridgePoller({ baseUrl: bridgeUrl, token: bridgeToken, clientVersion: `storyforge ${pkgVersion}` });
         poller.start();
       })();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "storyforge",
-  "version": "0.5.3",
+  "version": "0.6.0",
   "description": "StoryForge — local bridge for the Forge video production web app. Zero runtime dependencies.",
   "type": "module",
   "bin": {