fix(skills): list omitted skill names when prompt is truncated

openclaw-clownfish[bot] · openclaw-clownfish[bot] · commit 0ff24c7e1157 · 2026-06-18T09:24:03.000Z
diff --git a/src/skills/loading/compact-format.test.ts b/src/skills/loading/compact-format.test.ts
@@ -58,6 +58,7 @@ function makeSkillStatusEntry(entry: SkillEntry): SkillStatusEntry {
     blockedByAllowlist: false,
     blockedByAgentFilter: false,
     eligible: true,
+    platformIncompatible: false,
     modelVisible: true,
     userInvocable: true,
     commandVisible: true,
@@ -261,6 +262,32 @@ describe("applySkillsPromptLimits (via buildWorkspaceSkillsPrompt)", () => {
     }
   });
 
+  it("keeps omitted skill lookup keys when the audit suffix does not fit", () => {
+    const maxSkillsPromptChars = 250;
+    const entries = Array.from({ length: 6 }, (_, i) => {
+      const name = `skill-${String(i).padStart(2, "0")}`;
+      const skillKey = i === 0 ? "skill<zero`raw" : name;
+      return makeEntry(makeSkill(name, "A".repeat(500)), { skillKey });
+    });
+
+    const prompt = buildWorkspaceSkillsPrompt("/fake", {
+      entries,
+      config: {
+        skills: {
+          limits: {
+            maxSkillsInPrompt: 100,
+            maxSkillsPromptChars,
+          },
+        },
+      } satisfies OpenClawConfig,
+    });
+
+    expect(prompt.length).toBeLessThanOrEqual(maxSkillsPromptChars);
+    expect(prompt).toContain("⚠️ Skills truncated");
+    expect(prompt).not.toContain("openclaw skills check");
+    expect(parseAdvertisedOmittedSkillKeys(prompt)).toContain("skill<zero`raw");
+  });
+
   it("compact preserves all skills where full format would drop some", () => {
     const skills = Array.from({ length: 50 }, (_, i) => makeSkill(`skill-${i}`, "A".repeat(200)));
     const compactLen = formatSkillsCompact(skills).length;
diff --git a/src/skills/loading/workspace.ts b/src/skills/loading/workspace.ts
@@ -68,8 +68,8 @@ function resolveNativeUserHomeDir(): string | undefined {
 }
 
 function resolveCompactHomePrefixes(): string[] {
-  const homes = [resolveUserHomeDir(), resolveNativeUserHomeDir()].filter(
-    (home): home is string => Boolean(home),
+  const homes = [resolveUserHomeDir(), resolveNativeUserHomeDir()].filter((home): home is string =>
+    Boolean(home),
   );
   const resolvedHomes = homes.map((home) => path.resolve(home));
   const realHomes = resolvedHomes
@@ -116,15 +116,15 @@ function resolvePromptTildeRoots(): string[] {
     return [];
   }
   const realNativeHome = tryRealpath(resolvedNativeHome);
-  return uniqueStrings([
-    resolvedNativeHome,
-    ...(realNativeHome ? [realNativeHome] : []),
-  ]);
+  return uniqueStrings([resolvedNativeHome, ...(realNativeHome ? [realNativeHome] : [])]);
 }
 
 function isContainerStateHomeWherePromptTildeEscapes(home: string): boolean {
   const configDir = path.resolve(resolveConfigDir());
-  return home === "/data" && (configDir === "/data/.openclaw" || isPathInside("/data/.openclaw", configDir));
+  return (
+    home === "/data" &&
+    (configDir === "/data/.openclaw" || isPathInside("/data/.openclaw", configDir))
+  );
 }
 
 function shouldPreservePromptSkillPath(
@@ -1465,13 +1465,22 @@ function buildTruncationNote(params: {
   const base = `${prefix}${suffix}`;
   const shortBase = `⚠️ Skills truncated: included ${params.included} of ${params.total}.`;
   const terse = "⚠️ Skills truncated.";
-  const baseNotice = formatNoticeWithinBudget([base, shortBase, terse, "⚠️"], params.maxChars);
-  if (!baseNotice || baseNotice !== base) {
-    return baseNotice;
+  const candidates = [
+    { prefix, suffix },
+    { prefix, suffix: "" },
+  ];
+  for (const candidate of candidates) {
+    const baseNotice = `${candidate.prefix}${candidate.suffix}`;
+    if (baseNotice.length > params.maxChars) {
+      continue;
+    }
+    const segmentBudget = params.maxChars - baseNotice.length;
+    const omittedSegment = formatOmittedSkillKeysSegment(params.omittedSkillKeys, segmentBudget);
+    if (omittedSegment) {
+      return `${candidate.prefix}${omittedSegment}${candidate.suffix}`;
+    }
   }
-  const segmentBudget = params.maxChars - base.length;
-  const omittedSegment = formatOmittedSkillKeysSegment(params.omittedSkillKeys, segmentBudget);
-  return `${prefix}${omittedSegment}${suffix}`;
+  return formatNoticeWithinBudget([base, shortBase, terse, "⚠️"], params.maxChars);
 }
 
 function buildCompactNote(maxChars: number): string {
