@oh-my-pi/pi-coding-agent 14.6.5 → 14.7.0

package/src/system-prompt.ts

@@ -13,7 +13,9 @@ import type { SkillsSettings } from "./config/settings";
 import { type ContextFile, loadCapability, type SystemPrompt as SystemPromptFile } from "./discovery";
 import { loadSkills, type Skill } from "./extensibility/skills";
 import customSystemPromptTemplate from "./prompts/system/custom-system-prompt.md" with { type: "text" };
+import projectPromptTemplate from "./prompts/system/project-prompt.md" with { type: "text" };
 import systemPromptTemplate from "./prompts/system/system-prompt.md" with { type: "text" };
+import { buildWorkspaceTree, type WorkspaceTree } from "./workspace-tree";
 
 interface AlwaysApplyRule {
 	name: string;
@@ -409,12 +411,20 @@ export interface BuildSystemPromptOptions {
 	secretsEnabled?: boolean;
 	/** Pre-loaded AGENTS.md search (skips discovery if provided). May be a Promise to allow early kick-off. */
 	agentsMdSearch?: AgentsMdSearch | Promise<AgentsMdSearch>;
+	/** Pre-loaded workspace tree (skips discovery if provided). May be a Promise to allow early kick-off. */
+	workspaceTree?: WorkspaceTree | Promise<WorkspaceTree>;
+}
+
+/** Result of building provider-facing system prompt messages. */
+export interface BuildSystemPromptResult {
+	/** Ordered system prompt blocks. Providers should preserve entries as distinct messages/blocks. */
+	systemPrompt: string[];
 }
 
 /** Build the system prompt with tools, guidelines, and context */
-export async function buildSystemPrompt(options: BuildSystemPromptOptions = {}): Promise<string> {
+export async function buildSystemPrompt(options: BuildSystemPromptOptions = {}): Promise<BuildSystemPromptResult> {
 	if ($env.NULL_PROMPT === "true") {
-		return "";
+		return { systemPrompt: [] };
 	}
 
 	const {
@@ -435,6 +445,7 @@ export async function buildSystemPrompt(options: BuildSystemPromptOptions = {}):
 		eagerTasks = false,
 		secretsEnabled = false,
 		agentsMdSearch: providedAgentsMdSearch,
+		workspaceTree: providedWorkspaceTree,
 	} = options;
 	const resolvedCwd = cwd ?? getProjectDir();
 
@@ -449,6 +460,10 @@ export async function buildSystemPrompt(options: BuildSystemPromptOptions = {}):
 			providedAgentsMdSearch !== undefined
 				? Promise.resolve(providedAgentsMdSearch)
 				: logger.time("buildAgentsMdSearch", buildAgentsMdSearch, resolvedCwd);
+		const workspaceTreePromise =
+			providedWorkspaceTree !== undefined
+				? Promise.resolve(providedWorkspaceTree)
+				: logger.time("buildWorkspaceTree", buildWorkspaceTree, resolvedCwd);
 		const skillsPromise: Promise<Skill[]> =
 			providedSkills !== undefined
 				? Promise.resolve(providedSkills)
@@ -463,6 +478,7 @@ export async function buildSystemPrompt(options: BuildSystemPromptOptions = {}):
 			contextFilesPromise,
 			agentsMdSearchPromise,
 			skillsPromise,
+			workspaceTreePromise,
 		]).then(
 			([
 				resolvedCustomPrompt,
@@ -471,6 +487,7 @@ export async function buildSystemPrompt(options: BuildSystemPromptOptions = {}):
 				contextFiles,
 				agentsMdSearch,
 				skills,
+				workspaceTree,
 			]) => ({
 				resolvedCustomPrompt,
 				resolvedAppendPrompt,
@@ -478,6 +495,7 @@ export async function buildSystemPrompt(options: BuildSystemPromptOptions = {}):
 				contextFiles,
 				agentsMdSearch,
 				skills,
+				workspaceTree,
 			}),
 		);
 	})();
