space-architect 1.3.0 → 2.0.0.rc1

data/exe/space

@@ -8,6 +8,6 @@ if File.exist?(source_gemfile)
   $LOAD_PATH.unshift(File.expand_path("../lib", __dir__))
 end
 
-require "space_architect"
+require "space_core"
 
-SpaceArchitect::CLI.run(["space", *ARGV], $stdout, $stderr)
+Space::Core::CLI.run(ARGV, $stdout, $stderr)

data/exe/src

@@ -0,0 +1,13 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+source_gemfile = File.expand_path("../Gemfile", __dir__)
+if File.exist?(source_gemfile)
+  ENV["BUNDLE_GEMFILE"] ||= source_gemfile
+  require "bundler/setup"
+  $LOAD_PATH.unshift(File.expand_path("../lib", __dir__))
+end
+
+require "space_src"
+
+Space::Src::CLI.run(ARGV, $stdout, $stderr)

data/lib/space_architect/architect_mission.rb

@@ -6,7 +6,7 @@ require "open3"
 require "fileutils"
 require "pathname"
 
-module SpaceArchitect
+module Space::Architect
   # Manages an architect-loop mission inside a space: one self-contained file per
   # iteration at architecture/I<NN>-<iteration>.md (Grounds / Specification / Acceptance Criteria / Builder
   # Prompt / Builder Report / Verdict), grown one commit per section. The freeze
@@ -44,7 +44,7 @@ module SpaceArchitect
     def init!
       handoff_path = space.path.join("architecture", "ARCHITECT.md")
       if handoff_path.exist?
-        raise Error, "architecture/ARCHITECT.md already exists — remove it first or edit it directly (idempotent guard)"
+        raise Space::Core::Error, "architecture/ARCHITECT.md already exists — remove it first or edit it directly (idempotent guard)"
       end
 
       FileUtils.mkdir_p(handoff_path.dirname)
@@ -54,7 +54,7 @@ module SpaceArchitect
         b.merge("status" => "active", "current_iteration" => nil, "iterations" => [])
       end
 
-      git_run("-C", space.path.to_s, "add", "architecture/ARCHITECT.md", Space::METADATA_FILE)
+      git_run("-C", space.path.to_s, "add", "architecture/ARCHITECT.md", Space::Core::Space::METADATA_FILE)
       git_run("-C", space.path.to_s, "commit", "-m", "Initialize architect mission")
 
       handoff_path
@@ -65,14 +65,14 @@ module SpaceArchitect
       block = space.data["architect"] || {}
       iterations = block["iterations"] || []
       if iterations.any? { |s| s["name"] == name }
-        raise Error, "iteration '#{name}' already exists in space.yaml"
+        raise Space::Core::Error, "iteration '#{name}' already exists in space.yaml"
       end
 
       ordinal = (iterations.map { |s| s["ordinal"] || 0 }.max || 0) + 1
       nn = format("%02d", ordinal)
       rel = "architecture/I#{nn}-#{name}.md"
       path = space.path.join(rel)
-      raise Error, "#{rel} already exists" if path.exist?
+      raise Space::Core::Error, "#{rel} already exists" if path.exist?
 
       FileUtils.mkdir_p(path.dirname)
       path.write(render_iteration(nn, name))
@@ -88,7 +88,7 @@ module SpaceArchitect
         b
       end
 
-      git_run("-C", space.path.to_s, "add", rel, Space::METADATA_FILE)
+      git_run("-C", space.path.to_s, "add", rel, Space::Core::Space::METADATA_FILE)
       git_run("-C", space.path.to_s, "commit", "-m", "I#{nn}: scaffold #{name}")
 
       path
@@ -114,15 +114,15 @@ module SpaceArchitect
       entry = slice_entry(iteration)
       rel = entry["file"]
       path = space.path.join(rel)
