@kkelly-offical/kkcode 0.1.6 → 0.2.1

package/src/theme/status-bar.mjs

@@ -1,158 +1,162 @@
-import { paint } from "./color.mjs"
-
-function formatNumber(value) {
-  return Intl.NumberFormat("en-US").format(Math.round(value))
-}
-
-function formatCost(amount) {
-  if (amount === null || amount === undefined) return "unknown"
-  return `$${amount.toFixed(4)}`
-}
-
-function permissionColor(permission, theme) {
-  switch (permission) {
-    case "allow": return theme.semantic.success || theme.semantic.info
-    case "deny": return theme.semantic.error || theme.semantic.warn
-    case "ask":
-    default:
-      return theme.semantic.info
-  }
-}
-
-function contrastText(hex, dark = "#111111", light = "#f7f7f7") {
-  if (!/^#([A-Fa-f0-9]{6})$/.test(String(hex || ""))) return light
-  const raw = hex.replace("#", "")
-  const r = parseInt(raw.slice(0, 2), 16)
-  const g = parseInt(raw.slice(2, 4), 16)
-  const b = parseInt(raw.slice(4, 6), 16)
-  const y = 0.2126 * r + 0.7152 * g + 0.0722 * b
-  return y > 150 ? dark : light
-}
-
-function badge(text, fg, bg, options = {}) {
-  return paint(` ${text} `, fg, { bg, bold: options.bold !== false })
-}
-
-function clipModel(model, maxLen) {
-  const value = String(model || "")
-  if (value.length <= maxLen) return value
-  if (maxLen < 10) return value.slice(0, maxLen)
-  return `${value.slice(0, Math.max(4, maxLen - 4))}...`
-}
-
-export function renderStatusBar({
-  mode,
-  model,
-  permission,
-  tokenMeter,
-  aggregation = ["turn", "session", "global"],
-  cost,
-  savings = 0,
-  showCost = true,
-  showTokenMeter = true,
-  contextMeter = null,
-  theme,
-  layout = "compact",
-  longagentState = null,
-  memoryLoaded = false
-}) {
-  const width = Number(process.stdout.columns || 120)
-  const dense = width < 110
-  const tight = width < 86
-  const modelLabel = clipModel(model, tight ? 18 : dense ? 28 : 44)
-
-  const segments = []
-  const modeBg = theme.modes[mode] || theme.base.accent
-  segments.push(badge(mode.toUpperCase(), contrastText(modeBg), modeBg))
-  segments.push(badge(`MODEL ${modelLabel}`, theme.base.fg, theme.components.panel || theme.base.border, { bold: false }))
-
-  if (showTokenMeter && tokenMeter) {
-    const t = tokenMeter.turn
-    const s = tokenMeter.session
-    const g = tokenMeter.global
-    const tokenSegments = []
-    if (aggregation.includes("turn")) tokenSegments.push(`T:${formatNumber(t.input + t.output)}`)
-    if (!tight && aggregation.includes("session")) tokenSegments.push(`S:${formatNumber(s.input + s.output)}`)
-    if (!dense && aggregation.includes("global")) tokenSegments.push(`G:${formatNumber(g.input + g.output)}`)
-    const tokenText = `TOKENS ${tokenSegments.join(" ")}${tokenMeter.estimated ? " ~" : ""}`
-    segments.push(
-      badge(tokenText, theme.base.fg, "#2d3748", { bold: false })
-    )
-  }
-  if (showCost) {
-    const savingsStr = savings > 0 ? ` ↓${formatCost(savings)}` : ""
-    segments.push(badge(`COST ${formatCost(cost)}${savingsStr}`, contrastText(theme.semantic.warn), theme.semantic.warn, { bold: false }))
-  }
-  if (contextMeter && Number.isFinite(contextMeter.percent)) {
-    const pct = Math.max(0, Math.min(100, Math.round(contextMeter.percent)))
-    const ctxBg = pct >= 85
-      ? theme.semantic.error
-      : pct >= 70
-        ? theme.semantic.warn
-        : theme.semantic.info
-    let suffix = ""
-    if (contextMeter.cacheRead > 0 || contextMeter.cacheWrite > 0) {
-      const total = (contextMeter.cacheRead || 0) + (contextMeter.cacheWrite || 0) + (contextMeter.inputUncached || 0)
-      const hitPct = total > 0 ? Math.round((contextMeter.cacheRead || 0) / total * 100) : 0
-      suffix = ` Cache:${hitPct}%`
-    }
-    const text = tight ? `CTX ${pct}%` : `CONTEXT ${pct}%${suffix}`
-    segments.push(badge(text, contrastText(ctxBg), ctxBg, { bold: false }))
-  }
-  if (memoryLoaded && !tight) {
-    segments.push(badge("MEM", contrastText(theme.semantic.info), theme.semantic.info, { bold: false }))
-  }
-  const permBg = permissionColor(permission, theme)
-  segments.push(badge(`PERMISSION ${permission.toUpperCase()}`, contrastText(permBg), permBg, { bold: false }))
-  if (longagentState && mode === "longagent") {
-    const parts = []
-    if (longagentState.currentStageId) {
-      parts.push(`STG:${longagentState.currentStageId}`)
-    } else if (Number.isFinite(longagentState.stageIndex) && Number.isFinite(longagentState.stageCount) && longagentState.stageCount > 0) {
-      parts.push(`STG:${longagentState.stageIndex + 1}/${longagentState.stageCount}`)
-    }
-    if (longagentState.stageProgress?.total) {
-      parts.push(`TSK:${longagentState.stageProgress.done || 0}/${longagentState.stageProgress.total}`)
-    }
-    if (Number.isFinite(longagentState.remainingFilesCount)) {
-      parts.push(`REM:${longagentState.remainingFilesCount}`)
-    }
-    if (longagentState.phase) {
-      parts.push(`P:${longagentState.phase}`)
-    }
-    if (longagentState.currentGate) {
-      parts.push(`G:${longagentState.currentGate}`)
-    }
-    if (longagentState.iterations !== undefined) {
-      const iter = longagentState.maxIterations
-        ? `${longagentState.iterations}/${longagentState.maxIterations}`
-        : String(longagentState.iterations)
-      parts.push(`I:${iter}`)
-    }
-    if (!tight && longagentState.progress?.percentage !== null && longagentState.progress?.percentage !== undefined) {
-      const pct = longagentState.progress.percentage
-      const barW = dense ? 8 : 14
-      const filled = Math.round(barW * pct / 100)
-      parts.push(`${"█".repeat(filled)}${"░".repeat(barW - filled)} ${pct}%`)
-    }
-    if (!dense && longagentState.elapsed !== undefined) {
-      const m = Math.floor(longagentState.elapsed / 60)
-      const s = longagentState.elapsed % 60
-      parts.push(`${m}m${s}s`)
-    }
-    if (!tight && Array.isArray(longagentState.lastGateFailures) && longagentState.lastGateFailures.length) {
-      parts.push(`Fail`)
-    }
-    if (!tight && typeof longagentState.recoveryCount === "number" && longagentState.recoveryCount > 0) {
-      parts.push(`R:${longagentState.recoveryCount}`)
-    }
-    if (parts.length) {
-      segments.push(badge(`LONG ${parts.join(" ")}`, contrastText(theme.semantic.success), theme.semantic.success, { bold: false }))
-    }
-  }
-
-  if (layout === "comfortable") {
-    return segments.join("  ")
-  }
-  return segments.join(" ")
-}
+import { paint } from "./color.mjs"
+
+function formatNumber(value) {
+  return Intl.NumberFormat("en-US").format(Math.round(value))
+}
+
+function formatCost(amount) {
+  if (amount === null || amount === undefined) return "unknown"
+  return `$${amount.toFixed(4)}`
+}
+
+function permissionColor(permission, theme) {
+  switch (permission) {
+    case "allow":
+    case "yolo":
+      return theme.semantic.success || theme.semantic.info
+    case "deny": return theme.semantic.error || theme.semantic.warn
+    case "auto": return theme.semantic.warn || theme.semantic.info
+    case "manual":
+    case "ask":
+    default:
+      return theme.semantic.info
+  }
+}
+
+function contrastText(hex, dark = "#111111", light = "#f7f7f7") {
+  if (!/^#([A-Fa-f0-9]{6})$/.test(String(hex || ""))) return light
+  const raw = hex.replace("#", "")
+  const r = parseInt(raw.slice(0, 2), 16)
+  const g = parseInt(raw.slice(2, 4), 16)
+  const b = parseInt(raw.slice(4, 6), 16)
+  const y = 0.2126 * r + 0.7152 * g + 0.0722 * b
+  return y > 150 ? dark : light
+}
+
+function badge(text, fg, bg, options = {}) {
+  return paint(` ${text} `, fg, { bg, bold: options.bold !== false })
+}
+
+function clipModel(model, maxLen) {
+  const value = String(model || "")
+  if (value.length <= maxLen) return value
+  if (maxLen < 10) return value.slice(0, maxLen)
+  return `${value.slice(0, Math.max(4, maxLen - 4))}...`
+}
+
+export function renderStatusBar({
+  mode,
+  model,
+  permission,
+  tokenMeter,
+  aggregation = ["turn", "session", "global"],
+  cost,
+  savings = 0,
+  showCost = true,
+  showTokenMeter = true,
+  contextMeter = null,
+  theme,
+  layout = "compact",
+  longagentState = null,
+  memoryLoaded = false
+}) {
+  const width = Number(process.stdout.columns || 120)
+  const dense = width < 110
+  const tight = width < 86
+  const modelLabel = clipModel(model, tight ? 18 : dense ? 28 : 44)
+
+  const segments = []
+  const modeBg = theme.modes[mode] || theme.base.accent
+  segments.push(badge(mode.toUpperCase(), contrastText(modeBg), modeBg))
+  segments.push(badge(`MODEL ${modelLabel}`, theme.base.fg, theme.components.panel || theme.base.border, { bold: false }))
+
+  if (showTokenMeter && tokenMeter) {
+    const t = tokenMeter.turn
+    const s = tokenMeter.session
+    const g = tokenMeter.global
+    const tokenSegments = []
+    if (aggregation.includes("turn")) tokenSegments.push(`T:${formatNumber(t.input + t.output)}`)
+    if (!tight && aggregation.includes("session")) tokenSegments.push(`S:${formatNumber(s.input + s.output)}`)
+    if (!dense && aggregation.includes("global")) tokenSegments.push(`G:${formatNumber(g.input + g.output)}`)
+    const tokenText = `TOKENS ${tokenSegments.join(" ")}${tokenMeter.estimated ? " ~" : ""}`
+    segments.push(
+      badge(tokenText, theme.base.fg, "#2d3748", { bold: false })
+    )
+  }
+  if (showCost) {
+    const savingsStr = savings > 0 ? ` ↓${formatCost(savings)}` : ""
+    segments.push(badge(`COST ${formatCost(cost)}${savingsStr}`, contrastText(theme.semantic.warn), theme.semantic.warn, { bold: false }))
+  }
+  if (contextMeter && Number.isFinite(contextMeter.percent)) {
+    const pct = Math.max(0, Math.min(100, Math.round(contextMeter.percent)))
+    const ctxBg = pct >= 85
+      ? theme.semantic.error
+      : pct >= 70
+        ? theme.semantic.warn
+        : theme.semantic.info
+    let suffix = ""
+    if (contextMeter.cacheRead > 0 || contextMeter.cacheWrite > 0) {
+      const total = (contextMeter.cacheRead || 0) + (contextMeter.cacheWrite || 0) + (contextMeter.inputUncached || 0)
+      const hitPct = total > 0 ? Math.round((contextMeter.cacheRead || 0) / total * 100) : 0
+      suffix = ` Cache:${hitPct}%`
+    }
+    const text = tight ? `CTX ${pct}%` : `CONTEXT ${pct}%${suffix}`
+    segments.push(badge(text, contrastText(ctxBg), ctxBg, { bold: false }))
+  }
+  if (memoryLoaded && !tight) {
+    segments.push(badge("MEM", contrastText(theme.semantic.info), theme.semantic.info, { bold: false }))
+  }
+  const permBg = permissionColor(permission, theme)
+  segments.push(badge(`PERMISSION ${permission.toUpperCase()}`, contrastText(permBg), permBg, { bold: false }))
+  if (longagentState && mode === "longagent") {
+    const parts = []
+    if (longagentState.currentStageId) {
+      parts.push(`STG:${longagentState.currentStageId}`)
+    } else if (Number.isFinite(longagentState.stageIndex) && Number.isFinite(longagentState.stageCount) && longagentState.stageCount > 0) {
+      parts.push(`STG:${longagentState.stageIndex + 1}/${longagentState.stageCount}`)
+    }
+    if (longagentState.stageProgress?.total) {
+      parts.push(`TSK:${longagentState.stageProgress.done || 0}/${longagentState.stageProgress.total}`)
+    }
+    if (Number.isFinite(longagentState.remainingFilesCount)) {
+      parts.push(`REM:${longagentState.remainingFilesCount}`)
+    }
+    if (longagentState.phase) {
+      parts.push(`P:${longagentState.phase}`)
+    }
+    if (longagentState.currentGate) {
+      parts.push(`G:${longagentState.currentGate}`)
+    }
+    if (longagentState.iterations !== undefined) {
+      const iter = longagentState.maxIterations
+        ? `${longagentState.iterations}/${longagentState.maxIterations}`
+        : String(longagentState.iterations)
+      parts.push(`I:${iter}`)
+    }
+    if (!tight && longagentState.progress?.percentage !== null && longagentState.progress?.percentage !== undefined) {
+      const pct = longagentState.progress.percentage
+      const barW = dense ? 8 : 14
+      const filled = Math.round(barW * pct / 100)
+      parts.push(`${"█".repeat(filled)}${"░".repeat(barW - filled)} ${pct}%`)
+    }
+    if (!dense && longagentState.elapsed !== undefined) {
+      const m = Math.floor(longagentState.elapsed / 60)
+      const s = longagentState.elapsed % 60
+      parts.push(`${m}m${s}s`)
+    }
+    if (!tight && Array.isArray(longagentState.lastGateFailures) && longagentState.lastGateFailures.length) {
+      parts.push(`Fail`)
+    }
+    if (!tight && typeof longagentState.recoveryCount === "number" && longagentState.recoveryCount > 0) {
+      parts.push(`R:${longagentState.recoveryCount}`)
+    }
+    if (parts.length) {
+      segments.push(badge(`LONG ${parts.join(" ")}`, contrastText(theme.semantic.success), theme.semantic.success, { bold: false }))
+    }
+  }
+
+  if (layout === "comfortable") {
+    return segments.join("  ")
+  }
+  return segments.join(" ")
+}

package/src/tool/audit-wrapper.mjs

@@ -1,5 +1,21 @@
 import { appendAuditEntry } from "../storage/audit-store.mjs"
 
+const REDACT_KEYS = new Set(["api_key", "apiKey", "token", "password", "secret", "credential", "authorization"])
+const TRUNCATE_KEYS = new Set(["content", "new_string", "old_string"])
+const TRUNCATE_LIMIT = 200
+
+function redactArgs(args) {
+  if (!args || typeof args !== "object") return args
+  const out = {}
+  for (const [k, v] of Object.entries(args)) {
+    if (REDACT_KEYS.has(k)) { out[k] = "[REDACTED]" }
+    else if (TRUNCATE_KEYS.has(k) && typeof v === "string" && v.length > TRUNCATE_LIMIT) {
+      out[k] = v.slice(0, TRUNCATE_LIMIT) + `... (${v.length} chars)`
+    } else { out[k] = v }
+  }
+  return out
+}
+
 export async function withAudit({ sessionId, turnId, toolName, args, run }) {
   const startedAt = Date.now()
   await appendAuditEntry({
@@ -7,7 +23,7 @@ export async function withAudit({ sessionId, turnId, toolName, args, run }) {
     sessionId,
     turnId,
     tool: toolName,
-    args
+    args: redactArgs(args)
   })
   try {
     const result = await run()
@@ -35,4 +51,4 @@ export async function withAudit({ sessionId, turnId, toolName, args, run }) {
     })
     throw error
   }
-}
+}

package/src/tool/edit-transaction.mjs

@@ -9,6 +9,11 @@ function backupPath(target) {
   return `${target}.kkcode.bak`
 }
 
+function linesForPatch(text) {
+  const value = String(text ?? "")
+  return value === "" ? [] : value.split("\n")
+}
+
 /**
  * Count added/removed lines between two text snippets using LCS.
  * For snippets under 500 lines, uses O(m*n) DP. For larger texts, falls back to simple line-count diff.
@@ -51,6 +56,24 @@ export function diffLineCount(oldText, newText) {
   return { added: n - common, removed: m - common }
 }
 
+export function buildStructuredPatch(oldText, newText, {
+  oldStart = 1,
+  newStart = 1
+} = {}) {
+  const removed = linesForPatch(oldText)
+  const added = linesForPatch(newText)
+  return [{
+    oldStart,
+    oldLineCount: removed.length,
+    newStart,
+    newLineCount: added.length,
+    lines: [
+      ...removed.map((text) => ({ type: "remove", text })),
+      ...added.map((text) => ({ type: "add", text }))
+    ]
+  }]
+}
+
 export async function atomicWriteFile(target, content) {
   const dir = path.dirname(target)
   await mkdir(dir, { recursive: true })

package/src/tool/executor.mjs

@@ -3,10 +3,34 @@ 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"
+import { buildMutationObservability } from "../observability/edit-diagnostics.mjs"
 
 const FILE_EDIT_TOOLS = new Set(["write", "edit", "multiedit", "patch", "notebookedit"])
 const snapshotted = new Set()
 
+function eventMetadataSummary(metadata = {}) {
+  const fileChanges = Array.isArray(metadata.fileChanges) ? metadata.fileChanges : []
+  const observability = metadata.observability?.contract
+    ? metadata.observability
+    : buildMutationObservability(metadata)
+  const diagnostics = metadata.diagnostics?.contract
+    ? {
+        summary: metadata.diagnostics.summary || null,
+        currentCount: metadata.diagnostics.current?.count || 0,
+        delta: metadata.diagnostics.delta
+          ? {
+              added: metadata.diagnostics.delta.added?.length || 0,
+              resolved: metadata.diagnostics.delta.resolved?.length || 0,
+              persisted: metadata.diagnostics.delta.persisted?.length || 0
+            }
+          : null
+      }
+    : null
+
+  if (!fileChanges.length && !observability?.changes?.length && !diagnostics) return null
+  return { fileChanges, observability, diagnostics }
+}
+
 export async function executeTool({ tool, args, sessionId, turnId, context, signal = null }) {
   return withAudit({
     sessionId,
@@ -88,7 +112,8 @@ export async function executeTool({ tool, args, sessionId, turnId, context, sign
             status: result.status,
             args,
             output: String(output || "").slice(0, 500),
-            durationMs: result.durationMs
+            durationMs: result.durationMs,
+            metadata: eventMetadataSummary(metadata)
           }
         })
         return result

package/src/tool/file-read-state.mjs

@@ -0,0 +1,65 @@
+import path from "node:path"
+import { readFile, stat } from "node:fs/promises"
+
+const fileReadState = new Map()
+
+function normalizeFilePath(filePath) {
+  return path.resolve(String(filePath || ""))
+}
+
+function normalizeTimestamp(timestamp) {
+  const value = Number(timestamp)
+  return Number.isFinite(value) ? Math.floor(value) : Date.now()
+}
+
+export function markFileRead(filePath, {
+  content = "",
+  timestamp = Date.now(),
+  offset = undefined,
+  limit = undefined,
+  isPartialView = false
+} = {}) {
+  const normalized = normalizeFilePath(filePath)
+  fileReadState.set(normalized, {
+    content: String(content ?? ""),
+    timestamp: normalizeTimestamp(timestamp),
+    offset: Number.isInteger(offset) ? offset : undefined,
+    limit: Number.isInteger(limit) ? limit : undefined,
+    isPartialView: Boolean(isPartialView)
+  })
+}
+
+export function getFileReadState(filePath) {
+  return fileReadState.get(normalizeFilePath(filePath)) || null
+}
+
+export function wasFileRead(filePath) {
+  return fileReadState.has(normalizeFilePath(filePath))
+}
+
+export function clearFileReadState() {
+  fileReadState.clear()
+}
+
+export function extractTrackedView(content, readState) {
+  const text = String(content ?? "")
+  if (!readState?.isPartialView) return text
+  const startLine = Math.max(1, Number(readState.offset) || 1)
+  const lines = text.split("\n")
+  const sliceLength = Math.max(1, Number(readState.limit) || lines.length)
+  return lines.slice(startLine - 1, startLine - 1 + sliceLength).join("\n")
+}
+
+export async function refreshFileReadStateFromDisk(filePath, {
+  content = undefined
+} = {}) {
+  const normalized = normalizeFilePath(filePath)
+  const nextContent = content === undefined ? await readFile(normalized, "utf8") : String(content)
+  const fileStat = await stat(normalized)
+  markFileRead(normalized, {
+    content: nextContent,
+    timestamp: fileStat.mtimeMs,
+    isPartialView: false
+  })
+  return getFileReadState(normalized)
+}