@oh-my-pi/pi-coding-agent 16.2.1 → 16.2.2

package/src/edit/streaming.ts

@@ -52,6 +52,17 @@ export interface StreamingDiffContext {
 	isStreaming?: boolean;
 }
 
+/**
+ * Per-file projection of a streamed edit payload. Pairs one target file path
+ * with the digest of only the lines added to that file, so path-scoped stream
+ * matchers (TTSR) evaluate each file in isolation — a `tool:edit(*.ts)` rule
+ * never fires on text that actually belongs to a sibling `README.md` hunk.
+ */
+export interface EditMatcherEntry {
+	readonly path: string;
+	readonly digest: string;
+}
+
 export interface EditStreamingStrategy<Args = unknown> {
 	/**
 	 * Return the args restricted to edits that are "complete enough" to
@@ -77,6 +88,26 @@ export interface EditStreamingStrategy<Args = unknown> {
 	 * args don't yet carry any content.
 	 */
 	matcherDigest(args: Args): string | undefined;
+	/**
+	 * Surface the target file paths a (potentially partial) call would touch,
+	 * so path-scoped stream matchers (e.g. TTSR `tool:edit(*.ts)` globs) match
+	 * even when the path is not a top-level argument but lives inside the wire
+	 * payload — `hashline` section headers, `apply_patch` envelope markers.
+	 * Returns `undefined` (or an empty list) when no paths are recoverable.
+	 */
+	matcherPaths(args: Args): readonly string[] | undefined;
+	/**
+	 * Per-file projection of the (potentially partial) args: one entry per
+	 * touched file pairing the path with the digest of only the lines added to
+	 * that file. Multi-file payloads (multi-section hashline / multi-hunk
+	 * apply_patch) MUST split here so callers can evaluate each file under its
+	 * own path scope instead of leaking added lines from one file into the
+	 * other's match context. Same-path sections / hunks are merged into one
+	 * entry. Returns `undefined` (or empty) when no per-file split is
+	 * recoverable yet — the caller falls back to {@link matcherDigest} +
+	 * {@link matcherPaths}.
+	 */
+	matcherEntries(args: Args): readonly EditMatcherEntry[] | undefined;
 }
 
 // -----------------------------------------------------------------------------
@@ -191,6 +222,103 @@ function extractAddedLines(text: string, fallbackToWhole: boolean): string {
 	return added;
 }
 
