carson 3.30.0 → 3.30.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5156cb5207a0ee95cad65c30d494a24ddcee97c90f2aab6861b34f9ec8e92069
-  data.tar.gz: 182a83aaa84ec1d9c0a548bdaf98e421b4eab9e4ab1248b0d67db58e42a7c5ae
+  metadata.gz: 3d81e341c8b680889a883ac964de779e488168c08b692b4bc550d18309a2cd79
+  data.tar.gz: 59334525ce9d1b7952917e1a69dee01f4056900c0bfde09da191c1246ed0a087
 SHA512:
-  metadata.gz: 3e42b39fad6ca26a05bd914f7653c9cd4e7bb4227c9eb03ba5288b5e54d30f87f4b8e69991236caab797964d293ec1e6b01c4ec6a8853b24f80f7a7bb1670cfe
-  data.tar.gz: fd147d7b1941670279ad3261b0cca81639d72043b3e429a1f0290aff4a9deb53000971c5bb5953d7f36b4b574a1c5b03547f9cf33fdb3bcc16bbe4f30e5b770a
+  metadata.gz: 56ef060de2589540f6f87425fd49e147ee40577f9f6b8539152f06028100539c19b68d318e6dccb2376dc4666b05b3273b3989025b17510aeeb5866e2f32785e
+  data.tar.gz: 064f48a6b0b8db74484dd8584bcfa1b352caca8c68bb0662106ef235362486da602e654f5e1377495b7612df7a362ed00221e0737326224fd67aa0d514ca4b6f

data/MANUAL.md

@@ -66,12 +66,12 @@ on:
 
 jobs:
   governance:
-    uses: wanghailei/carson/.github/workflows/carson_policy.yml@v3.29.0
+    uses: wanghailei/carson/.github/workflows/carson_policy.yml@v3.30.0
     secrets:
       CARSON_READ_TOKEN: ${{ secrets.CARSON_READ_TOKEN }}
     with:
-      carson_ref: "v3.29.0"
-      carson_version: "3.29.0"
+      carson_ref: "v3.30.0"
+      carson_version: "3.30.0"
       rubocop_version: "1.81.0"
 ```
 

data/RELEASE.md

@@ -5,6 +5,29 @@ Release-note scope rule:
 - `RELEASE.md` records only version deltas, breaking changes, and migration actions.
 - Operational usage guides live in `MANUAL.md` and `API.md`.
 
+## 3.30.2
+
+### What changed
+
+- **Recovery hints re-enter through Carson, not blocked raw commands** — Delivery error recovery messages no longer suggest raw `gh pr create`, `gh pr merge`, or `git rebase` commands. All recovery paths now guide the user back through Carson. Freshness blocks say "refresh this branch onto the target, then `carson deliver`" instead of teaching raw git recipes.
+- **Fast PR indentation guard restored** — The Ruby indentation guard in CI now correctly handles access modifier detection, fixing false positives that blocked PRs.
+
+### No migration required
+
+- Existing workflows continue to work unchanged.
+
+## 3.30.1
+
+### What changed
+
+- **MANUAL.md CI example updated to v3.30.0** — The CI workflow reference, `carson_ref`, and `carson_version` in the setup example were still pinned to v3.29.0. Now aligned with the current release.
+- **CI split into fast PR gate and full smoke on main** — PR checks run the unit test suite only; the full smoke script runs on main after merge. Reduces PR feedback time.
+- **Command guard respects leading `cd` in Bash commands** — `cd /path && gh pr create` is now correctly detected as a governed command.
+
+### No migration required
+
+- Existing workflows continue to work unchanged.
+
 ## 3.30.0
 
 ### What changed

data/VERSION

@@ -1 +1 @@
-3.30.0
+3.30.2

data/hooks/command-guard

@@ -31,6 +31,28 @@ block_command() {
 	exit 2
 }
 
+resolve_command_pwd() {
+	local command_text="$1"
+	local base_pwd
+	local raw_cd_target
+	local cd_target
+	local resolved_pwd
+
+	base_pwd="$(pwd -P)"
+	if [[ ! "$command_text" =~ ^[[:space:]]*cd[[:space:]]+([^;&|]+)[[:space:]]*(&&|;) ]]; then
+		echo "$base_pwd"
+		return
+	fi
+
+	raw_cd_target="${BASH_REMATCH[1]}"
+	cd_target="$(printf '%s' "$raw_cd_target" | sed -E "s/^[[:space:]]+//; s/[[:space:]]+$//; s/^'(.*)'$/\\1/; s/^\"(.*)\"$/\\1/")"
+	if resolved_pwd="$(cd "$base_pwd" && cd "$cd_target" 2>/dev/null && pwd -P)"; then
+		echo "$resolved_pwd"
+	else
+		echo "$base_pwd"
+	fi
+}
+
 # Read the tool call JSON from stdin.
 input="$(cat)"
 
@@ -40,16 +62,17 @@ tool_name="$(echo "$input" | jq -r '.tool_name // empty' 2>/dev/null)"
 
 command_text="$(echo "$input" | jq -r '.tool_input.command // empty' 2>/dev/null)"
 [ -n "$command_text" ] || exit 0
+command_pwd="$(resolve_command_pwd "$command_text")"
 
 # Check if the current directory is inside a governed repository.
 config_file="${HOME}/.carson/config.json"
 [ -f "$config_file" ] || exit 0
 
-repo_root="$(git rev-parse --show-toplevel 2>/dev/null || echo "")"
+repo_root="$(git -C "$command_pwd" rev-parse --show-toplevel 2>/dev/null || echo "")"
 [ -n "$repo_root" ] || exit 0
 
 current_root="$(cd "$repo_root" && pwd -P)"
-common_dir="$(git rev-parse --path-format=absolute --git-common-dir 2>/dev/null || echo "")"
+common_dir="$(git -C "$command_pwd" rev-parse --path-format=absolute --git-common-dir 2>/dev/null || echo "")"
 if [ -n "$common_dir" ]; then
 	governed_root="$(cd "$(dirname "$common_dir")" && pwd -P)"
 else
@@ -62,7 +85,7 @@ fi
 
 main_branch="$(jq -r '.git.main_branch // "main"' "$config_file" 2>/dev/null || echo "main")"
 [ -n "$main_branch" ] || main_branch="main"
-current_branch="$(git rev-parse --abbrev-ref HEAD 2>/dev/null || echo "")"
+current_branch="$(git -C "$command_pwd" rev-parse --abbrev-ref HEAD 2>/dev/null || echo "")"
 on_main_worktree=false
 on_main_branch=false
 [ "$current_root" = "$governed_root" ] && on_main_worktree=true
@@ -96,7 +119,7 @@ fi
 if [ "$on_main_worktree" = true ] && [ "$on_main_branch" = true ] && grep -qE "$main_mutation_pattern" <<<"$command_text"; then
 	block_command \
 		"Main working tree is read-only in this Carson-governed repo." \
-		"Use \`carson worktree create <name>\` first, then run \`git add\` or \`git commit\` inside that worktree."
+		"Use \`carson worktree create <name>\` first, then commit inside that worktree or let Carson do it with \`carson deliver --commit \"...\"\`."
 fi
 
 exit 0

data/lib/carson/runtime/deliver.rb

@@ -288,7 +288,7 @@ module Carson
 					when :blocked
 						result[ :outcome ] = "blocked"
 						result[ :waited_seconds ] = elapsed_settle_seconds( started_at: started_at )
-						result[ :recovery ] = "git rebase #{config.git_remote}/#{main} && carson deliver" if evaluation[ :cause ] == "freshness"
+						result[ :recovery ] = "refresh this branch onto #{config.git_remote}/#{main}, then carson deliver" if evaluation[ :cause ] == "freshness"
 						apply_handoff!(
 							result: result,
 							reason: evaluation.fetch( :reason ),
@@ -809,10 +809,9 @@ module Carson
 
 			def freshness_recovery( freshness: )
 				remote_ref = freshness.fetch( :remote_ref )
-				return "git rebase #{remote_ref} && carson deliver" if freshness.fetch( :status ) == :behind
+				return "refresh this branch onto #{remote_ref}, then carson deliver" if freshness.fetch( :status ) == :behind
 
-				remote, main = remote_ref.split( "/", 2 )
-				"git fetch #{remote} #{main} && carson deliver"
+				"carson deliver (once #{remote_ref} is reachable)"
 			end
 
 			def deliver_merge_attempt_cap
@@ -898,7 +897,7 @@ module Carson
 					reason: "freshness_behind",
 					cause: "freshness",
 					summary: "branch is behind #{remote_main}",
-					recovery: "git rebase #{remote_main} && carson deliver"
+					recovery: "refresh this branch onto #{remote_main}, then carson deliver"
 				} if merge_state == "BEHIND"
 
 				return {
@@ -1127,7 +1126,7 @@ module Carson
 
 				if lease_stderr.to_s.include?( "stale info" )
 					result[ :error ] = "force-with-lease rejected — another push landed on #{branch} since your last fetch"
-					result[ :recovery ] = "git fetch #{remote} #{branch} && carson deliver"
+					result[ :recovery ] = "inspect newer commits on #{branch}, reconcile, then carson deliver"
 				else
 					error_text = lease_stderr.to_s.strip
 					error_text = "push failed (force-with-lease)" if error_text.empty?
@@ -1175,7 +1174,7 @@ module Carson
 					error_text = stderr.to_s.strip
 					error_text = "pr create failed" if error_text.empty?
 					result[ :error ] = error_text
-					result[ :recovery ] = "gh pr create --title '#{pr_title}' --head #{branch}"
+					result[ :recovery ] = "carson deliver"
 					return [ nil, nil ]
 				end
 
@@ -1274,7 +1273,7 @@ module Carson
 					error_text = stderr.to_s.strip
 					error_text = "merge failed" if error_text.empty?
 					result[ :error ] = error_text
-					result[ :recovery ] = "gh pr merge #{number} --#{method}"
+					result[ :recovery ] = "carson deliver"
 					EXIT_ERROR
 				end
 			end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: carson
 version: !ruby/object:Gem::Version
-  version: 3.30.0
+  version: 3.30.2
 platform: ruby
 authors:
 - Hailei Wang