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
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
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
a1f1f9c29a
Merge branch 'master' into codex/figma-context-injection-row
2026-07-30 19:20:21 +08:00
33bb266932
Merge remote-tracking branch 'origin/master' into feat/directory-picker-show-hidden
2026-07-30 18:29:37 +08:00
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
cf21f0a1ea
Merge remote-tracking branch 'origin/master' into feat/directory-picker-show-hidden
2026-07-30 18:08:30 +08:00
53ff5c6ef2
Merge branch 'master' into feature/shared-cli-config-foundation
2026-07-30 18:02:07 +08:00
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
faac9b4fd5
round 1: implement bracket-first manual compaction
2026-07-30 17:40:25 +08:00
66e182b516
Merge branch 'master' into feature/shared-cli-config-foundation
2026-07-30 17:35:47 +08:00
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
0f0564b3d0
Merge origin/master into codex/figma-context-injection-row
2026-07-30 17:35:04 +08:00
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
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
295813f6eb
Merge remote-tracking branch 'origin/master' into feat/directory-picker-show-hidden
2026-07-30 17:32:46 +08:00
47d2bcb18c
Merge remote-tracking branch 'origin/master' into fix/human-transcript-projection
2026-07-30 17:28:49 +08:00
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
abf498b8dc
fix(web): align composer context stack
2026-07-30 17:26:44 +08:00
b8d9fb1ede
Merge remote-tracking branch 'origin/master' into feat/directory-picker-show-hidden
2026-07-30 17:17:03 +08:00
4cd5745b94
Merge branch 'master' into codex/details-default-closed
2026-07-30 17:14:51 +08:00
da41677049
fix(web): address transcript review follow-ups
2026-07-30 17:10:45 +08:00
abd7d57358
Merge branch 'master' into feature/shared-cli-config-foundation
2026-07-30 17:08:42 +08:00
3809795fd5
Merge remote-tracking branch 'origin/master' into feat/directory-picker-show-hidden
2026-07-30 17:02:33 +08:00
34d5f8f2e2
Merge branch 'master' into feat/ask-question-gui
2026-07-30 16:55:54 +08:00
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
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
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
9e679c89b6
Merge branch 'master' into feat/session-inherited-boundary
2026-07-30 16:30:42 +08:00
d7641ec028
Merge origin/master into codex/figma-context-injection-row
2026-07-30 16:20:47 +08:00
17893c503e
feat(web): match context injection disclosure design
2026-07-30 16:20:34 +08:00
380b215287
Merge remote-tracking branch 'origin/master' into feat/directory-picker-show-hidden
2026-07-30 16:12:35 +08:00
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
f88d324f01
Merge branch 'master' into codex/details-default-closed
2026-07-30 15:53:01 +08:00
8fdd01e4ae
Merge remote-tracking branch 'origin/master' into fix/human-transcript-projection
2026-07-30 15:52:09 +08:00
69a58ddd6f
Merge branch 'master' into feat/ask-question-gui
2026-07-30 15:50:59 +08:00
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
8527137230
refactor(session): rename the seed boundary to end-seed
2026-07-30 15:32:06 +08:00
2550882875
Merge branch 'master' into worktree/persistent-bash-str-replace-editor
2026-07-30 15:19:27 +08:00
6ea1238714
docs(web): the composer bar is one session-maybe slot, not a swapped pair
...
fix(web): keep one composer bar DOM across the no-workspace transition
The composer.bar slot moves from session to session-maybe scope: with no
current session the entry still mounts, the machine faces (keyboard, stop,
command) arrive undefined, and the bar renders its normal DOM inert via the
disabled owner prop. DisabledInputBar and its parallel tree are gone, so the
textarea node survives the cold-start workspace pick instead of flashing
through a remount. A blank session whose workspace was deleted takes the
same inert path through owner props.
test(web): add the composer DOM-continuity acceptance probe
Drives a real dsh web server with headless chromium through the cold-start
-> pick-workspace -> type flow and asserts the composer textarea is the
same DOM node throughout (a marker property must survive). Rerun
prerequisites are in the header comment.
docs(web): session-maybe identity is adoption, not hold-forever
fix(web): session-maybe entries adopt the first session, then remount like strict entries
A session-maybe entry used to keep one React instance across every
transition, so component-local state leaked between sessions once the
composer bar moved to that scope (PermissionSelect's optimistic pick, the
IME composition guard). Identity is now adoption: an incarnation born
session-less holds through the arrival of the first session (the blank
shell's DOM survives the workspace pick), and afterwards behaves exactly
like a strict session entry — a switch or a drop to no-session remounts,
clearing local state by construction. The child key is an incarnation
counter kept in the stable outlet wrapper via render-phase setState.
chore: knip knows the root acceptance probe's playwright dependency
scripts/hero-composer-dom-continuity.mjs resolves playwright through
apps/web's devDependency tree (createRequire), which knip cannot follow;
ignore it at the root workspace.
2026-07-30 15:18:06 +08:00
e8f0934bc2
Merge remote-tracking branch 'origin/master' into feat/session-inherited-boundary
2026-07-30 15:14:16 +08:00
6c7520c652
Merge remote-tracking branch 'origin/master' into mergebot/pr883
...
# Conflicts:
# apps/web/tests/snapshots/question-composer/answered.expected.md
# apps/web/tests/snapshots/question-composer/ui.expected.md
2026-07-30 15:04:59 +08:00
03936cb320
Merge remote-tracking branch 'origin/master' into mergebot/pr883
...
# Conflicts:
# packages/client/ui-question/package.json
# packages/client/ui-question/src/client/QuestionComposer.tsx
# packages/client/ui-question/src/client/contract/slots.ts
# packages/client/ui-question/src/client/index.ts
# packages/client/ui-question/src/client/locales.ts
# packages/client/ui-question/tests/browser-plugin.spec.ts
# packages/client/ui-question/tests/question-composer.spec.tsx
2026-07-30 15:01:10 +08:00
39efc3dd73
Merge remote-tracking branch 'origin/master' into feature/shared-cli-config-foundation
...
# Conflicts:
# .agents/notes/implemented/testing/2026-07-24-web-gui-browser-e2e-lane.i18n.yaml
# docs/testing.i18n.yaml
2026-07-30 15:00:42 +08:00
36f6d8fd05
Merge remote-tracking branch 'origin/master' into feature/shared-cli-config-foundation
...
# Conflicts:
# packages/ui/tui/README.i18n.yaml
2026-07-30 14:58:10 +08:00
a51143bded
fix(cli): close shared config review gaps
2026-07-30 14:56:39 +08:00
fcab9b9e9c
Merge remote-tracking branch 'origin/master' into feat/directory-picker-show-hidden
2026-07-30 14:50:59 +08:00
5c2fc03d8f
Merge branch 'master' into codex/details-default-closed
2026-07-30 14:50:50 +08:00
4ef3e60d57
fix(web): keep details closed by default
2026-07-30 14:42:39 +08:00
9e6f251a4c
Merge remote-tracking branch 'origin/master' into feat/session-inherited-boundary
...
# Conflicts:
# examples/acp-agent/tests/snapshots/cordis-inspect-jsdoc/session.jsonl
# packages/host/apiproxy/README.i18n.yaml
# packages/host/apiproxy/src/api-proxy.ts
2026-07-30 14:20:35 +08:00
Hypatia May