汇总研究更新、奇思妙想与文档数据库迁移(main-only CI) #18
Reference in New Issue
Block a user
Delete Branch "codex/docs-integration"
Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?
目标与范围
按用户要求,将当前四个 PR 在 main 之外汇总为一个可评审 PR,不合并 main,不运行分支 CI。
74af205。0dcd178。ec95f3b。a80f656。head:
codex/docs-integration;base:main。集成合并 commit:
59a1e46。原 PR 与工作分支保留,未自动关闭或改写。最终行为与冲突处理
先整合研究和草案,再应用数据库迁移。一次性迁移输入锁定到
cffca6942b1bc0005321e1685f38593fb0b853d5,含最新研究正文及奇思妙想草案共 51 篇,研究三篇额外采用74af205b2959e1bb6a1fe9f567bc87069ac6d12c的最新历史正文,逐篇正文与目录保留。当前代码树没有正文 Markdown 和 catalog.json,运行时只查询数据库。草案仍标为 draft。研究业务数据仍按现有机制维护,下次迁移;公司 1,021、业务类别 11、证据 1,201、观测 187。收入图表标签保留 PR #16 的修改。
目录与研究正文的删除/修改冲突通过“保留历史迁移快照、删除运行时仓库正文”解决;审计脚本同时保留最新来源核查和数据库导出对照能力。旧 CI 日志发现的空值类型问题已加显式存在检查;没有重跑类型检查。
验证结果与限制
已通过:51 篇全文逐项一致、路由唯一、草案状态、两项研究数据/报告对照、4 项轻量 Python 测试、Python AST/JSON/Shell 语法、无冲突标记与 git diff --check。
分支不运行 CI,不在本机编译构建。此前误启动的旧分支 CI:首轮依赖超时;第二轮 lint 通过,但类型检查因空值问题失败。该问题已在汇总分支修正,尚未重新执行。数据库测试、完整构建与容器冒烟均不能称为通过;按 main-only 规则,用户手动合并 main 后才执行。
main 未改动,生产数据库未操作,未部署。等待用户手动合并,不开启自动合并。
逐文件改动
A 新增,M 修改,D 从当前代码树移除。删除的正文仍在 Git 历史及迁移输入中,不是丢弃文档内容。
.dockerignore.gitea/workflows/ci-deploy.yml.gitignoreAGENTS.mdREADME.mdapps/docs/package.jsonapps/docs/scripts/auth-cli.tsapps/docs/scripts/build-auth.mjsapps/docs/scripts/build-doc-images.mjsapps/docs/scripts/docs-cli.tsapps/docs/scripts/test-docs.mjsapps/docs/src/components/IncomeDistribution.tsxapps/docs/src/lib/ai-research.tsapps/docs/src/lib/docs.tsapps/docs/src/pages/api/documents/source.tsapps/docs/src/pages/api/search.tsapps/docs/src/pages/docs/[...slug].tsxapps/docs/src/pages/index.tsxapps/docs/src/proxy.tsapps/docs/tests/docs.test.tsapps/docs/tests/research.test.tscontent/catalog.jsoncontent/docs/00-endor-concepts-draft.mdcontent/docs/01-getting-started.mdcontent/docs/02-mounting-draft.mdcontent/docs/03-figures.mdcontent/docs/04-endor-purpose-draft.mdcontent/docs/05-object-graphs-gc.mdcontent/docs/06-agent-programming-draft.mdcontent/docs/07-composable-judgments-draft.mdcontent/docs/ai-company-research/00-overview.mdcontent/docs/ai-company-research/01-income-snapshot.mdcontent/docs/ai-company-research/02-coverage-and-gaps.mdcontent/docs/language-design/00-overview.mdcontent/docs/language-design/02-questions.mdcontent/docs/language-design/03-questions.mdcontent/docs/language-design/04-questions.mdcontent/docs/language-design/05-questions.mdcontent/docs/language-design/06-questions.mdcontent/docs/language-design/07-questions.mdcontent/docs/language-design/08-questions.mdcontent/docs/language-design/09-questions.mdcontent/docs/language-design/10-questions.mdcontent/docs/language-design/11-questions.mdcontent/docs/language-design/12-questions.mdcontent/docs/language-design/13-questions.mdcontent/docs/language-design/14-questions.mdcontent/docs/pretext/00-overview.mdcontent/docs/pretext/01-chapter.mdcontent/docs/pretext/02-chapter.mdcontent/docs/pretext/03-chapter.mdcontent/docs/pretext/04-chapter.mdcontent/docs/pretext/05-chapter.mdcontent/docs/pretext/06-chapter.mdcontent/docs/pretext/07-chapter.mdcontent/docs/pretext/08-chapter.mdcontent/docs/pretext/09-chapter.mdcontent/docs/pretext/10-chapter.mdcontent/docs/pretext/11-chapter.mdcontent/docs/pretext/12-chapter.mdcontent/docs/smalltalk/00-overview.mdcontent/docs/smalltalk/01-messages.mdcontent/docs/smalltalk/02-syntax-and-blocks.mdcontent/docs/smalltalk/03-classes-and-methods.mdcontent/docs/smalltalk/04-object-protocol.mdcontent/docs/smalltalk/05-reflection.mdcontent/docs/smalltalk/06-collections-and-streams.mdcontent/docs/smalltalk/07-processes.mdcontent/docs/smalltalk/08-graphics.mdcontent/docs/smalltalk/09-live-environment.mdcontent/docs/smalltalk/10-mvc.mdcontent/docs/smalltalk/11-reference.mdcontent/research/ai-companies.seed.jsoncontent/research/ai-companies.sources.jsoncontent/research/ai-income-analysis.jsonpackage.jsonscripts/audit-ai-research.pyscripts/check-container.shscripts/ci.pyscripts/deploy.pyscripts/docs-admin.shscripts/export-legacy-documents.pyscripts/summarize-ai-income.pyscripts/test_ci.pyPR #15 的新增草案文件不出现在相对 main 的最终文件差异中,因为它已经进入上述历史迁移快照;首次导入后以数据库中的草案存在,正文不再提交到当前代码树。