Commit Graph
100 Commits
Author SHA1 Message Date
brother7 0ca744fb9b docs: record approved rollback worktree cleanup
Electron E2E / Electron E2E (macos-latest) (push) Waiting to run
Electron E2E / Electron E2E (ubuntu-latest) (push) Waiting to run
Electron E2E / Electron E2E (windows-latest) (push) Waiting to run
2026-10-11 12:57:42 +08:00
brother7 6d3f4ea94d docs: record Makelore rollback on main 2026-10-11 12:38:40 +08:00
brother7 5ae6ffd204 merge: integrate reviewed Makelore identity rollback 2026-10-11 12:37:03 +08:00
brother7 9949328bcd docs(makelore): record platform auth rollback 2026-10-11 12:29:48 +08:00
brother7 45198aeccb Revert "feat(makelore): add platform oidc login"
This reverts commit 7236def07d.
2026-10-11 12:28:02 +08:00
brother7 658bf7dcbc docs: record rollback integration snapshot 2026-10-11 12:11:22 +08:00
brother7 4b452e6eed docs: record Makelore SSO rollback 2026-10-11 12:08:20 +08:00
brother7 e28beff3a6 Revert "feat(makelore): add platform oidc login"
This reverts commit 7236def07d.
2026-10-11 12:04:01 +08:00
brother7 f2a0eefc9e docs(makelore): record source worktree cleanup
Electron E2E / Electron E2E (macos-latest) (push) Waiting to run
Electron E2E / Electron E2E (ubuntu-latest) (push) Waiting to run
Electron E2E / Electron E2E (windows-latest) (push) Waiting to run
2026-10-10 22:15:48 +08:00
brother7 afaefdca6b docs(makelore): integrate platform oidc boundary 2026-10-10 19:42:24 +08:00
brother7 86216b8458 docs(makelore): mark platform sso ready for integration 2026-10-10 19:41:04 +08:00
brother7 7236def07d feat(makelore): add platform oidc login 2026-10-10 17:29:33 +08:00
brother7 87d3f03d75 Merge branch 'main' of https://git.nianxx.cn/wangxuming/makelore
Electron E2E / Electron E2E (macos-latest) (push) Canceled after 0s
Electron E2E / Electron E2E (ubuntu-latest) (push) Canceled after 0s
Electron E2E / Electron E2E (windows-latest) (push) Canceled after 0s
2026-10-09 16:11:55 +08:00
brother7 eb773f7421 docs: record product integration on main branch 2026-10-09 16:10:31 +08:00
brother7 35e2a9149a docs: record remaining product rollout and scope review 2026-10-09 15:59:50 +08:00
brother7 0dc9770449 docs(integration): record verified handoff and retained workspaces 2026-10-09 15:45:34 +08:00
brother7 12af6aed5d docs(product): integrate implemented community and teaching boundaries 2026-10-09 15:44:37 +08:00
brother7 0d442ce576 docs(product): retain the client creation boundary in integration handoff 2026-10-09 15:22:43 +08:00
brother7 281e6dc151 feat(billing): guide parents to recharge the child account 2026-10-09 08:43:05 +08:00
brother7 1c07f7b5cb Merge remote main with teacher streaming and composer updates
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-29 21:37:50 +08:00
brother7 bb96941461 feat: 按老师发布配置渲染快捷提示 2026-09-29 19:59:04 +08:00
brother7 6dee9ea62c docs: integrate teacher streaming into main 2026-09-29 18:30:58 +08:00
brother7 8ccc4650a2 feat(teacher): stream Yuxi reasoning and answer previews 2026-09-29 18:18:56 +08:00
brother7 f443f3bc66 docs: 记录快捷提示主分支集成与工作树清理
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-29 17:23:55 +08:00
brother7 53d5b6ba5b feat: 按老师发布配置渲染快捷提示 2026-09-29 17:04:55 +08:00
brother7 4103754b80 docs(teacher): 记录一次发布与配置刷新集成
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-29 12:06:59 +08:00
brother7 913ccad577 fix(teacher): 独立刷新老师目录以缩短配置更新延迟 2026-09-29 12:03:06 +08:00
brother7 2767a15017 Record bundled default Skill integration for MakeLore 2.0.2
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-29 09:01:50 +08:00
brother7 7a42de875b Merge branch 'codex/20260928-default-child-replies-0108dd01-default-child-replies' 2026-09-29 08:59:33 +08:00
brother7 97c3e4590e Bundle child-friendly replies with MakeLore and acquire it by default 2026-09-29 08:57:31 +08:00
brother7 5d45cd7f33 Record default child replies client integration
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-28 23:09:05 +08:00
brother7 e70b6eab91 Install child-friendly replies by default through signed Marketplace delivery 2026-09-28 23:00:54 +08:00
brother7 efff238a75 Merge remote main preserving project chats and reply recovery
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-28 20:51:33 +08:00
brother7 d37bc137ca Record teacher component removal integration 2026-09-28 17:55:03 +08:00
brother7 317def7912 Remove teacher conversation discussion components 2026-09-28 17:46:19 +08:00
brother7 592920da06 docs: record completed project chat worktree recovery 2026-09-28 16:41:23 +08:00
brother7 9b024a2cbd docs: record project chat cleanup recovery blocker 2026-09-28 16:38:25 +08:00
brother7 c406d0e00b docs: record project conversation merge verification 2026-09-28 16:34:56 +08:00
brother7 f12f890c49 Merge project-scoped agent conversations into main 2026-09-28 16:34:18 +08:00
brother7 4b41c23a3a fix: isolate delivered agent chats by project 2026-09-28 16:21:14 +08:00
brother7 a21a1f077c Merge remote main and reconcile agent refresh with ongoing chats
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-28 15:02:09 +08:00
brother7 56da6b9911 docs: record single-chat merge handoff 2026-09-28 14:36:57 +08:00
brother7 2b4b7710d1 Merge single ongoing agent conversations into main 2026-09-28 14:35:49 +08:00
brother7 7aa81da616 feat(coding): keep one ongoing conversation per delivered agent 2026-09-28 14:19:02 +08:00
brother7 a1d52c60d8 docs: 记录智能体会话作用域修复集成 2026-09-28 13:54:31 +08:00
brother7 3779f33655 docs: 记录智能体话题作用域报错诊断与验证 2026-09-28 13:43:50 +08:00
brother7 e54f3d234d docs: propose one ongoing conversation per cloud agent 2026-09-28 12:28:14 +08:00
brother7 b26e25c9ed docs(design): record video form fix integration
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-27 18:21:27 +08:00
brother7 bbea6eba82 fix(design): distinguish saved video settings from preparation needs 2026-09-27 16:32:38 +08:00
brother7 0eed70fa63 docs: integrate agent browser background debugging contract 2026-09-27 15:32:24 +08:00
brother7 a52e747a00 fix(browser): preserve chat focus during agent browsing 2026-09-27 15:23:23 +08:00
brother7 220e89992b docs: 记录智能体分页读取修复集成
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-27 10:31:02 +08:00
brother7 eb818bc037 merge: 合入智能体分页读取与工具活动修复 2026-09-27 10:30:09 +08:00
brother7 56cefe84e7 fix(teacher): 改善只读工具分页与读取预算 2026-09-27 10:15:17 +08:00
brother7 17c7e5c495 docs: 说明老师读取预算与工具分页限制 2026-09-27 09:17:00 +08:00
brother7 8a74721337 fix(teacher): 合并续接工具活动并修正暂停状态 2026-09-27 09:11:27 +08:00
brother7 5d24a219aa docs: 记录智能体读取收尾修复集成
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-26 18:33:53 +08:00
brother7 60c20f996e fix(teacher): 区分读取额度与上下文失效 2026-09-26 18:03:47 +08:00
brother7 287dcd303d docs: 记录图标任务工作目录清理状态 2026-09-26 16:35:36 +08:00
brother7 5e6866fc02 docs: 记录智能体图标修复集成结果
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-26 16:29:42 +08:00
brother7 e3d01a1da4 merge: 合入下发智能体图标修复 2026-09-26 16:28:24 +08:00
brother7 a3c02e7464 fix: 显示下发智能体的云端图标 2026-09-26 16:11:09 +08:00
brother7 37e7b1d01c docs: 补齐小智硬件与固件平台介绍 2026-09-26 16:00:46 +08:00
brother7 c8e9a24a04 docs: 补充麦洛产品介绍与老师 Agent 定位 2026-09-26 15:53:59 +08:00
brother7 4b79e6784d docs: 以领域杰出人物的能力定义老师 Agent
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-26 15:30:05 +08:00
brother7 9147b509c7 docs: 明确老师 Agent 的领域判断能力定位 2026-09-26 15:25:00 +08:00
brother7 1037356090 docs: 记录智能体工具续接修复集成
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-24 17:10:36 +08:00
brother7 79914e1d06 fix: 等待云端智能体资源释放后续接工具结果 2026-09-24 17:02:24 +08:00
brother7 0e22e0545d docs: 记录顶栏任务清理阻塞状态
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-24 15:49:31 +08:00
brother7 f7b2063dfe docs: 同步顶栏智能体切换集成记录 2026-09-24 15:45:18 +08:00
brother7 a10cf00015 feat: 在顶栏并排展示下发智能体并直接切换 2026-09-24 15:38:50 +08:00
brother7 39b03a1628 docs: 同步智能体咨询渲染集成记录
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-24 14:57:30 +08:00
brother7 98559e32a7 fix: 合入智能体咨询解析与渲染修复 2026-09-24 14:56:16 +08:00
brother7 97837cef90 fix: render consultation replies and typed tool activity 2026-09-24 14:36:20 +08:00
brother7 a628860144 docs: record missing evidence for discussion reply failure 2026-09-24 14:01:58 +08:00
brother7 3c68155ecd fix: avoid stray zero in consultation composer 2026-09-24 13:51:34 +08:00
brother7 0a8fce67a4 docs: record consultation integration checkpoint and registry blocker
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-24 12:35:28 +08:00
brother7 8a157be4f6 feat(consultation): unify server-distributed agents without fixed roles 2026-09-24 11:56:42 +08:00
brother7 248776d855 docs(teacher): clarify teacher and friend configuration sources 2026-09-24 11:18:53 +08:00
brother7 de72b1cd94 fix(teacher): 区分词元预算与传输字节避免短问题被拦截 2026-09-24 11:09:29 +08:00
brother7 158d3ee5fa docs(teacher): 集成 Yuxi 老师与学生计费边界
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-23 10:46:50 +08:00
brother7 d20c818fe7 fix(teacher): 隔离子智能体流式消息与老师正文 2026-09-23 10:25:43 +08:00
brother7 3fe98fc565 docs(teacher): 记录补充审查与流式消息路由遗漏 2026-09-23 10:14:22 +08:00
brother7 e35a13079e feat(teacher): 连接 Yuxi 老师并提供项目与会话只读工具 2026-09-23 09:56:11 +08:00
brother7 1f2ad3fb3a docs: record partial teacher context worktree cleanup 2026-09-22 19:27:17 +08:00
brother7 9b5324fb2e docs(coding-teacher): integrate read-only project context repair 2026-09-22 19:21:26 +08:00
brother7 44e754a43e fix(coding-teacher): restore context and read project files 2026-09-22 19:12:59 +08:00
brother7 7f5131e92f docs: integrate teacher default reasoning 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-09-22 14:39:08 +08:00
brother7 28e0decbc3 fix: accept nullable teacher default reasoning effort 2026-09-22 14:25:03 +08:00
brother7 2c2031469e docs: explain teacher availability message and refresh behavior 2026-09-22 14:16:39 +08:00
brother7 e5d271bc45 docs: integrate project conversations and coding teacher
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-22 13:59:36 +08:00
brother7 00ad84c094 Merge project conversations and cloud coding teacher into main 2026-09-22 13:54:50 +08:00
brother7 9242a40d87 feat: organize project conversations and add coding teacher side chat 2026-09-22 12:30:26 +08:00
brother7 0cf67befb5 docs: record point wallet worktree cleanup failure 2026-09-22 12:06:25 +08:00
brother7 88800f9223 docs: integrate permanent point wallet into main 2026-09-22 12:03:43 +08:00
brother7 a1cce428af feat: replace desktop membership with permanent point wallet 2026-09-22 11:43:04 +08:00
brother7 2f82b9f79c docs: retain game audio worktrees at user request
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-21 16:42:48 +08:00
brother7 e3a480964d docs: record game audio client main integration 2026-09-21 16:38:54 +08:00
brother7 1841bafb18 merge: integrate official game audio into main 2026-09-21 16:36:19 +08:00
brother7 b5907e895c docs: integrate removed project reopening fix 2026-09-21 15:46:31 +08:00