Skip to content

feat(Assistant): implement full Assistant features also on client #10345

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Rello merged 15 commits into from
Sep 8, 2026
Merged

feat(Assistant): implement full Assistant features also on client #10345

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
26cdfe0
feat(assistant): add desktop assistant interface
Rello Aug 23, 2026
c66f53a
fix(assistant): isolate module and harden request lifecycle
Rello Aug 23, 2026
0279ae1
fix(test): implement test feedback
Rello Aug 24, 2026
4d2f519
merge: resolve conflicts with origin/master
Copilot Aug 28, 2026
8ec8767
fix(assistant): address review feedback
Rello Sep 1, 2026
1c6eedb
fix(assistant): address remaining review feedback
Rello Sep 3, 2026
ee73774
merge: resolve conflicts with origin/master
Rello Sep 3, 2026
116f145
fix(assistant): avoid unity build symbol collision
Rello Sep 4, 2026
adf6ad1
fix(assistant): harden state handling and tests
Rello Sep 4, 2026
7caa829
fix(test): remove unused qml test dependency
Rello Sep 4, 2026
299b4e8
fix(test): generate fake account meta-object
Rello Sep 4, 2026
3718f6e
fix(test): wait for assistant task delegates
Rello Sep 4, 2026
f59b857
fix(assistant): address QML review feedback
Rello Sep 7, 2026
afa17e8
fix(assistant): instantiate list scrollbars
Rello Sep 7, 2026
ce070d9
fix(assistant): address follow-up QML review
Rello Sep 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion resources.qrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<file>src/gui/UserStatusWindow.qml</file>
<file>src/gui/WindowAccountHeader.qml</file>
<file>src/gui/activity/qml/ActivitiesWindow.qml</file>
<file>src/gui/AssistantWindow.qml</file>
<file>src/gui/search/SearchWindow.qml</file>
<file>src/gui/UserStatusWindowStatusRow.qml</file>
<file>src/gui/UserStatusWindowPredefinedStatusRow.qml</file>
Expand Down
258 changes: 0 additions & 258 deletions src/gui/AssistantWindow.qml
View file
Open in desktop

This file was deleted.

3 changes: 3 additions & 0 deletions src/gui/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,6 +287,9 @@ IF(BUILD_UPDATER)
endif()

add_subdirectory(search)
include(assistant/CMakeLists.txt)
list(APPEND client_SRCS ${assistant_SRCS})
qt_add_resources(client_UI_SRCS ${assistant_QRC})

IF( APPLE )
list(APPEND client_SRCS cocoainitializer_mac.mm)
Expand Down
29 changes: 29 additions & 0 deletions src/gui/assistant/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
# SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
# SPDX-License-Identifier: GPL-2.0-or-later

set(assistant_SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR})

set(assistant_SRCS
${assistant_SOURCE_DIR}/assistantapijob.h
${assistant_SOURCE_DIR}/assistantapijob.cpp
${assistant_SOURCE_DIR}/assistantclient.h
${assistant_SOURCE_DIR}/assistantclient.cpp
${assistant_SOURCE_DIR}/assistantcontroller.h
${assistant_SOURCE_DIR}/assistantcontroller.cpp
${assistant_SOURCE_DIR}/assistantconversationmodel.h
${assistant_SOURCE_DIR}/assistantconversationmodel.cpp
${assistant_SOURCE_DIR}/assistantmessagemodel.h
${assistant_SOURCE_DIR}/assistantmessagemodel.cpp
${assistant_SOURCE_DIR}/assistantmodule.h
${assistant_SOURCE_DIR}/assistantmodule.cpp
${assistant_SOURCE_DIR}/assistanttaskmodel.h
${assistant_SOURCE_DIR}/assistanttaskmodel.cpp
${assistant_SOURCE_DIR}/assistanttasktypemodel.h
${assistant_SOURCE_DIR}/assistanttasktypemodel.cpp
${assistant_SOURCE_DIR}/assistantutils.h
${assistant_SOURCE_DIR}/assistantutils.cpp
${assistant_SOURCE_DIR}/ocsassistantconnector.h
${assistant_SOURCE_DIR}/ocsassistantconnector.cpp
)

set(assistant_QRC ${assistant_SOURCE_DIR}/assistant.qrc)
19 changes: 19 additions & 0 deletions src/gui/assistant/assistant.qrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<!--
- SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
- SPDX-License-Identifier: GPL-2.0-or-later
-->
<RCC>
<qresource prefix="/qml">
<file alias="src/gui/assistant/qml/AssistantWindow.qml">qml/AssistantWindow.qml</file>
<file alias="src/gui/assistant/qml/AssistantTaskView.qml">qml/AssistantTaskView.qml</file>
<file alias="src/gui/assistant/qml/AssistantChatView.qml">qml/AssistantChatView.qml</file>
<file alias="src/gui/assistant/qml/AssistantConversationDelegate.qml">qml/AssistantConversationDelegate.qml</file>
<file alias="src/gui/assistant/qml/AssistantConversationPicker.qml">qml/AssistantConversationPicker.qml</file>
<file alias="src/gui/assistant/qml/AssistantDeleteTaskDialog.qml">qml/AssistantDeleteTaskDialog.qml</file>
<file alias="src/gui/assistant/qml/AssistantMessageDelegate.qml">qml/AssistantMessageDelegate.qml</file>
<file alias="src/gui/assistant/qml/AssistantMessageList.qml">qml/AssistantMessageList.qml</file>
<file alias="src/gui/assistant/qml/AssistantTaskDelegate.qml">qml/AssistantTaskDelegate.qml</file>
<file alias="src/gui/assistant/qml/AssistantTaskList.qml">qml/AssistantTaskList.qml</file>
<file alias="src/gui/assistant/qml/AssistantTaskTypeSelector.qml">qml/AssistantTaskTypeSelector.qml</file>
</qresource>
</RCC>
Loading
Loading