@oh-my-pi/pi-coding-agent 16.1.21 → 16.1.23

package/src/tools/acp-bridge.ts

@@ -10,7 +10,7 @@
 import type { ToolSession } from ".";
 import { invalidateFsScanAfterWrite } from "./fs-cache-invalidation";
 import { isInternalUrlPath } from "./path-utils";
-import { resolvePlanPath } from "./plan-mode-guard";
+import { resolvePlanPath, targetsLocalSandbox } from "./plan-mode-guard";
 import { ToolError } from "./tool-errors";
 
 /**
@@ -26,6 +26,11 @@ export function shouldRouteWriteThroughBridge(
 	absolutePath: string,
 ): boolean {
 	if (isInternalUrlPath(requestedPath)) return false;
+	// OMP-owned session artifacts (plan files, scratch notes) must stay off the
+	// editor buffer even when addressed by their absolute sandbox path — e.g.
+	// after tag-based path recovery rebinds a bare `plan.md#tag` onto the
+	// `local://` artifact, `requestedPath` is the absolute path, not the URL.
+	if (targetsLocalSandbox(session, absolutePath)) return false;
 
 	const state = session.getPlanModeState?.();
 	if (!state?.enabled || !isInternalUrlPath(state.planFilePath)) return true;

package/src/tools/plan-mode-guard.ts

@@ -1,7 +1,12 @@
 import * as fs from "node:fs";
 import * as path from "node:path";
 import { HL_FILE_HASH_LENGTH, HL_FILE_HASH_SEP, HL_FILE_PREFIX, HL_FILE_SUFFIX } from "@oh-my-pi/hashline";
-import { resolveLocalRoot, resolveLocalUrlToPath, resolveVaultUrlToPath } from "../internal-urls";
+import {
+	type LocalProtocolOptions,
+	resolveLocalRoot,
+	resolveLocalUrlToPath,
+	resolveVaultUrlToPath,
+} from "../internal-urls";
 import type { ToolSession } from ".";
 import { normalizeLocalScheme, resolveToCwd } from "./path-utils";
 import { ToolError } from "./tool-errors";
@@ -10,16 +15,27 @@ const VAULT_SCHEME_PREFIX = "vault:";
 const LOCAL_SCHEME_PREFIX = "local:";
 const HL_TRAILING_TAG_RE = new RegExp(`${HL_FILE_HASH_SEP}[0-9A-Fa-f]{${HL_FILE_HASH_LENGTH}}$`);
 
+/** Resolve the `local://` options the session uses, preferring its own
+ *  {@link LocalProtocolOptions} (the mapping `read`/`write`/`eval` resolve
+ *  through) over the bare `getArtifactsDir`/`getSessionId` pair. Subagents and
+ *  multi-session hosts (cmux/ACP, embedded SDK) pin `local://` to a parent/foreign
+ *  root via `localProtocolOptions`; the sandbox root the plan-mode guard derives
+ *  must match where the artifact actually lives, or it rejects a legitimate plan
+ *  edit (and tag-based path recovery onto the sandbox would miss it). */
+function planLocalProtocolOptions(session: ToolSession): LocalProtocolOptions {
+	return (
+		session.localProtocolOptions ?? {
+			getArtifactsDir: () => session.getArtifactsDir?.() ?? null,
+			getSessionId: () => session.getSessionId?.() ?? null,
+		}
+	);
+}
+
 /** Resolve the absolute path of the session's `local://` artifact sandbox.
  *  Returns `null` when the session has no artifact wiring (e.g. tests). */
 function localSandboxRoot(session: ToolSession): string | null {
 	try {
-		return path.resolve(
-			resolveLocalRoot({
-				getArtifactsDir: session.getArtifactsDir,
-				getSessionId: session.getSessionId,
-			}),
-		);
+		return path.resolve(resolveLocalRoot(planLocalProtocolOptions(session)));
 	} catch {
 		return null;
 	}
@@ -62,8 +78,8 @@ export function unwrapHashlineHeaderPath(targetPath: string): string {
  *  always agree on the absolute target (including bracketed hashline headers,
  *  `local://` URLs, and bare absolute paths). Files inside the sandbox are not
  *  part of the working tree, so plan mode treats them as freely writable
- *  scratch/plan space. */
-function targetsLocalSandbox(session: ToolSession, targetPath: string): boolean {
+ *  scratch/plan space — and tag-based path recovery may rebind onto them. */
+export function targetsLocalSandbox(session: ToolSession, targetPath: string): boolean {
 	const root = localSandboxRoot(session);
 	if (!root) return false;
 	let resolved: string;
@@ -99,10 +115,7 @@ export function resolvePlanPath(session: ToolSession, targetPath: string): strin
 	const unwrapped = unwrapHashlineHeaderPath(targetPath);
 	const normalized = normalizeLocalScheme(unwrapped);
 	if (normalized.startsWith(LOCAL_SCHEME_PREFIX)) {
-		return resolveLocalUrlToPath(normalized, {
-			getArtifactsDir: session.getArtifactsDir,
-			getSessionId: session.getSessionId,
-		});
+		return resolveLocalUrlToPath(normalized, planLocalProtocolOptions(session));
 	}
 
 	if (normalized.startsWith(VAULT_SCHEME_PREFIX)) {

package/src/utils/edit-mode.ts

@@ -1,4 +1,4 @@
-import { $env } from "@oh-my-pi/pi-utils";
+import { $env, $flag } from "@oh-my-pi/pi-utils";
 
 export type EditMode = "replace" | "patch" | "hashline" | "apply_patch";
 
@@ -13,6 +13,19 @@ const EDIT_MODE_IDS = {
 
 export const EDIT_MODES = Object.keys(EDIT_MODE_IDS) as EditMode[];
 
+const HASHLINE_EXCLUDED_MODEL_MODES: Array<{ pattern: string; mode: EditMode }> = [
+	{ pattern: "kimi", mode: "replace" },
+];
+
+function resolveHashlineExcludedModelMode(model: string | undefined): EditMode | null {
+	if (!model) return null;
+	const modelLower = model.toLowerCase();
+	for (const entry of HASHLINE_EXCLUDED_MODEL_MODES) {
+		if (modelLower.includes(entry.pattern)) return entry.mode;
+	}
+	return null;
+}
+
 export function normalizeEditMode(mode?: string | null): EditMode | undefined {
 	if (!mode) return undefined;
 	return EDIT_MODE_IDS[mode as keyof typeof EDIT_MODE_IDS];
@@ -37,5 +50,9 @@ export function resolveEditMode(session: EditModeSessionLike): EditMode {
 	if (envMode) return envMode;
 
 	const settingsMode = normalizeEditMode(String(session.settings.get("edit.mode") ?? ""));
-	return settingsMode ?? DEFAULT_EDIT_MODE;
+	const mode = settingsMode ?? DEFAULT_EDIT_MODE;
+	if (mode === "hashline" && !$flag("PI_STRICT_EDIT_MODE")) {
+		return resolveHashlineExcludedModelMode(activeModel) ?? mode;
+	}
+	return mode;
 }

package/src/utils/shell-snapshot.ts

@@ -17,7 +17,7 @@ const SNAPSHOT_TIMEOUT_MS = 2_000;
 /**
  * Characters that force brush's primitive alias expander down a path it does
  * not implement. brush-core resolves aliases via `value.split_ascii_whitespace()`
- * (`crates/brush-core-vendored/src/interp.rs:1500`, tracking
+ * (`crates/vendor/brush-core/src/interp.rs:1500`, tracking
  * https://github.com/reubeno/brush/issues/57): the resulting pieces are dropped
  * into argv verbatim instead of going through the shell parser. Any alias body
  * containing subshells `(...)`, pipes `|`, redirections `<` `>`, separators