@@ -501,6 +519,12 @@ export async function buildSystemPrompt(options: BuildSystemPromptOptions = {}):
 		pattern: `AGENTS.md depth ${AGENTS_MD_MIN_DEPTH}-${AGENTS_MD_MAX_DEPTH}`,
 		files: [],
 	};
+	let workspaceTree: WorkspaceTree = {
+		rootPath: resolvedCwd,
+		rendered: "",
+		truncated: false,
+		totalLines: 0,
+	};
 	let skills: Skill[] = providedSkills ?? [];
 
 	if (prepResult.type === "timeout") {
@@ -524,6 +548,7 @@ export async function buildSystemPrompt(options: BuildSystemPromptOptions = {}):
 		contextFiles = dedupeExactContextFiles(prepResult.value.contextFiles);
 		agentsMdSearch = prepResult.value.agentsMdSearch;
 		skills = prepResult.value.skills;
+		workspaceTree = prepResult.value.workspaceTree;
 	}
 
 	const date = new Date().toISOString().slice(0, 10);
@@ -578,6 +603,7 @@ export async function buildSystemPrompt(options: BuildSystemPromptOptions = {}):
 		environment,
 		contextFiles,
 		agentsMdSearch,
+		workspaceTree,
 		skills: filteredSkills,
 		rules: rules ?? [],
 		alwaysApplyRules: injectedAlwaysApplyRules,
@@ -599,5 +625,11 @@ export async function buildSystemPrompt(options: BuildSystemPromptOptions = {}):
 		rendered += `\n\n<critical>\nThe \`${reportToolIssueToolName}\` tool is available for automated QA. If ANY tool you call returns output that is unexpected, incorrect, malformed, or otherwise inconsistent with what you anticipated given the tool's described behavior and your parameters, call \`${reportToolIssueToolName}\` with the tool name and a concise description of the discrepancy. Do not hesitate to report — false positives are acceptable.\n</critical>`;
 	}
 
-	return rendered;
+	const systemPrompt = [rendered];
+	const projectPrompt = resolvedCustomPrompt ? "" : prompt.render(projectPromptTemplate, data).trim();
+	if (projectPrompt) {
+		systemPrompt.push(projectPrompt);
+	}
+
+	return { systemPrompt };
 }

package/src/task/executor.ts

@@ -967,9 +967,9 @@ export async function runSubprocess(options: ExecutorOptions): Promise<SingleRes
 				contextFiles: options.contextFiles,
 				skills: options.skills,
 				promptTemplates: options.promptTemplates,
-				systemPrompt: defaultPrompt =>
+				systemPrompt: defaultPrompt => [
 					prompt.render(subagentSystemPromptTemplate, {
-						base: defaultPrompt,
+						base: defaultPrompt.join("\n\n"),
 						agent: agent.systemPrompt,
 						worktree: worktree ?? "",
 						outputSchema: normalizedOutputSchema,
@@ -977,6 +977,7 @@ export async function runSubprocess(options: ExecutorOptions): Promise<SingleRes
 						ircPeers: ircEnabled ? renderIrcPeerRoster(id) : "",
 						ircSelfId: ircEnabled ? id : "",
 					}),
+				],
 				sessionManager,
 				hasUI: false,
 				spawns: spawnsEnv,
