@openacp/cli 0.6.0 → 0.6.2

package/dist/{discord-SLLKRUP7.js → discord-7B5NWW5Z.js}

@@ -4,20 +4,20 @@ import {
   handleHandoff,
   handleSessions,
   handleStatus
-} from "./chunk-T22OLSET.js";
+} from "./chunk-TTDSLV35.js";
 import {
   handleAgentButton,
   handleAgents,
   handleInstall
-} from "./chunk-H7ZMPBZC.js";
+} from "./chunk-3KGRVAEV.js";
 import {
   handleSettings,
   handleSettingsButton
-} from "./chunk-THBR6OXH.js";
+} from "./chunk-HSGUPJU5.js";
 import {
   handleDoctor,
   handleDoctorButton
-} from "./chunk-3WPG7GXA.js";
+} from "./chunk-FF4C3ZE4.js";
 import {
   buildActionKeyboard,
   detectAction,
@@ -27,7 +27,7 @@ import {
   handleNew,
   handleNewChat,
   handleNewSessionButton
-} from "./chunk-AKIU4JBF.js";
+} from "./chunk-ONENT7JQ.js";
 import {
   buildDeepLink,
   createSessionThread,
@@ -41,13 +41,14 @@ import {
   handleDangerousButton,
   handleRestart,
   handleUpdate
-} from "./chunk-7G5QKLLF.js";
+} from "./chunk-IUIMBEBX.js";
 import {
   ChannelAdapter,
-  PRODUCT_GUIDE
-} from "./chunk-5NBWM7P6.js";
-import "./chunk-SPX7CKWV.js";
-import "./chunk-DWQKUECJ.js";
+  PRODUCT_GUIDE,
+  dispatchMessage
+} from "./chunk-FMWSVLRM.js";
+import "./chunk-WQZ4RXH7.js";
+import "./chunk-EWYNCHUH.js";
 import {
   log
 } from "./chunk-ESOPMQAY.js";
@@ -816,8 +817,10 @@ var SkillCommandManager = class {
     const record = this.sessionManager.getSessionRecord(sessionId);
     if (record) {
       const platform = record.platform;
-      const { skillMsgId: _removed, ...rest } = platform;
-      await this.sessionManager.patchRecord(sessionId, { platform: rest });
+      if (platform && typeof platform === "object" && "threadId" in platform) {
+        const { skillMsgId: _removed, ...rest } = platform;
+        await this.sessionManager.patchRecord(sessionId, { platform: rest });
+      }
     }
   }
 };
