@revotools/cli 0.3.0 → 0.4.0

package/dist/revo

@@ -8,7 +8,7 @@ set -euo pipefail
 # Exit cleanly on SIGPIPE (e.g., revo clone | grep, revo status | head)
 trap 'exit 0' PIPE
 
-REVO_VERSION="0.3.0"
+REVO_VERSION="0.4.0"
 
 
 # === lib/ui.sh ===
@@ -794,8 +794,52 @@ config_init() {
     # Write config
     yaml_write "$REVO_CONFIG_FILE"
 
-    # Create .gitignore
-    printf 'repos/\n.revo/\n' > "$dir/.gitignore"
+    # Merge revo's required entries into .gitignore without clobbering
+    # any existing user entries.
+    config_ensure_gitignore "$dir/.gitignore"
+
+    return 0
+}
+
+# Ensure the given .gitignore contains the entries revo needs
+# (`repos/` and `.revo/`). Existing content is preserved; only missing
+# entries are appended. Creates the file if it doesn't exist.
+# Usage: config_ensure_gitignore "/path/to/.gitignore"
+config_ensure_gitignore() {
+    local gitignore="$1"
+    local needed
+    needed=$(printf 'repos/\n.revo/\n')
+
+    if [[ ! -f "$gitignore" ]]; then
+        printf '%s\n' "$needed" > "$gitignore"
+        return 0
+    fi
+
+    # Append only the entries that aren't already present (exact line match,
+    # ignoring leading/trailing whitespace and comments).
+    local entry has_entry needs_newline=0
+    # If the file is non-empty and doesn't end in a newline, we need to add
+    # one before appending so we don't merge into an existing line.
+    if [[ -s "$gitignore" ]] && [[ -n "$(tail -c1 "$gitignore" 2>/dev/null)" ]]; then
+        needs_newline=1
+    fi
+
+    local appended=0
+    while IFS= read -r entry; do
+        [[ -z "$entry" ]] && continue
+        has_entry=$(awk -v e="$entry" '
+            { sub(/^[[:space:]]+/, ""); sub(/[[:space:]]+$/, "") }
+            $0 == e { found = 1; exit }
+            END { exit !found }
+        ' "$gitignore" && printf 'yes' || printf 'no')
+        if [[ "$has_entry" == "no" ]]; then
+            if [[ $appended -eq 0 ]] && [[ $needs_newline -eq 1 ]]; then
+                printf '\n' >> "$gitignore"
+            fi
+            printf '%s\n' "$entry" >> "$gitignore"
+            appended=1
+        fi
+    done <<< "$needed"
 
     return 0
 }
@@ -1515,45 +1559,13 @@ _init_scan_existing() {
     fi
 }
 
-# Write a Claude-first onboarding CLAUDE.md, or append a revo section if the
-# user already has their own CLAUDE.md in the workspace root.
+# Write a Claude-first onboarding CLAUDE.md if and only if the workspace
+# root has no CLAUDE.md yet. Existing files are left alone — `revo context`
+# will append its marker-wrapped auto block once repos are added.
 _init_write_claude_md() {
     local out="$REVO_WORKSPACE_ROOT/CLAUDE.md"
 
-    if [[ -f "$out" ]] && ! grep -q "managed by revo" "$out" 2>/dev/null; then
-        if grep -q "Workspace Tool: revo" "$out" 2>/dev/null; then
-            return 0
-        fi
-        cat >> "$out" << 'EOF'
-
----
-
-## Workspace Tool: revo
-
-This workspace uses revo to manage multiple repos.
-Source: https://github.com/jippylong12/revo
-
-### Setup commands
-- `revo add <git-url> --tags <tags> [--depends-on <repo>]` — add a repo to workspace
-- `revo clone` — clone all configured repos
-- `revo context` — scan repos and regenerate the workspace context section
-
-### Daily commands
-- `revo status` — branch and dirty state across all repos
-- `revo sync` — pull latest across all repos
-- `revo feature <name>` — create feature branch across all repos
-- `revo commit "msg"` — commit all dirty repos with same message
-- `revo push` — push all repos
-- `revo pr "title"` — create coordinated PRs via gh CLI
-- `revo exec "cmd" --tag <tag>` — run command in filtered repos
-
-### Working in this workspace
-- Repos live in the repos/ subdirectory (or wherever configured in revo.yaml)
-- Edit files across repos directly
-- Check .revo/features/ for active feature briefs
-- Follow dependency order when making cross-repo changes
-EOF
-        ui_step_done "Appended revo section to existing CLAUDE.md"
+    if [[ -f "$out" ]]; then
         return 0
     fi
 
@@ -1693,16 +1705,18 @@ cmd_init() {
         fi
     fi
 
-    # Write the Claude-first onboarding CLAUDE.md (or append to user's own).
-    _init_write_claude_md
-
-    # If we detected repos, immediately generate the full workspace context.
+    # If we detected repos, hand off to cmd_context — it now wraps its output
+    # in BEGIN/END markers and preserves any user content in CLAUDE.md, so we
+    # don't need the onboarding placeholder. When no repos were detected,
+    # write the placeholder so Claude has something to read.
     if [[ $detected_count -gt 0 ]]; then
         ui_bar_line
         cmd_context
         return 0
     fi
 
+    _init_write_claude_md
+
     ui_outro "Workspace initialized! Run 'revo add <url>' to add repositories."
     return 0
 }
@@ -2752,15 +2766,75 @@ _context_topo_sort() {
     return 0
 }
 
-# Write the workspace CLAUDE.md to the given path.
+# Markers used to delimit revo's auto-generated block inside the workspace
+# CLAUDE.md. Anything between these markers is owned by `revo context` and
+# replaced on every regeneration. Anything outside is preserved untouched.
+CONTEXT_BEGIN_MARKER='<!-- BEGIN revo:auto - regenerated by `revo context`, do not edit between markers -->'
+CONTEXT_END_MARKER='<!-- END revo:auto -->'
+
+# Splice an auto-generated block into the target CLAUDE.md without
+# clobbering user content.
+#  - If target doesn't exist: copy auto file to target.
+#  - If target has BEGIN+END markers: replace the marker block in place.
+#  - Otherwise: append the auto block (with a separator) at the end.
+# Usage: _context_merge_into "/tmp/auto" "/path/to/CLAUDE.md"
+_context_merge_into() {
+    local auto_file="$1"
+    local target="$2"
+
+    if [[ ! -f "$target" ]]; then
+        cp "$auto_file" "$target"
+        return 0
+    fi
+
+    if grep -qF "$CONTEXT_BEGIN_MARKER" "$target" 2>/dev/null \
+        && grep -qF "$CONTEXT_END_MARKER" "$target" 2>/dev/null; then
+        local merged
+        merged=$(mktemp -t revo-merge.XXXXXX)
+        awk -v auto="$auto_file" -v begin="$CONTEXT_BEGIN_MARKER" -v end="$CONTEXT_END_MARKER" '
+            BEGIN { in_block = 0 }
+            index($0, begin) == 1 {
+                in_block = 1
+                while ((getline line < auto) > 0) print line
+                close(auto)
+                next
+            }
+            index($0, end) == 1 && in_block {
+                in_block = 0
+                next
+            }
+            !in_block { print }
+        ' "$target" > "$merged"
+        mv "$merged" "$target"
+        return 0
+    fi
+
+    # No markers — append at the end with a blank-line separator. If the
+    # existing file doesn't end in a newline, add one first so we don't merge
+    # into the user's last line.
+    if [[ -s "$target" ]] && [[ -n "$(tail -c1 "$target" 2>/dev/null)" ]]; then
+        printf '\n' >> "$target"
+    fi
+    printf '\n' >> "$target"
+    cat "$auto_file" >> "$target"
+    return 0
+}
+
+# Write the workspace CLAUDE.md to the given path. The auto-generated content
+# is wrapped in BEGIN/END markers and spliced into any existing CLAUDE.md so
+# user content above and below the markers is preserved across regenerations.
 # Usage: _context_write_file "/path/to/CLAUDE.md"
 _context_write_file() {
-    local output="$1"
+    local target="$1"
     local workspace
     workspace=$(config_workspace_name)
 
-    # Start file
+    local output
+    output=$(mktemp -t revo-auto.XXXXXX)
+
+    # Start auto block (markers + header)
     {
+        printf '%s\n' "$CONTEXT_BEGIN_MARKER"
         printf '# Workspace Context (auto-generated by revo)\n'
         printf '\n'
         printf 'This workspace contains multiple repositories managed by revo.\n'
@@ -2768,8 +2842,9 @@ _context_write_file() {
             printf 'Workspace: **%s**\n' "$workspace"
         fi
         printf '\n'
-        printf '> This file is regenerated by `revo context`. Manual edits below the\n'
-        printf '> `## Agent Instructions` section will be preserved across regeneration.\n'
+        printf '> This block is auto-generated by `revo context`. Edits between the\n'
+        printf '> BEGIN/END markers will be lost on regeneration. Add your own content\n'
+        printf '> above or below the markers.\n'
         printf '\n'
         printf '## Repos\n'
         printf '\n'
@@ -2946,7 +3021,13 @@ _context_write_file() {
         printf 'revo commit "feat: my feature"   # commits all dirty repos\n'
         printf 'revo pr "My feature"             # coordinated PRs\n'
         printf '```\n'
+        printf '\n'
+        printf '%s\n' "$CONTEXT_END_MARKER"
     } >> "$output"
+
+    # Splice the auto block into the target file, preserving any user content.
+    _context_merge_into "$output" "$target"
+    rm -f "$output"
 }
 
 cmd_context() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@revotools/cli",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "description": "Claude-first multi-repo workspace manager (fork of Mars)",
   "bin": {
     "revo": "./dist/revo"