@@ -1016,7 +1017,7 @@ export async function runSubprocess(options: ExecutorOptions): Promise<SingleRes
 			}
 
 			session.sessionManager.appendSessionInit({
-				systemPrompt: session.agent.state.systemPrompt,
+				systemPrompt: session.agent.state.systemPrompt.join("\n\n"),
 				task,
 				tools: session.getActiveToolNames(),
 				outputSchema,

package/src/tools/fetch.ts

@@ -148,20 +148,20 @@ export interface ParsedReadUrlTarget {
 	limit?: number;
 }
 
-export function parseReadUrlTarget(readPath: string, sel?: string): ParsedReadUrlTarget | null {
-	const embedded = sel ? undefined : tryExtractEmbeddedUrlSelector(readPath);
+export function parseReadUrlTarget(readPath: string): ParsedReadUrlTarget | null {
+	const embedded = tryExtractEmbeddedUrlSelector(readPath);
 	const urlPath = embedded?.path ?? readPath;
 	if (!isReadableUrlPath(urlPath)) {
 		return null;
 	}
 
-	const selector = sel ?? embedded?.sel;
+	const selector = embedded?.sel;
 	const raw = selector === "raw";
 	const lineMatch = selector ? URL_LINE_RANGE_RE.exec(selector) : null;
 	if (lineMatch) {
 		const startLine = Number.parseInt(lineMatch[1]!, 10);
 		if (startLine < 1) {
-			throw new ToolError("sel=0 is invalid; lines are 1-indexed. Use sel=1.");
+			throw new ToolError("URL line selector 0 is invalid; lines are 1-indexed. Use :L1.");
 		}
 		const sep = lineMatch[2];
 		const rhs = lineMatch[3] ? Number.parseInt(lineMatch[3], 10) : undefined;

package/src/tools/gh.ts

@@ -1,4 +1,5 @@
 import * as fs from "node:fs/promises";
+import * as os from "node:os";
 import * as path from "node:path";
 import type { AgentTool, AgentToolContext, AgentToolResult, AgentToolUpdateCallback } from "@oh-my-pi/pi-agent-core";
 import { StringEnum } from "@oh-my-pi/pi-ai";
@@ -151,6 +152,7 @@ const githubSchema = Type.Object({
 		[
 			"repo_view",
 			"issue_view",
+			"pr_create",
 			"pr_view",
 			"pr_diff",
 			"pr_checkout",
@@ -205,6 +207,53 @@ const githubSchema = Type.Object({
 	),
 	force: Type.Optional(Type.Boolean({ description: "reset existing local branch (pr_checkout)" })),
 	forceWithLease: Type.Optional(Type.Boolean({ description: "force-with-lease push (pr_push)" })),
+	title: Type.Optional(
+		Type.String({
+			description: "PR title (pr_create)",
+			examples: ["Fix login bug"],
+		}),
+	),
+	body: Type.Optional(
+		Type.String({
+			description: "PR body markdown (pr_create); mutually exclusive with fill",
+		}),
+	),
+	base: Type.Optional(
+		Type.String({
+			description: "PR base branch (pr_create); defaults to repo default branch",
+			examples: ["main"],
+		}),
+	),
+	head: Type.Optional(
+		Type.String({
+			description: "PR head branch (pr_create); defaults to current branch",
+			examples: ["feature/foo"],
+		}),
+	),
+	draft: Type.Optional(Type.Boolean({ description: "open PR as draft (pr_create)" })),
+	fill: Type.Optional(
+		Type.Boolean({
+			description: "auto-fill PR title/body from commits (pr_create); mutually exclusive with title/body",
+		}),
+	),
+	reviewer: Type.Optional(
+		Type.Array(Type.String(), {
+			description: "reviewers to request (pr_create); accepts users or org/team",
+			examples: [["octocat", "myorg/team"]],
+		}),
+	),
+	assignee: Type.Optional(
+		Type.Array(Type.String(), {
+			description: "assignees (pr_create); use @me for the authenticated user",
+			examples: [["@me"]],
+		}),
+	),
+	label: Type.Optional(
+		Type.Array(Type.String(), {
+			description: "labels to apply (pr_create)",
+			examples: [["bug", "enhancement"]],
+		}),
+	),
 	query: Type.Optional(
 		Type.String({
 			description: "search query (search_issues, search_prs, search_code, search_commits, search_repos)",
@@ -2063,6 +2112,8 @@ export class GithubTool implements AgentTool<typeof githubSchema, GhToolDetails>
 					return executeRepoView(this.session, params, signal);
 				case "issue_view":
 					return executeIssueView(this.session, params, signal);
+				case "pr_create":
+					return executePrCreate(this.session, params, signal);
 				case "pr_view":
 					return executePrView(this.session, params, signal);
 				case "pr_diff":
@@ -2442,6 +2493,142 @@ async function executePrPush(
 	);
 }
 
+async function executePrCreate(
+	session: ToolSession,
+	params: GithubInput,
+	signal: AbortSignal | undefined,
+): Promise<AgentToolResult<GhToolDetails>> {
+	const repo = normalizeOptionalString(params.repo);
+	const title = normalizeOptionalString(params.title);
+	const body = params.body;
+	const base = normalizeOptionalString(params.base);
+	const head = normalizeOptionalString(params.head);
+	const draft = params.draft ?? false;
+	const fill = params.fill ?? false;
+	const reviewers = normalizePrIdentifierList(params.reviewer);
+	const assignees = normalizePrIdentifierList(params.assignee);
+	const labels = normalizePrIdentifierList(params.label);
+
+	if (!fill && !title) {
+		throw new ToolError("title is required unless fill is true");
+	}
+	if (fill && (title || body !== undefined)) {
+		throw new ToolError("fill is mutually exclusive with title and body");
+	}
+
+	const args = ["pr", "create"];
+	appendRepoFlag(args, repo);
+	if (title) args.push("--title", title);
+	if (base) args.push("--base", base);
+	if (head) args.push("--head", head);
+	if (draft) args.push("--draft");
+	if (fill) args.push("--fill");
+	for (const reviewer of reviewers) args.push("--reviewer", reviewer);
+	for (const assignee of assignees) args.push("--assignee", assignee);
+	for (const label of labels) args.push("--label", label);
+
+	let bodyDir: string | undefined;
+	try {
+		if (!fill) {
+			if (body !== undefined && body.length > 0) {
+				// Route through a temp file so multi-KB bodies stay clear of any
+				// argv-length limits and shell-quoting hazards on uncommon platforms.
+				bodyDir = await fs.mkdtemp(path.join(os.tmpdir(), "gh-pr-body-"));
+				const bodyFile = path.join(bodyDir, "body.md");
+				await Bun.write(bodyFile, body);
+				args.push("--body-file", bodyFile);
+			} else {
+				// Avoid gh dropping into an interactive editor when no body is given.
+				args.push("--body", "");
+			}
+		}
+
+		const output = await git.github.text(session.cwd, args, signal, {
+			repoProvided: Boolean(repo),
+		});
+		const url =
+			output
+				.split("\n")
+				.map(line => line.trim())
+				.find(line => line.startsWith("https://github.com/")) ?? output.trim();
+		const parsed = parsePullRequestUrl(url);
+		const resolvedRepo = repo ?? parsed.repo;
+
+		let prView: GhPrViewData | undefined;
+		if (resolvedRepo && parsed.prNumber !== undefined) {
+			try {
+				prView = await git.github.json<GhPrViewData>(
+					session.cwd,
+					[
+						"pr",
+						"view",
+						String(parsed.prNumber),
+						"--repo",
+						resolvedRepo,
+						"--json",
+						GH_PR_FIELDS_NO_COMMENTS.join(","),
+					],
+					signal,
+					{ repoProvided: true },
+				);
+			} catch {
+				// Best-effort summary; PR creation already succeeded.
+			}
+		}
+
+		const text = formatPrCreateResult({
+			url,
+			prNumber: parsed.prNumber,
+			data: prView,
+			title,
+			base,
+			head,
+			draft,
+		});
+		return buildTextResult(text, url || prView?.url);
+	} finally {
+		if (bodyDir) {
+			await fs.rm(bodyDir, { recursive: true, force: true }).catch(() => {});
+		}
+	}
+}
+
+function formatPrCreateResult(options: {
+	url: string;
+	prNumber?: number;
+	data?: GhPrViewData;
+	title?: string;
+	base?: string;
+	head?: string;
+	draft?: boolean;
+}): string {
+	const number = options.prNumber ?? options.data?.number;
+	const headerTitle = options.data?.title ?? options.title ?? "Untitled";
+	const header =
+		number !== undefined
+			? `# Created Pull Request #${number}: ${headerTitle}`
+			: `# Created Pull Request: ${headerTitle}`;
+	const lines: string[] = [header, ""];
+	pushLine(lines, "URL", options.url || options.data?.url);
+	pushLine(lines, "State", options.data?.state);
+	pushLine(lines, "Draft", options.data?.isDraft ?? options.draft);
+	pushLine(lines, "Base", options.data?.baseRefName ?? options.base);
+	pushLine(lines, "Head", options.data?.headRefName ?? options.head);
+	pushLine(lines, "Author", formatAuthor(options.data?.author));
+	pushLine(lines, "Created", options.data?.createdAt);
+	pushLine(lines, "Labels", formatLabels(options.data?.labels));
+
+	const bodyText = normalizeText(options.data?.body);
+	if (bodyText) {
+		lines.push("");
+		lines.push("## Body");
+		lines.push("");
+		lines.push(bodyText);
+	}
+
+	return lines.join("\n").trim();
+}
+
 async function executeSearchIssues(
 	session: ToolSession,
 	params: GithubInput,

package/src/tools/image-gen.ts

@@ -1125,7 +1125,9 @@ export const imageGenTool: CustomTool<typeof imageGenSchema, ImageGenToolDetails
 					headers: {
 						"Content-Type": "application/json",
 						Authorization: `Bearer ${apiKey.apiKey}`,
-						"X-Title": "Oh-My-Pi",
+						"HTTP-Referer": "https://github.com/can1357/oh-my-pi",
+						"X-OpenRouter-Title": "Oh-My-Pi",
+						"X-OpenRouter-Categories": "cli-agent",
 					},
 					body: JSON.stringify(requestBody),
 					signal: requestSignal,

package/src/tools/inspect-image.ts

@@ -127,7 +127,7 @@ export class InspectImageTool implements AgentTool<typeof inspectImageSchema, In
 		const response = await this.completeImageRequest(
 			model,
 			{
-				systemPrompt: prompt.render(inspectImageSystemPromptTemplate),
+				systemPrompt: [prompt.render(inspectImageSystemPromptTemplate)],
 				messages: [
 					{
 						role: "user",

package/src/tools/output-meta.ts

@@ -337,7 +337,7 @@ export function formatTruncationMetaNotice(truncation: TruncationMeta): string {
 	}
 
 	if (truncation.nextOffset != null) {
-		notice += `. Use sel=${truncation.nextOffset} to continue`;
+		notice += `. Use :${truncation.nextOffset} to continue`;
 	}
 
 	if (truncation.artifactId != null) {

package/src/tools/path-utils.ts

@@ -5,6 +5,7 @@ import * as url from "node:url";
 import { isEnoent } from "@oh-my-pi/pi-utils";
 
 const UNICODE_SPACES = /[\u00A0\u2000-\u200A\u202F\u205F\u3000]/g;
+const FILE_LINE_RANGE_RE = /^(?:L?\d+(?:[-+]L?\d+)?|raw)$/i;
 const NARROW_NO_BREAK_SPACE = "\u202F";
 const TOP_LEVEL_INTERNAL_URL_PREFIXES = [
 	"agent://",
@@ -102,6 +103,16 @@ export function expandPath(filePath: string): string {
 	return expandTilde(normalized);
 }
 
+export function splitPathAndSel(rawPath: string): { path: string; sel?: string } {
+	const colon = rawPath.lastIndexOf(":");
+	if (colon <= 0) return { path: rawPath };
+
+	const candidate = rawPath.slice(colon + 1);
+	if (!FILE_LINE_RANGE_RE.test(candidate)) return { path: rawPath };
+
+	return { path: rawPath.slice(0, colon), sel: candidate };
+}
+
 function assertNotInternalUrl(expanded: string, original: string): void {
 	for (const prefix of TOP_LEVEL_INTERNAL_URL_PREFIXES) {
 		if (expanded.startsWith(prefix)) {