@ramarivera/coding-buddy 0.4.0-alpha.3 → 0.4.0-alpha.4

package/adapters/claude/install/backup.ts

@@ -25,14 +25,15 @@ import {
   readFileSync, writeFileSync, mkdirSync, existsSync,
   readdirSync, statSync, rmSync, copyFileSync,
 } from "fs";
-import { join } from "path";
+import { dirname, join } from "path";
 import { homedir } from "os";
+import { getBuddySkillDir, getClaudeJsonPath, getClaudeSettingsPath } from "../storage/paths.ts";
 
 const HOME = homedir();
 const BACKUPS_DIR = join(HOME, ".claude-buddy", "backups");
-const SETTINGS = join(HOME, ".claude", "settings.json");
-const CLAUDE_JSON = join(HOME, ".claude.json");
-const SKILL = join(HOME, ".claude", "skills", "buddy", "SKILL.md");
+const SETTINGS = getClaudeSettingsPath();
+const CLAUDE_JSON = getClaudeJsonPath();
+const SKILL = join(getBuddySkillDir(), "SKILL.md");
 const STATE_DIR = join(HOME, ".claude-buddy");
 
 const RED = "\x1b[31m";
@@ -193,7 +194,7 @@ function restoreBackup(ts: string) {
   // 1. settings.json — overwrite
   const settingsBak = join(dir, "settings.json");
   if (existsSync(settingsBak)) {
-    mkdirSync(join(HOME, ".claude"), { recursive: true });
+    mkdirSync(dirname(SETTINGS), { recursive: true });
     copyFileSync(settingsBak, SETTINGS);
     ok("Restored: ~/.claude/settings.json");
   }
@@ -215,7 +216,7 @@ function restoreBackup(ts: string) {
   // 3. SKILL.md
   const skillBak = join(dir, "SKILL.md");
   if (existsSync(skillBak)) {
-    mkdirSync(join(HOME, ".claude", "skills", "buddy"), { recursive: true });
+    mkdirSync(dirname(SKILL), { recursive: true });
     copyFileSync(skillBak, SKILL);
     ok("Restored: ~/.claude/skills/buddy/SKILL.md");
   }

package/adapters/claude/install/disable.ts

@@ -11,6 +11,7 @@
 import { readFileSync, writeFileSync, existsSync } from "fs";
 import { join } from "path";
 import { homedir } from "os";
+import { getClaudeJsonPath, getClaudeSettingsPath } from "../storage/paths.ts";
 
 interface HookCommand {
   type: "command";
@@ -42,8 +43,8 @@ function ok(msg: string) { console.log(`${GREEN}✓${NC}  ${msg}`); }
 function warn(msg: string) { console.log(`${YELLOW}⚠${NC}  ${msg}`); }
 
 const HOME = homedir();
-const CLAUDE_JSON = join(HOME, ".claude.json");
-const SETTINGS = join(HOME, ".claude", "settings.json");
+const CLAUDE_JSON = getClaudeJsonPath();
+const SETTINGS = getClaudeSettingsPath();
 
 console.log(`\n${BOLD}Disabling claude-buddy...${NC}\n`);
 
@@ -54,12 +55,12 @@ try {
     delete claudeJson.mcpServers["claude-buddy"];
     if (Object.keys(claudeJson.mcpServers).length === 0) delete claudeJson.mcpServers;
     writeFileSync(CLAUDE_JSON, JSON.stringify(claudeJson, null, 2));
-    ok("MCP server removed from ~/.claude.json");
+    ok(`MCP server removed from ${CLAUDE_JSON}`);
   } else {
     warn("MCP server was not registered");
   }
 } catch {
-  warn("Could not update ~/.claude.json");
+  warn(`Could not update ${CLAUDE_JSON}`);
 }
 
 // 2. Remove status line + hooks from settings.json

package/adapters/claude/install/doctor.ts

@@ -12,9 +12,14 @@ import { readFileSync, existsSync, statSync } from "fs";
 import { execSync } from "child_process";
 import { join, resolve } from "path";
 import { homedir } from "os";
+import { getBuddySkillDir, getClaudeConfigDir, getClaudeJsonPath, getClaudeSettingsPath } from "../storage/paths.ts";
 
 const PROJECT_ROOT = resolve(import.meta.dir, "../../..");
 const HOME = homedir();
+const CLAUDE_DIR = getClaudeConfigDir();
+const CLAUDE_JSON = getClaudeJsonPath();
+const SETTINGS = getClaudeSettingsPath();
+const SKILL_PATH = join(getBuddySkillDir(), "SKILL.md");
 const STATUS_SCRIPT = join(PROJECT_ROOT, "adapters", "claude", "statusline", "buddy-status.sh");
 
 const RED = "\x1b[31m";
@@ -95,8 +100,10 @@ row("tput cols", tryExec("tput cols 2>/dev/null", "(failed)"));
 section("Filesystem");
 const procExists = existsSync("/proc");
 row("/proc exists", procExists ? `${GREEN}yes${NC} (Linux)` : `${RED}no${NC} (macOS/BSD)`);
-row("~/.claude/ exists", existsSync(join(HOME, ".claude")) ? "yes" : "no");
-row("~/.claude.json exists", existsSync(join(HOME, ".claude.json")) ? "yes" : "no");
+row("Claude config dir", CLAUDE_DIR);
+row("Claude config dir exists", existsSync(CLAUDE_DIR) ? "yes" : "no");
+row("Claude config file", CLAUDE_JSON);
+row("Claude config file exists", existsSync(CLAUDE_JSON) ? "yes" : "no");
 row("~/.claude-buddy/ exists", existsSync(join(HOME, ".claude-buddy")) ? "yes" : "no");
 row("Project root", PROJECT_ROOT);
 row("Status script exists", existsSync(STATUS_SCRIPT) ? "yes" : `${RED}no${NC}`);
@@ -138,8 +145,8 @@ if (isRecord(status)) {
 // ─── settings.json ──────────────────────────────────────────────────────────
 
 section("Claude Code config");
-const settings = tryParseJson(tryRead(join(HOME, ".claude", "settings.json")));
-const claudeJson = tryParseJson(tryRead(join(HOME, ".claude.json")));
+const settings = tryParseJson(tryRead(SETTINGS));
+const claudeJson = tryParseJson(tryRead(CLAUDE_JSON));
 
 if (isRecord(settings) && "statusLine" in settings && settings.statusLine !== undefined) {
   console.log(`  ${DIM}statusLine:${NC}`);
@@ -166,11 +173,10 @@ if (isRecord(claudeJson) && isRecord(claudeJson.mcpServers) && isRecord(claudeJs
   err("MCP server NOT registered in ~/.claude.json");
 }
 
-const skillPath = join(HOME, ".claude", "skills", "buddy", "SKILL.md");
-if (existsSync(skillPath)) {
-  ok(`Skill installed: ${skillPath}`);
+if (existsSync(SKILL_PATH)) {
+  ok(`Skill installed: ${SKILL_PATH}`);
 } else {
-  err(`Skill missing: ${skillPath}`);
+  err(`Skill missing: ${SKILL_PATH}`);
 }
 
 // ─── Live status line test ──────────────────────────────────────────────────

package/adapters/claude/install/install.ts

@@ -5,15 +5,15 @@
  * Checks: bun, jq, ~/.claude/ directory
  */
 
-import { readFileSync, writeFileSync, mkdirSync, existsSync, cpSync } from "fs";
+import { readFileSync, writeFileSync, mkdirSync, existsSync, cpSync, statSync } from "fs";
 import { execSync } from "child_process";
 import { join, resolve } from "path";
-import { homedir } from "os";
 
 import { generateBones, renderBuddy, renderFace, RARITY_STARS } from "../../../core/engine.ts";
 import { loadCompanion, saveCompanion, writeStatusState } from "../storage/state.ts";
 import { resolveUserId } from "../storage/identity.ts";
 import { generateFallbackName } from "../../../core/reactions.ts";
+import { getBuddySkillDir, getClaudeConfigDir, getClaudeJsonPath, getClaudeSettingsPath } from "../storage/paths.ts";
 
 const CYAN = "\x1b[36m";
 const GREEN = "\x1b[32m";
@@ -23,9 +23,10 @@ const BOLD = "\x1b[1m";
 const DIM = "\x1b[2m";
 const NC = "\x1b[0m";
 
-const CLAUDE_DIR = join(homedir(), ".claude");
-const SETTINGS_FILE = join(CLAUDE_DIR, "settings.json");
-const BUDDY_DIR = join(CLAUDE_DIR, "skills", "buddy");
+const CLAUDE_DIR = getClaudeConfigDir();
+const SETTINGS_FILE = getClaudeSettingsPath();
+const BUDDY_DIR = getBuddySkillDir();
+const CLAUDE_JSON = getClaudeJsonPath();
 const PROJECT_ROOT = resolve(import.meta.dir, "../../..");
 
 function banner() {
@@ -71,21 +72,23 @@ function preflight(): boolean {
     }
   }
 
-  // Check ~/.claude/ exists
+  // Check Claude config dir exists and is actually a directory
   if (!existsSync(CLAUDE_DIR)) {
-    err("~/.claude/ not found. Start Claude Code once first, then re-run.");
+    err(`Claude config dir not found: ${CLAUDE_DIR}`);
+    pass = false;
+  } else if (!statSync(CLAUDE_DIR).isDirectory()) {
+    err(`Claude config path is not a directory: ${CLAUDE_DIR}`);
     pass = false;
   } else {
-    ok("~/.claude/ found");
+    ok(`Claude config dir found: ${CLAUDE_DIR}`);
   }
 
-  // Check ~/.claude.json exists
-  const claudeJson = join(homedir(), ".claude.json");
-  if (!existsSync(claudeJson)) {
-    err("~/.claude.json not found. Start Claude Code once first, then re-run.");
+  // Check .claude.json exists in the active Claude config location
+  if (!existsSync(CLAUDE_JSON)) {
+    err(`Claude config file not found: ${CLAUDE_JSON}`);
     pass = false;
   } else {
-    ok("~/.claude.json found");
+    ok(`Claude config file found: ${CLAUDE_JSON}`);
   }
 
   return pass;
@@ -145,7 +148,7 @@ function saveSettings(settings: ClaudeSettings) {
 
 function installMcp() {
   const serverPath = join(PROJECT_ROOT, "adapters", "claude", "server", "index.ts");
-  const claudeJsonPath = join(homedir(), ".claude.json");
+  const claudeJsonPath = CLAUDE_JSON;
 
   let claudeJson: ClaudeJsonConfig = {};
   try {
@@ -161,7 +164,7 @@ function installMcp() {
   };
 
   writeFileSync(claudeJsonPath, JSON.stringify(claudeJson, null, 2));
-  ok("MCP server registered in ~/.claude.json");
+  ok(`MCP server registered in ${claudeJsonPath}`);
 }
 
 // ─── Step 2: Install skill ──────────────────────────────────────────────────
@@ -170,7 +173,7 @@ function installSkill() {
   const srcSkill = join(PROJECT_ROOT, "adapters", "claude", "skills", "buddy", "SKILL.md");
   mkdirSync(BUDDY_DIR, { recursive: true });
   cpSync(srcSkill, join(BUDDY_DIR, "SKILL.md"), { force: true });
-  ok("Skill installed: ~/.claude/skills/buddy/SKILL.md");
+  ok(`Skill installed: ${join(BUDDY_DIR, "SKILL.md")}`);
 }
 
 // ─── Step 3: Configure status line (with animation refresh) ─────────────────

package/adapters/claude/install/test-statusline.ts

@@ -14,9 +14,10 @@
 import { readFileSync, writeFileSync, existsSync, copyFileSync, chmodSync, mkdirSync } from "fs";
 import { join, dirname, resolve } from "path";
 import { homedir } from "os";
+import { getClaudeSettingsPath } from "../storage/paths.ts";
 
 const HOME = homedir();
-const SETTINGS = join(HOME, ".claude", "settings.json");
+const SETTINGS = getClaudeSettingsPath();
 const BACKUP = join(HOME, ".claude-buddy", "statusline.bak");
 const TEST_SCRIPT = join(HOME, ".claude-buddy", "test-statusline.sh");
 const SOURCE_SCRIPT = resolve(import.meta.dir, "test-statusline.sh");
@@ -41,7 +42,7 @@ if (action === "install") {
   console.log(`\n${BOLD}claude-buddy test status line installer${NC}\n`);
 
   if (!existsSync(SETTINGS)) {
-    err("~/.claude/settings.json not found");
+    err(`Claude settings not found: ${SETTINGS}`);
     process.exit(1);
   }
   if (!existsSync(SOURCE_SCRIPT)) {

package/adapters/claude/install/uninstall.ts

@@ -5,6 +5,7 @@
 import { readFileSync, writeFileSync, existsSync, rmSync, readdirSync } from "fs";
 import { join } from "path";
 import { homedir } from "os";
+import { getBuddySkillDir, getClaudeConfigDir, getClaudeJsonPath, getClaudeSettingsPath } from "../storage/paths.ts";
 
 interface HookCommand {
   type: "command";
@@ -33,9 +34,10 @@ const NC = "\x1b[0m";
 function ok(msg: string) { console.log(`${GREEN}✓${NC}  ${msg}`); }
 function warn(msg: string) { console.log(`${YELLOW}⚠${NC}  ${msg}`); }
 
-const CLAUDE_DIR = join(homedir(), ".claude");
-const SETTINGS_FILE = join(CLAUDE_DIR, "settings.json");
-const SKILL_DIR = join(CLAUDE_DIR, "skills", "buddy");
+const CLAUDE_DIR = getClaudeConfigDir();
+const SETTINGS_FILE = getClaudeSettingsPath();
+const SKILL_DIR = getBuddySkillDir();
+const CLAUDE_JSON = getClaudeJsonPath();
 const STATE_DIR = join(homedir(), ".claude-buddy");
 
 console.log("\nclaude-buddy uninstall\n");
@@ -69,16 +71,15 @@ try {
 
 // Remove MCP server from ~/.claude.json
 try {
-  const claudeJsonPath = join(homedir(), ".claude.json");
-  const claudeJson = JSON.parse(readFileSync(claudeJsonPath, "utf8"));
+  const claudeJson = JSON.parse(readFileSync(CLAUDE_JSON, "utf8"));
   if (claudeJson.mcpServers?.["claude-buddy"]) {
     delete claudeJson.mcpServers["claude-buddy"];
     if (Object.keys(claudeJson.mcpServers).length === 0) delete claudeJson.mcpServers;
-    writeFileSync(claudeJsonPath, JSON.stringify(claudeJson, null, 2));
-    ok("MCP server removed from ~/.claude.json");
+    writeFileSync(CLAUDE_JSON, JSON.stringify(claudeJson, null, 2));
+    ok(`MCP server removed from ${CLAUDE_JSON}`);
   }
 } catch {
-  warn("Could not update ~/.claude.json");
+  warn(`Could not update ${CLAUDE_JSON}`);
 }
 
 // Remove hooks and statusline from settings.json

package/adapters/claude/storage/identity.ts

@@ -1,11 +1,10 @@
 import { readFileSync } from "fs";
-import { join } from "path";
-import { homedir } from "os";
+import { getClaudeJsonPath } from "./paths.ts";
 
 export function resolveUserId(): string {
   try {
     const claudeJson = JSON.parse(
-      readFileSync(join(homedir(), ".claude.json"), "utf8"),
+      readFileSync(getClaudeJsonPath(), "utf8"),
     );
     return claudeJson.oauthAccount?.accountUuid ?? claudeJson.userID ?? "anon";
   } catch {

package/adapters/claude/storage/paths.ts

@@ -0,0 +1,24 @@
+import { homedir } from "os";
+import { join, resolve } from "path";
+
+function claudeConfigDirEnv(): string | null {
+  const value = process.env.CLAUDE_CONFIG_DIR?.trim();
+  return value ? resolve(value) : null;
+}
+
+export function getClaudeConfigDir(): string {
+  return claudeConfigDirEnv() ?? join(homedir(), ".claude");
+}
+
+export function getClaudeJsonPath(): string {
+  const configDir = claudeConfigDirEnv();
+  return configDir ? join(configDir, ".claude.json") : join(homedir(), ".claude.json");
+}
+
+export function getClaudeSettingsPath(): string {
+  return join(getClaudeConfigDir(), "settings.json");
+}
+
+export function getBuddySkillDir(): string {
+  return join(getClaudeConfigDir(), "skills", "buddy");
+}

package/adapters/claude/storage/settings.ts

@@ -1,8 +1,7 @@
 import { readFileSync, writeFileSync, renameSync } from "fs";
-import { join } from "path";
-import { homedir } from "os";
+import { getClaudeSettingsPath } from "./paths.ts";
 
-export const CLAUDE_SETTINGS_PATH = join(homedir(), ".claude", "settings.json");
+export const CLAUDE_SETTINGS_PATH = getClaudeSettingsPath();
 
 export function setBuddyStatusLine(
   statusScript: string,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ramarivera/coding-buddy",
-    "version": "0.4.0-alpha.3",
+    "version": "0.4.0-alpha.4",
     "description": "Persistent coding companion for Claude Code and pi",
     "type": "module",
     "bin": {