fix: stabilize tests and logging

src/plugins/install.test.ts

@@ -4,7 +4,7 @@ import fs from "node:fs";
 import os from "node:os";
 import path from "node:path";
 import JSZip from "jszip";
-import { afterEach, describe, expect, it, vi } from "vitest";
+import { afterEach, describe, expect, it } from "vitest";
 
 const tempDirs: string[] = [];
 
@@ -77,22 +77,6 @@ function packToArchive({
   return dest;
 }
 
-async function withStateDir<T>(stateDir: string, fn: () => Promise<T>) {
-  const prev = process.env.CLAWDBOT_STATE_DIR;
-  process.env.CLAWDBOT_STATE_DIR = stateDir;
-  vi.resetModules();
-  try {
-    return await fn();
-  } finally {
-    if (prev === undefined) {
-      delete process.env.CLAWDBOT_STATE_DIR;
-    } else {
-      process.env.CLAWDBOT_STATE_DIR = prev;
-    }
-    vi.resetModules();
-  }
-}
-
 afterEach(() => {
   for (const dir of tempDirs.splice(0)) {
     try {
@@ -126,10 +110,9 @@ describe("installPluginFromArchive", () => {
       outName: "plugin.tgz",
     });
 
-    const result = await withStateDir(stateDir, async () => {
-      const { installPluginFromArchive } = await import("./install.js");
-      return await installPluginFromArchive({ archivePath });
-    });
+    const extensionsDir = path.join(stateDir, "extensions");
+    const { installPluginFromArchive } = await import("./install.js");
+    const result = await installPluginFromArchive({ archivePath, extensionsDir });
     expect(result.ok).toBe(true);
     if (!result.ok) return;
     expect(result.pluginId).toBe("voice-call");
@@ -160,12 +143,10 @@ describe("installPluginFromArchive", () => {
       outName: "plugin.tgz",
     });
 
-    const { first, second } = await withStateDir(stateDir, async () => {
-      const { installPluginFromArchive } = await import("./install.js");
-      const first = await installPluginFromArchive({ archivePath });
-      const second = await installPluginFromArchive({ archivePath });
-      return { first, second };
-    });
+    const extensionsDir = path.join(stateDir, "extensions");
+    const { installPluginFromArchive } = await import("./install.js");
+    const first = await installPluginFromArchive({ archivePath, extensionsDir });
+    const second = await installPluginFromArchive({ archivePath, extensionsDir });
 
     expect(first.ok).toBe(true);
     expect(second.ok).toBe(false);
@@ -191,10 +172,9 @@ describe("installPluginFromArchive", () => {
     const buffer = await zip.generateAsync({ type: "nodebuffer" });
     fs.writeFileSync(archivePath, buffer);
 
-    const result = await withStateDir(stateDir, async () => {
-      const { installPluginFromArchive } = await import("./install.js");
-      return await installPluginFromArchive({ archivePath });
-    });
+    const extensionsDir = path.join(stateDir, "extensions");
+    const { installPluginFromArchive } = await import("./install.js");
+    const result = await installPluginFromArchive({ archivePath, extensionsDir });
 
     expect(result.ok).toBe(true);
     if (!result.ok) return;
@@ -243,18 +223,23 @@ describe("installPluginFromArchive", () => {
       });
     })();
 
-    const result = await withStateDir(stateDir, async () => {
-      const { installPluginFromArchive } = await import("./install.js");
-      const first = await installPluginFromArchive({ archivePath: archiveV1 });
-      const second = await installPluginFromArchive({ archivePath: archiveV2, mode: "update" });
-      return { first, second };
+    const extensionsDir = path.join(stateDir, "extensions");
+    const { installPluginFromArchive } = await import("./install.js");
+    const first = await installPluginFromArchive({
+      archivePath: archiveV1,
+      extensionsDir,
+    });
+    const second = await installPluginFromArchive({
+      archivePath: archiveV2,
+      extensionsDir,
+      mode: "update",
     });
 
-    expect(result.first.ok).toBe(true);
-    expect(result.second.ok).toBe(true);
-    if (!result.second.ok) return;
+    expect(first.ok).toBe(true);
+    expect(second.ok).toBe(true);
+    if (!second.ok) return;
     const manifest = JSON.parse(
-      fs.readFileSync(path.join(result.second.targetDir, "package.json"), "utf-8"),
+      fs.readFileSync(path.join(second.targetDir, "package.json"), "utf-8"),
     ) as { version?: string };
     expect(manifest.version).toBe("0.0.2");
   });
@@ -276,10 +261,9 @@ describe("installPluginFromArchive", () => {
       outName: "bad.tgz",
     });
 
-    const result = await withStateDir(stateDir, async () => {
-      const { installPluginFromArchive } = await import("./install.js");
-      return await installPluginFromArchive({ archivePath });
-    });
+    const extensionsDir = path.join(stateDir, "extensions");
+    const { installPluginFromArchive } = await import("./install.js");
+    const result = await installPluginFromArchive({ archivePath, extensionsDir });
     expect(result.ok).toBe(false);
     if (result.ok) return;
     expect(result.error).toContain("clawdbot.extensions");

src/plugins/runtime/index.ts

@@ -38,7 +38,10 @@ import {
   updateLastRoute,
 } from "../../config/sessions.js";
 import { auditDiscordChannelPermissions } from "../../discord/audit.js";
-import { listDiscordDirectoryGroupsLive, listDiscordDirectoryPeersLive } from "../../discord/directory-live.js";
+import {
+  listDiscordDirectoryGroupsLive,
+  listDiscordDirectoryPeersLive,
+} from "../../discord/directory-live.js";
 import { monitorDiscordProvider } from "../../discord/monitor.js";
 import { probeDiscord } from "../../discord/probe.js";
 import { resolveDiscordChannelAllowlist } from "../../discord/resolve-channels.js";
@@ -68,7 +71,10 @@ import { monitorSignalProvider } from "../../signal/index.js";
 import { probeSignal } from "../../signal/probe.js";
 import { sendMessageSignal } from "../../signal/send.js";
 import { monitorSlackProvider } from "../../slack/index.js";
-import { listSlackDirectoryGroupsLive, listSlackDirectoryPeersLive } from "../../slack/directory-live.js";
+import {
+  listSlackDirectoryGroupsLive,
+  listSlackDirectoryPeersLive,
+} from "../../slack/directory-live.js";
 import { probeSlack } from "../../slack/probe.js";
 import { resolveSlackChannelAllowlist } from "../../slack/resolve-channels.js";
 import { resolveSlackUserAllowlist } from "../../slack/resolve-users.js";
@@ -137,12 +143,12 @@ export function createPluginRuntime(): PluginRuntime {
       registerMemoryCli,
     },
     channel: {
-    text: {
-      chunkMarkdownText,
-      chunkText,
-      resolveTextChunkLimit,
-      hasControlCommand,
-    },
+      text: {
+        chunkMarkdownText,
+        chunkText,
+        resolveTextChunkLimit,
+        hasControlCommand,
+      },
       reply: {
         dispatchReplyWithBufferedBlockDispatcher,
         createReplyDispatcherWithTyping,
@@ -181,12 +187,12 @@ export function createPluginRuntime(): PluginRuntime {
         createInboundDebouncer,
         resolveInboundDebounceMs,
       },
-    commands: {
-      resolveCommandAuthorizedFromAuthorizers,
-      isControlCommandMessage,
-      shouldComputeCommandAuthorized,
-      shouldHandleTextCommands,
-    },
+      commands: {
+        resolveCommandAuthorizedFromAuthorizers,
+        isControlCommandMessage,
+        shouldComputeCommandAuthorized,
+        shouldHandleTextCommands,
+      },
       discord: {
         messageActions: discordMessageActions,
         auditChannelPermissions: auditDiscordChannelPermissions,

src/plugins/runtime/types.ts

@@ -59,8 +59,7 @@ type MediaKindFromMime = typeof import("../../media/constants.js").mediaKindFrom
 type IsVoiceCompatibleAudio = typeof import("../../media/audio.js").isVoiceCompatibleAudio;
 type GetImageMetadata = typeof import("../../media/image-ops.js").getImageMetadata;
 type ResizeToJpeg = typeof import("../../media/image-ops.js").resizeToJpeg;
-type CreateMemoryGetTool =
-  typeof import("../../agents/tools/memory-tool.js").createMemoryGetTool;
+type CreateMemoryGetTool = typeof import("../../agents/tools/memory-tool.js").createMemoryGetTool;
 type CreateMemorySearchTool =
   typeof import("../../agents/tools/memory-tool.js").createMemorySearchTool;
 type RegisterMemoryCli = typeof import("../../cli/memory-cli.js").registerMemoryCli;