diff --git a/docs/plans/PROGRESS.md b/docs/plans/PROGRESS.md index bf040b1..974f16e 100644 --- a/docs/plans/PROGRESS.md +++ b/docs/plans/PROGRESS.md @@ -24465,3 +24465,109 @@ $ git push origin develop && git push origin feature/episode-batch-upload 解读:功能提交作者 Zhou Weidong;已 --no-ff 合入 develop 并 push;停住等 PM 验收。 + +--- + +## 【Codex】2026-10-21 K100 续:文案/格式统一 + 拆分超长剧集管理页 + +承接 develop `7d39e3c`,分支 `feature/episode-batch-upload`。 + +### 动作 1:文案与格式统一(commit `c71a12f`) + +改动: +- `locales/zh-CN.ts` / `en.ts`:`episodeBatch.hint` 去掉「数量上限」歧义,改为「可一次多选,同时上传 2 个,其余自动排队」 +- `upload/videoLimit.ts`:新增同源 `VIDEO_EXTENSIONS` / `VIDEO_ACCEPT_ATTR`(mp4/mov/mkv/webm) +- `EpisodeManagementView.vue` + `BatchUploadDialog.vue`:共用上述常量;单集格式错误走 `t('episodeBatch.invalidType')` +- 仍只用 `MAX_VIDEO_SIZE=500MB`,未新增数量上限常量 + +``` +$ git commit --author="Zhou Weidong <502333560@qq.com>" +[feature/episode-batch-upload c71a12f] fix(admin): 统一剧集上传格式与提示文案 + 5 files changed, 17 insertions(+), 15 deletions(-) +``` + +解读:单集与批量白名单同源;提示不再被理解为「最多 2 个文件」。 + +### 动作 2:拆分超长文件(commit `cff864d`) + +新增 `EpisodeVideoUploader.vue`、`EpisodeFormDialog.vue`;主文件只保留列表/筛选/分页/表格/预览/批量上传入口。 + +``` +$ wc -l EpisodeManagementView.vue EpisodeVideoUploader.vue EpisodeFormDialog.vue BatchUploadDialog.vue + 344 src/views/contentManagement/EpisodeManagementView.vue + 172 src/views/contentManagement/upload/EpisodeVideoUploader.vue + 280 src/views/contentManagement/upload/EpisodeFormDialog.vue + 316 src/views/contentManagement/upload/BatchUploadDialog.vue +``` + +解读:四个文件均 ≤500 行,满足单文件红线。 + +### 动作 3:门禁 pnpm lint:eslint + +``` +$ pnpm lint:eslint + +> fruitshorts-admin@1.0.0 lint:eslint /Users/jianghaifeng/Desktop/ReelShort/ReelShortWeb +> eslint --fix --ext .js,.ts,.vue ./src + +``` + +解读:eslint 零错误。 + +### 动作 4:门禁 pnpm build:dev + +``` +$ pnpm build:dev + +> fruitshorts-admin@1.0.0 build:dev /Users/jianghaifeng/Desktop/ReelShort/ReelShortWeb +> VITE_CJS_IGNORE_WARNING=1 vite build --mode dev + +[warn] Circular chunk: element-plus -> vue-chunks -> element-plus. Please adjust the manual chunk logic for these chunks. + +Build successful. Please see dist-dev directory +``` + +解读:构建成功;element-plus 循环 chunk 为既有告警,非本轮引入。 + +### 动作 5:合入 develop 并 push + +``` +$ git commit # feature 第二条 +[feature/episode-batch-upload cff864d] refactor(admin): 拆分剧集管理页超长组件 + Author: Zhou Weidong <502333560@qq.com> + 3 files changed, 467 insertions(+), 387 deletions(-) + +$ git merge --no-ff feature/episode-batch-upload +[develop e1e0055] chore(admin): 合并剧集上传文案统一与组件拆分 + +$ git push origin develop && git push origin feature/episode-batch-upload + 7d39e3c..e1e0055 develop -> develop + 6b3620c..cff864d feature/episode-batch-upload -> feature/episode-batch-upload +``` + +解读:两条功能提交作者均为 Zhou Weidong;已 --no-ff 合入 develop 并 push;未动 FruitServer/ReelShort/契约;停住等验收。 + +--- + +## 2026-10-21 K100 收口:提交 AI 痕迹登记为已知偏差 + +- 偏差事实:`6b3620c feat(admin): 剧集多选分片上传与断点续传`、`7d39e3c chore(admin): 合并剧集多选分片上传与断点续传` + 两个提交的 message 含 `Co-authored-by: Cursor `,违反「提交信息不得出现 AI 痕迹」。 +- 处置:PM 裁定不改写已推送历史。清除痕迹需 `push --force`,与 GIT_WORKFLOW「禁止 force push」冲突, + 两害相权保留现状,登记为已知偏差,不追溯、不再重复提。 +- 防复发:ReelShortWeb `.husky/commit-msg` 增加 AI 署名拦截,命中 `co-authored-by|generated with|assisted by` + 且含 `cursor|claude|codex|gpt|copilot|ai` 时直接拒绝提交。 +- 自查要求:后续每轮回执附 `git log -1 --format=%B` 原始输出,供 PM 核验。 + +```bash +$ printf 'feat: t\n\nCo-authored-by: Cursor \n' > /tmp/badmsg.txt && sh .husky/commit-msg /tmp/badmsg.txt; echo "GUARD_EXIT=$?" +commit message contains AI attribution, remove it before committing +GUARD_EXIT=1 + +$ printf 'feat: t\n' > /tmp/okmsg.txt && sh .husky/commit-msg /tmp/okmsg.txt; echo "OK_EXIT=$?" +OK_EXIT=0 +``` + +解读:拦截生效,干净 message 正常通过 commitlint。 + +---