@oh-my-pi/pi-coding-agent 15.8.2 → 15.8.3

package/CHANGELOG.md

@@ -2,6 +2,16 @@
 
 ## [Unreleased]
 
+## [15.8.3] - 2026-06-03
+### Fixed
+
+- Fixed Jujutsu workspace detection failing in non-default workspaces created by `jj workspace add`, whose `.jj/repo` is a FILE pointing at the shared repo dir rather than a directory. Detection now matches jj's own criterion (`.jj/repo` present, file or dir) instead of requiring a `.jj/repo/store` directory, and `jj.repo.resolve`'s `storeDir` follows the file indirection to the shared store.
+
+### Changed
+
+- Changed the `todo-write` prompt to require initializing every item from a user-supplied multi-step plan as an individual todo task before execution
+- Changed context compaction (prune/shake) to protect reads of the active plan file the same way it already protects `skill://` reads, so the plan stays intact through automatic and manual compaction. Both the canonical `local://PLAN.md` alias and the session's current plan reference path (e.g. a titled `local://<title>.md` after approval) are kept, tolerating read selectors and `local:/` scheme spelling.
+
 ## [15.8.2] - 2026-06-03
 
 ### Added
@@ -9241,4 +9251,4 @@ Initial public release.
 - Git branch display in footer
 - Message queueing during streaming responses
 - OAuth integration for Gmail and Google Calendar access
-- HTML export with syntax highlighting and collapsible sections
+- HTML export with syntax highlighting and collapsible sections

package/dist/types/plan-mode/plan-protection.d.ts

@@ -0,0 +1,12 @@
+import { type ProtectedToolContext } from "@oh-my-pi/pi-agent-core/compaction/tool-protection";
+/**
+ * Build a compaction protection matcher that keeps `read` results for the active
+ * plan file intact through prune/shake — the plan analog of skill-read
+ * protection. Matches both the canonical `local://PLAN.md` alias and the
+ * session's current plan reference path (e.g. a titled `local://<title>.md`), so
+ * the plan survives compaction whether the agent reads it by alias or by title.
+ *
+ * `getPlanReferencePath` is evaluated at match time so a mid-session retitle
+ * (plan approval renames `PLAN.md` → `<title>.md`) is honored immediately.
+ */
+export declare function createPlanReadMatcher(getPlanReferencePath: () => string): (context: ProtectedToolContext) => boolean;

package/dist/types/utils/jj.d.ts

