Merge branch 'main' into feat/tools-alsoAllow

2026-01-26 20:39:09 +00:00
parent 34b3494246 bdea265704
commit bc8c31eeed
59 changed files with 7076 additions and 180 deletions
--- a/src/agents/workspace.test.ts
+++ b/src/agents/workspace.test.ts
@@ -1,152 +1,49 @@
-import fs from "node:fs/promises";
-import os from "node:os";
-import path from "node:path";
 import { describe, expect, it } from "vitest";
-import { runCommandWithTimeout } from "../process/exec.js";
-import type { WorkspaceBootstrapFile } from "./workspace.js";
+
 import {
-  DEFAULT_AGENTS_FILENAME,
-  DEFAULT_BOOTSTRAP_FILENAME,
-  DEFAULT_HEARTBEAT_FILENAME,
-  DEFAULT_IDENTITY_FILENAME,
-  DEFAULT_SOUL_FILENAME,
-  DEFAULT_TOOLS_FILENAME,
-  DEFAULT_USER_FILENAME,
-  ensureAgentWorkspace,
-  filterBootstrapFilesForSession,
+  DEFAULT_MEMORY_ALT_FILENAME,
+  DEFAULT_MEMORY_FILENAME,
+  loadWorkspaceBootstrapFiles,
 } from "./workspace.js";
+import { makeTempWorkspace, writeWorkspaceFile } from "../test-helpers/workspace.js";

