diff --git a/src/agents/skills-install.download.test.ts b/src/agents/skills-install.download.test.ts
index f3a879066a6..bd8559b60fe 100644
--- a/src/agents/skills-install.download.test.ts
+++ b/src/agents/skills-install.download.test.ts
@@ -1,7 +1,6 @@
 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";
@@ -61,10 +60,7 @@ function buildEntry(name: string): SkillEntry {
       description: `${name} test skill`,
       filePath: path.join(skillDir, "SKILL.md"),
       baseDir: skillDir,
-      sourceInfo: createSyntheticSourceInfo(path.join(skillDir, "SKILL.md"), {
-        source: "openclaw-workspace",
-        baseDir: skillDir,
-      }),
+      source: "openclaw-workspace",
       disableModelInvocation: false,
     },
     frontmatter: {},
diff --git a/src/agents/skills-status.test.ts b/src/agents/skills-status.test.ts
index 2d3abda70b4..3e0b2ab6783 100644
--- a/src/agents/skills-status.test.ts
+++ b/src/agents/skills-status.test.ts
@@ -1,4 +1,3 @@
-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";
@@ -18,10 +17,7 @@ describe("buildWorkspaceSkillStatus", () => {
         description: "test",
         filePath: "/tmp/os-scoped",
         baseDir: "/tmp",
-        sourceInfo: createSyntheticSourceInfo("/tmp/os-scoped", {
-          source: "test",
-          baseDir: "/tmp",
-        }),
+        source: "test",
         disableModelInvocation: false,
       },
       frontmatter: {},
diff --git a/src/agents/skills.buildworkspaceskillstatus.test.ts b/src/agents/skills.buildworkspaceskillstatus.test.ts
index 36089a505fa..4b3cca8808f 100644
--- a/src/agents/skills.buildworkspaceskillstatus.test.ts
+++ b/src/agents/skills.buildworkspaceskillstatus.test.ts
@@ -1,4 +1,3 @@
-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";
@@ -25,10 +24,7 @@ function makeEntry(params: {
       description: `desc:${params.name}`,
       filePath: `/tmp/${params.name}/SKILL.md`,
       baseDir: `/tmp/${params.name}`,
-      sourceInfo: createSyntheticSourceInfo(`/tmp/${params.name}/SKILL.md`, {
-        source: params.source ?? "openclaw-workspace",
-        baseDir: `/tmp/${params.name}`,
-      }),
+      source: params.source ?? "openclaw-workspace",
       disableModelInvocation: false,
     },
     frontmatter: {},
diff --git a/src/agents/skills.resolveskillspromptforrun.test.ts b/src/agents/skills.resolveskillspromptforrun.test.ts
index 3e655721e21..305e11f2f4e 100644
--- a/src/agents/skills.resolveskillspromptforrun.test.ts
+++ b/src/agents/skills.resolveskillspromptforrun.test.ts
@@ -1,4 +1,3 @@
-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";
@@ -18,10 +17,7 @@ describe("resolveSkillsPromptForRun", () => {
         description: "Demo",
         filePath: "/app/skills/demo-skill/SKILL.md",
         baseDir: "/app/skills/demo-skill",
-        sourceInfo: createSyntheticSourceInfo("/app/skills/demo-skill/SKILL.md", {
-          source: "openclaw-bundled",
-          baseDir: "/app/skills/demo-skill",
-        }),
+        source: "openclaw-bundled",
         disableModelInvocation: false,
       },
       frontmatter: {},
diff --git a/src/agents/skills/compact-format.test.ts b/src/agents/skills/compact-format.test.ts
index ef8a0916a15..20f3b8a256e 100644
--- a/src/agents/skills/compact-format.test.ts
+++ b/src/agents/skills/compact-format.test.ts
@@ -1,9 +1,5 @@
 import os from "node:os";
-import {
-  createSyntheticSourceInfo,
-  formatSkillsForPrompt,
-  type Skill,
-} from "@mariozechner/pi-coding-agent";
+import { formatSkillsForPrompt, type Skill } from "@mariozechner/pi-coding-agent";
 import { describe, expect, it } from "vitest";
 import type { SkillEntry } from "./types.js";
 import {
@@ -18,10 +14,7 @@ function makeSkill(name: string, desc = "A skill", filePath = `/skills/${name}/S
     description: desc,
     filePath,
     baseDir: `/skills/${name}`,
-    sourceInfo: createSyntheticSourceInfo(filePath, {
-      source: "workspace",
-      baseDir: `/skills/${name}`,
-    }),
+    source: "workspace",
     disableModelInvocation: false,
   };
 }
diff --git a/src/agents/skills/source.ts b/src/agents/skills/source.ts
index 5db39e3d440..076c10bb8ec 100644
--- a/src/agents/skills/source.ts
+++ b/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.sourceInfo.source;
+  return skill.source;
 }
diff --git a/src/cli/skills-cli.formatting.test.ts b/src/cli/skills-cli.formatting.test.ts
index a5446eea2bf..19d4ba0b2ed 100644
--- a/src/cli/skills-cli.formatting.test.ts
+++ b/src/cli/skills-cli.formatting.test.ts
@@ -1,7 +1,6 @@
 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";
@@ -39,10 +38,7 @@ describe("skills-cli (e2e)", () => {
           description: "Capture UI screenshots",
           filePath: path.join(baseDir, "SKILL.md"),
           baseDir,
-          sourceInfo: createSyntheticSourceInfo(path.join(baseDir, "SKILL.md"), {
-            source: "openclaw-bundled",
-            baseDir,
-          }),
+          source: "openclaw-bundled",
           disableModelInvocation: false,
         } as SkillEntry["skill"],
         frontmatter: {},
diff --git a/src/security/audit-extra.async.ts b/src/security/audit-extra.async.ts
index 55765b717ce..5e9c4036e09 100644
--- a/src/security/audit-extra.async.ts
+++ b/src/security/audit-extra.async.ts
@@ -1261,7 +1261,7 @@ export async function collectInstalledSkillsCodeSafetyFindings(params: {
   for (const workspaceDir of workspaceDirs) {
     const entries = loadWorkspaceSkillEntries(workspaceDir, { config: params.cfg });
     for (const entry of entries) {
-      if (entry.skill.sourceInfo.source === "openclaw-bundled") {
+      if (entry.skill.source === "openclaw-bundled") {
         continue;
       }