 Hypatia May
|
eb3188f05d
|
Merge remote-tracking branch 'origin/fix/web-transcript-projection' into feat/manual-compact-single-lock
# Conflicts:
# apps/cli/config/base.cordis.yml
# apps/cli/cordis.yml
# docs/event-producer-consumer.md
# examples/package.json
# examples/tui-agent/README.i18n.yaml
# examples/tui-agent/README.md
# examples/tui-agent/README.zh.md
# pnpm-lock.yaml
|
2026-07-30 20:09:23 +08:00 |
|
|
Hypatia May
|
c2337bfa10
|
Merge remote-tracking branch 'origin/fix/human-transcript-projection' into fix/web-transcript-projection
# Conflicts:
# apps/web/tests/scaffold.ts
# apps/web/tests/seeded-history.e2e.ts
# apps/web/tests/snapshots/seeded-history/ui.expected.md
# packages/client/ui-conversation/README.i18n.yaml
# packages/client/ui-conversation/src/client/chat/MessageItem.tsx
|
2026-07-30 20:02:32 +08:00 |
|
|
Hypatia May
|
fe97451604
|
Merge remote-tracking branch 'origin/master' into fix/human-transcript-projection
# Conflicts:
# .agents/notes/implemented/feature/2026-07-17-dedicated-full-screen-tui-front-door.i18n.yaml
# docs/cordis-catalog/services.md
# packages/host/apiproxy/README.i18n.yaml
# packages/ui/tui/README.i18n.yaml
|
2026-07-30 19:57:49 +08:00 |
|
|
Hypatia May
|
a415c3572c
|
refactor(compact): name compaction entry state
|
2026-07-30 19:26:55 +08:00 |
|
 imccyu
|
a1f1f9c29a
|
Merge branch 'master' into codex/figma-context-injection-row
|
2026-07-30 19:20:21 +08:00 |
|
|
Hypatia May
|
bf1f06d398
|
test: stabilize aggregate coverage waits
|
2026-07-30 19:19:35 +08:00 |
|
|
Hypatia May
|
a3d2cf4f3b
|
round 4: fix compact service composition docs
|
2026-07-30 18:43:27 +08:00 |
|
 creatixchu
|
33bb266932
|
Merge remote-tracking branch 'origin/master' into feat/directory-picker-show-hidden
|
2026-07-30 18:29:37 +08:00 |
|
|
Hypatia May
|
7a6d64981c
|
round 3: disambiguate standalone compaction sections
|
2026-07-30 18:28:06 +08:00 |
|
 kingwl
|
1f5d09c2d7
|
Merge origin/master into codex/figma-context-injection-row
# Conflicts:
# packages/client/ui-conversation/README.i18n.yaml
|
2026-07-30 18:27:49 +08:00 |
|
|
Hypatia May
|
4de4d693a2
|
round 2: address manual compaction review findings
|
2026-07-30 18:15:12 +08:00 |
|
|
creatixchu
|
cf21f0a1ea
|
Merge remote-tracking branch 'origin/master' into feat/directory-picker-show-hidden
|
2026-07-30 18:08:30 +08:00 |
|
 Tianyi Cui
