devlog-tracker 0.34.0 → 1.1.0

package/core/scripts/devlog-md.sh

@@ -22,10 +22,18 @@ _devlog_fence_nofence() {
   if [ $((count % 2)) -eq 0 ]; then printf '0\n'; else printf '1\n'; fi
 }
 
+# Prints "<line> <round>" per round heading outside fences. With platform $2,
+# only rounds it owns: a heading ending in " · <platform>" (lowercase word)
+# belongs to it; any other heading (every pre-upgrade round) belongs to claude.
 devlog_list_round_starts() {
-  awk '
+  LC_ALL=C awk -v p="${2:-}" '
     /^[ \t]*```/ { fence = !fence; next }
     !fence && /^## Round [0-9]+/ {
+      if (p != "") {
+        owner = $0
+        if (!(sub(/.* · /, "", owner) && owner ~ /^[a-z]+$/)) owner = "claude"
+        if (owner != p) next
+      }
       round = $0
       sub(/^## Round /, "", round)
       sub(/[^0-9].*$/, "", round)
@@ -34,6 +42,24 @@ devlog_list_round_starts() {
   ' "$1"
 }
 
+devlog_list_round_starts_of() {
+  devlog_list_round_starts "$1" "$2"
+}
+
+# Start line of the last "## Round $2" heading; with platform $3, only its own.
+devlog_round_start_by_number() {
+  devlog_list_round_starts "$1" "${3:-}" | awk -v n="$2" '$2 == n { s = $1 } END { if (s) print s }'
+}
+
+# Reply Fold target for platform $3: its own "## Round $2" first, else any
+# owner's (a pre-claim heading it wrote without a suffix).
+devlog_fold_round_start() {
+  local s
+  s="$(devlog_round_start_by_number "$1" "$2" "$3")"
+  [ -n "$s" ] || s="$(devlog_round_start_by_number "$1" "$2")"
+  [ -z "$s" ] || printf '%s\n' "$s"
+}
+
 devlog_block_end() {
   awk -v start="$2" '
     NR < start { next }
@@ -178,6 +204,59 @@ devlog_origin_of() {
   sed -n '1s/^<!-- devlog-origin: \(.*\) -->$/\1/p' "$1"
 }
 
+# Span Mode rounds are numbered by the LLM, not reserved by round-start.sh.
+# So before a merge (caller holds the lock), every "## Round N" heading in
+# $2 whose N is already a round in $1, reserved by another platform's open
+# round on $1, or repeated within $2 gets the next free number; a
+# non-Claude heading without an owner suffix gains " · <platform>". The
+# caller's own reserved round passes through unchanged. Leaves $2 alone on
+# any error.
+_devlog_renumber_current() {
+  local devlog="$1" current="$2" p="${DEVLOG_PLATFORM:-claude}" rows="" own="" reserved=""
+  if [ -n "${DEVLOG_DIR:-}" ] && type devlog_open_rounds >/dev/null 2>&1; then
+    rows="$(devlog_open_rounds | awk -F '\t' -v f="${devlog##*/}" '($3 == f || $3 == "") && $2 ~ /^[0-9]+$/')"
+    own="$(printf '%s\n' "$rows" | awk -F '\t' -v p="$p" '$1 == p { print $2 }')"
+    reserved="$(printf '%s\n' "$rows" | awk -F '\t' -v p="$p" '$1 != p && $2 != "" { printf "%s ", $2 }')"
+  fi
+  LC_ALL=C awk -v p="$p" -v own="$own" -v reserved="$reserved" -v devlog="$devlog" '
+    function num(s) { sub(/^## Round /, "", s); sub(/[^0-9].*$/, "", s); return s + 0 }
+    BEGIN {
+      k = split(reserved, r, " ")
+      for (i = 1; i <= k; i++) { taken[r[i] + 0] = 1; if (r[i] + 0 > max) max = r[i] + 0 }
+      if (own != "") { taken[own + 0] = 1; if (own + 0 > max) max = own + 0 }
+      while ((getline line < devlog) > 0) {
+        if (line ~ /^[ \t]*```/) { f = !f; continue }
+        if (!f && line ~ /^## Round [0-9]+/) { x = num(line); taken[x] = 1; if (x > max) max = x }
+      }
+      close(devlog)
+    }
+    { lines[NR] = $0 }
+    /^[ \t]*```/ { fence = !fence; next }
+    !fence && /^## Round [0-9]+/ { head[NR] = 1; x = num($0); if (x > max) max = x }
+    END {
+      next_n = max + 1
+      for (i = 1; i <= NR; i++) {
+        line = lines[i]
+        if (head[i] && own != "" && !own_seen && num(line) == own + 0) { own_seen = 1 }
+        else if (head[i]) {
+          x = num(line)
+          if (x in taken) {
+            rest = line; sub(/^## Round [0-9]+/, "", rest)
+            x = next_n++
+            line = "## Round " x rest
+          }
+          taken[x] = 1
+          owner = line
+          if (p != "claude" && !(sub(/.* · /, "", owner) && owner ~ /^[a-z]+$/)) line = line " · " p
+        }
+        print line
+      }
+    }
+  ' "$current" 2>/dev/null >"$current.renum" && mv "$current.renum" "$current" 2>/dev/null
+  rm -f "$current.renum" 2>/dev/null
+  return 0
+}
+
 devlog_merge_round_current() {
   # Appends $2's content onto $1 (one blank line separator, matching the
   # existing "\n## Round N" append convention) and removes $2. No-op if $2
@@ -186,6 +265,7 @@ devlog_merge_round_current() {
   # goes first.
   local devlog="$1" current="$2"
   [ -s "$current" ] || return 0
+  _devlog_renumber_current "$devlog" "$current"
   {
     [ -s "$devlog" ] || [ -z "${DEVLOG_ORIGIN:-}" ] || devlog_origin_line "$DEVLOG_ORIGIN"
     printf '\n'
@@ -195,12 +275,13 @@ devlog_merge_round_current() {
   return 0
 }
 
-devlog_reopen_last_round() {
-  # Moves the last "## Round N ..." block out of $1 into $2 (creating $2),
-  # removing those lines from $1. Returns 1 and touches neither file if $1
-  # has no round to move.
+devlog_reopen_round() {
+  # Moves the "## Round $3" block (wherever it sits in $1) into $2, removing
+  # it from $1. With platform $4, picks the block devlog_fold_round_start
+  # does. Returns 1 and touches neither file if $1 has no such round.
   local devlog="$1" current="$2" start end
-  start="$(devlog_list_round_starts "$devlog" | awk 'END { print $1 }')"
+  if [ -n "${4:-}" ]; then start="$(devlog_fold_round_start "$devlog" "$3" "$4")"
+  else start="$(devlog_round_start_by_number "$devlog" "$3")"; fi
   [ -n "$start" ] || return 1
   end="$(devlog_block_end "$devlog" "$start")"
   awk -v start="$start" -v end="$end" 'NR >= start && NR <= end' "$devlog" > "$current" 2>/dev/null || return 1
@@ -210,12 +291,12 @@ devlog_reopen_last_round() {
 }
 
 workspace_claim_state() {
-  local dir="$1" file="$2" start end status claimed live
+  local dir="$1" file="$2" platform="${3:-claude}" start end status claimed live
   if ! type workspace_snapshot >/dev/null 2>&1; then
     # shellcheck source=workspace-snapshot.sh
     . "$_DEVLOG_MD_DIR/workspace-snapshot.sh"
   fi
-  start="$(devlog_list_round_starts "$file" | awk 'END { print $1 }')"
+  start="$(devlog_list_round_starts_of "$file" "$platform" | awk 'END { print $1 }')"
   [ -n "$start" ] || { printf 'NO_CLAIM\n'; return 0; }
   end="$(devlog_block_end "$file" "$start")"
   status="$(devlog_round_status "$file" "$start" "$end")"

package/core/scripts/devlog-path.sh

@@ -8,6 +8,112 @@ _DEVLOG_PATH_DIR="$(cd "${BASH_SOURCE[0]%/*}" && pwd)"
 . "$_DEVLOG_PATH_DIR/devlog-lock.sh"
 # shellcheck source=devlog-md.sh
 . "$_DEVLOG_PATH_DIR/devlog-md.sh"
+# shellcheck source=json-field.sh
+. "$_DEVLOG_PATH_DIR/json-field.sh"
+
+# Every platform that can own per-round state. Claude keeps the pre-0.x
+# un-suffixed names; the others add "@<platform>" (docs/design/
+# multi-platform-concurrency.md). "@" never survives _devlog_sanitize_name,
+# so a branch named "codex" cannot collide with platform Codex.
+DEVLOG_PLATFORMS="claude codex cursor"
+
+devlog_platform() {
+  case "${DEVLOG_PLATFORM:-}" in
+    codex|cursor) printf '%s\n' "$DEVLOG_PLATFORM" ;;
+    *) printf 'claude\n' ;;
+  esac
+}
+
+# $1 stem (".round-current", "handoff.feat-x"), $2 extension (".md" or ""),
+# $3 platform. Prints a basename.
+devlog_platform_file() {
+  if [ "$3" = claude ]; then printf '%s%s\n' "$1" "$2"
+  else printf '%s@%s%s\n' "$1" "$3" "$2"; fi
+}
+
+_devlog_set_state_paths() {
+  local p="$1" d="$DEVLOG_DIR"
+  # shellcheck disable=SC2034 # consumed by callers
+  ROUND_CURRENT="$d/$(devlog_platform_file .round-current .md "$p")"
+  # shellcheck disable=SC2034 # consumed by callers
+  ROUND_OPEN="$d/$(devlog_platform_file .round-open '' "$p")"
+  # shellcheck disable=SC2034 # consumed by callers
+  TURN_MARKER="$d/$(devlog_platform_file .turn-start '' "$p")"
+  # shellcheck disable=SC2034 # consumed by callers
+  SEGMENT_FILE="$d/$(devlog_platform_file .segment-state '' "$p")"
+  # shellcheck disable=SC2034 # consumed by callers
+  AWAITING_FILE="$d/$(devlog_platform_file .awaiting-reply '' "$p")"
+  # shellcheck disable=SC2034 # consumed by callers
+  INTERRUPTED_FLAG="$d/$(devlog_platform_file .interrupted '' "$p")"
+  # shellcheck disable=SC2034 # consumed by callers
+  SPAN_FILE="$d/$(devlog_platform_file .span-open '' "$p")"
+  # shellcheck disable=SC2034 # consumed by callers
+  MISMATCH_FILE="$d/$(devlog_platform_file .workspace-mismatch '' "$p")"
+}
+
+# First resolve after upgrade: before this change every platform wrote the
+# un-suffixed names. The platform that resolves first most likely wrote
+# them, so a non-Claude first resolver renames them to its own names.
+# .segment-state is configuration (start-devlog.sh creates it), not round
+# state, so it stays. Runs once; .platform-claimed stops it.
+_devlog_claim_legacy_state() {
+  local p="$1" d="$DEVLOG_DIR" name f stem
+  [ -f "$d/.enabled" ] && [ ! -e "$d/.platform-claimed" ] || return 0
+  devlog_lock_acquire
+  if [ ! -e "$d/.platform-claimed" ]; then
+    if [ "$p" != claude ]; then
+      for name in .round-open .turn-start .awaiting-reply .interrupted .span-open .workspace-mismatch; do
+        [ -e "$d/$name" ] && [ ! -e "$d/$name@$p" ] && mv "$d/$name" "$d/$name@$p" 2>/dev/null
+      done
+      [ -e "$d/.round-current.md" ] && [ ! -e "$d/.round-current@$p.md" ] \
+        && mv "$d/.round-current.md" "$d/.round-current@$p.md" 2>/dev/null
+      for f in "$d"/handoff.md "$d"/handoff.*.md; do
+        [ -f "$f" ] || continue
+        case "${f##*/}" in *@*) continue ;; esac
+        stem="${f%.md}"
+        [ -e "$stem@$p.md" ] || mv "$f" "$stem@$p.md" 2>/dev/null
+      done
+    fi
+    : > "$d/.platform-claimed" 2>/dev/null || true
+  fi
+  devlog_lock_release
+}
+
+# One line per existing .round-open marker: platform, round, file field.
+devlog_open_rounds() {
+  local q f
+  for q in $DEVLOG_PLATFORMS; do
+    f="$DEVLOG_DIR/$(devlog_platform_file .round-open '' "$q")"
+    [ -f "$f" ] || continue
+    printf '%s\t%s\t%s\n' "$q" "$(json_int_get "$f" round)" "$(json_str_get "$f" file)"
+  done
+}
+
+# Prints "<platform>\t<round>" of the only open round; nothing when none.
+# Returns 2 (message on stderr) when two or more platforms have one open.
+devlog_single_open_round() {
+  local rows count
+  rows="$(devlog_open_rounds)"
+  [ -n "$rows" ] || return 0
+  count="$(printf '%s\n' "$rows" | grep -c .)"
+  if [ "$count" -gt 1 ]; then
+    echo "其他平台還有進行中的輪次（$(printf '%s\n' "$rows" | cut -f1 | grep -vxF "$(devlog_platform)" | paste -sd '、' -)），等它們收尾再執行。若該平台已不再使用，可先 pause 再 start 清掉它的標記。" >&2
+    return 2
+  fi
+  printf '%s\n' "$rows" | cut -f1,2
+}
+
+# One line per other platform's non-empty handoff for this branch.
+devlog_other_handoffs() {
+  local q f
+  for q in $DEVLOG_PLATFORMS; do
+    [ "$q" = "$DEVLOG_PLATFORM" ] && continue
+    f="$HANDOFF_STEM.md"
+    [ "$q" = claude ] || f="$HANDOFF_STEM@$q.md"
+    [ -s "$f" ] && printf '%s\t%s\n' "$q" "$f"
+  done
+  return 0
+}
 
 # Turns an arbitrary branch/worktree name into a safe devlog.<name>.md
 # filename segment: anything outside [A-Za-z0-9._-] becomes '-', repeats
@@ -24,8 +130,9 @@ _devlog_sanitize_name() {
 # work in progress). When $6 (an origin like "branch=feat/x") is given,
 # the branch file starts with its origin marker. The project header,
 # Checkpoints, and Kept/Lessons
-# indexes always stay in $2. When rounds move, $4 (handoff.md) moves to
-# $5 too, since it snapshots that same unfinished work. Caller holds the
+# indexes always stay in $2. When rounds move, every platform's handoff
+# under stem $4 moves to stem $5 too, since it snapshots that same
+# unfinished work. Caller holds the
 # devlog lock.
 _devlog_migrate_unfinished_tail() {
   local dir="$1" src="$2" dst="$3" src_handoff="$4" dst_handoff="$5" origin="${6:-}"
@@ -82,9 +189,13 @@ _devlog_migrate_unfinished_tail() {
 
   # Branch file first: if the second mv fails the tail is duplicated, never lost.
   if mv "$dst.tmp" "$dst" 2>/dev/null && mv "$src.tmp" "$src" 2>/dev/null; then
-    if [ -f "$src_handoff" ] && [ ! -f "$dst_handoff" ]; then
-      mv "$src_handoff" "$dst_handoff" 2>/dev/null || true
-    fi
+    local q suffix
+    for q in $DEVLOG_PLATFORMS; do
+      suffix="$(devlog_platform_file '' .md "$q")"
+      if [ -f "$src_handoff$suffix" ] && [ ! -f "$dst_handoff$suffix" ]; then
+        mv "$src_handoff$suffix" "$dst_handoff$suffix" 2>/dev/null || true
+      fi
+    done
   fi
   rm -f "$dst.tmp" "$src.tmp" 2>/dev/null || true
 }
@@ -102,13 +213,19 @@ _devlog_migrate_unfinished_tail() {
 # Also sets DEVLOG_ORIGIN ("branch=<raw name>" / "detached=<dir>", empty
 # for devlog.md): the first line written into a new branch file records it
 # as an origin marker (docs/design/keep-all.md "Origin marker").
+# Call before taking the devlog lock: it may acquire/release the lock
+# itself, and a nested acquire would reset the caller's lock state.
 devlog_resolve_paths() {
   local dir="${1:-.}"
   DEVLOG_DIR="$dir/.devlog"
   DEVLOG_FILE="$DEVLOG_DIR/devlog.md"
-  # shellcheck disable=SC2034 # consumed by callers (e.g. enforce-devlog.sh), not used in this file
-  HANDOFF_FILE="$DEVLOG_DIR/handoff.md"
+  DEVLOG_PLATFORM="$(devlog_platform)"
+  HANDOFF_STEM="$DEVLOG_DIR/handoff"
   DEVLOG_ORIGIN=""
+  _devlog_set_state_paths "$DEVLOG_PLATFORM"
+  _devlog_claim_legacy_state "$DEVLOG_PLATFORM"
+  # shellcheck disable=SC2034 # consumed by callers (e.g. enforce-devlog.sh), not used in this file
+  HANDOFF_FILE="$DEVLOG_DIR/$(devlog_platform_file handoff .md "$DEVLOG_PLATFORM")"
 
   local branch raw name origin
   branch="$(git -C "$dir" rev-parse --abbrev-ref HEAD 2>/dev/null || echo '')"
@@ -146,15 +263,16 @@ devlog_resolve_paths() {
   esac
 
   local resolved="$DEVLOG_DIR/devlog.$name.md"
-  local resolved_handoff="$DEVLOG_DIR/handoff.$name.md"
+  local resolved_stem="$DEVLOG_DIR/handoff.$name"
   if [ -f "$DEVLOG_DIR/.enabled" ] && [ ! -f "$resolved" ] && [ -s "$DEVLOG_FILE" ]; then
     devlog_lock_acquire
     [ -f "$resolved" ] || _devlog_migrate_unfinished_tail \
-      "$dir" "$DEVLOG_FILE" "$resolved" "$HANDOFF_FILE" "$resolved_handoff" "$origin"
+      "$dir" "$DEVLOG_FILE" "$resolved" "$HANDOFF_STEM" "$resolved_stem" "$origin"
     devlog_lock_release
   fi
   DEVLOG_FILE="$resolved"
+  HANDOFF_STEM="$resolved_stem"
   # shellcheck disable=SC2034 # consumed by callers (e.g. enforce-devlog.sh), not used in this file
-  HANDOFF_FILE="$resolved_handoff"
+  HANDOFF_FILE="$DEVLOG_DIR/$(devlog_platform_file "handoff.$name" .md "$DEVLOG_PLATFORM")"
   DEVLOG_ORIGIN="$origin"
 }

package/core/scripts/enforce-devlog.sh

@@ -48,21 +48,18 @@ PROJECT_DIR="${DEVLOG_PROJECT_DIR:-${CLAUDE_PROJECT_DIR:-.}}"
 # DEVLOG_DIR 永遠是 $PROJECT_DIR/.devlog，與分支無關，所以兩者等價。
 ENABLED_FLAG="$PROJECT_DIR/.devlog/.enabled"
 if [ ! -f "$ENABLED_FLAG" ]; then
-  # 沒啟用就不做任何強制，但仍要清掉殘留的 .interrupted，否則之後重新
-  # /devlog-tracker:start 會繼承一個陳舊的中斷旗標。.interrupted 跟
+  # 沒啟用就不做任何強制，但仍要清掉每個平台殘留的 .interrupted，否則之後
+  # 重新 /devlog-tracker:start 會繼承一個陳舊的中斷旗標。.interrupted 跟
   # DEVLOG_DIR 一樣與分支無關，所以這裡不必解析分支。
-  if [ -f "$PROJECT_DIR/.devlog/.interrupted" ]; then
-    rm -f "$PROJECT_DIR/.devlog/.interrupted" 2>/dev/null || true
-  fi
+  rm -f "$PROJECT_DIR"/.devlog/.interrupted "$PROJECT_DIR"/.devlog/.interrupted@* 2>/dev/null || true
   exit 0
 fi
 # shellcheck source=devlog-path.sh
 . "$SCRIPT_DIR/devlog-path.sh"
 devlog_resolve_paths "$PROJECT_DIR"
-ROUND_CURRENT="$DEVLOG_DIR/.round-current.md"
-if [ -f "$DEVLOG_DIR/.interrupted" ]; then
+if [ -f "$INTERRUPTED_FLAG" ]; then
   bash "$SCRIPT_DIR/close-open-round.sh" "user_interrupt" || true
-  rm -f "$DEVLOG_DIR/.interrupted" 2>/dev/null || true
+  rm -f "$INTERRUPTED_FLAG" 2>/dev/null || true
   # close-open-round.sh merges and removes .round-current.md whenever it
   # decided the round was finished (stamped INTERRUPTED, or recovered —
   # Claude had already written Summary/Handoff before the interrupt signal
@@ -89,8 +86,6 @@ if [ "$STOP_HOOK_ACTIVE" = "true" ]; then
 fi
 
 # --- 開關檢查 -----------------------------------------------------------
-TURN_MARKER="$DEVLOG_DIR/.turn-start"
-
 devlog_lock_acquire
 trap 'devlog_lock_release' EXIT
 if [ -n "${LOCK_CONTENDED_BY:-}" ]; then
@@ -104,7 +99,6 @@ fi
 # 每個 tick 遞增）沒有累積超過 max_silent_ticks。超過門檻就退回下面正常的
 # 雜湊比對，逼這輪真的寫點東西；寫成功後把計數器歸零。span 檔案壞掉、缺欄位
 # 或不是數字，一律當作沒有 span，直接往下走正常流程——fail-open。
-SPAN_FILE="$DEVLOG_DIR/.span-open"
 SPAN_VALID=0
 if [ -f "$SPAN_FILE" ]; then
   SPAN_TICKS="$(json_int_get "$SPAN_FILE" ticks_since_checkin)"
@@ -138,7 +132,7 @@ fi
 
 if [ "$CURRENT_HASH" = "$TURN_START_HASH" ]; then
   if [ "$SPAN_VALID" -eq 1 ]; then
-    echo "這一輪尚未寫入。請依 skills/devlog-tracker/SKILL.md 在 .devlog/.round-current.md 建立一個新的 ## Round（編號接在 devlog.md 目前最後一輪之後），包含 User Input / Summary / Reply / Handoff / Status；收尾成功後 hook 會自動併回 devlog.md，不要自己直接寫進 devlog.md。" >&2
+    echo "這一輪尚未寫入。請依 skills/devlog-tracker/SKILL.md 在 .devlog/${ROUND_CURRENT##*/} 建立一個新的 ## Round（編號接在 devlog.md 目前最後一輪之後），包含 User Input / Summary / Reply / Handoff / Status；收尾成功後 hook 會自動併回 devlog.md，不要自己直接寫進 devlog.md。" >&2
   else
     echo "這一輪的 Round 只有 hook 寫的 User Input skeleton，還沒有收尾。請依 skills/devlog-tracker/SKILL.md 編輯最後一個 Round，補上 User Input / Summary / Reply / Handoff / Status。不要再新增一個 ## Round。" >&2
   fi
@@ -553,7 +547,7 @@ ${ACTUAL_DIRTY:-（沒有，工作樹乾淨）}"
       {
         echo "Session Handoff 格式不對：${SESSION_ERR}"
         echo ""
-        echo "正確格式（三個標籤都要有，沒有內容就寫 - （無））。寫完後 hook 會覆寫 .devlog/handoff.md 給下一 session："
+        echo "正確格式（三個標籤都要有，沒有內容就寫 - （無））。寫完後 hook 會覆寫 .devlog/${HANDOFF_FILE##*/} 給下一 session："
         handoff_xml_template session-handoff
       } >&2
       exit 2
@@ -561,7 +555,7 @@ ${ACTUAL_DIRTY:-（沒有，工作樹乾淨）}"
   fi
 fi
 
-rm -f "$DEVLOG_DIR/.workspace-mismatch" 2>/dev/null || true
+rm -f "$MISMATCH_FILE" 2>/dev/null || true
 
 # 這一輪通過所有驗證，正式收尾：把 .round-current.md 併回 devlog.md（併完
 # 就地刪除 .round-current.md）。放在 checkpoint 計數檢查之前，這樣如果這輪
@@ -581,7 +575,7 @@ rm -f "$DEVLOG_DIR/.workspace-mismatch" 2>/dev/null || true
 # 知道要去救它。
 if [ -n "$LAST_ROUND" ]; then
   if devlog_merge_round_current "$DEVLOG_FILE" "$ROUND_CURRENT"; then
-    rm -f "$DEVLOG_DIR/.round-open" 2>/dev/null || true
+    rm -f "$ROUND_OPEN" 2>/dev/null || true
     case "${STATUS_VAL:-}" in
       IN_PROGRESS|BLOCKED)
         handoff_write "$HANDOFF_FILE" "$LAST_ROUND" 2>/dev/null || \
@@ -594,7 +588,7 @@ if [ -n "$LAST_ROUND" ]; then
     esac
   fi
 else
-  rm -f "$DEVLOG_DIR/.round-open" 2>/dev/null || true
+  rm -f "$ROUND_OPEN" 2>/dev/null || true
 fi
 
 # 這輪真的有寫東西：如果剛剛因為 span 過期才走到這裡，把計數器歸零，

package/core/scripts/keep-all.js

@@ -53,7 +53,8 @@ function roundStatus(lines) {
 }
 
 function tsKey(ts) {
-  const iso = ts.replace(/([+-]\d\d)(\d\d)$/, '$1:$2');
+  // Platform ownership is part of the displayed heading, not the timestamp.
+  const iso = ts.replace(/ · [a-z]+$/, '').replace(/([+-]\d\d)(\d\d)$/, '$1:$2');
   const t = Date.parse(iso);
   return Number.isNaN(t) ? Infinity : t;
 }
@@ -408,8 +409,8 @@ function apply(c, planText, expected, count) {
     throw new Error(`寫入途中失敗：${e.message}\n原始檔備份在 ${backup}`);
   }
 
-  const span = path.join(c.devlogDir, '.span-open');
-  if (fs.existsSync(span)) {
+  for (const name of fs.readdirSync(c.devlogDir).filter(f => /^\.span-open(@[a-z]+)?$/.test(f))) {
+    const span = path.join(c.devlogDir, name);
     const m = fs.readFileSync(span, 'utf8').match(/"round"\s*:\s*(\d+)/);
     if (m && movedFromCurrent.has(Number(m[1]))) fs.rmSync(span, { force: true });
   }

package/core/scripts/keep-all.sh

@@ -20,11 +20,10 @@ PROJECT_DIR="${DEVLOG_PROJECT_DIR:-${CLAUDE_PROJECT_DIR:-.}}"
 devlog_resolve_paths "$PROJECT_DIR"
 [ -d "$DEVLOG_DIR" ] || { echo "NOTHING"; exit 0; }
 
-OPEN=""
-[ ! -f "$DEVLOG_DIR/.round-open" ] || OPEN="$(json_int_get "$DEVLOG_DIR/.round-open" round)"
-
 devlog_lock_acquire
 trap 'devlog_lock_release' EXIT
+OPEN_ROW="$(devlog_single_open_round)" || exit 1
+OPEN="$(printf '%s' "$OPEN_ROW" | cut -f2)"
 node "$SCRIPT_DIR/keep-all.js" "$@" \
   --dir "$DEVLOG_DIR" --project "$PROJECT_DIR" --current "${DEVLOG_FILE##*/}" \
   --open "$OPEN" --origin "${DEVLOG_ORIGIN:-}"

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

@@ -135,6 +135,23 @@ test('apply moves a cross-file topic into one file in time order and consumes ke
   assert.ok(fs.existsSync(path.join(backup, 'devlog.md')));
 });
 
+test('scan and apply keep platform-tagged rounds in chronological order', () => {
+  const d = setup({
+    'devlog.md': round(3, '2026-09-01T11:00:00+0800', 'DONE') + '\n' +
+      round(2, '2026-09-01T10:00:00+0800 · codex', 'DONE') + '\n' +
+      round(1, '2026-09-01T01:00:00Z · cursor', 'DONE'),
+  });
+  const c = ctx(d);
+  const s = scan(c);
+  assert.deepEqual(s.rounds.map(r => r.round), [1, 2, 3]);
+
+  apply(c, 'topic\t\t1,2,3\n', s.fingerprint, s.rounds.length);
+  const kept = read(d, 'devlog.topic.md');
+  assert.deepEqual([...kept.matchAll(/^## Round (\d+)/gm)].map(m => Number(m[1])), [1, 2, 3]);
+  assert.match(kept, /^## Round 1 — 2026-09-01T01:00:00Z · cursor$/m);
+  assert.match(kept, /^## Round 2 — 2026-09-01T10:00:00\+0800 · codex$/m);
+});
+
 test('apply deletes a branch file it emptied, but not an active branch or devlog.md', () => {
   const d = setup({
     'devlog.feat-main.md': '<!-- devlog-origin: branch=feat/main -->\n\n' + round(1, '2026-09-05T10:00:00+0800', 'IN_PROGRESS'),
@@ -228,3 +245,17 @@ test('apply clears .span-open only when its round moved out of current', () => {
   apply(c, `b\t\t${k2.join(',')}\n`, s2.fingerprint, s2.rounds.length);
   assert.ok(!exists(d, '.span-open'));
 });
+
+test('apply clears a platform .span-open@codex when its round moved out of current', () => {
+  const d = world();
+  fs.writeFileSync(path.join(d, '.span-open@codex'), '{"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@codex'));
+  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@codex'));
+});

package/core/scripts/keep-move.sh

@@ -41,8 +41,9 @@ TARGET="$DEVLOG_DIR/devlog.$NAME.md"
 [ -f "$MAIN" ] || { echo "devlog.md 不存在" >&2; exit 1; }
 [ ! -e "$TARGET" ] || { echo "目標檔案已存在：$TARGET" >&2; exit 1; }
 
-OPEN=""
-[ ! -f "$DEVLOG_DIR/.round-open" ] || OPEN="$(json_int_get "$DEVLOG_DIR/.round-open" round)"
+OPEN_ROW="$(devlog_single_open_round)" || exit 1
+OPEN="$(printf '%s' "$OPEN_ROW" | cut -f2)"
+OPEN_MARKER="$DEVLOG_DIR/$(devlog_platform_file .round-open '' "${OPEN_ROW%%	*}")"
 TMP="$(mktemp -d "${TMPDIR:-/tmp}/devlog-keep.XXXXXX")" || exit 1
 trap 'rm -rf "$TMP"; devlog_lock_release' EXIT
 STARTS="$TMP/starts"
@@ -148,14 +149,17 @@ EXISTING_KEPT_LINES="$(devlog_kept_index_lines "$MAIN")"
 } > "$KEPT_STRIPPED.new" && mv "$KEPT_STRIPPED.new" "$MAIN" || exit 1
 
 if [ "$FULL" -eq 1 ]; then
-  rm -f "$DEVLOG_DIR/.span-open"
-  [ ! -f "$DEVLOG_DIR/.round-open" ] || json_int_set "$DEVLOG_DIR/.round-open" round 1
+  rm -f "$DEVLOG_DIR"/.span-open "$DEVLOG_DIR"/.span-open@*
+  [ -z "$OPEN_ROW" ] || json_int_set "$OPEN_MARKER" round 1
   [ ! -f "$DEVLOG_DIR/.checkpoint-state" ] || json_int_set "$DEVLOG_DIR/.checkpoint-state" rounds_since_checkpoint 0
-elif [ -f "$DEVLOG_DIR/.span-open" ]; then
-  SPAN_ROUND="$(json_int_get "$DEVLOG_DIR/.span-open" round)"
-  if [ -n "$SPAN_ROUND" ] && [ "$SPAN_ROUND" -ge "$FROM" ] && [ "$SPAN_ROUND" -le "$TO" ]; then
-    rm -f "$DEVLOG_DIR/.span-open"
-  fi
+else
+  for SPAN in "$DEVLOG_DIR"/.span-open "$DEVLOG_DIR"/.span-open@*; do
+    [ -f "$SPAN" ] || continue
+    SPAN_ROUND="$(json_int_get "$SPAN" round)"
+    if [ -n "$SPAN_ROUND" ] && [ "$SPAN_ROUND" -ge "$FROM" ] && [ "$SPAN_ROUND" -le "$TO" ]; then
+      rm -f "$SPAN"
+    fi
+  done
 fi
 
 REMAINING="$(devlog_list_round_starts "$MAIN" | wc -l | tr -d ' ')"

package/core/scripts/migrate-handoff.sh

@@ -73,7 +73,7 @@ first_visit() {
   DONE_FILES="${DONE_FILES}${1}"$'\n'
 }
 
-for f in "$DEVLOG_DIR/.round-current.md" "$DEVLOG_DIR/devlog.md" "$CUR_DEVLOG"; do
+for f in "$DEVLOG_DIR"/.round-current.md "$DEVLOG_DIR"/.round-current@*.md "$DEVLOG_DIR/devlog.md" "$CUR_DEVLOG"; do
   [ -n "$f" ] && [ -s "$f" ] && first_visit "$f" && migrate_round_file "$f"
 done
 for f in "$DEVLOG_DIR"/devlog.*.md; do
@@ -81,7 +81,7 @@ for f in "$DEVLOG_DIR"/devlog.*.md; do
   head -n 1 "$f" | grep -q '^<!-- devlog-origin: ' || continue
   first_visit "$f" && migrate_round_file "$f"
 done
-for f in "$DEVLOG_DIR"/handoff.md "$CUR_HANDOFF" "$DEVLOG_DIR"/handoff.*.md; do
+for f in "$DEVLOG_DIR"/handoff.md "$CUR_HANDOFF" "$DEVLOG_DIR"/handoff@*.md "$DEVLOG_DIR"/handoff.*.md; do
   [ -n "$f" ] && [ -s "$f" ] && first_visit "$f" && migrate_snapshot_file "$f"
 done
 

package/core/scripts/on-tool-failure.sh

@@ -1,11 +1,16 @@
 #!/usr/bin/env bash
 # PostToolUseFailure: remember user Esc so Stop can stamp without blocking.
 set -uo pipefail
+_src="${BASH_SOURCE[0]}"
+SCRIPT_DIR="$(cd "${_src%/*}" && pwd)"
 
 PROJECT_DIR="${DEVLOG_PROJECT_DIR:-${CLAUDE_PROJECT_DIR:-.}}"
 DEVLOG_DIR="$PROJECT_DIR/.devlog"
 ENABLED_FLAG="$DEVLOG_DIR/.enabled"
 [ -f "$ENABLED_FLAG" ] || exit 0
+# shellcheck source=devlog-path.sh
+. "$SCRIPT_DIR/devlog-path.sh"
+devlog_resolve_paths "$PROJECT_DIR"
 
 INPUT="$(cat 2>/dev/null || true)"
 IS_INT="false"
@@ -20,6 +25,6 @@ fi
 
 if [ "$IS_INT" = "true" ]; then
   mkdir -p "$DEVLOG_DIR" 2>/dev/null || true
-  : > "$DEVLOG_DIR/.interrupted" 2>/dev/null || true
+  : > "$INTERRUPTED_FLAG" 2>/dev/null || true
 fi
 exit 0

package/core/scripts/pause-devlog.sh

@@ -6,8 +6,10 @@ if [ ! -f "$DEVLOG_DIR/.enabled" ]; then
   echo "NOT_ENABLED"
   exit 0
 fi
-rm -f "$DEVLOG_DIR/.enabled" "$DEVLOG_DIR/.span-open" \
-  "$DEVLOG_DIR/.round-open" "$DEVLOG_DIR/.interrupted" \
-  "$DEVLOG_DIR/.awaiting-reply"
+rm -f "$DEVLOG_DIR/.enabled" \
+  "$DEVLOG_DIR"/.span-open "$DEVLOG_DIR"/.span-open@* \
+  "$DEVLOG_DIR"/.round-open "$DEVLOG_DIR"/.round-open@* \
+  "$DEVLOG_DIR"/.interrupted "$DEVLOG_DIR"/.interrupted@* \
+  "$DEVLOG_DIR"/.awaiting-reply "$DEVLOG_DIR"/.awaiting-reply@*
 echo "PAUSED"
 exit 0