ai-account-switch 1.1.0 → 1.2.0

package/README.md

@@ -1,5 +1,7 @@
 # AI Account Switch (ais)
 
+English | [简体中文](README_ZH.md)
+
 A cross-platform CLI tool to manage and switch between Claude/Codex account configurations for different projects.
 
 ## Features
@@ -15,7 +17,27 @@ A cross-platform CLI tool to manage and switch between Claude/Codex account conf
 
 ## Installation
 
-### Option 1: Download Pre-built Binary (Recommended)
+### Option 1: Global npm Installation (Recommended)
+
+```bash
+npm install -g ai-account-switch
+```
+
+After installation, the `ais` command will be available globally.
+
+**Note**: If you encounter "command not found" after installation, you may need to add npm's global bin directory to your PATH:
+
+```bash
+# Check npm global bin path
+npm config get prefix
+
+# Add to PATH (Linux/macOS)
+export PATH="$PATH:$(npm config get prefix)/bin"
+
+# On Windows, add to system PATH: %APPDATA%\npm
+```
+
+### Option 2: Download Pre-built Binary
 
 Download the latest release for your platform from the [Releases page](https://github.com/yourusername/ai-agent-user-swith/releases):
 
@@ -36,7 +58,7 @@ chmod +x /usr/local/bin/ais
 **Windows:**
 Download `ais-win.exe` from the releases page and add it to your PATH.
 
-### Option 2: Install from Source
+### Option 3: Install from Source
 
 ```bash
 # Clone the repository
@@ -50,15 +72,7 @@ npm install
 npm link
 ```
 
-### Option 3: Global npm Installation
-
-```bash
-npm install -g ai-account-switch
-```
-
-After installation, the `ais` command will be available globally.
-
-**Note**: See [NPM_PUBLISH.md](NPM_PUBLISH.md) for publishing instructions if you're a maintainer.
+**For Maintainers**: See [NPM_PUBLISH.md](NPM_PUBLISH.md) for publishing instructions.
 
 ## Usage
 
@@ -100,6 +114,7 @@ You'll be prompted to enter:
 - Organization ID (optional)
 - Email (optional)
 - Description (optional)
+- Custom environment variables (optional, e.g., `CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC=1`)
 
 #### 2. List All Accounts
 
@@ -202,7 +217,8 @@ When you run `ais use`, the tool automatically creates `.claude/settings.local.j
   "env": {
     "ANTHROPIC_AUTH_TOKEN": "your-api-key",
     "ANTHROPIC_BASE_URL": "your-api-url",
-    "ANTHROPIC_ORGANIZATION_ID": "your-org-id"
+    "ANTHROPIC_ORGANIZATION_ID": "your-org-id",
+    "CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC": "1"
   },
   "permissions": {
     "allow": [],
@@ -214,6 +230,17 @@ When you run `ais use`, the tool automatically creates `.claude/settings.local.j
 
 This ensures Claude Code CLI automatically uses the correct account for your project.
 
+#### Custom Environment Variables
+
+You can add custom environment variables when creating an account. Common examples:
+
+- `CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC=1` - Disable non-essential network traffic
+- `HTTP_PROXY=http://proxy.example.com:8080` - Set HTTP proxy
+- `HTTPS_PROXY=https://proxy.example.com:8080` - Set HTTPS proxy
+- Any other environment variables needed for your setup
+
+These custom variables are automatically included in the generated `.claude/settings.local.json` file.
+
 ## Examples
 
 ### Example 1: Setting Up Multiple Accounts
@@ -328,6 +355,40 @@ Make sure you've added at least one account:
 ais add
 ```
 
+### Claude Code uses wrong account
+
+If Claude Code is using a different account than expected:
+
+1. Run diagnostics:
+   ```bash
+   ais doctor
+   ```
+
+2. Check if global Claude config is overriding project config:
+   - If `~/.claude/settings.json` contains `env.ANTHROPIC_AUTH_TOKEN`, it may conflict
+   - **Solution**: Remove the `env` section from global config, or only keep `permissions`
+
+3. Ensure you're starting Claude Code from your project directory or subdirectory
+
+4. Regenerate project config:
+   ```bash
+   ais use <your-account-name>
+   ```
+
+### Project config not found in subdirectory
+
+The tool should work in any subdirectory. If it doesn't:
+
+```bash
+# Make sure you're within a configured project
+cd /path/to/your/project
+ais use <account>
+
+# Then try from subdirectory
+cd src/
+ais current  # Should show your account
+```
+
 ## Contributing
 
 Contributions are welcome! Feel free to:
@@ -341,6 +402,14 @@ MIT License - feel free to use this tool in your projects!
 
 ## Changelog
 
+### v1.2.0
+- Added custom environment variables support for accounts
+- Added `ais doctor` command for configuration diagnostics
+- Enhanced `ais help` with all new features
+- Updated installation documentation (npm as recommended method)
+- Improved PATH configuration instructions
+- Display custom env variables in `ais list` and `ais info`
+
 ### v1.1.0
 - Added smart directory detection (works in any subdirectory)
 - Automatic Claude Code `.claude/settings.local.json` generation

package/README_ZH.md

@@ -0,0 +1,482 @@
+# AI Account Switch (ais)
+
+[English](README.md) | 简体中文
+
+一个跨平台的命令行工具，用于管理和切换不同项目的 Claude/Codex 账户配置。
+
+## 特性
+
+- **跨平台支持**：在 macOS、Linux 和 Windows 上无缝运行
+- **多账户管理**：存储和管理多个 AI 服务账户
+- **项目级配置**：每个项目可以使用不同的账户
+- **智能目录检测**：在项目的任何子目录中都能工作（类似 git）
+- **Claude Code 集成**：自动生成 `.claude/settings.local.json` 配置文件
+- **安全存储**：账户凭证仅存储在本地
+- **交互式命令行**：所有操作都有易用的交互式提示
+- **多种账户类型**：支持 Claude、Codex 和其他 AI 服务
+
+## 安装
+
+### 方式 1：全局 npm 安装（推荐）
+
+```bash
+npm install -g ai-account-switch
+```
+
+安装后，`ais` 命令将在全局可用。
+
+**注意**：如果安装后提示"命令未找到"，可能需要将 npm 的全局 bin 目录添加到 PATH：
+
+```bash
+# 查看 npm 全局 bin 路径
+npm config get prefix
+
+# 添加到 PATH (Linux/macOS)
+export PATH="$PATH:$(npm config get prefix)/bin"
+
+# Windows 上，添加到系统 PATH：%APPDATA%\npm
+```
+
+### 方式 2：下载预编译二进制文件
+
+从 [Releases 页面](https://github.com/yourusername/ai-agent-user-swith/releases) 下载适合你平台的最新版本：
+
+**macOS:**
+```bash
+# 下载并安装
+curl -L https://github.com/yourusername/ai-agent-user-swith/releases/latest/download/ais-macos -o /usr/local/bin/ais
+chmod +x /usr/local/bin/ais
+```
+
+**Linux:**
+```bash
+# 下载并安装
+curl -L https://github.com/yourusername/ai-agent-user-swith/releases/latest/download/ais-linux -o /usr/local/bin/ais
+chmod +x /usr/local/bin/ais
+```
+
+**Windows:**
+从 releases 页面下载 `ais-win.exe` 并添加到系统 PATH。
+
+### 方式 3：从源码安装
+
+```bash
+# 克隆仓库
+git clone https://github.com/yourusername/ai-agent-user-swith.git
+cd ai-agent-user-swith
+
+# 安装依赖
+npm install
+
+# 全局链接 CLI 工具
+npm link
+```
+
+**维护者说明**：请查看 [NPM_PUBLISH.md](NPM_PUBLISH.md) 了解发布说明。
+
+## 使用方法
+
+### 命令概览
+
+| 命令 | 别名 | 描述 |
+|------|------|------|
+| `ais add [name]` | - | 添加新的账户配置 |
+| `ais list` | `ls` | 列出所有可用账户 |
+| `ais use [name]` | - | 为当前项目设置账户 |
+| `ais info` | - | 显示当前项目的账户信息 |
+| `ais current` | - | 显示当前账户名称 |
+| `ais remove [name]` | `rm` | 删除账户 |
+| `ais paths` | - | 显示配置文件路径 |
+| `ais doctor` | - | 诊断 Claude Code 配置问题 |
+| `ais export <name>` | - | 导出账户为 JSON 格式 |
+| `ais help` | - | 显示帮助信息 |
+| `ais --version` | - | 显示版本号 |
+
+### 快速开始
+
+#### 1. 添加账户
+
+交互式添加第一个账户：
+
+```bash
+ais add
+```
+
+或直接指定名称：
+
+```bash
+ais add my-claude-account
+```
+
+系统将提示你输入：
+- 账户类型（Claude、Codex、其他）
+- API Key
+- API URL（可选）
+- Organization ID（可选）
+- Email（可选）
+- 描述（可选）
+- 自定义环境变量（可选，例如 `CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC=1`）
+
+#### 2. 列出所有账户
+
+查看所有已配置的账户：
+
+```bash
+ais list
+# 或
+ais ls
+```
+
+当前项目激活的账户将用绿色圆点标记。
+
+#### 3. 为当前项目切换账户
+
+设置当前项目使用的账户：
+
+```bash
+ais use my-claude-account
+```
+
+或交互式选择：
+
+```bash
+ais use
+```
+
+**注意**：此命令会自动生成 `.claude/settings.local.json` 文件用于 Claude Code CLI 集成。
+你可以在项目的任何子目录中运行此命令 - 它会自动找到项目根目录。
+
+#### 4. 查看当前项目信息
+
+查看当前项目激活的账户：
+
+```bash
+ais info
+```
+
+或仅显示账户名称：
+
+```bash
+ais current
+```
+
+**注意**：这些命令可以在项目的任何子目录中使用，类似 git 命令的工作方式。
+
+#### 5. 删除账户
+
+删除不再需要的账户：
+
+```bash
+ais remove old-account
+# 或
+ais rm
+```
+
+### 高级用法
+
+#### 显示配置路径
+
+查看配置文件的存储位置：
+
+```bash
+ais paths
+```
+
+#### 诊断配置问题
+
+如果 Claude Code 使用了错误的账户，运行诊断：
+
+```bash
+ais doctor
+```
+
+此命令会检查：
+- 当前目录和项目根目录
+- AIS 项目配置
+- Claude Code 配置
+- 全局 Claude 配置
+- 提供解决建议
+
+#### 导出账户配置
+
+以 JSON 格式导出账户配置：
+
+```bash
+ais export my-claude-account
+```
+
+## 配置
+
+### 全局配置
+
+所有账户都存储在用户主目录的全局配置中：
+
+- **macOS/Linux**: `~/.ai-account-switch/config.json`
+- **Windows**: `%USERPROFILE%\.ai-account-switch\config.json`
+
+### 项目配置
+
+每个项目将其活动账户引用存储在：
+
+```
+./.ais-project-config
+```
+
+此文件在运行 `ais use` 时自动创建，应添加到 `.gitignore` 中。
+
+### Claude Code 集成
+
+运行 `ais use` 时，工具会自动创建 `.claude/settings.local.json`，结构如下：
+
+```json
+{
+  "env": {
+    "ANTHROPIC_AUTH_TOKEN": "your-api-key",
+    "ANTHROPIC_BASE_URL": "your-api-url",
+    "ANTHROPIC_ORGANIZATION_ID": "your-org-id",
+    "CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC": "1"
+  },
+  "permissions": {
+    "allow": [],
+    "deny": [],
+    "ask": []
+  }
+}
+```
+
+这确保 Claude Code CLI 自动使用项目的正确账户。
+
+#### 自定义环境变量
+
+在创建账户时可以添加自定义环境变量。常见示例：
+
+- `CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC=1` - 禁用非必要网络流量
+- `HTTP_PROXY=http://proxy.example.com:8080` - 设置 HTTP 代理
+- `HTTPS_PROXY=https://proxy.example.com:8080` - 设置 HTTPS 代理
+- 其他你需要的环境变量
+
+这些自定义变量会自动包含在生成的 `.claude/settings.local.json` 文件中。
+
+## 使用示例
+
+### 示例 1：设置多个账户
+
+```bash
+# 添加个人 Claude 账户
+ais add personal-claude
+
+# 添加工作 Claude 账户
+ais add work-claude
+
+# 添加 Codex 账户
+ais add codex-dev
+
+# 列出所有账户
+ais list
+```
+
+### 示例 2：为不同项目使用不同账户
+
+```bash
+# 在个人项目中
+cd ~/my-personal-project
+ais use personal-claude
+
+# 在工作项目中
+cd ~/work/company-project
+ais use work-claude
+
+# 检查激活的账户
+ais info
+```
+
+### 示例 3：管理账户
+
+```bash
+# 查看所有账户
+ais list
+
+# 检查当前账户
+ais current
+
+# 导出账户配置
+ais export personal-claude
+
+# 删除旧账户
+ais remove old-account
+
+# 查看配置位置
+ais paths
+```
+
+### 示例 4：诊断问题
+
+```bash
+# 如果 Claude Code 使用了错误的账户
+cd ~/your-project
+ais doctor
+
+# 根据诊断建议操作
+# 然后重新设置账户
+ais use correct-account
+```
+
+## 安全注意事项
+
+- API 密钥仅存储在本地机器上
+- 全局配置文件包含敏感凭证
+- 始终将 `.ais-project-config` 添加到 `.gitignore`
+- 切勿将账户凭证提交到版本控制
+- 显示 API 密钥时会进行掩码处理（仅显示前 4 位和后 4 位字符）
+
+## 平台兼容性
+
+| 平台 | 状态 | 备注 |
+|------|------|------|
+| macOS | ✅ 完全支持 | 已在 macOS 10.15+ 上测试 |
+| Linux | ✅ 完全支持 | 已在 Ubuntu 20.04+ 上测试 |
+| Windows | ✅ 完全支持 | 已在 Windows 10+ 上测试 |
+
+## 系统要求
+
+- Node.js >= 14.0.0
+- npm >= 6.0.0
+
+## 项目结构
+
+```
+ai-agent-user-swith/
+├── bin/
+│   └── ais.js              # 可执行入口点
+├── src/
+│   ├── index.js            # 主 CLI 程序
+│   ├── commands.js         # 命令实现
+│   └── config.js           # 配置管理器
+├── .github/
+│   └── workflows/
+│       └── release.yml     # GitHub Actions 自动发布
+├── package.json
+├── .gitignore
+├── .npmignore
+├── README.md               # 英文文档
+├── README_ZH.md            # 中文文档
+├── NPM_PUBLISH.md          # npm 发布指南
+└── RELEASE.md              # 发布指南
+```
+
+## 故障排除
+
+### 命令未找到：ais
+
+如果安装后出现此错误，确保已链接包：
+
+```bash
+npm link
+```
+
+### 权限被拒绝
+
+在 Unix 系统上，确保 bin 文件可执行：
+
+```bash
+chmod +x bin/ais.js
+```
+
+### 未找到账户
+
+确保你已添加至少一个账户：
+
+```bash
+ais add
+```
+
+### Claude Code 使用了错误的账户
+
+如果 Claude Code 使用了非预期的账户：
+
+1. 运行诊断：
+   ```bash
+   ais doctor
+   ```
+
+2. 检查全局 Claude 配置是否覆盖了项目配置：
+   - 如果 `~/.claude/settings.json` 包含 `env.ANTHROPIC_AUTH_TOKEN`，可能会冲突
+   - **解决方案**：从全局配置中删除 `env` 部分，或仅保留 `permissions`
+
+3. 确保从项目目录或子目录启动 Claude Code
+
+4. 重新生成项目配置：
+   ```bash
+   ais use <你的账户名>
+   ```
+
+### 在子目录中未找到项目配置
+
+工具应该在任何子目录中工作。如果不行：
+
+```bash
+# 确保你在已配置的项目中
+cd /path/to/your/project
+ais use <account>
+
+# 然后从子目录尝试
+cd src/
+ais current  # 应该显示你的账户
+```
+
+## 贡献
+
+欢迎贡献！你可以：
+- 报告 bug
+- 建议新功能
+- 提交 pull request
+
+## 许可证
+
+MIT License - 欢迎在你的项目中使用此工具！
+
+## 更新日志
+
+### v1.2.0
+- 添加账户自定义环境变量支持
+- 添加 `ais doctor` 命令用于配置诊断
+- 增强 `ais help` 显示所有新功能
+- 更新安装文档（npm 作为推荐安装方式）
+- 改进 PATH 配置说明
+- 在 `ais list` 和 `ais info` 中显示自定义环境变量
+
+### v1.1.0
+- 添加智能目录检测（在任何子目录中工作）
+- 自动生成 Claude Code `.claude/settings.local.json` 配置
+- 在 `ais info` 命令中显示项目根目录
+- 改进跨平台兼容性
+
+### v1.0.0
+- 初始版本
+- 基本账户管理（添加、列出、删除）
+- 项目级账户切换
+- 跨平台支持
+- 交互式 CLI 提示
+- 账户导出功能
+
+## 未来增强
+
+未来版本的潜在功能：
+- 账户验证
+- 批量导入/导出
+- 账户模板
+- 环境变量导出
+- 账户共享（加密）
+- 云同步支持
+- 账户使用统计
+
+## 支持
+
+如果遇到任何问题或有疑问：
+1. 查看故障排除部分
+2. 查看现有 issues
+3. 创建新 issue 并提供详细信息
+
+---
+
+**祝你与 AI 助手编码愉快！** 🤖

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ai-account-switch",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "A cross-platform CLI tool to manage and switch Claude/Codex account configurations",
   "main": "src/index.js",
   "bin": {

package/src/commands.js

@@ -76,9 +76,64 @@ async function addAccount(name, options) {
       name: 'description',
       message: 'Enter description (optional):',
       default: ''
+    },
+    {
+      type: 'confirm',
+      name: 'addCustomEnv',
+      message: 'Add custom environment variables? (e.g., CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC)',
+      default: false
     }
   ]);
 
