@howaboua/pi-codex-conversion 1.5.0 → 1.5.1-dev.12.fbcf75f

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@howaboua/pi-codex-conversion",
-  "version": "1.5.0",
+  "version": "1.5.1-dev.12.fbcf75f",
   "description": "Codex-oriented tool and prompt adapter for pi coding agent",
   "type": "module",
   "repository": {

package/src/index.ts

@@ -1,4 +1,7 @@
 import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
+import { existsSync } from "node:fs";
+import { homedir } from "node:os";
+import { join, resolve } from "node:path";
 import { getCodexRuntimeShell } from "./adapter/runtime-shell.ts";
 import {
 	CORE_ADAPTER_TOOL_NAMES,
@@ -20,7 +23,7 @@ import {
 	registerOpenAICodexCustomProvider,
 } from "./providers/openai-codex-custom-provider.ts";
 import { registerImageGenerationTool, rewriteNativeImageGenerationTool, supportsNativeImageGeneration } from "./tools/image-generation-tool.ts";
-import { buildCodexSystemPrompt, extractPiPromptSkills, type PromptSkill } from "./prompt/build-system-prompt.ts";
+import { buildCodexSystemPrompt, extractPiPromptSkills, resolvePromptSkills, type PromptSkill } from "./prompt/build-system-prompt.ts";
 import { registerViewImageTool, supportsOriginalImageDetail } from "./tools/view-image-tool.ts";
 import {
 	registerWebSearchTool,
@@ -83,6 +86,11 @@ export default function codexConversion(pi: ExtensionAPI) {
 		syncAdapter(pi, ctx, state);
 	});
 
+	pi.on("resources_discover", async (event) => {
+		const skillPaths = getCodexSkillPaths(event.cwd);
+		return skillPaths.length > 0 ? { skillPaths } : undefined;
+	});
+
 	pi.on("model_select", async (_event, ctx) => {
 		state.cwd = ctx.cwd;
 		syncAdapter(pi, ctx, state);
@@ -118,9 +126,10 @@ export default function codexConversion(pi: ExtensionAPI) {
 		if (!isCodexLikeContext(ctx)) {
 			return undefined;
 		}
+		const skills = resolvePromptSkills(event.systemPromptOptions?.skills, state.promptSkills);
 		return {
 			systemPrompt: buildCodexSystemPrompt(event.systemPrompt, {
-				skills: state.promptSkills,
+				skills,
 				shell: getCodexRuntimeShell(process.env.SHELL),
 			}),
 		};
@@ -149,6 +158,20 @@ export default function codexConversion(pi: ExtensionAPI) {
 	});
 }
 
+export function getCodexSkillPaths(cwd: string, home: string = homedir()): string[] {
+	const skillPaths = [join(home, ".agents", "skills")];
+	let currentDir = resolve(cwd);
+	while (true) {
+		skillPaths.push(join(currentDir, ".agents", "skills"));
+		const parentDir = resolve(currentDir, "..");
+		if (parentDir === currentDir) {
+			break;
+		}
+		currentDir = parentDir;
+	}
+	return skillPaths.filter((path) => existsSync(path));
+}
+
 function syncAdapter(pi: ExtensionAPI, ctx: ExtensionContext, state: AdapterState): void {
 	state.promptSkills = extractPiPromptSkills(ctx.getSystemPrompt());
 

package/src/prompt/build-system-prompt.ts

@@ -4,6 +4,13 @@ export interface PromptSkill {
 	filePath: string;
 }
 
+export interface StructuredPromptSkill {
+	name: string;
+	description: string;
+	filePath: string;
+	disableModelInvocation?: boolean;
+}
+
 const CODEX_GUIDELINES = [
 	"Use `exec_command` for shell commands, file inspection, builds, and tests; prefer `rg` / `rg --files` for discovery and focused commands over truncation.",
 	"Use `apply_patch` for text-file changes, including creates/deletes/moves; group related multi-file edits into one patch.",
@@ -56,6 +63,27 @@ export function extractPiPromptSkills(prompt: string): PromptSkill[] {
 	}));
 }
 
+export function promptSkillsFromStructuredSkills(skills: readonly StructuredPromptSkill[] | undefined): PromptSkill[] {
+	if (!Array.isArray(skills)) {
+		return [];
+	}
+
+	return skills
+		.filter((skill) => !skill.disableModelInvocation)
+		.map((skill) => ({
+			name: skill.name,
+			description: skill.description,
+			filePath: skill.filePath,
+		}));
+}
+
+export function resolvePromptSkills(
+	structuredSkills: readonly StructuredPromptSkill[] | undefined,
+	fallbackSkills: readonly PromptSkill[],
+): PromptSkill[] {
+	return structuredSkills === undefined ? [...fallbackSkills] : promptSkillsFromStructuredSkills(structuredSkills);
+}
+
 function injectSkills(prompt: string, skills: PromptSkill[]): string {
 	if (skills.length === 0 || /\n## Skills\b/.test(prompt) || /<skills_instructions>/.test(prompt)) {
 		return prompt;