@fugood/bricks-project 2.24.0-beta.19 → 2.24.0-beta.20

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@fugood/bricks-project",
-  "version": "2.24.0-beta.19",
+  "version": "2.24.0-beta.20",
   "main": "index.ts",
   "scripts": {
     "typecheck": "tsc --noEmit",
     "build": "bun scripts/build.js"
   },
   "dependencies": {
-    "@fugood/bricks-cli": "^2.24.0-beta.19",
+    "@fugood/bricks-cli": "^2.24.0-beta.20",
     "@huggingface/gguf": "^0.3.2",
     "@iarna/toml": "^3.0.0",
     "@modelcontextprotocol/sdk": "^1.15.0",
@@ -24,5 +24,5 @@
   "peerDependencies": {
     "oxfmt": "^0.36.0"
   },
-  "gitHead": "17d967ae3718529b5b47e76b800874bcb2b22277"
+  "gitHead": "3fbcc074311b542fd2d078d5b107e0e433b6a3b6"
 }

package/tools/postinstall.ts

@@ -1,8 +1,25 @@
 import { $ } from 'bun'
-import { stat, readFile, writeFile, readdir } from 'fs/promises'
+import {
+  cp,
+  lstat,
+  mkdir,
+  readFile,
+  readdir,
+  readlink,
+  rm,
+  stat,
+  symlink,
+  writeFile,
+} from 'fs/promises'
+import * as path from 'path'
 import TOML from '@iarna/toml'
 
 const cwd = process.cwd()
