@cregis-dev/cckit 0.6.6 → 0.6.8

package/src/steps/configure-user.js

@@ -1,181 +1,181 @@
-/**
- * Step: Configure user-level settings in ~/.claude/settings.json.
- *
- * Writes API URL, API key (ANTHROPIC_AUTH_TOKEN), and model env vars.
- * User-level settings are separate from project-level .claude/settings.json.
- */
-
-import path from 'node:path'
-import os from 'node:os'
-import fse from 'fs-extra'
-import { askQuestion } from '../utils/prompt.js'
-
-/**
- * @param {object} opts
- * @param {string} opts.apiUrl - API base URL (default from registry)
- * @param {string} [opts.apiKey] - API key from CLI flag
- * @param {boolean} [opts.forceApiKey] - Force overwrite existing key
- * @param {string} opts.modelId - Resolved model ID (e.g. "MiniMax-M2.5")
- * @param {string[]} opts.modelEnvKeys - Env keys to set for model
- * @param {boolean} [opts.yes] - Non-interactive mode
- * @param {boolean} opts.skip - Skip this step
- * @param {object} logger
- * @param {object} [_deps] - Injectable dependencies for testing
- * @returns {Promise<import('../core/orchestrator.js').StepResult>}
- */
-export async function configureUser(opts, logger, _deps = {}) {
-  if (opts.skip) {
-    return { stepId: 'configure-user', name: 'Configure User Settings', success: true, skipped: true, details: {} }
-  }
-
-  const { askFn = askQuestion } = _deps
-  const settingsPath = _deps.settingsPath || path.join(os.homedir(), '.claude', 'settings.json')
-  const claudeJsonPath = _deps.claudeJsonPath || path.join(os.homedir(), '.claude.json')
-
-  // Read existing user settings
-  let existing = {}
-  try {
-    const raw = await fse.readFile(settingsPath, 'utf8')
-    existing = JSON.parse(raw)
-  } catch (err) {
-    if (err.code === 'ENOENT') {
-      // File doesn't exist — start fresh
-    } else {
-      // Other error (permission, corrupt, etc.) — log and start fresh
-      logger.warn(`Failed to read ${settingsPath}: ${err.message}, using defaults`)
-    }
-  }
-
-  const existingEnv = existing.env || {}
-
-  // 1. API URL — always prompt for confirmation when not in --yes mode
-  let apiUrl = opts.apiUrl
-  if (!opts.yes) {
-    const input = await askFn('  Enter API URL (default: ' + opts.apiUrl + '): ')
-    if (input && input.trim()) {
-      apiUrl = input.trim()
-    }
-  }
-
-  // 2. API Key — prompt when not in --yes mode
-  let apiKey = existingEnv.ANTHROPIC_AUTH_TOKEN || ''
-  const hasExistingKey = Boolean(apiKey)
-
-  if (!opts.yes) {
-    // Use CLI value if provided, otherwise prompt
-    if (opts.apiKey) {
-      apiKey = opts.apiKey
-    } else {
-      const prompt = hasExistingKey
-        ? '  API Key already exists. Enter new key to replace (empty to keep): '
-        : '  Enter your API Key (empty to skip): '
-      const input = await askFn(prompt)
-      if (input) {
-        apiKey = input
-      } else if (!hasExistingKey) {
-        logger.warn('No API Key provided. You can set it later with `cckit install --api-key <key>`')
-      }
-    }
-  } else if (opts.apiKey) {
-    // --yes mode: use CLI flag if provided
-    apiKey = opts.apiKey
-  }
-  // --yes mode without --api-key: keep existing
-
-  // 3. Model — always prompt for confirmation when not in --yes mode
-  let modelId = opts.modelId
-  if (!opts.yes) {
-    const input = await askFn('  Enter model (default: ' + opts.modelId + '): ')
-    if (input && input.trim()) {
-      modelId = input.trim()
-    }
-  }
-
-  // 4. Model env vars
-  const modelEnvEntries = {}
-  for (const key of opts.modelEnvKeys) {
-    modelEnvEntries[key] = modelId
-  }
-
-  // 5. Merge and write settings.json
-  const merged = {
-    ...existing,
-    env: {
-      ...existingEnv,
-      ANTHROPIC_BASE_URL: apiUrl,
-      ...(apiKey ? { ANTHROPIC_AUTH_TOKEN: apiKey } : {}),
-      ...modelEnvEntries,
-    },
-  }
-
-  await fse.ensureDir(path.dirname(settingsPath))
-  await fse.writeFile(settingsPath, JSON.stringify(merged, null, 2) + '\n', 'utf8')
-
-  // 6. Check and prompt for hasCompletedOnboarding in ~/.claude.json
-  if (!opts.yes) {
-    await checkAndPromptOnboarding(claudeJsonPath, logger, askFn)
-  }
-
-  const maskedKey = apiKey ? `${apiKey.slice(0, 4)}...${apiKey.slice(-4)}` : '(not set)'
-
-  logger.info(`  API URL:   ${apiUrl}`)
-  logger.info(`  API Key:   ${maskedKey}`)
-  logger.info(`  Model:     ${modelId}`)
-  logger.info(`  Settings:  ${settingsPath}`)
-
-  return {
-    stepId: 'configure-user',
-    name: 'Configure User Settings',
-    success: true,
-    skipped: false,
-    details: {
-      apiUrl,
-      hasApiKey: Boolean(apiKey),
-      modelId,
-      settingsPath,
-    },
-  }
-}
-
-/**
- * Check if ~/.claude.json has hasCompletedOnboarding and prompt if missing.
- *
- * @param {string} claudeJsonPath - Path to ~/.claude.json
- * @param {object} logger
- * @param {function} askFn
- * @returns {Promise<void>}
- */
-async function checkAndPromptOnboarding(claudeJsonPath, logger, askFn) {
-  let claudeJson = {}
-  let fileExisted = false
-
-  try {
-    const raw = await fse.readFile(claudeJsonPath, 'utf8')
-    claudeJson = JSON.parse(raw)
-    fileExisted = true
-  } catch (err) {
-    if (err.code !== 'ENOENT') {
-      logger.warn(`Failed to read ${claudeJsonPath}: ${err.message}`)
-      return
-    }
-    // File doesn't exist - will create new
-  }
-
-  // Check if hasCompletedOnboarding already exists
-  if ('hasCompletedOnboarding' in claudeJson) {
-    return
-  }
-
-  // Prompt user
-  const input = await askFn('  Add hasCompletedOnboarding: true to ~/.claude.json? (Y/n): ')
-  const answer = (input || '').trim().toLowerCase()
-
-  // Default to yes if empty input
-  if (answer === '' || answer === 'y' || answer === 'yes') {
-    claudeJson.hasCompletedOnboarding = true
-    await fse.writeFile(claudeJsonPath, JSON.stringify(claudeJson, null, 2) + '\n', 'utf8')
-    logger.info(`  Added hasCompletedOnboarding: true to ~/.claude.json`)
-  } else {
-    logger.info(`  Skipped adding hasCompletedOnboarding`)
-  }
-}
+/**
+ * Step: Configure user-level settings in ~/.claude/settings.json.
+ *
+ * Writes API URL, API key (ANTHROPIC_AUTH_TOKEN), and model env vars.
+ * User-level settings are separate from project-level .claude/settings.json.
+ */
+
+import path from 'node:path'
+import os from 'node:os'
+import fse from 'fs-extra'
+import { askQuestion } from '../utils/prompt.js'
+
+/**
+ * @param {object} opts
+ * @param {string} opts.apiUrl - API base URL (default from registry)
+ * @param {string} [opts.apiKey] - API key from CLI flag
+ * @param {boolean} [opts.forceApiKey] - Force overwrite existing key
+ * @param {string} opts.modelId - Resolved model ID (e.g. "MiniMax-M2.5")
+ * @param {string[]} opts.modelEnvKeys - Env keys to set for model
+ * @param {boolean} [opts.yes] - Non-interactive mode
+ * @param {boolean} opts.skip - Skip this step
+ * @param {object} logger
+ * @param {object} [_deps] - Injectable dependencies for testing
+ * @returns {Promise<import('../core/orchestrator.js').StepResult>}
+ */
+export async function configureUser(opts, logger, _deps = {}) {
+  if (opts.skip) {
+    return { stepId: 'configure-user', name: 'Configure User Settings', success: true, skipped: true, details: {} }
+  }
+
+  const { askFn = askQuestion } = _deps
+  const settingsPath = _deps.settingsPath || path.join(os.homedir(), '.claude', 'settings.json')
+  const claudeJsonPath = _deps.claudeJsonPath || path.join(os.homedir(), '.claude.json')
+
+  // Read existing user settings
+  let existing = {}
+  try {
+    const raw = await fse.readFile(settingsPath, 'utf8')
+    existing = JSON.parse(raw)
+  } catch (err) {
+    if (err.code === 'ENOENT') {
+      // File doesn't exist — start fresh
+    } else {
+      // Other error (permission, corrupt, etc.) — log and start fresh
+      logger.warn(`Failed to read ${settingsPath}: ${err.message}, using defaults`)
+    }
+  }
+
+  const existingEnv = existing.env || {}
+
+  // 1. API URL — always prompt for confirmation when not in --yes mode
+  let apiUrl = opts.apiUrl
+  if (!opts.yes) {
+    const input = await askFn('  Enter API URL (default: ' + opts.apiUrl + '): ')
+    if (input && input.trim()) {
+      apiUrl = input.trim()
+    }
+  }
+
+  // 2. API Key — prompt when not in --yes mode
+  let apiKey = existingEnv.ANTHROPIC_AUTH_TOKEN || ''
+  const hasExistingKey = Boolean(apiKey)
+
+  if (!opts.yes) {
+    // Use CLI value if provided, otherwise prompt
+    if (opts.apiKey) {
+      apiKey = opts.apiKey
+    } else {
+      const prompt = hasExistingKey
+        ? '  API Key already exists. Enter new key to replace (empty to keep): '
+        : '  Enter your API Key (empty to skip): '
+      const input = await askFn(prompt)
+      if (input) {
+        apiKey = input
+      } else if (!hasExistingKey) {
+        logger.warn('No API Key provided. You can set it later with `cckit install --api-key <key>`')
+      }
+    }
+  } else if (opts.apiKey) {
+    // --yes mode: use CLI flag if provided
+    apiKey = opts.apiKey
+  }
+  // --yes mode without --api-key: keep existing
+
+  // 3. Model — always prompt for confirmation when not in --yes mode
+  let modelId = opts.modelId
+  if (!opts.yes) {
+    const input = await askFn('  Enter model (default: ' + opts.modelId + '): ')
+    if (input && input.trim()) {
+      modelId = input.trim()
+    }
+  }
+
+  // 4. Model env vars
+  const modelEnvEntries = {}
+  for (const key of opts.modelEnvKeys) {
+    modelEnvEntries[key] = modelId
+  }
+
+  // 5. Merge and write settings.json
+  const merged = {
+    ...existing,
+    env: {
+      ...existingEnv,
+      ANTHROPIC_BASE_URL: apiUrl,
+      ...(apiKey ? { ANTHROPIC_AUTH_TOKEN: apiKey } : {}),
+      ...modelEnvEntries,
+    },
+  }
+
+  await fse.ensureDir(path.dirname(settingsPath))
+  await fse.writeFile(settingsPath, JSON.stringify(merged, null, 2) + '\n', 'utf8')
+
+  // 6. Check and prompt for hasCompletedOnboarding in ~/.claude.json
+  if (!opts.yes) {
+    await checkAndPromptOnboarding(claudeJsonPath, logger, askFn)
+  }
+
+  const maskedKey = apiKey ? `${apiKey.slice(0, 4)}...${apiKey.slice(-4)}` : '(not set)'
+
+  logger.info(`  API URL:   ${apiUrl}`)
+  logger.info(`  API Key:   ${maskedKey}`)
+  logger.info(`  Model:     ${modelId}`)
+  logger.info(`  Settings:  ${settingsPath}`)
+
+  return {
+    stepId: 'configure-user',
+    name: 'Configure User Settings',
+    success: true,
+    skipped: false,
+    details: {
+      apiUrl,
+      hasApiKey: Boolean(apiKey),
+      modelId,
+      settingsPath,
+    },
+  }
+}
+
+/**
+ * Check if ~/.claude.json has hasCompletedOnboarding and prompt if missing.
+ *
+ * @param {string} claudeJsonPath - Path to ~/.claude.json
+ * @param {object} logger
+ * @param {function} askFn
+ * @returns {Promise<void>}
+ */
+async function checkAndPromptOnboarding(claudeJsonPath, logger, askFn) {
+  let claudeJson = {}
+  let fileExisted = false
+
+  try {
+    const raw = await fse.readFile(claudeJsonPath, 'utf8')
+    claudeJson = JSON.parse(raw)
+    fileExisted = true
+  } catch (err) {
+    if (err.code !== 'ENOENT') {
+      logger.warn(`Failed to read ${claudeJsonPath}: ${err.message}`)
+      return
+    }
+    // File doesn't exist - will create new
+  }
+
+  // Check if hasCompletedOnboarding already exists
+  if ('hasCompletedOnboarding' in claudeJson) {
+    return
+  }
+
+  // Prompt user
+  const input = await askFn('  Add hasCompletedOnboarding: true to ~/.claude.json? (Y/n): ')
+  const answer = (input || '').trim().toLowerCase()
+
+  // Default to yes if empty input
+  if (answer === '' || answer === 'y' || answer === 'yes') {
+    claudeJson.hasCompletedOnboarding = true
+    await fse.writeFile(claudeJsonPath, JSON.stringify(claudeJson, null, 2) + '\n', 'utf8')
+    logger.info(`  Added hasCompletedOnboarding: true to ~/.claude.json`)
+  } else {
+    logger.info(`  Skipped adding hasCompletedOnboarding`)
+  }
+}

