@oh-my-pi/pi-coding-agent 13.4.0 → 13.5.0

package/CHANGELOG.md

@@ -2,6 +2,28 @@
 
 ## [Unreleased]
 
+## [13.5.0] - 2026-03-01
+
+### Added
+
+- Added `hlinejsonref` Handlebars helper for embedding hashline references inside JSON blocks in prompts
+- Added `librarian` agent for researching external libraries and APIs by reading source code
+- Added `oracle` agent for deep reasoning on debugging, architecture decisions, and technical advice
+- Added `dependencies` and `risks` output fields to explore agent for better context handoff
+- Added support for `lsp`, `fetch`, `web_search`, and `ast_grep` tools to explore, plan, and reviewer agents
+
+### Changed
+
+- Enhanced hashline tool documentation with explicit prohibition on formatting-only edits
+- Added mandatory rule requiring indentation in `lines` to match surrounding context exactly from `read` output
+- Changed explore agent output field `query` to `summary` with expanded description for findings and conclusions
+
+## [13.4.1] - 2026-03-01
+
+### Fixed
+
+- Pending resolve reminders now trigger as soon as a preview action is queued, before the next assistant turn, with regression coverage in `agent-session-resolve-reminder` tests
+
 ## [13.4.0] - 2026-03-01
 
 ### Breaking Changes

package/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "@oh-my-pi/pi-coding-agent",
-	"version": "13.4.0",
+	"version": "13.5.0",
 	"description": "Coding agent CLI with read, bash, edit, write tools and session management",
 	"homepage": "https://github.com/can1357/oh-my-pi",
 	"author": "Can Boluk",
@@ -41,12 +41,12 @@
 	},
 	"dependencies": {
 		"@mozilla/readability": "^0.6",
-		"@oh-my-pi/omp-stats": "13.4.0",
-		"@oh-my-pi/pi-agent-core": "13.4.0",
-		"@oh-my-pi/pi-ai": "13.4.0",
-		"@oh-my-pi/pi-natives": "13.4.0",
-		"@oh-my-pi/pi-tui": "13.4.0",
-		"@oh-my-pi/pi-utils": "13.4.0",
+		"@oh-my-pi/omp-stats": "13.5.0",
+		"@oh-my-pi/pi-agent-core": "13.5.0",
+		"@oh-my-pi/pi-ai": "13.5.0",
+		"@oh-my-pi/pi-natives": "13.5.0",
+		"@oh-my-pi/pi-tui": "13.5.0",
+		"@oh-my-pi/pi-utils": "13.5.0",
 		"@sinclair/typebox": "^0.34",
 		"@xterm/headless": "^6.0",
 		"ajv": "^8.18",

package/src/config/prompt-templates.ts

@@ -265,6 +265,15 @@ handlebars.registerHelper("hlineref", (lineNum: unknown, content: unknown): stri
 	return ref;
 });
 
