feat: support forcing pending ClawHub installs

Patrick-Erichsen · Patrick-Erichsen · commit 9bf44b3a8d19 · 2026-06-04T18:06:34.000-07:00
diff --git a/src/cli/skills-cli.commands.test.ts b/src/cli/skills-cli.commands.test.ts
@@ -566,6 +566,25 @@ describe("skills cli commands", () => {
     );
   });
 
+  it("passes --force-install through for ClawHub skill installs", async () => {
+    installSkillFromClawHubMock.mockResolvedValue({
+      ok: true,
+      slug: "calendar",
+      version: "1.2.3",
+      targetDir: "/tmp/workspace/skills/calendar",
+    });
+
+    await runCommand(["skills", "install", "calendar", "--force-install"]);
+
+    expect(installSkillFromClawHubMock).toHaveBeenCalledWith(
+      expect.objectContaining({
+        workspaceDir: "/tmp/workspace",
+        slug: "calendar",
+        forceInstall: true,
+      }),
+    );
+  });
+
   it("rejects using --global and --agent together for installs", async () => {
     await expect(
       runCommand(["skills", "install", "calendar", "--global", "--agent", "main"]),
@@ -613,6 +632,30 @@ describe("skills cli commands", () => {
     expect(runtimeErrors).toStrictEqual([]);
   });
 
+  it("passes --force-install through for ClawHub skill updates", async () => {
+    readTrackedClawHubSkillSlugsMock.mockResolvedValue(["calendar"]);
+    updateSkillsFromClawHubMock.mockResolvedValue([
+      {
+        ok: true,
+        slug: "calendar",
+        previousVersion: "1.2.2",
+        version: "1.2.3",
+        changed: true,
+        targetDir: "/tmp/workspace/skills/calendar",
+      },
+    ]);
+
+    await runCommand(["skills", "update", "--all", "--force-install"]);
+
+    expect(updateSkillsFromClawHubMock).toHaveBeenCalledWith(
+      expect.objectContaining({
+        workspaceDir: "/tmp/workspace",
+        slug: undefined,
+        forceInstall: true,
+      }),
+    );
+  });
+
   it("updates tracked ClawHub skills in the cwd-inferred agent workspace", async () => {
     routeWorkspaceByAgent();
     resolveAgentIdByWorkspacePathMock.mockReturnValue("writer");
diff --git a/src/cli/skills-cli.ts b/src/cli/skills-cli.ts
@@ -287,6 +287,11 @@ export function registerSkillsCli(program: Command) {
     .argument("<slug>", "ClawHub skill slug, git:<repo>, or local skill directory")
     .option("--version <version>", "Install a specific version")
     .option("--force", "Overwrite an existing workspace skill", false)
+    .option(
+      "--force-install",
+      "Install a pending GitHub-backed skill before ClawHub scan completes",
+      false,
+    )
     .option("--global", "Install into the shared managed skills directory", false)
     .option("--agent <id>", "Target agent workspace (defaults to cwd-inferred, then default agent)")
     .option("--as <slug>", "Install a git/local skill under this slug")
@@ -296,6 +301,7 @@ export function registerSkillsCli(program: Command) {
         opts: {
           version?: string;
           force?: boolean;
+          forceInstall?: boolean;
           global?: boolean;
           agent?: string;
           as?: string;
@@ -345,6 +351,7 @@ export function registerSkillsCli(program: Command) {
             slug,
             version: opts.version,
             force: Boolean(opts.force),
+            ...(opts.forceInstall ? { forceInstall: true } : {}),
             logger: {
               info: (message) => defaultRuntime.log(message),
             },
@@ -367,12 +374,17 @@ export function registerSkillsCli(program: Command) {
     .description("Update ClawHub-installed skills in the active or shared managed directory")
     .argument("[slug]", "Single skill slug")
     .option("--all", "Update all tracked ClawHub skills", false)
+    .option(
+      "--force-install",
+      "Install a pending GitHub-backed skill before ClawHub scan completes",
+      false,
+    )
     .option("--global", "Update skills in the shared managed skills directory", false)
     .option("--agent <id>", "Target agent workspace (defaults to cwd-inferred, then default agent)")
     .action(
       async (
         slug: string | undefined,
-        opts: { all?: boolean; global?: boolean; agent?: string },
+        opts: { all?: boolean; forceInstall?: boolean; global?: boolean; agent?: string },
         command: Command,
       ) => {
         try {
@@ -398,6 +410,7 @@ export function registerSkillsCli(program: Command) {
           const results = await updateSkillsFromClawHub({
             workspaceDir,
             slug,
+            ...(opts.forceInstall ? { forceInstall: true } : {}),
             logger: {
               info: (message) => defaultRuntime.log(message),
             },
diff --git a/src/infra/clawhub.ts b/src/infra/clawhub.ts
@@ -1066,13 +1066,17 @@ export async function fetchClawHubSkillInstallResolution(params: {
   token?: string;
   timeoutMs?: number;
   fetchImpl?: FetchLike;
+  forceInstall?: boolean;
 }): Promise<ClawHubSkillInstallResolutionResponse> {
   const { response, url, hasToken } = await clawhubRequest({
     baseUrl: params.baseUrl,
     path: `/api/v1/skills/${encodeURIComponent(params.slug)}/install`,
     token: params.token,
     timeoutMs: params.timeoutMs,
     fetchImpl: params.fetchImpl,
+    search: {
+      forceInstall: params.forceInstall ? "1" : undefined,
+    },
   });
   const isStructuredBlock = [403, 409, 410, 423].includes(response.status);
   if (!response.ok && !isStructuredBlock) {
diff --git a/src/skills/lifecycle/clawhub.test.ts b/src/skills/lifecycle/clawhub.test.ts
@@ -325,6 +325,46 @@ describe("skills-clawhub", () => {
     });
   });
 
+  it("passes forceInstall to the ClawHub install resolver", async () => {
+    const commit = "b".repeat(40);
+    fetchClawHubSkillInstallResolutionMock.mockResolvedValueOnce({
+      ok: true,
+      slug: "aiq-deploy",
+      installKind: "github",
+      github: {
+        repo: "NVIDIA/skills",
+        path: "skills/aiq-deploy",
+        commit,
+        contentHash: "hash-aiq-deploy",
+        sourceUrl: `https://github.com/NVIDIA/skills/tree/${commit}/skills/aiq-deploy`,
+      },
+    });
+    withExtractedArchiveRootMock.mockImplementationOnce(async (params) => {
+      return await params.onExtracted("/tmp/extracted-github-repo");
+    });
+    installPackageDirMock.mockResolvedValueOnce({
+      ok: true,
+      targetDir: "/tmp/workspace/skills/aiq-deploy",
+    });
+
+    const result = await installSkillFromClawHub({
+      workspaceDir: "/tmp/workspace",
+      slug: "aiq-deploy",
+      forceInstall: true,
+    });
+
+    expect(fetchClawHubSkillInstallResolutionMock).toHaveBeenCalledWith({
+      slug: "aiq-deploy",
+      baseUrl: undefined,
+      forceInstall: true,
+    });
+    expectInstalledSkill(result, {
+      slug: "aiq-deploy",
+      version: commit,
+      targetDir: "/tmp/workspace/skills/aiq-deploy",
+    });
+  });
+
   it("keeps ClawHub install telemetry best-effort", async () => {
     reportClawHubSkillInstallTelemetryMock.mockRejectedValueOnce(new Error("telemetry down"));
 
@@ -458,6 +498,40 @@ describe("skills-clawhub", () => {
       }
     });
 
+    it("passes forceInstall to resolver for tracked updates", async () => {
+      const slug = "agentreceipt";
+      const { workspaceDir } = await createLegacyTrackedSkillFixture(slug);
+      fetchClawHubSkillInstallResolutionMock.mockResolvedValueOnce({
+        ok: true,
+        slug,
+        installKind: "archive",
+        archive: {
+          version: "1.0.0",
+          downloadUrl: `https://legacy.clawhub.ai/api/v1/download?slug=${encodeURIComponent(slug)}&version=1.0.0`,
+        },
+      });
+      installPackageDirMock.mockResolvedValueOnce({
+        ok: true,
+        targetDir: path.join(workspaceDir, "skills", slug),
+      });
+
+      try {
+        const results = await updateSkillsFromClawHub({
+          workspaceDir,
+          forceInstall: true,
+        });
+
+        expect(fetchClawHubSkillInstallResolutionMock).toHaveBeenCalledWith({
+          slug,
+          baseUrl: "https://legacy.clawhub.ai",
+          forceInstall: true,
+        });
+        expectLegacyUpdateSuccess(results, workspaceDir, slug);
+      } finally {
+        await fs.rm(workspaceDir, { recursive: true, force: true });
+      }
+    });
+
     it("updates a legacy Unicode slug when requested explicitly", async () => {
       const slug = "re\u0430ct";
       const { workspaceDir } = await createLegacyTrackedSkillFixture(slug);
diff --git a/src/skills/lifecycle/clawhub.ts b/src/skills/lifecycle/clawhub.ts
@@ -137,6 +137,7 @@ type ClawHubInstallParams = {
   version?: string;
   baseUrl?: string;
   force?: boolean;
+  forceInstall?: boolean;
   logger?: Logger;
   config?: OpenClawConfig;
 };
@@ -916,6 +917,7 @@ async function performClawHubSkillInstall(
             await fetchClawHubSkillInstallResolution({
               slug: params.slug,
               baseUrl: params.baseUrl,
+              forceInstall: params.forceInstall,
             }),
           );
           if (latestResolution.installKind === "github") {
@@ -1080,6 +1082,7 @@ export async function installSkillFromClawHub(params: {
   version?: string;
   baseUrl?: string;
   force?: boolean;
+  forceInstall?: boolean;
   logger?: Logger;
   config?: OpenClawConfig;
 }): Promise<InstallClawHubSkillResult> {
@@ -1090,6 +1093,7 @@ export async function updateSkillsFromClawHub(params: {
   workspaceDir: string;
   slug?: string;
   baseUrl?: string;
+  forceInstall?: boolean;
   logger?: Logger;
   config?: OpenClawConfig;
 }): Promise<UpdateClawHubSkillResult[]> {
@@ -1123,6 +1127,7 @@ export async function updateSkillsFromClawHub(params: {
       slug: tracked.slug,
       baseUrl: tracked.baseUrl,
       force: true,
+      forceInstall: params.forceInstall,
       logger: params.logger,
       config: params.config,
     });
