@openacp/cli 0.6.9 → 0.6.10

package/dist/{discord-7IVQKB2H.js → discord-OMC52Y54.js}

@@ -47,7 +47,6 @@ import {
 } from "./chunk-2HMQOC7N.js";
 import {
   PRODUCT_GUIDE,
-  STATUS_ICONS,
   dispatchMessage,
   evaluateNoise,
   extractContentText,
@@ -55,10 +54,11 @@ import {
   formatToolSummary,
   formatToolTitle,
   progressBar,
+  resolveToolIcon,
   splitMessage,
   stripCodeFences,
   truncateContent
-} from "./chunk-JUYDFUSN.js";
+} from "./chunk-OWP7RZ62.js";
 import {
   ChannelAdapter
 } from "./chunk-LBIKITQT.js";
@@ -71,7 +71,11 @@ import {
 import "./chunk-VUNV25KB.js";
 
 // src/adapters/discord/adapter.ts
-import { Client, GatewayIntentBits, MessageFlags } from "discord.js";
+import {
+  Client,
+  GatewayIntentBits,
+  MessageFlags
+} from "discord.js";
 
 // src/adapters/discord/send-queue.ts
 var DiscordSendQueue = class {
@@ -152,27 +156,47 @@ function formatViewerLinks(links, filePath) {
 [View diff${fileName ? ` \u2014 ${fileName}` : ""}](${links.diff})`;
   return text;
 }
-function formatToolCall(tool, verbosity = "medium") {
-  const si = STATUS_ICONS[tool.status || ""] || "\u{1F527}";
-  const name = tool.name || "Tool";
-  const label = verbosity === "low" ? formatToolTitle(name, tool.rawInput) : formatToolSummary(name, tool.rawInput);
-  let text = `${si} **${label}**`;
-  text += formatViewerLinks(tool.viewerLinks, tool.viewerFilePath);
-  if (verbosity === "high" || verbosity === "medium" && !tool.viewerLinks) {
-    const details = stripCodeFences(extractContentText(tool.content));
-    if (details) {
+function formatHighDetails(rawInput, content, maxLen) {
+  let text = "";
+  if (rawInput) {
+    const inputStr = typeof rawInput === "string" ? rawInput : JSON.stringify(rawInput, null, 2);
+    if (inputStr && inputStr !== "{}") {
       text += `
+**Input:**
 \`\`\`
-${truncateContent(details, 500)}
+${truncateContent(inputStr, maxLen)}
 \`\`\``;
     }
   }
+  const details = stripCodeFences(extractContentText(content));
+  if (details) {
+    text += `
+**Output:**
+\`\`\`
+${truncateContent(details, maxLen)}
+\`\`\``;
+  }
+  return text;
+}
+function formatToolCall(tool, verbosity = "medium") {
+  const si = resolveToolIcon(tool);
+  const name = tool.name || "Tool";
+  const label = verbosity === "low" ? formatToolTitle(name, tool.rawInput, tool.displayTitle) : formatToolSummary(name, tool.rawInput, tool.displaySummary);
+  let text = `${si} **${label}**`;
+  text += formatViewerLinks(tool.viewerLinks, tool.viewerFilePath);
+  if (verbosity === "high") {
+    text += formatHighDetails(tool.rawInput, tool.content, 500);
+  }
   return text;
 }
 function formatToolUpdate(update, verbosity = "medium") {
   return formatToolCall(update, verbosity);
 }