|
53ff5c6ef2
|
Merge branch 'master' into feature/shared-cli-config-foundation
|
2026-07-30 18:02:07 +08:00 |
|
|
Hypatia May
|
eda7c76eb1
|
Merge latest PR 956 stack base
# Conflicts:
# docs/core-data-structures/compaction.i18n.yaml
# docs/core-data-structures/compaction.md
# docs/core-data-structures/compaction.zh.md
|
2026-07-30 17:55:35 +08:00 |
|
|
Hypatia May
|
faac9b4fd5
|
round 1: implement bracket-first manual compaction
|
2026-07-30 17:40:25 +08:00 |
|
|
Tianyi Cui
|
66e182b516
|
Merge branch 'master' into feature/shared-cli-config-foundation
|
2026-07-30 17:35:47 +08:00 |
|
|
kingwl
|
3d6cacc59b
|
Merge remote-tracking branch 'origin/master' into codex/composer-dock-stacking
# Conflicts:
# packages/client/ui-conversation/README.i18n.yaml
|
2026-07-30 17:35:22 +08:00 |
|
|
kingwl
|
0f0564b3d0
|
Merge origin/master into codex/figma-context-injection-row
|
2026-07-30 17:35:04 +08:00 |
|
|
kingwl
|
f5228e7c71
|
Merge origin/master into codex/figma-context-injection-row
# Conflicts:
# packages/client/ui-conversation/README.i18n.yaml
# packages/client/ui-conversation/src/client/chat/ToolRow.module.css
# packages/client/ui-conversation/src/client/chat/ToolRow.tsx
|
2026-07-30 17:34:14 +08:00 |
|
|
Hypatia May
|
16378e4ba7
|
Merge remote-tracking branch 'origin/fix/human-transcript-projection' into fix/web-transcript-projection
# Conflicts:
# packages/client/ui-conversation/README.i18n.yaml
|
2026-07-30 17:33:55 +08:00 |
|
|
creatixchu
|
295813f6eb
|
Merge remote-tracking branch 'origin/master' into feat/directory-picker-show-hidden
|
2026-07-30 17:32:46 +08:00 |
|
|
Hypatia May
|
47d2bcb18c
|
Merge remote-tracking branch 'origin/master' into fix/human-transcript-projection
|
2026-07-30 17:28:49 +08:00 |
|
|
Hypatia May
|
82817570b0
|
Merge remote-tracking branch 'origin/master' into fix/human-transcript-projection
# Conflicts:
# docs/cordis-catalog/services.md
# docs/core-data-structures/session.i18n.yaml
# packages/host/apiproxy/README.i18n.yaml
# packages/host/apiproxy/src/api-proxy.ts
# packages/ui/tui/src/index.ts
|
2026-07-30 17:28:26 +08:00 |
|
|
kingwl
|
abf498b8dc
|
fix(web): align composer context stack
|
2026-07-30 17:26:44 +08:00 |
|
|
Tianyi Cui
|
d8f4a0efda
|
chore(docs): refresh merged generated records
|
2026-07-30 17:17:38 +08:00 |
|
|
creatixchu
|
b8d9fb1ede
|
Merge remote-tracking branch 'origin/master' into feat/directory-picker-show-hidden
|
2026-07-30 17:17:03 +08:00 |
|
|
imccyu
|
4cd5745b94
|
Merge branch 'master' into codex/details-default-closed
|
2026-07-30 17:14:51 +08:00 |
|
|
Hypatia May
|
da41677049
|
fix(web): address transcript review follow-ups
|
2026-07-30 17:10:45 +08:00 |
|
|
Tianyi Cui
|
abd7d57358
|
Merge branch 'master' into feature/shared-cli-config-foundation
|
2026-07-30 17:08:42 +08:00 |
|
|
creatixchu
|
3809795fd5
|
Merge remote-tracking branch 'origin/master' into feat/directory-picker-show-hidden
|
2026-07-30 17:02:33 +08:00 |
|
|
imccyu
|
34d5f8f2e2
|
Merge branch 'master' into feat/ask-question-gui
|
2026-07-30 16:55:54 +08:00 |
|
 Turtle
