aipeek 0.2.4 → 0.2.6

package/src/core/compact.ts

@@ -1,5 +1,5 @@
 import type { CompactState, ErrorEntry, LogEntry, NetworkRequest, RawState } from './types'
-import { compactUrl, truncate } from './util'
+import { appStackFrames, compactUrl, formatValue, truncate } from './util'
 
 const SLOW_THRESHOLD = 1000
 
@@ -262,26 +262,14 @@ export function compactErrors(errors: ErrorEntry[]): string {
     for (const err of seen.values()) {
         lines.push(err.message)
         if (err.stack) {
-            const frames = filterStack(err.stack)
-            for (const frame of frames) {
-                lines.push(`  at ${frame}`)
-            }
+            for (const frame of appStackFrames(err.stack, 5))
+                lines.push(`  ${frame}`)
         }
     }
 
     return lines.join('\n')
 }
 
-function filterStack(stack: string): string[] {
-    return stack
-        .split('\n')
-        .map(l => l.trim())
-        .filter(l => l.startsWith('at '))
-        .map(l => l.slice(3))
-        .filter(l => !l.includes('node_modules') && !l.includes('<anonymous>'))
-        .slice(0, 5)
-}
-
 // --- State ---
 
 export function compactState(state: Record<string, unknown>): string {
@@ -293,7 +281,7 @@ export function compactState(state: Record<string, unknown>): string {
         lines.push(`${name}:`)
         if (typeof value === 'object' && value !== null) {
             for (const [k, v] of Object.entries(value as Record<string, unknown>)) {
-                lines.push(`  ${k}: ${formatValue(v)}`)
+                lines.push(`  ${k}: ${truncate(formatValue(v), 120)}`)
             }
         }
         else {
@@ -303,20 +291,6 @@ export function compactState(state: Record<string, unknown>): string {
     return lines.join('\n')
 }
 
-function formatValue(v: unknown): string {
-    if (v === null || v === undefined)
-        return String(v)
-    if (typeof v === 'string')
-        return v
-    if (typeof v === 'number' || typeof v === 'boolean')
-        return String(v)
-    if (typeof v === 'object') {
-        const s = JSON.stringify(v)
-        return s.length > 120 ? `${s.slice(0, 120)}…` : s
-    }
-    return String(v)
-}
-
 // --- Main ---
 
 export function compact(raw: RawState): CompactState {

package/src/core/detail.ts

@@ -1,6 +1,6 @@
 import type { ErrorEntry, LogEntry, NetworkRequest, RawState } from './types'
 import { compactUI } from './compact'
-import { truncate } from './util'
+import { appStackFrames, formatValue, truncate } from './util'
 
 export function detail(raw: RawState, section: string, index: string | undefined, full: boolean): string | null {
     switch (section) {
@@ -130,15 +130,10 @@ function detailError(errors: ErrorEntry[], index: string | undefined, full: bool
 
     const lines = [err.message]
     if (err.stack) {
-        const appFrames = err.stack.split('\n')
-            .map(l => l.trim())
-            .filter(l => l.startsWith('at ') && !l.includes('node_modules'))
-            .slice(0, 3)
-        if (appFrames.length)
-            lines.push(...appFrames)
-        const totalApp = err.stack.split('\n').filter(l => l.trim().startsWith('at ') && !l.includes('node_modules')).length
-        if (totalApp > 3)
-            lines.push(`  ... ${totalApp - 3} more app frames`)
+        const all = appStackFrames(err.stack, Infinity)
+        lines.push(...all.slice(0, 3))
+        if (all.length > 3)
+            lines.push(`  ... ${all.length - 3} more app frames`)
     }
     if (err.line != null)
         lines.push(`location: ${err.source || ''}:${err.line}:${err.column ?? 0}`)
@@ -159,10 +154,10 @@ function detailState(state: Record<string, unknown>, name: string | undefined, f
     const value = state[name]
     if (full) {
         try {
-            return JSON.stringify(value, null, 2)
+            return JSON.stringify(value, null, 2) ?? formatValue(value)
         }
         catch {
-            return String(value)
+            return formatValue(value) // 循环引用 / Error / Map → 不再 {}
         }
     }
     if (typeof value !== 'object' || value === null)
@@ -182,20 +177,9 @@ function isArraySentinel(v: string): boolean {
 }
 
 function formatSummaryValue(v: unknown): string {
-    if (v === null || v === undefined)
-        return String(v)
-    if (typeof v === 'string') {
-        if (isArraySentinel(v)) // "Array(N)" from boundedSnapshot — leave untruncated
-            return v
-        return v.length > 80 ? `${v.slice(0, 80)}…` : v
-    }
-    if (typeof v === 'number' || typeof v === 'boolean')
-        return String(v)
-    if (typeof v === 'object') {
-        const s = JSON.stringify(v)
-        return s.length > 80 ? `${s.slice(0, 80)}…` : s
-    }
-    return String(v)
+    if (typeof v === 'string' && isArraySentinel(v)) // "Array(N)" from boundedSnapshot — leave untruncated
+        return v
+    return truncate(formatValue(v), 80)
 }
 
 // --- JSON schema fallback ---

package/src/core/util.ts

@@ -2,6 +2,59 @@ export function truncate(s: string, max: number): string {
     return s.length > max ? `${s.slice(0, max)}…` : s
 }
 
+// unknown → 人类可读字符串。穷举 JS 类型，让 JSON.stringify 的「漏网类型 → {}」失败模式不可能出现。
+// 返回未截断字符串——截断由调用方按各自 max 处理。
+export function formatValue(v: unknown, seen: Set<object> = new Set()): string {
+    if (v === null || v === undefined)
+        return String(v)
+    const t = typeof v
+    if (t === 'string')
+        return v as string
+    if (t === 'number' || t === 'boolean' || t === 'bigint')
+        return String(v)
+    if (t === 'symbol')
+        return (v as symbol).toString()
+    if (t === 'function')
+        return `[Function: ${(v as { name?: string }).name || 'anonymous'}]`
+    // 此后 v 是 object
+    const obj = v as object
+    if (seen.has(obj))
+        return '[Circular]'
+    if (v instanceof Error)
+        return v.stack || `${v.name}: ${v.message}`
+    seen.add(obj)
+    if (v instanceof Map) {
+        const items = [...v.entries()].slice(0, 15).map(([k, val]) => `${formatValue(k, seen)} => ${formatValue(val, seen)}`)
+        return `Map(${v.size}) {${items.join(', ')}${v.size > 15 ? ', …' : ''}}`
+    }
+    if (v instanceof Set) {
+        const items = [...v.values()].slice(0, 15).map(val => formatValue(val, seen))
+        return `Set(${v.size}) {${items.join(', ')}${v.size > 15 ? ', …' : ''}}`
+    }
+    if (Array.isArray(v)) {
+        const items = v.slice(0, 30).map(val => formatValue(val, seen))
+        return `[${items.join(', ')}${v.length > 30 ? ', …' : ''}]`
+    }
+    try {
+        return JSON.stringify(v)
+    }
+    catch {
+        // 循环引用 / getter 抛错 → 手动遍历可枚举键，循环处标 [Circular]
+        const entries = Object.entries(v as Record<string, unknown>).slice(0, 15)
+        const parts = entries.map(([k, val]) => `${k}: ${formatValue(val, seen)}`)
+        return `{${parts.join(', ')}}`
+    }
+}
+
+// stack → 应用栈帧（去 node_modules / <anonymous>），保留 `at ` 前缀。max 与溢出提示由调用方决定。
+export function appStackFrames(stack: string, max: number): string[] {
+    return stack
+        .split('\n')
+        .map(l => l.trim())
+        .filter(l => l.startsWith('at ') && !l.includes('node_modules') && !l.includes('<anonymous>'))
+        .slice(0, max)
+}
+
 // pathname only; pass `search` to append a truncated query string
 export function compactUrl(url: string, search?: number): string {
     try {

package/src/server/plugin.ts

@@ -21,6 +21,12 @@ function readBody(req: { on: (e: string, cb: (c: unknown) => void) => void }): P
     })
 }
 
+// 所有端点都回文本响应——writeHead(Content-Type) + end 二连写了 15 遍（且有 2 处漏 charset）。收敛成一处。
+function send(res: { writeHead: (s: number, h: Record<string, string>) => void, end: (b: string) => void }, status: number, body: string) {
+    res.writeHead(status, { 'Content-Type': 'text/plain; charset=utf-8' })
+    res.end(body)
+}
+
 const __dirname = dirname(fileURLToPath(import.meta.url))
 // client/core sources are read at runtime (client.ts served via Vite transform,
 // client-patch.ts compiled by esbuild). Two layouts: source consumption
@@ -107,73 +113,30 @@ aipeek auto-detects errors after HMR and prints them to the terminal — watch f
 `
 }
 
-// normalize a line so cosmetic diffs (indent, port number) don't break matching
-function norm(line: string): string {
-    const t = line.trim()
-    const i = t.indexOf('localhost:')
-    if (i === -1)
-        return t
-    let j = i + 'localhost:'.length
-    while (j < t.length && t[j] >= '0' && t[j] <= '9') j++
-    return `${t.slice(0, i)}localhost:PORT${t.slice(j)}`
-}
+export const START_TAG = '<!-- AIPEEK:START -->'
+export const END_TAG = '<!-- AIPEEK:END -->'
 
-// strip every existing aipeek block by simulating a human reading line-by-line:
-// scan downward; once enough recent lines belong to the snippet we're INSIDE a
-// block; once they stop belonging we're OUTSIDE again. A run whose lines are
-// >50% snippet-content is dropped. Content-fuzzy — survives wording/port edits.
-function stripBlocks(content: string, snippet: string): string {
-    const known = new Set(snippet.split('\n').map(norm).filter(l => l.length > 3))
-    const lines = content.split('\n')
-    const keep: string[] = []
-    let inside = false
-    let buf: string[] = []
-    let hits = 0
-
-    const flush = () => {
-        // settle the buffered run: drop it if it reads as snippet, else keep it
-        if (buf.length && hits / buf.length <= 0.5)
-            keep.push(...buf)
-        buf = []
-        hits = 0
-        inside = false
-    }
-
-    for (const line of lines) {
-        const isKnown = known.has(norm(line))
-        if (!inside) {
-            if (isKnown) {
-                inside = true
-                buf = [line]
-                hits = 1
-            }
-            else {
-                keep.push(line)
-            }
-            continue
-        }
-        // INSIDE: keep accumulating until we drift away from the snippet
-        buf.push(line)
-        if (isKnown)
-            hits++
-        // a run of unknown lines means the block ended — settle it
-        else if (buf.slice(-3).every(l => !known.has(norm(l))))
-            flush()
-    }
-    flush()
-    return keep.join('\n')
-}
-
-function injectClaudeMd(root: string, port: number) {
+// Marker-based injection — the block lives between START_TAG and END_TAG, so
+// re-injection is a deterministic splice (find markers, replace between) rather
+// than fuzzy line matching. New file → write markers + snippet. Existing markers
+// → replace their contents. No markers yet → append a fresh marked block.
+export function injectClaudeMd(root: string, port: number) {
     const path = resolve(root, 'CLAUDE.md')
-    const snippet = aipeekSnippet(port)
+    const block = `${START_TAG}\n${aipeekSnippet(port).trim()}\n${END_TAG}\n`
     try {
         if (!existsSync(path)) {
-            writeFileSync(path, snippet.trimStart())
+            writeFileSync(path, block)
+            return
+        }
+        const content = readFileSync(path, 'utf-8')
+        const si = content.indexOf(START_TAG)
+        const ei = content.indexOf(END_TAG)
+        if (si !== -1 && ei !== -1) {
+            writeFileSync(path, content.slice(0, si) + block.trimEnd() + content.slice(ei + END_TAG.length))
             return
         }
-        const stripped = stripBlocks(readFileSync(path, 'utf-8'), snippet).trimEnd()
-        writeFileSync(path, `${stripped}\n${snippet}`)
+        const sep = content.endsWith('\n') ? '' : '\n'
+        writeFileSync(path, `${content}${sep}\n${block}`)
     }
     catch {}
 }
@@ -374,13 +337,11 @@ export function aipeekPlugin(): Plugin {
                         if (!code && req.method === 'POST')
                             code = await readBody(req)
                         if (!code) {
-                            res.writeHead(400, { 'Content-Type': 'text/plain; charset=utf-8' })
-                            res.end('eval needs ?code= or a POST body')
+                            send(res, 400, 'eval needs ?code= or a POST body')
                             return
                         }
                         const r = await evalInClient(code)
-                        res.writeHead(r.ok ? 200 : 422, { 'Content-Type': 'text/plain; charset=utf-8' })
-                        res.end(r.ok ? (r.value ?? 'undefined') : `error: ${r.error}`)
+                        send(res, r.ok ? 200 : 422, r.ok ? (r.value ?? 'undefined') : `error: ${r.error}`)
                         return
                     }
 
@@ -390,16 +351,14 @@ export function aipeekPlugin(): Plugin {
                             url.searchParams.get('scope') || undefined,
                             url.searchParams.get('sel') || undefined,
                         )
-                        res.writeHead(200, { 'Content-Type': 'text/plain; charset=utf-8' })
-                        res.end(dom || '(empty)')
+                        send(res, 200, dom || '(empty)')
                         return
                     }
 
                     // /__aipeek/screen — state-machine projection {view, modal, focus, knobs}
                     if (parts[0] === 'screen') {
                         const screen = await collectScreenFromClient()
-                        res.writeHead(200, { 'Content-Type': 'text/plain; charset=utf-8' })
-                        res.end(screen || '(empty)')
+                        send(res, 200, screen || '(empty)')
                         return
                     }
 
@@ -415,8 +374,7 @@ export function aipeekPlugin(): Plugin {
                                 throw new Error('body must be a JSON array')
                         }
                         catch (e) {
-                            res.writeHead(400, { 'Content-Type': 'text/plain; charset=utf-8' })
-                            res.end(`invalid chain body: ${e instanceof Error ? e.message : String(e)}`)
+                            send(res, 400, `invalid chain body: ${e instanceof Error ? e.message : String(e)}`)
                             return
                         }
                         lastRaw = null
@@ -445,8 +403,7 @@ export function aipeekPlugin(): Plugin {
                                 break
                             }
                         }
-                        res.writeHead(allOk ? 200 : 422, { 'Content-Type': 'text/plain; charset=utf-8' })
-                        res.end(lastUi ? `${lines.join('\n')}\n\n--- ui after ---\n${lastUi}` : lines.join('\n'))
+                        send(res, allOk ? 200 : 422, lastUi ? `${lines.join('\n')}\n\n--- ui after ---\n${lastUi}` : lines.join('\n'))
                         return
                     }
 
@@ -463,8 +420,7 @@ export function aipeekPlugin(): Plugin {
                         }
                         const check = resolveAction(parts[0], args)
                         if (!check.valid) {
-                            res.writeHead(400, { 'Content-Type': 'text/plain; charset=utf-8' })
-                            res.end(check.error)
+                            send(res, 400, check.error ?? 'invalid action')
                             return
                         }
                         const result = await sendAction(parts[0], args)
@@ -475,13 +431,11 @@ export function aipeekPlugin(): Plugin {
                             const name = q.get('out') || `shot-${result.dataUrl.length}.png`
                             const file = resolve(dir, name)
                             writeFileSync(file, Buffer.from(result.dataUrl.split(',')[1], 'base64'))
-                            res.writeHead(200, { 'Content-Type': 'text/plain; charset=utf-8' })
-                            res.end(`saved: ${file}`)
+                            send(res, 200, `saved: ${file}`)
                             return
                         }
-                        res.writeHead(result.ok ? 200 : 422, { 'Content-Type': 'text/plain; charset=utf-8' })
                         const head = result.ok ? (result.detail || 'ok') : `${result.error}${result.detail ? `\n\nclickable: ${result.detail}` : ''}`
-                        res.end(result.ui ? `${head}\n\n--- ui after ---\n${result.ui}` : head)
+                        send(res, result.ok ? 200 : 422, result.ui ? `${head}\n\n--- ui after ---\n${result.ui}` : head)
                         return
                     }
 
@@ -491,8 +445,7 @@ export function aipeekPlugin(): Plugin {
                         lastRaw = raw
                         const result = check(raw)
                         const output = emitCheck(result)
-                        res.writeHead(result.pass ? 200 : 417, { 'Content-Type': 'text/plain; charset=utf-8' })
-                        res.end(output)
+                        send(res, result.pass ? 200 : 417, output)
                         return
                     }
 
@@ -502,12 +455,10 @@ export function aipeekPlugin(): Plugin {
                             lastRaw = await collectFromClient()
                         const result = detail(lastRaw, parts[0], parts[1], full)
                         if (result !== null) {
-                            res.writeHead(200, { 'Content-Type': 'text/plain; charset=utf-8' })
-                            res.end(result)
+                            send(res, 200, result)
                             return
                         }
-                        res.writeHead(404, { 'Content-Type': 'text/plain' })
-                        res.end(`not found: ${parts.join('/')}`)
+                        send(res, 404, `not found: ${parts.join('/')}`)
                         return
                     }
 
@@ -516,19 +467,14 @@ export function aipeekPlugin(): Plugin {
                     lastRaw = raw
                     if (full) {
                         const compacted = compact(raw)
-                        const output = emit(compacted)
-                        res.writeHead(200, { 'Content-Type': 'text/plain; charset=utf-8' })
-                        res.end(output)
+                        send(res, 200, emit(compacted))
                     }
                     else {
-                        const output = emitSummary(raw)
-                        res.writeHead(200, { 'Content-Type': 'text/plain; charset=utf-8' })
-                        res.end(output)
+                        send(res, 200, emitSummary(raw))
                     }
                 }
                 catch (err) {
-                    res.writeHead(504, { 'Content-Type': 'text/plain' })
-                    res.end(err instanceof Error ? err.message : 'unknown error')
+                    send(res, 504, err instanceof Error ? err.message : 'unknown error')
                 }
             })
         },