-      raise Error, "#{rel} does not exist — run `architect new #{iteration}` first" unless path.exist?
+      raise Space::Core::Error, "#{rel} does not exist — run `architect new #{iteration}` first" unless path.exist?
       unless path.read.match?(/^## Acceptance Criteria/)
-        raise Error, "#{rel} has no '## Acceptance Criteria' section — write the Acceptance Criteria before freezing"
+        raise Space::Core::Error, "#{rel} has no '## Acceptance Criteria' section — write the Acceptance Criteria before freezing"
       end
 
       if entry["freeze_sha"]
         sha = entry["freeze_sha"]
         if frozen_region_changed?(sha, rel)
-          raise Error,
+          raise Space::Core::Error,
             "Frozen sections of #{rel} changed since freeze #{sha[0, 8]} — " \
             "refusing to re-freeze. Restore them to their frozen state or use a new iteration."
         end
@@ -159,7 +159,7 @@ module SpaceArchitect
     def brief_new!(force: false)
       brief_path = space.path.join("architecture", "BRIEF.md")
       if brief_path.exist? && !force
-        raise Error, "architecture/BRIEF.md already exists — edit it directly (idempotent guard), or pass --force to overwrite"
+        raise Space::Core::Error, "architecture/BRIEF.md already exists — edit it directly (idempotent guard), or pass --force to overwrite"
       end
 
       FileUtils.mkdir_p(brief_path.dirname)
@@ -176,7 +176,7 @@ module SpaceArchitect
     def write_section!(iteration, section, body:, append: false, lane: nil)
       spec = SECTIONS[section]
       unless spec
-        raise Error,
+        raise Space::Core::Error,
           "Unknown section '#{section}' — one of: #{SECTIONS.keys.join(', ')}. " \
           "(Acceptance Criteria is set by `architect freeze`; Builder Report by `architect evidence`.)"
       end
@@ -184,10 +184,10 @@ module SpaceArchitect
       entry = slice_entry(iteration)
       rel = entry["file"]
       path = space.path.join(rel)
-      raise Error, "#{rel} does not exist — run `architect new #{iteration}` first" unless path.exist?
+      raise Space::Core::Error, "#{rel} does not exist — run `architect new #{iteration}` first" unless path.exist?
 
       if spec[:frozen] && entry["freeze_sha"]
-        raise Error,
+        raise Space::Core::Error,
           "#{spec[:heading]} is frozen for #{iteration} (freeze #{entry["freeze_sha"][0, 8]}) — " \
           "frozen sections are read-only after the freeze commit. Open a new iteration to change the contract."
       end
@@ -211,13 +211,13 @@ module SpaceArchitect
       entry = slice_entry(iteration)
       rel = entry["file"]
       path = space.path.join(rel)
-      raise Error, "#{rel} does not exist — run `architect new #{iteration}` first" unless path.exist?
+      raise Space::Core::Error, "#{rel} does not exist — run `architect new #{iteration}` first" unless path.exist?
 
       id = iteration_id(entry)
       report = space.path.join("build", lane ? "#{id}-#{lane}" : id, "report.md")
-      raise Error, "builder report not found: #{report}" unless report.exist?
+      raise Space::Core::Error, "builder report not found: #{report}" unless report.exist?
       raw = report.read
-      raise Error, "builder report is empty: #{report}" if raw.strip.empty?
+      raise Space::Core::Error, "builder report is empty: #{report}" if raw.strip.empty?
 
       block = lane ? "### #{lane}\n\n#{raw.rstrip}" : raw.rstrip
       path.write(replace_section_body(path.read, "## Builder Report", block, append: !lane.nil?))
@@ -240,7 +240,7 @@ module SpaceArchitect
       text =
         if ref
           out, _, st = git_capture("-C", space.path.to_s, "show", "#{ref}:#{rel}")
-          raise Error, "could not read #{rel} at #{ref}" unless st.success?
+          raise Space::Core::Error, "could not read #{rel} at #{ref}" unless st.success?
           out
         else
           space.path.join(rel).read
@@ -255,27 +255,27 @@ module SpaceArchitect
     def merge_lane!(iteration, lane, message: nil)
       entry = slice_entry(iteration)
       lane_entry = (entry["lanes"] || []).find { |l| l["name"] == lane }
-      raise Error, "No lane '#{lane}' recorded for iteration '#{iteration}'" unless lane_entry
+      raise Space::Core::Error, "No lane '#{lane}' recorded for iteration '#{iteration}'" unless lane_entry
 
       checks = lane_mechanical_checks(entry, lane_entry)
       if checks[:no_builder_commits] == false
-        raise Error, "Lane '#{lane}' has builder commits — the worktree is tampered (hard rule 7). Reset and re-dispatch; do not merge."
+        raise Space::Core::Error, "Lane '#{lane}' has builder commits — the worktree is tampered (hard rule 7). Reset and re-dispatch; do not merge."
       end
       if checks[:in_bounds] == false
-        raise Error, "Lane '#{lane}' wrote outside its declared touch set — out-of-bounds fails the lane. Reset and re-dispatch."
+        raise Space::Core::Error, "Lane '#{lane}' wrote outside its declared touch set — out-of-bounds fails the lane. Reset and re-dispatch."
       end
 
       repo = lane_entry["repo"]
       repo_path = space.path.join("repos", repo)
       id = iteration_id(entry)
       wt_path = space.path.join(lane_entry["worktree"] || "build/#{id}-#{lane}/wt")
-      raise Error, "Worktree directory does not exist: #{wt_path}" unless wt_path.exist?
+      raise Space::Core::Error, "Worktree directory does not exist: #{wt_path}" unless wt_path.exist?
       base_sha = lane_entry["base_sha"]
       lane_branch = "lane/#{id}-#{lane}"
       integration_branch = "lane/#{id}"
 
       status_out, = git_capture("-C", wt_path.to_s, "status", "--porcelain")
-      raise Error, "Lane '#{lane}' worktree has no changes to integrate." if status_out.strip.empty?
+      raise Space::Core::Error, "Lane '#{lane}' worktree has no changes to integrate." if status_out.strip.empty?
 
       git_run("-C", wt_path.to_s, "add", "-A")
       git_run("-C", wt_path.to_s, "commit", "-m", message || "lane #{lane}: integrate")
@@ -291,7 +291,7 @@ module SpaceArchitect
       unless mst.success?
         conflicts, = git_capture("-C", repo_path.to_s, "diff", "--name-only", "--diff-filter=U")
         git_capture("-C", repo_path.to_s, "merge", "--abort")
-        raise Error,
+        raise Space::Core::Error,
           "Merge conflict integrating lane '#{lane}' (#{conflicts.split.join(", ")}) — the lane plan was " \
           "not disjoint = a spec defect. Kill the conflicting lane and re-spec; do not hand-resolve. #{merr.strip}"
       end
@@ -314,14 +314,14 @@ module SpaceArchitect
     # Loop merge_lane! over the architect-supplied passing set, in order. Stops on the
     # first conflict (a disjointness defect). Never decides which lanes pass.
     def integrate!(iteration, lanes:, teardown: false)
-      raise Error, "No lanes given to integrate" if lanes.nil? || lanes.empty?
+      raise Space::Core::Error, "No lanes given to integrate" if lanes.nil? || lanes.empty?
 
       merged = []
       lanes.each do |lane|
         merged << merge_lane!(iteration, lane)
-      rescue Error => e
+      rescue Space::Core::Error => e
         done = merged.map { |m| m[:lane] }.join(", ")
-        raise Error, "Integrated #{done.empty? ? "(none)" : done} then stopped at '#{lane}': #{e.message}"
+        raise Space::Core::Error, "Integrated #{done.empty? ? "(none)" : done} then stopped at '#{lane}': #{e.message}"
       end
 
       if teardown
@@ -340,26 +340,26 @@ module SpaceArchitect
     def run_gates(iteration, lane: nil)
       entry = slice_entry(iteration)
       freeze_sha = entry["freeze_sha"]
-      raise Error, "Iteration '#{iteration}' is not frozen — freeze before running gates." unless freeze_sha
+      raise Space::Core::Error, "Iteration '#{iteration}' is not frozen — freeze before running gates." unless freeze_sha
       rel = entry["file"]
 
       text, _, st = git_capture("-C", space.path.to_s, "show", "#{freeze_sha}:#{rel}")
-      raise Error, "could not read frozen #{rel} at #{freeze_sha[0, 8]}" unless st.success?
+      raise Space::Core::Error, "could not read frozen #{rel} at #{freeze_sha[0, 8]}" unless st.success?
       commands = acceptance_criteria_commands(text)
-      raise Error, "no gate commands found in the frozen Acceptance Criteria of #{rel}" if commands.empty?
+      raise Space::Core::Error, "no gate commands found in the frozen Acceptance Criteria of #{rel}" if commands.empty?
 
       lanes = entry["lanes"] || []
       dir =
         if lane
           le = lanes.find { |l| l["name"] == lane }
-          raise Error, "No lane '#{lane}' recorded for iteration '#{iteration}'" unless le
+          raise Space::Core::Error, "No lane '#{lane}' recorded for iteration '#{iteration}'" unless le
           space.path.join(le["worktree"] || "build/#{iteration_id(entry)}-#{lane}/wt")
         else
           repo = lanes.first&.dig("repo")
-          raise Error, "No lane/repo recorded for '#{iteration}' — cannot resolve a directory to run gates in" unless repo
+          raise Space::Core::Error, "No lane/repo recorded for '#{iteration}' — cannot resolve a directory to run gates in" unless repo
           space.path.join("repos", repo)
         end
-      raise Error, "directory does not exist: #{dir}" unless dir.exist?
+      raise Space::Core::Error, "directory does not exist: #{dir}" unless dir.exist?
 
       commands.map do |row|
         out, err, status = Open3.capture3(row[:command], chdir: dir.to_s)
@@ -369,20 +369,20 @@ module SpaceArchitect
 
     def worktree_add(repo, iteration, lane, base: nil, harness: "claude-code", model: nil, variant: false, effort: nil, touch: nil)
       if harness.to_s == "opencode" && (model.nil? || model == Harness::CLAUDE_DEFAULT_MODEL)
-        raise Error,
+        raise Space::Core::Error,
           "Pass --model when using --harness opencode " \
           "(#{Harness::CLAUDE_DEFAULT_MODEL} is a Claude model ID, not valid for opencode — " \
           "try e.g. fireworks-ai/accounts/fireworks/models/glm-5p2)"
       end
       if effort && harness.to_s != "opencode"
-        raise Error,
+        raise Space::Core::Error,
           "effort is opencode-only (sets opencode reasoningEffort) — " \
           "set effort only on opencode lanes (harness: opencode)"
       end
 
       entry = slice_entry(iteration)
       repo_path = space.path.join("repos", repo)
-      raise Error, "repos/#{repo} does not exist" unless repo_path.exist?
+      raise Space::Core::Error, "repos/#{repo} does not exist" unless repo_path.exist?
 
       id = iteration_id(entry)
       wt_path = space.path.join("build", "#{id}-#{lane}", "wt")
@@ -390,7 +390,7 @@ module SpaceArchitect
 
       base_ref = base || "HEAD"
       base_sha, _, wt_status = git_capture("-C", repo_path.to_s, "rev-parse", base_ref)
-      raise Error, "Could not resolve base ref '#{base_ref}' in #{repo}" unless wt_status.success?
+      raise Space::Core::Error, "Could not resolve base ref '#{base_ref}' in #{repo}" unless wt_status.success?
       base_sha = base_sha.strip
 
       branch = "lane/#{id}-#{lane}"
@@ -451,10 +451,10 @@ module SpaceArchitect
     def variant_promote(iteration, winner)
       entry = slice_entry(iteration)
       variant_lanes = (entry["lanes"] || []).select { |l| l["variant"] }
-      raise Error, "Iteration '#{iteration}' has no variant set — nothing to promote" if variant_lanes.empty?
+      raise Space::Core::Error, "Iteration '#{iteration}' has no variant set — nothing to promote" if variant_lanes.empty?
 
       names = variant_lanes.map { |l| l["name"] }
-      raise Error, "Cannot promote '#{winner}' — not a variant lane of iteration '#{iteration}'" unless names.include?(winner)
+      raise Space::Core::Error, "Cannot promote '#{winner}' — not a variant lane of iteration '#{iteration}'" unless names.include?(winner)
       discarded_names = names - [winner]
 
       update_architect_block do |b|
@@ -477,7 +477,7 @@ module SpaceArchitect
     def variant_compare(iteration)
       entry = slice_entry(iteration)
       variant_lanes = (entry["lanes"] || []).select { |l| l["variant"] }
-      raise Error, "Iteration '#{iteration}' has no variant set — nothing to compare" if variant_lanes.empty?
+      raise Space::Core::Error, "Iteration '#{iteration}' has no variant set — nothing to compare" if variant_lanes.empty?
 
       winner = entry["winner"]
       {
@@ -500,7 +500,7 @@ module SpaceArchitect
     def worktree_remove(iteration, lane)
       entry = slice_entry(iteration)
       lane_entry = (entry["lanes"] || []).find { |l| l["name"] == lane }
-      raise Error, "No lane '#{lane}' recorded for iteration '#{iteration}'" unless lane_entry
+      raise Space::Core::Error, "No lane '#{lane}' recorded for iteration '#{iteration}'" unless lane_entry
 
       repo = lane_entry["repo"]
       repo_path = space.path.join("repos", repo)
@@ -536,36 +536,67 @@ module SpaceArchitect
     end
 
     def dispatch(iteration, lane, model: nil, max_turns: 200,
-                 claude_bin: nil, harness: nil, opencode_bin: nil, effort: nil)
+                 claude_bin: nil, harness: nil, opencode_bin: nil, effort: nil, detach: false,
+                 push_url: nil, push_token: nil, push_host: nil, run_creator: nil,
+                 push_client: nil)
+      raise Space::Core::Error, "Specify --push-host or --push-url, not both" if push_host && push_url
+      raise Space::Core::Error, "--push-host requires --push-token"           if push_host && !push_token
+      raise Space::Core::Error, "--detach cannot be combined with --push-url or --push-host" \
+        if detach && (push_url || push_host)
+
       entry = slice_entry(iteration)
       lane_entry = (entry["lanes"] || []).find { |l| l["name"] == lane }
-      raise Error, "No lane '#{lane}' recorded for iteration '#{iteration}'" unless lane_entry
+      raise Space::Core::Error, "No lane '#{lane}' recorded for iteration '#{iteration}'" unless lane_entry
 
       resolved_harness = harness || lane_entry["harness"] || "claude-code"
       resolved_model   = model   || lane_entry["model"]   || Harness::CLAUDE_DEFAULT_MODEL
       resolved_effort  = effort  || lane_entry["effort"]
 
+      raise Space::Core::Error, "--push-host is only supported with the claude-code harness" \
+        if push_host && resolved_harness != "claude-code"
+
       id = iteration_id(entry)
       wt_path = space.path.join(lane_entry["worktree"] || "build/#{id}-#{lane}/wt")
-      raise Error, "Worktree directory does not exist: #{wt_path}" unless wt_path.exist?
+      raise Space::Core::Error, "Worktree directory does not exist: #{wt_path}" unless wt_path.exist?
 
       build_dir    = space.path.join("build", "#{id}-#{lane}")
       prompt_path  = build_dir.join("prompt.md")
       run_log_path = build_dir.join("run.jsonl")
       report_path  = build_dir.join("report.md")
-      raise Error, "prompt.md not found: #{prompt_path}" unless prompt_path.exist?
+      raise Space::Core::Error, "prompt.md not found: #{prompt_path}" unless prompt_path.exist?
 
       bin = resolved_harness == "claude-code" ? claude_bin : opencode_bin
       harness_obj = Harness.for(resolved_harness, model: resolved_model, max_turns: max_turns,
                                                   bin: bin, config_dir: build_dir, effort: resolved_effort)
 
-      exit_code = harness_obj.run(
-        prompt_path:  prompt_path,
-        run_log_path: run_log_path,
-        chdir:        wt_path
-      )
+      if detach
+        pid = harness_obj.run_detached(
+          prompt_path:  prompt_path,
+          run_log_path: run_log_path,
+          chdir:        wt_path
+        )
+        { pid: pid, run_log: run_log_path, report: report_path, worktree: wt_path }
+      else
+        created_run_id = nil
+        if push_host
+          creator        = run_creator || RunCreator.new(push_host, push_token)
+          created_run_id = creator.create
+          push_url       = "#{push_host.chomp('/')}/runs/#{created_run_id}/ingest"
+        end
 
-      { exit_code: exit_code, run_log: run_log_path, report: report_path, worktree: wt_path }
+        run_kwargs = { prompt_path: prompt_path, run_log_path: run_log_path, chdir: wt_path }
+        if resolved_harness == "claude-code"
+          run_kwargs[:push_url]    = push_url    if push_url
+          run_kwargs[:push_token]  = push_token  if push_token
+          run_kwargs[:push_client] = push_client if push_client
+        end
+        exit_code = harness_obj.run(**run_kwargs)
+
+        result = { exit_code: exit_code, run_log: run_log_path, report: report_path, worktree: wt_path }
+        result[:created_run_id] = created_run_id if created_run_id
+        result[:push_url]       = push_url       if push_url
+        result
+      end
     end
 
     private
@@ -579,7 +610,7 @@ module SpaceArchitect
     def slice_entry(iteration)
       block = space.data["architect"] || {}
       entry = (block["iterations"] || []).find { |s| s["name"] == iteration }
-      raise Error, "Iteration '#{iteration}' not recorded in space.yaml — run `architect new #{iteration}` first" unless entry
+      raise Space::Core::Error, "Iteration '#{iteration}' not recorded in space.yaml — run `architect new #{iteration}` first" unless entry
       entry
     end
 
@@ -637,7 +668,7 @@ module SpaceArchitect
     def replace_section_body(text, heading, new_block, append:)
       lines = text.lines
       start = lines.index { |l| l.chomp == heading }
-      raise Error, "section heading '#{heading}' not found in iteration file" unless start
+      raise Space::Core::Error, "section heading '#{heading}' not found in iteration file" unless start
 
       finish = ((start + 1)...lines.length).find { |i| KNOWN_HEADINGS.include?(lines[i].chomp) } || lines.length
       body = lines[(start + 1)...finish].join
@@ -735,7 +766,7 @@ module SpaceArchitect
       out, err, status = Open3.capture3("git", *args)
       return if status.success?
       output = [out, err].map(&:strip).reject(&:empty?).join(" ")
-      raise Error, "git #{args.join(' ')} failed: #{output}"
+      raise Space::Core::Error, "git #{args.join(' ')} failed: #{output}"
     end
 
     def git_capture(*args)