@spzhongwin/skill-logger-plugin 1.0.11 → 1.0.13

package/src/integration.test.ts

@@ -1,119 +1,119 @@
-import { describe, it, beforeEach, afterEach } from "node:test";
-import assert from "node:assert/strict";
-import fs from "node:fs/promises";
-import path from "node:path";
-import os from "node:os";
-import { createHash } from "node:crypto";
-import { ConfigSync } from "./config-sync.ts";
-import { SkillUpdater } from "./updater.ts";
-import type { PluginConfig } from "./types.ts";
-
-const idHash = (code: string, version: string) =>
-  createHash("sha256").update(`${code} ${code} ${version}`).digest("hex");
-
-let dir: string;
-
-beforeEach(async () => {
-  dir = path.join(os.tmpdir(), `slp-int-${Date.now()}-${Math.random().toString(36).slice(2)}`);
-  await fs.mkdir(dir, { recursive: true });
-});
-afterEach(async () => {
-  await fs.rm(dir, { recursive: true, force: true });
-});
-
-describe("版本更新闭环（端到端）", () => {
-  it("config-pull 报最新版 → 检测落后 → 下载覆盖 → 再查收敛", async () => {
-    // 本地装一个 demo@1.0.0
-    const ws = path.join(dir, "workspace");
-    const skillDir = path.join(ws, "skills", "demo");
-    await fs.mkdir(skillDir, { recursive: true });
-    await fs.writeFile(path.join(skillDir, "SKILL.md"), "---\nname: demo\nversion: 1.0.0\n---\nOLD\n");
-
-    const config: PluginConfig = { platformBaseUrl: "https://api", autoUpdateSkills: true };
-
-    // 服务端最新版本（随测试推进而变化），模拟「更新后平台版本=本地版本」的收敛。
-    let platformLatest = "2.0.0";
-
-    // ConfigSync 的 fetch：/skill_config/pull → 带 latestVersion
-    const csFetch = async (_url: string, _init?: any) => ({
-      ok: true,
-      status: 200,
-      json: async () => ({ configs: [{ skillName: "demo", version: "1.0.0", latestVersion: platformLatest, functions: [] }] }),
-    });
-
-    // Updater 的 fetch：/skill_package/pull → {url, sha256}；GET → zip 字节
-    const upFetch = async (_url: string, init?: any) => {
-      if (init?.method === "POST") {
-        return {
-          ok: true,
-          status: 200,
-          json: async () => ({ url: "https://pkg/skill.zip", version: platformLatest, sha256: idHash("demo", platformLatest) }),
-          arrayBuffer: async () => new ArrayBuffer(0),
-        };
-      }
-      return { ok: true, status: 200, json: async () => ({}), arrayBuffer: async () => new Uint8Array([1]).buffer };
-    };
-    // 解压：写出新版本的 SKILL.md（版本号与 platformLatest 一致）
-    const unzip = async (_zip: string, destDir: string) => {
-      const root = path.join(destDir, "demo");
-      await fs.mkdir(root, { recursive: true });
-      await fs.writeFile(path.join(root, "SKILL.md"), `---\nname: demo\nversion: ${platformLatest}\n---\nNEW\n`);
-    };
-
-    const updater = new SkillUpdater({ getConfig: () => config, fetchImpl: upFetch, unzip, tmpDir: dir });
-    const cs = new ConfigSync({
-      paths: { extensionsDir: path.join(dir, "ext"), syncStatePath: path.join(dir, "sync.json"), openclawConfigPath: path.join(dir, "openclaw.json") },
-      getConfig: () => config,
-      fetchImpl: csFetch as any,
-      resolveSkillDirs: () => [path.join(ws, "skills")],
-      updater,
-    });
-
-    // 第一轮：检测落后并覆盖到 2.0.0
-    await cs.checkVersionsAndUpdate();
-    const afterMd = await fs.readFile(path.join(skillDir, "SKILL.md"), "utf-8");
-    assert.ok(afterMd.includes("version: 2.0.0"), "应被更新到 2.0.0");
-    assert.ok(afterMd.includes("NEW"), "应为新内容");
-
-    // 第二轮：平台版本仍 2.0.0、本地已 2.0.0 → 收敛，无落后副本
-    platformLatest = "2.0.0";
-    await cs.checkVersionsAndUpdate();
-    assert.equal(cs.detectOutdated().length, 0, "更新后应收敛");
-
-    // sync.json 落了 installations 映射，且版本已是 2.0.0
-    const state = JSON.parse(await fs.readFile(path.join(dir, "sync.json"), "utf-8"));
-    assert.equal(state.installations.demo[0].version, "2.0.0");
-  });
-
-  it("autoUpdateSkills=false：检测到落后也不覆盖", async () => {
-    const ws = path.join(dir, "workspace");
-    const skillDir = path.join(ws, "skills", "demo");
-    await fs.mkdir(skillDir, { recursive: true });
-    await fs.writeFile(path.join(skillDir, "SKILL.md"), "---\nname: demo\nversion: 1.0.0\n---\nOLD\n");
-
-    const config: PluginConfig = { platformBaseUrl: "https://api", autoUpdateSkills: false };
-    const csFetch = async () => ({
-      ok: true,
-      status: 200,
-      json: async () => ({ configs: [{ skillName: "demo", version: "1.0.0", latestVersion: "2.0.0", functions: [] }] }),
-    });
-    let upCalled = 0;
-    const upFetch = async () => {
-      upCalled++;
-      return { ok: true, status: 200, json: async () => ({ url: "" }), arrayBuffer: async () => new ArrayBuffer(0) };
-    };
-    const updater = new SkillUpdater({ getConfig: () => config, fetchImpl: upFetch, unzip: async () => {}, tmpDir: dir });
-    const cs = new ConfigSync({
-      paths: { extensionsDir: path.join(dir, "ext"), syncStatePath: path.join(dir, "sync.json"), openclawConfigPath: path.join(dir, "openclaw.json") },
-      getConfig: () => config,
-      fetchImpl: csFetch as any,
-      resolveSkillDirs: () => [path.join(ws, "skills")],
-      updater,
-    });
-
-    await cs.checkVersionsAndUpdate();
-    assert.equal(cs.detectOutdated().length, 1, "仍检测到落后");
-    assert.equal(upCalled, 0, "关闭时不应发起下载");
-    assert.ok((await fs.readFile(path.join(skillDir, "SKILL.md"), "utf-8")).includes("OLD"), "文件保持原样");
-  });
-});
+import { describe, it, beforeEach, afterEach } from "node:test";
+import assert from "node:assert/strict";
+import fs from "node:fs/promises";
+import path from "node:path";
+import os from "node:os";
+import { createHash } from "node:crypto";
+import { ConfigSync } from "./config-sync.ts";
+import { SkillUpdater } from "./updater.ts";
+import type { PluginConfig } from "./types.ts";
+
+const idHash = (code: string, version: string) =>
+  createHash("sha256").update(`${code} ${code} ${version}`).digest("hex");
+
+let dir: string;
+
+beforeEach(async () => {
+  dir = path.join(os.tmpdir(), `slp-int-${Date.now()}-${Math.random().toString(36).slice(2)}`);
+  await fs.mkdir(dir, { recursive: true });
+});
+afterEach(async () => {
+  await fs.rm(dir, { recursive: true, force: true });
+});
+
+describe("版本更新闭环（端到端）", () => {
+  it("config-pull 报最新版 → 检测落后 → 下载覆盖 → 再查收敛", async () => {
+    // 本地装一个 demo@1.0.0
+    const ws = path.join(dir, "workspace");
+    const skillDir = path.join(ws, "skills", "demo");
+    await fs.mkdir(skillDir, { recursive: true });
+    await fs.writeFile(path.join(skillDir, "SKILL.md"), "---\nname: demo\nversion: 1.0.0\n---\nOLD\n");
+
+    const config: PluginConfig = { platformBaseUrl: "https://api", autoUpdateSkills: true };
+
+    // 服务端最新版本（随测试推进而变化），模拟「更新后平台版本=本地版本」的收敛。
+    let platformLatest = "2.0.0";
+
+    // ConfigSync 的 fetch：/skill_config/pull → 带 latestVersion
+    const csFetch = async (_url: string, _init?: any) => ({
+      ok: true,
+      status: 200,
+      json: async () => ({ configs: [{ skillName: "demo", version: "1.0.0", latestVersion: platformLatest, functions: [] }] }),
+    });
+
+    // Updater 的 fetch：/skill_package/pull → {url, sha256}；GET → zip 字节
+    const upFetch = async (_url: string, init?: any) => {
+      if (init?.method === "POST") {
+        return {
+          ok: true,
+          status: 200,
+          json: async () => ({ url: "https://pkg/skill.zip", version: platformLatest, sha256: idHash("demo", platformLatest) }),
+          arrayBuffer: async () => new ArrayBuffer(0),
+        };
+      }
+      return { ok: true, status: 200, json: async () => ({}), arrayBuffer: async () => new Uint8Array([1]).buffer };
+    };
+    // 解压：写出新版本的 SKILL.md（版本号与 platformLatest 一致）
+    const unzip = async (_zip: string, destDir: string) => {
+      const root = path.join(destDir, "demo");
+      await fs.mkdir(root, { recursive: true });
+      await fs.writeFile(path.join(root, "SKILL.md"), `---\nname: demo\nversion: ${platformLatest}\n---\nNEW\n`);
+    };
+
+    const updater = new SkillUpdater({ getConfig: () => config, fetchImpl: upFetch, unzip, tmpDir: dir });
+    const cs = new ConfigSync({
+      paths: { extensionsDir: path.join(dir, "ext"), syncStatePath: path.join(dir, "sync.json"), openclawConfigPath: path.join(dir, "openclaw.json") },
+      getConfig: () => config,
+      fetchImpl: csFetch as any,
+      resolveSkillDirs: () => [path.join(ws, "skills")],
+      updater,
+    });
+
+    // 第一轮：检测落后并覆盖到 2.0.0
+    await cs.checkVersionsAndUpdate();
+    const afterMd = await fs.readFile(path.join(skillDir, "SKILL.md"), "utf-8");
+    assert.ok(afterMd.includes("version: 2.0.0"), "应被更新到 2.0.0");
+    assert.ok(afterMd.includes("NEW"), "应为新内容");
+
+    // 第二轮：平台版本仍 2.0.0、本地已 2.0.0 → 收敛，无落后副本
+    platformLatest = "2.0.0";
+    await cs.checkVersionsAndUpdate();
+    assert.equal(cs.detectOutdated().length, 0, "更新后应收敛");
+
+    // sync.json 落了 installations 映射，且版本已是 2.0.0
+    const state = JSON.parse(await fs.readFile(path.join(dir, "sync.json"), "utf-8"));
+    assert.equal(state.installations.demo[0].version, "2.0.0");
+  });
+
+  it("autoUpdateSkills=false：检测到落后也不覆盖", async () => {
+    const ws = path.join(dir, "workspace");
+    const skillDir = path.join(ws, "skills", "demo");
+    await fs.mkdir(skillDir, { recursive: true });
+    await fs.writeFile(path.join(skillDir, "SKILL.md"), "---\nname: demo\nversion: 1.0.0\n---\nOLD\n");
+
+    const config: PluginConfig = { platformBaseUrl: "https://api", autoUpdateSkills: false };
+    const csFetch = async () => ({
+      ok: true,
+      status: 200,
+      json: async () => ({ configs: [{ skillName: "demo", version: "1.0.0", latestVersion: "2.0.0", functions: [] }] }),
+    });
+    let upCalled = 0;
+    const upFetch = async () => {
+      upCalled++;
+      return { ok: true, status: 200, json: async () => ({ url: "" }), arrayBuffer: async () => new ArrayBuffer(0) };
+    };
+    const updater = new SkillUpdater({ getConfig: () => config, fetchImpl: upFetch, unzip: async () => {}, tmpDir: dir });
+    const cs = new ConfigSync({
+      paths: { extensionsDir: path.join(dir, "ext"), syncStatePath: path.join(dir, "sync.json"), openclawConfigPath: path.join(dir, "openclaw.json") },
+      getConfig: () => config,
+      fetchImpl: csFetch as any,
+      resolveSkillDirs: () => [path.join(ws, "skills")],
+      updater,
+    });
+
+    await cs.checkVersionsAndUpdate();
+    assert.equal(cs.detectOutdated().length, 1, "仍检测到落后");
+    assert.equal(upCalled, 0, "关闭时不应发起下载");
+    assert.ok((await fs.readFile(path.join(skillDir, "SKILL.md"), "utf-8")).includes("OLD"), "文件保持原样");
+  });
+});

