@youtyan/code-viewer 0.2.10 → 0.3.0

package/dist/code-viewer.js

@@ -759,6 +759,16 @@ import {
   statSync
 } from "node:fs";
 import { join as join2 } from "node:path";
+function normalizeBlameRef(ref, base) {
+  const rawRef = ref || "worktree";
+  if (base === "worktree" && rawRef !== "worktree") {
+    return { base: "HEAD", ref: rawRef };
+  }
+  if (base === "HEAD" && rawRef === "worktree") {
+    return { base: "HEAD", ref: "HEAD" };
+  }
+  return { base, ref: rawRef };
+}
 function run(args, cwd) {
   return runSync(args, cwd);
 }
@@ -1063,6 +1073,13 @@ function commitHistory(cwd, options) {
   const skip = Math.max(0, Math.floor(options.skip) || 0);
   const limit = Math.max(1, Math.min(Math.floor(options.limit) || 1, MAX_HISTORY_LIMIT));
   const { filterArgs, pathspec, shaTerm } = historyQueryArgs(options.query || "");
+  const pathFilter = (options.path || "").trim();
+  const pathArgs = [];
+  if (pathFilter && !pathFilter.includes("\x00") && !pathFilter.startsWith("-")) {
+    if (!pathFilter.endsWith("/"))
+      pathArgs.push("--follow");
+    pathArgs.push("--", pathFilter);
+  }
   const res = run([
     "git",
     "log",
@@ -1072,7 +1089,8 @@ function commitHistory(cwd, options) {
     `--format=${HISTORY_FORMAT}`,
     ...filterArgs,
     verified.stdout.trim(),
-    ...pathspec
+    ...pathspec,
+    ...pathArgs
   ], cwd);
   if (res.code !== 0)
     return { commits: [], hasMore: false, error: "git log failed" };
@@ -1173,6 +1191,130 @@ function numstatZ(args, cwd) {
 function isToolInternalPath(path) {
   return path.split(/[\\/]+/).some((part) => part.toLowerCase() === ".code-viewer");
 }
+function syntheticUncommittedBlameFromWorktree(cwd, path) {
+  const filePath = join2(cwd, path);
+  try {
+    const stat = statSync(filePath);
+    if (!stat.isFile())
+      return { lines: [], commits: {}, error: "not a file" };
+    const text = readFileSync(filePath, "utf8");
+    const normalized = text.replace(/\r\n/g, `
+`).replace(/\r/g, `
+`);
+    const lineCount = normalized.length ? normalized.endsWith(`
+`) ? normalized.length - 1 === 0 ? 1 : normalized.split(`
+`).length - 1 : normalized.split(`
+`).length : 1;
+    const lines = [];
+    for (let i = 1;i <= lineCount; i++) {
+      lines.push({ lineNo: i, sha: BLAME_ZERO_SHA, isUncommitted: true });
+    }
+    return {
+      lines,
+      commits: {
+        [BLAME_ZERO_SHA]: {
+          sha: BLAME_ZERO_SHA,
+          author: "Not Committed Yet",
+          authorMail: "",
+          authorTime: 0,
+          summary: "Working tree",
+          isUncommitted: true
+        }
+      },
+      isUntracked: true,
+      isSynthetic: true
+    };
+  } catch (err) {
+    if (typeof err === "object" && err !== null && "code" in err && err.code === "ENOENT") {
+      return { lines: [], commits: {}, error: "file not found" };
+    }
+    return { lines: [], commits: {}, error: "file not readable" };
+  }
+}
+function blame(cwd, options) {
+  const path = options.path;
+  if (!path || path.includes("\x00") || path.startsWith("-")) {
+    return { lines: [], commits: {}, error: "invalid path" };
+  }
+  const normalized = normalizeBlameRef(options.ref, options.base);
+  const args = ["git", "blame", "--porcelain"];
+  if (normalized.base === "HEAD") {
+    if (normalized.ref.startsWith("-") || normalized.ref.includes("\x00"))
+      return { lines: [], commits: {}, error: "invalid ref" };
+    args.push(normalized.ref);
+  }
+  args.push("--", path);
+  const res = run(args, cwd);
+  if (res.code !== 0) {
+    if (normalized.base === "worktree") {
+      return syntheticUncommittedBlameFromWorktree(cwd, path);
+    }
+    return {
+      lines: [],
+      commits: {},
+      error: res.stderr.trim() || "blame failed"
+    };
+  }
+  const lines = [];
+  const commits = {};
+  const rawLines = res.stdout.split(`
+`);
+  let i = 0;
+  while (i < rawLines.length) {
+    const headerLine = rawLines[i];
+    if (!headerLine) {
+      i++;
+      continue;
+    }
+    const headerMatch = /^([0-9a-f]{40}) (\d+) (\d+)(?: (\d+))?$/.exec(headerLine);
+    if (!headerMatch) {
+      i++;
+      continue;
+    }
+    const sha = headerMatch[1];
+    const finalLine = Number(headerMatch[3]);
+    i++;
+    let commit = commits[sha];
+    if (!commit) {
+      commit = {
+        sha,
+        author: "",
+        authorMail: "",
+        authorTime: 0,
+        summary: "",
+        isUncommitted: sha === BLAME_ZERO_SHA
+      };
+      commits[sha] = commit;
+    }
+    while (i < rawLines.length && !rawLines[i].startsWith("\t")) {
+      const metaLine = rawLines[i++];
+      if (!metaLine)
+        continue;
+      const sp = metaLine.indexOf(" ");
+      const key = sp >= 0 ? metaLine.slice(0, sp) : metaLine;
+      const val = sp >= 0 ? metaLine.slice(sp + 1) : "";
+      if (key === "author" && !commit.author)
+        commit.author = val;
+      else if (key === "author-mail" && !commit.authorMail)
+        commit.authorMail = val.replace(/^</, "").replace(/>$/, "");
+      else if (key === "author-time" && !commit.authorTime)
+        commit.authorTime = Number(val) || 0;
+      else if (key === "summary" && !commit.summary)
+        commit.summary = val;
+    }
+    if (i < rawLines.length && rawLines[i].startsWith("\t"))
+      i++;
+    if (Number.isFinite(finalLine) && finalLine > 0) {
+      lines.push({
+        lineNo: finalLine,
+        sha,
+        isUncommitted: sha === BLAME_ZERO_SHA
+      });
+    }
+  }
+  lines.sort((a, b) => a.lineNo - b.lineNo);
+  return { lines, commits };
+}
 function untracked(cwd, path = "") {
   const args = ["git", "ls-files", "--others", "--exclude-standard"];
   if (path)
@@ -1509,7 +1651,7 @@ function truncateToNHunks(diffText, n, maxLines = Number.POSITIVE_INFINITY) {
     lineTruncated
   };
 }
-var WORKTREE_RECURSIVE_DEPTH_LIMIT = 32, WORKTREE_RECURSIVE_ENTRY_LIMIT = 50000, DEFAULT_REF_COMMIT_LIMIT = 100, MAX_REF_COMMIT_LIMIT = 500, COMMIT_FORMAT = "%H%x00%s%x00%an%x00%aI", DEFAULT_WORKTREE_OMIT_DIR_NAMES, HISTORY_FORMAT = "%H%x00%s%x00%an%x00%aI%x00%P%x00%b", MAX_HISTORY_LIMIT = 200;
+var BLAME_ZERO_SHA = "0000000000000000000000000000000000000000", WORKTREE_RECURSIVE_DEPTH_LIMIT = 32, WORKTREE_RECURSIVE_ENTRY_LIMIT = 50000, DEFAULT_REF_COMMIT_LIMIT = 100, MAX_REF_COMMIT_LIMIT = 500, COMMIT_FORMAT = "%H%x00%s%x00%an%x00%aI", DEFAULT_WORKTREE_OMIT_DIR_NAMES, HISTORY_FORMAT = "%H%x00%s%x00%an%x00%aI%x00%P%x00%b", MAX_HISTORY_LIMIT = 200;
 var init_git = __esm(() => {
   init_runtime();
   DEFAULT_WORKTREE_OMIT_DIR_NAMES = [
@@ -2775,7 +2917,7 @@ __export(exports_skill_cli, {
   SKILL_HELP: () => SKILL_HELP,
   AGENT_SKILL_DIRS: () => AGENT_SKILL_DIRS
 });
-import { cpSync, existsSync as existsSync4, mkdirSync as mkdirSync2 } from "node:fs";
+import { cpSync, existsSync as existsSync4, mkdirSync as mkdirSync2, readdirSync as readdirSync2 } from "node:fs";
 import { homedir as homedir2 } from "node:os";
 import { join as join5, resolve } from "node:path";
 function parseAgentList(value) {
@@ -2831,25 +2973,34 @@ function parseSkillArgs(argv) {
   }
   return { ok: true, args: { kind: "install", agents, global, cwd } };
 }
+function discoverBundledSkills(skillsRoot) {
+  if (!existsSync4(skillsRoot))
+    return [];
+  return readdirSync2(skillsRoot, { withFileTypes: true }).filter((entry) => entry.isDirectory() && existsSync4(join5(skillsRoot, entry.name, "SKILL.md"))).map((entry) => entry.name).sort();
+}
 function installSkill(args, deps) {
-  if (!existsSync4(join5(deps.sourceDir, "SKILL.md"))) {
+  const skills = discoverBundledSkills(deps.skillsRoot);
+  if (skills.length === 0) {
     return {
       ok: false,
-      error: `bundled skill not found at ${deps.sourceDir}`
+      error: `no bundled skills found under ${deps.skillsRoot}`
     };
   }
   const base = args.global ? deps.homeDir : resolve(args.cwd ?? deps.projectDir);
   const results = [];
   for (const agent of args.agents) {
-    const target = join5(base, AGENT_SKILL_DIRS[agent], "skills", SKILL_NAME);
-    const action = existsSync4(target) ? "updated" : "installed";
-    try {
-      mkdirSync2(target, { recursive: true });
-      cpSync(deps.sourceDir, target, { recursive: true });
-    } catch (error) {
-      return { ok: false, error: String(error) };
+    for (const skill of skills) {
+      const sourceDir = join5(deps.skillsRoot, skill);
+      const target = join5(base, AGENT_SKILL_DIRS[agent], "skills", skill);
+      const action = existsSync4(target) ? "updated" : "installed";
+      try {
+        mkdirSync2(target, { recursive: true });
+        cpSync(sourceDir, target, { recursive: true });
+      } catch (error) {
+        return { ok: false, error: String(error) };
+      }
+      results.push({ agent, skill, action, target });
     }
-    results.push({ agent, action, target });
   }
   return { ok: true, results };
 }
@@ -2865,7 +3016,7 @@ function runSkillCli(argv) {
     return;
   }
   const result = installSkill(parsed.args, {
-    sourceDir: join5(ROOT, "skills", SKILL_NAME),
+    skillsRoot: join5(ROOT, "skills"),
     homeDir: homedir2(),
     projectDir: process.cwd()
   });
@@ -2874,13 +3025,13 @@ function runSkillCli(argv) {
     process.exit(1);
   }
   for (const entry of result.results) {
-    console.log(`${entry.action} (${entry.agent}): ${entry.target}`);
+    console.log(`${entry.action} (${entry.agent}/${entry.skill}): ${entry.target}`);
   }
   if (result.results.some((entry) => entry.action === "installed")) {
-    console.log("Re-run the same command anytime to update the skill.");
+    console.log("Re-run the same command anytime to update the skills.");
   }
 }
-var SKILL_NAME = "code-viewer-annotate", AGENT_SKILL_DIRS, AGENT_NAMES, SKILL_HELP;
+var AGENT_SKILL_DIRS, AGENT_NAMES, SKILL_HELP;
 var init_skill_cli = __esm(() => {
   init_root();
   AGENT_SKILL_DIRS = {
@@ -2891,15 +3042,16 @@ var init_skill_cli = __esm(() => {
     agents: ".agents"
   };
   AGENT_NAMES = Object.keys(AGENT_SKILL_DIRS);
-  SKILL_HELP = `code-viewer skill — manage the bundled agent skill
+  SKILL_HELP = `code-viewer skill — manage the bundled agent skills
 
 Usage:
   code-viewer skill install [--agent <list>] [--global] [--cwd <dir>]
 
-Installs the ${SKILL_NAME} skill (SKILL.md for AI coding agents) into the
-skills directory of each selected agent in the current project, or into the
-home directory equivalents with --global. Running install again overwrites
-the files, so the same command also updates an existing installation.
+Installs every bundled skill (each SKILL.md directory under the package's
+skills/) into the skills directory of each selected agent in the current
+project, or into the home directory equivalents with --global. Running
+install again overwrites the files, so the same command also updates an
+existing installation.
 
 Options:
   --agent <list>  comma separated agents: ${AGENT_NAMES.join(", ")}, or all
@@ -4006,12 +4158,41 @@ function sanitizeDbUiPrefs(raw) {
   }
   return Object.keys(out).length > 0 ? out : undefined;
 }
+function sanitizeDbUiExpandedTables(raw) {
+  if (!isRecord(raw))
+    return;
+  const out = {};
+  let scopeCount = 0;
+  for (const [scopeRaw, tablesRaw] of Object.entries(raw)) {
+    if (scopeCount >= MAX_DB_UI_EXPANDED_SCOPES)
+      break;
+    const scope = safeObjectKey(scopeRaw);
+    if (!scope)
+      continue;
+    const tables = normalizeStringList(tablesRaw, {
+      maxItems: MAX_DB_UI_TABLES,
+      maxLen: MAX_KEY_LEN,
+      sort: true
+    });
+    if (!tables || tables.length === 0)
+      continue;
+    out[scope] = tables;
+    scopeCount++;
+  }
+  return Object.keys(out).length > 0 ? out : undefined;
+}
 function sanitizeDbUiState(raw) {
   if (!isRecord(raw))
     return emptyDbUiState();
   const prefs = sanitizeDbUiPrefs(raw.prefs);
+  const expandedTables = sanitizeDbUiExpandedTables(raw.expandedTables);
   if (!isRecord(raw.columnWidths)) {
-    return prefs ? { ...emptyDbUiState(), prefs } : emptyDbUiState();
+    const out2 = emptyDbUiState();
+    if (expandedTables)
+      out2.expandedTables = expandedTables;
+    if (prefs)
+      out2.prefs = prefs;
+    return out2;
   }
   const columnWidths = {};
   let dbCount = 0;
@@ -4052,6 +4233,8 @@ function sanitizeDbUiState(raw) {
     dbCount++;
   }
   const out = { version: 1, columnWidths };
+  if (expandedTables)
+    out.expandedTables = expandedTables;
   if (prefs)
     out.prefs = prefs;
   return out;
@@ -4069,12 +4252,30 @@ function mergeDbUiPrefs(current, patch) {
   }
   return Object.keys(next).length > 0 ? next : undefined;
 }
+function mergeDbUiExpandedTables(current, patch) {
+  if (!isRecord(patch))
+    return current;
+  const next = { ...current ?? {} };
+  for (const [scope, tablesRaw] of Object.entries(patch)) {
+    if (tablesRaw === null) {
+      delete next[scope];
+      continue;
+    }
+    next[scope] = tablesRaw;
+  }
+  return sanitizeDbUiExpandedTables(next);
+}
 function mergeDbUiState(current, patch) {
   if (!isRecord(patch))
     return current;
   const mergedPrefs = "prefs" in patch ? mergeDbUiPrefs(current.prefs, patch.prefs) : current.prefs;
+  const mergedExpandedTables = "expandedTables" in patch ? mergeDbUiExpandedTables(current.expandedTables, patch.expandedTables) : current.expandedTables;
   if (!isRecord(patch.columnWidths)) {
     const merged = { ...current, version: 1 };
+    if (mergedExpandedTables)
+      merged.expandedTables = mergedExpandedTables;
+    else
+      delete merged.expandedTables;
     if (mergedPrefs)
       merged.prefs = mergedPrefs;
     else
@@ -4114,6 +4315,7 @@ function mergeDbUiState(current, patch) {
     ...current,
     ...patch,
     columnWidths,
+    expandedTables: mergedExpandedTables,
     prefs: mergedPrefs,
     version: 1
   });
@@ -4145,7 +4347,7 @@ async function patchDbUiState(root, patch) {
     return { state: next, result: next };
   });
 }
-var CODE_VIEWER_DIR2 = ".code-viewer", SETTINGS_FILE_NAME = "settings.json", VIEW_STATE_FILE_NAME = "view-state.json", DB_UI_FILE_NAME = "db-ui.json", MAX_SETTINGS_BYTES = 200000, MAX_VIEW_STATE_BYTES = 1e6, MAX_DB_UI_BYTES = 1e6, MAX_REF_LEN = 1024, MAX_KEY_LEN = 2048, MAX_VIEW_ITEMS = 20000, MAX_DB_UI_DBS = 200, MAX_DB_UI_TABLES = 500, MAX_DB_UI_COLUMNS = 1000, DB_UI_BOOL_PREF_KEYS, settingsStore, viewStateStore, dbUiStore;
+var CODE_VIEWER_DIR2 = ".code-viewer", SETTINGS_FILE_NAME = "settings.json", VIEW_STATE_FILE_NAME = "view-state.json", DB_UI_FILE_NAME = "db-ui.json", MAX_SETTINGS_BYTES = 200000, MAX_VIEW_STATE_BYTES = 1e6, MAX_DB_UI_BYTES = 1e6, MAX_REF_LEN = 1024, MAX_KEY_LEN = 2048, MAX_VIEW_ITEMS = 20000, MAX_DB_UI_DBS = 200, MAX_DB_UI_TABLES = 500, MAX_DB_UI_COLUMNS = 1000, MAX_DB_UI_EXPANDED_SCOPES = 500, DB_UI_BOOL_PREF_KEYS, settingsStore, viewStateStore, dbUiStore;
 var init_state_store = __esm(() => {
   init_json_store();
   DB_UI_BOOL_PREF_KEYS = ["s3TooltipEnabled", "inferFkRails"];
@@ -5258,9 +5460,12 @@ function createDockerAdapter(config) {
     const tableLiteral = table.replace(/'/g, "''");
     if (config.kind === "postgresql") {
       const schemaLiteral = postgresSchemaLiteral();
-      return `SELECT c.column_name, c.data_type, c.is_nullable, c.column_default, CASE WHEN pk.column_name IS NULL THEN 'NO' ELSE 'YES' END FROM information_schema.columns c LEFT JOIN (SELECT kcu.column_name FROM information_schema.table_constraints tc JOIN information_schema.key_column_usage kcu ON tc.constraint_name = kcu.constraint_name AND tc.table_schema = kcu.table_schema AND tc.table_name = kcu.table_name WHERE tc.table_schema = ${schemaLiteral} AND tc.table_name = '${tableLiteral}' AND tc.constraint_type = 'PRIMARY KEY') pk ON pk.column_name = c.column_name WHERE c.table_schema = ${schemaLiteral} AND c.table_name = '${tableLiteral}' ORDER BY c.ordinal_position`;
+      return `SELECT c.column_name, c.data_type, c.is_nullable, c.column_default, CASE WHEN pk.column_name IS NULL THEN 'NO' ELSE 'YES' END, COALESCE(d.description, '') FROM information_schema.columns c JOIN pg_namespace n ON n.nspname = c.table_schema JOIN pg_class cls ON cls.relnamespace = n.oid AND cls.relname = c.table_name LEFT JOIN pg_attribute a ON a.attrelid = cls.oid AND a.attname = c.column_name AND a.attnum > 0 AND NOT a.attisdropped LEFT JOIN pg_description d ON d.objoid = cls.oid AND d.objsubid = a.attnum LEFT JOIN (SELECT kcu.column_name FROM information_schema.table_constraints tc JOIN information_schema.key_column_usage kcu ON tc.constraint_name = kcu.constraint_name AND tc.table_schema = kcu.table_schema AND tc.table_name = kcu.table_name WHERE tc.table_schema = ${schemaLiteral} AND tc.table_name = '${tableLiteral}' AND tc.constraint_type = 'PRIMARY KEY') pk ON pk.column_name = c.column_name WHERE c.table_schema = ${schemaLiteral} AND c.table_name = '${tableLiteral}' ORDER BY c.ordinal_position`;
     }
-    return `SELECT column_name, column_type, is_nullable, column_default, column_key FROM information_schema.columns WHERE table_schema = DATABASE() AND table_name = '${tableLiteral}' ORDER BY ordinal_position`;
+    return `SELECT column_name, column_type, is_nullable, column_default, column_key, column_comment FROM information_schema.columns WHERE table_schema = DATABASE() AND table_name = '${tableLiteral}' ORDER BY ordinal_position`;
+  }
+  function columnCommentFromInfoValue(value) {
+    return value ? value : null;
   }
   function columnsFromInfoRows(rows) {
     if (config.kind === "postgresql") {
@@ -5269,7 +5474,8 @@ function createDockerAdapter(config) {
         type: row[1],
         nullable: row[2] === "YES",
         primaryKey: row[4] === "YES",
-        defaultValue: row[3] === "" ? null : row[3]
+        defaultValue: row[3] === "" ? null : row[3],
+        comment: columnCommentFromInfoValue(row[5])
       }));
     }
     return rows.map((row) => ({
@@ -5277,7 +5483,8 @@ function createDockerAdapter(config) {
       type: row[1],
       nullable: row[2] === "YES",
       primaryKey: row[4] === "PRI",
-      defaultValue: row[3] === "NULL" ? null : row[3]
+      defaultValue: row[3] === "NULL" ? null : row[3],
+      comment: columnCommentFromInfoValue(row[5])
     }));
   }
   async function fetchColumnsAsyncUncached(table, signal) {
@@ -5376,10 +5583,10 @@ function createDockerAdapter(config) {
       let sql;
       if (config.kind === "postgresql") {
         const inList = uncached.map((t) => `'${t.replace(/'/g, "''")}'`).join(",");
-        sql = `SELECT table_name, column_name, data_type, is_nullable, column_default FROM information_schema.columns WHERE table_schema = ${postgresSchemaLiteral()} AND table_name IN (${inList}) ORDER BY table_name, ordinal_position`;
+        sql = `SELECT c.table_name, c.column_name, c.data_type, c.is_nullable, c.column_default, COALESCE(d.description, '') FROM information_schema.columns c JOIN pg_namespace n ON n.nspname = c.table_schema JOIN pg_class cls ON cls.relnamespace = n.oid AND cls.relname = c.table_name LEFT JOIN pg_attribute a ON a.attrelid = cls.oid AND a.attname = c.column_name AND a.attnum > 0 AND NOT a.attisdropped LEFT JOIN pg_description d ON d.objoid = cls.oid AND d.objsubid = a.attnum WHERE c.table_schema = ${postgresSchemaLiteral()} AND c.table_name IN (${inList}) ORDER BY c.table_name, c.ordinal_position`;
       } else {
         const inList = uncached.map((t) => `'${t.replace(/'/g, "''")}'`).join(",");
-        sql = `SELECT table_name, column_name, column_type, is_nullable, column_default, column_key FROM information_schema.columns WHERE table_schema = DATABASE() AND table_name IN (${inList}) ORDER BY table_name, ordinal_position`;
+        sql = `SELECT table_name, column_name, column_type, is_nullable, column_default, column_key, column_comment FROM information_schema.columns WHERE table_schema = DATABASE() AND table_name IN (${inList}) ORDER BY table_name, ordinal_position`;
       }
       try {
         const queryResult = await execAsync(sql, signal);
@@ -5415,7 +5622,8 @@ function createDockerAdapter(config) {
               type: row[2],
               nullable: row[3] === "YES",
               primaryKey: pkCols.has(row[1]),
-              defaultValue: row[4] === "" ? null : row[4]
+              defaultValue: row[4] === "" ? null : row[4],
+              comment: columnCommentFromInfoValue(row[5])
             }));
           } else {
             cols = rows.map((row) => ({
@@ -5423,7 +5631,8 @@ function createDockerAdapter(config) {
               type: row[2],
               nullable: row[3] === "YES",
               primaryKey: row[5] === "PRI",
-              defaultValue: row[4] === "NULL" ? null : row[4]
+              defaultValue: row[4] === "NULL" ? null : row[4],
+              comment: columnCommentFromInfoValue(row[6])
             }));
           }
           columnCache.set(tbl, cols);
@@ -5516,12 +5725,7 @@ function createDockerAdapter(config) {
     async getFilteredTablePageWithMeta(table, options, signal) {
       const id = tableIdentifier(table);
       const columnsPromise = tableMetaCache.getColumns(table, () => fetchColumnsAsyncUncached(table, signal));
-      let columns;
-      try {
-        columns = await columnsPromise;
-      } catch (err) {
-        throw err;
-      }
+      const columns = await columnsPromise;
       const columnNames = columns.map((column) => column.name);
       const order = buildOrderClause(filterOrderByColumns(options.orderBy, columnNames), config.kind);
       const where = buildFilterWhere(filterGroupedColumns(options.grouped, columnNames), config.kind, filterExactColumns(options.exact, columnNames)).where;
@@ -11597,7 +11801,7 @@ function fileToMeta(file, range, extraQs) {
     untracked: file.untracked || false
   };
 }
-function computePayload(extras, range) {
+function computePayload(extras, range, pathFilter = "") {
   if (isSameWorktreeRange(range)) {
     return {
       files: [],
@@ -11613,8 +11817,9 @@ function computePayload(extras, range) {
   const files = fileMeta(fullArgs, cwd, false);
   if (includeUntracked(range, refs2))
     files.push(...untrackedMeta(cwd));
-  files.sort((a, b) => a.path < b.path ? -1 : a.path > b.path ? 1 : 0);
-  files.forEach((file, i) => {
+  const filteredFiles = pathFilter ? files.filter((file) => file.path === pathFilter || file.old_path === pathFilter) : files;
+  filteredFiles.sort((a, b) => a.path < b.path ? -1 : a.path > b.path ? 1 : 0);
+  filteredFiles.forEach((file, i) => {
     file.order = i + 1;
   });
   const extraQs = {};
@@ -11624,7 +11829,7 @@ function computePayload(extras, range) {
     if (e === "--ignore-blank-lines")
       extraQs.ignore_blank = "1";
   }
-  const meta = files.map((file) => fileToMeta(file, range, extraQs));
+  const meta = filteredFiles.map((file) => fileToMeta(file, range, extraQs));
   const totals = meta.reduce((acc, file) => {
     acc.additions += file.additions || 0;
     acc.deletions += file.deletions || 0;
@@ -11651,9 +11856,12 @@ function handleDiffJson(url) {
     from: url.searchParams.get("from") || "",
     to: url.searchParams.get("to") || ""
   };
-  const key = `${range.from}|${range.to}|${url.searchParams.get("ignore_ws") || ""}|${url.searchParams.get("ignore_blank") || ""}`;
+  const path = url.searchParams.get("path") || "";
+  if (path && !safePath(path))
+    return text("invalid path", 400);
+  const key = `${range.from}|${range.to}|${url.searchParams.get("ignore_ws") || ""}|${url.searchParams.get("ignore_blank") || ""}|${path}`;
   if (url.searchParams.get("nocache") === "1") {
-    const payload2 = computePayload(extras, range);
+    const payload2 = computePayload(extras, range, path);
     const sig = JSON.stringify({ ...payload2, generation: undefined });
     const cached2 = metaCache.get(key);
     if (!cached2 || cached2.sig !== sig) {
@@ -11679,7 +11887,7 @@ function handleDiffJson(url) {
         "Cache-Control": "no-store"
       }
     });
-  const payload = computePayload(extras, range);
+  const payload = computePayload(extras, range, path);
   const body = JSON.stringify(payload);
   setTimedCacheEntry(metaCache, key, {
     body,
@@ -12096,15 +12304,109 @@ function handleLog(url) {
   const ref = url.searchParams.get("ref") || "HEAD";
   const skip = Number(url.searchParams.get("skip") || "0");
   const limit = Number(url.searchParams.get("limit") || "50");
+  const path = url.searchParams.get("path") || "";
+  if (path && !safePath(path))
+    return text("invalid path", 400);
   const result = commitHistory(cwd, {
     ref,
     skip: Number.isFinite(skip) ? skip : 0,
     limit: Number.isFinite(limit) ? limit : 50,
-    query: url.searchParams.get("q") || ""
+    query: url.searchParams.get("q") || "",
+    ...path ? { path } : {}
   });
   if (result.error)
     return text(result.error, 400);
-  return json2({ commits: result.commits, hasMore: result.hasMore });
+  const wantsWorktreeHead = path && skip === 0 && (ref === "worktree" || url.searchParams.get("worktree") === "1");
+  let commits = result.commits;
+  let hasWorktree = false;
+  if (wantsWorktreeHead) {
+    const status = runSync([
+      "git",
+      "-c",
+      "core.quotepath=false",
+      "status",
+      "--porcelain=v1",
+      "-z",
+      "--untracked-files=normal",
+      "--",
+      path
+    ], cwd);
+    if (status.code === 0 && status.stdout.length > 0) {
+      const parts = status.stdout.split("\x00").filter(Boolean);
+      if (parts.length > 0) {
+        hasWorktree = true;
+        commits = [
+          {
+            sha: "worktree",
+            subject: "未コミット変更 (Working tree)",
+            author: "",
+            when: "",
+            parents: [],
+            body: ""
+          },
+          ...commits
+        ];
+      }
+    }
+  }
+  return json2({
+    commits,
+    hasMore: result.hasMore,
+    generation,
+    ...hasWorktree ? { hasWorktree: true } : {}
+  });
+}
+function blamePathKey(p) {
+  try {
+    const st = statSync3(join13(cwd, p));
+    return `${st.mtimeMs}:${st.size}`;
+  } catch {
+    return "missing";
+  }
+}
+function rememberBlame(key, value) {
+  if (blameCache.has(key))
+    blameCache.delete(key);
+  blameCache.set(key, value);
+  while (blameCache.size > BLAME_CACHE_MAX) {
+    const oldest = blameCache.keys().next();
+    if (oldest.done)
+      break;
+    blameCache.delete(oldest.value);
+  }
+}
+function handleFileBlame(url) {
+  const path = url.searchParams.get("path") || "";
+  if (!safePath(path))
+    return text("invalid path", 400);
+  const ref = url.searchParams.get("ref") || "worktree";
+  if (!ref || ref.startsWith("-") || ref.includes("\x00"))
+    return text("invalid ref", 400);
+  const rawBase = url.searchParams.get("base");
+  const requestedBase = rawBase === "HEAD" ? "HEAD" : rawBase === "worktree" ? "worktree" : ref === "worktree" ? "worktree" : "HEAD";
+  const normalized = normalizeBlameRef(ref, requestedBase);
+  const { base } = normalized;
+  let cacheKey;
+  if (base === "worktree") {
+    cacheKey = `worktree|${path}|${blamePathKey(path)}`;
+  } else {
+    const resolved = runSync(["git", "rev-parse", "--verify", `${normalized.ref}^{commit}`], cwd);
+    if (resolved.code !== 0)
+      return text("unknown ref", 400);
+    cacheKey = `HEAD|${path}|${resolved.stdout.trim()}`;
+  }
+  const cached = blameCache.get(cacheKey);
+  if (cached) {
+    if (blameCache.has(cacheKey)) {
+      blameCache.delete(cacheKey);
+      blameCache.set(cacheKey, cached);
+    }
+    return json2({ ...cached, base, ref, generation });
+  }
+  const result = blame(cwd, { path, ref: normalized.ref, base });
+  if (!result.error)
+    rememberBlame(cacheKey, result);
+  return json2({ ...result, base, ref, generation });
 }
 function handleFileDiff(url) {
   const path = url.searchParams.get("path") || "";
@@ -13113,7 +13415,7 @@ function restartWorktreeWatch() {
   }
   worktreeWatch = startScopedWorktreeWatch();
 }
-var WEB_ROOT, VERSION, DEFAULT_ARGS, PREVIEW_HUNKS_DEFAULT = 3, PREVIEW_LINES_DEFAULT = 1200, WATCHED_ASSET_FILES, SIZE_SMALL = 2000, SIZE_MEDIUM = 8000, SIZE_LARGE = 20000, LINE_INDEX_MIN_START = 1e4, LINE_INDEX_MAX_FILE_BYTES, BLOB_LINE_CACHE_MAX_BYTES, MAX_UPLOAD_FILE_BYTES, MAX_UPLOAD_TOTAL_BYTES, MAX_UPLOAD_BODY_BYTES, MAX_UPLOAD_FILES = 50, SAFE_UPLOAD_EXTENSIONS, generation = 1, cwd, cliArgs, listenPort = 0, openAfterStart = false, scopeOmitDirNames, scopeOmitDirCliOverride = null, scopeExcludeNames, scopeWatchLimit, uploadEnabled = true, rgAvailableCache = null, enc, sseClients, sseKeepalives, fileCache, metaCache, fileListCache, lineIndexCache, blobLineIndexCache, blobBytesCache, blobLineCacheBytes = 0, isCodeViewerInternalPath, watchLimitReached = null, server, worktreeWatch = null, shuttingDown = false;
+var WEB_ROOT, VERSION, DEFAULT_ARGS, PREVIEW_HUNKS_DEFAULT = 3, PREVIEW_LINES_DEFAULT = 1200, WATCHED_ASSET_FILES, SIZE_SMALL = 2000, SIZE_MEDIUM = 8000, SIZE_LARGE = 20000, LINE_INDEX_MIN_START = 1e4, LINE_INDEX_MAX_FILE_BYTES, BLOB_LINE_CACHE_MAX_BYTES, MAX_UPLOAD_FILE_BYTES, MAX_UPLOAD_TOTAL_BYTES, MAX_UPLOAD_BODY_BYTES, MAX_UPLOAD_FILES = 50, SAFE_UPLOAD_EXTENSIONS, generation = 1, cwd, cliArgs, listenPort = 0, openAfterStart = false, scopeOmitDirNames, scopeOmitDirCliOverride = null, scopeExcludeNames, scopeWatchLimit, uploadEnabled = true, rgAvailableCache = null, enc, sseClients, sseKeepalives, fileCache, blameCache, BLAME_CACHE_MAX = 64, metaCache, fileListCache, lineIndexCache, blobLineIndexCache, blobBytesCache, blobLineCacheBytes = 0, isCodeViewerInternalPath, watchLimitReached = null, server, worktreeWatch = null, shuttingDown = false;
 var init_preview = __esm(async () => {
   init_routes();
   init_annotations();
@@ -13181,6 +13483,7 @@ var init_preview = __esm(async () => {
   sseClients = new Set;
   sseKeepalives = new Map;
   fileCache = new Map;
+  blameCache = new Map;
   metaCache = new Map;
   fileListCache = new Map;
   lineIndexCache = new Map;
@@ -13213,6 +13516,8 @@ var init_preview = __esm(async () => {
         return handleRefCommits(url);
       if (url.pathname === "/_log")
         return handleLog(url);
+      if (url.pathname === "/_file_blame")
+        return handleFileBlame(url);
       if (url.pathname === "/file_diff")
         return handleFileDiff(url);
       if (url.pathname === "/file_range")

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@youtyan/code-viewer",
-  "version": "0.2.10",
+  "version": "0.3.0",
   "description": "Local browser-based code and git diff viewer",
   "type": "module",
   "bin": {