+const projectSkillsDir = path.join(cwd, '.bricks', 'skills')
+const compatibilitySkillLinks = [
+  path.join(cwd, '.claude', 'skills'),
+  path.join(cwd, '.codex', 'skills'),
+]
 
 async function exists(f: string) {
   try {
@@ -13,6 +30,15 @@ async function exists(f: string) {
   }
 }
 
+async function pathExists(f: string) {
+  try {
+    await lstat(f)
+    return true
+  } catch {
+    return false
+  }
+}
+
 // handle flag --skip-copy
 const skipCopyProject = process.argv.includes('--skip-copy-project')
 if (skipCopyProject) {
@@ -34,6 +60,7 @@ type CodexMcpConfig = {
   mcp_servers: Record<string, typeof projectMcpServer>
 }
 
+// Claude Code and AGENTS.md projects both use the shared project .mcp.json file.
 const defaultMcpConfig = {
   mcpServers: {
     'bricks-project': projectMcpServer,
@@ -64,43 +91,99 @@ const hasClaudeCode = await exists(`${cwd}/CLAUDE.md`)
 const hasAgentsMd = await exists(`${cwd}/AGENTS.md`)
 
 if (hasClaudeCode || hasAgentsMd) {
+  // Keep the workspace-level JSON MCP config aligned for tools that read .mcp.json.
   const mcpConfigPath = `${cwd}/.mcp.json`
   await handleMcpConfigOverride(mcpConfigPath)
 }
 
-const setupSkills = async (skillsDir) => {
+const copyMissingSkills = async (sourceDir: string, targetDir: string) => {
+  if (!(await exists(sourceDir))) return
+
+  const packageSkills = await readdir(sourceDir, { withFileTypes: true })
+  const skillsToInstall = packageSkills.filter(
+    (entry) => entry.isDirectory() && !entry.name.startsWith('.'),
+  )
+
+  await mkdir(targetDir, { recursive: true })
+
+  await Promise.all(
+    skillsToInstall.map(async (entry) => {
+      const targetSkillDir = path.join(targetDir, entry.name)
+      if (await exists(targetSkillDir)) {
+        console.log(`Skill '${entry.name}' already exists, skipping`)
+      } else {
+        await cp(path.join(sourceDir, entry.name), targetSkillDir, { recursive: true })
+        console.log(`Installed skill '${entry.name}' to ${targetDir}/`)
+      }
+    }),
+  )
+}
+
+const migrateSkillsDir = async (legacySkillsDir: string, canonicalSkillsDir: string) => {
+  if (!(await pathExists(legacySkillsDir))) return
+
+  const legacyStats = await lstat(legacySkillsDir)
+
+  if (legacyStats.isSymbolicLink()) {
+    const linkTarget = await readlink(legacySkillsDir)
+    const resolvedTarget = path.resolve(path.dirname(legacySkillsDir), linkTarget)
+    if (resolvedTarget === canonicalSkillsDir) return
+
+    await copyMissingSkills(resolvedTarget, canonicalSkillsDir)
+    await rm(legacySkillsDir, { force: true, recursive: true })
+    return
+  }
+
+  if (legacyStats.isDirectory()) {
+    await copyMissingSkills(legacySkillsDir, canonicalSkillsDir)
+    await rm(legacySkillsDir, { force: true, recursive: true })
+    return
+  }
+
+  console.warn(`Skipping skills migration for ${legacySkillsDir}; expected a directory or symlink`)
+}
+
+const ensureCompatibilitySkillLink = async (linkPath: string, targetDir: string) => {
+  await mkdir(path.dirname(linkPath), { recursive: true })
+
+  if (await pathExists(linkPath)) {
+    const linkStats = await lstat(linkPath)
+    if (linkStats.isSymbolicLink()) {
+      const linkTarget = await readlink(linkPath)
+      const resolvedTarget = path.resolve(path.dirname(linkPath), linkTarget)
+      if (resolvedTarget === targetDir) return
+    } else {
+      console.warn(
+        `Skipping skills symlink at ${linkPath}; path already exists and is not a symlink`,
+      )
+      return
+    }
+  }
+
+  const relativeTarget = path.relative(path.dirname(linkPath), targetDir)
+  const symlinkType = process.platform === 'win32' ? 'junction' : 'dir'
+  await symlink(relativeTarget, linkPath, symlinkType)
+  console.log(`Linked ${linkPath} -> ${relativeTarget}`)
+}
+
+const setupSkills = async () => {
   const packageSkillsDir = `${__dirname}/../skills`
+  await mkdir(projectSkillsDir, { recursive: true })
+  await copyMissingSkills(packageSkillsDir, projectSkillsDir)
 
-  if (await exists(packageSkillsDir)) {
-    const packageSkills = await readdir(packageSkillsDir)
-    const skillsToInstall = packageSkills.filter((skill) => !skill.startsWith('.'))
-
-    await $`mkdir -p ${skillsDir}`
-
-    await Promise.all(
-      skillsToInstall.map(async (skill) => {
-        const targetSkillDir = `${skillsDir}/${skill}`
-        if (await exists(targetSkillDir)) {
-          console.log(`Skill '${skill}' already exists, skipping`)
-        } else {
-          await $`cp -r ${packageSkillsDir}/${skill} ${targetSkillDir}`
-          console.log(`Installed skill '${skill}' to ${skillsDir}/`)
-        }
-      }),
-    )
+  for (const linkPath of compatibilitySkillLinks) {
+    await migrateSkillsDir(linkPath, projectSkillsDir)
+    await ensureCompatibilitySkillLink(linkPath, projectSkillsDir)
   }
 }
 
-if (hasClaudeCode) {
-  // Install skills that don't already exist in the project
-  await setupSkills(`${cwd}/.claude/skills`)
+if (hasClaudeCode || hasAgentsMd) {
+  // Install project skills once and expose them through compatibility symlinks.
+  await setupSkills()
 }
 
 if (hasAgentsMd) {
-  // Handle codex skills
-  // Currently no signal file for codex skills, so we just check if AGENTS.md exists
-  await setupSkills(`${cwd}/.codex/skills`)
-
+  // Codex stores its project-local MCP config in .codex/config.toml.
   const defaultCodexMcpConfig = {
     mcp_servers: {
       'bricks-project': projectMcpServer,
@@ -128,7 +211,7 @@ if (hasAgentsMd) {
     console.log(`Updated ${mcpConfigPath}`)
   }
 
-  // Setup MCP config (.codex/config.toml)
+  // Keep the Codex TOML MCP config aligned with the same bricks-project server entry.
   const codexConfigPath = `${cwd}/.codex/config.toml`
   await handleCodexMcpConfigOverride(codexConfigPath)
 }