Skip to content

fix: resolve merge conflicts with main#19

Merged
wynxing merged 18 commits into
refactor/sqlite-persistencefrom
fork-pr-343-1776427778
Apr 17, 2026
Merged

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

Conversation

@fennoai

@fennoai fennoai Bot commented Apr 17, 2026

Copy link
Copy Markdown

Requested by @Yumiue

Summary

  • Merged latest origin/main into this working branch
  • Resolved conflicts in session/runtime/go module files
  • Adapted session input preparer to the new SQLite intent-based Store API
  • Added SQLite delete helpers used by prepare rollback/cleanup paths
  • Verified with go build and targeted tests

phantom5099 and others added 18 commits April 17, 2026 15:27
…overage

- require explicit @image: token and preserve whitespace when absorbing inline image refs
- dedupe user-message rendering by run id instead of message content
- rollback newly created session when asset save fails
- make custom provider directory load read-only friendly when directory is missing
- add/adjust tests for all updated behaviors

Generated with [codeagent](https://github.com/qbox/codeagent)
Co-authored-by: phantom5099 <245659304+phantom5099@users.noreply.github.com>
fix(tui,session,config): 修复 review 问题并补测试覆盖
…olation

Generated with [codeagent](https://github.com/qbox/codeagent)
Co-authored-by: phantom5099 <245659304+phantom5099@users.noreply.github.com>
fix: harden multimodal input safety and event isolation
Generated with [codeagent](https://github.com/qbox/codeagent)
Co-authored-by: phantom5099 <245659304+phantom5099@users.noreply.github.com>
- 引入 `go-selfupdate`,支持检测 Github Releases 并自动替换二进制文件
- 新增 `internal/version` 包,配合 `.goreleaser.yaml` 注入构建版本号
- 在根命令 `PersistentPreRunE` 挂载异步静默版本检测(屏蔽 `url-dispatch`)
- 优化 TUI 生命周期,利用提示缓冲实现 AltScreen 退出后的更新提醒
- 新增 `neocode update [--prerelease]` 手动升级命令
- fix(test): 修复 Windows 环境下 config 目录权限测试由于 `os.Chmod` 不兼容导致的误报
Generated with [codeagent](https://github.com/qbox/codeagent)
Co-authored-by: phantom5099 <245659304+phantom5099@users.noreply.github.com>
- 拦截 `update` 命令的静默检测逻辑,避免与手动升级流程产生并发冲突及输出过期提示
- 新增 `sanitizeVersionForTerminal`,剥离远端版本字符串中的 ANSI 控制序列,防止终端转义注入
- 为 `neocode update` 手动升级命令增加 5 分钟显式超时上下文,并优化网络超时错误提示
- 补全边界场景单元测试(涵盖跳过静默检测、字符串清洗及网络超时触发分支)
Generated with [codeagent](https://github.com/qbox/codeagent)
Co-authored-by: pionxe <148670367+pionxe@users.noreply.github.com>
… cancel-safe asset flow

Generated with [codeagent](https://github.com/qbox/codeagent)
Co-authored-by: phantom5099 <245659304+phantom5099@users.noreply.github.com>
fix(runtime/session/config): resolve submit-event blocking and cancellation gaps
Generated with [codeagent](https://github.com/qbox/codeagent)
Co-authored-by: pionxe <148670367+pionxe@users.noreply.github.com>
feat: 支持 CLI/TUI 程序启动时静默检测新版本与平滑升级
feat(TUI):收敛多模态输入链路:runtime 单入口提交 + session 归一化落地,清理 TUI 过渡职责并修复 schema/目录行为
Generated with [codeagent](https://github.com/qbox/codeagent)
Co-authored-by: Yumiue <188874804+Yumiue@users.noreply.github.com>
@wynxing wynxing merged commit db79122 into refactor/sqlite-persistence Apr 17, 2026
1 check failed
@fennoai fennoai Bot deleted the fork-pr-343-1776427778 branch April 17, 2026 12:41
wynxing pushed a commit that referenced this pull request Apr 22, 2026
…lution

fix(tui): close transcript selection regressions and add coverage tests
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants