carson 3.30.1 → 3.30.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f1c9bdf439edf6f4c50dbf4c2640ec87cf0cf7f5aacd7960d16c2d32600a0c3
-  data.tar.gz: b82620a9e4524b9e08c7851f9de133967ce64284c7d2c57a71d87df7055ce8a1
+  metadata.gz: 3d81e341c8b680889a883ac964de779e488168c08b692b4bc550d18309a2cd79
+  data.tar.gz: 59334525ce9d1b7952917e1a69dee01f4056900c0bfde09da191c1246ed0a087
 SHA512:
-  metadata.gz: 9433570c67b8f8b793eba64969356c6ec92775515e8291079518b0be7a4f051183eb20e19d23e0d6456a38a95c875f06d9e6d7536b434c30ec69fe36d63b0c4e
-  data.tar.gz: 7b82e7e07750d8e0ac4d0502a95e86925e210c1cca5b0c0e33355604cc4910819f46c57b002c9b7d9fd8dd4c312b4bc4cfba26192875e1a23818498343a4b0d0
+  metadata.gz: 56ef060de2589540f6f87425fd49e147ee40577f9f6b8539152f06028100539c19b68d318e6dccb2376dc4666b05b3273b3989025b17510aeeb5866e2f32785e
+  data.tar.gz: 064f48a6b0b8db74484dd8584bcfa1b352caca8c68bb0662106ef235362486da602e654f5e1377495b7612df7a362ed00221e0737326224fd67aa0d514ca4b6f

data/RELEASE.md

@@ -5,6 +5,17 @@ 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

data/VERSION

@@ -1 +1 @@
-3.30.1
+3.30.2

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.1
+  version: 3.30.2
 platform: ruby
 authors:
 - Hailei Wang