Commit Graph

87 Commits

Author SHA1 Message Date
inman
918f8f80dc Merge origin/main and preserve nonblocking project entry
Some checks failed
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
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
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
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
df02680f9d feat: improve project agent onboarding 2026-09-06 13:55:32 +08:00
9fed0cc7c4 fix(agent-browser): restore bounded presentation lifecycle 2026-09-06 12:50:18 +08:00
e0de7aa28c fix(plugins): make official plugins project-wide 2026-09-05 13:19:13 +08:00
inman
a2cb07fedc merge: integrate remote project scaffold updates 2026-09-05 12:42:00 +08:00
959b6333b5 feat(projects): add interactive AI app scaffold skill 2026-09-04 20:36:28 +08:00
inman
2d0322ef7a merge: integrate remote main 2026-09-04 14:14:02 +08:00
inman
bd0873f348 feat: remove Learning module 2026-09-04 12:14:53 +08:00
23f96a523e fix(design): restore streamed replies and quote handoff 2026-09-04 11:37:03 +08:00
945b40de11 feat(design): integrate conversation-first creation flow
Some checks failed
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-04 07:39:58 +08:00
4d8b19eeb5 merge: integrate remote main
Some checks failed
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-03 17:19:21 +08:00
1b1f206dd8 feat: unify plugin workspace navigation 2026-09-03 13:39:55 +08:00
inman
cdbc262802 merge: reconcile latest main changes 2026-09-03 11:11:58 +08:00
inman
04320ddfd4 merge: integrate foreground conversation reconciliation
# Conflicts:
#	tests/e2e/pi-coding-first-chat.spec.ts
2026-09-03 10:47:56 +08:00
inman
bbfe16d8f9 merge: integrate conversation attention badges 2026-09-03 10:46:24 +08:00
inman
7aa118b2d3 fix(coding): rehydrate selected conversation on foreground 2026-09-03 10:45:12 +08:00
inman
f2c3755b69 fix(coding): limit unread badges to attention transitions 2026-09-03 10:44:59 +08:00
inman
d25ed08aae merge: integrate remote and local main histories
# Conflicts:
#	.project-docs/20-architecture/module-map.md
#	.project-docs/30-worklog/current-state.md
#	.project-docs/50-evidence/evidence-index.md
#	src/pages/MyPlugins/index.tsx
#	tests/unit/pi-agent-server-process-real.test.ts
#	tests/unit/pi-managed-worker-opener.test.ts
#	tests/unit/plugin-marketplace-pages.test.tsx
2026-09-03 10:44:04 +08:00
756638a28a feat: simplify AI design for young creators 2026-09-02 19:14:33 +08:00
e800d42595 fix(titlebar): reserve Windows window controls for logo 2026-09-02 10:50:15 +08:00
d2ef37bc4d fix(coding): reconcile snapshot after abort 2026-09-01 15:17:45 +08:00
inman
a8fd95f844 Merge branch 'codex/20260831-show-progress-messages-a14f9c2d-show-progress-messages-a14f9c2d' 2026-09-01 11:46:31 +08:00
inman
69832e0ba6 Merge branch 'codex/20260831-fix-history-quota-errors-6c2a91e4-fix-history-quota-errors-6c2a91e4' 2026-09-01 11:46:28 +08:00
inman
8d878ebd14 feat: preserve assistant progress previews 2026-09-01 11:46:04 +08:00
inman
d523b72cf8 fix: restore coding history and quota feedback 2026-09-01 11:46:04 +08:00
inman
e237941399 feat: move plugin center into project configuration 2026-08-31 16:57:26 +08:00
inman
b3f4166f21 feat: consolidate plugin navigation 2026-08-31 16:30:17 +08:00
inman
28897cd4a2 merge: integrate upstream main with local Makelore changes 2026-08-31 10:55:48 +08:00
inman
33fb31fb28 chore(integration): snapshot local main worktree 2026-08-31 10:23:21 +08:00
04ee2c1134 merge: integrate marketplace and design v2 client 2026-08-30 22:45:44 +08:00
b0b5a602b5 feat(canvas): cut over design agent to living form v2 2026-08-30 17:00:31 +08:00
3df794c2e7 fix(marketplace): close client review findings 2026-08-29 12:36:21 +08:00
11d0af0166 fix: complete marketplace client remediation 2026-08-28 23:16:24 +08:00
97c9ad1aad feat: add plugin marketplace renderer 2026-08-28 18:42:28 +08:00
cb1fd2629c feat: add project plugin center 2026-08-27 18:40:24 +08:00
ce8e2103d9 feat(coding): add project identity UX 2026-08-26 18:56:13 +08:00
8ba2a6055c fix(pi): validate user-entry conversation forks 2026-08-25 17:48:31 +08:00
45d933732a feat(coding): nest Conversations under Agents 2026-08-25 16:34:11 +08:00