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 |
|
inman
|
bb8a19eecf
|
fix(canvas): soften design conversation
|
2026-09-07 17:24:15 +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 |
|
|
|
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 |
|
|
|
4b894c7e32
|
docs: record AI Design activity main landing
|
2026-09-07 12:36:12 +08:00 |
|
|
|
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 |
|
|
|
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 |
|
inman
|
de8ce283dd
|
feat: redesign coding default entry
|
2026-09-06 15:07:19 +08:00 |
|
|
|
da29294979
|
feat: integrate project setup onboarding
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-06 14:43:22 +08:00 |
|
|
|
83ad10d95e
|
feat: integrate token point usage v2
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-06 14:24:50 +08:00 |
|
|
|
8042d2be26
|
docs: complete project setup UX task
|
2026-09-06 13:57:03 +08:00 |
|
|
|
df02680f9d
|
feat: improve project agent onboarding
|
2026-09-06 13:55:32 +08:00 |
|
|
|
a4fc3a5251
|
Merge branch 'main' into codex/20260906-project-setup-ux-90fe6cf2-project-setup-ux
|
2026-09-06 13:55:25 +08:00 |
|
|
|
47f0095720
|
docs: resume project setup UX implementation
|
2026-09-06 12:53:29 +08:00 |
|
|
|
9fed0cc7c4
|
fix(agent-browser): restore bounded presentation lifecycle
|
2026-09-06 12:50:18 +08:00 |
|
|
|
2330401428
|
docs: record project setup UX review
|
2026-09-06 12:15:56 +08:00 |
|
|
|
5c61110f46
|
docs: record automatic game resource delivery
|
2026-09-06 09:56:47 +08:00 |
|
|
|
4df4bc9624
|
feat: integrate automatic game resource delivery
|
2026-09-06 09:50:49 +08:00 |
|
inman
|
f8eee430f4
|
docs: record running development environment
|
2026-09-05 14:56:12 +08:00 |
|
|
|
f721966f3c
|
docs: record official plugin project scope
|
2026-09-05 13:25:31 +08:00 |
|
|
|
e0de7aa28c
|
fix(plugins): make official plugins project-wide
|
2026-09-05 13:19:13 +08:00 |
|
inman
|
c501403076
|
docs: close repository pull integration
|
2026-09-05 12:45:53 +08:00 |
|
inman
|
8064add242
|
docs: reconcile remote scaffold integration
|
2026-09-05 12:44:50 +08:00 |
|
