space-architect 9.1.0 → 9.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c2dfa94f98278929ea382e4411856749de3af270511f60760ee4e3bed83daf53
-  data.tar.gz: 33c9bf994eafc772c67399876826b77f685a7ac9e3417f38b37054d853b5479b
+  metadata.gz: 154e74a35cc7d14274f2f6fec65f40400727adbf3ce4bcf69000c2f00405a07e
+  data.tar.gz: 2d6407b32a61f8c056e866e12dceab65b6a0b35f281ec6b1721c73233517da49
 SHA512:
-  metadata.gz: 2b7c099ff9ffc9b1cf6e37d48a687b2c08c4f2c0463ea5f1e77d156f214bdf9e4f5d0059e1be9fa1247de440c50ea091ffb933db5f02c3bb8e2d8d75ed0f3996
-  data.tar.gz: 5ce698b9ed448dbab61db46302c5f51f4e0bd850c8748c052131ffea4ef718326a3a4de47562092ba782dcfcfa042c6dedfe1c56675119b9ba2d98e29caf5f49
+  metadata.gz: db472c7ffcff0c4228f9c6bda1baad0c00cb0283defa3a686924267d51d252b9f24e3cdf65a8d50076f0354f5af1894ff6ff9799c2b783069a8bf52567206c2b
+  data.tar.gz: 444e06a1bbcbefe3f827a065cefba6383d04606215abf0ab016069f7b254a8c61d2343aa91a648a3a2be92ae1a47c97b18dbcdc63bb62a92d23c63b3b8b10e6f

data/lib/space_architect/architect_project.rb

@@ -929,12 +929,21 @@ module Space::Architect
       base_explicit = !base.nil?
       refuse_repoint_if_dirty!(iteration, lanes, base, iteration_id(entry)) if base_explicit && !force
 
+      # Sync-or-refuse ONCE per distinct repo of the selected set (lane order,
+      # first occurrence) BEFORE any worktree is cut — a divergence aborts the
+      # entire provision. An explicit --base is the deliberate case (#88): the
+      # pin is cut exactly as given, no sync, no divergence refusal.
+      synced = {}
+      unless base_explicit
+        lanes.map { |l| l["repo"] }.uniq.each { |repo| synced[repo] = sync_integration_branch!(repo, iteration) }
+      end
+
       lanes.map do |l|
         name = l["name"]
         result = worktree_add(l["repo"], iteration, name, base: resolve_lane_base(l["repo"], base),
                               base_explicit: base_explicit, force: force, **recorded_lane_fields(l))
         { lane: name, worktree: result[:worktree], base_sha: result[:base_sha], outcome: result[:outcome],
-          discarded: result[:discarded] }
+          discarded: result[:discarded], synced: synced[l["repo"]] }
       end
     end
 
@@ -1622,6 +1631,15 @@ module Space::Architect
       wt_path = space.path.join(lane_entry["worktree"] || "build/#{iteration_id(entry)}-#{lane}/wt")
       return lane_entry if wt_path.exist? && worktree_registered?(repo_path, wt_path)
 
+      # Same sync-or-refuse as provision, immediately before the cut — a
+      # dispatch/gate/integrate/verify that materializes a missing worktree must
+      # never cut it from a stale integration tip. Already-materialized lanes
+      # returned above and stay a true no-op. The inform goes on $stderr, like
+      # worktree_add's own informs on this path; no-op syncs print nothing.
+      report = sync_integration_branch!(lane_entry["repo"], iteration)
+      $stderr.puts "#{report[:repo]}: fast-forwarded #{report[:branch]} to #{report[:sha][0, 8]} — " \
+        "synced before materializing #{iteration}/#{lane}" if report
+
       worktree_add(lane_entry["repo"], iteration, lane, base: resolve_lane_base(lane_entry["repo"], nil),
                    base_explicit: false, **recorded_lane_fields(lane_entry))
       (slice_entry(iteration)["lanes"] || []).find { |l| l["name"] == lane }
@@ -1735,6 +1753,57 @@ module Space::Architect
       st.success? && !out.strip.empty? ? out.strip : "HEAD"
     end
 
