fix: restore lost changes

Plugins/ZShell/CMakeLists.txt

@@ -1,5 +1,6 @@
 qml_module(ZShell
 	URI ZShell
+	INCLUDE_PREFIX core
 	SOURCES
 		writefile.hpp writefile.cpp
 		appdb.hpp appdb.cpp

Plugins/ZShell/Config/llm.hpp

@@ -1,36 +1,29 @@
 #pragma once
-#include "configobject.hpp"
+
 #include <qhashfunctions.h>
 #include <qobject.h>
 #include <qqmlintegration.h>
 
+#include "common.hpp"
+
 namespace ZShell::config {
 
-class LlmAppearance : public ConfigObject {
-	Q_OBJECT
-	QML_ANONYMOUS
+class LlmAppearance : public settings::ObjectNode {
+	CONFIG_NODE(LlmAppearance, settings::ObjectNode)
 
-	CFG_PROPERTY(QString, scheme, QStringLiteral("tokyoNight"))
-
-	public:
-	explicit LlmAppearance(QObject* parent = nullptr) : ConfigObject(parent) {}
+	CONFIG_PROPERTY(QString, scheme, QStringLiteral("tokyoNight"))
 };
 
-class Llm : public ConfigObject {
-	Q_OBJECT
-	QML_ANONYMOUS
+class Llm : public settings::ObjectNode {
+	CONFIG_NODE(Llm, settings::ObjectNode)
 
-	CFG_PROPERTY(QString, endpoint, "http://localhost:8080")
-	CFG_PROPERTY(QString, model, "")
-	CFG_PROPERTY(double, temperature, 0.7)
-	CFG_PROPERTY(bool, tools, true)
-	CFG_PROPERTY(bool, sandbox, true)
-	CFG_PROPERTY(bool, enabled, true)
+	CONFIG_PROPERTY(QString, endpoint, "http://localhost:8080")
+	CONFIG_PROPERTY(QString, model, "")
+	CONFIG_PROPERTY(double, temperature, 0.7)
+	CONFIG_PROPERTY(bool, tools, true)
+	CONFIG_PROPERTY(bool, sandbox, true)
+	CONFIG_PROPERTY(bool, enabled, true)
 	CONFIG_SUBOBJECT(LlmAppearance, appearance)
-
-	public:
-	explicit Llm(QObject* parent = nullptr)
-		: ConfigObject(parent), m_appearance(new LlmAppearance(this)) {}
 };
 
 } // namespace ZShell::config

Plugins/ZShell/Config/rootnodes.hpp

@@ -16,6 +16,7 @@
 #include "dock.hpp"
 #include "general.hpp"
 #include "launcher.hpp"
+#include "llm.hpp"
 #include "lock.hpp"
 #include "notifs.hpp"
 #include "osd.hpp"
@@ -42,6 +43,7 @@ class ConfigRoot : public settings::RootNode {
 	CONFIG_SUBOBJECT(Dock, dock)
 	CONFIG_SUBOBJECT(General, general)
 	CONFIG_SUBOBJECT(Launcher, launcher)
+	CONFIG_SUBOBJECT(Llm, llm)
 	CONFIG_SUBOBJECT(Lock, lock)
 	CONFIG_SUBOBJECT(Notifs, notifs)
 	CONFIG_SUBOBJECT(Osd, osd)

Plugins/ZShell/Llm/CMakeLists.txt

@@ -1,38 +1,14 @@
-# cmark-gfm: markdown -> block structure (pkg-config; no CMake config
-# package is installed).
 pkg_check_modules(CMARK_GFM REQUIRED IMPORTED_TARGET libcmark-gfm)
 
-# tree-sitter runtime for code block highlighting (grammars are
-# dlopen()'d at runtime and optional).
 pkg_check_modules(TREE_SITTER REQUIRED IMPORTED_TARGET tree-sitter)
 
-# JKQTMathText (JKQtPlotter) for LaTeX rendering. The config files live
-# in a shared JKQTPlotter6 directory, not one named after the package.
 find_path(JKQTPlotter6_CMAKE_DIR
 	NAMES JKQTMathText6Config.cmake
 	HINTS /usr/lib/cmake/JKQTPlotter6 /usr/local/lib/cmake/JKQTPlotter6
 	DOC "Directory containing the JKQtPlotter cmake package files")
 find_package(JKQTMathText6 REQUIRED PATHS "${JKQTPlotter6_CMAKE_DIR}")
 
-# --- tree-sitter grammar discovery (configure time) ---
-#
-# Discover installed tree-sitter grammars — system packages
-# (libtree-sitter-<lang>.so) and the parsers Neovim's nvim-treesitter
-# installs (~/.local/share/nvim/site/parser/*.so) — and pair each with
-# highlight queries. Query sources, in priority order:
-#   1. vendored highlight-queries/*.scm (version-pinned; see the
-#      per-file source headers, MIT),
-#   2. Neovim's own queries (version-matched to its parsers),
-#   3. tree-sitter/highlighting from GitHub (cached in the build dir).
-# The result is embedded as highlight-queries.hpp. Re-run cmake to pick
-# up grammars installed later.
-#
-# Candidate entry points are read from the .so with `nm` rather than
-# assumed to be tree_sitter_<id>; a missing entry point just makes that
-# candidate fail at runtime.
 function(_ts_entry_point out file)
-	# OUTPUT_VARIABLE + OUTPUT_QUIET loses the output on CMake 4, so
-	# capture through a temp file.
 	get_filename_component(_ts_nm_base "${file}" NAME)
 	set(_ts_nm_file "${CMAKE_CURRENT_BINARY_DIR}/ts-entry-${_ts_nm_base}")
 	execute_process(
@@ -44,8 +20,6 @@ function(_ts_entry_point out file)
 	if(_ts_nm_rc EQUAL 0 AND EXISTS "${_ts_nm_file}")
 		file(READ "${_ts_nm_file}" _ts_nm_out)
 		file(REMOVE "${_ts_nm_file}" "${_ts_nm_file}.err")
-		# The library also exports the external scanner functions; the
-		# entry point is the one without the _external suffix.
 		string(REGEX MATCHALL " T tree_sitter_[A-Za-z0-9_]+" _ts_syms "${_ts_nm_out}")
 		foreach(_ts_s IN LISTS _ts_syms)
 			string(REPLACE " T " "" _ts_s "${_ts_s}")
@@ -58,22 +32,11 @@ function(_ts_entry_point out file)
 	set(${out} "${_ts_sym}" PARENT_SCOPE)
 endfunction()
 
-# Append a query text to <files> (PARENT_SCOPE) unless it duplicates a
-# hash in <hashes>. The text is written to the build tree right away:
-# the s-expression `;` comments would split CMake list items and the
-# query `(` `)` break bracket arguments, so query text only ever lives
-# in variables and files, never in lists.
-# Expand Neovim's "; inherits:" directives by appending the inherited
-# query set's highlights file (recursively; a visited set prevents
-# cycles). Several languages are stubs that inherit the real query
-# (html inherits html_tags, qmljs inherits ecma, ...).
 function(_ts_expand_inherits query_dir text outVar)
 	set(result "${text}")
 	set(_visited "")
 	set(_depth 0)
 	while(_depth LESS 8)
-		# Do not match the leading `;`: a MATCHALL result that itself
-		# contains a semicolon is re-split into list items.
 		string(REGEX MATCHALL "inherits:[ \t]*[A-Za-z0-9_]+" _inh "${result}")
 		if(NOT _inh)
 			break()
@@ -99,7 +62,6 @@ function(_ts_expand_inherits query_dir text outVar)
 endfunction()
 
 function(_ts_add_query sid text filesVar hashesVar)
-	# filesVar/hashesVar hold the caller's variable names.
 	set(files "${${filesVar}}")
 	set(hashes "${${hashesVar}}")
 	string(SHA256 _ts_qh "${text}")
@@ -115,7 +77,7 @@ function(_ts_add_query sid text filesVar hashesVar)
 	set(${hashesVar} "${hashes}" PARENT_SCOPE)
 endfunction()
 
-set(_ts_candidates "") # entries: <id>|<cmake-safe id>|<lib>|<symbol>
+set(_ts_candidates "")
 file(GLOB _ts_sys_files
 	"/usr/lib/libtree-sitter-*.so" "/usr/local/lib/libtree-sitter-*.so")
 foreach(_ts_file IN LISTS _ts_sys_files)
@@ -164,20 +126,13 @@ set(_ts_vendored
 foreach(_ts_id IN LISTS _ts_ids)
 	string(REPLACE "-" "_" _ts_sid "${_ts_id}")
 
-	# Query candidates in priority order (deduped; identical texts are
-	# skipped, the nvim site and plugin copies are usually the same
-	# file).
 	set(_ts_qfiles "")
 	set(_ts_qhashes "")
 	if(_ts_id STREQUAL "cpp")
-		# The C++ grammar is a superset of C and its query only covers
-		# the C++ delta; base C coverage comes from the C query.
 		file(READ "${CMAKE_CURRENT_SOURCE_DIR}/highlight-queries/c.scm" _ts_qa)
 		file(READ "${CMAKE_CURRENT_SOURCE_DIR}/highlight-queries/cpp.scm" _ts_qb)
 		_ts_add_query(${_ts_sid} "${_ts_qa}\n${_ts_qb}" _ts_qfiles _ts_qhashes)
 	elseif(_ts_id STREQUAL "typescript" OR _ts_id STREQUAL "tsx")
-		# The TS grammars reuse the JS node names; the JS query usually
-		# compiles against them and gives full coverage.
 		file(READ "${CMAKE_CURRENT_SOURCE_DIR}/highlight-queries/javascript.scm" _ts_qa)
 		file(READ "${CMAKE_CURRENT_SOURCE_DIR}/highlight-queries/typescript.scm" _ts_qb)
 		_ts_add_query(${_ts_sid} "${_ts_qa}\n${_ts_qb}" _ts_qfiles _ts_qhashes)
@@ -195,10 +150,6 @@ foreach(_ts_id IN LISTS _ts_ids)
 		endif()
 	endforeach()
 	if(NOT _ts_qfiles)
-		# Last resort: fetch from the tree-sitter/highlighting repo.
-		# Version-skewed against locally installed grammars, so only
-		# used when nothing local exists. Cached; offline builds simply
-		# drop the language.
 		set(_ts_dl "${CMAKE_CURRENT_BINARY_DIR}/ts-query-downloads/${_ts_sid}.scm")
 		if(NOT EXISTS "${_ts_dl}")
 			file(DOWNLOAD
@@ -219,7 +170,6 @@ foreach(_ts_id IN LISTS _ts_ids)
 		continue()
 	endif()
 
-	# Emit query sources.
 	set(_ts_qn 0)
 	set(_ts_q_ptrs "")
 	foreach(_ts_qfile IN LISTS _ts_qfiles)
@@ -232,7 +182,6 @@ foreach(_ts_id IN LISTS _ts_ids)
 	string(APPEND _hl_header
 		"inline constexpr const char* const q_${_ts_sid}[] = { ${_ts_q_ptrs} };\n")
 
-	# Emit library candidates (system package first, then Neovim).
 	string(APPEND _hl_header "inline constexpr Candidate cand_${_ts_sid}[] = {\n")
 	set(_ts_nc 0)
 	foreach(_ts_c IN LISTS _ts_candidates)
@@ -248,8 +197,7 @@ foreach(_ts_id IN LISTS _ts_ids)
 	endforeach()
 	string(APPEND _hl_header "};\n")
 	if(_ts_nc EQUAL 0)
-		# Queries but no library: pointless, drop the language.
-		string(APPEND _hl_header "") # (arrays stay; grammar row is skipped)
+		string(APPEND _hl_header "")
 		continue()
 	endif()
 
@@ -263,8 +211,6 @@ endforeach()
 string(APPEND _hl_header "};\n}\n")
 file(WRITE "${HIGHLIGHT_QUERIES_HPP}" "${_hl_header}")
 
-# Embed the vendored Latin Modern fonts (GUST Font License; provenance
-# in fonts/latinmodern/GUST-FONT-LICENSE.txt) as byte arrays.
 set(LM_FONTS
 	lmroman10-regular
 	lmroman10-italic
@@ -314,4 +260,3 @@ qml_module(ZShell-llm
 )
 
 target_include_directories(ZShell-llm PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
-target_include_directories(ZShell-llm PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../Config)

Plugins/ZShell/Llm/chat.cpp

@@ -1,12 +1,13 @@
 #include "chat.hpp"
 
-#include "config.hpp"
 #include "filetool.hpp"
-#include "llm.hpp"
 #include "llmclient.hpp"
 #include "shelltool.hpp"
 #include "webfetchtool.hpp"
 
+#include "config/rootnodes.hpp"
+#include "config/llm.hpp"
+
 #include <QDebug>
 
 namespace ZShell::llm {
@@ -15,14 +16,12 @@ Chat::Chat(QObject* parent)
 	: QObject(parent)
 	, m_store(new ChatStore(this))
 	, m_client(new LlmClient(this)) {
-	if (!config::Config::instance()) new config::Config();
-
 	m_store->setLlmClient(m_client);
 	m_client->tools()->registerTool(new WebFetchTool(m_client->tools()));
 	m_client->tools()->registerTool(new FileReadTool(m_client->tools()));
 	m_client->tools()->registerTool(new ShellTool(m_client, m_client->tools()));
 
-	const auto* llm = config::Config::instance()->llm();
+	const auto* llm = config::ConfigSingleton::instance()->llm();
 	m_client->setEndpoint(llm->endpoint());
 	m_client->setModel(llm->model());
 	m_client->setTemperature(llm->temperature());
@@ -144,7 +143,7 @@ bool Chat::toolsEnabled() const {
 
 void Chat::setToolsEnabled(bool value) {
 	m_client->setToolsEnabled(value);
-	if (auto* config = config::Config::instance())
+	if (auto* config = config::ConfigSingleton::instance())
 		config->llm()->set_tools(value);
 }
 
@@ -154,7 +153,7 @@ bool Chat::sandboxEnabled() const {
 
 void Chat::setSandboxEnabled(bool value) {
 	m_client->setSandboxEnabled(value);
-	if (auto* config = config::Config::instance())
+	if (auto* config = config::ConfigSingleton::instance())
 		config->llm()->set_sandbox(value);
 }
 
@@ -195,7 +194,8 @@ void Chat::refreshFromServer() {
 void Chat::selectModel(const QString& id) {
 	if (id.isEmpty()) return;
 	m_client->setModel(id);
-	if (auto* config = config::Config::instance()) config->llm()->set_model(id);
+	if (auto* config = config::ConfigSingleton::instance())
+		config->llm()->set_model(id);
 }
 
 } // namespace ZShell::llm