@stanco323/oh-my-claude-code 4.10.3 → 4.11.0

package/scripts/release.ts

@@ -3,7 +3,8 @@
  * Release Automation Script
  *
  * Automates version bumping, changelog generation, and release notes creation.
- * Uses conventional commits to categorize changes automatically.
+ * Uses merged PR metadata when available so changelog content, PR counts,
+ * and contributors all reflect the same release dataset.
  *
  * Usage:
  *   npm run release -- patch              # Bump patch version
@@ -18,10 +19,25 @@ import { join, resolve } from 'path';
 import { execSync } from 'child_process';
 import { fileURLToPath } from 'url';
 import { dirname } from 'path';
+import {
+  type ReleasePullRequest,
+  type ReleaseNoteEntry,
+  extractPullRequestNumbers,
+  isReleasePullRequest,
+  deriveContributorLogins,
+  buildReleaseNoteEntriesFromPullRequests,
+  categorizeReleaseNoteEntries,
+  generateChangelog,
+  generateReleaseBody,
+} from '../src/lib/release-generation.ts';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
 const ROOT = resolve(__dirname, '..');
+const DEFAULT_REPO_SLUG = 'Yeachan-Heo/oh-my-claudecode';
+const REPO_SLUG = process.env.GITHUB_REPOSITORY || DEFAULT_REPO_SLUG;
+const REPO_URL = `https://github.com/${REPO_SLUG}`;
+const GITHUB_API_URL = process.env.GITHUB_API_URL || 'https://api.github.com';
 
 // ── Colors ──────────────────────────────────────────────────────────────────
 
@@ -51,9 +67,16 @@ interface ParsedCommit {
   raw: string;
 }
 
