pi-code 1.0.72 → 1.0.74

package/extensions/claude-rules.ts

@@ -27,7 +27,7 @@ import { publishInstructionLoad } from './internal/instruction-events.js'
 import { readManagedSettings } from './internal/managed-settings.js'
 import { type CompiledGlob, compileGlobs, matchesCompiledGlobs } from './internal/path-rules.js'
 import { isProjectApproved } from './internal/project-approval.js'
-import { findNearestDir } from './internal/project-root.js'
+import { findNearestDir, sameLocation } from './internal/project-root.js'
 import { stripBlockComments } from './internal/strip-comments.js'
 import { fileToolTarget } from './internal/tool-target.js'
 
@@ -303,7 +303,10 @@ export default function claudeRulesExtension(pi: ExtensionAPI) {
     globalRules = readRules(globalRulesDir, isExcluded)
     // Nearest at-or-above cwd, so a subdirectory session still reads the rules the
     // approval walk gated on.
-    const projectRulesDir = approved ? findNearestDir(ctx.cwd, path.join('.claude', 'rules')) : null
+    // Not the user's own rules dir: from $HOME (or under a dotfiles repo rooted there)
+    // the nearest one is ~/.claude/rules, which the global load above already read.
+    const nearestRulesDir = approved ? findNearestDir(ctx.cwd, path.join('.claude', 'rules')) : null
+    const projectRulesDir = nearestRulesDir !== null && sameLocation(nearestRulesDir, globalRulesDir) ? null : nearestRulesDir
     projectRules = projectRulesDir ? readRules(projectRulesDir, isExcluded) : EMPTY_RULES
 
     // Global globs are relative to cwd; project globs to the project root (the dir

package/extensions/commands.ts

@@ -55,7 +55,7 @@ import { matchesPathRules } from './internal/path-rules.js'
 import { isPlanModeState, PLAN_MODE_CHANNEL } from './internal/plan-mode-state.js'
 import { type InstalledPlugin, installedPlugins, pluginComponentPath } from './internal/plugins.js'
 import { isProjectApproved } from './internal/project-approval.js'
-import { ancestorDirs, repoRoot } from './internal/project-root.js'
+import { ancestorDirs, checkoutRoot } from './internal/project-root.js'
 import { agentNamesIn, matchesAgentRules, matchesDomainRules, matchesSkillRules } from './internal/scope-rules.js'
 import { claudeSettingsChain } from './internal/settings-chain.js'
 import { fileToolTarget } from './internal/tool-target.js'
@@ -206,7 +206,7 @@ function commandVars(ctx: { cwd: string }, filePath: string, plugin?: CommandPlu
     // low|medium|high|xhigh|max, and an unset one stays literal in the body.
     CLAUDE_EFFORT: claudeEffortLevel(varCtx.thinkingLevel),
     CLAUDE_SKILL_DIR: path.dirname(filePath),
-    CLAUDE_PROJECT_DIR: repoRoot(ctx.cwd) ?? ctx.cwd,
+    CLAUDE_PROJECT_DIR: checkoutRoot(ctx.cwd),
     CLAUDE_PLUGIN_ROOT: plugin?.root,
     CLAUDE_PLUGIN_DATA: plugin?.dataDir,
   }
@@ -228,7 +228,7 @@ interface SpanRunner {
  * from running.
  */
 export async function expandCommand(runner: SpanRunner, parsed: ParsedCommand, args: string, ctx: { cwd: string }, filePath: string, plugin?: CommandPlugin, options?: { allowShell?: boolean }): Promise<string> {
-  const projectRoot = repoRoot(ctx.cwd) ?? ctx.cwd
+  const projectRoot = checkoutRoot(ctx.cwd)
   const vars = commandVars(ctx, filePath, plugin)
   const { text: withArgs, consumed } = substituteArgsDetailed(parsed.body, args, parsed.argumentNames ?? [])
   // `${user_config.KEY}` is a plugin-command variable only; leave it literal in an
@@ -415,7 +415,7 @@ export default function commandsExtension(pi: ExtensionAPI) {
     // pi's read/edit/write accept `file_path` as an alias for `path`; the shared reader
     // handles both, and the paired guard in hooks/matcher.ts reads both too.
     const filePath = fileToolTarget(event) ?? ''
-    const anchors = { cwd: ctx.cwd, projectRoot: repoRoot(ctx.cwd) ?? ctx.cwd, home: os.homedir() }
+    const anchors = { cwd: ctx.cwd, projectRoot: checkoutRoot(ctx.cwd), home: os.homedir() }
     if (filePath && matchesPathRules(filePath, rules, anchors)) return
     return {
       block: true,

package/extensions/context-imports.ts

@@ -76,7 +76,7 @@ import { managedSettingsPath, readManagedSettings } from './internal/managed-set
 import { capForContext, sliceBytes } from './internal/output-guard.js'
 import { globToRegExpSource } from './internal/path-rules.js'
 import { isGatedFileApproved, isProjectApproved, isProjectApprovedSilently } from './internal/project-approval.js'
-import { ancestorFiles, findNearestFile, repoRoot } from './internal/project-root.js'
+import { ancestorFiles, checkoutRoot, findNearestFile, repoRoot, sameLocation } from './internal/project-root.js'
 import { claudeSettingsChain, readSettingsChain } from './internal/settings-chain.js'
 import { statToken } from './internal/stat-token.js'
 import { type Fence, fenceMarker, stepFence, stripBlockComments } from './internal/strip-comments.js'
@@ -293,7 +293,10 @@ export function rootsForImporter(importer: string, home: string, cwd: string, ex
   // granting the importer's own directory. pi also loads home-level context
   // files (~/AGENTS.md) that sit outside the config roots; their directory is
   // $HOME, and allowing it would let @.ssh/... read into every session's prompt.
-  return realRoots([cwd, repoRoot(cwd) ?? cwd])
+  // The checkout the session runs in, and the main checkout too: in a worktree they are
+  // siblings, and the checkout's own files (docs/, a sibling CLAUDE.md) are as much the
+  // project as the shared root a CLAUDE.local.md may live at.
+  return realRoots([cwd, checkoutRoot(cwd), repoRoot(cwd) ?? cwd])
 }
 
 /** Claude's env gate for loading memory files from --add-dir directories. */
@@ -972,7 +975,11 @@ export default function contextImportsExtension(pi: ExtensionAPI) {
     // ./.claude/CLAUDE.md (nearest at or above cwd) is repo-controlled too, so both
     // ride the one approval decision.
     const candidates = ancestorFiles(ctx.cwd, 'CLAUDE.local.md')
-    const dotClaudeMd = findNearestFile(ctx.cwd, path.join('.claude', 'CLAUDE.md'))
+    const nearestDotClaudeMd = findNearestFile(ctx.cwd, path.join('.claude', 'CLAUDE.md'))
+    // From $HOME (or under a dotfiles repo rooted there) the nearest one is the user's own
+    // ~/.claude/CLAUDE.md, already loaded above as User memory: not a project file, so no
+    // second block and nothing to approve.
+    const dotClaudeMd = nearestDotClaudeMd !== null && sameLocation(nearestDotClaudeMd, userClaudeMd) ? null : nearestDotClaudeMd
     if ((candidates.length === 0 && dotClaudeMd === null) || !(await isProjectApproved(ctx))) return memory
 
     for (const candidate of candidates) {
@@ -1029,7 +1036,7 @@ export default function contextImportsExtension(pi: ExtensionAPI) {
 
     if (envCache?.cwd !== cwd) {
       const managedNow = readManagedSettings()
-      envCache = { cwd, managed: managedNow, excludeGlobs: readClaudeMdExcludes(claudeMdExcludeFiles(cwd, home, projectApproved), managedNow), projectRoot: repoRoot(cwd) ?? cwd }
+      envCache = { cwd, managed: managedNow, excludeGlobs: readClaudeMdExcludes(claudeMdExcludeFiles(cwd, home, projectApproved), managedNow), projectRoot: checkoutRoot(cwd) }
     }
     const { managed, excludeGlobs, projectRoot } = envCache
     // CLAUDE_CODE_DISABLE_CLAUDE_MDS also covers pi's own auto-discovered native context
@@ -1136,7 +1143,7 @@ export default function contextImportsExtension(pi: ExtensionAPI) {
     if (touchedDir === undefined) return
 
     const home = os.homedir()
-    const projectRoot = repoRoot(ctx.cwd) ?? ctx.cwd
+    const projectRoot = checkoutRoot(ctx.cwd)
     const excludeGlobs = readClaudeMdExcludes(claudeMdExcludeFiles(ctx.cwd, home, projectApproved), readManagedSettings())
     const load: NestedLoadContext = { home, cwd: ctx.cwd, realCwd, projectRoot, excludeGlobs, touched, launchLoaded: launchLoadedPaths }
     const { bodies, events } = nestedContextAttachments(touchedDir, load, nestedLoaded, gatedFilesApproved)

package/extensions/hooks/index.ts

@@ -104,7 +104,7 @@ import { resolveModelOverride } from '../internal/model-lookup.js'
 import { isPlanModeState, PLAN_MODE_CHANNEL } from '../internal/plan-mode-state.js'
 import { installedPlugins, managedForceEnabled } from '../internal/plugins.js'
 import { approvalRecheck, isProjectApproved } from '../internal/project-approval.js'
-import { repoRoot } from '../internal/project-root.js'
+import { checkoutRoot } from '../internal/project-root.js'
 import { watchSettingsFiles } from '../internal/settings-watch.js'
 import { isSkillHooksEvent, SKILL_HOOKS_CHANNEL } from '../internal/skill-hooks.js'
 import { isSubagentPhaseEvent, SUBAGENT_CHANNEL } from '../internal/subagent-events.js'
@@ -457,7 +457,7 @@ export default function hooksExtension(pi: ExtensionAPI) {
     // Claude's CLAUDE_PROJECT_DIR is the project root, not the session cwd; a hook
     // referencing $CLAUDE_PROJECT_DIR/.claude/hooks/helper.sh must resolve from a
     // subdirectory session too.
-    projectDir = repoRoot(ctx.cwd) ?? ctx.cwd
+    projectDir = checkoutRoot(ctx.cwd)
     resolveConfig(ctx.cwd, trusted)
     // Claude picks up direct settings edits mid-session via a file watcher. The reload
     // closes over the cwd value, never ctx: the poll has no awaiter, and every getter of

package/extensions/init.ts

@@ -23,7 +23,7 @@ export { CONTEXT_FILE_CANDIDATES }
 
 import type { ExtensionAPI } from '@earendil-works/pi-coding-agent'
 
-import { repoRoot } from './internal/project-root.js'
+import { checkoutRoot } from './internal/project-root.js'
 
 function statOf(target: string): fs.Stats | undefined {
   try {
@@ -73,7 +73,7 @@ export default function initExtension(pi: ExtensionAPI) {
   pi.registerCommand('init', {
     description: 'Analyze the codebase and create or improve the project context file (AGENTS.md)',
     handler: async (_args, ctx) => {
-      const root = repoRoot(ctx.cwd) ?? ctx.cwd
+      const root = checkoutRoot(ctx.cwd)
       const existing = findExistingContextFile(root)
       const cursorRules = statOf(path.join(root, '.cursor', 'rules'))?.isDirectory() === true || statOf(path.join(root, '.cursorrules'))?.isFile() === true
       const copilotRules = statOf(path.join(root, '.github', 'copilot-instructions.md'))?.isFile() === true

package/extensions/internal/mcp-oauth.ts

@@ -188,6 +188,19 @@ export class FileOAuthProvider implements OAuthClientProvider {
     return this.data.tokens !== undefined
   }
 
+  /** Called by the SDK when the server rejects what is stored: `invalid_grant` for an expired
+   * or revoked refresh token, `invalid_client` for a forgotten registration. It restarts
+   * authorization once this returns, which reaches the login prompt. Without it the
+   * rejection propagated and the dead credentials stayed on disk, so the server failed the
+   * same way on every connect. Discovery state is not stored, and the redirect port is kept
+   * so a re-login can still bind the port the client was registered with. */
+  invalidateCredentials(scope: 'all' | 'client' | 'tokens' | 'verifier' | 'discovery'): void {
+    if (scope === 'all' || scope === 'client') delete this.data.client
+    if (scope === 'all' || scope === 'tokens') delete this.data.tokens
+    if (scope === 'all' || scope === 'verifier') delete this.data.verifier
+    this.persist()
+  }
+
   /** The CSRF token the SDK adds to the authorization URL as `state`; waitForAuthCode
    * verifies the redirect echoes exactly this value. */
   state(): string {

package/extensions/internal/project-root.ts

@@ -29,6 +29,29 @@ export function repoRoot(from: string): string | undefined {
   return mainCheckout(root)
 }
 
+/** The root of the checkout a session runs in, or `from` itself outside one. Claude's
+ * `CLAUDE_PROJECT_DIR` is "the project root where the session started", and `/`-rooted path
+ * rules anchor there. In a worktree that is the worktree, not the main checkout repoRoot
+ * resolves to: right for shared state (settings.local.json, auto memory), wrong here, where
+ * a hook script or a rule anchor must land in the tree the session is editing. */
+export function checkoutRoot(from: string): string {
+  return gitRoot(from) ?? from
+}
+
+/** Whether two paths are the same file or directory once symlinks resolve. A session at
+ * `$HOME` finds the user's own `~/.claude/{rules,agents,CLAUDE.md}` as its "project" ones;
+ * comparing by realpath also catches a stow-style symlinked `~/.claude`. */
+export function sameLocation(a: string, b: string): boolean {
+  const resolve = (target: string): string => {
+    try {
+      return fs.realpathSync(target)
+    } catch {
+      return path.resolve(target)
+    }
+  }
+  return resolve(a) === resolve(b)
+}
+
 /** The git checkout at or above `from`, or undefined outside one.
  *
  * Narrower than repoRoot on purpose: repoRoot resolves a worktree to its main checkout,

package/extensions/mcp/index.ts

@@ -42,14 +42,14 @@ import { setMcpToolCaller } from '../internal/mcp-call.js'
 import { capForContext } from '../internal/output-guard.js'
 import { installedPlugins } from '../internal/plugins.js'
 import { isProjectApproved, isProjectApprovedSilently } from '../internal/project-approval.js'
-import { repoRoot } from '../internal/project-root.js'
+import { checkoutRoot } from '../internal/project-root.js'
 import { claudeSettingsChain } from '../internal/settings-chain.js'
 import { errorMessage } from '../internal/values.js'
 import { disabledServerNames, loadConfigFrom, loadPluginServers, loadUserScope, localScopeServerNames, projectConfigPaths, type ServerConfig, warnOnTypelessUrl } from './config.js'
 import { collectServerResourceEntries, listAllPrompts, listAllTools, type McpToolInfo, resourceServerFilter } from './listing.js'
 import { formatPromptCommandName, formatToolName, type McpContentBlock, type McpPromptInfo, mapContent, mapPromptArguments, normalizeSchema, promptMessageContent } from './mapping.js'
 import { applyServerPolicy, loadManagedMcpServers, type McpPolicy, mcpAllowDeny, projectServerPolicy, splitByPolicy } from './policy.js'
-import { type AuthUi, callRequestOptions, callTimeoutMs, connect, connectTimeoutMs, connectWithRetries, isUnauthorized, mcpConnectTimeoutMs, type ServerCallTuning, type SessionDirs, serverCallTuning, withTimeout } from './transport.js'
+import { type AuthUi, callRequestOptions, callTimeoutMs, connect, connectTimeoutMs, connectWithRetries, isConnectionLost, isUnauthorized, mcpConnectTimeoutMs, type ServerCallTuning, type SessionDirs, serverCallTuning, withTimeout } from './transport.js'
 
 export { managedSettingsPath, setManagedSettingsPath } from '../internal/managed-settings.js'
 // Re-exports for consumers: the module split keeps the extension's public surface
@@ -189,6 +189,19 @@ export default async function mcpExtension(pi: ExtensionAPI) {
     return count
   }
 
+  /** A client that is gone: flip the status and free the name so a reconnect can take it.
+   * Claude reconnects a dropped remote server with exponential backoff; stdio servers are
+   * local processes and are not reconnected. Shutdown closes clients while they are still
+   * in the map, so the flag guards against scheduling a reconnect for a deliberate
+   * teardown. Called by the transport's onclose and by a call that found the connection
+   * dead (isConnectionLost), so several calls failing together schedule one reconnect. */
+  function dropClient(name: string, client: Client, config: ServerConfig): void {
+    if (clients.get(name) !== client) return
+    clients.delete(name)
+    status.set(name, { state: 'disconnected', tools: 0 })
+    if (!shuttingDown && !serverCallTuning(config).stdio) void reconnectWithBackoff(name, config)
+  }
+
   /** Claude's mid-session reconnect for a dropped remote server: five attempts with
    * a delay doubling from one second. connectServers redoes the full bring-up
    * (tools, prompts, subscriptions, a fresh onclose) and its duplicate guard skips
@@ -205,17 +218,27 @@ export default async function mcpExtension(pi: ExtensionAPI) {
     }
   }
 
+  // One auth recovery per server at a time, shared by every call that met the same 401.
+  const authReconnects = new Map<string, Promise<void>>()
+
   /** Claude's 401/403 tool-call recovery: drop the client and reconnect once, so the
    * headersHelper re-runs (fresh credential) or the OAuth tokens refresh, then the
    * caller retries the call once. The map delete precedes the close so the onclose
-   * guard does not also schedule a backoff reconnect. */
-  async function reconnectForAuth(name: string, config: ServerConfig): Promise<void> {
-    const old = clients.get(name)
-    if (old) {
+   * guard does not also schedule a backoff reconnect. Parallel calls that all met the
+   * expired credential share the one reconnect: `failed` is the client a call was made
+   * on, and a map holding another one means a sibling already replaced it, so closing
+   * "the client in the map" would tear down the fresh connection under that sibling. */
+  function reconnectForAuth(name: string, config: ServerConfig, failed: Client | undefined): Promise<void> {
+    const inFlight = authReconnects.get(name)
+    if (inFlight !== undefined) return inFlight
+    if (clients.get(name) !== failed) return Promise.resolve()
+    const recovery = (async () => {
       clients.delete(name)
-      await withTimeout(old.close(), 3000, 'close').catch(() => {})
-    }
-    await connectServers({ [name]: config }, sessionAuthUi, true)
+      if (failed) await withTimeout(failed.close(), 3000, 'close').catch(() => {})
+      await connectServers({ [name]: config }, sessionAuthUi, true)
+    })().finally(() => authReconnects.delete(name))
+    authReconnects.set(name, recovery)
+    return recovery
   }
 
   /** A tool call with the auth retry: on a 401/403 rejection, reconnect once and
@@ -223,16 +246,26 @@ export default async function mcpExtension(pi: ExtensionAPI) {
   async function callToolWithAuthRetry(name: string, config: ServerConfig, args: { name: string; arguments: Record<string, unknown> }, label: string): Promise<Awaited<ReturnType<Client['callTool']>>> {
     const tuning = serverCallTuning(config)
     const wall = tuning.serverTimeoutMs ?? callTimeoutMs()
+    let used: Client | undefined
     const callOnce = async () => {
       const current = clients.get(name)
       if (!current) throw new Error(`MCP server "${name}" is not connected`)
-      return await withTimeout(current.callTool(args, undefined, callRequestOptions(wall, tuning)), wall, label)
+      used = current
+      try {
+        return await withTimeout(current.callTool(args, undefined, callRequestOptions(wall, tuning)), wall, label)
+      } catch (error) {
+        if (isConnectionLost(error)) {
+          dropClient(name, current, config)
+          void withTimeout(current.close(), 3000, 'close').catch(() => {})
+        }
+        throw error
+      }
     }
     try {
       return await callOnce()
     } catch (error) {
       if (!isUnauthorized(error)) throw error
-      await reconnectForAuth(name, config)
+      await reconnectForAuth(name, config, used)
       return await callOnce()
     }
   }
@@ -463,16 +496,7 @@ export default async function mcpExtension(pi: ExtensionAPI) {
           // A server that dies mid-session would otherwise stay "connected" in /mcp
           // while every call fails with the SDK's bare "Not connected"; flip the
           // status and free the name so a later session start can reconnect it.
-          client.onclose = () => {
-            if (clients.get(name) !== client) return
-            clients.delete(name)
-            status.set(name, { state: 'disconnected', tools: 0 })
-            // Claude reconnects a dropped remote server with exponential backoff;
-            // stdio servers are local processes and are not reconnected. Shutdown
-            // closes clients while they are still in the map, so the flag guards
-            // against scheduling a reconnect for a deliberate teardown.
-            if (!shuttingDown && !serverCallTuning(config).stdio) void reconnectWithBackoff(name, config)
-          }
+          client.onclose = () => dropClient(name, client, config)
         } catch (error) {
           status.set(name, { state: `failed: ${errorMessage(error)}`, tools: 0 })
           // Connected but failed after (tool listing hung or errored): left in the
@@ -539,7 +563,7 @@ export default async function mcpExtension(pi: ExtensionAPI) {
     // Plugin servers merge under the user scope (plugins are user-installed);
     // the user's own entry wins a name clash with a plugin's. A server toggled off
     // in ~/.claude.json's per-project disabledMcpServers list never connects.
-    const pluginServers = loadPluginServers(installedPlugins(os.homedir()), repoRoot(ctx.cwd) ?? ctx.cwd)
+    const pluginServers = loadPluginServers(installedPlugins(os.homedir()), checkoutRoot(ctx.cwd))
     const disabled = disabledServerNames(os.homedir(), ctx.cwd)
     const merged = Object.fromEntries(Object.entries({ ...pluginServers, ...loadUserScope(os.homedir(), ctx.cwd) }).filter(([name]) => !disabled.has(name)))
     const scoped = applyServerPolicy(merged, policy)
@@ -622,7 +646,7 @@ export default async function mcpExtension(pi: ExtensionAPI) {
     projectConnected = false
     // Claude answers roots/list with the session's launch directory and exports the
     // project root as CLAUDE_PROJECT_DIR to stdio servers; both derive from ctx.cwd.
-    sessionDirs = { projectDir: repoRoot(ctx.cwd) ?? ctx.cwd, launchDir: ctx.cwd, sessionId: ctx.sessionManager?.getSessionId?.() }
+    sessionDirs = { projectDir: checkoutRoot(ctx.cwd), launchDir: ctx.cwd, sessionId: ctx.sessionManager?.getSessionId?.() }
     const authUi = authUiFor(ctx)
     sessionAuthUi = authUi
     // The allow/deny lists filter every scope, including a managed-mcp.json set. They

package/extensions/mcp/mapping.ts

@@ -4,11 +4,25 @@
  * blocks mapped into pi's output budget.
  */
 
+import { createHash } from 'node:crypto'
+
 import { DEFAULT_MAX_BYTES } from '@earendil-works/pi-coding-agent'
 import { capForContext } from '../internal/output-guard.js'
 
+/** Providers take a tool name only as `^[a-zA-Z0-9_-]{1,64}$` (64 is OpenAI's cap, the
+ * tighter of the two) and reject the whole request otherwise, so one bad name failed every
+ * turn of the session. */
+const MAX_TOOL_NAME = 64
+
+/** The pi tool name for a server's tool: `server_tool` with every character a provider
+ * rejects (the MCP spec allows dots; a server name is whatever the user typed) as an
+ * underscore. A name over the limit is cut and ends in a hash of the whole, so two long
+ * tools of one server stay apart and a tool keeps its name from one session to the next. */
 export function formatToolName(server: string, tool: string): string {
-  return `${server}_${tool}`.replaceAll('-', '_')
+  const name = `${server}_${tool}`.replace(/\W/g, '_')
+  if (name.length <= MAX_TOOL_NAME) return name
+  const digest = createHash('sha256').update(name).digest('hex').slice(0, 8)
+  return `${name.slice(0, MAX_TOOL_NAME - digest.length - 1)}_${digest}`
 }
 
 /** Claude exposes server prompts as /mcp__<server>__<prompt> slash commands: any

package/extensions/mcp/transport.ts

@@ -339,6 +339,21 @@ export function isTransientConnectError(error: unknown): boolean {
   return /ECONNREFUSED|ECONNRESET|ETIMEDOUT|timed out after/.test(String(error))
 }
 
+/** Whether a failed call means the server is gone, not that the call was wrong: a refused,
+ * reset or unreachable connection, the 404 a restarted stateful server answers for a
+ * session it forgot (the spec has the client start a new one), or the SDK's own
+ * closed-connection errors. The SDK fires `Client.onclose` only from `close()`, never when
+ * an HTTP or SSE server disappears, so a call is the one place a dead server shows.
+ * Narrower than isTransientConnectError on purpose: a tool timing out, or a tool's own
+ * 5xx, says nothing about the connection and must not drop a healthy server. The closed
+ * connection is matched by the SDK's message, not its -32000 code, which servers also use
+ * for errors of their own. */
+export function isConnectionLost(error: unknown): boolean {
+  const code = typeof error === 'object' && error !== null ? (error as { code?: unknown }).code : undefined
+  if (code === 404 || errorCodes(error).some((one) => TRANSIENT_CODES.has(one))) return true
+  return /\(HTTP 404\)|^Not connected$|^MCP error -32000: Connection closed$/.test(error instanceof Error ? error.message : '')
+}
+
 const delay = (ms: number): Promise<void> => new Promise((resolve) => setTimeout(resolve, ms))
 
 /** Connect with Claude's first-connection retry: an HTTP or SSE server's transient

package/extensions/status-line.ts

@@ -36,7 +36,7 @@ import { claudeEffortLevel } from './internal/effort.js'
 import { readManagedSettings } from './internal/managed-settings.js'
 import { isPlanModeState, PLAN_MODE_CHANNEL } from './internal/plan-mode-state.js'
 import { approvalRecheck, isProjectApprovedSilently } from './internal/project-approval.js'
-import { gitRoot, repoRoot } from './internal/project-root.js'
+import { checkoutRoot, gitRoot } from './internal/project-root.js'
 import { readSettingsChain } from './internal/settings-chain.js'
 import { watchSettingsFiles } from './internal/settings-watch.js'
 import { readActiveStyleName, settingsFiles } from './output-styles.js'
@@ -283,7 +283,7 @@ export default function statusLine(pi: ExtensionAPI) {
       // directory. added_dirs comes from the --add-dir flag pi-code registers.
       workspace: {
         current_dir: ctx.cwd,
-        project_dir: repoRoot(ctx.cwd) ?? ctx.cwd,
+        project_dir: checkoutRoot(ctx.cwd),
         git_worktree: isGitWorktree(ctx.cwd),
         added_dirs: addedDirs(),
       },

package/extensions/subagent/agents.ts

@@ -14,7 +14,7 @@ import { claudeConfigDir } from '../internal/config-dir.js'
 import { parseClaudeFrontmatter } from '../internal/frontmatter.js'
 import { findModel } from '../internal/model-lookup.js'
 import { installedPlugins, pluginComponentPath } from '../internal/plugins.js'
-import { ancestorDirs, findNearestDir } from '../internal/project-root.js'
+import { ancestorDirs, findNearestDir, sameLocation } from '../internal/project-root.js'
 import { errorMessage } from '../internal/values.js'
 
 /**
@@ -371,7 +371,12 @@ export function discoverAgents(cwd: string, scope: AgentScope): AgentDiscoveryRe
   // Claude scans every .claude/agents between cwd and the repository root, the
   // definition closest to cwd winning a name clash; root-first load order makes
   // the nearer directory's entry overwrite in the map below.
-  const projectClaudeDirs = ancestorDirs(cwd, path.join('.claude', 'agents')).reverse()
+  // The user's own directory is not a project one: at $HOME, or under a dotfiles repo
+  // rooted there, the walk reaches ~/.claude/agents and would gate the user's agents as
+  // repo-controlled.
+  const projectClaudeDirs = ancestorDirs(cwd, path.join('.claude', 'agents'))
+    .filter((dir) => !sameLocation(dir, claudeUserDir))
+    .reverse()
 
   // Plugins load after builtins and before the user's own dirs, so a user agent
   // wins a name clash with a plugin's, and ~/.pi/agent/agents wins over ~/.claude.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-code",
-  "version": "1.0.72",
+  "version": "1.0.74",
   "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",