Branched WIP that needs to be merged with the new changes from develop.

Author: SpartanJ

bin/assets/plugins/aiassistant.json

@@ -506,7 +506,7 @@
     "gemini-cli": {
       "enabled": true,
       "command": "gemini",
-      "args": ["--experimental-acp"]
+      "args": ["--experimental-acp", "--model=auto"]
     },
     "opencode": {
       "enabled": true,

src/tools/ecode/plugins/aiassistant/acpclient.cpp

@@ -216,6 +216,16 @@ void ACPClient::newSession( const NewSessionRequest& req,
 		   } );
 }
 
+void ACPClient::loadSession( const LoadSessionRequest& req,
+							 const std::function<void( const LoadSessionResponse& )>& cb ) {
+	write( { { "method", "session/load" }, { "params", req.toJson() } },
+		   [cb]( const IdType&, const json& resp ) {
+			   if ( resp.contains( "result" ) && cb ) {
+				   cb( LoadSessionResponse( resp["result"] ) );
+			   }
+		   } );
+}
+
 void ACPClient::prompt( const PromptRequest& req,
 						const std::function<void( const PromptResponse& )>& cb ) {
 	write( { { "method", "session/prompt" }, { "params", req.toJson() } },

src/tools/ecode/plugins/aiassistant/acpclient.hpp

@@ -47,6 +47,8 @@ class ACPClient {
 					 const std::function<void( const InitializeResponse& )>& cb );
 	void newSession( const NewSessionRequest& req,
 					 const std::function<void( const NewSessionResponse& )>& cb );
+	void loadSession( const LoadSessionRequest& req,
+					  const std::function<void( const LoadSessionResponse& )>& cb );
 	void prompt( const PromptRequest& req, const std::function<void( const PromptResponse& )>& cb );
 
 	// Notifications to agent

src/tools/ecode/plugins/aiassistant/acpprotocol.cpp

@@ -60,6 +60,21 @@ NewSessionResponse::NewSessionResponse( const json& body ) {
 		configOptions = body["configOptions"];
 }
 
+json LoadSessionRequest::toJson() const {
+	json j = { { "sessionId", sessionId }, { "cwd", cwd } };
+	if ( mcpServers.is_null() ) {
+		j["mcpServers"] = json::array();
+	} else {
+		j["mcpServers"] = mcpServers;
+	}
+	return j;
+}
+
+LoadSessionResponse::LoadSessionResponse( const json& body ) {
+	if ( body.contains( "configOptions" ) )
+		configOptions = body["configOptions"];
+}
+
 json PromptRequest::toJson() const {
 	return { { "sessionId", sessionId }, { "prompt", prompt } };
 }

src/tools/ecode/plugins/aiassistant/acpprotocol.hpp

@@ -63,6 +63,22 @@ struct NewSessionResponse {
 	NewSessionResponse( const json& body );
 };
 
+struct LoadSessionRequest {
+	std::string sessionId;
+	std::string cwd;
+	json mcpServers;
+
+	LoadSessionRequest() = default;
+	json toJson() const;
+};
+
+struct LoadSessionResponse {
+	json configOptions;
+
+	LoadSessionResponse() = default;
+	LoadSessionResponse( const json& body );
+};
+
 struct PromptRequest {
 	std::string sessionId;
 	json prompt; // Array of ContentBlock

src/tools/ecode/plugins/aiassistant/agentsession.cpp

@@ -37,6 +37,38 @@ bool AgentSession::start( const std::function<void( bool )>& onReady ) {
 	return false;
 }
 
+bool AgentSession::startLoaded( const std::string& sessionId,
+								const std::function<void( bool )>& onReady ) {
+	if ( mClient->start() ) {
+		InitializeRequest req;
+		req.clientCapabilities.terminal = true;
+		req.clientCapabilities.fsReadTextFile = true;
+		req.clientCapabilities.fsWriteTextFile = true;
+
+		mClient->initialize( req, [this, sessionId, onReady]( const InitializeResponse& ires ) {
+			if ( ires.agentCapabilities.loadSession ) {
+				LoadSessionRequest lreq;
+				lreq.sessionId = sessionId;
+				lreq.cwd = mClient->isReady() ? mClient->getConfig().workingDirectory : "";
+				mClient->loadSession( lreq, [this, sessionId, onReady]( const LoadSessionResponse& ) {
+					mSessionId = sessionId;
+					if ( onReady )
+						onReady( true );
+				} );
+			} else {
+				// Agent doesn't support loading, fallback to new session?
+				// For now let's just fail or call onReady(false)
+				if ( onReady )
+					onReady( false );
+			}
+		} );
+		return true;
+	}
+	if ( onReady )
+		onReady( false );
+	return false;
+}
+
 void AgentSession::stop() {
 	if ( mClient )
 		mClient->stop();
@@ -58,6 +90,11 @@ void AgentSession::cancel() {
 	}
 }
 
+void AgentSession::setTerminalData( const std::string& terminalId, UITerminal* uiTerm ) {
+	mTerminals[terminalId] =
+		TermData{ uiTerm->getTerm(), uiTerm->getTerm()->getTerminal(), uiTerm };
+}
+
 void AgentSession::setupClient() {
 	mClient->onSessionUpdate = [this]( const json& msg ) {
 		if ( onSessionUpdate )
@@ -92,10 +129,8 @@ void AgentSession::setupClient() {
 		CreateTerminalResponse res;
 		std::string termId = String::format( "term-%u", String::hash( req.command ) );
 		res.terminalId = termId;
-		// Wait for UI? No, ACPClient is running in threads. We just trigger the event
-		// and return the ID.
 		if ( onTerminalCreated ) {
-			onTerminalCreated( nullptr, termId );
+			onTerminalCreated( req, termId );
 		}
 		cb( res );
 	};

src/tools/ecode/plugins/aiassistant/agentsession.hpp

@@ -21,6 +21,7 @@ class AgentSession {
 	~AgentSession();
 
 	bool start( const std::function<void( bool )>& onReady );
+	bool startLoaded( const std::string& sessionId, const std::function<void( bool )>& onReady );
 	void stop();
 
 	void prompt( const PromptRequest& req, const std::function<void( const PromptResponse& )>& cb );
@@ -32,11 +33,14 @@ class AgentSession {
 	std::function<void( const RequestPermissionRequest&,
 						std::function<void( const RequestPermissionResponse& )> )>
 		onRequestPermission;
-	std::function<void( UITerminal*, const std::string& terminalId )> onTerminalCreated;
+	std::function<void( const CreateTerminalRequest&, const std::string& terminalId )>
+		onTerminalCreated;
 
 	std::string getSessionId() const { return mSessionId; }
 	ACPClient* getClient() const { return mClient.get(); }
 
+	void setTerminalData( const std::string& terminalId, UITerminal* uiTerm );
+
   protected:
 	std::shared_ptr<ThreadPool> mThreadPool;
 	std::unique_ptr<ACPClient> mClient;