diff --git a/calliope-backend/src/calliope/db.py b/calliope-backend/src/calliope/db.py index d42cdd48..28301679 100644 --- a/calliope-backend/src/calliope/db.py +++ b/calliope-backend/src/calliope/db.py @@ -283,6 +283,41 @@ CREATE TABLE IF NOT EXISTS shot_capture ( created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP ); CREATE INDEX IF NOT EXISTS idx_shot_capture_composition ON shot_capture(composition_id); + +-- Five-stage creation workbench (HEL-614): one row per project per stage. +-- content_json is the working draft the user can edit; confirmed_content_json +-- is the last confirmed snapshot — the only version handed to the next agent +-- (unconfirmed drafts are never treated as final). +CREATE TABLE IF NOT EXISTS project_stages ( + id INTEGER PRIMARY KEY AUTOINCREMENT, + project_id INTEGER NOT NULL REFERENCES projects(id) ON DELETE CASCADE, + stage_key TEXT NOT NULL CHECK(stage_key IN ('script','style','storyboard','assets','shot')), + status TEXT NOT NULL DEFAULT 'todo' CHECK(status IN ('todo','running','awaiting_confirm','confirmed')), + content_json TEXT, + confirmed_content_json TEXT, + chosen_style_id TEXT, + draft_edited INTEGER NOT NULL DEFAULT 0, + error TEXT, + created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP, + updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP, + UNIQUE(project_id, stage_key) +); +CREATE INDEX IF NOT EXISTS idx_project_stages_project ON project_stages(project_id); + +-- Audit trail of agent runs inside the flow (HEL-614): instruction in, +-- normalized JSON artifact out, or a Chinese-readable failure reason. +CREATE TABLE IF NOT EXISTS stage_runs ( + id INTEGER PRIMARY KEY AUTOINCREMENT, + project_id INTEGER NOT NULL REFERENCES projects(id) ON DELETE CASCADE, + stage_key TEXT NOT NULL CHECK(stage_key IN ('script','style','storyboard','assets','shot')), + instruction TEXT, + output_json TEXT, + status TEXT NOT NULL DEFAULT 'running' CHECK(status IN ('running','done','failed')), + error TEXT, + created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP, + completed_at TIMESTAMP +); +CREATE INDEX IF NOT EXISTS idx_stage_runs_project ON stage_runs(project_id, stage_key); """ diff --git a/calliope-backend/src/calliope/main.py b/calliope-backend/src/calliope/main.py index b569df0f..7303f656 100644 --- a/calliope-backend/src/calliope/main.py +++ b/calliope-backend/src/calliope/main.py @@ -30,6 +30,7 @@ from calliope.routers import ( settings as settings_router, shots, story, + workbench, workflows, ) @@ -141,6 +142,7 @@ def create_app(static_dir: Path | None = None) -> FastAPI: app.include_router(canvas.router, prefix="/api/canvas", tags=["canvas"]) app.include_router(shots.router, prefix="/api/shots", tags=["shots"]) app.include_router(agent.router, prefix="/api/agent", tags=["agent"]) + app.include_router(workbench.router, prefix="/api/workbench", tags=["workbench"]) app.include_router(events.router, prefix="/api/events", tags=["events"]) @app.get("/api/health") diff --git a/calliope-backend/src/calliope/models/schemas.py b/calliope-backend/src/calliope/models/schemas.py index dc96dfe1..e2657654 100644 --- a/calliope-backend/src/calliope/models/schemas.py +++ b/calliope-backend/src/calliope/models/schemas.py @@ -39,6 +39,10 @@ class ProjectStats(BaseModel): character_count: int asset_ready_count: int asset_total_count: int + # Five-stage workbench progress (HEL-614) — real stage rows + live jobs. + stage_confirmed: int = 0 + stage_status: dict[str, str] = Field(default_factory=dict) + active_jobs: int = 0 class Project(BaseModel): diff --git a/calliope-backend/src/calliope/routers/projects.py b/calliope-backend/src/calliope/routers/projects.py index 9c9e2a22..ead4fc0a 100644 --- a/calliope-backend/src/calliope/routers/projects.py +++ b/calliope-backend/src/calliope/routers/projects.py @@ -9,7 +9,7 @@ from calliope.models.schemas import Project, ProjectCreate, ProjectUpdate router = APIRouter() -def _project_stats(project_id: int, conn) -> dict[str, int]: +def _project_stats(project_id: int, conn) -> dict: cur = conn.execute( """ SELECT @@ -18,11 +18,26 @@ def _project_stats(project_id: int, conn) -> dict[str, int]: (SELECT COUNT(*) FROM characters WHERE project_id = :pid AND sheet_path IS NOT NULL) + (SELECT COUNT(*) FROM locations WHERE project_id = :pid AND reference_image_path IS NOT NULL) AS asset_ready_count, (SELECT COUNT(*) FROM characters WHERE project_id = :pid) - + (SELECT COUNT(*) FROM locations WHERE project_id = :pid) AS asset_total_count + + (SELECT COUNT(*) FROM locations WHERE project_id = :pid) AS asset_total_count, + (SELECT COUNT(*) FROM jobs WHERE project_id = :pid + AND status IN ('pending','running')) AS active_jobs """, {"pid": project_id}, ) - return dict(cur.fetchone()) + stats = dict(cur.fetchone()) + # Five-stage creation flow (HEL-614) — real per-stage states. Fresh + # projects have no rows yet, which reads as "not started" honestly. + try: + rows = conn.execute( + "SELECT stage_key, status FROM project_stages WHERE project_id = ?", + (project_id,), + ).fetchall() + except Exception: # pragma: no cover — pre-migration DB + rows = [] + stage_status = {r["stage_key"]: r["status"] for r in rows} + stats["stage_status"] = stage_status + stats["stage_confirmed"] = sum(1 for s in stage_status.values() if s == "confirmed") + return stats @router.post("", response_model=Project) diff --git a/calliope-backend/src/calliope/routers/workbench.py b/calliope-backend/src/calliope/routers/workbench.py new file mode 100644 index 00000000..1b3bff71 --- /dev/null +++ b/calliope-backend/src/calliope/routers/workbench.py @@ -0,0 +1,916 @@ +"""Five-stage creation workbench (HEL-614). + +剧本创作 → 视觉设计 → 分镜设计 → 素材资产 → 镜头脚本 — one project, five +named agents in sequence. Each stage holds a working draft the user can edit +(``content_json``) and the last confirmed snapshot +(``confirmed_content_json``); only confirmed snapshots flow into the next +agent's context, so an unconfirmed draft is never treated as final. + +Stage runs reuse the HEL-613 registry (persona + llm_role + skill bindings) +with a workbench-specific mode prompt and a per-stage JSON artifact schema. +In-flow generation reuses the HEL-612 shared queue: jobs are project-linked +with ``payload.source = "workbench"`` so tasks and results come back to the +project (and the tasks page) like every other job. +""" +from __future__ import annotations + +import asyncio +import json +import re +from typing import Any, Literal + +from fastapi import APIRouter, HTTPException +from pydantic import BaseModel, Field + +from calliope import config +from calliope.agent.agents_registry import AGENTS, AGENT_KEYS +from calliope.agent.llm import LLMClient, extract_json +from calliope.agent.skills_store import effective_skill_dirs, list_skills +from calliope.comfyui.parser import parse_dynamic_inputs +from calliope.comfyui.smart_fill import smart_fill_inputs +from calliope.db import get_db, row_to_dict +from calliope.events.bus import event_bus +from calliope.queue.manager import queue_manager + +router = APIRouter() + +STAGE_KEYS: tuple[str, ...] = AGENT_KEYS # script, style, storyboard, assets, shot + +StageKey = Literal["script", "style", "storyboard", "assets", "shot"] +WORKBENCH_SOURCE = "workbench" + + +class StagePatch(BaseModel): + content: dict[str, Any] + chosen_style_id: str | None = None + + +class StageRunRequest(BaseModel): + instruction: str | None = Field(default=None, max_length=8000) + + +class StageConfirmRequest(BaseModel): + chosen_style_id: str | None = None + + +class ScriptImportRequest(BaseModel): + text: str = Field(min_length=1, max_length=200_000) + + +class WorkbenchGenerateRequest(BaseModel): + kind: Literal["image", "video"] + stage_key: StageKey + target_id: str | None = Field(default=None, max_length=64) + prompt: str = Field(min_length=1, max_length=8000) + negative_prompt: str | None = Field(default=None, max_length=2000) + duration_sec: float | None = None + + +# ───────────────────────────────────────────────────────────────────────── +# Content normalization — one defensive normalizer per stage. Accepts mild +# LLM shape drift, fills defaults, rejects unusable output with a Chinese +# reason that surfaces on the run row. +# ───────────────────────────────────────────────────────────────────────── + + +class StageContentError(ValueError): + """Unusable artifact content; str(err) is user-facing Chinese.""" + + +def _text(value: Any) -> str: + return str(value if value is not None else "").strip() + + +def _num(value: Any, default: float) -> float: + try: + out = float(value) + except (TypeError, ValueError): + return default + return out if out > 0 else default + + +def _slug_id(prefix: str, index: int) -> str: + return f"{prefix}{index + 1}" + + +def _norm_script(data: dict[str, Any]) -> dict[str, Any]: + text = _text(data.get("text") or data.get("script") or data.get("content")) + if len(text) < 30: + raise StageContentError("剧本内容太短(不足 30 字),请重试或在下方手动补充。") + return {"text": text} + + +def _norm_style(data: dict[str, Any]) -> dict[str, Any]: + raw = data.get("directions") or data.get("styles") or [] + if not isinstance(raw, list): + raise StageContentError("风格数据格式不正确,缺少风格方向列表。") + directions = [] + used_ids: set[str] = set() + for i, item in enumerate(raw): + if not isinstance(item, dict): + continue + name = _text(item.get("name") or item.get("title")) + prompt = _text(item.get("prompt") or item.get("keywords")) + if not name or not prompt: + continue + sid = _text(item.get("id")) + if not sid or sid in used_ids: + sid = _slug_id("style", i) + n = 2 + while sid in used_ids: + sid = f"style{i + 1}-{n}" + n += 1 + used_ids.add(sid) + directions.append( + { + "id": sid, + "name": name, + "description": _text(item.get("description")), + "prompt": prompt, + "negative_prompt": _text(item.get("negative_prompt")), + } + ) + if len(directions) < 2: + raise StageContentError("风格方向不足 2 套。请让智能体重试,或手动补充更多方向。") + return {"directions": directions} + + +def _norm_storyboard(data: dict[str, Any]) -> dict[str, Any]: + raw = data.get("shots") or data.get("storyboard") or [] + if not isinstance(raw, list): + raise StageContentError("分镜数据格式不正确,缺少逐镜列表。") + shots = [] + for i, item in enumerate(raw): + if not isinstance(item, dict): + continue + description = _text(item.get("description") or item.get("action") or item.get("content")) + if not description: + continue + shots.append( + { + "id": _text(item.get("id")) or _slug_id("shot", i), + "scene": _text(item.get("scene")) or f"{i + 1}", + "shot_size": _text(item.get("shot_size") or item.get("size")) or "中景", + "camera": _text(item.get("camera") or item.get("movement")) or "固定", + "description": description, + "dialog": _text(item.get("dialog") or item.get("dialogue")), + "duration_sec": _num(item.get("duration_sec") or item.get("duration"), 3.0), + } + ) + if not shots: + raise StageContentError("分镜表为空。请让智能体重试,或手动添加镜头。") + return {"shots": shots} + + +def _norm_assets(data: dict[str, Any]) -> dict[str, Any]: + raw = data.get("assets") or data.get("items") or [] + if not isinstance(raw, list): + raise StageContentError("素材数据格式不正确,缺少资产列表。") + assets = [] + for i, item in enumerate(raw): + if not isinstance(item, dict): + continue + name = _text(item.get("name") or item.get("title")) + prompt = _text(item.get("prompt")) + if not name or not prompt: + continue + kind = _text(item.get("kind") or item.get("type")) + if kind not in ("character", "location", "prop"): + kind = "prop" + assets.append( + { + "id": _text(item.get("id")) or _slug_id("asset", i), + "kind": kind, + "name": name, + "description": _text(item.get("description")), + "prompt": prompt, + "negative_prompt": _text(item.get("negative_prompt")), + } + ) + if not assets: + raise StageContentError("素材清单为空。请让智能体重试,或手动添加素材。") + return {"assets": assets} + + +def _norm_shot(data: dict[str, Any]) -> dict[str, Any]: + raw = data.get("shots") or [] + if not isinstance(raw, list): + raise StageContentError("镜头脚本数据格式不正确,缺少逐镜列表。") + shots = [] + for i, item in enumerate(raw): + if not isinstance(item, dict): + continue + prompt = _text(item.get("prompt") or item.get("video_prompt")) + if not prompt: + continue + shots.append( + { + "id": _text(item.get("id")) or _slug_id("vshot", i), + "shot_no": _text(item.get("shot_no") or item.get("shot")) or _slug_id("S", i), + "description": _text(item.get("description")), + "prompt": prompt, + "duration_sec": _num(item.get("duration_sec") or item.get("duration"), 5.0), + } + ) + if not shots: + raise StageContentError("镜头脚本为空。请让智能体重试,或手动添加镜头。") + return {"shots": shots} + + +NORMALIZERS = { + "script": _norm_script, + "style": _norm_style, + "storyboard": _norm_storyboard, + "assets": _norm_assets, + "shot": _norm_shot, +} + +# Short artifact brief embedded in each run prompt (Chinese; keeps the five +# agents' deliverables aligned with what the workbench UI renders). +STAGE_BRIEFS = { + "script": ( + "产出完整可拍摄的短视频剧本:故事大纲、按场次展开的分场(场景/时间/地点/人物)、" + "人物小传要点、逐场台词与动作描述。直接输出剧本正文,不要写「好的」之类的客套话。" + ), + "style": ( + "给出至少 2 套(建议 3 套)差异化视觉风格方向,每套包含:风格名称、中文风格说明" + "(色调/光影/材质/线条)、可直接用于生图模型的英文正向提示词词组(逗号分隔)、" + "可选的英文负面提示词。提示词词组必须完整可复制。" + ), + "storyboard": ( + "把剧本拆成逐镜分镜表,每镜包含:场次、景别(远/全/中/近/特写)、运镜" + "(推/拉/摇/移/跟/固定)、画面内容描述、台词或音效起点、建议时长(秒)。" + "重要情绪点给特写,节奏有起伏。" + ), + "assets": ( + "结合剧本、已确认的视觉风格与分镜表,整理需要生图的资产清单(角色/场景/道具)," + "每项资产给出:类型、名称、中文说明、完整可直接复制的英文生图提示词" + "(主体外观细节+风格关键词+构图视角+画质词)、可选负面提示词。" + "同一角色要保持跨视角一致性。" + ), + "shot": ( + "把分镜表转化为视频生成模型(如 MiniMax H3)可用的逐镜脚本,每镜包含:镜号、" + "中文画面说明、完整可直接复制的英文视频提示词(主体与动作+运镜指令+镜头语言+" + "光影氛围)、建议时长(秒)。同一项目运镜与风格保持一致。" + ), +} + + +def _stage_name(stage_key: str) -> str: + return AGENTS[stage_key]["name"] if stage_key in AGENTS else stage_key + + +# ───────────────────────────────────────────────────────────────────────── +# DB helpers +# ───────────────────────────────────────────────────────────────────────── + + +def _get_project(conn, project_id: int) -> dict[str, Any]: + row = conn.execute("SELECT * FROM projects WHERE id = ?", (project_id,)).fetchone() + if not row or row["status"] == "system": + raise HTTPException(status_code=404, detail="项目不存在") + return row_to_dict(row) + + +def _ensure_stage_rows(conn, project_id: int) -> None: + for key in STAGE_KEYS: + conn.execute( + "INSERT OR IGNORE INTO project_stages (project_id, stage_key) VALUES (?, ?)", + (project_id, key), + ) + conn.commit() + + +def _load_stage(conn, project_id: int, stage_key: str) -> dict[str, Any]: + row = conn.execute( + "SELECT * FROM project_stages WHERE project_id = ? AND stage_key = ?", + (project_id, stage_key), + ).fetchone() + if not row: + raise HTTPException(status_code=404, detail="阶段不存在") + return row_to_dict(row) + + +def _stage_public(row: dict[str, Any]) -> dict[str, Any]: + return { + "stage_key": row["stage_key"], + "status": row["status"], + "content": json.loads(row["content_json"]) if row["content_json"] else None, + "confirmed_content": ( + json.loads(row["confirmed_content_json"]) if row["confirmed_content_json"] else None + ), + "chosen_style_id": row["chosen_style_id"], + "draft_edited": bool(row["draft_edited"]), + "error": row["error"], + "updated_at": row["updated_at"], + } + + +def _last_run(conn, project_id: int, stage_key: str) -> dict[str, Any] | None: + row = conn.execute( + "SELECT * FROM stage_runs WHERE project_id = ? AND stage_key = ? " + "ORDER BY id DESC LIMIT 1", + (project_id, stage_key), + ).fetchone() + if not row: + return None + return { + "id": row["id"], + "status": row["status"], + "error": row["error"], + "instruction": row["instruction"], + "created_at": row["created_at"], + "completed_at": row["completed_at"], + } + + +def _job_public(job: dict[str, Any]) -> dict[str, Any]: + out = dict(job) + out["payload"] = json.loads(job.get("payload_json") or "{}") + out["output_paths"] = json.loads(job.get("output_paths_json") or "[]") + out.pop("payload_json", None) + out.pop("output_paths_json", None) + return out + + +def _workbench_job_outputs(conn, project_id: int) -> dict[str, dict[str, Any]]: + """target_id → latest workbench job (any status) for asset/shot panels.""" + rows = conn.execute( + "SELECT * FROM jobs WHERE project_id = ? ORDER BY id ASC", + (project_id,), + ).fetchall() + out: dict[str, dict[str, Any]] = {} + for row in rows: + job = _job_public(row_to_dict(row)) + payload = job.get("payload") or {} + if payload.get("source") != WORKBENCH_SOURCE: + continue + target = payload.get("target_id") + if not target: + continue + prev = out.get(target) + # later rows win; keep the newest per target + if prev is None or int(job["id"]) > int(prev["id"]): + out[target] = job + return out + + +def _enrich_stage( + stage: dict[str, Any], outputs: dict[str, dict[str, Any]] +) -> dict[str, Any]: + content = stage.get("content") or {} + if stage["stage_key"] == "assets" and isinstance(content.get("assets"), list): + for asset in content["assets"]: + job = outputs.get(asset.get("id")) + if job: + asset["job"] = _job_brief(job) + elif stage["stage_key"] == "shot" and isinstance(content.get("shots"), list): + for shot in content["shots"]: + job = outputs.get(shot.get("id")) + if job: + shot["job"] = _job_brief(job) + return stage + + +def _job_brief(job: dict[str, Any]) -> dict[str, Any]: + return { + "id": job["id"], + "status": job["status"], + "kind": job["kind"], + "output": (job.get("output_paths") or [None])[0], + "error": job.get("error"), + } + + +# ───────────────────────────────────────────────────────────────────────── +# Stage-run prompt assembly + background execution +# ───────────────────────────────────────────────────────────────────────── + +_SKILL_BODY_MAX_CHARS = 1600 +_SKILL_BODY_MAX_COUNT = 3 + + +def _skills_context(agent_key: str) -> str: + try: + effective = effective_skill_dirs(agent_key) + skills = [s for s in list_skills(cap=None) if s["dir"] in effective] + except Exception: + return "" + if not skills: + return "" + lines = ["以下 Skill 已分配给该智能体(用户配置),生成时请吸收其要点:"] + shown = 0 + for skill in skills: + lines.append(f"- {skill['name']}: {skill['description']}") + if shown >= _SKILL_BODY_MAX_COUNT: + continue + body = _skill_body(skill["dir"]) + if body: + lines.append(f" {skill['name']} 内容摘要:\n{body}") + shown += 1 + return "\n".join(lines) + + +def _skill_body(skill_dir: str) -> str: + from calliope.agent.skills_store import skills_root + + path = skills_root() / skill_dir / "SKILL.md" + try: + text = path.read_text(encoding="utf-8") + except OSError: + return "" + text = re.sub(r"^---.*?---\s*", "", text, flags=re.S) + text = text.strip() + if len(text) > _SKILL_BODY_MAX_CHARS: + text = text[:_SKILL_BODY_MAX_CHARS] + "…" + return text + + +def _system_prompt(stage_key: str) -> str: + agent = AGENTS[stage_key] + idx = STAGE_KEYS.index(stage_key) + 1 + parts = [ + agent["persona"], + ( + f"WORKBENCH MODE: 你正在「创作工作台」五段流程中负责第 {idx} 段「{agent['name']}」。" + "本次输出会被程序解析入库并在工作台展示给用户编辑、确认,因此:\n" + "- 只输出一个 JSON 对象,不要加 Markdown 代码围栏,不要输出 JSON 以外的任何文字。\n" + "- 严格遵守用户消息末尾给出的 JSON 结构与字段要求,中文内容用中文写," + "提示词词组按各段惯例(英文逗号分隔)。\n" + "- 这是正式交付物:内容要完整、具体、可直接使用,不要输出占位符或「待补充」。" + ), + f"本段任务:{STAGE_BRIEFS[stage_key]}", + ] + skills_ctx = _skills_context(stage_key) + if skills_ctx: + parts.append(skills_ctx) + return "\n\n".join(parts) + + +def _stage_context(conn, project_id: int, stage_key: str) -> str: + """Confirmed upstream artifacts only — drafts never leak downstream.""" + project = _get_project(conn, project_id) + blocks: list[str] = [f"项目名称:{project['title']}"] + if project.get("idea") and stage_key != "script": + idea = _text(project["idea"]) + if len(idea) <= 600: + blocks.append(f"用户创意:{idea}") + + rows = conn.execute( + "SELECT * FROM project_stages WHERE project_id = ?", + (project_id,), + ).fetchall() + stages = {r["stage_key"]: row_to_dict(r) for r in rows} + + def confirmed(key: str) -> dict[str, Any] | None: + row = stages.get(key) + if not row or row["status"] != "confirmed" or not row["confirmed_content_json"]: + return None + return json.loads(row["confirmed_content_json"]) + + script = confirmed("script") + if script and stage_key in ("style", "storyboard", "assets", "shot"): + blocks.append(f"【已确认的剧本】\n{_text(script.get('text'))}") + + style = confirmed("style") + if style and stage_key in ("storyboard", "assets", "shot"): + chosen_id = stages.get("style", {}).get("chosen_style_id") + directions = style.get("directions") or [] + chosen = next( + (d for d in directions if d.get("id") == chosen_id), directions[0] if directions else None + ) + if chosen: + blocks.append( + "【已确认的视觉风格】\n" + f"{chosen.get('name')}:{chosen.get('description') or ''}\n" + f"风格关键词:{chosen.get('prompt')}" + ) + else: + names = "、".join(d.get("name", "") for d in directions) + blocks.append(f"【已确认的视觉风格】候选方向:{names}") + + board = confirmed("storyboard") + if board and stage_key in ("assets", "shot"): + lines = [] + for i, shot in enumerate(board.get("shots") or [], 1): + lines.append( + f"{i}. 场次{shot.get('scene')}|{shot.get('shot_size')}|{shot.get('camera')}|" + f"{shot.get('description')}" + + (f"|台词:{shot.get('dialog')}" if shot.get("dialog") else "") + ) + blocks.append("【已确认的分镜表】\n" + "\n".join(lines)) + + assets = confirmed("assets") + if assets and stage_key == "shot": + lines = [ + f"- {a.get('kind')}|{a.get('name')}:{a.get('description') or a.get('prompt')}" + for a in assets.get("assets") or [] + ] + blocks.append("【已确认的素材清单】\n" + "\n".join(lines)) + return "\n\n".join(blocks) + + +_JSON_SCHEMAS = { + "script": '{"text": "完整剧本正文(简体中文,含大纲/分场/台词)"}', + "style": ( + '{"directions": [{"id": "style1", "name": "风格名称", ' + '"description": "中文风格说明", "prompt": "english, style, keywords", ' + '"negative_prompt": "optional english negative keywords"}]}(至少 2 套)' + ), + "storyboard": ( + '{"shots": [{"id": "shot1", "scene": "场次", "shot_size": "景别", ' + '"camera": "运镜", "description": "画面内容", "dialog": "台词(可空)", ' + '"duration_sec": 3}]}' + ), + "assets": ( + '{"assets": [{"id": "asset1", "kind": "character|location|prop", ' + '"name": "名称", "description": "中文说明", ' + '"prompt": "complete english image prompt", ' + '"negative_prompt": "可空"}]}' + ), + "shot": ( + '{"shots": [{"id": "vshot1", "shot_no": "S1", ' + '"description": "中文画面说明", "prompt": "complete english video prompt", ' + '"duration_sec": 5}]}' + ), +} + + +# Strong refs so in-flight runs are never garbage-collected mid-turn +# (same pattern as the harness runner). +_ACTIVE_RUNS: dict[int, asyncio.Task] = {} + + +async def _execute_run(project_id: int, stage_key: str, run_id: int, instruction: str | None) -> None: + db = config.settings.db_path + try: + conn = get_db(db) + try: + context = _stage_context(conn, project_id, stage_key) + finally: + conn.close() + + user_parts = [context] + if instruction and instruction.strip(): + user_parts.append(f"用户补充要求:{instruction.strip()}") + user_parts.append( + f"请产出本段({ _stage_name(stage_key)})的 JSON:{_JSON_SCHEMAS[stage_key]}" + ) + messages = [ + {"role": "system", "content": _system_prompt(stage_key)}, + {"role": "user", "content": "\n\n".join(user_parts)}, + ] + + role = AGENTS[stage_key]["llm_role"] + client = LLMClient.for_role(role, timeout=240.0) + try: + text = await client.chat(messages, temperature=0.7) + finally: + await client.close() + content = NORMALIZERS[stage_key](extract_json(text)) + + conn = get_db(db) + try: + conn.execute( + "UPDATE stage_runs SET status='done', output_json=?, completed_at=CURRENT_TIMESTAMP " + "WHERE id = ?", + (json.dumps(content, ensure_ascii=False), run_id), + ) + conn.execute( + "UPDATE project_stages SET content_json=?, status='awaiting_confirm', " + "draft_edited=0, error=NULL, updated_at=CURRENT_TIMESTAMP " + "WHERE project_id = ? AND stage_key = ?", + (json.dumps(content, ensure_ascii=False), project_id, stage_key), + ) + conn.execute( + "UPDATE projects SET updated_at=CURRENT_TIMESTAMP WHERE id = ?", + (project_id,), + ) + conn.commit() + finally: + conn.close() + except Exception as exc: # noqa: BLE001 — any failure becomes a readable run row + reason = _friendly_error(exc) + try: + conn = get_db(db) + try: + conn.execute( + "UPDATE stage_runs SET status='failed', error=?, completed_at=CURRENT_TIMESTAMP " + "WHERE id = ?", + (reason, run_id), + ) + conn.execute( + "UPDATE project_stages SET status=CASE " + "WHEN confirmed_content_json IS NOT NULL THEN 'confirmed' ELSE 'todo' END, " + "error=?, updated_at=CURRENT_TIMESTAMP " + "WHERE project_id = ? AND stage_key = ? AND status = 'running'", + (reason, project_id, stage_key), + ) + conn.commit() + finally: + conn.close() + except Exception: # pragma: no cover — bookkeeping failure only + pass + + +def _friendly_error(exc: Exception) -> str: + text = str(exc) + lowered = text.lower() + if "connect" in lowered or "timeout" in lowered or "timed out" in lowered: + return ( + "连接大模型服务失败:请到「模型设置」检查地址与密钥,或点「重新生成」再试一次。" + ) + if "no json" in lowered or isinstance(exc, ValueError): + return "智能体没有返回可解析的结果,请点「重新生成」重试;多次失败可换一个模型。" + return f"生成失败:{text[:300]}" + + +# ───────────────────────────────────────────────────────────────────────── +# Endpoints +# ───────────────────────────────────────────────────────────────────────── + + +@router.get("/projects/{project_id}") +async def workbench_overview(project_id: int) -> dict[str, Any]: + conn = get_db(config.settings.db_path) + try: + project = _get_project(conn, project_id) + _ensure_stage_rows(conn, project_id) + rows = conn.execute( + "SELECT * FROM project_stages WHERE project_id = ? ORDER BY id ASC", + (project_id,), + ).fetchall() + outputs = _workbench_job_outputs(conn, project_id) + stages = [] + for row in rows: + stage = _stage_public(row_to_dict(row)) + stages.append(_enrich_stage(stage, outputs)) + runs = {key: _last_run(conn, project_id, key) for key in STAGE_KEYS} + for stage in stages: + stage["last_run"] = runs.get(stage["stage_key"]) + return { + "project": { + "id": project["id"], + "title": project["title"], + "idea": project.get("idea"), + "status": project["status"], + "updated_at": project["updated_at"], + }, + "stages": stages, + } + finally: + conn.close() + + +def _stage_or_404(conn, project_id: int, stage_key: str) -> dict[str, Any]: + if stage_key not in STAGE_KEYS: + raise HTTPException(status_code=404, detail="阶段不存在") + _ensure_stage_rows(conn, project_id) + return _load_stage(conn, project_id, stage_key) + + +@router.patch("/projects/{project_id}/stages/{stage_key}") +async def patch_stage(project_id: int, stage_key: str, payload: StagePatch) -> dict[str, Any]: + conn = get_db(config.settings.db_path) + try: + _get_project(conn, project_id) + stage = _stage_or_404(conn, project_id, stage_key) + if stage["status"] == "running": + raise HTTPException(status_code=409, detail="本阶段正在生成中,请稍候再编辑。") + try: + content = NORMALIZERS[stage_key](payload.content) + except StageContentError as exc: + raise HTTPException(status_code=400, detail=str(exc)) from exc + if content == (json.loads(stage["content_json"]) if stage["content_json"] else None): + return {"ok": True, "stage": _stage_public({**stage, "content_json": json.dumps(content, ensure_ascii=False)})} + # Editing a confirmed stage produces a new draft awaiting re-confirm; + # the confirmed snapshot stays intact for 恢复. + next_status = "awaiting_confirm" if stage["status"] == "confirmed" else stage["status"] + if stage["status"] == "todo": + next_status = "awaiting_confirm" + chosen = payload.chosen_style_id + if stage_key == "style" and chosen: + ids = [d.get("id") for d in content.get("directions", [])] + if chosen not in ids: + raise HTTPException(status_code=400, detail="所选风格方向不存在,请刷新后重试。") + conn.execute( + "UPDATE project_stages SET content_json=?, status=?, draft_edited=1, " + "chosen_style_id=COALESCE(?, chosen_style_id), updated_at=CURRENT_TIMESTAMP " + "WHERE project_id = ? AND stage_key = ?", + ( + json.dumps(content, ensure_ascii=False), + next_status, + chosen, + project_id, + stage_key, + ), + ) + conn.execute( + "UPDATE projects SET updated_at=CURRENT_TIMESTAMP WHERE id = ?", (project_id,) + ) + conn.commit() + row = _load_stage(conn, project_id, stage_key) + return {"ok": True, "stage": _stage_public(row)} + finally: + conn.close() + + +@router.post("/projects/{project_id}/stages/{stage_key}/run") +async def run_stage(project_id: int, stage_key: str, payload: StageRunRequest | None = None) -> dict[str, Any]: + instruction = (payload.instruction if payload else None) or None + conn = get_db(config.settings.db_path) + try: + _get_project(conn, project_id) + stage = _stage_or_404(conn, project_id, stage_key) + if stage["status"] == "running": + raise HTTPException(status_code=409, detail="本阶段正在生成中,请稍候。") + # Prerequisite: the previous stage must be confirmed (drafts never + # unlock the next agent). + idx = STAGE_KEYS.index(stage_key) + if idx > 0: + prev = _load_stage(conn, project_id, STAGE_KEYS[idx - 1]) + if prev["status"] != "confirmed": + raise HTTPException( + status_code=409, + detail=f"请先完成并确认上一阶段「{_stage_name(STAGE_KEYS[idx - 1])}」。", + ) + # LLM must be resolvable — fail fast with a fix-it message. + try: + profile = config.settings.resolve_llm_for_role(AGENTS[stage_key]["llm_role"]) + except Exception: # pragma: no cover — defensive + profile = None + if not profile or not (profile.get("base_url") or "").strip(): + raise HTTPException( + status_code=400, + detail="尚未配置可用的大模型:请到「模型设置」添加并测试通过后再生成。", + ) + + cur = conn.execute( + "INSERT INTO stage_runs (project_id, stage_key, instruction) VALUES (?, ?, ?)", + (project_id, stage_key, instruction), + ) + run_id = int(cur.lastrowid) + conn.execute( + "UPDATE project_stages SET status='running', error=NULL, updated_at=CURRENT_TIMESTAMP " + "WHERE project_id = ? AND stage_key = ?", + (project_id, stage_key), + ) + conn.commit() + finally: + conn.close() + + task = asyncio.create_task(_execute_run(project_id, stage_key, run_id, instruction)) + _ACTIVE_RUNS[run_id] = task + task.add_done_callback(lambda t: _ACTIVE_RUNS.pop(run_id, None)) + return {"ok": True, "run_id": run_id} + + +@router.post("/projects/{project_id}/stages/{stage_key}/confirm") +async def confirm_stage( + project_id: int, stage_key: str, payload: StageConfirmRequest | None = None +) -> dict[str, Any]: + conn = get_db(config.settings.db_path) + try: + _get_project(conn, project_id) + stage = _stage_or_404(conn, project_id, stage_key) + if stage["status"] == "running": + raise HTTPException(status_code=409, detail="本阶段正在生成中,请等待完成。") + if not stage["content_json"]: + raise HTTPException(status_code=400, detail="本阶段还没有内容,请先生成或手动填写。") + content = json.loads(stage["content_json"]) + chosen = payload.chosen_style_id if payload else None + if stage_key == "style": + directions = content.get("directions") or [] + ids = [d.get("id") for d in directions] + if chosen and chosen not in ids: + raise HTTPException(status_code=400, detail="所选风格方向不存在,请刷新后重试。") + if not chosen: + chosen = stage["chosen_style_id"] or (ids[0] if ids else None) + conn.execute( + "UPDATE project_stages SET status='confirmed', confirmed_content_json=?, " + "chosen_style_id=?, draft_edited=0, error=NULL, updated_at=CURRENT_TIMESTAMP " + "WHERE project_id = ? AND stage_key = ?", + ( + json.dumps(content, ensure_ascii=False), + chosen if stage_key == "style" else stage["chosen_style_id"], + project_id, + stage_key, + ), + ) + conn.execute( + "UPDATE projects SET updated_at=CURRENT_TIMESTAMP WHERE id = ?", (project_id,) + ) + conn.commit() + row = _load_stage(conn, project_id, stage_key) + return {"ok": True, "stage": _stage_public(row)} + finally: + conn.close() + + +@router.post("/projects/{project_id}/stages/{stage_key}/restore") +async def restore_stage(project_id: int, stage_key: str) -> dict[str, Any]: + conn = get_db(config.settings.db_path) + try: + _get_project(conn, project_id) + stage = _stage_or_404(conn, project_id, stage_key) + if not stage["confirmed_content_json"]: + raise HTTPException(status_code=400, detail="本阶段还没有已确认版本,无需恢复。") + conn.execute( + "UPDATE project_stages SET content_json=confirmed_content_json, " + "status='confirmed', draft_edited=0, updated_at=CURRENT_TIMESTAMP " + "WHERE project_id = ? AND stage_key = ?", + (project_id, stage_key), + ) + conn.commit() + row = _load_stage(conn, project_id, stage_key) + return {"ok": True, "stage": _stage_public(row)} + finally: + conn.close() + + +@router.post("/projects/{project_id}/stages/script/import") +async def import_script(project_id: int, payload: ScriptImportRequest) -> dict[str, Any]: + """导入现成剧本:直接确认为剧本阶段基线,从视觉设计继续。""" + text = payload.text.strip() + if len(text) < 30: + raise HTTPException(status_code=400, detail="剧本内容太短,请检查粘贴是否完整。") + content = {"text": text} + conn = get_db(config.settings.db_path) + try: + _get_project(conn, project_id) + _stage_or_404(conn, project_id, "script") + conn.execute( + "UPDATE project_stages SET content_json=?, confirmed_content_json=?, " + "status='confirmed', draft_edited=0, error=NULL, updated_at=CURRENT_TIMESTAMP " + "WHERE project_id = ? AND stage_key = 'script'", + ( + json.dumps(content, ensure_ascii=False), + json.dumps(content, ensure_ascii=False), + project_id, + ), + ) + conn.execute( + "UPDATE projects SET updated_at=CURRENT_TIMESTAMP WHERE id = ?", (project_id,) + ) + conn.commit() + row = _load_stage(conn, project_id, "script") + return {"ok": True, "stage": _stage_public(row)} + finally: + conn.close() + + +@router.post("/projects/{project_id}/generate") +async def workbench_generate(project_id: int, payload: WorkbenchGenerateRequest) -> dict[str, Any]: + """In-flow generation (HEL-612 shared queue): one image or video job, + project-linked, tagged workbench so results come back to the project.""" + conn = get_db(config.settings.db_path) + try: + _get_project(conn, project_id) + _stage_or_404(conn, project_id, payload.stage_key) + wf = conn.execute( + "SELECT * FROM workflows WHERE kind = ? AND is_enabled = 1 ORDER BY id ASC LIMIT 1", + (payload.kind,), + ).fetchone() + if not wf: + label = "生图" if payload.kind == "image" else "生视频" + raise HTTPException( + status_code=400, + detail=f"没有可用的{label}工作流:请先到「ComfyUI 连接」确认连接可用," + "再到工作流管理导入并启用一个" + f"{label}工作流。", + ) + workflow = row_to_dict(wf) + finally: + conn.close() + + inputs = parse_dynamic_inputs(json.loads(workflow["workflow_json"] or "{}")) + duration = payload.duration_sec if payload.kind == "video" else None + input_values = smart_fill_inputs( + inputs, + prompt=payload.prompt, + negative_prompt=payload.negative_prompt or None, + duration=duration, + ) + + job = queue_manager.enqueue( + project_id=project_id, + kind=payload.kind, + workflow_id=int(workflow["id"]), + payload={ + "input_values": input_values, + "prompt": payload.prompt, + "source": WORKBENCH_SOURCE, + "stage_key": payload.stage_key, + "target_id": payload.target_id, + }, + ) + await event_bus.publish( + "job.created", + { + "job_id": job["id"], + "kind": payload.kind, + "source": WORKBENCH_SOURCE, + "project_id": project_id, + }, + ) + return {"ok": True, "job": _job_public(job)} diff --git a/calliope-backend/tests/test_projects.py b/calliope-backend/tests/test_projects.py index 1c24e061..99dea302 100644 --- a/calliope-backend/tests/test_projects.py +++ b/calliope-backend/tests/test_projects.py @@ -89,6 +89,10 @@ def test_list_projects_includes_stats(client): "character_count": 0, "asset_ready_count": 0, "asset_total_count": 0, + # Five-stage workbench progress (HEL-614): fresh project = not started. + "stage_confirmed": 0, + "stage_status": {}, + "active_jobs": 0, } diff --git a/calliope-backend/tests/test_workbench.py b/calliope-backend/tests/test_workbench.py new file mode 100644 index 00000000..4c522d98 --- /dev/null +++ b/calliope-backend/tests/test_workbench.py @@ -0,0 +1,421 @@ +"""五段创作工作台 (HEL-614) — stage lifecycle, context handoff (confirmed +drafts only), edit/confirm/restore, script import, in-flow generation via +the shared queue, and honest failure states. LLM is faked by monkeypatching +the workbench router's LLMClient; ComfyUI runs in dry_run placeholder mode.""" + +from __future__ import annotations + +import json +import time + +import httpx +import pytest + +from calliope.config import settings +from calliope.routers import workbench as wb + +IMAGE_WORKFLOW = { + "1": { + "class_type": "CLIPTextEncode", + "inputs": {"text": "默认提示词"}, + "_meta": {"title": "(Input:prompt) 正向提示词"}, + }, + "9": { + "class_type": "SaveImage", + "inputs": {"images": "x"}, + "_meta": {"title": "(Output:image) 图片输出"}, + }, +} + +SCRIPT_TEXT = ( + "《夜行便利店》\n第一场·内景·便利店·凌晨两点:店员小夏整理货架,风铃轻响," + "一位穿米色风衣的女孩推门而入,径直走到关东煮前。\n小夏:还是老样子?\n女孩点头。" +) + +STYLE_REPLY = json.dumps( + { + "directions": [ + { + "id": "style1", + "name": "霓虹赛博", + "description": "青紫霓虹、湿润反光、浅景深", + "prompt": "cyberpunk convenience store, neon rim light, wet floor reflections", + "negative_prompt": "blurry, lowres", + }, + { + "id": "style2", + "name": "暖调生活流", + "description": "暖黄顶光、柔焦、生活质感", + "prompt": "warm cozy interior, soft rim light, film grain", + "negative_prompt": "", + }, + ] + }, + ensure_ascii=False, +) + +STORYBOARD_REPLY = json.dumps( + { + "shots": [ + { + "id": "shot1", + "scene": "1", + "shot_size": "全景", + "camera": "固定", + "description": "凌晨便利店全貌,货架整齐,灯光惨白", + "dialog": "", + "duration_sec": 3, + }, + { + "id": "shot2", + "scene": "1", + "shot_size": "特写", + "camera": "推", + "description": "风铃轻响,女孩的手推开玻璃门", + "dialog": "小夏:还是老样子?", + "duration_sec": 2, + }, + ] + }, + ensure_ascii=False, +) + +ASSETS_REPLY = json.dumps( + { + "assets": [ + { + "id": "asset1", + "kind": "character", + "name": "小夏", + "description": "夜班店员,白色制服", + "prompt": "convenience store clerk, white uniform, name tag, half body", + }, + { + "id": "asset2", + "kind": "location", + "name": "便利店", + "description": "深夜便利店内部", + "prompt": "japanese convenience store interior at night, bright shelves", + }, + ] + }, + ensure_ascii=False, +) + +SHOT_REPLY = json.dumps( + { + "shots": [ + { + "id": "vshot1", + "shot_no": "S1", + "description": "开场全景", + "prompt": "slow push in on convenience store shelves at night, cinematic", + "duration_sec": 4, + }, + { + "id": "vshot2", + "shot_no": "S2", + "description": "风铃特写", + "prompt": "close up wind chime, door opens, warm light spill", + "duration_sec": 3, + }, + ] + }, + ensure_ascii=False, +) + + +class FakeLLM: + """Scripted replies; records every chat() call for context assertions.""" + + replies: list[str] = [] + calls: list[list[dict]] = [] + + @classmethod + def reset(cls, replies: list[str]) -> None: + cls.replies = list(replies) + cls.calls = [] + + @classmethod + def for_role(cls, role: str, *, timeout: float = 120.0) -> "FakeLLM": + return cls() + + async def chat(self, messages, temperature=0.7, **kwargs) -> str: + type(self).calls.append(messages) + if type(self).replies: + return type(self).replies.pop(0) + return json.dumps({"text": SCRIPT_TEXT}, ensure_ascii=False) + + async def close(self) -> None: + return None + + +class RefusingLLM(FakeLLM): + @classmethod + def for_role(cls, role: str, *, timeout: float = 120.0) -> "RefusingLLM": + return cls() + + async def chat(self, messages, temperature=0.7, **kwargs) -> str: + type(self).calls.append(messages) + raise httpx.ConnectError("connection refused") + + +def _make_project(client, **fields) -> int: + payload = {"title": fields.get("title", "夜行便利店"), "idea": "凌晨便利店的温暖相遇"} + r = client.post("/api/projects", json=payload) + assert r.status_code == 200, r.text + return r.json()["id"] + + +def _overview(client, pid: int) -> dict: + r = client.get(f"/api/workbench/projects/{pid}") + assert r.status_code == 200, r.text + return r.json() + + +def _stage(overview: dict, key: str) -> dict: + return next(s for s in overview["stages"] if s["stage_key"] == key) + + +def _wait_stage_status(client, pid: int, key: str, statuses: set[str], timeout: float = 10.0) -> dict: + deadline = time.time() + timeout + stage = None + while time.time() < deadline: + stage = _stage(_overview(client, pid), key) + if stage["status"] in statuses: + return stage + time.sleep(0.2) + pytest.fail(f"stage {key} stuck in {stage and stage['status']!r}, want {statuses}") + + +def _run(client, pid: int, key: str, instruction: str | None = None): + body = {"instruction": instruction} if instruction else {} + return client.post(f"/api/workbench/projects/{pid}/stages/{key}/run", json=body) + + +def _confirm(client, pid: int, key: str, **extra): + return client.post(f"/api/workbench/projects/{pid}/stages/{key}/confirm", json=extra or None) + + +# ───────────────────────────────────────────────────────────────────────── + + +def test_overview_ensures_five_todo_stages(client): + pid = _make_project(client) + overview = _overview(client, pid) + assert [s["stage_key"] for s in overview["stages"]] == [ + "script", + "style", + "storyboard", + "assets", + "shot", + ] + assert all(s["status"] == "todo" for s in overview["stages"]) + assert overview["project"]["title"] == "夜行便利店" + + +def test_run_requires_previous_stage_confirmed(client, monkeypatch): + monkeypatch.setattr(wb, "LLMClient", FakeLLM) + FakeLLM.reset([]) + pid = _make_project(client) + r = _run(client, pid, "style") + assert r.status_code == 409 + assert "剧本创作" in r.json()["detail"] + + +def test_five_stage_flow_confirmed_context_handoff(client, monkeypatch): + """从创意起步端到端:每段生成→确认;只有已确认内容进入下一段上下文。""" + monkeypatch.setattr(wb, "LLMClient", FakeLLM) + FakeLLM.reset( + [ + json.dumps({"text": SCRIPT_TEXT}, ensure_ascii=False), + STYLE_REPLY, + STORYBOARD_REPLY, + ASSETS_REPLY, + SHOT_REPLY, + ] + ) + pid = _make_project(client) + + # 1. 剧本创作 + assert _run(client, pid, "script").status_code == 200 + stage = _wait_stage_status(client, pid, "script", {"awaiting_confirm"}) + assert stage["content"]["text"] == SCRIPT_TEXT + assert _confirm(client, pid, "script").status_code == 200 + + # 2. 视觉设计 — 上下文带剧本 + assert _run(client, pid, "style").status_code == 200 + stage = _wait_stage_status(client, pid, "style", {"awaiting_confirm"}) + assert len(stage["content"]["directions"]) == 2 + assert SCRIPT_TEXT[:10] in FakeLLM.calls[-1][1]["content"] + r = _confirm(client, pid, "style", chosen_style_id="style2") + assert r.status_code == 200 + assert r.json()["stage"]["chosen_style_id"] == "style2" + + # 3. 分镜设计 — 上下文带剧本 + 已选风格(暖调生活流,非默认第一套) + assert _run(client, pid, "storyboard").status_code == 200 + _wait_stage_status(client, pid, "storyboard", {"awaiting_confirm"}) + ctx = FakeLLM.calls[-1][1]["content"] + assert "暖调生活流" in ctx + assert SCRIPT_TEXT[:10] in ctx + assert _confirm(client, pid, "storyboard").status_code == 200 + + # 4. 素材资产 — 上下文带分镜 + assert _run(client, pid, "assets").status_code == 200 + _wait_stage_status(client, pid, "assets", {"awaiting_confirm"}) + ctx = FakeLLM.calls[-1][1]["content"] + assert "风铃轻响" in ctx + assert _confirm(client, pid, "assets").status_code == 200 + + # 5. 镜头脚本 — 上下文带素材清单 + assert _run(client, pid, "shot").status_code == 200 + stage = _wait_stage_status(client, pid, "shot", {"awaiting_confirm"}) + ctx = FakeLLM.calls[-1][1]["content"] + assert "小夏" in ctx + assert stage["content"]["shots"][0]["prompt"].startswith("slow push") + + # 进度反映到项目列表(真实阶段数据) + r = client.get("/api/projects") + stats = next(p for p in r.json() if p["id"] == pid)["stats"] + assert stats["stage_confirmed"] == 4 + assert stats["stage_status"]["shot"] == "awaiting_confirm" + + +def test_run_failure_keeps_confirmed_snapshot_and_reads_chinese(client, monkeypatch): + monkeypatch.setattr(wb, "LLMClient", RefusingLLM) + pid = _make_project(client) + # 先用正常 LLM 确认剧本 + monkeypatch.setattr(wb, "LLMClient", FakeLLM) + FakeLLM.reset([json.dumps({"text": SCRIPT_TEXT}, ensure_ascii=False)]) + _run(client, pid, "script") + _wait_stage_status(client, pid, "script", {"awaiting_confirm"}) + _confirm(client, pid, "script") + # 视觉设计生成失败(连接拒绝) + monkeypatch.setattr(wb, "LLMClient", RefusingLLM) + assert _run(client, pid, "style").status_code == 200 + stage = _wait_stage_status(client, pid, "style", {"todo"}) + assert "连接大模型服务失败" in (stage["last_run"]["error"] or "") + # 剧本阶段不受影响 + assert _stage(_overview(client, pid), "script")["status"] == "confirmed" + + +def test_edit_after_confirm_and_restore(client, monkeypatch): + monkeypatch.setattr(wb, "LLMClient", FakeLLM) + FakeLLM.reset([json.dumps({"text": SCRIPT_TEXT}, ensure_ascii=False)]) + pid = _make_project(client) + _run(client, pid, "script") + _wait_stage_status(client, pid, "script", {"awaiting_confirm"}) + _confirm(client, pid, "script") + + # 编辑已确认阶段 → 变回待确认草稿,已确认快照保留 + edited = {"text": SCRIPT_TEXT + "\n(结尾新增:女孩微笑离开。)"} + r = client.patch(f"/api/workbench/projects/{pid}/stages/script", json={"content": edited}) + assert r.status_code == 200 + stage = r.json()["stage"] + assert stage["status"] == "awaiting_confirm" + assert stage["draft_edited"] is True + assert stage["confirmed_content"]["text"] == SCRIPT_TEXT + + # 恢复已确认版本 + r = client.post(f"/api/workbench/projects/{pid}/stages/script/restore") + assert r.status_code == 200 + stage = r.json()["stage"] + assert stage["status"] == "confirmed" + assert stage["content"]["text"] == SCRIPT_TEXT + + +def test_import_script_confirms_and_unlocks_style(client, monkeypatch): + monkeypatch.setattr(wb, "LLMClient", FakeLLM) + FakeLLM.reset([STYLE_REPLY]) + pid = _make_project(client) + r = client.post(f"/api/workbench/projects/{pid}/stages/script/import", json={"text": SCRIPT_TEXT}) + assert r.status_code == 200 + assert r.json()["stage"]["status"] == "confirmed" + # 跳过剧本创作,直接从视觉设计继续 + assert _run(client, pid, "style").status_code == 200 + _wait_stage_status(client, pid, "style", {"awaiting_confirm"}) + # 太短的导入被拒绝 + r = client.post( + f"/api/workbench/projects/{pid}/stages/script/import", json={"text": "太短"} + ) + assert r.status_code == 400 + assert "太短" in r.json()["detail"] + + +def test_generate_without_workflow_is_chinese_400(client): + pid = _make_project(client) + r = client.post( + f"/api/workbench/projects/{pid}/generate", + json={"kind": "image", "stage_key": "assets", "target_id": "asset1", "prompt": "a cat"}, + ) + assert r.status_code == 400 + assert "没有可用的生图工作流" in r.json()["detail"] + + +def test_generate_image_job_returns_to_project(client): + pid = _make_project(client) + # 手动放入素材阶段草稿(带 asset1) + r = client.patch( + f"/api/workbench/projects/{pid}/stages/assets", + json={"content": json.loads(ASSETS_REPLY)}, + ) + assert r.status_code == 200 + wf = client.post( + "/api/workflows", + json={"name": "假·文生图", "kind": "image", "workflow_json": IMAGE_WORKFLOW}, + ) + assert wf.status_code == 200, wf.text + + r = client.post( + f"/api/workbench/projects/{pid}/generate", + json={ + "kind": "image", + "stage_key": "assets", + "target_id": "asset1", + "prompt": "convenience store clerk portrait", + }, + ) + assert r.status_code == 200, r.text + job = r.json()["job"] + assert job["payload"]["source"] == "workbench" + assert job["payload"]["target_id"] == "asset1" + assert job["payload"]["input_values"]["1"] == "convenience store clerk portrait" + + # dry_run worker completes with a placeholder; overview enriches the asset + deadline = time.time() + 40 + job_done = False + mine = None + while time.time() < deadline: + jobs = client.get(f"/api/jobs?project_id={pid}").json() + mine = next((j for j in jobs if j["id"] == job["id"]), None) + if mine and mine["status"] in ("done", "failed"): + job_done = mine["status"] == "done" + break + time.sleep(0.4) + assert job_done, f"workbench job did not finish: {mine}" + stage = _stage(_overview(client, pid), "assets") + asset = next(a for a in stage["content"]["assets"] if a["id"] == "asset1") + assert asset["job"]["status"] == "done" + assert asset["job"]["output"] and asset["job"]["output"].endswith(".png") + + +def test_project_list_stats_include_active_jobs(client): + pid = _make_project(client) + wf = client.post( + "/api/workflows", + json={"name": "假·文生图2", "kind": "image", "workflow_json": IMAGE_WORKFLOW}, + ) + wf_id = wf.json()["id"] + r = client.post( + f"/api/workbench/projects/{pid}/generate", + json={"kind": "image", "stage_key": "assets", "prompt": "x"}, + ) + assert r.status_code == 200 + r = client.get("/api/projects") + stats = next(p for p in r.json() if p["id"] == pid)["stats"] + assert stats["active_jobs"] >= 1 + assert stats["stage_confirmed"] == 0 + # a project that never opened the workbench reports no stage rows at all + pid2 = _make_project(client, title="未开工") + stats2 = next(p for p in client.get("/api/projects").json() if p["id"] == pid2)["stats"] + assert stats2["stage_status"] == {} and stats2["stage_confirmed"] == 0 diff --git a/calliope-web/src/lib/api.ts b/calliope-web/src/lib/api.ts index 24d6d958..7fdbd53b 100644 --- a/calliope-web/src/lib/api.ts +++ b/calliope-web/src/lib/api.ts @@ -1,849 +1,1155 @@ -import type { AgentComposerPayload } from '$lib/agentComposer'; -import { t } from '$lib/i18n.svelte'; +import type { AgentComposerPayload } from "$lib/agentComposer"; +import { t } from "$lib/i18n.svelte"; -const API_BASE = ''; +const API_BASE = ""; export interface Project { - id: number; - title: string; - idea: string | null; - genre: string | null; - tone: string | null; - target_duration: string | null; - cover_path: string | null; - status: string; - created_at: string; - updated_at: string; - stats?: ProjectStats; + id: number; + title: string; + idea: string | null; + genre: string | null; + tone: string | null; + target_duration: string | null; + cover_path: string | null; + status: string; + created_at: string; + updated_at: string; + stats?: ProjectStats; } export interface ProjectStats { - scene_count: number; - character_count: number; - asset_ready_count: number; - asset_total_count: number; + scene_count: number; + character_count: number; + asset_ready_count: number; + asset_total_count: number; + /** Five-stage workbench progress (HEL-614) — real stage rows + live jobs. */ + stage_confirmed: number; + stage_status: Record; + active_jobs: number; } export interface ProjectCreate { - title: string; - idea?: string; - genre?: string; - tone?: string; - target_duration?: string; + title: string; + idea?: string; + genre?: string; + tone?: string; + target_duration?: string; } export interface Beat { - id: number; - order_index: number; - title: string; - description: string | null; + id: number; + order_index: number; + title: string; + description: string | null; } export interface Character { - id: number; - name: string; - role: string | null; - age: string | null; - appearance: string | null; - personality: string | null; - portrait_path: string | null; - sheet_path: string | null; - consistency_prompt: string | null; + id: number; + name: string; + role: string | null; + age: string | null; + appearance: string | null; + personality: string | null; + portrait_path: string | null; + sheet_path: string | null; + consistency_prompt: string | null; } export interface Location { - id: number; - name: string; - description: string | null; - reference_image_path: string | null; - consistency_prompt: string | null; + id: number; + name: string; + description: string | null; + reference_image_path: string | null; + consistency_prompt: string | null; } export interface Item { - id: number; - name: string; - description: string | null; - reference_image_path: string | null; - consistency_prompt: string | null; + id: number; + name: string; + description: string | null; + reference_image_path: string | null; + consistency_prompt: string | null; } export interface StoryData { - project: Project; - beats: Beat[]; - characters: Character[]; - locations: Location[]; - items: Item[]; + project: Project; + beats: Beat[]; + characters: Character[]; + locations: Location[]; + items: Item[]; } export interface LlmProfile { - id: string; - name: string; - base_url: string; - model: string; - api_key: boolean; - /** Last 4 chars of the stored key, for masked display only. */ - api_key_tail?: string | null; + id: string; + name: string; + base_url: string; + model: string; + api_key: boolean; + /** Last 4 chars of the stored key, for masked display only. */ + api_key_tail?: string | null; } export interface ComfyEndpoint { - id: string; - name: string; - base_url: string; - auth_type: 'none' | 'bearer' | 'header'; - header_name: string | null; - notes: string | null; - has_token: boolean; - token_tail?: string | null; + id: string; + name: string; + base_url: string; + auth_type: "none" | "bearer" | "header"; + header_name: string | null; + notes: string | null; + has_token: boolean; + token_tail?: string | null; } export interface Settings { - host: string; - port: number; - data_dir: string; - assets_dir: string; - agent_workspace_dir: string; - db_name: string; - llm_base_url: string; - llm_model: string; - llm_api_key: boolean; - llm_profiles: LlmProfile[]; - llm_active_id: string | null; - comfyui_base_url: string; - comfyui_endpoints: ComfyEndpoint[]; - comfyui_active_id: string | null; - queue_concurrency: number; - queue_poll_interval_sec: number; - queue_poll_timeout_sec: number; - queue_max_retries: number; - agent_max_steps: number; - agent_hardening_prompt: string; - agent_history_char_budget: number; - agent_llm_assignments: Record; - agent_shell_enabled: boolean; - dry_run: boolean; + host: string; + port: number; + data_dir: string; + assets_dir: string; + agent_workspace_dir: string; + db_name: string; + llm_base_url: string; + llm_model: string; + llm_api_key: boolean; + llm_profiles: LlmProfile[]; + llm_active_id: string | null; + comfyui_base_url: string; + comfyui_endpoints: ComfyEndpoint[]; + comfyui_active_id: string | null; + queue_concurrency: number; + queue_poll_interval_sec: number; + queue_poll_timeout_sec: number; + queue_max_retries: number; + agent_max_steps: number; + agent_hardening_prompt: string; + agent_history_char_budget: number; + agent_llm_assignments: Record; + agent_shell_enabled: boolean; + dry_run: boolean; } import type { - Job, - Scene, - SceneVideoSettings, - Clip, - Workflow, - ComfyDynamicInput, - ComfyDynamicOutput, -} from './comfy/types'; -export type { Job, Scene, SceneVideoSettings, Clip, Workflow, ComfyDynamicInput, ComfyDynamicOutput }; + Job, + Scene, + SceneVideoSettings, + Clip, + Workflow, + ComfyDynamicInput, + ComfyDynamicOutput, +} from "./comfy/types"; +export type { + Job, + Scene, + SceneVideoSettings, + Clip, + Workflow, + ComfyDynamicInput, + ComfyDynamicOutput, +}; async function api(path: string, init?: RequestInit): Promise { - const res = await fetch(`${API_BASE}${path}`, { - ...init, - headers: { - 'Content-Type': 'application/json', - ...init?.headers, - }, - }); - if (!res.ok) { - const body = await res.text().catch(() => t('api.unknownError')); - throw new Error(`${res.status}: ${body}`); - } - return res.json() as Promise; + const res = await fetch(`${API_BASE}${path}`, { + ...init, + headers: { + "Content-Type": "application/json", + ...init?.headers, + }, + }); + if (!res.ok) { + const body = await res.text().catch(() => t("api.unknownError")); + throw new Error(`${res.status}: ${body}`); + } + return res.json() as Promise; } /** Multipart variant of api() — FormData sets its own Content-Type boundary. */ async function apiUpload(path: string, form: FormData): Promise { - const res = await fetch(`${API_BASE}${path}`, { method: 'POST', body: form }); - if (!res.ok) { - const body = await res.text().catch(() => t('api.unknownError')); - throw new Error(`${res.status}: ${body}`); - } - return res.json() as Promise; + const res = await fetch(`${API_BASE}${path}`, { method: "POST", body: form }); + if (!res.ok) { + const body = await res.text().catch(() => t("api.unknownError")); + throw new Error(`${res.status}: ${body}`); + } + return res.json() as Promise; } export function assetUrl(path: string | null | undefined): string | null { - if (!path) return null; - return `/api/file?path=${encodeURIComponent(path)}`; + if (!path) return null; + return `/api/file?path=${encodeURIComponent(path)}`; } export const projects = { - list: () => api('/api/projects'), - create: (payload: ProjectCreate) => - api('/api/projects', { method: 'POST', body: JSON.stringify(payload) }), - get: (id: number) => api(`/api/projects/${id}`), - update: (id: number, payload: Partial) => - api(`/api/projects/${id}`, { method: 'PATCH', body: JSON.stringify(payload) }), - delete: (id: number) => api<{ ok: boolean }>(`/api/projects/${id}`, { method: 'DELETE' }), - getStory: (id: number) => api(`/api/projects/${id}/story`), - updateBeat: (projectId: number, beatId: number, payload: Partial) => - api(`/api/projects/${projectId}/beats/${beatId}`, { - method: 'PATCH', - body: JSON.stringify(payload), - }), - updateCharacter: (projectId: number, characterId: number, payload: Partial) => - api(`/api/projects/${projectId}/characters/${characterId}`, { - method: 'PATCH', - body: JSON.stringify(payload), - }), - updateLocation: (projectId: number, locationId: number, payload: Partial) => - api(`/api/projects/${projectId}/locations/${locationId}`, { - method: 'PATCH', - body: JSON.stringify(payload), - }), - updateItem: (projectId: number, itemId: number, payload: Partial) => - api(`/api/projects/${projectId}/items/${itemId}`, { - method: 'PATCH', - body: JSON.stringify(payload), - }), - deleteBeat: (projectId: number, beatId: number) => - api<{ ok: boolean }>(`/api/projects/${projectId}/beats/${beatId}`, { method: 'DELETE' }), - deleteCharacter: (projectId: number, characterId: number) => - api<{ ok: boolean }>(`/api/projects/${projectId}/characters/${characterId}`, { - method: 'DELETE', - }), - deleteLocation: (projectId: number, locationId: number) => - api<{ ok: boolean }>(`/api/projects/${projectId}/locations/${locationId}`, { - method: 'DELETE', - }), - deleteItem: (projectId: number, itemId: number) => - api<{ ok: boolean }>(`/api/projects/${projectId}/items/${itemId}`, { - method: 'DELETE', - }), - getScenes: (id: number) => - api<{ scenes: Scene[]; estimated_duration_sec: number }>(`/api/projects/${id}/scenes`), - updateScene: (projectId: number, sceneId: number, payload: Record) => - api(`/api/projects/${projectId}/scenes/${sceneId}`, { - method: 'PATCH', - body: JSON.stringify(payload), - }), - createScene: (projectId: number, payload: Record) => - api(`/api/projects/${projectId}/scenes`, { - method: 'POST', - body: JSON.stringify(payload), - }), - deleteScene: (projectId: number, sceneId: number) => - api<{ ok: boolean }>(`/api/projects/${projectId}/scenes/${sceneId}`, { method: 'DELETE' }), - reorderScenes: (projectId: number, sceneIds: number[]) => - api<{ scenes: Scene[] }>(`/api/projects/${projectId}/scenes/reorder`, { - method: 'POST', - body: JSON.stringify({ scene_ids: sceneIds }), - }), - createClip: (projectId: number, sceneId: number, payload: Record) => - api(`/api/projects/${projectId}/scenes/${sceneId}/clips`, { - method: 'POST', - body: JSON.stringify(payload), - }), - updateClip: (projectId: number, clipId: number, payload: Record) => - api(`/api/projects/${projectId}/clips/${clipId}`, { - method: 'PATCH', - body: JSON.stringify(payload), - }), - deleteClip: (projectId: number, clipId: number) => - api<{ ok: boolean }>(`/api/projects/${projectId}/clips/${clipId}`, { method: 'DELETE' }), - reorderClips: (projectId: number, sceneId: number, clipIds: number[]) => - api<{ ok: boolean }>(`/api/projects/${projectId}/scenes/${sceneId}/clips/reorder`, { - method: 'POST', - body: JSON.stringify({ clip_ids: clipIds }), - }), - expandClips: ( - projectId: number, - payload: { scene_ids?: number[]; all?: boolean; guidance?: string } = {}, - ) => - api<{ - ok: boolean; - scenes: Array<{ scene_id: number; clip_count: number; total_duration_sec: number }>; - total_clips: number; - }>(`/api/projects/${projectId}/expand-clips`, { - method: 'POST', - body: JSON.stringify(payload), - }), - generateAssets: ( - id: number, - payload: { - missing_only?: boolean; - character_ids?: number[]; - location_ids?: number[]; - item_ids?: number[]; - workflow_id?: number; - input_values?: Record; - asset_target?: 'sheet'; - prompt?: string; - } = {}, - ) => - api<{ ok: boolean; jobs: Job[] }>(`/api/projects/${id}/generate-assets`, { - method: 'POST', - body: JSON.stringify(payload), - }), - getAssets: (id: number) => - api<{ characters: Character[]; locations: Location[]; items: Item[] }>( - `/api/projects/${id}/assets`, - ), + list: () => api("/api/projects"), + create: (payload: ProjectCreate) => + api("/api/projects", { + method: "POST", + body: JSON.stringify(payload), + }), + get: (id: number) => + api(`/api/projects/${id}`), + update: ( + id: number, + payload: Partial< + ProjectCreate & { status?: string; cover_path?: string | null } + >, + ) => + api(`/api/projects/${id}`, { + method: "PATCH", + body: JSON.stringify(payload), + }), + delete: (id: number) => + api<{ ok: boolean }>(`/api/projects/${id}`, { method: "DELETE" }), + getStory: (id: number) => api(`/api/projects/${id}/story`), + updateBeat: (projectId: number, beatId: number, payload: Partial) => + api(`/api/projects/${projectId}/beats/${beatId}`, { + method: "PATCH", + body: JSON.stringify(payload), + }), + updateCharacter: ( + projectId: number, + characterId: number, + payload: Partial, + ) => + api(`/api/projects/${projectId}/characters/${characterId}`, { + method: "PATCH", + body: JSON.stringify(payload), + }), + updateLocation: ( + projectId: number, + locationId: number, + payload: Partial, + ) => + api(`/api/projects/${projectId}/locations/${locationId}`, { + method: "PATCH", + body: JSON.stringify(payload), + }), + updateItem: (projectId: number, itemId: number, payload: Partial) => + api(`/api/projects/${projectId}/items/${itemId}`, { + method: "PATCH", + body: JSON.stringify(payload), + }), + deleteBeat: (projectId: number, beatId: number) => + api<{ ok: boolean }>(`/api/projects/${projectId}/beats/${beatId}`, { + method: "DELETE", + }), + deleteCharacter: (projectId: number, characterId: number) => + api<{ ok: boolean }>( + `/api/projects/${projectId}/characters/${characterId}`, + { + method: "DELETE", + }, + ), + deleteLocation: (projectId: number, locationId: number) => + api<{ ok: boolean }>(`/api/projects/${projectId}/locations/${locationId}`, { + method: "DELETE", + }), + deleteItem: (projectId: number, itemId: number) => + api<{ ok: boolean }>(`/api/projects/${projectId}/items/${itemId}`, { + method: "DELETE", + }), + getScenes: (id: number) => + api<{ scenes: Scene[]; estimated_duration_sec: number }>( + `/api/projects/${id}/scenes`, + ), + updateScene: ( + projectId: number, + sceneId: number, + payload: Record, + ) => + api(`/api/projects/${projectId}/scenes/${sceneId}`, { + method: "PATCH", + body: JSON.stringify(payload), + }), + createScene: (projectId: number, payload: Record) => + api(`/api/projects/${projectId}/scenes`, { + method: "POST", + body: JSON.stringify(payload), + }), + deleteScene: (projectId: number, sceneId: number) => + api<{ ok: boolean }>(`/api/projects/${projectId}/scenes/${sceneId}`, { + method: "DELETE", + }), + reorderScenes: (projectId: number, sceneIds: number[]) => + api<{ scenes: Scene[] }>(`/api/projects/${projectId}/scenes/reorder`, { + method: "POST", + body: JSON.stringify({ scene_ids: sceneIds }), + }), + createClip: ( + projectId: number, + sceneId: number, + payload: Record, + ) => + api(`/api/projects/${projectId}/scenes/${sceneId}/clips`, { + method: "POST", + body: JSON.stringify(payload), + }), + updateClip: ( + projectId: number, + clipId: number, + payload: Record, + ) => + api(`/api/projects/${projectId}/clips/${clipId}`, { + method: "PATCH", + body: JSON.stringify(payload), + }), + deleteClip: (projectId: number, clipId: number) => + api<{ ok: boolean }>(`/api/projects/${projectId}/clips/${clipId}`, { + method: "DELETE", + }), + reorderClips: (projectId: number, sceneId: number, clipIds: number[]) => + api<{ ok: boolean }>( + `/api/projects/${projectId}/scenes/${sceneId}/clips/reorder`, + { + method: "POST", + body: JSON.stringify({ clip_ids: clipIds }), + }, + ), + expandClips: ( + projectId: number, + payload: { scene_ids?: number[]; all?: boolean; guidance?: string } = {}, + ) => + api<{ + ok: boolean; + scenes: Array<{ + scene_id: number; + clip_count: number; + total_duration_sec: number; + }>; + total_clips: number; + }>(`/api/projects/${projectId}/expand-clips`, { + method: "POST", + body: JSON.stringify(payload), + }), + generateAssets: ( + id: number, + payload: { + missing_only?: boolean; + character_ids?: number[]; + location_ids?: number[]; + item_ids?: number[]; + workflow_id?: number; + input_values?: Record; + asset_target?: "sheet"; + prompt?: string; + } = {}, + ) => + api<{ ok: boolean; jobs: Job[] }>(`/api/projects/${id}/generate-assets`, { + method: "POST", + body: JSON.stringify(payload), + }), + getAssets: (id: number) => + api<{ characters: Character[]; locations: Location[]; items: Item[] }>( + `/api/projects/${id}/assets`, + ), }; export const settings = { - get: () => api('/api/settings'), - update: (payload: Record) => - api('/api/settings', { method: 'POST', body: JSON.stringify(payload) }), - testLlm: (payload: { - profile_id?: string; - base_url?: string; - model?: string; - api_key?: string; - timeout_sec?: number; - }) => - api<{ - ok: boolean; - elapsed_ms?: number; - error?: string; - detail?: string; - timeout_sec?: number; - }>('/api/settings/llm-test', { - method: 'POST', - body: JSON.stringify(payload), - }), + get: () => api("/api/settings"), + update: (payload: Record) => + api("/api/settings", { + method: "POST", + body: JSON.stringify(payload), + }), + testLlm: (payload: { + profile_id?: string; + base_url?: string; + model?: string; + api_key?: string; + timeout_sec?: number; + }) => + api<{ + ok: boolean; + elapsed_ms?: number; + error?: string; + detail?: string; + timeout_sec?: number; + }>("/api/settings/llm-test", { + method: "POST", + body: JSON.stringify(payload), + }), }; export const comfy = { - listEndpoints: () => - api<{ endpoints: ComfyEndpoint[]; active_id: string | null }>('/api/comfyui/endpoints'), - createEndpoint: (payload: Partial & { base_url: string; auth_token?: string }) => - api<{ endpoints: ComfyEndpoint[]; active_id: string | null }>('/api/comfyui/endpoints', { - method: 'POST', - body: JSON.stringify(payload), - }), - updateEndpoint: (id: string, payload: Partial & { auth_token?: string }) => - api<{ endpoints: ComfyEndpoint[]; active_id: string | null }>(`/api/comfyui/endpoints/${id}`, { - method: 'PATCH', - body: JSON.stringify(payload), - }), - deleteEndpoint: (id: string) => - api<{ endpoints: ComfyEndpoint[]; active_id: string | null }>(`/api/comfyui/endpoints/${id}`, { - method: 'DELETE', - }), - activateEndpoint: (id: string) => - api<{ endpoints: ComfyEndpoint[]; active_id: string | null }>( - `/api/comfyui/endpoints/${id}/activate`, - { method: 'POST' }, - ), - testEndpoint: (payload: { - endpoint_id?: string; - base_url?: string; - auth_type?: string; - auth_token?: string; - header_name?: string; - timeout_sec?: number; - }) => - api<{ - ok: boolean; - elapsed_ms?: number; - comfyui_version?: string; - device_name?: string; - error?: string; - message?: string; - detail?: string; - timeout_sec?: number; - }>('/api/comfyui/endpoints/test', { - method: 'POST', - body: JSON.stringify(payload), - }), + listEndpoints: () => + api<{ endpoints: ComfyEndpoint[]; active_id: string | null }>( + "/api/comfyui/endpoints", + ), + createEndpoint: ( + payload: Partial & { base_url: string; auth_token?: string }, + ) => + api<{ endpoints: ComfyEndpoint[]; active_id: string | null }>( + "/api/comfyui/endpoints", + { + method: "POST", + body: JSON.stringify(payload), + }, + ), + updateEndpoint: ( + id: string, + payload: Partial & { auth_token?: string }, + ) => + api<{ endpoints: ComfyEndpoint[]; active_id: string | null }>( + `/api/comfyui/endpoints/${id}`, + { + method: "PATCH", + body: JSON.stringify(payload), + }, + ), + deleteEndpoint: (id: string) => + api<{ endpoints: ComfyEndpoint[]; active_id: string | null }>( + `/api/comfyui/endpoints/${id}`, + { + method: "DELETE", + }, + ), + activateEndpoint: (id: string) => + api<{ endpoints: ComfyEndpoint[]; active_id: string | null }>( + `/api/comfyui/endpoints/${id}/activate`, + { method: "POST" }, + ), + testEndpoint: (payload: { + endpoint_id?: string; + base_url?: string; + auth_type?: string; + auth_token?: string; + header_name?: string; + timeout_sec?: number; + }) => + api<{ + ok: boolean; + elapsed_ms?: number; + comfyui_version?: string; + device_name?: string; + error?: string; + message?: string; + detail?: string; + timeout_sec?: number; + }>("/api/comfyui/endpoints/test", { + method: "POST", + body: JSON.stringify(payload), + }), }; export const workflows = { - list: () => api('/api/workflows'), - analyze: (workflow_json: Record) => - api<{ - inputs: ComfyDynamicInput[]; - outputs: ComfyDynamicOutput[]; - suggested_profile?: string; - }>('/api/workflows/analyze', { - method: 'POST', - body: JSON.stringify({ workflow_json }), - }), - reanalyze: (id: number) => - api(`/api/workflows/${id}/reanalyze`, { method: 'POST' }), - create: (payload: { - name: string; - kind: 'image' | 'video'; - workflow_json: Record; - description?: string; - prompt_profile?: string; - endpoint_id?: string | null; - }) => api('/api/workflows', { method: 'POST', body: JSON.stringify(payload) }), - update: ( - id: number, - payload: Partial<{ - name: string; - kind: string; - is_enabled: boolean; - description: string; - prompt_profile: string; - endpoint_id: string | null; - }>, - ) => api(`/api/workflows/${id}`, { method: 'PATCH', body: JSON.stringify(payload) }), - delete: (id: number) => api<{ ok: boolean }>(`/api/workflows/${id}`, { method: 'DELETE' }), - get: (id: number) => api(`/api/workflows/${id}`), + list: () => api("/api/workflows"), + analyze: (workflow_json: Record) => + api<{ + inputs: ComfyDynamicInput[]; + outputs: ComfyDynamicOutput[]; + suggested_profile?: string; + }>("/api/workflows/analyze", { + method: "POST", + body: JSON.stringify({ workflow_json }), + }), + reanalyze: (id: number) => + api(`/api/workflows/${id}/reanalyze`, { method: "POST" }), + create: (payload: { + name: string; + kind: "image" | "video"; + workflow_json: Record; + description?: string; + prompt_profile?: string; + endpoint_id?: string | null; + }) => + api("/api/workflows", { + method: "POST", + body: JSON.stringify(payload), + }), + update: ( + id: number, + payload: Partial<{ + name: string; + kind: string; + is_enabled: boolean; + description: string; + prompt_profile: string; + endpoint_id: string | null; + }>, + ) => + api(`/api/workflows/${id}`, { + method: "PATCH", + body: JSON.stringify(payload), + }), + delete: (id: number) => + api<{ ok: boolean }>(`/api/workflows/${id}`, { method: "DELETE" }), + get: (id: number) => api(`/api/workflows/${id}`), }; export const jobsApi = { - list: (projectId?: number) => - api(`/api/jobs${projectId != null ? `?project_id=${projectId}` : ''}`), - retry: (id: number) => api(`/api/jobs/${id}/retry`, { method: 'POST' }), - cancel: (id: number) => api<{ ok: boolean }>(`/api/jobs/${id}/cancel`, { method: 'POST' }), - pause: () => api<{ ok: boolean; paused: boolean }>('/api/jobs/pause', { method: 'POST' }), - resume: () => api<{ ok: boolean; paused: boolean }>('/api/jobs/resume', { method: 'POST' }), - queueStatus: () => api<{ paused: boolean }>('/api/jobs/queue-status'), - generateVideos: ( - projectId: number, - payload: { - scene_ids?: number[]; - clip_ids?: number[]; - workflow_id?: number; - input_values?: Record; - prompts?: Record; - } = {}, - ) => - api<{ ok: boolean; jobs: Job[] }>(`/api/jobs/projects/${projectId}/generate-videos`, { - method: 'POST', - body: JSON.stringify(payload), - }), - previewPrompt: ( - projectId: number, - payload: { - clip_id?: number; - scene_id?: number; - workflow_id?: number; - input_values?: Record; - force?: boolean; - }, - ) => - api<{ - prompt: string; - profile: string; - from_draft: boolean; - based_on: string; - critic?: { ok: boolean; notes: string[] }; - }>(`/api/jobs/projects/${projectId}/preview-prompt`, { - method: 'POST', - body: JSON.stringify(payload), - }), - exportFilm: (projectId: number) => - api<{ ok: boolean; job: Job }>(`/api/jobs/projects/${projectId}/export`, { method: 'POST' }), + list: (projectId?: number) => + api( + `/api/jobs${projectId != null ? `?project_id=${projectId}` : ""}`, + ), + retry: (id: number) => api(`/api/jobs/${id}/retry`, { method: "POST" }), + cancel: (id: number) => + api<{ ok: boolean }>(`/api/jobs/${id}/cancel`, { method: "POST" }), + pause: () => + api<{ ok: boolean; paused: boolean }>("/api/jobs/pause", { + method: "POST", + }), + resume: () => + api<{ ok: boolean; paused: boolean }>("/api/jobs/resume", { + method: "POST", + }), + queueStatus: () => api<{ paused: boolean }>("/api/jobs/queue-status"), + generateVideos: ( + projectId: number, + payload: { + scene_ids?: number[]; + clip_ids?: number[]; + workflow_id?: number; + input_values?: Record; + prompts?: Record; + } = {}, + ) => + api<{ ok: boolean; jobs: Job[] }>( + `/api/jobs/projects/${projectId}/generate-videos`, + { + method: "POST", + body: JSON.stringify(payload), + }, + ), + previewPrompt: ( + projectId: number, + payload: { + clip_id?: number; + scene_id?: number; + workflow_id?: number; + input_values?: Record; + force?: boolean; + }, + ) => + api<{ + prompt: string; + profile: string; + from_draft: boolean; + based_on: string; + critic?: { ok: boolean; notes: string[] }; + }>(`/api/jobs/projects/${projectId}/preview-prompt`, { + method: "POST", + body: JSON.stringify(payload), + }), + exportFilm: (projectId: number) => + api<{ ok: boolean; job: Job }>(`/api/jobs/projects/${projectId}/export`, { + method: "POST", + }), }; -export type PlaygroundAttachTarget = 'character_sheet' | 'location' | 'item' | 'scene'; +export type PlaygroundAttachTarget = + "character_sheet" | "location" | "item" | "scene"; -export type UploadKind = 'image' | 'video' | 'audio' | 'document'; +export type UploadKind = "image" | "video" | "audio" | "document"; export interface PlaygroundUpload { - ok: boolean; - path: string; - name: string; - kind: UploadKind; + ok: boolean; + path: string; + name: string; + kind: UploadKind; } export interface PlaygroundUploadListItem { - name: string; - path: string; - kind: UploadKind; - size: number; - mtime: string; + name: string; + path: string; + kind: UploadKind; + size: number; + mtime: string; } export const playgroundApi = { - project: () => api('/api/playground/project'), - jobs: () => api('/api/playground/jobs'), - generate: (payload: { - workflow_id: number; - input_values?: Record; - /** Target connection; omitted → workflow binding → active (backend). */ - endpoint_id?: string | null; - /** Origin recorded on the job payload (tasks page labels). */ - source?: 'playground' | 'studio-image' | 'studio-video'; - }) => - api<{ ok: boolean; job: Job }>('/api/playground/generate', { - method: 'POST', - body: JSON.stringify(payload), - }), - upload: (file: File) => { - const form = new FormData(); - form.append('file', file); - return apiUpload('/api/playground/uploads', form); - }, - listUploads: () => api('/api/playground/uploads'), - deleteJob: (jobId: number) => - api<{ ok: boolean; job_id: number; deleted_files: string[]; missing_files: string[] }>( - `/api/playground/jobs/${jobId}`, - { method: 'DELETE' }, - ), - attach: (payload: { - path: string; - project_id: number; - target: PlaygroundAttachTarget; - character_id?: number; - location_id?: number; - item_id?: number; - scene_id?: number; - name?: string; - }) => - api<{ ok: boolean; path: string; target: string; project_id: number; item_id?: number }>( - '/api/playground/attach', - { method: 'POST', body: JSON.stringify(payload) }, - ), + project: () => api("/api/playground/project"), + jobs: () => api("/api/playground/jobs"), + generate: (payload: { + workflow_id: number; + input_values?: Record; + /** Target connection; omitted → workflow binding → active (backend). */ + endpoint_id?: string | null; + /** Origin recorded on the job payload (tasks page labels). */ + source?: "playground" | "studio-image" | "studio-video"; + }) => + api<{ ok: boolean; job: Job }>("/api/playground/generate", { + method: "POST", + body: JSON.stringify(payload), + }), + upload: (file: File) => { + const form = new FormData(); + form.append("file", file); + return apiUpload("/api/playground/uploads", form); + }, + listUploads: () => api("/api/playground/uploads"), + deleteJob: (jobId: number) => + api<{ + ok: boolean; + job_id: number; + deleted_files: string[]; + missing_files: string[]; + }>(`/api/playground/jobs/${jobId}`, { method: "DELETE" }), + attach: (payload: { + path: string; + project_id: number; + target: PlaygroundAttachTarget; + character_id?: number; + location_id?: number; + item_id?: number; + scene_id?: number; + name?: string; + }) => + api<{ + ok: boolean; + path: string; + target: string; + project_id: number; + item_id?: number; + }>("/api/playground/attach", { + method: "POST", + body: JSON.stringify(payload), + }), }; // ── Asset Library (unlinked Playground media) ─────────────────────────── export interface LibraryMediaItem { - path: string; - name: string; - kind: 'image' | 'video'; - size: number; - mtime: string; + path: string; + name: string; + kind: "image" | "video"; + size: number; + mtime: string; } +// ── Five-stage creation workbench (HEL-614) ───────────────────────────── + +export type WorkbenchStageKey = + "script" | "style" | "storyboard" | "assets" | "shot"; +export type WorkbenchStageStatus = + "todo" | "running" | "awaiting_confirm" | "confirmed"; + +export interface StageRun { + id: number; + status: "running" | "done" | "failed"; + error: string | null; + instruction: string | null; + created_at: string; + completed_at: string | null; +} + +export interface WorkbenchJobBrief { + id: number; + status: string; + kind: string; + output: string | null; + error: string | null; +} + +export interface StyleDirection { + id: string; + name: string; + description: string; + prompt: string; + negative_prompt: string; +} + +export interface StoryboardShot { + id: string; + scene: string; + shot_size: string; + camera: string; + description: string; + dialog: string; + duration_sec: number; +} + +export interface WorkbenchAsset { + id: string; + kind: "character" | "location" | "prop"; + name: string; + description: string; + prompt: string; + negative_prompt: string; + job?: WorkbenchJobBrief; +} + +export interface VideoShot { + id: string; + shot_no: string; + description: string; + prompt: string; + duration_sec: number; + job?: WorkbenchJobBrief; +} + +export interface WorkbenchStage { + stage_key: WorkbenchStageKey; + status: WorkbenchStageStatus; + content: Record | null; + confirmed_content: Record | null; + chosen_style_id: string | null; + draft_edited: boolean; + error: string | null; + updated_at: string; + last_run: StageRun | null; +} + +export interface WorkbenchOverview { + project: { + id: number; + title: string; + idea: string | null; + status: string; + updated_at: string; + }; + stages: WorkbenchStage[]; +} + +export const workbenchApi = { + overview: (projectId: number) => + api(`/api/workbench/projects/${projectId}`), + patchStage: ( + projectId: number, + stageKey: WorkbenchStageKey, + payload: { + content: Record; + chosen_style_id?: string | null; + }, + ) => + api<{ ok: boolean; stage: WorkbenchStage }>( + `/api/workbench/projects/${projectId}/stages/${stageKey}`, + { method: "PATCH", body: JSON.stringify(payload) }, + ), + runStage: ( + projectId: number, + stageKey: WorkbenchStageKey, + instruction?: string, + ) => + api<{ ok: boolean; run_id: number }>( + `/api/workbench/projects/${projectId}/stages/${stageKey}/run`, + { + method: "POST", + body: JSON.stringify({ instruction: instruction ?? null }), + }, + ), + confirmStage: ( + projectId: number, + stageKey: WorkbenchStageKey, + chosenStyleId?: string | null, + ) => + api<{ ok: boolean; stage: WorkbenchStage }>( + `/api/workbench/projects/${projectId}/stages/${stageKey}/confirm`, + { + method: "POST", + body: JSON.stringify( + chosenStyleId ? { chosen_style_id: chosenStyleId } : {}, + ), + }, + ), + restoreStage: (projectId: number, stageKey: WorkbenchStageKey) => + api<{ ok: boolean; stage: WorkbenchStage }>( + `/api/workbench/projects/${projectId}/stages/${stageKey}/restore`, + { method: "POST" }, + ), + importScript: (projectId: number, text: string) => + api<{ ok: boolean; stage: WorkbenchStage }>( + `/api/workbench/projects/${projectId}/stages/script/import`, + { method: "POST", body: JSON.stringify({ text }) }, + ), + generate: ( + projectId: number, + payload: { + kind: "image" | "video"; + stage_key: WorkbenchStageKey; + target_id?: string; + prompt: string; + negative_prompt?: string; + duration_sec?: number; + }, + ) => + api<{ ok: boolean; job: Job }>( + `/api/workbench/projects/${projectId}/generate`, + { + method: "POST", + body: JSON.stringify(payload), + }, + ), +}; + export interface LibraryDeleteResult { - path: string; - status: 'deleted' | 'kept'; - reason?: string; + path: string; + status: "deleted" | "kept"; + reason?: string; } export const libraryApi = { - list: () => api('/api/library/media'), - deleteMany: (paths: string[]) => - api<{ - ok: boolean; - deleted: string[]; - results: LibraryDeleteResult[]; - }>('/api/library/media', { method: 'DELETE', body: JSON.stringify({ paths }) }), + list: () => api("/api/library/media"), + deleteMany: (paths: string[]) => + api<{ + ok: boolean; + deleted: string[]; + results: LibraryDeleteResult[]; + }>("/api/library/media", { + method: "DELETE", + body: JSON.stringify({ paths }), + }), }; // ── Agents (agentic harness) ──────────────────────────────────────────── export interface AgentSession { - id: number; - project_id: number | null; - title: string; - status: 'idle' | 'running' | 'error'; - /** WHERE the session was born: 'chat' (AI Canvas) or 'scene' (Build Scene rail). */ - origin: 'chat' | 'scene'; - /** WHICH named agent owns the session (HEL-613); null = plain harness chat. */ - agent_key?: string | null; - created_at: string; - updated_at: string; - running?: boolean; - project?: { id: number; title: string; status: string } | null; + id: number; + project_id: number | null; + title: string; + status: "idle" | "running" | "error"; + /** WHERE the session was born: 'chat' (AI Canvas) or 'scene' (Build Scene rail). */ + origin: "chat" | "scene"; + /** WHICH named agent owns the session (HEL-613); null = plain harness chat. */ + agent_key?: string | null; + created_at: string; + updated_at: string; + running?: boolean; + project?: { id: number; title: string; status: string } | null; } export interface NamedAgent { - key: string; - name: string; - char: string; - avatar: number; - avatar_dark: boolean; - llm_role: string; - tagline: string; - skill_count: number; - model_profile_id?: string | null; + key: string; + name: string; + char: string; + avatar: number; + avatar_dark: boolean; + llm_role: string; + tagline: string; + skill_count: number; + model_profile_id?: string | null; } export interface SkillAdminEntry { - name: string; - description: string; - version: string; - tags: string[]; - dir: string; - type: string; - updated_at: number | null; - is_enabled: boolean; - bindings: Record; - assigned_count: number; + name: string; + description: string; + version: string; + tags: string[]; + dir: string; + type: string; + updated_at: number | null; + is_enabled: boolean; + bindings: Record; + assigned_count: number; } export interface SkillVersion { - id: number; - skill: string; - created_at: string; - length: number; - preview: string; + id: number; + skill: string; + created_at: string; + length: number; + preview: string; } export interface AgentMessage { - id: number; - session_id: number; - role: 'user' | 'assistant' | 'tool' | 'system'; - content: string; - agent_name?: string | null; - tool_name?: string | null; - tool_args?: Record | null; - tool_result?: unknown; - status?: string | null; - reasoning?: string | null; - created_at: string; - mentions?: AgentComposerPayload['mentions']; - attachments?: AgentComposerPayload['attachments']; + id: number; + session_id: number; + role: "user" | "assistant" | "tool" | "system"; + content: string; + agent_name?: string | null; + tool_name?: string | null; + tool_args?: Record | null; + tool_result?: unknown; + status?: string | null; + reasoning?: string | null; + created_at: string; + mentions?: AgentComposerPayload["mentions"]; + attachments?: AgentComposerPayload["attachments"]; } export interface AgentTask { - role: string; - goal: string; - status: 'pending' | 'running' | 'done' | 'failed' | 'skipped'; - index?: number; + role: string; + goal: string; + status: "pending" | "running" | "done" | "failed" | "skipped"; + index?: number; } export interface AgentPlan { - tasks: AgentTask[]; - note?: string | null; + tasks: AgentTask[]; + note?: string | null; } export const agentApi = { - listSessions: (projectId?: number) => - api( - `/api/agent/sessions${projectId != null ? `?project_id=${projectId}` : ''}`, - ), - listSceneSessions: () => api('/api/agent/sessions?origin=scene'), - listAgentSessions: (agentKey: string) => - api(`/api/agent/sessions?agent_key=${encodeURIComponent(agentKey)}`), - listNamedAgents: () => api('/api/agent/agents'), - listLinkableProjects: () => - api<{ id: number; title: string; status: string }[]>('/api/agent/projects'), - createSession: (payload: { - title?: string; - project_id?: number | null; - origin?: 'chat' | 'scene'; - agent_key?: string | null; - }) => - api('/api/agent/sessions', { - method: 'POST', - body: JSON.stringify(payload), - }), - getSession: (id: number) => - api( - `/api/agent/sessions/${id}`, - ), - patchSession: ( - id: number, - payload: { title?: string; project_id?: number | null; unlink?: boolean }, - ) => - api(`/api/agent/sessions/${id}`, { - method: 'PATCH', - body: JSON.stringify(payload), - }), - deleteSession: (id: number) => - api<{ ok: boolean }>(`/api/agent/sessions/${id}`, { method: 'DELETE' }), - postMessage: (id: number, payload: AgentComposerPayload | string) => { - const body = - typeof payload === 'string' - ? { content: payload, mentions: [], attachments: [] } - : payload; - return api<{ ok: boolean; steered?: boolean; message: AgentMessage }>(`/api/agent/sessions/${id}/messages`, { - method: 'POST', - body: JSON.stringify(body), - }); - }, - cancel: (id: number) => - api<{ ok: boolean }>(`/api/agent/sessions/${id}/cancel`, { method: 'POST' }), - listSkills: () => - api<{ name: string; description: string; version: string; tags: string[]; dir: string }[]>( - '/api/agent/skills', - ), - listSkillsAdmin: () => api('/api/agent/skills?all=true'), - upsertSkill: ( - dir: string, - payload: { - description: string; - version?: string; - tags?: string[]; - skill_type?: string; - content: string; - bindings?: Record; - }, - ) => - api<{ ok: boolean; skill: SkillAdminEntry }>( - `/api/agent/skills/${encodeURIComponent(dir)}`, - { method: 'PUT', body: JSON.stringify(payload) }, - ), - patchSkill: (dir: string, isEnabled: boolean) => - api<{ ok: boolean }>(`/api/agent/skills/${encodeURIComponent(dir)}`, { - method: 'PATCH', - body: JSON.stringify({ is_enabled: isEnabled }), - }), - putSkillBindings: (dir: string, bindings: Record) => - api<{ ok: boolean }>(`/api/agent/skills/${encodeURIComponent(dir)}/bindings`, { - method: 'PUT', - body: JSON.stringify({ bindings }), - }), - deleteSkill: (dir: string) => - api<{ ok: boolean }>(`/api/agent/skills/${encodeURIComponent(dir)}`, { - method: 'DELETE', - }), - listSkillVersions: (dir: string) => - api(`/api/agent/skills/${encodeURIComponent(dir)}/versions`), - restoreSkillVersion: (dir: string, versionId: number) => - api<{ ok: boolean; skill: SkillAdminEntry }>( - `/api/agent/skills/${encodeURIComponent(dir)}/versions/${versionId}/restore`, - { method: 'POST' }, - ), - listMemories: () => - api< - { - id: number; - scope: 'global' | 'project'; - project_id: number | null; - project_title: string | null; - content: string; - kind: string; - source: string; - use_count: number; - created_at: string; - }[] - >('/api/agent/memories'), - addMemory: (payload: { - content: string; - scope: 'global' | 'project'; - project_id?: number | null; - kind?: string; - }) => - api<{ ok: boolean; id: number }>('/api/agent/memories', { - method: 'POST', - body: JSON.stringify(payload), - }), - deleteMemory: (id: number) => - api<{ ok: boolean }>(`/api/agent/memories/${id}`, { method: 'DELETE' }), - skillsPath: () => api<{ path: string }>('/api/agent/skills/path'), - skillFiles: (name: string) => api<{ skill: string; files: string[] }>(`/api/agent/skills/${encodeURIComponent(name)}/files`), - readSkillFile: (name: string, path: string) => - api<{ ok: boolean; content: string; truncated: boolean }>( - `/api/agent/skills/${encodeURIComponent(name)}/file?path=${encodeURIComponent(path)}`, - ), + listSessions: (projectId?: number) => + api( + `/api/agent/sessions${projectId != null ? `?project_id=${projectId}` : ""}`, + ), + listSceneSessions: () => + api("/api/agent/sessions?origin=scene"), + listAgentSessions: (agentKey: string) => + api( + `/api/agent/sessions?agent_key=${encodeURIComponent(agentKey)}`, + ), + listNamedAgents: () => api("/api/agent/agents"), + listLinkableProjects: () => + api<{ id: number; title: string; status: string }[]>("/api/agent/projects"), + createSession: (payload: { + title?: string; + project_id?: number | null; + origin?: "chat" | "scene"; + agent_key?: string | null; + }) => + api("/api/agent/sessions", { + method: "POST", + body: JSON.stringify(payload), + }), + getSession: (id: number) => + api( + `/api/agent/sessions/${id}`, + ), + patchSession: ( + id: number, + payload: { title?: string; project_id?: number | null; unlink?: boolean }, + ) => + api(`/api/agent/sessions/${id}`, { + method: "PATCH", + body: JSON.stringify(payload), + }), + deleteSession: (id: number) => + api<{ ok: boolean }>(`/api/agent/sessions/${id}`, { method: "DELETE" }), + postMessage: (id: number, payload: AgentComposerPayload | string) => { + const body = + typeof payload === "string" + ? { content: payload, mentions: [], attachments: [] } + : payload; + return api<{ ok: boolean; steered?: boolean; message: AgentMessage }>( + `/api/agent/sessions/${id}/messages`, + { + method: "POST", + body: JSON.stringify(body), + }, + ); + }, + cancel: (id: number) => + api<{ ok: boolean }>(`/api/agent/sessions/${id}/cancel`, { + method: "POST", + }), + listSkills: () => + api< + { + name: string; + description: string; + version: string; + tags: string[]; + dir: string; + }[] + >("/api/agent/skills"), + listSkillsAdmin: () => api("/api/agent/skills?all=true"), + upsertSkill: ( + dir: string, + payload: { + description: string; + version?: string; + tags?: string[]; + skill_type?: string; + content: string; + bindings?: Record; + }, + ) => + api<{ ok: boolean; skill: SkillAdminEntry }>( + `/api/agent/skills/${encodeURIComponent(dir)}`, + { method: "PUT", body: JSON.stringify(payload) }, + ), + patchSkill: (dir: string, isEnabled: boolean) => + api<{ ok: boolean }>(`/api/agent/skills/${encodeURIComponent(dir)}`, { + method: "PATCH", + body: JSON.stringify({ is_enabled: isEnabled }), + }), + putSkillBindings: (dir: string, bindings: Record) => + api<{ ok: boolean }>( + `/api/agent/skills/${encodeURIComponent(dir)}/bindings`, + { + method: "PUT", + body: JSON.stringify({ bindings }), + }, + ), + deleteSkill: (dir: string) => + api<{ ok: boolean }>(`/api/agent/skills/${encodeURIComponent(dir)}`, { + method: "DELETE", + }), + listSkillVersions: (dir: string) => + api( + `/api/agent/skills/${encodeURIComponent(dir)}/versions`, + ), + restoreSkillVersion: (dir: string, versionId: number) => + api<{ ok: boolean; skill: SkillAdminEntry }>( + `/api/agent/skills/${encodeURIComponent(dir)}/versions/${versionId}/restore`, + { method: "POST" }, + ), + listMemories: () => + api< + { + id: number; + scope: "global" | "project"; + project_id: number | null; + project_title: string | null; + content: string; + kind: string; + source: string; + use_count: number; + created_at: string; + }[] + >("/api/agent/memories"), + addMemory: (payload: { + content: string; + scope: "global" | "project"; + project_id?: number | null; + kind?: string; + }) => + api<{ ok: boolean; id: number }>("/api/agent/memories", { + method: "POST", + body: JSON.stringify(payload), + }), + deleteMemory: (id: number) => + api<{ ok: boolean }>(`/api/agent/memories/${id}`, { method: "DELETE" }), + skillsPath: () => api<{ path: string }>("/api/agent/skills/path"), + skillFiles: (name: string) => + api<{ skill: string; files: string[] }>( + `/api/agent/skills/${encodeURIComponent(name)}/files`, + ), + readSkillFile: (name: string, path: string) => + api<{ ok: boolean; content: string; truncated: boolean }>( + `/api/agent/skills/${encodeURIComponent(name)}/file?path=${encodeURIComponent(path)}`, + ), }; export interface CanvasInfo { - id: number; - title: string; - project_id: number | null; - agent_session_id: number | null; - updated_at: string; + id: number; + title: string; + project_id: number | null; + agent_session_id: number | null; + updated_at: string; } export interface CanvasNode { - id: number; - canvas_id: number; - type: 'entity' | 'image' | 'video' | 'text' | 'workflow'; - title: string | null; - x: number; - y: number; - width: number | null; - height: number | null; - workflow_id: number | null; - artifact_path: string | null; - job_id: number | null; - status: string; - input_values_json: string; - entity_type: string | null; - entity_id: number | null; + id: number; + canvas_id: number; + type: "entity" | "image" | "video" | "text" | "workflow"; + title: string | null; + x: number; + y: number; + width: number | null; + height: number | null; + workflow_id: number | null; + artifact_path: string | null; + job_id: number | null; + status: string; + input_values_json: string; + entity_type: string | null; + entity_id: number | null; } export interface CanvasEdge { - id: number; - canvas_id: number; - src_node_id: number; - dst_node_id: number; - kind: 'data' | 'link'; - label: string | null; - dst_role: string | null; - dst_comfy_node_id: string | null; + id: number; + canvas_id: number; + src_node_id: number; + dst_node_id: number; + kind: "data" | "link"; + label: string | null; + dst_role: string | null; + dst_comfy_node_id: string | null; } export interface CanvasGraph { - canvas: CanvasInfo & { - project?: { id: number; title: string } | null; - viewport_json?: string | null; - }; - nodes: CanvasNode[]; - edges: CanvasEdge[]; + canvas: CanvasInfo & { + project?: { id: number; title: string } | null; + viewport_json?: string | null; + }; + nodes: CanvasNode[]; + edges: CanvasEdge[]; } export const canvasApi = { - list: () => api('/api/canvas'), - ensureForProject: (projectId: number, title?: string) => - api('/api/canvas', { - method: 'POST', - body: JSON.stringify({ project_id: projectId, ...(title ? { title } : {}) }), - }), - ensureForSession: (sessionId: number) => - api('/api/canvas', { - method: 'POST', - body: JSON.stringify({ agent_session_id: sessionId }), - }), - get: (id: number) => api(`/api/canvas/${id}`), - patchCanvas: (id: number, payload: { title?: string; viewport_json?: string }) => - api( - `/api/canvas/${id}`, - { - method: 'PATCH', - body: JSON.stringify(payload), - }, - ), - patchNode: ( - canvasId: number, - nodeId: number, - payload: { - x?: number; - y?: number; - title?: string; - input_values_json?: string; - status?: string; - job_id?: number; - artifact_path?: string; - }, - ) => - api(`/api/canvas/${canvasId}/nodes/${nodeId}`, { - method: 'PATCH', - body: JSON.stringify(payload), - }), - createNode: ( - canvasId: number, - payload: { - type: 'workflow' | 'image' | 'video'; - title?: string; - x?: number; - y?: number; - workflow_id?: number; - artifact_path?: string; - job_id?: number; - status?: string; - input_values_json?: string; - }, - ) => - api(`/api/canvas/${canvasId}/nodes`, { - method: 'POST', - body: JSON.stringify(payload), - }), - deleteNode: (canvasId: number, nodeId: number) => - api<{ ok: boolean; file_deleted?: boolean; reason?: string | null }>( - `/api/canvas/${canvasId}/nodes/${nodeId}`, - { method: 'DELETE' }, - ), - tidy: (canvasId: number) => - api<{ ok: boolean; moved: number }>(`/api/canvas/${canvasId}/tidy`, { method: 'POST' }), - createEdge: ( - canvasId: number, - payload: { - src_node_id: number; - dst_node_id: number; - kind: 'data' | 'link'; - label?: string; - dst_role?: string; - dst_comfy_node_id?: string; - }, - ) => - api(`/api/canvas/${canvasId}/edges`, { - method: 'POST', - body: JSON.stringify(payload), - }), - patchEdge: (canvasId: number, edgeId: number, payload: { label: string }) => - api(`/api/canvas/${canvasId}/edges/${edgeId}`, { - method: 'PATCH', - body: JSON.stringify(payload), - }), - deleteEdge: (canvasId: number, edgeId: number) => - api<{ ok: boolean }>(`/api/canvas/${canvasId}/edges/${edgeId}`, { method: 'DELETE' }), + list: () => api("/api/canvas"), + ensureForProject: (projectId: number, title?: string) => + api("/api/canvas", { + method: "POST", + body: JSON.stringify({ + project_id: projectId, + ...(title ? { title } : {}), + }), + }), + ensureForSession: (sessionId: number) => + api("/api/canvas", { + method: "POST", + body: JSON.stringify({ agent_session_id: sessionId }), + }), + get: (id: number) => api(`/api/canvas/${id}`), + patchCanvas: ( + id: number, + payload: { title?: string; viewport_json?: string }, + ) => + api< + CanvasInfo & { + project?: { id: number; title: string } | null; + viewport_json?: string | null; + } + >(`/api/canvas/${id}`, { + method: "PATCH", + body: JSON.stringify(payload), + }), + patchNode: ( + canvasId: number, + nodeId: number, + payload: { + x?: number; + y?: number; + title?: string; + input_values_json?: string; + status?: string; + job_id?: number; + artifact_path?: string; + }, + ) => + api(`/api/canvas/${canvasId}/nodes/${nodeId}`, { + method: "PATCH", + body: JSON.stringify(payload), + }), + createNode: ( + canvasId: number, + payload: { + type: "workflow" | "image" | "video"; + title?: string; + x?: number; + y?: number; + workflow_id?: number; + artifact_path?: string; + job_id?: number; + status?: string; + input_values_json?: string; + }, + ) => + api(`/api/canvas/${canvasId}/nodes`, { + method: "POST", + body: JSON.stringify(payload), + }), + deleteNode: (canvasId: number, nodeId: number) => + api<{ ok: boolean; file_deleted?: boolean; reason?: string | null }>( + `/api/canvas/${canvasId}/nodes/${nodeId}`, + { method: "DELETE" }, + ), + tidy: (canvasId: number) => + api<{ ok: boolean; moved: number }>(`/api/canvas/${canvasId}/tidy`, { + method: "POST", + }), + createEdge: ( + canvasId: number, + payload: { + src_node_id: number; + dst_node_id: number; + kind: "data" | "link"; + label?: string; + dst_role?: string; + dst_comfy_node_id?: string; + }, + ) => + api(`/api/canvas/${canvasId}/edges`, { + method: "POST", + body: JSON.stringify(payload), + }), + patchEdge: (canvasId: number, edgeId: number, payload: { label: string }) => + api(`/api/canvas/${canvasId}/edges/${edgeId}`, { + method: "PATCH", + body: JSON.stringify(payload), + }), + deleteEdge: (canvasId: number, edgeId: number) => + api<{ ok: boolean }>(`/api/canvas/${canvasId}/edges/${edgeId}`, { + method: "DELETE", + }), }; diff --git a/calliope-web/src/lib/components/home/AProjectCard.svelte b/calliope-web/src/lib/components/home/AProjectCard.svelte index 2bb893ed..be1456c0 100644 --- a/calliope-web/src/lib/components/home/AProjectCard.svelte +++ b/calliope-web/src/lib/components/home/AProjectCard.svelte @@ -28,9 +28,21 @@ character_count: 0, asset_ready_count: 0, asset_total_count: 0, + stage_confirmed: 0, + stage_status: {} as Record, + active_jobs: 0, }, ); + // Five-stage creation progress (HEL-614) — real stage rows only. + const STAGE_SEGMENTS = ['script', 'style', 'storyboard', 'assets', 'shot'] as const; + function segClass(key: string): string { + const state = stats.stage_status?.[key]; + if (state === 'confirmed') return 'seg-confirmed'; + if (state === 'running' || state === 'awaiting_confirm') return 'seg-draft'; + return ''; + } + // Spec §2.1 allows the five avatar gradients as cover placeholders. const PLACEHOLDER_GRADIENTS = [ 'linear-gradient(135deg, #e8a33d, #b96a1b)', @@ -143,7 +155,7 @@ type="button" class="card-main" aria-label={t('projectCard.open', { title: project.title })} - onclick={() => goto(`/project/${project.id}`)} + onclick={() => goto(`/workbench/${project.id}`)} > {#if coverUrl && !coverFailed} @@ -167,6 +179,15 @@ {project.idea || t('home.noIdea')} + + {#each STAGE_SEGMENTS as key (key)} + + {/each} + {stats.stage_confirmed}/5 + {#if stats.active_jobs > 0} + {t('home.activeJobs', { n: stats.active_jobs })} + {/if} + {t('home.statScenes', { n: stats.scene_count })} @@ -369,6 +390,42 @@ overflow: hidden; min-height: 2.2em; } + + /* Five-stage progress segments (real stage rows, HEL-614). */ + .stage-bar { + display: flex; + align-items: center; + gap: 4px; + } + .seg { + width: 20px; + height: 5px; + border-radius: 2px; + background: var(--surface-3); + } + .seg-draft { + background: var(--accent); + } + .seg-confirmed { + background: var(--success); + } + .seg-count { + margin-left: 5px; + font-size: 11px; + color: var(--text-3); + font-variant-numeric: tabular-nums; + } + .jobs-pill { + margin-left: auto; + padding: 1px 8px; + border-radius: 999px; + background: var(--accent-dim); + color: var(--accent); + font-size: 10px; + font-weight: 600; + font-variant-numeric: tabular-nums; + white-space: nowrap; + } .meta { display: flex; align-items: center; diff --git a/calliope-web/src/lib/components/shell/AppShell.svelte b/calliope-web/src/lib/components/shell/AppShell.svelte index 534e628c..3f6df87e 100644 --- a/calliope-web/src/lib/components/shell/AppShell.svelte +++ b/calliope-web/src/lib/components/shell/AppShell.svelte @@ -38,7 +38,7 @@ // 生成任务 / 智能体 / ComfyUI 连接 / 模型设置 / 设置. const NAV: NavItem[] = [ { id: 'projects', labelKey: 'shell.navProjects', icon: 'home', href: '/' }, - { id: 'workbench', labelKey: 'shell.navWorkbench', icon: 'story', href: '/canvas' }, + { id: 'workbench', labelKey: 'shell.navWorkbench', icon: 'story', href: '/workbench' }, { id: 'image', labelKey: 'shell.navImage', icon: 'image', href: '/image' }, { id: 'video', labelKey: 'shell.navVideo', icon: 'film', href: '/video' }, { id: 'tasks', labelKey: 'shell.navTasks', icon: 'queue', href: '/tasks' }, diff --git a/calliope-web/src/lib/components/workbench/AssetsStagePanel.svelte b/calliope-web/src/lib/components/workbench/AssetsStagePanel.svelte new file mode 100644 index 00000000..f7f1bb88 --- /dev/null +++ b/calliope-web/src/lib/components/workbench/AssetsStagePanel.svelte @@ -0,0 +1,451 @@ + + +{#if editing} +
+
+ {#each draft as asset (asset.id)} +
+
+ + + +
+ + + +
+ {/each} +
+
+ +
+ + +
+
+
+{:else if assets.length === 0} +
+

{t('workbench.asset.todoTitle')}

+

{t('workbench.asset.todoBody')}

+ +
+{:else} +
+ {#each assets as asset (asset.id)} +
+
+ {t(KIND_LABEL[asset.kind] ?? 'workbench.asset.kindProp')} + {asset.name} + {#if asset.job} + + {#if asset.job.status === 'failed'} + + {/if} + {/if} +
+ {#if asset.description}

{asset.description}

{/if} + {#if asset.job?.status === 'done' && asset.job.output} + + {asset.name} + + {/if} + + {#if asset.negative_prompt} + + {/if} +
+ +
+
+ {/each} +
+
+ {t('workbench.asset.summary', { n: assets.length })} +
+ {#if stage.status !== 'running'} + + + {/if} +
+
+{/if} + + diff --git a/calliope-web/src/lib/components/workbench/JobChip.svelte b/calliope-web/src/lib/components/workbench/JobChip.svelte new file mode 100644 index 00000000..ecdee9c8 --- /dev/null +++ b/calliope-web/src/lib/components/workbench/JobChip.svelte @@ -0,0 +1,103 @@ + + + + {#if state === 'running'} + + {#if pct != null}{t('workbench.jobRunningPct', { n: Math.round(pct) })}{:else}{t('workbench.jobRunning')}{/if} + {:else if state === 'pending'} + {t('workbench.jobQueued')} + {:else if state === 'done'} + {t('workbench.jobDone')} + {:else} + {t('workbench.jobFailed')} + {/if} + +{#if state === 'failed' && job.error} + {job.error} +{/if} + + diff --git a/calliope-web/src/lib/components/workbench/PromptBlock.svelte b/calliope-web/src/lib/components/workbench/PromptBlock.svelte new file mode 100644 index 00000000..13c89ee0 --- /dev/null +++ b/calliope-web/src/lib/components/workbench/PromptBlock.svelte @@ -0,0 +1,102 @@ + + +
+
+ {label} + +
+
{text}
+
+ + diff --git a/calliope-web/src/lib/components/workbench/ScriptStagePanel.svelte b/calliope-web/src/lib/components/workbench/ScriptStagePanel.svelte new file mode 100644 index 00000000..59d4417d --- /dev/null +++ b/calliope-web/src/lib/components/workbench/ScriptStagePanel.svelte @@ -0,0 +1,307 @@ + + +{#if stage.status === 'todo' && !text} +
+

{t('workbench.script.todoTitle')}

+ {#if projectIdea} +

{t('workbench.script.todoIdea')}

+
{projectIdea}
+ {/if} +
+ + + +
+ {#if importOpen} +
+ +
+ {t('workbench.script.importHint')} + +
+
+ {/if} +
+{:else if editing} +
+ +
+ {t('workbench.script.editorHint')} +
+ + +
+
+
+{:else} +
{text}
+
+ {t('workbench.charCount', { n: charCount })} +
+ {#if stage.status !== 'running'} + + + {/if} +
+
+ +{/if} + + diff --git a/calliope-web/src/lib/components/workbench/ShotStagePanel.svelte b/calliope-web/src/lib/components/workbench/ShotStagePanel.svelte new file mode 100644 index 00000000..1fc13409 --- /dev/null +++ b/calliope-web/src/lib/components/workbench/ShotStagePanel.svelte @@ -0,0 +1,425 @@ + + +{#if editing} +
+
+ {#each draft as shot (shot.id)} +
+
+ + + +
+ + +
+ {/each} +
+
+ +
+ + +
+
+
+{:else if shots.length === 0} +
+

{t('workbench.vshot.todoTitle')}

+

{t('workbench.vshot.todoBody')}

+ +
+{:else} +
+ {#each shots as shot (shot.id)} +
+
+ {shot.shot_no} + {shot.duration_sec}s + {#if shot.job} + + {#if shot.job.status === 'failed'} + + {/if} + {/if} +
+ {#if shot.description}

{shot.description}

{/if} + {#if shot.job?.status === 'done' && shot.job.output} + + {/if} + +
+ +
+
+ {/each} +
+
+ {t('workbench.vshot.summary', { n: shots.length })} +
+ {#if stage.status !== 'running'} + + + {/if} +
+
+{/if} + + diff --git a/calliope-web/src/lib/components/workbench/StageStepper.svelte b/calliope-web/src/lib/components/workbench/StageStepper.svelte new file mode 100644 index 00000000..11242940 --- /dev/null +++ b/calliope-web/src/lib/components/workbench/StageStepper.svelte @@ -0,0 +1,231 @@ + + +
    + {#each ORDER as key, i} + {@const stage = stages.find((s) => s.stage_key === key)} + {@const state = stage ? stateOf(stage) : 'todo'} + {@const open = stage ? unlocked(stages, key) : i === 0} +
  1. + {#if i > 0}{/if} + +
  2. + {/each} +
+ + diff --git a/calliope-web/src/lib/components/workbench/StoryboardStagePanel.svelte b/calliope-web/src/lib/components/workbench/StoryboardStagePanel.svelte new file mode 100644 index 00000000..6298bcb4 --- /dev/null +++ b/calliope-web/src/lib/components/workbench/StoryboardStagePanel.svelte @@ -0,0 +1,395 @@ + + +{#if editing} +
+
+ {#each draft as shot, i (shot.id)} +
+
+ {String(i + 1).padStart(2, '0')} + +
+
+ + + + +
+ + +
+ {/each} +
+
+ +
+ + +
+
+
+{:else if shots.length === 0} +
+

{t('workbench.board.todoTitle')}

+

{t('workbench.board.todoBody')}

+ +
+{:else} +
+
+ # + {t('workbench.board.scene')} + {t('workbench.board.size')} + {t('workbench.board.camera')} + {t('workbench.board.desc')} + {t('workbench.board.dialog')} + {t('workbench.board.duration')} +
+ {#each shots as shot, i (shot.id)} +
+ {String(i + 1).padStart(2, '0')} + {shot.scene} + {shot.shot_size} + {shot.camera} + {shot.description} + {shot.dialog || '—'} + {shot.duration_sec}s +
+ {/each} +
+
+ {t('workbench.board.summary', { n: shots.length, sec: totalDuration })} +
+ {#if stage.status !== 'running'} + + + {/if} +
+
+{/if} + + diff --git a/calliope-web/src/lib/components/workbench/StyleStagePanel.svelte b/calliope-web/src/lib/components/workbench/StyleStagePanel.svelte new file mode 100644 index 00000000..68beb7b3 --- /dev/null +++ b/calliope-web/src/lib/components/workbench/StyleStagePanel.svelte @@ -0,0 +1,384 @@ + + +{#if editing} +
+ {#each draft as dir, i (dir.id)} +
+
+ {i + 1} + + +
+ + + +
+ {/each} +
+ +
+ + +
+
+
+{:else if directions.length === 0} +
+

{t('workbench.style.todoTitle')}

+

{t('workbench.style.todoBody')}

+ +
+{:else} +
+ {#each directions as dir (dir.id)} + + {/each} +
+
+ {t('workbench.style.chooseHint')} +
+ {#if stage.status !== 'running'} + + + {/if} +
+
+{/if} + + diff --git a/calliope-web/src/lib/i18n/de.ts b/calliope-web/src/lib/i18n/de.ts index 5d931cdd..ef9d094e 100644 --- a/calliope-web/src/lib/i18n/de.ts +++ b/calliope-web/src/lib/i18n/de.ts @@ -1570,4 +1570,140 @@ export const de: Dict = { 'agentsPage.sugShot2P': 'Zeige, wie man einen Erst-/Letztbild-Prompt schreibt: Beschreibung, Bewegung und Dauer.', + + 'workbench.title': 'Kreativ-Werkbank', + 'workbench.subtitle': 'Drehbuch → Stil → Storyboard → Assets → Shotliste, fünf Agenten im Staffellauf', + 'workbench.pickerSubtitle': 'Projekt wählen und den Fünf-Phasen-Fluss fortsetzen', + 'workbench.pickerEmpty': 'Noch keine Projekte', + 'workbench.pickerEmptyBody': 'Zur Übersicht zurückgehen und mit einer Idee oder einem importierten Drehbuch starten.', + 'workbench.pickerGoHome': 'Zur Übersicht', + 'workbench.pickerFootHint': 'Die Werkbank ist auch über die Übersicht (Idee / Drehbuch importieren) erreichbar.', + 'workbench.stageProgress': 'Fünf-Phasen-Fortschritt', + 'workbench.activeJobs': '{n} laufende Aufgaben', + 'workbench.stage.script': 'Drehbuch', + 'workbench.stage.style': 'Bildstil', + 'workbench.stage.storyboard': 'Storyboard', + 'workbench.stage.assets': 'Assets', + 'workbench.stage.shot': 'Shotliste', + 'workbench.lockedStep': 'Wird freigeschaltet, wenn „{stage}“ bestätigt ist', + 'workbench.state.todo': 'Nicht begonnen', + 'workbench.state.running': 'Generiert', + 'workbench.state.draft': 'Zu bestätigen', + 'workbench.state.confirmed': 'Bestätigt', + 'workbench.state.edited': 'Bearbeitet', + 'workbench.copied': 'Kopiert — direkt in die Bild-/Video-Generierung einfügen', + 'workbench.copyFailed': 'Kopieren fehlgeschlagen, bitte manuell kopieren', + 'workbench.copy': 'Kopieren', + 'workbench.charCount': '{n} Zeichen', + 'workbench.runStage': 'Mit {agent} generieren', + 'workbench.runDone': '{agent} hat den Entwurf fertig — bitte prüfen', + 'workbench.runFailed': 'Generierung fehlgeschlagen, erneut versuchen', + 'workbench.runningHint': '{agent} schreibt diese Phase…', + 'workbench.confirmNext': 'Bestätigen & weiter', + 'workbench.confirmLast': 'Phase bestätigen', + 'workbench.confirmed': 'Phase „{agent}“ bestätigt', + 'workbench.confirmFailed': 'Bestätigen fehlgeschlagen, erneut versuchen', + 'workbench.restore': 'Bestätigte Version wiederherstellen', + 'workbench.restored': 'Zuletzt bestätigte Version wiederhergestellt', + 'workbench.restoreFailed': 'Wiederherstellen fehlgeschlagen, erneut versuchen', + 'workbench.draftNotice': 'Unbestätigter Entwurf: Der nächste Agent sieht ihn erst nach der Bestätigung.', + 'workbench.draftSaved': 'Entwurf gespeichert — Bestätigung ausstehend', + 'workbench.saveFailed': 'Speichern fehlgeschlagen, erneut versuchen', + 'workbench.saveDraft': 'Entwurf speichern', + 'workbench.cancelEdit': 'Abbrechen', + 'workbench.editDraft': 'Bearbeiten', + 'workbench.regenerate': 'Neu generieren', + 'workbench.regenerateHint': 'Phase neu generieren (die bestätigte Version bleibt wiederherstellbar)', + 'workbench.instructionPh': 'Zusätzliche Vorgaben (optional): filmischer, natürlichere Dialoge…', + 'workbench.jobSubmitted': 'Generierungsauftrag eingereicht — Ergebnisse kehren zum Projekt zurück', + 'workbench.jobSubmitFailed': 'Auftrag konnte nicht eingereicht werden', + 'workbench.jobRequeued': 'Auftrag erneut eingereiht', + 'workbench.retryJob': 'Erneut versuchen', + 'workbench.cancelJob': 'Auftrag abbrechen', + 'workbench.openOutput': 'Ergebnis ansehen', + 'workbench.jobRunningPct': '{n} %', + 'workbench.jobRunning': 'Läuft', + 'workbench.jobQueued': 'Warteschlange', + 'workbench.jobDone': 'Fertig', + 'workbench.jobFailed': 'Fehlgeschlagen', + 'workbench.generating': 'Generiert…', + 'workbench.progressChip': 'Phase {n}/5', + 'workbench.backHome': 'Übersicht', + 'workbench.loadFailed': 'Werkbank konnte nicht geladen werden.', + 'workbench.retryLoad': 'Erneut versuchen', + 'workbench.agentSkills': '{n} Skills', + 'workbench.chatWithAgent': 'Direkt chatten', + 'workbench.tasksTitle': 'Phasen-Aufträge', + 'workbench.tasksAll': 'Alle Aufträge', + 'workbench.tasksEmpty': 'Noch keine Aufträge. Sende Prompts aus der Asset- oder Shotliste-Phase.', + 'workbench.flowTitle': 'Fünf-Phasen-Fortschritt', + 'workbench.script.todoTitle': 'Mit dem Drehbuch beginnen: Idee an den Drehbuch-Agenten übergeben', + 'workbench.script.todoIdea': 'Deine Idee:', + 'workbench.script.generate': 'Drehbuch-Entwurf erstellen', + 'workbench.script.importBtn': 'Bestehendes Drehbuch importieren', + 'workbench.script.writeManually': 'Selbst schreiben', + 'workbench.script.importPlaceholder': 'Bestehendes Drehbuch hier einfügen… Beim Import wird die Entwurfsphase übersprungen und mit dem Bildstil fortgefahren.', + 'workbench.script.importHint': 'Das importierte Drehbuch wird zur bestätigten Baseline dieser Phase.', + 'workbench.script.importConfirm': 'Importieren & überspringen', + 'workbench.script.importDone': 'Drehbuch importiert — mit Bildstil fortfahren', + 'workbench.script.importFailed': 'Import fehlgeschlagen, Text prüfen und erneut versuchen', + 'workbench.script.editorHint': 'Text direkt bearbeiten; nach dem Speichern ist die Bestätigung nötig.', + 'workbench.script.copyLabel': 'Vollständiges Drehbuch', + 'workbench.style.todoTitle': 'Bildstil für das Drehbuch festlegen', + 'workbench.style.todoBody': 'Der Stil-Agent schlägt mehrere Richtungen vor — jeweils mit kopierfertigen Bild-Prompts.', + 'workbench.style.generate': 'Stilrichtungen vorschlagen', + 'workbench.style.namePh': 'Name, z. B. Neon-Cyber', + 'workbench.style.descPh': 'Beschreibung (Palette / Licht / Material)', + 'workbench.style.promptPh': 'Englische Bild-Schlüsselwörter, kommagetrennt', + 'workbench.style.negativePh': 'Negativ-Prompt (optional, Englisch)', + 'workbench.style.negativeLabel': 'Negativ-Prompt', + 'workbench.style.remove': 'Richtung entfernen', + 'workbench.style.add': 'Richtung hinzufügen', + 'workbench.style.chosen': 'Ausgewählt', + 'workbench.style.chooseHint': 'Beim Bestätigen wird der gewählte Stil an die Folgephasen übergeben.', + 'workbench.style.promptLabel': 'Stil-Prompt', + 'workbench.board.scene': 'Szene', + 'workbench.board.size': 'Einstellung', + 'workbench.board.camera': 'Kamera', + 'workbench.board.duration': 'Sek', + 'workbench.board.desc': 'Beschreibung', + 'workbench.board.dialog': 'Dialog/SFX', + 'workbench.board.descPh': 'Was dieser Shot zeigt', + 'workbench.board.dialogPh': 'Dialog oder Toneinsatz (optional)', + 'workbench.board.remove': 'Shot entfernen', + 'workbench.board.add': 'Shot hinzufügen', + 'workbench.board.todoTitle': 'Drehbuch Shot für Shot zerlegen', + 'workbench.board.todoBody': 'Der Storyboard-Agent liefert Nummern, Einstellungen, Kamerafahrten und Dauern.', + 'workbench.board.generate': 'Storyboard erstellen', + 'workbench.board.summary': '{n} Shots · ~{sec} s', + 'workbench.asset.kindCharacter': 'Figur', + 'workbench.asset.kindLocation': 'Location', + 'workbench.asset.kindProp': 'Requisite', + 'workbench.asset.namePh': 'Asset-Name', + 'workbench.asset.descPh': 'Beschreibung (Aussehen, Verwendung)', + 'workbench.asset.promptPh': 'Vollständiger englischer Bild-Prompt', + 'workbench.asset.promptLabel': 'Bild-Prompt', + 'workbench.asset.remove': 'Asset entfernen', + 'workbench.asset.add': 'Asset hinzufügen', + 'workbench.asset.todoTitle': 'Asset-Liste mit Bild-Prompts aufbauen', + 'workbench.asset.todoBody': 'Der Asset-Agent kombiniert Drehbuch, Stil und Storyboard zu kopierfertigen Prompts.', + 'workbench.asset.generate': 'Liste erstellen', + 'workbench.asset.generateImage': 'Bild generieren', + 'workbench.asset.generateHint': 'Generiert über den verbundenen ComfyUI-Workflow; Ergebnisse kehren zum Projekt zurück', + 'workbench.asset.summary': '{n} Assets', + 'workbench.vshot.noPh': 'Shot-Nr., z. B. S1', + 'workbench.vshot.descPh': 'Beschreibung des Shots', + 'workbench.vshot.promptPh': 'Vollständiger Video-Prompt (Englisch)', + 'workbench.vshot.promptLabel': 'Video-Prompt', + 'workbench.vshot.remove': 'Shot entfernen', + 'workbench.vshot.add': 'Shot hinzufügen', + 'workbench.vshot.todoTitle': 'Shot-weise Videoskripte erstellen', + 'workbench.vshot.todoBody': 'Der Shotlisten-Agent wandelt das Storyboard in videomodell-taugliche Prompts.', + 'workbench.vshot.generate': 'Shotliste erstellen', + 'workbench.vshot.generateVideo': 'Shot-Video generieren', + 'workbench.vshot.generateHint': 'Generiert über den verbundenen ComfyUI-Video-Workflow; Ergebnisse kehren zum Projekt zurück', + 'workbench.vshot.summary': '{n} Shots', + 'home.errScriptShort': 'Drehbuch zu kurz — prüfe den eingefügten Text (mind. 30 Zeichen)', + 'home.stageProgress': 'Fünf-Phasen-Fortschritt', + 'tasks.sourceWorkbench': 'Kreativ-Fluss', }; diff --git a/calliope-web/src/lib/i18n/en.ts b/calliope-web/src/lib/i18n/en.ts index 7f603ec9..0d1fb31e 100644 --- a/calliope-web/src/lib/i18n/en.ts +++ b/calliope-web/src/lib/i18n/en.ts @@ -1569,6 +1569,142 @@ export const en = { 'agentsPage.sugShot2P': 'Show how to write a first/last-frame video prompt: how to describe first frame, last frame, camera move, and duration.', + + 'workbench.title': 'Creation Workbench', + 'workbench.subtitle': 'Script → style → storyboard → assets → shot list, five agents in relay', + 'workbench.pickerSubtitle': 'Pick a project to continue its five-stage flow', + 'workbench.pickerEmpty': 'No projects yet', + 'workbench.pickerEmptyBody': 'Go back to the overview and start from an idea or import a script.', + 'workbench.pickerGoHome': 'Open overview', + 'workbench.pickerFootHint': 'You can also enter the workbench from the overview\'s 从创意开始 / 导入剧本 entries.', + 'workbench.stageProgress': 'Five-stage progress', + 'workbench.activeJobs': '{n} jobs running', + 'workbench.stage.script': 'Script', + 'workbench.stage.style': 'Visual Style', + 'workbench.stage.storyboard': 'Storyboard', + 'workbench.stage.assets': 'Assets', + 'workbench.stage.shot': 'Shot List', + 'workbench.lockedStep': 'Unlocks after 「{stage}」 is confirmed', + 'workbench.state.todo': 'Not started', + 'workbench.state.running': 'Generating', + 'workbench.state.draft': 'Awaiting confirm', + 'workbench.state.confirmed': 'Confirmed', + 'workbench.state.edited': 'Edited', + 'workbench.copied': 'Copied — paste it into image/video generation', + 'workbench.copyFailed': 'Copy failed, please copy manually', + 'workbench.copy': 'Copy', + 'workbench.charCount': '{n} chars', + 'workbench.runStage': 'Generate with {agent}', + 'workbench.runDone': '{agent} finished the draft — please review and confirm', + 'workbench.runFailed': 'Generation failed, please retry', + 'workbench.runningHint': '{agent} is writing this stage…', + 'workbench.confirmNext': 'Confirm & continue', + 'workbench.confirmLast': 'Confirm stage', + 'workbench.confirmed': '「{agent}」 stage confirmed', + 'workbench.confirmFailed': 'Confirm failed, please retry', + 'workbench.restore': 'Restore confirmed', + 'workbench.restored': 'Restored to the last confirmed version', + 'workbench.restoreFailed': 'Restore failed, please retry', + 'workbench.draftNotice': 'This is an unconfirmed draft — the next agent only sees it after you confirm.', + 'workbench.draftSaved': 'Draft saved — still needs confirmation', + 'workbench.saveFailed': 'Save failed, please retry', + 'workbench.saveDraft': 'Save draft', + 'workbench.cancelEdit': 'Cancel', + 'workbench.editDraft': 'Edit', + 'workbench.regenerate': 'Regenerate', + 'workbench.regenerateHint': 'Ask the agent to redo this stage (the confirmed version is kept and restorable)', + 'workbench.instructionPh': 'Extra instructions (optional), e.g. more cinematic, casual dialogue…', + 'workbench.jobSubmitted': 'Generation queued — results return to this project', + 'workbench.jobSubmitFailed': 'Failed to submit the job', + 'workbench.jobRequeued': 'Job re-queued', + 'workbench.retryJob': 'Retry', + 'workbench.cancelJob': 'Cancel job', + 'workbench.openOutput': 'Open result', + 'workbench.jobRunningPct': '{n}%', + 'workbench.jobRunning': 'Running', + 'workbench.jobQueued': 'Queued', + 'workbench.jobDone': 'Done', + 'workbench.jobFailed': 'Failed', + 'workbench.generating': 'Generating…', + 'workbench.progressChip': 'Stage {n}/5', + 'workbench.backHome': 'Overview', + 'workbench.loadFailed': 'Failed to load the workbench.', + 'workbench.retryLoad': 'Retry', + 'workbench.agentSkills': '{n} skills', + 'workbench.chatWithAgent': 'Chat solo', + 'workbench.tasksTitle': 'Stage jobs', + 'workbench.tasksAll': 'All jobs', + 'workbench.tasksEmpty': 'No generation jobs yet. Send prompts from the assets or shot-list stage.', + 'workbench.flowTitle': 'Five-stage progress', + 'workbench.script.todoTitle': 'Start from the script: hand your idea to the Script agent', + 'workbench.script.todoIdea': 'Your idea:', + 'workbench.script.generate': 'Draft the script', + 'workbench.script.importBtn': 'Import existing script', + 'workbench.script.writeManually': 'Write manually', + 'workbench.script.importPlaceholder': 'Paste an existing script here… Importing skips script drafting and continues from visual style.', + 'workbench.script.importHint': 'The imported script becomes the confirmed baseline of this stage.', + 'workbench.script.importConfirm': 'Import & skip drafting', + 'workbench.script.importDone': 'Script imported — continue from visual style', + 'workbench.script.importFailed': 'Import failed, please check the text and retry', + 'workbench.script.editorHint': 'Edit the script text directly; confirmation is still required after saving.', + 'workbench.script.copyLabel': 'Full script', + 'workbench.style.todoTitle': 'Define the visual style for the script', + 'workbench.style.todoBody': 'The Visual Style agent proposes several distinct directions, each with copy-ready image prompts.', + 'workbench.style.generate': 'Propose style directions', + 'workbench.style.namePh': 'Direction name, e.g. Neon Cyber', + 'workbench.style.descPh': 'Description (palette / lighting / texture)', + 'workbench.style.promptPh': 'English image keywords, comma separated', + 'workbench.style.negativePh': 'Negative prompt (optional, English)', + 'workbench.style.negativeLabel': 'Negative prompt', + 'workbench.style.remove': 'Remove direction', + 'workbench.style.add': 'Add direction', + 'workbench.style.chosen': 'Selected', + 'workbench.style.chooseHint': 'When confirming this stage, your selected style is handed to later stages.', + 'workbench.style.promptLabel': 'Style prompt', + 'workbench.board.scene': 'Scene', + 'workbench.board.size': 'Shot size', + 'workbench.board.camera': 'Camera', + 'workbench.board.duration': 'Sec', + 'workbench.board.desc': 'Description', + 'workbench.board.dialog': 'Dialog/SFX', + 'workbench.board.descPh': 'What this shot shows', + 'workbench.board.dialogPh': 'Dialog or SFX cue (optional)', + 'workbench.board.remove': 'Remove shot', + 'workbench.board.add': 'Add shot', + 'workbench.board.todoTitle': 'Break the script into a shot-by-shot storyboard', + 'workbench.board.todoBody': 'The Storyboard agent produces shot numbers, sizes, camera moves, framing and durations.', + 'workbench.board.generate': 'Draft the storyboard', + 'workbench.board.summary': '{n} shots · ~{sec}s', + 'workbench.asset.kindCharacter': 'Character', + 'workbench.asset.kindLocation': 'Location', + 'workbench.asset.kindProp': 'Prop', + 'workbench.asset.namePh': 'Asset name', + 'workbench.asset.descPh': 'Description (appearance, usage)', + 'workbench.asset.promptPh': 'Full English image prompt', + 'workbench.asset.promptLabel': 'Image prompt', + 'workbench.asset.remove': 'Remove asset', + 'workbench.asset.add': 'Add asset', + 'workbench.asset.todoTitle': 'Build the asset list with image prompts', + 'workbench.asset.todoBody': 'The Assets agent combines script, style and storyboard into copy-ready prompts for characters/locations/props.', + 'workbench.asset.generate': 'Draft the asset list', + 'workbench.asset.generateImage': 'Generate image', + 'workbench.asset.generateHint': 'Generate with the connected ComfyUI workflow; results return to this project', + 'workbench.asset.summary': '{n} assets', + 'workbench.vshot.noPh': 'Shot no., e.g. S1', + 'workbench.vshot.descPh': 'Description of the shot', + 'workbench.vshot.promptPh': 'Full video-model prompt (English)', + 'workbench.vshot.promptLabel': 'Video prompt', + 'workbench.vshot.remove': 'Remove shot', + 'workbench.vshot.add': 'Add shot', + 'workbench.vshot.todoTitle': 'Produce the shot-by-shot video script', + 'workbench.vshot.todoBody': 'The Shot List agent turns the storyboard into prompts ready for video models.', + 'workbench.vshot.generate': 'Draft the shot list', + 'workbench.vshot.generateVideo': 'Generate shot video', + 'workbench.vshot.generateHint': 'Generate with the connected ComfyUI video workflow; results return to this project', + 'workbench.vshot.summary': '{n} shots', + 'home.errScriptShort': 'The script looks too short — check the paste is complete (min 30 characters)', + 'home.stageProgress': 'Five-stage progress', + 'tasks.sourceWorkbench': 'Creation flow', }; export type Dict = typeof en; diff --git a/calliope-web/src/lib/i18n/es.ts b/calliope-web/src/lib/i18n/es.ts index ae80faf4..4a02feb3 100644 --- a/calliope-web/src/lib/i18n/es.ts +++ b/calliope-web/src/lib/i18n/es.ts @@ -1570,4 +1570,140 @@ export const es: Dict = { 'agentsPage.sugShot2P': 'Muestra cómo escribir un prompt con primer y último fotograma: descripción, movimiento y duración.', + + 'workbench.title': 'Taller de creación', + 'workbench.subtitle': 'Guion → estilo → storyboard → assets → lista de planos, cinco agentes en relevo', + 'workbench.pickerSubtitle': 'Elige un proyecto para continuar su flujo de cinco etapas', + 'workbench.pickerEmpty': 'Aún no hay proyectos', + 'workbench.pickerEmptyBody': 'Vuelve al resumen general y empieza desde una idea o importa un guion.', + 'workbench.pickerGoHome': 'Ir al resumen', + 'workbench.pickerFootHint': 'También puedes entrar al taller desde el resumen (idea / importar guion).', + 'workbench.stageProgress': 'Progreso de cinco etapas', + 'workbench.activeJobs': '{n} tareas en curso', + 'workbench.stage.script': 'Guion', + 'workbench.stage.style': 'Estilo visual', + 'workbench.stage.storyboard': 'Storyboard', + 'workbench.stage.assets': 'Assets', + 'workbench.stage.shot': 'Lista de planos', + 'workbench.lockedStep': 'Se desbloquea al confirmar «{stage}»', + 'workbench.state.todo': 'Sin empezar', + 'workbench.state.running': 'Generando', + 'workbench.state.draft': 'Por confirmar', + 'workbench.state.confirmed': 'Confirmado', + 'workbench.state.edited': 'Editado', + 'workbench.copied': 'Copiado — pégalo en la generación de imagen/vídeo', + 'workbench.copyFailed': 'Error al copiar, cópialo manualmente', + 'workbench.copy': 'Copiar', + 'workbench.charCount': '{n} caracteres', + 'workbench.runStage': 'Generar con {agent}', + 'workbench.runDone': '{agent} terminó el borrador — revísalo y confirma', + 'workbench.runFailed': 'Falló la generación, reintenta', + 'workbench.runningHint': '{agent} está escribiendo esta etapa…', + 'workbench.confirmNext': 'Confirmar y continuar', + 'workbench.confirmLast': 'Confirmar etapa', + 'workbench.confirmed': 'Etapa «{agent}» confirmada', + 'workbench.confirmFailed': 'Error al confirmar, reintenta', + 'workbench.restore': 'Restaurar versión confirmada', + 'workbench.restored': 'Se restauró la última versión confirmada', + 'workbench.restoreFailed': 'Error al restaurar, reintenta', + 'workbench.draftNotice': 'Borrador sin confirmar: el siguiente agente solo lo verá tras confirmar.', + 'workbench.draftSaved': 'Borrador guardado — falta confirmarlo', + 'workbench.saveFailed': 'Error al guardar, reintenta', + 'workbench.saveDraft': 'Guardar borrador', + 'workbench.cancelEdit': 'Cancelar', + 'workbench.editDraft': 'Editar', + 'workbench.regenerate': 'Regenerar', + 'workbench.regenerateHint': 'Vuelve a generar esta etapa (la versión confirmada se conserva)', + 'workbench.instructionPh': 'Indicaciones extra (opcional): más cinematográfico, diálogos naturales…', + 'workbench.jobSubmitted': 'Tarea en cola — los resultados vuelven al proyecto', + 'workbench.jobSubmitFailed': 'Error al enviar la tarea', + 'workbench.jobRequeued': 'Tarea reencolada', + 'workbench.retryJob': 'Reintentar', + 'workbench.cancelJob': 'Cancelar tarea', + 'workbench.openOutput': 'Ver resultado', + 'workbench.jobRunningPct': '{n}%', + 'workbench.jobRunning': 'En curso', + 'workbench.jobQueued': 'En cola', + 'workbench.jobDone': 'Listo', + 'workbench.jobFailed': 'Fallido', + 'workbench.generating': 'Generando…', + 'workbench.progressChip': 'Etapa {n}/5', + 'workbench.backHome': 'Resumen', + 'workbench.loadFailed': 'Error al cargar el taller.', + 'workbench.retryLoad': 'Reintentar', + 'workbench.agentSkills': '{n} skills', + 'workbench.chatWithAgent': 'Chat individual', + 'workbench.tasksTitle': 'Tareas de etapa', + 'workbench.tasksAll': 'Todas las tareas', + 'workbench.tasksEmpty': 'Aún no hay tareas. Envía prompts desde la etapa de assets o planos.', + 'workbench.flowTitle': 'Progreso de cinco etapas', + 'workbench.script.todoTitle': 'Empieza por el guion: entrega tu idea al agente de Guion', + 'workbench.script.todoIdea': 'Tu idea:', + 'workbench.script.generate': 'Redactar el borrador', + 'workbench.script.importBtn': 'Importar guion existente', + 'workbench.script.writeManually': 'Escribir a mano', + 'workbench.script.importPlaceholder': 'Pega aquí un guion existente… Al importar se salta la redacción y sigue en estilo visual.', + 'workbench.script.importHint': 'El guion importado pasa a ser la base confirmada de esta etapa.', + 'workbench.script.importConfirm': 'Importar y saltar', + 'workbench.script.importDone': 'Guion importado — sigue desde estilo visual', + 'workbench.script.importFailed': 'Error al importar, revisa el texto y reintenta', + 'workbench.script.editorHint': 'Edita el texto directamente; aún necesitarás confirmar.', + 'workbench.script.copyLabel': 'Guion completo', + 'workbench.style.todoTitle': 'Define el estilo visual del guion', + 'workbench.style.todoBody': 'El agente de Estilo propone varias direcciones con prompts de imagen listos para copiar.', + 'workbench.style.generate': 'Proponer direcciones', + 'workbench.style.namePh': 'Nombre, p. ej. Neón Cyber', + 'workbench.style.descPh': 'Descripción (paleta / luz / materia)', + 'workbench.style.promptPh': 'Palabras clave en inglés, separadas por comas', + 'workbench.style.negativePh': 'Prompt negativo (opcional, inglés)', + 'workbench.style.negativeLabel': 'Prompt negativo', + 'workbench.style.remove': 'Eliminar dirección', + 'workbench.style.add': 'Añadir dirección', + 'workbench.style.chosen': 'Elegido', + 'workbench.style.chooseHint': 'Al confirmar, el estilo elegido pasa a las siguientes etapas.', + 'workbench.style.promptLabel': 'Prompt de estilo', + 'workbench.board.scene': 'Escena', + 'workbench.board.size': 'Plano', + 'workbench.board.camera': 'Cámara', + 'workbench.board.duration': 'Seg', + 'workbench.board.desc': 'Descripción', + 'workbench.board.dialog': 'Diálogo/SFX', + 'workbench.board.descPh': 'Qué muestra este plano', + 'workbench.board.dialogPh': 'Diálogo o efecto (opcional)', + 'workbench.board.remove': 'Eliminar plano', + 'workbench.board.add': 'Añadir plano', + 'workbench.board.todoTitle': 'Divide el guion plano a plano', + 'workbench.board.todoBody': 'El agente de Storyboard produce números, escalas, movimientos y duraciones.', + 'workbench.board.generate': 'Redactar el storyboard', + 'workbench.board.summary': '{n} planos · ~{sec} s', + 'workbench.asset.kindCharacter': 'Personaje', + 'workbench.asset.kindLocation': 'Localización', + 'workbench.asset.kindProp': 'Atrezo', + 'workbench.asset.namePh': 'Nombre del asset', + 'workbench.asset.descPh': 'Descripción (apariencia, uso)', + 'workbench.asset.promptPh': 'Prompt de imagen completo en inglés', + 'workbench.asset.promptLabel': 'Prompt de imagen', + 'workbench.asset.remove': 'Eliminar asset', + 'workbench.asset.add': 'Añadir asset', + 'workbench.asset.todoTitle': 'Construye la lista de assets con prompts', + 'workbench.asset.todoBody': 'El agente de Assets combina guion, estilo y storyboard en prompts listos para copiar.', + 'workbench.asset.generate': 'Redactar la lista', + 'workbench.asset.generateImage': 'Generar imagen', + 'workbench.asset.generateHint': 'Genera con el workflow ComfyUI conectado; los resultados vuelven al proyecto', + 'workbench.asset.summary': '{n} assets', + 'workbench.vshot.noPh': 'N.º de plano, p. ej. S1', + 'workbench.vshot.descPh': 'Descripción del plano', + 'workbench.vshot.promptPh': 'Prompt completo de vídeo (inglés)', + 'workbench.vshot.promptLabel': 'Prompt de vídeo', + 'workbench.vshot.remove': 'Eliminar plano', + 'workbench.vshot.add': 'Añadir plano', + 'workbench.vshot.todoTitle': 'Produce el guion de vídeo plano a plano', + 'workbench.vshot.todoBody': 'El agente de Planos convierte el storyboard en prompts para modelos de vídeo.', + 'workbench.vshot.generate': 'Redactar los planos', + 'workbench.vshot.generateVideo': 'Generar vídeo del plano', + 'workbench.vshot.generateHint': 'Genera con el workflow de vídeo ComfyUI; los resultados vuelven al proyecto', + 'workbench.vshot.summary': '{n} planos', + 'home.errScriptShort': 'El guion es demasiado corto — revisa el pegado (mín. 30 caracteres)', + 'home.stageProgress': 'Progreso de cinco etapas', + 'tasks.sourceWorkbench': 'Flujo de creación', }; diff --git a/calliope-web/src/lib/i18n/fr.ts b/calliope-web/src/lib/i18n/fr.ts index 5eb968f6..c2a4b87a 100644 --- a/calliope-web/src/lib/i18n/fr.ts +++ b/calliope-web/src/lib/i18n/fr.ts @@ -1570,4 +1570,140 @@ export const fr: Dict = { 'agentsPage.sugShot2P': 'Montrez comment écrire un prompt premier/dernier cadre : description, mouvement et durée.', + + 'workbench.title': 'Atelier de création', + 'workbench.subtitle': 'Scénario → style → storyboard → assets → plan de tournage, cinq agents en relais', + 'workbench.pickerSubtitle': 'Choisissez un projet pour reprendre son flux en cinq étapes', + 'workbench.pickerEmpty': 'Aucun projet pour l\'instant', + 'workbench.pickerEmptyBody': 'Retournez à la vue d\'ensemble : partez d\'une idée ou importez un scénario.', + 'workbench.pickerGoHome': 'Vue d\'ensemble', + 'workbench.pickerFootHint': 'Vous pouvez aussi entrer dans l\'atelier depuis la vue d\'ensemble (idée / import de scénario).', + 'workbench.stageProgress': 'Progression en cinq étapes', + 'workbench.activeJobs': '{n} tâches en cours', + 'workbench.stage.script': 'Scénario', + 'workbench.stage.style': 'Style visuel', + 'workbench.stage.storyboard': 'Storyboard', + 'workbench.stage.assets': 'Assets', + 'workbench.stage.shot': 'Plan de tournage', + 'workbench.lockedStep': 'Se déverrouille après confirmation de « {stage} »', + 'workbench.state.todo': 'Non commencé', + 'workbench.state.running': 'Génération', + 'workbench.state.draft': 'À confirmer', + 'workbench.state.confirmed': 'Confirmé', + 'workbench.state.edited': 'Modifié', + 'workbench.copied': 'Copié — à coller dans la génération image/vidéo', + 'workbench.copyFailed': 'Échec de la copie, copiez manuellement', + 'workbench.copy': 'Copier', + 'workbench.charCount': '{n} caractères', + 'workbench.runStage': 'Générer avec {agent}', + 'workbench.runDone': '{agent} a terminé le brouillon — à valider', + 'workbench.runFailed': 'Échec de génération, réessayez', + 'workbench.runningHint': '{agent} rédige cette étape…', + 'workbench.confirmNext': 'Confirmer et continuer', + 'workbench.confirmLast': 'Confirmer l\'étape', + 'workbench.confirmed': 'Étape « {agent} » confirmée', + 'workbench.confirmFailed': 'Échec de confirmation, réessayez', + 'workbench.restore': 'Restaurer la version confirmée', + 'workbench.restored': 'Version confirmée restaurée', + 'workbench.restoreFailed': 'Échec de restauration, réessayez', + 'workbench.draftNotice': 'Brouillon non confirmé : l\'agent suivant ne le verra qu\'après confirmation.', + 'workbench.draftSaved': 'Brouillon enregistré — confirmation requise', + 'workbench.saveFailed': 'Échec de l\'enregistrement, réessayez', + 'workbench.saveDraft': 'Enregistrer le brouillon', + 'workbench.cancelEdit': 'Annuler', + 'workbench.editDraft': 'Modifier', + 'workbench.regenerate': 'Régénérer', + 'workbench.regenerateHint': 'Regénérer cette étape (la version confirmée est conservée et restaurable)', + 'workbench.instructionPh': 'Consignes supplémentaires (facultatif) : plus cinématographique, dialogues plus naturels…', + 'workbench.jobSubmitted': 'Tâche de génération envoyée — les résultats reviennent au projet', + 'workbench.jobSubmitFailed': 'Échec de l\'envoi de la tâche', + 'workbench.jobRequeued': 'Tâche remise en file', + 'workbench.retryJob': 'Réessayer', + 'workbench.cancelJob': 'Annuler la tâche', + 'workbench.openOutput': 'Voir le résultat', + 'workbench.jobRunningPct': '{n} %', + 'workbench.jobRunning': 'En cours', + 'workbench.jobQueued': 'En file', + 'workbench.jobDone': 'Terminé', + 'workbench.jobFailed': 'Échec', + 'workbench.generating': 'Génération…', + 'workbench.progressChip': 'Étape {n}/5', + 'workbench.backHome': 'Vue d\'ensemble', + 'workbench.loadFailed': 'Échec du chargement de l\'atelier.', + 'workbench.retryLoad': 'Réessayer', + 'workbench.agentSkills': '{n} skills', + 'workbench.chatWithAgent': 'Discuter en solo', + 'workbench.tasksTitle': 'Tâches de l\'étape', + 'workbench.tasksAll': 'Toutes les tâches', + 'workbench.tasksEmpty': 'Aucune tâche. Envoyez des prompts depuis l\'étape assets ou plans.', + 'workbench.flowTitle': 'Progression en cinq étapes', + 'workbench.script.todoTitle': 'Commencez par le scénario : confiez votre idée à l\'agent Scénario', + 'workbench.script.todoIdea': 'Votre idée :', + 'workbench.script.generate': 'Rédiger le brouillon', + 'workbench.script.importBtn': 'Importer un scénario', + 'workbench.script.writeManually': 'Écrire manuellement', + 'workbench.script.importPlaceholder': 'Collez ici un scénario existant… L\'import saute la rédaction et reprend au style visuel.', + 'workbench.script.importHint': 'Le scénario importé devient la base confirmée de cette étape.', + 'workbench.script.importConfirm': 'Importer et passer', + 'workbench.script.importDone': 'Scénario importé — continuez au style visuel', + 'workbench.script.importFailed': 'Échec de l\'import, vérifiez le texte et réessayez', + 'workbench.script.editorHint': 'Modifiez le texte directement ; la confirmation reste nécessaire.', + 'workbench.script.copyLabel': 'Scénario complet', + 'workbench.style.todoTitle': 'Définir le style visuel du scénario', + 'workbench.style.todoBody': 'L\'agent Style propose plusieurs directions, chacune avec des prompts image prêts à copier.', + 'workbench.style.generate': 'Proposer des directions', + 'workbench.style.namePh': 'Nom de la direction, ex. Néon Cyber', + 'workbench.style.descPh': 'Description (palette / lumière / matière)', + 'workbench.style.promptPh': 'Mots-clés image en anglais, séparés par des virgules', + 'workbench.style.negativePh': 'Prompt négatif (facultatif, anglais)', + 'workbench.style.negativeLabel': 'Prompt négatif', + 'workbench.style.remove': 'Supprimer la direction', + 'workbench.style.add': 'Ajouter une direction', + 'workbench.style.chosen': 'Sélectionné', + 'workbench.style.chooseHint': 'En confirmant, le style choisi est transmis aux étapes suivantes.', + 'workbench.style.promptLabel': 'Prompt de style', + 'workbench.board.scene': 'Scène', + 'workbench.board.size': 'Échelle', + 'workbench.board.camera': 'Caméra', + 'workbench.board.duration': 'Sec', + 'workbench.board.desc': 'Description', + 'workbench.board.dialog': 'Dialogue/SFX', + 'workbench.board.descPh': 'Ce que montre ce plan', + 'workbench.board.dialogPh': 'Dialogue ou effet sonore (facultatif)', + 'workbench.board.remove': 'Supprimer le plan', + 'workbench.board.add': 'Ajouter un plan', + 'workbench.board.todoTitle': 'Découper le scénario plan par plan', + 'workbench.board.todoBody': 'L\'agent Storyboard produit numéros, échelles, mouvements et durées.', + 'workbench.board.generate': 'Rédiger le storyboard', + 'workbench.board.summary': '{n} plans · ~{sec} s', + 'workbench.asset.kindCharacter': 'Personnage', + 'workbench.asset.kindLocation': 'Lieu', + 'workbench.asset.kindProp': 'Accessoire', + 'workbench.asset.namePh': 'Nom de l\'asset', + 'workbench.asset.descPh': 'Description (apparence, usage)', + 'workbench.asset.promptPh': 'Prompt image complet en anglais', + 'workbench.asset.promptLabel': 'Prompt image', + 'workbench.asset.remove': 'Supprimer l\'asset', + 'workbench.asset.add': 'Ajouter un asset', + 'workbench.asset.todoTitle': 'Construire la liste d\'assets avec prompts', + 'workbench.asset.todoBody': 'L\'agent Assets combine scénario, style et storyboard en prompts prêts à copier.', + 'workbench.asset.generate': 'Rédiger la liste', + 'workbench.asset.generateImage': 'Générer l\'image', + 'workbench.asset.generateHint': 'Génère via le workflow ComfyUI connecté ; les résultats reviennent au projet', + 'workbench.asset.summary': '{n} assets', + 'workbench.vshot.noPh': 'N° de plan, ex. S1', + 'workbench.vshot.descPh': 'Description du plan', + 'workbench.vshot.promptPh': 'Prompt vidéo complet (anglais)', + 'workbench.vshot.promptLabel': 'Prompt vidéo', + 'workbench.vshot.remove': 'Supprimer le plan', + 'workbench.vshot.add': 'Ajouter un plan', + 'workbench.vshot.todoTitle': 'Produire le script vidéo plan par plan', + 'workbench.vshot.todoBody': 'L\'agent Plans transforme le storyboard en prompts prêts pour les modèles vidéo.', + 'workbench.vshot.generate': 'Rédiger les plans', + 'workbench.vshot.generateVideo': 'Générer la vidéo du plan', + 'workbench.vshot.generateHint': 'Génère via le workflow vidéo ComfyUI connecté ; résultats dans le projet', + 'workbench.vshot.summary': '{n} plans', + 'home.errScriptShort': 'Scénario trop court — vérifiez le collage (30 caractères min.)', + 'home.stageProgress': 'Progression en cinq étapes', + 'tasks.sourceWorkbench': 'Flux de création', }; diff --git a/calliope-web/src/lib/i18n/ja.ts b/calliope-web/src/lib/i18n/ja.ts index 0bfccee7..ec4e1163 100644 --- a/calliope-web/src/lib/i18n/ja.ts +++ b/calliope-web/src/lib/i18n/ja.ts @@ -1570,4 +1570,140 @@ export const ja: Dict = { 'agentsPage.sugShot2P': '最初/最終フレームの動画プロンプトの書き方を実演して:描写・カメラワーク・秒数。', + + 'workbench.title': '制作ワークベンチ', + 'workbench.subtitle': '脚本 → ビジュアル → 絵コンテ → 素材 → ショットリスト、5つのエージェントがリレーで制作', + 'workbench.pickerSubtitle': 'プロジェクトを選んで五段階フローを続行', + 'workbench.pickerEmpty': 'プロジェクトがまだありません', + 'workbench.pickerEmptyBody': 'まずトップページへ戻り、アイデアから始めるか脚本を取り込んでください。', + 'workbench.pickerGoHome': 'トップへ戻る', + 'workbench.pickerFootHint': 'トップの「アイデアから始める / 脚本を取り込む」からも入れます。', + 'workbench.stageProgress': '五段階の進捗', + 'workbench.activeJobs': '{n} 件のタスク実行中', + 'workbench.stage.script': '脚本制作', + 'workbench.stage.style': 'ビジュアル設計', + 'workbench.stage.storyboard': '絵コンテ', + 'workbench.stage.assets': '素材アセット', + 'workbench.stage.shot': 'ショットリスト', + 'workbench.lockedStep': '「{stage}」を確認すると解放されます', + 'workbench.state.todo': '未着手', + 'workbench.state.running': '生成中', + 'workbench.state.draft': '確認待ち', + 'workbench.state.confirmed': '確認済み', + 'workbench.state.edited': '編集済み', + 'workbench.copied': 'コピーしました。生成画面にそのまま貼り付けられます', + 'workbench.copyFailed': 'コピーに失敗しました。手動で選択してコピーしてください', + 'workbench.copy': 'コピー', + 'workbench.charCount': '{n} 文字', + 'workbench.runStage': '{agent}に生成させる', + 'workbench.runDone': '{agent}がドラフトを完成させました。確認してください', + 'workbench.runFailed': '生成に失敗しました。再試行してください', + 'workbench.runningHint': '{agent}がこの段階を書いています…', + 'workbench.confirmNext': '確認して次へ', + 'workbench.confirmLast': 'この段階を確認', + 'workbench.confirmed': '「{agent}」段階を確認しました', + 'workbench.confirmFailed': '確認に失敗しました。再試行してください', + 'workbench.restore': '確認済み版に戻す', + 'workbench.restored': '直近の確認済み版に戻しました', + 'workbench.restoreFailed': '復元に失敗しました。再試行してください', + 'workbench.draftNotice': 'これは未確認のドラフトです。確認後にのみ次のエージェントへ渡ります。', + 'workbench.draftSaved': 'ドラフトを保存しました。確認が必要です', + 'workbench.saveFailed': '保存に失敗しました。再試行してください', + 'workbench.saveDraft': 'ドラフトを保存', + 'workbench.cancelEdit': 'キャンセル', + 'workbench.editDraft': '編集', + 'workbench.regenerate': '再生成', + 'workbench.regenerateHint': 'この段階を再度生成します(確認済み版は保持され、いつでも戻せます)', + 'workbench.instructionPh': '追加の要望(任意)。例:映画的に、台詞をより口語的に…', + 'workbench.jobSubmitted': '生成タスクを投入しました。結果はこのプロジェクトに戻ります', + 'workbench.jobSubmitFailed': 'タスクの投入に失敗しました', + 'workbench.jobRequeued': 'タスクを再び並べました', + 'workbench.retryJob': '再試行', + 'workbench.cancelJob': 'タスクをキャンセル', + 'workbench.openOutput': '結果を見る', + 'workbench.jobRunningPct': '{n}%', + 'workbench.jobRunning': '実行中', + 'workbench.jobQueued': '待機中', + 'workbench.jobDone': '完了', + 'workbench.jobFailed': '失敗', + 'workbench.generating': '生成中…', + 'workbench.progressChip': '段階 {n}/5', + 'workbench.backHome': 'トップ', + 'workbench.loadFailed': 'ワークベンチの読み込みに失敗しました。', + 'workbench.retryLoad': '再試行', + 'workbench.agentSkills': 'Skill {n} 件', + 'workbench.chatWithAgent': '個別にチャット', + 'workbench.tasksTitle': '段階タスク', + 'workbench.tasksAll': 'すべてのタスク', + 'workbench.tasksEmpty': '生成タスクはまだありません。素材・ショット段階からプロンプトを送れます。', + 'workbench.flowTitle': '五段階の進捗', + 'workbench.script.todoTitle': '脚本から始める:アイデアを脚本エージェントへ', + 'workbench.script.todoIdea': 'あなたのアイデア:', + 'workbench.script.generate': '脚本のドラフトを生成', + 'workbench.script.importBtn': '既存の脚本を取り込む', + 'workbench.script.writeManually': '手動で書く', + 'workbench.script.importPlaceholder': '既存の脚本をここに貼り付け…取り込むと脚本制作をスキップし、ビジュアル設計から始まります。', + 'workbench.script.importHint': '取り込んだ脚本はこの段階の確認済みベースラインになります。', + 'workbench.script.importConfirm': '取り込んで脚本制作をスキップ', + 'workbench.script.importDone': '脚本を取り込みました。ビジュアル設計から続行', + 'workbench.script.importFailed': '取り込みに失敗しました。内容を確認して再試行してください', + 'workbench.script.editorHint': '脚本本文を直接編集できます。保存後も確認が必要です。', + 'workbench.script.copyLabel': '脚本全文', + 'workbench.style.todoTitle': '脚本にビジュアルスタイルを定める', + 'workbench.style.todoBody': 'ビジュアル設計エージェントが、コピーして使える画像プロンプト付きの複数のスタイル方向を提案します。', + 'workbench.style.generate': 'スタイル方向を生成', + 'workbench.style.namePh': 'スタイル名(例:ネオンサイバー)', + 'workbench.style.descPh': 'スタイル説明(色調 / 光 / 質感)', + 'workbench.style.promptPh': '英語の画像キーワード(カンマ区切り)', + 'workbench.style.negativePh': 'ネガティブプロンプト(任意・英語)', + 'workbench.style.negativeLabel': 'ネガティブプロンプト', + 'workbench.style.remove': 'この方向を削除', + 'workbench.style.add': 'スタイル方向を追加', + 'workbench.style.chosen': '選択中', + 'workbench.style.chooseHint': 'この段階を確認すると、選んだスタイルが以降の段階に渡ります。', + 'workbench.style.promptLabel': 'スタイルプロンプト', + 'workbench.board.scene': '場面', + 'workbench.board.size': 'サイズ', + 'workbench.board.camera': 'カメラ', + 'workbench.board.duration': '秒', + 'workbench.board.desc': '内容', + 'workbench.board.dialog': '台詞・効果音', + 'workbench.board.descPh': 'このショットの内容', + 'workbench.board.dialogPh': '台詞や効果音(任意)', + 'workbench.board.remove': 'このショットを削除', + 'workbench.board.add': 'ショットを追加', + 'workbench.board.todoTitle': '脚本をショットごとの絵コンテに分解', + 'workbench.board.todoBody': '絵コンテエージェントがショット番号・サイズ・カメラワーク・内容・秒数を作成します。', + 'workbench.board.generate': '絵コンテを生成', + 'workbench.board.summary': '全 {n} ショット · 約 {sec} 秒', + 'workbench.asset.kindCharacter': 'キャラクター', + 'workbench.asset.kindLocation': 'ロケーション', + 'workbench.asset.kindProp': '小道具', + 'workbench.asset.namePh': 'アセット名', + 'workbench.asset.descPh': '説明(外見・用途)', + 'workbench.asset.promptPh': '完全な英語の画像プロンプト', + 'workbench.asset.promptLabel': '画像プロンプト', + 'workbench.asset.remove': 'このアセットを削除', + 'workbench.asset.add': 'アセットを追加', + 'workbench.asset.todoTitle': '素材リストと画像プロンプトを作成', + 'workbench.asset.todoBody': '素材エージェントが脚本・スタイル・絵コンテから、复制可能な完全なプロンプトを作成します。', + 'workbench.asset.generate': '素材リストを生成', + 'workbench.asset.generateImage': 'この画像を生成', + 'workbench.asset.generateHint': '接続済み ComfyUI ワークフローで生成し、結果はこのプロジェクトに戻ります', + 'workbench.asset.summary': '素材 {n} 点', + 'workbench.vshot.noPh': 'ショット番号(例 S1)', + 'workbench.vshot.descPh': 'ショットの説明', + 'workbench.vshot.promptPh': '完全な動画モデル用プロンプト(英語)', + 'workbench.vshot.promptLabel': '動画プロンプト', + 'workbench.vshot.remove': 'このショットを削除', + 'workbench.vshot.add': 'ショットを追加', + 'workbench.vshot.todoTitle': 'ショットごとの動画スクリプトを作成', + 'workbench.vshot.todoBody': 'ショットリストエージェントが絵コンテを動画モデル用プロンプトに変換します。', + 'workbench.vshot.generate': 'ショットリストを生成', + 'workbench.vshot.generateVideo': 'このショットの動画を生成', + 'workbench.vshot.generateHint': '接続済み ComfyUI 動画ワークフローで生成し、結果はこのプロジェクトに戻ります', + 'workbench.vshot.summary': '全 {n} ショット', + 'home.errScriptShort': '脚本が短すぎます。貼り付けが完全か確認してください(30 文字以上)', + 'home.stageProgress': '五段階の進捗', + 'tasks.sourceWorkbench': '制作フロー', }; diff --git a/calliope-web/src/lib/i18n/ko.ts b/calliope-web/src/lib/i18n/ko.ts index 42d1589f..4cb82a1a 100644 --- a/calliope-web/src/lib/i18n/ko.ts +++ b/calliope-web/src/lib/i18n/ko.ts @@ -1570,4 +1570,140 @@ export const ko: Dict = { 'agentsPage.sugShot2P': '첫/끝 프레임 영상 프롬프트 작성법을 보여 줘: 묘사, 카메라 무브, 길이.', + + 'workbench.title': '제작 워크벤치', + 'workbench.subtitle': '대본 → 비주얼 → 스토리보드 → 소재 → 숏리스트, 다섯 에이전트의 릴레이', + 'workbench.pickerSubtitle': '프로젝트를 골라 5단계 흐름을 이어가세요', + 'workbench.pickerEmpty': '아직 프로젝트가 없습니다', + 'workbench.pickerEmptyBody': '먼저 개요로 돌아가 아이디어로 시작하거나 대본을 가져오세요.', + 'workbench.pickerGoHome': '개요로 가기', + 'workbench.pickerFootHint': '개요의 \'아이디어로 시작 / 대본 가져오기\'에서도 들어갈 수 있습니다.', + 'workbench.stageProgress': '5단계 진행', + 'workbench.activeJobs': '작업 {n}개 실행 중', + 'workbench.stage.script': '대본 작성', + 'workbench.stage.style': '비주얼 디자인', + 'workbench.stage.storyboard': '스토리보드', + 'workbench.stage.assets': '소재 에셋', + 'workbench.stage.shot': '숏 리스트', + 'workbench.lockedStep': '\'{stage}\'을(를) 확인하면 잠금 해제됩니다', + 'workbench.state.todo': '시작 전', + 'workbench.state.running': '생성 중', + 'workbench.state.draft': '확인 대기', + 'workbench.state.confirmed': '확인됨', + 'workbench.state.edited': '수정됨', + 'workbench.copied': '복사됐습니다. 이미지/영상 생성에 바로 붙여넣으세요', + 'workbench.copyFailed': '복사 실패, 직접 선택해 복사해 주세요', + 'workbench.copy': '복사', + 'workbench.charCount': '{n}자', + 'workbench.runStage': '{agent} 에이전트가 생성', + 'workbench.runDone': '{agent} 에이전트가 초안을 완성했습니다. 확인해 주세요', + 'workbench.runFailed': '생성 실패, 다시 시도해 주세요', + 'workbench.runningHint': '{agent} 에이전트가 이 단계를 작성 중입니다…', + 'workbench.confirmNext': '확인하고 다음 단계로', + 'workbench.confirmLast': '이 단계 확인', + 'workbench.confirmed': '\'{agent}\' 단계가 확인되었습니다', + 'workbench.confirmFailed': '확인 실패, 다시 시도해 주세요', + 'workbench.restore': '확인본 복원', + 'workbench.restored': '마지막 확인 버전으로 복원했습니다', + 'workbench.restoreFailed': '복원 실패, 다시 시도해 주세요', + 'workbench.draftNotice': '확인되지 않은 초안입니다. 확인 후 다음 에이전트에 전달됩니다.', + 'workbench.draftSaved': '초안 저장됨 — 여전히 확인이 필요합니다', + 'workbench.saveFailed': '저장 실패, 다시 시도해 주세요', + 'workbench.saveDraft': '초안 저장', + 'workbench.cancelEdit': '취소', + 'workbench.editDraft': '편집', + 'workbench.regenerate': '다시 생성', + 'workbench.regenerateHint': '이 단계를 다시 생성합니다(확인본은 유지되어 언제든 복원 가능)', + 'workbench.instructionPh': '추가 요청(선택). 예: 영화감 있게, 대사를 구어체로…', + 'workbench.jobSubmitted': '생성 작업이 등록되었습니다. 결과는 이 프로젝트로 돌아옵니다', + 'workbench.jobSubmitFailed': '작업 등록 실패', + 'workbench.jobRequeued': '작업이 다시 대기열에 등록되었습니다', + 'workbench.retryJob': '재시도', + 'workbench.cancelJob': '작업 취소', + 'workbench.openOutput': '결과 보기', + 'workbench.jobRunningPct': '{n}%', + 'workbench.jobRunning': '실행 중', + 'workbench.jobQueued': '대기 중', + 'workbench.jobDone': '완료', + 'workbench.jobFailed': '실패', + 'workbench.generating': '생성 중…', + 'workbench.progressChip': '단계 {n}/5', + 'workbench.backHome': '개요', + 'workbench.loadFailed': '워크벤치를 불러오지 못했습니다.', + 'workbench.retryLoad': '재시도', + 'workbench.agentSkills': '스킬 {n}개', + 'workbench.chatWithAgent': '따로 대화하기', + 'workbench.tasksTitle': '단계 작업', + 'workbench.tasksAll': '전체 작업', + 'workbench.tasksEmpty': '아직 생성 작업이 없습니다. 소재·숏 단계에서 프롬프트를 보내세요.', + 'workbench.flowTitle': '5단계 진행', + 'workbench.script.todoTitle': '대본부터 시작: 아이디어를 대본 에이전트에게', + 'workbench.script.todoIdea': '당신의 아이디어:', + 'workbench.script.generate': '대본 초안 생성', + 'workbench.script.importBtn': '기존 대본 가져오기', + 'workbench.script.writeManually': '직접 작성', + 'workbench.script.importPlaceholder': '기존 대본을 여기에 붙여넣으세요… 가져오면 대본 작성을 건너뛰고 비주얼 디자인부터 시작합니다.', + 'workbench.script.importHint': '가져온 대본은 이 단계의 확인된 기준선이 됩니다.', + 'workbench.script.importConfirm': '가져오고 대본 작성 건너뛰기', + 'workbench.script.importDone': '대본을 가져왔습니다. 비주얼 디자인부터 계속', + 'workbench.script.importFailed': '가져오기 실패, 내용을 확인하고 다시 시도하세요', + 'workbench.script.editorHint': '대본 본문을 직접 수정할 수 있습니다. 저장 후에도 확인이 필요합니다.', + 'workbench.script.copyLabel': '대본 전문', + 'workbench.style.todoTitle': '대본에 어울리는 비주얼 스타일 정하기', + 'workbench.style.todoBody': '비주얼 디자인 에이전트가 복사해 바로 쓸 수 있는 이미지 프롬프트와 함께 여러 스타일 방향을 제안합니다.', + 'workbench.style.generate': '스타일 방향 생성', + 'workbench.style.namePh': '스타일 이름(예: 네온 사이버)', + 'workbench.style.descPh': '스타일 설명(톤 / 조명 / 질감)', + 'workbench.style.promptPh': '영어 이미지 키워드, 쉼표 구분', + 'workbench.style.negativePh': '네거티브 프롬프트(선택, 영어)', + 'workbench.style.negativeLabel': '네거티브 프롬프트', + 'workbench.style.remove': '이 방향 삭제', + 'workbench.style.add': '스타일 방향 추가', + 'workbench.style.chosen': '선택됨', + 'workbench.style.chooseHint': '이 단계를 확인하면 선택한 스타일이 이후 단계에 전달됩니다.', + 'workbench.style.promptLabel': '스타일 프롬프트', + 'workbench.board.scene': '장면', + 'workbench.board.size': '샷 크기', + 'workbench.board.camera': '카메라', + 'workbench.board.duration': '초', + 'workbench.board.desc': '내용', + 'workbench.board.dialog': '대사/효과음', + 'workbench.board.descPh': '이 샷의 내용', + 'workbench.board.dialogPh': '대사나 효과음(선택)', + 'workbench.board.remove': '이 샷 삭제', + 'workbench.board.add': '샷 추가', + 'workbench.board.todoTitle': '대본을 샷 단위 스토리보드로 분해', + 'workbench.board.todoBody': '스토리보드 에이전트가 샷 번호·크기·카메라·내용·길이를 만듭니다.', + 'workbench.board.generate': '스토리보드 생성', + 'workbench.board.summary': '총 {n}샷 · 약 {sec}초', + 'workbench.asset.kindCharacter': '캐릭터', + 'workbench.asset.kindLocation': '장소', + 'workbench.asset.kindProp': '소품', + 'workbench.asset.namePh': '에셋 이름', + 'workbench.asset.descPh': '설명(외형, 용도)', + 'workbench.asset.promptPh': '완전한 영어 이미지 프롬프트', + 'workbench.asset.promptLabel': '이미지 프롬프트', + 'workbench.asset.remove': '이 에셋 삭제', + 'workbench.asset.add': '에셋 추가', + 'workbench.asset.todoTitle': '소재 목록과 이미지 프롬프트 만들기', + 'workbench.asset.todoBody': '소재 에이전트가 대본·스타일·스토리보드를 조합해 복사 가능한 완전한 프롬프트를 만듭니다.', + 'workbench.asset.generate': '소재 목록 생성', + 'workbench.asset.generateImage': '이 이미지 생성', + 'workbench.asset.generateHint': '연결된 ComfyUI 워크플로로 생성하며 결과는 이 프로젝트로 돌아옵니다', + 'workbench.asset.summary': '소재 {n}건', + 'workbench.vshot.noPh': '샷 번호(예 S1)', + 'workbench.vshot.descPh': '샷 설명', + 'workbench.vshot.promptPh': '완전한 영어 영상 모델 프롬프트', + 'workbench.vshot.promptLabel': '영상 프롬프트', + 'workbench.vshot.remove': '이 샷 삭제', + 'workbench.vshot.add': '샷 추가', + 'workbench.vshot.todoTitle': '샷별 영상 스크립트 만들기', + 'workbench.vshot.todoBody': '숏 리스트 에이전트가 스토리보드를 영상 모델용 프롬프트로 바꿉니다.', + 'workbench.vshot.generate': '숏 리스트 생성', + 'workbench.vshot.generateVideo': '이 샷 영상 생성', + 'workbench.vshot.generateHint': '연결된 ComfyUI 영상 워크플로로 생성하며 결과는 이 프로젝트로 돌아옵니다', + 'workbench.vshot.summary': '총 {n}샷', + 'home.errScriptShort': '대본이 너무 짧습니다. 붙여넣기가 완전한지 확인하세요(30자 이상)', + 'home.stageProgress': '5단계 진행', + 'tasks.sourceWorkbench': '제작 흐름', }; diff --git a/calliope-web/src/lib/i18n/zh.ts b/calliope-web/src/lib/i18n/zh.ts index 9592eaf3..fe1329f0 100644 --- a/calliope-web/src/lib/i18n/zh.ts +++ b/calliope-web/src/lib/i18n/zh.ts @@ -1569,4 +1569,140 @@ export const zh: Dict = { 'agentsPage.sugShot2P': '请演示一个首尾帧生视频镜头的提示词写法:首帧画面、尾帧画面、运镜与时长分别怎么描述。', + + 'workbench.title': '创作工作台', + 'workbench.subtitle': '剧本 → 视觉 → 分镜 → 素材 → 镜头脚本,五个智能体接力完成创作', + 'workbench.pickerSubtitle': '选择一个项目,继续它的五段创作流程', + 'workbench.pickerEmpty': '还没有项目', + 'workbench.pickerEmptyBody': '先回到项目总览,从创意开始或导入现成剧本。', + 'workbench.pickerGoHome': '去项目总览', + 'workbench.pickerFootHint': '也可以在项目总览直接「从创意开始」或「导入剧本」进入工作台。', + 'workbench.stageProgress': '五段进度', + 'workbench.activeJobs': '{n} 个任务进行中', + 'workbench.stage.script': '剧本创作', + 'workbench.stage.style': '视觉设计', + 'workbench.stage.storyboard': '分镜设计', + 'workbench.stage.assets': '素材资产', + 'workbench.stage.shot': '镜头脚本', + 'workbench.lockedStep': '先完成并确认「{stage}」后解锁', + 'workbench.state.todo': '待开始', + 'workbench.state.running': '生成中', + 'workbench.state.draft': '待确认', + 'workbench.state.confirmed': '已确认', + 'workbench.state.edited': '已修改', + 'workbench.copied': '已复制,可直接粘贴到生图/生视频', + 'workbench.copyFailed': '复制失败,请手动选择复制', + 'workbench.copy': '复制', + 'workbench.charCount': '{n} 字', + 'workbench.runStage': '让{agent}生成', + 'workbench.runDone': '{agent}已完成本段初稿,请确认', + 'workbench.runFailed': '生成失败,请重试', + 'workbench.runningHint': '{agent}正在生成本段内容,请稍候……', + 'workbench.confirmNext': '确认,进入下一阶段', + 'workbench.confirmLast': '确认本阶段', + 'workbench.confirmed': '已确认「{agent}」阶段产出', + 'workbench.confirmFailed': '确认失败,请重试', + 'workbench.restore': '恢复已确认版', + 'workbench.restored': '已恢复到最近确认的版本', + 'workbench.restoreFailed': '恢复失败,请重试', + 'workbench.draftNotice': '当前是未确认草稿:确认后才会交给下一阶段的智能体使用。', + 'workbench.draftSaved': '草稿已保存,仍需确认后才生效', + 'workbench.saveFailed': '保存失败,请重试', + 'workbench.saveDraft': '保存草稿', + 'workbench.cancelEdit': '取消', + 'workbench.editDraft': '编辑', + 'workbench.regenerate': '重新生成', + 'workbench.regenerateHint': '重新让智能体生成本段内容(已确认版本会保留,可随时恢复)', + 'workbench.instructionPh': '补充要求(可选),例如:偏电影感、台词更口语化……', + 'workbench.jobSubmitted': '已提交生成任务,结果会自动回到本项目', + 'workbench.jobSubmitFailed': '任务提交失败', + 'workbench.jobRequeued': '任务已重新排队', + 'workbench.retryJob': '重试', + 'workbench.cancelJob': '取消任务', + 'workbench.openOutput': '查看结果', + 'workbench.jobRunningPct': '{n}%', + 'workbench.jobRunning': '生成中', + 'workbench.jobQueued': '排队', + 'workbench.jobDone': '完成', + 'workbench.jobFailed': '失败', + 'workbench.generating': '生成中…', + 'workbench.progressChip': '阶段 {n}/5', + 'workbench.backHome': '项目总览', + 'workbench.loadFailed': '工作台加载失败。', + 'workbench.retryLoad': '重试', + 'workbench.agentSkills': '{n} 个 Skill', + 'workbench.chatWithAgent': '单独聊聊', + 'workbench.tasksTitle': '阶段任务', + 'workbench.tasksAll': '全部任务', + 'workbench.tasksEmpty': '还没有生成任务。在素材资产或镜头脚本阶段可把提示词送入生成。', + 'workbench.flowTitle': '五段进度', + 'workbench.script.todoTitle': '从剧本开始:写下创意,交给「剧本创作」智能体', + 'workbench.script.todoIdea': '你的创意:', + 'workbench.script.generate': '生成剧本初稿', + 'workbench.script.importBtn': '导入已有剧本', + 'workbench.script.writeManually': '手动撰写', + 'workbench.script.importPlaceholder': '把现成剧本粘贴到这里……导入后将跳过剧本创作,直接从视觉设计开始。', + 'workbench.script.importHint': '导入的剧本会直接作为已确认的剧本阶段基线。', + 'workbench.script.importConfirm': '导入并跳过剧本创作', + 'workbench.script.importDone': '剧本已导入,从视觉设计继续', + 'workbench.script.importFailed': '剧本导入失败,请检查内容后重试', + 'workbench.script.editorHint': '直接编辑剧本正文,保存后仍需确认。', + 'workbench.script.copyLabel': '剧本全文', + 'workbench.style.todoTitle': '为剧本确定视觉风格', + 'workbench.style.todoBody': '「视觉设计」智能体会给出多套差异化风格方向,每套附可直接复制的生图提示词。', + 'workbench.style.generate': '生成风格方向', + 'workbench.style.namePh': '风格名称,如:霓虹赛博', + 'workbench.style.descPh': '中文风格说明(色调/光影/材质)', + 'workbench.style.promptPh': '英文生图关键词,逗号分隔', + 'workbench.style.negativePh': '负面提示词(可选,英文)', + 'workbench.style.negativeLabel': '负面提示词', + 'workbench.style.remove': '删除该方向', + 'workbench.style.add': '添加风格方向', + 'workbench.style.chosen': '当前选择', + 'workbench.style.chooseHint': '确认视觉设计阶段时,会把你选中的风格交给后续阶段。', + 'workbench.style.promptLabel': '风格提示词', + 'workbench.board.scene': '场次', + 'workbench.board.size': '景别', + 'workbench.board.camera': '运镜', + 'workbench.board.duration': '时长(秒)', + 'workbench.board.desc': '画面内容', + 'workbench.board.dialog': '台词/音效', + 'workbench.board.descPh': '这一镜的画面内容描述', + 'workbench.board.dialogPh': '台词或音效起点(可空)', + 'workbench.board.remove': '删除该镜', + 'workbench.board.add': '添加镜头', + 'workbench.board.todoTitle': '把剧本拆成逐镜分镜表', + 'workbench.board.todoBody': '「分镜设计」智能体按剧本产出镜号、景别、运镜、画面与时长建议。', + 'workbench.board.generate': '生成分镜表', + 'workbench.board.summary': '共 {n} 镜 · 约 {sec} 秒', + 'workbench.asset.kindCharacter': '角色', + 'workbench.asset.kindLocation': '场景', + 'workbench.asset.kindProp': '道具', + 'workbench.asset.namePh': '资产名称', + 'workbench.asset.descPh': '中文说明(外观细节、用途)', + 'workbench.asset.promptPh': '完整英文生图提示词', + 'workbench.asset.promptLabel': '生图提示词', + 'workbench.asset.remove': '删除该资产', + 'workbench.asset.add': '添加素材', + 'workbench.asset.todoTitle': '整理素材清单与生图提示词', + 'workbench.asset.todoBody': '「素材资产」智能体结合剧本、风格与分镜,为角色/场景/道具产出完整可复制的生图提示词。', + 'workbench.asset.generate': '生成素材清单', + 'workbench.asset.generateImage': '生成本图', + 'workbench.asset.generateHint': '用本地/已连接的 ComfyUI 工作流生成这张图,结果回到本项目', + 'workbench.asset.summary': '共 {n} 项素材', + 'workbench.vshot.noPh': '镜号,如 S1', + 'workbench.vshot.descPh': '中文画面说明', + 'workbench.vshot.promptPh': '完整英文视频模型提示词', + 'workbench.vshot.promptLabel': '视频提示词', + 'workbench.vshot.remove': '删除该镜', + 'workbench.vshot.add': '添加镜头', + 'workbench.vshot.todoTitle': '产出逐镜视频脚本', + 'workbench.vshot.todoBody': '「镜头脚本」智能体把分镜转化为视频模型可用的逐镜提示词。', + 'workbench.vshot.generate': '生成镜头脚本', + 'workbench.vshot.generateVideo': '生成本镜视频', + 'workbench.vshot.generateHint': '用已连接的 ComfyUI 视频工作流生成这一镜,结果回到本项目', + 'workbench.vshot.summary': '共 {n} 镜', + 'home.errScriptShort': '剧本内容太短,请检查粘贴是否完整(至少 30 字)', + 'home.stageProgress': '五段进度', + 'tasks.sourceWorkbench': '创作流程', }; diff --git a/calliope-web/src/routes/+page.svelte b/calliope-web/src/routes/+page.svelte index 1dfeae4c..d58cc6ff 100644 --- a/calliope-web/src/routes/+page.svelte +++ b/calliope-web/src/routes/+page.svelte @@ -5,8 +5,7 @@ // the sample progress rendered in the mockup. import { goto } from '$app/navigation'; import { createMutation, createQuery, useQueryClient } from '@tanstack/svelte-query'; - import { jobsApi, projects, type Project } from '$lib/api'; - import { agentDeepLink } from '$lib/agentTasks'; + import { jobsApi, projects, workbenchApi, type Project } from '$lib/api'; import AppShell from '$lib/components/shell/AppShell.svelte'; import AProjectCard from '$lib/components/home/AProjectCard.svelte'; import Button from '$lib/components/ui/Button.svelte'; @@ -32,10 +31,10 @@ const inProgressCount = $derived(allProjects.filter((p) => p.status === 'in_progress').length); // ------------------------------------------------------------------ - // Entry flows — both lead to already-working Calliope flows: - // 从创意开始 → create project → project stage workspace (/project/:id) - // 导入剧本 → create project with the script stored → hand off to the - // project-linked script agent (/agents?project=…&task=script) + // Entry flows — both open the five-stage creation workbench (a2): + // 从创意开始 → create project → workbench stage 1 (剧本创作) + // 导入剧本 → create project → script stage confirmed via import + // → workbench stage 2 (视觉设计), skipping 剧本创作 // ------------------------------------------------------------------ type EntryMode = 'none' | 'idea' | 'script'; let entryMode = $state('none'); @@ -98,20 +97,38 @@ const errs: Record = {}; if (!scriptForm.title.trim()) errs.title = t('home.errTitle'); if (!scriptForm.script.trim()) errs.script = t('home.errScript'); + else if (scriptForm.script.trim().length < 30) errs.script = t('home.errScriptShort'); return errs; }); function onIdeaCreated(p: Project) { client.invalidateQueries({ queryKey: ['projects'] }); toast.success(t('projects.created', { title: p.title })); - goto(`/project/${p.id}`); + goto(`/workbench/${p.id}?stage=script`); } function onScriptCreated(p: Project) { client.invalidateQueries({ queryKey: ['projects'] }); toast.success(t('projects.created', { title: p.title })); - goto(agentDeepLink(p.id, 'script')); + // Import the pasted script as the confirmed 剧本 baseline, then + // continue from 视觉设计 (导入剧本可跳过剧本创作). + $importScriptMutation.mutate({ projectId: p.id, text: scriptForm.script.trim() }); } + const importScriptMutation = createMutation({ + mutationFn: (args: { projectId: number; text: string }) => + workbenchApi.importScript(args.projectId, args.text), + onSuccess: (_data, args) => { + client.invalidateQueries({ queryKey: ['projects'] }); + goto(`/workbench/${args.projectId}?stage=style`); + }, + onError: (err, args) => { + toast.error(err instanceof Error ? err.message : t('projects.createFailed')); + // Never strand the user: open the workbench at 剧本创作 so the + // text can be pasted/edited there even if the import failed. + if (args) goto(`/workbench/${args.projectId}?stage=script`); + }, + }); + const ideaMutation = createMutation({ mutationFn: () => projects.create({ diff --git a/calliope-web/src/routes/tasks/+page.svelte b/calliope-web/src/routes/tasks/+page.svelte index 270ed325..8ebda6f9 100644 --- a/calliope-web/src/routes/tasks/+page.svelte +++ b/calliope-web/src/routes/tasks/+page.svelte @@ -55,6 +55,7 @@ const src = job.payload?.source; if (src === 'studio-image') return t('tasks.sourceStudioImage'); if (src === 'studio-video') return t('tasks.sourceStudioVideo'); + if (src === 'workbench') return t('tasks.sourceWorkbench'); if (src === 'playground') return t('tasks.sourcePlayground'); if (job.scene_id || job.clip_id) return t('tasks.sourceFlow'); if (!src) return t('tasks.sourceFlow'); diff --git a/calliope-web/src/routes/workbench/+page.svelte b/calliope-web/src/routes/workbench/+page.svelte new file mode 100644 index 00000000..73d6aa21 --- /dev/null +++ b/calliope-web/src/routes/workbench/+page.svelte @@ -0,0 +1,234 @@ + + + +
+ {#if $projectsQuery.isLoading} +
+ {#each Array(3) as _} + + {/each} +
+ {:else if items.length === 0} + + {#snippet action()} + {t('workbench.pickerGoHome')} + {/snippet} + + {:else} +
    + {#each items as p (p.id)} +
  • + +
  • + {/each} +
+

{t('workbench.pickerFootHint')}

+ {/if} +
+
+ + diff --git a/calliope-web/src/routes/workbench/+page.ts b/calliope-web/src/routes/workbench/+page.ts new file mode 100644 index 00000000..83addb7e --- /dev/null +++ b/calliope-web/src/routes/workbench/+page.ts @@ -0,0 +1,2 @@ +export const ssr = false; +export const prerender = false; diff --git a/calliope-web/src/routes/workbench/[id]/+page.svelte b/calliope-web/src/routes/workbench/[id]/+page.svelte new file mode 100644 index 00000000..ba0c6cea --- /dev/null +++ b/calliope-web/src/routes/workbench/[id]/+page.svelte @@ -0,0 +1,1074 @@ + + + + {#snippet actions()} + {t('workbench.progressChip', { n: confirmedCount })} + {t('workbench.backHome')} + {/snippet} + + {#if !$overviewQuery.data && $overviewQuery.isLoading} +
+ +
+ +
+ {:else if !overview} +
+

+ {t('workbench.loadFailed')} + +

+
+ {:else} +
+
+ + + {#if panelProps} +
+
+

{t(`workbench.stage.${stageKey}`)}

+

{currentAgent?.tagline ?? ''}

+
+
+ + {#if stageStatus === 'running'}{/if} + {t(STATUS_LABEL[stageStatus])} + + {#if currentStage && currentStage.draft_edited && stageStatus !== 'todo'} + {t('workbench.state.edited')} + {/if} +
+
+ + {#if currentStage?.error || (currentStage?.last_run?.status === 'failed' && currentStage?.last_run?.error)} +
+ + {currentStage.last_run?.error ?? currentStage.error} +
+ {/if} + + {#if stageStatus === 'awaiting_confirm'} +
+ + {t('workbench.draftNotice')} +
+ {/if} + + {#if stageStatus === 'running'} +
+ + {t('workbench.runningHint', { agent: agentName(stageKey) })} +
+ {/if} + +
+ + {#if stageStatus === 'todo'} + + {/if} + {#if stageStatus === 'awaiting_confirm'} + + {/if} + {#if stageStatus === 'confirmed' && currentStage?.draft_edited} + + {/if} +
+ +
+ {#if stageKey === 'script'} + $saveMutation.mutate({ key: 'script', content })} + onImport={(text) => $importMutation.mutate(text)} + onRun={() => handleRun('script')} + /> + {:else if stageKey === 'style'} + $saveMutation.mutate({ key: 'style', content })} + onRun={() => handleRun('style')} + /> + {:else if stageKey === 'storyboard'} + $saveMutation.mutate({ key: 'storyboard', content })} + onRun={() => handleRun('storyboard')} + /> + {:else if stageKey === 'assets'} + $saveMutation.mutate({ key: 'assets', content })} + onRun={() => handleRun('assets')} + onGenerate={onGenerate} + onRetryJob={(jobId) => $retryMutation.mutate(jobId)} + /> + {:else} + $saveMutation.mutate({ key: 'shot', content })} + onRun={() => handleRun('shot')} + onGenerate={onGenerate} + onRetryJob={(jobId) => $retryMutation.mutate(jobId)} + /> + {/if} +
+ {/if} +
+ + +
+ {/if} + + + diff --git a/calliope-web/src/routes/workbench/[id]/+page.ts b/calliope-web/src/routes/workbench/[id]/+page.ts new file mode 100644 index 00000000..83addb7e --- /dev/null +++ b/calliope-web/src/routes/workbench/[id]/+page.ts @@ -0,0 +1,2 @@ +export const ssr = false; +export const prerender = false;