@kairyou/agent-tools 0.13.3 → 0.13.5

package/dist/log/hook.mjs

@@ -1251,30 +1251,46 @@ async function updateDailyFile(outputFile, day, items) {
     (item, index) => `  ${index + 1}. ${item.project ? `${item.project}: ` : ""}${item.text}`
   );
   const block = [`<!-- log:${day}:start -->`, ...lines, `<!-- log:${day}:end -->`];
-  let current = "";
+  let raw = "";
   try {
-    current = await fs.readFile(outputFile, "utf8");
+    raw = await fs.readFile(outputFile, "utf8");
   } catch {
   }
+  const hadBom = raw.charCodeAt(0) === 65279;
+  const current = hadBom ? raw.slice(1) : raw;
   const eol = current.includes("\r\n") ? "\r\n" : "\n";
   const fileLines = current ? current.split(/\r?\n/) : [];
   const startMarker = `<!-- log:${day}:start -->`;
   const endMarker = `<!-- log:${day}:end -->`;
-  const startIndex = fileLines.findIndex((line) => line.trim() === startMarker);
-  const endIndex = fileLines.findIndex((line) => line.trim() === endMarker);
+  const startIndex = fileLines.findLastIndex((line) => line.trim() === startMarker);
+  const endIndex = fileLines.findIndex(
+    (line, index) => index > startIndex && line.trim() === endMarker
+  );
   let nextLines;
   if (startIndex !== -1 && endIndex > startIndex) {
     nextLines = [...fileLines.slice(0, startIndex), ...block, ...fileLines.slice(endIndex + 1)];
-  } else if (startIndex !== -1 || endIndex !== -1) {
-    console.error(`[agent-tools log] Unpaired markers for ${day} in ${outputFile}; skipped.`);
-    return;
   } else {
     nextLines = insertDatedBlock(fileLines, day, block);
   }
-  const text = nextLines.join(eol).replace(/(\r?\n)*$/, eol);
+  const body = nextLines.join(eol).replace(/(\r?\n)*$/, eol);
+  const text = hadBom ? "\uFEFF" + body : body;
   await fs.mkdir(path.dirname(outputFile), { recursive: true });
   await writeFileAtomic(outputFile, text);
 }
