@howaboua/pi-codex-conversion 1.0.0 → 1.0.2

package/README.md

@@ -79,6 +79,7 @@ pi install git:github.com/IgorWarzocha/pi-codex-conversion
 The adapter does not build a standalone replacement prompt anymore. Instead it:
 
 - keeps Pi's tool descriptions, Pi docs section, AGENTS/project context, skills inventory, and date/cwd when Pi already surfaced them
+- adds the current shell to the transformed prompt so quoting and escaping can match the runtime environment
 - rewrites the top-level role framing to Codex-style wording
 - adds a small Codex delta to the existing `Guidelines` section
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@howaboua/pi-codex-conversion",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "Codex-oriented tool and prompt adapter for pi coding agent",
   "type": "module",
   "repository": {

package/src/index.ts

@@ -15,6 +15,8 @@ interface AdapterState {
 	promptSkills: PromptSkill[];
 }
 
+const ADAPTER_TOOL_NAMES = [...CORE_ADAPTER_TOOL_NAMES, VIEW_IMAGE_TOOL_NAME];
+
 function getCommandArg(args: unknown): string | undefined {
 	if (!args || typeof args !== "object" || !("cmd" in args) || typeof args.cmd !== "string") {
 		return undefined;
@@ -63,7 +65,12 @@ export default function codexConversion(pi: ExtensionAPI) {
 		if (!isCodexLikeContext(ctx)) {
 			return undefined;
 		}
-		return { systemPrompt: buildCodexSystemPrompt(event.systemPrompt, { skills: state.promptSkills }) };
+		return {
+			systemPrompt: buildCodexSystemPrompt(event.systemPrompt, {
+				skills: state.promptSkills,
+				shell: process.env.SHELL || "/bin/bash",
+			}),
+		};
 	});
 }
 
@@ -80,7 +87,7 @@ function syncAdapter(pi: ExtensionAPI, ctx: ExtensionContext, state: AdapterStat
 }
 
 function enableAdapter(pi: ExtensionAPI, ctx: ExtensionContext, state: AdapterState): void {
-	const toolNames = getAdapterToolNames(ctx);
+	const toolNames = mergeAdapterTools(pi.getActiveTools(), getAdapterToolNames(ctx));
 	if (!state.enabled) {
 		// Preserve the previous active set once so switching away from Codex-like
 		// models restores the user's existing Pi tool configuration.
@@ -93,7 +100,8 @@ function enableAdapter(pi: ExtensionAPI, ctx: ExtensionContext, state: AdapterSt
 
 function disableAdapter(pi: ExtensionAPI, ctx: ExtensionContext, state: AdapterState): void {
 	if (state.enabled) {
-		pi.setActiveTools(state.previousToolNames && state.previousToolNames.length > 0 ? state.previousToolNames : DEFAULT_TOOL_NAMES);
+		const previousToolNames = state.previousToolNames && state.previousToolNames.length > 0 ? state.previousToolNames : DEFAULT_TOOL_NAMES;
+		pi.setActiveTools(restoreTools(previousToolNames, pi.getActiveTools()));
 		state.enabled = false;
 	}
 	setStatus(ctx, false);
@@ -110,3 +118,18 @@ function getAdapterToolNames(ctx: ExtensionContext): string[] {
 	}
 	return [...CORE_ADAPTER_TOOL_NAMES];
 }
+
+export function mergeAdapterTools(activeTools: string[], adapterTools: string[]): string[] {
+	const preservedTools = activeTools.filter((toolName) => !DEFAULT_TOOL_NAMES.includes(toolName) && !ADAPTER_TOOL_NAMES.includes(toolName));
+	return [...adapterTools, ...preservedTools];
+}
+
+export function restoreTools(previousTools: string[], activeTools: string[]): string[] {
+	const restored = [...previousTools];
+	for (const toolName of activeTools) {
+		if (!ADAPTER_TOOL_NAMES.includes(toolName) && !restored.includes(toolName)) {
+			restored.push(toolName);
+		}
+	}
+	return restored;
+}

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

@@ -30,6 +30,13 @@ function insertBeforeTrailingContext(prompt: string, section: string): string {
 	return `${prompt}\n\n${section}`;
 }
 
+function injectShell(prompt: string, shell?: string): string {
+	if (!shell || /\nCurrent shell:/.test(prompt)) {
+		return prompt;
+	}
+	return insertBeforeTrailingContext(prompt, `Current shell: ${shell}`);
+}
+
 function decodeXml(text: string): string {
 	return text
 		.replace(/'/g, "'")
@@ -106,6 +113,6 @@ function injectGuidelines(prompt: string): string {
 	return `${prompt.slice(0, match.index)}${replacement}${prompt.slice(match.index + match[0].length)}`;
 }
 
-export function buildCodexSystemPrompt(basePrompt: string, options: { skills?: PromptSkill[] } = {}): string {
-	return injectSkills(injectGuidelines(rewriteIntro(basePrompt)), options.skills ?? []);
+export function buildCodexSystemPrompt(basePrompt: string, options: { skills?: PromptSkill[]; shell?: string } = {}): string {
+	return injectShell(injectSkills(injectGuidelines(rewriteIntro(basePrompt)), options.skills ?? []), options.shell);
 }