+  // Handle custom environment variables
+  if (accountData.addCustomEnv) {
+    accountData.customEnv = {};
+    let addMore = true;
+
+    console.log(chalk.cyan('\n💡 Examples: CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC=1, HTTP_PROXY=http://proxy.com\n'));
+
+    while (addMore) {
+      const envInput = await inquirer.prompt([
+        {
+          type: 'input',
+          name: 'key',
+          message: 'Environment variable name (e.g., CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC):',
+          validate: (input) => {
+            if (!input.trim()) return 'Variable name is required';
+            if (!/^[A-Z_][A-Z0-9_]*$/.test(input.trim())) {
+              return 'Invalid format. Use uppercase letters, numbers, and underscores (e.g., MY_VAR)';
+            }
+            return true;
+          }
+        },
+        {
+          type: 'input',
+          name: 'value',
+          message: 'Environment variable value:',
+          validate: (input) => input.trim() !== '' || 'Value is required'
+        }
+      ]);
+
+      accountData.customEnv[envInput.key.trim()] = envInput.value.trim();
+
+      const { continueAdding } = await inquirer.prompt([
+        {
+          type: 'confirm',
+          name: 'continueAdding',
+          message: 'Add another environment variable?',
+          default: false
+        }
+      ]);
+
+      addMore = continueAdding;
+    }
+
+    console.log(chalk.green(`\n✓ Added ${Object.keys(accountData.customEnv).length} custom environment variable(s)\n`));
+  }
+
+  // Remove the addCustomEnv flag before saving
+  delete accountData.addCustomEnv;
+
   // Save account
   config.addAccount(name, accountData);
   console.log(chalk.green(`✓ Account '${name}' added successfully!`));
