halbot 1991.2.21 → 1991.2.23

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "halbot",
   "description": "Just another `ChatGPT` / `Gemini` / `Mistral (by ollama)` Telegram bob, which is simple design, easy to use, extendable and fun.",
-  "version": "1991.2.21",
+  "version": "1991.2.23",
   "private": false,
   "homepage": "https://github.com/Leask/halbot",
   "type": "module",
@@ -51,7 +51,7 @@
     "pgvector": "^0.2.0",
     "telegraf": "^4.16.3",
     "tesseract.js": "^5.1.0",
-    "utilitas": "^1997.1.2",
+    "utilitas": "^1997.1.4",
     "youtube-transcript": "^1.2.1"
   }
 }

package/skills/{-8845_session.mjs → -8845_thread.mjs}

@@ -1,19 +1,25 @@
 import { alan, bot, uoid, utilitas } from 'utilitas';
 
-const EMIJI_FINISH = '☑️';
+const [EMIJI_FINISH, END, NEW, THREAD, CLR] = ['☑️', '❎', '✨', '🧵', '🆑'];
+
+const [CREATED, SWITCHED] = [
+    `${NEW} Thread created: `, `${EMIJI_FINISH} Thread switched: `
+];
 
 // moved to help and configs
 const keyboards = [[
-    { text: '/clear this thread 🆑' },
-    { text: '/clearall threads 🔄' }
+    { text: `/clear ${CLR}` },
+    { text: `/end ${END}` },
+    { text: `/list ${THREAD}` },
+    { text: `/new ${NEW}` },
 ], [
-    { text: '/end this thread ❎' },
-    { text: '/list threads 🧵' },
-    { text: '/new thread ✨' },
+    { text: '/polish ❇️' },
+    { text: '/translate 🇨🇳' },
+    { text: '/translate 🇺🇸' },
 ], [
     { text: '/help 🛟' },
-    { text: '/ttsoff 🔇' },
-    { text: '/ttson 🔊' },
+    { text: '/set --tts=🔇' },
+    { text: '/set --tts=🔊' },
 ]];
 
 const action = async (ctx, next) => {
@@ -24,10 +30,25 @@ const action = async (ctx, next) => {
     const resetSessions = () => ctx.session.sessions = [];
     const resetContext = context => ctx.session.context = context || {};
     const now = Date.now();
-    ctx.session.sessionId || resetSession();
+    const preSessionId = ctx.session.sessionId || resetSession();
     ctx.session.sessions || resetSessions();
     ctx.session.context || resetContext();
+    ctx.carry || (ctx.carry = {});
+    ctx.carry.threadInfo || (ctx.carry.threadInfo = []);
     // load functions
+    ctx.clear = async context => {
+        await alan.resetSession(
+            ctx.session.sessionId,
+            // { systemPrompt: context?.prompt } // @todo: switch to real system prompt
+        );
+        resetContext(context);
+        const id = findSession(ctx.session.sessionId);
+        ctx.cmd.ignored = true;
+        ctx.session.sessions?.[id] && (
+            ctx.session.sessions[id].context = ctx.session.context
+        );
+        ctx.hello(context?.prompt);
+    };
     const switchSession = async () => {
         let resp;
         for (const session of ctx.session.sessions) {
@@ -36,6 +57,9 @@ const action = async (ctx, next) => {
                 ctx.session.context = session.context;
                 session.touchedAt = now;
                 resp = session;
+                preSessionId !== ctx.session.sessionId
+                    && ctx.carry.threadInfo.push(SWITCHED
+                        + getLabel(findSession(ctx.session.sessionId)));
                 break;
             }
         }
@@ -44,9 +68,12 @@ const action = async (ctx, next) => {
                 id: resetSession(),
                 createdAt: now, touchedAt: now, context: {},
             });
+            ctx.carry.threadInfo.push(CREATED
+                + getLabel(findSession(ctx.session.sessionId)));
             await ctx.clear();
         }
-        ctx.carry = { sessionId: ctx.session.sessionId };
+        ctx.carry.sessionId = ctx.session.sessionId;
+        ctx.carry.threadInfo.length && (ctx.carry.keyboards = keyboards);
         return resp;
     };
     const defauleTitle = i => (ctx.session.sessions[i]?.context?.cmd
@@ -60,26 +87,13 @@ const action = async (ctx, next) => {
             }
         }
     };
-    ctx.clear = async context => {
-        await alan.resetSession(
-            ctx.session.sessionId,
-            // { systemPrompt: context?.prompt } // @todo: switch to real system prompt
-        );
-        resetContext(context);
-        const id = findSession(ctx.session.sessionId);
-        ctx.cmd.ignored = true;
-        ctx.session.sessions?.[id] && (
-            ctx.session.sessions[id].context = ctx.session.context
-        );
-        ctx.hello(context?.prompt);
-    };
     const ok = async (message, options) => await ctx.ok(message, {
-        ...options || {}, ...options?.buttons ? {} : { keyboards }
+        ...options || {},
+        ...options?.buttons ? {} : (options?.keyboards || { keyboards }),
     });