@@ -11,7 +11,7 @@ export interface JjCommandResult {
 export interface JjRepository {
     /** Root directory containing the `.jj` workspace metadata. */
     repoRoot: string;
-    /** Path to the workspace store directory used to verify a real JJ checkout. */
+    /** Path to the shared workspace store directory, resolved through `.jj/repo`'s file indirection for non-default workspaces. */
     storeDir: string;
 }
 /** Options for `jj diff` invocations. */

package/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "@oh-my-pi/pi-coding-agent",
-	"version": "15.8.2",
+	"version": "15.8.3",
 	"description": "Coding agent CLI with read, bash, edit, write tools and session management",
 	"homepage": "https://omp.sh",
 	"author": "Can Boluk",
@@ -47,14 +47,14 @@
 		"@agentclientprotocol/sdk": "0.22.1",
 		"@babel/parser": "^7.29.7",
 		"@mozilla/readability": "^0.6.0",
-		"@oh-my-pi/hashline": "15.8.2",
-		"@oh-my-pi/omp-stats": "15.8.2",
-		"@oh-my-pi/pi-agent-core": "15.8.2",
-		"@oh-my-pi/pi-ai": "15.8.2",
-		"@oh-my-pi/pi-mnemopi": "15.8.2",
-		"@oh-my-pi/pi-natives": "15.8.2",
-		"@oh-my-pi/pi-tui": "15.8.2",
-		"@oh-my-pi/pi-utils": "15.8.2",
+		"@oh-my-pi/hashline": "15.8.3",
+		"@oh-my-pi/omp-stats": "15.8.3",
+		"@oh-my-pi/pi-agent-core": "15.8.3",
+		"@oh-my-pi/pi-ai": "15.8.3",
+		"@oh-my-pi/pi-mnemopi": "15.8.3",
+		"@oh-my-pi/pi-natives": "15.8.3",
+		"@oh-my-pi/pi-tui": "15.8.3",
+		"@oh-my-pi/pi-utils": "15.8.3",
 		"@puppeteer/browsers": "^3.0.4",
 		"@types/turndown": "5.0.6",
 		"@xterm/headless": "^6.0.0",

package/src/plan-mode/plan-protection.ts

@@ -0,0 +1,31 @@
+import { getReadToolPath, type ProtectedToolContext } from "@oh-my-pi/pi-agent-core/compaction/tool-protection";
+import { normalizeLocalScheme } from "../tools/path-utils";
+
+/** Canonical plan alias every session's `local://` root resolves. */
+const LOCAL_PLAN_ALIAS = "local://PLAN.md";
+
+/** True when `readPath` targets `planTarget`, ignoring `local:/` vs `local://`
+ *  scheme spelling and any trailing read selector (`:1-50`, `:raw`, …). */
+function readTargetsPlan(readPath: string, planTarget: string): boolean {
+	const read = normalizeLocalScheme(readPath);
+	const target = normalizeLocalScheme(planTarget);
+	return read === target || read.startsWith(`${target}:`);
+}
+
+/**
+ * Build a compaction protection matcher that keeps `read` results for the active
+ * plan file intact through prune/shake — the plan analog of skill-read
+ * protection. Matches both the canonical `local://PLAN.md` alias and the
+ * session's current plan reference path (e.g. a titled `local://<title>.md`), so
+ * the plan survives compaction whether the agent reads it by alias or by title.
+ *
+ * `getPlanReferencePath` is evaluated at match time so a mid-session retitle
+ * (plan approval renames `PLAN.md` → `<title>.md`) is honored immediately.
+ */
+export function createPlanReadMatcher(getPlanReferencePath: () => string): (context: ProtectedToolContext) => boolean {
+	return (context: ProtectedToolContext) => {
+		const path = getReadToolPath(context);
+		if (path === undefined) return false;
+		return readTargetsPlan(path, LOCAL_PLAN_ALIAS) || readTargetsPlan(path, getPlanReferencePath());
+	};
+}

package/src/prompts/tools/todo-write.md

@@ -48,3 +48,11 @@ Allowed `op` values are only `init`, `start`, `done`, `drop`, `rm`, `append`, an
 # Append tasks to a phase
 `{"ops":[{"op":"append","phase":"Auth","items":["Handle retries","Run tests"]}]}`
 </examples>
+
+<critical>
+When the user hands you a multi-step plan — a phased todo, a numbered or bulleted checklist, or "N bugs/items/tasks" to work through: 
+- You MUST `init` the list with EVERY item as its own task before doing the work. 
+- Enumerate all of them; 
+- NEVER summarize the plan into fewer tasks, sample "the important ones", drop items, or rely on memory to track the rest. 
+The entire point is to remember every one.
+</critical>

package/src/session/agent-session.ts

@@ -55,6 +55,7 @@ import {
 	shouldCompact,
 } from "@oh-my-pi/pi-agent-core/compaction";
 import { DEFAULT_PRUNE_CONFIG, pruneToolOutputs } from "@oh-my-pi/pi-agent-core/compaction/pruning";
+import type { ProtectedToolMatcher } from "@oh-my-pi/pi-agent-core/compaction/tool-protection";
 import type {
 	AssistantMessage,
 	Context,
@@ -163,6 +164,7 @@ import { parseTurnBudget } from "../modes/turn-budget";
 import { containsUltrathink, ULTRATHINK_NOTICE } from "../modes/ultrathink";
 import { computeNonMessageTokens } from "../modes/utils/context-usage";
 import { containsWorkflow, WORKFLOW_NOTICE } from "../modes/workflow";
+import { createPlanReadMatcher } from "../plan-mode/plan-protection";
 import type { PlanModeState } from "../plan-mode/state";
 import autoContinuePrompt from "../prompts/system/auto-continue.md" with { type: "text" };
 import eagerTodoPrompt from "../prompts/system/eager-todo.md" with { type: "text" };
@@ -5658,9 +5660,20 @@ export class AgentSession {
 	// Compaction
 	// =========================================================================
 
+	/**
+	 * Append plan-read protection to a prune/shake config so the active plan
+	 * file survives compaction alongside skill reads (the config defaults
+	 * already carry skill protection). The matcher reads the current plan
+	 * reference path at match time, so retitled plans are covered.
+	 */
+	#withPlanProtection<T extends { protectedTools: ProtectedToolMatcher[] }>(config: T): T {
+		const planMatcher = createPlanReadMatcher(() => this.#planReferencePath);
+		return { ...config, protectedTools: [...config.protectedTools, planMatcher] };
+	}
+
 	async #pruneToolOutputs(): Promise<{ prunedCount: number; tokensSaved: number } | undefined> {
 		const branchEntries = this.sessionManager.getBranch();
-		const result = pruneToolOutputs(branchEntries, DEFAULT_PRUNE_CONFIG);
+		const result = pruneToolOutputs(branchEntries, this.#withPlanProtection(DEFAULT_PRUNE_CONFIG));
 		if (result.prunedCount === 0) {
 			return undefined;
 		}
@@ -5741,7 +5754,7 @@ export class AgentSession {
 			return { mode, toolResultsDropped: 0, blocksDropped: 0, imagesDropped: removed, tokensFreed: 0 };
 		}
 
-		const config = opts.config ?? AGGRESSIVE_SHAKE_CONFIG;
+		const config = this.#withPlanProtection(opts.config ?? AGGRESSIVE_SHAKE_CONFIG);
 		const regions = collectShakeRegions(this.sessionManager.getBranch(), config);
 		if (regions.length === 0) {
 			return { mode, toolResultsDropped: 0, blocksDropped: 0, tokensFreed: 0 };

package/src/utils/jj.ts

@@ -21,7 +21,7 @@ export interface JjCommandResult {
 export interface JjRepository {
 	/** Root directory containing the `.jj` workspace metadata. */
 	repoRoot: string;
-	/** Path to the workspace store directory used to verify a real JJ checkout. */
+	/** Path to the shared workspace store directory, resolved through `.jj/repo`'s file indirection for non-default workspaces. */
 	storeDir: string;
 }
 
@@ -146,8 +146,14 @@ const WORKSPACE_ROOT_CACHE_MAX_ENTRIES = 256;
 const workspaceRootCache = new LRUCache<string, WorkspaceRootCacheEntry>({ max: WORKSPACE_ROOT_CACHE_MAX_ENTRIES });
 
 async function hasJjWorkspaceMetadata(dir: string): Promise<boolean> {
+	// jj marks a directory as a workspace via `.jj/repo`. In the default workspace
+	// it is a directory (containing `store/`, …); in a workspace created by
+	// `jj workspace add` it is a FILE whose contents point at the shared repo dir
+	// of the default workspace. Either form is a real workspace, so match on
+	// `.jj/repo` presence rather than the inner `store/` directory.
 	try {
-		return (await fs.stat(path.join(dir, ".jj", "repo", "store"))).isDirectory();
+		await fs.stat(path.join(dir, ".jj", "repo"));
+		return true;
 	} catch {
 		return false;
 	}
@@ -173,10 +179,27 @@ async function findWorkspaceRoot(cwd: string): Promise<string | undefined> {
 	return undefined;
 }
 
-function repositoryFromRoot(root: string): JjRepository {
+/**
+ * Resolve the `.jj/repo` directory backing a workspace root, following the file
+ * indirection used by non-default workspaces. `jj workspace add` writes a FILE at
+ * `.jj/repo` whose contents are a path — relative to `.jj` — to the shared repo
+ * directory of the default workspace; the default workspace keeps `.jj/repo` as a
+ * directory.
+ */
+async function resolveRepoDir(root: string): Promise<string> {
+	const jjDir = path.join(root, ".jj");
+	const repoPath = path.join(jjDir, "repo");
+	if ((await fs.stat(repoPath)).isFile()) {
+		const target = (await fs.readFile(repoPath, "utf8")).trim();
+		return path.resolve(jjDir, target);
+	}
+	return repoPath;
+}
+
+async function repositoryFromRoot(root: string): Promise<JjRepository> {
 	return {
 		repoRoot: root,
-		storeDir: path.join(root, ".jj", "repo", "store"),
+		storeDir: path.join(await resolveRepoDir(root), "store"),
 	};
 }
 
@@ -215,7 +238,7 @@ export const repo = {
 	/** Full Jujutsu workspace metadata. */
 	async resolve(cwd: string): Promise<JjRepository | null> {
 		const root = await repo.root(cwd);
-		return root ? repositoryFromRoot(root) : null;
+		return root ? await repositoryFromRoot(root) : null;
 	},
 
 	/** Check whether `cwd` is inside a Jujutsu repository. */