+var ENTRY_MARKER_RE = /^<!--\s*(?:daily-)?log:\d{4}-\d{2}-\d{2}:(?:start|end)\b/;
+function datedSectionEnd(fileLines, dateIndex) {
+  let end = dateIndex + 1;
+  for (let i = dateIndex + 1; i < fileLines.length; i += 1) {
+    const line = fileLines[i];
+    if (!line.trim()) continue;
+    if (ENTRY_MARKER_RE.test(line.trim()) || /^\s/.test(line)) {
+      end = i + 1;
+      continue;
+    }
+    break;
+  }
+  return end;
+}
 function insertDatedBlock(fileLines, day, block) {
   const dateLineRe = /^\+ (\d{4}-\d{2}-\d{2})\s*$/;
   const dates = [];
@@ -1284,22 +1300,14 @@ function insertDatedBlock(fileLines, day, block) {
   }
   const existing = dates.find((entry) => entry.date === day);
   if (existing) {
-    const boundaryRe = /^(\+ \d{4}-\d{2}-\d{2}\s*$|#{1,6}\s)/;
-    let insertAt2 = fileLines.length;
-    for (let i = existing.index + 1; i < fileLines.length; i += 1) {
-      if (boundaryRe.test(fileLines[i])) {
-        insertAt2 = i;
-        break;
-      }
-    }
-    while (insertAt2 - 1 > existing.index && fileLines[insertAt2 - 1].trim() === "") insertAt2 -= 1;
+    const insertAt2 = datedSectionEnd(fileLines, existing.index);
     const trailing = fileLines.slice(insertAt2);
     const inserted = [...block];
     if (trailing.length > 0 && trailing[0].trim() !== "") inserted.push("");
     return [...fileLines.slice(0, insertAt2), ...inserted, ...trailing];
   }
   const ascending = dates.length < 2 || dates[0].date <= dates[dates.length - 1].date;
-  let insertAt = fileLines.length;
+  let insertAt = dates.length > 0 ? datedSectionEnd(fileLines, dates[dates.length - 1].index) : fileLines.length;
   for (const entry of dates) {
     if (ascending ? entry.date > day : entry.date < day) {
       insertAt = entry.index;

package/integrations/log/hook.mjs

@@ -520,36 +520,63 @@ async function updateDailyFile(outputFile, day, items) {
   );
   const block = [`<!-- log:${day}:start -->`, ...lines, `<!-- log:${day}:end -->`];
 
-  let current = "";
+  let raw = "";
   try {
-    current = await fs.readFile(outputFile, "utf8");
+    raw = await fs.readFile(outputFile, "utf8");
   } catch {
     // First write creates the file.
   }
+  // Windows editors and PowerShell write a BOM; strip it for parsing and put
+  // it back on write so the file keeps the encoding its author chose.
+  const hadBom = raw.charCodeAt(0) === 0xfeff;
+  const current = hadBom ? raw.slice(1) : raw;
   const eol = current.includes("\r\n") ? "\r\n" : "\n";
   const fileLines = current ? current.split(/\r?\n/) : [];
 
   const startMarker = `<!-- log:${day}:start -->`;
   const endMarker = `<!-- log:${day}:end -->`;
-  const startIndex = fileLines.findIndex((line) => line.trim() === startMarker);
-  const endIndex = fileLines.findIndex((line) => line.trim() === endMarker);
+  // Pair with the LAST start: an earlier damaged start must not swallow
+  // whatever the user wrote between it and our block.
+  const startIndex = fileLines.findLastIndex((line) => line.trim() === startMarker);
+  const endIndex = fileLines.findIndex(
+    (line, index) => index > startIndex && line.trim() === endMarker
+  );
 
   let nextLines;
   if (startIndex !== -1 && endIndex > startIndex) {
     nextLines = [...fileLines.slice(0, startIndex), ...block, ...fileLines.slice(endIndex + 1)];
-  } else if (startIndex !== -1 || endIndex !== -1) {
-    // Unpaired markers: refuse to guess an edit range in an unattended run.
-    console.error(`[agent-tools log] Unpaired markers for ${day} in ${outputFile}; skipped.`);
-    return;
   } else {
+    // Also covers an unpaired marker: never guess its range, just add an
+    // intact block. Recording must not stop because one block got damaged;
+    // the stray marker stays visible for the user to clean up.
     nextLines = insertDatedBlock(fileLines, day, block);
   }
 
-  const text = nextLines.join(eol).replace(/(\r?\n)*$/, eol);
+  const body = nextLines.join(eol).replace(/(\r?\n)*$/, eol);
+  const text = hadBom ? "" + body : body;
   await fs.mkdir(path.dirname(outputFile), { recursive: true });
   await writeFileAtomic(outputFile, text);
 }
 
+// Where a dated entry stops: markers and indented items belong to it, anything
+// else below (headings, comment blocks, separators, todo lists) does not. Both
+// marker namespaces count, since at-daily-log may share this file.
+const ENTRY_MARKER_RE = /^<!--\s*(?:daily-)?log:\d{4}-\d{2}-\d{2}:(?:start|end)\b/;
+
+function datedSectionEnd(fileLines, dateIndex) {
+  let end = dateIndex + 1;
+  for (let i = dateIndex + 1; i < fileLines.length; i += 1) {
+    const line = fileLines[i];
+    if (!line.trim()) continue;
+    if (ENTRY_MARKER_RE.test(line.trim()) || /^\s/.test(line)) {
+      end = i + 1;
+      continue;
+    }
+    break;
+  }
+  return end;
+}
+
 function insertDatedBlock(fileLines, day, block) {
   const dateLineRe = /^\+ (\d{4}-\d{2}-\d{2})\s*$/;
   const dates = [];
@@ -560,18 +587,10 @@ function insertDatedBlock(fileLines, day, block) {
 
   const existing = dates.find((entry) => entry.date === day);
   if (existing) {
-    // Date line exists without markers (user-written): append the block below
-    // that date's lines. The dated section ends at the next date line or the
-    // next heading (notes and todo lists after the entries stay untouched).
-    const boundaryRe = /^(\+ \d{4}-\d{2}-\d{2}\s*$|#{1,6}\s)/;
-    let insertAt = fileLines.length;
-    for (let i = existing.index + 1; i < fileLines.length; i += 1) {
-      if (boundaryRe.test(fileLines[i])) {
-        insertAt = i;
-        break;
-      }
-    }
-    while (insertAt - 1 > existing.index && fileLines[insertAt - 1].trim() === "") insertAt -= 1;
+    // The date exists but carries no block of ours yet (user-written, or only
+    // at-daily-log's). Append below that date's own lines, never past the
+    // notes and todo lists that live further down the file.
+    const insertAt = datedSectionEnd(fileLines, existing.index);
     const trailing = fileLines.slice(insertAt);
     const inserted = [...block];
     if (trailing.length > 0 && trailing[0].trim() !== "") inserted.push("");
@@ -579,8 +598,12 @@ function insertDatedBlock(fileLines, day, block) {
   }
 
   // Insert a new date at its date-order position; ascending when ambiguous.
+  // Falling off the end means this date sorts last, so it goes at the end of
+  // the dated section rather than the end of the file: notes, comment blocks
+  // and todo lists kept below the log must stay below it.
   const ascending = dates.length < 2 || dates[0].date <= dates[dates.length - 1].date;
-  let insertAt = fileLines.length;
+  let insertAt =
+    dates.length > 0 ? datedSectionEnd(fileLines, dates[dates.length - 1].index) : fileLines.length;
   for (const entry of dates) {
     if (ascending ? entry.date > day : entry.date < day) {
       insertAt = entry.index;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kairyou/agent-tools",
-  "version": "0.13.3",
+  "version": "0.13.5",
   "description": "Reusable Agent Skills, plus integrations (statusline, provider usage, vision) that install into Codex, Claude Code, and opencode.",
   "license": "MIT",
   "repository": {

package/skills/workflow/at-daily-log/SKILL.md

@@ -26,13 +26,23 @@ Resolve paths to Git roots and deduplicate them. Report invalid paths; a non-Git
 directory does not block other valid projects. Do not clone remote URLs without consent.
 
 For each repository, resolve the author with `git -C <root> config user.name`; never
-infer aliases or use the remote login as the author. Filter commits by comparing `%an`
-literally, not via an `--author` regex. Inspect all local branches, current
-HEAD, user-named branches, and configured upstreams. Unless the user requests local-only
-data, refresh only the configured upstream branches, grouped into one best-effort
-`git fetch --no-tags <remote> <branch...>` per involved remote. Fetch failure is
-non-fatal. Do not change the working tree or local branch history. Deduplicate commits
-by hash.
+infer aliases or use the remote login as the author.
+
+Inspect all local branches, current HEAD, user-named branches, and configured
+upstreams. Unless the user requests local-only data, refresh only the configured
+upstream branches, grouped into one best-effort `git fetch --no-tags <remote>
+<branch...>` per involved remote. Fetch failure is non-fatal. Do not change the
+working tree or local branch history.
+
+Then list candidates with `git -C <root> log --no-merges --since=<from>
+--until=<to+1day> --format=%H%x09%an --branches HEAD <upstream refs>`, taking the
+upstream refs from `git -C <root> for-each-ref --format=%(upstream) refs/heads/`.
+Passing no ref walks only the current branch, so work on an unmerged branch reads as
+no activity; `--all` reaches past the scope above into remote branches nobody tracks.
+Keep the rows whose `%an` equals the resolved name exactly. Never pass `--author`: it
+matches the whole `Name <email>` header, so anchored patterns silently match nothing.
+When the window holds commits but none carry that name, report the names actually
+found instead. Deduplicate commits by hash.
 
 ## Build work items
 
@@ -87,7 +97,9 @@ first, and skip empty days.
 ## Draft or record
 
 "Generate" / `生成日报` returns a draft. "Record" / `记录日报`, or an explicit
-write request, writes after previewing the entry. Resolve the destination in order:
+write request, writes after previewing the entry. A draft may close with one short
+line offering to record it; treat any affirmative reply to that offer as the go-ahead,
+and keep the suggested word short (`记录` / `record`). Resolve the destination in order:
 
 1. a path supplied in conversation;
 2. optional `dailyLog.output` in `~/.agent-tools/config.jsonc`;
@@ -103,17 +115,19 @@ the current block and the regenerated one before writing, then replace only that
 date's block. If the date exists without markers, append a marked block below the
 user's lines instead of editing them. Do not duplicate the date. Insert a new date
 among the existing dated entries at its date-order position, inferring ascending or
-descending from the dates already present (ascending when that is ambiguous); content
-above or below the dated entries, such as notes or todo lists, stays where it is. On duplicate or
+descending from the dates already present (ascending when that is ambiguous). A date
+that sorts last goes right after the final dated entry, not at the end of the file:
+notes, comment blocks and todo lists kept below the log stay below it. On duplicate or
 unpaired markers, stop and propose the edit instead of writing. When neither Git nor
 the session log shows activity for the day, leave the file unchanged and say so; the
 user can add a manual entry themselves. Recording a range applies these rules to each day's block independently.
 
 Scheduling is separate; set it up only when the user asks. Prefer the OS scheduler
 (Task Scheduler, cron, launchd) over agent-internal timers, which stop with the agent:
-schedule a headless run of the CLI this skill is executing in, invoking the skill with
-the recording request the user asked for (in Claude Code,
-`claude -p "/at-daily-log record the log"`; other CLIs have their own headless form).
+schedule a headless run of the CLI this skill is executing in — `claude -p <prompt>`,
+`codex exec <prompt>`, `opencode run <prompt>` — invoking the skill with the recording
+request the user asked for, as in `claude -p "/at-daily-log record the log"`. How a
+skill is addressed varies per CLI, so the test run below is what confirms it.
 Keep projects and output in config so the command stays stable. Before registering,
 confirm the schedule, make sure the output file is resolvable, and run the exact
 command once; register only after that test run records correctly, and show how to

package/skills/workflow/at-self-eval/SKILL.md

@@ -27,8 +27,15 @@ Always exclude merge commits.
 
 Use an explicit author when supplied; otherwise resolve it independently per repository
 with `git -C <root> config user.name`. Never infer aliases or use the remote login as
-the author. Filter commits by comparing `%an` literally, not via an `--author` regex. If no commits match, report that and suggest listing known commit authors;
-do not try spelling or language variants. When results exist, mention once that the
+the author. List candidates with `git -C <root> log --no-merges --since=<from>
+--until=<to+1day> --format=%H%x09%an --branches HEAD <upstream refs>`, taking the
+upstream refs from `git -C <root> for-each-ref --format=%(upstream) refs/heads/`;
+passing no ref walks only the current branch, so work on an unmerged branch reads as
+no activity, while `--all` reaches into remote branches nobody tracks. Keep the rows
+whose `%an` equals that name exactly. Never pass `--author`: it matches the whole
+`Name <email>` header, so anchored patterns silently match nothing. If no commits
+match, report that together with the author names the window actually holds; do not
+try spelling or language variants. When results exist, mention once that the
 user can provide other author names if needed.
 
 ## Project evidence