+    # Fast-forward the repo's project integration branch from its default branch
+    # BEFORE any lane worktree is cut from it (I06 provision-sync — the I05 burn:
+    # a worktree cut from a stale project/<slug> tip). Local-to-local only — no
+    # fetch/pull, no remote-tracking ref is read or written. Compare before moving:
+    # default not ahead → no-op (nil, callers print nothing); default ahead and
+    # integration not ahead → fast-forward; both ahead → refuse (a human merges
+    # deliberately, or pins --base) — --force has no bypass. Bang: it raises.
+    # Returns nil for a no-op, or { repo:, branch:, sha: } for the moved ref so
+    # callers can report the movement (never silently move a branch).
+    def sync_integration_branch!(repo, iteration)
+      repo_path = space.path.join("repos", repo)
+      integration = project_integration_branch
+      return nil unless branch_exists?(repo_path, integration)
+
+      default = repo_default_branch(repo_path)
+      counts_out, counts_err, counts_st = git_capture("-C", repo_path.to_s, "rev-list", "--left-right", "--count",
+        "#{default}...#{integration}")
+      unless counts_st.success?
+        raise Space::Core::Error, "Cannot compare #{default}...#{integration} in repos/#{repo} — #{counts_err.strip}"
+      end
+
+      default_ahead, integration_ahead = counts_out.strip.split.map(&:to_i)
+      return nil if default_ahead.zero?
+
+      default_tip, = git_capture("-C", repo_path.to_s, "rev-parse", default)
+      integration_tip, = git_capture("-C", repo_path.to_s, "rev-parse", integration)
+      if integration_ahead.positive?
+        raise Space::Core::Error,
+          "Refusing to provision '#{iteration}' — repos/#{repo} has diverged: #{default} (#{default_tip[0, 8]}) and " \
+          "#{integration} (#{integration_tip[0, 8]}) each hold commits the other lacks " \
+          "(#{default} ahead by #{default_ahead}, #{integration} ahead by #{integration_ahead}) — not fast-forwardable. " \
+          "A human must merge #{default} into #{integration} deliberately, or pin the base explicitly with " \
+          "`architect provision #{iteration} --base <sha>`. --force does not bypass this refusal."
+      end
+
+      head_out, _, head_st = git_capture("-C", repo_path.to_s, "symbolic-ref", "--short", "HEAD")
+      if head_st.success? && head_out.strip == integration
+        # The integration branch is the clone's checked-out branch (the real
+        # post-integrate state — merge_lane! checks it out) — fetch refuses a
+        # checked-out dst, so fast-forward via merge instead.
+        git_run("-C", repo_path.to_s, "merge", "--ff-only", default)
+      else
+        # Unprefixed refspecs are ff-only by construction — git rejects a non-ff
+        # update here, so the branch can only ever move forward.
+        git_run("-C", repo_path.to_s, "fetch", ".", "#{default}:#{integration}")
+      end
+
+      new_tip, = git_capture("-C", repo_path.to_s, "rev-parse", integration)
+      { repo: repo, branch: integration, sha: new_tip.strip }
+    end
+
     def slice_entry(iteration)
       block = space.data["project"] || {}
       entry = (block["iterations"] || []).find { |s| s["name"] == iteration }

data/lib/space_architect/cli/architect.rb

@@ -562,7 +562,7 @@ module Space::Architect
         phase 20, "Build"
         argument :iteration, required: true,  desc: "Iteration name"
         argument :space,     required: false, desc: "Space identifier (default: $PWD)"
-        option   :base,      default: nil,    desc: "Base ref override (default: project/<slug> HEAD if it exists, else the repo's default branch)"
+        option   :base,      default: nil,    desc: "Base ref override (default: project/<slug> fast-forward-synced from the repo's default branch first — diverged → refuse; --base skips the sync and cuts exactly the given ref)"
         option   :lane,      default: nil,    desc: "Provision only this lane (default: all declared lanes)"
         option   :force,     type: :boolean, default: false, desc: "Clear and re-create a stale (unregistered) worktree directory"
 
@@ -575,6 +575,12 @@ module Space::Architect
               if results.empty?
                 terminal.say "No declared lanes to provision for '#{iteration}'"
               else
+                # Sync report first (the sync ran before any cut): one line per
+                # moved branch — repo, branch, new short tip. No-op syncs are
+                # nil here and print nothing.
+                results.filter_map { |r| r[:synced] }.uniq.each do |s|
+                  terminal.say "#{s[:repo]}: fast-forwarded #{s[:branch]} to #{s[:sha][0, 8]}"
+                end
                 results.each do |r|
                   state = case r[:outcome]
                   when :created   then "created"

data/lib/space_architect/routing.rb

@@ -17,9 +17,9 @@ module Space::Architect
   # XDG_CONFIG_HOME); space-local is architect.yaml beside the loaded
   # space.yaml (the CLI already resolved the space — no walk-up).
   module Routing
-    ROLES          = %w[architect spec builder judge coordinator].freeze
-    # The four agent roles that must be routed after the merge; `architect` is optional.
-    REQUIRED_ROLES = %w[spec builder judge coordinator].freeze
+    ROLES          = %w[architect spec builder judge coordinator narrator].freeze
+    # The five agent roles that must be routed after the merge; `architect` is optional.
+    REQUIRED_ROLES = %w[spec builder judge coordinator narrator].freeze
     ENTRY_KEYS     = %w[model thinking].freeze
 
     def self.global_path
@@ -34,7 +34,7 @@ module Space::Architect
 
     # Parse one file's text into { role => {"model" => id, "thinking" => level|nil} }.
     # +path+ is used only in error messages. Frozen v1 rules: integer version 1,
-    # the five known roles, entries ⊆ {model, thinking} with a non-empty model,
+    # the six known roles, entries ⊆ {model, thinking} with a non-empty model,
     # duplicate mapping keys rejected (psych's plain load silently keeps the
     # last — the npm yaml the extension parses with throws), aliases accepted,
     # a trailing :level suffix on model parsed via Harness.parse_model_suffix

data/lib/space_architect/version.rb

@@ -2,6 +2,6 @@
 
 module Space
   module Architect
-    VERSION = "9.1.0"
+    VERSION = "9.1.1"
   end
 end

metadata

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