+/**
+ * Extract hashline `[path#TAG]` (and untagged `[path]`) section-header paths
+ * from a (possibly partial) hashline buffer. Tolerant of streaming chunks
+ * where `Patch.parse` would still throw on the trailing op — only fully
+ * closed header lines are recognised.
+ */
+function extractHashlineHeaderPaths(input: string): string[] {
+	const paths: string[] = [];
+	const re = /^\s*\[([^\]\r\n]+?)(?:#[0-9a-fA-F]{4})?\]\s*$/gm;
+	for (const match of input.matchAll(re)) {
+		const candidate = stripApplyPatchPathNoise(match[1]).trim();
+		if (candidate.length > 0) paths.push(candidate);
+	}
+	return paths;
+}
+
+/**
+ * Strip the `*** Add/Update/Delete File:` / `*** Move to:` noise that the
+ * model sometimes pastes into a hashline header (the hashline tokenizer does
+ * the same in its recovery path).
+ */
+function stripApplyPatchPathNoise(value: string): string {
+	return value
+		.replace(/^\s*\*{3}\s*(?:Add|Update|Delete)\s+File\s*:\s*/i, "")
+		.replace(/^\s*\*{3}\s*Move\s+to\s*:\s*/i, "");
+}
+
+/** Extract `*** Add/Update/Delete File:` paths from a (possibly partial) apply_patch envelope. */
+function extractApplyPatchEnvelopePaths(input: string): string[] {
+	const paths: string[] = [];
+	const re = /^\s*\*{3}\s+(?:Add|Update|Delete)\s+File\s*:\s*(\S.*?)\s*$/gm;
+	for (const match of input.matchAll(re)) {
+		const candidate = match[1].trim();
+		if (candidate.length > 0) paths.push(candidate);
+	}
+	return paths;
+}
+
+/**
+ * Split a (possibly partial) hashline buffer into one matcher entry per
+ * touched file: pair the section header path with the added lines from that
+ * section's body, merging sections that target the same file into one entry.
+ * Header-line regex (not `Patch.parse`) so a mid-typed trailing op still
+ * yields entries for completed sections.
+ */
+function splitHashlinePerFile(input: string): EditMatcherEntry[] {
+	const headerRe = /^\s*\[([^\]\r\n]+?)(?:#[0-9a-fA-F]{4})?\]\s*$/gm;
+	const sections: { path: string; headerStart: number; bodyStart: number }[] = [];
+	let match: RegExpExecArray | null = headerRe.exec(input);
+	while (match !== null) {
+		const candidate = stripApplyPatchPathNoise(match[1]).trim();
+		if (candidate.length > 0) {
+			sections.push({ path: candidate, headerStart: match.index, bodyStart: headerRe.lastIndex });
+		}
+		match = headerRe.exec(input);
+	}
+	if (sections.length === 0) return [];
+
+	const byPath = new Map<string, string>();
+	for (let i = 0; i < sections.length; i++) {
+		const { path: sectionPath, bodyStart } = sections[i];
+		const bodyEnd = i + 1 < sections.length ? sections[i + 1].headerStart : input.length;
+		const added = extractAddedLines(input.slice(bodyStart, bodyEnd), false);
+		if (added.length === 0) continue;
+		const existing = byPath.get(sectionPath);
+		byPath.set(sectionPath, existing === undefined ? added : `${existing}\n${added}`);
+	}
+	return Array.from(byPath, ([path, digest]) => ({ path, digest }));
+}
+
+/**
+ * Split a (possibly partial) apply_patch envelope into one matcher entry per
+ * touched file. Same-path hunks are merged into one entry. Falls back to the
+ * streaming-tolerant parser when the envelope hasn't reached `*** End Patch`.
+ */
+function splitApplyPatchPerFile(input: string): EditMatcherEntry[] {
+	let entries: ApplyPatchEntry[];
+	try {
+		entries = expandApplyPatchToEntries({ input });
+	} catch {
+		try {
+			entries = expandApplyPatchToPreviewEntries({ input });
+		} catch {
+			return [];
+		}
+	}
+	const byPath = new Map<string, string>();
+	for (const entry of entries) {
+		if (typeof entry.diff !== "string") continue;
+		const added = extractAddedLines(entry.diff, false);
+		if (added.length === 0) continue;
+		const existing = byPath.get(entry.path);
+		byPath.set(entry.path, existing === undefined ? added : `${existing}\n${added}`);
+	}
+	return Array.from(byPath, ([path, digest]) => ({ path, digest }));
+}
+
 // -----------------------------------------------------------------------------
 // Strategies
 // -----------------------------------------------------------------------------
@@ -236,6 +364,15 @@ const replaceStrategy: EditStreamingStrategy<ReplaceArgs> = {
 		}
 		return digest;
 	},
+	matcherPaths(args) {
+		return typeof args?.path === "string" && args.path.length > 0 ? [args.path] : undefined;
+	},
+	matcherEntries(args) {
+		const path = args?.path;
+		if (typeof path !== "string" || path.length === 0) return undefined;
+		const digest = replaceStrategy.matcherDigest(args);
+		return digest === undefined ? undefined : [{ path, digest }];
+	},
 };
 
 interface PatchArgs {
@@ -278,6 +415,15 @@ const patchStrategy: EditStreamingStrategy<PatchArgs> = {
 		}
 		return digest;
 	},
