Four of the five findings share one root cause: the tri-state `outcome` added in round 15 was not propagated to consumers, which kept branching on `ok` — true for an `incomplete` report, since nothing that was checked was wrong. - CLI `summarizeSkillVerification` counts off `outcome`, not `ok`, so a truncated walk no longer prints "no conformance errors" one line before exiting SKILL_INCOMPLETE. A mixed failed/incomplete catalog reports both counts rather than letting the louder verdict hide the quieter. - `verifySkills` sets the truncation reason only when entries were actually left unread. A file crossing the byte budget as the FINAL entry stopped nothing, and "Stopped after 3 of 3" both read as a contradiction and demoted a fully-read skill out of `verified`. - The TUI status line switches on `outcome` through a `Record` over the union, so the INCOMPLETE arm is reachable and a fourth outcome would be a type error rather than a silently missing label. - The `incomplete` doc paragraph said it makes `ok` false. It does not, deliberately — corrected, and it now names `outcome` as the thing a consumer must branch on. - The web sidebar composes in the per-URI `duplicate-name` warning, so two colliding skills are badged in the catalog instead of looking clean until one is selected. The suppressed `selfAttempted` finding is stale — fixed in round 16. The existing TUI INCOMPLETE test was passing for the wrong reason: its fixture understated every size, which is itself a mismatch, so the report was `failed` and only the old `ok`-first branch printed INCOMPLETE. It is rebuilt with honest digests and sizes, so truncation comes from the declared-size prefilter and the report is genuinely incomplete. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01ND46Ci64DC3tzBy9aG81Nc Signed-off-by: cliffhall <cliff@futurescale.com>
335 lines
13 KiB
TypeScript
335 lines
13 KiB
TypeScript
import { describe, it, expect, vi } from "vitest";
|
|
import { runMethod } from "../src/handlers/run-method.js";
|
|
import { summarizeSkillVerification } from "../src/handlers/skills-verify.js";
|
|
import { EXIT_CODES } from "../src/error-handler.js";
|
|
import type { InspectorClient } from "@inspector/core/mcp/index.js";
|
|
import type { SkillEntry } from "@inspector/core/mcp/skillsSchemas.js";
|
|
import { sha256Digest } from "@inspector/core/mcp/skills.js";
|
|
import type { SkillVerifyReport } from "@inspector/core/mcp/skillsVerification.js";
|
|
|
|
/**
|
|
* The three SEP-2640 methods the CLI gained in #2248, plus `--verify`.
|
|
*
|
|
* The store's cursor walk and the verification checks are covered where they
|
|
* live (`managedSkillsState.test.ts`, `skillsVerification.test.ts`); what these
|
|
* pin is the dispatcher's own decisions — which method reaches which client
|
|
* call, what shape leaves as a result, and when the report sets a non-zero exit
|
|
* code.
|
|
*/
|
|
const SKILL_MD = "---\nname: demo\ndescription: A demo\n---\n\n# Demo\n";
|
|
|
|
async function cleanEntry(): Promise<SkillEntry> {
|
|
const bytes = new TextEncoder().encode(SKILL_MD);
|
|
return {
|
|
uri: "skill://demo/SKILL.md",
|
|
frontmatter: { name: "demo", description: "A demo" },
|
|
resources: [
|
|
{
|
|
uri: "skill://demo/SKILL.md",
|
|
digest: await sha256Digest(bytes),
|
|
size: bytes.byteLength,
|
|
},
|
|
],
|
|
};
|
|
}
|
|
|
|
function mockClient(overrides: Record<string, unknown> = {}): InspectorClient {
|
|
return {
|
|
addEventListener: vi.fn(),
|
|
removeEventListener: vi.fn(),
|
|
getStatus: vi.fn().mockReturnValue("connected"),
|
|
getSkillsExtension: vi.fn().mockReturnValue({ directoryRead: true }),
|
|
listSkills: vi.fn().mockResolvedValue({ skills: [] }),
|
|
getSkill: vi.fn(),
|
|
getSkillResult: vi.fn(),
|
|
readResourceDirectory: vi.fn(),
|
|
readResource: vi.fn().mockResolvedValue({
|
|
result: { contents: [{ uri: "skill://demo/SKILL.md", text: SKILL_MD }] },
|
|
}),
|
|
...overrides,
|
|
} as unknown as InspectorClient;
|
|
}
|
|
|
|
describe("runMethod skills dispatch (#2248)", () => {
|
|
it("returns the walked list for skills/list", async () => {
|
|
const entry = await cleanEntry();
|
|
const client = mockClient({
|
|
listSkills: vi.fn().mockResolvedValue({ skills: [entry] }),
|
|
});
|
|
const outcome = await runMethod(client, { method: "skills/list" });
|
|
expect(outcome).toEqual({
|
|
kind: "result",
|
|
result: { skills: [entry] },
|
|
appInfo: undefined,
|
|
});
|
|
});
|
|
|
|
it("rejects skills/list with a usage exit code when the server declares no extension", async () => {
|
|
// The store answers "no extension" with an empty list, which is right for
|
|
// a UI that must render something and wrong for a CLI: "no skills" and
|
|
// "does not serve skills" are answers a script has to tell apart.
|
|
const client = mockClient({
|
|
getSkillsExtension: vi.fn().mockReturnValue(undefined),
|
|
});
|
|
await expect(runMethod(client, { method: "skills/list" })).rejects.toThrow(
|
|
/does not declare/i,
|
|
);
|
|
await expect(
|
|
runMethod(client, { method: "skills/list" }),
|
|
).rejects.toMatchObject({ exitCode: EXIT_CODES.USAGE });
|
|
});
|
|
|
|
it("rejects skills/get too when the server declares no extension", async () => {
|
|
// Declaring the extension commits a server to BOTH methods, so gating one
|
|
// and not the other is inconsistent with the thing being checked — and an
|
|
// undeclared server's -32601 is indistinguishable to a script from the
|
|
// -32602 a declared server returns for a URI it does not serve.
|
|
const client = mockClient({
|
|
getSkillsExtension: vi.fn().mockReturnValue(undefined),
|
|
getSkillResult: vi.fn(),
|
|
});
|
|
await expect(
|
|
runMethod(client, { method: "skills/get", uri: "skill://x/SKILL.md" }),
|
|
).rejects.toMatchObject({ exitCode: EXIT_CODES.USAGE });
|
|
expect(client.getSkillResult).not.toHaveBeenCalled();
|
|
});
|
|
|
|
it("keeps the { skill } envelope on skills/get", async () => {
|
|
// The client unwraps it for callers that want the entry; a CLI whose
|
|
// contract is "print the result" must not quietly reshape the wire form.
|
|
const entry = await cleanEntry();
|
|
const client = mockClient({
|
|
getSkillResult: vi.fn().mockResolvedValue({ skill: entry }),
|
|
});
|
|
const outcome = await runMethod(client, {
|
|
method: "skills/get",
|
|
uri: entry.uri,
|
|
});
|
|
expect(outcome).toMatchObject({ result: { skill: entry } });
|
|
});
|
|
|
|
it("prints the whole skills/get envelope, not just the entry", async () => {
|
|
// SEP-2640 leaves it open whether this result carries `ttlMs`/`cacheScope`,
|
|
// so a server may send them — and unwrapping to the entry discarded exactly
|
|
// those, from a path whose contract is "print the result" (Copilot).
|
|
const entry = await cleanEntry();
|
|
const envelope = {
|
|
skill: entry,
|
|
resultType: "complete",
|
|
ttlMs: 60,
|
|
cacheScope: "public",
|
|
};
|
|
const client = mockClient({
|
|
getSkillResult: vi.fn().mockResolvedValue(envelope),
|
|
});
|
|
const outcome = await runMethod(client, {
|
|
method: "skills/get",
|
|
uri: entry.uri,
|
|
});
|
|
expect(outcome).toMatchObject({ result: envelope });
|
|
});
|
|
|
|
it("requires --uri for skills/get", async () => {
|
|
await expect(
|
|
runMethod(mockClient(), { method: "skills/get" }),
|
|
).rejects.toThrow(/URI is required/);
|
|
});
|
|
|
|
it("requires --uri for resources/directory/read", async () => {
|
|
await expect(
|
|
runMethod(mockClient(), { method: "resources/directory/read" }),
|
|
).rejects.toThrow(/URI is required/);
|
|
});
|
|
|
|
it("returns one page of resources/directory/read and forwards the cursor", async () => {
|
|
// One page, not a walk: the SEP says the listing is not recursive and the
|
|
// client descends, so aggregating here would present a subtree as a
|
|
// directory.
|
|
const page = { resources: [], nextCursor: "2" };
|
|
const readResourceDirectory = vi.fn().mockResolvedValue(page);
|
|
const client = mockClient({ readResourceDirectory });
|
|
const outcome = await runMethod(client, {
|
|
method: "resources/directory/read",
|
|
uri: "skill://demo",
|
|
cursor: "1",
|
|
});
|
|
expect(readResourceDirectory).toHaveBeenCalledWith(
|
|
"skill://demo",
|
|
"1",
|
|
undefined,
|
|
);
|
|
expect(outcome).toMatchObject({ result: page });
|
|
});
|
|
|
|
it("--verify emits one NDJSON report per skill with no exit code when clean", async () => {
|
|
const entry = await cleanEntry();
|
|
const client = mockClient({
|
|
listSkills: vi.fn().mockResolvedValue({ skills: [entry] }),
|
|
});
|
|
const outcome = await runMethod(client, {
|
|
method: "skills/list",
|
|
verify: true,
|
|
});
|
|
expect(outcome.kind).toBe("ndjson");
|
|
if (outcome.kind !== "ndjson") throw new Error("unreachable");
|
|
expect(outcome.lines).toHaveLength(1);
|
|
expect((outcome.lines[0] as SkillVerifyReport).ok).toBe(true);
|
|
expect(outcome.summary).toMatch(/no conformance errors/);
|
|
expect(outcome.exitCode).toBeUndefined();
|
|
});
|
|
|
|
it("--verify sets the skills exit code when a skill fails", async () => {
|
|
const entry = await cleanEntry();
|
|
const client = mockClient({
|
|
listSkills: vi.fn().mockResolvedValue({ skills: [entry] }),
|
|
readResource: vi.fn().mockResolvedValue({
|
|
result: {
|
|
contents: [{ uri: entry.uri, text: "totally different bytes" }],
|
|
},
|
|
}),
|
|
});
|
|
const outcome = await runMethod(client, {
|
|
method: "skills/list",
|
|
verify: true,
|
|
});
|
|
if (outcome.kind !== "ndjson") throw new Error("unreachable");
|
|
expect(outcome.exitCode).toBe(EXIT_CODES.SKILL_NONCONFORMANT);
|
|
// Its own code, not SCHEMA_UNPORTABLE — an unportable tool schema and a
|
|
// tampered skill digest are different CI failures.
|
|
expect(EXIT_CODES.SKILL_NONCONFORMANT).not.toBe(
|
|
EXIT_CODES.SCHEMA_UNPORTABLE,
|
|
);
|
|
});
|
|
|
|
it("exits 8, not 7, when the walk was only truncated", async () => {
|
|
// SEP-2640 states the read limits as SHOULD NOT and lets hosts support
|
|
// more, so exiting `SKILL_NONCONFORMANT` would call a conforming server
|
|
// nonconformant — while exiting 0 would report success for entries nobody
|
|
// fetched (Copilot).
|
|
const md = "---\nname: many\ndescription: Big\n---\n\n# many\n";
|
|
const enc = new TextEncoder();
|
|
const selfDigest = await sha256Digest(enc.encode(md));
|
|
const bodyDigest = await sha256Digest(enc.encode("x"));
|
|
const entry: SkillEntry = {
|
|
uri: "skill://many/SKILL.md",
|
|
frontmatter: { name: "many", description: "Big" },
|
|
resources: Array.from({ length: 600 }, (_, i) =>
|
|
i === 0
|
|
? {
|
|
uri: "skill://many/SKILL.md",
|
|
digest: selfDigest,
|
|
size: enc.encode(md).byteLength,
|
|
}
|
|
: { uri: `skill://many/f${i}.md`, digest: bodyDigest, size: 1 },
|
|
),
|
|
};
|
|
const client = mockClient({
|
|
listSkills: vi.fn().mockResolvedValue({ skills: [entry] }),
|
|
readResource: vi.fn(async (uri: string) => ({
|
|
result: {
|
|
contents: [{ uri, text: uri.endsWith("/SKILL.md") ? md : "x" }],
|
|
},
|
|
})),
|
|
});
|
|
const outcome = await runMethod(client, {
|
|
method: "skills/list",
|
|
verify: true,
|
|
});
|
|
if (outcome.kind !== "ndjson") throw new Error("unreachable");
|
|
expect(outcome.exitCode).toBe(EXIT_CODES.SKILL_INCOMPLETE);
|
|
expect(EXIT_CODES.SKILL_INCOMPLETE).not.toBe(
|
|
EXIT_CODES.SKILL_NONCONFORMANT,
|
|
);
|
|
});
|
|
|
|
it("--verify works on a single skills/get", async () => {
|
|
const entry = await cleanEntry();
|
|
const client = mockClient({
|
|
getSkillResult: vi.fn().mockResolvedValue({ skill: entry }),
|
|
});
|
|
const outcome = await runMethod(client, {
|
|
method: "skills/get",
|
|
uri: entry.uri,
|
|
verify: true,
|
|
});
|
|
expect(outcome.kind).toBe("ndjson");
|
|
if (outcome.kind !== "ndjson") throw new Error("unreachable");
|
|
expect(outcome.lines).toHaveLength(1);
|
|
});
|
|
});
|
|
|
|
describe("summarizeSkillVerification (#2248)", () => {
|
|
const report = (
|
|
over: Partial<SkillVerifyReport> = {},
|
|
): SkillVerifyReport => ({
|
|
uri: "skill://demo/SKILL.md",
|
|
name: "demo",
|
|
conformance: [],
|
|
frontmatter: [],
|
|
files: [{ uri: "skill://demo/SKILL.md", status: "verified" }],
|
|
ok: true,
|
|
outcome: "verified",
|
|
...over,
|
|
});
|
|
|
|
it("reports a clean run with singular wording for one skill", () => {
|
|
expect(summarizeSkillVerification([report()])).toBe(
|
|
"Verified 1 skill and 1 file: no conformance errors.",
|
|
);
|
|
});
|
|
|
|
it("pluralizes for more than one", () => {
|
|
expect(summarizeSkillVerification([report(), report()])).toBe(
|
|
"Verified 2 skills and 2 files: no conformance errors.",
|
|
);
|
|
});
|
|
|
|
it("counts failures and digest mismatches separately", () => {
|
|
// A skill can fail on a conformance error with no mismatched file at all,
|
|
// so collapsing the two counts would misreport the cause.
|
|
const failed = report({
|
|
ok: false,
|
|
outcome: "failed",
|
|
files: [{ uri: "skill://demo/SKILL.md", status: "mismatch" }],
|
|
});
|
|
expect(summarizeSkillVerification([report(), failed])).toBe(
|
|
"1 of 2 skills failed verification (1 digest/size mismatch across 2 files).",
|
|
);
|
|
});
|
|
|
|
it("reports a failure with no mismatched file", () => {
|
|
const failed = report({ ok: false, outcome: "failed", files: [] });
|
|
expect(summarizeSkillVerification([failed])).toBe(
|
|
"1 of 1 skill failed verification (0 digest/size mismatch across 0 files).",
|
|
);
|
|
});
|
|
|
|
it("does not claim a truncated walk verified", () => {
|
|
// An `incomplete` report keeps `ok: true` — nothing checked was wrong —
|
|
// so a summary branching on `ok` printed "no conformance errors" one line
|
|
// before the run exited SKILL_INCOMPLETE (Copilot).
|
|
const cut = report({
|
|
outcome: "incomplete",
|
|
incomplete: "Stopped after 2 of 9 manifest entries.",
|
|
});
|
|
expect(summarizeSkillVerification([cut])).toBe(
|
|
"Checked 1 skill and 1 file: no conformance errors in what was read." +
|
|
" 1 of 1 skill could not be fully checked: the read bounds stopped the walk.",
|
|
);
|
|
});
|
|
|
|
it("reports a mixed catalog on both counts", () => {
|
|
// The louder verdict must not hide the quieter one: a caller told only
|
|
// about the failure would think the rest of the catalog was cleared.
|
|
const failed = report({
|
|
ok: false,
|
|
outcome: "failed",
|
|
files: [{ uri: "skill://demo/SKILL.md", status: "mismatch" }],
|
|
});
|
|
const cut = report({ outcome: "incomplete", incomplete: "Stopped." });
|
|
expect(summarizeSkillVerification([report(), failed, cut])).toBe(
|
|
"1 of 3 skills failed verification (1 digest/size mismatch across 3 files)." +
|
|
" 1 of 3 skills could not be fully checked: the read bounds stopped the walk.",
|
|
);
|
|
});
|
|
});
|