slides-grab 1.2.5 → 1.3.0

package/src/editor/edit-subprocess.js

@@ -23,6 +23,14 @@ export function buildEditTimeoutMessage({ engineLabel = 'Editor process', timeou
   return `${engineLabel} edit timed out after ${timeoutMs}ms and was terminated.`;
 }
 
+export const EDIT_ABORT_EXIT_CODE = 130;
+export const EDIT_ABORT_KILL_SIGNAL = 'SIGTERM';
+export const EDIT_ABORT_FORCE_KILL_AFTER_MS = 5_000;
+
+export function buildEditAbortMessage({ engineLabel = 'Editor process' } = {}) {
+  return `${engineLabel} edit was aborted and the child process was terminated.`;
+}
+
 export function runEditSubprocess({
   bin,
   args,
@@ -32,32 +40,79 @@ export function runEditSubprocess({
   timeoutMs = DEFAULT_EDIT_TIMEOUT_MS,
   engineLabel,
   onLog = () => {},
+  onChild = () => {},
+  signal,
   spawnImpl = spawn,
 }) {
   return new Promise((resolvePromise, rejectPromise) => {
     const child = spawnImpl(bin, args, { cwd, env, stdio });
 
+    try {
+      onChild(child);
+    } catch {
+      // Never let a faulty observer crash the spawn lifecycle.
+    }
+
     let stdout = '';
     let stderr = '';
     let timedOut = false;
+    let aborted = false;
     let settled = false;
     let forceKillTimer = null;
+    let abortForceKillTimer = null;
 
     const timeoutMessage = buildEditTimeoutMessage({ engineLabel, timeoutMs });
+    const abortMessage = buildEditAbortMessage({ engineLabel });
 
     const timeoutTimer = setTimeout(() => {
+      if (settled || aborted) return;
       timedOut = true;
       const messageLine = `${timeoutMessage}\n`;
       stderr += messageLine;
       onLog('stderr', messageLine);
-      child.kill(EDIT_TIMEOUT_KILL_SIGNAL);
+      try {
+        child.kill(EDIT_TIMEOUT_KILL_SIGNAL);
+      } catch {}
       forceKillTimer = setTimeout(() => {
-        child.kill('SIGKILL');
+        try {
+          child.kill('SIGKILL');
+        } catch {}
       }, EDIT_TIMEOUT_FORCE_KILL_AFTER_MS);
       forceKillTimer.unref?.();
     }, timeoutMs);
     timeoutTimer.unref?.();
 
+    function abortChild() {
+      if (settled || aborted) return;
+      aborted = true;
+      const messageLine = `${abortMessage}\n`;
+      stderr += messageLine;
+      try {
+        onLog('stderr', messageLine);
+      } catch {}
+      try {
+        child.kill(EDIT_ABORT_KILL_SIGNAL);
+      } catch {}
+      abortForceKillTimer = setTimeout(() => {
+        try {
+          child.kill('SIGKILL');
+        } catch {}
+      }, EDIT_ABORT_FORCE_KILL_AFTER_MS);
+      abortForceKillTimer.unref?.();
+    }
+
+    if (signal) {
+      if (signal.aborted) {
+        setImmediate(abortChild);
+      } else {
+        const onAbort = () => abortChild();
+        signal.addEventListener?.('abort', onAbort, { once: true });
+        child.once('close', () => {
+          signal.removeEventListener?.('abort', onAbort);
+        });
+      }
+    }
+
     child.stdout?.on('data', (chunk) => {
       const text = chunk.toString();
       stdout += text;
@@ -70,19 +125,36 @@ export function runEditSubprocess({
       onLog('stderr', text);
     });
 
-    child.on('close', (code, signal) => {
+    child.on('close', (code, exitSignal) => {
       if (settled) return;
       settled = true;
       clearTimeout(timeoutTimer);
       clearTimeout(forceKillTimer);
+      clearTimeout(abortForceKillTimer);
+
+      let resolvedCode;
+      if (timedOut) {
+        resolvedCode = EDIT_TIMEOUT_EXIT_CODE;
+      } else if (aborted) {
+        resolvedCode = EDIT_ABORT_EXIT_CODE;
+      } else {
+        resolvedCode = code ?? 1;
+      }
+
+      let resolvedSignal = exitSignal;
+      if (timedOut && !exitSignal) resolvedSignal = EDIT_TIMEOUT_KILL_SIGNAL;
+      else if (aborted && !exitSignal) resolvedSignal = EDIT_ABORT_KILL_SIGNAL;
+
       resolvePromise({
-        code: timedOut ? EDIT_TIMEOUT_EXIT_CODE : (code ?? 1),
+        code: resolvedCode,
         stdout,
         stderr,
-        signal: timedOut ? (signal || EDIT_TIMEOUT_KILL_SIGNAL) : signal,
+        signal: resolvedSignal,
         timedOut,
+        aborted,
         timeoutMs: timedOut ? timeoutMs : null,
         timeoutMessage: timedOut ? timeoutMessage : null,
+        abortMessage: aborted ? abortMessage : null,
       });
     });
 
@@ -91,6 +163,7 @@ export function runEditSubprocess({
       settled = true;
       clearTimeout(timeoutTimer);
       clearTimeout(forceKillTimer);
+      clearTimeout(abortForceKillTimer);
       rejectPromise(error);
     });
   });

package/src/editor/editor-codex-prompt.md

@@ -29,8 +29,8 @@ The user's edit request is the primary objective. All rules below exist to suppo
 - Do not use absolute filesystem paths in slide HTML.
 - Do not use non-body `background-image` for content imagery; use `<img>` instead.
 - Use `data-image-placeholder` to reserve space when no image is available yet.
-- When the request needs bespoke imagery, prefer `slides-grab image --prompt "<prompt>" --slides-dir <path>` so Nano Banana Pro saves the asset under `<slides-dir>/assets/`.
-- If `GOOGLE_API_KEY` / `GEMINI_API_KEY` is unavailable or the Nano Banana API fails, ask the user for a key or fall back to web search + download into `./assets/`.
+- When the request needs bespoke imagery, prefer `slides-grab image --prompt "<prompt>" --slides-dir <path>` so the default god-tibo-imagen provider saves the asset under `<slides-dir>/assets/` via your local Codex ChatGPT login (run `codex login` once if needed).
+- Default provider god-tibo-imagen reuses `~/.codex/auth.json` — no OpenAI/Google API key required; requires a Codex/ChatGPT account entitled to image generation. ⚠️ god-tibo calls an unsupported private Codex backend that may break without notice. Optional fallbacks: `--provider codex` (Codex/OpenAI gpt-image-2 via `OPENAI_API_KEY`; maps `--aspect-ratio` to the nearest supported OpenAI image size; `--image-size 2K|4K` is Nano Banana-only) or `--provider nano-banana` (Google `gemini-3-pro-image-preview` via `GOOGLE_API_KEY` / `GEMINI_API_KEY`; supports `--image-size 2K|4K`). If credentials are unavailable, fall back to web search + download into `./assets/`.
 - For local videos, use `<video src="./assets/<file>">` with `poster="./assets/<file>"`.
 - If a video starts on YouTube or a supported page, use `slides-grab fetch-video --url <url> --slides-dir <path>` to download first.
 

package/src/editor/editor.html

@@ -1630,9 +1630,12 @@
             <div class="sidebar-section">
               <span class="sidebar-label">Model</span>
               <select id="model-select" class="model-select">
+                <option value="gpt-5.5">gpt-5.5</option>
                 <option value="gpt-5.4">gpt-5.4</option>
                 <option value="gpt-5.3-codex">gpt-5.3-codex</option>
                 <option value="gpt-5.3-codex-spark">gpt-5.3-codex-spark</option>
+                <option value="claude-opus-4-7">claude-opus-4-7</option>
+                <option value="claude-sonnet-4-6">claude-sonnet-4-6</option>
               </select>
             </div>
             <button class="sidebar-btn" id="btn-send" title="Run Codex">

package/src/editor/js/editor-state.js

@@ -1,4 +1,4 @@
-// editor-state.js — State variables, constants, Maps/Sets
+import { ALL_MODELS } from './model-registry.js';
 
 export let SLIDE_W = 960;
 export let SLIDE_H = 540;
@@ -15,7 +15,7 @@ export const POPOVER_TEXT = 'text';
 export const POPOVER_TEXT_COLOR = 'text-color';
 export const POPOVER_BG_COLOR = 'bg-color';
 export const POPOVER_SIZE = 'size';
-export const DEFAULT_MODELS = ['gpt-5.4', 'gpt-5.3-codex', 'gpt-5.3-codex-spark', 'claude-opus-4-7', 'claude-sonnet-4-6'];
+export const DEFAULT_MODELS = ALL_MODELS.slice();
 export const DIRECT_TEXT_TAGS = new Set(['p', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'li']);
 export const NON_SELECTABLE_TAGS = new Set(['html', 'head', 'body', 'script', 'style', 'link', 'meta', 'noscript']);
 

package/src/editor/js/model-registry.js

@@ -0,0 +1,38 @@
+// Canonical editor model registry — single source of truth for the slide
+// editor's model dropdown and dispatch routing. Imported by both Node code
+// (scripts/editor-server.js, src/editor/codex-edit.js) and browser code
+// (src/editor/js/editor-state.js), so this module MUST stay browser-safe:
+// no Node imports, no Node-only globals.
+//
+// To add a new model:
+//   1. Append to CODEX_MODELS or CLAUDE_MODELS below.
+//   2. Add a matching <option> to src/editor/editor.html (also a fallback).
+//   3. Existing tests/editor/editor-model-dispatch.test.js will automatically
+//      verify the new model dispatches correctly through the editor pipeline.
+//      No per-model test additions needed.
+
+export const CODEX_MODELS = [
+  'gpt-5.5',
+  'gpt-5.4',
+  'gpt-5.3-codex',
+  'gpt-5.3-codex-spark',
+];
+
+export const CLAUDE_MODELS = ['claude-opus-4-7', 'claude-sonnet-4-6'];
+
+export const ALL_MODELS = [...CODEX_MODELS, ...CLAUDE_MODELS];
+
+export const DEFAULT_CODEX_MODEL = CODEX_MODELS[0];
+export const DEFAULT_MODEL = DEFAULT_CODEX_MODEL;
+
+export function isClaudeModel(model) {
+  return typeof model === 'string' && CLAUDE_MODELS.includes(model.trim());
+}
+
+export function isCodexModel(model) {
+  return typeof model === 'string' && CODEX_MODELS.includes(model.trim());
+}
+
+export function isKnownEditorModel(model) {
+  return isCodexModel(model) || isClaudeModel(model);
+}

package/src/god-tibo-imagen.js

@@ -0,0 +1,135 @@
+import { mkdir, readFile, rm } from 'node:fs/promises';
+import { join } from 'node:path';
+import { tmpdir } from 'node:os';
+import { randomUUID } from 'node:crypto';
+
+import {
+  createProvider as defaultCreateProvider,
+  resolveConfig as defaultResolveConfig,
+} from 'god-tibo-imagen';
+
+export const GOD_TIBO_DEFAULT_MODEL = 'gpt-5.4';
+export const GOD_TIBO_PROVIDER_AUTO = 'auto';
+export const GOD_TIBO_PROVIDER_PRIVATE_CODEX = 'private-codex';
+export const GOD_TIBO_PROVIDER_CODEX_CLI = 'codex-cli';
+
+const ASPECT_RATIO_HINTS = new Map([
+  ['16:9', 'wide landscape 16:9 aspect ratio'],
+  ['9:16', 'tall portrait 9:16 aspect ratio'],
+  ['1:1', 'square 1:1 aspect ratio'],
+  ['4:3', '4:3 aspect ratio'],
+  ['3:4', 'portrait 3:4 aspect ratio'],
+  ['3:2', 'landscape 3:2 aspect ratio'],
+  ['2:3', 'portrait 2:3 aspect ratio'],
+]);
+
+export function injectAspectRatioHint(prompt, aspectRatio) {
+  if (typeof prompt !== 'string' || prompt.trim() === '') {
+    throw new Error('injectAspectRatioHint: prompt must be a non-empty string.');
+  }
+  if (!aspectRatio || typeof aspectRatio !== 'string') {
+    return prompt;
+  }
+  const trimmed = aspectRatio.trim();
+  const explicit = ASPECT_RATIO_HINTS.get(trimmed);
+  if (explicit) {
+    return `${prompt} (${explicit})`;
+  }
+  if (/^\d+(?:\.\d+)?:\d+(?:\.\d+)?$/.test(trimmed)) {
+    return `${prompt} (${trimmed} aspect ratio)`;
+  }
+  return prompt;
+}
+
+export function resolveGodTiboConfig({ providerMode = GOD_TIBO_PROVIDER_AUTO, resolveConfigImpl = defaultResolveConfig } = {}) {
+  return resolveConfigImpl({ provider: providerMode });
+}
+
+function isCodexAuthError(error) {
+  if (!error || typeof error !== 'object') return false;
+  const code = String(error.code || '').toUpperCase();
+  if (code === 'UNAUTHORIZED' || code === 'ENOENT') return true;
+  const message = String(error.message || '').toLowerCase();
+  return (
+    message.includes('auth.json') ||
+    message.includes('unauthorized') ||
+    message.includes('chatgpt auth') ||
+    message.includes('codex login')
+  );
+}
+
+export function getGodTiboFallbackMessage(reason) {
+  const summary = typeof reason === 'string' && reason.trim()
+    ? reason.trim()
+    : 'god-tibo-imagen image generation failed.';
+  return `${summary} god-tibo-imagen is the default image provider and reuses your local Codex ChatGPT login (~/.codex/auth.json). Run \`codex login\` once to enable it. Optional fallbacks: set OPENAI_API_KEY (Codex/OpenAI gpt-image-2) or GOOGLE_API_KEY/GEMINI_API_KEY (Nano Banana). If image generation credentials are unavailable, use web search and download the chosen image into ./assets/<file>.`;
+}
+
+export async function generateGodTiboImage({
+  prompt,
+  model = GOD_TIBO_DEFAULT_MODEL,
+  aspectRatio,
+  providerMode = GOD_TIBO_PROVIDER_AUTO,
+  dryRun = false,
+  deps = {},
+} = {}) {
+  if (typeof prompt !== 'string' || prompt.trim() === '') {
+    throw new Error('generateGodTiboImage: prompt must be a non-empty string.');
+  }
+
+  const createProviderImpl = deps.createProvider || defaultCreateProvider;
+  const resolveConfigImpl = deps.resolveConfig || defaultResolveConfig;
+
+  const enrichedPrompt = injectAspectRatioHint(prompt, aspectRatio);
+  const config = resolveGodTiboConfig({ providerMode, resolveConfigImpl });
+  const provider = createProviderImpl(config);
+
+  // god-tibo's provider.generateImage writes a PNG to outputPath as a side
+  // effect. slides-grab centralizes asset path resolution in
+  // saveNanoBananaImage (src/nano-banana.js) - so we route god-tibo's write
+  // to a tmp file and read the bytes back, letting the caller persist via
+  // the existing asset contract. This keeps the asset path policy single-sourced.
+  const tempDir = join(tmpdir(), `slides-grab-godtibo-${randomUUID()}`);
+  await mkdir(tempDir, { recursive: true });
+  const tempPath = join(tempDir, 'image.png');
+
+  try {
+    const result = await provider.generateImage({
+      prompt: enrichedPrompt,
+      model,
+      outputPath: tempPath,
+      dryRun: Boolean(dryRun),
+    });
+
+    if (dryRun) {
+      return {
+        mimeType: 'image/png',
+        bytes: Buffer.alloc(0),
+        mode: result?.mode || 'dry-run',
+        warnings: Array.isArray(result?.warnings) ? result.warnings : [],
+        revisedPrompt: result?.revisedPrompt ?? null,
+      };
+    }
+
+    const bytes = await readFile(tempPath);
+    return {
+      mimeType: 'image/png',
+      bytes,
+      mode: result?.mode || 'live',
+      warnings: Array.isArray(result?.warnings) ? result.warnings : [],
+      revisedPrompt: result?.revisedPrompt ?? null,
+    };
+  } catch (error) {
+    const wrapped = new Error(getGodTiboFallbackMessage(error?.message || String(error)));
+    wrapped.cause = error;
+    wrapped.isAuthError = isCodexAuthError(error);
+    throw wrapped;
+  } finally {
+    await rm(tempDir, { recursive: true, force: true }).catch(() => {});
+  }
+}
+
+export const __test_only__ = {
+  ASPECT_RATIO_HINTS,
+  isCodexAuthError,
+};