Skip to content

Formerly KrillinAI, VideoTranslation and Dubbing Tool for 120+ Languages. Open-source AI workspace for creators, powered by Codex. Video downloader, video translation, create videos, images, audios, and edits with Agents in one place. For your Social Media like YouTube, TikTok, Instagram, etc.

feat: improve creator workflows and project settings

Leggett959a4fffef80
diff --git a/.codex/skills/oc-bugfix/SKILL.md b/.codex/skills/oc-bugfix/SKILL.md
new file mode 100644
index 00000000..2d80107b
--- /dev/null
+++ b/.codex/skills/oc-bugfix/SKILL.md
@@ -0,0 +1,78 @@
+---
+name: oc-bugfix
+description: 处理并回写 OpenCreator 飞书 Bug 文档中的问题,依次完成事实排查、详细方案确认、修复、功能测试和原因/方案回写。仅在用户明确要求处理该 Bug 文档或明确调用本 skill 时使用;普通开发修复不自动启用。
+---
+
+# OpenCreator Bug Fix
+
+默认问题文档:`https://q1trqz6q9x7.feishu.cn/wiki/D0O5wUHqGiZoXHk9QPqcZjYhnwh`。
+
+遵守仓库根目录 `AGENTS.md`。本流程中的用户确认只授权已说明的修复方案,不自动授权 Git commit、push、发布、添加文档协作者或修改共享权限。
+
+## 飞书工具铁律
+
+- 本项目已验证可用的 Lark CLI 集成是 `lark-mcp mcp`。必须通过 Node MCP SDK 的 `StdioClientTransport` 启动并调用它;不得在交互式 PTY 中向进程直接发送原始 JSON,因为终端回显和控制字符会导致请求挂起或协议失效。
+- 使用 OAuth `user_access_token`,调用工具时设置 `useUAT: true`。启动时只开放本次需要的 docx 工具,例如读取使用 `docx.v1.documentBlock.list`,追加内容使用 `docx.v1.documentBlockChildren.create`。
+- 不得因为 `whoami` 或 scope 展示中未出现 docx 权限,就直接判断文档不可编辑。编辑能力以实际的受控 API 调用结果为准;先读目标块,再执行最小写入,并回读验证。
+- 写入前读取最新问题块及其 children,确认目标文本、目标 block ID、插入位置和已有图片没有变化。若文档内容与排查时记录不一致,停止写入并重新定位,避免覆盖他人修改。
+- 写入必须针对原问题块做最小范围追加,并使用稳定、可复用的 `client_token` 防止重试产生重复内容。禁止覆盖原问题、删除原图片或把内容追加到无关位置。
+- 写入后立即重新读取目标问题及相邻块;只有新增内容的位置和文本正确、原有内容与图片仍然存在时,才算回写成功。
+- 命令、认证参数或本机凭据来源不明确时,先检查已安装包、CLI 帮助和现有安全存储配置。不得凭空猜测命令,也不得通过登出、重新授权、修改协作者或共享权限来试错。
+
+## 进入流程
+
+只有用户明确调用 `$oc-bugfix`,或明确要求读取、处理、修复、测试或回写上述飞书 Bug 文档时才启用。用户只提出普通 Bug、开发或体验优化时,直接按常规开发流程处理,不读取或回写飞书文档。
+
+1. 通过上述 `lark-mcp mcp` CLI 集成,以 OAuth 用户身份解析 Wiki 节点并读取最新正文;不要依赖先前对话中的文档副本。
+2. 用户未指定问题时,根据其描述在文档中定位;存在多个合理匹配时,列出候选并请用户选择,不得猜测。
+3. 记录问题在文档中的原始描述和相邻上下文,后续回写必须落在该问题下面,不得只追加到文档末尾。
+4. 在第一次需要写文档前,通过一次受控的 docx 写入调用确认当前 OAuth 用户身份具有内容更新能力。失败时保留原始错误并排查调用方式、目标块和授权状态,不得仅凭 scope 展示推断权限,也不得修改成员权限来测试。
+
+## 阶段门禁
+
+严格按以下阶段推进,不得合并“排查并顺手修复”,也不得把方案展示视为用户确认。
+
+### 1. 事实排查
+
+在任何代码修改前完成只读调查:复现或获得可靠失败证据,定位相关调用链、状态和数据边界,检查现有测试,并判断影响 Web、Desktop、Daemon、Runtime、持久化或 Creator 共享能力中的哪些部分。
+
+输出一份诊断结论,至少包含:当前行为、期望行为、复现条件、证据、根因、影响范围和仍未证实的假设。根因未查清时继续调查或明确阻塞,禁止修改源码、配置、测试断言或文档来掩盖问题。
+
+### 2. 方案确认
+
+基于已证实根因给出详细优化方案,包含:拟修改文件或模块、关键逻辑、为何能解决根因、兼容性与回归风险、测试计划、文档回写内容。存在合理备选时说明取舍。
+
+明确询问用户是否确认该方案。收到清晰确认前停止,不得编辑代码。用户调整方案后,更新方案并重新确认;确认只覆盖展示过的范围。
+
+### 3. 修复
+
+确认后实施最小充分改动,保留工作区中的用户修改,不做无关重构。若实施中发现根因判断错误、范围显著扩大、需数据迁移或需改变已确认行为,停止修改并带着新证据返回方案确认阶段。
+
+Creator 相关问题在排查和实现前读取 [references/creator-bug-guide.md](references/creator-bug-guide.md),并遵守共享 `CreatorCollaborationPanel`、Adapter 边界、Runtime 标准进度和 Activity 语义化规则。
+
+### 4. 功能测试
+
+修复后必须执行能覆盖用户报告流程的功能测试,不得只运行 lint、typecheck 或静态检查。先按风险执行最接近的自动化测试;交互问题在自动化无法证明时补充浏览器验证。测试失败时回到排查阶段,不得回写“已修复”。
+
+验证范围遵守根目录风险分级和“Web 快速验证路径”。纯 Web 页面、样式或局部交互 Bug 通过相关定向测试、Web typecheck 和必要的浏览器验证后即可回写完成,不运行 Desktop 打包或 packaged App E2E。只有 Bug 触及 Host Bridge、Preload/IPC、Desktop capability、Daemon 启动与代理、打包资源/脚本,或目标本身是 Desktop 交付、候选验证或发布时,才升级到实际 App 门禁;不能执行的必需项目要明确残余风险。
+
+### 5. 文档回写
+
+只有修复完成且相关功能测试通过后,才在原问题描述正下方追加:
+
+```text
+【问题原因】
+<面向维护者的具体根因;包含关键模块或数据流,不粘贴大段日志>
+
+【修复方案】
+<实际完成的修改、行为变化和关键兼容处理>
+
+【验证结果】
+<实际执行的功能测试及结果;未验证项必须明确列出>
+```
+
+先通过 `lark-mcp mcp` 和 MCP SDK transport 重新读取最新文档,确认目标问题及邻近内容未被他人改动,再做最小范围更新。不得覆盖原始问题、图片或其他人的记录,不得把计划写成已完成。如果实际 API 返回权限不足,或无法可靠插入到目标位置,保留代码修复结果和原始错误并明确报告回写阻塞;不得改权限、重建文档或声称已经回写。
+
+## 交付
+
+交付时报告根因、实际修复、功能测试、文档回写位置与结果,以及未验证风险。不要自动创建 Git commit。
diff --git a/.codex/skills/oc-bugfix/agents/openai.yaml b/.codex/skills/oc-bugfix/agents/openai.yaml
new file mode 100644
index 00000000..15f74e57
--- /dev/null
+++ b/.codex/skills/oc-bugfix/agents/openai.yaml
@@ -0,0 +1,4 @@
+interface:
+ display_name: "OpenCreator Bug Fix"
+ short_description: "排查、确认、修复并回写 OpenCreator Bug"
+ default_prompt: "使用 $oc-bugfix 处理默认飞书文档中的 Bug,先完成排查和方案确认。"
diff --git a/.codex/skills/oc-bugfix/references/creator-bug-guide.md b/.codex/skills/oc-bugfix/references/creator-bug-guide.md
new file mode 100644
index 00000000..286b9b56
--- /dev/null
+++ b/.codex/skills/oc-bugfix/references/creator-bug-guide.md
@@ -0,0 +1,46 @@
+# Creator Bug 排查指南
+
+只在问题涉及 Creator 模板、Workspace、协作面板、执行进度、审批或生成工作流时读取。
+
+## 先定位责任层
+
+沿真实数据流找首个错误状态,不要只修最终展示:
+
+1. 用户输入与模板 Workspace 上下文。
+2. `CreatorPanelAdapter` 的模板语义映射。
+3. `CreatorCollaborationPanel` 的通用消息、Stage、Activity、审批和 Composer。
+4. Web service / Runtime 请求和标准事件。
+5. Daemon、执行器及外部 Provider。
+6. 持久化结果、项目列表和恢复路径。
+
+用网络请求、Runtime 事件、持久化数据和组件状态交叉验证边界。日志中的错误字符串不是根因;确认它由哪一层产生,以及失败后状态是否仍继续推进。
+
+## Creator 架构检查
+
+- 所有模板共用唯一 `CreatorCollaborationPanel`。模板差异放在 Adapter、配置、回调或局部 slot,不能创建第二套消息、审批、SSE 或 Stage 框架。
+- 通用 Panel 只消费 `phase`、`percent`、`message`、`completed`、`failed`、`total` 等标准进度;执行器私有字段只在 Runtime normalizer 或对应 Adapter 兼容。
+- Activity 只记录用户可理解的业务变化。过滤 UI-only 状态,合并连续同类更新,未知模板使用 fallback 文案,不能暴露内部 Stage ID 或原始事件字段。
+- 区分“后端仍在执行”“前端连接中断”“事件被错误标记失败”和“展示状态过期”。取消、重试、刷新恢复和重复事件要保持幂等。
+- 项目产物必须能从项目列表和会话恢复路径找到;确认 project/session/task/artifact 标识在创建、执行和持久化各阶段一致。
+- 外部 Provider 的 403、429、5xx 要保留可诊断信息,并区分鉴权、限流、输入不支持和临时故障。不要把所有异常改写成通用失败。
+
+## 修复策略
+
+- 优先修正状态或协议的真实来源,再调整 UI;避免用延时、强制刷新或隐藏错误绕过竞态。
+- 共享行为在通用层修一次,模板语义在 Adapter 修;不要按模板复制通用逻辑。
+- 对异步竞态,明确事件顺序、任务身份、终止条件和过期结果丢弃规则。
+- 对历史任务或草稿,说明兼容策略;公共字段变化时检查旧数据和所有消费者。
+- 涉及 Web/Desktop 时按 capability 隔离原生能力,不按 `hostBridge.kind` 分叉通用业务。
+
+## 功能测试选择
+
+至少覆盖报告问题的可观察结果,并优先补一条能在修复前失败、修复后通过的回归测试:
+
+- Adapter:Stage/Phase/字段文案和 fallback。
+- Activity:UI-only 过滤、连续更新合并、重复事件去重。
+- Stage:成功、失败、取消、重试和刷新恢复。
+- 进度:标准字段、乱序/重复事件、完成态不回退。
+- Workspace/Panel:关键用户操作与共享 Panel 的交互结果。
+- Runtime/Daemon:请求参数、错误映射、持久化和恢复。
+
+UI 布局或拖拽问题应验证真实交互和关键尺寸;视觉问题保留相同内容视口。涉及共享 Web UI 时判断 Web/Desktop 一致性,但只有触及相关范围才执行对应门禁,不为局部问题默认打包 Desktop。
diff --git a/.gitignore b/.gitignore
index cae54530..0de35ee3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,6 +20,8 @@ open-design-main/
.codex/*
!.codex/skills/
.codex/skills/*
+!.codex/skills/oc-bugfix/
+!.codex/skills/oc-bugfix/**
!.codex/skills/oc-deploy/
!.codex/skills/oc-deploy/**
!.codex/skills/oc-pr/
diff --git a/AGENTS.md b/AGENTS.md
index 74d5c0cc..3ca8f8c6 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -22,6 +22,13 @@
- 执行相关集成测试、构建、服务重启和健康检查。
- 只有任务涉及 Desktop 或交付包时才执行 Desktop 构建、打包及一致性门禁。
+### Web 快速验证路径
+
+- 只修改 `apps/web` 中的页面、模板 Workspace、样式或局部前端状态,且未触及 Host Bridge、Desktop capability、Preload/IPC、Daemon/Runtime、协议、持久化或构建资源时,以相关 Web 定向测试、`@opencreator/web` typecheck 和必要的浏览器交互验证为完成标准。
+- 上述纯 Web 改动通过验证后即可交付。默认不运行生产构建、Browser/Desktop 双上下文一致性规格、`desktop:package` 或 packaged App E2E;不能仅因 Desktop 复用同一份 Web 产物而升级验证。
+- 只有改动依赖平台 capability、响应式结果可能受 Electron 内容视口影响,或用户明确要求对比 Web/Desktop 时,才增加 Browser/Desktop 双上下文规格。双上下文规格通过后,仍不因该规格本身自动升级到实际 App 打包。
+- 只有触及 `apps/desktop`、Host Bridge、Preload/IPC、窗口或系统原生能力、Daemon 启动与代理、打包资源/脚本,或任务目标是 Desktop 交付、候选验证或发布时,才执行实际 App 打包和 packaged App E2E。
+
### 服务操作
- 前端源码在正在运行的 Vite 开发服务下能够热更新时,不得仅为使页面生效而重启 Web 服务。
@@ -64,7 +71,7 @@
- 铁律:OpenCreator 以 `apps/web` 作为唯一的前端实现和主要开发环境,Desktop 必须直接使用同一套 Web 前端构建产物,不得维护第二套页面、组件、样式或通用交互逻辑。
- 铁律:在相同业务数据、相同用户偏好和相同前端内容区尺寸下,Web 与 Desktop 的通用界面、文案、布局、状态、交互结果和 Runtime 请求必须一致。
- “一致”指通用产品能力一致,不要求浏览器模拟操作系统窗口、系统目录选择器、菜单栏、托盘和原生通知等系统能力。
-- 不能因为 Web 和 Desktop 共用 React 代码就默认二者已经一致;一致性必须通过自动化测试和实际打包 App 验证。
+- 不能因为 Web 和 Desktop 共用 React 代码就默认平台边界已经一致。纯共享 Web 改动按“Web 快速验证路径”验证;涉及 Desktop 边界或交付包时才要求实际打包 App 验证。
### 通用能力铁律
@@ -102,9 +109,9 @@
- 打包校验必须比较 App 内嵌 Web 资源与本次 Web 构建产物;不一致时必须终止打包。
- 不得通过手工复制、替换 App 内资源或跳过 Web 构建来制作可交付 App。
-### 必须执行的一致性测试
+### 分级一致性测试
-以下测试是相关功能完成前的强制门禁,不是可选建议:
+明确影响 Web/Desktop 通用行为或平台 capability 时,按实际影响选择以下自动化测试,不得因纯 Web 局部改动默认执行整组:
1. 使用同一个 Fake Daemon、相同项目、相同会话、相同本地偏好和相同内容视口,分别以 Browser Bridge 和 Desktop Bridge 渲染应用。
2. 对比首页、项目选择器、创建项目、设置页、会话输入区和文件工作区的通用可见文案、按钮、状态、关键尺寸和操作结果。
@@ -112,12 +119,14 @@
4. 验证 Web 首次启动会自动获得默认项目,输入框立即可用。
5. 验证 Browser Bridge 下不显示目录选择、目录更换、窗口关闭等不可用的 Desktop 原生入口。
6. 验证 Desktop Bridge 下原生入口真实调用对应 Bridge 能力,不得只验证按钮存在。
+实际 App 打包仅在“Web 快速验证路径”的升级条件命中时执行,并必须完成:
+
7. 运行实际打包 App E2E,验证 Preload Bridge、`opencreator-app://` 页面、Runtime 代理、默认项目、核心输入流程和原生能力。
8. 校验 `apps/web/dist` 与 App 内嵌 Web 目录文件列表和内容哈希完全一致。
### 修改时的强制判断
-- 修改 `apps/web` 页面、状态、Service、Host Bridge、Daemon 项目逻辑、Desktop Preload、窗口逻辑、协议代理或打包脚本时,必须判断是否影响 Web/Desktop 一致性。
+- 修改 `apps/web` 页面、状态、Service、Host Bridge、Daemon 项目逻辑、Desktop Preload、窗口逻辑、协议代理或打包脚本时,必须先按“Web 快速验证路径”判断验证等级,不得把普通 Web 修改自动视为 Desktop 打包任务。
- 新功能开发前必须先归类:
- 通用产品能力:只实现一次,由 Web 和 Daemon 共用。
- 系统原生能力:通过 capability 隔离,并提供平台专属测试。
@@ -127,6 +136,7 @@
### 完成声明门禁
-- 未通过类型检查、相关单元测试、Web/Desktop 一致性测试和实际打包 App 验证时,不得声称相关功能已经完成、两端已经一致或可以发布。
+- 纯 Web 改动通过相关 Web 定向测试、typecheck 和必要的浏览器验证后,可以声明该改动完成,但不得据此声明实际 Desktop 包或发布候选已验证。
+- 命中 Desktop 打包升级条件时,未通过相关测试、实际打包 App 验证和资源哈希校验,不得声称 Desktop 功能完成、两端已经一致或可以发布。
- 如果当前环境无法运行其中某项验证,必须明确说明未验证内容、原因和残余风险。
- 发现 Web 与 Desktop 通用行为回归、App 嵌入旧 Web 产物、无效平台入口或首次启动状态不一致时,必须阻止发布,不得降级为普通提示。
diff --git a/apps/daemon/src/api/routes.settings.ts b/apps/daemon/src/api/routes.settings.ts
index 70e638fb..d4d5090d 100644
--- a/apps/daemon/src/api/routes.settings.ts
+++ b/apps/daemon/src/api/routes.settings.ts
@@ -1,8 +1,12 @@
import type {
+ OpenCreatorStorageSettingsResponse,
+ UpdateOpenCreatorStorageSettingsRequest,
OpenCreatorUiSettingsResponse,
UpdateOpenCreatorUiSettingsRequest
} from '@opencreator/protocol';
import type { FastifyInstance } from 'fastify';
+import { accessSync, constants, mkdirSync, statSync } from 'node:fs';
+import { isAbsolute } from 'node:path';
import { z, ZodError } from 'zod';
import type { OpenCreatorSettingsStore } from '../settings/store.js';
import { apiError } from './errors.js';
@@ -28,10 +32,21 @@ const updateSchema = z.object({
]).optional()
}).strict();
+const storageUpdateSchema = z.object({
+ defaultProjectRoot: z.string().trim().min(1).refine(isAbsolute).optional(),
+ outputRoot: z.string().trim().min(1).refine(isAbsolute).optional()
+}).strict();
+
+type StorageRouteOptions = {
+ validateStoragePath?: (path: string) => boolean;
+};
+
export async function registerSettingsRoutes(
server: FastifyInstance,
- store: OpenCreatorSettingsStore
+ store: OpenCreatorSettingsStore,
+ options: StorageRouteOptions = {}
): Promise<void> {
+ const validateStoragePath = options.validateStoragePath ?? ensureWritableDirectory;
server.get('/settings/ui', async (): Promise<OpenCreatorUiSettingsResponse> => (
store.readUi()
));
@@ -54,4 +69,46 @@ export async function registerSettingsRoutes(
}
}
);
+
+ server.get('/settings/storage', async (): Promise<OpenCreatorStorageSettingsResponse> => (
+ store.readStorage()
+ ));
+
+ server.patch<{ Body: unknown }>(
+ '/settings/storage',
+ async (request, reply) => {
+ try {
+ const update = storageUpdateSchema.parse(
+ request.body
+ ) as UpdateOpenCreatorStorageSettingsRequest;
+ for (const path of Object.values(update)) {
+ if (!validateStoragePath(path)) {
+ throw new StorageDirectoryError('Storage directory is not writable');
+ }
+ }
+ return store.updateStorage(update);
+ } catch (error) {
+ if (error instanceof ZodError || error instanceof StorageDirectoryError) {
+ return reply.code(400).send(apiError(
+ 'VALIDATION_FAILED',
+ 'OpenCreator storage settings are invalid'
+ ));
+ }
+ throw error;
+ }
+ }
+ );
+}
+
+class StorageDirectoryError extends Error {}
+
+function ensureWritableDirectory(path: string): boolean {
+ try {
+ mkdirSync(path, { recursive: true });
+ if (!statSync(path).isDirectory()) throw new Error('not a directory');
+ accessSync(path, constants.W_OK);
+ return true;
+ } catch {
+ return false;
+ }
}
diff --git a/apps/daemon/src/api/server.ts b/apps/daemon/src/api/server.ts
index e0d90dbc..67ff9363 100644
--- a/apps/daemon/src/api/server.ts
+++ b/apps/daemon/src/api/server.ts
@@ -3,6 +3,7 @@ import type { CodexAvailabilityProbe, CodexRuntimeComponentReadiness } from '@op
import cors from '@fastify/cors';
import Fastify from 'fastify';
import { existsSync, readFileSync } from 'node:fs';
+import { homedir } from 'node:os';
import { dirname, join, resolve } from 'node:path';
import { fileURLToPath } from 'node:url';
import {
@@ -36,6 +37,7 @@ import {
import { bootstrapCreatorAgentRuntime } from '../creator/agent/bootstrap.js';
import { createCodexCreatorAdapter } from '../creator/agent/codex-adapter.js';
import { createCreatorStageRunner } from '../creator/stage-runner.js';
+import { publishCreatorArtifacts } from '../creator/artifact-publisher.js';
import { createCreatorStageScheduler } from '../creator/stage-scheduler.js';
import { createCreatorCommandDispatcher } from '../creator/command-dispatcher.js';
import type { CreatorExecutor } from '../creator/executor.js';
@@ -318,6 +320,14 @@ export async function buildServer(input: BuildServerInput) {
const configFile = resolve(input.configFile ?? join(appHome, 'config.toml'));
const runtimeDir = resolve(input.runtimeDir ?? join(dataDir, 'creator-runtime'));
const creatorDir = resolve(input.creatorDir ?? join(dataDir, 'creator'));
+ const defaultManagedProjectRoot = join(
+ input.defaultProjectRoot ?? join(homedir(), 'Documents'),
+ 'OpenCreator'
+ );
+ const openCreatorSettingsStore = createOpenCreatorSettingsStore(configFile, {
+ defaultProjectRoot: defaultManagedProjectRoot,
+ outputRoot: join(defaultManagedProjectRoot, 'Exports')
+ });
const codexBin = input.codexBin ?? 'codex';
const defaultCwd = input.defaultCwd ?? process.cwd();
const resolvedCodexHome =
@@ -344,9 +354,10 @@ export async function buildServer(input: BuildServerInput) {
const scheduleRepository = new ScheduleRepository(db);
const projectManager = createProjectManager({
db,
- managedProjectRoot: input.defaultProjectRoot === undefined
- ? undefined
- : join(input.defaultProjectRoot, 'OpenCreator')
+ managedProjectRoot: defaultManagedProjectRoot,
+ resolveManagedProjectRoot: () => (
+ openCreatorSettingsStore.readStorage().settings.defaultProjectRoot
+ )
});
const threadManager = createThreadManager({ db, dataDir, projectManager });
const codexControlClient = createCodexAppServerClient({
@@ -417,7 +428,6 @@ export async function buildServer(input: BuildServerInput) {
}
});
const memoryService = createMemoryService({ db });
- const openCreatorSettingsStore = createOpenCreatorSettingsStore(configFile);
const storedCreatorServicesConfigStore =
input.creatorServicesConfigStore ?? (
input.credentialsFile === undefined
@@ -879,6 +889,19 @@ export async function buildServer(input: BuildServerInput) {
}
},
onStageSucceeded(stage) {
+ const completedJob = creatorService.getJob(stage.jobId);
+ if (completedJob !== undefined) {
+ const project = projectManager.getProject(completedJob.projectId);
+ if (project !== undefined) {
+ void publishCreatorArtifacts({
+ job: completedJob,
+ project,
+ outputRoot: openCreatorSettingsStore.readStorage().settings.outputRoot
+ }).catch(error => {
+ console.warn(`Creator artifact publication failed: ${formatError(error)}`);
+ });
+ }
+ }
void coverWorkflow?.handleStageChanged(stage).catch(error => {
console.warn(`Cover workflow continuation failed: ${formatError(error)}`);
});
diff --git a/apps/daemon/src/creator/artifact-publisher.ts b/apps/daemon/src/creator/artifact-publisher.ts
new file mode 100644
index 00000000..4fa8fbb5
--- /dev/null
+++ b/apps/daemon/src/creator/artifact-publisher.ts
@@ -0,0 +1,73 @@
+import type { CreatorJob, ProjectResponse } from '@opencreator/protocol';
+import { copyFile, mkdir, rename, rm } from 'node:fs/promises';
+import { basename, extname, join, resolve } from 'node:path';
+
+const publishableKinds = new Set([
+ 'source_subtitle',
+ 'target_subtitle',
+ 'bilingual_subtitle',
+ 'dubbed_audio',
+ 'horizontal_video',
+ 'vertical_video',
+ 'auto_clip_video',
+ 'clean_video',
+ 'bilingual_video',
+ 'cover_image',
+ 'generated_image',
+ 'generated_video',
+ 'publish_copy',
+ 'script_manifest',
+ 'clip_candidates'
+]);
+
+export async function publishCreatorArtifacts(input: {
+ job: CreatorJob;
+ project: ProjectResponse;
+ outputRoot: string;
+}): Promise<string[]> {
+ const published: string[] = [];
+ for (const artifact of input.job.artifacts) {
+ if (
+ artifact.path === null
+ || artifact.status !== 'completed'
+ || !publishableKinds.has(artifact.kind)
+ ) continue;
+
+ const version = positiveInteger(artifact.metadata.resultVersion) ?? artifact.version;
+ const directory = resolve(
+ input.outputRoot,
+ safeSegment(`${input.project.name}-${input.project.id}`),
+ safeSegment(`${input.job.templateId}-${input.job.id}`),
+ `V${version}`
+ );
+ await mkdir(directory, { recursive: true });
+ const sourceName = typeof artifact.metadata.fileName === 'string'
+ ? artifact.metadata.fileName
+ : basename(artifact.path);
+ const extension = extname(sourceName) || extname(artifact.path);
+ const destination = join(
+ directory,
+ `${safeSegment(`${artifact.kind}-${artifact.version}`)}${extension}`
+ );
+ const temporary = `${destination}.tmp-${process.pid}`;
+ try {
+ await copyFile(artifact.path, temporary);
+ await rename(temporary, destination);
+ published.push(destination);
+ } finally {
+ await rm(temporary, { force: true });
+ }
+ }
+ return published;
+}
+
+function safeSegment(value: string): string {
+ const normalized = value.trim().replace(/[\\/:*?"<>|\u0000-\u001f]/g, '-');
+ return normalized.length > 0 ? normalized.slice(0, 120) : 'untitled';
+}
+
+function positiveInteger(value: unknown): number | undefined {
+ return typeof value === 'number' && Number.isInteger(value) && value > 0
+ ? value
+ : undefined;
+}
diff --git a/apps/daemon/src/projects/manager.ts b/apps/daemon/src/projects/manager.ts
index ee236f6a..c9617918 100644
--- a/apps/daemon/src/projects/manager.ts
+++ b/apps/daemon/src/projects/manager.ts
@@ -35,6 +35,7 @@ export type CreateProjectManagerInput = {
db: Database.Database;
homeDir?: string;
managedProjectRoot?: string;
+ resolveManagedProjectRoot?: () => string;
idFactory?: () => string;
};
@@ -42,14 +43,18 @@ export function createProjectManager(input: CreateProjectManagerInput): ProjectM
const projects = createProjectRepository(input.db);
const threads = createThreadRepository(input.db);
const homeDir = input.homeDir ?? homedir();
- const managedProjectRoot = input.managedProjectRoot === undefined
+ const defaultManagedProjectRoot = input.managedProjectRoot === undefined
? join(homeDir, 'Documents', 'OpenCreator')
: resolve(expandHome(input.managedProjectRoot, homeDir));
+ const managedProjectRoot = () => resolve(expandHome(
+ input.resolveManagedProjectRoot?.() ?? defaultManagedProjectRoot,
+ homeDir
+ ));
const createId = input.idFactory ?? (() => `project_${nanoid(10)}`);
const createManagedProjectDirectory = (): string => {
for (let attempt = 0; attempt < 5; attempt += 1) {
- const cwd = join(managedProjectRoot, `project-${nanoid(12)}`);
+ const cwd = join(managedProjectRoot(), `project-${nanoid(12)}`);
try {
mkdirSync(cwd);
return cwd;
@@ -71,7 +76,7 @@ export function createProjectManager(input: CreateProjectManagerInput): ProjectM
return {
ensureDefaultProject(): ProjectResponse {
try {
- mkdirSync(managedProjectRoot, { recursive: true });
+ mkdirSync(managedProjectRoot(), { recursive: true });
} catch {
throw new ProjectManagerError(
'PROJECT_DIRECTORY_UNAVAILABLE',
@@ -79,7 +84,7 @@ export function createProjectManager(input: CreateProjectManagerInput): ProjectM
);
}
- const cwd = join(managedProjectRoot, 'Default Project');
+ const cwd = join(managedProjectRoot(), 'Default Project');
let createdDirectory = false;
if (!existsSync(cwd)) {
try {
@@ -118,7 +123,7 @@ export function createProjectManager(input: CreateProjectManagerInput): ProjectM
createManagedProject(request: CreateManagedProjectRequest): ProjectResponse {
const name = normalizeManagedProjectName(request.name);
try {
- mkdirSync(managedProjectRoot, { recursive: true });
+ mkdirSync(managedProjectRoot(), { recursive: true });
} catch {
throw new ProjectManagerError(
'PROJECT_DIRECTORY_UNAVAILABLE',
diff --git a/apps/daemon/src/settings/store.ts b/apps/daemon/src/settings/store.ts
index 312ffb61..62bbcd8b 100644
--- a/apps/daemon/src/settings/store.ts
+++ b/apps/daemon/src/settings/store.ts
@@ -1,16 +1,24 @@
import {
readOpenCreatorConfig,
+ resolveStorageSettings,
resolveUiSettings,
+ updateOpenCreatorStorageSettings,
updateOpenCreatorUiSettings
} from '@opencreator/config';
import type {
+ OpenCreatorStorageSettings,
+ OpenCreatorStorageSettingsResponse,
OpenCreatorUiSettingsResponse,
+ UpdateOpenCreatorStorageSettingsRequest,
UpdateOpenCreatorUiSettingsRequest
} from '@opencreator/protocol';
export type OpenCreatorSettingsStore = ReturnType<typeof createOpenCreatorSettingsStore>;
-export function createOpenCreatorSettingsStore(configFile: string) {
+export function createOpenCreatorSettingsStore(
+ configFile: string,
+ storageDefaults: OpenCreatorStorageSettings
+) {
return {
readUi(): OpenCreatorUiSettingsResponse {
const snapshot = readOpenCreatorConfig(configFile);
@@ -25,6 +33,23 @@ export function createOpenCreatorSettingsStore(configFile: string) {
settings: resolveUiSettings(snapshot),
configured: true
};
+ },
+ readStorage(): OpenCreatorStorageSettingsResponse {
+ const snapshot = readOpenCreatorConfig(configFile);
+ return {
+ settings: resolveStorageSettings(snapshot, storageDefaults),
+ configured: snapshot.configured.storage
+ };
+ },
+ updateStorage(
+ update: UpdateOpenCreatorStorageSettingsRequest
+ ): OpenCreatorStorageSettingsResponse {
+ const current = resolveStorageSettings(readOpenCreatorConfig(configFile), storageDefaults);
+ const snapshot = updateOpenCreatorStorageSettings(configFile, { ...current, ...update });
+ return {
+ settings: resolveStorageSettings(snapshot, storageDefaults),
+ configured: true
+ };
}
};
}
diff --git a/apps/daemon/test/unit/creator-artifact-publisher.test.ts b/apps/daemon/test/unit/creator-artifact-publisher.test.ts
new file mode 100644
index 00000000..504daf82
--- /dev/null
+++ b/apps/daemon/test/unit/creator-artifact-publisher.test.ts
@@ -0,0 +1,73 @@
+import { mkdir, mkdtemp, readFile, rm, writeFile } from 'node:fs/promises';
+import { tmpdir } from 'node:os';
+import { join } from 'node:path';
+import type { CreatorJob, ProjectResponse } from '@opencreator/protocol';
+import { afterEach, describe, expect, it } from 'vitest';
+import { publishCreatorArtifacts } from '../../src/creator/artifact-publisher.js';
+
+let root = '';
+
+afterEach(async () => {
+ if (root) await rm(root, { recursive: true, force: true });
+ root = '';
+});
+
+describe('creator artifact publisher', () => {
+ it('copies completed deliverables by project, job and result version', async () => {
+ root = await mkdtemp(join(tmpdir(), 'opencreator-publisher-'));
+ const sourceDir = join(root, 'internal');
+ await mkdir(sourceDir);
+ const source = join(sourceDir, 'video.mp4');
+ await writeFile(source, 'video');
+ const job = {
+ id: 'job/1',
+ projectId: 'project_1',
+ templateId: 'video-translation',
+ artifacts: [{
+ id: 'artifact_1',
+ jobId: 'job/1',
+ kind: 'horizontal_video',
+ version: 2,
+ status: 'completed',
+ path: source,
+ scopeKey: null,
+ inputFingerprint: null,
+ sha256: null,
+ sourceArtifactIds: [],
+ metadata: { resultVersion: 3, fileName: 'final.mp4' },
+ createdAt: new Date().toISOString()
+ }]
+ } as unknown as CreatorJob;
+ const project = { id: 'project_1', name: 'Demo' } as ProjectResponse;
+
+ const published = await publishCreatorArtifacts({
+ job,
+ project,
+ outputRoot: join(root, 'exports')
+ });
+
+ expect(published).toHaveLength(1);
+ expect(published[0]).toContain(join('Demo-project_1', 'video-translation-job-1', 'V3'));
+ expect(await readFile(published[0]!, 'utf8')).toBe('video');
+ expect(await readFile(source, 'utf8')).toBe('video');
+ });
+
+ it('does not publish source or stale artifacts', async () => {
+ root = await mkdtemp(join(tmpdir(), 'opencreator-publisher-'));
+ const job = {
+ id: 'job_1',
+ projectId: 'project_1',
+ templateId: 'image-generation',
+ artifacts: [
+ { kind: 'source_video', status: 'completed', path: '/missing/source.mp4' },
+ { kind: 'generated_image', status: 'stale', path: '/missing/image.png' }
+ ]
+ } as unknown as CreatorJob;
+
+ await expect(publishCreatorArtifacts({
+ job,
+ project: { id: 'project_1', name: 'Demo' } as ProjectResponse,
+ outputRoot: join(root, 'exports')
+ })).resolves.toEqual([]);
+ });
+});
diff --git a/apps/daemon/test/unit/opencreator-settings-routes.test.ts b/apps/daemon/test/unit/opencreator-settings-routes.test.ts
index 7c27407c..d0b638c2 100644
--- a/apps/daemon/test/unit/opencreator-settings-routes.test.ts
+++ b/apps/daemon/test/unit/opencreator-settings-routes.test.ts
@@ -7,6 +7,7 @@ import type { OpenCreatorSettingsStore } from '../../src/settings/store.js';
describe('OpenCreator settings routes', () => {
let server: FastifyInstance;
let store: OpenCreatorSettingsStore;
+ let validateStoragePath: ReturnType<typeof vi.fn>;
beforeEach(async () => {
store = {
@@ -29,10 +30,25 @@ describe('OpenCreator settings routes', () => {
customAccentColor: update.customAccentColor ?? '#3b82f6',
defaultPermission: update.defaultPermission ?? 'danger-full-access'
}
+ })),
+ readStorage: vi.fn(() => ({
+ configured: false,
+ settings: {
+ defaultProjectRoot: '/tmp/OpenCreator',
+ outputRoot: '/tmp/OpenCreator/Exports'
+ }
+ })),
+ updateStorage: vi.fn(update => ({
+ configured: true,
+ settings: {
+ defaultProjectRoot: update.defaultProjectRoot ?? '/tmp/OpenCreator',
+ outputRoot: update.outputRoot ?? '/tmp/OpenCreator/Exports'
+ }
}))
};
server = Fastify({ logger: false });
- await registerSettingsRoutes(server, store);
+ validateStoragePath = vi.fn((_path: string): boolean => true);
+ await registerSettingsRoutes(server, store, { validateStoragePath });
});
afterEach(async () => {
@@ -79,4 +95,39 @@ describe('OpenCreator settings routes', () => {
expect(response.statusCode).toBe(400);
expect(store.updateUi).not.toHaveBeenCalled();
});
+
+ it('reads and updates storage settings', async () => {
+ const current = await server.inject({ method: 'GET', url: '/settings/storage' });
+ expect(current.json().settings.outputRoot).toBe('/tmp/OpenCreator/Exports');
+
+ const updated = await server.inject({
+ method: 'PATCH',
+ url: '/settings/storage',
+ payload: { defaultProjectRoot: '/Volumes/Projects' }
+ });
+ expect(updated.statusCode).toBe(200);
+ expect(store.updateStorage).toHaveBeenCalledWith({
+ defaultProjectRoot: '/Volumes/Projects'
+ });
+ expect(validateStoragePath).toHaveBeenCalledWith('/Volumes/Projects');
+ });
+
+ it('rejects relative or unavailable storage directories', async () => {
+ const relative = await server.inject({
+ method: 'PATCH',
+ url: '/settings/storage',
+ payload: { outputRoot: 'relative/exports' }
+ });
+ expect(relative.statusCode).toBe(400);
+ expect(store.updateStorage).not.toHaveBeenCalled();
+
+ validateStoragePath.mockReturnValue(false);
+ const unavailable = await server.inject({
+ method: 'PATCH',
+ url: '/settings/storage',
+ payload: { outputRoot: '/read-only/exports' }
+ });
+ expect(unavailable.statusCode).toBe(400);
+ expect(store.updateStorage).not.toHaveBeenCalled();
+ });
});
diff --git a/apps/daemon/test/unit/project-manager.test.ts b/apps/daemon/test/unit/project-manager.test.ts
index 4213a365..dbcbaa23 100644
--- a/apps/daemon/test/unit/project-manager.test.ts
+++ b/apps/daemon/test/unit/project-manager.test.ts
@@ -67,6 +67,27 @@ describe('project manager', () => {
expect(existsSync(created.cwd)).toBe(true);
});
+ it('uses the latest configured root for newly managed projects', () => {
+ tempDir = mkdtempSync(join(tmpdir(), 'opencreator-managed-project-root-'));
+ const firstRoot = join(tempDir, 'first');
+ const secondRoot = join(tempDir, 'second');
+ let currentRoot = firstRoot;
+ db = openRuntimeDatabase(join(tempDir, 'app.sqlite'));
+ let id = 0;
+ const manager = createProjectManager({
+ db,
+ resolveManagedProjectRoot: () => currentRoot,
+ idFactory: () => `project_dynamic_${++id}`
+ });
+
+ const first = manager.createManagedProject({ name: 'First' });
+ currentRoot = secondRoot;
+ const second = manager.createManagedProject({ name: 'Second' });
+
+ expect(first.cwd.startsWith(firstRoot)).toBe(true);
+ expect(second.cwd.startsWith(secondRoot)).toBe(true);
+ });
+
it('removes a newly created empty directory when registration fails', () => {
tempDir = mkdtempSync(join(tmpdir(), 'opencreator-managed-project-'));
const managedProjectRoot = join(tempDir, 'Documents', 'OpenCreator');
diff --git a/apps/desktop/src/main/main.ts b/apps/desktop/src/main/main.ts
index c6d68278..e61c4f89 100644
--- a/apps/desktop/src/main/main.ts
+++ b/apps/desktop/src/main/main.ts
@@ -373,10 +373,14 @@ function registerIpcHandlers(input: {
? ok()
: failed(input.bootstrap.currentState.error?.message ?? 'Codex 检测失败');
});
- handle(desktopIpc.selectProjectDirectory, input.development, async () => {
+ handle(desktopIpc.selectProjectDirectory, input.development, async (_event, purpose: unknown) => {
+ const labels = purpose === 'default-project-root'
+ ? { title: '选择默认项目位置', buttonLabel: '使用此位置' }
+ : purpose === 'output-root'
+ ? { title: '选择完成产物位置', buttonLabel: '使用此位置' }
+ : { title: '添加项目文件夹', buttonLabel: '添加项目' };
const result = await dialog.showOpenDialog({
- title: '添加项目文件夹',
- buttonLabel: '添加项目',
+ ...labels,
properties: ['openDirectory']
});
if (result.canceled) return null;
diff --git a/apps/desktop/src/preload/index.ts b/apps/desktop/src/preload/index.ts
index e441f2a9..b293497e 100644
--- a/apps/desktop/src/preload/index.ts
+++ b/apps/desktop/src/preload/index.ts
@@ -32,7 +32,7 @@ const api: DesktopApi = {
},
retryBootstrap: () => ipcRenderer.invoke(desktopIpc.bootstrapRetry),
selectCodexPath: () => ipcRenderer.invoke(desktopIpc.selectCodex),
- selectProjectDirectory: () => ipcRenderer.invoke(desktopIpc.selectProjectDirectory),
+ selectProjectDirectory: purpose => ipcRenderer.invoke(desktopIpc.selectProjectDirectory, purpose),
resolveDroppedFilePath: file => {
const path = webUtils.getPathForFile(file);
return path.length > 0 ? path : null;
diff --git a/apps/desktop/src/shared/types.ts b/apps/desktop/src/shared/types.ts
index 5b057307..068ae274 100644
--- a/apps/desktop/src/shared/types.ts
+++ b/apps/desktop/src/shared/types.ts
@@ -99,6 +99,8 @@ export type DesktopHostNotification = {
approvalId?: string;
};
+export type DirectorySelectionPurpose = 'project' | 'default-project-root' | 'output-root';
+
export type DesktopApi = {
kind: 'desktop';
windowChrome?: DesktopWindowChrome;
@@ -111,7 +113,7 @@ export type DesktopApi = {
subscribeBootstrapState(listener: (state: DesktopBootstrapState) => void): () => void;
retryBootstrap(): Promise<DesktopHostResult>;
selectCodexPath(): Promise<DesktopHostResult>;
- selectProjectDirectory(): Promise<string | null>;
+ selectProjectDirectory(purpose?: DirectorySelectionPurpose): Promise<string | null>;
resolveDroppedFilePath(file: File): string | null;
restartRuntime(): Promise<DesktopHostResult>;
reloadWorkspace(): Promise<DesktopHostResult>;
diff --git a/apps/desktop/test/settings-store.test.ts b/apps/desktop/test/settings-store.test.ts
index a72e35a3..916d4e07 100644
--- a/apps/desktop/test/settings-store.test.ts
+++ b/apps/desktop/test/settings-store.test.ts
@@ -9,6 +9,7 @@ const emptySnapshot = (): OpenCreatorConfigSnapshot => ({
document: { version: 1 },
configured: {
ui: false,
+ storage: false,
desktop: false,
runtime: false,
creatorServices: false
diff --git a/apps/web/e2e/web-desktop-parity.spec.ts b/apps/web/e2e/web-desktop-parity.spec.ts
index b6cb0321..62cb35f4 100644
--- a/apps/web/e2e/web-desktop-parity.spec.ts
+++ b/apps/web/e2e/web-desktop-parity.spec.ts
@@ -377,6 +377,127 @@ test('项目页滚动而工作台未滚动时内容边界仍一致', async ({ br
}
});
+test('文章写作长提示词在 Browser/Desktop 下填满可用编辑高度', async ({
+ browser,
+ runtime
+}, testInfo) => {
+ test.skip(testInfo.project.name !== 'chromium-desktop', '固定桌面内容视口');
+ const created = await runtime.api<{ job: { id: string } }>('POST', '/creator/jobs', {
+ projectId: runtime.projectId,
+ templateId: 'wechat-article',
+ creationKey: 'parity-wechat-writing-brief-height',
+ state: {
+ currentStep: 1,
+ furthestStep: 1,
+ writingPrompt: Array.from(
+ { length: 24 },
+ (_, index) => `第 ${index + 1} 条写作要求:覆盖目标读者、核心观点与事实依据。`
+ ).join('\n')
+ }
+ });
+ const results = [];
+
+ for (const platform of ['browser', 'desktop'] as const) {
+ const context = await browser.newContext({
+ viewport: { width: 1440, height: 900 },
+ deviceScaleFactor: 1,
+ reducedMotion: 'reduce'
+ });
+ const page = await context.newPage();
+ if (platform === 'desktop') await installDesktopBridge(page);
+ try {
+ await runtime.openApp(page);
+ await page.goto(
+ `${runtime.origin}/#/workbench?tool=wechat-article&jobId=${created.job.id}`
+ );
+ const textarea = page.getByRole('textbox', { name: '提示词' });
+ await expect(textarea).toBeVisible();
+ const measurements = await textarea.evaluate(element => {
+ const textareaBox = element.getBoundingClientRect();
+ const field = element.closest('.creator-tool-field')!;
+ const fieldBox = field.getBoundingClientRect();
+ const gridBox = element.closest('.wechat-brief-grid')!.getBoundingClientRect();
+ const scrollBox = element.closest('.wechat-article-scroll')!.getBoundingClientRect();
+ const style = getComputedStyle(element);
+ return {
+ textareaHeight: Math.round(textareaBox.height),
+ fieldBottomGap: Math.round(fieldBox.bottom - textareaBox.bottom),
+ gridHeight: Math.round(gridBox.height),
+ scrollHeight: Math.round(scrollBox.height),
+ resize: style.resize,
+ overflowY: style.overflowY
+ };
+ });
+ expect(measurements.textareaHeight).toBeGreaterThanOrEqual(300);
+ expect(measurements.fieldBottomGap).toBeLessThanOrEqual(1);
+ expect(measurements.scrollHeight - measurements.gridHeight).toBe(4);
+ expect(measurements.resize).toBe('none');
+ expect(measurements.overflowY).toBe('auto');
+ results.push(measurements);
+ } finally {
+ await context.close();
+ }
+ }
+
+ expect(results[1]).toEqual(results[0]);
+});
+
+test('文章写作长大纲填满确认大纲步骤的可用编辑高度', async ({
+ browser,
+ runtime
+}, testInfo) => {
+ test.skip(testInfo.project.name !== 'chromium-desktop', '固定桌面内容视口');
+ const created = await runtime.api<{ job: { id: string } }>('POST', '/creator/jobs', {
+ projectId: runtime.projectId,
+ templateId: 'wechat-article',
+ creationKey: 'wechat-outline-editor-height',
+ state: {
+ currentStep: 3,
+ furthestStep: 3,
+ outline: Array.from(
+ { length: 30 },
+ (_, index) => `## ${index + 1}. 大纲章节\n\n- 论点\n- 事实依据\n- 行动建议`
+ ).join('\n\n')
+ }
+ });
+ const context = await browser.newContext({
+ viewport: { width: 1440, height: 900 },
+ deviceScaleFactor: 1,
+ reducedMotion: 'reduce'
+ });
+ const page = await context.newPage();
+ try {
+ await runtime.openApp(page);
+ await page.goto(
+ `${runtime.origin}/#/workbench?tool=wechat-article&jobId=${created.job.id}`
+ );
+ const textarea = page.getByRole('textbox', { name: '文章大纲编辑器' });
+ await expect(textarea).toBeVisible();
+ const measurements = await textarea.evaluate(element => {
+ const textareaBox = element.getBoundingClientRect();
+ const fieldBox = element.closest('.creator-tool-field')!.getBoundingClientRect();
+ const panelBox = element.closest('.wechat-outline-panel')!.getBoundingClientRect();
+ const scrollBox = element.closest('.wechat-article-scroll')!.getBoundingClientRect();
+ const style = getComputedStyle(element);
+ return {
+ textareaHeight: Math.round(textareaBox.height),
+ fieldBottomGap: Math.round(fieldBox.bottom - textareaBox.bottom),
+ panelHeight: Math.round(panelBox.height),
+ scrollHeight: Math.round(scrollBox.height),
+ resize: style.resize,
+ overflowY: style.overflowY
+ };
+ });
+ expect(measurements.textareaHeight).toBeGreaterThanOrEqual(400);
+ expect(measurements.fieldBottomGap).toBeLessThanOrEqual(1);
+ expect(measurements.scrollHeight - measurements.panelHeight).toBe(4);
+ expect(measurements.resize).toBe('none');
+ expect(measurements.overflowY).toBe('auto');
+ } finally {
+ await context.close();
+ }
+});
+
test('我的项目和产出中心分类在 Browser/Desktop 下保持单行', async ({
browser,
runtime
@@ -607,6 +728,8 @@ test('通用界面设置在 Browser/Desktop Bridge 下读取并写入相同 Runt
lightSelected: string | null;
permission: string;
language: string;
+ storagePaths: string[];
+ storagePickerCount: number;
boxes: Record<string, { x: number; y: number; width: number; height: number }>;
requests: string[];
}> = [];
@@ -619,6 +742,10 @@ test('通用界面设置在 Browser/Desktop Bridge 下读取并写入相同 Runt
customAccentColor: '#3b82f6',
defaultPermission: 'workspace-write'
});
+ await runtime.api('PATCH', '/settings/storage', {
+ defaultProjectRoot: '/tmp/opencreator-parity/projects',
+ outputRoot: '/tmp/opencreator-parity/exports'
+ });
const context = await browser.newContext({
viewport: { width: 1280, height: 800 },
deviceScaleFactor: 1,
@@ -630,7 +757,8 @@ test('通用界面设置在 Browser/Desktop Bridge 下读取并写入相同 Runt
const requests: string[] = [];
page.on('request', request => {
const url = new URL(request.url());
- if (!url.pathname.endsWith('/settings/ui')) return;
+ if (!url.pathname.endsWith('/settings/ui')
+ && !url.pathname.endsWith('/settings/storage')) return;
requests.push(
`${request.method()} ${url.pathname.replace('/.opencreator/runtime', '')}`
);
@@ -646,11 +774,36 @@ test('通用界面设置在 Browser/Desktop Bridge 下读取并写入相同 Runt
const lightButton = settings.getByRole('button', { name: '浅色' });
const permission = settings.getByRole('combobox', { name: '默认权限' });
const language = settings.getByRole('combobox', { name: '显示语言' });
+ const storagePaths = settings.locator('.settings-directory-input');
await expect(lightButton).toHaveAttribute('aria-pressed', 'true');
await expect(permission).toHaveValue('workspace-write');
await expect(language).toHaveValue('zh-CN');
await expect(page.locator('html')).toHaveAttribute('data-theme', 'light');
await expect(page.locator('html')).toHaveAttribute('data-accent', 'red');
+ const readStoragePaths = () => storagePaths.evaluateAll(inputs => (
+ inputs.map(input => (input as HTMLInputElement).value)
+ ));
+ await expect.poll(readStoragePaths).toEqual([
+ '/tmp/opencreator-parity/projects',
+ '/tmp/opencreator-parity/exports'
+ ]);
+ const outputPath = settings.getByRole('textbox', { name: '完成产物位置' });
+ await outputPath.fill('/tmp/opencreator-parity/saved-exports');
+ await settings.getByRole('button', { name: '保存完成产物位置' }).click();
+ await expect(outputPath).toHaveValue('/tmp/opencreator-parity/saved-exports');
+ await expect.poll(async () => (
+ await runtime.api<{ settings: { outputRoot: string } }>('GET', '/settings/storage')
+ ).settings.outputRoot).toBe('/tmp/opencreator-parity/saved-exports');
+ const storagePickerCount = await settings.getByRole('button', {
+ name: /选择(?:默认项目位置|完成产物位置)/
+ }).count();
+ expect(storagePickerCount).toBe(platform === 'desktop' ? 2 : 0);
+ if (platform === 'desktop') {
+ await settings.getByRole('button', { name: '选择完成产物位置' }).click();
+ await expect.poll(() => page.evaluate(() => (
+ window as unknown as { __directorySelectionPurpose?: string }
+ ).__directorySelectionPurpose)).toBe('output-root');
+ }
await settings.getByRole('button', { name: '深色' }).click();
await expect(page.locator('html')).toHaveAttribute('data-theme', 'dark');
await expect.poll(async () => (
@@ -683,6 +836,8 @@ test('通用界面设置在 Browser/Desktop Bridge 下读取并写入相同 Runt
lightSelected: await lightButton.getAttribute('aria-pressed'),
permission: await permission.inputValue(),
language: await language.inputValue(),
+ storagePaths: await readStoragePaths(),
+ storagePickerCount,
boxes,
requests
});
@@ -692,14 +847,24 @@ test('通用界面设置在 Browser/Desktop Bridge 下读取并写入相同 Runt
}
expect({
- ...results[1],
+ ...results[1], storagePickerCount: 0, boxes: undefined,
requests: normalizeParityRequests(results[1]!.requests)
}).toEqual({
- ...results[0],
+ ...results[0], boxes: undefined,
requests: normalizeParityRequests(results[0]!.requests)
});
+ for (const name of Object.keys(results[0]!.boxes)) {
+ const browserBox = results[0]!.boxes[name]!;
+ const desktopBox = results[1]!.boxes[name]!;
+ expect(desktopBox.width).toBe(browserBox.width);
+ expect(desktopBox.height).toBe(browserBox.height);
+ expect(Math.abs(desktopBox.x - browserBox.x)).toBeLessThanOrEqual(1);
+ expect(Math.abs(desktopBox.y - browserBox.y)).toBeLessThanOrEqual(1);
+ }
expect(results[0]!.requests).toContain('GET /settings/ui');
expect(results[0]!.requests).toContain('PATCH /settings/ui');
+ expect(results[0]!.requests).toContain('GET /settings/storage');
+ expect(results[0]!.requests).toContain('PATCH /settings/storage');
});
test('视频下载在 Browser/Desktop Bridge 下保持相同界面、请求和持久状态', async ({
@@ -1905,7 +2070,11 @@ async function installDesktopBridge(
updateDesktopPreferences: async () => ({
closeBehavior: 'hide' as const
}),
- selectProjectDirectory: async () => null,
+ selectProjectDirectory: async (purpose?: string) => {
+ (window as unknown as { __directorySelectionPurpose?: string })
+ .__directorySelectionPurpose = purpose;
+ return null;
+ },
resolveDroppedFilePath: () => null,
openExternal: async () => undefined,
revealPath: async () => success,
diff --git a/apps/web/src/app/AppController.tsx b/apps/web/src/app/AppController.tsx
index 3068c762..e6d043ba 100644
--- a/apps/web/src/app/AppController.tsx
+++ b/apps/web/src/app/AppController.tsx
@@ -2480,7 +2480,7 @@ export function AppController(props: AppControllerProps) {
) return;
projectDirectoryDialogInFlightRef.current = true;
try {
- const path = await selectDirectory();
+ const path = await selectDirectory('project');
if (path === null) return;
await registerProjectDirectory(path);
} catch (error) {
@@ -2685,7 +2685,7 @@ export function AppController(props: AppControllerProps) {
async function replaceManagedProjectDirectory(projectId: string) {
if (projectService === null || hostBridge.selectProjectDirectory === undefined) return;
- const cwd = await hostBridge.selectProjectDirectory();
+ const cwd = await hostBridge.selectProjectDirectory('project');
if (cwd === null) return;
setProjectMutationBusy(true);
try {
@@ -4637,6 +4637,8 @@ export function AppController(props: AppControllerProps) {
onAccentColorChange={handleAccentColorChange}
customAccentColor={customAccentColor}
onCustomAccentColorChange={handleCustomAccentColorChange}
+ storageSettingsService={openCreatorSettingsService}
+ onSelectStorageDirectory={hostBridge.selectProjectDirectory}
desktopCloseBehavior={desktopCloseBehavior}
onDesktopCloseBehaviorChange={(behavior: 'hide' | 'quit') => {
const update = hostBridge.updateDesktopPreferences;
diff --git a/apps/web/src/components/layout/pane-resize-2026-07-29.ts b/apps/web/src/components/layout/pane-resize-2026-07-29.ts
index 37e657d2..ddce6cff 100644
--- a/apps/web/src/components/layout/pane-resize-2026-07-29.ts
+++ b/apps/web/src/components/layout/pane-resize-2026-07-29.ts
@@ -4,20 +4,26 @@ let activeResizeCleanup: (() => void) | undefined;
export function beginPaneResize(
event: ReactMouseEvent<HTMLElement>,
- update: (clientX: number) => void
+ update: (clientX: number) => void,
+ options?: { updateOnStart?: boolean }
): void {
if (event.button !== 0) return;
event.preventDefault();
activeResizeCleanup?.();
- const shield = document.createElement('div');
- shield.className = 'pane-resize-shield';
- shield.setAttribute('aria-hidden', 'true');
- document.body.append(shield);
- document.documentElement.classList.add('is-pane-resizing');
+ let shield: HTMLDivElement | undefined;
+ const showShield = () => {
+ if (shield) return;
+ shield = document.createElement('div');
+ shield.className = 'pane-resize-shield';
+ shield.setAttribute('aria-hidden', 'true');
+ document.body.append(shield);
+ document.documentElement.classList.add('is-pane-resizing');
+ };
const handleMouseMove = (moveEvent: MouseEvent) => {
+ showShield();
update(moveEvent.clientX);
};
const cleanup = () => {
@@ -26,7 +32,7 @@ export function beginPaneResize(
window.removeEventListener('mousemove', handleMouseMove);
window.removeEventListener('mouseup', cleanup);
window.removeEventListener('blur', cleanup);
- shield.remove();
+ shield?.remove();
document.documentElement.classList.remove('is-pane-resizing');
};
@@ -34,5 +40,8 @@ export function beginPaneResize(
window.addEventListener('mousemove', handleMouseMove);
window.addEventListener('mouseup', cleanup);
window.addEventListener('blur', cleanup);
- update(event.clientX);
+ if (options?.updateOnStart !== false) {
+ showShield();
+ update(event.clientX);
+ }
}
diff --git a/apps/web/src/features/dashboard/CreatorResizableLayout.test.tsx b/apps/web/src/features/dashboard/CreatorResizableLayout.test.tsx
new file mode 100644
index 00000000..7b3c2472
--- /dev/null
+++ b/apps/web/src/features/dashboard/CreatorResizableLayout.test.tsx
@@ -0,0 +1,49 @@
+import { fireEvent, render, screen } from '@testing-library/react';
+import { describe, expect, it, vi } from 'vitest';
+import { LanguageProvider } from '../../i18n/LanguageProvider.js';
+import CreatorResizableLayout from './CreatorResizableLayout.js';
+
+describe('CreatorResizableLayout', () => {
+ it('resizes every Creator workspace with the same mouse and keyboard controls', () => {
+ render(
+ <LanguageProvider initialPreference="zh-CN">
+ <CreatorResizableLayout
+ workspace={<div>工作区</div>}
+ agentPanel={<div>Agent 对话区</div>}
+ />
+ </LanguageProvider>
+ );
+
+ const separator = screen.getByRole('separator', { name: '调整操作区和对话区宽度' });
+ const layout = separator.parentElement as HTMLDivElement;
+ vi.spyOn(layout, 'getBoundingClientRect').mockReturnValue({
+ bottom: 800,
+ height: 800,
+ left: 0,
+ right: 1200,
+ top: 0,
+ width: 1200,
+ x: 0,
+ y: 0,
+ toJSON: () => ({})
+ });
+
+ fireEvent.mouseDown(separator, { button: 0, clientX: 800 });
+ expect(document.querySelector('.pane-resize-shield')).not.toBeInTheDocument();
+ fireEvent.mouseUp(window);
+ expect(layout.style.getPropertyValue('--creator-workspace-pane-width')).toBe('');
+
+ fireEvent.mouseDown(separator, { button: 0, clientX: 800 });
+ fireEvent.mouseMove(window, { clientX: 720 });
+ fireEvent.mouseUp(window);
+ expect(layout).toHaveStyle({ '--creator-workspace-pane-width': '720px' });
+
+ fireEvent.keyDown(separator, { key: 'ArrowLeft' });
+ expect(layout).toHaveStyle({ '--creator-workspace-pane-width': '688px' });
+ fireEvent.keyDown(separator, { key: 'ArrowRight' });
+ expect(layout).toHaveStyle({ '--creator-workspace-pane-width': '720px' });
+
+ fireEvent.doubleClick(separator);
+ expect(layout.style.getPropertyValue('--creator-workspace-pane-width')).toBe('');
+ });
+});
diff --git a/apps/web/src/features/dashboard/CreatorResizableLayout.tsx b/apps/web/src/features/dashboard/CreatorResizableLayout.tsx
new file mode 100644
index 00000000..c80539df
--- /dev/null
+++ b/apps/web/src/features/dashboard/CreatorResizableLayout.tsx
@@ -0,0 +1,98 @@
+import {
+ useRef,
+ useState,
+ type CSSProperties,
+ type KeyboardEvent as ReactKeyboardEvent,
+ type MouseEvent as ReactMouseEvent,
+ type ReactNode
+} from 'react';
+import { beginPaneResize } from '../../components/layout/pane-resize-2026-07-29.js';
+import { useLocalizedCopy } from '../../i18n/useLocalizedCopy.js';
+
+const WORKSPACE_MIN_WIDTH = 390;
+const AGENT_MIN_WIDTH = 280;
+const RESIZE_HANDLE_WIDTH = 7;
+const RESIZE_KEY_STEP = 32;
+
+export default function CreatorResizableLayout(props: {
+ workspace: ReactNode;
+ agentPanel: ReactNode;
+ className?: string;
+}) {
+ const l = useLocalizedCopy();
+ const layoutRef = useRef<HTMLDivElement>(null);
+ const [workspaceWidth, setWorkspaceWidth] = useState<number>();
+
+ function widthBounds() {
+ const rect = layoutRef.current?.getBoundingClientRect();
+ const fallbackWidth = 900;
+ return {
+ fallback: rect ? Math.round(rect.width * 0.68) : fallbackWidth,
+ max: rect
+ ? Math.max(WORKSPACE_MIN_WIDTH, rect.width - AGENT_MIN_WIDTH - RESIZE_HANDLE_WIDTH)
+ : fallbackWidth
+ };
+ }
+
+ function updateWorkspaceWidth(clientX: number) {
+ const rect = layoutRef.current?.getBoundingClientRect();
+ if (!rect) return;
+ setWorkspaceWidth(Math.max(
+ WORKSPACE_MIN_WIDTH,
+ Math.min(rect.width - AGENT_MIN_WIDTH - RESIZE_HANDLE_WIDTH, clientX - rect.left)
+ ));
+ }
+
+ function adjustWorkspaceWidth(delta: number) {
+ const bounds = widthBounds();
+ setWorkspaceWidth(previous => Math.max(
+ WORKSPACE_MIN_WIDTH,
+ Math.min(bounds.max, (previous ?? bounds.fallback) + delta)
+ ));
+ }
+
+ function handleMouseDown(event: ReactMouseEvent<HTMLDivElement>) {
+ beginPaneResize(event, updateWorkspaceWidth, { updateOnStart: false });
+ }
+
+ function handleKeyDown(event: ReactKeyboardEvent<HTMLDivElement>) {
+ if (event.key === 'ArrowLeft') {
+ event.preventDefault();
+ adjustWorkspaceWidth(-RESIZE_KEY_STEP);
+ } else if (event.key === 'ArrowRight') {
+ event.preventDefault();
+ adjustWorkspaceWidth(RESIZE_KEY_STEP);
+ }
+ }
+
+ const style = workspaceWidth === undefined
+ ? undefined
+ : ({ '--creator-workspace-pane-width': `${workspaceWidth}px` } as CSSProperties);
+
+ return (
+ <div
+ className={`creator-resizable-layout${props.className ? ` ${props.className}` : ''}`}
+ ref={layoutRef}
+ style={style}
+ >
+ {props.workspace}
+ <div
+ className="pane-resize-handle creator-pane-resize"
+ role="separator"
+ aria-label={l('调整操作区和对话区宽度', 'Resize workspace and conversation panels')}
+ aria-orientation="vertical"
+ aria-valuemin={WORKSPACE_MIN_WIDTH}
+ aria-valuenow={workspaceWidth}
+ aria-valuetext={workspaceWidth === undefined
+ ? l('默认宽度', 'Default width')
+ : l(`操作区宽度 ${workspaceWidth} 像素`, `Workspace width ${workspaceWidth} pixels`)}
+ tabIndex={0}
+ title={l('拖动调整宽度,双击恢复默认', 'Drag to resize. Double-click to restore the default.')}
+ onDoubleClick={() => setWorkspaceWidth(undefined)}
+ onMouseDown={handleMouseDown}
+ onKeyDown={handleKeyDown}
+ />
+ {props.agentPanel}
+ </div>
+ );
+}
diff --git a/apps/web/src/features/dashboard/CreatorToolShell.tsx b/apps/web/src/features/dashboard/CreatorToolShell.tsx
index 9af85117..500508c5 100644
--- a/apps/web/src/features/dashboard/CreatorToolShell.tsx
+++ b/apps/web/src/features/dashboard/CreatorToolShell.tsx
@@ -4,6 +4,7 @@ import { useLocalizedCopy } from '../../i18n/useLocalizedCopy.js';
import CreatorCollaborationPanel, {
type CreatorPanelQuickAction
} from './CreatorCollaborationPanel.js';
+import CreatorResizableLayout from './CreatorResizableLayout.js';
import { creatorPanelAdapterFor } from './creator-panel-adapters.js';
import { useOptionalCreatorSession } from './creator-session-store.js';
@@ -39,8 +40,9 @@ export default function CreatorToolShell(props: {
return (
<main className={`creator-workspace-page${props.pageClassName ? ` ${props.pageClassName}` : ''}`}>
- <div className="creator-workspace-layout">
- <section className="creator-workspace-main" aria-label={`${props.title} ${l('操作区', 'workspace')}`}>
+ <CreatorResizableLayout
+ className="creator-workspace-layout"
+ workspace={<section className="creator-workspace-main" aria-label={`${props.title} ${l('操作区', 'workspace')}`}>
<header className={`creator-workspace-header${props.titleIcon === undefined ? '' : ' has-title-icon'}`}>
<button type="button" onClick={props.onBack} aria-label={l('返回', 'Back')}>
<ArrowLeft size={18} strokeWidth={1.8} aria-hidden="true" />
@@ -54,9 +56,8 @@ export default function CreatorToolShell(props: {
</div>
</header>
<div className={`creator-workspace-content${props.contentClassName ? ` ${props.contentClassName}` : ''}`}>{props.children}</div>
- </section>
-
- <CreatorCollaborationPanel
+ </section>}
+ agentPanel={<CreatorCollaborationPanel
adapter={adapter}
stepLabel={props.stepLabel ?? props.title}
contextSummary={props.context}
@@ -66,8 +67,8 @@ export default function CreatorToolShell(props: {
onCancelTask={props.onCancelTask}
onResumeTask={props.onResumeTask}
taskControlPending={props.taskControlPending}
- />
- </div>
+ />}
+ />
</main>
);
}
diff --git a/apps/web/src/features/dashboard/DashboardPage.test.tsx b/apps/web/src/features/dashboard/DashboardPage.test.tsx
index 055047a5..f5752520 100644
--- a/apps/web/src/features/dashboard/DashboardPage.test.tsx
+++ b/apps/web/src/features/dashboard/DashboardPage.test.tsx
@@ -1566,16 +1566,16 @@ describe('DashboardPage', () => {
fireEvent.mouseDown(separator, { button: 0, clientX: 800 });
fireEvent.mouseMove(window, { clientX: 720 });
fireEvent.mouseUp(window);
- expect(layout).toHaveStyle({ '--video-translation-pane-width': '720px' });
+ expect(layout).toHaveStyle({ '--creator-workspace-pane-width': '720px' });
fireEvent.keyDown(separator, { key: 'ArrowLeft' });
- expect(layout).toHaveStyle({ '--video-translation-pane-width': '688px' });
+ expect(layout).toHaveStyle({ '--creator-workspace-pane-width': '688px' });
fireEvent.keyDown(separator, { key: 'ArrowRight' });
- expect(layout).toHaveStyle({ '--video-translation-pane-width': '720px' });
+ expect(layout).toHaveStyle({ '--creator-workspace-pane-width': '720px' });
fireEvent.keyDown(separator, { key: 'ArrowLeft' });
- expect(layout).toHaveStyle({ '--video-translation-pane-width': '688px' });
+ expect(layout).toHaveStyle({ '--creator-workspace-pane-width': '688px' });
fireEvent.doubleClick(separator);
- expect(layout.style.getPropertyValue('--video-translation-pane-width')).toBe('');
+ expect(layout.style.getPropertyValue('--creator-workspace-pane-width')).toBe('');
});
it('supports local video, dubbing and vertical output options', async () => {
diff --git a/apps/web/src/features/dashboard/VideoTranslationWorkspace.tsx b/apps/web/src/features/dashboard/VideoTranslationWorkspace.tsx
index 7be8a03c..2b3d8ac6 100644
--- a/apps/web/src/features/dashboard/VideoTranslationWorkspace.tsx
+++ b/apps/web/src/features/dashboard/VideoTranslationWorkspace.tsx
@@ -3,9 +3,7 @@ import {
useMemo,
useRef,
useState,
- type CSSProperties,
- type KeyboardEvent as ReactKeyboardEvent,
- type MouseEvent as ReactMouseEvent
+ type CSSProperties
} from 'react';
import {
ArrowLeft,
@@ -22,12 +20,12 @@ import {
Play,
Sparkles
} from 'lucide-react';
-import { beginPaneResize } from '../../components/layout/pane-resize-2026-07-29.js';
import { TtsVoicePicker } from '../../components/tts/TtsVoicePicker.js';
import { useLocalizedCopy, type LocalizeCopy } from '../../i18n/useLocalizedCopy.js';
import type { CreatorServicesSettingsService } from '../../services/creator-services-service.js';
import type { VideoMetadataService } from '../../services/video-metadata-service.js';
import VideoTranslationAgentPanel from './VideoTranslationAgentPanel.js';
+import CreatorResizableLayout from './CreatorResizableLayout.js';
import CreatorTaskSummary from './CreatorTaskSummary.js';
import VideoSourceInput from './VideoSourceInput.js';
import VideoSourcePreview from './VideoSourcePreview.js';
@@ -160,11 +158,6 @@ const defaultSubtitleStyle: SubtitleStyleSettings = {
subtitleShadowOffsetY: 1.5,
subtitleShadowBlur: 0.5
};
-const WORKSPACE_MIN_WIDTH = 390;
-const AGENT_MIN_WIDTH = 280;
-const WORKSPACE_RESIZE_HANDLE_WIDTH = 7;
-const WORKSPACE_RESIZE_KEY_STEP = 32;
-
const sourceLanguages: LanguageOption[] = [
{ value: 'zh_cn', label: '简体中文' },
{ value: 'en', label: 'English' },
@@ -1391,7 +1384,6 @@ export default function VideoTranslationWorkspace(props: {
const l = useLocalizedCopy();
const creatorSession = useOptionalCreatorSession();
const videoInputRef = useRef<HTMLInputElement>(null);
- const collabLayoutRef = useRef<HTMLDivElement>(null);
const agentFocusTimeoutRef = useRef<number>();
const skipPersistRef = useRef(false);
const restoredResultNavigationRef = useRef<{
@@ -1438,7 +1430,6 @@ export default function VideoTranslationWorkspace(props: {
const [verticalTitle, setVerticalTitle] = useState('');
const [verticalSubtitle, setVerticalSubtitle] = useState('');
const [attemptedContinue, setAttemptedContinue] = useState(false);
- const [workspacePaneWidth, setWorkspacePaneWidth] = useState<number>();
const [resultTab, setResultTab] = useState<VideoTranslationResultTab>('video');
const [resultVersion, setResultVersion] = useState(1);
const [resultVersions, setResultVersions] = useState<TranslationResultVersion[]>([]);
@@ -2679,69 +2670,12 @@ export default function VideoTranslationWorkspace(props: {
}
}
- function paneWidthBounds() {
- const rect = collabLayoutRef.current?.getBoundingClientRect();
- const fallbackWidth = 900;
- return {
- fallback: rect ? Math.round(rect.width * 0.68) : fallbackWidth,
- max: rect
- ? Math.max(
- WORKSPACE_MIN_WIDTH,
- rect.width - AGENT_MIN_WIDTH - WORKSPACE_RESIZE_HANDLE_WIDTH
- )
- : fallbackWidth
- };
- }
-
- function updateWorkspacePaneWidth(clientX: number) {
- const rect = collabLayoutRef.current?.getBoundingClientRect();
- if (!rect) return;
- setWorkspacePaneWidth(clampPaneWidth(
- clientX - rect.left,
- WORKSPACE_MIN_WIDTH,
- Math.max(
- WORKSPACE_MIN_WIDTH,
- rect.width - AGENT_MIN_WIDTH - WORKSPACE_RESIZE_HANDLE_WIDTH
- )
- ));
- }
-
- function adjustWorkspacePaneWidth(delta: number) {
- const bounds = paneWidthBounds();
- setWorkspacePaneWidth(previous => clampPaneWidth(
- (previous ?? bounds.fallback) + delta,
- WORKSPACE_MIN_WIDTH,
- bounds.max
- ));
- }
-
- function handlePaneResizeMouseDown(event: ReactMouseEvent<HTMLDivElement>) {
- beginPaneResize(event, updateWorkspacePaneWidth);
- }
-
- function handlePaneResizeKeyDown(event: ReactKeyboardEvent<HTMLDivElement>) {
- if (event.key === 'ArrowLeft') {
- event.preventDefault();
- adjustWorkspacePaneWidth(-WORKSPACE_RESIZE_KEY_STEP);
- } else if (event.key === 'ArrowRight') {
- event.preventDefault();
- adjustWorkspacePaneWidth(WORKSPACE_RESIZE_KEY_STEP);
- }
- }
-
- const collabLayoutStyle = workspacePaneWidth === undefined
- ? undefined
- : ({ '--video-translation-pane-width': `${workspacePaneWidth}px` } as CSSProperties);
-
return (
<main className="video-translation-page">
<div className="video-translation-page-inner video-translation-wizard">
- <div
+ <CreatorResizableLayout
className="video-translation-collab-layout"
- ref={collabLayoutRef}
- style={collabLayoutStyle}
- >
- <div
+ workspace={<div
className="video-translation-wizard-main"
data-step={currentStep}
data-phase={workspacePhase}
@@ -3322,26 +3256,8 @@ export default function VideoTranslationWorkspace(props: {
{renderTaskControlButton()}
</footer>
) : null}
- </div>
-
- <div
- className="pane-resize-handle video-translation-pane-resize"
- role="separator"
- aria-label={l('调整操作区和对话区宽度', 'Resize workspace and conversation panels')}
- aria-orientation="vertical"
- aria-valuemin={WORKSPACE_MIN_WIDTH}
- aria-valuenow={workspacePaneWidth}
- aria-valuetext={workspacePaneWidth === undefined
- ? l('默认宽度', 'Default width')
- : l(`操作区宽度 ${workspacePaneWidth} 像素`, `Workspace width ${workspacePaneWidth} pixels`)}
- tabIndex={0}
- title={l('拖动调整宽度,双击恢复默认', 'Drag to resize. Double-click to restore the default.')}
- onDoubleClick={() => setWorkspacePaneWidth(undefined)}
- onMouseDown={handlePaneResizeMouseDown}
- onKeyDown={handlePaneResizeKeyDown}
- />
-
- <VideoTranslationAgentPanel
+ </div>}
+ agentPanel={<VideoTranslationAgentPanel
stepLabel={workspacePhase === 'result' ? l('项目结果', 'Project results') : localizeStep(steps[currentStep], l)}
contextSummary={agentContextSummary}
promptHint={props.promptHint}
@@ -3384,8 +3300,8 @@ export default function VideoTranslationWorkspace(props: {
onCancelTask={requestCancelTask}
onResumeTask={() => void resumeTask()}
taskControlPending={taskControlPending}
- />
- </div>
+ />}
+ />
</div>
{cancelDialogOpen && activeStage !== undefined ? (
<div
@@ -3451,10 +3367,6 @@ function sourceArtifactMatchesFile(artifact: CreatorArtifact, file: File): boole
&& readArtifactNumber(artifact, 'lastModified') === file.lastModified;
}
-function clampPaneWidth(value: number, min: number, max: number) {
- return Math.min(Math.max(value, min), max);
-}
-
function creatorErrorMessage(cause: unknown, l: LocalizeCopy): string {
const candidate = cause as { code?: unknown; message?: unknown };
const code = typeof candidate?.code === 'string' ? candidate.code : '';
diff --git a/apps/web/src/features/dashboard/WechatArticleWorkspace.test.tsx b/apps/web/src/features/dashboard/WechatArticleWorkspace.test.tsx
index 936d29c4..a4879bc9 100644
--- a/apps/web/src/features/dashboard/WechatArticleWorkspace.test.tsx
+++ b/apps/web/src/features/dashboard/WechatArticleWorkspace.test.tsx
@@ -119,6 +119,7 @@ describe('WechatArticleWorkspace', () => {
expect(screen.getByRole('tab', { name: '配图' })).toBeInTheDocument();
expect(container.querySelector('.wechat-result-preview')).not.toBeInTheDocument();
expect(container.querySelector('.creator-collaboration-panel')).toBeInTheDocument();
+ expect(screen.getByRole('separator', { name: '调整操作区和对话区宽度' })).toBeInTheDocument();
fireEvent.click(screen.getByRole('button', { name: '下载 Markdown 文档' }));
await waitFor(() => expect(openArtifact).toHaveBeenCalledWith(job.id, 'article-document-1'));
@@ -564,6 +565,43 @@ describe('WechatArticleWorkspace', () => {
expect(screen.getByText('故事叙事')).toBeInTheDocument();
});
+ it('allows editing the topic count and enforces its range when committed', async () => {
+ const job = inspirationJob();
+ job.state.currentStep = 1;
+ job.state.furthestStep = 1;
+ const applyAction = vi.fn(async (_jobId: string, request: CreatorActionRequest) => {
+ if (request.action === 'update-settings') Object.assign(job.state, readPatch(request));
+ job.revision += 1;
+ return actionResponse(job, request.action);
+ });
+ render(
+ <LanguageProvider initialPreference="zh-CN">
+ <CreatorSessionProvider
+ initialJob={job}
+ service={{ applyAction, runAgentTurn: vi.fn() } as never}
+ >
+ <WechatArticleWorkspace onBack={vi.fn()} />
+ </CreatorSessionProvider>
+ </LanguageProvider>
+ );
+
+ const input = screen.getByRole('spinbutton', { name: '候选选题数量' });
+ expect(input).toHaveValue(5);
+
+ fireEvent.change(input, { target: { value: '' } });
+ expect(input).toHaveValue(null);
+
+ fireEvent.change(input, { target: { value: '2' } });
+ fireEvent.blur(input);
+ expect(input).toHaveValue(3);
+ await waitFor(() => expect(job.state.topicCount).toBe(3));
+
+ fireEvent.change(input, { target: { value: '7' } });
+ fireEvent.keyDown(input, { key: 'Enter' });
+ expect(input).toHaveValue(7);
+ await waitFor(() => expect(job.state.topicCount).toBe(7));
+ });
+
it('starts without a selected template and exposes the template list', () => {
const job = inspirationJob();
job.state.currentStep = 1;
diff --git a/apps/web/src/features/dashboard/WechatArticleWorkspace.tsx b/apps/web/src/features/dashboard/WechatArticleWorkspace.tsx
index e2119d90..06eb40e1 100644
--- a/apps/web/src/features/dashboard/WechatArticleWorkspace.tsx
+++ b/apps/web/src/features/dashboard/WechatArticleWorkspace.tsx
@@ -172,6 +172,7 @@ export default function WechatArticleWorkspace(props: {
const [urlInput, setUrlInput] = useState('');
const [writingPrompt, setWritingPrompt] = useState(() => readString(session?.state.writingPrompt));
const [topicCount, setTopicCount] = useState(() => readTopicCount(session?.state.topicCount));
+ const [topicCountDraft, setTopicCountDraft] = useState(() => String(readTopicCount(session?.state.topicCount)));
const [topics, setTopics] = useState<WechatArticleTopic[]>(() => readTopics(session?.state.topics));
const [selectedTopicId, setSelectedTopicId] = useState(() => readString(session?.state.selectedTopicId));
const [outline, setOutline] = useState(() => readString(session?.state.outline));
@@ -208,6 +209,16 @@ export default function WechatArticleWorkspace(props: {
const [dismissedErrorKey, setDismissedErrorKey] = useState('');
const [taskControlPending, setTaskControlPending] = useState<'canceling' | 'resuming'>();
+ function commitTopicCount() {
+ const parsed = Number(topicCountDraft);
+ const value = topicCountDraft.trim() && Number.isFinite(parsed)
+ ? Math.max(3, Math.min(10, Math.trunc(parsed)))
+ : topicCount;
+ setTopicCount(value);
+ setTopicCountDraft(String(value));
+ session?.updateDraft({ topicCount: value });
+ }
+
const selectedDocumentIds = useMemo(
() => readStringArray(session?.state.sourceDocumentArtifactIds),
[session?.state.sourceDocumentArtifactIds]
@@ -1197,7 +1208,7 @@ export default function WechatArticleWorkspace(props: {
<section className="creator-tool-panel wechat-writing-brief-panel">
<div className="creator-tool-panel-heading"><div><h2>{l('写作要求', 'Writing brief')}</h2><p>{l('说明主题、目标读者、篇幅、语气和必须覆盖的观点', 'Describe the topic, audience, length, tone, and required points.')}</p></div></div>
<label className="creator-tool-field"><span>{l('提示词', 'Instructions')}</span><textarea rows={15} value={writingPrompt} onChange={event => { setWritingPrompt(event.target.value); session?.updateDraft({ writingPrompt: event.target.value }); }} placeholder={l('例如:面向 AI 产品经理,写一篇 2000 字左右的深度分析,重点讨论实际落地中的三个误区。', 'For example: Write a 2,000-word analysis for AI product managers, focusing on three common implementation mistakes.')} /></label>
- <label className="creator-tool-field wechat-topic-count"><span>{l('候选选题数量', 'Topic options')}</span><input type="number" min={3} max={10} value={topicCount} onChange={event => { const value = Math.max(3, Math.min(10, Number(event.target.value) || 5)); setTopicCount(value); session?.updateDraft({ topicCount: value }); }} /></label>
+ <label className="creator-tool-field wechat-topic-count"><span>{l('候选选题数量', 'Topic options')}</span><input type="number" min={3} max={10} value={topicCountDraft} onChange={event => setTopicCountDraft(event.target.value)} onBlur={commitTopicCount} onKeyDown={event => { if (event.key === 'Enter') { event.preventDefault(); commitTopicCount(); } }} /></label>
</section>
<section className="creator-tool-panel wechat-template-selection-panel">
<div className="creator-tool-panel-heading"><div><h2>{l('写作模板', 'Writing template')}</h2><p>{l('模板负责文章结构,写作要求仍以左侧提示词为准', 'The template guides structure while the writing brief remains primary.')}</p></div></div>
diff --git a/apps/web/src/features/dashboard/XiaohongshuPostWorkspace.test.tsx b/apps/web/src/features/dashboard/XiaohongshuPostWorkspace.test.tsx
index f9b13a58..84e83833 100644
--- a/apps/web/src/features/dashboard/XiaohongshuPostWorkspace.test.tsx
+++ b/apps/web/src/features/dashboard/XiaohongshuPostWorkspace.test.tsx
@@ -53,6 +53,11 @@ describe('XiaohongshuPostWorkspace', () => {
</LanguageProvider>
);
+ const workflow = screen.getByRole('navigation', { name: '小红书帖子生成流程' });
+ expect(screen.getByRole('button', { name: /创作设置/ })).toHaveAttribute('aria-current', 'step');
+ expect(screen.getByRole('button', { name: /帖子结果/ })).toBeDisabled();
+ expect(screen.queryByRole('heading', { name: '帖子结果' })).not.toBeInTheDocument();
+
fireEvent.change(screen.getByRole('textbox', { name: '小红书帖子主题或素材' }), {
target: { value: '分享第一次参与开源项目的过程' }
});
@@ -64,6 +69,8 @@ describe('XiaohongshuPostWorkspace', () => {
fireEvent.click(screen.getByRole('button', { name: '生成帖子' }));
expect(await screen.findByRole('textbox', { name: '生成的小红书帖子' })).toHaveValue(markdown);
+ expect(workflow).toBeInTheDocument();
+ expect(screen.getByRole('button', { name: /帖子结果/ })).toHaveAttribute('aria-current', 'step');
expect(openArtifact).toHaveBeenCalledWith('xiaohongshu_job', 'xiaohongshu_post_v1');
expect(applyAction).toHaveBeenLastCalledWith(
'xiaohongshu_job',
@@ -82,6 +89,10 @@ describe('XiaohongshuPostWorkspace', () => {
fireEvent.click(screen.getByRole('button', { name: '复制帖子' }));
await waitFor(() => expect(copy).toHaveBeenCalledWith(markdown));
expect(screen.getByText('帖子已复制到剪贴板')).toBeInTheDocument();
+
+ fireEvent.click(screen.getByRole('button', { name: '上一步' }));
+ expect(screen.getByRole('heading', { name: '创作设置' })).toBeInTheDocument();
+ expect(screen.getByRole('button', { name: '重新生成' })).toBeInTheDocument();
});
it('uses settings updated through the collaboration session', async () => {
@@ -212,6 +223,7 @@ describe('XiaohongshuPostWorkspace', () => {
</LanguageProvider>
);
+ expect(screen.getByRole('button', { name: /帖子结果/ })).toHaveAttribute('aria-current', 'step');
expect(await screen.findByRole('textbox', { name: '生成的小红书帖子' }))
.toHaveValue('# 可下载的帖子\n');
fireEvent.click(screen.getByRole('button', { name: '下载 Markdown' }));
diff --git a/apps/web/src/features/dashboard/XiaohongshuPostWorkspace.tsx b/apps/web/src/features/dashboard/XiaohongshuPostWorkspace.tsx
index 41fc8087..553525d5 100644
--- a/apps/web/src/features/dashboard/XiaohongshuPostWorkspace.tsx
+++ b/apps/web/src/features/dashboard/XiaohongshuPostWorkspace.tsx
@@ -1,5 +1,6 @@
import type { CreatorArtifact, CreatorJson } from '@opencreator/protocol';
import {
+ Check,
Copy,
Download,
LoaderCircle,
@@ -14,6 +15,7 @@ import { useOptionalCreatorSession } from './creator-session-store.js';
type PostStyle = 'experience' | 'tutorial' | 'recommendation' | 'review';
type PostLength = 'short' | 'medium' | 'long';
+type PostStep = 0 | 1;
const styles: Array<{ value: PostStyle; zh: string; en: string }> = [
{ value: 'experience', zh: '经验分享', en: 'Experience' },
@@ -34,6 +36,11 @@ export default function XiaohongshuPostWorkspace(props: {
}) {
const l = useLocalizedCopy();
const session = useOptionalCreatorSession();
+ const result = useMemo(
+ () => readLatestResult(session?.job.artifacts ?? []),
+ [session?.job.artifacts]
+ );
+ const restoredStep: PostStep = result === undefined ? 0 : 1;
const [topic, setTopic] = useState(() => readString(session?.state.topic));
const [audience, setAudience] = useState(() => readString(session?.state.audience));
const [style, setStyle] = useState<PostStyle>(() => readStyle(session?.state.style));
@@ -45,10 +52,8 @@ export default function XiaohongshuPostWorkspace(props: {
const [notice, setNotice] = useState('');
const [error, setError] = useState('');
const [taskControlPending, setTaskControlPending] = useState<'canceling' | 'resuming'>();
- const result = useMemo(
- () => readLatestResult(session?.job.artifacts ?? []),
- [session?.job.artifacts]
- );
+ const [currentStep, setCurrentStep] = useState<PostStep>(restoredStep);
+ const [furthestStep, setFurthestStep] = useState<PostStep>(restoredStep);
const latestStage = session?.job.stages.filter(stage => stage.stageId === 'generate').at(-1);
const generating = latestStage?.status === 'queued' || latestStage?.status === 'running';
const runtimeError = latestStage?.status === 'failed'
@@ -94,6 +99,12 @@ export default function XiaohongshuPostWorkspace(props: {
return () => { active = false; };
}, [l, result?.artifact.id, session?.openArtifact]);
+ useEffect(() => {
+ if (result === undefined) return;
+ setCurrentStep(1);
+ setFurthestStep(1);
+ }, [result?.artifact.id]);
+
function updateTopic(value: string) {
setTopic(value);
session?.updateDraft({ topic: value });
@@ -153,6 +164,8 @@ export default function XiaohongshuPostWorkspace(props: {
action: 'run-stage',
input: { stageId: 'generate' }
});
+ setCurrentStep(1);
+ setFurthestStep(1);
setNotice(l(
'生成任务已提交,完成后会自动显示帖子',
'Generation started. The post will appear automatically.'
@@ -212,6 +225,7 @@ export default function XiaohongshuPostWorkspace(props: {
const selectedStyle = styles.find(item => item.value === style) ?? styles[0]!;
const selectedLength = lengths.find(item => item.value === length) ?? lengths[1]!;
+ const stepLabels = [l('创作设置', 'Post settings'), l('帖子结果', 'Post result')] as const;
return (
<CreatorToolShell
title={l('小红书帖子生成器', 'Xiaohongshu Post Generator')}
@@ -221,7 +235,7 @@ export default function XiaohongshuPostWorkspace(props: {
: generating
? l('正在生成帖子', 'Generating post')
: `${l(selectedStyle.zh, selectedStyle.en)} · ${l(selectedLength.zh, selectedLength.en)}`}
- stepLabel={generating ? l('正在生成帖子', 'Generating post') : l('小红书帖子', 'Xiaohongshu post')}
+ stepLabel={generating ? l('正在生成帖子', 'Generating post') : stepLabels[currentStep]}
currentIssue={visibleError || undefined}
suggestions={result
? [l('标题更有吸引力', 'Make the title more engaging'), l('减少营销感', 'Make it less promotional')]
@@ -237,7 +251,22 @@ export default function XiaohongshuPostWorkspace(props: {
pageClassName="xiaohongshu-post-workspace-page"
>
<div className="creator-tool-stack xiaohongshu-post-stack">
- <section className="creator-tool-panel" aria-labelledby="xiaohongshu-post-settings-title">
+ <nav className="video-translation-steps creator-tool-steps creator-tool-steps-two" aria-label={l('小红书帖子生成流程', 'Xiaohongshu post workflow')}>
+ <ol>{stepLabels.map((label, index) => {
+ const active = currentStep === index;
+ const completed = index < currentStep;
+ return (
+ <li key={label} data-active={active} data-completed={completed} data-visited={index <= furthestStep}>
+ <button type="button" disabled={index > furthestStep} aria-current={active ? 'step' : undefined} onClick={() => setCurrentStep(index as PostStep)}>
+ <span>{completed ? <Check size={13} strokeWidth={2.2} /> : index + 1}</span>
+ <strong>{label}</strong>
+ </button>
+ </li>
+ );
+ })}</ol>
+ </nav>
+
+ {currentStep === 0 ? <section className="creator-tool-panel" aria-labelledby="xiaohongshu-post-settings-title">
<div className="creator-tool-panel-heading">
<div>
<h2 id="xiaohongshu-post-settings-title">{l('创作设置', 'Post settings')}</h2>
@@ -310,23 +339,9 @@ export default function XiaohongshuPostWorkspace(props: {
/>
</label>
</div>
- <div className="creator-tool-actions">
- <button type="button" onClick={() => void generate()} disabled={generating}>
- {generating
- ? <LoaderCircle className="xiaohongshu-post-spinner" size={16} strokeWidth={1.8} aria-hidden="true" />
- : result
- ? <RotateCcw size={16} strokeWidth={1.8} aria-hidden="true" />
- : <Sparkles size={16} strokeWidth={1.8} aria-hidden="true" />}
- {generating
- ? l('正在生成', 'Generating')
- : result
- ? l('重新生成', 'Regenerate')
- : l('生成帖子', 'Generate post')}
- </button>
- </div>
- </section>
+ </section> : null}
- <section className="creator-tool-panel xiaohongshu-post-result-panel" aria-labelledby="xiaohongshu-post-result-title">
+ {currentStep === 1 ? <section className="creator-tool-panel xiaohongshu-post-result-panel" aria-labelledby="xiaohongshu-post-result-title">
<div className="creator-tool-panel-heading">
<div>
<h2 id="xiaohongshu-post-result-title">{l('帖子结果', 'Post result')}</h2>
@@ -361,7 +376,7 @@ export default function XiaohongshuPostWorkspace(props: {
<span>{generating ? l('正在生成帖子', 'Generating post') : l('还没有生成内容', 'No post generated yet')}</span>
</div>
)}
- </section>
+ </section> : null}
{visibleError ? (
<div className="xiaohongshu-post-error" role="alert">
@@ -372,6 +387,24 @@ export default function XiaohongshuPostWorkspace(props: {
</div>
) : null}
{notice ? <p className="creator-tool-notice" role="status">{notice}</p> : null}
+
+ <footer className="video-translation-wizard-actions xiaohongshu-post-actions">
+ <button className="video-translation-secondary-action" type="button" onClick={() => currentStep === 0 ? props.onBack() : setCurrentStep(0)}>
+ {currentStep === 0 ? l('返回', 'Back') : l('上一步', 'Back')}
+ </button>
+ {currentStep === 0 ? <button className="video-translation-primary-action" type="button" onClick={() => void generate()} disabled={generating}>
+ {generating
+ ? <LoaderCircle className="xiaohongshu-post-spinner" size={16} strokeWidth={1.8} aria-hidden="true" />
+ : result
+ ? <RotateCcw size={16} strokeWidth={1.8} aria-hidden="true" />
+ : <Sparkles size={16} strokeWidth={1.8} aria-hidden="true" />}
+ {generating
+ ? l('正在生成', 'Generating')
+ : result
+ ? l('重新生成', 'Regenerate')
+ : l('生成帖子', 'Generate post')}
+ </button> : null}
+ </footer>
</div>
</CreatorToolShell>
);
diff --git a/apps/web/src/features/dashboard/dashboard-css.test.ts b/apps/web/src/features/dashboard/dashboard-css.test.ts
index 56c8b783..e0b3b450 100644
--- a/apps/web/src/features/dashboard/dashboard-css.test.ts
+++ b/apps/web/src/features/dashboard/dashboard-css.test.ts
@@ -30,6 +30,43 @@ describe('dashboard CSS contracts', () => {
}
});
+ it('uses the available article brief height for long writing instructions', () => {
+ const scroll = cssBlocks('.wechat-article-scroll[data-step="1"]')[0];
+ const grid = cssBlocks('.wechat-brief-grid')[0];
+ const field = cssBlocks(
+ '.wechat-writing-brief-panel > .creator-tool-field:first-of-type'
+ )[0];
+ const textarea = cssBlocks(
+ '.wechat-writing-brief-panel > .creator-tool-field:first-of-type textarea'
+ )[0];
+
+ expect(scroll).toContain('grid-template-rows: minmax(0, 1fr);');
+ expect(scroll).toContain('overflow: hidden;');
+ expect(grid).toContain('height: 100%;');
+ expect(field).toContain('grid-template-rows: auto minmax(0, 1fr);');
+ expect(textarea).toContain('height: 100%;');
+ expect(textarea).toContain('min-height: 0;');
+ });
+
+ it('uses the available outline step height for long article outlines', () => {
+ const scroll = cssBlocks('.wechat-article-scroll[data-step="3"]')[0];
+ const panel = cssBlocks(
+ '.wechat-article-scroll[data-step="3"] > .wechat-outline-panel'
+ )[0];
+ const field = cssBlocks('.wechat-outline-panel > .creator-tool-field')[0];
+ const textarea = cssBlocks(
+ '.wechat-outline-panel .creator-tool-field > .wechat-outline-editor'
+ )[0];
+
+ expect(scroll).toContain('grid-template-rows: minmax(0, 1fr);');
+ expect(scroll).toContain('overflow: hidden;');
+ expect(panel).toContain('height: 100%;');
+ expect(panel).toContain('grid-template-rows: auto minmax(0, 1fr);');
+ expect(field).toContain('grid-template-rows: minmax(0, 1fr);');
+ expect(textarea).toContain('height: 100%;');
+ expect(textarea).toContain('min-height: 0;');
+ });
+
it('separates Creator form groups and top-aligns fields beside taller previews', () => {
const formRow = cssBlocks('.creator-tool-form-row');
const characterPicker = cssBlocks('.stickman-character-picker');
@@ -55,10 +92,11 @@ describe('dashboard CSS contracts', () => {
expect(sharedPanel[0]).toContain('height: 100%;');
expect(sharedPanel[0]).toContain('min-height: 0;');
expect(sharedPanel[0]).toContain('grid-template-rows: auto auto minmax(0, 1fr) auto auto;');
- expect(workspaceLayout[0]).toContain('min-width: 680px;');
- expect(workspaceLayout[0]).toContain('grid-template-columns: minmax(0, 3fr) minmax(280px, 1fr);');
- expect(translationLayout[0]).toContain('min-width: 680px;');
- expect(translationLayout[0]).toContain('minmax(280px, 1fr);');
+ const resizableLayout = cssBlocks('.creator-resizable-layout');
+ expect(resizableLayout[0]).toContain('min-width: 680px;');
+ expect(resizableLayout[0]).toContain('minmax(280px, 1fr);');
+ expect(workspaceLayout[0]).toContain('height: 100%;');
+ expect(translationLayout[0]).toContain('height: 100%;');
expect(dashboardCss).not.toMatch(/\.creator-collaboration-panel\s*\{[^}]*height: auto;/);
});
diff --git a/apps/web/src/features/dashboard/dashboard.css b/apps/web/src/features/dashboard/dashboard.css
index cfcbe210..ae87d439 100644
--- a/apps/web/src/features/dashboard/dashboard.css
+++ b/apps/web/src/features/dashboard/dashboard.css
@@ -1448,9 +1448,30 @@
.creator-workspace-layout {
height: 100%;
+}
+
+.creator-resizable-layout {
min-width: 680px;
+ min-height: 0;
display: grid;
- grid-template-columns: minmax(0, 3fr) minmax(280px, 1fr);
+ grid-template-columns:
+ minmax(
+ 0,
+ min(
+ var(--creator-workspace-pane-width, calc(75% - 3.5px)),
+ calc(100% - 287px)
+ )
+ )
+ 7px
+ minmax(280px, 1fr);
+ align-items: stretch;
+ overflow: hidden;
+}
+
+.creator-pane-resize {
+ z-index: 2;
+ height: 100%;
+ background: var(--conversation-bg);
}
.creator-workspace-main {
@@ -2841,6 +2862,20 @@
scrollbar-gutter: auto;
}
+.wechat-article-scroll[data-step="1"] {
+ display: grid;
+ grid-template-rows: minmax(0, 1fr);
+ overflow: hidden;
+ scrollbar-gutter: auto;
+}
+
+.wechat-article-scroll[data-step="3"] {
+ display: grid;
+ grid-template-rows: minmax(0, 1fr);
+ overflow: hidden;
+ scrollbar-gutter: auto;
+}
+
.wechat-article-scroll[data-step="4"] > .wechat-article-panel {
height: 100%;
min-height: 0;
@@ -3182,6 +3217,8 @@
}
.wechat-brief-grid {
+ min-height: 0;
+ height: 100%;
display: grid;
grid-template-columns: minmax(0, 2fr) minmax(280px, 1fr);
align-items: stretch;
@@ -3190,7 +3227,9 @@
.wechat-writing-brief-panel,
.wechat-template-selection-panel {
- min-height: 480px;
+ min-height: 0;
+ height: 100%;
+ overflow-y: auto;
}
.wechat-writing-brief-panel {
@@ -3199,11 +3238,15 @@
}
.wechat-writing-brief-panel > .creator-tool-field:first-of-type {
+ min-height: 0;
flex: 1 1 auto;
+ grid-template-rows: auto minmax(0, 1fr);
}
.wechat-writing-brief-panel > .creator-tool-field:first-of-type textarea {
- min-height: 330px;
+ min-height: 0;
+ height: 100%;
+ resize: none;
}
.wechat-template-selection-panel {
@@ -4602,14 +4645,27 @@
box-shadow: 0 0 0 2px color-mix(in srgb, var(--text) 5%, transparent);
}
-.wechat-outline-editor {
- min-height: 430px;
+.wechat-outline-panel .creator-tool-field > .wechat-outline-editor {
+ min-height: 0;
+ height: 100%;
resize: none;
overflow-y: auto;
font-family: var(--font-mono);
line-height: 1.65;
}
+.wechat-article-scroll[data-step="3"] > .wechat-outline-panel {
+ min-height: 0;
+ height: 100%;
+ display: grid;
+ grid-template-rows: auto minmax(0, 1fr);
+}
+
+.wechat-outline-panel > .creator-tool-field {
+ min-height: 0;
+ grid-template-rows: minmax(0, 1fr);
+}
+
.wechat-article-edit-workbench {
min-height: 0;
height: 100%;
@@ -5667,10 +5723,47 @@
}
@media (max-width: 900px) {
+ .wechat-article-scroll[data-step="1"] {
+ display: block;
+ overflow-y: auto;
+ scrollbar-gutter: stable;
+ }
+
+ .wechat-article-scroll[data-step="3"] {
+ display: block;
+ overflow-y: auto;
+ scrollbar-gutter: stable;
+ }
+
.wechat-brief-grid {
+ height: auto;
grid-template-columns: minmax(0, 1fr);
}
+ .wechat-writing-brief-panel,
+ .wechat-template-selection-panel {
+ min-height: 480px;
+ height: auto;
+ overflow: visible;
+ }
+
+ .wechat-writing-brief-panel > .creator-tool-field:first-of-type textarea {
+ min-height: 330px;
+ height: auto;
+ resize: vertical;
+ }
+
+ .wechat-article-scroll[data-step="3"] > .wechat-outline-panel {
+ height: auto;
+ display: block;
+ }
+
+ .wechat-outline-panel .creator-tool-field > .wechat-outline-editor {
+ min-height: 430px;
+ height: auto;
+ resize: vertical;
+ }
+
.wechat-inspiration-workbench {
grid-template-columns: 240px minmax(0, 1fr);
}
@@ -11580,21 +11673,7 @@
.video-translation-collab-layout {
height: 100%;
- min-width: 680px;
- min-height: 0;
- display: grid;
- grid-template-columns:
- minmax(
- 0px,
- min(
- var(--video-translation-pane-width, calc(68% - 3.5px)),
- calc(100% - 287px)
- )
- )
- 7px
- minmax(280px, 1fr);
- align-items: stretch;
- overflow: hidden;
+ --creator-workspace-pane-width: min(calc(68% - 3.5px), calc(100% - 287px));
}
.video-translation-wizard-main {
@@ -11796,12 +11875,6 @@
margin-left: auto;
}
-.video-translation-pane-resize {
- z-index: 2;
- height: 100%;
- background: var(--conversation-bg);
-}
-
.creator-collaboration {
position: static;
min-width: 0;
@@ -12185,12 +12258,6 @@
min-width: 0;
}
-.video-translation-pane-resize {
- z-index: 2;
- height: 100%;
- background: var(--conversation-bg);
-}
-
.video-result-workspace {
min-height: 0;
height: 100%;
diff --git a/apps/web/src/features/settings/OpenCreatorSettingsView.test.tsx b/apps/web/src/features/settings/OpenCreatorSettingsView.test.tsx
index 32cf9d65..e947b7ca 100644
--- a/apps/web/src/features/settings/OpenCreatorSettingsView.test.tsx
+++ b/apps/web/src/features/settings/OpenCreatorSettingsView.test.tsx
@@ -218,6 +218,83 @@ describe('OpenCreatorSettingsView', () => {
expect(onDesktopCloseBehaviorChange).toHaveBeenCalledWith('quit');
});
+ it('shows storage paths and updates a selected completed output location', async () => {
+ const user = userEvent.setup();
+ const updateStorageSettings = vi.fn(async () => ({
+ configured: true,
+ settings: {
+ defaultProjectRoot: '/Users/demo/Projects',
+ outputRoot: '/Users/demo/Exports'
+ }
+ }));
+ const onSelectStorageDirectory = vi.fn(async () => '/Users/demo/Exports');
+ render(
+ <OpenCreatorSettingsView
+ runtimeStatus={runtimeStatus}
+ storageSettingsService={{
+ getStorageSettings: async () => ({
+ configured: false,
+ settings: {
+ defaultProjectRoot: '/Users/demo/Documents/OpenCreator',
+ outputRoot: '/Users/demo/Documents/OpenCreator/Exports'
+ }
+ }),
+ updateStorageSettings
+ }}
+ onSelectStorageDirectory={onSelectStorageDirectory}
+ onBack={vi.fn()}
+ />
+ );
+
+ expect(await screen.findByRole('textbox', { name: '默认项目位置' }))
+ .toHaveValue('/Users/demo/Documents/OpenCreator');
+ await user.click(screen.getByRole('button', { name: '选择完成产物位置' }));
+ expect(onSelectStorageDirectory).toHaveBeenCalledWith('output-root');
+ expect(updateStorageSettings).toHaveBeenCalledWith({
+ outputRoot: '/Users/demo/Exports'
+ });
+ expect(screen.getByRole('textbox', { name: '完成产物位置' }))
+ .toHaveValue('/Users/demo/Exports');
+ });
+
+ it('allows Browser users to enter and save an absolute storage path', async () => {
+ const user = userEvent.setup();
+ const updateStorageSettings = vi.fn(async (update: { outputRoot?: string }) => ({
+ configured: true,
+ settings: {
+ defaultProjectRoot: '/Users/demo/Documents/OpenCreator',
+ outputRoot: update.outputRoot ?? '/Users/demo/Documents/OpenCreator/Exports'
+ }
+ }));
+ render(
+ <OpenCreatorSettingsView
+ runtimeStatus={runtimeStatus}
+ storageSettingsService={{
+ getStorageSettings: async () => ({
+ configured: false,
+ settings: {
+ defaultProjectRoot: '/Users/demo/Documents/OpenCreator',
+ outputRoot: '/Users/demo/Documents/OpenCreator/Exports'
+ }
+ }),
+ updateStorageSettings
+ }}
+ onBack={vi.fn()}
+ />
+ );
+
+ const output = await screen.findByRole('textbox', { name: '完成产物位置' });
+ await user.clear(output);
+ await user.type(output, '/Users/demo/Custom Exports');
+ await user.click(screen.getByRole('button', { name: '保存完成产物位置' }));
+
+ expect(updateStorageSettings).toHaveBeenCalledWith({
+ outputRoot: '/Users/demo/Custom Exports'
+ });
+ expect(output).toHaveValue('/Users/demo/Custom Exports');
+ expect(screen.queryByRole('button', { name: '选择完成产物位置' })).not.toBeInTheDocument();
+ });
+
it('shows the anonymous telemetry scope and allows Desktop users to disable it', () => {
const onDesktopTelemetryEnabledChange = vi.fn();
render(
diff --git a/apps/web/src/features/settings/OpenCreatorSettingsView.tsx b/apps/web/src/features/settings/OpenCreatorSettingsView.tsx
index 46646410..fe08a41a 100644
--- a/apps/web/src/features/settings/OpenCreatorSettingsView.tsx
+++ b/apps/web/src/features/settings/OpenCreatorSettingsView.tsx
@@ -1,8 +1,9 @@
import { useEffect, useRef, useState, type CSSProperties } from 'react';
-import { Check, Moon, Sun } from 'lucide-react';
+import { Check, FolderOpen, Moon, Save, Sun } from 'lucide-react';
import type {
CodexProfileListResponse,
- CodexStatusResponse
+ CodexStatusResponse,
+ OpenCreatorStorageSettings
} from '@opencreator/protocol';
import { useConfirmDialog } from '../../components/dialogs/ConfirmDialogProvider.js';
import type { ColorMode } from '../../styles/color-mode.js';
@@ -32,6 +33,8 @@ import {
import type { RuntimeDependenciesController } from '../../app/use-runtime-dependencies.js';
import { RuntimeComponentsSettingsView } from './RuntimeComponentsSettingsView.js';
import './settings-management.css';
+import type { OpenCreatorSettingsService } from '../../services/opencreator-settings-service.js';
+import { useLocalizedCopy } from '../../i18n/useLocalizedCopy.js';
export type RuntimeStatus = {
connected: boolean;
@@ -70,6 +73,8 @@ export type OpenCreatorSettingsViewProps = {
memoryProjects?: MemoryScopeOption[];
memoryThreads?: MemoryScopeOption[];
runtimeDependencies?: RuntimeDependenciesController;
+ storageSettingsService?: Pick<OpenCreatorSettingsService, 'getStorageSettings' | 'updateStorageSettings'> | null;
+ onSelectStorageDirectory?(purpose: 'default-project-root' | 'output-root'): Promise<string | null>;
codexStatus?: CodexStatusResponse;
initialTab?: 'general' | 'ai-services' | 'local-components';
initialSection?: CreatorServicesSection;
@@ -153,6 +158,8 @@ export function OpenCreatorSettingsView(props: OpenCreatorSettingsViewProps) {
onDesktopCloseBehaviorChange={props.onDesktopCloseBehaviorChange}
desktopTelemetryEnabled={props.desktopTelemetryEnabled}
onDesktopTelemetryEnabledChange={props.onDesktopTelemetryEnabledChange}
+ storageSettingsService={props.storageSettingsService}
+ onSelectStorageDirectory={props.onSelectStorageDirectory}
/>
) : null}
{activeTab === 'ai-services' ? (
@@ -219,9 +226,66 @@ function GeneralSettings(props: {
onDesktopCloseBehaviorChange?(behavior: 'hide' | 'quit'): void;
desktopTelemetryEnabled?: boolean;
onDesktopTelemetryEnabledChange?(enabled: boolean): void;
+ storageSettingsService?: Pick<OpenCreatorSettingsService, 'getStorageSettings' | 'updateStorageSettings'> | null;
+ onSelectStorageDirectory?(purpose: 'default-project-root' | 'output-root'): Promise<string | null>;
}) {
const { language, preference, setPreference, t } = useAppLanguage();
const confirm = useConfirmDialog();
+ const l = useLocalizedCopy();
+ const [storage, setStorage] = useState<OpenCreatorStorageSettings>();
+ const [storageDraft, setStorageDraft] = useState<OpenCreatorStorageSettings>();
+ const [storageError, setStorageError] = useState<string>();
+ const [storageBusy, setStorageBusy] = useState(false);
+
+ useEffect(() => {
+ let canceled = false;
+ void props.storageSettingsService?.getStorageSettings()
+ .then(response => {
+ if (!canceled) {
+ setStorage(response.settings);
+ setStorageDraft(response.settings);
+ }
+ })
+ .catch(() => {
+ if (!canceled) setStorageError(l('无法读取存储位置', 'Unable to load storage locations'));
+ });
+ return () => { canceled = true; };
+ }, [props.storageSettingsService]);
+
+ async function saveStorageDirectory(
+ key: keyof OpenCreatorStorageSettings,
+ selectedValue?: string
+ ) {
+ if (props.storageSettingsService === null || props.storageSettingsService === undefined) return;
+ const value = (selectedValue ?? storageDraft?.[key] ?? '').trim();
+ if (value.length === 0 || value === storage?.[key]) return;
+ setStorageBusy(true);
+ setStorageError(undefined);
+ try {
+ const response = await props.storageSettingsService.updateStorageSettings({ [key]: value });
+ setStorage(response.settings);
+ setStorageDraft(response.settings);
+ } catch {
+ setStorageError(l(
+ '无法保存:请输入可创建且可写的绝对目录路径',
+ 'Unable to save: enter an absolute directory path that can be created and written'
+ ));
+ } finally {
+ setStorageBusy(false);
+ }
+ }
+
+ async function selectStorageDirectory(key: keyof OpenCreatorStorageSettings) {
+ if (
+ props.onSelectStorageDirectory === undefined
+ ) return;
+ const selected = await props.onSelectStorageDirectory(
+ key === 'defaultProjectRoot' ? 'default-project-root' : 'output-root'
+ );
+ if (selected === null) return;
+ setStorageDraft(current => current === undefined ? current : { ...current, [key]: selected });
+ await saveStorageDirectory(key, selected);
+ }
const defaultPermissionOptions: Array<{
value: DefaultPermissionPreference;
label: string;
@@ -252,6 +316,38 @@ function GeneralSettings(props: {
<p>{t('settings.general.description')}</p>
</header>
<div className="settings-card">
+ {storage === undefined || storageDraft === undefined ? null : (
+ <>
+ <StorageDirectoryRow
+ id="settings-default-project-root"
+ label={l('默认项目位置', 'Default project location')}
+ value={storageDraft.defaultProjectRoot}
+ savedValue={storage.defaultProjectRoot}
+ disabled={storageBusy}
+ onChange={value => setStorageDraft(current => current === undefined
+ ? current
+ : { ...current, defaultProjectRoot: value })}
+ onSave={() => void saveStorageDirectory('defaultProjectRoot')}
+ onSelect={props.onSelectStorageDirectory === undefined
+ ? undefined
+ : () => void selectStorageDirectory('defaultProjectRoot')}
+ />
+ <StorageDirectoryRow
+ id="settings-output-root"
+ label={l('完成产物位置', 'Completed output location')}
+ value={storageDraft.outputRoot}
+ savedValue={storage.outputRoot}
+ disabled={storageBusy}
+ onChange={value => setStorageDraft(current => current === undefined
+ ? current
+ : { ...current, outputRoot: value })}
+ onSave={() => void saveStorageDirectory('outputRoot')}
+ onSelect={props.onSelectStorageDirectory === undefined
+ ? undefined
+ : () => void selectStorageDirectory('outputRoot')}
+ />
+ </>
+ )}
<SettingsColorModeRow
value={props.colorMode}
onChange={(mode) => props.onColorModeChange?.(mode)}
@@ -330,10 +426,61 @@ function GeneralSettings(props: {
{props.defaultPermissionError ? (
<p className="settings-error" role="alert">{props.defaultPermissionError}</p>
) : null}
+ {storageError ? <p className="settings-error" role="alert">{storageError}</p> : null}
</section>
);
}
+function StorageDirectoryRow(props: {
+ id: string;
+ label: string;
+ value: string;
+ savedValue: string;
+ disabled: boolean;
+ onChange: (value: string) => void;
+ onSave: () => void;
+ onSelect?: () => void;
+}) {
+ const dirty = props.value.trim().length > 0 && props.value.trim() !== props.savedValue;
+ return (
+ <div className="settings-row settings-control-row settings-directory-row">
+ <label htmlFor={props.id}>{props.label}</label>
+ <input
+ id={props.id}
+ className="settings-directory-input"
+ value={props.value}
+ disabled={props.disabled}
+ onChange={event => props.onChange(event.target.value)}
+ onKeyDown={event => {
+ if (event.key === 'Enter' && dirty) props.onSave();
+ }}
+ />
+ <span className="settings-directory-actions">
+ <button
+ type="button"
+ className="icon-button"
+ aria-label={`保存${props.label}`}
+ title={`保存${props.label}`}
+ disabled={props.disabled || !dirty}
+ onClick={props.onSave}
+ >
+ <Save size={17} aria-hidden="true" />
+ </button>
+ {props.onSelect === undefined ? null : <button
+ type="button"
+ className="icon-button"
+ aria-label={`选择${props.label}`}
+ title={`选择${props.label}`}
+ disabled={props.disabled}
+ onClick={props.onSelect}
+ >
+ <FolderOpen size={17} aria-hidden="true" />
+ </button>}
+ </span>
+ </div>
+ );
+}
+
function SettingsColorModeRow(props: { value: ColorMode; onChange(mode: ColorMode): void }) {
const labelId = 'settings-color-mode-label';
const { t } = useAppLanguage();
diff --git a/apps/web/src/host/bridge.ts b/apps/web/src/host/bridge.ts
index a6a602e6..6ca51759 100644
--- a/apps/web/src/host/bridge.ts
+++ b/apps/web/src/host/bridge.ts
@@ -20,6 +20,8 @@ export type DesktopPreferences = {
telemetryEnabled: boolean;
};
+export type DirectorySelectionPurpose = 'project' | 'default-project-root' | 'output-root';
+
export type HostWindowChrome = {
integratedTitleBar: true;
titleBarHeight: number;
@@ -48,6 +50,6 @@ export type HostBridge = {
): Promise<DesktopPreferences>;
setWindowColorMode?(mode: ColorMode): Promise<void>;
controlWindow?(action: 'close' | 'minimize' | 'zoom'): Promise<void>;
- selectProjectDirectory?(): Promise<string | null>;
+ selectProjectDirectory?(purpose?: DirectorySelectionPurpose): Promise<string | null>;
resolveDroppedFilePath?(file: File): string | null;
};
diff --git a/apps/web/src/host/desktop-bridge.ts b/apps/web/src/host/desktop-bridge.ts
index 38fdc465..b4c7570b 100644
--- a/apps/web/src/host/desktop-bridge.ts
+++ b/apps/web/src/host/desktop-bridge.ts
@@ -1,5 +1,6 @@
import type { ConnectionConfig } from '../runtime/types.js';
import type {
+ DirectorySelectionPurpose,
HostBridge,
HostBridgeResult,
HostNotification
@@ -34,7 +35,7 @@ type DesktopApi = {
}>;
setWindowColorMode?(mode: 'light' | 'dark'): Promise<void>;
controlWindow?(action: 'close' | 'minimize' | 'zoom'): Promise<void>;
- selectProjectDirectory(): Promise<string | null>;
+ selectProjectDirectory(purpose?: DirectorySelectionPurpose): Promise<string | null>;
resolveDroppedFilePath(file: File): string | null;
openExternal(url: string): Promise<void>;
revealPath(path: string): Promise<HostBridgeResult>;
@@ -88,7 +89,7 @@ export function readDesktopHostBridge(): DesktopHostBridge | undefined {
...(windowChrome !== undefined && api.controlWindow !== undefined
? { controlWindow: (action: 'close' | 'minimize' | 'zoom') => api.controlWindow!(action) }
: {}),
- selectProjectDirectory: () => api.selectProjectDirectory(),
+ selectProjectDirectory: purpose => api.selectProjectDirectory(purpose),
resolveDroppedFilePath: file => api.resolveDroppedFilePath(file),
openExternal: url => api.openExternal(url),
revealPath: path => api.revealPath(path),
diff --git a/apps/web/src/services/opencreator-settings-service.test.ts b/apps/web/src/services/opencreator-settings-service.test.ts
index 5e11662c..1a827f52 100644
--- a/apps/web/src/services/opencreator-settings-service.test.ts
+++ b/apps/web/src/services/opencreator-settings-service.test.ts
@@ -31,10 +31,16 @@ describe('OpenCreator settings service', () => {
await service.getUiSettings();
await service.updateUiSettings({ colorMode: 'light' });
+ await service.getStorageSettings();
+ await service.updateStorageSettings({ outputRoot: '/tmp/exports' });
expect(get).toHaveBeenCalledWith('/settings/ui');
expect(patch).toHaveBeenCalledWith('/settings/ui', {
colorMode: 'light'
});
+ expect(get).toHaveBeenCalledWith('/settings/storage');
+ expect(patch).toHaveBeenCalledWith('/settings/storage', {
+ outputRoot: '/tmp/exports'
+ });
});
});
diff --git a/apps/web/src/services/opencreator-settings-service.ts b/apps/web/src/services/opencreator-settings-service.ts
index f318790e..29bff371 100644
--- a/apps/web/src/services/opencreator-settings-service.ts
+++ b/apps/web/src/services/opencreator-settings-service.ts
@@ -1,4 +1,6 @@
import type {
+ OpenCreatorStorageSettingsResponse,
+ UpdateOpenCreatorStorageSettingsRequest,
OpenCreatorUiSettingsResponse,
UpdateOpenCreatorUiSettingsRequest
} from '@opencreator/protocol';
@@ -15,6 +17,14 @@ export function createOpenCreatorSettingsService(client: ClientLike) {
update: UpdateOpenCreatorUiSettingsRequest
): Promise<OpenCreatorUiSettingsResponse> {
return client.patch('/settings/ui', update);
+ },
+ getStorageSettings(): Promise<OpenCreatorStorageSettingsResponse> {
+ return client.get('/settings/storage');
+ },
+ updateStorageSettings(
+ update: UpdateOpenCreatorStorageSettingsRequest
+ ): Promise<OpenCreatorStorageSettingsResponse> {
+ return client.patch('/settings/storage', update);
}
};
}
diff --git a/apps/web/src/styles/app.css b/apps/web/src/styles/app.css
index ad615604..075cc281 100644
--- a/apps/web/src/styles/app.css
+++ b/apps/web/src/styles/app.css
@@ -715,7 +715,7 @@ select:focus-visible {
}
.timeline-load-older {
- min-height: 52px;
+ height: 53px;
display: grid;
place-items: center;
padding: 12px 18px 2px;
@@ -6828,6 +6828,41 @@ button.creator-template-outcome-expand:hover {
text-align: right;
}
+.settings-control-row.settings-directory-row {
+ min-height: 53px;
+ grid-template-columns: minmax(120px, 0.45fr) minmax(0, 1fr) auto;
+ gap: 10px;
+}
+
+.settings-directory-row > label {
+ color: var(--muted);
+ font-size: 13px;
+ font-weight: 600;
+}
+
+.settings-directory-input {
+ width: 100%;
+ min-width: 0;
+ height: 34px;
+ padding: 0 10px;
+ border: 1px solid var(--border);
+ border-radius: 6px;
+ background: var(--surface-2);
+ color: var(--muted);
+ font-family: var(--font-mono);
+ font-size: 12px;
+}
+
+.settings-directory-input:focus {
+ border-color: var(--accent-strong);
+ outline: 2px solid var(--accent-soft);
+}
+
+.settings-directory-actions {
+ display: flex;
+ gap: 6px;
+}
+
.settings-control-row {
grid-template-columns: minmax(160px, 1fr) auto;
}
diff --git a/assets/icon-optimized.png b/assets/icon-optimized.png
new file mode 100644
index 00000000..cb9d58d7
Binary files /dev/null and b/assets/icon-optimized.png differ
diff --git a/assets/icon.jpg b/assets/icon.jpg
new file mode 100644
index 00000000..a6907e5b
Binary files /dev/null and b/assets/icon.jpg differ
diff --git a/assets/icon.png b/assets/icon.png
new file mode 100644
index 00000000..a6907e5b
Binary files /dev/null and b/assets/icon.png differ
diff --git a/packages/config/src/index.test.ts b/packages/config/src/index.test.ts
index ae1a611d..469e60f5 100644
--- a/packages/config/src/index.test.ts
+++ b/packages/config/src/index.test.ts
@@ -10,8 +10,10 @@ import {
readOpenCreatorConfig,
resolveDesktopConfig,
resolveOpenCreatorPaths,
+ resolveStorageSettings,
resolveUiSettings,
updateOpenCreatorConfig,
+ updateOpenCreatorStorageSettings,
updateOpenCreatorUiSettings
} from './index.js';
@@ -92,4 +94,26 @@ describe('OpenCreator config', () => {
telemetryInstallId
});
});
+
+ it('persists project and completed output locations', () => {
+ const root = mkdtempSync(join(tmpdir(), 'opencreator-config-'));
+ tempDirs.push(root);
+ const path = join(root, 'config.toml');
+ const defaults = {
+ defaultProjectRoot: join(root, 'OpenCreator'),
+ outputRoot: join(root, 'OpenCreator', 'Exports')
+ };
+
+ expect(resolveStorageSettings(readOpenCreatorConfig(path), defaults)).toEqual(defaults);
+ updateOpenCreatorStorageSettings(path, {
+ defaultProjectRoot: join(root, 'Projects'),
+ outputRoot: join(root, 'Outputs')
+ });
+
+ expect(resolveStorageSettings(readOpenCreatorConfig(path), defaults)).toEqual({
+ defaultProjectRoot: join(root, 'Projects'),
+ outputRoot: join(root, 'Outputs')
+ });
+ expect(readFileSync(path, 'utf8')).toContain('[storage]');
+ });
});
diff --git a/packages/config/src/index.ts b/packages/config/src/index.ts
index cd426f69..9848767f 100644
--- a/packages/config/src/index.ts
+++ b/packages/config/src/index.ts
@@ -14,7 +14,9 @@ import { homedir } from 'node:os';
import { dirname, join, resolve } from 'node:path';
import { parse, stringify } from '@iarna/toml';
import type {
+ OpenCreatorStorageSettings,
OpenCreatorUiSettings,
+ UpdateOpenCreatorStorageSettingsRequest,
UpdateOpenCreatorUiSettingsRequest
} from '@opencreator/protocol';
@@ -56,6 +58,7 @@ export type OpenCreatorRuntimeConfig = {
export type OpenCreatorConfigDocument = {
version: number;
ui?: OpenCreatorUiSettings;
+ storage?: OpenCreatorStorageSettings;
desktop?: OpenCreatorDesktopConfig;
runtime?: OpenCreatorRuntimeConfig;
creatorServices?: Record<string, unknown>;
@@ -65,6 +68,7 @@ export type OpenCreatorConfigSnapshot = {
document: OpenCreatorConfigDocument;
configured: {
ui: boolean;
+ storage: boolean;
desktop: boolean;
runtime: boolean;
creatorServices: boolean;
@@ -140,6 +144,16 @@ export function updateOpenCreatorUiSettings(
}));
}
+export function updateOpenCreatorStorageSettings(
+ path: string,
+ patch: UpdateOpenCreatorStorageSettingsRequest
+): OpenCreatorConfigSnapshot {
+ return updateOpenCreatorConfig(path, document => ({
+ ...document,
+ storage: normalizeStorageSettings({ ...document.storage, ...patch })
+ }));
+}
+
function readOpenCreatorConfigUnlocked(path: string): OpenCreatorConfigSnapshot {
if (!existsSync(path)) return snapshot({ version: 1 });
const source = readFileSync(path, 'utf8');
@@ -155,6 +169,9 @@ function normalizeDocument(value: unknown): OpenCreatorConfigDocument {
? source.version
: 1,
...(isRecord(source.ui) ? { ui: normalizeUiSettings(source.ui) } : {}),
+ ...(isRecord(source.storage)
+ ? { storage: normalizeStorageSettings(source.storage) }
+ : {}),
...(isRecord(source.desktop)
? { desktop: normalizeDesktopConfig(source.desktop) }
: {}),
@@ -176,6 +193,9 @@ function snapshot(document: OpenCreatorConfigDocument): OpenCreatorConfigSnapsho
...(document.ui === undefined
? {}
: { ui: normalizeUiSettings(document.ui) }),
+ ...(document.storage === undefined
+ ? {}
+ : { storage: normalizeStorageSettings(document.storage) }),
...(document.desktop === undefined
? {}
: { desktop: normalizeDesktopConfig(document.desktop) }),
@@ -188,6 +208,7 @@ function snapshot(document: OpenCreatorConfigDocument): OpenCreatorConfigSnapsho
},
configured: {
ui: document.ui !== undefined,
+ storage: document.storage !== undefined,
desktop: document.desktop !== undefined,
runtime: document.runtime !== undefined,
creatorServices: document.creatorServices !== undefined
@@ -199,6 +220,30 @@ export function resolveUiSettings(snapshot: OpenCreatorConfigSnapshot): OpenCrea
return normalizeUiSettings(snapshot.document.ui ?? defaultUiSettings);
}
+export function resolveStorageSettings(
+ snapshot: OpenCreatorConfigSnapshot,
+ defaults: OpenCreatorStorageSettings
+): OpenCreatorStorageSettings {
+ return normalizeStorageSettings(snapshot.document.storage ?? defaults, defaults);
+}
+
+function normalizeStorageSettings(
+ value: unknown,
+ defaults?: OpenCreatorStorageSettings
+): OpenCreatorStorageSettings {
+ const source = isRecord(value) ? value : {};
+ const defaultProjectRoot = nonEmptyString(
+ source.defaultProjectRoot ?? source.default_project_root
+ ) ?? defaults?.defaultProjectRoot ?? '';
+ const outputRoot = nonEmptyString(source.outputRoot ?? source.output_root)
+ ?? defaults?.outputRoot
+ ?? '';
+ return {
+ defaultProjectRoot: resolve(defaultProjectRoot),
+ outputRoot: resolve(outputRoot)
+ };
+}
+
export function resolveDesktopConfig(
snapshot: OpenCreatorConfigSnapshot
): OpenCreatorDesktopConfig {
@@ -310,6 +355,9 @@ function writeConfigFile(path: string, document: OpenCreatorConfigDocument): voi
const serializable = {
version: document.version,
...(document.ui === undefined ? {} : { ui: serializeUi(document.ui) }),
+ ...(document.storage === undefined
+ ? {}
+ : { storage: serializeStorage(document.storage) }),
...(document.desktop === undefined
? {}
: { desktop: serializeDesktop(document.desktop) }),
@@ -325,6 +373,13 @@ function writeConfigFile(path: string, document: OpenCreatorConfigDocument): voi
renameSync(temporary, path);
}
+function serializeStorage(value: OpenCreatorStorageSettings): Record<string, unknown> {
+ return {
+ default_project_root: value.defaultProjectRoot,
+ output_root: value.outputRoot
+ };
+}
+
function serializeUi(value: OpenCreatorUiSettings): Record<string, unknown> {
return {
language: value.language,
diff --git a/packages/protocol/src/settings.ts b/packages/protocol/src/settings.ts
index 07b302c3..b4b214ac 100644
--- a/packages/protocol/src/settings.ts
+++ b/packages/protocol/src/settings.ts
@@ -31,3 +31,15 @@ export type OpenCreatorUiSettingsResponse = {
};
export type UpdateOpenCreatorUiSettingsRequest = Partial<OpenCreatorUiSettings>;
+
+export type OpenCreatorStorageSettings = {
+ defaultProjectRoot: string;
+ outputRoot: string;
+};
+
+export type OpenCreatorStorageSettingsResponse = {
+ settings: OpenCreatorStorageSettings;
+ configured: boolean;
+};
+
+export type UpdateOpenCreatorStorageSettingsRequest = Partial<OpenCreatorStorageSettings>;