@kkelly-offical/kkcode 0.1.3 → 0.1.7

package/src/storage/ghost-commit-store.mjs

@@ -6,6 +6,9 @@ const GHOST_COMMIT_DIR = "ghost-commits"
 const MAX_GHOST_COMMITS_PER_REPO = 50 // 每个仓库最多保留的幽灵提交数
 const GHOST_COMMIT_TTL_MS = 7 * 24 * 60 * 60 * 1000 // 7天过期
 
+// 防止并发 cleanup 竞态：per-repo 锁
+const cleanupLocks = new Map()
+
 /**
  * Ghost Commit 存储管理
  * 
@@ -152,16 +155,23 @@ export async function deleteGhostCommit(repoPath, ghostCommitId) {
  * @param {string} repoPath - 仓库路径
  */
 export async function cleanupOldGhostCommits(repoPath) {
-  const commits = await listGhostCommits(repoPath, { includeExpired: true })
+  // 同一 repo 的 cleanup 串行化，防止并发竞态
+  if (cleanupLocks.get(repoPath)) return
+  cleanupLocks.set(repoPath, true)
+  try {
+    const commits = await listGhostCommits(repoPath, { includeExpired: true })
 
-  if (commits.length <= MAX_GHOST_COMMITS_PER_REPO) {
-    return
-  }
+    if (commits.length <= MAX_GHOST_COMMITS_PER_REPO) {
+      return
+    }
 
-  // 删除多余的旧提交
-  const toDelete = commits.slice(MAX_GHOST_COMMITS_PER_REPO)
-  for (const commit of toDelete) {
-    await deleteGhostCommit(repoPath, commit.id)
+    // 删除多余的旧提交
+    const toDelete = commits.slice(MAX_GHOST_COMMITS_PER_REPO)
+    for (const commit of toDelete) {
+      await deleteGhostCommit(repoPath, commit.id)
+    }
+  } finally {
+    cleanupLocks.delete(repoPath)
   }
 }
 

package/src/tool/executor.mjs

@@ -2,6 +2,10 @@ import { makeToolResult } from "../core/types.mjs"
 import { EventBus } from "../core/events.mjs"
 import { EVENT_TYPES } from "../core/constants.mjs"
 import { withAudit } from "./audit-wrapper.mjs"
+import { autoSnapshotBeforeEdit } from "../session/checkpoint.mjs"
+
+const FILE_EDIT_TOOLS = new Set(["write", "edit", "multiedit", "patch", "notebookedit"])
+const snapshotted = new Set()
 
 export async function executeTool({ tool, args, sessionId, turnId, context, signal = null }) {
   return withAudit({
@@ -44,6 +48,13 @@ export async function executeTool({ tool, args, sessionId, turnId, context, sign
           return cancelled
         }
 
+        // Auto snapshot before first file edit per turn
+        if (FILE_EDIT_TOOLS.has(tool.name) && !snapshotted.has(turnId)) {
+          snapshotted.add(turnId)
+          if (snapshotted.size > 200) snapshotted.clear()
+          autoSnapshotBeforeEdit(sessionId, context.cwd, context.config).catch(() => {})
+        }
+
         const raw = await tool.execute(args || {}, context)
         let output = ""
         let metadata = {}

package/src/tool/git-auto.mjs

@@ -524,22 +524,3 @@ export async function getLastSnapshotId(sessionId) {
   return state.lastSnapshotId
 }
 
-/**
- * 在修改前自动创建快照（如果配置启用）
- */
-export async function autoSnapshotBeforeEdit(sessionId, cwd, config = {}) {
-  if (!config.git_auto?.enabled || !config.git_auto?.auto_snapshot) {
-    return { skipped: true, reason: "auto_snapshot_disabled" }
-  }
-
-  if (!(await isGitRepo(cwd))) {
-    return { skipped: true, reason: "not_a_git_repo" }
-  }
-
-  const result = await gitSnapshotTool.execute(
-    { auto: true, message: "Auto snapshot before AI edit" },
-    { cwd, sessionId }
-  )
-
-  return result
-}

package/src/tool/question-prompt.mjs

@@ -1,86 +1,93 @@
-import { stdin as input, stdout as output } from "node:process"
-import { createInterface } from "node:readline/promises"
-
-let customPromptHandler = null
-
-export function setQuestionPromptHandler(handler) {
-  customPromptHandler = typeof handler === "function" ? handler : null
-}
-
-export async function askQuestionInteractive({ questions }) {
-  if (!Array.isArray(questions) || questions.length === 0) {
-    return {}
-  }
-
-  // 1. TUI handler (registered by repl.mjs)
-  if (customPromptHandler) {
-    const answers = await customPromptHandler({ questions })
-    if (answers && typeof answers === "object") return answers
-  }
-
-  // 2. Non-TTY: return empty answers
-  if (!process.stdout.isTTY || !process.stdin.isTTY) {
-    return Object.fromEntries(questions.map((q) => [q.id, ""]))
-  }
-
-  // 3. TTY fallback: readline sequential Q&A
-  const rl = createInterface({ input, output })
-  const answers = {}
-  try {
-    for (const q of questions) {
-      console.log("")
-      console.log(`  ${q.text}`)
-      if (q.description) console.log(`  ${q.description}`)
-      const options = Array.isArray(q.options) ? q.options : []
-      if (options.length) {
-        for (let i = 0; i < options.length; i++) {
-          const opt = options[i]
-          console.log(`    ${i + 1}. ${opt.label}`)
-          if (opt.description) console.log(`       ${opt.description}`)
-        }
-        if (q.allowCustom !== false) {
-          console.log(`    ${options.length + 1}. Custom...`)
-        }
-      }
-      const raw = (await rl.question("  > ")).trim()
-      if (options.length) {
-        const idx = parseInt(raw, 10)
-        if (idx >= 1 && idx <= options.length) {
-          const chosen = options[idx - 1]
-          answers[q.id] = chosen.value || chosen.label
-        } else {
-          answers[q.id] = raw
-        }
-      } else {
-        answers[q.id] = raw
-      }
-    }
-  } finally {
-    rl.close()
-  }
-  return answers
-}
-
-export async function askPlanApproval({ plan, files = [] }) {
-  const fileList = files.length ? `\nFiles to modify:\n${files.map(f => `  - ${f}`).join("\n")}` : ""
-  const questions = [
-    {
-      id: "plan_approval",
-      text: `Plan Review`,
-      description: `${plan}${fileList}`,
-      options: [
-        { label: "Approve", value: "approve", description: "Proceed with this plan" },
-        { label: "Reject", value: "reject", description: "Reject and provide feedback" }
-      ],
-      multi: false,
-      allowCustom: true
-    }
-  ]
-  const answers = await askQuestionInteractive({ questions })
-  const answer = String(answers.plan_approval || "").trim().toLowerCase()
-  if (answer === "approve" || answer === "1") {
-    return { approved: true, feedback: "" }
-  }
-  const feedback = answer === "reject" || answer === "2" ? "" : answer
-  return { approved: false, feedback }
-}
+import { stdin as input, stdout as output } from "node:process"
+import { createInterface } from "node:readline/promises"
+
+let customPromptHandler = null
+
+export function setQuestionPromptHandler(handler) {
+  customPromptHandler = typeof handler === "function" ? handler : null
+}
+
+export async function askQuestionInteractive({ questions }) {
+  if (!Array.isArray(questions) || questions.length === 0) {
+    return {}
+  }
+
+  // 1. TUI handler (registered by repl.mjs)
+  if (customPromptHandler) {
+    const answers = await customPromptHandler({ questions })
+    if (answers && typeof answers === "object") return answers
+  }
+
+  // 2. Non-TTY: return empty answers
+  if (!process.stdout.isTTY || !process.stdin.isTTY) {
+    return Object.fromEntries(questions.map((q) => [q.id, ""]))
+  }
+
+  // 3. TTY fallback: readline sequential Q&A
+  const rl = createInterface({ input, output })
+  const answers = {}
+  try {
+    for (const q of questions) {
+      console.log("")
+      console.log(`  ${q.text}`)
+      if (q.description) console.log(`  ${q.description}`)
+      const options = Array.isArray(q.options) ? q.options : []
+      if (options.length) {
+        for (let i = 0; i < options.length; i++) {
+          const opt = options[i]
+          console.log(`    ${i + 1}. ${opt.label}`)
+          if (opt.description) console.log(`       ${opt.description}`)
+        }
+        if (q.allowCustom !== false) {
+          console.log(`    ${options.length + 1}. Custom...`)
+        }
+      }
+      const raw = (await rl.question("  > ")).trim()
+      if (options.length) {
+        const idx = parseInt(raw, 10)
+        if (idx >= 1 && idx <= options.length) {
+          const chosen = options[idx - 1]
+          answers[q.id] = chosen.value || chosen.label
+        } else {
+          answers[q.id] = raw
+        }
+      } else {
+        answers[q.id] = raw
+      }
+    }
+  } finally {
+    rl.close()
+  }
+  return answers
+}
+
+export async function askPlanApproval({ plan, files = [] }) {
+  const fileList = files.length ? `\nFiles to modify:\n${files.map(f => `  - ${f}`).join("\n")}` : ""
+  const questions = [
+    {
+      id: "plan_approval",
+      text: `Plan Review`,
+      description: `${plan}${fileList}`,
+      options: [
+        { label: "Approve", value: "approve", description: "Proceed with this plan" },
+        { label: "Request Changes", value: "changes", description: "Revise and resubmit with feedback" },
+        { label: "Reject", value: "reject", description: "Cancel this plan entirely" }
+      ],
+      multi: false,
+      allowCustom: true
+    }
+  ]
+  const answers = await askQuestionInteractive({ questions })
+  const answer = String(answers.plan_approval || "").trim().toLowerCase()
+  if (answer === "approve" || answer === "1") {
+    return { approved: true, requestChanges: false, feedback: "" }
+  }
+  if (answer === "changes" || answer === "2") {
+    return { approved: false, requestChanges: true, feedback: "" }
+  }
+  if (answer === "reject" || answer === "3") {
+    return { approved: false, requestChanges: false, feedback: "" }
+  }
+  // Custom text input: treat as "request changes" with the text as feedback
+  return { approved: false, requestChanges: true, feedback: answer }
+}

package/src/tool/registry.mjs

@@ -1,7 +1,7 @@
 import path from "node:path"
 import { readdir, readFile } from "node:fs/promises"
 import { access, stat, unlink } from "node:fs/promises"
-import { exec as execCb } from "node:child_process"
+import { exec as execCb, spawn } from "node:child_process"
 import { promisify } from "node:util"
 import { pathToFileURL } from "node:url"
 import { atomicWriteFile, replaceInFileTransactional, replaceAllInFileTransactional, diffLineCount } from "./edit-transaction.mjs"
@@ -23,7 +23,8 @@ const state = {
   loadedAt: 0,
   lastSignature: "",
   lastCwd: "",
-  lastConfig: null
+  lastConfig: null,
+  refreshing: false
 }
 
 function schema(type, description) {
@@ -70,16 +71,37 @@ function wasFileRead(filePath) {
   return fileReadTracker.has(filePath)
 }
 
+function runRg(args, cwd, timeoutMs = 30000) {
+  return new Promise((resolve) => {
+    let stdout = "", stderr = "", done = false
+    const child = spawn("rg", ["--no-config", ...args], {
+      cwd, windowsHide: true, stdio: ["ignore", "pipe", "pipe"]
+    })
+    const timer = setTimeout(() => {
+      if (done) return
+      done = true
+      child.kill("SIGTERM")
+      setTimeout(() => { try { child.kill("SIGKILL") } catch {} }, 2000).unref()
+      resolve({ ok: false, stdout, stderr: "search timed out" })
+    }, timeoutMs)
+    child.stdout.on("data", (b) => { stdout += b })
+    child.stderr.on("data", (b) => { stderr += b })
+    child.on("error", (e) => {
+      if (done) return; done = true; clearTimeout(timer)
+      resolve({ ok: false, stdout, stderr: e.message })
+    })
+    child.on("close", (code) => {
+      if (done) return; done = true; clearTimeout(timer)
+      resolve({ ok: code === 0 || code === 1, stdout: stdout.trim(), stderr: stderr.trim() })
+    })
+  })
+}
+
 async function runGlob(pattern, cwd, searchPath) {
   if (!pattern) return "pattern is required"
-  const escaped = pattern.replace(/"/g, '\\"')
   const target = searchPath ? path.resolve(cwd, searchPath) : "."
-  const command = `rg --files --glob "${escaped}" "${target}"`
-  const out = await exec(command, { cwd, timeout: 15000, encoding: "utf8" }).catch((error) => ({
-    stdout: error.stdout ?? "",
-    stderr: error.stderr ?? error.message
-  }))
-  const text = `${out.stdout || ""}`.trim()
+  const { stdout } = await runRg(["--files", "--glob", pattern, target], cwd, 15000)
+  const text = stdout.trim()
   if (!text) return "no files matched"
   const lines = text.split("\n").filter(Boolean)
   if (lines.length > 200) {
@@ -90,31 +112,23 @@ async function runGlob(pattern, cwd, searchPath) {
 
 async function runGrep(pattern, cwd, options = {}) {
   if (!pattern) return "pattern is required"
-  const parts = ["rg"]
-  // Output mode
-  if (options.multiline) parts.push("-U", "--multiline-dotall")
-  if (options.outputMode === "count") parts.push("-c")
-  else if (options.outputMode === "files") parts.push("-l")
-  else parts.push("-n") // content mode (default)
-  // Context
-  if (options.beforeContext) parts.push("-B", String(options.beforeContext))
-  if (options.afterContext) parts.push("-A", String(options.afterContext))
-  if (options.context) parts.push("-C", String(options.context))
-  // Filters
-  if (options.type) parts.push("--type", options.type)
-  if (options.glob) parts.push("--glob", `"${options.glob}"`)
-  if (options.maxCount) parts.push("-m", String(options.maxCount))
-  if (options.ignoreCase) parts.push("-i")
-  const escaped = process.platform === "win32" ? `"${pattern}"` : `'${pattern}'`
-  const target = options.path ? `"${path.resolve(cwd, options.path)}"` : "."
-  parts.push(escaped, target)
-  const command = parts.join(" ")
-  const out = await exec(command, { cwd, timeout: 30000, encoding: "utf8" }).catch((error) => ({
-    stdout: error.stdout ?? "",
-    stderr: error.stderr ?? error.message
-  }))
-  let text = `${out.stdout || ""}${out.stderr || ""}`.trim()
-  // Post-process: offset + head_limit for pagination
+  const args = []
+  if (options.multiline) args.push("-U", "--multiline-dotall")
+  if (options.outputMode === "count") args.push("-c")
+  else if (options.outputMode === "files") args.push("-l")
+  else args.push("-n")
+  if (options.beforeContext) args.push("-B", String(options.beforeContext))
+  if (options.afterContext) args.push("-A", String(options.afterContext))
+  if (options.context) args.push("-C", String(options.context))
+  if (options.type) args.push("--type", options.type)
+  if (options.glob) args.push("--glob", options.glob)
+  if (options.maxCount) args.push("-m", String(options.maxCount))
+  if (options.ignoreCase) args.push("-i")
+  args.push(pattern)
+  args.push(options.path ? path.resolve(cwd, options.path) : ".")
+  const { stdout, stderr } = await runRg(args, cwd)
+  let text = stdout.trim()
+  if (!text && stderr) text = `[search error] ${stderr}`
   if (text && (options.offset || options.headLimit)) {
     const lines = text.split("\n")
     const start = options.offset || 0
@@ -566,7 +580,8 @@ function builtinTools(config) {
     },
     async execute(args, ctx) {
       const command = String(args.command || "")
-      const timeoutMs = Math.min(Math.max(Number(args.timeout) || BASH_TIMEOUT_MS, 1000), 600_000)
+      const configBashTimeout = Number(ctx.config?.tool?.bash_timeout_ms || BASH_TIMEOUT_MS)
+      const timeoutMs = Math.min(Math.max(Number(args.timeout) || configBashTimeout, 1000), 600_000)
 
       // 执行策略检查
       const policyCheck = checkBashAllowed(command, ctx.config)
@@ -1206,8 +1221,14 @@ function mcpTools() {
     description: `[mcp:${tool.server}] ${tool.description}`,
     inputSchema: tool.inputSchema,
     async execute(args, ctx) {
-      const result = await McpRegistry.callTool(tool.id, args || {}, ctx.signal || null)
-      return result.output
+      try {
+        const result = await McpRegistry.callTool(tool.id, args || {}, ctx.signal || null)
+        return result.output
+      } catch (error) {
+        const reason = error.reason || "unknown"
+        const server = error.server || tool.server
+        return `[MCP Error: ${server} ${reason}] ${error.message}`
+      }
     }
   }))
 }
@@ -1305,5 +1326,18 @@ export const ToolRegistry = {
         error: error.message
       }
     }
+  },
+
+  refreshMcpTools() {
+    if (!state.initialized || state.refreshing) return
+    state.refreshing = true
+    try {
+      // Atomic replacement: build new list, then assign once
+      const nonMcp = state.tools.filter((t) => !t.name.startsWith("mcp_"))
+      const newMcpTools = mcpTools()
+      state.tools = [...nonMcp, ...newMcpTools]
+    } finally {
+      state.refreshing = false
+    }
   }
 }