creatixchu
|
18aa6c381b
|
Merge remote-tracking branch 'origin/worktree/web-multimodal-image-input' into worktree/web-multimodal-image-input
# Conflicts:
# .agents/notes/implemented/feature/2026-07-22-web-multimodal-image-input-and-durable-attachments.i18n.yaml
# apps/web/tests/code-mode-fixture.snapshot.ts
# apps/web/tests/image-display.snapshot.ts
# docs/architecture.i18n.yaml
# docs/module-graph.md
# packages/client/test-runtime/tests/runtime.spec.tsx
# packages/client/ui-conversation/src/client/skeleton/ConversationSession.tsx
# packages/client/ui-conversation/tests/terminal-card.spec.tsx
# packages/client/ui-trajectory/src/client/layout.ts
|
2026-07-30 10:46:50 +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 |
|
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
|
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
|
0440c4cc0c
|
Merge latest master into codex/migrate-to-oxlint
|
2026-07-30 00:13:30 +08:00 |
|
imccyu
|
dcb8b592ee
|
Merge remote-tracking branch 'origin/master' into worktree-trpc
|
2026-07-30 00:04:52 +08:00 |
|
imccyu
|
c269febc9a
|
refactor(cordis): generate catalogs from Typert models
|
2026-07-29 23:55:12 +08:00 |
|
imccyu
|
f773985e71
|
feat(typert): add compiler-independent type pipeline
|
2026-07-29 23:45:42 +08:00 |
|
Tianyi Cui
|
50350088f9
|
docs: correct the Oxlint workflow contract
|
2026-07-29 23:45:06 +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
|
0a1c0dcb07
|
Merge remote-tracking branch 'origin/master' into worktree/web-multimodal-image-input
|
2026-07-29 22:52:14 +08:00 |
|
Tianyi Cui
|
12832886c5
|
refactor(skill): canonicalize invocation policy
|
2026-07-29 22:51:47 +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
|
87b19a1ded
|
Merge remote-tracking branch 'origin/master' into worktree/web-multimodal-image-input
|
2026-07-29 22:35:12 +08:00 |
|
imccyu
|
20c446e033
|
Merge branch 'master' into worktree-renameweb
|
2026-07-29 22:28:34 +08:00 |
|
Tianyi Cui
|
db543ffa85
|
fix(skill): bound catalog discovery retries
|
2026-07-29 22:27:49 +08:00 |
|
imccyu
|
98a23fc88c
|
Merge branch 'master' into feat/input-command-interaction
|
2026-07-29 22:20:09 +08:00 |
|
Tianyi Cui
|
637c5c9b7b
|
Merge remote-tracking branch 'origin/master' into worktree/fix-agent-loop-scheduler-quiescence
|
2026-07-29 22:10:52 +08:00 |
|
imccyu
|
fd356b92c8
|
Merge branch 'master' into feat/input-command-interaction
|
2026-07-29 22:10:39 +08:00 |
|
Tianyi Cui
|
1a21fc3a06
|
fix(agent-loop): quiesce scheduler failures
|
2026-07-29 22:10:26 +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 |
|
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
|
354aeae35a
|
fix: docs
|
2026-07-29 21:40:45 +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 |
|
Tianyi Cui
|
754e163663
|
Merge remote-tracking branch 'origin/master' into worktree/pr823-retarget-latest-20260729
|
2026-07-29 21:26:44 +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 |
|
Tianyi Cui
|
ae4a6081be
|
Merge remote-tracking branch 'origin/master' into worktree/pr823-retarget-latest-20260729
|
2026-07-29 21:22:07 +08:00 |
|
imccyu
|
bf8db964d4
|
Merge branch 'master' into xtr/trajectory-inspection-ui
|
2026-07-29 21:20:38 +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 |
|
Tianyi Cui
|
4926fa18ec
|
Merge commit 'refs/codex/pr758/live-master' into HEAD
|
2026-07-29 21:01:55 +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 |
|
Tianyi Cui
|
4368c2d40c
|
Merge branch 'master' into fix/translation-brief-uncommitted-pair
|
2026-07-29 20:54:30 +08:00 |
|