Dev

.vscode/launch.json

@@ -10,7 +10,8 @@
 			"type": "extensionHost",
 			"request": "launch",
 			"args": [
-				"--extensionDevelopmentPath=${workspaceFolder}"
+				"--extensionDevelopmentPath=${workspaceFolder}",
+				"--allow-insecure-localhost"
 			],
 			"outFiles": [
 				"${workspaceFolder}/out/**/*.js"

package.json

@@ -18,7 +18,7 @@
 		"url": "https://github.com/smallcloudai/refact-vscode/issues",
 		"email": "[email protected]"
 	},
-	"version": "6.5.0",
+	"version": "6.5.22",
 	"dependencies": {
 		"@types/marked": "^4.0.8",
 		"@types/vscode": "^1.69.0",
@@ -229,7 +229,10 @@
 					"order": 14
 				},
 				"refactai.activeGroup": {
-					"type": ["object", "null"],
+					"type": [
+						"object",
+						"null"
+					],
 					"default": null,
 					"description": "Active selected group in your Team Workspace. Modify via settings.json in your workspace",
 					"scope": "machine-overridable",

src/codeLens.ts

@@ -5,9 +5,7 @@ import * as estate from "./estate";
 import * as fetchH2 from 'fetch-h2';
 import * as fetchAPI from "./fetchAPI";
 import {
-    type ChatMessages,
     type ChatMessage,
-    type ToolUse,
     setInputValue,
     isUserMessage,
     UserMessage,
@@ -169,10 +167,10 @@ const createMessageBlock = (
     cursor: number | null,
     text: string
 ) => {
-    if (typeof message.content === 'string') {
-        return replaceVariablesInText(message.content, relative_path, cursor, text);
+    if (typeof message.ftm_content === 'string') {
+        return replaceVariablesInText(message.ftm_content, relative_path, cursor, text);
     } else {
-        return message.content.map(content => {
+        return message.ftm_content.map(content => {
             if (('type' in content) && content.type === 'text') {
                 return replaceVariablesInText(content.text, relative_path, cursor, text);
             }
@@ -185,13 +183,13 @@ const formatMultipleMessagesForCodeLens = (
     relative_path: string,
     cursor: number | null,
     text: string
-) => {
+): ChatMessage[] => {
     return messages.map(message => {
         if (isUserMessage(message)) {
-            if (typeof message.content === 'string') {
+            if (typeof message.ftm_content === 'string') {
                 return {
                     ...message,
-                    content: replaceVariablesInText(message.content, relative_path, cursor, text)
+                    ftm_content: replaceVariablesInText(message.ftm_content, relative_path, cursor, text)
                 };
             }
         }
@@ -206,7 +204,12 @@ export async function code_lens_execute(code_lens: string, range: any) {
     if (custom_code_lens) {
         const auto_submit = custom_code_lens[code_lens]["auto_submit"];
         const new_tab = custom_code_lens[code_lens]["new_tab"];
-        let messages: ChatMessage[] = custom_code_lens[code_lens]["messages"];
+        let messages: ChatMessage[] = custom_code_lens[code_lens]["messages"].map((message: {role: string, content: unknown}) => {
+            return {
+                ftm_role: message.role,
+                ftm_content: message.content,
+            };
+        });
 
         const start_of_line = new vscode.Position(range.start.line, 0);
         const end_of_line = new vscode.Position(range.end.line + 1, 0);

src/fetchAPI.ts

@@ -5,8 +5,6 @@ import * as usabilityHints from "./usabilityHints";
 import * as estate from "./estate";
 import * as statusBar from "./statusBar";
 import {
-	type CapsResponse,
-    type CustomPromptsResponse,
     ChatMessages,
 } from "refact-chat-js/dist/events";
 
@@ -458,28 +456,40 @@ export function look_for_common_errors(json: any, scope: string, url: string): b
     return false;
 }
 
-export async function get_caps(): Promise<CapsResponse> {
-  let url = rust_url("/v1/caps");
-  if (!url) {
-    return Promise.reject("read_caps no rust binary working, very strange");
-  }
-
-  let req = new fetchH2.Request(url, {
-    method: "GET",
-    redirect: "follow",
-    cache: "no-cache",
-    referrer: "no-referrer",
-  });
-
-  let resp = await fetchH2.fetch(req);
-  if (resp.status !== 200) {
-    console.log(["read_caps http status", resp.status]);
-    return Promise.reject("read_caps bad status");
-  }
-  let json = await resp.json();
-  console.log(["successful read_caps", json]);
-  return json as CapsResponse;
-}
+// TODO: this has moved (also not used)
+// export async function get_caps(): Promise<CapsResponse> {
+//   let url = rust_url("/v1/caps");
+//   if (!url) {
+//     return Promise.reject("read_caps no rust binary working, very strange");
+//   }
+
+//   let req = new fetchH2.Request(url, {
+//     method: "GET",
+//     redirect: "follow",
+//     cache: "no-cache",
+//     referrer: "no-referrer",
+//   });
+
+//   let resp = await fetchH2.fetch(req);
+//   if (resp.status !== 200) {
+//     console.log(["read_caps http status", resp.status]);
+//     return Promise.reject("read_caps bad status");
+//   }
+//   let json = await resp.json();
+//   console.log(["successful read_caps", json]);
+//   return json as CapsResponse;
+// }
+
+type SystemPrompt = {
+  text: string;
+  description: string;
+};
+
+type SystemPrompts = Record<string, SystemPrompt>;
+type CustomPromptsResponse = {
+  system_prompts: SystemPrompts;
+  toolbox_commands: Record<string, unknown>;
+};
 
 export async function get_prompt_customization(): Promise<CustomPromptsResponse> {
     const url = rust_url("/v1/customization");

src/launchRust.ts

@@ -83,8 +83,9 @@ export class RustBinaryBlob {
             let port: number;
             let ping_response: string;
 
-            // const maybe_active_workspace = global.global_context.globalState.get('active_workspace') as Workspace | undefined;
-            // const active_workspace_id = maybe_active_workspace ? maybe_active_workspace.workspace_id : null;
+
+            const team = global.side_panel?.context.workspaceState.get<TeamsGroup>('refactai.activeGroup');
+
             if (xdebug === 0) {
                 if (this.lsp_client) { // running
                     port = this.port;  // keep the same port
@@ -128,10 +129,10 @@ export class RustBinaryBlob {
                 "--basic-telemetry",
             ];
 
-            // if (active_workspace_id !== null && active_workspace_id !== undefined) {
-            //     new_cmdline.push("--active-workspace-id");
-            //     new_cmdline.push(active_workspace_id.toString());
-            // }
+            if (team && team.id) {
+                new_cmdline.push("--active-group-id");
+                new_cmdline.push(team.id.toString());
+            }
 
             if (vscode.workspace.getConfiguration().get<boolean>("refactai.vecdb")) {
                 new_cmdline.push("--vecdb");
@@ -166,7 +167,9 @@ export class RustBinaryBlob {
                 break;
             }
         }
+
         global.side_panel?.handleSettingsChange();
+
     }
 
     public async launch() {