Commit Graph

430 Commits

Author SHA1 Message Date
inman
f2c3755b69 fix(coding): limit unread badges to attention transitions 2026-09-03 10:44:59 +08:00
inman
301c1496b0 docs: diagnose stale Coding foreground state 2026-09-02 14:17:00 +08:00
inman
774beee508 docs: integrate Bash tool bridge fix 2026-09-02 12:11:04 +08:00
inman
55bf80e88e merge: fix Bash tool bridge deadlock 2026-09-02 12:08:29 +08:00
inman
49112b688d fix(pi): serialize write-leased tool batches 2026-09-02 12:07:13 +08:00
inman
6073bd6f4c docs: diagnose Bash tool retry stall 2026-09-02 11:46:47 +08:00
inman
dcc186877a docs: integrate session settlement recovery 2026-09-02 11:18:58 +08:00
inman
e76a1e113e Merge branch 'codex/20260901-fix-session-settlement-a47d2e91-fix-session-settlement' 2026-09-02 11:13:09 +08:00
inman
dedbc85014 docs: record Coding session stall diagnosis 2026-09-02 11:10:50 +08:00
inman
f1fd13a70f fix(coding): bound missing Pi settlement 2026-09-01 12:40:08 +08:00
inman
8062b45103 docs: certify all-local integration 2026-09-01 12:00:56 +08:00
inman
fac08e975d docs: finalize integrated local product state 2026-09-01 11:59:13 +08:00
inman
e32041f31e docs: record local integration verification 2026-09-01 11:49:37 +08:00
inman
b2af43bfbe docs: preserve local plugin integration review 2026-09-01 11:46:48 +08:00
inman
d2962c7329 Merge branch 'codex/20260831-start-dev-91c4e2a7-start-dev' 2026-09-01 11:46:40 +08:00
inman
5928fe4803 Merge branch 'codex/20260831-push-main-4f8c2a91-push-main' 2026-09-01 11:46:40 +08:00
inman
38094ce646 Merge branch 'codex/20260831-start-platform-7c9e2a41-start-platform-7c9e2a41' 2026-09-01 11:46:40 +08:00
inman
4d4486b458 Merge branch 'codex/20260831-diagnose-history-pagination-3eac1d7b-diagnose-history-pagination-3eac1d7b' 2026-09-01 11:46:40 +08:00
inman
09e2dee95b Merge branch 'codex/20260831-diagnose-agent-submit-f90e1b3f-diagnose-agent-submit-f90e1b3f' 2026-09-01 11:46:40 +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
a278ca34b9 Merge branch 'codex/20260831-consolidate-plugin-navigation-3d9a6c71-consolidate-plugin-navigation' 2026-09-01 11:46:24 +08:00
inman
982f1d5318 docs: begin all-local integration 2026-09-01 11:46:18 +08:00
inman
82415ba76c docs: record platform startup 2026-09-01 11:46:05 +08:00
inman
1f2e35ca00 docs: record history pagination diagnosis 2026-09-01 11:46:05 +08:00
inman
2c9f7418d6 docs: record agent submission diagnosis 2026-09-01 11:46:04 +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
9ed70ba925 docs: record current development startup 2026-09-01 11:39:17 +08:00
inman
c515e3bc75 docs: close local main sync gate 2026-09-01 10:30:26 +08:00
inman
e92b1d2f33 docs: record local main fast-forward 2026-09-01 10:29:27 +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
bf32fecd60 docs: close main merge integration gate
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-31 15:17:18 +08:00
0313261bfb docs: record main merge promotion 2026-08-31 15:15:30 +08:00
b928b9ac60 merge: promote verified remote integration to main 2026-08-31 15:10:27 +08:00
2ca60445d4 docs: record takeover merge 2026-08-31 15:07:36 +08:00
03a9e866d4 Merge branch 'main' of https://git.nianxx.cn/wangxuming/makelore
# Conflicts:
#	electron/coding-runtime/pi/extensions/makelore-runtime.ts
2026-08-31 15:06:37 +08:00
93fba75f74 docs: record remote main integration 2026-08-31 14:56:40 +08:00
372b5345da Merge remote-tracking branch 'origin/main' into codex/20260831-pull-remote-merge-4a91c7e2-pull-remote-merge
# Conflicts:
#	electron/coding-runtime/pi/extensions/makelore-runtime.ts
2026-08-31 14:45:21 +08:00
inman
3c797d69f7 docs: record running development environment 2026-08-31 13:56:44 +08:00
inman
3245524e40 docs: record verified main push 2026-08-31 13:48:45 +08:00
inman
38f85f6b5e docs: record upstream merge promotion
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-31 10:57:23 +08:00
inman
28897cd4a2 merge: integrate upstream main with local Makelore changes 2026-08-31 10:55:48 +08:00
421c8254d5 docs(plugins): record hosted client verification 2026-08-31 10:52:48 +08:00
fe656dd865 feat(plugins): move game resources behind marketplace 2026-08-31 10:45:20 +08:00
inman
33fb31fb28 chore(integration): snapshot local main worktree 2026-08-31 10:23:21 +08:00
62304dc85b docs: record marketplace and design v2 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-08-30 22:47:58 +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