docs: record image preview integration and worktree recovery
This commit is contained in:
@@ -4,6 +4,8 @@ This file is the integrated default-branch snapshot. Feature tasks record progre
|
||||
|
||||
## Integrated Through
|
||||
|
||||
- 2026-09-15：任务 `20260915-merge-image-preview-56ab481e` 将图片预览源 `41664b2ae3b1139f7f00401e2aeb5b483319d29e` 无冲突合入本地 `main`，合并提交 `9b64dd9b3917999fd1f10683ee78ac1746de6f81`。AI 设计任务图片新增放大查看，支持完整适配窗口、原始尺寸滚动、关闭/Esc 和焦点返回，桌面与紧凑布局共用且不触发下载；Main-owned Asset 契约保持。合并后的类型检查、31 项相关单测、Vite 全目标构建和 Windows Electron 交互验收通过；产品及源任务记录与已验证源一致，三份原有未跟踪文档原样保留。用户授权的旧 Agent-tabs 残留目录已改名 `.retained` 保留，并用 bundled scripts 恢复登记。未推送、打包或安装；详见[集成记录](tasks/20260915-merge-image-preview-56ab481e.md)。
|
||||
|
||||
- 2026-09-15：任务 `20260915-merge-agent-tabs-2fd41184` 经用户确认登记移交，将源 `868ab54be6575ea6bd170d2ece7b7c8d4f6c0007` 无冲突快进合入本地 `main`。智能体编辑区改为“我的要求”与“高级设置”双 Tab，选中态与方向键切换明确，高级分类记忆、切换回顶、未保存输入及试用状态保留。产品树与已验证源一致，沿用 47 项相关单测、类型检查、scoped lint、Vite 全目标构建及 Electron 交互验收，详见[源任务](tasks/20260915-agent-editor-tabs-8c46f6f5.md)。源记录原样导入，三份原有未跟踪文档保留；未推送、打包或安装客户端。
|
||||
|
||||
- 2026-09-15：任务 `20260915-merge-knowledge-status-ml-7a69bec0` 经用户确认登记移交，将已独立审查源 `fee2f4c` 无冲突快进合入本地 `main`。知识文档上传、导入与替换自动衔接解析索引，明确阶段、真实可用性和失败恢复；每 5 秒串行刷新已加载页面，旧可用内容在替换清理重试时保留。沿用源 49 项相关单测、类型检查、scoped lint、Vite 全目标构建、真实 Electron E2E 1 passed，以及独立 Reviewer Standards/Spec PASS。全量唯一 Pi runtime v6/v7 旧断言失败与本改动无关，详见[源任务](tasks/20260915-knowledge-status-ml-3065956f.md)。产品树与已审查源一致；原有三份文档保留，未推送、打包或部署。需配套更新 Yuxi API/worker 与客户端后验收实际上传。
|
||||
|
||||
@@ -0,0 +1,49 @@
|
||||
# Task: Merge AI Design task image preview into main
|
||||
|
||||
## Identity
|
||||
|
||||
- Task ID: 20260915-merge-image-preview-56ab481e
|
||||
- Mode: Integration
|
||||
- Branch: main
|
||||
- Worktree: D:\Datas\OthersProjects\makelore
|
||||
- Base commit: 52305c18a4be87fbc84991e4159feb328e5662a1
|
||||
- Owner: codex
|
||||
- Status: Ready for Integration
|
||||
|
||||
## Scope
|
||||
|
||||
- Merge the completed AI Design task-image preview source `41664b2` into local main, retaining the already integrated Agent editor tabs and all unrelated files.
|
||||
- Recover the user-approved stale Agent-tabs registration without deleting residual files; document this integration in the owned task record and current-state.
|
||||
|
||||
## Intent And Constraints
|
||||
|
||||
- Concurrent Gate Passed after explicit human recovery consent: renamed the invalid old checkout to `D:\Datas\OthersProjects\.codex-worktrees\makelore\20260915-agent-editor-tabs-8c46f6f5.retained`, removed its exact stale registry via bundled `release-missing --force`, released completed main owner `20260915-merge-agent-tabs-2fd41184`, and claimed this integration with `start --adopt-existing`. Status matches this task, main, absolute worktree, baseline and integration mode.
|
||||
- Three pre-existing untracked task records (package-122, package-123 and client-hang-diagnosis) were explicitly adopted for unchanged preservation; their original bytes are retained for direct comparison. No task source records are editable.
|
||||
- Planning Gate Passed: reused the loaded skill, memory/positioning, decisions/ADR-007, architecture, domain/success criteria and evidence/reflection/commitment context; read the new integration record, latest current-state and source record, and checked updated peer scopes. Known active peers are unrelated; historical placeholder scopes remain unknown with no concrete dependency. The recovered peer failure is no longer a registry blocker.
|
||||
- Preview remains presentation-only under the existing Main-owned V2 Asset URL helper. No business or architecture decision changes; source has no canonical promotion candidates.
|
||||
- Merge preflight is conflict-free. Merge main and the exact source, verify the combined result and original-file preservation, record the outcome, then offer cleanup only for this newly integrated source worktree. No push, packaging, deployment or unapproved cleanup.
|
||||
|
||||
## Outcome
|
||||
|
||||
- Merged source `41664b2ae3b1139f7f00401e2aeb5b483319d29e` into main without conflict as `9b64dd9b3917999fd1f10683ee78ac1746de6f81`. README combines the prior Agent-tab text and the new image-preview text; both product changes are retained.
|
||||
- Source image-preview product/tests and source task record match the validated source exactly. Generated images can be enlarged inside desktop/compact task history, fit or shown at original size, and dismissed without downloading.
|
||||
- Restored registry health using the explicitly approved residual-directory retention and bundled release operations. Prior Agent-tabs residual files remain at the `.retained` path above; the old branch and all commits remain available.
|
||||
- Three pre-existing untracked documents remain byte-for-byte unchanged. No push, package, deployment or installed-client update performed.
|
||||
- User subsequently approved source-worktree cleanup. The bundled `retire` passed eligibility checks but Git unlinked the checkout and returned `Directory not empty`, leaving residual files and the skill registry. Confirmed `.git` and Git worktree registration were gone, and the branch still pointed at the merged source. A bounded native residual-delete command was rejected before execution by automatic approval review (`blocked by policy`, no further reason). No alternate deletion method was attempted. Retained the residual directory as `D:\Datas\OthersProjects\.codex-worktrees\makelore\20260915-design-image-preview-b24997a6.retained`, then used bundled `release-missing --force` to clear the now-missing original-path registry. Branch/commits remain; residual disk cleanup is incomplete.
|
||||
|
||||
## Verification
|
||||
|
||||
- Merge-tree preflight succeeded; actual committed merge tree exactly matches the preflight tree. Exact source product/test/task-record comparison is unchanged.
|
||||
- Combined main: `pnpm run typecheck` passed; focused preview/Canvas/API Vitest run passed 31 tests; `pnpm run build:vite` passed all targets with existing build warnings; targeted Windows Electron V2 confirmation/preview case passed, including native 1600×2400 scrolling and 375px layout.
|
||||
- Source scoped lint remains applicable because the relevant files were imported unchanged. Original document contents were compared directly before and after merging and match exactly.
|
||||
- Before approved retirement, source worktree was clean, registry status was ready_for_integration/managed, HEAD was the latest source `41664b2`, and that exact source was an ancestor of actual main. Branch/commit preservation was rechecked after the partial Git removal.
|
||||
|
||||
## Follow-ups
|
||||
|
||||
- Source residual files are retained at `D:\Datas\OthersProjects\.codex-worktrees\makelore\20260915-design-image-preview-b24997a6.retained` because automatic approval review blocked deletion. The old worktree path and task registry are released; the feature branch and commits remain. No repeated deletion or cleanup approval request in this continuation.
|
||||
- Rebuild/install a desktop package when the feature should reach installed clients.
|
||||
|
||||
## Promotion Candidates
|
||||
|
||||
- No new architecture/domain promotion. Current-state records the completed integration; README is synchronized with visible image-preview behavior.
|
||||
- Workflow candidate for the external maintain-project-docs skill: add an explicit supported recovery for Windows `git worktree remove` partially unlinking a checkout before failing directory removal. Both Agent-tabs cleanup and this source cleanup exhibited it; an invalid worktree registry then blocks every `start`. Preserve residual data and require the existing human recovery/cleanup authority; do not automatically simulate ownership. This candidate is documented only and no external skill code was changed.
|
||||
Reference in New Issue
Block a user