@oh-my-pi/pi-coding-agent 14.3.0 → 14.4.1

package/src/utils/file-display-mode.ts

@@ -22,16 +22,21 @@ export interface FileDisplayModeSession {
 /**
  * Computes effective line display mode from session settings/env.
  * Hashline mode takes precedence and implies line-addressed output everywhere.
- * Hashlines are suppressed when the edit tool is not available (e.g. explore agents).
+ * Hashlines are suppressed when the edit tool is not available (e.g. explore agents)
+ * and when the caller signals a `raw` read — raw output should be returned as-is
+ * without injecting hashline anchors or line numbers.
  */
-export function resolveFileDisplayMode(session: FileDisplayModeSession): FileDisplayMode {
+export function resolveFileDisplayMode(session: FileDisplayModeSession, options?: { raw?: boolean }): FileDisplayMode {
 	const { settings } = session;
 	const hasEditTool = session.hasEditTool ?? true;
-	const hashLines = hasEditTool && resolveEditMode(session) === "hashline" && settings.get("readHashLines") !== false;
-	const chunked = hasEditTool && resolveEditMode(session) === "chunk";
+	const editMode = resolveEditMode(session);
+	const usesHashLineAnchors = editMode === "hashline" || editMode === "atom";
+	const raw = options?.raw === true;
+	const hashLines = !raw && hasEditTool && usesHashLineAnchors && settings.get("readHashLines") !== false;
+	const chunked = !raw && hasEditTool && editMode === "chunk";
 	return {
 		hashLines,
-		lineNumbers: hashLines || settings.get("readLineNumbers") === true,
+		lineNumbers: !raw && (hashLines || settings.get("readLineNumbers") === true),
 		chunked,
 	};
 }

package/src/utils/git.ts

@@ -1,7 +1,7 @@
 import * as fs from "node:fs";
 import * as os from "node:os";
 import * as path from "node:path";
-import { $which, isEnoent, Snowflake } from "@oh-my-pi/pi-utils";
+import { $which, hasFsCode, isEnoent, Snowflake } from "@oh-my-pi/pi-utils";
 import {
 	parseDiffHunks as parseCommitDiffHunks,
 	parseFileDiffs,
@@ -322,6 +322,10 @@ async function writeTempPatch(content: string): Promise<string> {
 
 type EntryType = "directory" | "file";
 
+function isOptionalGitMetadataUnavailable(err: unknown): boolean {
+	return isEnoent(err) || hasFsCode(err, "ENFILE") || hasFsCode(err, "EMFILE");
+}
+
 function getEntryTypeSync(gitEntryPath: string): EntryType | null {
 	try {
 		const stat = fs.statSync(gitEntryPath);
@@ -329,7 +333,7 @@ function getEntryTypeSync(gitEntryPath: string): EntryType | null {
 		if (stat.isFile()) return "file";
 		return null;
 	} catch (err) {
-		if (isEnoent(err)) return null;
+		if (isOptionalGitMetadataUnavailable(err)) return null;
 		throw err;
 	}
 }
@@ -341,7 +345,7 @@ async function getEntryType(gitEntryPath: string): Promise<EntryType | null> {
 		if (stat.isFile()) return "file";
 		return null;
 	} catch (err) {
-		if (isEnoent(err)) return null;
+		if (isOptionalGitMetadataUnavailable(err)) return null;
 		throw err;
 	}
 }
@@ -350,7 +354,7 @@ function readOptionalTextSync(filePath: string): string | null {
 	try {
 		return fs.readFileSync(filePath, "utf8");
 	} catch (err) {
-		if (isEnoent(err)) return null;
+		if (isOptionalGitMetadataUnavailable(err)) return null;
 		throw err;
 	}
 }
@@ -359,7 +363,7 @@ async function readOptionalText(filePath: string): Promise<string | null> {
 	try {
 		return await Bun.file(filePath).text();
 	} catch (err) {
-		if (isEnoent(err)) return null;
+		if (isOptionalGitMetadataUnavailable(err)) return null;
 		throw err;
 	}
 }

package/src/utils/shell-snapshot.ts

@@ -59,10 +59,9 @@ done
 echo "# Functions" >> "$SNAPSHOT_FILE"
 # Force autoload all functions first
 declare -f > /dev/null 2>&1
-# Get user function names - filter system/private ones, use base64 for special chars
+# Get user function names - filter system/private ones
 declare -F 2>/dev/null | cut -d' ' -f3 | grep -vE '^(_|__)' | grep -vE '${commonToolsRegex}' | while read func; do
-   encoded_func=$(declare -f "$func" | base64)
-   echo "eval \\"\\$(echo '$encoded_func' | base64 -d)\\" > /dev/null 2>&1" >> "$SNAPSHOT_FILE"
+   declare -f "$func" >> "$SNAPSHOT_FILE" 2>/dev/null
 done
 `;
 

package/src/vim/render.ts

@@ -1,5 +1,5 @@
 import { extractSegments } from "@oh-my-pi/pi-tui";
-import { truncateToWidth } from "../tools/render-utils";
+import { formatCodeFrameLine, truncateToWidth } from "../tools/render-utils";
 import type {
 	VimErrorLocation,
 	VimFocusLine,
@@ -207,7 +207,7 @@ export function renderVimDetails(details: VimToolDetails): string {
 	}
 
 	if (details.focus) {
-		const focusPrefix = `>${String(details.focus.line).padStart(String(details.viewport.end).length, " ")}│`;
+		const focusPrefix = formatCodeFrameLine(">", details.focus.line, "", String(details.viewport.end).length);
 		const caretPrefix = `${" ".repeat(focusPrefix.length)} `;
 		const caretPadding = " ".repeat(Math.max(0, details.focus.caretCol));
 		lines.push("Focus:");
@@ -219,8 +219,8 @@ export function renderVimDetails(details: VimToolDetails): string {
 		const padWidth = String(details.viewport.end).length;
 		lines.push("Viewport:");
 		for (const line of details.viewportLines) {
-			const prefix = line.isCursor ? ">" : line.isSelected ? "*" : " ";
-			lines.push(`${prefix}${String(line.line).padStart(padWidth, " ")}│${renderPlainViewportCursor(line)}`);
+			const marker = line.isCursor ? ">" : line.isSelected ? "*" : " ";
+			lines.push(formatCodeFrameLine(marker, line.line, renderPlainViewportCursor(line), padWidth));
 		}
 	}
 

package/src/prompts/system/subagent-submit-reminder.md

@@ -1,11 +0,0 @@
-<system-reminder>
-You stopped without calling submit_result. This is reminder {{retryCount}} of {{maxRetries}}.
-
-You **MUST** call submit_result as your only action now. Choose one:
-- If task is complete: call submit_result with your result in `result.data`
-- If task failed: call submit_result with `result.error` describing what happened
-
-You **MUST NOT** give up if you can still complete the task through exploration (using available tools or repo context). If you submit an error, you **MUST** include what you tried and the exact blocker.
-
-You **MUST NOT** output text without a tool call. You **MUST** call submit_result to finish.
-</system-reminder>

package/src/prompts/tools/gh-issue-view.md

@@ -1,11 +0,0 @@
-Reads a GitHub issue through the local GitHub CLI.
-
-<instruction>
-- Accepts an issue number or full GitHub issue URL
-- Use `repo` when you have a number but no active GitHub repository context
-- Keep `comments` enabled when discussion context matters; disable it for a lighter summary
-</instruction>
-
-<output>
-Returns issue metadata, body text, and optionally visible comments in a readable format.
-</output>

package/src/prompts/tools/gh-pr-checkout.md

@@ -1,12 +0,0 @@
-Checks out a GitHub pull request into a dedicated git worktree through the local GitHub CLI.
-
-<instruction>
-- Accepts a pull request number, URL, or branch name
-- Omitting `pr` targets the pull request associated with the current branch
-- Creates or reuses a local `pr-<number>` branch by default, fetches the contributor head branch, and creates a dedicated worktree for it
-- Configures the local branch to push back to the pull request head branch instead of accidentally publishing to the base repository
-</instruction>
-
-<output>
-Returns the worktree path, local branch name, remote name, and remote branch configured for future pushes.
-</output>

package/src/prompts/tools/gh-pr-diff.md

@@ -1,12 +0,0 @@
-Reads a GitHub pull request diff through the local GitHub CLI.
-
-<instruction>
-- Accepts a pull request number, URL, or branch name
-- Omitting `pr` targets the pull request associated with the current branch
-- Use `nameOnly: true` when you only need changed file names
-- Use `exclude` to drop generated or irrelevant paths from the diff
-</instruction>
-
-<output>
-Returns a unified diff or changed-file list for the selected pull request.
-</output>

package/src/prompts/tools/gh-pr-push.md

@@ -1,12 +0,0 @@
-Pushes a checked-out pull request branch back to its source branch through local git.
-
-<instruction>
-- Defaults to the current checked-out git branch
-- Requires branch metadata recorded by `gh_pr_checkout`; fail instead of pushing if the branch was not checked out with `gh_pr_checkout`
-- Pushes back to the contributor fork and PR head branch recorded in that metadata
-- Use `forceWithLease` only when rewriting the branch intentionally
-</instruction>
-
-<output>
-Returns the local branch, remote, remote branch, and push target that were used.
-</output>

package/src/prompts/tools/gh-pr-view.md

@@ -1,11 +0,0 @@
-Reads a GitHub pull request through the local GitHub CLI.
-
-<instruction>
-- Accepts a pull request number, URL, or branch name
-- Omitting `pr` targets the pull request associated with the current branch
-- Use this for PR metadata, body, changed-file summaries, review discussion, inline review comments, and issue-comment context
-</instruction>
-
-<output>
-Returns pull request metadata, body text, changed files, and optionally visible reviews, inline review comments, and issue comments in a readable format.
-</output>

package/src/prompts/tools/gh-repo-view.md

@@ -1,11 +0,0 @@
-Reads GitHub repository metadata using the local GitHub CLI.
-
-<instruction>
-- Prefer this when you need authenticated repository context or GitHub CLI default-repo resolution
-- Use `repo` to target an explicit `OWNER/REPO`; otherwise the current checkout or `gh` default repo is used
-- This tool is read-only and returns repository metadata, not raw file contents
-</instruction>
-
-<output>
-Returns a concise repository summary including description, branch, visibility, stars, forks, and related metadata.
-</output>

package/src/prompts/tools/gh-run-watch.md

@@ -1,12 +0,0 @@
-Watches a GitHub Actions workflow run through the local GitHub CLI.
-
-<instruction>
-- Accepts a run ID or full Actions run URL
-- Omitting `run` watches the workflow runs for the current HEAD commit in the current GitHub repository context
-- Omitting `branch` falls back to the current checked-out git branch
-- Fast-fails after the first detected job failure, waits briefly to collect concurrent failures, and then fetches tailed logs for the failed jobs
-</instruction>
-
-<output>
-Streams live run snapshots while polling, then returns the final run status, job list, and tailed logs for failed jobs when available. When failed-job logs are fetched, the full failed-job logs are also saved as a session artifact for on-demand reads. When `run` is omitted, the snapshots cover all workflow runs created for the current HEAD commit.
-</output>

package/src/prompts/tools/gh-search-issues.md

@@ -1,11 +0,0 @@
-Searches GitHub issues through the local GitHub CLI.
-
-<instruction>
-- `query` supports normal GitHub issue search syntax
-- Use `repo` to scope results to a single repository when relevant
-- Prefer small limits and refine the query instead of pulling large result sets
-</instruction>
-
-<output>
-Returns a concise list of matching issues with repository, state, labels, timestamps, and URLs.
-</output>

package/src/prompts/tools/gh-search-prs.md

@@ -1,11 +0,0 @@
-Searches GitHub pull requests through the local GitHub CLI.
-
-<instruction>
-- `query` supports normal GitHub pull request search syntax
-- Use `repo` to scope results to a single repository when relevant
-- Prefer small limits and refine the query instead of pulling large result sets
-</instruction>
-
-<output>
-Returns a concise list of matching pull requests with repository, state, labels, timestamps, and URLs.
-</output>