@songsid/agend 2.0.5-beta.2 → 2.0.5-beta.21

package/dist/fleet-manager.js

@@ -539,9 +539,9 @@ export class FleetManager {
             // Snapshotted at startup — new decisions via post_decision are available
             // through list_decisions tool but not auto-injected until restart.
             try {
-                const decisions = this.scheduler.db.listDecisions("", { includeArchived: false });
+                const decisions = this.scheduler.db.listAllActiveDecisions();
                 if (decisions.length > 0) {
-                    const capped = decisions.slice(0, 20).map(d => ({ title: d.title, content: (d.content ?? "").slice(0, 200) }));
+                    const capped = decisions.slice(0, 20).map(d => ({ title: d.title, content: (d.content ?? "").slice(0, 200), scope: d.scope, project_root: d.project_root }));
                     process.env.AGEND_DECISIONS = JSON.stringify(capped);
                     this.logger.info({ count: decisions.length, injected: capped.length }, "Injected active decisions into env");
                 }
@@ -780,7 +780,7 @@ export class FleetManager {
                     timestamp: new Date(),
                 });
             }
-            else if (data.command === "compact" || data.command === "save" || data.command === "load") {
+            else if (data.command === "save" || data.command === "load") {
                 if (!this.classicChannels?.isAdmin(data.userId)) {
                     await data.respond("⛔ This command requires admin access.");
                     return;
@@ -791,10 +791,7 @@ export class FleetManager {
                     return;
                 }
                 let rawCmd;
-                if (data.command === "compact") {
-                    rawCmd = "/compact";
-                }
-                else if (data.command === "save") {
+                if (data.command === "save") {
                     const filename = data.options?.filename;
                     if (!/^[\w.-]+$/.test(filename)) {
                         await data.respond("⛔ Invalid filename — only letters, numbers, dots, hyphens, underscores allowed.");
@@ -813,6 +810,15 @@ export class FleetManager {
                 this.pasteRawToClassicInstance(target.name, rawCmd);
                 await data.respond(`✅ Sent \`${rawCmd}\` to ${target.name}`);
             }
+            else if (data.command === "compact") {
+                const target = this.routing.resolve(data.channelId);
+                if (!target) {
+                    await data.respond("No active agent in this channel.");
+                    return;
+                }
+                const result = await this.topicCommands.sendCompact(target.name);
+                await data.respond(result);
+            }
             else if (data.command === "ctx") {
                 const target = this.routing.resolve(data.channelId);
                 if (!target) {
@@ -1059,7 +1065,7 @@ export class FleetManager {
                     timestamp: new Date(),
                 });
             }
-            else if (data.command === "compact" || data.command === "save" || data.command === "load") {
+            else if (data.command === "save" || data.command === "load") {
                 if (!this.classicChannels?.isAdmin(data.userId)) {
                     await data.respond("⛔ This command requires admin access.");
                     return;
@@ -1070,10 +1076,7 @@ export class FleetManager {
                     return;
                 }
                 let rawCmd;
-                if (data.command === "compact") {
-                    rawCmd = "/compact";
-                }
-                else if (data.command === "save") {
+                if (data.command === "save") {
                     const filename = data.options?.filename;
                     if (!/^[\w.-]+$/.test(filename)) {
                         await data.respond("⛔ Invalid filename — only letters, numbers, dots, hyphens, underscores allowed.");
@@ -1092,6 +1095,15 @@ export class FleetManager {
                 this.pasteRawToClassicInstance(target.name, rawCmd);
                 await data.respond(`✅ Sent \`${rawCmd}\` to ${target.name}`);
             }
+            else if (data.command === "compact") {
+                const target = this.routing.resolve(data.channelId);
+                if (!target) {
+                    await data.respond("No active agent in this channel.");
+                    return;
+                }
+                const result = await this.topicCommands.sendCompact(target.name);
+                await data.respond(result);
+            }
             else if (data.command === "ctx") {
                 const target = this.routing.resolve(data.channelId);
                 if (!target) {
@@ -1486,6 +1498,10 @@ export class FleetManager {
                 if (text === "/start" || text.startsWith("/start ")) {
                     if (isPrivateChat) {
                         if (!this.classicChannels.isUserAllowed(msg.userId)) {
+                            const generalId = this.findGeneralInstance(msg.adapterId);
+                            if (generalId) {
+                                this.notifyInstanceTopic(generalId, `🆕 Unauthorized user tried /start in private chat:\n• Name: ${msg.username}\n• ID: ${msg.userId}\n• Platform: ${msg.source}\n\nTo allow: add \`${msg.userId}\` to classicBot.yaml \`allowed_users\``);
+                            }
                             await msgAdapter?.sendText(chatId, "⛔ You are not in the allowed users list.");
                             return;
                         }
@@ -1547,14 +1563,24 @@ export class FleetManager {
                     await msgAdapter?.sendText(chatId, result);
                     return;
                 }
+                // Handle /ctx command
+                if (text === "/ctx" || text.startsWith("/ctx@")) {
+                    const ctxTarget = this.routing.resolve(chatId);
+                    if (!ctxTarget || ctxTarget.kind !== "classic") {
+                        await msgAdapter?.sendText(chatId, "No active agent. Use /start first.");
+                        return;
+                    }
+                    const reply = await this.topicCommands.getCtxText(ctxTarget.name);
+                    await msgAdapter?.sendText(chatId, reply);
+                    return;
+                }
                 // Route to classic channel if registered
                 const target = this.routing.resolve(chatId);
                 if (target?.kind === "classic") {
                     if (msg.adapterId)
                         this.bindInstanceAdapter(target.name, msg.adapterId, true);
-                    // TG ClassicBot: only @mention triggers agent (both private and group).
-                    // /chat command is NOT supported for TG classic — use @bot instead.
-                    if (!isBotMentioned) {
+                    // TG ClassicBot: group requires @mention, private chat forwards directly.
+                    if (!isPrivateChat && !isBotMentioned) {
                         // No trigger: save attachments + react, log, but don't forward to agent
                         const syntheticMsg = { ...msg, threadId: chatId, text: rawText.startsWith("/") ? "" : rawText };
                         await this.handleClassicChannelMessage(target.name, syntheticMsg);
@@ -1754,7 +1780,7 @@ export class FleetManager {
         const routingConfig = senderInstanceName
             ? this.fleetConfig?.instances[senderInstanceName]
             : (senderSessionName ? undefined : this.fleetConfig?.instances[instanceName]);
-        const threadId = resolveReplyThreadId(args.thread_id, routingConfig)
+        let threadId = resolveReplyThreadId(args.thread_id, routingConfig)
             ?? this.classicChannels?.getChannelIdByInstance(senderInstanceName ?? instanceName);
         // Select adapter: use instance binding, or resolve from chatId in args
         const outAdapter = this.getAdapterForInstance(senderInstanceName ?? instanceName) ?? this.adapter;
@@ -1762,6 +1788,15 @@ export class FleetManager {
             respond(null, "No adapter available");
             return;
         }
+        // For classic instances: clear thread_id to prevent TG interpreting it as message_thread_id
+        // (classic chats — private or group — don't use forum threads)
+        const classicChannelId = this.classicChannels?.getChannelIdByInstance(senderInstanceName ?? instanceName);
+        if (classicChannelId) {
+            if (!args.chat_id)
+                args.chat_id = classicChannelId;
+            delete args.thread_id;
+            threadId = undefined;
+        }
         // Route standard channel tools (reply, react, edit_message, download_attachment)
         if (routeToolCall(outAdapter, tool, args, threadId, respond)) {
             if (tool === "reply") {
@@ -2799,6 +2834,14 @@ When users create specialized instances, suggest these configurations:
         const text = msg.text ?? "";
         const channelId = msg.threadId ?? msg.chatId;
         const isCollabMode = this.classicChannels?.isCollab(channelId) ?? false;
+        // Handle /ctx in classic mode — always, regardless of collab mode
+        if (text === "/ctx" || text.startsWith("/ctx@")) {
+            const reply = await this.topicCommands.getCtxText(instanceName);
+            const classicAdapter = this.worlds.get(msg.adapterId ?? "")?.adapter ?? this.adapter;
+            if (classicAdapter)
+                await classicAdapter.sendText(msg.threadId ?? msg.chatId, reply, { threadId: msg.threadId });
+            return;
+        }
         // Collab mode: trigger on @mention of our bot, log all messages
         if (isCollabMode) {
             // Skip empty bot messages (e.g., reactions) — don't pollute chat log
@@ -2883,14 +2926,6 @@ When users create specialized instances, suggest these configurations:
             await this.forwardToClassicInstance(instanceName, finalText, msg, extraMeta);
             return;
         }
-        // Handle /ctx in classic mode
-        if (text === "/ctx" || text.startsWith("/ctx@")) {
-            const reply = await this.topicCommands.getCtxText(instanceName);
-            const classicAdapter = this.worlds.get(msg.adapterId ?? "")?.adapter ?? this.adapter;
-            if (classicAdapter)
-                await classicAdapter.sendText(msg.threadId ?? msg.chatId, reply, { threadId: msg.threadId });
-            return;
-        }
         // Normal mode: /chat trigger
         const isChat = text.startsWith("/chat ") || text === "/chat";
         this.logger.info({ instanceName, user: msg.username, textLen: text.length, hasChat: isChat }, "classic channel message received");
@@ -3077,8 +3112,13 @@ When users create specialized instances, suggest these configurations:
     async handleClassicStart(channelId, channelName, userId, guildId) {
         if (!this.classicChannels)
             return "Classic channel manager not initialized.";
-        if (guildId && !this.classicChannels.isGuildAllowed(guildId))
+        if (guildId && !this.classicChannels.isGuildAllowed(guildId)) {
+            const generalId = this.findGeneralInstance();
+            if (generalId) {
+                this.notifyInstanceTopic(generalId, `🆕 Unauthorized guild tried /start:\n• Guild ID: ${guildId}\n• User: ${userId}\n• Platform: discord\n\nTo allow: add \`${guildId}\` to classicBot.yaml \`allowed_guilds\``);
+            }
             return "⛔ This server is not in the allowed guilds list.";
+        }
         if (this.classicChannels.isClassicChannel(channelId))
             return "This channel already has an active agent. Use /chat to talk.";
         if (this.routing.resolve(channelId))
@@ -3088,8 +3128,8 @@ When users create specialized instances, suggest these configurations:
         this.routing.register(channelId, { kind: "classic", name: instanceName });
         await this.startClassicInstance(instanceName, this.classicChannels.getBackend(channelId, this.fleetConfig?.defaults?.backend), this.classicChannels.getPreTaskCommand(channelId), this.classicChannels.getModel(channelId, this.fleetConfig?.defaults?.model));
         this.reregisterClassicChannels();
-        // Auto-enable collab for Discord classic channels
-        if (!this.classicChannels.isCollab(channelId)) {
+        // Auto-enable collab for Discord classic channels (TG uses @mention directly without collab mode)
+        if (guildId && !this.classicChannels.isCollab(channelId)) {
             this.classicChannels.toggleCollab(channelId);
         }
         this.logger.info({ channelId, instanceName, userId }, "Classic channel started");