From 0bfaff0d1b8816146487b5be4a7656d48b8a0069 Mon Sep 17 00:00:00 2001 From: digital-garbage <133010426+digital-garbage@users.noreply.github.com> Date: Wed, 27 May 2026 02:25:58 +0300 Subject: [PATCH] Fix Timeline: expand shortcuts before splitting into scenes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The pipeline is shortcuts → transitions → split. The route now runs apply_prompt_shortcuts first, then parse_timeline_segments on the expanded text, matching actual generation behavior. Co-Authored-By: Claude Sonnet 4.6 --- templates.py | 7 ++++--- web/funpack_studio.js | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/templates.py b/templates.py index 2e97e563..ab352483 100644 --- a/templates.py +++ b/templates.py @@ -1555,13 +1555,14 @@ async def funpack_transitions_import(request): async def funpack_parse_timeline(request): data = await request.json() prompt = str(data.get("prompt") or "") - refinement_key = str(data.get("refinement_key") or "") - custom_map = load_custom_transition_triggers() + seed = int(data.get("seed") or 0) try: from .conditioning import parse_timeline_segments except ImportError: from conditioning import parse_timeline_segments - return web.json_response(parse_timeline_segments(prompt, custom_map=custom_map or None)) + expanded, _ = apply_prompt_shortcuts(prompt, seed=seed) + custom_map = load_custom_transition_triggers() + return web.json_response(parse_timeline_segments(expanded, custom_map=custom_map or None)) @PromptServer.instance.routes.get("/funpack/refinement_keys") diff --git a/web/funpack_studio.js b/web/funpack_studio.js index ab94846d..bf142e4d 100644 --- a/web/funpack_studio.js +++ b/web/funpack_studio.js @@ -1268,6 +1268,7 @@ function openPanel(node) { headers: { "Content-Type": "application/json" }, body: JSON.stringify({ prompt, + seed: widgetByName(node, "seed")?.value ?? 0, refinement_key: settings.refinement_key || linkedRefinementKey(node) || "", }), });