Add v1.navie.thread.(add|remove)MessageAttachment

This restores functionality with code snippets.

Author: dustinbyrne

packages/cli/src/cmds/index/rpc.ts

@@ -39,6 +39,10 @@ import NavieService from '../../rpc/navie/services/navieService';
 import { ThreadIndexService } from '../../rpc/navie/services/threadIndexService';
 import { container } from 'tsyringe';
 import ThreadService from '../../rpc/navie/services/threadService';
+import {
+  navieThreadAddMessageAttachmentHandler,
+  navieThreadRemoveMessageAttachmentHandler,
+} from '../../rpc/navie/thread/handlers/messageAttachment';
 
 export const command = 'rpc';
 export const describe = 'Run AppMap JSON-RPC server';
@@ -87,6 +91,8 @@ export function rpcMethods(navie: INavieProvider, codeEditor?: string): RpcHandl
     navieThreadPinItemHandler(threadService),
     navieThreadUnpinItemHandler(threadService),
     navieThreadQueryHandler(threadIndexService),
+    navieThreadAddMessageAttachmentHandler(threadService),
+    navieThreadRemoveMessageAttachmentHandler(threadService),
   ];
 }
 

packages/cli/src/rpc/explain/review.ts

@@ -10,7 +10,7 @@ import { getDiffLog, getWorkingDiff } from '../../lib/git';
 export default async function handleReview(
   question: string,
   userContext?: UserContext.Context
-): Promise<{ applied: boolean; userContext?: UserContext.Context }> {
+): Promise<{ applied: boolean; userContext?: UserContext.ContextItem[] }> {
   const [mode] = question.split(/\s+/g);
   if (mode !== '@review') return { applied: false };
 

packages/cli/src/rpc/navie/thread/events.ts

@@ -2,6 +2,10 @@ import { ConversationThread } from '@appland/client';
 import { ContextV2, Help, ProjectInfo } from '@appland/navie';
 import { NavieRpc } from '@appland/rpc';
 
+export type Timestamp = {
+  time: number;
+};
+
 export type NavieThreadInitEvent = {
   type: 'thread-init';
   conversationThread: ConversationThread;
@@ -56,14 +60,23 @@ export type NavieBeginContextSearchEvent = {
   id: string;
   request?: Help.HelpRequest | ProjectInfo.ProjectInfoRequest | ContextV2.ContextRequest;
 };
+
 export type NavieCompleteContextSearchEvent = {
   type: 'complete-context-search';
   id: string;
   result?: Help.HelpResponse | ProjectInfo.ProjectInfoResponse | ContextV2.ContextResponse;
 };
 
-export type Timestamp = {
-  time: number;
+export type NavieAddMessageAttachmentEvent = {
+  type: 'add-message-attachment';
+  attachmentId: string;
+  uri?: string;
+  content?: string;
+};
+
+export type NavieRemoveMessageAttachmentEvent = {
+  type: 'remove-message-attachment';
+  attachmentId: string;
 };
 
 export type NavieEvent =
@@ -77,7 +90,9 @@ export type NavieEvent =
   | NaviePromptSuggestionsEvent
   | NavieThreadInitEvent
   | NavieTokenEvent
-  | NavieTokenMetadataEvent;
+  | NavieTokenMetadataEvent
+  | NavieAddMessageAttachmentEvent
+  | NavieRemoveMessageAttachmentEvent;
 
 export type TimestampNavieEvent = Timestamp & NavieEvent;
 

packages/cli/src/rpc/navie/thread/handlers/messageAttachment.ts

@@ -0,0 +1,36 @@
+import { NavieRpc } from '@appland/rpc';
+import ThreadService from '../../services/threadService';
+import { RpcError, RpcHandler } from '../../../rpc';
+
+export function navieThreadAddMessageAttachmentHandler(
+  threadService: ThreadService
+): RpcHandler<
+  NavieRpc.V1.Thread.AddMessageAttachment.Params,
+  NavieRpc.V1.Thread.AddMessageAttachment.Response
+> {
+  return {
+    name: NavieRpc.V1.Thread.AddMessageAttachment.Method,
+    async handler({ threadId, uri, content }) {
+      if (!uri && !content) throw new RpcError(400, 'must specify at least one of uri or content');
+
+      const thread = await threadService.getThread(threadId);
+      const attachmentId = thread.addMessageAttachment(uri, content);
+      return { attachmentId };
+    },
+  };
+}
+
+export function navieThreadRemoveMessageAttachmentHandler(
+  threadService: ThreadService
+): RpcHandler<
+  NavieRpc.V1.Thread.RemoveMessageAttachment.Params,
+  NavieRpc.V1.Thread.RemoveMessageAttachment.Response
+> {
+  return {
+    name: NavieRpc.V1.Thread.RemoveMessageAttachment.Method,
+    async handler({ threadId, attachmentId }) {
+      const thread = await threadService.getThread(threadId);
+      thread.removeMessageAttachment(attachmentId);
+    },
+  };
+}

packages/cli/src/rpc/navie/thread/index.ts

@@ -8,7 +8,13 @@ import { homedir } from 'os';
 import { mkdir, writeFile } from 'fs/promises';
 
 import NavieService from '../services/navieService';
-import { NavieEvent, NavieMessageEvent, PinnedItem, TimestampNavieEvent } from './events';
+import {
+  NavieAddMessageAttachmentEvent,
+  NavieEvent,
+  NavieMessageEvent,
+  PinnedItem,
+  TimestampNavieEvent,
+} from './events';
 import { ThreadIndexService } from '../services/threadIndexService';
 import { container } from 'tsyringe';
 import { NavieRpc } from '@appland/rpc';
@@ -25,15 +31,26 @@ type EventListener = (...args: any[]) => void;
  */
 function convertContext(
   context?: NavieRpc.V1.UserContext.ContextItem[]
-): undefined | UserContext.Context {
-  return context?.map((item) => {
+): UserContext.ContextItem[] {
+  if (!context) return [];
+  return context.map((item) => {
     if (item.type === 'static') {
       return { type: 'code-snippet', content: item.content, location: item.id };
     }
     return { type: 'file', location: item.uri };
   });
 }
 
+function convertMessageAttachmentToContextItem(
+  attachment: NavieAddMessageAttachmentEvent
+): UserContext.ContextItem {
+  return {
+    type: 'code-snippet',
+    content: attachment.content ?? '',
+    location: attachment.uri,
+  };
+}
+
 export class Thread {
   private eventEmitter = new EventEmitter();
   private listeners = new Map<string, EventListener[]>();
@@ -236,10 +253,11 @@ export class Thread {
 
   /**
    * Send a user message to the thread. This will emit a `message` event. This promise will resolve
-   * once the message has been acknowledged by the backend, before the message is completed.
+   * once the message has been acknowledged by the backend, before the message is completed. Message
+   * attachments need NOT be included in the `userContext` parameter.
    *
    * @param message the message to send
-   * @param codeSelection (optional) the code selection to send
+   * @param codeSelection (optional) additional context to use, i.e., pinned items
    */
   async sendMessage(
     message: string,
@@ -248,8 +266,10 @@ export class Thread {
     const [navie, contextEvents] = this.navieService.getNavie();
 
     let context = convertContext(userContext);
+    context.push(...this.getMessageAttachments().map(convertMessageAttachmentToContextItem));
+
     const { applied, userContext: newUserContext } = await handleReview(message, context);
-    if (applied) {
+    if (applied && newUserContext) {
       context = newUserContext;
     }
 
@@ -296,6 +316,44 @@ export class Thread {
     });
   }
 
+  addMessageAttachment(uri?: string, content?: string): string {
+    const attachmentId = randomUUID();
+    this.logEvent({
+      type: 'add-message-attachment',
+      attachmentId,
+      uri,
+      content,
+    });
+    return attachmentId;
+  }
+
+  removeMessageAttachment(attachmentId: string) {
+    this.logEvent({ type: 'remove-message-attachment', attachmentId });
+  }
+
+  getMessageAttachments(): NavieAddMessageAttachmentEvent[] {
+    // Array.lastIndexOf is not supported until es2023.
+    let lastUserMessageIndex = 0;
+    for (let i = lastUserMessageIndex; i < this.log.length; ++i) {
+      const e = this.log[i];
+      if (e.type === 'message' && e.role === 'user') {
+        lastUserMessageIndex = i;
+      }
+    }
+
+    const attachments = new Map<string, NavieAddMessageAttachmentEvent>();
+    for (let i = lastUserMessageIndex + 1; i < this.log.length; ++i) {
+      const e = this.log[i];
+      if (e.type === 'add-message-attachment') {
+        attachments.set(e.attachmentId, e);
+      } else if (e.type === 'remove-message-attachment') {
+        attachments.delete(e.attachmentId);
+      }
+    }
+
+    return Array.from(attachments.values());
+  }
+
   /**
    * Gets the events since the given nonce. If no nonce is given, it will return all events.
    *

packages/components/src/components/chat/Chat.vue

@@ -315,13 +315,8 @@ export default {
       }
     },
     async onSend(message: string) {
-      this.sendMessage(
-        message,
-        this.codeSelections.map((s) => s.code),
-        this.appmaps
-      );
-
-      this.codeSelections = [];
+      this.sendMessage(message, [], this.appmaps);
+      this.$set(this, 'codeSelections', []);
     },
     onStop() {
       this.$emit('stop');
@@ -383,6 +378,13 @@ export default {
     includeCodeSelection(codeSelection: CodeSelection) {
       this.codeSelections.push(codeSelection);
     },
+    removeCodeSelection(attachmentId: string) {
+      this.$set(
+        this,
+        'codeSelections',
+        this.codeSelections.filter((c) => c.attachmentId !== attachmentId)
+      );
+    },
     includeAppMap(appmap: string) {
       this.appmaps.push(appmap);
     },

packages/components/src/components/chat/ChatInput.vue

@@ -23,13 +23,9 @@
       data-cy="input-attachments"
     >
       <v-code-selection
-        v-for="(selection, i) in codeSelections"
-        :key="i"
-        :path="selection.path"
-        :line-start="selection.lineStart"
-        :line-end="selection.lineEnd"
-        :language="selection.language"
-        :code="selection.code"
+        v-for="selection in codeSelections"
+        :key="selection.uri"
+        v-bind="selection"
         class="attachment"
       />
     </div>
@@ -282,7 +278,7 @@ $border-color: rgba(white, 0.333);
   display: flex;
   flex-direction: column;
   gap: 1rem;
-  padding: 1.5rem;
+  padding: 1rem 1.5rem 1.5rem 1.5rem;
   border-top: 1px solid $color-background-dark;
   box-shadow: 0 0 1rem 0rem $color-tile-shadow;
   border-radius: $border-radius $border-radius 0 0;