 Tianyi Cui
|
57e56915de
|
Merge latest manual compaction parent into compaction progress
|
2026-07-31 14:40:12 +08:00 |
|
|
Tianyi Cui
|
e371311203
|
Merge latest Web transcript parent into manual compaction
# Conflicts:
# examples/acp-agent/tests/snapshots/cordis-inspect-jsdoc/session.jsonl
# packages/client/runtime/README.i18n.yaml
|
2026-07-31 14:39:20 +08:00 |
|
|
Tianyi Cui
|
3dc2a449e5
|
Merge latest master into web transcript projection
|
2026-07-31 14:32:03 +08:00 |
|
|
Tianyi Cui
|
5c394b1743
|
Merge latest master into web transcript projection
# Conflicts:
# packages/client/runtime/README.i18n.yaml
|
2026-07-31 14:31:14 +08:00 |
|
 Chinesezjc
|
538488506f
|
Merge pull request #973 from deepseek-harness/feat/read-presenter
feat(fs): add a read render-intent card for the read tool result
|
2026-07-31 14:30:31 +08:00 |
|
|
Tianyi Cui
|
009657dc32
|
Merge finalized manual compaction parent
|
2026-07-31 14:20:36 +08:00 |
|
|
Tianyi Cui
|
6a31f5bf2a
|
Merge finalized Web transcript parent
# Conflicts:
# .agents/notes/implemented/architecture/2026-07-30-session-end-seed-log-boundary.i18n.yaml
|
2026-07-31 14:11:40 +08:00 |
|
 imccyu
|
5fc2645afc
|
docs: regenerate the cordis catalog for the archiveSession contract change
|
2026-07-31 14:08:13 +08:00 |
|
|
imccyu
|
3b86c288d6
|
docs: catalogs and Agent Note for the session archive set
|
2026-07-31 14:08:13 +08:00 |
|
|
Tianyi Cui
|
74398e87f6
|
Merge latest master into Web transcript
|
2026-07-31 14:07:24 +08:00 |
|
|
Tianyi Cui
|
7a92f23ad4
|
Merge finalized manual compaction parent
|
2026-07-31 13:44:34 +08:00 |
|
|
Tianyi Cui
|
98f48fd83a
|
Merge finalized Web transcript parent
# Conflicts:
# apps/cli/README.i18n.yaml
# packages/client/runtime/README.i18n.yaml
# packages/client/ui-trajectory/README.i18n.yaml
# packages/client/ui-trajectory/README.zh.md
|
2026-07-31 13:42:47 +08:00 |
|
 Yichen Jiang
|
48152a7a1d
|
merge master and address permission settings review
|
2026-07-31 13:24:30 +08:00 |
|
|
Tianyi Cui
|
bb3d6a0de8
|
Merge latest master into Web transcript
# Conflicts:
# packages/client/runtime/README.i18n.yaml
# packages/client/runtime/src/client/index.ts
# packages/client/runtime/src/client/sessions/conversation.ts
# packages/client/runtime/src/client/sessions/session.ts
# packages/client/ui-conversation/README.i18n.yaml
# packages/client/ui-conversation/src/client/chat/MessageItem.module.css
# packages/client/ui-conversation/src/client/chat/MessageItem.tsx
# packages/client/ui-conversation/src/client/chat/chat-flow.ts
# packages/client/ui-conversation/tests/chat-branch-tails.spec.tsx
|
2026-07-31 13:12:37 +08:00 |
|
|
Chinesezjc
|
a2fa8ccbcf
|
Merge remote-tracking branch 'origin/master' into feat/read-presenter
|
2026-07-31 13:03:05 +08:00 |
|
|
Yichen Jiang
|
ee74b5b07a
|
feat(permission): add new-session default setting
|
2026-07-31 12:48:19 +08:00 |
|
|
imccyu
|
5afdb5c235
|
Merge remote-tracking branch 'origin/master' into mergebot/pr998
# Conflicts:
# packages/client/ui-conversation/README.i18n.yaml
|
2026-07-31 12:23:03 +08:00 |
|
 Hypatia May
