@kkelly-offical/kkcode 0.1.7 → 0.2.1

package/src/config/defaults.mjs

@@ -1,260 +1,280 @@
-export const DEFAULT_CONFIG = {
-  language: "en",
-  provider: {
-    default: "openai",
-    strict_mode: false,
-    openai: {
-      base_url: "https://api.openai.com/v1",
-      api_key_env: "OPENAI_API_KEY",
-      default_model: "gpt-5.3-codex",
-      models: ["gpt-5.3-codex", "gpt-5.2"],
-      timeout_ms: 120000,
-      stream_idle_timeout_ms: 120000,
-      max_tokens: 32768,
-      context_limit: null,
-      retry_attempts: 3,
-      retry_base_delay_ms: 800,
-      stream: true,
-      thinking: null
-    },
-    anthropic: {
-      base_url: "https://api.anthropic.com/v1",
-      api_key_env: "ANTHROPIC_API_KEY",
-      default_model: "claude-opus-4-6",
-      models: ["claude-sonnet-4-5", "claude-sonnet-4-6", "claude-haiku-4-5-20251001", "claude-opus-4-6"],
-      timeout_ms: 120000,
-      stream_idle_timeout_ms: 120000,
-      max_tokens: 32768,
-      context_limit: null,
-      retry_attempts: 3,
-      retry_base_delay_ms: 800,
-      stream: true,
-      thinking: null
-    },
-    ollama: {
-      base_url: "http://localhost:11434",
-      api_key_env: "",
-      default_model: "llama3.1",
-      timeout_ms: 300000,
-      stream_idle_timeout_ms: 300000,
-      max_tokens: 32768,
-      context_limit: null,
-      retry_attempts: 1,
-      retry_base_delay_ms: 1000,
-      stream: true,
-      thinking: null
-    },
-    model_context: {}
-  },
-  agent: {
-    default_mode: "agent",
-    max_steps: 8,
-    longagent: {
-      max_iterations: 0,
-      no_progress_warning: 3,
-      no_progress_limit: 5,
-      max_stage_recoveries: 3,
-      heartbeat_timeout_ms: 120000,
-      checkpoint_interval: 5,
-      lock_timeout_ms: 5000,
-      parallel: {
-        enabled: true,
-        max_concurrency: 3,
-        stage_pass_rule: "all_success",
-        task_timeout_ms: 600000,
-        task_max_retries: 2,
-        poll_interval_ms: 300
-      },
-      planner: {
-        intake_questions: {
-          enabled: true,
-          max_rounds: 6
-        },
-        ask_user_after_plan_frozen: false
-      },
-      four_stage: {
-        enabled: false,
-        preview_max_iterations: 10,
-        blueprint_max_iterations: 10,
-        coding_max_iterations: 50,
-        debugging_max_iterations: 20,
-        separate_models: {
-          enabled: false,
-          preview_model: null,
-          blueprint_model: null,
-          coding_model: null,
-          debugging_model: null
-        }
-      },
-      hybrid: {
-        enabled: true,
-        intake: true,
-        completion_validation: true,
-        debugging_max_iterations: 20,
-        max_coding_rollbacks: 2,
-        parallel_preview: true,
-        blueprint_review: false,
-        blueprint_validation: true,
-        tdd_mode: false,
-        cross_review: true,
-        incremental_gates: true,
-        context_pressure_limit: 8000,
-        budget_awareness: true,
-        checkpoint_resume: true,
-        project_memory: true,
-        task_bus: true,
-        coding_phase_timeout_ms: 1800000,
-        debugging_phase_timeout_ms: 600000,
-        checkpoint_max_keep: 10,
-        checkpoint_cleanup: true,
-        degradation: {
-          enabled: true,
-          fallback_model: null,
-          skip_non_critical: true
-        },
-        separate_models: {
-          enabled: false,
-          preview_model: null,
-          blueprint_model: null,
-          debugging_model: null
-        },
-        adaptive_models: {
-          enabled: false,
-          low: null,
-          medium: null,
-          high: null
-        }
-      },
-      resume_incomplete_files: true,
-      scaffold: {
-        enabled: true
-      },
-      git: {
-        enabled: "ask",
-        auto_branch: true,
-        auto_commit_stages: true,
-        auto_merge: true,
-        branch_prefix: "kkcode"
-      },
-      usability_gates: {
-        prompt_user: "first_run",
-        build: { enabled: true },
-        test: { enabled: true },
-        review: { enabled: true },
-        health: { enabled: true },
-        budget: { enabled: true }
-      }
-    },
-    subagents: {},
-    routing: {
-      categories: {}
-    }
-  },
-  mcp: {
-    servers: {},
-    auto_discover: true,
-    timeout_ms: 30000,
-    max_reconnect_attempts: 5,
-    circuit_reset_ms: 60000,
-    health_check_interval_ms: 0,
-    max_buffer_bytes: 16777216,
-    shutdown_timeout_ms: 5000,
-    max_sse_buffer_bytes: 4194304
-  },
-  skills: {
-    enabled: true,
-    dirs: [".kkcode/skills"],
-    allowed_commands: []
-  },
-  permission: {
-    default_policy: "ask",
-    non_tty_default: "deny",
-    rules: []
-  },
-  storage: {
-    session_shard_enabled: true,
-    flush_interval_ms: 1000,
-    event_rotate_mb: 32,
-    event_retain_days: 14
-  },
-  background: {
-    mode: "worker_process",
-    worker_timeout_ms: 900000,
-    max_parallel: 2,
-    max_log_lines: 300
-  },
-  runtime: {
-    tool_registry_cache_ttl_ms: 30000,
-    mcp_refresh_ttl_ms: 60000
-  },
-  tool: {
-    sources: {
-      builtin: true,
-      local: true,
-      mcp: true,
-      plugin: true
-    },
-    bash_timeout_ms: 120000,
-    write_lock: {
-      mode: "file_lock",
-      wait_timeout_ms: 120000
-    },
-    local_dirs: [".kkcode/tools", ".kkcode/tool"],
-    plugin_dirs: [".kkcode/plugins", ".kkcode/plugin"]
-  },
-  session: {
-    max_history: 30,
-    recovery: true,
-    compaction_threshold_ratio: 0.7,
-    compaction_threshold_messages: 50,
-    context_cache_points: true
-  },
-  review: {
-    sort: "risk_first",
-    default_lines: 80,
-    max_expand_lines: 1200,
-    risk_weights: {
-      sensitive_path: 4,
-      large_change: 3,
-      medium_change: 2,
-      small_change: 1,
-      executable_script: 2,
-      command_pattern: 3
-    }
-  },
-  usage: {
-    pricing_file: null,
-    aggregation: ["turn", "session", "global"],
-    budget: {
-      session_usd: null,
-      global_usd: null,
-      warn_at_percent: 80,
-      strategy: "warn"
-    }
-  },
-  ui: {
-    theme_file: null,
-    mode_colors: {
-      ask: "#8da3b9",
-      plan: "#00b7c2",
-      agent: "#2ac26f",
-      longagent: "#ff7a33"
-    },
-    layout: "compact",
-    markdown_render: true,
-    status: {
-      show_cost: true,
-      show_token_meter: true
-    }
-  }
-}
-
-export const VALID_PROVIDER_TYPES = ["openai", "anthropic", "ollama", "openai-compatible"]
-
-import { listProviders } from "../provider/router.mjs"
-export function getValidProviderTypes() {
-  return listProviders()
-}
-export const VALID_MODES = ["ask", "plan", "agent", "longagent"]
-export const VALID_REVIEW_SORT = ["risk_first", "time_order", "file_order"]
-export const VALID_LANGUAGES = ["en", "zh"]
+export const DEFAULT_CONFIG = {
+  language: "en",
+  provider: {
+    default: "openai",
+    strict_mode: false,
+    openai: {
+      base_url: "https://api.openai.com/v1",
+      api_key_env: "OPENAI_API_KEY",
+      default_model: "gpt-5.3-codex",
+      models: ["gpt-5.3-codex", "gpt-5.2"],
+      timeout_ms: 120000,
+      stream_idle_timeout_ms: 120000,
+      max_tokens: 32768,
+      context_limit: null,
+      retry_attempts: 3,
+      retry_base_delay_ms: 800,
+      stream: true,
+      thinking: null
+    },
+    anthropic: {
+      base_url: "https://api.anthropic.com/v1",
+      api_key_env: "ANTHROPIC_API_KEY",
+      default_model: "claude-opus-4-6",
+      models: ["claude-sonnet-4-5", "claude-sonnet-4-6", "claude-haiku-4-5-20251001", "claude-opus-4-6"],
+      timeout_ms: 120000,
+      stream_idle_timeout_ms: 120000,
+      max_tokens: 32768,
+      context_limit: null,
+      retry_attempts: 3,
+      retry_base_delay_ms: 800,
+      stream: true,
+      thinking: null
+    },
+    ollama: {
+      base_url: "http://localhost:11434",
+      api_key_env: "",
+      default_model: "llama3.1",
+      timeout_ms: 300000,
+      stream_idle_timeout_ms: 300000,
+      max_tokens: 32768,
+      context_limit: null,
+      retry_attempts: 1,
+      retry_base_delay_ms: 1000,
+      stream: true,
+      thinking: null
+    },
+    model_context: {}
+  },
+  agent: {
+    default_mode: "assistant",
+    max_steps: 8,
+    longagent: {
+      max_iterations: 0,
+      no_progress_warning: 3,
+      no_progress_limit: 5,
+      max_stage_recoveries: 3,
+      heartbeat_timeout_ms: 120000,
+      checkpoint_interval: 5,
+      lock_timeout_ms: 5000,
+      parallel: {
+        enabled: true,
+        max_concurrency: 3,
+        stage_pass_rule: "all_success",
+        task_timeout_ms: 600000,
+        task_max_retries: 2,
+        poll_interval_ms: 300
+      },
+      planner: {
+        intake_questions: {
+          enabled: true,
+          max_rounds: 6
+        },
+        ask_user_after_plan_frozen: false
+      },
+      four_stage: {
+        enabled: false,
+        preview_max_iterations: 10,
+        blueprint_max_iterations: 10,
+        coding_max_iterations: 50,
+        debugging_max_iterations: 20,
+        separate_models: {
+          enabled: false,
+          preview_model: null,
+          blueprint_model: null,
+          coding_model: null,
+          debugging_model: null
+        }
+      },
+      hybrid: {
+        enabled: true,
+        intake: true,
+        completion_validation: true,
+        debugging_max_iterations: 20,
+        max_coding_rollbacks: 2,
+        parallel_preview: true,
+        blueprint_review: false,
+        blueprint_validation: true,
+        tdd_mode: false,
+        cross_review: true,
+        incremental_gates: true,
+        context_pressure_limit: 8000,
+        budget_awareness: true,
+        checkpoint_resume: true,
+        project_memory: true,
+        task_bus: true,
+        coding_phase_timeout_ms: 1800000,
+        debugging_phase_timeout_ms: 600000,
+        checkpoint_max_keep: 10,
+        checkpoint_cleanup: true,
+        degradation: {
+          enabled: true,
+          fallback_model: null,
+          skip_non_critical: true
+        },
+        separate_models: {
+          enabled: false,
+          preview_model: null,
+          blueprint_model: null,
+          debugging_model: null
+        },
+        adaptive_models: {
+          enabled: false,
+          low: null,
+          medium: null,
+          high: null
+        }
+      },
+      resume_incomplete_files: true,
+      scaffold: {
+        enabled: true
+      },
+      git: {
+        enabled: "ask",
+        auto_branch: true,
+        auto_commit_stages: true,
+        auto_merge: true,
+        branch_prefix: "kkcode"
+      },
+      usability_gates: {
+        prompt_user: "first_run",
+        build: { enabled: true },
+        test: { enabled: true },
+        review: { enabled: true },
+        health: { enabled: true },
+        budget: { enabled: true }
+      }
+    },
+    subagents: {},
+    routing: {
+      categories: {}
+    }
+  },
+  mcp: {
+    servers: {},
+    auto_discover: true,
+    timeout_ms: 30000,
+    max_reconnect_attempts: 5,
+    circuit_reset_ms: 60000,
+    health_check_interval_ms: 0,
+    max_buffer_bytes: 16777216,
+    shutdown_timeout_ms: 5000,
+    max_sse_buffer_bytes: 4194304
+  },
+  skills: {
+    enabled: true,
+    auto_seed: true,
+    dirs: [".kkcode/skills"],
+    allowed_commands: []
+  },
+  permission: {
+    mode: "auto",
+    default_policy: "ask",
+    non_tty_default: "deny",
+    rules: []
+  },
+  storage: {
+    session_shard_enabled: true,
+    flush_interval_ms: 1000,
+    event_rotate_mb: 32,
+    event_retain_days: 14
+  },
+  background: {
+    mode: "worker_process",
+    worker_timeout_ms: 900000,
+    max_parallel: 2,
+    max_log_lines: 300
+  },
+  runtime: {
+    tool_registry_cache_ttl_ms: 30000,
+    mcp_refresh_ttl_ms: 60000
+  },
+  tool: {
+    sources: {
+      builtin: true,
+      local: true,
+      mcp: true,
+      plugin: true
+    },
+    bash_timeout_ms: 120000,
+    write_lock: {
+      mode: "file_lock",
+      wait_timeout_ms: 120000
+    },
+    sensitive_file_patterns: [
+      "AGENTS.md",
+      "**/AGENTS.md",
+      "KKCODE.md",
+      "**/KKCODE.md",
+      ".kkcode/**",
+      "**/.kkcode/**",
+      "kkcode.config.yaml",
+      "**/kkcode.config.yaml",
+      ".mcp.json",
+      "**/.mcp.json",
+      ".env",
+      ".env.*",
+      "**/.env",
+      "**/.env.*",
+      ".github/workflows/**",
+      "**/.github/workflows/**"
+    ],
+    local_dirs: [".kkcode/tools", ".kkcode/tool"],
+    plugin_dirs: [".kkcode/plugins", ".kkcode/plugin"]
+  },
+  session: {
+    max_history: 30,
+    recovery: true,
+    compaction_threshold_ratio: 0.7,
+    compaction_threshold_messages: 50,
+    context_cache_points: true
+  },
+  review: {
+    sort: "risk_first",
+    default_lines: 80,
+    max_expand_lines: 1200,
+    risk_weights: {
+      sensitive_path: 4,
+      large_change: 3,
+      medium_change: 2,
+      small_change: 1,
+      executable_script: 2,
+      command_pattern: 3
+    }
+  },
+  usage: {
+    pricing_file: null,
+    aggregation: ["turn", "session", "global"],
+    budget: {
+      session_usd: null,
+      global_usd: null,
+      warn_at_percent: 80,
+      strategy: "warn"
+    }
+  },
+  ui: {
+    theme_file: null,
+    mode_colors: {
+      assistant: "#22d3ee",
+      plan: "#00b7c2",
+      agent: "#2ac26f",
+      longagent: "#ff7a33"
+    },
+    layout: "compact",
+    markdown_render: true,
+    status: {
+      show_cost: true,
+      show_token_meter: true
+    }
+  }
+}
+
+export const VALID_PROVIDER_TYPES = ["openai", "anthropic", "ollama", "openai-compatible"]
+
+import { listProviders } from "../provider/router.mjs"
+export function getValidProviderTypes() {
+  return listProviders()
+}
+export const VALID_MODES = ["assistant", "plan", "agent", "code", "coding", "longagent"]
+export const VALID_REVIEW_SORT = ["risk_first", "time_order", "file_order"]
+export const VALID_LANGUAGES = ["en", "zh"]

