Tianyi Cui
515d48875e
fix: harden Web image admission
2026-07-30 01:58:36 +08:00
Yichen Jiang
b99d261501
Merge remote-tracking branch 'origin/master' into worktree/web-multimodal-image-input
...
# Conflicts:
# packages/ui/tui/README.i18n.yaml
2026-07-30 00:32:42 +08:00
Tianyi Cui
fca0c05155
Merge remote-tracking branch 'origin/master' into worktree/pr823-retarget-latest-20260729
...
# Conflicts:
# docs/config-catalog.md
# docs/cordis-catalog/services.md
# docs/core-data-structures/skills.i18n.yaml
# docs/core-data-structures/skills.md
# docs/core-data-structures/skills.zh.md
# packages/host/apiproxy/README.i18n.yaml
# packages/skill/skill-local/README.i18n.yaml
# packages/skill/skill/README.i18n.yaml
# packages/skill/skill/README.md
# packages/skill/skill/README.zh.md
# packages/skill/skill/src/index.ts
# packages/skill/skill/tests/skill.spec.ts
# packages/skill/tool-skill/README.i18n.yaml
# packages/skill/tool-skill/src/index.ts
# packages/ui/tui/README.i18n.yaml
# packages/ui/tui/README.md
# packages/ui/tui/README.zh.md
# packages/ui/tui/src/index.ts
# packages/ui/tui/tests/tui.spec.ts
2026-07-29 23:36:49 +08:00
imccyu
fca74c470b
Merge remote-tracking branch 'origin/master' into worktree/web-multimodal-image-input
2026-07-29 23:36:11 +08:00
imccyu
87b19a1ded
Merge remote-tracking branch 'origin/master' into worktree/web-multimodal-image-input
2026-07-29 22:35:12 +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
754e163663
Merge remote-tracking branch 'origin/master' into worktree/pr823-retarget-latest-20260729
2026-07-29 21:26:44 +08:00
Tianyi Cui
52d68a5383
fix(skill): retain candidates across watcher failures
2026-07-29 21:17:27 +08:00
imccyu
8dca750c8e
Merge branch 'master' into trajectory-history-source
2026-07-29 21:12:31 +08:00
Tianyi Cui
de4f2a12f0
Merge remote-tracking branch 'origin/master' into worktree/pr823-retarget-latest-20260729
2026-07-29 21:06:24 +08:00
Tianyi Cui
5c0c59847b
Merge remote-tracking branch 'origin/master' into worktree/pr823-retarget-latest-20260729
...
# Conflicts:
# packages/client/ui-skill/README.i18n.yaml
# packages/client/ui-skill/README.zh.md
# packages/host/apiproxy/src/api-proxy.ts
# packages/skill/skill-local/README.i18n.yaml
# packages/skill/skill-local/README.zh.md
# packages/skill/skill/README.i18n.yaml
# packages/skill/skill/README.zh.md
# packages/skill/tool-skill/README.i18n.yaml
2026-07-29 21:05:09 +08:00
imccyu
b23c3d596a
Merge remote-tracking branch 'origin/master' into trajectory-history-source
2026-07-29 20:58:04 +08:00
Tianyi Cui
4368c2d40c
Merge branch 'master' into fix/translation-brief-uncommitted-pair
2026-07-29 20:54:30 +08:00
creatixchu
22e48c1953
Merge remote-tracking branch 'origin/master' into worktree/web-multimodal-image-input
...
# Conflicts:
# apps/cli/README.i18n.yaml
# packages/client/ui-conversation/README.i18n.yaml
# packages/client/ui-conversation/src/client/chat/AssistantMarkdown.tsx
# packages/client/ui-conversation/src/client/chat/ChatView.tsx
# packages/client/ui-conversation/src/client/chat/MessageItem.tsx
2026-07-29 18:05:44 +08:00
j-xiang
ed4a6fd026
docs(i18n): address automated review
2026-07-29 17:46:06 +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
j-xiang
94b2862e12
Merge remote-tracking branch 'origin/master' into xjt/readme-proofreading-batch-1
2026-07-29 15:47:00 +08:00
j-xiang
46e1e86c76
docs(i18n): bind reviewed README terminology
2026-07-29 15:29:03 +08:00
imccyu
4da1026956
Merge branch 'master' into xtr/dsh-source-launch-tsx-esm
2026-07-29 15:29:00 +08:00
Tianyi Cui
2e7ac0d7f2
Merge branch 'master' into agent/fix-copied-worktree-hooks
2026-07-29 14:55:36 +08:00
creatixchu
666fd721b5
Merge remote-tracking branch 'origin/master' into worktree/web-multimodal-image-input
...
# Conflicts:
# apps/cli/README.i18n.yaml
# apps/cli/package.json
# apps/cli/src/app-cli-entry.ts
# apps/cli/src/args.ts
# apps/cli/src/bin.ts
# apps/cli/src/web.ts
# apps/cli/tests/args.spec.ts
# docs/architecture.i18n.yaml
# docs/config-catalog.md
# docs/module-graph.md
# packages/README.i18n.yaml
# packages/client/connection/README.i18n.yaml
# packages/client/connection/src/client/api.ts
# packages/client/connection/src/client/fixture.ts
# packages/client/connection/src/index.ts
# packages/client/connection/tests/node-half.spec.ts
# packages/client/ui-conversation/README.i18n.yaml
# packages/client/ui-conversation/src/client/chat/ChatView.tsx
# packages/client/ui-conversation/src/client/skeleton/InputBar.tsx
# packages/host/apiproxy/src/api/host.schema.ts
# packages/host/apiproxy/src/index.ts
# packages/ui/tui/README.i18n.yaml
# pnpm-lock.yaml
2026-07-29 14:38:34 +08:00
kingwl
2ca6f54c9e
Merge remote-tracking branch 'origin/master' into xtr/dsh-source-launch-tsx-esm
...
# Conflicts:
# apps/cli/README.i18n.yaml
2026-07-29 13:39:57 +08:00
Hypatia May
173a1a8319
fix(dev-infra): migrate copied worktree hooks
2026-07-29 13:38:55 +08:00
kingwl
aebf9c863b
feat(cli): launch dsh source through the tsx ESM hook
...
Node 26.0.0 removed --experimental-transform-types, so the native
source-launch chain cannot start anywhere on that line, and strip-only
mode rejects the vendored syntax (parameter properties, decorators,
runtime enums/namespaces). Switch bin/dsh, the root dsh/demo:tui/
demo:web scripts, and the Code Mode TUI overlay to node --import
tsx/esm: one launch vector across the whole engines range, ~0.4s faster
than the full tsx default (the CJS hook stays off; the graph is
ESM-only).
Delete scripts/tspath-loader.ts and apps/cli/src/tsconfig-paths-loader.ts:
tsx owns both transformation and tsconfig paths projection. Add
dsh-source-launch-smoke to the node-compat gates so the 22.19/26 matrix
executes the real launch vector; no CI job did, which is how the Node 26
breakage shipped silently.
Supersedes the native-TypeScript-source-launch Agent Note (new note
records the profiling evidence and rejected alternatives).
2026-07-29 13:15:24 +08:00
Yichen Jiang
8f9535af87
Merge remote-tracking branch 'origin/master' into worktree/skill-invocation-controls
...
# Conflicts:
# docs/cordis-catalog/services.md
# packages/host/apiproxy/README.i18n.yaml
# packages/host/apiproxy/src/api-proxy.ts
# packages/ui/tui/README.i18n.yaml
2026-07-29 12:58: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
Yichen Jiang
6601830907
Merge remote-tracking branch 'origin/master' into worktree/web-multimodal-image-input
...
# Conflicts:
# apps/cli/README.i18n.yaml
# docs/core-data-structures/core.i18n.yaml
# docs/core-data-structures/llm-streaming.i18n.yaml
# examples/acp-agent/tests/snapshots/cordis-inspect-jsdoc/session.jsonl
# packages/client/connection/src/client/fixture.ts
# packages/client/connection/src/client/index.ts
# 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/input/hub.ts
# packages/client/ui-conversation/src/client/service.ts
# packages/client/ui-conversation/src/client/skeleton/InputBar.tsx
# packages/compact/compact-basic/src/summarizer.ts
# packages/compact/compact-basic/tests/compact-basic.spec.ts
# packages/host/apiproxy/src/api-proxy.ts
# packages/host/apiproxy/src/api/rpc.schema.ts
# packages/host/apiproxy/src/api/rpc.ts
# packages/host/apiproxy/src/api/sessions.ts
# packages/host/apiproxy/tests/rpc-schemas.spec.ts
# packages/llm/llm-deepseek/tests/serialize.spec.ts
# packages/llm/llm-pi-ai/tests/adapter.spec.ts
# packages/llm/llm-pi-ai/tests/convert.spec.ts
# packages/llm/llm-pi-ai/tests/provider-apis.e2e.ts
# packages/llm/token-meter/tests/token-meter.spec.ts
# packages/ui/tui/README.i18n.yaml
2026-07-29 10:18:53 +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
ZiyaZhang
f8082eef63
Merge remote-tracking branch 'upstream/master' into fix/translation-brief-uncommitted-pair
2026-07-28 16:53:21 -07: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
imccyu
40e3e10831
Merge origin/master (plan line #590 ) into web-permission-sandbox-merge-master
...
Shared-surface conflicts resolve as unions: the fixture serves all five
projection keys (title/todos/permissions/plan/goal) with the /permission
and /plan command mirrors side by side, the connection specs assert the
five-key baseline and the shifted approval/question replay indices, and
the cli roster/deps, tsconfig aggregate, and README allowlist carry both
lines' rows. Plan-side content lands verbatim from master.
One end-state consolidation both branches half-did: with questions
(ui-question) and approvals (ApprovalPanel) each owning a composer
takeover, PendingCard retires outright — ChatView renders no pending
placeholder, the card component and its specs go, and both README halves
state the takeover-only contract.
2026-07-29 03:52:55 +08:00
imccyu
d4ba2ecd63
Merge origin/master: goal domain lands beside plan
...
Union resolutions throughout — the fixture serves both the goal and plan
projection units (catalog gains /goal beside /plan; the retired
goal-fixture sample command yields to the real goal mirror), the mux
baseline spec expects all four unit frames, and the tsconfig paths /
Model Experience allowlist carry both domains' outlets.
2026-07-29 02:27:16 +08:00
imccyu
86549943ec
Merge origin/master (goal line #527 ) into web-permission-sandbox-merge-master
...
Shared-surface conflicts resolve as unions: the fixture serves all four
projection keys (title/todos/permissions/goal) with both the /permission
and /goal command mirrors (the goal-fixture placeholder retires with
master), apps/cli carries both lines' dependency additions, and the README
Model Experience allowlist keeps both entries. The connection specs assert
the four-key baseline and the shifted approval/question replay indices;
the module graph regenerates over the merged dependency set.
2026-07-29 02:27:11 +08:00
creatixchu
e7c9877ac5
fix(build,doc): native paths aliases; the note states browse's client half is stacked
...
- tsconfig.base.json still aliased the removed directory-picker-dialog and
offered no mapping for -native: on a clean tree, package-name imports and
source launches fell through to a missing lib/ until a build ran.
- The seam note (and the generated seam prose) no longer describe the
browse browser half as shipped here: it lands in the stacked follow-up,
and a -browse composition meanwhile shows the documented empty-hole
default (ds-review-bot).
2026-07-29 02:11:31 +08:00
Tianyi Cui
979fa8ab33
refactor(skill): scope provider invalidation
2026-07-29 02:06:07 +08:00
imccyu
15c1976472
Merge origin/master (SessionFace contract) into web-permission-sandbox-merge-master
...
Three ui-conversation spec conflicts resolve to master's SlotTestRuntime
rewrites. Adaptation to the new outward session face: ISession gains the
command verb (the composer chip and the /permission picker submit through
it), FixtureSession grows the matching fail-loud stub plus the
waitingApproval summary default, and the picker reads the projection
through projections.faceOf (the ProjectionsFace shape) instead of the
retired store getter.
2026-07-29 01:41:54 +08:00
ZiyaZhang
9189857860
test(i18n): refresh gc-pinned prompt snapshot
2026-07-28 10:41:48 -07:00
Tianyi Cui
07d61ee992
Merge latest master into skill invocation controls
...
# Conflicts:
# docs/config-catalog.md
# docs/cordis-catalog/services.md
# examples/acp-agent/tests/snapshots/skill-load/session.jsonl
# packages/host/apiproxy/README.i18n.yaml
# packages/host/apiproxy/README.md
# packages/host/apiproxy/README.zh.md
# packages/host/apiproxy/src/api-proxy.ts
# packages/skill/tool-skill/src/index.ts
# packages/ui/tui/README.i18n.yaml
2026-07-29 01:29:39 +08:00
ZiyaZhang
612b527cd2
fix(i18n): pin translation snapshots against gc
2026-07-28 10:28:49 -07:00
imccyu
532b2b9107
Merge origin/master (regenerate the event producer-consumer graph)
2026-07-29 01:21:29 +08:00
ZiyaZhang
e59e2f6192
test(i18n): isolate git object format fixtures
2026-07-28 10:10:18 -07:00
creatixchu
6a78bf4dd0
Merge remote-tracking branch 'origin/doc/host-client-group-readmes' into feat/directory-picker
2026-07-29 01:09:33 +08:00
creatixchu
51b70f5864
Merge remote-tracking branch 'origin/master' into doc/host-client-group-readmes
...
# Conflicts:
# apps/cli/README.i18n.yaml
2026-07-29 01:08:17 +08:00
imccyu
b0fc3b971b
Merge remote-tracking branch 'origin/master' into goal-ui-merge-master
2026-07-29 01:08:09 +08:00
ZiyaZhang
ba9c914238
Merge remote-tracking branch 'upstream/master' into fix/translation-brief-uncommitted-pair
2026-07-28 10:01:15 -07:00
ZiyaZhang
2edc186047
Merge remote-tracking branch 'upstream/master' into fix/translation-brief-uncommitted-pair
2026-07-28 09:56:23 -07:00
Tianyi Cui
Yichen Jiang
imccyu
creatixchu
j-xiang
_Kerman
kingwl
Hypatia May
ZiyaZhang