+/**
+ * {{hlinejsonref lineNum "content"}} — same as hlineref but returns a JSON-quoted string.
+ * Useful for embedding hashline refs inside JSON blocks in prompts.
+ */
+handlebars.registerHelper("hlinejsonref", (lineNum: unknown, content: unknown): string => {
+	const { ref } = formatHashlineRef(lineNum, content);
+	return JSON.stringify(ref);
+});
+
 /**
  * {{hlinefull lineNum "content"}} — format a full read-style line with prefix.
  * Returns `"lineNum#hash:content"`.

package/src/prompts/agents/explore.md

@@ -1,14 +1,14 @@
 ---
 name: explore
 description: Fast read-only codebase scout returning compressed context for handoff
-tools: read, grep, find, bash
+tools: read, grep, find, bash, lsp, fetch, web_search, ast_grep
 model: pi/smol
 thinking-level: minimal
 output:
   properties:
-    query:
+    summary:
       metadata:
-        description: One-line search summary
+        description: Brief summary of findings and conclusions
       type: string
     files:
       metadata:
@@ -60,6 +60,24 @@ output:
       metadata:
         description: Brief explanation of how pieces connect
       type: string
+    dependencies:
+      metadata:
+        description: Key internal and external dependencies relevant to the task
+      elements:
+        properties:
+          name:
+            metadata:
+              description: Package or module name
+            type: string
+          role:
+            metadata:
+              description: What it provides in context of the task
+            type: string
+    risks:
+      metadata:
+        description: Gotchas, edge cases, or constraints the receiving agent should know
+      elements:
+        type: string
     start_here:
       metadata:
         description: Recommended entry point for receiving agent

package/src/prompts/agents/librarian.md

@@ -0,0 +1,119 @@
+---
+name: librarian
+description: Researches external libraries and APIs by reading source code. Returns definitive, source-verified answers.
+tools: read, grep, find, bash, lsp, web_search, fetch, ast_grep
+model: pi/smol
+thinking-level: minimal
+output:
+  properties:
+    answer:
+      metadata:
+        description: Direct answer to the question, grounded in source code
+      type: string
+    sources:
+      metadata:
+        description: Source evidence backing the answer
+      elements:
+        properties:
+          repo:
+            metadata:
+              description: GitHub repo (owner/name) or package name
+            type: string
+          path:
+            metadata:
+              description: File path within the repo or node_modules
+            type: string
+          line_start:
+            metadata:
+              description: First relevant line (1-indexed)
+            type: number
+          line_end:
+            metadata:
+              description: Last relevant line (1-indexed)
+            type: number
+          excerpt:
+            metadata:
+              description: Verbatim code or doc excerpt proving the claim
+            type: string
+    api:
+      metadata:
+        description: Extracted API signatures, types, or config relevant to the question
+      elements:
+        properties:
+          signature:
+            metadata:
+              description: Function signature, type definition, or config shape — copied verbatim from source
+            type: string
+          description:
+            metadata:
+              description: What it does, constraints, defaults
+            type: string
+    version:
+      metadata:
+        description: Library version investigated (from package.json, Cargo.toml, etc.)
+      type: string
+  optionalProperties:
+    breaking_changes:
+      metadata:
+        description: Breaking changes or migration notes if version-relevant
+      elements:
+        type: string
+    caveats:
+      metadata:
+        description: Limitations, undocumented behavior, or gotchas discovered
+      elements:
+        type: string
+---
+
+You are a library research specialist. You answer questions about external libraries, frameworks, and APIs by going to the source — reading code, not guessing from training data.
+
+<critical>
+You **MUST** ground every claim in source code or official documentation. You **MUST NOT** rely on training data for API details — it may be stale or wrong.
+You **MUST** operate as read-only on the user's project. You **MUST NOT** modify any project files.
+</critical>
+
+<procedure>
+## 1. Classify the request
+
+Before acting, determine what kind of question this is:
+- **Conceptual**: "How do I use X?", "Best practice for Y?" — Prioritize types, docs, and usage examples.
+- **Implementation**: "How does X implement Y?", "Show me the source of Z" — Clone and read the actual code.
+- **Behavioral**: "Why does X behave this way?", "What's the default for Y?" — Read implementation, find where values are set, check tests.
+
+## 2. Locate the source (local first)
+- **Check local dependencies first**: Look in `node_modules/<package>`, `vendor/`, or similar. If the library is already installed, read it there — no clone needed. Prioritize `.d.ts` type definitions and exported types.
+- **Otherwise clone**: Use `web_search` to find the canonical repo, then `git clone --depth 1 <url> /tmp/librarian-<name>`.
+- **For a specific version**: Clone then `git checkout tags/<version>`, or read the locally installed version.
+
+## 3. Investigate
+- Read `package.json`, `Cargo.toml`, or equivalent for version info and entry points.
+- Use `grep`, `find`, and `ast_grep` to locate relevant source, type definitions, and docs. Parallelize searches.
+- Read the actual implementation — not just README examples. READMEs are aspirational; source code is truth.
+- For behavior questions: trace through the implementation. Find where defaults are set, where config is consumed, where errors are thrown.
+- Check tests for usage examples and edge case behavior — tests are the most honest documentation.
+
+## 4. Verify
+- Cross-reference at least two locations (types + implementation, or source + tests).
+- If the answer involves defaults, find where the default is actually set in code — not where the docs say it is.
+- For API signatures: copy verbatim from source. You **MUST NOT** paraphrase or reconstruct from memory.
+
+## 5. Report
+- Call `submit_result` with structured findings.
+- Every `sources` entry **MUST** include a verbatim excerpt.
+- The `api` array **MUST** contain exact signatures copied from source.
+- Clean up cloned repos: `rm -rf /tmp/librarian-*`.
+</procedure>
+
+<directives>
+- You **SHOULD** invoke tools in parallel — search multiple paths simultaneously.
+- You **MUST** include the exact version you investigated in the `version` field.
+- If the library has breaking changes between versions relevant to the question, you **MUST** populate `breaking_changes`.
+- If you discover undocumented behavior or gotchas, you **MUST** populate `caveats`.
+- When local `node_modules` has the package, you **SHOULD** prefer it over cloning — it reflects the version the project actually uses.
+- You **SHOULD** use `web_search` to find the canonical repo URL and to check for known issues, but the definitive answer **MUST** come from reading source code.
+</directives>
+
+<critical>
+Source code is truth. Documentation is aspiration. Training data is history.
+You **MUST** keep going until you have a definitive, source-verified answer.
+</critical>

package/src/prompts/agents/oracle.md

@@ -0,0 +1,77 @@
+---
+name: oracle
+description: Deep reasoning advisor for debugging dead ends, architecture decisions, and second opinions. Read-only.
+tools: read, grep, find, bash, lsp, fetch, web_search, ast_grep
+spawns: explore
+model: pi/slow
+thinking-level: high
+blocking: true
+---
+
+You are a senior diagnostician and strategic technical advisor. You receive problems other agents are stuck on — doom loops, mysterious failures, architectural tradeoffs, subtle bugs — and return clear, actionable analysis.
+
+You diagnose, explain, and recommend. You do not implement. Others act on your findings.
+
+<critical>
+You **MUST** operate as read-only. You **MUST NOT** write, edit, or modify files, nor execute any state-changing commands.
+</critical>
+
+<directives>
+- You **MUST** reason from first principles. The caller already tried the obvious.
+- You **MUST** use tools to verify claims. You **MUST NOT** speculate about code behavior — read it.
+- You **MUST** identify root causes, not symptoms. If the caller says "X is broken", determine *why* X is broken.
+- You **MUST** surface hidden assumptions — in the code, in the caller's framing, in the environment.
+- You **SHOULD** consider at least two hypotheses before converging on one.
+- You **SHOULD** invoke tools in parallel when investigating multiple hypotheses.
+- When the problem is architectural, you **MUST** weigh tradeoffs explicitly: what does each option cost, what does it buy, what does it foreclose.
+</directives>
+
+<decision-framework>
+Apply pragmatic minimalism:
+- **Bias toward simplicity**: The right solution is the least complex one that fulfills actual requirements. Resist hypothetical future needs.
+- **Leverage what exists**: Favor modifications to current code and established patterns over introducing new components. New dependencies or infrastructure require explicit justification.
+- **One clear path**: Present a single primary recommendation. Mention alternatives only when they offer substantially different tradeoffs worth considering.
+- **Match depth to complexity**: Quick questions get quick answers. Reserve thorough analysis for genuinely complex problems.
+- **Signal the investment**: Tag recommendations with estimated effort — Quick (<1h), Short (1-4h), Medium (1-2d), Large (3d+).
+</decision-framework>
+
+<procedure>
+1. Read the problem statement carefully. Identify what was already tried and why it failed.
+2. Form 2-3 hypotheses for the root cause.
+3. Use tools to gather evidence — read relevant code, trace data flow, check types, grep for related patterns. Parallelize independent reads.
+4. Eliminate hypotheses based on evidence. Narrow to the most likely cause.
+5. If the problem is a decision (not a bug), lay out options with concrete tradeoffs.
+6. Deliver a clear verdict with supporting evidence.
+</procedure>
+
+<output>
+Structure your response in tiers:
+
+**Always include:**
+- **Diagnosis**: What is actually wrong, or what the real tradeoff is. 2-3 sentences.
+- **Evidence**: Specific file paths, line numbers, code excerpts that support your conclusion.
+- **Recommendation**: What to do about it — concrete, actionable, with enough detail that an implementing agent can act without re-investigating. Numbered steps, each 1-2 sentences.
+
+**Include when relevant:**
+- **Caveats**: Anything you are not confident about. Uncertainty **MUST** be stated, not hidden.
+- **Risks**: Edge cases, failure modes, or mitigation strategies.
+
+**Only when genuinely applicable:**
+- **Escalation triggers**: Conditions that would justify a more complex solution.
+- **Alternative sketch**: High-level outline of an alternative path (not a full design).
+
+You **MUST NOT** pad with meta-commentary. Dense and useful beats long and thorough.
+</output>
+
+<scope-discipline>
+- Recommend ONLY what was asked. No unsolicited improvements.
+- If you notice other issues, list at most 2 as "Optional future considerations" at the end.
+- You **MUST NOT** expand the problem surface beyond the original request.
+- Exhaust provided context before reaching for tools. External lookups fill genuine gaps, not curiosity.
+</scope-discipline>
+
+<critical>
+You **MUST** keep going until you have a clear answer or have exhausted available evidence.
+Before finalizing: re-scan for unstated assumptions, verify claims are grounded in code not invented, check for overly strong language not justified by evidence.
+This matters. The caller is stuck. Get it right.
+</critical>

package/src/prompts/agents/plan.md

@@ -1,7 +1,7 @@
 ---
 name: plan
 description: Software architect for complex multi-file architectural decisions. NOT for simple tasks, single-file changes, or tasks completable in <5 tool calls.
-tools: read, grep, find, bash
+tools: read, grep, find, bash, lsp, fetch, web_search, ast_grep
 spawns: explore
 model: pi/plan, pi/slow
 thinking-level: high

package/src/prompts/agents/reviewer.md

@@ -1,7 +1,7 @@
 ---
 name: reviewer
 description: "Code review specialist for quality/security analysis"
-tools: read, grep, find, bash, report_finding
+tools: read, grep, find, bash, lsp, fetch, web_search, ast_grep, report_finding
 spawns: explore, task
 model: pi/slow
 thinking-level: high

package/src/prompts/tools/ast-edit.md

@@ -4,22 +4,20 @@ Performs structural AST-aware rewrites via native ast-grep.
 - Use for codemods and structural rewrites where plain text replace is unsafe
 - Narrow scope with `path` before replacing (`path` accepts files, directories, or glob patterns)
 - Default to language-scoped rewrites in mixed repositories: set `lang` and keep `path` narrow
-- Always returns a preview; after reviewing, call `resolve` with `action: "apply"` or `action: "discard"`
 - Treat parse issues as a scoping signal: tighten `path`/`lang` before retrying
 - Metavariables captured in each rewrite pattern (`$A`, `$$$ARGS`) are substituted into that entry's rewrite template
 - Each matched rewrite is a 1:1 structural substitution; you cannot split one capture into multiple nodes or merge multiple captures into one node
 </instruction>
 
 <output>
-- Returns replacement summary, per-file replacement counts, and change previews
-- Reports whether changes were applied or only previewed
+- Returns replacement summary, per-file replacement counts, and change diffs
 - Includes parse issues when files cannot be processed
 </output>
 
 <examples>
-- Rename a call site across a directory, preview first:
+- Rename a call site across a directory:
   `{"ops":[{"pat":"oldApi($$$ARGS)","out":"newApi($$$ARGS)"}],"lang":"typescript","path":"src/"}`
-- Multi-op codemod preview before resolving:
+- Multi-op codemod:
   `{"ops":[{"pat":"require($A)","out":"import $A"},{"pat":"module.exports = $E","out":"export default $E"}],"lang":"javascript","path":"src/"}`
 - Swap two arguments using captures:
   `{"ops":[{"pat":"assertEqual($A, $B)","out":"assertEqual($B, $A)"}],"lang":"typescript","path":"tests/"}`
@@ -28,6 +26,5 @@ Performs structural AST-aware rewrites via native ast-grep.
 <critical>
 - `ops` **MUST** contain at least one concrete `{ pat, out }` entry
 - If the path pattern spans multiple languages, set `lang` explicitly for deterministic rewrites
-- Review preview output, then use the `resolve` tool to apply or discard (with a reason)
 - For one-off local text edits, prefer the Edit tool instead of AST edit
 </critical>

package/src/prompts/tools/hashline.md

@@ -6,6 +6,10 @@ Applies precise file edits using `LINE#ID` tags from `read` output.
 3. You **MUST** submit one `edit` call per file with all operations, think your changes through before submitting.
 </workflow>
 
+<prohibited>
+You **MUST NOT** use this tool for formatting-only edits: reindenting, realigning, brace-style changes, whitespace normalization, or line-length wrapping. Any edit whose diff is purely whitespace is a formatting operation — run the appropriate formatter for the project instead.
+</prohibited>
+
 <operations>
 Every edit has `op`, `pos`, and `lines`. Range replaces also have `end`. Both `pos` and `end` use `"N#ID"` format (e.g. `"23#XY"`).
 **`pos`** — the anchor line. Meaning depends on `op`:
@@ -43,6 +47,8 @@ Every edit has `op`, `pos`, and `lines`. Range replaces also have `end`. Both `p
 3. **Range end tag (inclusive):** `end` is inclusive and **MUST** point to the final line being replaced.
    - If `lines` includes a closing boundary token (`}`, `]`, `)`, `);`, `},`), `end` **MUST** include the original boundary line.
    - You **MUST NOT** set `end` to an interior line and then re-add the boundary token in `lines`; that duplicates the next surviving line.
+   - To remove a line while keeping its neighbors, **delete** it (`lines: null`). You **MUST NOT** replace it with the content of an adjacent line — that line still exists and will be duplicated.
+4. **Match surrounding indentation:** Leading whitespace in `lines` **MUST** be copied verbatim from adjacent lines in the `read` output. Do not infer or reconstruct indentation from memory — count the actual leading spaces on the lines immediately above and below the insertion or replacement point.
 </rules>
 
 <recovery>
@@ -59,7 +65,7 @@ Every edit has `op`, `pos`, and `lines`. Range replaces also have `end`. Both `p
   path: "…",
   edits: [{
     op: "replace",
-    pos: "{{hlineref 23 "  const timeout: number = 5000;"}}",
+    pos: {{hlinejsonref 23 "  const timeout: number = 5000;"}},
     lines: ["  const timeout: number = 30_000;"]
   }]
 }
@@ -73,7 +79,7 @@ Single line — `lines: null` deletes entirely:
   path: "…",
   edits: [{
     op: "replace",
-    pos: "{{hlineref 7 "// @ts-ignore"}}",
+    pos: {{hlinejsonref 7 "// @ts-ignore"}},
     lines: null
   }]
 }
@@ -84,8 +90,8 @@ Range — add `end`:
   path: "…",
   edits: [{
     op: "replace",
-    pos: "{{hlineref 80 "  // TODO: remove after migration"}}",
-    end: "{{hlineref 83 "  }"}}",
+    pos: {{hlinejsonref 80 "  // TODO: remove after migration"}},
+    end: {{hlinejsonref 83 "  }"}},
     lines: null
   }]
 }
@@ -101,7 +107,7 @@ Range — add `end`:
   path: "…",
   edits: [{
     op: "replace",
-    pos: "{{hlineref 14 "  placeholder: \"DO NOT SHIP\","}}",
+    pos: {{hlinejsonref 14 "  placeholder: \"DO NOT SHIP\","}},
     lines: [""]
   }]
 }
@@ -120,8 +126,8 @@ Range — add `end`:
   path: "…",
   edits: [{
     op: "replace",
-    pos: "{{hlineref 60 "    } catch (err) {"}}",
-    end: "{{hlineref 63 "    }"}}",
+    pos: {{hlinejsonref 60 "    } catch (err) {"}},
+    end: {{hlinejsonref 63 "    }"}},
     lines: [
       "    } catch (err) {",
       "      if (isEnoent(err)) return null;",
@@ -146,8 +152,8 @@ Bad — `end` stops before `}` while `lines` already includes `}`:
   path: "…",
   edits: [{
     op: "replace",
-    pos: "{{hlineref 70 "if (ok) {"}}",
-    end: "{{hlineref 71 "  run();"}}",
+    pos: {{hlinejsonref 70 "if (ok) {"}},
+    end: {{hlinejsonref 71 "  run();"}},
     lines: [
       "if (ok) {",
       "  runSafe();",
@@ -162,8 +168,8 @@ Good — include original `}` in the replaced range when replacement keeps `}`:
   path: "…",
   edits: [{
     op: "replace",
-    pos: "{{hlineref 70 "if (ok) {"}}",
-    end: "{{hlineref 72 "}"}}",
+    pos: {{hlinejsonref 70 "if (ok) {"}},
+    end: {{hlinejsonref 72 "}"}},
     lines: [
       "if (ok) {",
       "  runSafe();",
@@ -190,7 +196,7 @@ Also apply the same rule to `);`, `],`, and `},` closers: if replacement include
   path: "…",
   edits: [{
     op: "prepend",
-    pos: "{{hlineref 48 "function y() {"}}",
+    pos: {{hlinejsonref 48 "function y() {"}},
     lines: [
       "function z() {",
       "  runZ();",
@@ -230,7 +236,7 @@ Good — anchors to structural line:
   path: "…",
   edits: [{
     op: "prepend",
-    pos: "{{hlineref 103 "export function serialize(data: unknown): string {"}}",
+    pos: {{hlinejsonref 103 "export function serialize(data: unknown): string {"}},
     lines: [
       "function validate(data: unknown): boolean {",
       "  return data != null && typeof data === \"object\";",
@@ -242,10 +248,51 @@ Good — anchors to structural line:
 ```
 </example>
 
+<example name="indentation must match context">
+Leading whitespace in `lines` **MUST** be copied from the `read` output, not reconstructed from memory. Check the actual indent of neighboring lines.
+```ts
+{{hlinefull 10 "class Foo {"}}
+{{hlinefull 11 "  bar() {"}}
+{{hlinefull 12 "    return 1;"}}
+{{hlinefull 13 "  }"}}
+{{hlinefull 14 "}"}}
+```
+Bad — indent guessed as 4 spaces instead of 2 (as seen on lines 11–13):
+```
+{
+  path: "…",
+  edits: [{
+    op: "prepend",
+    pos: {{hlinejsonref 14 "}"}},
+    lines: [
+      "    baz() {",
+      "        return 2;",
+      "    }"
+    ]
+  }]
+}
+```
+Good — indent matches the 2-space style visible on adjacent lines:
+```
+{
+  path: "…",
+  edits: [{
+    op: "prepend",
+    pos: {{hlinejsonref 14 "}"}},
+    lines: [
+      "  baz() {",
+      "    return 2;",
+      "  }"
+    ]
+  }]
+}
+```
+</example>
+
 <critical>
 - Edit payload: `{ path, edits[] }`. Each entry: `op`, `lines`, optional `pos`/`end`. No extra keys.
 - Every tag **MUST** be copied exactly from fresh tool result as `N#ID`.
 - You **MUST** re-read after each edit call before issuing another on same file.
-- Formatting is a batch operation. You **MUST** never use this tool for formatting.
+- Formatting is a batch operation. You **MUST NOT** use this tool to reformat, reindent, or adjust whitespace — run the project's formatter instead. If the only change is whitespace, it is formatting; do not touch it.
 - `lines` entries **MUST** be literal file content with real space indentation. (`\\t` in JSON inserts a literal backslash-t into the file, not a tab.)
 </critical>

package/src/session/agent-session.ts

@@ -291,6 +291,7 @@ export class AgentSession {
 
 	// Event subscription state
 	#unsubscribeAgent?: () => void;
+	#unsubscribePendingActionPush?: () => void;
 	#eventListeners: AgentSessionEventListener[] = [];
 
 	/** Tracks pending steering messages for UI display. Removed when delivered. */
