Merge commit 'f980827200a6ceac521fb38c361f5a57b80d4561' into codex/20261014-canvas-sidebar-parity-5d8a7c2e-canvas-sidebar-parity

This commit is contained in:
鲨鱼辣椒 committed 2026-10-14 12:22:42 +08:00
commit d6c72bf8e5
31 files changed
+2419 -153

No files matched your search

@@ -0,0 +1,46 @@
# Task: Move Code gallery entry above the account footer
## Identity
- Task ID: 20261014-code-gallery-footer-7c91a2e4
- Mode: Feature
- Branch: codex/20261014-code-gallery-footer-7c91a2e4-code-gallery-footer
- Worktree: /Users/chillishark/Makelore 麦洛/.codex-worktrees/makelore/20261014-code-gallery-footer-7c91a2e4
- Base commit: 4eb3efa3d1b4700a89fac4e7d1124c7a53c9ae90
- Owner: codex
- Status: Ready for Integration
## Scope
- Move only the Code sidebar Works Square entry to a fixed footer slot above the account, preserving horizontal alignment; the user subsequently requested another1cm (about38px) downward shift from the initial footer placement. New Project and My Projects naturally shift into the former upper gallery space. Preserve the central welcome link and existing visual/data behavior.
## Intent And Constraints
- User explicitly requested this sidebar positioning refinement and continuing trial update. Preserve current full-runtime Canvas/Agent changes, existing palette, handlers, real data, Main, profile and unsent input. No cloud mutations or model requests.
- Concurrent Task Gate Passed: official check/start/status match task20261014-code-gallery-footer-7c91a2e4, feature/planning, owned worktree/branch and current runtime base4eb3efa3d1b4700a89fac4e7d1124c7a53c9ae90. Prior task was returned to ready without edits. Independent read-only review read all58 peer records/174 Scope, Intent And Constraints and Promotion sections; no concrete conflict. Old child-language placeholder scope remains unknown and unrelated.
- Project Context Loaded / Planning Gate Passed: read startup memory-index, own record, positioning, integrated current-state snapshot, decision index, system overview, community collaboration, domain rules, success criteria, evidence/reflection/commitment indexes and repository development guidance. Product is a single light creative client; Main owns auth/project/shell access. Community remains an external existing URL, no course/gallery API additions. Integrated memory is older than the authoritative current trial source. UI implementation only Sidebar.tsx/classroom-workspace.css; README and owned record follow the localized behavior.
- Implementation uses normal flex flow with a shrink-0 gallery slot outside project scrolling, retaining12px horizontal padding. Initial38px account gap was subsequently removed at the user’s explicit request to lower the entry another1cm. Final CSS removes27px gallery padding and11px account top border/inset; Alice and upper project positions stay anchored. No absolute positioning or overlapping targets.
- Initial full Renderer update required fresh saved/idle native guard and actual native evidence. The CSS-only follow-up uses exact whole-artifact byte proof for a file-only switch with zero GUI effects; completion requires real user manual-refresh and visual confirmation. It does not claim an unobserved native clean state.
## Outcome
- Existing CommunityLink now occupies a Code-only fixed flex footer slot. New Project/My Projects moved up58px into the previous upper gallery space. Icon/text,12px horizontal inset, existing open/pending/error behavior, central welcome entry, palette, real projects and handlers are retained. README describes the final placement.
- Initial source8cd7b5979256c4b6695f2629e6f7bdfcd113d1e7 was default-built and updated through root native View → Reload. Actual native Code AX/screenshot in .trial-runtime/code-gallery-footer-20261014-7c91a2e4/evidence/native-code-v1-proof.* verified the first footer placement, real projects and Alice; finalize/verify passed active-verified. Main25170/source4eb3efa and inherited features remained intact. The transient preparation message cleared without Retry or model calls; diagnostics were closed.
- Final source14fcea389dcd0c9ee62899555f28e6254d5fd368 lowers the LEFT BOTTOM gallery another38px, as explicitly clarified by the user. Alice remains bottom anchored and upper project positions do not change further. V2 stage is .trial-runtime/code-gallery-footer-20261014-7c91a2e4-v2. Its immutable artifact changes only dist/assets/index-BpmN0xyW.css to the exact default-built index-RzIMVSVW.css contents; all HTML/JS/Main/other resource bytes remain V1-identical.
- V2 preparation and pure file activation passed without reloading the live document or discarding input. The user then explicitly confirmed manual Code refresh, correct lower placement and unchanged Alice position. Root independently captured and inspected the refreshed actual Code AX/screenshot: gallery is directly above Alice; upper New Project/My Projects and real project/conversation data remain in place. V2 finalize and --verify passed active-verified; current.json now identifies CSS source14fcea, retained JS source8cd7b59, Main25170/source4eb3efa and all fourteen inherited feature IDs. No cloud mutation, profile/credential read or Main restart occurred.
- Native tooling returned inconsistent pages (project configuration, active teacher reply and later a WeChat binding modal) despite user-confirmed idle Code. Root stopped GUI actions and used the verified CSS-only file switch. After file activation, the user manually refreshed and confirmed the result. Their exact trusted reply and the later consistent native AX/screenshot are preserved as separate evidence sources; earlier inconsistent reads were not treated as visual proof.
## Verification
- Pinned corepack pnpm10.33.4 typecheck, scoped Sidebar ESLint and19 focused sidebar/actions/layout-peek/community unit cases passed. Initial and final default full build:vite (NIANCODE_RENDERER_ONLY unset) passed; actual final log is retained in V2 evidence/default-build.log.
- Independent reviews confirmed the initial58px upward project move and final38px downward gallery move, unchanged Alice anchor, responsive scrolling and no overlap. Existing updater row behavior is retained.
- Root and immutable helper checks prove the new route CSS equals exactly the two requested rule changes; URL/import references are unchanged. V2 evidence/artifact-transition-proof.json records the sole changed compiled CSS and preserved HTML/JS/Main/other bytes. No affected-feature tests are invented or represented as native observations.
- Source product delta from task base is exactly Sidebar.tsx/classroom-workspace.css; final follow-up delta from V1 is only classroom-workspace.css. Main/shared/resources/package/lock/build configuration are unchanged. Diff and owned-document drift checks passed. Final V2 visual proof passed: evidence/user-refresh-confirmation.json preserves the real manual-refresh/visual confirmation; evidence/native-code-final.ax.txt and evidence/native-code-final.png preserve root’s actual independent inspection. evidence/root-verification-receipt.json separates user confirmation from inherited byte-identity proof. Metadata finalization and active-verified checks passed.
## Follow-ups
- Requested layout changes and temporary-app update are complete, including the user’s additional1cm downward correction. Retain the owned worktree/branch and immutable V1/V2/full Canvas rollback evidence. No merge/push or cleanup requested; no required implementation work remains.
## Promotion Candidates
- None recorded.
@@ -0,0 +1,48 @@
# Task: Use Code sidebar throughout conversation programming settings
## Identity
- Task ID: 20261014-code-settings-sidebar-8f4b2c71
- Mode: Feature
- Branch: codex/20261014-code-settings-sidebar-8f4b2c71-code-settings-sidebar
- Worktree: /Users/chillishark/Makelore 麦洛/.codex-worktrees/makelore/20261014-code-settings-sidebar-8f4b2c71
- Base commit: 5e3afa841a86b005a6f19462e1634d4bf92cd881
- Owner: codex
- Status: Ready for Integration
## Scope
- Reuse the approved Code left rail for conversation programming settings (`/project-config?agent=…`) and its plugin resource route, including navigation/brand, shared resize/collapse, project rows, footer gallery and account placement.
## Intent And Constraints
- User explicitly supersedes the old config-specific header/gallery omission. Keep project configuration content, APIs, back/unsaved guards, session/project identities, current home-entry behavior and all trial inherited features unchanged. Renderer-only update preserves actual Main process/bytes. Load the Code skin from shared layout for direct route/reload.
## Outcome
- Implemented a shared Code sidebar route scope for `/chat`, `/project-config` and descendants. TitleBar uses a sidebar-specific layout flag so configuration title/project context/logo and main content padding retain their existing behavior.
- Removed configuration-only suppression of brand/header and gallery footer; project/session/account state and handlers are shared. Moved Code CSS loading to MainLayout so direct configuration entry and reload include the approved skin. Only two CSS scoping rules changed; footer rules and accepted placement remain exact.
- README behavior updated. Product implementation `6bb15ae`, focused Electron coverage `2c671ae`; final complete product source `ec07c67ef4a9218dbadcb73c9e6e79fd0da2c172`.
- During work, actual runtime advanced first to WeChat copy `d0451e9`, then full Main/Renderer `40930aec` / PID93092. Retained both committed product deltas so relative to the actual current runtime only the approved five Renderer files differ; Main/shared/resources/package remain exact.
- A whole-source merge pulled a foreign task record and failed the documentation gate. Preserved that known owned merge as backup branch `codex/20261014-code-settings-sidebar-8f4b2c71-import-snapshot`, returned to the prior owned snapshot, and imported only committed product/relevant test deltas. Peer record remains untouched in its owned worktree; final boundary gate passes.
- Immutable overlay `.trial-runtime/code-settings-sidebar-20261014-8f4b2c71` prepared, safely activated, reloaded in the same native window, finalized and verified `active-verified`. Effective Renderer ec07c67, actual Main40930/PID93092 and all Main bytes preserved; 17 inherited features plus `code-settings-sidebar`. Pointer stale Main manifest/snapshot references were corrected from exact actual process/manifest/closure evidence during finalization.
- User logged in and confirmed idle; fresh UI was checked again at activation and refresh. No credentials/profile files read, no input discarded, no business settings/channel/project/model mutations. Native new entry `index-B5J3Jpk-.js` observed in read-only DevTools, closed after inspection. Final actual Code screenshot/AX retained Alice, width256, project/session/footer/account. Native body action timing is inconsistent, so settings traversal is explicitly fixture-verified rather than claimed as a fresh native traversal.
## Verification
- Official Concurrent/Planning Gates passed; 64 peer records/192 sections inspected read-only, no blocking semantic conflict.
- Typecheck, scoped ESLint, default full `build:vite` passed.
- 40 focused unit tests passed across layout peek, sidebar project actions, community, module navigation and Canvas layout.
- Matching final full-build typecheck passed. Focused real Electron run: 2 passed (8.5s), including actual conversation menu → agent configuration, matching visible sidebar/topnav geometry/colors, unchanged configuration body, plugin route, direct reload and collapse/expand; plus actual isolated Main restart/stopped-service/static-render work restoration.
- Initial E2E assertion also compared the unused inherited text color of the empty titlebar background div. Final test excludes only that non-rendered field and retains all actual text/icon/background/border/geometry assertions.
- 117 preserved-work-entry tests passed across four files after importing the latest active Main; no real account or model execution.
- Independent source review found no actionable issue. Final helper verify, artifact closure/source scope, accepted footer rules, root native refresh receipt, and documentation/whitespace checks passed. Evidence/logs/PNGs and operations are in the task runtime stage.
- Full-runtime predecessor remains recorded as pending actual Alice work-entry acceptance; this task independently fixture-verifies preservation and does not falsely promote the preceding stage to native active-verified.
## Follow-ups
- Pre-existing actual-account work-entry acceptance remains with task `20261014-work-entry-restore-91c7e6a2`; no remaining work for the requested shared sidebar.
## Promotion Candidates
- Target: integrated UI/current-state documentation. Proposal: Code configuration and plugin resource routes reuse the same left navigation rail and shared CSS loading as chat, while configuration main content retains its own layout. Evidence: this user request, exact-build metrics/color/reload Electron acceptance and immutable overlay receipt. Impact: supersedes the earlier config-only brand/gallery omission. Human confirmation: already provided by the user request; no additional product decision needed.
@@ -0,0 +1,47 @@
# Task: Expand module sidebars when entering from home
## Identity
- Task ID: 20261014-home-sidebar-default-31a87f9c
- Mode: Feature
- Branch: codex/20261014-home-sidebar-default-31a87f9c-home-sidebar-default
- Worktree: /Users/chillishark/Makelore 麦洛/.codex-worktrees/makelore/20261014-home-sidebar-default-31a87f9c
- Base commit: b7f50be87bac49bb321c28264279c7a9c379aee4
- Owner: codex
- Status: Ready for Integration
## Scope
- Expand the shared left sidebar before an authorized homepage module-card navigation for Code, Agents, and Canvas. Cover prior-collapse/re-entry and preserve manual toggling.
## Intent And Constraints
- Scope is homepage entry behavior only; retain module access/auth guards, Agent view=mine entry, manual collapse, and accepted gallery placement. No new API or content values. Preserve current combined trial Main and inherited feature bytes during Renderer update.
## Outcome
- Implemented guarded homepage-entry expansion through the existing shared sidebar setter; already-expanded entries avoid redundant preference writes. Agent entry remains `?view=mine`; auth/module policy guards remain before changes. Manual toggling and Canvas desktop/compact rules are unchanged.
- README current behavior updated. Source review found no actionable issue.
- Product commit `1c39471156e4230d8efe110fd8695176cf80ae3a`; Electron coverage commit `cca23df79c73b05459bbf8c447e44dd82771b023`.
- Immutable Renderer snapshot prepared in `.trial-runtime/home-sidebar-default-20261014-31a87f9c`; verifies all 14 inherited features and byte-identical accepted footer CSS, Main source `4eb3efa` / PID 25170 unchanged.
- After the user confirmed an idle homepage, captured the fresh guard, activated the immutable Renderer files and reloaded the same native window through View > Reload. Native DevTools showed the exact new compiled entry `index-StjdrODv.js`; closed DevTools. Final native homepage AX/screenshot retained Alice; Code AX after reload retained sidebar width 256 and expected project/gallery/account elements.
- Finalize and verify passed `active-verified`; current pointer now Renderer `cca23df79c73b05459bbf8c447e44dd82771b023`, same Main `4eb3efa` / PID 25170, all 14 inherited features plus `home-sidebar-default`. No Main restart or business/config/channel writes. Requested layout preference synchronization uses the existing setter.
- Native automation exhibited inconsistent AX/paint/action timing, including an elementHasNoFrame result. Three-module behavior verification is explicitly from the passing isolated Electron fixture; no claim of three fresh native flows. No input discarded; final screen is the homepage. Earlier guard was invalidated when a user dialog was observed; activation waited for user confirmation and a fresh homepage guard.
## Verification
- Planning gate passed after official task identity/status and all 63 peer records (189 sections) were checked read-only; no blocking semantic conflict.
- Typecheck and targeted ESLint passed.
- 37 focused tests passed across module-navigation, cloud-agent-entry-navigation, main-layout-sidebar-peek, and image-workspace-sidebar.
- Default full `build:vite` passed with Renderer-only mode unset; existing Browserslist/chunk warnings only.
- Focused Electron test `opens each home module with the sidebar expanded after a saved collapse`: 1 passed (3.2s), isolated fake auth/Main boundary, no actual user profile or cloud operation. Verified three home card entries, Code/Agents manual collapse and home re-entry, existing Canvas desktop behavior.
- ESLint across all three changed code/test files and diff whitespace check passed.
- Trial helper prepare, safe file activation, root native reload receipt, finalize, and final verification all passed. Evidence and operations are in `.trial-runtime/home-sidebar-default-20261014-31a87f9c`; `overlay-manifest.json` is active-verified. Artifact hashes retain Main/bootstrap and accepted footer stylesheet exactly; recursive inherited coverage is verified separately from the new focused fixture.
## Follow-ups
- None recorded.
## Promotion Candidates
- None recorded.
@@ -0,0 +1,40 @@
# Task: Simplify Code brand area and Canvas project labels
## Identity
- Task ID: 20261014-sidebar-simplify-a6d32f90
- Mode: Feature
- Branch: codex/20261014-sidebar-simplify-a6d32f90-sidebar-simplify
- Worktree: /Users/chillishark/Makelore 麦洛/.codex-worktrees/makelore/20261014-sidebar-simplify-a6d32f90
- Base commit: 049e34cc77338f3778d82323539e9c0f6066a09a
- Owner: codex
- Status: In Progress
## Scope
- Remove the Code rail brand/logo/caption, align New Project at the former brand top and My Projects/list at the former New Project top; apply consistently to chat/configuration via the shared rail. Rename Canvas desktop rail heading to My Projects and show only project names, without version/date metadata.
## Intent And Constraints
- User explicitly supersedes prior Code brand retention. Preserve top return/collapse controls including Linux navigation, shared sidebar width/collapse, Code gallery/Alice footer, configuration content/guards, APIs/project identities/menu actions, Canvas sort/selection/loading. Desktop left rail only; compact Canvas project sheet/status presentation is outside the supplied screenshot scope. Preserve actual trial Main40930/PID93092 and all 18 inherited features; no Main restart or real business writes.
## Outcome
- Removed only the Code sidebar brand block/import; the center welcome artwork and top navigation remain. Removed 10px content top padding as well as the 46px brand block, placing New Project at the prior brand top and My Projects heading at the prior New Project top. Chat/configuration continue sharing one rail; bottom gallery/account rules unchanged.
- Canvas desktop rail is My Projects, with each row showing its real title only. Removed the date formatter; kept updatedAt ordering, selection identity and all existing project actions/loading states.
- README and focused existing tests updated; trial update pending.
## Verification
- Official ownership and Planning Gate passed after 66 peers/198 scope/intent/promotion sections were inspected read-only, no blocking semantic conflicts.
- Standard typecheck, scoped ESLint and default full `build:vite` passed.
- 31 Code/layout/navigation/community tests and 6 Canvas sidebar tests passed. The Canvas selection test also verifies recent-first order and exact identity after hiding metadata.
- Focused Electron chat/configuration geometry/navigation tests running; immutable trial update pending.
## Follow-ups
- None recorded.
## Promotion Candidates
- None recorded.