fix: align skills and compaction api drift

src/agents/compaction.retry.test.ts

@@ -56,7 +56,7 @@ describe("compaction retry integration", () => {
   } as unknown as NonNullable<ExtensionContext["model"]>;
 
   const invokeGenerateSummary = (signal = new AbortController().signal) =>
-    mockGenerateSummary(testMessages, testModel, 1000, "test-api-key", signal);
+    mockGenerateSummary(testMessages, testModel, 1000, "test-api-key", undefined, signal);
 
   const runSummaryRetry = (options: Parameters<typeof retryAsync>[1]) =>
     retryAsync(() => invokeGenerateSummary(), options);

src/agents/compaction.ts

@@ -257,6 +257,7 @@ async function summarizeChunks(params: {
           model,
           params.reserveTokens,
           params.apiKey,
+          model.headers,
           params.signal,
           effectiveInstructions,
           summary,

src/agents/pi-extensions/compaction-safeguard.ts

@@ -614,11 +614,27 @@ export default function compactionSafeguardExtension(api: ExtensionAPI): void {
       return { cancel: true };
     }
 
-    const headers =
+    const modelHeaders =
       model.headers && typeof model.headers === "object" && !Array.isArray(model.headers)
         ? model.headers
         : undefined;
-    const apiKey = (await ctx.modelRegistry.getApiKey(model)) ?? "";
+    const auth = await ctx.modelRegistry.getApiKeyAndHeaders(model);
+    const headersRecord = {
+      ...modelHeaders,
+      ...(auth.ok ? auth.headers : undefined),
+    };
+    const headers = Object.keys(headersRecord).length > 0 ? headersRecord : undefined;
+    const apiKey = auth.ok ? (auth.apiKey ?? "") : "";
+    if (!auth.ok && !headers) {
+      log.warn(
+        `Compaction safeguard: request auth unavailable; cancelling compaction. ${auth.error}`,
+      );
+      setCompactionSafeguardCancelReason(
+        ctx.sessionManager,
+        `Compaction safeguard could not resolve request auth for ${model.provider}/${model.id}: ${auth.error}`,
+      );
+      return { cancel: true };
+    }
     if (!apiKey && !headers) {
       log.warn(
         "Compaction safeguard: no request auth available; cancelling compaction to preserve history.",

src/agents/skills-install.download.test.ts

@@ -1,6 +1,7 @@
 import fs from "node:fs/promises";
 import os from "node:os";
 import path from "node:path";
+import { createSyntheticSourceInfo } from "@mariozechner/pi-coding-agent";
 import { afterAll, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
 import { installDownloadSpec } from "./skills-install-download.js";
 import { setTempStateDir } from "./skills-install.download-test-utils.js";
@@ -60,7 +61,9 @@ function buildEntry(name: string): SkillEntry {
       description: `${name} test skill`,
       filePath: path.join(skillDir, "SKILL.md"),
       baseDir: skillDir,
-      source: "openclaw-workspace",
+      sourceInfo: createSyntheticSourceInfo(path.join(skillDir, "SKILL.md"), {
+        source: "openclaw-workspace",
+      }),
       disableModelInvocation: false,
     },
     frontmatter: {},

src/agents/skills-status.test.ts

@@ -1,3 +1,4 @@
+import { createSyntheticSourceInfo } from "@mariozechner/pi-coding-agent";
 import { describe, expect, it } from "vitest";
 import { buildWorkspaceSkillStatus } from "./skills-status.js";
 import type { SkillEntry } from "./skills/types.js";
@@ -17,7 +18,7 @@ describe("buildWorkspaceSkillStatus", () => {
         description: "test",
         filePath: "/tmp/os-scoped",
         baseDir: "/tmp",
-        source: "test",
+        sourceInfo: createSyntheticSourceInfo("/tmp/os-scoped", { source: "test" }),
         disableModelInvocation: false,
       },
       frontmatter: {},

src/agents/skills.buildworkspaceskillstatus.test.ts

@@ -1,3 +1,4 @@
+import { createSyntheticSourceInfo } from "@mariozechner/pi-coding-agent";
 import { describe, expect, it } from "vitest";
 import { withEnv } from "../test-utils/env.js";
 import { buildWorkspaceSkillStatus } from "./skills-status.js";
@@ -24,7 +25,9 @@ function makeEntry(params: {
       description: `desc:${params.name}`,
       filePath: `/tmp/${params.name}/SKILL.md`,
       baseDir: `/tmp/${params.name}`,
-      source: params.source ?? "openclaw-workspace",
+      sourceInfo: createSyntheticSourceInfo(`/tmp/${params.name}/SKILL.md`, {
+        source: params.source ?? "openclaw-workspace",
+      }),
       disableModelInvocation: false,
     },
     frontmatter: {},

src/agents/skills.resolveskillspromptforrun.test.ts

@@ -1,3 +1,4 @@
+import { createSyntheticSourceInfo } from "@mariozechner/pi-coding-agent";
 import { describe, expect, it } from "vitest";
 import { resolveSkillsPromptForRun } from "./skills.js";
 import type { SkillEntry } from "./skills/types.js";
@@ -17,7 +18,9 @@ describe("resolveSkillsPromptForRun", () => {
         description: "Demo",
         filePath: "/app/skills/demo-skill/SKILL.md",
         baseDir: "/app/skills/demo-skill",
-        source: "openclaw-bundled",
+        sourceInfo: createSyntheticSourceInfo("/app/skills/demo-skill/SKILL.md", {
+          source: "openclaw-bundled",
+        }),
         disableModelInvocation: false,
       },
       frontmatter: {},

src/agents/skills/compact-format.test.ts

@@ -1,5 +1,9 @@
 import os from "node:os";
-import { formatSkillsForPrompt, type Skill } from "@mariozechner/pi-coding-agent";
+import {
+  createSyntheticSourceInfo,
+  formatSkillsForPrompt,
+  type Skill,
+} from "@mariozechner/pi-coding-agent";
 import { describe, expect, it } from "vitest";
 import type { OpenClawConfig } from "../../config/config.js";
 import type { SkillEntry } from "./types.js";
@@ -15,7 +19,7 @@ function makeSkill(name: string, desc = "A skill", filePath = `/skills/${name}/S
     description: desc,
     filePath,
     baseDir: `/skills/${name}`,
-    source: "workspace",
+    sourceInfo: createSyntheticSourceInfo(filePath, { source: "workspace" }),
     disableModelInvocation: false,
   };
 }

src/agents/skills/source.ts

@@ -1,5 +1,5 @@
 import type { Skill } from "@mariozechner/pi-coding-agent";
 
 export function resolveSkillSource(skill: Skill): string {
-  return skill.source;
+  return skill.sourceInfo.source;
 }

src/cli/skills-cli.formatting.test.ts

@@ -1,6 +1,7 @@
 import fs from "node:fs";
 import os from "node:os";
 import path from "node:path";
+import { createSyntheticSourceInfo } from "@mariozechner/pi-coding-agent";
 import { afterAll, beforeAll, describe, expect, it } from "vitest";
 import { buildWorkspaceSkillStatus } from "../agents/skills-status.js";
 import type { SkillEntry } from "../agents/skills.js";
@@ -38,7 +39,9 @@ describe("skills-cli (e2e)", () => {
           description: "Capture UI screenshots",
           filePath: path.join(baseDir, "SKILL.md"),
           baseDir,
-          source: "openclaw-bundled",
+          sourceInfo: createSyntheticSourceInfo(path.join(baseDir, "SKILL.md"), {
+            source: "openclaw-bundled",
+          }),
           disableModelInvocation: false,
         },
         frontmatter: {},

test/helpers/extensions/plugin-sdk-stub.cjs

@@ -37,10 +37,10 @@ stub = new Proxy(
       }
       return stub;
     },
-    ownKeys() {
-      return [];
+    ownKeys(target) {
+      return [...new Set([...Reflect.ownKeys(target), "__esModule", "default"])];
     },
-    getOwnPropertyDescriptor(_target, prop) {
+    getOwnPropertyDescriptor(target, prop) {
       if (prop === "__esModule") {
         return {
           configurable: true,
@@ -57,7 +57,7 @@ stub = new Proxy(
           writable: false,
         };
       }
-      return undefined;
+      return Reflect.getOwnPropertyDescriptor(target, prop);
     },
   },
 );