@spzhongwin/skill-logger-plugin 1.0.16 → 1.0.17

package/src/ws-client.test.ts

@@ -1,158 +1,247 @@
-import { describe, it } from "node:test";
-import assert from "node:assert/strict";
-import fs from "node:fs";
-import os from "node:os";
-import path from "node:path";
-import { DatabaseSync } from "node:sqlite";
-import {
-  normalizeAssistantUserId,
-  normalizeCommandCode,
-  parseAssistantWorkspaceAgentId,
-  readCronJobsByAgentId,
-  findInstalledExpertSkillsRoot,
-  shouldSyncBuiltInTemplate,
-} from "./ws-client.ts";
-
-describe("command code boundary", () => {
-  it("只接受单一路径段，不静默改写路径穿越输入", () => {
-    assert.equal(normalizeCommandCode("demo-skill"), "demo-skill");
-    assert.equal(normalizeCommandCode("../demo"), undefined);
-    assert.equal(normalizeCommandCode("a/b"), undefined);
-    assert.equal(normalizeCommandCode("a\\b"), undefined);
-    assert.equal(normalizeCommandCode("."), undefined);
-    assert.equal(normalizeCommandCode(".."), undefined);
-    assert.equal(normalizeCommandCode(""), undefined);
-    assert.equal(normalizeCommandCode(123), undefined);
-  });
-});
-
-describe("assistant workspace naming", () => {
-  it("accepts workspace-assistant-* only when suffix is at least 5 digits", () => {
-    assert.equal(parseAssistantWorkspaceAgentId("workspace-assistant-12345"), "assistant-12345");
-    assert.equal(
-      parseAssistantWorkspaceAgentId("workspace-assistant-12342325232333223223"),
-      "assistant-12342325232333223223"
-    );
-    assert.equal(parseAssistantWorkspaceAgentId("workspace-assistant-000001"), "assistant-000001");
-  });
-
-  it("rejects short, non-numeric, and malformed workspace names", () => {
-    assert.equal(parseAssistantWorkspaceAgentId("workspace-assistant-1234"), undefined);
-    assert.equal(parseAssistantWorkspaceAgentId("workspace-assistant-1234a"), undefined);
-    assert.equal(parseAssistantWorkspaceAgentId("workspace-assistant-abcde"), undefined);
-    assert.equal(parseAssistantWorkspaceAgentId("workspace-coder-12345"), undefined);
-  });
-
-  it("normalizes command userId using the same numeric suffix rule", () => {
-    assert.equal(normalizeAssistantUserId("12345"), "12345");
-    assert.equal(normalizeAssistantUserId("assistant-12345"), "12345");
-    assert.equal(normalizeAssistantUserId("assistant-000001"), "000001");
-  });
-
-  it("rejects unsafe or non-conforming command userId values", () => {
-    assert.equal(normalizeAssistantUserId("1234"), undefined);
-    assert.equal(normalizeAssistantUserId("assistant-1234"), undefined);
-    assert.equal(normalizeAssistantUserId("assistant-1234a"), undefined);
-    assert.equal(normalizeAssistantUserId("../assistant-12345"), undefined);
-  });
-});
-
-describe("built-in template update boundary", () => {
-  it("only syncs the template for an explicit built-in UPDATE_SKILL command", () => {
-    assert.equal(shouldSyncBuiltInTemplate("UPDATE_SKILL", true), true);
-    assert.equal(shouldSyncBuiltInTemplate("UPDATE_SKILL", false), false);
-    assert.equal(shouldSyncBuiltInTemplate("UPDATE_SKILL", undefined), false);
-    assert.equal(shouldSyncBuiltInTemplate("INSTALL_SKILL", true), false);
-    assert.equal(shouldSyncBuiltInTemplate("UNINSTALL_SKILL", true), false);
-  });
-});
-
-describe("expert skill update target", () => {
-  it("返回 .user/skills 父目录，由安装器统一追加 skill code", async () => {
-    const root = fs.mkdtempSync(path.join(os.tmpdir(), "openclaw-expert-skill-"));
-    try {
-      const skillsRoot = path.join(root, "workspace-assistant-12345", ".user", "skills");
-      fs.mkdirSync(path.join(skillsRoot, "demo"), { recursive: true });
-
-      assert.equal(await findInstalledExpertSkillsRoot(root, "12345", "demo"), skillsRoot);
-      assert.equal(await findInstalledExpertSkillsRoot(root, "12345", "missing"), undefined);
-    } finally {
-      fs.rmSync(root, { recursive: true, force: true });
-    }
-  });
-});
-
-describe("cron job sqlite lookup", () => {
-  it("returns all cron_jobs rows for the requested agent_id", () => {
-    const dir = fs.mkdtempSync(path.join(os.tmpdir(), "openclaw-cron-jobs-"));
-    const dbPath = path.join(dir, "openclaw.sqlite");
-    const db = new DatabaseSync(dbPath);
-    try {
-      db.exec(`
-        CREATE TABLE cron_jobs (
-          id INTEGER PRIMARY KEY,
-          agent_id TEXT NOT NULL,
-          name TEXT NOT NULL,
-          cron TEXT NOT NULL
-        );
-      `);
-      db.prepare("INSERT INTO cron_jobs (agent_id, name, cron) VALUES (?, ?, ?)").run(
-        "assistant-1579723293989240833",
-        "morning",
-        "0 9 * * *"
-      );
-      db.prepare("INSERT INTO cron_jobs (agent_id, name, cron) VALUES (?, ?, ?)").run(
-        "assistant-1579723293989240833",
-        "evening",
-        "0 18 * * *"
-      );
-      db.prepare("INSERT INTO cron_jobs (agent_id, name, cron) VALUES (?, ?, ?)").run(
-        "assistant-000001",
-        "other",
-        "0 12 * * *"
-      );
-    } finally {
-      db.close();
-    }
-
-    const rows = readCronJobsByAgentId("assistant-1579723293989240833", dbPath);
-
-    assert.equal(rows.length, 2);
-    assert.deepEqual(
-      rows.map((row) => row.name),
-      ["morning", "evening"]
-    );
-  });
-
-  it("returns an empty list when no cron_jobs row matches", () => {
-    const dir = fs.mkdtempSync(path.join(os.tmpdir(), "openclaw-cron-jobs-"));
-    const dbPath = path.join(dir, "openclaw.sqlite");
-    const db = new DatabaseSync(dbPath);
-    try {
-      db.exec("CREATE TABLE cron_jobs (id INTEGER PRIMARY KEY, agent_id TEXT NOT NULL);");
-    } finally {
-      db.close();
-    }
-
-    assert.deepEqual(readCronJobsByAgentId("assistant-1579723293989240833", dbPath), []);
-  });
-
-  it("returns an empty list when the sqlite file is not readable", () => {
-    const missingPath = path.join(os.tmpdir(), `missing-openclaw-${Date.now()}.sqlite`);
-
-    assert.deepEqual(readCronJobsByAgentId("assistant-1579723293989240833", missingPath), []);
-  });
-
-  it("returns an empty list when cron_jobs table does not exist", () => {
-    const dir = fs.mkdtempSync(path.join(os.tmpdir(), "openclaw-cron-jobs-"));
-    const dbPath = path.join(dir, "openclaw.sqlite");
-    const db = new DatabaseSync(dbPath);
-    try {
-      db.exec("CREATE TABLE other_table (id INTEGER PRIMARY KEY, agent_id TEXT NOT NULL);");
-    } finally {
-      db.close();
-    }
-
-    assert.deepEqual(readCronJobsByAgentId("assistant-1579723293989240833", dbPath), []);
-  });
-});
+import { describe, it } from "node:test";
+import assert from "node:assert/strict";
+import fs from "node:fs";
+import os from "node:os";
+import path from "node:path";
+import { DatabaseSync } from "node:sqlite";
+import {
+  normalizeAssistantUserId,
+  normalizeCommandCode,
+  enabledAgentIdsFromAccounts,
+  resolveSkillInstallTarget,
+  parseAssistantWorkspaceAgentId,
+  readCronJobsByAgentId,
+  findInstalledExpertSkillsRoot,
+  shouldSyncBuiltInTemplate,
+} from "./ws-client.ts";
+
+describe("command code boundary", () => {
+  it("只接受单一路径段，不静默改写路径穿越输入", () => {
+    assert.equal(normalizeCommandCode("demo-skill"), "demo-skill");
+    assert.equal(normalizeCommandCode("../demo"), undefined);
+    assert.equal(normalizeCommandCode("a/b"), undefined);
+    assert.equal(normalizeCommandCode("a\\b"), undefined);
+    assert.equal(normalizeCommandCode("."), undefined);
+    assert.equal(normalizeCommandCode(".."), undefined);
+    assert.equal(normalizeCommandCode(""), undefined);
+    assert.equal(normalizeCommandCode(123), undefined);
+  });
+});
+
+describe("gateway heartbeat agent accounts", () => {
+  it("reports enabled accounts and accounts without an explicit enabled field", () => {
+    const agentIds = enabledAgentIdsFromAccounts({
+      channels: {
+        xg_cwork_im: {
+          accounts: {
+            "assistant-enabled": { agentId: "assistant-enabled", enabled: true },
+            "assistant-legacy": { agentId: "assistant-legacy" },
+            default: { groupPolicy: "mention" },
+          },
+        },
+      },
+    });
+
+    assert.deepEqual(agentIds, ["assistant-enabled", "assistant-legacy"]);
+  });
+
+  it("filters accounts explicitly disabled in openclaw.json", () => {
+    const agentIds = enabledAgentIdsFromAccounts({
+      channels: {
+        xg_cwork_im: {
+          accounts: {
+            "assistant-1514822133731725314": {
+              agentId: "assistant-1514822133731725314",
+              enabled: false,
+              name: "个人助理",
+              robotKey: "secret-is-not-used-for-heartbeats",
+            },
+            "assistant-active": { agentId: "assistant-active", enabled: true },
+          },
+        },
+      },
+    });
+
+    assert.deepEqual(agentIds, ["assistant-active"]);
+  });
+
+  it("returns no agents when the account path is absent or malformed", () => {
+    assert.deepEqual(enabledAgentIdsFromAccounts({}), []);
+    assert.deepEqual(enabledAgentIdsFromAccounts({ channels: { xg_cwork_im: { accounts: [] } } }), []);
+  });
+});
+
+describe("普通 Skill 配置驱动的安装目录", () => {
+  const config = {
+    channels: {
+      xg_cwork_im: {
+        accounts: {
+          "assistant-12345": { agentId: "assistant-12345", enabled: true },
+          "assistant-67890": { agentId: "assistant-67890", enabled: false },
+        },
+      },
+    },
+    bindings: [{
+      agentId: "sales-agent",
+      match: { channel: "xg_cwork_im", accountId: "assistant-12345" },
+    }],
+    agents: {
+      defaults: { workspace: "/var/openclaw/default" },
+      list: [{ id: "sales-agent", workspace: "/var/openclaw/sales" }],
+    },
+  };
+
+  it("通过 account、binding 和 agent workspace 解析目录", () => {
+    assert.deepEqual(resolveSkillInstallTarget(config, "assistant-12345"), {
+      localAgentId: "sales-agent",
+      skillsDir: "/var/openclaw/sales/skills",
+    });
+  });
+
+  it("拒绝显式 disabled 的 account", () => {
+    assert.throws(() => resolveSkillInstallTarget(config, "assistant-67890"), /已禁用/);
+  });
+
+  it("找不到 account、binding 后的 agent 或 workspace 时拒绝回退到命名目录", () => {
+    assert.throws(() => resolveSkillInstallTarget(config, "assistant-99999"), /未找到 userId/);
+    assert.throws(() => resolveSkillInstallTarget({
+      ...config,
+      bindings: [{ agentId: "missing-agent", match: { channel: "xg_cwork_im", accountId: "assistant-12345" } }],
+    }, "assistant-12345"), /未找到本地 Agent/);
+    assert.throws(() => resolveSkillInstallTarget({
+      ...config,
+      agents: { list: [{ id: "sales-agent" }] },
+    }, "assistant-12345"), /未配置 workspace/);
+  });
+});
+
+describe("assistant workspace naming", () => {
+  it("accepts workspace-assistant-* only when suffix is at least 5 digits", () => {
+    assert.equal(parseAssistantWorkspaceAgentId("workspace-assistant-12345"), "assistant-12345");
+    assert.equal(
+      parseAssistantWorkspaceAgentId("workspace-assistant-12342325232333223223"),
+      "assistant-12342325232333223223"
+    );
+    assert.equal(parseAssistantWorkspaceAgentId("workspace-assistant-000001"), "assistant-000001");
+  });
+
+  it("rejects short, non-numeric, and malformed workspace names", () => {
+    assert.equal(parseAssistantWorkspaceAgentId("workspace-assistant-1234"), undefined);
+    assert.equal(parseAssistantWorkspaceAgentId("workspace-assistant-1234a"), undefined);
+    assert.equal(parseAssistantWorkspaceAgentId("workspace-assistant-abcde"), undefined);
+    assert.equal(parseAssistantWorkspaceAgentId("workspace-coder-12345"), undefined);
+  });
+
+  it("normalizes command userId using the same numeric suffix rule", () => {
+    assert.equal(normalizeAssistantUserId("12345"), "12345");
+    assert.equal(normalizeAssistantUserId("assistant-12345"), "12345");
+    assert.equal(normalizeAssistantUserId("assistant-000001"), "000001");
+  });
+
+  it("rejects unsafe or non-conforming command userId values", () => {
+    assert.equal(normalizeAssistantUserId("1234"), undefined);
+    assert.equal(normalizeAssistantUserId("assistant-1234"), undefined);
+    assert.equal(normalizeAssistantUserId("assistant-1234a"), undefined);
+    assert.equal(normalizeAssistantUserId("../assistant-12345"), undefined);
+  });
+});
+
+describe("built-in template update boundary", () => {
+  it("only syncs the template for an explicit built-in UPDATE_SKILL command", () => {
+    assert.equal(shouldSyncBuiltInTemplate("UPDATE_SKILL", true), true);
+    assert.equal(shouldSyncBuiltInTemplate("UPDATE_SKILL", false), false);
+    assert.equal(shouldSyncBuiltInTemplate("UPDATE_SKILL", undefined), false);
+    assert.equal(shouldSyncBuiltInTemplate("INSTALL_SKILL", true), false);
+    assert.equal(shouldSyncBuiltInTemplate("UNINSTALL_SKILL", true), false);
+  });
+});
+
+describe("expert skill update target", () => {
+  it("返回 .user/skills 父目录，由安装器统一追加 skill code", async () => {
+    const root = fs.mkdtempSync(path.join(os.tmpdir(), "openclaw-expert-skill-"));
+    try {
+      const skillsRoot = path.join(root, "workspace-assistant-12345", ".user", "skills");
+      fs.mkdirSync(path.join(skillsRoot, "demo"), { recursive: true });
+
+      assert.equal(await findInstalledExpertSkillsRoot(root, "12345", "demo"), skillsRoot);
+      assert.equal(await findInstalledExpertSkillsRoot(root, "12345", "missing"), undefined);
+    } finally {
+      fs.rmSync(root, { recursive: true, force: true });
+    }
+  });
+});
+
+describe("cron job sqlite lookup", () => {
+  it("returns all cron_jobs rows for the requested agent_id", () => {
+    const dir = fs.mkdtempSync(path.join(os.tmpdir(), "openclaw-cron-jobs-"));
+    const dbPath = path.join(dir, "openclaw.sqlite");
+    const db = new DatabaseSync(dbPath);
+    try {
+      db.exec(`
+        CREATE TABLE cron_jobs (
+          id INTEGER PRIMARY KEY,
+          agent_id TEXT NOT NULL,
+          name TEXT NOT NULL,
+          cron TEXT NOT NULL
+        );
+      `);
+      db.prepare("INSERT INTO cron_jobs (agent_id, name, cron) VALUES (?, ?, ?)").run(
+        "assistant-1579723293989240833",
+        "morning",
+        "0 9 * * *"
+      );
+      db.prepare("INSERT INTO cron_jobs (agent_id, name, cron) VALUES (?, ?, ?)").run(
+        "assistant-1579723293989240833",
+        "evening",
+        "0 18 * * *"
+      );
+      db.prepare("INSERT INTO cron_jobs (agent_id, name, cron) VALUES (?, ?, ?)").run(
+        "assistant-000001",
+        "other",
+        "0 12 * * *"
+      );
+    } finally {
+      db.close();
+    }
+
+    const rows = readCronJobsByAgentId("assistant-1579723293989240833", dbPath);
+
+    assert.equal(rows.length, 2);
+    assert.deepEqual(
+      rows.map((row) => row.name),
+      ["morning", "evening"]
+    );
+  });
+
+  it("returns an empty list when no cron_jobs row matches", () => {
+    const dir = fs.mkdtempSync(path.join(os.tmpdir(), "openclaw-cron-jobs-"));
+    const dbPath = path.join(dir, "openclaw.sqlite");
+    const db = new DatabaseSync(dbPath);
+    try {
+      db.exec("CREATE TABLE cron_jobs (id INTEGER PRIMARY KEY, agent_id TEXT NOT NULL);");
+    } finally {
+      db.close();
+    }
+
+    assert.deepEqual(readCronJobsByAgentId("assistant-1579723293989240833", dbPath), []);
+  });
+
+  it("returns an empty list when the sqlite file is not readable", () => {
+    const missingPath = path.join(os.tmpdir(), `missing-openclaw-${Date.now()}.sqlite`);
+
+    assert.deepEqual(readCronJobsByAgentId("assistant-1579723293989240833", missingPath), []);
+  });
+
+  it("returns an empty list when cron_jobs table does not exist", () => {
+    const dir = fs.mkdtempSync(path.join(os.tmpdir(), "openclaw-cron-jobs-"));
+    const dbPath = path.join(dir, "openclaw.sqlite");
+    const db = new DatabaseSync(dbPath);
+    try {
+      db.exec("CREATE TABLE other_table (id INTEGER PRIMARY KEY, agent_id TEXT NOT NULL);");
+    } finally {
+      db.close();
+    }
+
+    assert.deepEqual(readCronJobsByAgentId("assistant-1579723293989240833", dbPath), []);
+  });
+});