|
949b9fba8d
|
feat(tui): add transcript compaction progress marker
|
2026-07-31 11:46:43 +08:00 |
|
|
Yichen Jiang
|
2e07da19e5
|
Merge remote-tracking branch 'origin/master' into worktree/web-model-request-retry
# Conflicts:
# apps/cli/README.i18n.yaml
# apps/cli/README.md
# apps/cli/README.zh.md
# packages/client/runtime/README.i18n.yaml
# packages/client/ui-conversation/README.i18n.yaml
|
2026-07-31 11:39:58 +08:00 |
|
|
Tianyi Cui
|
ef722cc14a
|
Merge latest master into Web transcript
|
2026-07-31 11:39:49 +08:00 |
|
|
Chinesezjc
|
38bd01af52
|
Merge remote-tracking branch 'origin/master' into feat/read-presenter
|
2026-07-31 11:25:44 +08:00 |
|
|
imccyu
|
37827c461d
|
Merge remote-tracking branch 'origin/master' into mergebot/pr998
# Conflicts:
# apps/web/tests/snapshots/code-mode-round/ui.expected.md
# apps/web/tests/snapshots/cordis-tool-round/ui.expected.md
# apps/web/tests/snapshots/fresh-round-trip/ui.expected.md
# apps/web/tests/snapshots/lifecycle-chrome/hero.expected.md
# apps/web/tests/snapshots/lifecycle-chrome/reloaded.expected.md
# apps/web/tests/snapshots/live-interactions/cancel.expected.md
# apps/web/tests/snapshots/live-interactions/error-auth.expected.md
# apps/web/tests/snapshots/live-interactions/retry.expected.md
# apps/web/tests/snapshots/message-actions/ui.expected.md
# apps/web/tests/snapshots/plan-review/approved.expected.md
# apps/web/tests/snapshots/question-composer/answered.expected.md
# apps/web/tests/snapshots/queue-actions/collapsed.expected.md
# apps/web/tests/snapshots/queue-actions/editing.expected.md
# apps/web/tests/snapshots/queue-actions/ui.expected.md
# apps/web/tests/snapshots/seeded-history/ui.expected.md
# apps/web/tests/snapshots/steering/settled.expected.md
# packages/client/ui-conversation/README.i18n.yaml
# packages/client/ui-conversation/tests/input-bar.spec.tsx
|
2026-07-31 11:25:16 +08:00 |
|
|
imccyu
|
9525cc9db2
|
Merge pull request #1005 from deepseek-harness/codex/new-task
Open command menu from composer plus button
|
2026-07-31 11:12:26 +08:00 |
|
 Ziya
