creatixchu
|
97cf33b7e0
|
Merge remote-tracking branch 'origin/master' into worktree/web-multimodal-image-input
# Conflicts:
# packages/ui/tui/README.i18n.yaml
|
2026-07-30 13:50:24 +08:00 |
|
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 |
|
imccyu
|
432a64ef2f
|
Merge branch 'master' into worktree/short-default-labels
|
2026-07-30 12:56:11 +08:00 |
|
Yichen Jiang
|
fb4b8f3973
|
Merge remote-tracking branch 'origin/master' into worktree/short-default-labels
# Conflicts:
# packages/client/ui-model/src/client/ModelSelect.tsx
# packages/client/ui-model/tests/model-select.spec.tsx
|
2026-07-30 10:47:35 +08:00 |
|
creatixchu
|
6a96c8dd42
|
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
# apps/web/tests/code-mode-fixture.snapshot.ts
# docs/architecture.i18n.yaml
# docs/core-data-structures/core.i18n.yaml
# docs/module-graph.md
# packages/README.i18n.yaml
# packages/client/runtime/README.i18n.yaml
# packages/client/runtime/README.md
# packages/client/runtime/README.zh.md
# packages/client/test-runtime/tests/runtime.spec.tsx
# packages/client/ui-conversation/README.i18n.yaml
# packages/client/ui-conversation/package.json
# packages/client/ui-conversation/src/client/chat/ChatView.tsx
# packages/client/ui-conversation/src/client/skeleton/ConversationSession.tsx
# packages/client/ui-conversation/src/client/skeleton/InputBar.tsx
# packages/client/ui-conversation/tests/skeleton.spec.tsx
# packages/compact/compact-basic/README.i18n.yaml
# packages/compact/compact-basic/README.zh.md
# packages/compact/compact-basic/src/summarizer.ts
# packages/host/apiproxy/src/api/sessions.ts
# packages/llm/llm-pi-ai/README.i18n.yaml
# packages/llm/llm/README.i18n.yaml
# packages/ui/tui/README.i18n.yaml
# pnpm-lock.yaml
|
2026-07-30 10:36:41 +08:00 |
|
kingwl
|
ebbcfdd03b
|
Merge remote-tracking branch 'origin/master' into codex/web-queue-actions
# Conflicts:
# packages/core/agent-loop/src/agent.ts
|
2026-07-30 03:33:41 +08:00 |
|
Yichen Jiang
|
15eaac6af5
|
fix(ui): shorten default reasoning labels
|
2026-07-30 00:57:38 +08:00 |
|
kingwl
|
c97b1d025e
|
Merge remote-tracking branch 'origin/master' into codex/web-queue-actions
# Conflicts:
# apps/web/tsconfig.json
# docs/architecture.i18n.yaml
# docs/event-producer-consumer.md
# packages/client/runtime/README.i18n.yaml
# packages/client/tsdown.client.ts
# packages/client/ui-conversation/README.i18n.yaml
# packages/core/agent-loop/README.i18n.yaml
# packages/core/agent/README.i18n.yaml
# packages/core/agent/README.zh.md
# packages/host/apiproxy/README.i18n.yaml
# tsconfig.host.json
|
2026-07-30 00:30:38 +08:00 |
|
Tianyi Cui
|
0440c4cc0c
|
Merge latest master into codex/migrate-to-oxlint
|
2026-07-30 00:13:30 +08:00 |
|
kingwl
|
f893e2281d
|
feat(agent): add addressable queue operations
|
2026-07-30 00:05:00 +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 |
|
Tianyi Cui
|
1619d7686b
|
test(skill): close invocation policy coverage gaps
|
2026-07-29 23:17:07 +08:00 |
|
Tianyi Cui
|
12832886c5
|
refactor(skill): canonicalize invocation policy
|
2026-07-29 22:51:47 +08:00 |
|
Tianyi Cui
|
5fb4bd66d7
|
Merge latest master into codex/migrate-to-oxlint
|
2026-07-29 22:01:25 +08:00 |
|
Tianyi Cui
|
bb3e5c8c05
|
Merge remote-tracking branch 'origin/master' into worktree/pr823-retarget-latest-20260729
|
2026-07-29 21:59:24 +08:00 |
|
Tianyi Cui
|
d10dde430c
|
Merge origin/master at ddeb1cab2d into skill catalog hot refresh
|
2026-07-29 21:55:32 +08:00 |
|
Tianyi Cui
|
66072285c8
|
fix(skill): enforce invocation policy before load
|
2026-07-29 21:48:15 +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
|
5bf93e4229
|
Merge origin/master into worktree/skill-catalog-hot-refresh
|
2026-07-29 16:40:40 +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 |
|
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
|
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 |
|
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 |
|
Turtle
|
31cb340c36
|
feat(tui)!: consolidate terminal UI improvements
|
2026-07-29 10:00:29 +08:00 |
|
Tianyi Cui
|
979fa8ab33
|
refactor(skill): scope provider invalidation
|
2026-07-29 02:06:07 +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
|
8d77e5149c
|
Merge remote-tracking branch 'upstream/master' into fix/subprocess-password-scrub
|
2026-07-28 08:15:08 -07:00 |
|
07akioni
|
a39890bba5
|
Merge branch 'master' into feat/close-todo
|
2026-07-28 19:45:36 +08:00 |
|
07akioni
|
7bf36c6aa3
|
Merge origin/master into feat/close-todo
Keep master's session-projection carrier for todos, and fold turn/start
clearance into the tool-todo projection unit (plus TUI/fixture mirrors).
|
2026-07-28 19:43:56 +08:00 |
|
07akioni
|
6978dbfb13
|
fix: cr
|
2026-07-28 19:16:39 +08:00 |
|
_Kerman
|
9220dbd271
|
Merge remote-tracking branch 'origin/master' into xtr/identified-immutable-messages
# Conflicts:
# docs/event-producer-consumer.md
# packages/client/connection/src/client/fixture.ts
# packages/goal/command-goal/tests/command-goal.spec.ts
# packages/host/apiproxy/src/api-proxy.ts
# packages/host/apiproxy/src/api/events.schema.ts
# packages/host/apiproxy/src/api/events.ts
# packages/host/apiproxy/tests/api-proxy-view.spec.ts
# packages/host/apiproxy/tests/rpc-schemas.spec.ts
# tsconfig.base.json
|
2026-07-28 18:11:13 +08:00 |
|
Yichen Jiang
|
7a54987cb0
|
Merge remote-tracking branch 'origin/master' into worktree/web-multimodal-image-input
# Conflicts:
# packages/README.i18n.yaml
# packages/client/connection/src/client/api.ts
# packages/client/ui-conversation/README.i18n.yaml
# packages/client/ui-conversation/src/client/chat/ChatView.tsx
# packages/client/ui-conversation/src/client/index.ts
# packages/host/apiproxy/src/api-proxy.ts
# packages/host/apiproxy/src/api/index.ts
# packages/host/apiproxy/src/api/sessions.ts
# pnpm-lock.yaml
|
2026-07-28 18:02:13 +08:00 |
|
Yichen Jiang
|
1fd06eae89
|
Merge remote-tracking branch 'origin/master' into worktree/skill-invocation-controls
# Conflicts:
# packages/host/apiproxy/README.i18n.yaml
# packages/host/apiproxy/README.md
# packages/host/apiproxy/README.zh.md
# packages/host/apiproxy/src/api-proxy.ts
|
2026-07-28 18:00:40 +08:00 |
|
07akioni
|
9e94082f4d
|
feat: implement todo plan clearance on turn start
|
2026-07-28 17:58:09 +08:00 |
|
Yichen Jiang
|
babb8f1496
|
fix(skill): normalize invocation policy
|
2026-07-28 17:55:49 +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 |
|
ZiyaZhang
|
d0cbf825a5
|
fix(subprocess): share password scrub with direct spawners
|
2026-07-28 02:19:18 -07:00 |
|
Tianyi Cui
|
def1b5c55a
|
Merge remote-tracking branch 'origin/master' into worktree/pr742-retarget-20260728
# Conflicts:
# docs/event-producer-consumer.md
|
2026-07-28 16:59:10 +08:00 |
|
imccyu
|
de56936c87
|
docs: fix test and docs conflicts
|
2026-07-28 16:50:07 +08:00 |
|
imccyu
|
9ce201e490
|
Merge remote-tracking branch 'origin/master' into worktree-guifork
|
2026-07-28 16:12:12 +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
|
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
|
b1af35145b
|
fix: enforce message snapshot invariants
|
2026-07-28 15:33:00 +08:00 |
|
Tianyi Cui
|
fa18977ebd
|
Merge remote-tracking branch 'origin/master' into worktree/pr742-retarget-20260728
|
2026-07-28 14:51:20 +08:00 |
|
Tianyi Cui
|
eeaf4c7220
|
fix(ci): stabilize readiness timing boundaries
|
2026-07-28 14:49:59 +08:00 |
|
_Kerman
|
971f20b66e
|
fix: restore message migration CI coverage
|
2026-07-28 14:29:54 +08:00 |
|
_Kerman
|
350c296cff
|
fix: complete immutable message migration
|
2026-07-28 14:15:23 +08:00 |
|
_Kerman
|
f5ec71f5b1
|
Merge remote-tracking branch 'origin/master' into xtr/identified-immutable-messages
# Conflicts:
# .agents/notes/implemented/feature/2026-07-21-cross-session-references.i18n.yaml
# packages/context/session-reference/README.i18n.yaml
# packages/context/session-reference/README.md
# packages/context/session-reference/README.zh.md
# packages/context/session-reference/src/index.ts
|
2026-07-28 13:58:06 +08:00 |
|