|
3c620a0cb6
|
Merge remote-tracking branch 'origin/master' into feature/shared-cli-config-foundation
# Conflicts:
# docs/cordis-catalog/services.md
# packages/host/apiproxy/README.i18n.yaml
|
2026-07-30 16:53:55 +08:00 |
|
|
imccyu
|
34c124585a
|
fix: test
|
2026-07-30 16:46:50 +08:00 |
|
|
Hypatia May
|
86b95a3856
|
Merge PR #941 dependency into manual compaction stack
# Conflicts:
# docs/cordis-catalog/services.md
# docs/core-data-structures/session.i18n.yaml
# packages/host/apiproxy/README.i18n.yaml
# packages/host/apiproxy/src/api-proxy.ts
# packages/ui/tui/src/index.ts
|
2026-07-30 16:42:24 +08:00 |
|
|
Hypatia May
|
3b3d5579cb
|
Merge remote-tracking branch 'origin/fix/human-transcript-projection' into fix/web-transcript-projection
# Conflicts:
# apps/web/tests/snapshots/seeded-history/ui.expected.md
# packages/client/runtime/README.i18n.yaml
# packages/client/runtime/README.md
# packages/client/runtime/src/client/index.ts
# packages/client/runtime/src/client/sessions/fold-adapter.ts
# packages/client/runtime/tests/fold-adapter.spec.ts
# packages/client/ui-trajectory/src/client/layout.ts
# packages/client/ui-trajectory/src/client/spans.ts
# packages/compact/compact/README.i18n.yaml
|
2026-07-30 16:37:22 +08:00 |
|
|
Tianyi Cui
|
9e679c89b6
|
Merge branch 'master' into feat/session-inherited-boundary
|
2026-07-30 16:30:42 +08:00 |
|
|
kingwl
|
d7641ec028
|
Merge origin/master into codex/figma-context-injection-row
|
2026-07-30 16:20:47 +08:00 |
|
|
kingwl
|
17893c503e
|
feat(web): match context injection disclosure design
|
2026-07-30 16:20:34 +08:00 |
|
|
creatixchu
|
380b215287
|
Merge remote-tracking branch 'origin/master' into feat/directory-picker-show-hidden
|
2026-07-30 16:12:35 +08:00 |
|
|
Turtle
|
674c25a6a2
|
Merge remote-tracking branch 'origin/master' into feature/shared-cli-config-foundation
# Conflicts:
# docs/tool-catalog.md
# examples/package.json
# packages/examples/agent-spine-demo/README.i18n.yaml
# packages/examples/agent-spine-demo/README.zh.md
# pnpm-lock.yaml
|
2026-07-30 16:11:21 +08:00 |
|
|
imccyu
|
f88d324f01
|
Merge branch 'master' into codex/details-default-closed
|
2026-07-30 15:53:01 +08:00 |
|
|
Hypatia May
|
8fdd01e4ae
|
Merge remote-tracking branch 'origin/master' into fix/human-transcript-projection
|
2026-07-30 15:52:09 +08:00 |
|
|
imccyu
|
69a58ddd6f
|
Merge branch 'master' into feat/ask-question-gui
|
2026-07-30 15:50:59 +08:00 |
|
|
Hypatia May
|
7bcf8d660d
|
Merge remote-tracking branch 'origin/master' into fix/human-transcript-projection
# Conflicts:
# packages/host/apiproxy/README.i18n.yaml
# packages/host/apiproxy/src/api-proxy.ts
# packages/ui/tui/README.i18n.yaml
|
2026-07-30 15:42:47 +08:00 |
|
|
imccyu
|
17fea637d5
|
Merge branch 'master' into codex/details-default-closed
|
2026-07-30 15:40:36 +08:00 |
|
|
Turtle
|
42ba71b4f2
|
test(tui): pin transient query access
|
2026-07-30 15:37:03 +08:00 |
|
|
imccyu
|
e184b9561a
|
Merge branch 'master' into feat/ask-question-gui
|
2026-07-30 15:36:22 +08:00 |
|
|
Hypatia May
|
30667e1eb9
|
Merge remote-tracking branch 'origin/master' into feat/session-inherited-boundary
|
2026-07-30 15:34:55 +08:00 |
|
|
imccyu
|
925cb0b315
|
feat(web): plan chip as an always-visible pressed-state toggle
fix: plan button add label
|
2026-07-30 15:33:45 +08:00 |
|
|
Hypatia May
|
8527137230
|
refactor(session): rename the seed boundary to end-seed
|
2026-07-30 15:32:06 +08:00 |
|