@kubbisec/ai-linux-arm64 0.1.8 → 0.1.9

package/bundled/skills/chat-mention-render.js

@@ -1,32 +1,63 @@
 import { visibleWidth } from "@earendil-works/pi-tui";
-const SKILL_TOKEN_RE = /\/skill:([a-z0-9_-]+)/gi;
+import { PLAN_MENTION_ALIASES } from "./chat-mentions.js";
+const SKILL_SLASH_RE = /\/skill:([a-z0-9_-]+)/gi;
+const AT_SKILL_RE = /@skill\s+([^\s@/]+)/gi;
 const PLAN_TOKEN_RE = /\/mode:plan\b/gi;
+const AT_PLAN_PATTERN = PLAN_MENTION_ALIASES.map((t) => t.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"))
+    .sort((a, b) => b.length - a.length)
+    .join("|");
+const AT_PLAN_RE = new RegExp(`(?:^|[\\s"'=])(${AT_PLAN_PATTERN})(?=\\s|$)`, "gi");
+const PLAN_VISIBLE_LABEL = "@plan";
+function findNextMentionMatch(line, cursor) {
+    const candidates = [];
+    SKILL_SLASH_RE.lastIndex = cursor;
+    const slashMatch = SKILL_SLASH_RE.exec(line);
+    if (slashMatch?.index !== undefined) {
+        candidates.push({
+            index: slashMatch.index,
+            length: slashMatch[0].length,
+            span: { kind: "skill", name: slashMatch[1] ?? "", source: "slash" },
+        });
+    }
+    AT_SKILL_RE.lastIndex = cursor;
+    const atMatch = AT_SKILL_RE.exec(line);
+    if (atMatch?.index !== undefined) {
+        candidates.push({
+            index: atMatch.index,
+            length: atMatch[0].length,
+            span: { kind: "skill", name: atMatch[1] ?? "", source: "at" },
+        });
+    }
+    PLAN_TOKEN_RE.lastIndex = cursor;
+    const planMatch = PLAN_TOKEN_RE.exec(line);
+    if (planMatch?.index !== undefined) {
+        candidates.push({
+            index: planMatch.index,
+            length: planMatch[0].length,
+            span: { kind: "plan", logicalToken: planMatch[0] },
+        });
+    }
+    AT_PLAN_RE.lastIndex = cursor;
+    const atPlanMatch = AT_PLAN_RE.exec(line);
+    if (atPlanMatch?.index !== undefined) {
+        const token = atPlanMatch[1] ?? "@plan";
+        const leading = atPlanMatch[0].length - token.length;
+        const index = atPlanMatch.index + leading;
+        candidates.push({
+            index,
+            length: token.length,
+            span: { kind: "plan", logicalToken: token },
+        });
+    }
+    if (candidates.length === 0)
+        return null;
+    return candidates.reduce((earliest, candidate) => candidate.index < earliest.index ? candidate : earliest);
+}
 function parseMentionSpans(line) {
     const spans = [];
     let cursor = 0;
     while (cursor < line.length) {
-        SKILL_TOKEN_RE.lastIndex = cursor;
-        PLAN_TOKEN_RE.lastIndex = cursor;
-        const skillMatch = SKILL_TOKEN_RE.exec(line);
-        const planMatch = PLAN_TOKEN_RE.exec(line);
-        let nextMatch = null;
-        if (skillMatch?.index !== undefined) {
-            nextMatch = {
-                index: skillMatch.index,
-                length: skillMatch[0].length,
-                span: { kind: "skill", name: skillMatch[1] ?? "" },
-            };
-        }
-        if (planMatch?.index !== undefined) {
-            const candidate = {
-                index: planMatch.index,
-                length: planMatch[0].length,
-                span: { kind: "plan" },
-            };
-            if (!nextMatch || candidate.index < nextMatch.index) {
-                nextMatch = candidate;
-            }
-        }
+        const nextMatch = findNextMentionMatch(line, cursor);
         if (!nextMatch) {
             spans.push({ kind: "text", value: line.slice(cursor) });
             break;
@@ -42,37 +73,44 @@ function parseMentionSpans(line) {
     }
     return spans;
 }
+function skillVisibleText(span) {
+    return span.source === "at" ? `@${span.name}` : span.name;
+}
+function skillLogicalText(span) {
+    return span.source === "at" ? `@skill ${span.name}` : `/skill:${span.name}`;
+}
 function renderSpan(span, theme) {
     if (span.kind === "text")
         return span.value;
     if (span.kind === "skill") {
+        const text = skillVisibleText(span);
         try {
-            return theme.fg("accent", span.name);
+            return theme.fg("accent", text);
         }
         catch {
-            return theme.fg("text", span.name);
+            return theme.fg("text", text);
         }
     }
     try {
-        return theme.fg("planAccent", "plan");
+        return theme.fg("planAccent", PLAN_VISIBLE_LABEL);
     }
     catch {
-        return theme.fg("text", "plan");
+        return theme.fg("text", PLAN_VISIBLE_LABEL);
     }
 }
 function spanLogicalWidth(span) {
     if (span.kind === "text")
         return span.value.length;
     if (span.kind === "skill")
-        return `/skill:${span.name}`.length;
-    return "/mode:plan".length;
+        return skillLogicalText(span).length;
+    return span.logicalToken.length;
 }
 function spanVisibleText(span) {
     if (span.kind === "text")
         return span.value;
     if (span.kind === "skill")
-        return span.name;
-    return "plan";
+        return skillVisibleText(span);
+    return PLAN_VISIBLE_LABEL;
 }
 export function renderLineWithMentionChips(line, theme) {
     return parseMentionSpans(line)

package/bundled/skills/chat-mention-render.js.map

@@ -1 +1 @@
-{"version":3,"file":"chat-mention-render.js","sourceRoot":"","sources":["../../src/skills/chat-mention-render.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"chat-mention-render.js","sourceRoot":"","sources":["../../src/skills/chat-mention-render.ts"],"names":[],"mappings":"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"}

package/bundled/skills/chat-mention-render.test.ts

@@ -21,7 +21,16 @@ describe("chat-mention-render", () => {
   it("renders plan chip with planAccent token", () => {
     const theme = mockTheme();
     renderLineWithMentionChips("/mode:plan scope", theme);
-    expect(theme.fg).toHaveBeenCalledWith("planAccent", "plan");
+    expect(theme.fg).toHaveBeenCalledWith("planAccent", "@plan");
+  });
+
+  it("renders @plan and @planejar as @plan chip", () => {
+    const theme = mockTheme();
+    renderLineWithMentionChips("@plan scope", theme);
+    expect(theme.fg).toHaveBeenCalledWith("planAccent", "@plan");
+    theme.fg.mockClear();
+    renderLineWithMentionChips("@planejar scope", theme);
+    expect(theme.fg).toHaveBeenCalledWith("planAccent", "@plan");
   });
 
   it("leaves lines without tokens unchanged", () => {
@@ -44,4 +53,18 @@ describe("chat-mention-render", () => {
     expect(theme.fg).toHaveBeenCalledWith("accent", "a");
     expect(theme.fg).toHaveBeenCalledWith("accent", "b");
   });
+
+  it("renders @skill name as @name accent chip in the editor", () => {
+    const theme = mockTheme();
+    renderLineWithMentionChips("@skill aspm-platform validate", theme);
+    expect(theme.fg).toHaveBeenCalledWith("accent", "@aspm-platform");
+  });
+
+  it("maps logical cursor columns for @skill mentions", () => {
+    const line = "@skill aspm-platform apply fix";
+    const afterMention = logicalToVisibleCol(line, "@skill aspm-platform".length);
+    expect(afterMention).toBe("@aspm-platform".length);
+    const roundTrip = visibleToLogicalCol(line, afterMention);
+    expect(roundTrip).toBe("@skill aspm-platform".length);
+  });
 });

package/bundled/skills/chat-mention-render.ts

@@ -1,4 +1,5 @@
 import { visibleWidth } from "@earendil-works/pi-tui";
+import { PLAN_MENTION_ALIASES } from "./chat-mentions.js";
 
 export type MentionChipTheme = {
   fg: (role: string, text: string) => string;
@@ -6,40 +7,83 @@ export type MentionChipTheme = {
 
 type MentionSpan =
   | { kind: "text"; value: string }
-  | { kind: "skill"; name: string }
-  | { kind: "plan" };
+  | { kind: "skill"; name: string; source: "slash" | "at" }
+  | { kind: "plan"; logicalToken: string };
 
-const SKILL_TOKEN_RE = /\/skill:([a-z0-9_-]+)/gi;
+const SKILL_SLASH_RE = /\/skill:([a-z0-9_-]+)/gi;
+const AT_SKILL_RE = /@skill\s+([^\s@/]+)/gi;
 const PLAN_TOKEN_RE = /\/mode:plan\b/gi;
 
+const AT_PLAN_PATTERN = PLAN_MENTION_ALIASES.map((t) =>
+  t.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"),
+)
+  .sort((a, b) => b.length - a.length)
+  .join("|");
+const AT_PLAN_RE = new RegExp(`(?:^|[\\s"'=])(${AT_PLAN_PATTERN})(?=\\s|$)`, "gi");
+
+const PLAN_VISIBLE_LABEL = "@plan";
+
+function findNextMentionMatch(
+  line: string,
+  cursor: number,
+): { index: number; length: number; span: MentionSpan } | null {
+  const candidates: Array<{ index: number; length: number; span: MentionSpan }> = [];
+
+  SKILL_SLASH_RE.lastIndex = cursor;
+  const slashMatch = SKILL_SLASH_RE.exec(line);
+  if (slashMatch?.index !== undefined) {
+    candidates.push({
+      index: slashMatch.index,
+      length: slashMatch[0].length,
+      span: { kind: "skill", name: slashMatch[1] ?? "", source: "slash" },
+    });
+  }
+
+  AT_SKILL_RE.lastIndex = cursor;
+  const atMatch = AT_SKILL_RE.exec(line);
+  if (atMatch?.index !== undefined) {
+    candidates.push({
+      index: atMatch.index,
+      length: atMatch[0].length,
+      span: { kind: "skill", name: atMatch[1] ?? "", source: "at" },
+    });
+  }
+
+  PLAN_TOKEN_RE.lastIndex = cursor;
+  const planMatch = PLAN_TOKEN_RE.exec(line);
+  if (planMatch?.index !== undefined) {
+    candidates.push({
+      index: planMatch.index,
+      length: planMatch[0].length,
+      span: { kind: "plan", logicalToken: planMatch[0] },
+    });
+  }
+
+  AT_PLAN_RE.lastIndex = cursor;
+  const atPlanMatch = AT_PLAN_RE.exec(line);
+  if (atPlanMatch?.index !== undefined) {
+    const token = atPlanMatch[1] ?? "@plan";
+    const leading = atPlanMatch[0].length - token.length;
+    const index = atPlanMatch.index + leading;
+    candidates.push({
+      index,
+      length: token.length,
+      span: { kind: "plan", logicalToken: token },
+    });
+  }
+
+  if (candidates.length === 0) return null;
+  return candidates.reduce((earliest, candidate) =>
+    candidate.index < earliest.index ? candidate : earliest,
+  );
+}
+
 function parseMentionSpans(line: string): MentionSpan[] {
   const spans: MentionSpan[] = [];
   let cursor = 0;
 
   while (cursor < line.length) {
-    SKILL_TOKEN_RE.lastIndex = cursor;
-    PLAN_TOKEN_RE.lastIndex = cursor;
-    const skillMatch = SKILL_TOKEN_RE.exec(line);
-    const planMatch = PLAN_TOKEN_RE.exec(line);
-
-    let nextMatch: { index: number; length: number; span: MentionSpan } | null = null;
-    if (skillMatch?.index !== undefined) {
-      nextMatch = {
-        index: skillMatch.index,
-        length: skillMatch[0].length,
-        span: { kind: "skill", name: skillMatch[1] ?? "" },
-      };
-    }
-    if (planMatch?.index !== undefined) {
-      const candidate = {
-        index: planMatch.index,
-        length: planMatch[0].length,
-        span: { kind: "plan" as const },
-      };
-      if (!nextMatch || candidate.index < nextMatch.index) {
-        nextMatch = candidate;
-      }
-    }
+    const nextMatch = findNextMentionMatch(line, cursor);
 
     if (!nextMatch) {
       spans.push({ kind: "text", value: line.slice(cursor) });
@@ -60,32 +104,41 @@ function parseMentionSpans(line: string): MentionSpan[] {
   return spans;
 }
 
+function skillVisibleText(span: Extract<MentionSpan, { kind: "skill" }>): string {
+  return span.source === "at" ? `@${span.name}` : span.name;
+}
+
+function skillLogicalText(span: Extract<MentionSpan, { kind: "skill" }>): string {
+  return span.source === "at" ? `@skill ${span.name}` : `/skill:${span.name}`;
+}
+
 function renderSpan(span: MentionSpan, theme: MentionChipTheme): string {
   if (span.kind === "text") return span.value;
   if (span.kind === "skill") {
+    const text = skillVisibleText(span);
     try {
-      return theme.fg("accent", span.name);
+      return theme.fg("accent", text);
     } catch {
-      return theme.fg("text", span.name);
+      return theme.fg("text", text);
     }
   }
   try {
-    return theme.fg("planAccent", "plan");
+    return theme.fg("planAccent", PLAN_VISIBLE_LABEL);
   } catch {
-    return theme.fg("text", "plan");
+    return theme.fg("text", PLAN_VISIBLE_LABEL);
   }
 }
 
 function spanLogicalWidth(span: MentionSpan): number {
   if (span.kind === "text") return span.value.length;
-  if (span.kind === "skill") return `/skill:${span.name}`.length;
-  return "/mode:plan".length;
+  if (span.kind === "skill") return skillLogicalText(span).length;
+  return span.logicalToken.length;
 }
 
 function spanVisibleText(span: MentionSpan): string {
   if (span.kind === "text") return span.value;
-  if (span.kind === "skill") return span.name;
-  return "plan";
+  if (span.kind === "skill") return skillVisibleText(span);
+  return PLAN_VISIBLE_LABEL;
 }
 
 export function renderLineWithMentionChips(line: string, theme: MentionChipTheme): string {

package/bundled/skills/chat-mentions.d.ts

@@ -15,10 +15,11 @@ export declare function parsePlanMentionPrefix(atPrefix: string | null): {
 export declare function filterSkillSuggestions(skills: KubbisecSkillEntry[], query: string): AutocompleteItem[];
 /** Pi expands `/skill:name` — map `@skill name` before submit. */
 export declare function transformAtSkillMentions(text: string): string;
-/** Map `@plan` / `@planejar` to `/mode:plan` before submit. */
+/** Legacy: map `@plan` / `@planejar` to `/mode:plan` (prefer session state + visible @plan). */
 export declare function transformAtPlanMentions(text: string): string;
-/** Apply skill transform first, then plan (CHAT-004). */
+/** Apply @skill → /skill:name only. @plan stays visible; plan mode is set via session state. */
 export declare function transformChatMentions(text: string): string;
+export declare function messageActivatesPlanMode(text: string): boolean;
 export declare function applySkillMentionCompletion(lines: string[], cursorLine: number, cursorCol: number, item: AutocompleteItem, prefix: string): {
     lines: string[];
     cursorLine: number;

package/bundled/skills/chat-mentions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"chat-mentions.d.ts","sourceRoot":"","sources":["../../src/skills/chat-mentions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAE/D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAEnE,eAAO,MAAM,mBAAmB,WAAW,CAAC;AAE5C,eAAO,MAAM,oBAAoB,iCAAkC,CAAC;AAiBpE,2EAA2E;AAC3E,wBAAgB,eAAe,CAAC,gBAAgB,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAOvE;AAED,2FAA2F;AAC3F,wBAAgB,yBAAyB,CAAC,gBAAgB,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CASjF;AAED,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,GAAG;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAKzF;AAED,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,GAAG;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CASxF;AAED,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,kBAAkB,EAAE,EAC5B,KAAK,EAAE,MAAM,GACZ,gBAAgB,EAAE,CAcpB;AAED,kEAAkE;AAClE,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAE7D;AAED,+DAA+D;AAC/D,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAS5D;AAED,yDAAyD;AACzD,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAE1D;AAED,wBAAgB,2BAA2B,CACzC,KAAK,EAAE,MAAM,EAAE,EACf,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,gBAAgB,EACtB,MAAM,EAAE,MAAM,GACb;IAAE,KAAK,EAAE,MAAM,EAAE,CAAC;IAAC,UAAU,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,CAe5D"}
+{"version":3,"file":"chat-mentions.d.ts","sourceRoot":"","sources":["../../src/skills/chat-mentions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAE/D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAEnE,eAAO,MAAM,mBAAmB,WAAW,CAAC;AAE5C,eAAO,MAAM,oBAAoB,iCAAkC,CAAC;AAiBpE,2EAA2E;AAC3E,wBAAgB,eAAe,CAAC,gBAAgB,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAOvE;AAED,2FAA2F;AAC3F,wBAAgB,yBAAyB,CAAC,gBAAgB,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CASjF;AAED,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,GAAG;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAKzF;AAED,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,GAAG;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CASxF;AAED,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,kBAAkB,EAAE,EAC5B,KAAK,EAAE,MAAM,GACZ,gBAAgB,EAAE,CAcpB;AAED,kEAAkE;AAClE,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAE7D;AAED,gGAAgG;AAChG,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAS5D;AAED,gGAAgG;AAChG,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAE1D;AAED,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAO9D;AAED,wBAAgB,2BAA2B,CACzC,KAAK,EAAE,MAAM,EAAE,EACf,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,gBAAgB,EACtB,MAAM,EAAE,MAAM,GACb;IAAE,KAAK,EAAE,MAAM,EAAE,CAAC;IAAC,UAAU,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,CAe5D"}

package/bundled/skills/chat-mentions.js

@@ -72,7 +72,7 @@ export function filterSkillSuggestions(skills, query) {
 export function transformAtSkillMentions(text) {
     return text.replace(/@skill\s+([^\s@/]+)/g, "/skill:$1");
 }
-/** Map `@plan` / `@planejar` to `/mode:plan` before submit. */
+/** Legacy: map `@plan` / `@planejar` to `/mode:plan` (prefer session state + visible @plan). */
 export function transformAtPlanMentions(text) {
     const tokenPattern = PLAN_MENTION_TOKENS_LONGEST_FIRST.map((t) => t.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")).join("|");
     const pattern = new RegExp(`(^|[\\s"'=])(${tokenPattern})(\\s[\\s\\S]*)?`, "g");
@@ -81,9 +81,15 @@ export function transformAtPlanMentions(text) {
         return `${delim}/mode:plan${query ? ` ${query}` : ""}`;
     });
 }
-/** Apply skill transform first, then plan (CHAT-004). */
+/** Apply @skill → /skill:name only. @plan stays visible; plan mode is set via session state. */
 export function transformChatMentions(text) {
-    return transformAtPlanMentions(transformAtSkillMentions(text));
+    return transformAtSkillMentions(text);
+}
+export function messageActivatesPlanMode(text) {
+    const trimmed = text.trim();
+    return (trimmed.startsWith("/mode:plan") ||
+        /^@plan\b/i.test(trimmed) ||
+        /^@planejar\b/i.test(trimmed));
 }
 export function applySkillMentionCompletion(lines, cursorLine, cursorCol, item, prefix) {
     const currentLine = lines[cursorLine] ?? "";

package/bundled/skills/chat-mentions.js.map

@@ -1 +1 @@
-{"version":3,"file":"chat-mentions.js","sourceRoot":"","sources":["../../src/skills/chat-mentions.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"chat-mentions.js","sourceRoot":"","sources":["../../src/skills/chat-mentions.ts"],"names":[],"mappings":"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"}

package/bundled/skills/chat-mentions.test.ts

@@ -1,5 +1,6 @@
 import { describe, expect, it } from "vitest";
 import {
+  messageActivatesPlanMode,
   parsePlanMentionPrefix,
   PLAN_MENTION_ALIASES,
   transformAtPlanMentions,
@@ -18,15 +19,21 @@ describe("chat-mentions", () => {
     expect(parsePlanMentionPrefix("@planful")).toBeNull();
   });
 
-  it("transforms @plan to /mode:plan", () => {
+  it("transformAtPlanMentions still maps legacy @plan to /mode:plan", () => {
     expect(transformAtPlanMentions("@plan fix HIGH SCA")).toBe("/mode:plan fix HIGH SCA");
     expect(transformAtPlanMentions("@planejar foo")).toBe("/mode:plan foo");
-    expect(transformAtPlanMentions("@plan")).toBe("/mode:plan");
     expect(transformAtPlanMentions("x@plan fix")).toBe("x@plan fix");
   });
 
-  it("transforms combined skill and plan mentions (skill first)", () => {
-    expect(transformChatMentions("@skill naus @plan fix")).toBe("/skill:naus /mode:plan fix");
-    expect(transformChatMentions("@planejar x")).toBe("/mode:plan x");
+  it("transformChatMentions keeps @plan visible (plan mode via session state)", () => {
+    expect(transformChatMentions("@plan fix HIGH SCA")).toBe("@plan fix HIGH SCA");
+    expect(transformChatMentions("@planejar x")).toBe("@planejar x");
+    expect(transformChatMentions("@skill naus @plan fix")).toBe("/skill:naus @plan fix");
+  });
+
+  it("messageActivatesPlanMode detects plan prefixes", () => {
+    expect(messageActivatesPlanMode("@plan scope")).toBe(true);
+    expect(messageActivatesPlanMode("/mode:plan scope")).toBe(true);
+    expect(messageActivatesPlanMode("hello")).toBe(false);
   });
 });

package/bundled/skills/chat-mentions.ts

@@ -85,7 +85,7 @@ export function transformAtSkillMentions(text: string): string {
   return text.replace(/@skill\s+([^\s@/]+)/g, "/skill:$1");
 }
 
-/** Map `@plan` / `@planejar` to `/mode:plan` before submit. */
+/** Legacy: map `@plan` / `@planejar` to `/mode:plan` (prefer session state + visible @plan). */
 export function transformAtPlanMentions(text: string): string {
   const tokenPattern = PLAN_MENTION_TOKENS_LONGEST_FIRST.map((t) =>
     t.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"),
@@ -97,9 +97,18 @@ export function transformAtPlanMentions(text: string): string {
   });
 }
 
-/** Apply skill transform first, then plan (CHAT-004). */
+/** Apply @skill → /skill:name only. @plan stays visible; plan mode is set via session state. */
 export function transformChatMentions(text: string): string {
-  return transformAtPlanMentions(transformAtSkillMentions(text));
+  return transformAtSkillMentions(text);
+}
+
+export function messageActivatesPlanMode(text: string): boolean {
+  const trimmed = text.trim();
+  return (
+    trimmed.startsWith("/mode:plan") ||
+    /^@plan\b/i.test(trimmed) ||
+    /^@planejar\b/i.test(trimmed)
+  );
 }
 
 export function applySkillMentionCompletion(

package/bundled/skills/naus-pipelines/SKILL.md

@@ -3,29 +3,124 @@ name: naus-pipelines
 description: NAUS CI/CD — YAML, validação @naus/validation, runners e jobs ASPM no KubbiSec.
 ---
 
+## Estrutura YAML (obrigatório — não é GitHub Actions)
+
+| Correto (NAUS) | Errado (não usar) |
+|----------------|-------------------|
+| `run:` (top-level) | `jobs:` |
+| `script:` (array de strings) | `commands:`, `steps:` |
+| `depends_on:` | `needs:` |
+| `variables:` | `env:` no root |
+| `kind: aspm` + `tool: trivy` | `scanner: trivy` + script manual `trivy fs` |
+| `$VAR` / Env Pack | `${{ secrets.* }}`, `${{ vars.* }}` |
+
+Top-level: `name`, `description`, `local`, `stages`, `variables`, `volumes`, `repository`, `only`, `run` (obrigatório).
+
+**HARD-GATE:** antes de mostrar YAML final → `naus_pipeline_docs` + `naus_validate_yaml` (ou `naus_local_validate` com `--extended-context`).
+
+## NAUS CLI (`npm install -g @kubbisec/naus`)
+
+Ficheiro por omissão: `.naus.yml`. **Docs:** `naus_pipeline_docs` secção `naus-commands`.
+
+| Comando | Descrição |
+|---------|-----------|
+| `naus register [token] [--renew]` | Registar runner (bootstrap mTLS) |
+| `naus start` | Iniciar runner e aceitar jobs |
+| `naus migrate` | Migrar runner token legado → certificado |
+| `naus validate <file>` / `naus check <file>` | Validar YAML |
+| `naus plan <file> [--format mermaid]` | Ondas de dependências |
+| `naus run <file>` | Executar pipeline localmente |
+| `naus daemon list` / `naus daemon stop` | Sessões background |
+| `naus runner start` | Modo legado (token, sem mTLS) |
+| `naus tools install` | Ferramentas auxiliares |
+
+**Variáveis:** `NAUS_BOOTSTRAP_TOKEN`, `NAUS_RENEW_RUNNER=1` (equivale `--renew`).
+
+**Chat:** não invocar `register`, `start`, `daemon` — processos persistentes; documentar apenas.
+
+## Exemplo canónico (container + ASPM matrix + gate)
+
+```yaml
+name: exemplo-simples
+stages: [build, security]
+
+run:
+  - build:
+      stage: build
+      image: node:20-alpine
+      script:
+        - npm ci
+        - npm run build --if-present
+
+  - kubbisec_scan:
+      stage: security
+      kind: aspm_matrix
+      mode: scan-and-upload
+      matrix_strategy: chain
+      depends_on: [build]
+      parallel:
+        - tool: osv
+        - tool: gitleaks
+        - tool: syft
+
+  - kubbisec_gate:
+      kind: aspm_gate
+      depends_on: [kubbisec_scan]
+      rules:
+        vulnerabilities:
+          max_by_severity:
+            CRITICAL: 0
+```
+
+Jobs `kind: aspm` **não** precisam de `script:` — o NAUS expande scanner + upload. Use `tool:` (não `scanner:`).
+
+## Kinds de job
+
+| Kind | Campos principais |
+|------|-------------------|
+| `container` (default) | `image:`, `script:`, `depends_on:` |
+| `aspm` | `tool:`, `mode:` scan \| upload \| scan-and-upload |
+| `aspm_matrix` | `parallel: [{ tool: ... }]`, `matrix_strategy:` chain \| fanout |
+| `aspm_gate` | `rules:` (vulnerabilities, coverage, risk_score) |
+| `aspm_preset` | `preset: kubbisec/default-security` |
+| `docker` | `registry:`, `tags:`; opcional `aspm.tool` + `aspm.gate` |
+
 ## Fluxo na plataforma (cloud)
 
-1. `naus_pipeline_docs` — 20 secções web (paridade `kubbisec://naus/*`) + runner-management + validation.
-2. `naus_schema_overview` — campos e kinds suportados.
-3. `naus_validate_yaml` — validar candidato antes de persistir.
+1. `naus_pipeline_docs` — secções web (`naus-commands`, `naus-pipeline-overview`, `naus-aspm-integration`, …).
+2. `naus_schema_overview` — cheat sheet de campos.
+3. `naus_validate_yaml` — **sempre** validar antes de persistir.
 4. `set_editor_yaml` (preview) → `set_pipeline_yaml` (bound) → `trigger_run` → `get_run_logs_excerpt`.
 
-## Fluxo local (`kbs chat --extended-context -w <repo>`)
+## Secrets e variáveis
+
+| Contexto | Onde definir valores sensíveis |
+|----------|-------------------------------|
+| **`naus run` / `naus plan` local** | Por omissão: **`.secrets`** e **`.env`** no cwd. Ou caminhos explícitos: `naus run .naus.yml --env-file .env --secret-file .secrets` (qualquer nome, ex. `.secret`). Flags repetíveis. |
+| **Runner na cloud (KubbiSec)** | **Env Packs** no painel (CI/CD → Env Packs) associados ao pipeline — não usar `.secrets` no runner remoto. |
+
+No YAML, referencie apenas `$VAR` — nunca o valor em claro. Chaves em `.secrets` são ofuscadas nos logs locais. **Não commitar** `.secrets`.
 
-- `naus_local_status` — `naus` no PATH.
-- `naus_local_validate` — `naus validate <path>` no workspace.
-- `naus_local_plan` — `naus plan <path>` (text ou mermaid).
-- `naus_local_run` — `naus run <path>` (até 15 min; preferir `trigger_run` em CI cloud).
+**Anti-padrões (secrets):**
+- Local `naus run` → criar `.secrets` no repo; **não** inventar `kubsec_set_secret`, `naus set_env_pack` ou `attach_env_pack` para execução local.
+- Cloud → Env Packs na UI; `.secrets` só existe na máquina onde corres `naus run`.
+
+## Fluxo local (`kbs chat --extended-context -w <repo>`)
 
-**Não** invocar `naus register`, `naus start` ou `naus daemon` via chat — processos persistentes; ver `naus_pipeline_docs` / runner-management.
+| Tool | Comando |
+|------|---------|
+| `naus_local_status` | `naus` no PATH |
+| `naus_local_validate` | `naus validate <path>` |
+| `naus_local_plan` | `naus plan <path>` (lê `.env` / `.secrets` como `naus run`) |
+| `naus_local_run` | `naus run <path>` (até 15 min; lê `.secrets` por omissão) |
 
-## Kinds ASPM
+## Runner enrollment (documentar, não executar no chat)
 
-- `kind: aspm` + `tool` (trivy, gitleaks, syft, osv, semgrep, sonar, nmap, skipfish).
-- `kind: aspm_matrix` — `parallel` com várias tools.
-- `kind: aspm_gate` — políticas após upload.
-- `kind: docker` — build/registry; `aspm.tool: trivy` para scan de imagem + gate.
+1. Obter bootstrap token `bt_...` na UI (Runners).
+2. `naus register <token>` → grava `~/.kubbisec/naus/config.json` + certificados mTLS.
+3. `naus start` — runner aceita jobs da cloud.
+4. Re-registo do mesmo runner: token de re-registo na UI ou `naus migrate` (token legado `nau_...`).
 
-## Scanners locais
+## Scanners locais (fora do pipeline)
 
-Para `aspm scan` / `aspm upload` no host, skill `aspm-platform` e `aspm_local_*`.
+Para `aspm scan` / `aspm upload` no host → skill `aspm-platform` e `aspm_local_*`.