@cregis-dev/cckit 0.6.3 → 0.6.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cregis-dev/cckit",
-  "version": "0.6.3",
+  "version": "0.6.5",
   "description": "Enterprise-grade Claude Code configuration toolkit — orchestrates external tools to set up unified rules, skills, MCP and methodology for teams",
   "type": "module",
   "bin": {

package/registry.json

@@ -46,6 +46,18 @@
       "marketplace": "claude-plugins-official",
       "default": true,
       "description": "Web scraping, search, and skill generation using Firecrawl"
+    },
+    "typescript-lsp": {
+      "name": "TypeScript LSP",
+      "marketplace": "claude-plugins-official",
+      "default": true,
+      "description": "TypeScript language server protocol integration for enhanced TypeScript development"
+    },
+    "pr-review-toolkit": {
+      "name": "PR Review Toolkit",
+      "marketplace": "claude-plugins-official",
+      "default": true,
+      "description": "Comprehensive PR review using specialized agents"
     }
   },
   "rules": {
@@ -69,7 +81,7 @@
       "id": "skill-vetter",
       "repo": "https://github.com/useai-pro/openclaw-skills-security",
       "skill": "skill-vetter",
-      "installCommand": "npx skills add https://github.com/useai-pro/openclaw-skills-security@skill-vetter -y -a claude-code"
+      "installCommand": "npx skills add https://github.com/useai-pro/openclaw-skills-security --skill skill-vetter -y -a claude-code"
     }
   ],
   "bmad": {

package/src/commands/init.js

@@ -71,7 +71,8 @@ export async function runInit(opts = {}, _deps = {}) {
         apiUrl: config.apiUrl || userSettings.apiUrl || DEFAULT_API_URL,
         apiKey: config.apiKey,
         forceApiKey: config.forceApiKey,
-        modelId,
+        model: config.model,    // CLI alias (e.g. 'kimi'), used for prompting
+        modelId,                // Resolved ID (e.g. 'Kimi-K2.5'), used for env vars
         modelEnvKeys: userSettings.modelEnvKeys || [],
         yes: opts.yes,
         skip: false,

package/src/steps/configure-user.js

@@ -30,6 +30,7 @@ export async function configureUser(opts, logger, _deps = {}) {
 
   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 = {}
@@ -47,25 +48,24 @@ export async function configureUser(opts, logger, _deps = {}) {
 
   const existingEnv = existing.env || {}
 
-  // 1. API URL — prompt for confirmation if not provided via CLI
+  // 1. API URL — always prompt for confirmation when not in --yes mode
   let apiUrl = opts.apiUrl
-  if (!opts.yes && !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 — resolve from CLI flag, readline, or existing
+  // 2. API Key — prompt when not in --yes mode
   let apiKey = existingEnv.ANTHROPIC_AUTH_TOKEN || ''
   const hasExistingKey = Boolean(apiKey)
 
-  if (opts.apiKey) {
-    // CLI flag provided — use it (force or new)
-    apiKey = opts.apiKey
-  } else if (!hasExistingKey || opts.forceApiKey) {
-    // No existing key, or force update — prompt via readline
-    if (!opts.yes) {
+  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): '
@@ -76,12 +76,15 @@ export async function configureUser(opts, logger, _deps = {}) {
         logger.warn('No API Key provided. You can set it later with `cckit install --api-key <key>`')
       }
     }
-    // --yes mode without --api-key: skip prompt, keep existing
+  } else if (opts.apiKey) {
+    // --yes mode: use CLI flag if provided
+    apiKey = opts.apiKey
   }
+  // --yes mode without --api-key: keep existing
 
-  // 3. Model — prompt for confirmation
+  // 3. Model — always prompt for confirmation when not in --yes mode
   let modelId = opts.modelId
-  if (!opts.yes && !opts.model) {
+  if (!opts.yes) {
     const input = await askFn('  Enter model (default: ' + opts.modelId + '): ')
     if (input && input.trim()) {
       modelId = input.trim()
@@ -94,7 +97,7 @@ export async function configureUser(opts, logger, _deps = {}) {
     modelEnvEntries[key] = modelId
   }
 
-  // 5. Merge and write
+  // 5. Merge and write settings.json
   const merged = {
     ...existing,
     env: {
@@ -108,6 +111,11 @@ export async function configureUser(opts, logger, _deps = {}) {
   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}`)
@@ -128,3 +136,46 @@ export async function configureUser(opts, logger, _deps = {}) {
     },
   }
 }
+
+/**
+ * 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`)
+  }
+}