pi-code 1.0.22 → 1.0.23

package/extensions/commands.ts

@@ -52,7 +52,7 @@ import { capForContext } from './internal/output-guard.js'
 import { matchesPathRules } from './internal/path-rules.js'
 import { type InstalledPlugin, installedPlugins } from './internal/plugins.js'
 import { isProjectApproved } from './internal/project-approval.js'
-import { findNearestDir, repoRoot } from './internal/project-root.js'
+import { ancestorDirs, repoRoot } from './internal/project-root.js'
 import { claudeSettingsChain } from './internal/settings-chain.js'
 import { createTurnOverride } from './internal/turn-override.js'
 
@@ -120,7 +120,10 @@ function isDirectory(target: string): boolean {
  * the approval walk) and is included only for approved projects. */
 export function commandDirs(cwd: string, home: string, trusted: boolean): string[] {
   const candidates = [path.join(claudeConfigDir(home), 'commands')]
-  if (trusted) candidates.push(findNearestDir(cwd, path.join('.claude', 'commands')) ?? path.join(cwd, '.claude', 'commands'))
+  // Claude scans every .claude/commands between cwd and the repository root, the
+  // nearest winning a name clash: collectCommands lets later directories win, so
+  // the project list goes root-first with the nearest last.
+  if (trusted) candidates.push(...ancestorDirs(cwd, path.join('.claude', 'commands')).reverse())
   const dirs: string[] = []
   for (const dir of candidates) {
     if (!dirs.includes(dir) && isDirectory(dir)) dirs.push(dir)

package/extensions/internal/project-root.ts

@@ -60,6 +60,24 @@ export function findNearestFile(cwd: string, relative: string): string | null {
   return findNearest(cwd, relative, false)
 }
 
+/** Every `relative` directory between cwd and the repository root, nearest first,
+ * matching Claude's "every .claude/<kind> between the working directory and the
+ * repository root" discovery where the entry closest to cwd wins a name clash. */
+export function ancestorDirs(cwd: string, relative: string): string[] {
+  const boundary = repoRoot(cwd) ?? cwd
+  const found: string[] = []
+  let currentDir = cwd
+  while (true) {
+    const candidate = path.join(currentDir, relative)
+    if (statOf(candidate)?.isDirectory()) found.push(candidate)
+    if (currentDir === boundary) break
+    const parentDir = path.dirname(currentDir)
+    if (parentDir === currentDir) break
+    currentDir = parentDir
+  }
+  return found
+}
+
 /** Every `relative` file between the repository root and cwd, ordered root first,
  * matching Claude's root-down ordering for hierarchy-loaded context. */
 export function ancestorFiles(cwd: string, relative: string): string[] {

package/extensions/output-styles.ts

@@ -27,7 +27,7 @@ import type { ExtensionAPI } from '@earendil-works/pi-coding-agent'
 import { claudeConfigDir } from './internal/config-dir.js'
 import { installedPlugins } from './internal/plugins.js'
 import { isProjectApproved } from './internal/project-approval.js'
-import { findNearestDir, findNearestFile } from './internal/project-root.js'
+import { ancestorDirs, findNearestDir, findNearestFile } from './internal/project-root.js'
 import { claudeSettingsChain } from './internal/settings-chain.js'
 
 export interface OutputStyle {
@@ -85,7 +85,10 @@ function isDirectory(target: string): boolean {
  */
 export function styleDirs(cwd: string, home: string, trusted: boolean): string[] {
   const dirs = [path.join(claudeConfigDir(home), 'output-styles')]
-  if (trusted) dirs.push(findNearestDir(cwd, path.join('.claude', 'output-styles')) ?? path.join(cwd, '.claude', 'output-styles'))
+  // Claude loads every .claude/output-styles between cwd and the repository root,
+  // using the one closest to cwd for a name clash: styleForName is first-match,
+  // so the nearest directory goes first.
+  if (trusted) dirs.push(...ancestorDirs(cwd, path.join('.claude', 'output-styles')))
   return dirs.filter((dir) => isDirectory(dir))
 }
 

package/extensions/skills.ts

@@ -29,7 +29,7 @@ import { parseCommandFile } from './internal/command-file.js'
 import { claudeConfigDir } from './internal/config-dir.js'
 import { installedPlugins } from './internal/plugins.js'
 import { isProjectApprovedSilently } from './internal/project-approval.js'
-import { findNearestDir } from './internal/project-root.js'
+import { ancestorDirs } from './internal/project-root.js'
 
 function isDirectory(target: string): boolean {
   try {
@@ -53,7 +53,10 @@ export function skillDirs(cwd: string, home: string, trusted: boolean): string[]
     const dirs = Array.isArray(declared) ? declared : [typeof declared === 'string' ? declared : 'skills']
     candidates.push(...dirs.map((dir) => path.resolve(plugin.root, String(dir))))
   }
-  if (trusted) candidates.push(findNearestDir(cwd, path.join('.claude', 'skills')) ?? path.join(cwd, '.claude', 'skills'))
+  // Claude loads skills from every .claude/skills between cwd and the repository
+  // root; the list goes nearest-first so findClaudeSkill's first match is the
+  // closest definition (pi's loader receives the same order).
+  if (trusted) candidates.push(...ancestorDirs(cwd, path.join('.claude', 'skills')))
   const dirs: string[] = []
   for (const dir of candidates) {
     if (!dirs.includes(dir) && isDirectory(dir)) dirs.push(dir)

package/extensions/subagent/agents.ts

@@ -13,7 +13,7 @@ import { getAgentDir, parseFrontmatter, stripFrontmatter } from '@earendil-works
 import { parseToolGrants } from '../internal/command-file.js'
 import { claudeConfigDir } from '../internal/config-dir.js'
 import { installedPlugins } from '../internal/plugins.js'
-import { findNearestDir } from '../internal/project-root.js'
+import { ancestorDirs, findNearestDir } from '../internal/project-root.js'
 
 /**
  * `tools:` may be a comma-separated string (the Claude Code format) or a YAML block
@@ -337,13 +337,16 @@ export function discoverAgents(cwd: string, scope: AgentScope): AgentDiscoveryRe
   const userDir = path.join(getAgentDir(), 'agents')
   const claudeUserDir = path.join(claudeConfigDir(os.homedir()), 'agents')
   const projectPiDir = findNearestDir(cwd, path.join('.pi', 'agents'))
-  const projectClaudeDir = findNearestDir(cwd, path.join('.claude', 'agents'))
+  // 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()
 
   // 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.
   const userAgents = scope === 'project' ? [] : [...loadAgentsFromDir(BUILTIN_AGENTS_DIR, 'builtin'), ...pluginAgentDirs(os.homedir()).flatMap((dir) => loadAgentsFromDir(dir, 'plugin')), ...loadAgentsFromDir(claudeUserDir, 'user'), ...loadAgentsFromDir(userDir, 'user')]
   // project .claude/agents loads first so project .pi/agents wins on name conflicts
-  const projectAgents = scope === 'user' ? [] : [...(projectClaudeDir ? loadAgentsFromDir(projectClaudeDir, 'project') : []), ...(projectPiDir ? loadAgentsFromDir(projectPiDir, 'project') : [])]
+  const projectAgents = scope === 'user' ? [] : [...projectClaudeDirs.flatMap((dir) => loadAgentsFromDir(dir, 'project')), ...(projectPiDir ? loadAgentsFromDir(projectPiDir, 'project') : [])]
 
   const agentMap = buildAgentMap(userAgents, projectAgents, scope)
   return { agents: Array.from(agentMap.values()), projectAgentsDir: projectPiDir }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-code",
-  "version": "1.0.22",
+  "version": "1.0.23",
   "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, and subagents",
   "keywords": [
     "pi",