Repository navigation
ci: 集成工具权限、文件操作与聊天目录整理 - #95
Merged
Merged
Conversation
# Conflicts: # app/src/main/java/com/ai/assistance/operit/ui/features/conversation/chat/webview/workspace/browser/WorkspaceBrowserOperations.kt
# Conflicts: # app/src/main/java/com/ai/assistance/operit/ui/features/conversation/chat/modules/attachments/AttachmentSelector.kt # app/src/main/java/com/ai/assistance/operit/ui/features/conversation/chat/viewmodel/ChatViewModel.kt # app/src/main/java/com/ai/assistance/operit/ui/features/conversation/workspace/WorkspaceManager.kt # app/src/main/java/com/ai/assistance/operit/ui/features/conversation/workspace/WorkspaceSetup.kt # docs/TODO/chore/README.md
4 of 5 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
变更说明 / Description
将工具与权限整理、工作区文件操作优化、聊天与工作区目录迁移合入同一候选分支,提供可安装的 Android 集成包,验证三份改动在聊天界面和工作区中的协作情况。集成分支从
dev的ffb78d30创建,保留三份来源历史,PR 目标为dev。背景与动机 / Context and motivation
#92 调整了工具实现与权限入口的位置,#93 改进了工作区复制、移动和删除操作,#94 进一步迁移聊天与工作区包路径。部分调用方同时涉及工具入口和界面包名,需要在同一个构建中确认引用能够正确衔接,并由维护者验证实际聊天界面。
改动范围 / Changes
core.tools.runtime.AIToolHandler、core.tools.packTool.runtime.PackageManager和core.tools.system.terminal.Terminal等新路径,保持该分支已有的权限路由与工具入口,避免其他来源带回旧引用。conversation.workspace;聊天按foundation、modules、screens、viewmodel归类;共享模型从 UI 文件原样提取并同步主源码、JVM 测试和 Android 测试的引用,页面继续通过原有声明组装。集成来源与实现记录
按 #92 → #93 → #94 的顺序合入:
528a8070cb29774133234c353949943b79e640a59b9bb75d93b96b72204067fa576db30e5279d960d4e90bd1c02e703240fbc15b27f71c5c1188a734目录整理分支以 #93 为基线;合并时依据共同祖先处理,文件操作改动没有重复应用。三份来源提交均已验证为最终集成提交的祖先。
最终集成提交:
3a823f14c2984d050f1a7bfef96107c0cad4cfe2。联合验证说明
兼容性与风险 / Compatibility and risks
本 PR 增加的是联合验证分支,运行行为来自上述三个来源。目录整理同步了 Kotlin 包名、导入及已有全限定名称引用,共享声明保留原有字段、默认值与可见性。文件操作的流式传输与进度能力继续保留。
路径迁移和多分支合并后的编译、运行兼容性仍需 CI 与 Android 界面验证。已完成的静态核对不替代构建和设备测试。
关联 Issue / Related issue
关联 PR:#92、#93、#94。这是三份改动的集成验证 PR,无单独 Issue;各来源 PR 的后续处理由维护者决定。
验证方式 / Verification
完整回归范围与填写入口
记录保留此前已有的全部用例,当前尚未填写的设备和 CI 结果继续保持待验证。
证据 / Evidence
operit-android-<运行编号>检查清单 / Checklist