-function formatPlan(entries) {
+function formatPlan(entries, verbosity = "medium") {
+  if (verbosity === "medium") {
+    const done = entries.filter((e) => e.status === "completed").length;
+    return `\u{1F4CB} **Plan:** ${done}/${entries.length} steps completed`;
+  }
   const statusIcon = {
     pending: "\u23F3",
     in_progress: "\u{1F504}",
@@ -184,16 +208,23 @@ function formatPlan(entries) {
   return `**Plan:**
 ${lines.join("\n")}`;
 }
-function formatUsage(usage) {
-  const { tokensUsed, contextSize } = usage;
+function formatUsage(usage, verbosity = "medium") {
+  const { tokensUsed, contextSize, cost } = usage;
   if (tokensUsed == null) return "\u{1F4CA} Usage data unavailable";
+  if (verbosity === "medium") {
+    const costStr = cost != null ? ` \xB7 $${cost.toFixed(2)}` : "";
+    return `\u{1F4CA} ${formatTokens(tokensUsed)} tokens${costStr}`;
+  }
   if (contextSize == null) return `\u{1F4CA} ${formatTokens(tokensUsed)} tokens`;
   const ratio = tokensUsed / contextSize;
   const pct = Math.round(ratio * 100);
   const bar = progressBar(ratio);
   const emoji = pct >= 85 ? "\u26A0\uFE0F" : "\u{1F4CA}";
-  return `${emoji} ${formatTokens(tokensUsed)} / ${formatTokens(contextSize)} tokens
+  let text = `${emoji} ${formatTokens(tokensUsed)} / ${formatTokens(contextSize)} tokens
 ${bar} ${pct}%`;
+  if (cost != null) text += `
+\u{1F4B0} $${cost.toFixed(2)}`;
+  return text;
 }
 function splitMessage2(text, maxLength = 1800) {
   return splitMessage(text, maxLength);
@@ -548,8 +579,8 @@ var UsageMessage = class {
     this.sendQueue = sendQueue;
   }
   message;
-  async send(usage) {
-    const text = formatUsage(usage);
+  async send(usage, verbosity = "medium") {
+    const text = formatUsage(usage, verbosity);
     const embed = new EmbedBuilder().setDescription(text);
     try {
       if (this.message) {
@@ -573,10 +604,7 @@ var UsageMessage = class {
     const msg = this.message;
     this.message = void 0;
     try {
-      await this.sendQueue.enqueue(
-        () => msg.delete(),
-        { type: "other" }
-      );
+      await this.sendQueue.enqueue(() => msg.delete(), { type: "other" });
     } catch (err) {
       log.warn({ err }, "[UsageMessage] delete() failed");
     }
@@ -593,6 +621,10 @@ var PlanCard = class {
   latestEntries;
   lastSentText;
   flushTimer;
+  verbosity = "medium";
+  setVerbosity(v) {
+    this.verbosity = v;
+  }
   update(entries) {
     this.latestEntries = entries;
     if (this.flushTimer) clearTimeout(this.flushTimer);
@@ -621,7 +653,7 @@ var PlanCard = class {
   }
   async _flush() {
     if (!this.latestEntries) return;
-    const text = formatPlan(this.latestEntries);
+    const text = formatPlan(this.latestEntries, this.verbosity);
     if (this.message && text === this.lastSentText) return;
     this.lastSentText = text;
     const embed = new EmbedBuilder().setDescription(text);
@@ -675,14 +707,15 @@ var ActivityTracker = class {
     this.thinking.dismiss();
     this.thinking.reset();
   }
-  async onPlan(entries) {
+  async onPlan(entries, verbosity) {
     await this._firstEventGuard();
     this.thinking.dismiss();
     this.hasPlanCard = true;
+    if (verbosity) this.planCard.setVerbosity(verbosity);
     this.planCard.update(entries);
   }
-  async sendUsage(usage) {
-    await this.usage.send(usage);
+  async sendUsage(usage, verbosity = "medium") {
+    await this.usage.send(usage, verbosity);
   }
   async cleanup() {
     this.thinking.dismiss();
@@ -1583,7 +1616,10 @@ var DiscordAdapter = class extends ChannelAdapter {
     this.draftManager = new DraftManager(this.sendQueue);
     this.fileService = core.fileService;
     this.client.rest.on("rateLimited", (info) => {
-      log.warn({ route: info.route, timeToReset: info.timeToReset }, "[DiscordAdapter] Rate limited");
+      log.warn(
+        { route: info.route, timeToReset: info.timeToReset },
+        "[DiscordAdapter] Rate limited"
+      );
       this.sendQueue.onRateLimited();
     });
   }
@@ -1592,13 +1628,18 @@ var DiscordAdapter = class extends ChannelAdapter {
     return new Promise((resolve, reject) => {
       this.client.once("ready", async () => {
         try {
-          log.info({ guildId: this.discordConfig.guildId }, "[DiscordAdapter] Client ready, initializing...");
+          log.info(
+            { guildId: this.discordConfig.guildId },
+            "[DiscordAdapter] Client ready, initializing..."
+          );
           const guild = this.client.guilds.cache.get(this.discordConfig.guildId) ?? await this.client.guilds.fetch(this.discordConfig.guildId).catch(() => null);
           if (!guild) {
             throw new Error(`Guild not found: ${this.discordConfig.guildId}`);
           }
           this.guild = guild;
-          const saveConfig = (updates) => this.core.configManager.save(updates);
+          const saveConfig = (updates) => this.core.configManager.save(
+            updates
+          );
           const { forumChannel, notificationChannel } = await ensureForums(
             guild,
             {
@@ -1609,7 +1650,10 @@ var DiscordAdapter = class extends ChannelAdapter {
           );
           this.forumChannel = forumChannel;
           this.notificationChannel = notificationChannel;
-          this.skillManager = new SkillCommandManager(this.sendQueue, this.core.sessionManager);
+          this.skillManager = new SkillCommandManager(
+            this.sendQueue,
+            this.core.sessionManager
+          );
           this.permissionHandler = new PermissionHandler(
             guild.id,
             (sessionId) => this.core.sessionManager.getSession(sessionId),
@@ -1622,7 +1666,10 @@ var DiscordAdapter = class extends ChannelAdapter {
           try {
             await this.notificationChannel.send(welcomeMsg);
           } catch (err) {
-            log.warn({ err }, "[DiscordAdapter] Failed to send welcome message");
+            log.warn(
+              { err },
+              "[DiscordAdapter] Failed to send welcome message"
+            );
           }
           await this.setupAssistant();
           log.info("[DiscordAdapter] Initialization complete");
@@ -1641,7 +1688,10 @@ var DiscordAdapter = class extends ChannelAdapter {
       try {
         await this.assistantSession.destroy();
       } catch (err) {
-        log.warn({ err }, "[DiscordAdapter] Failed to destroy assistant session");
+        log.warn(
+          { err },
+          "[DiscordAdapter] Failed to destroy assistant session"
+        );
       }
       this.assistantSession = null;
     }
@@ -1679,7 +1729,12 @@ var DiscordAdapter = class extends ChannelAdapter {
         const userId = message.author.id;
         let text = message.content;
         log.debug(
-          { threadId, userId, text: text.slice(0, 50), attachmentCount: message.attachments.size },
+          {
+            threadId,
+            userId,
+            text: text.slice(0, 50),
+            attachmentCount: message.attachments.size
+          },
           "[DiscordAdapter] messageCreate received"
         );
         if (!text && message.attachments.size === 0) return;
@@ -1698,7 +1753,10 @@ var DiscordAdapter = class extends ChannelAdapter {
             "[discord-media] Processing incoming attachments"
           );
         }
-        const attachments = await this.processIncomingAttachments(message, sessionId);
+        const attachments = await this.processIncomingAttachments(
+          message,
+          sessionId
+        );
         if (!text && attachments.length > 0) {
           text = buildFallbackText(attachments);
         }
@@ -1711,7 +1769,10 @@ var DiscordAdapter = class extends ChannelAdapter {
         }
         if (this.discordConfig.assistantThreadId && threadId === this.discordConfig.assistantThreadId) {
           if (this.assistantSession && text) {
-            await this.assistantSession.enqueuePrompt(text, attachments.length > 0 ? attachments : void 0);
+            await this.assistantSession.enqueuePrompt(
+              text,
+              attachments.length > 0 ? attachments : void 0
+            );
           }
           return;
         }
@@ -1734,14 +1795,25 @@ var DiscordAdapter = class extends ChannelAdapter {
       try {
         const existing = this.guild.channels.cache.get(threadId) ?? await this.guild.channels.fetch(threadId);
         if (existing && existing.isThread()) {
-          await ensureUnarchived(existing);
-          log.info({ threadId }, "[DiscordAdapter] Reusing existing assistant thread");
+          await ensureUnarchived(
+            existing
+          );
+          log.info(
+            { threadId },
+            "[DiscordAdapter] Reusing existing assistant thread"
+          );
         } else {
-          log.warn({ threadId }, "[DiscordAdapter] Assistant thread not found, recreating...");
+          log.warn(
+            { threadId },
+            "[DiscordAdapter] Assistant thread not found, recreating..."
+          );
           threadId = null;
         }
       } catch {
-        log.warn({ threadId }, "[DiscordAdapter] Assistant thread inaccessible, recreating...");
+        log.warn(
+          { threadId },
+          "[DiscordAdapter] Assistant thread inaccessible, recreating..."
+        );
         threadId = null;
       }
     }
@@ -1795,7 +1867,10 @@ var DiscordAdapter = class extends ChannelAdapter {
             fileName = "voice.wav";
             mimeType = "audio/wav";
           } catch (err) {
-            log.warn({ err }, "[discord-media] OGG\u2192WAV conversion failed, saving original");
+            log.warn(
+              { err },
+              "[discord-media] OGG\u2192WAV conversion failed, saving original"
+            );
           }
         }
         return this.fileService.saveFile(sessionId, fileName, data, mimeType);
@@ -1803,10 +1878,18 @@ var DiscordAdapter = class extends ChannelAdapter {
     );
     const rejected = results.filter((r) => r.status === "rejected");
     if (rejected.length > 0) {
-      log.warn({ rejected: rejected.map((r) => r.reason) }, "[discord-media] Some attachments failed");
+      log.warn(
+        { rejected: rejected.map((r) => r.reason) },
+        "[discord-media] Some attachments failed"
+      );
     }
-    const saved = results.filter((r) => r.status === "fulfilled").map((r) => r.value).filter((att) => att !== null);
-    log.info({ count: saved.length, files: saved.map((a) => a.fileName) }, "[discord-media] Attachments processed");
+    const saved = results.filter(
+      (r) => r.status === "fulfilled"
+    ).map((r) => r.value).filter((att) => att !== null);
+    log.info(
+      { count: saved.length, files: saved.map((a) => a.fileName) },
+      "[discord-media] Attachments processed"
+    );
     return saved;
   }
   // ─── Helper: resolve thread ───────────────────────────────────────────────
@@ -1820,17 +1903,26 @@ var DiscordAdapter = class extends ChannelAdapter {
     try {
       const channel = this.guild.channels.cache.get(threadId) ?? await this.guild.channels.fetch(threadId);
       if (channel && channel.isThread()) return channel;
-      log.warn({ sessionId, threadId }, "[DiscordAdapter] Channel is not a thread");
+      log.warn(
+        { sessionId, threadId },
+        "[DiscordAdapter] Channel is not a thread"
+      );
       return null;
     } catch (err) {
-      log.warn({ err, sessionId, threadId }, "[DiscordAdapter] Failed to fetch thread");
+      log.warn(
+        { err, sessionId, threadId },
+        "[DiscordAdapter] Failed to fetch thread"
+      );
       return null;
     }
   }
   // ─── Helper: get or create activity tracker ──────────────────────────────
   getOrCreateTracker(sessionId, thread) {
     if (!this.sessionTrackers.has(sessionId)) {
-      this.sessionTrackers.set(sessionId, new ActivityTracker(thread, this.sendQueue));
+      this.sessionTrackers.set(
+        sessionId,
+        new ActivityTracker(thread, this.sendQueue)
+      );
     }
     return this.sessionTrackers.get(sessionId);
   }
@@ -1856,42 +1948,71 @@ var DiscordAdapter = class extends ChannelAdapter {
       if (noiseAction === "collapse" && this.verbosity === "low") return;
       const tracker = this.getOrCreateTracker(ctx.sessionId, ctx.thread);
       await tracker.onToolCall();
-      await this.draftManager.finalize(ctx.sessionId, ctx.thread, ctx.isAssistant);
-      await this.toolTracker.trackNewCall(ctx.sessionId, ctx.thread, {
-        id: String(meta.id ?? ""),
-        name: toolName,
-        kind: meta.kind,
-        status: String(meta.status ?? "running"),
-        content: meta.content,
-        viewerLinks: meta.viewerLinks,
-        viewerFilePath: meta.viewerFilePath
-      }, this.verbosity);
+      await this.draftManager.finalize(
+        ctx.sessionId,
+        ctx.thread,
+        ctx.isAssistant
+      );
+      await this.toolTracker.trackNewCall(
+        ctx.sessionId,
+        ctx.thread,
+        {
+          id: String(meta.id ?? ""),
+          name: toolName,
+          kind: meta.kind,
+          status: String(meta.status ?? "running"),
+          content: meta.content,
+          rawInput: meta.rawInput,
+          viewerLinks: meta.viewerLinks,
+          viewerFilePath: meta.viewerFilePath,
+          displaySummary: meta.displaySummary,
+          displayTitle: meta.displayTitle,
+          displayKind: meta.displayKind
+        },
+        this.verbosity
+      );
     },
     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
-      }, this.verbosity);
+      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,
+          rawInput: meta.rawInput,
+          viewerLinks: meta.viewerLinks,
+          viewerFilePath: meta.viewerFilePath,
+          displaySummary: meta.displaySummary,
+          displayTitle: meta.displayTitle,
+          displayKind: meta.displayKind
+        },
+        this.verbosity
+      );
     },
     onPlan: async (ctx, content) => {
       const entries = content.metadata?.entries ?? [];
       const tracker = this.getOrCreateTracker(ctx.sessionId, ctx.thread);
-      await tracker.onPlan(entries);
+      await tracker.onPlan(entries, this.verbosity);
     },
     onUsage: async (ctx, content) => {
-      await this.draftManager.finalize(ctx.sessionId, ctx.thread, ctx.isAssistant);
+      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
-      });
+      await tracker.sendUsage(
+        {
+          tokensUsed: meta.tokensUsed,
+          contextSize: meta.contextSize,
+          cost: meta.cost
+        },
+        this.verbosity
+      );
       try {
         const deepLink = buildDeepLink(this.guild.id, ctx.thread.id);
         await this.sendNotification({
@@ -1904,7 +2025,11 @@ var DiscordAdapter = class extends ChannelAdapter {
       }
     },
     onSessionEnd: async (ctx, _content) => {
-      await this.draftManager.finalize(ctx.sessionId, ctx.thread, ctx.isAssistant);
+      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);
@@ -1919,7 +2044,11 @@ var DiscordAdapter = class extends ChannelAdapter {
       }
     },
     onError: async (ctx, content) => {
-      await this.draftManager.finalize(ctx.sessionId, ctx.thread, ctx.isAssistant);
+      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);
@@ -1935,12 +2064,25 @@ var DiscordAdapter = class extends ChannelAdapter {
     onAttachment: async (ctx, content) => {
       if (!content.attachment) return;
       const { attachment } = content;
-      await this.draftManager.finalize(ctx.sessionId, ctx.thread, ctx.isAssistant);
+      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)");
+        log.warn(
+          {
+            sessionId: ctx.sessionId,
+            fileName: attachment.fileName,
+            size: attachment.size
+          },
+          "[discord-media] File too large (>25MB)"
+        );
         try {
           await this.sendQueue.enqueue(
-            () => ctx.thread.send({ content: `\u26A0\uFE0F File too large to send (${Math.round(attachment.size / 1024 / 1024)}MB): ${attachment.fileName}` }),
+            () => ctx.thread.send({
+              content: `\u26A0\uFE0F File too large to send (${Math.round(attachment.size / 1024 / 1024)}MB): ${attachment.fileName}`
+            }),
             { type: "other" }
           );
         } catch {
@@ -1949,7 +2091,11 @@ var DiscordAdapter = class extends ChannelAdapter {
       }
       try {
         await this.sendQueue.enqueue(
-          () => ctx.thread.send({ files: [{ attachment: attachment.filePath, name: attachment.fileName }] }),
+          () => ctx.thread.send({
+            files: [
+              { attachment: attachment.filePath, name: attachment.fileName }
+            ]
+          }),
           { type: "other" }
         );
         if (attachment.type === "audio") {
@@ -1960,7 +2106,10 @@ var DiscordAdapter = class extends ChannelAdapter {
           }
         }
       } catch (err) {
-        log.error({ err, sessionId: ctx.sessionId, fileName: attachment.fileName }, "[discord-media] Failed to send attachment");
+        log.error(
+          { err, sessionId: ctx.sessionId, fileName: attachment.fileName },
+          "[discord-media] Failed to send attachment"
+        );
       }
     },
     onSystemMessage: async (ctx, content) => {
@@ -1989,12 +2138,19 @@ var DiscordAdapter = class extends ChannelAdapter {
   async sendPermissionRequest(sessionId, request) {
     const session = this.core.sessionManager.getSession(sessionId);
     if (!session) {
-      log.warn({ sessionId }, "[DiscordAdapter] sendPermissionRequest: session not found");
+      log.warn(
+        { sessionId },
+        "[DiscordAdapter] sendPermissionRequest: session not found"
+      );
       return;
     }
     const thread = await this.getThread(sessionId);
     if (!thread) return;
-    await this.permissionHandler.sendPermissionRequest(session, request, thread);
+    await this.permissionHandler.sendPermissionRequest(
+      session,
+      request,
+      thread
+    );
   }
   // ─── sendNotification ─────────────────────────────────────────────────────
   async sendNotification(notification) {
@@ -2080,4 +2236,4 @@ ${notification.deepLink}`;
 export {
   DiscordAdapter
 };
-//# sourceMappingURL=discord-7IVQKB2H.js.map
+//# sourceMappingURL=discord-OMC52Y54.js.map