-    // handle commands
     const sendList = async (names, lastMsgId) => {
         lastMsgId = lastMsgId || ctx.update?.callback_query?.message?.message_id;
-        const message = `🧵 Thread${ctx.session.sessions.length > 0 ? 's' : ''}:`;
+        const message = `{THREAD} Thread${ctx.session.sessions.length > 0 ? 's' : ''}:`;
         const buttons = ctx.session.sessions.map((x, i) => {
             names?.[x.id]
                 && (ctx.session.sessions[i].label = names[x.id])
@@ -92,14 +106,26 @@ const action = async (ctx, next) => {
         });
         return await ok(message, { lastMessageId: lastMsgId, buttons });
     };
-    const switched = async preTitle => await ok(
-        `${preTitle ? `❎ Thread ended: \`${preTitle}\`.\n\n` : ''}` +
-        `${EMIJI_FINISH} Thread switched: \`${getLabel(findSession(ctx.session.sessionId))}\`.`
-    );
+    const switched = async (preTitle, newThread) => await ok(`${preTitle
+        ? `${END} Thread ended: \`${preTitle}\`\n\n` : ''}`
+        + (newThread ? CREATED : SWITCHED)
+        + getLabel(findSession(ctx.session.sessionId)), { pageBreak: true });
+    // handle commands
     switch (ctx.cmd?.cmd) {
-        case 'clear': await ctx.clear(); break;
-        case 'clearall': resetSessions(); break;
-        case 'new': resetSession(); break;
+        case 'clearkb':
+            return await ok(EMIJI_FINISH, { keyboards: [] });
+        case 'clear':
+            ctx.carry.threadInfo.push(`${CLR} Thread cleared: `
+                + getLabel(findSession(ctx.session.sessionId)));
+            await ctx.clear();
+            break;
+        case 'clearall':
+            ctx.carry.threadInfo.push(`🔄 All threads have been cleared.`);
+            resetSessions();
+            break;
+        case 'new':
+            resetSession();
+            break;
         case 'list':
             const resp = await sendList();
             utilitas.ignoreErrFunc(async () => {
@@ -119,16 +145,18 @@ const action = async (ctx, next) => {
             let preTitle = '';
             ctx.session.sessions?.[id] && (preTitle = getLabel(id))
                 && (ctx.session.sessions.splice(id, 1));
+            const newThread = ctx.session.sessions.length === 0
             const sorted = ctx.session.sessions.slice().sort(
                 (x, y) => y.touchedAt - x.touchedAt
             );
             ctx.session.sessionId = sorted?.[0]?.id;
             await switchSession();
-            return await switched(preTitle);
+            return await switched(preTitle, newThread);
         case 'switch':
             ctx.session.sessionId = utilitas.trim(ctx.cmd.args);
             await switchSession();
-            return await sendList();
+            await sendList();
+            return await switched();
         case 'factory':
         case 'reset':
             await alan.resetSession(ctx.session.sessionId);
@@ -139,17 +167,17 @@ const action = async (ctx, next) => {
 };
 
 export const { name, run, priority, func, help, cmds, cmdx } = {
-    name: 'session',
+    name: 'Thread',
     run: true,
     priority: -8845,
     func: action,
-    help: '',
+    help: 'Thread management.',
     cmdx: {
-        new: 'Add a session.',
-        end: 'Delete a session.',
-        switch: 'Switch to a session.',
-        clear: 'Clear current AI conversation session and start a new one.',
-        clearall: 'Clear all AI conversation sessions.',
-        list: 'List all AI conversation sessions.',
+        new: 'Create a new thread.',
+        end: 'End current thread.',
+        switch: 'Switch to a thread. Usage: /switch `THREAD_ID`.',
+        clear: 'Clear current thread.',
+        clearall: 'Clear all threads.',
+        list: 'List all threads.',
     },
 };

package/skills/70_chat.mjs

@@ -13,7 +13,9 @@ const action = async (ctx, next) => {
     let [lastMsg, lastSent] = [null, 0];
     const packMsg = options => {
         const said = !options?.tts && ctx.result ? ctx.result : '';
-        const packed = [...said ? [joinL2([YOU, said])] : []];
+        const packed = [
+            ...ctx.carry?.threadInfo, ...said ? [joinL2([YOU, said])] : [],
+        ];
         const source = options?.tts ? tts : msgs;
         const pure = [];
         ctx.selectedAi.map(n => {
@@ -36,9 +38,12 @@ const action = async (ctx, next) => {
         options?.final && cmd && (extra.buttons = [{
             label: `❎ End context: \`${cmd}\``, text: '/clear',
         }]);
-        return await ctx.ok(curMsg, { md: true, ...extra, ...options || {} });
+        return await ctx.ok(curMsg, {
+            ...ctx.carry.keyboards ? { keyboards: ctx.carry.keyboards } : {},
+            md: true, ...extra, ...options || {},
+        });
     };
-    await ok(onProgress);
+    ctx.carry.threadInfo.length || await ok(onProgress);
     for (let n of ctx.selectedAi) {
         pms.push((async () => {
             try {
@@ -46,7 +51,7 @@ const action = async (ctx, next) => {
                     engine: ctx._.ai[n].engine, ...ctx.carry,
                     stream: async r => {
                         msgs[n] = r[0].text;
-                        await ok(onProgress);
+                        ctx.carry.threadInfo.length || await ok(onProgress);
                     },
                 });
                 msgs[n] = ctx.session.config?.render === true