+	matcherPaths(args) {
+		return typeof args?.path === "string" && args.path.length > 0 ? [args.path] : undefined;
+	},
+	matcherEntries(args) {
+		const path = args?.path;
+		if (typeof path !== "string" || path.length === 0) return undefined;
+		const digest = patchStrategy.matcherDigest(args);
+		return digest === undefined ? undefined : [{ path, digest }];
+	},
 };
 
 interface HashlineArgs {
@@ -437,6 +583,18 @@ const hashlineStrategy: EditStreamingStrategy<HashlineArgs> = {
 		// Body rows are `+TEXT`; headers and op lines are grammar, never content.
 		return extractAddedLines(input, false);
 	},
+	matcherPaths(args) {
+		const input = args?.input;
+		if (typeof input !== "string" || input.length === 0) return undefined;
+		const paths = extractHashlineHeaderPaths(input);
+		return paths.length > 0 ? paths : undefined;
+	},
+	matcherEntries(args) {
+		const input = args?.input;
+		if (typeof input !== "string" || input.length === 0) return undefined;
+		const entries = splitHashlinePerFile(input);
+		return entries.length > 0 ? entries : undefined;
+	},
 };
 
 interface ApplyPatchArgs {
@@ -495,6 +653,18 @@ const applyPatchStrategy: EditStreamingStrategy<ApplyPatchArgs> = {
 		// Envelope markers and `@@` hunk headers are grammar, never content.
 		return extractAddedLines(input, false);
 	},
+	matcherPaths(args) {
+		const input = args?.input;
+		if (typeof input !== "string" || input.length === 0) return undefined;
+		const paths = extractApplyPatchEnvelopePaths(input);
+		return paths.length > 0 ? paths : undefined;
+	},
+	matcherEntries(args) {
+		const input = args?.input;
+		if (typeof input !== "string" || input.length === 0) return undefined;
+		const entries = splitApplyPatchPerFile(input);
+		return entries.length > 0 ? entries : undefined;
+	},
 };
 export const EDIT_MODE_STRATEGIES: Record<EditMode, EditStreamingStrategy<unknown>> = {
 	replace: replaceStrategy as EditStreamingStrategy<unknown>,

package/src/extensibility/custom-tools/types.ts

@@ -126,6 +126,7 @@ export type CustomToolSessionEvent =
 			maxAttempts: number;
 			delayMs: number;
 			errorMessage: string;
+			errorId?: number;
 	  }
 	| {
 			reason: "auto_retry_end";

package/src/extensibility/plugins/legacy-pi-bundled-keys.ts

@@ -23,6 +23,7 @@ export const BUNDLED_PI_REGISTRY_KEYS: ReadonlySet<string> = new Set([
 	"@oh-my-pi/pi-agent-core/compaction/tool-protection",
 	"@oh-my-pi/pi-agent-core/compaction/utils",
 	"@oh-my-pi/pi-ai",
+	"@oh-my-pi/pi-ai/error",
 	"@oh-my-pi/pi-ai/auth-broker",
 	"@oh-my-pi/pi-ai/auth-gateway",
 	"@oh-my-pi/pi-ai/utils/harmony-leak",
@@ -56,6 +57,7 @@ export const BUNDLED_PI_REGISTRY_KEYS: ReadonlySet<string> = new Set([
 	"@oh-my-pi/pi-ai/providers/devin",
 	"@oh-my-pi/pi-ai/providers/error-message",
 	"@oh-my-pi/pi-ai/providers/github-copilot-headers",
+	"@oh-my-pi/pi-ai/providers/gitlab-duo-workflow",
 	"@oh-my-pi/pi-ai/providers/gitlab-duo",
 	"@oh-my-pi/pi-ai/providers/google-auth",
 	"@oh-my-pi/pi-ai/providers/google-gemini-cli",
@@ -94,6 +96,7 @@ export const BUNDLED_PI_REGISTRY_KEYS: ReadonlySet<string> = new Set([
 	"@oh-my-pi/pi-ai/usage/kimi",
 	"@oh-my-pi/pi-ai/usage/minimax-code",
 	"@oh-my-pi/pi-ai/usage/ollama",
+	"@oh-my-pi/pi-ai/usage/openai-codex-base-url",
 	"@oh-my-pi/pi-ai/usage/openai-codex-reset",
 	"@oh-my-pi/pi-ai/usage/openai-codex",
 	"@oh-my-pi/pi-ai/usage/opencode-go",
@@ -101,6 +104,7 @@ export const BUNDLED_PI_REGISTRY_KEYS: ReadonlySet<string> = new Set([
 	"@oh-my-pi/pi-ai/usage/zai",
 	"@oh-my-pi/pi-ai/utils/abort",
 	"@oh-my-pi/pi-ai/utils/anthropic-auth",
+	"@oh-my-pi/pi-ai/utils/block-symbols",
 	"@oh-my-pi/pi-ai/utils/deterministic-id",
 	"@oh-my-pi/pi-ai/utils/empty-completion-retry",
 	"@oh-my-pi/pi-ai/utils/event-stream",
@@ -110,7 +114,6 @@ export const BUNDLED_PI_REGISTRY_KEYS: ReadonlySet<string> = new Set([
 	"@oh-my-pi/pi-ai/utils/idle-iterator",
 	"@oh-my-pi/pi-ai/utils/openai-http",
 	"@oh-my-pi/pi-ai/utils/openrouter-headers",
-	"@oh-my-pi/pi-ai/utils/overflow",
 	"@oh-my-pi/pi-ai/utils/parse-bind",
 	"@oh-my-pi/pi-ai/utils/provider-response",
 	"@oh-my-pi/pi-ai/utils/proxy",
@@ -128,6 +131,7 @@ export const BUNDLED_PI_REGISTRY_KEYS: ReadonlySet<string> = new Set([
 	"@oh-my-pi/pi-ai/oauth/cursor",
 	"@oh-my-pi/pi-ai/oauth/devin",
 	"@oh-my-pi/pi-ai/oauth/github-copilot",
+	"@oh-my-pi/pi-ai/oauth/gitlab-duo-workflow",
 	"@oh-my-pi/pi-ai/oauth/gitlab-duo",
 	"@oh-my-pi/pi-ai/oauth/google-antigravity",
 	"@oh-my-pi/pi-ai/oauth/google-gemini-cli",
@@ -187,6 +191,7 @@ export const BUNDLED_PI_REGISTRY_KEYS: ReadonlySet<string> = new Set([
 	"@oh-my-pi/pi-coding-agent/eval",
 	"@oh-my-pi/pi-coding-agent/lsp",
 	"@oh-my-pi/pi-coding-agent/lsp/clients",
+	"@oh-my-pi/pi-coding-agent/markit",
 	"@oh-my-pi/pi-coding-agent/mcp",
 	"@oh-my-pi/pi-coding-agent/mcp/transports",
 	"@oh-my-pi/pi-coding-agent/memories",
@@ -481,6 +486,7 @@ export const BUNDLED_PI_REGISTRY_KEYS: ReadonlySet<string> = new Set([
 	"@oh-my-pi/pi-coding-agent/internal-urls/router",
 	"@oh-my-pi/pi-coding-agent/internal-urls/rule-protocol",
 	"@oh-my-pi/pi-coding-agent/internal-urls/skill-protocol",
+	"@oh-my-pi/pi-coding-agent/internal-urls/ssh-protocol",
 	"@oh-my-pi/pi-coding-agent/internal-urls/types",
 	"@oh-my-pi/pi-coding-agent/internal-urls/vault-protocol",
 	"@oh-my-pi/pi-coding-agent/eval/js/context-manager",
@@ -508,6 +514,8 @@ export const BUNDLED_PI_REGISTRY_KEYS: ReadonlySet<string> = new Set([
 	"@oh-my-pi/pi-coding-agent/lsp/clients/biome-client",
 	"@oh-my-pi/pi-coding-agent/lsp/clients/lsp-linter-client",
 	"@oh-my-pi/pi-coding-agent/lsp/clients/swiftlint-client",
+	"@oh-my-pi/pi-coding-agent/markit/registry",
+	"@oh-my-pi/pi-coding-agent/markit/types",
 	"@oh-my-pi/pi-coding-agent/mcp/client",
 	"@oh-my-pi/pi-coding-agent/mcp/config-writer",
 	"@oh-my-pi/pi-coding-agent/mcp/config",
@@ -554,6 +562,7 @@ export const BUNDLED_PI_REGISTRY_KEYS: ReadonlySet<string> = new Set([
 	"@oh-my-pi/pi-coding-agent/modes/orchestrate",
 	"@oh-my-pi/pi-coding-agent/modes/print-mode",
 	"@oh-my-pi/pi-coding-agent/modes/prompt-action-autocomplete",
+	"@oh-my-pi/pi-coding-agent/modes/running-subagent-badge",
 	"@oh-my-pi/pi-coding-agent/modes/runtime-init",
 	"@oh-my-pi/pi-coding-agent/modes/session-observer-registry",
 	"@oh-my-pi/pi-coding-agent/modes/setup-version",
@@ -603,6 +612,7 @@ export const BUNDLED_PI_REGISTRY_KEYS: ReadonlySet<string> = new Set([
 	"@oh-my-pi/pi-coding-agent/modes/components/mcp-add-wizard",
 	"@oh-my-pi/pi-coding-agent/modes/components/message-frame",
 	"@oh-my-pi/pi-coding-agent/modes/components/model-selector",
+	"@oh-my-pi/pi-coding-agent/modes/components/move-overlay",
 	"@oh-my-pi/pi-coding-agent/modes/components/oauth-selector",
 	"@oh-my-pi/pi-coding-agent/modes/components/omfg-panel",
 	"@oh-my-pi/pi-coding-agent/modes/components/overlay-box",
@@ -614,6 +624,7 @@ export const BUNDLED_PI_REGISTRY_KEYS: ReadonlySet<string> = new Set([
 	"@oh-my-pi/pi-coding-agent/modes/components/read-tool-group",
 	"@oh-my-pi/pi-coding-agent/modes/components/reset-usage-selector",
 	"@oh-my-pi/pi-coding-agent/modes/components/segment-track",
+	"@oh-my-pi/pi-coding-agent/modes/components/select-list-mouse-routing",
 	"@oh-my-pi/pi-coding-agent/modes/components/selector-helpers",
 	"@oh-my-pi/pi-coding-agent/modes/components/session-selector",
 	"@oh-my-pi/pi-coding-agent/modes/components/settings-defs",
@@ -714,12 +725,14 @@ export const BUNDLED_PI_REGISTRY_KEYS: ReadonlySet<string> = new Set([
 	"@oh-my-pi/pi-coding-agent/session/session-paths",
 	"@oh-my-pi/pi-coding-agent/session/session-persistence",
 	"@oh-my-pi/pi-coding-agent/session/session-storage",
+	"@oh-my-pi/pi-coding-agent/session/settings-stream-fn",
 	"@oh-my-pi/pi-coding-agent/session/shake-types",
 	"@oh-my-pi/pi-coding-agent/session/snapcompact-inline",
 	"@oh-my-pi/pi-coding-agent/session/snapcompact-savings-journal",
 	"@oh-my-pi/pi-coding-agent/session/sql-session-storage",
 	"@oh-my-pi/pi-coding-agent/session/streaming-output",
 	"@oh-my-pi/pi-coding-agent/session/tool-choice-queue",
+	"@oh-my-pi/pi-coding-agent/session/turn-persistence",
 	"@oh-my-pi/pi-coding-agent/session/unexpected-stop-classifier",
 	"@oh-my-pi/pi-coding-agent/session/yield-queue",
 	"@oh-my-pi/pi-coding-agent/slash-commands/acp-builtins",
@@ -729,6 +742,7 @@ export const BUNDLED_PI_REGISTRY_KEYS: ReadonlySet<string> = new Set([
 	"@oh-my-pi/pi-coding-agent/slash-commands/types",
 	"@oh-my-pi/pi-coding-agent/ssh/config-writer",
 	"@oh-my-pi/pi-coding-agent/ssh/connection-manager",
+	"@oh-my-pi/pi-coding-agent/ssh/file-transfer",
 	"@oh-my-pi/pi-coding-agent/ssh/ssh-executor",
 	"@oh-my-pi/pi-coding-agent/ssh/sshfs-mount",
 	"@oh-my-pi/pi-coding-agent/ssh/utils",
@@ -838,6 +852,7 @@ export const BUNDLED_PI_REGISTRY_KEYS: ReadonlySet<string> = new Set([
 	"@oh-my-pi/pi-coding-agent/tui/types",
 	"@oh-my-pi/pi-coding-agent/tui/utils",
 	"@oh-my-pi/pi-coding-agent/tui/width-aware-text",
+	"@oh-my-pi/pi-coding-agent/utils/active-repo-context",
 	"@oh-my-pi/pi-coding-agent/utils/block-context",
 	"@oh-my-pi/pi-coding-agent/utils/changelog",
 	"@oh-my-pi/pi-coding-agent/utils/clipboard",
@@ -856,9 +871,11 @@ export const BUNDLED_PI_REGISTRY_KEYS: ReadonlySet<string> = new Set([
 	"@oh-my-pi/pi-coding-agent/utils/ipc",
 	"@oh-my-pi/pi-coding-agent/utils/jj",
 	"@oh-my-pi/pi-coding-agent/utils/lang-from-path",
+	"@oh-my-pi/pi-coding-agent/utils/markit-cache",
 	"@oh-my-pi/pi-coding-agent/utils/markit",
 	"@oh-my-pi/pi-coding-agent/utils/mupdf-wasm-embed",
 	"@oh-my-pi/pi-coding-agent/utils/open",
+	"@oh-my-pi/pi-coding-agent/utils/prompt-path",
 	"@oh-my-pi/pi-coding-agent/utils/qrcode",
 	"@oh-my-pi/pi-coding-agent/utils/session-color",
 	"@oh-my-pi/pi-coding-agent/utils/shell-snapshot",