pi-code 1.0.74 → 1.0.76

package/README.md

@@ -19,7 +19,7 @@ What a repository ships is treated as untrusted until you approve it: project MC
 
 ## Requirements
 
-pi `>=0.79.1` (0.84.x recommended) and Node `>=22.19` for current pi.
+pi `>=0.80.4` (0.84.x recommended) and Node `>=22.19` for current pi.
 
 ## Install
 

package/extensions/claude-rules.ts

@@ -289,6 +289,9 @@ export default function claudeRulesExtension(pi: ExtensionAPI) {
   // Scoped rules still awaiting a matching touch. An attached rule leaves the
   // list, so each attaches at most once and the per-tool-result scan shrinks.
   let attachTargets: AttachTarget[] = []
+  // Every scoped rule of the session, the list attachTargets is rebuilt from when what was
+  // attached leaves the context (see rearm below).
+  let scopedTargets: AttachTarget[] = []
 
   pi.on('session_start', async (_event, ctx) => {
     // Project rules are repository text landing in the system prompt, so they load
@@ -318,6 +321,7 @@ export default function claudeRulesExtension(pi: ExtensionAPI) {
       ...globalRules.scoped.map((rule) => ({ globs: rule.paths, compiled: compileGlobs(rule.paths), body: rule.body, root: realpathOr(ctx.cwd), file: path.join(globalRulesDir, rule.rel), memoryType: 'User' as const })),
       ...projectRules.scoped.map((rule) => ({ globs: rule.paths, compiled: compileGlobs(rule.paths), body: rule.body, root: realpathOr(projectRoot), file: path.join(projectRulesDir ?? path.join(ctx.cwd, '.claude', 'rules'), rule.rel), memoryType: 'Project' as const })),
     ]
+    scopedTargets = attachTargets
     pendingScopedRules = attachTargets.length
     // Relative to cwd, which the read tool resolves: an ancestor dir yields a
     // `../…/.claude/rules` the model can follow, where a bare '.claude/rules'
@@ -340,6 +344,16 @@ export default function claudeRulesExtension(pi: ExtensionAPI) {
     return { systemPrompt: event.systemPrompt + addition }
   })
 
+  // A rule's body sits in the tool result that attached it. Compaction folds that result into
+  // a summary and /tree moves to a branch that never had it, and Claude reloads the rule "as
+  // Claude reads files they apply to", so every rule is armed again.
+  const rearm = (): void => {
+    attachTargets = scopedTargets
+    pendingScopedRules = attachTargets.length
+  }
+  pi.on('session_compact', rearm)
+  pi.on('session_tree', rearm)
+
   // Lazy attach: when a file tool touches a path a scoped rule covers, append the
   // rule body to that tool's result so it enters context, once per rule per session.
   // This mirrors Claude Code, which attaches a scoped rule when a matching file is

package/extensions/commands.ts

@@ -554,7 +554,8 @@ export default function commandsExtension(pi: ExtensionAPI) {
   }
 
   pi.on('session_start', async (_event, ctx) => {
-    // One extension instance serves every session. A mid-turn /new fires session_start on
+    // pi's CLI builds a fresh extension instance per session replacement; only RPC mode can
+    // reuse one across sessions. A mid-turn /new there fires session_start on
     // the same instance while a command's per-run scoping is still pending (its agent_settled
     // never came). Carrying that into the next session would restore an unrelated tool set,
     // bash/path scope, model, or effort onto it, so drop the pending state here. Drop only:

package/extensions/context-imports.ts

@@ -145,12 +145,15 @@ export interface ImportBudget {
   files: number
   bytes: number
   dropped: number
-  /** Existing files an @import named that resolve outside the importer's allowed
-   * roots. Collected so the refusal can be reported rather than left silent. */
+  /** Every @import target that resolves outside the importer's allowed roots, whether or not
+   * it exists: the notice to the model must not reveal which of a repo's guesses do. */
   refused: Set<string>
+  /** The subset of `refused` that is an existing file, which is what an approval would
+   * load and so what the user's dialog is about. */
+  refusedPresent: Set<string>
 }
 
-export const createImportBudget = (): ImportBudget => ({ files: MAX_IMPORT_FILES, bytes: MAX_IMPORT_BYTES, dropped: 0, refused: new Set() })
+export const createImportBudget = (): ImportBudget => ({ files: MAX_IMPORT_FILES, bytes: MAX_IMPORT_BYTES, dropped: 0, refused: new Set(), refusedPresent: new Set() })
 
 /** The `@path` targets of a context file, in document order. Claude Code evaluates
  * imports neither in fenced code blocks (backtick or tilde) nor in inline spans. */
@@ -171,16 +174,25 @@ function importTargets(content: string): string[] {
   return targets
 }
 
+function isRegularFile(target: string): boolean {
+  try {
+    return fs.statSync(target).isFile()
+  } catch {
+    return false
+  }
+}
+
 /** Read one `@path` target, or null when it is unresolvable, already seen, outside `allowedRoots`, excluded, or unreadable. */
-function readImport(target: string, fromDir: string, home: string, allowedRoots: string[], seen: Set<string>, isExcluded: ((realPath: string) => boolean) | undefined, refused: Set<string>): { real: string; body: string } | null {
+function readImport(target: string, fromDir: string, home: string, allowedRoots: string[], seen: Set<string>, isExcluded: ((realPath: string) => boolean) | undefined, refusals: Pick<ImportBudget, 'refused' | 'refusedPresent'>): { real: string; body: string } | null {
   const resolved = path.resolve(fromDir, expandHome(target, home))
   // Always the path the importing file named, never where a symlink pointed: the
   // notice would otherwise hand a repo the real name of whatever the link reaches,
   // which is the disclosure the refusal exists to prevent. An excluded file is not
   // named either, since exclusion removes it from every other surface too.
-  const refuse = (): null => {
-    if (isExcluded?.(resolved) !== true) refused.add(resolved)
-    return null
+  const refuse = (isFile: boolean): void => {
+    if (isExcluded?.(resolved) === true) return
+    refusals.refused.add(resolved)
+    if (isFile) refusals.refusedPresent.add(resolved)
   }
   let real: string
   try {
@@ -190,10 +202,14 @@ function readImport(target: string, fromDir: string, home: string, allowedRoots:
     // reported never depends on whether it exists: a notice that named only the
     // existing ones would enumerate the filesystem for any repo-controlled file
     // willing to write one @line per guess.
-    return isUnder(resolved, allowedRoots) ? null : refuse()
+    if (!isUnder(resolved, allowedRoots)) refuse(false)
+    return null
   }
   if (seen.has(real)) return null
-  if (!isUnder(real, allowedRoots)) return refuse()
+  if (!isUnder(real, allowedRoots)) {
+    refuse(isRegularFile(real))
+    return null
+  }
   // Checked before the read so an excluded file contributes nothing: no body, no
   // transitive imports, no budget spend, no announce. A post-collection filter
   // would drop the file itself but keep its children.
@@ -206,7 +222,8 @@ function readImport(target: string, fromDir: string, home: string, allowedRoots:
     seen.add(real)
     // A file another importer already refused is in context after all; the notice
     // must not claim otherwise.
-    refused.delete(resolved)
+    refusals.refused.delete(resolved)
+    refusals.refusedPresent.delete(resolved)
     return { real, body }
   } catch {
     return null
@@ -243,7 +260,7 @@ function collectFrom(scan: ImportScan, content: string, fromDir: string, depth:
       scan.budget.dropped += 1
       continue
     }
-    const file = readImport(target, fromDir, scan.home, scan.allowedRoots, scan.seen, scan.isExcluded, scan.budget.refused)
+    const file = readImport(target, fromDir, scan.home, scan.allowedRoots, scan.seen, scan.isExcluded, scan.budget)
     if (!file) continue
     scan.budget.files -= 1
     // The budget is bytes: a string slice counts UTF-16 units and lets CJK text through
@@ -272,16 +289,21 @@ export function collectImports(content: string, fromDir: string, home: string, a
 /**
  * Roots an importing file may pull from.
  *
- * A context file under the user's own config may reach the whole config; a project
- * file may not. `~/.claude` holds `.credentials.json`, global settings and every
- * project's transcripts, so granting those roots to a cloned repo's `CLAUDE.md`
- * would let it read them into the system prompt.
+ * A file under the user's own config may import from anywhere: Claude's user-scope memory
+ * files "are files you wrote yourself", and it loads their imports without the dialog and
+ * trusts them like the rest of the user's configuration. A project file may not, so a cloned
+ * repo's `CLAUDE.md` cannot read `~/.claude` (`.credentials.json`, global settings, every
+ * project's transcripts) into the system prompt.
+ *
+ * "Under the user's config" is judged by the path pi reported as well as its realpath: a
+ * dotfiles manager such as GNU stow links `~/.claude/CLAUDE.md` to a repository, so the
+ * real path is outside `~/.claude` although the user put the link there.
  */
 export function rootsForImporter(importer: string, home: string, cwd: string, externalApproved = false): string[] {
-  const userRoots = realRoots([claudeConfigDir(home), path.join(home, '.pi')])
+  const userConfig = [claudeConfigDir(home), path.join(home, '.pi')]
   const [real] = realRoots([importer])
-  const fromUserConfig = real !== undefined && isUnder(real, userRoots)
-  if (fromUserConfig) return realRoots([cwd, ...userRoots])
+  const fromUserConfig = isUnder(path.resolve(importer), userConfig) || (real !== undefined && isUnder(real, realRoots(userConfig)))
+  if (fromUserConfig) return [ANY_ROOT]
   // The project was asked about its external imports and allowed them, so a project
   // file may reach outside, as Claude's dialog grants. The widening is deliberately
   // only for project files: a user-scope file's roots are its own config, and an
@@ -552,7 +574,9 @@ export const EXTERNAL_IMPORT_PROMPT_TITLE = 'Load imports from outside this proj
  *
  * The list is the refusals the enforcing path produced, not a second enumeration of
  * what it might refuse: same files, same depth, same resolution, same exclusions. That
- * is the only way the dialog can promise it names everything the approval lets in.
+ * is the only way the dialog can promise it names everything the approval lets in. Only
+ * files that exist are listed, as in Claude, which asks about the external files it read:
+ * a prose `@/components/ui` names nothing an approval could load.
  */
 async function askExternalImports(ctx: ExtensionContext, root: string, refused: ReadonlySet<string>): Promise<boolean> {
   const listed = [...refused]
@@ -853,8 +877,15 @@ export default function contextImportsExtension(pi: ExtensionAPI) {
   // @import cannot pay for a body that is already there.
   let launchLoadedPaths: string[] = []
   // Nested CLAUDE.md/CLAUDE.local.md files already attached this session, so a second
-  // read in the same subtree does not repeat them.
+  // read in the same subtree does not repeat them. Emptied when compaction or /tree takes
+  // the tool results that carried them out of context: Claude reloads them "as Claude
+  // reads files they apply to".
   const nestedLoaded = new Set<string>()
+  const forgetNested = (): void => {
+    nestedLoaded.clear()
+  }
+  pi.on('session_compact', forgetNested)
+  pi.on('session_tree', forgetNested)
   // Instruction loads already announced on the shared bus, keyed reason:path.
   // before_agent_start fires every turn, so without this a configured
   // InstructionsLoaded hook would fire once per file per turn.
@@ -1023,8 +1054,8 @@ export default function contextImportsExtension(pi: ExtensionAPI) {
     const key = externalImportKey(cwd)
     const decided = externalImportDecision(key)
     const result = expandWith(decided === true)
-    if (decided !== null || result.budget.refused.size === 0 || ctx?.hasUI !== true) return result
-    const approved = await askExternalImports(ctx, key, result.budget.refused)
+    if (decided !== null || result.budget.refusedPresent.size === 0 || ctx?.hasUI !== true) return result
+    const approved = await askExternalImports(ctx, key, result.budget.refusedPresent)
     rememberExternalImportDecision(key, approved)
     return approved ? expandWith(true) : result
   }

package/extensions/git-checkpoint.ts

@@ -172,6 +172,9 @@ export default function gitCheckpointExtension(pi: ExtensionAPI) {
   let promptedRun = false
   let shadowDir: string | undefined
   let workTree: string | undefined
+  // Set in ensureShadow: whether the live session has no session file (--no-session),
+  // whose shadow repo session_shutdown then knows is safe to remove on a real quit.
+  let ephemeralShadow = false
   // Absolute paths this session's edit tools targeted: the whole of what a checkpoint
   // captures. Seeded on resume from the last commit, so a resumed session keeps
   // snapshotting the files it was already tracking.
@@ -191,6 +194,7 @@ export default function gitCheckpointExtension(pi: ExtensionAPI) {
   async function ensureShadow(ctx: ExtensionContext): Promise<void> {
     workTree = ctx.cwd
     const sessionFile = (ctx.sessionManager as { getSessionFile?: () => string | undefined }).getSessionFile?.()
+    ephemeralShadow = sessionFile === undefined
     const checkpointsRoot = path.join(getAgentDir(), 'checkpoints')
     shadowDir = path.join(checkpointsRoot, sessionSlug(sessionFile))
     // A resumed session can arrive from a different directory than the one the shadow
@@ -454,7 +458,8 @@ export default function gitCheckpointExtension(pi: ExtensionAPI) {
   }
 
   pi.on('session_start', async (event, ctx) => {
-    // One extension instance serves every session. A mid-turn /new fires session_start on
+    // pi's CLI builds a fresh extension instance per session replacement; only RPC mode can
+    // reuse one across sessions. A mid-turn /new there fires session_start on
     // the same instance after turn_start took the pre-run snapshot but before turn_end saved
     // it; that pending ref belongs to the previous session and must not attach to the next
     // session's first turn_end. Re-arm runNeedsSnapshot too, so the next run snapshots its
@@ -480,6 +485,17 @@ export default function gitCheckpointExtension(pi: ExtensionAPI) {
     for (const checkpoint of capCheckpoints(stored)) checkpoints.set(checkpoint.entryId, checkpoint)
   })
 
+  // A --no-session run has no session file, so nothing can ever resume it or run
+  // /rewind from it again once the process exits: its shadow repo, left in place, was
+  // pure waste for the 30 days until the retention sweep reached it. Only a genuine
+  // quit removes it eagerly; 'new', 'resume' and 'reload' keep the process (and this
+  // extension instance) alive, and 'fork' can write a session from the live run's
+  // in-memory entries and then fetch refs from exactly this shadow at its own
+  // session_start, so this one case is left for the retention sweep as before.
+  pi.on('session_shutdown', async (event) => {
+    if (ephemeralShadow && shadowDir && event.reason === 'quit') fs.rmSync(shadowDir, { recursive: true, force: true })
+  })
+
   // A new agent loop starts a run: the next turn_start snapshots the pre-run tree.
   // agent_start, not before_agent_start: before_agent_start does not fire for a queued
   // follow-up message delivered through agent.continue, so gating on it would leave that

package/extensions/goal.ts

@@ -446,7 +446,8 @@ export default function goalExtension(pi: ExtensionAPI) {
   })
 
   pi.on('session_start', (_event, ctx) => {
-    // One extension instance serves every session: drop the previous session's goal and
+    // pi's CLI builds a fresh extension instance per session replacement; RPC mode can reuse
+    // one across sessions, so drop the previous session's goal and
     // timers before reading this session's persisted state.
     sessionCtx = ctx
     goal = undefined

package/extensions/hooks/index.ts

@@ -446,7 +446,8 @@ export default function hooksExtension(pi: ExtensionAPI) {
 
   pi.on('session_start', async (event, ctx) => {
     sessionCtx = ctx
-    // One extension instance serves every session. A mid-turn /new fires session_start on
+    // pi's CLI builds a fresh extension instance per session replacement; only RPC mode can
+    // reuse one across sessions. A mid-turn /new there fires session_start on
     // the same instance while a Stop-hook continuation streak is in flight; it must not
     // carry into the next session, so reset before any early return (disableAllHooks below).
     stopHookActive = false

package/extensions/internal/html-markdown.ts

@@ -58,30 +58,125 @@ const trimNewlines = (value: string): string => {
   return value.slice(start, end)
 }
 
+/** Every match of the global regex `re` in `html`, as `{start, end}` spans. One linear
+ * scan: `matchAll` resumes after each match rather than restarting the search. */
+function matchSpans(html: string, re: RegExp): Array<{ start: number; end: number }> {
+  return [...html.matchAll(re)].map((m) => ({ start: m.index, end: m.index + m[0].length }))
+}
+
+/**
+ * Replace every `open...close` span with `transform(open, body)`. `closeSource(open)`
+ * gives the close pattern's regex source for this particular open (a fixed literal for
+ * most callers; a backreference to `open[1]` for a shared tag family like
+ * script|style|noscript, so each open pairs only with its own tag name). An open with no
+ * reachable close is left as literal text, the same as a non-matching `[\s\S]*?` regex
+ * would leave it.
+ *
+ * Both the opens and each distinct close pattern are found with one bounded, linear scan
+ * (`openRe`'s attrs never cross a `<`/`>`, and neither does a close tag's), then paired by
+ * a single forward walk with a cursor per close pattern that only advances. A page that
+ * repeats one unclosed tag thousands of times used to cost one rescan to the end of the
+ * document per occurrence (O(n^2) for the lazy `[\s\S]*?<\/tag>` shape this replaces);
+ * this costs one pass.
+ */
+function replaceTagSpans(html: string, openRe: RegExp, closeSource: (open: RegExpMatchArray) => string, transform: (open: RegExpMatchArray, body: string) => string): string {
+  const opens = [...html.matchAll(openRe)]
+  if (opens.length === 0) return html
+
+  const closeSpans = new Map<string, Array<{ start: number; end: number }>>()
+  const closeCursor = new Map<string, number>()
+
+  let out = ''
+  let cursor = 0
+  for (const open of opens) {
+    const openStart = open.index ?? 0
+    if (openStart < cursor) continue // inside a span an earlier open of this pass already consumed
+    const source = closeSource(open)
+    if (!closeSpans.has(source)) {
+      closeSpans.set(source, matchSpans(html, new RegExp(source, 'gi')))
+      closeCursor.set(source, 0)
+    }
+    const spans = closeSpans.get(source) as Array<{ start: number; end: number }>
+    const openEnd = openStart + open[0].length
+    let idx = closeCursor.get(source) as number
+    while (idx < spans.length && spans[idx].start < openEnd) idx++
+    closeCursor.set(source, idx)
+    if (idx >= spans.length) continue // no close anywhere after this open: leave it as text
+    out += html.slice(cursor, openStart) + transform(open, html.slice(openEnd, spans[idx].start))
+    cursor = spans[idx].end
+  }
+  return out + html.slice(cursor)
+}
+
 export function htmlToMarkdown(html: string): string {
   // Pre blocks are lifted out first so no later transform touches their content.
   const preBodies: string[] = []
-  let work = html
-    .replace(/<!--[\s\S]*?-->/g, ' ')
-    .replace(/<(script|style|noscript|head|svg)\b[^<>]*>[\s\S]*?<\/\1[^<>]*>/gi, ' ')
-    .replace(/<pre\b[^<>]*>([\s\S]*?)<\/pre>/gi, (_whole, inner: string) => {
-      preBodies.push(trimNewlines(decodeAllEntities(removeTags(inner))))
+  // Each of these bodies can legitimately hold anything up to and including another `<`, so
+  // the body itself cannot be bounded like an open tag's attrs; replaceTagSpans keeps the
+  // pass linear instead by pairing opens and closes in one pass rather than rescanning the
+  // document from every open that turns out to have no close (a broken template or a fetch
+  // truncated mid-tag repeats that shape often enough to matter).
+  let work = replaceTagSpans(
+    html,
+    /<!--/g,
+    () => '-->',
+    () => ' ',
+  )
+  work = replaceTagSpans(
+    work,
+    /<(script|style|noscript|head|svg)\b[^<>]*>/gi,
+    (open) => `</${open[1]}[^<>]*>`,
+    () => ' ',
+  )
+  work = replaceTagSpans(
+    work,
+    /<pre\b[^<>]*>/gi,
+    () => '</pre[^<>]*>',
+    (_open, body) => {
+      preBodies.push(trimNewlines(decodeAllEntities(removeTags(body))))
       return `\n\n\uE000PRE${preBodies.length - 1}\uE000\n\n`
-    })
+    },
+  )
 
-  work = work
-    .replace(/<code\b[^<>]*>([\s\S]*?)<\/code>/gi, (_whole, inner: string) => `\`${removeTags(inner)}\``)
-    // Only real web links become markdown links; fragment and javascript hrefs
-    // keep their label and lose the target.
-    .replace(/<a\b[^<>]*?href=(?:"([^"]*)"|'([^']*)')[^<>]*>([\s\S]*?)<\/a>/gi, (_whole, dq: string | undefined, sq: string | undefined, inner: string) => {
-      const href = decodeAllEntities(dq ?? sq ?? '')
-      const label = removeTags(inner).trim()
+  work = replaceTagSpans(
+    work,
+    /<code\b[^<>]*>/gi,
+    () => '</code[^<>]*>',
+    (_open, body) => `\`${removeTags(body)}\``,
+  )
+  // Only real web links become markdown links; fragment and javascript hrefs
+  // keep their label and lose the target.
+  work = replaceTagSpans(
+    work,
+    /<a\b[^<>]*?href=(?:"([^"]*)"|'([^']*)')[^<>]*>/gi,
+    () => '</a[^<>]*>',
+    (open, body) => {
+      const href = decodeAllEntities(open[1] ?? open[2] ?? '')
+      const label = removeTags(body).trim()
       if (!label) return ' '
       return /^https?:\/\//i.test(href) ? `[${label}](${href})` : label
-    })
-    .replace(/<(strong|b)\b[^<>]*>([\s\S]*?)<\/\1>/gi, (_whole, _tag, inner: string) => `**${removeTags(inner).trim()}**`)
-    .replace(/<(em|i)\b[^<>]*>([\s\S]*?)<\/\1>/gi, (_whole, _tag, inner: string) => `*${removeTags(inner).trim()}*`)
-    .replace(/<h([1-6])\b[^<>]*>([\s\S]*?)<\/h\1>/gi, (_whole, level: string, inner: string) => `\n\n${'#'.repeat(Number(level))} ${removeTags(inner).trim()}\n\n`)
+    },
+  )
+  work = replaceTagSpans(
+    work,
+    /<(strong|b)\b[^<>]*>/gi,
+    (open) => `</${open[1]}[^<>]*>`,
+    (_open, body) => `**${removeTags(body).trim()}**`,
+  )
+  work = replaceTagSpans(
+    work,
+    /<(em|i)\b[^<>]*>/gi,
+    (open) => `</${open[1]}[^<>]*>`,
+    (_open, body) => `*${removeTags(body).trim()}*`,
+  )
+  work = replaceTagSpans(
+    work,
+    /<h([1-6])\b[^<>]*>/gi,
+    (open) => `</h${open[1]}[^<>]*>`,
+    (open, body) => `\n\n${'#'.repeat(Number(open[1]))} ${removeTags(body).trim()}\n\n`,
+  )
+
+  work = work
     .replace(/<img\b[^<>]*?alt=(?:"([^"]*)"|'([^']*)')[^<>]*>/gi, (_whole, dq?: string, sq?: string) => dq ?? sq ?? '')
     .replace(/<li\b[^<>]*>/gi, '\n- ')
     .replace(/<blockquote\b[^<>]*>/gi, '\n\n> ')

package/extensions/internal/plugins.ts

@@ -6,8 +6,10 @@
  * active only when `enabledPlugins` in the settings chain says true, under the
  * bare name or the marketplace-qualified `name@marketplace`. Only an explicit
  * true enables: Claude writes the entry on install, so a cached plugin with no
- * entry is not one the user turned on. With no version index on disk, the
- * newest version directory wins, matching the update-then-grace-period layout.
+ * entry is not one the user turned on. The version that loads is the one Claude's
+ * installed_plugins.json records; without a usable record, the newest directory
+ * not marked `.orphaned_at`, since an update leaves the old version in the cache
+ * for a grace period and some directories are named by commit sha.
  * The persistent data directory (${CLAUDE_PLUGIN_DATA}) survives updates at
  * ~/.claude/plugins/data/<id>, id being the qualified name folded to dashes.
  */
@@ -59,6 +61,12 @@ function listDirs(dir: string): string[] {
   }
 }
 
+/** The plugin directories of a marketplace. A dot-directory is never one: Claude clones a
+ * marketplace into `temp_git_*` first, and its `.git` was loaded as a plugin. */
+function listPluginDirs(marketplaceDir: string): string[] {
+  return listDirs(marketplaceDir).filter((name) => !name.startsWith('.'))
+}
+
 /** One version string split for comparison: optional v prefix dropped, numeric
  * base segments, and whatever follows a dash as the prerelease tag. */
 function parseVersion(version: string): { base: number[]; pre: string | undefined } {
@@ -88,6 +96,39 @@ function newestVersion(versions: string[]): string | undefined {
   return [...versions].sort(compareVersions).at(-1)
 }
 
+/** Claude's record of what is installed, `plugins/installed_plugins.json`: per plugin id a
+ * list of installs (an object in the older layout), each with its scope and `installPath`.
+ * Maps each id to its recorded directories, user scope first: enablement here is the
+ * user's own, and a project or local install is another project's copy. Undefined when the
+ * file is absent or unusable, which leaves the directory walk to decide. */
+function readInstallIndex(home: string): Map<string, string[]> | undefined {
+  const file = path.join(claudeConfigDir(home), 'plugins', 'installed_plugins.json')
+  const plugins = readJson(file).plugins
+  if (plugins === null || typeof plugins !== 'object') return undefined
+  const installs = new Map<string, string[]>()
+  for (const [id, entry] of Object.entries(plugins)) {
+    const recorded = (Array.isArray(entry) ? entry : [entry]).filter((one): one is { scope?: unknown; installPath: string } => typeof one?.installPath === 'string')
+    recorded.sort((a, b) => Number(b.scope === 'user') - Number(a.scope === 'user'))
+    installs.set(
+      id,
+      recorded.map((one) => one.installPath),
+    )
+  }
+  return installs
+}
+
+/** The version directory of one cached plugin that loads: a recorded install that still
+ * exists and sits directly under the plugin's cache directory (the record is a file, and a
+ * path into another plugin's tree would load that plugin's code under this one's name),
+ * else the newest version not marked orphaned. */
+function versionDir(pluginPath: string, recorded: string[] | undefined): string | undefined {
+  const installed = recorded?.find((dir) => path.dirname(path.resolve(dir)) === pluginPath && listDirs(pluginPath).includes(path.basename(dir)))
+  if (installed) return installed
+  const live = listDirs(pluginPath).filter((version) => !fs.existsSync(path.join(pluginPath, version, '.orphaned_at')))
+  const newest = newestVersion(live)
+  return newest === undefined ? undefined : path.join(pluginPath, newest)
+}
+
 /** The enablement map, later files winning per key, as settings scopes merge. */
 function enabledMap(settingsFiles: string[]): Record<string, boolean> {
   const merged: Record<string, boolean> = {}
@@ -159,26 +200,26 @@ function contentToken(target: string): string {
 /**
  * A cheap change signature for one home's plugin config: the settings files'
  * content hashes plus the cache tree's directory names and mtimes down through each plugin's
- * version directories, and the stat token of the resolved (newest) version's manifest
+ * version directories, and the stat token of the resolved version's manifest (which moves when Claude's install record selects another)
  * so an in-place edit of it invalidates the cache. Costs a few stats where the full
  * walk reads and parses the settings and every manifest.
  */
-function pluginFingerprint(cacheDir: string, settingsFiles: string[]): string {
+function pluginFingerprint(cacheDir: string, settingsFiles: string[], index: Map<string, string[]> | undefined): string {
   const parts = settingsFiles.map(contentToken)
   for (const marketplace of listDirs(cacheDir)) {
     const marketplaceDir = path.join(cacheDir, marketplace)
     parts.push(`${marketplace}:${statToken(marketplaceDir)}`)
-    for (const pluginDir of listDirs(marketplaceDir)) {
+    for (const pluginDir of listPluginDirs(marketplaceDir)) {
       const pluginPath = path.join(marketplaceDir, pluginDir)
       parts.push(`${marketplace}/${pluginDir}:${statToken(pluginPath)}`)
       const versions = listDirs(pluginPath)
       for (const version of versions) {
         parts.push(`${marketplace}/${pluginDir}/${version}:${statToken(path.join(pluginPath, version))}`)
       }
-      // resolvePlugin reads only the newest version's manifest, so its stat token is
+      // resolvePlugin reads only the resolved version's manifest, so its stat token is
       // what an in-place edit (no directory entry changing) must move.
-      const newest = newestVersion(versions)
-      if (newest) parts.push(`${marketplace}/${pluginDir}/${newest}/manifest:${statToken(path.join(pluginPath, newest, '.claude-plugin', 'plugin.json'))}`)
+      const resolved = versionDir(pluginPath, index?.get(`${pluginDir}@${marketplace}`))
+      if (resolved) parts.push(`${marketplace}/${pluginDir}/${path.basename(resolved)}/manifest:${statToken(path.join(resolved, '.claude-plugin', 'plugin.json'))}`)
     }
   }
   return parts.join('\n')
@@ -199,15 +240,16 @@ export function installedPlugins(home: string, extraSettingsFiles: string[] = []
   const cacheDir = path.join(claudeConfigDir(home), 'plugins', 'cache')
   const settingsFiles = [path.join(claudeConfigDir(home), 'settings.json'), ...extraSettingsFiles]
   const key = [home, ...extraSettingsFiles].join('\n')
-  const fingerprint = pluginFingerprint(cacheDir, settingsFiles)
+  const index = readInstallIndex(home)
+  const fingerprint = pluginFingerprint(cacheDir, settingsFiles, index)
   const cached = pluginCache.get(key)
   if (cached?.fingerprint === fingerprint) return cached.plugins
   const enabled = enabledMap(settingsFiles)
   const configs = pluginConfigsMap(settingsFiles)
   const plugins: InstalledPlugin[] = []
   for (const marketplace of listDirs(cacheDir)) {
-    for (const pluginDir of listDirs(path.join(cacheDir, marketplace))) {
-      const plugin = resolvePlugin(home, cacheDir, marketplace, pluginDir, enabled, configs)
+    for (const pluginDir of listPluginDirs(path.join(cacheDir, marketplace))) {
+      const plugin = resolvePlugin(home, cacheDir, marketplace, pluginDir, enabled, configs, index)
       if (plugin) plugins.push(plugin)
     }
   }
@@ -243,11 +285,10 @@ function pluginEnabled(qualified: string, pluginDir: string, enabled: Record<str
 
 /** Resolve one cached plugin directory into an enabled InstalledPlugin, or null to skip
  * it: turned off by managed/user settings or defaultEnabled, or no version yet. */
-function resolvePlugin(home: string, cacheDir: string, marketplace: string, pluginDir: string, enabled: Record<string, boolean>, configs: Record<string, Record<string, string>>): InstalledPlugin | null {
+function resolvePlugin(home: string, cacheDir: string, marketplace: string, pluginDir: string, enabled: Record<string, boolean>, configs: Record<string, Record<string, string>>, installs: Map<string, string[]> | undefined): InstalledPlugin | null {
   const qualified = `${pluginDir}@${marketplace}`
-  const version = newestVersion(listDirs(path.join(cacheDir, marketplace, pluginDir)))
-  if (!version) return null
-  const root = path.join(cacheDir, marketplace, pluginDir, version)
+  const root = versionDir(path.join(cacheDir, marketplace, pluginDir), installs?.get(qualified))
+  if (!root) return null
   const manifest = readJson(path.join(root, '.claude-plugin', 'plugin.json'))
   if (!pluginEnabled(qualified, pluginDir, enabled, manifest)) return null
   const name = typeof manifest.name === 'string' && manifest.name.length > 0 ? manifest.name : pluginDir

package/extensions/notify.ts

@@ -86,7 +86,11 @@ function notifyWindows(title: string, body: string): void {
 }
 
 function notifyDesktop(title: string, body: string): void {
-  if (process.env.WT_SESSION) {
+  // Windows Terminal sets WT_SESSION for a WSL session it hosts too, but WSL is a Linux
+  // process: notifyWindows's fixed C:\Windows\... path is a Windows path and cannot
+  // resolve there, so PowerShell never actually launched and no toast ever fired. The
+  // escape-sequence fallback below travels over the same pty either way.
+  if (process.env.WT_SESSION && process.platform === 'win32') {
     notifyWindows(title, body)
   } else if (process.env.KITTY_WINDOW_ID) {
     notifyOSC99(title, body)
@@ -100,25 +104,44 @@ export default function notifyExtension(pi: ExtensionAPI) {
   // When the user last submitted a prompt, so a turn's duration can stand in for
   // Claude's "appear to be away" check. Undefined until the first prompt this session.
   let lastInputAt: number | undefined
+  // Set by agent_end, consumed and cleared by agent_settled. agent_end alone cannot
+  // tell a genuine "done, waiting for you" end from one an automatic retry, a /goal
+  // continuation, or a compaction is about to follow with no user involved: each of
+  // those fires its own agent_end too, with nobody ever actually waiting until the
+  // last one. agent_settled ("no automatic retry, compaction, or queued continuation
+  // will run") is that signal, but only firing there would delay the common, single-
+  // turn case behind a peer extension's agent_end handler blocking on a UI dialog
+  // (plan mode); capturing state at agent_end and only acting on it once agent_settled
+  // confirms this was the final step keeps both properties.
+  let pending = false
+  // Whether the run's own last assistant message ended with stopReason: 'aborted', i.e.
+  // the user pressed Esc: they are at the keyboard by definition, whatever isAway's
+  // timer-based guess would otherwise say.
+  let lastAborted = false
 
   pi.on('session_start', async (_event, _ctx) => {
     channel = resolveNotifChannel(readPreferredNotifChannel(os.homedir()))
     lastInputAt = undefined
+    pending = false
   })
 
-  pi.on('input', async () => {
+  pi.on('input', async (event) => {
+    // A goal continuation or a subagent's own prompt is not the user; only their own
+    // input is evidence they are at the keyboard (mirroring goal.ts's own check).
+    if (event.source === 'extension') return
     lastInputAt = Date.now()
   })
 
-  // Fires on agent_end rather than agent_settled deliberately: agent_settled is only
-  // emitted after every agent_end handler returns, and a peer extension (plan mode)
-  // blocks its agent_end handler on a UI dialog, which would starve this notification
-  // exactly when the user has stepped away. agent_end can fire slightly early before a
-  // rare automatic retry or compaction, which is a better failure than never notifying.
-  pi.on('agent_end', async () => {
-    if (channel === 'off') return
-    // Piped or headless stdout (pi -p, CI) must not receive raw escape bytes.
-    if (!process.stdout.isTTY) return
+  pi.on('agent_end', async (event) => {
+    const last = [...event.messages].reverse().find((message) => message.role === 'assistant')
+    lastAborted = last?.stopReason === 'aborted'
+    pending = channel !== 'off' && process.stdout.isTTY === true
+  })
+
+  pi.on('agent_settled', async () => {
+    if (!pending) return
+    pending = false
+    if (lastAborted) return
     if (!isAway(lastInputAt, Date.now(), AWAY_AFTER_MS)) return
     if (channel === 'bell') {
       process.stdout.write('\x07')

package/extensions/plan-mode/index.ts

@@ -426,7 +426,8 @@ After completing a step, include a [DONE:n] tag in your response.`,
 
   // Restore state on session start/resume
   pi.on('session_start', async (_event, ctx) => {
-    // One extension instance serves every session, so clear prior state first: a fresh
+    // pi's CLI builds a fresh extension instance per session replacement; RPC mode can reuse
+    // one across sessions, so clear prior state first there too: a fresh
     // session (/new, no plan entry) must not inherit the last session's plan or execution.
     planModeEnabled = false
     executionMode = false

package/extensions/session-title.ts

@@ -8,10 +8,12 @@
  * (pi changelog); a separate ctx.ui.setTitle call would only duplicate that, so there is none.
  *
  * It runs in every mode, not just the TUI: naming a session is cheap and harmless, and a
- * headless run that persists its session still benefits from a readable name later. Titling
- * is best-effort throughout: a session that already has a name, a run with no user text (a
- * slash-command-only turn), a headless run with no model, or any provider error leaves the
- * session untitled and never throws.
+ * headless run that persists its session still benefits from a readable name later. The one
+ * exception is a subagent child (PI_CODE_SUBAGENT=1): its session is never browsed by name,
+ * so the call is skipped outright rather than spending a model round trip nobody sees.
+ * Titling is best-effort throughout: a session that already has a name, a run with no user
+ * text (a slash-command-only turn), a headless run with no model, or any provider error
+ * leaves the session untitled and never throws.
  *
  * Cost: one model call per session at most. The guard is claimed before the completion so
  * repeated settles cannot each fire a call, and a failed attempt is not retried until a
@@ -98,6 +100,10 @@ export default function sessionTitleExtension(pi: ExtensionAPI) {
     // small/fast-model request that generates the session title." setSessionName is pi's
     // only title sink, so skipping the call here skips both effects at once.
     if (process.env.CLAUDE_CODE_DISABLE_TERMINAL_TITLE === '1') return
+    // A subagent child's session (--no-session, or its own --session-dir once it persists
+    // one for a resumable follow-up) is never browsed by name in a session picker: the
+    // model call would only add latency and cost to how soon the child can exit.
+    if (process.env.PI_CODE_SUBAGENT === '1') return
     if (titled) return
     // Never clobber an existing name: a user-chosen or resumed name wins.
     if (pi.getSessionName?.()) return

package/extensions/subagent/background.ts

@@ -29,6 +29,9 @@ export interface BackgroundRun {
   partial?: boolean
   /** Temp dir holding a prompt file rebuilt for a resume; removed with the run. */
   rebuiltPromptDir?: string
+  /** Temp dir the child persists its session in, apart from the project's session dir;
+   * removed with the run. */
+  sessionDir?: string
   /** Set while running so the run can be cancelled; cleared on completion. */
   kill?: () => void
   /** True until the child process actually closes: a cancelled child that ignores
@@ -90,7 +93,7 @@ export function activeBackgroundRuns(): number {
 /** Test seam: the registry is module state, so tests reset it between cases to
  * stay order-independent. */
 export function resetBackgroundRuns(): void {
-  for (const run of runs.values()) removeRebuiltPrompt(run)
+  for (const run of runs.values()) removeRunFiles(run)
   runs.clear()
   state.finishSequence = 0
 }
@@ -99,7 +102,7 @@ function evictFinishedRuns(): void {
   const finished = [...runs.values()].filter((run) => !run.live && run.state !== 'running')
   finished.sort((a, b) => (a.finishedAt ?? 0) - (b.finishedAt ?? 0))
   for (const stale of finished.slice(0, Math.max(0, finished.length - MAX_FINISHED_RUNS))) {
-    removeRebuiltPrompt(stale)
+    removeRunFiles(stale)
     runs.delete(stale.id)
   }
 }
@@ -178,7 +181,7 @@ export function cancelAllBackgroundRuns(): number {
     if (cancelBackgroundRun(id) === 'cancelled') count++
   }
   // Called at quit: nothing in this registry is resumable once pi exits.
-  for (const run of runs.values()) removeRebuiltPrompt(run)
+  for (const run of runs.values()) removeRunFiles(run)
   return count
 }
 
@@ -259,12 +262,14 @@ function withRebuiltPrompt(spawnSpec: BackgroundSpawn, agent: string): { args: s
   }
 }
 
-/** The rebuilt prompt lives as long as its run can be resumed, so it goes when the run
- * leaves the registry: eviction, quit, or the test reset. */
-function removeRebuiltPrompt(run: BackgroundRun): void {
-  if (!run.rebuiltPromptDir) return
-  fs.rmSync(run.rebuiltPromptDir, { recursive: true, force: true })
+/** A run's temp files (the rebuilt prompt, its session) live as long as the run can be
+ * resumed, so they go when it leaves the registry: eviction, quit, or the test reset. */
+function removeRunFiles(run: BackgroundRun): void {
+  for (const dir of [run.rebuiltPromptDir, run.sessionDir]) {
+    if (dir) fs.rmSync(dir, { recursive: true, force: true })
+  }
   run.rebuiltPromptDir = undefined
+  run.sessionDir = undefined
 }
 
 export function startBackgroundRun(agent: string, task: string, invocation: BackgroundSpawn, onComplete: (run: BackgroundRun) => void, presetId?: string): string | null {
@@ -276,12 +281,15 @@ export function startBackgroundRun(agent: string, task: string, invocation: Back
   // id the run will carry.
   const id = presetId ?? `bg-${randomUUID().slice(0, 8)}`
   // A stable session id per run: the child persists its session, so a follow-up can
-  // resume it instead of starting cold.
+  // resume it instead of starting cold. It persists into a directory of its own: in the
+  // project's session dir it would be the newest session there, which `pi -c` and /resume
+  // offer as the user's previous one. The same args serve the resume, so it finds the file.
   const sessionId = `pi-code-${id}-${randomUUID().slice(0, 8)}`
+  const sessionDir = fs.mkdtempSync(path.join(os.tmpdir(), 'pi-code-bg-session-'))
   const args = invocation.args.map((arg) => (arg === '--no-session' ? '--session-id' : arg))
-  const withSession = args.includes('--session-id') ? args.flatMap((arg) => (arg === '--session-id' ? ['--session-id', sessionId] : [arg])) : args
+  const withSession = args.includes('--session-id') ? args.flatMap((arg) => (arg === '--session-id' ? ['--session-id', sessionId, '--session-dir', sessionDir] : [arg])) : args
   const spawnSpec: BackgroundSpawn = { ...invocation, args: withSession }
-  const run: BackgroundRun = { id, agent, task, state: 'running', turns: 0, sessionId, spawn: spawnSpec }
+  const run: BackgroundRun = { id, agent, task, state: 'running', turns: 0, sessionId, sessionDir, spawn: spawnSpec }
   runs.set(id, run)
   driveRun(run, spawnSpec, onComplete)
   return id

package/extensions/thinking.ts

@@ -56,7 +56,8 @@ export default function thinkingExtension(pi: ExtensionAPI) {
   })
 
   pi.on('session_start', () => {
-    // One extension instance serves every session. A mid-turn /new fires session_start on
+    // pi's CLI builds a fresh extension instance per session replacement; only RPC mode can
+    // reuse one across sessions. A mid-turn /new there fires session_start on
     // the same instance while an escalation is still pending (its agent_settled never came),
     // and that stale restore must be dropped rather than fired into the next session, whose
     // level the new session owns. Drop only: do NOT setThinkingLevel here.

package/extensions/web.ts

@@ -178,11 +178,28 @@ async function resolveAndPin(url: URL): Promise<LookupFunction> {
 
 const MAX_REDIRECTS = 5
 
-/** Read a response body up to MAX_RAW_CHARS, then stop the download. Bounds memory and parsing cost. */
+/** The charset a content-type header declares, or 'utf-8' when it names none. */
+function declaredCharset(contentType: string): string {
+  const match = /charset=(?:"([^"]*)"|'([^']*)'|([^;\s]*))/i.exec(contentType)
+  return (match?.[1] ?? match?.[2] ?? match?.[3] ?? '').trim() || 'utf-8'
+}
+
+/** A decoder for `contentType`'s declared charset, or the platform default (UTF-8) for a
+ * label TextDecoder does not recognize: a bad or made-up charset must not fail the fetch. */
+function decoderFor(contentType: string): TextDecoder {
+  try {
+    return new TextDecoder(declaredCharset(contentType))
+  } catch {
+    return new TextDecoder()
+  }
+}
+
+/** Read a response body up to MAX_RAW_CHARS, decoded as the content-type header's charset
+ * (UTF-8 when it names none), then stop the download. Bounds memory and parsing cost. */
 async function readCapped(response: Response): Promise<string> {
+  const decoder = decoderFor(response.headers.get('content-type') ?? '')
   const reader = response.body?.getReader()
-  if (!reader) return (await response.text()).slice(0, MAX_RAW_CHARS)
-  const decoder = new TextDecoder()
+  if (!reader) return decoder.decode(await response.arrayBuffer()).slice(0, MAX_RAW_CHARS)
   let text = ''
   while (text.length < MAX_RAW_CHARS) {
     const { done, value } = await reader.read()
@@ -234,13 +251,23 @@ function redirectTarget(response: Response, url: URL, rawUrl: string, crossHost:
   return { kind: 'next', next }
 }
 
-async function fetchText(rawUrl: string, crossHost: CrossHost, transport = httpFetch): Promise<FetchOutcome> {
+/** The per-hop timeout, combined with the caller's own signal (the tool call's, fired on
+ * Esc) when there is one: cancelling must not lose the ceiling that keeps a silently
+ * hanging host from holding the turn forever, but Esc must not have to wait for it either. */
+function hopSignal(signal: AbortSignal | undefined): AbortSignal {
+  const timeout = AbortSignal.timeout(FETCH_TIMEOUT_MS)
+  return signal ? AbortSignal.any([signal, timeout]) : timeout
+}
+
+async function fetchText(rawUrl: string, crossHost: CrossHost, signal?: AbortSignal, transport = httpFetch): Promise<FetchOutcome> {
   let url = new URL(rawUrl)
   for (let hop = 0; hop <= MAX_REDIRECTS; hop++) {
+    // Cancelled between hops (a redirect chain), not just mid-request.
+    signal?.throwIfAborted()
     // Resolve, validate and pin per hop: a redirect target gets the same guarantee.
     const lookup = await resolveAndPin(url)
     const response = await transport(url, {
-      signal: AbortSignal.timeout(FETCH_TIMEOUT_MS),
+      signal: hopSignal(signal),
       lookup,
       userAgent: USER_AGENT,
     })
@@ -317,9 +344,9 @@ export default function webExtension(pi: ExtensionAPI) {
       allowed_domains: Type.Optional(Type.Array(Type.String(), { description: 'Only include results from these domains' })),
       blocked_domains: Type.Optional(Type.Array(Type.String(), { description: 'Exclude results from these domains' })),
     }),
-    async execute(_id, params) {
+    async execute(_id, params, signal) {
       // Claude documents allowed/blocked domains as mutually exclusive; allowed wins.
-      const outcome = await fetchText(SEARCH_ENDPOINT + encodeURIComponent(params.query), 'follow')
+      const outcome = await fetchText(SEARCH_ENDPOINT + encodeURIComponent(params.query), 'follow', signal)
       const text = outcome.kind === 'body' ? outcome.text : ''
       const limit = Math.min(params.count ?? 5, 10)
       const results = filterByDomain(parseSearchResults(text, 10), params.allowed_domains, params.blocked_domains).slice(0, limit)
@@ -356,7 +383,7 @@ export default function webExtension(pi: ExtensionAPI) {
       if (cached && cached.expires > now) {
         body = cached.body
       } else {
-        const outcome = await fetchText(target, 'report')
+        const outcome = await fetchText(target, 'report', signal)
         // A cross-host redirect has no body to cache or summarize: the naming result is
         // the answer, and Claude fetches the target with a second call if it wants it.
         if (outcome.kind === 'redirect') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-code",
-  "version": "1.0.74",
+  "version": "1.0.76",
   "description": "Claude Code experience for the pi coding agent: reads your .claude config (rules, commands, skills, hooks, output styles, MCP servers, agents) and adds todo, checkpoints, memory, web, subagents, and goals",
   "keywords": [
     "pi",
@@ -57,9 +57,9 @@
     "typebox": "^1.3.6"
   },
   "peerDependencies": {
-    "@earendil-works/pi-ai": ">=0.79.1",
-    "@earendil-works/pi-coding-agent": ">=0.79.1",
-    "@earendil-works/pi-tui": ">=0.79.1"
+    "@earendil-works/pi-ai": ">=0.80.4",
+    "@earendil-works/pi-coding-agent": ">=0.80.4",
+    "@earendil-works/pi-tui": ">=0.80.4"
   },
   "devDependencies": {
     "@biomejs/biome": "^2.5.4",