impl TextViewer for Tool Args/Output + SystemPrompt

Author: mythz

llms/extensions/app/ui/threadStore.mjs

@@ -354,11 +354,11 @@ async function startNewThread({ title, model, tools, redirect }) {
 async function queueChat(ctxRequest, options = {}) {
     if (!ctxRequest.request) return ctx.createErrorResult({ message: 'No request provided' })
     if (!ctxRequest.thread) return ctx.createErrorResult({ message: 'No thread provided' })
-    if (!ctxRequest.request.metadata) {
-        ctxRequest.request.metadata = {}
-    }
+    ctxRequest = ctx.createChatContext(ctxRequest)
     ctx.chatRequestFilters.forEach(f => f(ctxRequest))
     const { thread, request } = ctxRequest
+    ctx.completeChatContext(ctxRequest)
+
     const api = await ctx.postJson(`/ext/app/threads/${thread.id}/chat`, {
         ...options,
         body: typeof request == 'string'
@@ -381,6 +381,12 @@ async function loadThreadDetails(id, opt = null) {
     return threadDetails.value[id]
 }
 
+function getCurrentThreadSystemPrompt() {
+    return currentThread.value?.systemPrompt
+        ?? currentThread.value?.messages?.find(m => m.role == 'system')?.content
+        ?? ''
+}
+
 // Export the store
 export function useThreadStore() {
     return {
@@ -391,6 +397,7 @@ export function useThreadStore() {
         groupedThreads,
 
         // Actions
+        getCurrentThreadSystemPrompt,
         query,
         createThread,
         updateThread,

llms/extensions/system_prompts/ui/index.mjs

@@ -163,7 +163,7 @@ const SystemPromptEditor = {
                 </div>
             </div>
             <div v-if="hasMessages" class="w-full rounded-md border border-gray-300 dark:border-gray-600 bg-white dark:bg-gray-900 text-gray-900 dark:text-gray-100 px-3 py-2 text-sm">
-                {{$threads.currentThread.value?.systemPrompt || 'No System Prompt was used' }}
+                <TextViewer prefsName="systemPrompt" :text="$threads.getCurrentThreadSystemPrompt() || 'No System Prompt was used'" />
             </div>
             <div v-else>
                 <textarea
@@ -251,21 +251,17 @@ export default {
             }
         })
 
-        ctx.chatRequestFilters.push(({ request, thread }) => {
+        ctx.chatRequestFilters.push(({ request, thread, context }) => {
 
-            const hasSystemPrompt = request.messages.find(x => x.role === 'system')
+            const hasSystemPrompt = !!context.systemPrompt
+            console.log('system_prompts chatRequestFilters', hasSystemPrompt)
             if (hasSystemPrompt) {
                 console.log('Already has system prompt', hasSystemPrompt.content)
                 return
             }
 
-            // Only add the selected system prompt for new requests
-            if (ext.prefs.systemPrompt && request.messages.length <= 1) {
-                // add message to start
-                request.messages.unshift({
-                    role: 'system',
-                    content: ext.prefs.systemPrompt
-                })
+            if (ext.prefs.systemPrompt) {
+                context.systemPrompt = ext.prefs.systemPrompt
             }
         })
 

llms/extensions/tools/ui/index.mjs

@@ -656,7 +656,7 @@ export default {
             }
         })
 
-        ctx.chatRequestFilters.push(({ request, thread }) => {
+        ctx.chatRequestFilters.push(({ request, thread, context }) => {
             // Tool Preferences
             const prefs = ctx.prefs
             if (prefs.onlyTools != null) {