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 |
|
creatixchu
|
a703575dab
|
Merge remote-tracking branch 'origin/worktree/web-multimodal-image-input' into worktree/pr555-fixes
# 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
|
2026-07-30 13:11:07 +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 |
|
Tianyi Cui
|
515d48875e
|
fix: harden Web image admission
|
2026-07-30 01:58:36 +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 |
|
kingwl
|
76e14793a9
|
Merge remote-tracking branch 'origin/master' into codex/web-queue-actions
# Conflicts:
# docs/architecture.i18n.yaml
# docs/cordis-catalog/events.md
# docs/core-data-structures/core.i18n.yaml
# docs/event-producer-consumer.md
|
2026-07-30 01:04:25 +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 |
|
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 |
|
imccyu
|
ed1ae0d636
|
fix: docs budget
|
2026-07-30 00:12:03 +08:00 |
|
kingwl
|
f893e2281d
|
feat(agent): add addressable queue operations
|
2026-07-30 00:05:00 +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
|
e673524976
|
refactor: centralize Oxlint worker bounds
|
2026-07-29 23:39:49 +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 |
|
Tianyi Cui
|
f7ee0bf0fd
|
fix: allow ignored-only staged lint
|
2026-07-29 23:36:08 +08:00 |
|
Tianyi Cui
|
8f34131f01
|
fix: restore unused suppression reports
|
2026-07-29 23:35:10 +08:00 |
|
Tianyi Cui
|
59940f0863
|
test: keep lint format rules aligned
|
2026-07-29 23:34:30 +08:00 |
|
Tianyi Cui
|
fe5d0001ab
|
test: pin Oxlint compatibility rules
|
2026-07-29 23:29:59 +08:00 |
|
Tianyi Cui
|
d29c5e0c07
|
test: prove Oxlint project discovery
|
2026-07-29 23:28:32 +08:00 |
|
Tianyi Cui
|
df9608c43d
|
test: make lint profile fingerprint honest
|
2026-07-29 23:26:16 +08:00 |
|
Tianyi Cui
|
0659151cd5
|
test: refresh translation prompt snapshot
|
2026-07-29 22:57:32 +08:00 |
|
Tianyi Cui
|
e91ef39f5a
|
fix: preserve lint migration contracts
|
2026-07-29 22:38:20 +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
|
e1984cbfd9
|
Merge commit '90bc53cc64dc684dc3d741f45ae6a8d548c188f9' into worktree/retarget-pr885-20260729
|
2026-07-29 21:40:13 +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 |
|
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 |
|
Turtle
|
203767cd37
|
test: prove ESLint to Oxlint rule parity
|
2026-07-29 14:47:50 +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 |
|