package/src/steps/enable-plugins.js

@@ -1,97 +1,97 @@
-/**
- * Step: Enable Claude Code plugins in `.claude/settings.json`.
- *
- * Writes `enabledPlugins`, `extraKnownMarketplaces`, and environment
- * defaults via read-merge-write to preserve existing user settings.
- */
-
-import path from 'node:path'
-import fse from 'fs-extra'
-
-const ENV_DEFAULTS = {
-  DISABLE_BUG_COMMAND: '1',
-  DISABLE_ERROR_REPORTING: '1',
-  DISABLE_TELEMETRY: '1',
-  MCP_TIMEOUT: '60000',
-  MAX_THINKING_TOKENS: '31999',
-  CLAUDE_CODE_MAX_OUTPUT_TOKENS: '64000',
-}
-
-/**
- * @param {object} opts
- * @param {string} opts.targetDir - Project root
- * @param {Array<{id: string, def: object}>} opts.plugins - Resolved plugins
- * @param {boolean} opts.skip - Skip this step
- * @param {object} logger
- * @returns {Promise<import('../core/orchestrator.js').StepResult>}
- */
-export async function enablePlugins(opts, logger) {
-  if (opts.skip) {
-    return { stepId: 'enable-plugins', name: 'Enable Plugins', success: true, skipped: true, details: {} }
-  }
-
-  const settingsPath = path.join(opts.targetDir, '.claude', 'settings.json')
-  let existing = {}
-
-  try {
-    const raw = await fse.readFile(settingsPath, 'utf8')
-    existing = JSON.parse(raw)
-  } catch (err) {
-    if (err.code === 'ENOENT') {
-      // No existing settings — start fresh
-    } else {
-      logger.warn(`settings.json parse error, backing up and recreating: ${err.message}`)
-      const backupPath = `${settingsPath}.bak.${Date.now()}`
-      await fse.copy(settingsPath, backupPath)
-    }
-    existing = {}
-  }
-
-  const newPlugins = {}
-  const newMarketplaces = {}
-
-  for (const { id, def } of opts.plugins) {
-    const key = `${id}@${def.marketplace}`
-    newPlugins[key] = true
-
-    if (def.marketplaceSource && !newMarketplaces[def.marketplace]) {
-      newMarketplaces[def.marketplace] = { source: { ...def.marketplaceSource } }
-    }
-  }
-
-  const merged = {
-    ...existing,
-    env: {
-      ...(existing.env || {}),
-      ...ENV_DEFAULTS,
-    },
-    enabledPlugins: {
-      ...(existing.enabledPlugins || {}),
-      ...newPlugins,
-    },
-  }
-
-  if (Object.keys(newMarketplaces).length > 0) {
-    merged.extraKnownMarketplaces = {
-      ...(existing.extraKnownMarketplaces || {}),
-      ...newMarketplaces,
-    }
-  }
-
-  await fse.ensureDir(path.dirname(settingsPath))
-  await fse.writeFile(settingsPath, JSON.stringify(merged, null, 2) + '\n', 'utf8')
-
-  const enabledKeys = Object.keys(newPlugins)
-  logger.debug(`Enabled ${enabledKeys.length} plugins in settings.json`)
-
-  return {
-    stepId: 'enable-plugins',
-    name: 'Enable Plugins',
-    success: true,
-    skipped: false,
-    details: {
-      enabledKeys,
-      marketplaces: Object.keys(newMarketplaces),
-    },
-  }
-}
+/**
+ * Step: Enable Claude Code plugins in `.claude/settings.json`.
+ *
+ * Writes `enabledPlugins`, `extraKnownMarketplaces`, and environment
+ * defaults via read-merge-write to preserve existing user settings.
+ */
+
+import path from 'node:path'
+import fse from 'fs-extra'
+
+const ENV_DEFAULTS = {
+  DISABLE_BUG_COMMAND: '1',
+  DISABLE_ERROR_REPORTING: '1',
+  DISABLE_TELEMETRY: '1',
+  MCP_TIMEOUT: '60000',
+  MAX_THINKING_TOKENS: '31999',
+  CLAUDE_CODE_MAX_OUTPUT_TOKENS: '64000',
+}
+
+/**
+ * @param {object} opts
+ * @param {string} opts.targetDir - Project root
+ * @param {Array<{id: string, def: object}>} opts.plugins - Resolved plugins
+ * @param {boolean} opts.skip - Skip this step
+ * @param {object} logger
+ * @returns {Promise<import('../core/orchestrator.js').StepResult>}
+ */
+export async function enablePlugins(opts, logger) {
+  if (opts.skip) {
+    return { stepId: 'enable-plugins', name: 'Enable Plugins', success: true, skipped: true, details: {} }
+  }
+
+  const settingsPath = path.join(opts.targetDir, '.claude', 'settings.json')
+  let existing = {}
+
+  try {
+    const raw = await fse.readFile(settingsPath, 'utf8')
+    existing = JSON.parse(raw)
+  } catch (err) {
+    if (err.code === 'ENOENT') {
+      // No existing settings — start fresh
+    } else {
+      logger.warn(`settings.json parse error, backing up and recreating: ${err.message}`)
+      const backupPath = `${settingsPath}.bak.${Date.now()}`
+      await fse.copy(settingsPath, backupPath)
+    }
+    existing = {}
+  }
+
+  const newPlugins = {}
+  const newMarketplaces = {}
+
+  for (const { id, def } of opts.plugins) {
+    const key = `${id}@${def.marketplace}`
+    newPlugins[key] = true
+
+    if (def.marketplaceSource && !newMarketplaces[def.marketplace]) {
+      newMarketplaces[def.marketplace] = { source: { ...def.marketplaceSource } }
+    }
+  }
+
+  const merged = {
+    ...existing,
+    env: {
+      ...(existing.env || {}),
+      ...ENV_DEFAULTS,
+    },
+    enabledPlugins: {
+      ...(existing.enabledPlugins || {}),
+      ...newPlugins,
+    },
+  }
+
+  if (Object.keys(newMarketplaces).length > 0) {
+    merged.extraKnownMarketplaces = {
+      ...(existing.extraKnownMarketplaces || {}),
+      ...newMarketplaces,
+    }
+  }
+
+  await fse.ensureDir(path.dirname(settingsPath))
+  await fse.writeFile(settingsPath, JSON.stringify(merged, null, 2) + '\n', 'utf8')
+
+  const enabledKeys = Object.keys(newPlugins)
+  logger.debug(`Enabled ${enabledKeys.length} plugins in settings.json`)
+
+  return {
+    stepId: 'enable-plugins',
+    name: 'Enable Plugins',
+    success: true,
+    skipped: false,
+    details: {
+      enabledKeys,
+      marketplaces: Object.keys(newMarketplaces),
+    },
+  }
+}