Commit Graph
749 Commits
Author SHA1 Message Date
brother7 303f26294e feat(agents): 完善恢复费用与云资源交互 2026-09-10 22:29:24 +08:00
brother7 f8f39f39de docs(agents): 核对首期剩余功能与验收范围 2026-09-10 20:10:19 +08:00
brother7 64a3cf4934 feat(agents): 完成云智能体工作台与交互流程 2026-09-10 19:25:12 +08:00
brother7 46fbae9dec feat(agents): 新增云端智能体入口与草稿编辑 2026-09-10 16:00:37 +08:00
brother7 927a85fa22 docs: complete reset card wallet integration
Electron E2E / Electron E2E (macos-latest) (push) Has been cancelled
Electron E2E / Electron E2E (ubuntu-latest) (push) Has been cancelled
Electron E2E / Electron E2E (windows-latest) (push) Has been cancelled
2026-09-08 23:30:14 +08:00
brother7 84250399dd docs: integrate reset card wallet 2026-09-08 23:26:08 +08:00
brother7 01525834fd feat: add expiring reset card wallet 2026-09-08 23:04:54 +08:00
brother7 91ae7912ab docs(project): record design confirmation integration
Electron E2E / Electron E2E (macos-latest) (push) Has been cancelled
Electron E2E / Electron E2E (ubuntu-latest) (push) Has been cancelled
Electron E2E / Electron E2E (windows-latest) (push) Has been cancelled
2026-09-08 11:42:21 +08:00
brother7 3c4e866c2d fix(design): surface incomplete creation plans 2026-09-08 11:40:10 +08:00
brother7 323f4caa50 docs: record Design chat generation client integration
Electron E2E / Electron E2E (macos-latest) (push) Has been cancelled
Electron E2E / Electron E2E (ubuntu-latest) (push) Has been cancelled
Electron E2E / Electron E2E (windows-latest) (push) Has been cancelled
2026-09-08 08:45:40 +08:00
brother7 7defe46de2 merge: integrate Design chat generation handoff client 2026-09-08 08:32:47 +08:00
brother7 6b1e3937d7 test(design): cover chat quote handoff 2026-09-07 23:48:28 +08:00
brother7 bce20d9e4d Merge branch 'main' of https://git.nianxx.cn/wangxuming/makelore
Electron E2E / Electron E2E (macos-latest) (push) Has been cancelled
Electron E2E / Electron E2E (ubuntu-latest) (push) Has been cancelled
Electron E2E / Electron E2E (windows-latest) (push) Has been cancelled
2026-09-07 20:28:05 +08:00
inman 64db6abbfb Merge remote-tracking branch 'origin/main'
Electron E2E / Electron E2E (macos-latest) (push) Has been cancelled
Electron E2E / Electron E2E (ubuntu-latest) (push) Has been cancelled
Electron E2E / Electron E2E (windows-latest) (push) Has been cancelled
# Conflicts:
#	.project-docs/20-architecture/module-map.md
#	src/pages/ImageCanvas/DesignConversationPane.tsx
#	tests/unit/image-canvas-page.test.tsx
2026-09-07 18:40:36 +08:00
inman ab9f889233 feat(plugins): merge Skill management into plugins 2026-09-07 18:36:33 +08:00
brother7 171602f302 docs: record context menu integration 2026-09-07 18:10:08 +08:00
inman bb8a19eecf fix(canvas): soften design conversation 2026-09-07 17:24:15 +08:00
brother7 6fbb9c077e test: cover design text context menu 2026-09-07 17:19:04 +08:00
brother7 813d1ca02e fix: restore native text context menu 2026-09-07 17:07:57 +08:00
inman 6a05992e18 fix(canvas): align fixed design sidebars 2026-09-07 16:08:17 +08:00
inman e98603435d fix(canvas): compact workspace toolbar 2026-09-07 15:53:49 +08:00
inman 0619327fbe fix(canvas): align workspace headers 2026-09-07 15:36:48 +08:00
inman a705253261 fix(canvas): add full-height history rail 2026-09-07 15:09:12 +08:00
inman 4477d0da7d docs: record plugin panel integration 2026-09-07 15:01:49 +08:00
inman 3ecfb74b15 Merge branch 'codex/20260907-project-config-plugin-panel-c84e71a2-project-config-plugin-panel'
# Conflicts:
#	README.md
2026-09-07 14:59:14 +08:00
inman d278785da8 feat(project-config): simplify plugin and model drawers 2026-09-07 14:58:30 +08:00
inman 34ec92ee72 merge: restore AI Design left project sidebar 2026-09-07 14:47:10 +08:00
inman b95f1b4df5 fix(canvas): restore left project sidebar 2026-09-07 14:31:43 +08:00
brother7 8c13ae76db merge: integrate remote main
Electron E2E / Electron E2E (macos-latest) (push) Has been cancelled
Electron E2E / Electron E2E (ubuntu-latest) (push) Has been cancelled
Electron E2E / Electron E2E (windows-latest) (push) Has been cancelled
2026-09-07 13:43:27 +08:00
inman 918f8f80dc Merge origin/main and preserve nonblocking project entry
Electron E2E / Electron E2E (macos-latest) (push) Has been cancelled
Electron E2E / Electron E2E (ubuntu-latest) (push) Has been cancelled
Electron E2E / Electron E2E (windows-latest) (push) Has been cancelled
2026-09-07 12:53:55 +08:00
brother7 4b894c7e32 docs: record AI Design activity main landing 2026-09-07 12:36:12 +08:00
brother7 7bdb42f26c feat(design): integrate agent activity timeline 2026-09-07 12:21:40 +08:00
inman f53683a586 docs: record remote main semantic conflict 2026-09-07 12:07:14 +08:00
inman 6366fc28dc docs: hand off remote main divergence 2026-09-07 11:50:24 +08:00
inman 43a48f7392 chore: clean stale worktrees and branches 2026-09-07 11:36:05 +08:00
inman 860c97d466 docs: close final main integration gate 2026-09-07 11:10:30 +08:00
inman 0fb1dac245 integrate completed September 6 product changes 2026-09-07 11:05:25 +08:00
inman e069ec6294 merge: retire Canvas inspiration entry
# Conflicts:
#	README.md
#	src/components/layout/MainLayout.tsx
#	src/components/layout/Sidebar.tsx
#	tests/e2e/image-workspace-v2.spec.ts
#	tests/unit/app-module-provider-gate.test.tsx
#	tests/unit/title-bar.test.tsx
2026-09-07 10:24:24 +08:00
inman ea1219c583 merge: integrate Canvas plan and reference flow
# Conflicts:
#	README.md
2026-09-07 10:17:50 +08:00
inman f6c59615af merge: integrate project settings plugin workspace
# Conflicts:
#	src/components/layout/MainLayout.tsx
#	src/pages/ProjectConfiguration/index.tsx
2026-09-07 10:16:19 +08:00
inman a91c7e3b86 merge: integrate coding default page
# Conflicts:
#	src/components/layout/Sidebar.tsx
#	tests/unit/coding-chat-panel.test.tsx
2026-09-07 10:10:34 +08:00
inman 39d7b7e2a1 merge: integrate simplified project creation 2026-09-07 10:08:05 +08:00
inman b22559a596 feat: remove Canvas inspiration entry 2026-09-07 10:06:38 +08:00
inman 1562a49ff1 feat: redesign Canvas plan and reference flow 2026-09-07 10:06:38 +08:00
inman be1764e016 feat: move plugin workspace into project settings 2026-09-07 10:06:37 +08:00
inman af13aca003 feat: simplify code project creation 2026-09-07 10:06:37 +08:00
inman 1dfa9221c4 docs: record development startup task 2026-09-07 10:06:23 +08:00
brother7 81b524a02c feat(design): render assistant activity progress 2026-09-07 09:57:21 +08:00
inman ce90f57ce7 fix: simplify coding project card rail 2026-09-06 16:12:24 +08:00
inman faf751be5e fix: refine coding project landing actions 2026-09-06 15:45:22 +08:00