|
7b95559f18
|
Merge branch 'master' into feat/gui-full-access-confirmation
|
2026-07-30 22:51:43 -04:00 |
|
|
Chinesezjc
|
83fff705da
|
Merge remote-tracking branch 'origin/master' into feat/read-presenter
# Conflicts:
# docs/config-catalog.md
# docs/cordis-catalog/events.md
# docs/cordis-catalog/services.md
# docs/core-data-structures/tools.i18n.yaml
# docs/core-data-structures/tools.md
# docs/core-data-structures/tools.zh.md
# docs/event-producer-consumer.md
# examples/acp-agent/tests/snapshots/cordis-inspect-jsdoc/session.jsonl
# examples/acp-agent/tests/snapshots/workspace-context/session.jsonl
# packages/cordis/tool-cordis/src/api-catalog.ts
# packages/core/tools/README.i18n.yaml
# packages/core/tools/README.md
# packages/core/tools/README.zh.md
# packages/core/tools/src/index.ts
# packages/core/tools/src/presentation.ts
# packages/ui/tui/src/components/transcript.ts
|
2026-07-31 10:42:07 +08:00 |
|
|
imccyu
|
c0733ba46b
|
Merge branch 'master' into fix/nodeboot-dep
|
2026-07-31 10:34:07 +08:00 |
|
|
Yichen Jiang
|
d3c6638b6d
|
Merge remote-tracking branch 'origin/master' into worktree/web-model-request-retry
# Conflicts:
# apps/cli/README.i18n.yaml
# packages/client/runtime/README.i18n.yaml
# packages/client/runtime/README.md
# packages/client/runtime/README.zh.md
# packages/client/ui-conversation/README.i18n.yaml
# packages/client/ui-conversation/src/client/chat/ChatView.tsx
# packages/client/ui-conversation/src/client/chat/MessageItem.tsx
# packages/client/ui-conversation/tests/chat-view.spec.tsx
|
2026-07-31 10:19:14 +08:00 |
|
|
Hypatia May
|
01e64c6350
|
Merge finalized Web transcript parent
|
2026-07-31 09:46:32 +08:00 |
|
|
Hypatia May
|
074f0e4393
|
Merge pinned master into Web transcript
|
2026-07-31 09:18:45 +08:00 |
|
|
imccyu
|
59ce4086ae
|
Merge remote-tracking branch 'origin/master' into mergebot/pr711
# Conflicts:
# packages/client/ui-workspace/src/client/WorkspaceBrowser.tsx
# packages/client/ui-workspace/src/client/index.ts
# packages/client/ui-workspace/src/client/rows/Rows.tsx
# packages/client/ui-workspace/src/client/tree.ts
# packages/client/ui-workspace/tests/apply.spec.ts
# packages/client/ui-workspace/tests/rows.spec.tsx
# packages/client/ui-workspace/tests/tree.spec.ts
# packages/client/ui-workspace/tests/workspace-browser.spec.tsx
|
2026-07-31 04:37:08 +08:00 |
|
|
imccyu
|
9433259f05
|
Merge remote-tracking branch 'origin/master' into mergebot/pr1005
# Conflicts:
# docs/module-graph.md
# packages/client/ui-conversation/README.i18n.yaml
# packages/client/ui-conversation/README.md
# packages/client/ui-conversation/README.zh.md
# packages/client/ui-conversation/src/client/apply.ts
# packages/client/ui-conversation/src/client/skeleton/InputBar.tsx
# packages/client/ui-conversation/tests/input-bar.spec.tsx
# packages/client/ui-conversation/tests/input-matrix.spec.tsx
# packages/client/ui-plan/README.i18n.yaml
# packages/client/ui-plan/README.md
# packages/client/ui-plan/README.zh.md
# packages/client/ui-plan/src/client/PlanModeControl.tsx
# packages/client/ui-plan/src/client/index.ts
# packages/client/ui-plan/tests/browser-plugin.spec.ts
# packages/client/ui-plan/tests/plan-mode-control.spec.tsx
|
2026-07-31 03:47:24 +08:00 |
|
|
imccyu
|
2dab9667f4
|
fix: ci
|
2026-07-31 03:20:20 +08:00 |
|
|
imccyu
|
e423d10111
|
fix: ci
|
2026-07-31 03:20:20 +08:00 |
|
|
imccyu
|
c9997311cf
|
Merge remote-tracking branch 'origin/master' into mergebot/pr998
# Conflicts:
# packages/client/ui-command/src/client/PopupSelectView.tsx
# packages/client/ui-conversation/README.i18n.yaml
# packages/client/ui-conversation/src/client/apply.ts
# packages/client/ui-conversation/src/client/contract/slots.ts
# packages/client/ui-conversation/src/client/skeleton/InputBar.tsx
# packages/client/ui-conversation/src/client/skeleton/PermissionSelect.tsx
# packages/client/ui-conversation/tests/input-bar.spec.tsx
# packages/client/ui-conversation/tests/input-matrix.spec.tsx
# packages/client/ui-conversation/tests/input-scenarios.spec.tsx
# packages/client/ui-conversation/tests/skeleton.spec.tsx
# packages/client/ui-primitives/src/Modal.tsx
# packages/client/ui-primitives/tests/atoms.spec.tsx
|
2026-07-31 03:14:44 +08:00 |
|
 imccyu