-describe("ensureAgentWorkspace", () => {
-  it("creates directory and bootstrap files when missing", async () => {
-    const dir = await fs.mkdtemp(path.join(os.tmpdir(), "clawdbot-ws-"));
-    const nested = path.join(dir, "nested");
-    const result = await ensureAgentWorkspace({
-      dir: nested,
-      ensureBootstrapFiles: true,
-    });
-    expect(result.dir).toBe(path.resolve(nested));
-    expect(result.agentsPath).toBe(path.join(path.resolve(nested), "AGENTS.md"));
-    expect(result.agentsPath).toBeDefined();
-    if (!result.agentsPath) throw new Error("agentsPath missing");
-    const content = await fs.readFile(result.agentsPath, "utf-8");
-    expect(content).toContain("# AGENTS.md");
+describe("loadWorkspaceBootstrapFiles", () => {
+  it("includes MEMORY.md when present", async () => {
+    const tempDir = await makeTempWorkspace("clawdbot-workspace-");
+    await writeWorkspaceFile({ dir: tempDir, name: "MEMORY.md", content: "memory" });

-    const identity = path.join(path.resolve(nested), "IDENTITY.md");
-    const user = path.join(path.resolve(nested), "USER.md");
-    const heartbeat = path.join(path.resolve(nested), "HEARTBEAT.md");
-    const bootstrap = path.join(path.resolve(nested), "BOOTSTRAP.md");
-    await expect(fs.stat(identity)).resolves.toBeDefined();
-    await expect(fs.stat(user)).resolves.toBeDefined();
-    await expect(fs.stat(heartbeat)).resolves.toBeDefined();
-    await expect(fs.stat(bootstrap)).resolves.toBeDefined();
+    const files = await loadWorkspaceBootstrapFiles(tempDir);
+    const memoryEntries = files.filter((file) =>
+      [DEFAULT_MEMORY_FILENAME, DEFAULT_MEMORY_ALT_FILENAME].includes(file.name),
+    );
+
+    expect(memoryEntries).toHaveLength(1);
+    expect(memoryEntries[0]?.missing).toBe(false);
+    expect(memoryEntries[0]?.content).toBe("memory");
  });

-  it("initializes a git repo for brand-new workspaces when git is available", async () => {
-    const dir = await fs.mkdtemp(path.join(os.tmpdir(), "clawdbot-ws-"));
-    const nested = path.join(dir, "nested");
-    const gitAvailable = await runCommandWithTimeout(["git", "--version"], { timeoutMs: 2_000 })
-      .then((res) => res.code === 0)
-      .catch(() => false);
-    if (!gitAvailable) return;
+  it("includes memory.md when MEMORY.md is absent", async () => {
+    const tempDir = await makeTempWorkspace("clawdbot-workspace-");
+    await writeWorkspaceFile({ dir: tempDir, name: "memory.md", content: "alt" });

-    await ensureAgentWorkspace({
-      dir: nested,
-      ensureBootstrapFiles: true,
-    });
+    const files = await loadWorkspaceBootstrapFiles(tempDir);
+    const memoryEntries = files.filter((file) =>
+      [DEFAULT_MEMORY_FILENAME, DEFAULT_MEMORY_ALT_FILENAME].includes(file.name),
+    );

-    await expect(fs.stat(path.join(nested, ".git"))).resolves.toBeDefined();
+    expect(memoryEntries).toHaveLength(1);
+    expect(memoryEntries[0]?.missing).toBe(false);
+    expect(memoryEntries[0]?.content).toBe("alt");
  });

-  it("does not initialize git when workspace already exists", async () => {
-    const dir = await fs.mkdtemp(path.join(os.tmpdir(), "clawdbot-ws-"));
-    await fs.writeFile(path.join(dir, "AGENTS.md"), "custom", "utf-8");
+  it("omits memory entries when no memory files exist", async () => {
+    const tempDir = await makeTempWorkspace("clawdbot-workspace-");

-    await ensureAgentWorkspace({
-      dir,
-      ensureBootstrapFiles: true,
-    });
+    const files = await loadWorkspaceBootstrapFiles(tempDir);
+    const memoryEntries = files.filter((file) =>
+      [DEFAULT_MEMORY_FILENAME, DEFAULT_MEMORY_ALT_FILENAME].includes(file.name),
+    );

-    await expect(fs.stat(path.join(dir, ".git"))).rejects.toBeDefined();
-  });
-
-  it("does not overwrite existing AGENTS.md", async () => {
-    const dir = await fs.mkdtemp(path.join(os.tmpdir(), "clawdbot-ws-"));
-    const agentsPath = path.join(dir, "AGENTS.md");
-    await fs.writeFile(agentsPath, "custom", "utf-8");
-    await ensureAgentWorkspace({ dir, ensureBootstrapFiles: true });
-    expect(await fs.readFile(agentsPath, "utf-8")).toBe("custom");
-  });
-
-  it("does not recreate BOOTSTRAP.md once workspace exists", async () => {
-    const dir = await fs.mkdtemp(path.join(os.tmpdir(), "clawdbot-ws-"));
-    const agentsPath = path.join(dir, "AGENTS.md");
-    const bootstrapPath = path.join(dir, "BOOTSTRAP.md");
-
-    await fs.writeFile(agentsPath, "custom", "utf-8");
-    await fs.rm(bootstrapPath, { force: true });
-
-    await ensureAgentWorkspace({ dir, ensureBootstrapFiles: true });
-
-    await expect(fs.stat(bootstrapPath)).rejects.toBeDefined();
-  });
-});
-
-describe("filterBootstrapFilesForSession", () => {
-  const files: WorkspaceBootstrapFile[] = [
-    {
-      name: DEFAULT_AGENTS_FILENAME,
-      path: "/tmp/AGENTS.md",
-      content: "agents",
-      missing: false,
-    },
-    {
-      name: DEFAULT_SOUL_FILENAME,
-      path: "/tmp/SOUL.md",
-      content: "soul",
-      missing: false,
-    },
-    {
-      name: DEFAULT_TOOLS_FILENAME,
-      path: "/tmp/TOOLS.md",
-      content: "tools",
-      missing: false,
-    },
-    {
-      name: DEFAULT_IDENTITY_FILENAME,
-      path: "/tmp/IDENTITY.md",
-      content: "identity",
-      missing: false,
-    },
-    {
-      name: DEFAULT_USER_FILENAME,
-      path: "/tmp/USER.md",
-      content: "user",
-      missing: false,
-    },
-    {
-      name: DEFAULT_HEARTBEAT_FILENAME,
-      path: "/tmp/HEARTBEAT.md",
-      content: "heartbeat",
-      missing: false,
-    },
-    {
-      name: DEFAULT_BOOTSTRAP_FILENAME,
-      path: "/tmp/BOOTSTRAP.md",
-      content: "bootstrap",
-      missing: false,
-    },
-  ];
-
-  it("keeps full bootstrap set for non-subagent sessions", () => {
-    const result = filterBootstrapFilesForSession(files, "agent:main:session:abc");
-    expect(result.map((file) => file.name)).toEqual(files.map((file) => file.name));
-  });
-
-  it("limits bootstrap files for subagent sessions", () => {
-    const result = filterBootstrapFilesForSession(files, "agent:main:subagent:abc");
-    expect(result.map((file) => file.name)).toEqual([
-      DEFAULT_AGENTS_FILENAME,
-      DEFAULT_TOOLS_FILENAME,
-    ]);
+    expect(memoryEntries).toHaveLength(0);
  });
 });
--- a/src/agents/workspace.ts
+++ b/src/agents/workspace.ts
@@ -26,6 +26,8 @@ export const DEFAULT_IDENTITY_FILENAME = "IDENTITY.md";
 export const DEFAULT_USER_FILENAME = "USER.md";
 export const DEFAULT_HEARTBEAT_FILENAME = "HEARTBEAT.md";
 export const DEFAULT_BOOTSTRAP_FILENAME = "BOOTSTRAP.md";
+export const DEFAULT_MEMORY_FILENAME = "MEMORY.md";
+export const DEFAULT_MEMORY_ALT_FILENAME = "memory.md";

 const TEMPLATE_DIR = path.resolve(
  path.dirname(fileURLToPath(import.meta.url)),
@@ -61,7 +63,9 @@ export type WorkspaceBootstrapFileName =
  | typeof DEFAULT_IDENTITY_FILENAME
  | typeof DEFAULT_USER_FILENAME
  | typeof DEFAULT_HEARTBEAT_FILENAME
-  | typeof DEFAULT_BOOTSTRAP_FILENAME;
+  | typeof DEFAULT_BOOTSTRAP_FILENAME
+  | typeof DEFAULT_MEMORY_FILENAME
+  | typeof DEFAULT_MEMORY_ALT_FILENAME;

 export type WorkspaceBootstrapFile = {
  name: WorkspaceBootstrapFileName;
@@ -184,6 +188,39 @@ export async function ensureAgentWorkspace(params?: {
  };
 }

+async function resolveMemoryBootstrapEntries(
+  resolvedDir: string,
+): Promise<Array<{ name: WorkspaceBootstrapFileName; filePath: string }>> {
+  const candidates: WorkspaceBootstrapFileName[] = [
+    DEFAULT_MEMORY_FILENAME,
+    DEFAULT_MEMORY_ALT_FILENAME,
+  ];
+  const entries: Array<{ name: WorkspaceBootstrapFileName; filePath: string }> = [];
+  for (const name of candidates) {
+    const filePath = path.join(resolvedDir, name);
+    try {
+      await fs.access(filePath);
+      entries.push({ name, filePath });
+    } catch {
+      // optional
+    }
+  }
+  if (entries.length <= 1) return entries;
+
+  const seen = new Set<string>();
+  const deduped: Array<{ name: WorkspaceBootstrapFileName; filePath: string }> = [];
+  for (const entry of entries) {
+    let key = entry.filePath;
+    try {
+      key = await fs.realpath(entry.filePath);
+    } catch {}
+    if (seen.has(key)) continue;
+    seen.add(key);
+    deduped.push(entry);
+  }
+  return deduped;
+}
+
 export async function loadWorkspaceBootstrapFiles(dir: string): Promise<WorkspaceBootstrapFile[]> {
  const resolvedDir = resolveUserPath(dir);

@@ -221,6 +258,8 @@ export async function loadWorkspaceBootstrapFiles(dir: string): Promise<Workspac
    },
  ];

+  entries.push(...(await resolveMemoryBootstrapEntries(resolvedDir)));
+
  const result: WorkspaceBootstrapFile[] = [];
  for (const entry of entries) {
    try {
--- a/src/channels/plugins/actions/discord.test.ts
+++ b/src/channels/plugins/actions/discord.test.ts
@@ -127,4 +127,30 @@ describe("handleDiscordMessageAction", () => {
      }),
    );
  });
+
+  it("accepts threadId for thread replies (tool compatibility)", async () => {
+    sendMessageDiscord.mockClear();
+    const handleDiscordMessageAction = await loadHandleDiscordMessageAction();
+
+    await handleDiscordMessageAction({
+      action: "thread-reply",
+      params: {
+        // The `message` tool uses `threadId`.
+        threadId: "999",
+        // Include a conflicting channelId to ensure threadId takes precedence.
+        channelId: "123",
+        message: "hi",
+      },
+      cfg: {} as ClawdbotConfig,
+      accountId: "ops",
+    });
+
+    expect(sendMessageDiscord).toHaveBeenCalledWith(
+      "channel:999",
+      "hi",
+      expect.objectContaining({
+        accountId: "ops",
+      }),
+    );
+  });
 });
--- a/src/channels/plugins/actions/discord/handle-action.guild-admin.ts
+++ b/src/channels/plugins/actions/discord/handle-action.guild-admin.ts
@@ -393,11 +393,17 @@ export async function tryHandleDiscordMessageActionGuildAdmin(params: {
    });
    const mediaUrl = readStringParam(actionParams, "media", { trim: false });
    const replyTo = readStringParam(actionParams, "replyTo");
+
+    // `message.thread-reply` (tool) uses `threadId`, while the CLI historically used `to`/`channelId`.
+    // Prefer `threadId` when present to avoid accidentally replying in the parent channel.
+    const threadId = readStringParam(actionParams, "threadId");
+    const channelId = threadId ?? resolveChannelId();
+
    return await handleDiscordAction(
      {
        action: "threadReply",
        accountId: accountId ?? undefined,
-        channelId: resolveChannelId(),
+        channelId,
        content,
        mediaUrl: mediaUrl ?? undefined,
        replyTo: replyTo ?? undefined,
--- a/src/discord/monitor/presence-cache.test.ts
+++ b/src/discord/monitor/presence-cache.test.ts
@@ -1,11 +1,6 @@
 import { beforeEach, describe, expect, it } from "vitest";
 import type { GatewayPresenceUpdate } from "discord-api-types/v10";
-import {
-  clearPresences,
-  getPresence,
-  presenceCacheSize,
-  setPresence,
-} from "./presence-cache.js";
+import { clearPresences, getPresence, presenceCacheSize, setPresence } from "./presence-cache.js";

 describe("presence-cache", () => {
  beforeEach(() => {
--- a/src/security/audit.test.ts
+++ b/src/security/audit.test.ts
@@ -862,12 +862,33 @@ describe("security audit", () => {
    await fs.chmod(configPath, 0o600);

    const cfg: ClawdbotConfig = { logging: { redactSensitive: "off" } };
+    const user = "DESKTOP-TEST\\Tester";
+    const execIcacls = isWindows
+      ? async (_cmd: string, args: string[]) => {
+          const target = args[0];
+          if (target === includePath) {
+            return {
+              stdout: `${target} NT AUTHORITY\\SYSTEM:(F)\n BUILTIN\\Users:(W)\n ${user}:(F)\n`,
+              stderr: "",
+            };
+          }
+          return {
+            stdout: `${target} NT AUTHORITY\\SYSTEM:(F)\n ${user}:(F)\n`,
+            stderr: "",
+          };
+        }
+      : undefined;
    const res = await runSecurityAudit({
      config: cfg,
      includeFilesystem: true,
      includeChannelSecurity: false,
      stateDir,
      configPath,
+      platform: isWindows ? "win32" : undefined,
+      env: isWindows
+        ? { ...process.env, USERNAME: "Tester", USERDOMAIN: "DESKTOP-TEST" }
+        : undefined,
+      execIcacls,
    });

    const expectedCheckId = isWindows