Skip to content

修复消息检索bug+Windows对话异常+对话工作中/完成提示#1386

Merged
piorpua merged 10 commits intoiOfficeAI:mainfrom
JAVA-LW:conversation_history_search
Mar 18, 2026
Merged

修复消息检索bug+Windows对话异常+对话工作中/完成提示#1386
piorpua merged 10 commits intoiOfficeAI:mainfrom
JAVA-LW:conversation_history_search

Conversation

@JAVA-LW
Copy link
Copy Markdown
Contributor

@JAVA-LW JAVA-LW commented Mar 17, 2026

Pull Request

Description

修复消息检索bug+Windows 对话出现异常问题

Additionally includes changes from #1361:

Related Issues

Type of Change

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Documentation update

Testing

  • Tested on macOS
  • Tested on Windows
  • Tested on Linux
  • My code follows the project's code style guidelines
  • I have performed a self-review of my own code
  • My changes generate no new warnings or errors

Screenshots

Additional Context


Thank you for contributing to AionUi! 🎉

JAVA-LW and others added 5 commits March 17, 2026 07:10
修复搜索弹窗在选择结果后未正确重置状态的问题,优化了打开/关闭逻辑和清除搜索关键词的处理。同时添加了按钮的可访问性标签并移除了不必要的状态更新。
添加对Windows平台shell执行的支持,包括:
1. 新增getWindowsShellExecutionOptions工具函数
2. 在resolveNpxPath和codex命令执行时添加Windows平台特定的shell选项
3. 添加相关单元测试验证Windows平台行为
Copy link
Copy Markdown

@chatgpt-codex-connector chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: e265e785be

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

Comment on lines +180 to +184
if (shouldIgnoreStreamMessage(message.type)) {
return;
}

markGenerating(conversationId);
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Ignore notification-only stream types before setting generating

This branch marks every non-terminal message as "generating", which includes notification events like tips. For example, missed-cron notices are emitted as type: 'tips' (src/process/services/cron/CronService.ts, around the ipcBridge.conversation.responseStream.emit call) and are not followed by a finish/error signal, so the conversation can remain stuck in generatingConversationIdsState and show a permanent spinner in the sidebar. Restrict markGenerating to true generation message types (or explicitly ignore tips/system-style events).

Useful? React with 👍 / 👎.

zk added 4 commits March 18, 2026 10:32
- Export getWindowsShellExecutionOptions from shellEnv.ts for reuse
- Replace inline platform check in acpConnectors.ts with the shared helper
- Add shell execution options to AcpConnection.ts npm cache clean call
- Add shell execution options to resolveNpxPath where.exe probe for consistency
- Update acpConnectors test mock to include getWindowsShellExecutionOptions
… in tray tests

Avoids flaky failures on CI (ubuntu) where `await import('electron')`
after vi.resetModules() can return an incomplete mock object.
…ht side

- Replace renderLeadingIcon with Spin when conversation is generating
- Move completion unread blue dot to absolute right position
- Hide blue dot on hover to avoid overlap with action buttons
@kaizhou-lab kaizhou-lab changed the title 修复消息检索bug+Windows 对话出现异常问题 修复消息检索bug+Windows对话异常+对话工作中/完成提示 Mar 18, 2026
Resolve conflict in conversationBridge.ts by adopting main's
dependency-injected architecture (IConversationService,
IWorkerTaskManager) while preserving the emitConversationListChanged
event notifications added by this PR branch.
@sentry
Copy link
Copy Markdown

sentry bot commented Mar 18, 2026

Welcome to Codecov 🎉

Once you merge this PR into your default branch, you're all set! Codecov will compare coverage reports and display results in all future pull requests.

ℹ️ You can also turn on project coverage checks and project coverage reporting on Pull Request comment

Thanks for integrating Codecov - We've got you covered ☂️

@piorpua piorpua merged commit c0d9c34 into iOfficeAI:main Mar 18, 2026
13 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

2 participants