@@ -980,12 +983,12 @@ Each session gets its own forum thread \u2014 chat there to work with the agent.
 }
 async function handleClear(interaction, adapter) {
   await interaction.deferReply({ ephemeral: true });
-  if (!adapter.assistant) {
+  if (!adapter.getAssistantSessionId()) {
     await interaction.editReply("\u26A0\uFE0F Assistant is not available.");
     return;
   }
   try {
-    await adapter.assistant.respawn();
+    await adapter.respawnAssistant();
     await interaction.editReply("\u2705 Assistant history cleared.");
   } catch (err) {
     const message = err instanceof Error ? err.message : String(err);
@@ -1001,12 +1004,12 @@ async function handleMenuButton(interaction, adapter) {
   try {
     switch (customId) {
       case "m:new": {
-        const { handleNew: handleNew2 } = await import("./new-session-DRRP2J7E.js");
+        const { handleNew: handleNew2 } = await import("./new-session-BVNE6S3A.js");
         await interaction.followUp({ content: "Use `/new` to create a new session.", ephemeral: true });
         break;
       }
       case "m:sessions": {
-        const { handleSessions: handleSessions2 } = await import("./session-FVFLBREJ.js");
+        const { handleSessions: handleSessions2 } = await import("./session-ZMAM67AA.js");
         await showSessionsList(interaction, adapter);
         break;
       }
@@ -1015,12 +1018,12 @@ async function handleMenuButton(interaction, adapter) {
         break;
       }
       case "m:agents": {
-        const { showAgentsList } = await import("./agents-55NX3DHM.js");
+        const { showAgentsList } = await import("./agents-SXIY4IEF.js");
         await showAgentsList(interaction, adapter);
         break;
       }
       case "m:settings": {
-        const { showSettingsInfo } = await import("./settings-LPOLJ6SA.js");
+        const { showSettingsInfo } = await import("./settings-LQ57CFY4.js");
         await showSettingsInfo(interaction, adapter);
         break;
       }
@@ -1029,7 +1032,7 @@ async function handleMenuButton(interaction, adapter) {
         break;
       }
       case "m:restart": {
-        const { handleRestart: handleRestart2 } = await import("./admin-IKPS5PFC.js");
+        const { handleRestart: handleRestart2 } = await import("./admin-IVQTC72V.js");
         if (!adapter.core.requestRestart) {
           await interaction.followUp({ content: "\u26A0\uFE0F Restart not available.", ephemeral: true });
         } else {
@@ -1048,7 +1051,7 @@ async function handleMenuButton(interaction, adapter) {
         break;
       }
       case "m:doctor": {
-        const { runDoctorInline } = await import("./doctor-DB5PRQ6D.js");
+        const { runDoctorInline } = await import("./doctor-FR5GASOQ.js");
         await runDoctorInline(interaction, adapter);
         break;
       }
@@ -1287,11 +1290,11 @@ async function setupButtonCallbacks(interaction, adapter) {
   }
 }
 async function executeNewSession(interaction, adapter, agentName, workspace) {
-  const { executeNewSession: doExecute } = await import("./new-session-DRRP2J7E.js");
+  const { executeNewSession: doExecute } = await import("./new-session-BVNE6S3A.js");
   await doExecute(interaction, adapter, agentName, workspace);
 }
 async function executeCancelSession(interaction, adapter) {
-  const { executeCancelSession: doCancel } = await import("./session-FVFLBREJ.js");
+  const { executeCancelSession: doCancel } = await import("./session-ZMAM67AA.js");
   await doCancel(interaction, adapter);
 }
 
@@ -1795,138 +1798,151 @@ var DiscordAdapter = class extends ChannelAdapter {
       return null;
     }
   }
-  // ─── sendMessage ──────────────────────────────────────────────────────────
-  async sendMessage(sessionId, content) {
-    if (this.assistantInitializing && this.assistantSession && sessionId === this.assistantSession.id) {
-      return;
-    }
-    const thread = await this.getThread(sessionId);
-    if (!thread) return;
-    await ensureUnarchived(thread);
-    const isAssistant = this.assistantSession != null && sessionId === this.assistantSession.id;
+  // ─── Helper: get or create activity tracker ──────────────────────────────
+  getOrCreateTracker(sessionId, thread) {
     if (!this.sessionTrackers.has(sessionId)) {
       this.sessionTrackers.set(sessionId, new ActivityTracker(thread, this.sendQueue));
     }
-    const tracker = this.sessionTrackers.get(sessionId);
-    switch (content.type) {
-      case "thought": {
-        await tracker.onThought();
-        break;
-      }
-      case "text": {
-        await tracker.onTextStart();
-        const draft = this.draftManager.getOrCreate(sessionId, thread);
-        draft.append(content.text);
-        this.draftManager.appendText(sessionId, content.text);
-        break;
-      }
-      case "tool_call": {
-        await tracker.onToolCall();
-        await this.draftManager.finalize(sessionId, thread, isAssistant);
-        const meta = content.metadata ?? {};
-        await this.toolTracker.trackNewCall(sessionId, thread, {
-          id: String(meta.id ?? ""),
-          name: content.text || String(meta.name ?? "Tool"),
-          kind: meta.kind,
-          status: String(meta.status ?? "running"),
-          content: meta.content,
-          viewerLinks: meta.viewerLinks,
-          viewerFilePath: meta.viewerFilePath
-        });
-        break;
-      }
-      case "tool_update": {
-        const meta = content.metadata ?? {};
-        await this.toolTracker.updateCall(sessionId, {
-          id: String(meta.id ?? ""),
-          name: content.text || String(meta.name ?? ""),
-          kind: meta.kind,
-          status: String(meta.status ?? "completed"),
-          content: meta.content,
-          viewerLinks: meta.viewerLinks,
-          viewerFilePath: meta.viewerFilePath
+    return this.sessionTrackers.get(sessionId);
+  }
+  // --- MessageHandlers for dispatchMessage ---
+  messageHandlers = {
+    onThought: async (ctx, _content) => {
+      const tracker = this.getOrCreateTracker(ctx.sessionId, ctx.thread);
+      await tracker.onThought();
+    },
+    onText: async (ctx, content) => {
+      const tracker = this.getOrCreateTracker(ctx.sessionId, ctx.thread);
+      await tracker.onTextStart();
+      const draft = this.draftManager.getOrCreate(ctx.sessionId, ctx.thread);
+      draft.append(content.text);
+      this.draftManager.appendText(ctx.sessionId, content.text);
+    },
+    onToolCall: async (ctx, content) => {
+      const tracker = this.getOrCreateTracker(ctx.sessionId, ctx.thread);
+      await tracker.onToolCall();
+      await this.draftManager.finalize(ctx.sessionId, ctx.thread, ctx.isAssistant);
+      const meta = content.metadata ?? {};
+      await this.toolTracker.trackNewCall(ctx.sessionId, ctx.thread, {
+        id: String(meta.id ?? ""),
+        name: content.text || String(meta.name ?? "Tool"),
+        kind: meta.kind,
+        status: String(meta.status ?? "running"),
+        content: meta.content,
+        viewerLinks: meta.viewerLinks,
+        viewerFilePath: meta.viewerFilePath
+      });
+    },
+    onToolUpdate: async (ctx, content) => {
+      const meta = content.metadata ?? {};
+      await this.toolTracker.updateCall(ctx.sessionId, {
+        id: String(meta.id ?? ""),
+        name: content.text || String(meta.name ?? ""),
+        kind: meta.kind,
+        status: String(meta.status ?? "completed"),
+        content: meta.content,
+        viewerLinks: meta.viewerLinks,
+        viewerFilePath: meta.viewerFilePath
+      });
+    },
+    onPlan: async (ctx, content) => {
+      const entries = content.metadata?.entries ?? [];
+      const tracker = this.getOrCreateTracker(ctx.sessionId, ctx.thread);
+      await tracker.onPlan(entries);
+    },
+    onUsage: async (ctx, content) => {
+      await this.draftManager.finalize(ctx.sessionId, ctx.thread, ctx.isAssistant);
+      const meta = content.metadata ?? {};
+      const tracker = this.getOrCreateTracker(ctx.sessionId, ctx.thread);
+      await tracker.sendUsage({
+        tokensUsed: meta.tokensUsed,
+        contextSize: meta.contextSize
+      });
+      try {
+        const deepLink = buildDeepLink(this.guild.id, ctx.thread.id);
+        await this.sendNotification({
+          sessionId: ctx.sessionId,
+          type: "completed",
+          summary: content.text || "Session completed",
+          deepLink
         });
-        break;
+      } catch {
       }
-      case "plan": {
-        const entries = content.metadata?.entries ?? [];
-        await tracker.onPlan(entries);
-        break;
+    },
+    onSessionEnd: async (ctx, _content) => {
+      await this.draftManager.finalize(ctx.sessionId, ctx.thread, ctx.isAssistant);
+      const tracker = this.getOrCreateTracker(ctx.sessionId, ctx.thread);
+      await tracker.cleanup();
+      this.toolTracker.cleanup(ctx.sessionId);
+      this.sessionTrackers.delete(ctx.sessionId);
+      await this.skillManager.cleanup(ctx.sessionId);
+      try {
+        await this.sendQueue.enqueue(
+          () => ctx.thread.send({ content: "\u2705 Done" }),
+          { type: "other" }
+        );
+      } catch {
       }
-      case "usage": {
-        await this.draftManager.finalize(sessionId, thread, isAssistant);
-        const meta = content.metadata ?? {};
-        await tracker.sendUsage({
-          tokensUsed: meta.tokensUsed,
-          contextSize: meta.contextSize
-        });
-        try {
-          const deepLink = buildDeepLink(this.guild.id, thread.id);
-          await this.sendNotification({
-            sessionId,
-            type: "completed",
-            summary: content.text || "Session completed",
-            deepLink
-          });
-        } catch {
-        }
-        break;
+    },
+    onError: async (ctx, content) => {
+      await this.draftManager.finalize(ctx.sessionId, ctx.thread, ctx.isAssistant);
+      const tracker = this.getOrCreateTracker(ctx.sessionId, ctx.thread);
+      await tracker.cleanup();
+      this.toolTracker.cleanup(ctx.sessionId);
+      this.sessionTrackers.delete(ctx.sessionId);
+      try {
+        await this.sendQueue.enqueue(
+          () => ctx.thread.send({ content: `\u274C Error: ${content.text}` }),
+          { type: "other" }
+        );
+      } catch {
       }
-      case "session_end": {
-        await this.draftManager.finalize(sessionId, thread, isAssistant);
-        await tracker.cleanup();
-        this.toolTracker.cleanup(sessionId);
-        this.sessionTrackers.delete(sessionId);
-        await this.skillManager.cleanup(sessionId);
+    },
+    onAttachment: async (ctx, content) => {
+      if (!content.attachment) return;
+      const { attachment } = content;
+      await this.draftManager.finalize(ctx.sessionId, ctx.thread, ctx.isAssistant);
+      if (isAttachmentTooLarge(attachment.size)) {
+        log.warn({ sessionId: ctx.sessionId, fileName: attachment.fileName, size: attachment.size }, "[discord-media] File too large (>25MB)");
         try {
           await this.sendQueue.enqueue(
-            () => thread.send({ content: "\u2705 Done" }),
+            () => ctx.thread.send({ content: `\u26A0\uFE0F File too large to send (${Math.round(attachment.size / 1024 / 1024)}MB): ${attachment.fileName}` }),
             { type: "other" }
           );
         } catch {
         }
-        break;
+        return;
       }
-      case "error": {
-        await this.draftManager.finalize(sessionId, thread, isAssistant);
-        await tracker.cleanup();
-        this.toolTracker.cleanup(sessionId);
-        this.sessionTrackers.delete(sessionId);
-        try {
-          await this.sendQueue.enqueue(
-            () => thread.send({ content: `\u274C Error: ${content.text}` }),
-            { type: "other" }
-          );
-        } catch {
-        }
-        break;
+      try {
+        await this.sendQueue.enqueue(
+          () => ctx.thread.send({ files: [{ attachment: attachment.filePath, name: attachment.fileName }] }),
+          { type: "other" }
+        );
+      } catch (err) {
+        log.error({ err, sessionId: ctx.sessionId, fileName: attachment.fileName }, "[discord-media] Failed to send attachment");
       }
-      case "attachment": {
-        if (!content.attachment) break;
-        const { attachment } = content;
-        await this.draftManager.finalize(sessionId, thread, isAssistant);
-        if (isAttachmentTooLarge(attachment.size)) {
-          log.warn({ sessionId, fileName: attachment.fileName, size: attachment.size }, "[discord-media] File too large (>25MB)");
-          try {
-            await this.sendQueue.enqueue(
-              () => thread.send({ content: `\u26A0\uFE0F File too large to send (${Math.round(attachment.size / 1024 / 1024)}MB): ${attachment.fileName}` }),
-              { type: "other" }
-            );
-          } catch {
-          }
-          break;
-        }
-        try {
-          await this.sendQueue.enqueue(
-            () => thread.send({ files: [{ attachment: attachment.filePath, name: attachment.fileName }] }),
-            { type: "other" }
-          );
-        } catch (err) {
-          log.error({ err, sessionId, fileName: attachment.fileName }, "[discord-media] Failed to send attachment");
-        }
-        break;
+    },
+    onSystemMessage: async (ctx, content) => {
+      try {
+        await this.sendQueue.enqueue(
+          () => ctx.thread.send({ content: content.text }),
+          { type: "other" }
+        );
+      } catch {
       }
     }
+  };
+  // ─── sendMessage ──────────────────────────────────────────────────────────
+  async sendMessage(sessionId, content) {
+    if (this.assistantInitializing && this.assistantSession && sessionId === this.assistantSession.id) {
+      return;
+    }
+    const thread = await this.getThread(sessionId);
+    if (!thread) return;
+    await ensureUnarchived(thread);
+    const isAssistant = this.assistantSession != null && sessionId === this.assistantSession.id;
+    const ctx = { sessionId, thread, isAssistant };
+    await dispatchMessage(this.messageHandlers, ctx, content);
   }
   // ─── sendPermissionRequest ────────────────────────────────────────────────
   async sendPermissionRequest(sessionId, request) {
@@ -1935,14 +1951,6 @@ var DiscordAdapter = class extends ChannelAdapter {
       log.warn({ sessionId }, "[DiscordAdapter] sendPermissionRequest: session not found");
       return;
     }
-    const autoApprove = request.description.toLowerCase().includes("openacp") || session.dangerousMode;
-    if (autoApprove) {
-      const allowOption = request.options.find((o) => o.isAllow);
-      if (allowOption && session.permissionGate.requestId === request.id) {
-        session.permissionGate.resolve(allowOption.id);
-      }
-      return;
-    }
     const thread = await this.getThread(sessionId);
     if (!thread) return;
     await this.permissionHandler.sendPermissionRequest(session, request, thread);
@@ -2031,4 +2039,4 @@ ${notification.deepLink}`;
 export {
   DiscordAdapter
 };
-//# sourceMappingURL=discord-SLLKRUP7.js.map
+//# sourceMappingURL=discord-7B5NWW5Z.js.map