dsh-cc-loader 0.1.0 → 0.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-cc-loader",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "Shared parse layer for the dsh-cc ecosystem: parses Claude Code .claude/ (project + global) into a standalone .dsh intermediate representation (IR), classifying every component DIRECT/ADAPTED/UNSUPPORTED/BLOCKED and filtering unsupported ones out.",
   "type": "module",
   "main": "src/index.js",

package/src/index.js

@@ -12,7 +12,7 @@
 export { loadClaude, loadPermissions } from './load.js'
 export {
   discoverSkills, discoverCommands, collectClaudeDir, discoverRules,
-  findProjectRoot, parseFrontmatter, isSkillName, pathExists, readTextSafe,
+  findProjectRoot, findClaudeProjectRoot, parseFrontmatter, isSkillName, pathExists, readTextSafe,
 } from './skills.js'
 export { discoverSettings, mergeSettings } from './settings.js'
 export {

package/src/load.js

@@ -2,7 +2,7 @@
 
 import { homedir } from 'node:os'
 import { join } from 'node:path'
-import { findProjectRoot, collectClaudeDir, discoverRules } from './skills.js'
+import { findProjectRoot, findClaudeProjectRoot, collectClaudeDir, discoverRules } from './skills.js'
 import { discoverSettings, mergeSettings } from './settings.js'
 import { parseRulesFor, removedToolNames, classifyComponents } from './classify.js'
 import { STATUS } from './classify.js'
@@ -30,12 +30,16 @@ import { discoverPluginRoot, discoverMarketplace } from './plugin.js'
 export async function loadClaude(opts = {}) {
   const cwd = opts.cwd ?? process.cwd()
   const homeDir = opts.homeDir ?? homedir()
-  const markers = opts.projectRootMarkers ?? ['.git']
   const projectSkillRank = opts.projectSkillRank ?? 150
   const globalSkillRank = opts.globalSkillRank ?? 160
   const warnings = []
 
-  const projectRoot = await findProjectRoot(cwd, markers)
+  // Project root: explicit projectRootMarkers wins (caller control, e.g.
+  // cc-mcp's configurable markers); otherwise CC semantics — closest
+  // .claude/ directory, falling back to the .git root, home excluded.
+  const projectRoot = opts.projectRootMarkers !== undefined
+    ? await findProjectRoot(cwd, opts.projectRootMarkers)
+    : await findClaudeProjectRoot(cwd, { homeDir })
   const skills = []
   const commands = []
   const rules = []
@@ -66,7 +70,10 @@ export async function loadClaude(opts = {}) {
   warnings.push(...catalog.warnings)
 
   // Permissions: discover the three settings files and merge.
-  const discovered = await discoverSettings(cwd, { homeDir, projectRootMarkers: markers })
+  const discovered = await discoverSettings(cwd, {
+    homeDir,
+    ...(opts.projectRootMarkers !== undefined ? { projectRootMarkers: opts.projectRootMarkers } : {}),
+  })
   const merged = mergeSettings(discovered)
   const parsed = parseRulesFor(merged)
   for (const invalid of parsed.invalid) {
@@ -147,9 +154,11 @@ export async function loadClaude(opts = {}) {
 export async function loadPermissions(opts = {}) {
   const cwd = opts.cwd ?? process.cwd()
   const homeDir = opts.homeDir ?? homedir()
-  const markers = opts.projectRootMarkers ?? ['.git']
   const warnings = []
-  const discovered = await discoverSettings(cwd, { homeDir, projectRootMarkers: markers })
+  const discovered = await discoverSettings(cwd, {
+    homeDir,
+    ...(opts.projectRootMarkers !== undefined ? { projectRootMarkers: opts.projectRootMarkers } : {}),
+  })
   const merged = mergeSettings(discovered)
   const parsed = parseRulesFor(merged)
   for (const invalid of parsed.invalid) {

package/src/settings.js

@@ -9,18 +9,22 @@
 
 import { join } from 'node:path'
 import { homedir } from 'node:os'
-import { findProjectRoot, pathExists, readTextSafe } from './skills.js'
+import { findProjectRoot, findClaudeProjectRoot, pathExists, readTextSafe } from './skills.js'
 
 /**
  * Discover the three settings files for a cwd.
  * @param {string} cwd
  * @param {{ homeDir?: string, projectRootMarkers?: string[] }} [opts]
+ *   projectRootMarkers: explicit markers use findProjectRoot; otherwise CC
+ *   semantics (closest .claude/ directory, .git fallback, home excluded).
  * @returns {Promise<{ projectRoot?: string, user?: Source, project?: Source, local?: Source }>}
  *   Source = { scope, path, data } or undefined when absent/unreadable.
  */
 export async function discoverSettings(cwd, opts = {}) {
   const homeDir = opts.homeDir ?? homedir()
-  const projectRoot = await findProjectRoot(cwd, opts.projectRootMarkers)
+  const projectRoot = opts.projectRootMarkers !== undefined
+    ? await findProjectRoot(cwd, opts.projectRootMarkers)
+    : await findClaudeProjectRoot(cwd, { homeDir })
   const userPath = join(homeDir, '.claude', 'settings.json')
   const out = {}
   if (projectRoot !== undefined) {

package/src/skills.js

@@ -24,6 +24,52 @@ export async function findProjectRoot(cwd, markers = ['.git']) {
   }
 }
 
+/**
+ * Claude Code project-root discovery: the closest directory containing a
+ * `.claude/` directory IS the project configuration root — Claude Code walks
+ * up from the cwd looking for a `.claude/` directory (confirmed by
+ * anthropics/claude-code#80791: "Claude Code discovers project-level settings
+ * by walking up from the current working directory looking for a .claude/
+ * directory"), NOT the git root.
+ *
+ * Fallback: when no `.claude/` exists on the walk, fall back to the closest
+ * `.git` root (compat: repositories without a `.claude/` still resolve).
+ *
+ * Home-directory guard: `~/.claude` (Claude Code's global config dir) and a
+ * git-backed home are NEVER treated as a project root — the walk stops at
+ * home. Without the guard, every session outside a project would resolve its
+ * root to the user's home directory.
+ *
+ * @param {string} cwd - session working directory.
+ * @param {object} [opts] - { homeDir } excluded from root resolution;
+ *   { stopAt } optional upper walk boundary (directory at or above which the
+ *   walk stops — primarily a test seam so walk-top markers on the real
+ *   machine cannot interfere; callers normally leave it unset).
+ * @returns {Promise<string | undefined>} project root directory.
+ */
+export async function findClaudeProjectRoot(cwd, opts = {}) {
+  const homeDir = opts.homeDir
+  const stopAt = opts.stopAt
+  const isHome = (dir) => homeDir !== undefined && dir === homeDir
+  const atStop = (dir) => stopAt !== undefined && dir === stopAt
+  // 1. Closest .claude/ directory (CC project-scope semantics), home excluded.
+  let current = resolve(cwd)
+  while (true) {
+    if (!isHome(current) && !atStop(current) && await pathExists(join(current, '.claude'))) return current
+    const parent = dirname(current)
+    if (parent === current || atStop(current)) break
+    current = parent
+  }
+  // 2. Fallback: closest .git root, home excluded.
+  current = resolve(cwd)
+  while (true) {
+    if (!isHome(current) && !atStop(current) && await pathExists(join(current, '.git'))) return current
+    const parent = dirname(current)
+    if (parent === current || atStop(current)) return undefined
+    current = parent
+  }
+}
+
 export async function pathExists(path) {
   try { await stat(path); return true } catch { return false }
 }