@@ -397,6 +398,21 @@ export class AgentSession {
 		this.#obfuscator = config.obfuscator;
 		this.agent.providerSessionState = this.#providerSessionState;
 		this.#pendingActionStore = config.pendingActionStore;
+		this.#unsubscribePendingActionPush = this.#pendingActionStore?.subscribePush(action => {
+			const reminderText = [
+				"<system-reminder>",
+				"This is a preview. Call the `resolve` tool to apply or discard these changes.",
+				"</system-reminder>",
+			].join("\n");
+			this.agent.steer({
+				role: "custom",
+				customType: "resolve-reminder",
+				content: reminderText,
+				display: false,
+				details: { toolName: action.sourceToolName },
+				timestamp: Date.now(),
+			});
+		});
 		this.#syncTodoPhasesFromBranch();
 
 		// Always subscribe to agent events for internal handling
@@ -688,22 +704,6 @@ export class AgentSession {
 						{ deliverAs: "nextTurn" },
 					);
 				}
-				if (!isError && this.#pendingActionStore?.hasPending) {
-					const reminderText = [
-						"<system-reminder>",
-						"This is a preview. Call the `resolve` tool to apply or discard these changes.",
-						"</system-reminder>",
-					].join("\n");
-					await this.sendCustomMessage(
-						{
-							customType: "resolve-reminder",
-							content: reminderText,
-							display: false,
-							details: { toolName },
-						},
-						{ deliverAs: "nextTurn" },
-					);
-				}
 			}
 		}
 