|
975cc88e45
|
docs: refresh client module service catalog
|
2026-07-31 03:02:45 +08:00 |
|
|
imccyu
|
72a7307826
|
chore: regenerate module graph and refresh composer goldens after master merge
|
2026-07-31 02:28:43 +08:00 |
|
|
imccyu
|
119cc05577
|
fix: docs/static
|
2026-07-31 02:13:53 +08:00 |
|
|
imccyu
|
1e10966ef6
|
wip
fix: docs
|
2026-07-31 02:13:53 +08:00 |
|
|
imccyu
|
2e034bbbd3
|
Merge remote-tracking branch 'origin/master' into mergebot/pr711
# Conflicts:
# apps/cli/README.i18n.yaml
# docs/module-graph.md
# packages/client/connection/README.i18n.yaml
# packages/client/runtime/README.i18n.yaml
# packages/host/apiproxy/README.i18n.yaml
# packages/host/apiproxy/src/api-proxy.ts
|
2026-07-31 02:02:47 +08:00 |
|
|
Tianyi Cui
|
464a57d3ca
|
Merge commit 'refs/codex/pr1006/master' into worktree/pr1006-merge-20260731
# Conflicts:
# docs/architecture.i18n.yaml
# docs/config-catalog.md
# docs/cordis-catalog/services.md
# docs/core-data-structures/core.i18n.yaml
# examples/acp-agent/tests/snapshots/cordis-inspect-jsdoc/session.jsonl
# examples/headless-agent/cordis.yml
# packages/cordis/tool-cordis/src/api-catalog.ts
# packages/llm/llm-deepseek/README.i18n.yaml
# packages/llm/llm-deepseek/README.md
# packages/llm/llm-deepseek/README.zh.md
# packages/llm/llm-deepseek/src/adapter.ts
# packages/llm/llm-deepseek/src/index.ts
# packages/llm/llm-deepseek/tests/adapter.spec.ts
# packages/llm/llm/README.i18n.yaml
# packages/llm/llm/README.md
# packages/llm/llm/README.zh.md
# packages/subagent/subagent-dsh-sdk/README.i18n.yaml
# packages/ui/jsonrpc/README.i18n.yaml
|
2026-07-31 01:55:19 +08:00 |
|
|
imccyu
|
ecbd8babc1
|
Merge remote-tracking branch 'origin/master' into mergebot/pr711
# Conflicts:
# apps/cli/README.i18n.yaml
# apps/cli/README.md
# apps/cli/README.zh.md
# apps/cli/cordis.yml
# apps/cli/package.json
# docs/config-catalog.md
# packages/client/runtime/README.i18n.yaml
# packages/client/runtime/src/client/contract/sessions.ts
# packages/client/test-runtime/src/sessions.ts
# packages/client/ui-workspace/README.i18n.yaml
# packages/client/ui-workspace/README.md
# packages/client/ui-workspace/README.zh.md
# packages/client/ui-workspace/src/client/WorkspaceBrowser.tsx
# packages/client/ui-workspace/src/client/tree.ts
# packages/client/ui-workspace/tests/apply.spec.ts
# packages/client/ui-workspace/tests/tree.spec.ts
# packages/host/apiproxy/README.i18n.yaml
# packages/host/apiproxy/src/api-proxy.ts
# packages/host/apiproxy/src/api/index.ts
# packages/host/apiproxy/tests/client-handler.spec.ts
# packages/host/apiproxy/tests/rpc-schemas.spec.ts
# pnpm-lock.yaml
|
2026-07-31 01:28:15 +08:00 |
|
|
Hypatia May
|
f3963686bd
|
Merge final Web parent into manual compact
|
2026-07-31 00:38:21 +08:00 |
|
|
Yichen Jiang
|
c580b1b634
|
Merge worktree-llm-web-config (939, with latest master) into worktree/onboarding-deepseek-config
|
2026-07-31 00:32:59 +08:00 |
|
|
Yichen Jiang
|
e8c550d0e5
|
Merge worktree-llm-dynamic-config (884, with latest master) into worktree-llm-web-config
|
2026-07-31 00:31:42 +08:00 |
|
|
Yichen Jiang
|
f64026d7e3
|
Merge latest master into worktree-llm-dynamic-config
|
2026-07-31 00:31:06 +08:00 |
|
 ZiyaZhang
|
4c5922edad
|
Merge remote-tracking branch 'upstream/master' into feat/gui-full-access-confirmation
|
2026-07-30 09:28:09 -07:00 |
|
|
Hypatia May
|
ceb37f3377
|
Merge final master into Web transcript
|
2026-07-31 00:27:16 +08:00 |
|
|
ZiyaZhang
|
bf4ff3a696
|
Merge remote-tracking branch 'upstream/master' into feat/gui-full-access-confirmation
# Conflicts:
# packages/client/ui-conversation/README.i18n.yaml
|
2026-07-30 09:20:43 -07:00 |
|
|
Yichen Jiang
|
39072f8c58
|
Merge worktree-llm-web-config (939, with latest master) into worktree/onboarding-deepseek-config
|
2026-07-31 00:07:11 +08:00 |
|
|
Yichen Jiang
|
307fea8ae9
|
Merge worktree-llm-dynamic-config (884, with latest master) into worktree-llm-web-config
|
2026-07-31 00:06:29 +08:00 |
|