 creatixchu
|
0a9b6e75d6
|
Merge remote-tracking branch 'origin/master' into worktree/web-multimodal-image-input
# Conflicts:
# docs/architecture.i18n.yaml
# docs/core-data-structures/core.i18n.yaml
# examples/acp-agent/tests/snapshots/cordis-inspect-jsdoc/session.jsonl
# packages/README.i18n.yaml
# packages/README.md
# packages/README.zh.md
# packages/client/connection/src/client/fixture.ts
# packages/client/connection/tests/fake-api.ts
# packages/client/runtime/README.i18n.yaml
# packages/client/runtime/src/client/contract/session.ts
# packages/client/runtime/src/client/sessions/session.ts
# packages/client/runtime/tests/fake-api.ts
# packages/client/test-runtime/src/sessions.ts
# packages/client/test-runtime/tests/runtime.spec.tsx
# packages/client/ui-conversation/README.i18n.yaml
# packages/client/ui-conversation/src/client/service.ts
# packages/client/ui-conversation/src/client/skeleton/InputBar.tsx
# packages/client/ui-conversation/tests/queue-dock.spec.tsx
# packages/client/ui-conversation/tests/service-orchestration.spec.ts
# packages/cordis/tool-cordis/src/api-catalog.ts
# packages/host/apiproxy/README.i18n.yaml
# packages/host/apiproxy/src/api-proxy.ts
# packages/host/apiproxy/src/api/index.ts
# packages/host/apiproxy/src/api/rpc-map.ts
# packages/host/apiproxy/src/api/rpc.schema.ts
# packages/host/apiproxy/src/api/rpc.ts
# packages/host/apiproxy/src/api/sessions.schema.ts
# packages/host/apiproxy/src/api/sessions.ts
# packages/host/apiproxy/src/fetch/client.ts
# packages/host/apiproxy/src/fetch/handler.ts
# packages/host/apiproxy/tests/api-proxy-commands.spec.ts
# packages/host/apiproxy/tests/client-handler.spec.ts
# packages/host/apiproxy/tests/fetch-carrier.spec.ts
# packages/host/apiproxy/tests/rpc-schemas.spec.ts
|
2026-07-30 13:48:33 +08:00 |
|
|
Tianyi Cui
|
d37b192aa9
|
Merge branch 'master' into fix/workspace-instruction-frame-metadata
|
2026-07-30 12:16:41 +08:00 |
|
|
Tianyi Cui
|
ecb43469af
|
Merge branch 'master' into fix/workspace-instruction-frame-metadata
|
2026-07-30 11:45:00 +08:00 |
|
|
imccyu
|
a9813a2801
|
Merge branch 'master' into codex/web-queue-actions
|
2026-07-30 11:20:57 +08:00 |
|
|
kingwl
|
ff570ea04c
|
test(agent): refresh inbox action snapshot
|
2026-07-30 04:20:20 +08:00 |
|
|
Tianyi Cui
|
d6c82001b3
|
Merge remote-tracking branch 'refs/remotes/origin/worktree/web-multimodal-image-input' into worktree/pr555-simplify
# Conflicts:
# .agents/notes/implemented/feature/2026-07-22-web-multimodal-image-input-and-durable-attachments.i18n.yaml
# .agents/notes/implemented/feature/2026-07-22-web-multimodal-image-input-and-durable-attachments.md
# .agents/notes/implemented/feature/2026-07-22-web-multimodal-image-input-and-durable-attachments.zh.md
# apps/cli/README.i18n.yaml
# apps/cli/README.md
# apps/cli/README.zh.md
# apps/cli/src/app-cli-entry.ts
# packages/client/connection/src/client/fixture.ts
# packages/client/ui-conversation/src/client/service.ts
# packages/host/apiproxy/src/api-proxy.ts
# packages/host/apiproxy/src/api/host.schema.ts
# packages/host/apiproxy/src/api/host.ts
# packages/host/apiproxy/tests/fetch-carrier.spec.ts
|
2026-07-30 01:16:58 +08:00 |
|
|
Tianyi Cui
|
4c15041fc9
|
test(hooks): normalize matcher snapshot workdirs
|
2026-07-30 01:16:37 +08:00 |
|
|
kingwl
|
77479f5ab0
|
test(queue): close CI coverage gaps
|
2026-07-30 00:55:02 +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
|
3d5fe9ffab
|
Merge branch 'master' into fix/hook-matcher-validation
|
2026-07-30 00:21:43 +08:00 |
|
|
Tianyi Cui
|
3a4c436d83
|
refactor: narrow web image input v1
|
2026-07-29 23:18:57 +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
|
7f711996ff
|
Merge commit 'ecbf75a5e70f662b6420375140cf12eb6bac7860' into worktree/retarget-pr828-20260729
# Conflicts:
# packages/hooks/README.i18n.yaml
# packages/hooks/README.zh.md
# packages/hooks/hook-protocol/README.i18n.yaml
# packages/hooks/hook-protocol/README.zh.md
# packages/hooks/hooks-claude/README.i18n.yaml
# packages/hooks/hooks-claude/README.zh.md
# packages/hooks/hooks-codex/README.i18n.yaml
# packages/hooks/hooks-codex/README.zh.md
|
2026-07-29 21:34:29 +08:00 |
|
|
Tianyi Cui
|
44fe621f3f
|
Merge commit 'ecbf75a5e70f662b6420375140cf12eb6bac7860' into worktree/retarget-pr831-20260729
# Conflicts:
# packages/context/workspace-context/README.i18n.yaml
# packages/context/workspace-context/README.zh.md
|
2026-07-29 21:25:44 +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 |
|
|
j-xiang
|
c44d2cc2b4
|
docs(i18n): fix proofreading review findings
|
2026-07-29 15:37:42 +08:00 |
|
|
j-xiang
|
599e6edc87
|
docs(i18n): record proofread README pairs
|
2026-07-29 15:30:44 +08:00 |
|
|
j-xiang
|
333b4bcd30
|
docs(i18n): proofread README translations 1-20
|
2026-07-29 15:29:24 +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 |
|
|
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
|
55321fe7a4
|
fix(hooks): ignore matcherless event fields
|
2026-07-28 09:55:18 -07:00 |
|
|
ZiyaZhang
|
688d298e7e
|
Merge remote-tracking branch 'upstream/master' into fix/workspace-instruction-frame-metadata
|
2026-07-28 09:53:30 -07:00 |
|
|
ZiyaZhang
|
cddf340df8
|
Merge remote-tracking branch 'origin/master' into fix/hook-matcher-validation
|
2026-07-28 09:49:40 -07:00 |
|
|
ZiyaZhang
|
15edb38a34
|
Merge remote-tracking branch 'upstream/master' into fix/workspace-instruction-frame-metadata
# Conflicts:
# packages/support/acp-snapshot/README.i18n.yaml
# packages/support/acp-snapshot/README.md
# packages/support/acp-snapshot/README.zh.md
|
2026-07-28 08:59:32 -07:00 |
|
|
ZiyaZhang
|
61a388b54e
|
test(hooks): align matcher fixtures with message identity
|
2026-07-28 08:59:28 -07:00 |
|
|
Tianyi Cui
|
c3d9f132e8
|
test(snapshot): canonicalize generated cwd tokens
|
2026-07-28 23:46:01 +08:00 |
|
|
ZiyaZhang
|
0626b6656c
|
Merge remote-tracking branch 'origin/master' into fix/hook-matcher-validation
|
2026-07-28 08:15:28 -07:00 |
|
|
Tianyi Cui
|
84d0d92cfb
|
test(snapshot): normalize temporary workspace paths
|
2026-07-28 21:32:49 +08:00 |
|
|
Tianyi Cui
|
0304ba1457
|
Merge branch 'master' into worktree/dedupe-snapshot-contracts
|
2026-07-28 21:08:38 +08:00 |
|
|
ZiyaZhang
|
f688cd32af
|
fix(workspace-context): escape instruction metadata
|
2026-07-28 05:22:47 -07:00 |
|
|
_Kerman
|
bc988ca4a9
|
Merge remote-tracking branch 'origin/master' into xtr/identified-immutable-messages
# Conflicts:
# docs/cordis-catalog/events.md
# docs/core-data-structures/core.i18n.yaml
# docs/event-producer-consumer.md
# examples/acp-agent/tests/snapshots/cordis-inspect-jsdoc/session.jsonl
# packages/core/agent-loop/README.i18n.yaml
# packages/core/agent/README.i18n.yaml
|
2026-07-28 18:49:23 +08:00 |
|
|
Yichen Jiang
|
fd01fef6b7
|
test(sdk): satisfy max tokens gates
|
2026-07-28 18:06:58 +08:00 |
|
|
ZiyaZhang
|
5e4c2ffae7
|
test(hooks): snapshot invalid matcher loading
|
2026-07-28 02:58:08 -07:00 |
|
|
Tianyi Cui
|
9c78a7df33
|
test(snapshot): share identical header sidecars
|
2026-07-28 17:26:03 +08:00 |
|
|
Yichen Jiang
|
3764778be3
|
Merge remote-tracking branch 'origin/master' into worktree/skill-invocation-controls
|
2026-07-28 17:22:56 +08:00 |
|
|
Yichen Jiang
|
e133e4bddb
|
feat(skill): add invocation controls
|
2026-07-28 17:22:41 +08:00 |
|
|
Yichen Jiang
|
e0f637abcd
|
Merge remote-tracking branch 'origin/master' into worktree/web-multimodal-image-input
# Conflicts:
# .agents/notes/implemented/architecture/2026-07-25-web-input-machine-and-slash-pipeline.i18n.yaml
# docs/architecture.i18n.yaml
# docs/core-data-structures/core.i18n.yaml
# packages/client/runtime/README.i18n.yaml
# packages/client/ui-conversation/src/client/apply.ts
# packages/client/ui-conversation/src/client/chat/ChatView.tsx
# 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-conversation/tests/input-scenarios.spec.tsx
# packages/client/ui-conversation/tests/skeleton.spec.tsx
|
2026-07-28 16:07:58 +08:00 |
|
|
_Kerman
|
750aa2022f
|
fix(snapshot): refresh session title messages
|
2026-07-28 15:55:15 +08:00 |
|
|
_Kerman
|
019b0abb68
|
Merge remote-tracking branch 'origin/master' into xtr/identified-immutable-messages
# Conflicts:
# .agents/notes/implemented/architecture/2026-07-24-separate-context-injection-from-turn-execution.i18n.yaml
# docs/cordis-catalog/services.md
# docs/core-data-structures/core.i18n.yaml
# docs/core-data-structures/session.i18n.yaml
# docs/event-producer-consumer.md
# docs/persistence-catalog.md
# packages/core/session/README.i18n.yaml
# packages/session-title/session-title/tests/persistence.spec.ts
|
2026-07-28 15:45:53 +08:00 |
|
|
_Kerman
|
a39ffb095a
|
fix(session): preserve plugin turn invariants
|
2026-07-28 15:18:48 +08:00 |
|
|
_Kerman
|
350c296cff
|
fix: complete immutable message migration
|
2026-07-28 14:15:23 +08:00 |
|
|
_Kerman
|
fbf87e660c
|
refactor: identify and freeze messages at creation
|
2026-07-28 13:55:59 +08:00 |
|
|
Yichen Jiang
|
004f598917
|
Merge remote-tracking branch 'origin/master' into worktree/web-multimodal-image-input
# Conflicts:
# docs/architecture.i18n.yaml
# docs/architecture.md
# docs/architecture.zh.md
# docs/config-catalog.md
# docs/core-data-structures/core.i18n.yaml
# docs/core-data-structures/llm-streaming.i18n.yaml
# docs/module-graph.md
# examples/acp-agent/tests/snapshots/cordis-inspect-jsdoc/session.jsonl
# packages/README.i18n.yaml
# packages/client/connection/src/client/fixture.ts
# packages/client/connection/src/index.ts
# packages/client/runtime/README.i18n.yaml
# packages/client/runtime/README.md
# packages/client/runtime/README.zh.md
# packages/client/runtime/src/client/sessions/conversation.ts
# packages/client/ui-conversation/README.i18n.yaml
# packages/client/ui-conversation/src/client/apply.ts
# packages/client/ui-conversation/src/client/chat/ChatView.tsx
# packages/client/ui-conversation/src/client/chat/MessageItem.tsx
# packages/client/ui-conversation/src/client/contract/slots.ts
# packages/client/ui-trajectory/tests/views.spec.tsx
# packages/compact/compact-basic/README.i18n.yaml
# packages/cordis/tool-cordis/src/api-catalog.ts
# packages/host/apiproxy/src/api-proxy.ts
# packages/host/apiproxy/src/api/index.ts
# packages/host/apiproxy/src/api/sessions.ts
# packages/host/apiproxy/src/index.ts
# packages/host/apiproxy/tests/fetch-carrier.spec.ts
# packages/llm/llm-deepseek/src/adapter.ts
# packages/llm/llm-deepseek/tests/adapter.spec.ts
# packages/llm/llm-deepseek/tests/serialize.spec.ts
# packages/llm/llm-pi-ai/README.i18n.yaml
# packages/llm/llm-pi-ai/src/adapter.ts
# packages/llm/llm-pi-ai/src/index.ts
# packages/llm/llm-pi-ai/tests/adapter.spec.ts
# packages/llm/llm/src/types.ts
# packages/ui/tui/README.i18n.yaml
# packages/ui/tui/src/index.ts
# packages/ui/tui/tests/tui.spec.ts
|
2026-07-28 11:41:40 +08:00 |
|
|
Tianyi Cui
|
9ebd0075e9
|
Merge master into fix/pty-handoff-grace
|
2026-07-28 01:19:58 +08:00 |
|
|
Tianyi Cui
|
cc8f6a30c0
|
Merge remote-tracking branch 'origin/master' into worktree/pr703-ci-fix-20260727
# Conflicts:
# docs/architecture.i18n.yaml
# packages/core/agent-loop/src/agent.ts
|
2026-07-28 00:23:27 +08:00 |
|
|
Chinesezjc
|
3dc3e59b38
|
Merge remote-tracking branch 'origin/master' into fix/pty-handoff-grace
|
2026-07-28 00:17:25 +08:00 |
|
|
Tianyi Cui
|
c8814d7347
|
test(acp): await goal cancellation persistence
|
2026-07-28 00:13:09 +08:00 |
|
|
Tianyi Cui
|
064cea4ebe
|
Merge remote-tracking branch 'origin/master' into worktree/pr743-merge-20260727
# Conflicts:
# examples/acp-agent/tests/snapshots/escalation-approved/session.jsonl
# examples/acp-agent/tests/snapshots/escalation-rejected/session.jsonl
# examples/acp-agent/tests/snapshots/fs-escalation-approved/session.jsonl
# examples/acp-agent/tests/snapshots/hook-cc-pretool-ask/session.jsonl
# examples/acp-agent/tests/snapshots/session-query-spill/session.jsonl
# examples/cordis-agent/tests/cordis-tools.e2e.ts
# examples/headless-agent/tests/snapshots/advanced-toolchain/session.1.jsonl
# examples/headless-agent/tests/snapshots/advanced-toolchain/session.2.jsonl
# examples/headless-agent/tests/snapshots/advanced-toolchain/session.jsonl
|
2026-07-27 23:59:33 +08:00 |
|
|
Tianyi Cui
|
29619eda77
|
Merge remote-tracking branch 'origin/master' into worktree/pr628-merge-20260727
# Conflicts:
# .agents/notes/implemented/architecture/2026-06-21-bounded-llm-request-recovery.i18n.yaml
# .agents/notes/implemented/architecture/2026-06-21-bounded-llm-request-recovery.md
# .agents/notes/implemented/architecture/2026-06-21-bounded-llm-request-recovery.zh.md
# docs/architecture.i18n.yaml
# docs/architecture.md
# docs/architecture.zh.md
# docs/cordis-catalog/events.md
# docs/core-data-structures/llm-streaming.i18n.yaml
# docs/core-data-structures/llm-streaming.md
# docs/core-data-structures/llm-streaming.zh.md
# docs/event-producer-consumer.md
# examples/acp-agent/tests/snapshots/empty-response-retry/session.jsonl
# packages/compact/compact-basic/src/index.ts
# packages/compact/compact-basic/tests/compact-basic.spec.ts
# packages/cordis/tool-cordis/src/api-catalog.ts
# packages/core/agent-loop/README.i18n.yaml
# packages/core/agent-loop/README.md
# packages/core/agent-loop/README.zh.md
# packages/core/agent-loop/src/loop.ts
# packages/core/agent-loop/tests/request-recovery.spec.ts
# packages/core/agent/src/types.ts
# packages/core/scope/tests/invariant.spec.ts
# packages/llm/llm-retry/README.i18n.yaml
# packages/llm/llm-retry/README.md
# packages/llm/llm-retry/README.zh.md
# packages/llm/llm-retry/src/index.ts
# packages/llm/llm-retry/src/invariant.ts
# packages/llm/llm-retry/tests/invariant.spec.ts
# packages/llm/llm-retry/tests/retry.spec.ts
# packages/plan/plan-mode/src/index.ts
# packages/plan/plan-mode/tests/integration.spec.ts
# packages/plan/plan-mode/tests/plan-mode.spec.ts
|
2026-07-27 23:29:26 +08:00 |
|
|
Chinesezjc
|
18882af947
|
Merge remote-tracking branch 'origin/master' into fix/pty-handoff-grace
|
2026-07-27 23:17:23 +08:00 |
|