local-kanban 2.0.0-beta.5 → 2.0.0-beta.6

package/CHANGELOG.md

@@ -8,6 +8,12 @@ version it goes out as and opens an empty one again. Released sections are histo
 
 ## [Unreleased]
 
+## [2.0.0-beta.6]
+
+### Fixed
+
+- Words typed to the terminal of a task in Review that only lead to commits of other tasks or a release (such as «roll it out») no longer keep the handed-in task in Doing: when the turn changed nothing but commits and none of them names the task, it goes back to Review. A task without an issue keeps the old rule — a commit naming nothing may be its own.
+
 ## [2.0.0-beta.5]
 
 ### Fixed

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "local-kanban",
-  "version": "2.0.0-beta.5",
+  "version": "2.0.0-beta.6",
   "license": "MIT",
   "author": "Dannylamao",
   "repository": {

package/src/routes/tasks.js

@@ -10,7 +10,7 @@ import { resolveProject } from './projects.js';
 import { kick } from '../sync/worker.js';
 import { LABELS } from '../sync/github.js';
 import { repoHttpsBase } from '../repo-base.js';
-import { STAT_FORMAT, mirrorName, statCommit, wordsOf } from '../shipped.js';
+import { STAT_FORMAT, mirrorName, namesTask, statCommit, wordsOf } from '../shipped.js';
 import { isManual, listShape, noclaudeFilter, snapshot, taskEvent } from '../task-shape.js';
 import { requestSession, requestHostSession, bindSession, taskSessions, mayReprep, unclaimedLaunch, claimLaunch, markLaunch } from '../claude-sessions.js';
 import { taskFeed } from '../work-feed.js';
@@ -19,7 +19,7 @@ import { currentWorkProjects, liveTasks, terminalQuestions } from '../claude-liv
 import { activeBoardSessions, doneRuns, nowRuns } from '../claude-now.js';
 import { closeFinishedTerminals, taskTerminal } from '../phantom.js';
 import { CHECK_LABEL, OPEN_CHECK, isCheck, leadCheck, openCheck, secondCheck } from '../review-check.js';
-import { treePrint } from '../tree-print.js';
+import { treePrint, turnCommits } from '../tree-print.js';
 import { bin } from '../bin-path.js';
 
 const ATTACH_DIR = join(DATA_DIR, 'attachments');
@@ -65,6 +65,15 @@ async function commitUrlFor(task) {
 
 // and not the newest commit of the project, whoever made it
 const STAT_SCAN = 300;
+/** The words that name `task` in a commit of the repository at `path` (wordsOf) and the prefixes of the board. */
+async function taskWords(task, path) {
+  const issueNo = task.gh_issue_number;
+  const mirror = mirrorName(ghOwner(), ghRepo());
+  const base = issueNo && mirror ? await repoHttpsBase(path) : null;
+  const home = Boolean(base) && base.toLowerCase() === `https://github.com/${mirror}`.toLowerCase();
+  const known = new Set(db.prepare('SELECT upper(prefix) AS prefix FROM projects').all().map((p) => p.prefix));
+  return { words: wordsOf(task.key, issueNo, mirror, home), known };
+}
 function attachGitStat(task, startedAt) {
   const project = db.prepare('SELECT path FROM projects WHERE id = ?').get(task.project_id);
   if (!project?.path) return;
@@ -73,14 +82,11 @@ function attachGitStat(task, startedAt) {
   const git = (args) => new Promise((done) => execFile(bin('git'), ['-C', project.path, ...args], { timeout: 5000, maxBuffer: 16 * 1024 * 1024 }, (err, out) => done(err ? null : out)));
   (async () => {
     try {
-      const mirror = mirrorName(ghOwner(), ghRepo());
-      const base = issueNo && mirror ? await repoHttpsBase(project.path) : null;
-      const home = Boolean(base) && base.toLowerCase() === `https://github.com/${mirror}`.toLowerCase();
+      const { words, known } = await taskWords(task, project.path);
       const log = await git(['log', '-n', String(STAT_SCAN), `--format=${STAT_FORMAT}`]);
       if (log === null) return; // not a git repository, or no git — nothing to show
-      const known = new Set(db.prepare('SELECT upper(prefix) AS prefix FROM projects').all().map((p) => p.prefix));
       const since = startedAt ? Math.floor(new Date(startedAt + 'Z').getTime() / 1000) : null;
-      const hash = statCommit(log, wordsOf(task.key, issueNo, mirror, home), { issue: issueNo, since, known });
+      const hash = statCommit(log, words, { issue: issueNo, since, known });
       if (!hash) return;
       const stdout = await git(['log', '-1', '--format=%h|%ct|%s', '--shortstat', hash]);
       const lines = String(stdout || '').trim().split('\n').filter(Boolean);
@@ -361,8 +367,16 @@ export async function settleTurns(states) {
     const elsewhere = db.prepare('SELECT 1 FROM task_events WHERE session_id = ? AND task_id != ? AND id > ? LIMIT 1').get(m.sid, st.id, m.event);
     if (!elsewhere) {
       const before = await m.print;
-      const now = await treePrint(db.prepare('SELECT p.path FROM tasks t JOIN projects p ON p.id = t.project_id WHERE t.id = ?').get(st.id)?.path);
-      if (before === null || now === null || before !== now) continue; // committed or changed files — or cannot tell
+      const path = db.prepare('SELECT p.path FROM tasks t JOIN projects p ON p.id = t.project_id WHERE t.id = ?').get(st.id)?.path;
+      const now = await treePrint(path);
+      if (before === null || now === null) continue; // cannot tell
+      if (before !== now) {
+        const log = await turnCommits(path, before, now, STAT_FORMAT);
+        const t = log === null ? null : resolveTask(String(st.id));
+        if (!t) continue; // changed files — or cannot tell
+        const { words, known } = await taskWords(t, path);
+        if (namesTask(log, words, { issue: t.gh_issue_number, known })) continue; // committed for it
+      }
     }
     back.push({ id: st.id, ...m });
   }

package/src/shipped.js

@@ -68,6 +68,12 @@ export function statCommit(out, words, { issue = null, since = null, known = nul
   return head.hash;
 }
 
+export function namesTask(out, words, { issue = null, known = null } = {}) {
+  const commits = parseLog(out, known);
+  if (!commits.length) return true;
+  return commits.some((c) => words.some((w) => c.words.has(w)) || (!issue && !ownKeys(c.subject, known).length));
+}
+
 export function branchesOf(key, names) {
   const k = new RegExp(`(^|[-/_])${key}($|[-/_])`, 'i');
   return names.filter((n) => k.test(n.replace(/^(origin\/)?claude\//, '')));

package/src/tree-print.js

@@ -29,6 +29,16 @@ export async function treePrint(path) {
   if (untracked.length > UNTRACKED_MAX || !top) return null; // too many to look at, or no root to find them: cannot tell
   const root = top.toString('utf8').trim();
   const stamps = await Promise.all(untracked.map((f) => stat(join(root, f)).then((s) => `${f}\0${s.size}\0${s.mtimeMs}`, () => `${f}\0-`)));
-  return createHash('sha1').update(head || '').update('\0').update(status).update('\0').update(diff || '').update('\0')
-    .update(stamps.join('\0')).digest('hex');
+  const rest = createHash('sha1').update(status).update('\0').update(diff || '').update('\0').update(stamps.join('\0')).digest('hex');
+  return `${head ? head.toString('utf8').trim() : ''}:${rest}`;
+}
+
+export async function turnCommits(path, before, now, format) {
+  const cut = (p) => { const i = String(p || '').indexOf(':'); return i > 0 ? [p.slice(0, i), p.slice(i + 1)] : [null, null]; };
+  const [a, restA] = cut(before);
+  const [b, restB] = cut(now);
+  if (!a || !b || a === b || restA !== restB) return null;
+  if (await git(path, ['merge-base', '--is-ancestor', a, b]) === null) return null; // a branch switched, a reset: cannot tell
+  const out = await git(path, ['log', `--format=${format}`, `${a}..${b}`]);
+  return out === null ? null : out.toString('utf8');
 }