refactor: remove old features/Chat/Thread

Author: MarcMcIntosh

refact-agent/gui/src/features/Chat/Thread/index.ts

@@ -15,11 +15,8 @@ import {
   ToolMessage,
   isToolMessage,
 } from "../../services/refact";
-import {
-  isMessageWithIntegrationMeta,
-  MessageWithIntegrationMeta,
-} from "../Chat";
-import { takeWhile } from "../../utils";
+
+import { Override, takeWhile } from "../../utils";
 
 // TODO: move this somewhere
 export type ToolConfirmationRequest = {
@@ -57,6 +54,43 @@ type Message = NonNullable<
   MessagesSubscriptionSubscription["comprehensive_thread_subs"]["news_payload_thread_message"]
 >;
 
+export type IntegrationMeta = {
+  name?: string;
+  path?: string;
+  project?: string;
+  shouldIntermediatePageShowUp?: boolean;
+};
+
+export function isIntegrationMeta(json: unknown): json is IntegrationMeta {
+  if (!json || typeof json !== "object") return false;
+  if (!("name" in json) || !("path" in json) || !("project" in json)) {
+    return false;
+  }
+  return true;
+}
+
+export type MessageWithIntegrationMeta = Override<
+  Message,
+  {
+    ftm_user_preferences: { integration: IntegrationMeta };
+  }
+>;
+
+export function isMessageWithIntegrationMeta(
+  message: unknown,
+): message is MessageWithIntegrationMeta {
+  if (!message || typeof message !== "object") return false;
+  if (!("ftm_user_preferences" in message)) return false;
+  if (
+    !message.ftm_user_preferences ||
+    typeof message.ftm_user_preferences !== "object"
+  )
+    return false;
+  const preferences = message.ftm_user_preferences as Record<string, unknown>;
+  if (!("integration" in preferences)) return false;
+  return isIntegrationMeta(preferences.integration);
+}
+
 export type MessagesInitialState = {
   waitingBranches: number[]; // alt numbers
   streamingBranches: number[]; // alt number
@@ -458,7 +492,7 @@ export const threadMessagesSlice = createSlice({
       const maybeIntegrationMeta = messages.find(isMessageWithIntegrationMeta);
       if (!maybeIntegrationMeta) return null;
       // TODO: any types are causing issues here
-      const message = maybeIntegrationMeta as MessageWithIntegrationMeta;
+      const message = maybeIntegrationMeta;
       return message.ftm_user_preferences.integration;
     }),
 

refact-agent/gui/src/features/Chat/Thread/types.ts

@@ -40,7 +40,7 @@ import {
 import { type RootState } from "../../app/store";
 import { setThreadFtId } from "../../features/ThreadMessages";
 import { Tool } from "../refact/tools";
-import { IntegrationMeta } from "../../features/Chat";
+import type { IntegrationMeta } from "../../features/ThreadMessages";
 
 // async function fetchAppSearchableId(apiKey: string, port: number) {
 //   const appIdUrl = `http://127.0.0.1:${port}/v1/get-app-searchable-id`;

refact-agent/gui/src/features/Chat/Thread/utils.ts

@@ -1,9 +1,18 @@
 import { createApi, fetchBaseQuery } from "@reduxjs/toolkit/query/react";
 import { RootState } from "../../app/store";
-import { ChatMessage, ChatMessages } from "./types";
-import { formatMessagesForLsp } from "../../features/Chat/Thread/utils";
+import {
+  ChatMessage,
+  ChatMessages,
+  isAssistantMessage,
+  isDiffMessage,
+  isToolMessage,
+  isUserMessage,
+  LspChatMode,
+} from "./types";
 import { CHAT_COMMIT_LINK_URL, CHAT_LINKS_URL } from "./consts";
-import { LspChatMode } from "../../features/Chat";
+
+import { LspChatMessage, LSPUserMessage } from "./chat";
+
 // useful for forcing specific links
 // import { STUB_LINKS_FOR_CHAT_RESPONSE } from "../../__fixtures__";
 
@@ -227,3 +236,55 @@ function isCommitResponse(json: unknown): json is CommitResponse {
   // TODO: type check the arrays if we use the data anywhere.
   return true;
 }
+
+export function formatMessagesForLsp(messages: ChatMessages): LspChatMessage[] {
+  return messages.reduce<LspChatMessage[]>((acc, message) => {
+    if (isUserMessage(message)) {
+      const { ftm_role, ftm_content, ...rest } = message;
+      const msg: LSPUserMessage = {
+        ...rest,
+        role: ftm_role,
+        content: ftm_content,
+      };
+      return acc.concat([msg]);
+    }
+
+    if (isAssistantMessage(message)) {
+      return acc.concat([
+        {
+          role: message.ftm_role,
+          content: message.ftm_content,
+          tool_calls: message.ftm_tool_calls ?? undefined,
+          thinking_blocks: message.thinking_blocks ?? undefined,
+          finish_reason: message.finish_reason,
+          usage: message.usage,
+        },
+      ]);
+    }
+
+    if (isToolMessage(message)) {
+      return acc.concat([
+        {
+          role: "tool",
+          content: message.ftm_content,
+          tool_call_id: message.ftm_call_id,
+        },
+      ]);
+    }
+
+    if (isDiffMessage(message)) {
+      const diff = {
+        role: message.ftm_role,
+        content: JSON.stringify(message.ftm_content),
+        tool_call_id: message.tool_call_id,
+      };
+      return acc.concat([diff]);
+    }
+
+    const ftm_content =
+      typeof message.ftm_content === "string"
+        ? message.ftm_content
+        : JSON.stringify(message.ftm_content);
+    return [...acc, { role: message.ftm_role, content: ftm_content }];
+  }, []);
+}

refact-agent/gui/src/features/ThreadMessages/threadMessagesSlice.ts

@@ -1,6 +1,4 @@
-// import { FThreadMessageOutput } from "../../../generated/documents";
 import type { MessagesSubscriptionSubscription } from "../../../generated/documents";
-import { LspChatMode } from "../../features/Chat";
 import { Checkpoint } from "../../features/Checkpoints/types";
 import { Override } from "../../utils/Override";
 import { GetChatTitleActionPayload, GetChatTitleResponse, Usage } from "./chat";
@@ -297,6 +295,13 @@ export function isChatMessage(message: unknown): message is ChatMessage {
 
 export type ChatMessages = ChatMessage[];
 
+export type LspChatMode =
+  | "NO_TOOLS"
+  | "EXPLORE"
+  | "AGENT"
+  | "CONFIGURE"
+  | "PROJECT_SUMMARY";
+
 export type ChatMeta = {
   current_config_file?: string | undefined;
   chat_id?: string | undefined;