space-architect 5.5.0 → 5.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e170b3f69d5b2a6bdeb9422aedc341df20148e7085ea38b120b43508a9aaf3d0
-  data.tar.gz: 8ed8737fdeacf88a4ef1917fcf2a695e3d7f6f679eb1c6745094179bf57a8166
+  metadata.gz: 71935f28a32069832af5b4d25f368d33c7efc505267a98c4f4b49f75a0084861
+  data.tar.gz: 2b067fdbdd5a950b204ef9fb16a3484a634e0b6acd2f9ca467e8f47adec29902
 SHA512:
-  metadata.gz: '059f2419d80fc974f33c66367f9bc3a3c58492ed095d155c7e9aaa07c0c127ef374e236a973dd21c635e0c2eea97f62fafe83e66c03f8c3a6f5109f4745c20c3'
-  data.tar.gz: 2ee62770684237d0f60eedc5e752695846ff9dfd95836876b555e94e68683bc1ec4367a2006ea35fb350313b568a1d81d6a13822dea4747364f4710688984002
+  metadata.gz: 66a47fc8027809c4132ba9e5365694ab530d646be68b0cacec80d527e81dcb28f7d192afb4e76ea1e9b0489bada20013af2c32da066075e28f39bb407fc89243
+  data.tar.gz: f10a02847f4dafb408b98eb6a79f4b911bc0db7bf1856fbef18b751928f2e824ee5a5596db82ca94641f2fa5f55b037a671d9fed4daf0c8b54a374735b5d4baf

data/CHANGELOG.md

@@ -5,6 +5,22 @@ All notable changes to this project are documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [5.5.1] - 2026-07-25
+
+### Fixed
+
+- **Lane in-bounds check no longer false-FAILs on dotfile directories** — the
+  `touch_set` matcher built its `fnmatch` flags without `File::FNM_DOTMATCH`, so
+  a `dir/**` touch glob never matched a path with a dot-prefixed segment. Any
+  lane creating `.github/workflows/ci.yml` *inside its own declared directory*
+  was reported out-of-bounds by `architect verify` check (d) and hard-blocked by
+  `architect integrate` ("wrote outside its declared touch set"), with no
+  override — the touch set is frozen at spec time, so neither side of the
+  comparison could be adjusted legitimately and the merges had to be done by
+  hand. `merge_lane!`'s conflict classification carried the identical blind spot;
+  both sites now share one `in_touch_set?` predicate so the flags cannot drift
+  again.
+
 ## [5.5.0] - 2026-07-22
 
 ### Added

data/lib/space_architect/architect_project.rb

@@ -42,6 +42,13 @@ module Space::Architect
     # Hard per-gate timeout. Generous relative to the full suite (~55s).
     DEFAULT_GATE_TIMEOUT = 900
 
+    # Flags for matching a changed path against a lane's touch_set globs.
+    # PATHNAME keeps a single `*` from crossing `/`; EXTGLOB enables `{a,b}`;
+    # DOTMATCH lets a glob reach dotfile segments, so a `dir/**` touch set covers
+    # `dir/.github/workflows/ci.yml` — the standard deliverable for a lane preparing
+    # a directory to become a repo root.
+    TOUCH_FNM = File::FNM_PATHNAME | File::FNM_EXTGLOB | File::FNM_DOTMATCH
+
     # Legacy sentinel: worktree_add used to seed prompt.md with this placeholder
     # (dropped — the blind-overwrite tripped harness read-before-write guards, #48).
     # dispatch still refuses to launch on this content, so stubs in old spaces
@@ -404,10 +411,7 @@ module Space::Architect
         git_capture("-C", repo_path.to_s, "merge", "--abort")
         conflict_files = conflicts.split
         lane_touch_set = lane_entry["touch_set"] || []
-        fnm = File::FNM_PATHNAME | File::FNM_EXTGLOB
-        outside = conflict_files.reject do |f|
-          lane_touch_set.any? { |g| File.fnmatch(g, f, fnm) || (g.end_with?("/**") && File.fnmatch("#{g}/*", f, fnm)) }
-        end
+        outside = conflict_files.reject { |f| in_touch_set?(f, lane_touch_set) }
         if !lane_touch_set.empty? && outside.empty?
           raise Space::Core::Error,
             "Merge conflict integrating lane '#{lane}' (#{conflict_files.join(", ")}) — the lane plan was " \
@@ -1298,18 +1302,23 @@ module Space::Architect
           i += 1
           changed << orig if orig && !orig.empty?
         end
-        fnm = File::FNM_PATHNAME | File::FNM_EXTGLOB
-        changed.all? do |f|
-          touch_set.any? do |g|
-            File.fnmatch(g, f, fnm) ||
-              (g.end_with?("/**") && File.fnmatch("#{g}/*", f, fnm))
-          end
-        end
+        changed.all? { |f| in_touch_set?(f, touch_set) }
       end
 
       checks
     end
 
+    # Is a changed path inside a lane's declared touch set? Single-sourced so the
+    # in-bounds check (d) and merge_lane!'s conflict classification can never drift.
+    # A trailing `dir/**` is matched twice: bare (PATHNAME stops it at direct
+    # children) and as `dir/**/*`, whose whole-component `**/` does cross `/`.
+    def in_touch_set?(path, globs)
+      globs.any? do |g|
+        File.fnmatch(g, path, TOUCH_FNM) ||
+          (g.end_with?("/**") && File.fnmatch("#{g}/*", path, TOUCH_FNM))
+      end
+    end
+
     # Replace (or, with append:, extend) the body of a "## Heading" section, leaving
     # every other section byte-untouched. Append replaces a placeholder body (only a
     # template comment) the first time, then stacks subsections after it. A supplied

data/lib/space_core/version.rb

@@ -2,6 +2,6 @@
 
 module Space
   module Core
-    VERSION = "5.5.0"
+    VERSION = "5.5.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: space-architect
 version: !ruby/object:Gem::Version
-  version: 5.5.0
+  version: 5.5.1
 platform: ruby
 authors:
 - Eric Jacobs