Merge upstream/main: resolve conflicts preserving local customizations

Browse Source

Merge 207 upstream commits (up to v1.2.41) while keeping Apple Container
runtime support and MiniMax model forwarding. Remove deleted telegram.ts
and credential-proxy.ts imports, widen CONTAINER_RUNTIME_BIN type for
Apple Container detection.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

...

This commit is contained in:

woozu-shin

2026-03-28 14:44:28 +09:00

parent cd8d043eaf c3e9a892c2

commit 576d5ce366

65 changed files with 2948 additions and 3092 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

824

package-lock.json generated

File diff suppressed because it is too large Load Diff