@lalalic/markcut 3.2.13 → 3.2.14

package/README.md

@@ -370,3 +370,13 @@ export MARKCUT_VTT_CLI='my-video-backend --prompt "{prompt}" {input}'
 ```
 
 ## Architecture
+
+### Global queue CLI template (opt-in)
+
+Set `MARKCUT_QUEUE_CLI_TEMPLATE` in Markcut's environment to route generation and vision CLI subprocesses through the PM2-managed queue worker. `{command}` is the shell-quoted original command; the queue wrapper sets `MARKCUT_QUEUE_ACTIVE=1` for descendants to prevent re-entrance.
+
+```bash
+export MARKCUT_QUEUE_CLI_TEMPLATE='node "$HOME/.agents/skills/queue/queue.mjs" run --queue media-ai -- /bin/sh -c {command}'
+```
+
+The template must use an executable reachable from the process environment. To avoid ambiguity with shell quoting of `$HOME`, use a literal absolute path in production. If unset, execution is unchanged. Rendering cache continues to be managed by Markcut, not the queue. No service restart or Markcut-specific queue daemon is required.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lalalic/markcut",
-  "version": "3.2.13",
+  "version": "3.2.14",
   "description": "Markdown-to-video engine. Describe scenes in markdown, get a rendered video.",
   "bin": {
     "markcut": "bin/markcut"

package/src/queue-cli.mjs

@@ -0,0 +1,17 @@
+/** Optional global queue CLI template for expensive Markcut operations. */
+export function shellQuote(value) {
+  return "'" + String(value).replace(/'/g, "'\\''") + "'";
+}
+export function queueCommand(command, env = process.env) {
+  const template = env.MARKCUT_QUEUE_CLI_TEMPLATE;
+  if (!template || env.MARKCUT_QUEUE_ACTIVE === "1") return command;
+  if (!template.includes("{command}")) throw Error("MARKCUT_QUEUE_CLI_TEMPLATE must contain {command}");
+  // The worker runs a shell to execute the original CLI without re-entering the queue.
+  return template.replaceAll("{command}", shellQuote(`MARKCUT_QUEUE_ACTIVE=1 ${command}`));
+}
+export function queueArgv(command, argv, env = process.env) {
+  const template = env.MARKCUT_QUEUE_CLI_TEMPLATE;
+  if (!template || env.MARKCUT_QUEUE_ACTIVE === "1") return { command, argv };
+  const cmd = [command, ...argv].map(shellQuote).join(" ");
+  return { command: "/bin/sh", argv: ["-c", queueCommand(cmd, env)] };
+}

package/src/render/cli-tools.ts

@@ -11,6 +11,7 @@
  * Override via MARKCUT_TTS_CLI / MARKCUT_STT_CLI / MARKCUT_TTI_CLI / MARKCUT_TTV_CLI.
  */
 import { execSync, exec } from "node:child_process";
+import { queueCommand } from "../queue-cli.mjs";
 import { existsSync, mkdirSync } from "node:fs";
 import { dirname } from "node:path";
 import {
@@ -89,7 +90,7 @@ export function generateTTS(text: string, outputPath: string, cli?: string): str
   mkdirSync(dirname(outputPath), { recursive: true });
   const cmd = substituteCli(cli ?? DEFAULT_TTS_CLI, text, outputPath);
   try {
-    execSync(cmd, { stdio: "pipe" });
+    execSync(queueCommand(cmd), { stdio: "pipe" });
   } catch (e: any) {
     console.warn(`  ⚠ TTS failed: ${e.message}`);
     return "";
@@ -104,7 +105,7 @@ export function generateTTS(text: string, outputPath: string, cli?: string): str
 export async function generateSTT(audioPath: string, outputDir: string, cli?: string): Promise<void> {
   const cmd = substituteCli(cli ?? DEFAULT_STT_CLI, audioPath, outputDir);
   try {
-    execSync(cmd, { stdio: "pipe" });
+    execSync(queueCommand(cmd), { stdio: "pipe" });
   } catch (e: any) {
     console.warn(`  ⚠ STT failed: ${e.message}`);
   }
@@ -119,7 +120,7 @@ export function generateTTI(prompt: string, outputPath: string, cli?: string, se
   mkdirSync(dirname(outputPath), { recursive: true });
   const cmd = substituteCli(cli ?? DEFAULT_TTI_CLI, prompt, outputPath, seed);
   try {
-    execSync(cmd, {
+    execSync(queueCommand(cmd), {
       encoding: "utf-8",
       stdio: ["pipe", "pipe", "pipe"],
       timeout: 300_000,
@@ -162,7 +163,7 @@ export function generateTTV(
     }
     try {
       execSync(
-        `ffmpeg -y -loop 1 -i "${pngPath}" -c:v libx264 -t 3 -pix_fmt yuv420p "${outputPath}"`,
+        queueCommand(`ffmpeg -y -loop 1 -i "${pngPath}" -c:v libx264 -t 3 -pix_fmt yuv420p "${outputPath}"`),
         { stdio: ["pipe", "pipe", "pipe"], timeout: 60_000 },
       );
     } catch (e: any) {
@@ -177,7 +178,7 @@ export function generateTTV(
   // Custom CLI mode: substitute template and run
   const cmd = substituteCli(cli, prompt, outputPath, seed);
   try {
-    execSync(cmd, {
+    execSync(queueCommand(cmd), {
       encoding: "utf-8",
       stdio: ["pipe", "pipe", "pipe"],
       timeout: 300_000,

package/src/vision/candidate.mjs

@@ -5,6 +5,7 @@ import {
 import { basename, dirname, extname, join, resolve } from "node:path";
 import { z } from "zod";
 import { execSync } from "node:child_process";
+import { queueCommand } from "../queue-cli.mjs";
 import { VIDEO_EXTS, DEFAULT_VTT_SAMPLE_INTERVAL } from "../config.mjs";
 
 export const CANDIDATE_CONTRACT_VERSION = 1;
@@ -107,7 +108,7 @@ function shQuote(value) {
 }
 
 function run(command, options = {}) {
-  return execSync(command, {
+  return execSync(queueCommand(command), {
     encoding: "utf-8",
     stdio: ["pipe", "pipe", "pipe"],
     timeout: 300_000,

package/src/vision/cli.mjs

@@ -37,6 +37,7 @@
  */
 
 import { execSync, spawn } from "node:child_process";
+import { queueCommand } from "../queue-cli.mjs";
 import { createHash } from "node:crypto";
 import {
   existsSync, mkdirSync, readFileSync, writeFileSync, readdirSync, statSync, renameSync, rmSync,
@@ -67,7 +68,7 @@ function emitWarn(msg) { console.error(`⚠️  ${msg}`); }
 function emitError(msg) { console.error(`❌ ${msg}`); }
 
 function run(cmd, opts = {}) {
-  return execSync(cmd, {
+  return execSync(queueCommand(cmd), {
     encoding: "utf-8",
     stdio: ["pipe", "pipe", "pipe"],
     timeout: 300_000,

package/src/vision/default-infer.mjs

@@ -1,5 +1,6 @@
 #!/usr/bin/env node
 import { spawnSync } from "node:child_process";
+import { queueArgv } from "../queue-cli.mjs";
 import { accessSync, constants, existsSync, mkdtempSync, readFileSync, rmSync } from "node:fs";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
@@ -28,7 +29,8 @@ function which(name) {
 }
 
 function run(command, args, options = {}) {
-  const r = spawnSync(command, args, { encoding: "utf8", timeout: options.timeout || 600_000, env: process.env });
+  const queued = queueArgv(command, args);
+  const r = spawnSync(queued.command, queued.argv, { encoding: "utf8", timeout: options.timeout || 600_000, env: process.env });
   return { ok: r.status === 0, stdout: (r.stdout || "").trim(), stderr: (r.stderr || "").trim(), status: r.status };
 }
 

package/tests/queue-cli.test.ts

@@ -0,0 +1,17 @@
+import { describe, expect, it } from "vitest";
+import { queueCommand, queueArgv } from "../src/queue-cli.mjs";
+describe("global queue CLI template", () => {
+  it("is disabled unless global env is set", () => expect(queueCommand("echo one", {})).toBe("echo one"));
+  it("wraps a shell command with a recursion guard", () => {
+    const env = { MARKCUT_QUEUE_CLI_TEMPLATE: "node queue.mjs run --queue media-ai -- /bin/sh -c {command}" };
+    const result = queueCommand('echo "a b"', env);
+    expect(result).toContain("MARKCUT_QUEUE_ACTIVE=1");
+    expect(result).toContain("node queue.mjs run --queue media-ai");
+    expect(queueCommand("echo no nested", {...env, MARKCUT_QUEUE_ACTIVE:"1"})).toBe("echo no nested");
+  });
+  it("rejects unusable templates", () => expect(() => queueCommand("echo 1", {MARKCUT_QUEUE_CLI_TEMPLATE:"invalid"})).toThrow(/\{command\}/));
+  it("handles spawned CLI argv without escaping loss", () => {
+    const r=queueArgv("python",["file with spaces", "quoted'word"],{MARKCUT_QUEUE_CLI_TEMPLATE:"queue run -- /bin/sh -c {command}"});
+    expect(r.command).toBe("/bin/sh");expect(r.argv[1]).toContain("MARKCUT_QUEUE_ACTIVE");
+  });
+});