Ayuriel/openclaw
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge f4db93176e9e339258aef4d518e0e4d8cc0494e4 into 5e417b44e1540f528d2ae63e3e20229a902d1db2

Browse Source
This commit is contained in:
Shion Eria 2026-03-20 21:18:46 -05:00 committed by GitHub
commit 354e0c41c0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/cli/skills-cli.commands.test.ts
View File

@ -2,6 +2,7 @@ import { Command } from "commander";
import { beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
const loadConfigMock = vi.fn();
const resolveAgentIdByWorkspacePathMock = vi.fn();
const resolveAgentWorkspaceDirMock = vi.fn();
const resolveDefaultAgentIdMock = vi.fn();
const buildWorkspaceSkillStatusMock = vi.fn();
@ -20,6 +21,7 @@ vi.mock("../config/config.js", () => ({
}));
vi.mock("../agents/agent-scope.js", () => ({
resolveAgentIdByWorkspacePath: resolveAgentIdByWorkspacePathMock,
resolveAgentWorkspaceDir: resolveAgentWorkspaceDirMock,
resolveDefaultAgentId: resolveDefaultAgentIdMock,
}));
@ -60,6 +62,7 @@ describe("registerSkillsCli", () => {
beforeEach(() => {
vi.clearAllMocks();
loadConfigMock.mockReturnValue({ gateway: {} });
resolveAgentIdByWorkspacePathMock.mockReturnValue(undefined);
resolveDefaultAgentIdMock.mockReturnValue("main");
resolveAgentWorkspaceDirMock.mockReturnValue("/tmp/workspace");
buildWorkspaceSkillStatusMock.mockReturnValue(report);
@ -71,6 +74,8 @@ describe("registerSkillsCli", () => {
it("runs list command with resolved report and formatter options", async () => {
await runCli(["skills", "list", "--eligible", "--verbose", "--json"]);
expect(resolveAgentIdByWorkspacePathMock).toHaveBeenCalledWith({ gateway: {} }, process.cwd());
expect(resolveAgentWorkspaceDirMock).toHaveBeenCalledWith({ gateway: {} }, "main");
expect(buildWorkspaceSkillStatusMock).toHaveBeenCalledWith("/tmp/workspace", {
config: { gateway: {} },
});
@ -85,6 +90,19 @@ describe("registerSkillsCli", () => {
expect(runtime.log).toHaveBeenCalledWith("skills-list-output");
});
it("prefers the agent inferred from cwd over the default agent", async () => {
resolveAgentIdByWorkspacePathMock.mockReturnValue("ops");
resolveAgentWorkspaceDirMock.mockReturnValue("/tmp/ops-workspace");
await runCli(["skills", "list"]);
expect(resolveAgentWorkspaceDirMock).toHaveBeenCalledWith({ gateway: {} }, "ops");
expect(resolveDefaultAgentIdMock).not.toHaveBeenCalled();
expect(buildWorkspaceSkillStatusMock).toHaveBeenCalledWith("/tmp/ops-workspace", {
config: { gateway: {} },
});
});
it("runs info command and forwards skill name", async () => {
await runCli(["skills", "info", "peekaboo", "--json"]);

10
src/cli/skills-cli.ts
View File

@ -1,5 +1,9 @@
import type { Command } from "commander";
import { resolveAgentWorkspaceDir, resolveDefaultAgentId } from "../agents/agent-scope.js";
import {
resolveAgentIdByWorkspacePath,
resolveAgentWorkspaceDir,
resolveDefaultAgentId,
} from "../agents/agent-scope.js";
import { loadConfig } from "../config/config.js";
import { defaultRuntime } from "../runtime.js";
import { formatDocsLink } from "../terminal/links.js";
@ -19,7 +23,9 @@ type SkillStatusReport = Awaited<
async function loadSkillsStatusReport(): Promise<SkillStatusReport> {
const config = loadConfig();
const workspaceDir = resolveAgentWorkspaceDir(config, resolveDefaultAgentId(config));
const agentId =
resolveAgentIdByWorkspacePath(config, process.cwd()) ?? resolveDefaultAgentId(config);
const workspaceDir = resolveAgentWorkspaceDir(config, agentId);
const { buildWorkspaceSkillStatus } = await import("../agents/skills-status.js");
return buildWorkspaceSkillStatus(workspaceDir, { config });
}