@tkpdx01/ccc 1.3.4 → 1.3.5

package/README.md

@@ -60,7 +60,7 @@ ccc webdav status      # View sync status / 查看同步状态
 - **Template Support / 模板**: Based on `~/.claude/settings.json`
 - **Smart Import / 智能导入**: Auto-detect API URL and token
 - **Sync Settings / 同步**: Update from template, preserve credentials
-- **Claude Env Defaults / Claude 环境变量默认值**: Auto-ensure `CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC=1`, `CLAUDE_CODE_ATTRIBUTION_HEADER=0`, and `DISABLE_INSTALLATION_CHECKS=1` in both template and profiles
+- **Claude Env Defaults / Claude 环境变量默认值**: Auto-ensure these values in the `env` section of both `~/.claude/settings.json` and each profile: `CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC=1`, `CLAUDE_CODE_ATTRIBUTION_HEADER=0`, `DISABLE_INSTALLATION_CHECKS=1`
 - **WebDAV Cloud Sync / 云同步**: Encrypted sync across devices
 
 ## Sync Command / 同步命令

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tkpdx01/ccc",
-  "version": "1.3.4",
+  "version": "1.3.5",
   "description": "Claude Code Settings Launcher - Manage multiple Claude Code profiles",
   "main": "index.js",
   "bin": {

package/src/commands/edit.js

@@ -13,7 +13,8 @@ import {
   resolveProfile,
   getProfileCredentials,
   getClaudeSettingsTemplate,
-  ensureRequiredClaudeEnvSettings
+  ensureRequiredClaudeEnvSettings,
+  ensureClaudeSettingsExtras
 } from '../profiles.js';
 
 export function editCommand(program) {
@@ -98,6 +99,7 @@ export function editCommand(program) {
 
       // 确保主配置（~/.claude/settings.json）与 profile 都包含必要 env 设置
       ensureRequiredClaudeEnvSettings();
+      ensureClaudeSettingsExtras();
       currentProfile.env.CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC = '1';
       currentProfile.env.CLAUDE_CODE_ATTRIBUTION_HEADER = '0';
       currentProfile.env.DISABLE_INSTALLATION_CHECKS = '1';

package/src/commands/new.js

@@ -5,10 +5,42 @@ import {
   getProfiles,
   profileExists,
   createProfileFromTemplate,
-  setDefaultProfile
+  setDefaultProfile,
+  ensureClaudeSettingsExtras
 } from '../profiles.js';
 import { launchClaude } from '../launch.js';
 
+const RESERVED_PROFILE_NAMES = [
+  'list',
+  'ls',
+  'use',
+  'show',
+  'import',
+  'if',
+  'new',
+  'edit',
+  'delete',
+  'rm',
+  'sync',
+  'webdav',
+  'help'
+];
+
+function isReservedProfileName(name) {
+  return RESERVED_PROFILE_NAMES.includes(name);
+}
+
+function validateProfileName(input) {
+  const trimmed = input.trim();
+  if (!trimmed) {
+    return '请输入配置名称';
+  }
+  if (isReservedProfileName(trimmed)) {
+    return '配置名称不能使用命令关键词';
+  }
+  return true;
+}
+
 export function newCommand(program) {
   program
     .command('new [name]')
@@ -21,10 +53,16 @@ export function newCommand(program) {
             type: 'input',
             name: 'profileName',
             message: '配置名称:',
-            validate: (input) => input.trim() ? true : '请输入配置名称'
+            validate: validateProfileName
           }
         ]);
         name = profileName;
+      } else {
+        const validationResult = validateProfileName(name);
+        if (validationResult !== true) {
+          console.log(chalk.red(validationResult));
+          process.exit(1);
+        }
       }
 
       // 检查是否已存在
@@ -60,7 +98,8 @@ export function newCommand(program) {
           type: 'input',
           name: 'finalName',
           message: 'Profile 名称:',
-          default: name
+          default: name,
+          validate: validateProfileName
         }
       ]);
 
@@ -81,6 +120,7 @@ export function newCommand(program) {
       }
 
       ensureDirs();
+      ensureClaudeSettingsExtras();
       createProfileFromTemplate(finalName, apiUrl, apiKey);
       console.log(chalk.green(`\n✓ 配置 "${finalName}" 已创建（基于 ~/.claude/settings.json）`));
 

package/src/profiles.js

@@ -1,5 +1,6 @@
 import fs from 'fs';
 import path from 'path';
+import os from 'os';
 import { CONFIG_DIR, PROFILES_DIR, DEFAULT_FILE, CLAUDE_SETTINGS_PATH } from './config.js';
 
 function stringifyClaudeSettings(settings) {
@@ -138,6 +139,67 @@ export function ensureRequiredClaudeEnvSettings() {
   });
 }
 
+// 获取 statusLine 的 ccline 路径（适配不同操作系统）
+function getCclineCommand() {
+  const platform = os.platform();
+  if (platform === 'win32') {
+    return '%USERPROFILE%\\.claude\\ccline\\ccline.exe';
+  } else {
+    // Linux 和 macOS
+    return '~/.claude/ccline/ccline';
+  }
+}
+
+// 确保主配置包含 attribution/includeCoAuthoredBy 和 statusLine 设置
+export function ensureClaudeSettingsExtras() {
+  const template = getClaudeSettingsTemplate();
+  if (!template) {
+    return null;
+  }
+
+  let changed = false;
+
+  // 确保 attribution 禁用（commit/pr 为空字符串）
+  if (!template.attribution || typeof template.attribution !== 'object' || Array.isArray(template.attribution)) {
+    template.attribution = { commit: '', pr: '' };
+    changed = true;
+  } else {
+    if (template.attribution.commit !== '' || template.attribution.pr !== '') {
+      template.attribution.commit = '';
+      template.attribution.pr = '';
+      changed = true;
+    }
+  }
+
+  // 兼容旧版本：确保 includeCoAuthoredBy: false
+  if (template.includeCoAuthoredBy !== false) {
+    template.includeCoAuthoredBy = false;
+    changed = true;
+  }
+
+  // 确保 statusLine 配置
+  const expectedCommand = getCclineCommand();
+  const expectedStatusLine = {
+    type: 'command',
+    command: expectedCommand,
+    padding: 0
+  };
+
+  if (!template.statusLine ||
+      template.statusLine.type !== 'command' ||
+      template.statusLine.command !== expectedCommand ||
+      template.statusLine.padding !== 0) {
+    template.statusLine = expectedStatusLine;
+    changed = true;
+  }
+
+  if (changed) {
+    fs.writeFileSync(CLAUDE_SETTINGS_PATH, stringifyClaudeSettings(template));
+  }
+
+  return template;
+}
+
 // 读取 profile 配置
 export function readProfile(name) {
   const profilePath = getProfilePath(name);