@kitkat-vn/kitcode 0.2.0-staging.3 → 0.2.0-staging.5

package/src/source-snapshot.mjs

@@ -505,7 +505,9 @@ export function readProjectSourcesUnder(root, {sourceType = 'vibe', rules}) {
 // A read in which git did anything but the user's own commits carries `gitOperation`: what it found
 // changed is git's, and not activity (operator decision Q4, 2026-09-25). A baseline always does; so does
 // a read after git acted without moving HEAD, as a stash does, which is read whole too, like a move, so
-// that none of what git changed is left for a later scan to take for the user's.
+// that none of what git changed is left for a later scan to take for the user's. A read that is a
+// baseline because an operation waits for the user carries `gitWaiting` too, the files git left for it,
+// for the tracker's log (since 2026-10-01).
 function checkedAgainstGit(root, sourceType, since, read, readAll) {
   const first = read();
 
@@ -513,9 +515,15 @@ function checkedAgainstGit(root, sourceType, since, read, readAll) {
     return first;
   }
 
-  const {arrival, operation, position} = gitArrival(root, since);
+  const {arrival, operation, position, waiting} = gitArrival(root, since);
   const reads = arrival === 'moved' || arrival === 'unexplained' || (arrival === null && operation) ? readAll() : first;
-  const mark = (entry) => ({...entry, git: position, ...(arrival ? {baseline: arrival} : {}), ...(operation ? {gitOperation: true} : {})});
+  const mark = (entry) => ({
+    ...entry,
+    git: position,
+    ...(arrival ? {baseline: arrival} : {}),
+    ...(waiting ? {gitWaiting: waiting} : {}),
+    ...(operation ? {gitOperation: true} : {}),
+  });
 
   return Array.isArray(reads) ? reads.map(mark) : mark(reads);
 }

package/src/tracker-problems.mjs

@@ -10,6 +10,7 @@ const PROBLEM_SENTENCES = {
   'project-missing': 'A KitCode project folder is missing, so nothing in it is counted.',
   'scan-failed': 'KitCode tracker could not read a project, so its = are not being counted.',
   'git-locked': 'A KitCode project\'s git index has stayed locked (index.lock in its .git folder), so nothing in it is counted until the lock goes; a git command that crashed can leave that file behind.',
+  'git-unfinished': 'A KitCode project has an unfinished git operation (a merge, rebase, cherry-pick, revert, am or squash merge), so nothing in it is counted until that operation is finished or aborted.',
 };
 const UNKNOWN_PROBLEM = 'KitCode tracker is working with a problem; its log is ~/.kitcode/tracker.log.';