Merge pull request #33 from maxDcb/develop

Develop

Author: maxDcb

.gitmodules

@@ -4,12 +4,6 @@
 [submodule "thirdParty/donut"]
 	path = thirdParty/donut
 	url = https://github.com/maxDcb/donut.git
-[submodule "thirdParty/coffLoader/coffLoader"]
-	path = thirdParty/coffLoader/coffLoader
-	url = https://github.com/maxDcb/COFFLoader.git
-[submodule "thirdParty/coffLoader/coffPacker"]
-	path = thirdParty/coffLoader/coffPacker
-	url = https://github.com/maxDcb/COFFPacker.git
 [submodule "core"]
 	path = core
 	url = https://github.com/maxDcb/C2Core.git

AGENT.md

@@ -0,0 +1,58 @@
+# 🧠 AGENT.md
+
+## Agent Role
+
+You are an **expert C++ and CMake assistant** dedicated to supporting the C2TeamServer codebase:
+
+* ✅ Fluent with the **project’s existing C++ style, directory layout, and CMake syntax**.
+* ⛔ **Do not attempt to build or compile the project**—that process is resource-intensive and time-consuming.
+* 🎯 Your focus is on **code understanding, guidance, edits**.
+
+---
+
+## 📌 Responsibilities
+
+### Code Review & Navigation
+
+* Analyze and explain C++ classes, actions, and CMake configurations.
+* Help trace calls from gRPC definitions to implementation.
+* Locate where libraries and dependencies are imported and used.
+
+### Style & Syntax Alignment
+
+* Provide suggestions strictly following the project's CMake and C++ style conventions (e.g., variable naming, build targets, include directories).
+* Maintain consistency with existing module structure and naming.
+
+### Documentation & Guidance
+
+* Generate lightweight helper scripts (e.g. code snippets, CMake snippets, CLI usage).
+* Draft small additions to README, comments, or doc files to clarify behavior—without rebuilding.
+
+### Troubleshooting and Q\&A
+
+* Troubleshoot code logic, gRPC interactions, and CMake file references.
+* Answer developer questions about function behavior, build targets, or directory layout.
+* Provide suggestions for refactors, optimizations, or better code organization that aligns with the existing style.
+
+---
+
+## 🚫 What You Should Not Do
+
+* 🛠 Attempt to build the TeamServer or its dependencies locally.
+* ⚠ Perform any heavy code generation or restructuring that would require a full build.
+* 🔁 Initiate or recommend large build automations or CI integrations.
+
+---
+
+## ✅ Summary
+
+| Role                  | Description                                                                  |
+| --------------------- | ---------------------------------------------------------------------------- |
+| **Expert Agent**      | Deep knowledge of C++17 and CMake for command-and-control code               |
+| **No Builds**         | Don’t compile the project or port it to other systems; skip heavy operations |
+| **Style-Focused**     | Always match project's existing syntax and modular layout                    |
+| **Lightweight Tasks** | Commentary, documentation, small code reviews, snippet generation            |
+
+---
+
+You are effectively the **senior C++/CMake co-pilot** for the project—always aligned with the existing style, focused on clarity and precision, and avoiding resource-intensive operations.

C2Client/C2Client/AssistantPanel.py

@@ -5,11 +5,18 @@
 from datetime import datetime
 
 from threading import Thread, Lock, Semaphore
-from PyQt5.QtWidgets import *
-from PyQt5.QtGui import *
-from PyQt5.QtCore import *
 
-from grpcClient import *
+from PyQt6.QtCore import Qt, QEvent, QTimer, pyqtSignal
+from PyQt6.QtGui import QFont, QTextCursor, QStandardItem, QStandardItemModel, QShortcut
+from PyQt6.QtWidgets import (
+    QCompleter,
+    QLineEdit,
+    QPlainTextEdit,
+    QVBoxLayout,
+    QWidget,
+)
+
+from .grpcClient import TeamServerApi_pb2
 
 import openai
 from openai import OpenAI
@@ -35,7 +42,7 @@ def __init__(self, parent, grpcClient):
         # self.logFileName=LogFileName
 
         self.editorOutput = QPlainTextEdit()
-        self.editorOutput.setFont(QFont("Courier"));
+        self.editorOutput.setFont(QFont("JetBrainsMono Nerd Font")) 
         self.editorOutput.setReadOnly(True)
         self.layout.addWidget(self.editorOutput, 8)
 
