@kkelly-offical/kkcode 0.1.3 → 0.1.7

package/src/provider/sse.mjs

@@ -1,91 +1,104 @@
-/**
- * 将 fetch response.body (ReadableStream) 解析为 SSE 事件的 AsyncIterator。
- * 同时支持 OpenAI（纯 data: 行）和 Anthropic（event: + data: 对）格式。
- *
- * @param {ReadableStream} body
- * @param {AbortSignal} [signal]
- * @param {object} [options]
- * @param {number} [options.idleTimeoutMs] - per-chunk idle timeout (resets on each chunk)
- * @yields {{ event: string|null, data: string }}
- */
-export async function* parseSSE(body, signal, options = {}) {
-  const reader = body.getReader()
-  const decoder = new TextDecoder()
-  let buffer = ""
-  const idleMs = options.idleTimeoutMs || 0
-
-  try {
-    while (true) {
-      if (signal?.aborted) break
-
-      let readResult
-      if (idleMs > 0) {
-        // Race between next chunk and idle timeout
-        readResult = await Promise.race([
-          reader.read(),
-          idleTimeout(idleMs, signal)
-        ])
-      } else {
-        readResult = await reader.read()
-      }
-
-      const { done, value } = readResult
-      if (done) break
-      buffer += decoder.decode(value, { stream: true })
-
-      const parts = buffer.split("\n\n")
-      buffer = parts.pop()
-
-      for (const part of parts) {
-        const result = parsePart(part)
-        if (result === null) return // [DONE]
-        if (result) yield result
-      }
-    }
-    // flush remaining buffer
-    if (buffer.trim()) {
-      const result = parsePart(buffer)
-      if (result && result !== null) yield result
-    }
-  } finally {
-    try { reader.releaseLock() } catch { /* reader may have pending read if generator was force-closed */ }
-  }
-}
-
-function idleTimeout(ms, signal) {
-  return new Promise((resolve, reject) => {
-    const timer = setTimeout(() => {
-      const err = new Error(`stream idle timeout: no data received for ${ms}ms`)
-      err.code = "STREAM_IDLE_TIMEOUT"
-      reject(err)
-    }, ms)
-    if (signal) {
-      const onAbort = () => {
-        clearTimeout(timer)
-        const err = new Error("aborted")
-        err.code = "ABORT_ERR"
-        reject(err)
-      }
-      if (signal.aborted) { clearTimeout(timer); onAbort(); return }
-      signal.addEventListener("abort", onAbort, { once: true })
-    }
-  })
-}
-
-function parsePart(part) {
-  const trimmed = part.trim()
-  if (!trimmed) return undefined
-  let event = null
-  let data = ""
-  for (const line of trimmed.split("\n")) {
-    if (line.startsWith("event:")) {
-      event = line.slice(6).trim()
-    } else if (line.startsWith("data:")) {
-      const payload = line.slice(5).trim()
-      if (payload === "[DONE]") return null
-      data = payload
-    }
-  }
-  if (!data) return undefined
-  return { event, data }
-}
+/**
+ * 将 fetch response.body (ReadableStream) 解析为 SSE 事件的 AsyncIterator。
+ * 同时支持 OpenAI（纯 data: 行）和 Anthropic（event: + data: 对）格式。
+ *
+ * @param {ReadableStream} body
+ * @param {AbortSignal} [signal]
+ * @param {object} [options]
+ * @param {number} [options.idleTimeoutMs] - per-chunk idle timeout (resets on each chunk)
+ * @yields {{ event: string|null, data: string }}
+ */
+export async function* parseSSE(body, signal, options = {}) {
+  const reader = body.getReader()
+  const decoder = new TextDecoder()
+  let buffer = ""
+  const idleMs = options.idleTimeoutMs || 0
+  let currentTimeout = null
+
+  try {
+    while (true) {
+      if (signal?.aborted) break
+
+      let readResult
+      if (idleMs > 0) {
+        if (currentTimeout) currentTimeout.cancel()
+        currentTimeout = idleTimeout(idleMs, signal)
+        readResult = await Promise.race([
+          reader.read(),
+          currentTimeout.promise
+        ])
+      } else {
+        readResult = await reader.read()
+      }
+
+      const { done, value } = readResult
+      if (done) break
+      buffer += decoder.decode(value, { stream: true })
+
+      const parts = buffer.split("\n\n")
+      buffer = parts.pop()
+
+      for (const part of parts) {
+        const result = parsePart(part)
+        if (result === null) return // [DONE]
+        if (result) yield result
+      }
+    }
+    // flush remaining buffer
+    if (buffer.trim()) {
+      const result = parsePart(buffer)
+      if (result && result !== null) yield result
+    }
+  } finally {
+    if (currentTimeout) currentTimeout.cancel()
+    try { reader.releaseLock() } catch { /* reader may have pending read if generator was force-closed */ }
+  }
+}
+
+function idleTimeout(ms, signal) {
+  let timer = null
+  let onAbort = null
+  const promise = new Promise((resolve, reject) => {
+    timer = setTimeout(() => {
+      const err = new Error(`stream idle timeout: no data received for ${ms}ms`)
+      err.code = "STREAM_IDLE_TIMEOUT"
+      reject(err)
+    }, ms)
+    if (signal) {
+      onAbort = () => {
+        clearTimeout(timer)
+        const err = new Error("aborted")
+        err.code = "ABORT_ERR"
+        reject(err)
+      }
+      if (signal.aborted) { clearTimeout(timer); onAbort(); return }
+      signal.addEventListener("abort", onAbort, { once: true })
+    }
+  })
+  function cancel() {
+    if (timer !== null) { clearTimeout(timer); timer = null }
+    if (onAbort && signal) {
+      signal.removeEventListener("abort", onAbort)
+      onAbort = null
+    }
+  }
+  return { promise, cancel }
+}
+
+function parsePart(part) {
+  const trimmed = part.trim()
+  if (!trimmed) return undefined
+  let event = null
+  let data = ""
+  for (const line of trimmed.split("\n")) {
+    if (line.startsWith("event:")) {
+      event = line.slice(6).trim()
+    } else if (line.startsWith("data:")) {
+      const payload = line.slice(5).trim()
+      if (payload === "[DONE]") return null
+      data = payload
+    }
+  }
+  if (!data) return undefined
+  return { event, data }
+}