package/src/config/import-config.mjs

@@ -73,4 +73,4 @@ export function importConfig(input = {}) {
   }
 
   return next
-}
+}

package/src/config/load-config.mjs

@@ -3,7 +3,7 @@ import { access, readFile } from "node:fs/promises"
 import YAML from "yaml"
 import { DEFAULT_CONFIG } from "./defaults.mjs"
 import { validateConfig } from "./schema.mjs"
-import { projectConfigCandidates, userConfigCandidates } from "../storage/paths.mjs"
+import { projectConfigCandidates, userConfigCandidates, envFileCandidates } from "../storage/paths.mjs"
 
 async function exists(file) {
   try {
@@ -38,6 +38,46 @@ async function firstExisting(candidates) {
   return null
 }
 
+/**
+ * Parse .env file — only extract KKCODE_ prefixed vars into nested config.
+ * Uses __ (double underscore) as nesting separator, single _ stays in key name.
+ *
+ * KKCODE_PROVIDER__DEFAULT=anthropic → { provider: { default: "anthropic" } }
+ * KKCODE_AGENT__LONGAGENT__PARALLEL__MAX_CONCURRENCY=5 → { agent: { longagent: { parallel: { max_concurrency: 5 } } } }
+ * KKCODE_LANGUAGE=zh → { language: "zh" }
+ */
+export function parseEnvOverlay(content) {
+  const config = {}
+  for (const line of content.split("\n")) {
+    const trimmed = line.trim()
+    if (!trimmed || trimmed.startsWith("#")) continue
+    const eqIdx = trimmed.indexOf("=")
+    if (eqIdx <= 0) continue
+    const key = trimmed.slice(0, eqIdx).trim()
+    if (!key.startsWith("KKCODE_")) continue
+    let val = trimmed.slice(eqIdx + 1).trim()
+    // strip surrounding quotes
+    if ((val.startsWith('"') && val.endsWith('"')) || (val.startsWith("'") && val.endsWith("'"))) {
+      val = val.slice(1, -1)
+    }
+    // split on __ for nesting, lowercase each part
+    const parts = key.slice(7).split("__").map(p => p.toLowerCase())
+    // coerce types
+    let typed = val
+    if (val === "true") typed = true
+    else if (val === "false") typed = false
+    else if (val !== "" && !isNaN(val)) typed = Number(val)
+
+    let cursor = config
+    for (let i = 0; i < parts.length - 1; i++) {
+      if (!cursor[parts[i]] || typeof cursor[parts[i]] !== "object") cursor[parts[i]] = {}
+      cursor = cursor[parts[i]]
+    }
+    cursor[parts[parts.length - 1]] = typed
+  }
+  return config
+}
+
 async function loadOne(filePath) {
   if (!filePath) return { config: {}, errors: [] }
   try {
@@ -57,7 +97,22 @@ export async function loadConfig(cwd = process.cwd()) {
 
   const userLoaded = await loadOne(userPath)
   const projectLoaded = await loadOne(projectPath)
-  const merged = mergeObject(mergeObject(DEFAULT_CONFIG, userLoaded.config), projectLoaded.config)
+  let merged = mergeObject(mergeObject(DEFAULT_CONFIG, userLoaded.config), projectLoaded.config)
+
+  // .env overlay — highest priority, KKCODE_ prefixed vars
+  let envPath = null
+  let envOverlay = {}
+  const envCandidate = await firstExisting(envFileCandidates(cwd))
+  if (envCandidate) {
+    try {
+      const raw = await readFile(envCandidate, "utf8")
+      envOverlay = parseEnvOverlay(raw)
+      if (Object.keys(envOverlay).length > 0) {
+        envPath = envCandidate
+        merged = mergeObject(merged, envOverlay)
+      }
+    } catch { /* ignore unreadable .env */ }
+  }
 
   const source = {
     userPath,
@@ -65,7 +120,9 @@ export async function loadConfig(cwd = process.cwd()) {
     userRaw: userLoaded.config,
     projectPath,
     projectDir: projectPath ? path.dirname(projectPath) : null,
-    projectRaw: projectLoaded.config
+    projectRaw: projectLoaded.config,
+    envPath,
+    envOverlay
   }
 
   return {
@@ -73,4 +130,4 @@ export async function loadConfig(cwd = process.cwd()) {
     source,
     errors: [...userLoaded.errors, ...projectLoaded.errors]
   }
-}
+}