thincoder 0.1.0 → 0.3.0

package/src/session.mjs

@@ -17,12 +17,14 @@ export function sessionPath(cwd) {
 /** 保存会话（同步：退出清理路径也能用） */
 export function saveSession(agent) {
   const data = {
-    version: 1,
+    version: 2,
     cwd: agent.cwd,
-    model: agent.provider.model,
+    activeProvider: agent.provider?.name,
     updatedAt: Date.now(),
     history: agent.history,
     tasks: agent.tasks ?? [],
+    planMode: agent.planMode ?? false,
+    goal: agent.goal ?? null,
   }
   const p = sessionPath(agent.cwd)
   mkdirSync(dirname(p), { recursive: true })
@@ -35,7 +37,8 @@ export function loadSession(cwd) {
     const p = sessionPath(cwd)
     if (!existsSync(p)) return null
     const data = JSON.parse(readFileSync(p, "utf8"))
-    if (data?.version !== 1 || !Array.isArray(data.history)) return null
+    if (data?.version !== 1 && data?.version !== 2) return null
+    if (!Array.isArray(data.history)) return null
     return data
   } catch {
     return null
@@ -46,7 +49,7 @@ export function loadSession(cwd) {
 export function clearSession(cwd) {
   try {
     const p = sessionPath(cwd)
-    if (existsSync(p)) writeFileSync(p, JSON.stringify({ version: 1, cwd, history: [], tasks: [] }), "utf8")
+    if (existsSync(p)) writeFileSync(p, JSON.stringify({ version: 2, cwd, history: [], tasks: [] }), "utf8")
   } catch {
     // 清不掉就算了，下次保存会覆盖
   }

package/src/skills.mjs

@@ -0,0 +1,75 @@
+/**
+ * skills.mjs — 技能系统
+ * 从 .thincoder/skills/ 目录发现 .md 技能文件，
+ * 注入到 system prompt 供 agent 按需加载。
+ * 用 skill 工具激活指定技能，内容以 <skill-loaded> 包裹写入对话历史。
+ */
+
+import { readFile, readdir, stat } from "node:fs/promises"
+import { join } from "node:path"
+
+/**
+ * 扫描 .thincoder/skills/ 目录，返回技能列表。
+ * 每个技能：{ name, path, description } — name 取文件名（去扩展名）。
+ * 目录不存在或无文件返回空数组。
+ */
+export async function loadSkills(cwd) {
+  const dir = join(cwd, ".thincoder", "skills")
+  let entries
+  try {
+    entries = await readdir(dir)
+  } catch {
+    return []
+  }
+  const skills = []
+  for (const name of entries) {
+    if (!/^[a-zA-Z0-9_-]+\.md$/.test(name)) continue // 与 readSkill 的名字校验一致，防"列得出、读不了"
+    const p = join(dir, name)
+    try {
+      const s = await stat(p)
+      if (!s.isFile()) continue
+      // 提取描述（前 400 字符里第一段非空、非标题行）
+      const head = await readFile(p, "utf8")
+      const body = head.slice(0, 400).split("\n")
+      let desc = ""
+      for (const line of body) {
+        const t = line.trim()
+        if (t && !t.startsWith("#") && !t.startsWith("---")) {
+          desc = t.slice(0, 120)
+          break
+        }
+      }
+      skills.push({ name: name.replace(/\.md$/, ""), path: p, description: desc || "(no description)" })
+    } catch {
+      // 读失败跳过
+    }
+  }
+  return skills
+}
+
+/**
+ * 生成技能列表文本，注入 system prompt。
+ * 最多 3 个（占位少），超过则标 "... and N more"。
+ */
+export function formatSkillListing(skills) {
+  if (skills.length === 0) return ""
+  const listed = skills.slice(0, 3)
+  const lines = listed.map((s) => `- **${s.name}**: ${s.description}`)
+  if (skills.length > 3) lines.push(`  ... and ${skills.length - 3} more`)
+  return "Available skills (use the skill tool to load one):\n" + lines.join("\n")
+}
+
+/**
+ * 读取指定技能文件的完整内容。
+ * 返回文本，找不到返回 null。
+ */
+export async function readSkill(cwd, name) {
+  // 安全检查：技能名只能是字母数字 + 连字符/下划线
+  if (!/^[a-zA-Z0-9_-]+$/.test(name)) return null
+  const p = join(cwd, ".thincoder", "skills", `${name}.md`)
+  try {
+    return await readFile(p, "utf8")
+  } catch {
+    return null
+  }
+}

package/src/tools/bash.md

@@ -0,0 +1,13 @@
+Execute a shell command and return stdout+stderr. Use for running commands, builds, tests.
+
+Parameters:
+- command (required): Shell command to execute
+- timeout: Timeout in milliseconds (default 120000, max ~300000)
+
+Notes:
+- There is NO TTY — editors, pagers (vim, less), and interactive prompts WILL hang. Always pass non-interactive flags: `git commit -m`, `git --no-pager`, `-y`/`--yes` where applicable
+- The environment sets GIT_PAGER=cat, PAGER=cat, EDITOR=true, TERM=dumb — but still always use non-interactive flags
+- Output is capped at ~50000 chars; if you need more, redirect to a file and read it
+- On Windows, use Unix shell syntax inside bash commands (Git Bash): forward slashes, `/dev/null` not `NUL`
+- Never use bash to read, copy, or transmit secret files (.env, keys, tokens)
+- Do NOT run destructive commands (rm -rf, force-push, drop table) without explicit user confirmation

package/src/tools/delete.md

@@ -0,0 +1,9 @@
+Delete a file. Use when the agent created a temporary or junk file that should be cleaned up, or when the user explicitly asks to delete something. Refuses to delete git-tracked files as a safety measure — tracked files should be edited or removed via bash with explicit user confirmation.
+
+Parameters:
+- path (required): File path, relative to cwd or absolute
+
+Notes:
+- Untracked or non-git files are deleted immediately
+- Tracked files require force=true (user must confirm separately)
+- Directories must be removed with bash (rm -rf)

package/src/tools/edit.md

@@ -0,0 +1,12 @@
+Edit a file by exact string replacement. old_string must match exactly once unless replace_all is set.
+
+Parameters:
+- path (required): File path
+- old_string (required): Exact text to find and replace
+- new_string (required): Replacement text
+- replace_all: Replace all occurrences instead of just one (default false)
+
+Notes:
+- Prefer this over write for targeted edits — it's safer and keeps diffs small
+- If old_string matches zero times: error. If it matches multiple times without replace_all: error — add more surrounding context to make it unique
+- Never fabricate the old_string — copy it verbatim from the actual file using read first

package/src/tools/fetch.md

@@ -0,0 +1,10 @@
+Fetch a URL and return its content as text. HTML pages are stripped to readable text. Use after websearch to read full documents.
+
+Parameters:
+- url (required): http/https URL
+
+Notes:
+- Follows redirects automatically
+- Timeout: 20 seconds
+- HTML pages are converted to plain text (scripts, styles, navigation stripped)
+- Non-HTML responses are returned as-is (truncated at ~50000 chars)

package/src/tools/git_diff.md

@@ -0,0 +1,11 @@
+Show git diff (unified format). Use to see uncommitted changes, staged changes, or diff against a specific ref.
+
+Parameters:
+- staged: Show staged changes (default false, shows working tree diff)
+- path: File or directory to diff (default all)
+- ref: Compare against a ref (default HEAD)
+
+Notes:
+- Only works inside a git repository
+- Output is standard unified diff — LLMs understand this natively
+- If no changes, returns "(no changes)"

package/src/tools/git_log.md

@@ -0,0 +1,10 @@
+Show recent git commit history. Use to understand the project's recent changes, conventions, and pace.
+
+Parameters:
+- count: Number of commits to show (default 10)
+- path: File or directory to show history for (default all)
+- oneline: Compact one-line-per-commit format (default false)
+
+Notes:
+- Only works inside a git repository
+- Output includes hash, author, date, and message

package/src/tools/git_status.md

@@ -0,0 +1,8 @@
+Show structured git status. Use to understand the current working tree state: what files are staged, modified, untracked, or conflicting.
+
+Returns categorized lists: staged, unstaged, untracked, conflicts.
+
+Notes:
+- Only works inside a git repository
+- Output is categorized for easy parsing by the agent
+- No side effects — read-only

package/src/tools/glob.md

@@ -0,0 +1,11 @@
+Find files by glob pattern (e.g. 'src/**/*.mjs'). Returns matching paths.
+
+Parameters:
+- pattern (required): Glob pattern — supports **, *, ?, and character classes
+- path: Directory to search in (default cwd)
+
+Notes:
+- Skips node_modules, .git, dist, build, .turbo, coverage
+- Results capped at 1000 matches
+- Use this to discover file structure; use grep to search file contents
+- Prefer patterns with a literal anchor (extension or subdirectory) over bare wildcards

package/src/tools/grep.md

@@ -0,0 +1,12 @@
+Search file contents with a regex. Returns matching lines as path:line: content.
+
+Parameters:
+- pattern (required): JavaScript regular expression
+- path: Directory or file to search (default cwd)
+- glob: Only search files matching this glob (e.g. '*.mjs')
+
+Notes:
+- Skips node_modules, .git, dist, build, .turbo, coverage
+- Results capped at 200 matches
+- Binary/unreadable files are silently skipped
+- Use this to find usages, definitions, patterns; use glob to find files by name

package/src/tools/ls.md

@@ -0,0 +1,9 @@
+List directory contents with type, size, and modification time. Directories listed first. Use to see what a directory contains (glob only matches files).
+
+Parameters:
+- path: Directory path (default cwd)
+
+Notes:
+- Shows first 500 entries
+- Directories are prefixed with `/` and listed before files
+- Use this for a quick overview; use glob when you have a specific file pattern in mind

package/src/tools/question.md

@@ -0,0 +1,10 @@
+Ask the user a question and wait for their response. Use when the task is ambiguous, you need a design decision, or you're stuck and need human judgment.
+
+Parameters:
+- question (required): The question to ask the user
+- options: Array of single-choice options for the user to pick from (optional)
+
+Notes:
+- The agent loop pauses until the user answers
+- The answer is injected as the next user message
+- Use sparingly — prefer making reasonable decisions when possible

package/src/tools/read.md

@@ -0,0 +1,10 @@
+Read a text file. Returns numbered lines. Use offset/limit to page large files.
+
+Parameters:
+- path (required): File path, relative to cwd or absolute
+- offset: 1-based line number to start reading from
+- limit: Max lines to return (default 2000)
+
+Notes:
+- Always prefer this over `cat` or shell-based reading — it caps output and avoids large dumps
+- Use offset for pagination when the file is large

package/src/tools/websearch.md

@@ -0,0 +1,10 @@
+Search the web (Bing). Returns result titles, URLs, and snippets. Use for looking up current information, docs, error messages.
+
+Parameters:
+- query (required): Search query
+- limit: Max results (default 8)
+
+Notes:
+- Use this for information that is NOT in the local codebase — current docs, error messages, API references
+- Follow up with `fetch` to read full pages from the results
+- Results are scraped from Bing HTML — some formatting may be imperfect

package/src/tools/write.md

@@ -0,0 +1,9 @@
+Write content to a file. Creates parent directories; overwrites existing file.
+
+Parameters:
+- path (required): File path, relative to cwd or absolute
+- content (required): Full content to write
+
+Notes:
+- This overwrites the entire file — use `edit` for targeted changes
+- The file is atomic: it either writes completely or fails

package/src/tools.mjs

@@ -1,12 +1,18 @@
 /**
  * tools.mjs — 内置工具集
- * read / write / edit / bash / glob / grep，零依赖实现。
+ * read / write / edit / bash / glob / grep / websearch / ls / fetch / delete / git_diff / git_status / git_log / question，零依赖实现。
+ * 工具描述从 src/tools/*.md 加载（方便人读和修改）。
  * readonly 标记供 agent 调度：只读工具可并行，有副作用工具串行。
  */
 
-import { spawn } from "node:child_process"
-import { mkdir, readFile, readdir, stat, writeFile } from "node:fs/promises"
-import { dirname, join, resolve } from "node:path"
+import { spawn, execFileSync } from "node:child_process"
+import { mkdir, readFile, readdir, stat, writeFile, unlink } from "node:fs/promises"
+import { readFileSync, existsSync } from "node:fs"
+import { dirname, join, resolve, relative } from "node:path"
+import { fileURLToPath } from "node:url"
+
+const __dirname = dirname(fileURLToPath(import.meta.url))
+const DESC = (name) => readFileSync(join(__dirname, "tools", `${name}.md`), "utf8")
 
 const MAX_READ_LINES = 2000
 const MAX_OUTPUT_CHARS = 50_000
@@ -48,8 +54,7 @@ function resolveInCwd(ctx, p) {
 
 const readTool = {
   name: "read",
-  description:
-    "Read a text file. Returns numbered lines. Use offset/limit to page large files.",
+  description: DESC("read"),
   parameters: {
     type: "object",
     properties: {
@@ -77,7 +82,7 @@ const readTool = {
 
 const writeTool = {
   name: "write",
-  description: "Write content to a file. Creates parent directories; overwrites existing file.",
+  description: DESC("write"),
   parameters: {
     type: "object",
     properties: {
@@ -99,8 +104,7 @@ const writeTool = {
 
 const editTool = {
   name: "edit",
-  description:
-    "Edit a file by exact string replacement. old_string must match exactly once unless replace_all is set.",
+  description: DESC("edit"),
   parameters: {
     type: "object",
     properties: {
@@ -134,8 +138,7 @@ const editTool = {
 
 const bashTool = {
   name: "bash",
-  description:
-    "Execute a shell command and return stdout+stderr. Use for running commands, builds, tests.",
+  description: DESC("bash"),
   parameters: {
     type: "object",
     properties: {
@@ -210,6 +213,10 @@ const bashTool = {
       child.stderr.on("data", onData)
 
       const timer = setTimeout(() => child.kill(), args.timeout ?? BASH_TIMEOUT_MS)
+      // 用户中止：杀进程
+      if (ctx.signal) {
+        ctx.signal.addEventListener("abort", () => child.kill(), { once: true })
+      }
       child.on("error", (error) => {
         clearTimeout(timer)
         resolve(truncate(`Command failed: ${error.message}\n${out}`))
@@ -218,7 +225,7 @@ const bashTool = {
         clearTimeout(timer)
         out += sanitizeOutput(feed(Buffer.alloc(0), true)) // 最终判定 + 冲刷解码器尾部
         const suffix = signal
-          ? "\n(killed: timeout)"
+          ? `\n(killed: ${ctx.signal?.aborted ? "user interrupted" : "timeout"})`
           : code !== 0
             ? `\n(exit code ${code})`
             : ""
@@ -232,7 +239,7 @@ const bashTool = {
 
 const globTool = {
   name: "glob",
-  description: "Find files by glob pattern (e.g. 'src/**/*.mjs'). Returns matching paths.",
+  description: DESC("glob"),
   parameters: {
     type: "object",
     properties: {
@@ -295,7 +302,7 @@ function globToRegex(pattern) {
 
 const grepTool = {
   name: "grep",
-  description: "Search file contents with a regex. Returns matching lines as path:line: content.",
+  description: DESC("grep"),
   parameters: {
     type: "object",
     properties: {
@@ -357,8 +364,7 @@ const grepTool = {
 
 const websearchTool = {
   name: "websearch",
-  description:
-    "Search the web (Bing). Returns result titles, URLs, and snippets. Use for looking up current information, docs, error messages.",
+  description: DESC("websearch"),
   parameters: {
     type: "object",
     properties: {
@@ -422,8 +428,7 @@ function stripTags(html) {
 
 const lsTool = {
   name: "ls",
-  description:
-    "List directory contents with type, size, and modification time. Directories listed first. Use to see what a directory contains (glob only matches files).",
+  description: DESC("ls"),
   parameters: {
     type: "object",
     properties: {
@@ -457,8 +462,7 @@ const lsTool = {
 
 const fetchTool = {
   name: "fetch",
-  description:
-    "Fetch a URL and return its content as text (HTML pages are stripped to readable text). Use after websearch to read full documents.",
+  description: DESC("fetch"),
   parameters: {
     type: "object",
     properties: {
@@ -511,3 +515,170 @@ function htmlToText(html) {
 }
 
 export const builtinTools = [readTool, writeTool, editTool, bashTool, globTool, grepTool, websearchTool, lsTool, fetchTool]
+
+// ---------------------------------------------------------------- delete
+
+const deleteTool = {
+  name: "delete",
+  description: DESC("delete"),
+  parameters: {
+    type: "object",
+    properties: {
+      path: { type: "string", description: "File path (relative to cwd or absolute)" },
+      force: { type: "boolean", description: "Allow deleting git-tracked files (default false)" },
+    },
+    required: ["path"],
+  },
+  readonly: false,
+  async execute(args, ctx) {
+    const abs = resolveInCwd(ctx, args.path)
+    if (!existsSync(abs)) throw new Error(`File not found: ${abs}`)
+    const s = await stat(abs)
+    if (s.isDirectory()) throw new Error(`"${args.path}" is a directory — use bash to remove directories`)
+    // git 跟踪文件拒绝直接删除（安全网）；未跟踪的放行
+    // 用解析后的相对路径（统一正斜杠），防反斜杠/非常规路径绕过 ls-files 匹配
+    const rel = relative(ctx.cwd, abs).replace(/\\/g, "/")
+    let tracked = false
+    try {
+      execFileSync("git", ["ls-files", "--error-unmatch", "--", rel], { cwd: ctx.cwd, stdio: "ignore" })
+      tracked = true
+    } catch {
+      // 未跟踪 / 非 git 仓库
+    }
+    if (tracked && !args.force) throw new Error(`"${args.path}" is git-tracked. Set force=true to delete anyway.`)
+    await unlink(abs)
+    return `Deleted ${abs}`
+  },
+}
+
+// ---------------------------------------------------------------- git_diff
+
+const gitDiffTool = {
+  name: "git_diff",
+  description: DESC("git_diff"),
+  parameters: {
+    type: "object",
+    properties: {
+      staged: { type: "boolean", description: "Show staged changes (default false)" },
+      path: { type: "string", description: "File or directory to diff (default all)" },
+      ref: { type: "string", description: "Compare against this ref (default HEAD)" },
+    },
+  },
+  readonly: true,
+  execute(args, ctx) {
+    const ref = args.ref ?? "HEAD"
+    const flags = args.staged ? ["--staged"] : []
+    const paths = args.path ? [args.path] : []
+    const out = runGit(ctx.cwd, ["diff", ...flags, ref, "--", ...paths])
+    return truncate(out || "(no changes)")
+  },
+}
+
+// ---------------------------------------------------------------- git_status
+
+const gitStatusTool = {
+  name: "git_status",
+  description: DESC("git_status"),
+  parameters: {
+    type: "object",
+    properties: {},
+  },
+  readonly: true,
+  execute(_args, ctx) {
+    const porcelain = runGit(ctx.cwd, ["status", "--porcelain"])
+    if (!porcelain) return "(clean — no changes)"
+
+    const staged = []
+    const unstaged = []
+    const untracked = []
+    const conflicts = []
+    for (const line of porcelain.split("\n")) {
+      if (!line) continue
+      // porcelain: XY path — 2 状态字符 + 空格 + 文件路径（部分环境只 1 空格）
+      // 去掉可能的 CR（execFileSync 在某些 Windows git 下会残留 \r 在行末但不在换行符中）
+      const clean = line.replace(/\r/g, "")
+      // 尝试匹配 "XY path" 或 "XY  path"（可变间距）
+      const m = clean.match(/^(..?)\s+(.+)$/)
+      if (!m) continue
+      const [, status, file] = m
+      const idx = status[0] ?? " "
+      const wt = status[1] ?? " "
+      if (idx === "U" || wt === "U" || (idx === "A" && wt === "A")) {
+        conflicts.push(file)
+      } else if (idx === "?" && wt === "?") {
+        untracked.push(file)
+      } else {
+        if (idx !== " " && idx !== "?") staged.push(idx + " " + file)
+        if (wt !== " " && wt !== "?") unstaged.push(wt + " " + file)
+      }
+    }
+    const parts = []
+    if (staged.length) parts.push("Staged (" + staged.length + "):\n" + staged.join("\n"))
+    if (unstaged.length) parts.push("Unstaged (" + unstaged.length + "):\n" + unstaged.join("\n"))
+    if (untracked.length) parts.push("Untracked (" + untracked.length + "):\n" + untracked.join("\n"))
+    if (conflicts.length) parts.push("Conflicts (" + conflicts.length + "):\n" + conflicts.join("\n"))
+    return truncate(parts.join("\n\n"))
+  },
+}
+
+// ---------------------------------------------------------------- git_log
+
+const gitLogTool = {
+  name: "git_log",
+  description: DESC("git_log"),
+  parameters: {
+    type: "object",
+    properties: {
+      count: { type: "number", description: "Number of commits (default 10)" },
+      path: { type: "string", description: "File or directory (default all)" },
+      oneline: { type: "boolean", description: "One-line-per-commit format (default false)" },
+    },
+  },
+  readonly: true,
+  execute(args, ctx) {
+    const n = args.count ?? 10
+    const isOneline = args.oneline
+    const cmdArgs = isOneline
+      ? ["log", "-" + n, "--oneline"]
+      : ["log", "-" + n, "--format=%h %ad %an %s", "--date=short"]
+    if (args.path) cmdArgs.push("--", args.path)
+    const out = runGit(ctx.cwd, cmdArgs)
+    return truncate(out || "(no commits)")
+  },
+}
+
+// ---------------------------------------------------------------- question
+
+const questionTool = {
+  name: "question",
+  description: DESC("question"),
+  parameters: {
+    type: "object",
+    properties: {
+      question: { type: "string", description: "The question to ask the user" },
+      options: {
+        type: "array",
+        items: { type: "string" },
+        description: "Single-choice options for the user to pick from (optional)",
+      },
+    },
+    required: ["question"],
+  },
+  readonly: true,
+  async execute(args, ctx) {
+    if (!ctx.onQuestion) throw new Error("question tool not supported in this context (no UI to ask)")
+    return ctx.onQuestion(args.question, args.options ?? [])
+  },
+}
+
+/** 执行 git 命令；非 git 仓库 / git 不可用时返回空字符串 */
+function runGit(cwd, cmdArgs) {
+  try {
+    return execFileSync("git", cmdArgs, { cwd, encoding: "utf8", stdio: ["ignore", "pipe", "ignore"] }).trim().replace(/\r/g, "")
+  } catch {
+    return ""
+  }
+}
+
+export { deleteTool, gitDiffTool, gitStatusTool, gitLogTool, questionTool }
+builtinTools.push(deleteTool, gitDiffTool, gitStatusTool, gitLogTool, questionTool)