package/src/repl.mjs

@@ -29,6 +29,7 @@ import { extractImageRefs, buildContentBlocks, readClipboardImage, readClipboard
 import { generateSkill, saveSkillGlobal } from "./skill/generator.mjs"
 import { userConfigCandidates, projectConfigCandidates, memoryFilePath } from "./storage/paths.mjs"
 import { persistTrust, revokeTrust } from "./permission/workspace-trust.mjs"
+import { confirmRollback, executeRollback } from "./session/rollback.mjs"
 
 const HIST_DIR = join(homedir(), ".kkcode")
 const HIST_FILE = join(HIST_DIR, "repl_history")
@@ -88,6 +89,7 @@ const BUILTIN_SLASH = [
   { name: "longagent", desc: "switch to longagent mode" },
   { name: "create-skill", desc: "generate a new skill via AI" },
   { name: "create-agent", desc: "generate a new sub-agent via AI" },
+  { name: "undo", desc: "undo last code changes" },
   { name: "trust", desc: "trust this workspace" },
   { name: "untrust", desc: "revoke workspace trust" },
   { name: "exit", desc: "quit" }
@@ -747,7 +749,9 @@ async function processInputLine({
     else {
       for (const s of sessions) {
         const age = ageLabel(Date.now() - s.updatedAt)
-        print(`  ${s.id.slice(0, 12)}  ${padRight(s.mode, 9)} ${padRight(s.model || "?", 20)} ${padRight(s.status || "-", 14)} ${age}`)
+        const title = s.title || `${s.mode}:${s.model || "?"}`
+        const titleClipped = title.length > 35 ? title.slice(0, 32) + "..." : title
+        print(`  ${s.id.slice(0, 12)}  ${padRight(titleClipped, 36)} ${padRight(s.mode, 9)} ${padRight(s.status || "-", 10)} ${age}`)
       }
     }
     return { exit: false }
@@ -756,12 +760,42 @@ async function processInputLine({
   if (normalized === "/resume" || normalized.startsWith("/resume ") || normalized === "/r" || normalized.startsWith("/r ")) {
     const arg = normalized.replace(/^\/(resume|r)/, "").trim()
     const sessions = await listSessions({ cwd: process.cwd(), limit: 20, includeChildren: false })
+
+    if (!sessions.length) {
+      print("no sessions found in current directory")
+      return { exit: false }
+    }
+
     let target = null
-    if (!arg) target = sessions[0] || null
-    else target = sessions.find((s) => s.id === arg || s.id.startsWith(arg)) || null
+
+    if (!arg) {
+      // Show interactive numbered list
+      print(`\n  Sessions in ${paint(process.cwd(), "cyan")}:\n`)
+      for (let i = 0; i < sessions.length; i++) {
+        const s = sessions[i]
+        const num = paint(`  ${String(i + 1).padStart(2)}.`, "yellow")
+        const title = s.title || `${s.mode}:${s.model || "?"}`
+        const titleClipped = title.length > 45 ? title.slice(0, 42) + "..." : title
+        const age = ageLabel(Date.now() - s.updatedAt)
+        const mode = paint(padRight(s.mode, 9), "cyan")
+        const status = s.status === "active" ? paint("active", "green") : paint(s.status || "-", null, { dim: true })
+        print(`${num} ${padRight(titleClipped, 46)} ${mode} ${padRight(status, 14)} ${paint(age, null, { dim: true })}`)
+      }
+      print(`\n  usage: ${paint("/resume <number>", "yellow")} or ${paint("/resume <session-id>", "yellow")}`)
+      return { exit: false }
+    }
+
+    // Try numeric index first (1-based)
+    const idx = parseInt(arg, 10)
+    if (!Number.isNaN(idx) && idx >= 1 && idx <= sessions.length) {
+      target = sessions[idx - 1]
+    } else {
+      // Fallback to ID prefix match
+      target = sessions.find((s) => s.id === arg || s.id.startsWith(arg)) || null
+    }
 
     if (!target) {
-      print(arg ? `no session matching "${arg}"` : "no sessions to resume")
+      print(`no session matching "${arg}"`)
       return { exit: false }
     }
 
@@ -769,15 +803,33 @@ async function processInputLine({
     state.mode = target.mode || state.mode
     state.providerType = target.providerType || state.providerType
     state.model = target.model || state.model
-    print(`resumed session: ${target.id} (${target.mode}, ${target.model || "?"})`)
+    const title = target.title || `${target.mode}:${target.model || "?"}`
+    print(`resumed: ${paint(title, "cyan")} (${target.mode}, ${target.model || "?"})`)
     const msgs = await getConversationHistory(target.id, 3)
     for (const m of msgs) {
-      const preview = m.content.length > 84 ? `${m.content.slice(0, 84)}...` : m.content
+      const text = typeof m.content === "string" ? m.content : JSON.stringify(m.content)
+      const preview = text.length > 84 ? `${text.slice(0, 84)}...` : text
       print(`  [${m.role}] ${preview}`)
     }
     return { exit: false }
   }
 
+  if (normalized === "/undo") {
+    const language = ctx.configState.config.language || "en"
+    const cwd = process.cwd()
+    const confirmation = await confirmRollback({ cwd, language })
+    print(confirmation.message)
+    if (!confirmation.confirmed) return { exit: false }
+    const result = await executeRollback({
+      cwd,
+      commitHash: confirmation.commitHash,
+      sessionId: state.sessionId,
+      language
+    })
+    print(result.message)
+    return { exit: false }
+  }
+
   if (["/ask", "/plan", "/agent", "/longagent"].includes(normalized)) {
     state.mode = resolveMode(normalized.slice(1))
     print(`mode switched: ${state.mode}`)
@@ -2720,7 +2772,7 @@ function startSplash() {
     "  ╚═╝  ╚═╝ ╚═╝  ╚═╝  ╚═════╝  ╚═════╝  ╚═════╝  ╚══════╝ "
   ]
   const tagline = "AI Coding Agent"
-  const version = "v0.1.3"
+  const version = "v0.1.6"
 
   // Gradient colors for the wave animation (cyan → blue → purple → pink → back)
   const wave = [

package/src/session/checkpoint.mjs

@@ -46,6 +46,71 @@ export async function listCheckpoints(sessionId) {
     .sort()
 }
 
+// ========== Phase 7: Task 级 Checkpoint ==========
+
+export async function saveTaskCheckpoint(sessionId, stageId, taskId, data) {
+  const dir = checkpointDir(sessionId)
+  await mkdir(dir, { recursive: true })
+  const name = `task_${stageId}_${taskId}`
+  const checkpoint = {
+    sessionId,
+    stageId,
+    taskId,
+    savedAt: Date.now(),
+    ...data
+  }
+  await writeJson(checkpointFile(sessionId, name), checkpoint)
+  return checkpoint
+}
+
+export async function loadTaskCheckpoints(sessionId, stageId) {
+  const dir = checkpointDir(sessionId)
+  const files = await readdir(dir, { withFileTypes: true }).catch(() => [])
+  const prefix = `task_${stageId}_`
+  const results = {}
+  for (const entry of files) {
+    if (entry.isFile() && entry.name.startsWith(prefix) && entry.name.endsWith(".json")) {
+      const data = await readJson(path.join(dir, entry.name), null)
+      if (data?.taskId) results[data.taskId] = data
+    }
+  }
+  return results
+}
+
+// ========== Phase 10: Checkpoint 清理策略 ==========
+
+export async function cleanupCheckpoints(sessionId, options = {}) {
+  const maxKeep = options.maxKeep || 10
+  const keepStageCheckpoints = options.keepStageCheckpoints !== false
+  const dir = checkpointDir(sessionId)
+  const all = await listCheckpoints(sessionId)
+  if (all.length <= maxKeep + 1) return { removed: 0 }
+
+  const toKeep = new Set(["latest"])
+  // 保留 stage 级和 task 级 checkpoint
+  if (keepStageCheckpoints) {
+    for (const name of all) {
+      if (name.startsWith("hybrid_stage_") || name.startsWith("task_")) {
+        toKeep.add(name)
+      }
+    }
+  }
+  // 保留最近 maxKeep 个编号 checkpoint
+  const numbered = all.filter(n => n.startsWith("cp_")).sort()
+  for (const n of numbered.slice(-maxKeep)) toKeep.add(n)
+
+  let removed = 0
+  for (const name of all) {
+    if (toKeep.has(name)) continue
+    try {
+      const { unlink: unlinkFile } = await import("node:fs/promises")
+      await unlinkFile(checkpointFile(sessionId, name)).catch(() => {})
+      removed++
+    } catch { /* ignore */ }
+  }
+  return { removed }
+}
+
 // ============================================================================
 // Git Snapshot Integration - AI Agent 自动 Git 快照功能
 // ============================================================================
@@ -61,12 +126,10 @@ export async function listCheckpoints(sessionId) {
  * @returns {Promise<{ok: boolean, snapshot?: Object, skipped?: boolean, reason?: string}>}
  */
 export async function autoSnapshotBeforeEdit(sessionId, cwd, config = {}, options = {}) {
-  // 检查 Git 自动化是否启用
+  // 检查 Git 自动化是否启用（默认启用，只有显式关闭才跳过）
   if (config.git_auto?.enabled === false) {
     return { ok: true, skipped: true, reason: "git_auto_disabled" }
   }
-
-  // 检查自动快照是否启用
   if (config.git_auto?.auto_snapshot === false) {
     return { ok: true, skipped: true, reason: "auto_snapshot_disabled" }
   }