ags: sync

.config/ags/widgets/sideleft/apis/chatgpt.js

@@ -1,5 +1,8 @@
-const { Gdk, GLib, Gtk, Pango } = imports.gi;
-import { App, Utils, Widget } from '../../../imports.js';
+const { Gtk } = imports.gi;
+import App from 'resource:///com/github/Aylur/ags/app.js';
+import Widget from 'resource:///com/github/Aylur/ags/widget.js';
+import * as Utils from 'resource:///com/github/Aylur/ags/utils.js';
+
 const { Box, Button, Entry, EventBox, Icon, Label, Revealer, Scrollable, Stack } = Widget;
 const { execAsync, exec } = Utils;
 import ChatGPT from '../../../services/chatgpt.js';
@@ -8,7 +11,7 @@ import { setupCursorHover, setupCursorHoverInfo } from "../../../lib/cursorhover
 import { SystemMessage, ChatMessage } from "./chatgpt_chatmessage.js";
 import { ConfigToggle, ConfigSegmentedSelection, ConfigGap } from '../../../lib/configwidgets.js';
 import { markdownTest } from '../../../lib/md2pango.js';
-import { MarginRevealer } from '../../../lib/advancedrevealers.js';
+import { MarginRevealer } from '../../../lib/advancedwidgets.js';
 
 export const chatGPTTabIcon = Box({
     hpack: 'center',
@@ -64,14 +67,14 @@ const chatGPTInfo = Box({
 export const chatGPTSettings = MarginRevealer({
     transition: 'slide_down',
     revealChild: true,
-    connections: [
-        [ChatGPT, (self) => Utils.timeout(200, () => {
-            self._hide(self);
-        }), 'newMsg'],
-        [ChatGPT, (self) => Utils.timeout(200, () => {
-            self._show(self);
-        }), 'clear'],
-    ],
+    extraSetup: (self) => self
+        .hook(ChatGPT, (self) => Utils.timeout(200, () => {
+            self.attribute.hide();
+        }), 'newMsg')
+        .hook(ChatGPT, (self) => Utils.timeout(200, () => {
+            self.attribute.show();
+        }), 'clear')
+    ,
     child: Box({
         vertical: true,
         className: 'sidebar-chat-settings',
@@ -126,9 +129,11 @@ export const openaiApiKeyInstructions = Box({
     children: [Revealer({
         transition: 'slide_down',
         transitionDuration: 150,
-        connections: [[ChatGPT, (self, hasKey) => {
-            self.revealChild = (ChatGPT.key.length == 0);
-        }, 'hasKey']],
+        setup: (self) => self
+            .hook(ChatGPT, (self, hasKey) => {
+                self.revealChild = (ChatGPT.key.length == 0);
+            }, 'hasKey')
+        ,
         child: Button({
             child: Label({
                 useMarkup: true,
@@ -163,13 +168,13 @@ export const chatGPTWelcome = Box({
 export const chatContent = Box({
     className: 'spacing-v-15',
     vertical: true,
-    connections: [
-        [ChatGPT, (box, id) => {
+    setup: (self) => self
+        .hook(ChatGPT, (box, id) => {
             const message = ChatGPT.messages[id];
             if (!message) return;
             box.add(ChatMessage(message, chatGPTView))
-        }, 'newMsg'],
-    ]
+        }, 'newMsg')
+    ,
 });
 
 const clearChat = () => {
@@ -197,46 +202,36 @@ export const chatGPTView = Scrollable({
         const vScrollbar = scrolledWindow.get_vscrollbar();
         vScrollbar.get_style_context().add_class('sidebar-scrollbar');
         // Avoid click-to-scroll-widget-to-view behavior
-        Utils.timeout(1, () => { 
+        Utils.timeout(1, () => {
             const viewport = scrolledWindow.child;
             viewport.set_focus_vadjustment(new Gtk.Adjustment(undefined));
         })
+        // Always scroll to bottom with new content
+        const adjustment = scrolledWindow.get_vadjustment();
+        adjustment.connect("changed", () => {
+            adjustment.set_value(adjustment.get_upper() - adjustment.get_page_size());
+        })
     }
 });
 
+const CommandButton = (command) => Button({
+    className: 'sidebar-chat-chip sidebar-chat-chip-action txt txt-small',
+    onClicked: () => sendMessage(command),
+    setup: setupCursorHover,
+    label: command,
+});
+
 export const chatGPTCommands = Box({
     className: 'spacing-h-5',
     children: [
         Box({ hexpand: true }),
-        Button({
-            className: 'sidebar-chat-chip sidebar-chat-chip-action txt txt-small',
-            onClicked: () => chatContent.add(SystemMessage(
-                `Key stored in:\n\`${ChatGPT.keyPath}\`\nTo update this key, type \`/key YOUR_API_KEY\``,
-                '/key',
-                chatGPTView)),
-            setup: setupCursorHover,
-            label: '/key',
-        }),
-        Button({
-            className: 'sidebar-chat-chip sidebar-chat-chip-action txt txt-small',
-            onClicked: () => chatContent.add(SystemMessage(
-                `Currently using \`${ChatGPT.modelName}\``,
-                '/model',
-                chatGPTView
-            )),
-            setup: setupCursorHover,
-            label: '/model',
-        }),
-        Button({
-            className: 'sidebar-chat-chip sidebar-chat-chip-action txt txt-small',
-            onClicked: () => clearChat(),
-            setup: setupCursorHover,
-            label: '/clear',
-        }),
+        CommandButton('/key'),
+        CommandButton('/model'),
+        CommandButton('/clear'),
     ]
 });
 
-export const chatGPTSendMessage = (text) => {
+export const sendMessage = (text) => {
     // Check if text or API key is empty
     if (text.length == 0) return;
     if (ChatGPT.key.length == 0) {