@trailkeep/cli 0.4.0 → 0.5.0

package/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "trailkeep",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "description": "Injects your private repo notes and the current branch's effort file at session start, plus the effort skill.",
   "author": { "name": "Mario Širić" },
   "repository": "https://github.com/msiric/trailkeep",

package/README.md

@@ -42,7 +42,8 @@ Later, `trailkeep update` gets the latest version the same way you installed it
 | When | What happens automatically |
 |---|---|
 | Any session starts in any repo | Notes and the branch's effort file are injected. A one-line pointer mentions the decision log if it has entries. Leftovers from a session that didn't exit cleanly are logged first. |
-| Any session starts in a repo | A short capture rule tells the agent to record decisions, user rules and dead ends the moment they come up, with `trailkeep note`. It doesn't wait for anyone to decide the task "spans sessions". Turn it off with `TRAILKEEP_HINT=0`. |
+| Any session starts in a repo | A short capture rule tells the agent to record decisions, user rules and dead ends the moment they come up, with `trailkeep note`, and to pick the scope: this branch, the whole repo (`--repo`) or every repo (`--all`). It doesn't wait for anyone to decide the task "spans sessions". Turn it off with `TRAILKEEP_HINT=0`. |
+| You're on a branch with no notes yet | The last few decisions recorded on other branches are shown, each labelled with its branch, so repo-wide rules saved on one branch aren't lost on the next. Once the branch has its own notes, only those are shown. |
 | The agent works | It keeps the effort file current: plan ticks, a progress line per session, decisions and dead ends. That's the effort skill's job. |
 | Context gets compacted | The effort file is re-injected fresh. |
 | A session ends | New Decisions and Progress lines from every effort in the worktree go into the decision log, stamped with the commit, the branch's changed files, branch and session id. It takes under 0.1 s, well inside Codex's 3-second limit for this hook. Anything a killed session missed is picked up at the next start, in the background. |

package/bin/trailkeep

@@ -5,7 +5,7 @@
 
 set -u
 
-VERSION="0.4.0"
+VERSION="0.5.0"
 PKG="@trailkeep/cli"
 MARKER="managed by trailkeep"
 
@@ -230,7 +230,22 @@ default_branch() {
 # One standing instruction, so capture doesn't depend on the agent deciding a
 # task "spans sessions" (it can't know). Measured cost: about 110 tokens.
 capture_rule() {
-  printf '%s\n' 'trailkeep: when something comes up that a later session must not lose (a decision and its reason, a rule or preference the user states, an approach that failed and why), record it right away: `trailkeep note "<what and why>"`. It is kept for this branch and shown at the start of the next session. Use `trailkeep note --repo` for a fact about the whole repo, or `--all` for a personal preference that applies in every repo.'
+  printf '%s\n' 'trailkeep: when something comes up that a later session must not lose (a decision and its reason, a rule or preference the user states, an approach that failed and why), record it right away with its reason. Pick the scope: `trailkeep note --repo "..."` for a rule about this codebase that holds on every branch, `trailkeep note "..."` for something specific to this branch'"'"'s task, `trailkeep note --all "..."` for a personal preference in every repo. Notes are shown at the start of the next session.'
+}
+
+# Decisions recorded on other branches, newest first: effort files in this
+# worktree (their latest lines may not be in the log yet), then the log.
+other_decisions() { # CURRENT_BRANCH KEY -> up to 5 lines "- (branch) text"
+  {
+    for f in $(ls -t "$(effort_dir)"/*.md 2>/dev/null); do
+      br=$(effort_branch "$f"); [ -n "$br" ] && [ "$br" != "$1" ] || continue
+      section "$f" "Decisions and dead ends" |
+        awk -v br="$br" -v tab="$TAB" 'NF { l = $0; sub(/^[[:space:]]*[-*][[:space:]]*/, "", l); a[++n] = br tab l } END { for (i = n; i > 0; i--) print a[i] }'
+    done
+    log_events "$2" | awk -F "$TAB" -v OFS="$TAB" -v b="$1" '($3 == "decision" || $3 == "dead-end") && $4 != b { print $4, $7 }'
+  } | awk -F "$TAB" '!seen[$2]++ && $2 !~ /^\[[ xX]\]/ {
+        t = $2; if (length(t) > 240) t = substr(t, 1, 237) "..."
+        printf "- (%s) %s\n", $1, t; if (++c >= 5) exit }'
 }
 
 build_context() {
@@ -246,25 +261,31 @@ build_context() {
 
   budget=$MAX_CHARS
   if [ -s "$GLOBAL_NOTES" ]; then
-    piece "trailkeep: your notes for every repo" "$GLOBAL_NOTES" "$((budget / 4))"
+    piece "trailkeep: your preferences for every repo; apply them unless the user says otherwise" "$GLOBAL_NOTES" "$((budget / 4))"
     budget=$((budget - $(chars "$GLOBAL_NOTES")))
     [ "$budget" -lt $((MAX_CHARS / 2)) ] && budget=$((MAX_CHARS / 2))
     printf '\n'
   fi
   if [ "$has_notes" -eq 1 ]; then
-    piece "trailkeep: private notes for this repository" "$notes" "$((budget / 3))"
+    piece "trailkeep: rules and notes for this repository; follow them unless the user says otherwise" "$notes" "$((budget / 3))"
     budget=$((budget - $(chars "$notes")))
     [ "$budget" -lt $((MAX_CHARS / 2)) ] && budget=$((MAX_CHARS / 2))
     printf '\n'
   fi
   if [ "$has_effort" -eq 1 ] && ! grep -q '^## Plan' "$effort"; then
-    piece "trailkeep: notes for branch $b" "$effort" "$budget"
+    piece "trailkeep: decisions recorded for branch $b; follow them unless the user says otherwise" "$effort" "$budget"
     printf '\n'
   elif [ "$has_effort" -eq 1 ]; then
     printf 'trailkeep: this branch has an effort file. It is the source of truth for the current task. Keep it current as you work: tick Plan items and add one dated line under Progress before you stop.\n'
     piece "trailkeep: effort file for branch $b" "$effort" "$budget"
     printf '\n'
   fi
+  if [ "$has_effort" -eq 0 ] && [ -n "$effort" ]; then
+    od=$(other_decisions "$b" "$KEY" 2>/dev/null)
+    if [ -n "$od" ]; then
+      printf 'trailkeep: branch %s has no notes yet. Recent decisions from other branches of this repo, newest first. Rules about the codebase as a whole probably hold here too; ones tied to another branch'"'"'s task may not:\n%s\n\n' "$b" "$od"
+    fi
+  fi
   if [ "${TRAILKEEP_HINT:-1}" != 0 ] && [ -n "$effort" ]; then
     capture_rule
   fi
@@ -617,7 +638,8 @@ cmd_note() {
     -h|--help|help|"") die 'usage: trailkeep note [--repo|--all] "what and why"' ;;
   esac
   [ $# -ge 1 ] || die 'usage: trailkeep note [--repo|--all] "what and why"'
-  text=$(printf '%s' "$*" | one_line)
+  # drop a date the agent wrote itself; the note gets today's date below
+  text=$(printf '%s' "$*" | one_line | sed 's/^[-* ]*[0-9]\{4\}-[0-9][0-9]-[0-9][0-9]:\{0,1\}[[:space:]]*//')
   [ -n "$text" ] || die "note: empty text"
   case $scope in
     branch)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trailkeep/cli",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "description": "Shared instructions, per-branch task context and a decision log for Claude Code, Codex CLI and GitHub Copilot CLI. POSIX sh + git.",
   "keywords": [
     "claude-code",