@@ -80,7 +87,7 @@ def nextCompletion(self):
 
     def sessionAssistantMethod(self, action, beaconHash, listenerHash, hostname, username, arch, privilege, os, lastProofOfLife, killed):
         if action == "start":
-            print("sessionAssistantMethod", action, beaconHash)
+            # print("sessionAssistantMethod", action, beaconHash)
             self.messages.append({"role": "user", "content": "New session stared: beaconHash={}, listenerHash={}, hostname={}, username={}, privilege={}, os={}.".format(beaconHash, listenerHash, hostname, username, privilege, os) })
         elif action == "stop":
             toto = 1
@@ -89,7 +96,7 @@ def sessionAssistantMethod(self, action, beaconHash, listenerHash, hostname, use
 
 
     def listenerAssistantMethod(self, action, hash, str3, str4):
-        print("listenerAssistantMethod", action, hash)
+        # print("listenerAssistantMethod", action, hash)
         if action == "start":
             toto = 1
         elif action == "stop":
@@ -98,14 +105,14 @@ def listenerAssistantMethod(self, action, hash, str3, str4):
 
     def consoleAssistantMethod(self, action, beaconHash, listenerHash, context, cmd, result):
         if action == "receive":
-            print("consoleAssistantMethod", "-Context:\n" + context + "\n\n-Command sent:\n" + cmd + "\n\n-Response:\n" + result)
+            # print("consoleAssistantMethod", "-Context:\n" + context + "\n\n-Command sent:\n" + cmd + "\n\n-Response:\n" + result)
             self.messages.append({"role": "user", "content": cmd + "\n" + result})
         elif action == "send":
             toto = 1
 
 
     def event(self, event):
-        if event.type() == QEvent.KeyPress and event.key() == Qt.Key_Tab:
+        if event.type() == QEvent.Type.KeyPress and event.key() == Qt.Key.Key_Tab:
             self.tabPressed.emit()
             return True
         return super().event(event)
@@ -279,13 +286,13 @@ def runCommand(self):
                     self.printInTerminal("User:", commandLine)
 
                     message = response.choices[0].message
-                    print(message)
+                    # print(message)
 
                     function_call = message.function_call
                     if function_call:
                         name = function_call.name
                         args = json.loads(function_call.arguments)
-                        print(f"Model wants to call `{name}` with arguments: {args}")
+                        # print(f"Model wants to call `{name}` with arguments: {args}")
 
                         self.printInTerminal("Analysis:", f"Model wants to call `{name}` with arguments: {args}")
 
@@ -381,7 +388,7 @@ def executeCmd(self, cmd, args):
     # setCursorEditorAtEnd
     def setCursorEditorAtEnd(self):
         cursor = self.editorOutput.textCursor()
-        cursor.movePosition(QTextCursor.End,)
+        cursor.movePosition(QTextCursor.MoveOperation.End)
         self.editorOutput.setTextCursor(cursor)
 
 
@@ -393,8 +400,8 @@ class CommandEditor(QLineEdit):
     def __init__(self, parent=None):
         super().__init__(parent)
 
-        QShortcut(Qt.Key_Up, self, self.historyUp)
-        QShortcut(Qt.Key_Down, self, self.historyDown)
+        QShortcut(Qt.Key.Key_Up, self, self.historyUp)
+        QShortcut(Qt.Key.Key_Down, self, self.historyDown)
 
         # self.codeCompleter = CodeCompleter(completerData, self)
         # # needed to clear the completer after activation
@@ -410,7 +417,7 @@ def nextCompletion(self):
             self.codeCompleter.setCurrentRow(0)
 
     def event(self, event):
-        if event.type() == QEvent.KeyPress and event.key() == Qt.Key_Tab:
+        if event.type() == QEvent.Type.KeyPress and event.key() == Qt.Key.Key_Tab:
             self.tabPressed.emit()
             return True
         return super().event(event)
@@ -441,7 +448,7 @@ def onActivated(self):
 
 
 class CodeCompleter(QCompleter):
-    ConcatenationRole = Qt.UserRole + 1
+    ConcatenationRole = Qt.ItemDataRole.UserRole + 1
 
     def __init__(self, data, parent=None):
         super().__init__(parent)