creatixchu fb743759a7 Merge remote-tracking branch 'origin/master' into worktree/2984-generic-file-upload ...

# Conflicts:
#	apps/web/tests/scaffold.ts
#	docs/config-catalog.i18n.yaml
#	docs/config-catalog.md
#	docs/config-catalog.zh.md
#	docs/event-producer-consumer.i18n.yaml
#	docs/event-producer-consumer.md
#	docs/event-producer-consumer.zh.md
#	packages/api/session-controller/README.i18n.yaml
#	packages/api/session-controller/README.md
#	packages/api/session-controller/README.zh.md
#	packages/extensions/tool-cordis/src/api-catalog.ts
#	packages/llm/token-meter/src/index.ts
#	packages/session-query/session-log-export/README.i18n.yaml
#	packages/session-query/session-log-export/README.md
#	packages/session-query/session-log-export/README.zh.md
#	packages/session-query/session-log-export/src/archive.ts
#	scripts/package-dependency-policy.ts

2026-09-04 10:12:19 +08:00

..

client

Merge remote-tracking branch 'origin/master' into worktree/2984-generic-file-upload

2026-09-04 10:12:19 +08:00

agent.ts

refactor(session)!: distinguish event seqs from log offsets

2026-09-01 20:36:00 +08:00

assistant-stream.ts

Merge commit 'be5db297c7' into worktree/session-format-05-v1-v2-chunk-migration

2026-09-03 22:09:31 +08:00

catalog.ts

…

commands.ts

Merge remote-tracking branch 'origin/master' into worktree/2984-generic-file-upload

2026-09-04 10:12:19 +08:00

control.ts

…

file-references.ts

…

history.ts

Merge remote-tracking branch 'origin/worktree/session-format-03-v0-v1-migration' into worktree/session-format-04-live-assistant-stream

2026-09-02 21:51:42 +08:00

index.ts

Merge remote-tracking branch 'origin/master' into worktree/2984-generic-file-upload

2026-09-04 10:12:19 +08:00

list.ts

fix(session): address v0 migration review

2026-09-03 01:52:25 +08:00

model-selection-projection.ts

…

remote-events.ts

…

skill-catalog.ts

…

types.ts

Merge remote-tracking branch 'origin/master' into worktree/2984-generic-file-upload

2026-09-04 10:12:19 +08:00