pi-subagents 0.30.0 → 0.31.1

package/src/shared/utils.ts

@@ -5,6 +5,7 @@
 import * as fs from "node:fs";
 import * as os from "node:os";
 import * as path from "node:path";
+import * as piCodingAgent from "@earendil-works/pi-coding-agent";
 import type { Message } from "@earendil-works/pi-ai";
 import { formatToolCall } from "./formatters.ts";
 import type { AgentProgress, AsyncStatus, Details, DisplayItem, ErrorInfo, SingleResult, ToolCallSummary } from "./types.ts";
@@ -13,11 +14,28 @@ import type { AgentProgress, AsyncStatus, Details, DisplayItem, ErrorInfo, Singl
 // File System Utilities
 // ============================================================================
 
+const DEFAULT_CONFIG_DIR_NAME = ".pi";
+
+export function resolveConfigDirName(codingAgentModule: unknown = piCodingAgent): string {
+	const value = codingAgentModule && typeof codingAgentModule === "object"
+		? (codingAgentModule as { CONFIG_DIR_NAME?: unknown }).CONFIG_DIR_NAME
+		: undefined;
+	return typeof value === "string" && value.trim() ? value : DEFAULT_CONFIG_DIR_NAME;
+}
+
+export function getConfigDirName(): string {
+	return resolveConfigDirName();
+}
+
+export function getProjectConfigDir(projectRoot: string): string {
+	return path.join(projectRoot, getConfigDirName());
+}
+
 export function getAgentDir(): string {
 	const configured = process.env.PI_CODING_AGENT_DIR;
 	if (configured === "~") return os.homedir();
 	if (configured?.startsWith("~/")) return path.join(os.homedir(), configured.slice(2));
-	return configured || path.join(os.homedir(), ".pi", "agent");
+	return configured || path.join(os.homedir(), getConfigDirName(), "agent");
 }
 
 const statusCache = new Map<string, { mtime: number; status: AsyncStatus }>();

package/src/slash/prompt-template-bridge.ts

@@ -79,6 +79,7 @@ interface PromptTemplateBridgeResult {
 			agent?: string;
 			messages?: unknown[];
 			finalOutput?: string;
+			toolCalls?: Array<{ text?: string; expandedText?: string }>;
 			exitCode?: number;
 			error?: string;
 			model?: string;
@@ -209,13 +210,35 @@ function resolveProgressModel(
 	return firstWithModel?.model;
 }
 
-function buildDelegationMessages(result: { messages?: unknown[]; finalOutput?: string }, fallbackText?: string): unknown[] {
+function toolCallNameFromSummary(summary: { text?: string; expandedText?: string }): string | undefined {
+	const text = typeof summary.expandedText === "string" && summary.expandedText.trim().length > 0
+		? summary.expandedText.trim()
+		: typeof summary.text === "string"
+			? summary.text.trim()
+			: "";
+	if (!text) return undefined;
+	if (text.startsWith("$ ")) return "bash";
+	return text.match(/^[A-Za-z_][\w.-]*/)?.[0];
+}
+
+function buildDelegationMessages(
+	result: { messages?: unknown[]; finalOutput?: string; toolCalls?: Array<{ text?: string; expandedText?: string }> },
+	fallbackText?: string,
+): unknown[] {
 	if (Array.isArray(result.messages) && result.messages.length > 0) return result.messages;
+	const toolCallParts = (result.toolCalls ?? []).flatMap((summary) => {
+		const name = toolCallNameFromSummary(summary);
+		return name ? [{ type: "toolCall", name, arguments: { summary: summary.expandedText ?? summary.text ?? "" } }] : [];
+	});
 	const text = typeof result.finalOutput === "string" && result.finalOutput.trim().length > 0
 		? result.finalOutput.trim()
 		: fallbackText;
-	if (!text) return [];
-	return [{ role: "assistant", content: [{ type: "text", text }] }];
+	const content = [
+		...toolCallParts,
+		...(text ? [{ type: "text", text }] : []),
+	];
+	if (content.length === 0) return [];
+	return [{ role: "assistant", content }];
 }
 
 function toDelegationUpdate(requestId: string, update: PromptTemplateBridgeResult): PromptTemplateDelegationUpdate | undefined {