package/src/matcher.test.ts

@@ -1,170 +1,170 @@
-import { describe, it } from "node:test";
-import assert from "node:assert/strict";
-import {
-  buildIndex,
-  match,
-  parseFlags,
-  parseKeyValues,
-  pathEndsWith,
-  commandHead,
-  tokenize,
-} from "./matcher.ts";
-import type { SkillStandardConfig, ToolCall } from "./types.ts";
-
-const configs: SkillStandardConfig[] = [
-  {
-    skillName: "model-usage",
-    version: "1.0.0",
-    functions: [
-      { id: "usage_current", name: "当前用量", match: { type: "script", script: "scripts/model_usage.py", argRules: [{ flag: "--mode", value: "current" }] } },
-      { id: "usage_all", name: "全部用量", match: { type: "script", script: "scripts/model_usage.py", argRules: [{ flag: "--mode", value: "all" }] } },
-    ],
-  },
-  {
-    skillName: "openai-whisper-api",
-    version: "1.0.0",
-    functions: [{ id: "transcribe", name: "转写", match: { type: "script", script: "scripts/transcribe.sh" } }],
-  },
-  {
-    skillName: "mcporter",
-    version: "1.0.0",
-    functions: [{ id: "list_issues", name: "列issue", match: { type: "command", command: "mcporter", targetPattern: "call linear.list_issues" } }],
-  },
-  {
-    skillName: "linear-mcp",
-    version: "1.0.0",
-    functions: [
-      { id: "create_issue", name: "建issue", match: { type: "tool", toolName: "linear_create_issue" } },
-      { id: "transcribe_http", name: "转写端点", match: { type: "http", urlContains: "/v1/audio/transcriptions" } },
-    ],
-  },
-];
-
-const index = buildIndex(configs);
-const noActive = new Set<string>();
-
-function exec(command: string): ToolCall {
-  return { toolName: "exec", params: { command } };
-}
-
-describe("pathEndsWith / tokenize / commandHead", () => {
-  it("脚本路径按段对齐，规避 fooX.py 误判", () => {
-    assert.equal(pathEndsWith("/a/b/scripts/model_usage.py", "scripts/model_usage.py"), true);
-    assert.equal(pathEndsWith("scripts/model_usage.py", "scripts/model_usage.py"), true);
-    assert.equal(pathEndsWith("/a/xscripts/model_usage.py", "scripts/model_usage.py"), false);
-    assert.equal(pathEndsWith("/a/foomodel_usage.py", "model_usage.py"), false);
-  });
-
-  it("tokenize 处理引号", () => {
-    assert.deepEqual(tokenize(`a "b c" 'd e' f`), ["a", "b c", "d e", "f"]);
-  });
-
-  it("commandHead 跳过环境前缀与解释器", () => {
-    assert.equal(commandHead(tokenize("FOO=1 python /x/scripts/y.py --a")), "y.py");
-    assert.equal(commandHead(tokenize("mcporter call linear.list_issues")), "mcporter");
-  });
-});
-
-describe("parseFlags / parseKeyValues", () => {
-  it("--k v / --k=v / 布尔 flag", () => {
-    const f = parseFlags(tokenize("x --mode current --pretty --n=3 -v"));
-    assert.equal(f.mode, "current");
-    assert.equal(f.pretty, true);
-    assert.equal(f.n, "3");
-    assert.equal(f.v, true);
-  });
-
-  it("k=v / k:v，跳过 URL", () => {
-    const kv = parseKeyValues(tokenize("call linear.list_issues team=ENG limit:5 url=https://x/y"));
-    assert.equal(kv.team, "ENG");
-    assert.equal(kv.limit, "5");
-    assert.equal(kv.url, undefined); // 含 :// 被跳过
-  });
-});
-
-describe("match - script", () => {
-  it("按 --mode 细分功能点", () => {
-    const cur = match(exec("python /e/skills/model-usage/scripts/model_usage.py --mode current"), noActive, index);
-    assert.equal(cur?.functionId, "usage_current");
-    assert.equal(cur?.matchType, "script");
-    assert.equal(cur?.args.mode, "current");
-
-    const all = match(exec("python /e/skills/model-usage/scripts/model_usage.py --mode all --pretty"), noActive, index);
-    assert.equal(all?.functionId, "usage_all");
-  });
-
-  it("argRules 不满足则不命中该功能点", () => {
-    const r = match(exec("python /e/scripts/model_usage.py --mode none"), noActive, index);
-    assert.equal(r, null);
-  });
-
-  it("解释器无关：bash 跑 .sh 命中", () => {
-    const r = match(exec("bash /e/openai-whisper-api/scripts/transcribe.sh a.mp3"), noActive, index);
-    assert.equal(r?.functionId, "transcribe");
-  });
-});
-
-describe("match - command / tool / http", () => {
-  it("command: mcporter call", () => {
-    const r = match(exec("mcporter call linear.list_issues team=ENG"), noActive, index);
-    assert.equal(r?.functionId, "list_issues");
-    assert.equal(r?.matchType, "command");
-    assert.equal(r?.args.team, "ENG");
-  });
-
-  it("tool: 非 exec 工具直调", () => {
-    const r = match({ toolName: "linear_create_issue", params: { title: "bug" } }, noActive, index);
-    assert.equal(r?.functionId, "create_issue");
-    assert.equal(r?.matchType, "tool");
-    assert.equal(r?.args.title, "bug");
-  });
-
-  it("http: curl 命中端点", () => {
-    const r = match(exec("curl -s https://api.openai.com/v1/audio/transcriptions -F file=@a.mp3"), noActive, index);
-    assert.equal(r?.functionId, "transcribe_http");
-    assert.equal(r?.matchType, "http");
-  });
-
-  it("http: fetch 类工具 url 参数命中", () => {
-    const r = match({ toolName: "fetch", params: { url: "https://api.openai.com/v1/audio/transcriptions?x=1" } }, noActive, index);
-    assert.equal(r?.functionId, "transcribe_http");
-    assert.equal(r?.args.x, "1");
-  });
-
-  it("无匹配返回 null", () => {
-    assert.equal(match(exec("ls -la"), noActive, index), null);
-    assert.equal(match({ toolName: "unknown_tool", params: {} }, noActive, index), null);
-  });
-});
-
-describe("match - 弱匹配（cd 后相对路径）仅在 skill 激活时采纳", () => {
-  it("仅 basename 相同：未激活 → null，激活 → 命中", () => {
-    // `cd .../openai-whisper-api/scripts && bash transcribe.sh a.mp3`
-    const call = exec("bash transcribe.sh a.mp3");
-    assert.equal(match(call, noActive, index), null);
-    const r = match(call, new Set(["openai-whisper-api"]), index);
-    assert.equal(r?.functionId, "transcribe");
-  });
-
-  it("强匹配优先于弱匹配", () => {
-    // 同时出现强（全路径）与弱（裸名）token 时取强匹配
-    const r = match(exec("bash /e/openai-whisper-api/scripts/transcribe.sh"), noActive, index);
-    assert.equal(r?.functionId, "transcribe");
-  });
-});
-
-describe("match - 歧义消解优先 activeSkills", () => {
-  const ambConfigs: SkillStandardConfig[] = [
-    { skillName: "A", version: "1", functions: [{ id: "a", name: "a", match: { type: "tool", toolNamePrefix: "x_" } }] },
-    { skillName: "B", version: "1", functions: [{ id: "b", name: "b", match: { type: "tool", toolNamePrefix: "x_" } }] },
-  ];
-  const ambIndex = buildIndex(ambConfigs);
-
-  it("无激活时取第一候选", () => {
-    assert.equal(match({ toolName: "x_do", params: {} }, noActive, ambIndex)?.skillName, "A");
-  });
-
-  it("激活 B 时归属 B", () => {
-    assert.equal(match({ toolName: "x_do", params: {} }, new Set(["B"]), ambIndex)?.skillName, "B");
-  });
-});
+import { describe, it } from "node:test";
+import assert from "node:assert/strict";
+import {
+  buildIndex,
+  match,
+  parseFlags,
+  parseKeyValues,
+  pathEndsWith,
+  commandHead,
+  tokenize,
+} from "./matcher.ts";
+import type { SkillStandardConfig, ToolCall } from "./types.ts";
+
+const configs: SkillStandardConfig[] = [
+  {
+    skillName: "model-usage",
+    version: "1.0.0",
+    functions: [
+      { id: "usage_current", name: "当前用量", match: { type: "script", script: "scripts/model_usage.py", argRules: [{ flag: "--mode", value: "current" }] } },
+      { id: "usage_all", name: "全部用量", match: { type: "script", script: "scripts/model_usage.py", argRules: [{ flag: "--mode", value: "all" }] } },
+    ],
+  },
+  {
+    skillName: "openai-whisper-api",
+    version: "1.0.0",
+    functions: [{ id: "transcribe", name: "转写", match: { type: "script", script: "scripts/transcribe.sh" } }],
+  },
+  {
+    skillName: "mcporter",
+    version: "1.0.0",
+    functions: [{ id: "list_issues", name: "列issue", match: { type: "command", command: "mcporter", targetPattern: "call linear.list_issues" } }],
+  },
+  {
+    skillName: "linear-mcp",
+    version: "1.0.0",
+    functions: [
+      { id: "create_issue", name: "建issue", match: { type: "tool", toolName: "linear_create_issue" } },
+      { id: "transcribe_http", name: "转写端点", match: { type: "http", urlContains: "/v1/audio/transcriptions" } },
+    ],
+  },
+];
+
+const index = buildIndex(configs);
+const noActive = new Set<string>();
+
+function exec(command: string): ToolCall {
+  return { toolName: "exec", params: { command } };
+}
+
+describe("pathEndsWith / tokenize / commandHead", () => {
+  it("脚本路径按段对齐，规避 fooX.py 误判", () => {
+    assert.equal(pathEndsWith("/a/b/scripts/model_usage.py", "scripts/model_usage.py"), true);
+    assert.equal(pathEndsWith("scripts/model_usage.py", "scripts/model_usage.py"), true);
+    assert.equal(pathEndsWith("/a/xscripts/model_usage.py", "scripts/model_usage.py"), false);
+    assert.equal(pathEndsWith("/a/foomodel_usage.py", "model_usage.py"), false);
+  });
+
+  it("tokenize 处理引号", () => {
+    assert.deepEqual(tokenize(`a "b c" 'd e' f`), ["a", "b c", "d e", "f"]);
+  });
+
+  it("commandHead 跳过环境前缀与解释器", () => {
+    assert.equal(commandHead(tokenize("FOO=1 python /x/scripts/y.py --a")), "y.py");
+    assert.equal(commandHead(tokenize("mcporter call linear.list_issues")), "mcporter");
+  });
+});
+
+describe("parseFlags / parseKeyValues", () => {
+  it("--k v / --k=v / 布尔 flag", () => {
+    const f = parseFlags(tokenize("x --mode current --pretty --n=3 -v"));
+    assert.equal(f.mode, "current");
+    assert.equal(f.pretty, true);
+    assert.equal(f.n, "3");
+    assert.equal(f.v, true);
+  });
+
+  it("k=v / k:v，跳过 URL", () => {
+    const kv = parseKeyValues(tokenize("call linear.list_issues team=ENG limit:5 url=https://x/y"));
+    assert.equal(kv.team, "ENG");
+    assert.equal(kv.limit, "5");
+    assert.equal(kv.url, undefined); // 含 :// 被跳过
+  });
+});
+
+describe("match - script", () => {
+  it("按 --mode 细分功能点", () => {
+    const cur = match(exec("python /e/skills/model-usage/scripts/model_usage.py --mode current"), noActive, index);
+    assert.equal(cur?.functionId, "usage_current");
+    assert.equal(cur?.matchType, "script");
+    assert.equal(cur?.args.mode, "current");
+
+    const all = match(exec("python /e/skills/model-usage/scripts/model_usage.py --mode all --pretty"), noActive, index);
+    assert.equal(all?.functionId, "usage_all");
+  });
+
+  it("argRules 不满足则不命中该功能点", () => {
+    const r = match(exec("python /e/scripts/model_usage.py --mode none"), noActive, index);
+    assert.equal(r, null);
+  });
+
+  it("解释器无关：bash 跑 .sh 命中", () => {
+    const r = match(exec("bash /e/openai-whisper-api/scripts/transcribe.sh a.mp3"), noActive, index);
+    assert.equal(r?.functionId, "transcribe");
+  });
+});
+
+describe("match - command / tool / http", () => {
+  it("command: mcporter call", () => {
+    const r = match(exec("mcporter call linear.list_issues team=ENG"), noActive, index);
+    assert.equal(r?.functionId, "list_issues");
+    assert.equal(r?.matchType, "command");
+    assert.equal(r?.args.team, "ENG");
+  });
+
+  it("tool: 非 exec 工具直调", () => {
+    const r = match({ toolName: "linear_create_issue", params: { title: "bug" } }, noActive, index);
+    assert.equal(r?.functionId, "create_issue");
+    assert.equal(r?.matchType, "tool");
+    assert.equal(r?.args.title, "bug");
+  });
+
+  it("http: curl 命中端点", () => {
+    const r = match(exec("curl -s https://api.openai.com/v1/audio/transcriptions -F file=@a.mp3"), noActive, index);
+    assert.equal(r?.functionId, "transcribe_http");
+    assert.equal(r?.matchType, "http");
+  });
+
+  it("http: fetch 类工具 url 参数命中", () => {
+    const r = match({ toolName: "fetch", params: { url: "https://api.openai.com/v1/audio/transcriptions?x=1" } }, noActive, index);
+    assert.equal(r?.functionId, "transcribe_http");
+    assert.equal(r?.args.x, "1");
+  });
+
+  it("无匹配返回 null", () => {
+    assert.equal(match(exec("ls -la"), noActive, index), null);
+    assert.equal(match({ toolName: "unknown_tool", params: {} }, noActive, index), null);
+  });
+});
+
+describe("match - 弱匹配（cd 后相对路径）仅在 skill 激活时采纳", () => {
+  it("仅 basename 相同：未激活 → null，激活 → 命中", () => {
+    // `cd .../openai-whisper-api/scripts && bash transcribe.sh a.mp3`
+    const call = exec("bash transcribe.sh a.mp3");
+    assert.equal(match(call, noActive, index), null);
+    const r = match(call, new Set(["openai-whisper-api"]), index);
+    assert.equal(r?.functionId, "transcribe");
+  });
+
+  it("强匹配优先于弱匹配", () => {
+    // 同时出现强（全路径）与弱（裸名）token 时取强匹配
+    const r = match(exec("bash /e/openai-whisper-api/scripts/transcribe.sh"), noActive, index);
+    assert.equal(r?.functionId, "transcribe");
+  });
+});
+
+describe("match - 歧义消解优先 activeSkills", () => {
+  const ambConfigs: SkillStandardConfig[] = [
+    { skillName: "A", version: "1", functions: [{ id: "a", name: "a", match: { type: "tool", toolNamePrefix: "x_" } }] },
+    { skillName: "B", version: "1", functions: [{ id: "b", name: "b", match: { type: "tool", toolNamePrefix: "x_" } }] },
+  ];
+  const ambIndex = buildIndex(ambConfigs);
+
+  it("无激活时取第一候选", () => {
+    assert.equal(match({ toolName: "x_do", params: {} }, noActive, ambIndex)?.skillName, "A");
+  });
+
+  it("激活 B 时归属 B", () => {
+    assert.equal(match({ toolName: "x_do", params: {} }, new Set(["B"]), ambIndex)?.skillName, "B");
+  });
+});