@@ -111,6 +166,9 @@ function listAccounts() {
     console.log(`   API Key: ${maskApiKey(account.apiKey)}`);
     if (account.email) console.log(`   Email: ${account.email}`);
     if (account.description) console.log(`   Description: ${account.description}`);
+    if (account.customEnv && Object.keys(account.customEnv).length > 0) {
+      console.log(`   Custom Env: ${Object.keys(account.customEnv).join(', ')}`);
+    }
     console.log(`   Created: ${new Date(account.createdAt).toLocaleString()}`);
     console.log('');
   });
@@ -185,6 +243,12 @@ function showInfo() {
   if (projectAccount.organizationId) console.log(`${chalk.cyan('Organization ID:')} ${projectAccount.organizationId}`);
   if (projectAccount.email) console.log(`${chalk.cyan('Email:')} ${projectAccount.email}`);
   if (projectAccount.description) console.log(`${chalk.cyan('Description:')} ${projectAccount.description}`);
+  if (projectAccount.customEnv && Object.keys(projectAccount.customEnv).length > 0) {
+    console.log(`${chalk.cyan('Custom Environment Variables:')}`);
+    Object.entries(projectAccount.customEnv).forEach(([key, value]) => {
+      console.log(`  ${chalk.gray('•')} ${key}: ${value}`);
+    });
+  }
   console.log(`${chalk.cyan('Set At:')} ${new Date(projectAccount.setAt).toLocaleString()}`);
   console.log(`${chalk.cyan('Project Root:')} ${projectAccount.projectRoot}`);
   console.log(`${chalk.cyan('Current Directory:')} ${process.cwd()}\n`);
@@ -261,11 +325,24 @@ function showCurrent() {
  */
 function showPaths() {
   const paths = config.getConfigPaths();
+  const projectRoot = config.findProjectRoot();
 
   console.log(chalk.bold('\n📂 Configuration Paths:\n'));
-  console.log(`${chalk.cyan('Global config file:')} ${chalk.yellow(paths.global)}`);
-  console.log(`${chalk.cyan('Global config directory:')} ${chalk.yellow(paths.globalDir)}`);
-  console.log(`${chalk.cyan('Project config file:')} ${chalk.yellow(paths.project)}\n`);
+  console.log(`${chalk.cyan('Global config file:')} ${paths.global}`);
+  console.log(`${chalk.cyan('Global config directory:')} ${paths.globalDir}`);
+  console.log(`${chalk.cyan('Project config file:')} ${paths.project}`);
+
+  if (projectRoot) {
+    const claudeConfigPath = require('path').join(projectRoot, '.claude', 'settings.local.json');
+    const fs = require('fs');
+    console.log(`${chalk.cyan('Claude config file:')} ${claudeConfigPath}`);
+    console.log(`${chalk.cyan('Claude config exists:')} ${fs.existsSync(claudeConfigPath) ? chalk.green('✓ Yes') : chalk.red('✗ No')}`);
+    console.log(`${chalk.cyan('Project root:')} ${projectRoot}`);
+    console.log(`${chalk.cyan('Current directory:')} ${process.cwd()}`);
+  } else {
+    console.log(chalk.yellow('\n⚠ Not in a configured project directory'));
+  }
+  console.log('');
 }
 
 /**
@@ -297,6 +374,126 @@ function maskApiKey(apiKey) {
   return apiKey.substring(0, 4) + '****' + apiKey.substring(apiKey.length - 4);
 }
 
+/**
+ * Diagnose Claude Code configuration issues
+ */
+function doctor() {
+  const path = require('path');
+  const fs = require('fs');
+  const os = require('os');
+
+  console.log(chalk.bold.cyan('\n🔍 Claude Code Configuration Diagnostics\n'));
+
+  // Check current directory
+  console.log(chalk.bold('1. Current Directory:'));
+  console.log(`   ${process.cwd()}\n`);
+
+  // Check project root
+  const projectRoot = config.findProjectRoot();
+  console.log(chalk.bold('2. Project Root Detection:'));
+  if (projectRoot) {
+    console.log(chalk.green(`   ✓ Found project root: ${projectRoot}`));
+  } else {
+    console.log(chalk.yellow('   ⚠ No project root found (not in a configured project)'));
+    console.log(chalk.gray('   Run "ais use <account>" in your project root first\n'));
+    return;
+  }
+
+  // Check ais project config
+  const aisConfigPath = path.join(projectRoot, '.ais-project-config');
+  console.log(chalk.bold('\n3. AIS Project Configuration:'));
+  if (fs.existsSync(aisConfigPath)) {
+    console.log(chalk.green(`   ✓ Config exists: ${aisConfigPath}`));
+    try {
+      const aisConfig = JSON.parse(fs.readFileSync(aisConfigPath, 'utf8'));
+      console.log(`   Account: ${chalk.cyan(aisConfig.activeAccount)}`);
+    } catch (e) {
+      console.log(chalk.red(`   ✗ Error reading config: ${e.message}`));
+    }
+  } else {
+    console.log(chalk.red(`   ✗ Config not found: ${aisConfigPath}`));
+  }
+
+  // Check Claude config
+  const claudeDir = path.join(projectRoot, '.claude');
+  const claudeConfigPath = path.join(claudeDir, 'settings.local.json');
+
+  console.log(chalk.bold('\n4. Claude Code Configuration:'));
+  console.log(`   Expected location: ${claudeConfigPath}`);
+
+  if (fs.existsSync(claudeConfigPath)) {
+    console.log(chalk.green('   ✓ Claude config exists'));
+    try {
+      const claudeConfig = JSON.parse(fs.readFileSync(claudeConfigPath, 'utf8'));
+
+      if (claudeConfig.env && claudeConfig.env.ANTHROPIC_AUTH_TOKEN) {
+        const token = claudeConfig.env.ANTHROPIC_AUTH_TOKEN;
+        const masked = token.substring(0, 6) + '****' + token.substring(token.length - 4);
+        console.log(`   API Token: ${masked}`);
+      }
+
+      if (claudeConfig.env && claudeConfig.env.ANTHROPIC_BASE_URL) {
+        console.log(`   API URL: ${claudeConfig.env.ANTHROPIC_BASE_URL}`);
+      }
+
+      if (claudeConfig.env && claudeConfig.env.ANTHROPIC_ORGANIZATION_ID) {
+        console.log(`   Org ID: ${claudeConfig.env.ANTHROPIC_ORGANIZATION_ID}`);
+      }
+    } catch (e) {
+      console.log(chalk.red(`   ✗ Error reading Claude config: ${e.message}`));
+    }
+  } else {
+    console.log(chalk.red('   ✗ Claude config not found'));
+    console.log(chalk.yellow('   Run "ais use <account>" to generate it'));
+  }
+
+  // Check global Claude config
+  const globalClaudeConfig = path.join(os.homedir(), '.claude', 'settings.json');
+  console.log(chalk.bold('\n5. Global Claude Configuration:'));
+  console.log(`   Location: ${globalClaudeConfig}`);
+
+  if (fs.existsSync(globalClaudeConfig)) {
+    console.log(chalk.yellow('   ⚠ Global config exists (may override project config in some cases)'));
+    try {
+      const globalConfig = JSON.parse(fs.readFileSync(globalClaudeConfig, 'utf8'));
+      if (globalConfig.env && globalConfig.env.ANTHROPIC_AUTH_TOKEN) {
+        const token = globalConfig.env.ANTHROPIC_AUTH_TOKEN;
+        const masked = token.substring(0, 6) + '****' + token.substring(token.length - 4);
+        console.log(`   Global API Token: ${masked}`);
+      }
+      if (globalConfig.env && globalConfig.env.ANTHROPIC_BASE_URL) {
+        console.log(`   Global API URL: ${globalConfig.env.ANTHROPIC_BASE_URL}`);
+      }
+    } catch (e) {
+      console.log(chalk.red(`   ✗ Error reading global config: ${e.message}`));
+    }
+  } else {
+    console.log(chalk.green('   ✓ No global config (good - project config will be used)'));
+  }
+
+  // Recommendations
+  console.log(chalk.bold('\n6. Recommendations:'));
+
+  if (projectRoot && process.cwd() !== projectRoot) {
+    console.log(chalk.yellow(`   ⚠ You are in a subdirectory (${path.relative(projectRoot, process.cwd())})`));
+    console.log(chalk.cyan('   • Claude Code should still find the project config'));
+    console.log(chalk.cyan('   • Make sure to start Claude Code from this directory or parent directories'));
+  }
+
+  if (fs.existsSync(globalClaudeConfig)) {
+    console.log(chalk.yellow('   ⚠ Global Claude config exists:'));
+    console.log(chalk.cyan('   • Project config should take precedence'));
+    console.log(chalk.cyan('   • If issues persist, consider removing global env settings'));
+    console.log(chalk.gray(`   • File: ${globalClaudeConfig}`));
+  }
+
+  console.log(chalk.bold('\n7. Next Steps:'));
+  console.log(chalk.cyan('   • Start Claude Code from your project directory or subdirectory'));
+  console.log(chalk.cyan('   • Check which account Claude Code is using'));
+  console.log(chalk.cyan('   • If wrong account is used, run: ais use <correct-account>'));
+  console.log('');
+}
+
 module.exports = {
   addAccount,
   listAccounts,
@@ -305,5 +502,6 @@ module.exports = {
   removeAccount,
   showCurrent,
   showPaths,
-  exportAccount
+  exportAccount,
+  doctor
 };

package/src/config.js

@@ -191,6 +191,13 @@ class ConfigManager {
       claudeConfig.env.ANTHROPIC_ORGANIZATION_ID = account.organizationId;
     }
 
+    // Add custom environment variables if specified
+    if (account.customEnv && typeof account.customEnv === 'object') {
+      Object.keys(account.customEnv).forEach(key => {
+        claudeConfig.env[key] = account.customEnv[key];
+      });
+    }
+
     // Preserve existing permissions if any
     if (!claudeConfig.permissions) {
       claudeConfig.permissions = existingConfig.permissions || {

package/src/index.js

@@ -10,7 +10,8 @@ const {
   removeAccount,
   showCurrent,
   showPaths,
-  exportAccount
+  exportAccount,
+  doctor
 } = require('./commands');
 
 // Package info
@@ -71,6 +72,12 @@ program
   .description('Export account configuration as JSON')
   .action(exportAccount);
 
+// Diagnostic command
+program
+  .command('doctor')
+  .description('Diagnose Claude Code configuration issues')
+  .action(doctor);
+
 // Help command
 program
   .command('help')
@@ -81,13 +88,14 @@ program
     console.log('  ais <command> [options]\n');
 
     console.log(chalk.bold('COMMANDS:'));
-    console.log('  add [name]       Add a new account configuration');
+    console.log('  add [name]       Add a new account configuration (with custom env vars)');
     console.log('  list, ls         List all available accounts');
     console.log('  use [name]       Set the account for current project');
     console.log('  info             Show current project\'s account info');
     console.log('  current          Show current account name');
     console.log('  remove, rm       Remove an account');
     console.log('  paths            Show configuration file paths');
+    console.log('  doctor           Diagnose Claude Code configuration issues');
     console.log('  export <name>    Export account as JSON');
     console.log('  help             Display this help message');
     console.log('  version          Show version number\n');
@@ -103,12 +111,21 @@ program
     console.log('  ais use my-claude-account\n');
     console.log(chalk.gray('  # Show current project info'));
     console.log('  ais info\n');
+    console.log(chalk.gray('  # Diagnose configuration issues'));
+    console.log('  ais doctor\n');
     console.log(chalk.gray('  # Remove an account'));
     console.log('  ais remove my-old-account\n');
 
+    console.log(chalk.bold('FEATURES:'));
+    console.log('  • Custom environment variables support');
+    console.log('  • Automatic Claude Code .claude/settings.local.json generation');
+    console.log('  • Smart directory detection (works in any subdirectory)');
+    console.log('  • Configuration diagnostics with doctor command\n');
+
     console.log(chalk.bold('CONFIGURATION:'));
     console.log('  Global config: ~/.ai-account-switch/config.json');
-    console.log('  Project config: ./.ais-project-config\n');
+    console.log('  Project config: ./.ais-project-config');
+    console.log('  Claude config: ./.claude/settings.local.json\n');
 
     console.log(chalk.bold('CROSS-PLATFORM:'));
     console.log('  Works on macOS, Linux, and Windows');

package/.claude/settings.local.json

@@ -1,19 +0,0 @@
-{
-  "permissions": {
-    "allow": [
-      "Bash(node:*)",
-      "Bash(npm --version)",
-      "Bash(chmod:*)",
-      "Bash(npm install)",
-      "Bash(npm link)",
-      "Bash(ais:*)",
-      "WebSearch",
-      "WebFetch(domain:www.vibesparking.com)",
-      "Read(//Users/deanwang/.claude/**)",
-      "Read(//Users/deanwang/IdeaProjects/githubProject/team-nav/**)",
-      "Bash(cat:*)"
-    ],
-    "deny": [],
-    "ask": []
-  }
-}