chat improvements

lalalune · lalalune · commit e2d7bf2bf903 · 2025-03-16T21:08:39.000-07:00
diff --git a/llms.txt b/llms.txt
@@ -19,7 +19,6 @@ export type UUID = `${string}-${string}-${string}-${string}-${string}`;
 export function asUUID(id: string): UUID
 export interface Content {
   thought?: string;
-  plan?: string;
   text?: string;
   actions?: string[];
   providers?: string[];
diff --git a/package.json b/package.json
@@ -7,7 +7,7 @@
     "start:app": "turbo run start --filter=./packages/app",
     "dev": "turbo run dev --filter=./packages/the-org",
     "build:docs": "turbo run build --filter=@elizaos/docs",
-    "build": "turbo run build --filter=!@elizaos/docs",
+    "build": "turbo run build --filter=@elizaos/client && turbo run build --filter=!@elizaos/docs",
     "clean": "rm -rf dist .turbo node_modules .turbo-tsconfig.json tsconfig.tsbuildinfo bun.lock* && turbo run clean --filter=./packages/*",
     "lint": "turbo run lint --filter=./packages/* && prettier --write . && prettier --check .",
     "pre-commit": "bun run scripts/pre-commit-lint.js",
diff --git a/packages/cli/src/displayBanner.ts b/packages/cli/src/displayBanner.ts
@@ -12,8 +12,11 @@ export function displayBanner(version: string | null = null, hideBanner = false)
   const red = '\x1b[38;5;196m';
   let versionColor = lightblue;
 
+  // assume __dirname doesnt exist
+  const __dirname = path.resolve(import.meta.dirname, '..');
+
   if (!version) {
-    const packageJsonPath = path.join(process.cwd(), 'package.json');
+    const packageJsonPath = path.join(__dirname, 'package.json');
     if (!fs.existsSync(packageJsonPath)) {
     } else {
       const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf-8'));
diff --git a/packages/cli/src/server/api/index.ts b/packages/cli/src/server/api/index.ts
@@ -153,7 +153,6 @@ export function setupSocketIO(
 
               // Add optional fields only if they exist in the original content
               if (content.thought) broadcastData.thought = content.thought;
-              if (content.plan) broadcastData.plan = content.plan;
               if (content.actions) broadcastData.actions = content.actions;
 
               // Log exact broadcast data
diff --git a/packages/client/src/components/chat.tsx b/packages/client/src/components/chat.tsx
@@ -15,7 +15,16 @@ import type { IAttachment } from '@/types';
 import type { Content, UUID } from '@elizaos/core';
 import { AgentStatus } from '@elizaos/core';
 import { useQueryClient } from '@tanstack/react-query';
-import { Activity, Database, PanelRight, Paperclip, Send, Terminal, X } from 'lucide-react';
+import {
+  Activity,
+  ChevronRight,
+  Database,
+  PanelRight,
+  Paperclip,
+  Send,
+  Terminal,
+  X,
+} from 'lucide-react';
 import { useEffect, useRef, useState, useCallback } from 'react';
 import AIWriter from 'react-aiwriter';
 import { AgentActionViewer } from './action-viewer';
@@ -29,6 +38,7 @@ import { useAutoScroll } from './ui/chat/hooks/useAutoScroll';
 import { Tabs, TabsContent, TabsList, TabsTrigger } from './ui/tabs';
 import { Tooltip, TooltipContent, TooltipTrigger } from './ui/tooltip';
 import { AgentMemoryViewer } from './memory-viewer';
+import { Collapsible, CollapsibleContent, CollapsibleTrigger } from '@radix-ui/react-collapsible';
 
 const SOURCE_NAME = 'client_chat';
 
@@ -49,6 +59,7 @@ function MessageContent({
   agentId: UUID;
   isLastMessage: boolean;
 }) {
+  console.log('message', message);
   // Only log message details in development mode
   if (import.meta.env.DEV) {
     console.log(`[Chat] Rendering message from ${message.name}:`, {
@@ -60,58 +71,88 @@ function MessageContent({
   }
 
   return (
-    <div className="flex flex-col">
-      <ChatBubbleMessage
-        isLoading={message.isLoading}
-        {...(message.name === USER_NAME ? { variant: 'sent' } : {})}
-      >
-        {message.name === USER_NAME ? (
-          message.text
-        ) : isLastMessage && message.name !== USER_NAME ? (
-          <AIWriter>{message.text}</AIWriter>
-        ) : (
-          message.text
-        )}
-        {/* Attachments */}
-        <div>
-          {message.attachments?.map((attachment: IAttachment) => (
-            <div className="flex flex-col gap-1 mt-2" key={`${attachment.url}-${attachment.title}`}>
-              <img
-                alt="attachment"
-                src={attachment.url}
-                width="100%"
-                height="100%"
-                className="w-64 rounded-md"
-              />
-              <div className="flex items-center justify-between gap-4">
-                <span />
-                <span />
-              </div>
+    <ChatBubbleMessage
+      isLoading={message.isLoading}
+      {...(message.name === USER_NAME ? { variant: 'sent' } : {})}
+      {...(!message.text ? { className: 'bg-transparent' } : {})}
+    >
+      <div className="flex flex-col w-full m-0 p-0">
+        {message.name !== USER_NAME && (
+          <>
+            <div className="flex justify-end mb-2 absolute top-2 right-2">
+              {message.text && !message.isLoading ? (
+                <div className="flex items-center gap-4">
+                  <CopyButton text={message.text} />
+                  <ChatTtsButton agentId={agentId} text={message.text} />
+                </div>
+              ) : (
+                <div />
+              )}
             </div>
-          ))}
+            {message.text && message.thought && (
+              <Collapsible className="mb-1">
+                <CollapsibleTrigger className="flex items-center gap-1 text-sm text-muted-foreground hover:text-foreground transition-colors group">
+                  <ChevronRight className="h-4 w-4 transition-transform group-data-[state=open]:rotate-90" />
+                  Thought Process
+                </CollapsibleTrigger>
+                <CollapsibleContent className="pl-5 pt-1">
+                  <Badge variant="outline" className="text-xs">
+                    {message.thought}
+                  </Badge>
+                </CollapsibleContent>
+              </Collapsible>
+            )}
+          </>
+        )}
+      </div>
+
+      {message.name === USER_NAME ? (
+        message.text
+      ) : isLastMessage && message.name !== USER_NAME ? (
+        <AIWriter>{message.text}</AIWriter>
+      ) : (
+        message.text
+      )}
+
+      {!message.text && message.thought && (
+        <>
+          {message.name === USER_NAME ? (
+            message.thought
+          ) : isLastMessage && message.name !== USER_NAME ? (
+            <AIWriter>
+              <span className="italic text-muted-foreground">{message.thought}</span>
+            </AIWriter>
+          ) : (
+            <span className="italic text-muted-foreground">{message.thought}</span>
+          )}
+        </>
+      )}
+
+      {message.text && message.actions && (
+        <div className="mt-2">
+          Actions: <span className="font-bold">{message.actions}</span>
         </div>
-      </ChatBubbleMessage>
-      <div className="flex items-center gap-4 justify-between w-full mt-1">
-        {message.text && !message.isLoading ? (
-          <div className="flex items-center gap-1">
-            <CopyButton text={message.text} />
-            <ChatTtsButton agentId={agentId} text={message.text} />
+      )}
+
+      {message.attachments?.map((attachment: IAttachment) => (
+        <div className="flex flex-col gap-1" key={`${attachment.url}-${attachment.title}`}>
+          <img
+            alt="attachment"
+            src={attachment.url}
+            width="100%"
+            height="100%"
+            className="w-64 rounded-md"
+          />
+          <div className="flex items-center justify-between gap-4">
+            <span />
+            <span />
           </div>
-        ) : null}
-        <div
-          className={cn([
-            message.isLoading ? 'mt-2' : '',
-            'flex items-center justify-between gap-4 select-none',
-          ])}
-        >
-          {message.thought ? <Badge variant="outline">{message.thought}</Badge> : null}
-          {message.plan ? <Badge variant="outline">{message.plan}</Badge> : null}
-          {message.createdAt ? (
-            <ChatBubbleTimestamp timestamp={moment(message.createdAt).format('LT')} />
-          ) : null}
         </div>
-      </div>
-    </div>
+      ))}
+      {message.text && message.createdAt && (
+        <ChatBubbleTimestamp timestamp={moment(message.createdAt).format('LT')} />
+      )}
+    </ChatBubbleMessage>
   );
 }
 
@@ -412,23 +453,22 @@ export default function Page({ agentId }: { agentId: UUID }) {
                 >
                   <ChatBubble
                     variant={isUser ? 'sent' : 'received'}
-                    className={`flex flex-row items-center gap-2 ${
-                      isUser ? 'flex-row-reverse' : ''
-                    }`}
+                    className={`flex flex-row items-end gap-2 ${isUser ? 'flex-row-reverse' : ''}`}
                   >
-                    <Avatar className="size-8 border rounded-full select-none">
-                      <AvatarImage
-                        src={
-                          isUser
-                            ? '/user-icon.png'
-                            : agentData?.settings?.avatar
-                              ? agentData?.settings?.avatar
-                              : '/elizaos-icon.png'
-                        }
-                      />
+                    {message.text && !isUser && (
+                      <Avatar className="size-8 border rounded-full select-none mb-2">
+                        <AvatarImage
+                          src={
+                            isUser
+                              ? '/user-icon.png'
+                              : agentData?.settings?.avatar
+                                ? agentData?.settings?.avatar
+                                : '/elizaos-icon.png'
+                          }
+                        />
+                      </Avatar>
+                    )}
 
-                      {isUser && <AvatarFallback>U</AvatarFallback>}
-                    </Avatar>
                     <MessageContent
                       message={message}
                       agentId={agentId}
diff --git a/packages/client/src/lib/socketio-manager.ts b/packages/client/src/lib/socketio-manager.ts
@@ -79,7 +79,6 @@ class SocketIOManager extends EventEmitter {
         textType: typeof data.text,
         textLength: data.text ? data.text.length : 0,
         hasThought: 'thought' in data,
-        hasPlan: 'plan' in data,
         hasActions: 'actions' in data,
         additionalKeys: Object.keys(data).filter(
           (k) =>
@@ -91,7 +90,6 @@ class SocketIOManager extends EventEmitter {
               'createdAt',
               'source',
               'thought',
-              'plan',
               'actions',
             ].includes(k)
         ),
diff --git a/packages/core/src/bootstrap.ts b/packages/core/src/bootstrap.ts
@@ -230,18 +230,15 @@ const messageReceivedHandler = async ({
         // Retry if missing required fields
         let retries = 0;
         const maxRetries = 3;
-        while (
-          retries < maxRetries &&
-          (!responseContent?.thought || !responseContent?.plan || !responseContent?.actions)
-        ) {
+        while (retries < maxRetries && (!responseContent?.thought || !responseContent?.actions)) {
           const response = await runtime.useModel(ModelType.TEXT_SMALL, {
             prompt,
           });
 
           responseContent = parseJSONObjectFromText(response) as Content;
 
           retries++;
-          if ((!responseContent?.thought || !responseContent?.plan) && !responseContent?.actions) {
+          if (!responseContent?.thought && !responseContent?.actions) {
             logger.warn('*** Missing required fields, retrying... ***');
           }
         }
@@ -256,7 +253,6 @@ const messageReceivedHandler = async ({
         }
 
         if (responseContent) {
-          responseContent.plan = responseContent.plan?.trim();
           responseContent.inReplyTo = createUniqueUuid(runtime, message.id);
 
           responseMessages = [
@@ -277,7 +273,6 @@ const messageReceivedHandler = async ({
               agentId: runtime.agentId,
               content: {
                 thought: responseContent.thought,
-                plan: responseContent.plan,
                 actions: responseContent.actions,
                 providers: responseContent.providers,
               },
@@ -474,7 +469,6 @@ const postGeneratedHandler = async ({
         source: 'twitter',
         channelType: ChannelType.FEED,
         thought: jsonResponse.thought || '',
-        plan: jsonResponse.plan || '',
         type: 'post',
       },
       roomId: message.roomId,
diff --git a/packages/core/src/prompts.ts b/packages/core/src/prompts.ts
@@ -208,9 +208,6 @@ export const formatMessages = ({
   messages: Memory[];
   entities: Entity[];
 }) => {
-  const newestMessageWithContentPlan = messages.find(
-    (message: Memory) => (message.content as Content).plan
-  );
   const messageStrings = messages
     .reverse()
     .filter((message: Memory) => message.entityId)
@@ -254,13 +251,8 @@ export const formatMessages = ({
             } (${formattedName}'s actions: ${messageActions.join(', ')})`
           : null;
 
-      const planString =
-        newestMessageWithContentPlan?.id === message.id
-          ? `(${formattedName}'s plan: ${newestMessageWithContentPlan?.content?.plan})`
-          : null;
-
       // for each thought, action, text or attachment, add a new line, with text first, then thought, then action, then attachment
-      const messageString = [textString, thoughtString, planString, actionString, attachmentString]
+      const messageString = [textString, thoughtString, actionString, attachmentString]
         .filter(Boolean)
         .join('\n');
 
@@ -320,14 +312,12 @@ First, think about what you want to do next and plan your actions. Then, write t
 "actions" should be an array of the actions {{agentName}} plans to take based on the thought (if none, use IGNORE, if simply responding with text, use REPLY)
 "providers" should be an optional array of the providers that {{agentName}} will use to have the right context for responding and acting
 "evaluators" should be an optional array of the evaluators that {{agentName}} will use to evaluate the conversation after responding
-"plan" should be explanation of the message you plan to send, the actions you plan to take, and the data providers you plan to use.
 These are the available valid actions: {{actionNames}}
 
 Response format should be formatted in a valid JSON block like this:
 \`\`\`json
 {
     "thought": "<string>",
-    "plan": "<string>",
     "actions": ["<string>", "<string>", ...],
     "providers": ["<string>", "<string>", ...]
 }
diff --git a/packages/core/src/types.ts b/packages/core/src/types.ts
@@ -25,9 +25,6 @@ export interface Content {
   /** The agent's internal thought process */
   thought?: string;
 
-  /** The agent's plan for the next message */
-  plan?: string;
-
   /** The main text content visible to users */
   text?: string;
 
diff --git a/packages/the-org/package.json b/packages/the-org/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@elizaos/the-org",
-  "version": "1.0.0-alpha.38",
+  "version": "1.0.0-alpha.65",
   "main": "dist/index.js",
   "module": "dist/index.js",
   "types": "dist/index.d.ts",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@elizaos/the-org",`
`3`		`- "version": "1.0.0-alpha.38",`
	`3`	`+ "version": "1.0.0-alpha.65",`
`4`	`4`	`"main": "dist/index.js",`
`5`	`5`	`"module": "dist/index.js",`
`6`	`6`	`"types": "dist/index.d.ts",`