Commit Graph

71 Commits

Author SHA1 Message Date
03774d0625 docs: record image attachment fix on main 2026-09-13 00:19:50 +08:00
1d661f7a56 docs: record model capability main branch delivery
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-12 22:14:51 +08:00
c570a357f9 docs: 记录云智能体桌面工作区主分支集成 2026-09-12 19:47:45 +08:00
5d8e91c701 docs(agents): 集成个人云智能体平台与最终费用政策 2026-09-11 00:25:41 +08:00
84250399dd docs: integrate reset card wallet 2026-09-08 23:26:08 +08:00
323f4caa50 docs: record Design chat generation client integration
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-08 08:45:40 +08:00
inman
64db6abbfb Merge remote-tracking branch 'origin/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
# 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
a705253261 fix(canvas): add full-height history rail 2026-09-07 15:09:12 +08:00
8c13ae76db 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-07 13:43:27 +08:00
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
7bdb42f26c feat(design): integrate agent activity timeline 2026-09-07 12:21:40 +08:00
inman
0fb1dac245 integrate completed September 6 product changes 2026-09-07 11:05:25 +08:00
5c61110f46 docs: record automatic game resource delivery 2026-09-06 09:56:47 +08:00
f721966f3c docs: record official plugin project scope 2026-09-05 13:25:31 +08:00
inman
a2cb07fedc merge: integrate remote project scaffold updates 2026-09-05 12:42:00 +08:00
5e0a091955 docs: record project-wide scaffold activation 2026-09-05 12:39:18 +08:00
b92e7ba5bb docs: reconcile official scaffold plugin integration 2026-09-04 22:42:29 +08:00
2207806038 docs: reconcile interactive AI app scaffold boundary 2026-09-04 21:09:55 +08:00
inman
2d0322ef7a merge: integrate remote main 2026-09-04 14:14:02 +08:00
inman
5f87a42d59 docs: integrate Learning removal 2026-09-04 12:15:32 +08:00
336e0bb0ca docs: integrate design stream and quote handoff
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 11:46:11 +08:00
aa3f52a8f8 docs: finalize AI Design feedback integration 2026-09-04 10:20:44 +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
fcdc1b2f6e docs: integrate unified plugin workspace 2026-09-03 15:55:58 +08:00
inman
cdbc262802 merge: reconcile latest main changes 2026-09-03 11:11:58 +08:00
bd377c9732 docs: integrate installed resource loading 2026-09-03 10:44:41 +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
664b8823a0 feat(coding): add model tools and device packages 2026-09-02 18:46:21 +08:00
08099ea1c2 docs(plugins): integrate official bundled delivery
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-01 18:38:27 +08:00
738eda1430 docs: record model capability integration 2026-09-01 14:34:56 +08:00
inman
fac08e975d docs: finalize integrated local product state 2026-09-01 11:59:13 +08:00
4a1e5d3121 docs(web-search): record client integration 2026-09-01 02:44:41 +08:00
93fba75f74 docs: record remote main integration 2026-08-31 14:56:40 +08:00
inman
28897cd4a2 merge: integrate upstream main with local Makelore changes 2026-08-31 10:55:48 +08:00
04ee2c1134 merge: integrate marketplace and design v2 client 2026-08-30 22:45:44 +08:00
30f84fe973 docs: promote plugin marketplace Release A 2026-08-30 15:36:52 +08:00
2eaf0450b8 fix: integrate updater downgrade guard
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-08-26 16:41:53 +08:00
fba68e86d9 merge: fix opencode model switching runtime refresh
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-08-21 01:48:01 +08:00
eedd20d061 docs(integration): record remember password boundary
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-08-20 23:45:13 +08:00
460268586b docs(integration): record session model hotfix promotion 2026-08-20 23:31:40 +08:00
d16cacece7 docs(integration): remove Learning download size checks 2026-08-20 14:47:01 +08:00
2168e291b2 docs(integration): direct Learning README images 2026-08-20 14:09:50 +08:00
a5fc8bf596 docs(integration): promote Learning project catalog 2026-08-20 00:17:42 +08:00
b51dea6f52 docs(integration): record Square auth lifecycle merge 2026-08-19 16:55:05 +08:00
5bff5d3135 docs(integration): record design freeze fix 2026-08-19 13:06:16 +08:00
ce897f14cc merge: isolate concurrent OpenCode chat runs 2026-08-17 22:28:19 +08:00
4013edcbbc merge: integrate per-user module access 2026-08-17 10:13:12 +08:00
f7171a471a merge: integrate remote learning module safely
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-08-17 01:05:49 +08:00
bb16c1d12a merge: sync remote main and preserve local integrations 2026-08-16 21:49:41 +08:00