-interface ChangelogSection {
+interface GitHubPullRequestResponse {
   title: string;
-  entries: string[];
+  user?: { login?: string | null } | null;
+  head?: { ref?: string | null } | null;
+}
+
+interface GitHubCompareResponse {
+  commits?: Array<{
+    author?: { login?: string | null } | null;
+  }>;
 }
 
 // ── Version helpers ─────────────────────────────────────────────────────────
@@ -85,243 +108,123 @@ function bumpVersion(current: string, bump: string): string {
 
 // ── Git helpers ─────────────────────────────────────────────────────────────
 
-function getCommitsSinceTag(tag: string): string[] {
+function getGitLog(tag: string, format: string, flags: string[] = []): string[] {
   const range = tag ? `${tag}..HEAD` : 'HEAD';
-  const raw = execSync(
-    `git log ${range} --format="%H|%s" --no-merges`,
-    { cwd: ROOT, encoding: 'utf-8' }
-  ).trim();
+  const cmd = ['git', 'log', range, `--format=${JSON.stringify(format)}`, ...flags].join(' ');
+  const raw = execSync(cmd, { cwd: ROOT, encoding: 'utf-8' }).trim();
   return raw ? raw.split('\n') : [];
 }
 
-function getMergeCommitsSinceTag(tag: string): string[] {
-  const range = tag ? `${tag}..HEAD` : 'HEAD';
-  const raw = execSync(
-    `git log ${range} --format="%s" --merges`,
-    { cwd: ROOT, encoding: 'utf-8' }
-  ).trim();
-  return raw ? raw.split('\n') : [];
+function getCommitLinesSinceTag(tag: string): string[] {
+  return getGitLog(tag, '%H|%s');
 }
 
-function getContributors(tag: string): string[] {
-  const merges = getMergeCommitsSinceTag(tag);
-  const contributors = new Set<string>();
-
-  for (const msg of merges) {
-    const match = msg.match(/from\s+([^/]+)\//);
-    if (match && match[1]) {
-      const user = match[1].trim();
-      if (user && !user.startsWith('#')) {
-        contributors.add(user);
-      }
-    }
-  }
-
-  return [...contributors].sort();
+function getNonMergeCommitLinesSinceTag(tag: string): string[] {
+  return getGitLog(tag, '%H|%s', ['--no-merges']);
 }
 
-function getPRCount(tag: string): number {
-  const merges = getMergeCommitsSinceTag(tag);
-  return merges.filter(m => m.startsWith('Merge pull request')).length;
+function getHeadSha(): string {
+  return execSync('git rev-parse HEAD', { cwd: ROOT, encoding: 'utf-8' }).trim();
 }
 
-// ── Commit parsing ──────────────────────────────────────────────────────────
-
-const CONVENTIONAL_RE = /^(?<type>[a-z]+)(?:\((?<scope>[^)]*)\))?:\s*(?<desc>.+)$/;
+// ── Commit / PR parsing ─────────────────────────────────────────────────────
 
 function parseCommit(line: string): ParsedCommit | null {
   const [hash, ...rest] = line.split('|');
   const raw = rest.join('|');
 
   if (!raw) return null;
-
-  // Skip merge commits, chore(release) version bumps
   if (raw.startsWith('Merge ')) return null;
   if (raw.match(/^chore\(release\)/i)) return null;
 
-  const match = raw.match(CONVENTIONAL_RE);
-  if (!match?.groups) return null;
+  const conventionalMatch = raw.match(/^(?<type>[a-z]+)(?:\((?<scope>[^)]*)\))?:\s*(?<desc>.+)$/);
+  if (!conventionalMatch?.groups) return null;
 
   const prMatch = raw.match(/\(#(\d+)\)/);
 
   return {
     hash: hash.trim(),
-    type: match.groups.type,
-    scope: match.groups.scope || '',
-    description: match.groups.desc.replace(/\s*\(#\d+\)$/, '').trim(),
+    type: conventionalMatch.groups.type,
+    scope: conventionalMatch.groups.scope || '',
+    description: conventionalMatch.groups.desc.replace(/\s*\(#\d+\)$/, '').trim(),
     prNumber: prMatch ? prMatch[1] : null,
     raw,
   };
 }
 
-// ── Categorization ──────────────────────────────────────────────────────────
-
-function categorize(commits: ParsedCommit[]): Map<string, ParsedCommit[]> {
-  const categories = new Map<string, ParsedCommit[]>();
-
-  for (const commit of commits) {
-    let category: string;
-
-    if (commit.type === 'feat') {
-      category = 'features';
-    } else if (commit.type === 'fix' && /^(security|deps)$/.test(commit.scope)) {
-      category = 'security';
-    } else if (commit.type === 'fix') {
-      category = 'fixes';
-    } else if (commit.type === 'refactor') {
-      category = 'refactoring';
-    } else if (commit.type === 'docs') {
-      category = 'docs';
-    } else if (commit.type === 'chore' && commit.scope === 'deps') {
-      category = 'security';
-    } else if (commit.type === 'perf') {
-      category = 'features';
-    } else {
-      // skip test, chore, ci, build, style
-      continue;
-    }
-
-    if (!categories.has(category)) categories.set(category, []);
-    categories.get(category)!.push(commit);
-  }
-
-  return categories;
+function toReleaseNoteEntryFromCommit(commit: ParsedCommit): ReleaseNoteEntry {
+  return {
+    type: commit.type,
+    scope: commit.scope,
+    description: commit.description,
+    prNumber: commit.prNumber,
+  };
 }
 
-// ── Changelog generation ────────────────────────────────────────────────────
 
-function formatEntry(commit: ParsedCommit): string {
-  const scope = commit.scope ? `(${commit.scope})` : '';
-  const pr = commit.prNumber ? ` (#${commit.prNumber})` : '';
-  return `- **${commit.type}${scope}: ${commit.description}**${pr}`;
-}
-
-function generateTitle(categories: Map<string, ParsedCommit[]>): string {
-  const parts: string[] = [];
-
-  if (categories.has('features')) {
-    // Pick the most notable feature keywords
-    const feats = categories.get('features')!;
-    const keywords = feats
-      .slice(0, 3)
-      .map(f => {
-        // Extract key noun from description
-        const words = f.description.split(/\s+/);
-        return words.slice(0, 3).join(' ');
-      });
-    parts.push(...keywords);
-  }
-  if (categories.has('security')) parts.push('Security Hardening');
-  if (categories.has('fixes') && !parts.length) parts.push('Bug Fixes');
+// ── GitHub metadata helpers ─────────────────────────────────────────────────
 
-  if (parts.length === 0) return 'Maintenance Release';
-  if (parts.length <= 3) return parts.join(', ');
-  return parts.slice(0, 3).join(', ');
-}
+function getGitHubApiHeaders(): Record<string, string> {
+  const headers: Record<string, string> = {
+    Accept: 'application/vnd.github+json',
+    'User-Agent': 'oh-my-claudecode-release-script',
+  };
 
-function generateSummary(categories: Map<string, ParsedCommit[]>, prCount: number): string {
-  const parts: string[] = [];
-  if (categories.has('features')) parts.push(`**${categories.get('features')!.length} new features**`);
-  if (categories.has('security')) parts.push(`**security hardening**`);
-  if (categories.has('fixes')) parts.push(`**${categories.get('fixes')!.length} bug fixes**`);
+  const token = process.env.GITHUB_TOKEN || process.env.GH_TOKEN;
+  if (token) headers.Authorization = `Bearer ${token}`;
 
-  if (parts.length === 0) return 'Maintenance release with internal improvements.';
-  return `Release with ${parts.join(', ')} across ${prCount}+ merged PRs.`;
+  return headers;
 }
 
-function generateChangelog(
-  version: string,
-  categories: Map<string, ParsedCommit[]>,
-  prCount: number,
-): string {
-  const title = generateTitle(categories);
-  const summary = generateSummary(categories, prCount);
-
-  const sections: ChangelogSection[] = [];
-
-  // Highlights: top features + security
-  const highlights: string[] = [];
-  if (categories.has('features')) {
-    for (const f of categories.get('features')!.slice(0, 5)) {
-      highlights.push(formatEntry(f));
-    }
-  }
-  if (categories.has('security')) {
-    for (const s of categories.get('security')!.slice(0, 3)) {
-      highlights.push(formatEntry(s));
-    }
-  }
-  if (highlights.length) sections.push({ title: 'Highlights', entries: highlights });
-
-  // New Features
-  if (categories.has('features')) {
-    sections.push({ title: 'New Features', entries: categories.get('features')!.map(formatEntry) });
-  }
-
-  // Security & Hardening
-  if (categories.has('security')) {
-    sections.push({ title: 'Security & Hardening', entries: categories.get('security')!.map(formatEntry) });
-  }
-
-  // Bug Fixes
-  if (categories.has('fixes')) {
-    sections.push({ title: 'Bug Fixes', entries: categories.get('fixes')!.map(formatEntry) });
-  }
-
-  // Refactoring
-  if (categories.has('refactoring')) {
-    sections.push({ title: 'Refactoring', entries: categories.get('refactoring')!.map(formatEntry) });
-  }
-
-  // Documentation
-  if (categories.has('docs')) {
-    sections.push({ title: 'Documentation', entries: categories.get('docs')!.map(formatEntry) });
+async function fetchJson<T>(url: string): Promise<T | null> {
+  try {
+    const response = await fetch(url, { headers: getGitHubApiHeaders() });
+    if (!response.ok) return null;
+    return await response.json() as T;
+  } catch {
+    return null;
   }
+}
 
-  // Stats
-  const featCount = categories.get('features')?.length ?? 0;
-  const fixCount = categories.get('fixes')?.length ?? 0;
-  const secCount = categories.get('security')?.length ?? 0;
-  const statsLine = `- **${prCount}+ PRs merged** | **${featCount} new features** | **${fixCount} bug fixes** | **${secCount} security/hardening improvements**`;
+function getRepoApiPath(): string {
+  return REPO_SLUG
+    .split('/')
+    .map(part => encodeURIComponent(part))
+    .join('/');
+}
 
-  // Assemble
-  let md = `# oh-my-claudecode v${version}: ${title}\n\n`;
-  md += `## Release Notes\n\n${summary}\n`;
+async function fetchPullRequestMetadata(prNumbers: string[]): Promise<ReleasePullRequest[]> {
+  const repoPath = getRepoApiPath();
+  const records = await Promise.all(prNumbers.map(async number => {
+    const data = await fetchJson<GitHubPullRequestResponse>(
+      `${GITHUB_API_URL}/repos/${repoPath}/pulls/${encodeURIComponent(number)}`
+    );
 
-  for (const section of sections) {
-    md += `\n### ${section.title}\n\n`;
-    md += section.entries.join('\n') + '\n';
-  }
+    if (!data) return null;
 
-  md += `\n### Stats\n\n${statsLine}\n`;
+    return {
+      number,
+      title: data.title,
+      author: data.user?.login ?? null,
+      headRefName: data.head?.ref ?? null,
+    } satisfies ReleasePullRequest;
+  }));
 
-  return md;
+  return records.filter((record): record is ReleasePullRequest => record !== null);
 }
 
-function generateReleaseBody(
-  version: string,
-  changelog: string,
-  contributors: string[],
-  prevTag: string,
-): string {
-  let body = changelog;
-
-  body += `\n### Install / Update\n\n`;
-  body += '```bash\n';
-  body += `npm install -g oh-my-claude-sisyphus@${version}\n`;
-  body += '```\n\n';
-  body += 'Or reinstall the plugin:\n```bash\nclaude /install-plugin oh-my-claudecode\n```\n';
-
-  if (prevTag) {
-    body += `\n**Full Changelog**: https://github.com/Yeachan-Heo/oh-my-claudecode/compare/${prevTag}...v${version}\n`;
-  }
+async function fetchCompareCommitAuthors(prevTag: string): Promise<string[]> {
+  if (!prevTag) return [];
 
-  if (contributors.length > 0) {
-    body += `\n## Contributors\n\nThank you to all contributors who made this release possible!\n\n`;
-    body += contributors.map(u => `@${u}`).join(' ') + '\n';
-  }
+  const repoPath = getRepoApiPath();
+  const headRef = process.env.GITHUB_SHA || getHeadSha();
+  const data = await fetchJson<GitHubCompareResponse>(
+    `${GITHUB_API_URL}/repos/${repoPath}/compare/${encodeURIComponent(prevTag)}...${encodeURIComponent(headRef)}`
+  );
 
-  return body;
+  return (data?.commits ?? [])
+    .map(commit => commit.author?.login ?? null)
+    .filter((author): author is string => Boolean(author));
 }
 
 // ── Version file bumping ────────────────────────────────────────────────────
@@ -329,7 +232,6 @@ function generateReleaseBody(
 function bumpVersionFiles(newVersion: string, dryRun: boolean): string[] {
   const changes: string[] = [];
 
-  // 1. package.json
   const pkgPath = join(ROOT, 'package.json');
   const pkg = JSON.parse(readFileSync(pkgPath, 'utf-8'));
   if (pkg.version !== newVersion) {
@@ -338,7 +240,6 @@ function bumpVersionFiles(newVersion: string, dryRun: boolean): string[] {
     changes.push(`package.json: ${pkg.version} → ${newVersion}`);
   }
 
-  // 2. .claude-plugin/plugin.json
   const pluginPath = join(ROOT, '.claude-plugin/plugin.json');
   if (existsSync(pluginPath)) {
     const content = readFileSync(pluginPath, 'utf-8');
@@ -349,7 +250,6 @@ function bumpVersionFiles(newVersion: string, dryRun: boolean): string[] {
     }
   }
 
-  // 3. .claude-plugin/marketplace.json (has 2 version fields)
   const marketPath = join(ROOT, '.claude-plugin/marketplace.json');
   if (existsSync(marketPath)) {
     const content = readFileSync(marketPath, 'utf-8');
@@ -360,7 +260,6 @@ function bumpVersionFiles(newVersion: string, dryRun: boolean): string[] {
     }
   }
 
-  // 4. docs/CLAUDE.md version marker
   const claudeMdPath = join(ROOT, 'docs/CLAUDE.md');
   if (existsSync(claudeMdPath)) {
     const content = readFileSync(claudeMdPath, 'utf-8');
@@ -371,7 +270,6 @@ function bumpVersionFiles(newVersion: string, dryRun: boolean): string[] {
     }
   }
 
-  // 5. package-lock.json (via npm)
   if (!dryRun) {
     try {
       execSync('npm install --package-lock-only --ignore-scripts 2>/dev/null', { cwd: ROOT });
@@ -386,9 +284,28 @@ function bumpVersionFiles(newVersion: string, dryRun: boolean): string[] {
   return changes;
 }
 
+function buildFallbackPullRequests(prNumbers: string[], subjects: string[]): ReleasePullRequest[] {
+  return prNumbers.map(number => {
+    const subject = subjects.find(entry => entry.includes(`(#${number})`));
+    const mergeSubject = subjects.find(entry => entry.startsWith(`Merge pull request #${number} `));
+    const headRefMatch = mergeSubject?.match(/from\s+[^/]+\/(.+)$/);
+
+    return {
+      number,
+      title: subject ? subject.replace(/\s*\(#\d+\)$/, '').trim() : `PR #${number}`,
+      author: null,
+      headRefName: headRefMatch?.[1] ?? null,
+    } satisfies ReleasePullRequest;
+  });
+}
+
+function isMainModule(): boolean {
+  return process.argv[1] ? resolve(process.argv[1]) === __filename : false;
+}
+
 // ── Main ────────────────────────────────────────────────────────────────────
 
-function main(): void {
+async function main(): Promise<void> {
   const args = process.argv.slice(2);
   const dryRun = args.includes('--dry-run');
   const help = args.includes('--help') || args.includes('-h');
@@ -409,7 +326,7 @@ ${clr('Examples:', c.cyan)}
 
 ${clr('What it does:', c.cyan)}
   1. Bumps version in all 5 files (package.json, plugin.json, marketplace.json, docs/CLAUDE.md, lockfile)
-  2. Generates CHANGELOG.md from conventional commits
+  2. Generates CHANGELOG.md from the merged PR set when metadata is available
   3. Generates .github/release-body.md with contributor @mentions
   4. Runs sync-metadata to update doc badges
 
@@ -435,31 +352,45 @@ ${clr('After running:', c.cyan)}
   console.log(`  Previous tag:    ${clr(prevTag || '(none)', c.dim)}`);
   if (dryRun) console.log(clr('\n  DRY RUN — no files will be modified\n', c.yellow));
 
-  // 1. Parse commits
-  const rawCommits = getCommitsSinceTag(prevTag);
-  const parsed = rawCommits.map(parseCommit).filter((c): c is ParsedCommit => c !== null);
-  const categories = categorize(parsed);
-  const prCount = getPRCount(prevTag);
-  const contributors = getContributors(prevTag);
-
-  console.log(clr('\n📊 Commit Analysis', c.cyan));
-  console.log(`  Total commits: ${rawCommits.length}`);
-  console.log(`  Parsed conventional: ${parsed.length}`);
-  console.log(`  PRs merged: ${prCount}`);
+  const allCommitLines = getCommitLinesSinceTag(prevTag);
+  const allSubjects = allCommitLines.map(line => line.split('|').slice(1).join('|'));
+  const fallbackCommits = getNonMergeCommitLinesSinceTag(prevTag)
+    .map(parseCommit)
+    .filter((commit): commit is ParsedCommit => commit !== null);
+
+  const extractedPrNumbers = extractPullRequestNumbers(allSubjects);
+  const fetchedPullRequests = await fetchPullRequestMetadata(extractedPrNumbers);
+  const pullRequests = fetchedPullRequests.length > 0
+    ? fetchedPullRequests
+    : buildFallbackPullRequests(extractedPrNumbers, allSubjects);
+  const userFacingPullRequests = pullRequests.filter(pr => !isReleasePullRequest(pr));
+  const compareCommitAuthors = fetchedPullRequests.length > 0 ? await fetchCompareCommitAuthors(prevTag) : [];
+  const contributors = deriveContributorLogins(userFacingPullRequests, compareCommitAuthors);
+
+  const usingPullRequests = fetchedPullRequests.length > 0;
+  const releaseEntries = usingPullRequests
+    ? buildReleaseNoteEntriesFromPullRequests(userFacingPullRequests)
+    : fallbackCommits.map(toReleaseNoteEntryFromCommit);
+  const categories = categorizeReleaseNoteEntries(releaseEntries);
+  const prCount = userFacingPullRequests.length > 0 ? userFacingPullRequests.length : extractedPrNumbers.length;
+
+  console.log(clr('\n📊 Release Analysis', c.cyan));
+  console.log(`  Total commits: ${allCommitLines.length}`);
+  console.log(`  Extracted PRs: ${extractedPrNumbers.length}`);
+  console.log(`  User-facing PRs: ${prCount}`);
+  console.log(`  Metadata source: ${usingPullRequests ? 'GitHub PR metadata' : 'git fallback'}`);
   console.log(`  Contributors: ${contributors.join(', ') || '(none)'}`);
 
-  for (const [cat, commits] of categories) {
-    console.log(`  ${cat}: ${commits.length}`);
+  for (const [cat, entries] of categories) {
+    console.log(`  ${cat}: ${entries.length}`);
   }
 
-  // 2. Bump version files
   console.log(clr('\n📦 Version Bump', c.cyan));
   const versionChanges = bumpVersionFiles(newVersion, dryRun);
   for (const change of versionChanges) {
     console.log(`  ${clr('✓', c.green)} ${change}`);
   }
 
-  // 3. Generate CHANGELOG
   console.log(clr('\n📝 Changelog', c.cyan));
   const changelog = generateChangelog(newVersion, categories, prCount);
   if (!dryRun) {
@@ -472,9 +403,8 @@ ${clr('After running:', c.cyan)}
     console.log(clr('--- End Preview ---\n', c.dim));
   }
 
-  // 4. Generate release body
   console.log(clr('\n📋 Release Body', c.cyan));
-  const releaseBody = generateReleaseBody(newVersion, changelog, contributors, prevTag);
+  const releaseBody = generateReleaseBody(newVersion, changelog, contributors, prevTag, REPO_URL);
   const releaseBodyPath = join(ROOT, '.github/release-body.md');
   if (!dryRun) {
     writeFileSync(releaseBodyPath, releaseBody, 'utf-8');
@@ -483,7 +413,6 @@ ${clr('After running:', c.cyan)}
     console.log(`  ${clr('→', c.yellow)} Would write .github/release-body.md`);
   }
 
-  // 5. Run sync-metadata
   console.log(clr('\n🔄 Sync Metadata', c.cyan));
   if (!dryRun) {
     try {
@@ -495,17 +424,22 @@ ${clr('After running:', c.cyan)}
     console.log(`  ${clr('→', c.yellow)} Would run sync-metadata`);
   }
 
-  // 6. Next steps
   console.log(clr('\n✅ Done!', c.green));
   if (!dryRun) {
     console.log(clr('\nNext steps:', c.bold));
     console.log(`  1. ${clr(`git add -A && git commit -m "chore(release): bump version to v${newVersion}"`, c.cyan)}`);
-    console.log(`  2. ${clr(`git push origin dev`, c.cyan)}`);
-    console.log(`  3. Wait for CI green`);
-    console.log(`  4. ${clr(`git checkout main && git merge dev && git push origin main`, c.cyan)}`);
+    console.log(`  2. ${clr('git push origin dev', c.cyan)}`);
+    console.log('  3. Wait for CI green');
+    console.log(`  4. ${clr('git checkout main && git merge dev && git push origin main', c.cyan)}`);
     console.log(`  5. ${clr(`git tag -a v${newVersion} -m "v${newVersion}" && git push origin v${newVersion}`, c.cyan)}`);
-    console.log(`  6. release.yml handles npm publish + GitHub release automatically`);
+    console.log('  6. release.yml handles npm publish + GitHub release automatically');
   }
 }
 
-main();
+if (isMainModule()) {
+  void main().catch((error: unknown) => {
+    const message = error instanceof Error ? error.message : String(error);
+    console.error(clr(`\n✖ ${message}`, c.red));
+    process.exit(1);
+  });
+}

package/scripts/session-start.mjs

@@ -8,14 +8,14 @@
 
 import { existsSync, readFileSync, readdirSync, rmSync, mkdirSync, writeFileSync, symlinkSync, lstatSync, readlinkSync, unlinkSync, renameSync } from 'fs';
 import { join, dirname } from 'path';
-import { homedir } from 'os';
 import { fileURLToPath, pathToFileURL } from 'url';
+import { getClaudeConfigDir } from './lib/config-dir.mjs';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
 
 /** Claude config directory (respects CLAUDE_CONFIG_DIR env var) */
-const configDir = process.env.CLAUDE_CONFIG_DIR || join(homedir(), '.claude');
+const configDir = getClaudeConfigDir();
 
 // Import timeout-protected stdin reader (prevents hangs on Linux/Windows, see issue #240, #524)
 let readStdin;
@@ -482,8 +482,10 @@ Treat this as prior-session context only. Prioritize the user's newest request,
 `);
     }
 
-    // Check for incomplete todos (project-local only, not global ~/.claude/todos/)
-    // NOTE: We intentionally do NOT scan the global ~/.claude/todos/ directory.
+    // Check for incomplete todos (project-local only, not global
+    // [$CLAUDE_CONFIG_DIR|~/.claude]/todos/)
+    // NOTE: We intentionally do NOT scan the global
+    // [$CLAUDE_CONFIG_DIR|~/.claude]/todos/ directory.
     // That directory accumulates todo files from ALL past sessions across all
     // projects, causing phantom task counts in fresh sessions (see issue #354).
     const localTodoPaths = [

package/scripts/session-summary.mjs

@@ -126,7 +126,12 @@ function readSummaryState(stateDir, sessionId) {
  * Write summary state to disk (scoped by sessionId).
  */
 function writeSummaryState(stateDir, sessionId, state) {
-  mkdirSync(stateDir, { recursive: true });
+  try {
+    mkdirSync(stateDir, { recursive: true });
+  } catch (err) {
+    // On Windows, concurrent hooks can throw EEXIST even with recursive:true
+    if (err?.code !== 'EEXIST') throw err;
+  }
   const statePath = join(stateDir, `session-summary-${sessionId}.json`);
   writeFileSync(statePath, JSON.stringify(state, null, 2));
 }

package/scripts/setup-claude-md.sh

@@ -13,13 +13,15 @@ INSTALL_STYLE="${2:-overwrite}"
 DOWNLOAD_URL="https://raw.githubusercontent.com/Yeachan-Heo/oh-my-claudecode/main/docs/CLAUDE.md"
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 SCRIPT_PLUGIN_ROOT="$(cd "${SCRIPT_DIR}/.." && pwd)"
+. "$SCRIPT_DIR/lib/config-dir.sh"
 
 # Resolve active plugin root from installed_plugins.json.
 # Handles stale CLAUDE_PLUGIN_ROOT when a session was started before a plugin
 # update (e.g. 4.8.2 session invoking setup after updating to 4.9.0).
 # Same pattern as run.cjs resolveTarget() fallback.
 resolve_active_plugin_root() {
-  local config_dir="${CLAUDE_CONFIG_DIR:-$HOME/.claude}"
+  local config_dir
+  config_dir="$(resolve_claude_config_dir)"
   local installed_plugins="${config_dir}/plugins/installed_plugins.json"
 
   if [ -f "$installed_plugins" ] && command -v jq >/dev/null 2>&1; then
@@ -89,7 +91,7 @@ EOF
 }
 
 # Determine target path
-CONFIG_DIR="${CLAUDE_CONFIG_DIR:-$HOME/.claude}"
+CONFIG_DIR="$(resolve_claude_config_dir)"
 if [ "$MODE" = "local" ]; then
   mkdir -p .claude/skills/omc-reference
   TARGET_PATH=".claude/CLAUDE.md"

package/scripts/setup-progress.sh

@@ -8,8 +8,11 @@
 
 set -euo pipefail
 
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+. "$SCRIPT_DIR/lib/config-dir.sh"
+
 STATE_FILE=".omc/state/setup-state.json"
-CONFIG_DIR="${CLAUDE_CONFIG_DIR:-$HOME/.claude}"
+CONFIG_DIR="$(resolve_claude_config_dir)"
 CONFIG_FILE="$CONFIG_DIR/.omc-config.json"
 
 # Cross-platform ISO date to epoch conversion

package/scripts/skill-injector.mjs

@@ -13,6 +13,7 @@
 import { existsSync, readdirSync, readFileSync, realpathSync } from 'fs';
 import { join, basename } from 'path';
 import { homedir } from 'os';
+import { getClaudeConfigDir } from './lib/config-dir.mjs';
 import { readStdin } from './lib/stdin.mjs';
 import { createRequire } from 'module';
 
@@ -26,7 +27,7 @@ try {
 }
 
 // Constants (used by fallback)
-const cfgDir = process.env.CLAUDE_CONFIG_DIR || join(homedir(), '.claude');
+const cfgDir = getClaudeConfigDir();
 const USER_SKILLS_DIR = join(cfgDir, 'skills', 'omc-learned');
 const GLOBAL_SKILLS_DIR = join(homedir(), '.omc', 'skills');
 const PROJECT_SKILLS_SUBDIR = join('.omc', 'skills');