devlog-tracker 0.31.1 → 0.33.0

package/core/scripts/keep-all.test.js

@@ -0,0 +1,210 @@
+'use strict';
+const test = require('node:test');
+const assert = require('node:assert/strict');
+const fs = require('fs');
+const os = require('os');
+const path = require('path');
+const { parseBlocks, scan, apply, formatScan } = require('./keep-all');
+
+function round(n, ts, status, body = `round ${n} body`) {
+  return `## Round ${n} — ${ts}\n\n### Summary\n${body}\n\n### Status\n${status}\n`;
+}
+
+function setup(files) {
+  const dir = fs.mkdtempSync(path.join(os.tmpdir(), 'keep-all-'));
+  const devlogDir = path.join(dir, '.devlog');
+  fs.mkdirSync(devlogDir);
+  for (const [name, text] of Object.entries(files)) fs.writeFileSync(path.join(devlogDir, name), text);
+  return devlogDir;
+}
+
+function ctx(devlogDir, extra = {}) {
+  return { devlogDir, projectDir: path.dirname(devlogDir), current: 'devlog.md', open: '', origin: '', ...extra };
+}
+
+const read = (d, f) => fs.readFileSync(path.join(d, f), 'utf8');
+const exists = (d, f) => fs.existsSync(path.join(d, f));
+
+function idsOf(result, file, rounds) {
+  return result.rounds.filter(r => r.file === file && rounds.includes(r.round)).map(r => r.id);
+}
+
+test('parseBlocks is fence-aware and reads round number, timestamp and status', () => {
+  const text = '# head\n\n' + round(1, '2026-09-01T10:00:00+0800', 'DONE',
+    '```\n## Round 99 — fake\n```') + '\n## Checkpoint — x\n\ncp\n';
+  const { blocks, firstBlock } = parseBlocks(text);
+  assert.equal(firstBlock, 2);
+  assert.equal(blocks.length, 2);
+  assert.equal(blocks[0].round, 1);
+  assert.equal(blocks[0].status, 'DONE');
+  assert.equal(blocks[0].ts, '2026-09-01T10:00:00+0800');
+  assert.equal(blocks[1].round, null);
+});
+
+test('scan classifies sources and marks what is movable', () => {
+  const d = setup({
+    'devlog.md': '# proj\n\n' + round(1, '2026-09-01T10:00:00+0800', 'DONE') + '\n' +
+      round(2, '2026-09-01T11:00:00+0800', 'DONE') + '\n' + round(3, '2026-09-05T10:00:00+0800', 'IN_PROGRESS'),
+    'devlog.feat-x.md': '<!-- devlog-origin: branch=feat/x -->\n\n' +
+      round(1, '2026-09-02T10:00:00+0800', 'DONE') + '\n' + round(2, '2026-09-02T11:00:00+0800', 'IN_PROGRESS'),
+    'devlog.legacy.md': round(1, '2026-09-03T10:00:00+0800', 'DONE'),
+    'devlog.archive.md': round(1, '2026-08-01T10:00:00+0800', 'DONE'),
+    'devlog.topic.md': '# Kept log\n\n- source: `.devlog/devlog.md`\n- rounds: 5-5\n- kept_at: x\n\n' +
+      round(5, '2026-08-15T10:00:00+0800', 'DONE'),
+    'devlog.lessons.git.md': '# lessons\n',
+  });
+  const r = scan(ctx(d, { open: '3' }));
+  const kind = Object.fromEntries(r.sources.map(s => [s.file, s.kind]));
+  assert.deepEqual(kind, {
+    'devlog.archive.md': 'archive', 'devlog.feat-x.md': 'branch', 'devlog.legacy.md': 'branch',
+    'devlog.md': 'current', 'devlog.topic.md': 'kept',
+  });
+  const fx = r.sources.find(s => s.file === 'devlog.feat-x.md');
+  assert.equal(fx.origin, 'feat/x');
+  assert.equal(fx.originFrom, 'marker');
+  assert.equal(r.sources.find(s => s.file === 'devlog.legacy.md').originFrom, 'filename');
+  // global ids ordered by timestamp
+  assert.deepEqual(r.rounds.map(x => `${x.file}:${x.round}`), [
+    'devlog.archive.md:1', 'devlog.topic.md:5', 'devlog.md:1', 'devlog.md:2',
+    'devlog.feat-x.md:1', 'devlog.feat-x.md:2', 'devlog.legacy.md:1', 'devlog.md:3',
+  ]);
+  const mov = x => r.rounds.find(y => `${y.file}:${y.round}` === x).movable;
+  assert.equal(mov('devlog.md:3'), false, 'open round');
+  assert.equal(mov('devlog.feat-x.md:2'), false, 'branch unfinished tail');
+  assert.equal(mov('devlog.feat-x.md:1'), true);
+  assert.match(formatScan(r), /^FINGERPRINT=\S+ COUNT=8\n/);
+});
+
+test('scan reports NOTHING when no round is movable', () => {
+  const d = setup({ 'devlog.md': round(1, '2026-09-01T10:00:00+0800', 'IN_PROGRESS') });
+  const r = scan(ctx(d, { open: '1' }));
+  assert.equal(formatScan(r), 'NOTHING\n');
+});
+
+function world() {
+  return setup({
+    'devlog.md': '# proj\n\n' + round(1, '2026-09-01T10:00:00+0800', 'DONE') +
+      '\n## Checkpoint — Round 1-1\n\ncp one\n\n' + round(2, '2026-09-01T11:00:00+0800', 'DONE') +
+      '\n## Kept 索引\n- `devlog.topic.md`：Round 5-5，kept_at x\n- `devlog.other.md`：Round 9-9，kept_at x\n',
+    'devlog.feat-x.md': '<!-- devlog-origin: branch=feat/x -->\n\n' +
+      round(1, '2026-09-02T10:00:00+0800', 'DONE') + '\n' + round(2, '2026-09-02T11:00:00+0800', 'IN_PROGRESS'),
+    'devlog.archive.md': round(1, '2026-08-01T10:00:00+0800', 'DONE'),
+    'devlog.topic.md': '# Kept log\n\n- source: `.devlog/devlog.md`\n- rounds: 5-5\n- kept_at: x\n\nold summary\n\n' +
+      round(5, '2026-08-15T10:00:00+0800', 'DONE'),
+    'devlog.other.md': '# Kept log\n\n- rounds: 9-9\n\n' + round(9, '2026-08-20T10:00:00+0800', 'DONE'),
+  });
+}
+
+test('apply moves a cross-file topic into one file in time order and consumes kept files', () => {
+  const d = world();
+  const c = ctx(d);
+  const s = scan(c);
+  const a = [...idsOf(s, 'devlog.archive.md', [1]), ...idsOf(s, 'devlog.topic.md', [5]), ...idsOf(s, 'devlog.feat-x.md', [1])];
+  const b = [...idsOf(s, 'devlog.other.md', [9]), ...idsOf(s, 'devlog.md', [1])];
+  const plan = `alpha\tfirst topic\t${a.join(',')}\nbeta\t\t${b.join(',')}\n`;
+  const out = apply(c, plan, s.fingerprint, s.rounds.length);
+
+  const alpha = read(d, 'devlog.alpha.md');
+  assert.match(alpha, /^# Kept log\n\n- source: keep-all\n/);
+  assert.match(alpha, /- rounds: devlog\.archive\.md 1\n/);
+  assert.match(alpha, /old summary/, 'kept file summary travels with its first round');
+  const order = [...alpha.matchAll(/^## Round (\d+) — (\S+)/gm)].map(m => m[2]);
+  assert.deepEqual(order, ['2026-08-01T10:00:00+0800', '2026-08-15T10:00:00+0800', '2026-09-02T10:00:00+0800']);
+
+  const beta = read(d, 'devlog.beta.md');
+  assert.match(beta, /## Round 1 — 2026-09-01T10:00:00\+0800[\s\S]*## Checkpoint — Round 1-1/, 'checkpoint follows its round');
+
+  assert.ok(!exists(d, 'devlog.topic.md') && !exists(d, 'devlog.other.md'), 'kept sources deleted');
+  assert.ok(!exists(d, 'devlog.archive.md'), 'empty archive deleted');
+  const main = read(d, 'devlog.md');
+  assert.match(main, /^# proj\n/);
+  assert.ok(!/Round 1 —/.test(main) && /Round 2 —/.test(main));
+  assert.ok(!/Checkpoint/.test(main));
+  assert.ok(!/devlog\.topic\.md|devlog\.other\.md/.test(main), 'ghost index lines removed');
+  assert.match(main, /- `devlog\.alpha\.md`：keep-all，3 輪，kept_at \S+，first topic\n/);
+  assert.match(main, /- `devlog\.beta\.md`：keep-all，2 輪，kept_at \S+\n/);
+
+  const fx = read(d, 'devlog.feat-x.md');
+  assert.match(fx, /^<!-- devlog-origin: branch=feat\/x -->\n/);
+  assert.ok(!/Round 1 —/.test(fx) && /Round 2 —/.test(fx));
+
+  assert.match(out, /^KEPT=.*devlog\.alpha\.md ROUNDS=3$/m);
+  assert.match(out, /^DELETED=.*devlog\.topic\.md$/m);
+  const backup = out.match(/^BACKUP=(.*)$/m)[1];
+  assert.ok(fs.existsSync(path.join(backup, 'devlog.topic.md')));
+  assert.ok(fs.existsSync(path.join(backup, 'devlog.md')));
+});
+
+test('apply may reuse the name of a kept file it consumes', () => {
+  const d = world();
+  const c = ctx(d);
+  const s = scan(c);
+  const all = [...idsOf(s, 'devlog.topic.md', [5]), ...idsOf(s, 'devlog.other.md', [9])];
+  apply(c, `topic\t\t${all.join(',')}\n`, s.fingerprint, s.rounds.length);
+  assert.match(read(d, 'devlog.topic.md'), /- source: keep-all/);
+  assert.match(read(d, 'devlog.md'), /- `devlog\.topic\.md`：keep-all，2 輪/);
+});
+
+function snapshot(d) {
+  return Object.fromEntries(fs.readdirSync(d).map(f => [f, fs.readFileSync(path.join(d, f), 'utf8')]));
+}
+
+for (const [label, planFor, pattern] of [
+  ['uncovered kept round', s => `a\t\t${idsOf(s, 'devlog.topic.md', [5])}\n`, /devlog\.other\.md/],
+  ['id in two segments', s => {
+    const k = [...idsOf(s, 'devlog.topic.md', [5]), ...idsOf(s, 'devlog.other.md', [9])].join(',');
+    return `a\t\t${k}\nb\t\t${idsOf(s, 'devlog.topic.md', [5])}\n`;
+  }, /重複/],
+  ['unmovable round', s => {
+    const k = [...idsOf(s, 'devlog.topic.md', [5]), ...idsOf(s, 'devlog.other.md', [9])].join(',');
+    return `a\t\t${k},${idsOf(s, 'devlog.feat-x.md', [2])}\n`;
+  }, /不可搬/],
+  ['collision with an existing branch file', s => {
+    const k = [...idsOf(s, 'devlog.topic.md', [5]), ...idsOf(s, 'devlog.other.md', [9])].join(',');
+    return `feat-x\t\t${k}\n`;
+  }, /已存在/],
+  ['reserved name', s => {
+    const k = [...idsOf(s, 'devlog.topic.md', [5]), ...idsOf(s, 'devlog.other.md', [9])].join(',');
+    return `archive\t\t${k}\n`;
+  }, /檔名無效/],
+]) {
+  test(`apply rejects ${label} and writes nothing`, () => {
+    const d = world();
+    const c = ctx(d);
+    const s = scan(c);
+    const before = snapshot(d);
+    assert.throws(() => apply(c, planFor(s), s.fingerprint, s.rounds.length), pattern);
+    assert.deepEqual(snapshot(d), before);
+  });
+}
+
+test('apply refuses when a scanned round changed, but tolerates a newly appended round', () => {
+  const d = world();
+  const c = ctx(d);
+  const s = scan(c);
+  const k = [...idsOf(s, 'devlog.topic.md', [5]), ...idsOf(s, 'devlog.other.md', [9])].join(',');
+  fs.appendFileSync(path.join(d, 'devlog.md'), '\n' + round(3, '2026-09-10T10:00:00+0800', 'DONE'));
+  const d2 = world();
+  const c2 = ctx(d2);
+  const s2 = scan(c2);
+  fs.writeFileSync(path.join(d2, 'devlog.archive.md'), round(1, '2026-08-01T10:00:00+0800', 'DONE', 'edited'));
+  const before = snapshot(d2);
+  assert.throws(() => apply(c2, `a\t\t${k}\n`, s2.fingerprint, s2.rounds.length), /fingerprint/);
+  assert.deepEqual(snapshot(d2), before);
+  apply(c, `a\t\t${k}\n`, s.fingerprint, s.rounds.length);
+  assert.match(read(d, 'devlog.md'), /Round 3 —/);
+});
+
+test('apply clears .span-open only when its round moved out of current', () => {
+  const d = world();
+  fs.writeFileSync(path.join(d, '.span-open'), '{"round": 1, "ticks": 0}\n');
+  const c = ctx(d);
+  const s = scan(c);
+  const k = [...idsOf(s, 'devlog.topic.md', [5]), ...idsOf(s, 'devlog.other.md', [9]), ...idsOf(s, 'devlog.md', [2])].join(',');
+  apply(c, `a\t\t${k}\n`, s.fingerprint, s.rounds.length);
+  assert.ok(exists(d, '.span-open'));
+  const s2 = scan(c);
+  const k2 = [...s2.rounds.filter(r => r.file === 'devlog.a.md').map(r => r.id), ...idsOf(s2, 'devlog.md', [1])];
+  apply(c, `b\t\t${k2.join(',')}\n`, s2.fingerprint, s2.rounds.length);
+  assert.ok(!exists(d, '.span-open'));
+});

package/core/scripts/keep-move.sh

@@ -97,12 +97,18 @@ while IFS="$(printf '\t')" read -r start heading; do
   esac
 done < "$H2"
 
+# A branch file's origin marker (line 1) is the file's identity, not part
+# of the project summary: it never moves, even on full keep.
+MARKER=0
+[ -z "$(devlog_origin_of "$MAIN")" ] || MARKER=1
+
 KEPT_AT="$(date -Iseconds 2>/dev/null || date '+%Y-%m-%dT%H:%M:%S%z')"
 {
   printf '# Kept log\n\n- source: `.devlog/devlog.md`\n- rounds: %s-%s\n- kept_at: %s\n\n' \
     "$FROM" "$TO" "$KEPT_AT"
-  awk -v selected="$MOVE_BLOCKS" -v full="$FULL" -v first_round="$FIRST_ROUND" '
+  awk -v selected="$MOVE_BLOCKS" -v full="$FULL" -v first_round="$FIRST_ROUND" -v marker="$MARKER" '
     BEGIN { while ((getline n < selected) > 0) move[n] = 1 }
+    marker && NR == 1 { next }
     /^[ \t]*```/ { fence = !fence }
     !fence && /^## / { moving = (NR in move) }
     full && NR < first_round { print; next }
@@ -115,8 +121,9 @@ while read -r start round; do
   grep -Fqx "$heading" "$TARGET" || { echo "具名檔驗證失敗" >&2; exit 1; }
 done < "$MOVE_ROUNDS"
 
-awk -v selected="$MOVE_BLOCKS" -v full="$FULL" -v first_round="$FIRST_ROUND" -v open="$OPEN" '
+awk -v selected="$MOVE_BLOCKS" -v full="$FULL" -v first_round="$FIRST_ROUND" -v open="$OPEN" -v marker="$MARKER" '
   BEGIN { while ((getline n < selected) > 0) move[n] = 1 }
+  marker && NR == 1 { print; next }
   /^[ \t]*```/ { fence = !fence }
   !fence && /^## / { moving = (NR in move) }
   full && NR < first_round { next }

package/core/scripts/round-start.sh

@@ -95,7 +95,7 @@ case "$PROMPT" in
     ;;
 esac
 case "$CMD_NAME" in
-  devlog-tracker:checkpoint|devlog-tracker:clean|devlog-tracker:compact|devlog-tracker:keep|devlog-tracker:lessons|devlog-tracker:lessons-drift|devlog-tracker:lessons-off|devlog-tracker:lessons-on|devlog-tracker:overview|devlog-tracker:pause|devlog-tracker:report|devlog-tracker:search|devlog-tracker:segment-watch|devlog-tracker:span|devlog-tracker:start|devlog-tracker:status|devlog-tracker:timeline)
+  devlog-tracker:checkpoint|devlog-tracker:clean|devlog-tracker:compact|devlog-tracker:keep|devlog-tracker:keep-all|devlog-tracker:lessons|devlog-tracker:lessons-drift|devlog-tracker:lessons-off|devlog-tracker:lessons-on|devlog-tracker:overview|devlog-tracker:pause|devlog-tracker:report|devlog-tracker:search|devlog-tracker:segment-watch|devlog-tracker:span|devlog-tracker:start|devlog-tracker:status|devlog-tracker:timeline)
     exit 0
     ;;
 esac

package/core/scripts/tests/test-devlog-path.sh

@@ -69,35 +69,124 @@ devlog_resolve_paths "$DETACHEDREPO"
   && echo "PASS: detached HEAD falls back to worktree dirname" \
   || { echo "FAIL: detached got $DEVLOG_FILE"; FAIL=1; }
 
-# --- migration: existing devlog.md content moves to branch file ----------
-MIGREPO="$TMP/migrepo"
-mkdir -p "$MIGREPO/.devlog"
-: > "$MIGREPO/.devlog/.enabled"
-git_setup "$MIGREPO"
-git -C "$MIGREPO" checkout -q -b feature-y
-echo "## Round 1 existing content" > "$MIGREPO/.devlog/devlog.md"
-devlog_resolve_paths "$MIGREPO"
-if [ "$DEVLOG_FILE" = "$MIGREPO/.devlog/devlog.feature-y.md" ] \
+# Writes a devlog.md with a project header, the given rounds (as
+# "<n>:<STATUS>" pairs), a Checkpoint between rounds 1 and 2, and a
+# trailing Kept 索引.
+write_main_devlog() {
+  local file="$1"; shift
+  {
+    printf '# 專案摘要\n\nheader line\n'
+    local pair n st
+    for pair in "$@"; do
+      n="${pair%%:*}"; st="${pair#*:}"
+      printf '\n## Round %s — t\n\n### Summary\nround %s body\n\n### Status\n%s\n' "$n" "$n" "$st"
+      [ "$n" = 1 ] && printf '\n## Checkpoint — t\n\ncheckpoint body\n'
+    done
+    printf '\n## Kept 索引\n\n- devlog.old.md — kept topic\n'
+  } > "$file"
+}
+
+# New repo on main with .enabled; leaves the caller on main.
+mig_repo() {
+  mkdir -p "$1/.devlog"
+  : > "$1/.devlog/.enabled"
+  git_setup "$1"
+  git -C "$1" branch -M main
+}
+
+# --- main's last round DONE: new branch starts empty, devlog.md untouched --
+DONEREPO="$TMP/donerepo"
+mig_repo "$DONEREPO"
+write_main_devlog "$DONEREPO/.devlog/devlog.md" 1:DONE 2:DONE
+cp "$DONEREPO/.devlog/devlog.md" "$TMP/done-before.md"
+echo "main handoff" > "$DONEREPO/.devlog/handoff.md"
+git -C "$DONEREPO" checkout -q -b feature-done
+devlog_resolve_paths "$DONEREPO"
+if [ "$DEVLOG_FILE" = "$DONEREPO/.devlog/devlog.feature-done.md" ] \
+  && [ ! -f "$DEVLOG_FILE" ] \
+  && cmp -s "$DONEREPO/.devlog/devlog.md" "$TMP/done-before.md" \
+  && [ -f "$DONEREPO/.devlog/handoff.md" ] \
+  && [ ! -f "$DONEREPO/.devlog/handoff.feature-done.md" ]; then
+  echo "PASS: main ending DONE leaves devlog.md alone, branch starts empty"
+else
+  echo "FAIL: DONE-tail migration moved something (file=$DEVLOG_FILE)"
+  FAIL=1
+fi
+
+# --- unfinished tail: rounds after the last DONE are cut into branch file --
+TAILREPO="$TMP/tailrepo"
+mig_repo "$TAILREPO"
+write_main_devlog "$TAILREPO/.devlog/devlog.md" 1:DONE 2:DONE 3:BLOCKED 4:IN_PROGRESS
+echo "main handoff" > "$TAILREPO/.devlog/handoff.md"
+git -C "$TAILREPO" checkout -q -b feature-y
+devlog_resolve_paths "$TAILREPO"
+MAINF="$TAILREPO/.devlog/devlog.md"
+if [ "$DEVLOG_FILE" = "$TAILREPO/.devlog/devlog.feature-y.md" ] \
   && [ -f "$DEVLOG_FILE" ] \
-  && [ ! -f "$MIGREPO/.devlog/devlog.md" ] \
-  && grep -q "existing content" "$DEVLOG_FILE"; then
-  echo "PASS: migration renames devlog.md into branch file"
+  && [ "$(devlog_list_round_starts "$DEVLOG_FILE" | awk '{print $2}' | tr '\n' ' ')" = "3 4 " ] \
+  && [ "$(devlog_list_round_starts "$MAINF" | awk '{print $2}' | tr '\n' ' ')" = "1 2 " ] \
+  && ! grep -q "round 3 body\|round 4 body" "$MAINF" \
+  && grep -q "^# 專案摘要" "$MAINF" && ! grep -q "^# 專案摘要" "$DEVLOG_FILE" \
+  && grep -q "^## Checkpoint" "$MAINF" && ! grep -q "^## Checkpoint" "$DEVLOG_FILE" \
+  && grep -q "^## Kept 索引" "$MAINF" && ! grep -q "^## Kept 索引" "$DEVLOG_FILE" \
+  && [ ! -f "$TAILREPO/.devlog/handoff.md" ] \
+  && grep -q "main handoff" "$TAILREPO/.devlog/handoff.feature-y.md"; then
+  echo "PASS: unfinished tail (rounds after last DONE) cut into branch file with handoff"
 else
-  echo "FAIL: migration file=$DEVLOG_FILE"
+  echo "FAIL: tail migration (file=$DEVLOG_FILE)"
+  echo "--- devlog.md"; cat "$MAINF"; echo "--- branch"; cat "$DEVLOG_FILE" 2>/dev/null
   FAIL=1
 fi
 
-# --- migration is idempotent: second call doesn't re-move or error -------
-echo "## Round 2 written after migration" >> "$MIGREPO/.devlog/devlog.feature-y.md"
-devlog_resolve_paths "$MIGREPO"
-if [ "$DEVLOG_FILE" = "$MIGREPO/.devlog/devlog.feature-y.md" ] \
-  && grep -q "Round 2 written after migration" "$DEVLOG_FILE"; then
+# --- tail migration is idempotent: branch file exists, nothing re-moves ----
+echo "## Round 5 written after migration" >> "$TAILREPO/.devlog/devlog.feature-y.md"
+cp "$MAINF" "$TMP/tail-main-after.md"
+devlog_resolve_paths "$TAILREPO"
+if [ "$DEVLOG_FILE" = "$TAILREPO/.devlog/devlog.feature-y.md" ] \
+  && grep -q "Round 5 written after migration" "$DEVLOG_FILE" \
+  && cmp -s "$MAINF" "$TMP/tail-main-after.md"; then
   echo "PASS: second resolve is a no-op, content preserved"
 else
   echo "FAIL: second resolve altered state, got $DEVLOG_FILE"
   FAIL=1
 fi
 
+# --- no DONE round at all: every round moves, header/index stay ----------
+NODONEREPO="$TMP/nodonerepo"
+mig_repo "$NODONEREPO"
+write_main_devlog "$NODONEREPO/.devlog/devlog.md" 1:INTERRUPTED 2:IN_PROGRESS
+git -C "$NODONEREPO" checkout -q -b feature-n
+devlog_resolve_paths "$NODONEREPO"
+if [ "$(devlog_list_round_starts "$DEVLOG_FILE" 2>/dev/null | awk '{print $2}' | tr '\n' ' ')" = "1 2 " ] \
+  && [ -z "$(devlog_list_round_starts "$NODONEREPO/.devlog/devlog.md")" ] \
+  && grep -q "^## Kept 索引" "$NODONEREPO/.devlog/devlog.md" \
+  && grep -q "^## Checkpoint" "$NODONEREPO/.devlog/devlog.md"; then
+  echo "PASS: with no DONE round, all rounds move and non-round sections stay"
+else
+  echo "FAIL: no-DONE migration (file=$DEVLOG_FILE)"
+  FAIL=1
+fi
+
+# --- stale branch (doesn't contain main's tip): nothing moves -------------
+STALEREPO="$TMP/stalerepo"
+mig_repo "$STALEREPO"
+git -C "$STALEREPO" branch old-branch
+git -C "$STALEREPO" -c user.email=t@t.t -c user.name=t commit -q --allow-empty -m "main moves on"
+write_main_devlog "$STALEREPO/.devlog/devlog.md" 1:DONE 2:IN_PROGRESS
+cp "$STALEREPO/.devlog/devlog.md" "$TMP/stale-before.md"
+echo "main handoff" > "$STALEREPO/.devlog/handoff.md"
+git -C "$STALEREPO" checkout -q old-branch
+devlog_resolve_paths "$STALEREPO"
+if [ "$DEVLOG_FILE" = "$STALEREPO/.devlog/devlog.old-branch.md" ] \
+  && [ ! -f "$DEVLOG_FILE" ] \
+  && cmp -s "$STALEREPO/.devlog/devlog.md" "$TMP/stale-before.md" \
+  && [ -f "$STALEREPO/.devlog/handoff.md" ]; then
+  echo "PASS: checking out a branch that lacks main's tip moves nothing"
+else
+  echo "FAIL: stale branch took main's tail (file=$DEVLOG_FILE)"
+  FAIL=1
+fi
+
 # --- migration does NOT fire when .devlog/.enabled is absent (Fix 6) -----
 NOENABLEDREPO="$TMP/noenabledrepo"
 mkdir -p "$NOENABLEDREPO/.devlog"
@@ -114,6 +203,65 @@ else
   FAIL=1
 fi
 
+# --- origin marker: DEVLOG_ORIGIN reflects the raw branch / detached dir ----
+devlog_resolve_paths "$MAINREPO"
+[ -z "$DEVLOG_ORIGIN" ] \
+  && echo "PASS: main has no DEVLOG_ORIGIN" \
+  || { echo "FAIL: main DEVLOG_ORIGIN=$DEVLOG_ORIGIN"; FAIL=1; }
+devlog_resolve_paths "$NONGIT"
+[ -z "$DEVLOG_ORIGIN" ] \
+  && echo "PASS: non-git has no DEVLOG_ORIGIN" \
+  || { echo "FAIL: non-git DEVLOG_ORIGIN=$DEVLOG_ORIGIN"; FAIL=1; }
+devlog_resolve_paths "$SLASHREPO"
+[ "$DEVLOG_ORIGIN" = "branch=feature/foo" ] \
+  && echo "PASS: DEVLOG_ORIGIN keeps the raw (unsanitized) branch name" \
+  || { echo "FAIL: slash DEVLOG_ORIGIN=$DEVLOG_ORIGIN"; FAIL=1; }
+devlog_resolve_paths "$DETACHEDREPO"
+[ "$DEVLOG_ORIGIN" = "detached=detached-repo" ] \
+  && echo "PASS: detached DEVLOG_ORIGIN names the worktree dir" \
+  || { echo "FAIL: detached DEVLOG_ORIGIN=$DEVLOG_ORIGIN"; FAIL=1; }
+
+# --- origin marker: written as line 1 when the tail migrates -------------
+MARKREPO="$TMP/markrepo"
+mig_repo "$MARKREPO"
+write_main_devlog "$MARKREPO/.devlog/devlog.md" 1:DONE 2:IN_PROGRESS
+git -C "$MARKREPO" checkout -q -b feat/mark
+devlog_resolve_paths "$MARKREPO"
+if [ "$(head -n 1 "$DEVLOG_FILE")" = "<!-- devlog-origin: branch=feat/mark -->" ] \
+  && [ "$(devlog_list_round_starts "$DEVLOG_FILE" | awk '{print $2}' | tr '\n' ' ')" = "2 " ] \
+  && ! grep -q "devlog-origin" "$MARKREPO/.devlog/devlog.md"; then
+  echo "PASS: migrated branch file starts with its origin marker"
+else
+  echo "FAIL: migrated marker"; cat "$DEVLOG_FILE" 2>/dev/null; FAIL=1
+fi
+
+# --- origin marker: first merge into a missing branch file writes it -----
+MERGEREPO="$TMP/mergerepo"
+mig_repo "$MERGEREPO"
+git -C "$MERGEREPO" checkout -q -b feat/merge
+devlog_resolve_paths "$MERGEREPO"
+printf '## Round 1 — t\n\n### Status\nDONE\n' > "$TMP/rc1.md"
+devlog_merge_round_current "$DEVLOG_FILE" "$TMP/rc1.md"
+printf '## Round 2 — t\n\n### Status\nDONE\n' > "$TMP/rc2.md"
+devlog_merge_round_current "$DEVLOG_FILE" "$TMP/rc2.md"
+if [ "$(head -n 1 "$DEVLOG_FILE")" = "<!-- devlog-origin: branch=feat/merge -->" ] \
+  && [ "$(grep -c "devlog-origin" "$DEVLOG_FILE")" = 1 ] \
+  && [ "$(devlog_list_round_starts "$DEVLOG_FILE" | awk '{print $2}' | tr '\n' ' ')" = "1 2 " ]; then
+  echo "PASS: first merge into a new branch file writes the marker once"
+else
+  echo "FAIL: merge marker"; cat "$DEVLOG_FILE" 2>/dev/null; FAIL=1
+fi
+
+# --- origin marker: devlog.md never gets one -----------------------------
+MAINMERGE="$TMP/mainmerge"
+mig_repo "$MAINMERGE"
+devlog_resolve_paths "$MAINMERGE"
+printf '## Round 1 — t\n\n### Status\nDONE\n' > "$TMP/rc3.md"
+devlog_merge_round_current "$DEVLOG_FILE" "$TMP/rc3.md"
+! grep -q "devlog-origin" "$DEVLOG_FILE" \
+  && echo "PASS: devlog.md gets no origin marker" \
+  || { echo "FAIL: devlog.md got a marker"; FAIL=1; }
+
 # --- HANDOFF_FILE mirrors DEVLOG_FILE naming (no rename migration) --------
 devlog_resolve_paths "$NONGIT"
 [ "$HANDOFF_FILE" = "$NONGIT/.devlog/handoff.md" ] \
@@ -140,23 +288,5 @@ devlog_resolve_paths "$DETACHEDREPO"
   && echo "PASS: detached HANDOFF_FILE uses worktree dirname" \
   || { echo "FAIL: detached HANDOFF_FILE=$HANDOFF_FILE"; FAIL=1; }
 
-# migration must NOT move handoff.md
-MIGHO="$TMP/mighandoff"
-mkdir -p "$MIGHO/.devlog"
-: > "$MIGHO/.devlog/.enabled"
-git_setup "$MIGHO"
-git -C "$MIGHO" checkout -q -b feature-h
-echo "old handoff" > "$MIGHO/.devlog/handoff.md"
-echo "## Round 1" > "$MIGHO/.devlog/devlog.md"
-devlog_resolve_paths "$MIGHO"
-if [ -f "$MIGHO/.devlog/handoff.md" ] \
-  && [ ! -f "$MIGHO/.devlog/handoff.feature-h.md" ] \
-  && [ "$HANDOFF_FILE" = "$MIGHO/.devlog/handoff.feature-h.md" ]; then
-  echo "PASS: handoff.md is not renamed on first branch resolve"
-else
-  echo "FAIL: handoff migration diverged (HANDOFF_FILE=$HANDOFF_FILE)"
-  FAIL=1
-fi
-
 if [ "$FAIL" -eq 0 ]; then echo "All checks passed."; exit 0
 else echo "Some checks FAILED."; exit 1; fi

package/core/scripts/tests/test-keep-all.sh

@@ -0,0 +1,56 @@
+#!/usr/bin/env bash
+# End-to-end check of keep-all.sh in a real git repo: branch-state
+# reporting, current-file resolution, and a full scan → apply cycle.
+# keep-all.js's own rules are covered by core/scripts/keep-all.test.js.
+set -uo pipefail
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
+TMP="$(mktemp -d)"
+trap 'rm -rf "$TMP"' EXIT
+FAIL=0
+check() { if eval "$2"; then echo "PASS: $1"; else echo "FAIL: $1"; FAIL=1; fi; }
+round() { printf '## Round %s — %s\n\n### Status\n%s\n\n' "$1" "$2" "$3"; }
+
+command -v node >/dev/null 2>&1 || { echo "SKIP: node not installed"; exit 0; }
+
+R="$TMP/repo"
+mkdir -p "$R/.devlog"
+git -C "$R" init -q
+git -C "$R" -c user.email=t@t.t -c user.name=t commit -q --allow-empty -m init
+git -C "$R" branch -M main
+git -C "$R" branch feat/merged
+git -C "$R" checkout -q -b feat/live
+git -C "$R" -c user.email=t@t.t -c user.name=t commit -q --allow-empty -m live
+export DEVLOG_PROJECT_DIR="$R"
+
+{ printf '# proj\n\n'; round 1 2026-09-01T10:00:00+0800 DONE; } > "$R/.devlog/devlog.md"
+{ printf '<!-- devlog-origin: branch=feat/live -->\n\n'; round 1 2026-09-02T10:00:00+0800 DONE; round 2 2026-09-02T11:00:00+0800 IN_PROGRESS; } > "$R/.devlog/devlog.feat-live.md"
+{ printf '<!-- devlog-origin: branch=feat/merged -->\n\n'; round 1 2026-09-03T10:00:00+0800 DONE; } > "$R/.devlog/devlog.feat-merged.md"
+{ printf '<!-- devlog-origin: branch=feat/deleted -->\n\n'; round 1 2026-09-04T10:00:00+0800 DONE; } > "$R/.devlog/devlog.feat-deleted.md"
+printf '{"round": 2, "opened_at": "now"}\n' > "$R/.devlog/.round-open"
+
+OUT="$(bash "$SCRIPT_DIR/keep-all.sh" --scan)"
+check "current file is the checked-out branch's" 'grep -q "^SOURCE file=devlog.feat-live.md kind=current origin=feat/live origin_from=marker state=active" <<<"$OUT"'
+check "devlog.md off main is a branch source" 'grep -q "^SOURCE file=devlog.md kind=branch origin=main" <<<"$OUT"'
+check "merged branch reported" 'grep -q "file=devlog.feat-merged.md kind=branch origin=feat/merged origin_from=marker state=merged" <<<"$OUT"'
+check "deleted branch reported" 'grep -q "file=devlog.feat-deleted.md kind=branch origin=feat/deleted origin_from=marker state=gone" <<<"$OUT"'
+check "open round not movable" 'grep -q "file=devlog.feat-live.md round=2 .* movable=0" <<<"$OUT"'
+
+FP="$(sed -n 's/^FINGERPRINT=\([^ ]*\) COUNT=.*/\1/p' <<<"$OUT")"
+COUNT="$(sed -n 's/^FINGERPRINT=[^ ]* COUNT=\(.*\)/\1/p' <<<"$OUT")"
+ID_MERGED="$(sed -n 's/^ROUND id=\([0-9]*\) file=devlog.feat-merged.md .*/\1/p' <<<"$OUT")"
+ID_DELETED="$(sed -n 's/^ROUND id=\([0-9]*\) file=devlog.feat-deleted.md .*/\1/p' <<<"$OUT")"
+printf 'old-branches\told branch work\t%s,%s\n' "$ID_MERGED" "$ID_DELETED" > "$TMP/plan.tsv"
+APPLY="$(bash "$SCRIPT_DIR/keep-all.sh" --apply "$TMP/plan.tsv" --fingerprint "$FP" --count "$COUNT")"
+if [ $? -eq 0 ]; then echo "PASS: apply exits 0"; else echo "FAIL: apply exits 0"; FAIL=1; fi
+[ -f "$R/.devlog/devlog.old-branches.md" ] && grep -q "^KEPT=.*devlog.old-branches.md ROUNDS=2" <<<"$APPLY" \
+  && echo "PASS: named file written" || { echo "FAIL: named file written"; FAIL=1; }
+check "branch files keep their marker and are not deleted" '[ "$(head -n 1 "$R/.devlog/devlog.feat-merged.md")" = "<!-- devlog-origin: branch=feat/merged -->" ]'
+check "index written to the current branch file" 'grep -q "devlog.old-branches.md\`：keep-all，2 輪" "$R/.devlog/devlog.feat-live.md"'
+check "lock released" '[ ! -e "$R/.devlog/.lock" ] && [ ! -d "$R/.devlog/.lock.d" ]'
+
+bash "$SCRIPT_DIR/keep-all.sh" --apply "$TMP/plan.tsv" --fingerprint "$FP" --count "$COUNT" >/dev/null 2>"$TMP/err"
+if [ $? -eq 1 ] && grep -q fingerprint "$TMP/err"; then echo "PASS: stale fingerprint rejected"
+else echo "FAIL: stale fingerprint rejected"; FAIL=1; fi
+
+if [ "$FAIL" -eq 0 ]; then echo "All checks passed."; exit 0
+else echo "Some checks FAILED."; exit 1; fi

package/core/scripts/tests/test-keep-move.sh

@@ -123,5 +123,17 @@ case "$LINE_NO_DESC" in
   *) echo "FAIL: index line for no-desc missing: $LINE_NO_DESC"; FAIL=1 ;;
 esac
 
+MARK="$TMP/marker"
+mkdir -p "$MARK/.devlog"
+export CLAUDE_PROJECT_DIR="$MARK"
+printf '<!-- devlog-origin: branch=feat/x -->\n# project\n\n' > "$MARK/.devlog/devlog.md"
+make_round "$MARK/.devlog/devlog.md" 1 DONE
+make_round "$MARK/.devlog/devlog.md" 2 IN_PROGRESS
+printf '%s\n' '{"round": 2, "opened_at": "now"}' > "$MARK/.devlog/.round-open"
+bash "$SCRIPT_DIR/keep-move.sh" --from 1 --to 1 --name all >/dev/null
+assert_eq "full keep leaves origin marker on line 1" "<!-- devlog-origin: branch=feat/x -->" "$(head -n 1 "$MARK/.devlog/devlog.md")"
+grep -q 'devlog-origin' "$MARK/.devlog/devlog.all.md" && { echo "FAIL: marker copied into kept file"; FAIL=1; } || echo "PASS: kept file has no origin marker"
+grep -q '^# project' "$MARK/.devlog/devlog.all.md" && echo "PASS: project summary still moves on full keep" || { echo "FAIL: summary not moved"; FAIL=1; }
+
 if [ "$FAIL" -eq 0 ]; then echo "All checks passed."; exit 0
 else echo "Some checks FAILED."; exit 1; fi

package/core/scripts/tests/test-round-start.sh

@@ -664,8 +664,8 @@ else
 fi
 rm -f "$DEVLOG_DIR/.checkpoint-state"
 
-# --- 19b: report / timeline are admin (read-side) commands too -------------
-for ADMIN_CMD in report timeline; do
+# --- 19b: report / timeline / keep-all are admin commands too -------------
+for ADMIN_CMD in report timeline keep-all; do
   rm -f "$DEVLOG_DIR/.round-current.md" "$DEVLOG_DIR/.round-open"
   printf '{"prompt":"<command-name>/devlog-tracker:%s</command-name>"}' "$ADMIN_CMD" | bash "$SCRIPT_DIR/round-start.sh"
   assert_file_absent "admin $ADMIN_CMD: no .round-current.md" "$DEVLOG_DIR/.round-current.md"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "devlog-tracker",
-  "version": "0.31.1",
+  "version": "0.33.0",
   "description": "npx installer for devlog-tracker's Claude Code, Cursor and Codex adapters.",
   "bin": {
     "devlog-tracker": "bin/devlog-tracker.js"

package/skills/devlog-tracker/SKILL.md

@@ -70,9 +70,10 @@ Summary/Handoff」——後面這句要整句刪掉，不是縮短。
 ## 檔案位置
 
 - 主檔：`.devlog/devlog.md`——在 `main`／`master` 分支上工作時使用
-- 分支主檔：`.devlog/devlog.<branch>.md`——在同一個 worktree 裡切換到其他分支時，主檔會依目前 checkout 的分支自動分開（斜線轉成 `-`）；detached HEAD 退回用 worktree 目錄名。另開一個 `git worktree`（不同目錄）本來就有自己獨立的 `.devlog/`，不受這個機制影響。第一次在某分支偵測到還沒有專屬檔案、且 `.devlog/devlog.md` 已有內容時，會把它改名（非複製）成該分支的檔案。細節見 `docs/design/branch-scoped-devlog.md`。
+- 分支主檔：`.devlog/devlog.<branch>.md`——在同一個 worktree 裡切換到其他分支時，主檔會依目前 checkout 的分支自動分開（斜線轉成 `-`）；detached HEAD 退回用 worktree 目錄名。另開一個 `git worktree`（不同目錄）本來就有自己獨立的 `.devlog/`，不受這個機制影響。第一次在某分支偵測到還沒有專屬檔案時，只會把 `devlog.md` 裡還沒完成的尾巴（最後一個 `DONE` 之後的 Round，連同 `handoff.md`）剪到該分支的檔案；`main` 自己的歷史、專案摘要、Checkpoint、Kept／Lessons 索引都留在 `devlog.md`。最後一輪已經是 `DONE`，或切到的是不含目前 `main` 最新 commit 的舊分支時，什麼都不搬，新分支從空檔開始。分支檔第一行是 origin 標記 `<!-- devlog-origin: branch=<原始分支名> -->`（detached HEAD 是 `detached=<目錄名>`），由 hook 在建立分支檔時寫入；不要刪改這一行。細節見 `docs/design/branch-scoped-devlog.md`。
 - 歸檔：`.devlog/devlog.archive.md`
-- 具名保存：`.devlog/devlog.<name>.md`（`/devlog-tracker:keep` 搬走的主題檔；SessionStart 不讀這些檔）
+- 具名保存：`.devlog/devlog.<name>.md`（`/devlog-tracker:keep`／`keep-all` 搬走的主題檔，第一行是 `# Kept log`；SessionStart 不讀這些檔）
+- keep-all 備份：`.devlog/.keep-all-backup/<時間戳>/`（`/devlog-tracker:keep-all` 動手前的原始檔複本）
 - 當輪暫存：`.devlog/.round-current.md`（目前開著的那一輪，Claude 該讀寫的是這個檔，不是 `devlog.md`；
   收尾或中斷時由 hook 自動合併回 `devlog.md` 並清空，設計見 `docs/design/round-current-split.md`）
 - Session Handoff 快照：`.devlog/handoff.md`（`main`／`master`）；其他分支 `.devlog/handoff.<branch>.md`。
@@ -314,7 +315,7 @@ Stop hook 會檢查最後一個 Round 是否同時有 `### Summary`、`### Reply
 ### devlog-tracker 自己的管理指令不記錄
 
 這一輪如果是使用者直接呼叫 devlog-tracker 自己的純管理指令——`/devlog-tracker:checkpoint`、
-`clean`、`compact`、`keep`、`lessons`、`lessons-drift`、`lessons-off`、`lessons-on`、
+`clean`、`compact`、`keep`、`keep-all`、`lessons`、`lessons-drift`、`lessons-off`、`lessons-on`、
 `overview`、`pause`、`report`、`search`、`segment-watch`、`span`、`start`、`status`、`timeline`——`round-start.sh`
 會整輪直接放行，不開 Round、不動任何計數器，等於這個 tick 沒發生過；不用、也不會被
 Stop hook 要求補寫 Summary／Reply／Handoff。這些指令本身就是在操作 devlog 系統，不是開發
@@ -425,6 +426,15 @@ hook 會要求補一段。
 讓「哪個主題被搬去哪個檔」不用翻完整份 `devlog.md` 或憑印象猜檔名
 （`docs/design/devlog-as-ssot-assessment.md` Phase 3）。
 
+## 整理所有 devlog：`/devlog-tracker:keep-all`
+
+keep 只整理目前分支的主檔；keep-all 一次整理 `.devlog/` 裡**所有** devlog 檔：目前分支的
+主檔、其他分支的 `devlog.<branch>.md`、`devlog.archive.md`，以及既有的具名檔。Round 依時間
+拿到全域編號，Claude 跨檔依主題重新分段、一次列出建議，確認後 `core/scripts/keep-all.sh`
+整批執行（全有或全無，先備份到 `.devlog/.keep-all-backup/`）。既有 kept 檔的 Round 必須全部
+重新分配；各分支最後一個 `DONE` 之後的未完成尾巴與開著的那一輪不搬；分支檔搬空也不刪。
+新索引行寫進目前分支主檔的 `## Kept 索引`。需要 Node。步驟見 `commands/keep-all.md`。不要自動觸發。
+
 ## 接續具名保存：`/devlog-tracker:resume <name>`
 
 需要重啟具名主題時，用 resume 讀取 `.devlog/devlog.<name>.md` 的最後一輪與

package/skills/devlog-tracker/references/contract.md

@@ -60,6 +60,7 @@
 | 接續上一題 | `commands/continue.md` |
 | 暫停／狀態／壓縮／清空 | `commands/pause.md`／`status.md`／`compact.md`／`clean.md` |
 | 具名保存／接續／總覽 | `commands/keep.md`／`resume.md`／`overview.md` |
+| 整理所有 devlog（跨分支檔、archive、既有 keep 檔） | `commands/keep-all.md` |
 | Span／Checkpoint／Segment／Lessons | `commands/span.md`／`checkpoint.md`／`segment-watch.md`／`lessons*.md` |
 | 協定與跨指令行為 | `SKILL.md`（本層不重抄步驟） |