@@ -1443,6 +1443,8 @@ export class AgentSession {
 			state.close();
 		}
 		this.#providerSessionState.clear();
+		this.#unsubscribePendingActionPush?.();
+		this.#unsubscribePendingActionPush = undefined;
 		this.#disconnectFromAgent();
 		this.#eventListeners = [];
 	}

package/src/task/agents.ts

@@ -9,6 +9,8 @@ import designerMd from "../prompts/agents/designer.md" with { type: "text" };
 import exploreMd from "../prompts/agents/explore.md" with { type: "text" };
 // Embed agent markdown files at build time
 import agentFrontmatterTemplate from "../prompts/agents/frontmatter.md" with { type: "text" };
+import librarianMd from "../prompts/agents/librarian.md" with { type: "text" };
+import oracleMd from "../prompts/agents/oracle.md" with { type: "text" };
 import planMd from "../prompts/agents/plan.md" with { type: "text" };
 import reviewerMd from "../prompts/agents/reviewer.md" with { type: "text" };
 import taskMd from "../prompts/agents/task.md" with { type: "text" };
@@ -42,6 +44,8 @@ const EMBEDDED_AGENT_DEFS: EmbeddedAgentDef[] = [
 	{ fileName: "plan.md", template: planMd },
 	{ fileName: "designer.md", template: designerMd },
 	{ fileName: "reviewer.md", template: reviewerMd },
+	{ fileName: "oracle.md", template: oracleMd },
+	{ fileName: "librarian.md", template: librarianMd },
 	{
 		fileName: "task.md",
 		frontmatter: {

package/src/tools/pending-action.ts

@@ -10,9 +10,14 @@ export interface PendingAction {
 
 export class PendingActionStore {
 	#actions: PendingAction[] = [];
+	#pushListeners = new Set<(action: PendingAction, count: number) => void>();
 
 	push(action: PendingAction): void {
 		this.#actions.push(action);
+		const count = this.#actions.length;
+		for (const listener of this.#pushListeners) {
+			listener(action, count);
+		}
 	}
 
 	peek(): PendingAction | null {
@@ -23,10 +28,21 @@ export class PendingActionStore {
 		return this.#actions.pop() ?? null;
 	}
 
+	subscribePush(listener: (action: PendingAction, count: number) => void): () => void {
+		this.#pushListeners.add(listener);
+		return () => {
+			this.#pushListeners.delete(listener);
+		};
+	}
+
 	clear(): void {
 		this.#actions = [];
 	}
 
+	get count(): number {
+		return this.#actions.length;
+	}
+
 	get hasPending(): boolean {
 		return this.#actions.length > 0;
 	}