@oh-my-pi/pi-coding-agent 16.2.8 → 16.2.11

package/src/extensibility/skills.ts

@@ -384,6 +384,83 @@ export function getSkillSlashCommandName(skill: Pick<Skill, "name">): string {
 	return `skill:${skill.name}`;
 }
 
+/**
+ * Parsed `/skill:<name>` invocation: either at the start of the draft (the
+ * traditional slash-command position) or as a `/skill:<name>` token embedded
+ * mid-prompt. For the mid-prompt form the surrounding prose is threaded
+ * through as `args` so the skill sees the full user request.
+ */
+export interface ParsedSkillInvocation {
+	/** Bare skill name without the leading `skill:` prefix. */
+	name: string;
+	/** User-supplied arguments (everything outside the `/skill:<name>` token). */
+	args: string;
+}
+
+const MID_PROMPT_SKILL_RE = /(^|\s)\/skill:([^\s/]+)(\s|$)/;
+
+/**
+ * Detect a `/skill:<name>` invocation in a user draft.
+ *
+ * Returns `undefined` when the text contains no skill token. Otherwise:
+ *   - Leading form (`/skill:foo bar baz`): name=`foo`, args=`bar baz`.
+ *   - Mid-prompt form (`fix the bug /skill:foo focus on auth`): name=`foo`,
+ *     args=`fix the bug focus on auth` — the surrounding prose collapsed
+ *     into a single args string.
+ *
+ * Mid-prompt detection is disabled when the draft itself starts with a
+ * different slash command (e.g. `/compact /skill:foo`) or a local-execution
+ * sigil — `!cmd` / `!!cmd` for the bash tool and `$ cmd` / `$$ cmd` for the
+ * python tool. Those handlers run after the skill-command dispatcher and
+ * their bodies routinely contain `/skill:<name>` references that are not
+ * meant as skill invocations.
+ */
+export function parseSkillInvocation(text: string): ParsedSkillInvocation | undefined {
+	const trimmedStart = text.trimStart();
+	if (trimmedStart.startsWith("/skill:")) {
+		const spaceIndex = trimmedStart.indexOf(" ");
+		const name =
+			spaceIndex === -1 ? trimmedStart.slice("/skill:".length) : trimmedStart.slice("/skill:".length, spaceIndex);
+		if (!name) return undefined;
+		const args = spaceIndex === -1 ? "" : trimmedStart.slice(spaceIndex + 1).trim();
+		return { name, args };
+	}
+	if (trimmedStart.startsWith("/")) return undefined;
+	if (startsWithLocalExecutionPrefix(trimmedStart)) return undefined;
+	const match = MID_PROMPT_SKILL_RE.exec(text);
+	if (!match) return undefined;
+	const leading = match[1] ?? "";
+	const trailing = match[3] ?? "";
+	const tokenStart = match.index + leading.length;
+	const tokenEnd = match.index + match[0].length - trailing.length;
+	const name = match[2] ?? "";
+	if (!name) return undefined;
+	const before = text.slice(0, tokenStart).trimEnd();
+	const after = text.slice(tokenEnd).trimStart();
+	const args = [before, after]
+		.filter(part => part.length > 0)
+		.join(" ")
+		.trim();
+	return { name, args };
+}
+
+/**
+ * Whether the (already left-trimmed) draft begins with a TUI local-execution
+ * sigil that downstream branches will consume verbatim — `!`/`!!` for the bash
+ * tool and `$`/`$$` followed by ASCII whitespace for the python tool. Mirrors
+ * `pythonCommandPrefixLength` in `modes/controllers/input-controller` so the
+ * two checks agree without forcing a circular import.
+ */
+function startsWithLocalExecutionPrefix(trimmedStart: string): boolean {
+	if (trimmedStart.startsWith("!")) return true;
+	if (trimmedStart.charCodeAt(0) !== 36 /* $ */) return false;
+	if (trimmedStart.charCodeAt(1) === 123 /* { */) return false;
+	const sigilLength = trimmedStart.charCodeAt(1) === 36 /* $ */ ? 2 : 1;
+	const next = trimmedStart.charCodeAt(sigilLength);
+	if (Number.isNaN(next)) return true;
+	return next === 32 /* space */ || next === 9 /* tab */ || next === 10 /* LF */ || next === 13 /* CR */;
+}
+
 export async function buildSkillPromptMessage(
 	skill: Pick<Skill, "name" | "filePath">,
 	args: string,