fix: resolve merge conflicts with main#19

Merged

wynxing merged 18 commits into

refactor/sqlite-persistencefrom

fork-pr-343-1776427778

Apr 17, 2026

Commits on Apr 17, 2026

feat(TUI):增加图片输入入口
 phantom5099
committed
fix(tui,session,config): address review findings and add regression coverage

xgopilot
and
phantom5099
committed
Merge pull request #27 from phantom5099/fork-pr-337-1776410957
phantom5099
authored
fix(runtime/session/tui): harden multimodal input safety and event isolation

xgopilot
and
phantom5099
committed
Merge pull request #28 from phantom5099/fork-pr-337-1776410957
phantom5099
authored
test(coverage): 补充多模态输入与事件分支测试

xgopilot
and
phantom5099
committed
Merge pull request #29 from phantom5099/fork-pr-337-1776410957
phantom5099
authored
feat(cli): 支持应用启动静默检测新版本与平滑自动升级
 pionxe
committed
fix: resolve residual multimodal/session/provider review risks

xgopilot
and
phantom5099
committed
fix(cli): 修复自动更新并发冲突、终端注入风险及网络阻塞问题
 pionxe
committed
test: improve updater and workspace coverage

xgopilot
and
pionxe
committed
fix(runtime/session/config): avoid prepare-event deadlock and improve cancel-safe asset flow

xgopilot
and
phantom5099
committed
Merge branch 'fork-pr-337-1776410957' of https://github.com/phantom5099/neo-code into fork-pr-337-1776410957
xgopilot
committed
Merge pull request #30 from phantom5099/fork-pr-337-1776410957
phantom5099
authored
fix(cli): harden update notice/output and simplify logic

xgopilot
and
pionxe
committed
Merge pull request #340 from pionxe/main
phantom5099
authored
Merge pull request #337 from phantom5099/main
phantom5099
authored
merge: resolve conflicts with origin/main for sqlite persistence PR

xgopilot
and
wynxing
committed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: resolve merge conflicts with main#19

fix: resolve merge conflicts with main#19
wynxing merged 18 commits into
refactor/sqlite-persistencefrom
fork-pr-343-1776427778

Commits on Apr 17, 2026

feat(TUI):增加图片输入入口

fix(tui,session,config): address review findings and add regression coverage

Merge pull request #27 from phantom5099/fork-pr-337-1776410957

fix(runtime/session/tui): harden multimodal input safety and event isolation

Merge pull request #28 from phantom5099/fork-pr-337-1776410957

test(coverage): 补充多模态输入与事件分支测试

Merge pull request #29 from phantom5099/fork-pr-337-1776410957

feat(cli): 支持应用启动静默检测新版本与平滑自动升级

fix: resolve residual multimodal/session/provider review risks

fix(cli): 修复自动更新并发冲突、终端注入风险及网络阻塞问题

test: improve updater and workspace coverage

fix(runtime/session/config): avoid prepare-event deadlock and improve cancel-safe asset flow

Merge branch 'fork-pr-337-1776410957' of https://github.com/phantom5099/neo-code into fork-pr-337-1776410957

Merge pull request #30 from phantom5099/fork-pr-337-1776410957

fix(cli): harden update notice/output and simplify logic

Merge pull request #340 from pionxe/main

Merge pull request #337 from phantom5099/main

merge: resolve conflicts with origin/main for sqlite persistence PR