Yichen Jiang
a35e372594
Merge remote-tracking branch 'origin/master' into worktree/web-model-request-retry
...
# Conflicts:
# apps/web/tests/session-title.snapshot.ts
2026-07-30 10:27:00 +08:00
Tianyi Cui
4582e1425c
Merge commit 'refs/codex/pr885/master-20260730' into worktree/retarget-pr885-20260729
...
# Conflicts:
# eslint.config.mjs
2026-07-30 01:18:28 +08:00
Yichen Jiang
3eec30c278
Merge remote-tracking branch 'origin/master' into worktree/web-model-request-retry
...
# Conflicts:
# apps/cli/README.i18n.yaml
# apps/web/tests/snapshots/live-interactions/retry.expected.md
# packages/client/runtime/README.i18n.yaml
# packages/client/runtime/src/client/index.ts
# 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/chat/MessageItem.tsx
# packages/client/ui-conversation/tests/chat-branch-tails.spec.tsx
# packages/client/ui-trajectory/README.i18n.yaml
# packages/client/ui-trajectory/README.md
# packages/client/ui-trajectory/README.zh.md
# packages/client/ui-trajectory/src/client/spans.ts
# packages/client/ui-trajectory/tests/views.spec.tsx
# packages/llm/llm-retry/README.i18n.yaml
# packages/llm/llm-retry/README.zh.md
2026-07-30 00:16:32 +08:00
Tianyi Cui
0440c4cc0c
Merge latest master into codex/migrate-to-oxlint
2026-07-30 00:13:30 +08:00
imccyu
f773985e71
feat(typert): add compiler-independent type pipeline
2026-07-29 23:45:42 +08:00
Tianyi Cui
a1215886a8
Merge origin/master at 834d9dbbce into skill catalog hot refresh
2026-07-29 22:41:57 +08:00
Tianyi Cui
2d3338a03b
Merge latest master into codex/migrate-to-oxlint
2026-07-29 22:39:06 +08:00
Tianyi Cui
e91ef39f5a
fix: preserve lint migration contracts
2026-07-29 22:38:20 +08:00
Tianyi Cui
4b9fde2ed4
Merge origin/master at e2e412656a into skill catalog hot refresh
...
# Conflicts:
# docs/event-producer-consumer.md
2026-07-29 22:37:31 +08:00
imccyu
20c446e033
Merge branch 'master' into worktree-renameweb
2026-07-29 22:28:34 +08:00
imccyu
fd356b92c8
Merge branch 'master' into feat/input-command-interaction
2026-07-29 22:10:39 +08:00
Tianyi Cui
5fb4bd66d7
Merge latest master into codex/migrate-to-oxlint
2026-07-29 22:01:25 +08:00
Tianyi Cui
d10dde430c
Merge origin/master at ddeb1cab2d into skill catalog hot refresh
2026-07-29 21:55:32 +08:00
imccyu
32c3d1e17f
Merge remote-tracking branch 'origin/master' into worktree-renameweb
...
# Conflicts:
# packages/client/runtime/README.i18n.yaml
# packages/client/test-runtime/src/sessions.ts
2026-07-29 21:45:29 +08:00
Tianyi Cui
16e1734444
Merge origin/master at 90bc53cc64 into skill catalog hot refresh
2026-07-29 21:43:13 +08:00
Tianyi Cui
502e64c00d
Merge origin/master at ecbf75a5e7 into skill catalog hot refresh
2026-07-29 21:42:18 +08:00
Tianyi Cui
d70cfed4e8
Merge master into fix/subprocess-password-scrub
2026-07-29 21:40:50 +08:00
imccyu
f4bc0a4a86
Merge remote-tracking branch 'origin/master' into feat/input-command-interaction
2026-07-29 21:40:28 +08:00
Tianyi Cui
e1984cbfd9
Merge commit '90bc53cc64dc684dc3d741f45ae6a8d548c188f9' into worktree/retarget-pr885-20260729
2026-07-29 21:40:13 +08:00
Tianyi Cui
a5446e3160
Merge master into fix/subprocess-password-scrub
...
# Conflicts:
# packages/lsp/lsp-local/README.i18n.yaml
# packages/subprocess/subprocess-local/README.i18n.yaml
# packages/subprocess/subprocess-local/README.zh.md
2026-07-29 21:38:24 +08:00
Tianyi Cui
32aaa8983e
Merge commit 'ecbf75a5e70f662b6420375140cf12eb6bac7860' into worktree/retarget-pr885-20260729
...
# Conflicts:
# docs/development.i18n.yaml
# packages/client/ui-conversation/src/client/chat/MessageItem.tsx
# packages/client/ui-primitives/src/markdown/CodeBlock.tsx
# scripts/snapshots/translation-prompt-v4/request-response.expected.json
2026-07-29 21:37:43 +08:00
imccyu
f2aa63f756
Merge branch 'master' into worktree-renameweb
2026-07-29 21:25:14 +08:00
imccyu
76b4563380
Merge remote-tracking branch 'origin/master' into feat/input-command-interaction
2026-07-29 21:23:13 +08:00
imccyu
bf8db964d4
Merge branch 'master' into xtr/trajectory-inspection-ui
2026-07-29 21:20:38 +08:00
imccyu
6e8ad4b382
Merge remote-tracking branch 'origin/master' into worktree-renameweb
...
# Conflicts:
# packages/client/runtime/README.i18n.yaml
# packages/client/runtime/README.zh.md
# packages/session-title/session-title/README.i18n.yaml
# packages/session-title/session-title/README.zh.md
2026-07-29 20:58:22 +08:00
imccyu
b23c3d596a
Merge remote-tracking branch 'origin/master' into trajectory-history-source
2026-07-29 20:58:04 +08:00
Tianyi Cui
b060b6f5f6
Merge commit 'refs/codex/pr758/master' into HEAD
...
# Conflicts:
# packages/context/README.i18n.yaml
# packages/context/README.zh.md
2026-07-29 20:55:09 +08:00
Yif
45c9205caf
feat(client): localize composer hints and rework input command interaction
...
Unify the /plan claimed hint with the plan placeholder through a locale
namespace, localize slash menu group titles, replace the PermissionSelect
native select with the Menu primitive, add a goal pause verb chain, clamp
anchored popups to the viewport with scroll-into-view and outside-dismiss,
and fix onPasteUpgrade insertedRange to account for the chip trailing gap.
2026-07-29 19:46:48 +08:00
imccyu
19336686a6
feat(apiproxy): session.rename RPC delegating to the session-title service
...
New unary method in RpcMethodMap with the title-invalid error code; the impl
resolves the agent (cold sessions resume first) and delegates to
ctx.sessionTitle.rename, returning the normalized title plus its event seq so
clients settle the title projection cell ahead of the push frame. session.fork
stays on the reserved-seam list.
2026-07-29 18:59:23 +08:00
_Kerman
859452d807
Merge remote-tracking branch 'github/master' into xtr/trajectory-inspection-ui
...
# 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/question-composer/answered.expected.md
# apps/web/tests/snapshots/seeded-history/ui.expected.md
# apps/web/tests/snapshots/steering/mid-steer.expected.md
# apps/web/tests/snapshots/steering/settled.expected.md
# packages/client/runtime/src/client/contract/session.ts
# packages/client/ui-conversation/README.i18n.yaml
2026-07-29 17:31:33 +08:00
Tianyi Cui
5bf93e4229
Merge origin/master into worktree/skill-catalog-hot-refresh
2026-07-29 16:40:40 +08:00
Chinesezjc
612b3c7c4e
Merge remote-tracking branch 'origin/master' into feat/web-terminal-card
...
# Conflicts:
# packages/client/ui-conversation/README.i18n.yaml
2026-07-29 14:45:23 +08:00
Yichen Jiang
f8238ab75d
Merge remote-tracking branch 'origin/master' into worktree/web-model-request-retry
...
# Conflicts:
# apps/cli/README.i18n.yaml
# packages/client/ui-conversation/README.i18n.yaml
# packages/client/ui-conversation/README.zh.md
# packages/client/ui-conversation/tests/chat-branch-tails.spec.tsx
2026-07-29 14:38:55 +08:00
Turtle
711efc0a8e
Merge remote-tracking branch 'origin/master' into codex/migrate-to-oxlint
2026-07-29 14:32:21 +08:00
Turtle
95a995968b
refactor: migrate linting to Oxlint
2026-07-29 14:32:11 +08:00
Yichen Jiang
49131c47c5
fix(web): address model retry review feedback
2026-07-29 14:23:03 +08:00
imccyu
07262d967c
Merge branch 'master' into web-permission-sandbox
2026-07-29 13:41:23 +08:00
Yichen Jiang
0dce3f57ca
Merge remote-tracking branch 'origin/master' into worktree/default-pi-ai-providers
...
# Conflicts:
# apps/cli/README.i18n.yaml
2026-07-29 13:25:06 +08:00
Turtle
31189cf403
chore: drop the examples dsh-bash dep left by the removed mock-bash fixture
...
Nothing under examples/ references @deepseek-ai/dsh-bash now that the
tmux-context fixtures are gone; the examples workspace ignores every
@deepseek-ai/* dependency in knip, so no gate could catch it. This leaves
examples/package.json untouched by the PR.
2026-07-29 12:52:14 +08:00
Chinesezjc
eba81fe1f2
Merge remote-tracking branch 'origin/master' into feat/web-terminal-card
...
# Conflicts:
# packages/client/ui-conversation/README.i18n.yaml
2026-07-29 11:49:10 +08:00
imccyu
5c432955ed
Merge remote-tracking branch 'origin/master' into web-permission-sandbox-merge-master
2026-07-29 11:16:49 +08:00
_Kerman
69aa58d31b
Merge remote-tracking branch 'github/master' into xtr/trajectory-inspection-ui
2026-07-29 11:14:05 +08:00
Turtle
f15ff737cd
chore: drop e2e-only knip entry, loader-smoke dep, and tsconfig reference
...
Follows removing the tmux-context e2e test: the .e2e.ts knip entry pattern
matched nothing and dsh-loader-smoke became an unused devDependency.
2026-07-29 10:37:17 +08:00
ZiyaZhang
2630de8bd6
Merge remote-tracking branch 'upstream/master' into fix/subprocess-password-scrub
...
# Conflicts:
# docs/module-graph.md
2026-07-28 19:14:40 -07:00
Yichen Jiang
602f594c4b
Merge remote-tracking branch 'origin/master' into worktree/web-model-request-retry
...
# Conflicts:
# apps/cli/README.i18n.yaml
# packages/client/connection/tests/fixture.spec.ts
# packages/client/runtime/README.i18n.yaml
# packages/client/runtime/src/client/index.ts
# packages/client/runtime/src/client/sessions/session.ts
# 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/chat/ChatView.tsx
# packages/client/ui-conversation/tests/chat-view.spec.tsx
# tsconfig.base.json
2026-07-29 10:14:02 +08:00
Turtle
b4aebc9b56
chore: update pnpm-lock.yaml after removing dsh-tmux-context from examples deps
2026-07-29 10:12:22 +08:00
_Kerman
c60d3f2aaa
Merge remote-tracking branch 'github/master' into xtr/trajectory-inspection-ui
...
# Conflicts:
# packages/client/runtime/src/client/sessions/session.ts
# packages/client/ui-conversation/README.i18n.yaml
# packages/client/ui-conversation/README.md
# packages/client/ui-conversation/README.zh.md
2026-07-29 09:48:24 +08:00
creatixchu
9a5fe52678
Merge remote-tracking branch 'origin/feat/directory-picker' into feat/workspace-directory-browser
2026-07-29 06:45:12 +08:00
creatixchu
c5ae7dd65e
Merge remote-tracking branch 'origin/doc/host-client-group-readmes' into feat/directory-picker
...
# Conflicts:
# packages/host/apiproxy/package.json
# pnpm-lock.yaml
2026-07-29 06:43:09 +08:00
creatixchu
1779488c99
Merge remote-tracking branch 'origin/master' into doc/host-client-group-readmes
2026-07-29 06:40:26 +08:00
