 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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
inman
|
f8eee430f4
|
docs: record running development environment
|
2026-09-05 14:56:12 +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 |
|
|
inman
|
a2cb07fedc
|
merge: integrate remote project scaffold updates
|
2026-09-05 12:42:00 +08:00 |
|
|
inman
|
53f3db3ace
|
docs: record repository pull handoff
|
2026-09-05 12:37:55 +08:00 |
|
|
inman
|
533f8bb457
|
docs: record remote main integration
|
2026-09-04 14:16:55 +08:00 |
|
|
inman
|
2d0322ef7a
|
merge: integrate remote main
|
2026-09-04 14:14:02 +08:00 |
|
|
inman
|
2d3c103bac
|
docs: record remote main fetch
|
2026-09-04 14:10:59 +08:00 |
|
|
inman
|
5f87a42d59
|
docs: integrate Learning removal
|
2026-09-04 12:15:32 +08:00 |
|
|
inman
|
bd0873f348
|
feat: remove Learning module
|
2026-09-04 12:14:53 +08:00 |
|
|
inman
|
bdc290c2cf
|
docs: record main synchronization
|
2026-09-04 12:02:02 +08:00 |
|
|
inman
|
8e947b4f0e
|
docs: complete main integration record
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 11:16:15 +08:00 |
|
|
inman
|
e1fddeea15
|
docs: record final main integration gate
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 11:14:15 +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
|
4babd6d0c4
|
merge: integrate packaged Pi runtime resolution
# Conflicts:
# tests/unit/pi-agent-server-process-real.test.ts
|
2026-09-03 10:46:18 +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
|
5d7a235987
|
fix(coding): resolve packaged Pi imports from runtime root
|
2026-09-03 10:44:44 +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 |
|
|
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 |
|
|
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
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 |
|
|
inman
|
33fb31fb28
|
chore(integration): snapshot local main worktree
|
2026-08-31 10:23:21 +08:00 |
|
|
inman
|
927e13349b
|
perf: optimize app startup and background lifecycles
|
2026-08-19 00:56:15 +08:00 |
|
|
inman
|
6882ff687b
|
merge: sync origin/main and preserve learning stream fix
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 18:11:16 +08:00 |
|
|
inman
|
aa57dff677
|
fix: parse production learning agent streams
|
2026-08-16 21:44:35 +08:00 |
|
|
inman
|
01bee3188b
|
feat: integrate learning module
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-16 20:52:16 +08:00 |
|
|
inman
|
26b52d76e3
|
feat: 完善图像工作区与创作工具体验
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-16 14:08:27 +08:00 |
|
|
inman
|
c809002180
|
feat: add bundled OpenCode skills and refine module flow
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-14 18:15:55 +08:00 |
|
|
inman
|
22add3f01f
|
完善客户端模块与工作区能力
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-13 19:51:02 +08:00 |
|
|
inman
|
f4113a872f
|
收口 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-08-12 22:43:09 +08:00 |
|
|
inman
|
80e8386fa6
|
feat: update Makelore modules and conversations
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-07-31 10:08:41 +08:00 |
|
|
inman
|
b8ca3f8eea
|
Makelore 2.0 initial clean snapshot
|
2026-07-29 17:22:35 +08:00 |
|