space-architect 1.3.0 → 2.0.0.rc1

data/lib/space_architect/cli/architect.rb

@@ -1,12 +1,9 @@
 # frozen_string_literal: true
 
-module SpaceArchitect
+module Space::Architect
   module CLI
     module Architect
-      class Init < Dry::CLI::Command
-        include GlobalOptions
-        include Helpers
-
+      class Init < BaseCommand
         desc "Scaffold architect mission memory in the current space"
         argument :space, required: false, desc: "Space identifier (default: $PWD)"
 
@@ -23,10 +20,7 @@ module SpaceArchitect
         end
       end
 
-      class New < Dry::CLI::Command
-        include GlobalOptions
-        include Helpers
-
+      class New < BaseCommand
         desc "Scaffold the next iteration file (architecture/I<NN>-<iteration>.md)"
         argument :iteration, required: true,  desc: "Iteration name (kebab-case)"
         argument :space,     required: false, desc: "Space identifier (default: $PWD)"
@@ -44,10 +38,7 @@ module SpaceArchitect
         end
       end
 
-      class Status < Dry::CLI::Command
-        include GlobalOptions
-        include Helpers
-
+      class Status < BaseCommand
         desc "Show architect mission state (read-only)"
         argument :space, required: false, desc: "Space identifier (default: $PWD)"
 
@@ -92,10 +83,7 @@ module SpaceArchitect
         end
       end
 
-      class Freeze < Dry::CLI::Command
-        include GlobalOptions
-        include Helpers
-
+      class Freeze < BaseCommand
         desc "Freeze gates for an iteration"
         argument :iteration, required: true, desc: "Iteration name"
         argument :space,     required: false, desc: "Space identifier (default: $PWD)"
@@ -119,10 +107,7 @@ module SpaceArchitect
         end
       end
 
-      class Verify < Dry::CLI::Command
-        include GlobalOptions
-        include Helpers
-
+      class Verify < BaseCommand
         desc "Post-flight mechanical checks for an iteration (reports only, no judgment)"
         argument :iteration, required: true, desc: "Iteration name"
         argument :space,     required: false, desc: "Space identifier (default: $PWD)"
@@ -168,43 +153,54 @@ module SpaceArchitect
         end
       end
 
-      class Dispatch < Dry::CLI::Command
-        include GlobalOptions
-        include Helpers
-
+      class Dispatch < BaseCommand
         desc "Dispatch a builder for a lane (streams to build/<id>-<lane>/run.jsonl)"
         argument :iteration, required: true,  desc: "Iteration name"
         argument :lane,      required: true,  desc: "Lane name"
         argument :space,     required: false, desc: "Space identifier (default: $PWD)"
-        option   :model,     default: nil,   desc: "Model to use (default: lane entry or claude-sonnet-4-6)"
-        option   :max_turns, default: "200", desc: "Max turns for the builder"
-        option   :harness,   default: nil,   desc: "Harness override (claude-code, opencode)"
-        option   :effort,    default: nil,   desc: "Reasoning effort override (opencode only; sets reasoningEffort in the model config)"
+        option   :model,     default: nil,    desc: "Model to use (default: lane entry or claude-sonnet-4-6)"
+        option   :max_turns, default: "200",  desc: "Max turns for the builder"
+        option   :harness,   default: nil,    desc: "Harness override (claude-code, opencode)"
+        option   :effort,    default: nil,    desc: "Reasoning effort override (opencode only; sets reasoningEffort in the model config)"
+        option   :detach,    type: :boolean, default: false, desc: "Detach the builder process (returns immediately with PID; poll report for completion)"
+        option   :push_url,   default: nil,   desc: "HTTP endpoint for streaming push (POST body to this URL)"
+        option   :push_token, default: nil,   desc: "Bearer token for push endpoint authorization"
+        option   :push_host,  default: nil,   desc: "Base URL of the ingest server; the CLI creates a run via POST <host>/runs and streams to /runs/<id>/ingest (requires --push-token)"
 
         def call(iteration:, lane:, space: nil, model: nil,
-                 max_turns: "200", harness: nil, effort: nil, **opts)
+                 max_turns: "200", harness: nil, effort: nil, detach: false,
+                 push_url: nil, push_token: nil, push_host: nil, **opts)
           setup_terminal(**opts.slice(:color, :colors))
           handle_errors do
             render(store.find(space)) do |sp|
               mission = ArchitectMission.new(space: sp)
-              kwargs = { max_turns: max_turns.to_i }
-              kwargs[:model]   = model   if model
-              kwargs[:harness] = harness if harness
-              kwargs[:effort]  = effort  if effort
+              kwargs = { max_turns: max_turns.to_i, detach: detach }
+              kwargs[:model]      = model      if model
+              kwargs[:harness]    = harness    if harness
+              kwargs[:effort]     = effort     if effort
+              kwargs[:push_url]   = push_url   if push_url
+              kwargs[:push_token] = push_token if push_token
+              kwargs[:push_host]  = push_host  if push_host
               res = mission.dispatch(iteration, lane, **kwargs)
-              terminal.say "Run log: #{terminal.path(res[:run_log])}"
-              terminal.say "Report:  #{terminal.path(res[:report])}"
-              terminal.say "Builder exited with status #{res[:exit_code]}"
-              CLI.record_outcome(Outcome.new(exit_code: res[:exit_code]))
+              if detach
+                terminal.say "PID:     #{res[:pid]}"
+                terminal.say "Run log: #{terminal.path(res[:run_log])}"
+                terminal.say "Report:  #{terminal.path(res[:report])}"
+                terminal.say "Dispatched detached — poll #{terminal.path(res[:report])} for completion"
+                CLI.record_outcome(Outcome.new(exit_code: 0))
+              else
+                terminal.say "Run log: #{terminal.path(res[:run_log])}"
+                terminal.say "Report:  #{terminal.path(res[:report])}"
+                terminal.say "Ingest URL:  #{res[:push_url]}" if res[:push_url]
+                terminal.say "Builder exited with status #{res[:exit_code]}"
+                CLI.record_outcome(Outcome.new(exit_code: res[:exit_code]))
+              end
             end
           end
         end
       end
 
-      class Section < Dry::CLI::Command
-        include GlobalOptions
-        include Helpers
-
+      class Section < BaseCommand
         desc "Write a section of the iteration file and commit it (one call)"
         argument :iteration, required: true,  desc: "Iteration name"
         argument :section,   required: true,  desc: "Section: grounds, specification, prompt, verdict"
@@ -239,14 +235,11 @@ module SpaceArchitect
           return File.read(from) if from
           return body if body
           return $stdin.read if stdin
-          raise SpaceArchitect::Error, "provide the section body via --from <file>, --body <text>, or --stdin"
+          raise Space::Core::Error, "provide the section body via --from <file>, --body <text>, or --stdin"
         end
       end
 
-      class Evidence < Dry::CLI::Command
-        include GlobalOptions
-        include Helpers
-
+      class Evidence < BaseCommand
         desc "Transcribe a lane's scratch report VERBATIM into Builder Report and commit"
         argument :iteration, required: true,  desc: "Iteration name"
         argument :space,     required: false, desc: "Space identifier (default: $PWD)"
@@ -267,10 +260,7 @@ module SpaceArchitect
         end
       end
 
-      class Merge < Dry::CLI::Command
-        include GlobalOptions
-        include Helpers
-
+      class Merge < BaseCommand
         desc "Integrate ONE judged-passing lane (merges --no-ff; runs no gates, makes no verdict)"
         argument :iteration, required: true,  desc: "Iteration name"
         argument :lane,      required: true,  desc: "Lane name (architect-judged passing)"
@@ -292,10 +282,7 @@ module SpaceArchitect
         end
       end
 
-      class Integrate < Dry::CLI::Command
-        include GlobalOptions
-        include Helpers
-
+      class Integrate < BaseCommand
         desc "Integrate the architect-supplied set of passing lanes, in order (stops on conflict)"
         argument :iteration, required: true,  desc: "Iteration name"
         argument :space,     required: false, desc: "Space identifier (default: $PWD)"
@@ -319,10 +306,7 @@ module SpaceArchitect
         end
       end
 
-      class Gate < Dry::CLI::Command
-        include GlobalOptions
-        include Helpers
-
+      class Gate < BaseCommand
         desc "Run the frozen Acceptance Criteria gate commands and stream raw output (no PASS/FAIL)"
         argument :iteration, required: true,  desc: "Iteration name"
         argument :lane,      required: false, desc: "Run in a lane worktree (default: the integration repo)"
@@ -348,10 +332,7 @@ module SpaceArchitect
         end
       end
 
-      class InstallSkills < Dry::CLI::Command
-        include GlobalOptions
-        include Helpers
-
+      class InstallSkills < BaseCommand
         desc "Install bundled skills (architect, architect-research, architect-vocabulary) for a harness"
         option :provider, default: "claude", desc: "Harness: claude, codex, opencode, pi"
         option :project, type: :boolean, default: false, desc: "Install to CWD instead of global"
@@ -373,34 +354,8 @@ module SpaceArchitect
         end
       end
 
-      module Brief
-        class New < Dry::CLI::Command
-          include GlobalOptions
-          include Helpers
-
-          desc "Scaffold the durable mission brief (architecture/BRIEF.md)"
-          argument :space, required: false, desc: "Space identifier (default: $PWD)"
-          option   :force, type: :boolean, default: false, desc: "Overwrite an existing BRIEF.md"
-
-          def call(space: nil, force: false, **opts)
-            setup_terminal(**opts.slice(:color, :colors))
-            handle_errors do
-              render(store.find(space)) do |sp|
-                mission = ArchitectMission.new(space: sp)
-                path = mission.brief_new!(force: force)
-                terminal.say "Brief ready: #{terminal.path(path)}"
-                CLI.record_outcome(Outcome.new(exit_code: 0))
-              end
-            end
-          end
-        end
-      end
-
       module Worktree
-        class Add < Dry::CLI::Command
-          include GlobalOptions
-          include Helpers
-
+        class Add < BaseCommand
           desc "Create a worktree for a lane"
           argument :repo,      required: true, desc: "Repo name (under repos/)"
           argument :iteration, required: true, desc: "Iteration name"
@@ -427,10 +382,7 @@ module SpaceArchitect
           end
         end
 
-        class Remove < Dry::CLI::Command
-          include GlobalOptions
-          include Helpers
-
+        class Remove < BaseCommand
           desc "Remove a lane worktree"
           argument :iteration, required: true, desc: "Iteration name"
           argument :lane,      required: true, desc: "Lane name"
@@ -448,10 +400,7 @@ module SpaceArchitect
           end
         end
 
-        class List < Dry::CLI::Command
-          include GlobalOptions
-          include Helpers
-
+        class List < BaseCommand
           desc "List active architect worktrees"
 
           def call(**opts)
@@ -473,10 +422,7 @@ module SpaceArchitect
       end
 
       module Variant
-        class Add < Dry::CLI::Command
-          include GlobalOptions
-          include Helpers
-
+        class Add < BaseCommand
           desc "Create a variant set (competing lanes over one frozen spec)"
           argument :repo,      required: true,  desc: "Repo name (under repos/)"
           argument :iteration, required: true,  desc: "Iteration name"
@@ -506,10 +452,7 @@ module SpaceArchitect
           end
         end
 
-        class Promote < Dry::CLI::Command
-          include GlobalOptions
-          include Helpers
-
+        class Promote < BaseCommand
           desc "Promote one variant of a variant set as the winner"
           argument :iteration, required: true,  desc: "Iteration name"
           argument :winner,    required: true,  desc: "Variant lane name to promote (e.g. v02)"
@@ -532,10 +475,7 @@ module SpaceArchitect
           end
         end
 
-        class Compare < Dry::CLI::Command
-          include GlobalOptions
-          include Helpers
-
+        class Compare < BaseCommand
           desc "Compare variants of an iteration's variant set (read-only)"
           argument :iteration, required: true,  desc: "Iteration name"
           argument :space,     required: false, desc: "Space identifier (default: $PWD)"
@@ -569,32 +509,52 @@ module SpaceArchitect
           end
         end
       end
+
+      module Brief
+        class New < BaseCommand
+          desc "Scaffold the durable mission brief (architecture/BRIEF.md)"
+          argument :space, required: false, desc: "Space identifier (default: $PWD)"
+          option   :force, type: :boolean, default: false, desc: "Overwrite an existing BRIEF.md"
+
+          def call(space: nil, force: false, **opts)
+            setup_terminal(**opts.slice(:color, :colors))
+            handle_errors do
+              render(store.find(space)) do |sp|
+                mission = ArchitectMission.new(space: sp)
+                path = mission.brief_new!(force: force)
+                terminal.say "Brief ready: #{terminal.path(path)}"
+                CLI.record_outcome(Outcome.new(exit_code: 0))
+              end
+            end
+          end
+        end
+      end
     end
   end
 end
 
-SpaceArchitect::CLI::Registry.register "init",   SpaceArchitect::CLI::Architect::Init
-SpaceArchitect::CLI::Registry.register "new",    SpaceArchitect::CLI::Architect::New
-SpaceArchitect::CLI::Registry.register "status", SpaceArchitect::CLI::Architect::Status
-SpaceArchitect::CLI::Registry.register "freeze", SpaceArchitect::CLI::Architect::Freeze
-SpaceArchitect::CLI::Registry.register "verify", SpaceArchitect::CLI::Architect::Verify
-SpaceArchitect::CLI::Registry.register "dispatch", SpaceArchitect::CLI::Architect::Dispatch
-SpaceArchitect::CLI::Registry.register "section",   SpaceArchitect::CLI::Architect::Section
-SpaceArchitect::CLI::Registry.register "evidence",  SpaceArchitect::CLI::Architect::Evidence
-SpaceArchitect::CLI::Registry.register "merge",     SpaceArchitect::CLI::Architect::Merge
-SpaceArchitect::CLI::Registry.register "integrate", SpaceArchitect::CLI::Architect::Integrate
-SpaceArchitect::CLI::Registry.register "gate",      SpaceArchitect::CLI::Architect::Gate
-SpaceArchitect::CLI::Registry.register "install-skills", SpaceArchitect::CLI::Architect::InstallSkills
-SpaceArchitect::CLI::Registry.register "brief" do |b|
-  b.register "new", SpaceArchitect::CLI::Architect::Brief::New
+Space::Architect::CLI::Registry.register "init",   Space::Architect::CLI::Architect::Init
+Space::Architect::CLI::Registry.register "new",    Space::Architect::CLI::Architect::New
+Space::Architect::CLI::Registry.register "status", Space::Architect::CLI::Architect::Status
+Space::Architect::CLI::Registry.register "freeze", Space::Architect::CLI::Architect::Freeze
+Space::Architect::CLI::Registry.register "verify", Space::Architect::CLI::Architect::Verify
+Space::Architect::CLI::Registry.register "dispatch", Space::Architect::CLI::Architect::Dispatch
+Space::Architect::CLI::Registry.register "section",   Space::Architect::CLI::Architect::Section
+Space::Architect::CLI::Registry.register "evidence",  Space::Architect::CLI::Architect::Evidence
+Space::Architect::CLI::Registry.register "merge",     Space::Architect::CLI::Architect::Merge
+Space::Architect::CLI::Registry.register "integrate", Space::Architect::CLI::Architect::Integrate
+Space::Architect::CLI::Registry.register "gate",      Space::Architect::CLI::Architect::Gate
+Space::Architect::CLI::Registry.register "install-skills", Space::Architect::CLI::Architect::InstallSkills
+Space::Architect::CLI::Registry.register "brief" do |b|
+  b.register "new", Space::Architect::CLI::Architect::Brief::New
 end
-SpaceArchitect::CLI::Registry.register "worktree" do |wt|
-  wt.register "add",    SpaceArchitect::CLI::Architect::Worktree::Add
-  wt.register "remove", SpaceArchitect::CLI::Architect::Worktree::Remove
-  wt.register "list",   SpaceArchitect::CLI::Architect::Worktree::List
+Space::Architect::CLI::Registry.register "worktree" do |wt|
+  wt.register "add",    Space::Architect::CLI::Architect::Worktree::Add
+  wt.register "remove", Space::Architect::CLI::Architect::Worktree::Remove
+  wt.register "list",   Space::Architect::CLI::Architect::Worktree::List
 end
-SpaceArchitect::CLI::Registry.register "variant" do |v|
-  v.register "add",     SpaceArchitect::CLI::Architect::Variant::Add
-  v.register "promote", SpaceArchitect::CLI::Architect::Variant::Promote
-  v.register "compare", SpaceArchitect::CLI::Architect::Variant::Compare
+Space::Architect::CLI::Registry.register "variant" do |v|
+  v.register "add",     Space::Architect::CLI::Architect::Variant::Add
+  v.register "promote", Space::Architect::CLI::Architect::Variant::Promote
+  v.register "compare", Space::Architect::CLI::Architect::Variant::Compare
 end

data/lib/space_architect/cli/research.rb

@@ -0,0 +1,94 @@
+# frozen_string_literal: true
+
+module Space::Architect
+  module CLI
+    module Architect
+      module Research
+        class Dispatch < BaseCommand
+          desc "Dispatch detached read-only research lanes (one per prompt file)"
+          argument :prompts, required: true,
+                             desc: "Prompt file(s) to dispatch (space-separated paths)"
+          option :model,     default: nil, desc: "Model override (default: claude-sonnet-4-6)"
+          option :max_turns, default: "40", desc: "Max turns per researcher"
+
+          def call(prompts:, model: nil, max_turns: "40", **opts)
+            setup_terminal(**opts.slice(:color, :colors))
+            handle_errors do
+              render(store.find(opts[:space])) do |sp|
+                paths = Array(prompts)
+                supervisor = Space::Architect::Research::Supervisor.new(space: sp)
+                kwargs = { max_turns: max_turns.to_i }
+                kwargs[:model] = model if model
+                runs = supervisor.dispatch(paths, **kwargs)
+                runs.each do |run|
+                  terminal.say "dispatched #{run.id} (pid #{run.pid}) → #{terminal.path(run.run_log_path)}"
+                end
+                CLI.record_outcome(Outcome.new(exit_code: 0))
+              end
+            end
+          end
+        end
+
+        class Status < BaseCommand
+          desc "Show status of dispatched research runs"
+          argument :space, required: false, desc: "Space identifier (default: $PWD)"
+
+          def call(space: nil, **opts)
+            setup_terminal(**opts.slice(:color, :colors))
+            handle_errors do
+              render(store.find(space)) do |sp|
+                supervisor = Space::Architect::Research::Supervisor.new(space: sp)
+                entries = supervisor.status
+                if entries.empty?
+                  terminal.say "No research runs registered"
+                else
+                  rows = entries.map do |e|
+                    run = e[:run]
+                    [run.id, run.pid.to_s, e[:state].to_s, run.model, e[:tail].last.to_s.slice(0, 60)]
+                  end
+                  terminal.say terminal.table(%w[ID PID State Model LastLine], rows)
+                end
+                CLI.record_outcome(Outcome.new(exit_code: 0))
+              end
+            end
+          end
+        end
+
+        class Wait < BaseCommand
+          desc "Wait for all dispatched research runs to complete"
+          argument :space,    required: false, desc: "Space identifier (default: $PWD)"
+          option   :quiet,    type: :boolean, default: false,
+                              desc: "L0: suppress all output; exit status only"
+          option   :level,    type: :integer, default: 1,
+                              desc: "Verbosity level: 1=lifecycle 2=+text 3=+tools 4=+io"
+          option   :thinking, type: :boolean, default: false,
+                              desc: "Show assistant thinking blocks"
+          option   :jsonl,    type: :boolean, default: false,
+                              desc: "Emit raw lane-tagged JSONL (mutually exclusive with level/quiet)"
+
+          def call(space: nil, quiet: false, level: 1, thinking: false, jsonl: false, **opts)
+            setup_terminal(**opts.slice(:color, :colors))
+            handle_errors do
+              render(store.find(space)) do |sp|
+                supervisor = Space::Architect::Research::Supervisor.new(space: sp)
+                result = supervisor.wait(
+                  quiet:   quiet,
+                  level:   level.to_i,
+                  thinking: thinking,
+                  jsonl:   jsonl
+                )
+                CLI.record_outcome(Outcome.new(exit_code: result == :ok ? 0 : 1))
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end
+
+Space::Architect::CLI::Registry.register "research" do |r|
+  r.register "dispatch", Space::Architect::CLI::Architect::Research::Dispatch
+  r.register "status",   Space::Architect::CLI::Architect::Research::Status
+  r.register "wait",     Space::Architect::CLI::Architect::Research::Wait
+end

data/lib/space_architect/cli/space.rb

@@ -1,35 +1,29 @@
 # frozen_string_literal: true
 
-SpaceArchitect::CLI::Registry.register "space" do |prefix|
-  prefix.register "init",    SpaceArchitect::CLI::Init
-  prefix.register "new",     SpaceArchitect::CLI::New
-  prefix.register "list",    SpaceArchitect::CLI::List
-  prefix.register "ls",      SpaceArchitect::CLI::List
-  prefix.register "show",    SpaceArchitect::CLI::Show
-  prefix.register "path",    SpaceArchitect::CLI::Path
-  prefix.register "use",     SpaceArchitect::CLI::Use
-  prefix.register "current", SpaceArchitect::CLI::Current
-  prefix.register "status",  SpaceArchitect::CLI::Status
-  prefix.register "config" do |c|
-    c.register "show", SpaceArchitect::CLI::Config::Show
-    c.register "path", SpaceArchitect::CLI::Config::ConfigPath
-    c.register "set",  SpaceArchitect::CLI::Config::Set
-  end
-  prefix.register "repo" do |r|
-    r.register "add",     SpaceArchitect::CLI::Repo::Add
-    r.register "list",    SpaceArchitect::CLI::Repo::RepoList
-    r.register "ls",      SpaceArchitect::CLI::Repo::RepoList
-    r.register "resolve", SpaceArchitect::CLI::Repo::Resolve
-  end
-  prefix.register "repos" do |r|
-    r.register "add",     SpaceArchitect::CLI::Repo::Add
-    r.register "list",    SpaceArchitect::CLI::Repo::RepoList
-    r.register "ls",      SpaceArchitect::CLI::Repo::RepoList
-    r.register "resolve", SpaceArchitect::CLI::Repo::Resolve
-  end
-  prefix.register "shell" do |s|
-    s.register "init",     SpaceArchitect::CLI::Shell::ShellInit
-    s.register "fish",     SpaceArchitect::CLI::Shell::Fish
-    s.register "complete", SpaceArchitect::CLI::Shell::Complete
+require "space_core/cli"
+
+module Space::Architect
+  module CLI
+    # Exit-code bridge to the Space::Core CLI engine.
+    # `architect space <args>` (and `exe/space <args>` via Space::Core::CLI directly)
+    # hands the raw remainder to Space::Core's own dry-cli registry and translates
+    # Space::Core's recorded Outcome into the host exit code.
+    # Space::Core has its own Registry, Outcome, and :space_core_cli_outcome thread-local;
+    # this is the seam between the two registries (NOT a re-registration).
+    def self.dispatch_space(rest, out = $stdout, err = $stderr)
+      if ::Space::Core::CLI::TOP_LEVEL_HELP.include?(rest)
+        out.puts Dry::CLI::Usage.call(::Space::Core::CLI::Registry.get([]))
+        return 0
+      end
+
+      if ::Space::Core::CLI::VERSION_REQUEST.include?(rest)
+        out.puts ::Space::Core::VERSION
+        return 0
+      end
+
+      Thread.current[:space_core_cli_outcome] = nil
+      Dry::CLI.new(::Space::Core::CLI::Registry).call(arguments: rest, out: out, err: err)
+      ::Space::Core::CLI.last_outcome&.exit_code || 0
+    end
   end
 end

data/lib/space_architect/cli/src.rb

@@ -1,32 +1,38 @@
 # frozen_string_literal: true
 
-require "space_architect/pristine/cli"
+require "space_src/cli"
 
-module SpaceArchitect
+module Space::Architect
   module CLI
-    # Exit-code bridge to the vendored Pristine (repo-tender) CLI engine.
-    # `architect src <args>` hands the raw remainder to Pristine's own dry-cli
-    # registry and translates Pristine's recorded Outcome into the host exit code.
-    # Pristine has its own Registry, Outcome, and :repo_tender_cli_* thread-locals;
-    # this is the seam between the two registries (NOT a re-registration). Pristine's
+    # Exit-code bridge to the Space::Src CLI engine.
+    # `architect src <args>` hands the raw remainder to Space::Src's own dry-cli
+    # registry and translates Space::Src's recorded Outcome into the host exit code.
+    # Space::Src has its own Registry, Outcome, and :space_src_cli_* thread-locals;
+    # this is the seam between the two registries (NOT a re-registration). Space::Src's
     # top-level help/version interceptors call Kernel.exit, so we reproduce that
     # interception here against the injected IO instead of delegating to them.
     # dry-cli's internal exit on a bare group / unknown command propagates as
     # SystemExit — same as the host's own bare groups (e.g. `space repo`) — and is
     # intentionally NOT rescued (accepted behavior change).
     def self.dispatch_src(rest, out = $stdout, err = $stderr)
-      if Pristine::CLI::TOP_LEVEL_HELP.include?(rest)
-        out.puts Dry::CLI::Usage.call(Pristine::CLI::Registry.get([]))
+      if ::Space::Src::CLI::TOP_LEVEL_HELP.include?(rest)
+        out.puts Dry::CLI::Usage.call(::Space::Src::CLI::Registry.get([]))
         return 0
       end
-      if Pristine::CLI::VERSION_REQUEST.include?(rest)
-        out.puts SpaceArchitect::Pristine::VERSION
+      if ::Space::Src::CLI::VERSION_REQUEST.include?(rest)
+        out.puts ::Space::Src::VERSION
         return 0
       end
 
-      Thread.current[:repo_tender_cli_outcome] = nil
-      Dry::CLI.new(Pristine::CLI::Registry).call(arguments: rest, out: out, err: err)
-      Pristine::CLI.last_outcome&.exit_code || 0
+      if ::Space::Src::CLI.bare_query?(rest)
+        paths = ::Space::Src::CLI.make_paths
+        config = ::Space::Src::Config::Store.load(paths.config_file).success
+        return ::Space::Src::Nav.dispatch(rest[0], out, err, config.base_dir)
+      end
+
+      Thread.current[:space_src_cli_outcome] = nil
+      Dry::CLI.new(::Space::Src::CLI::Registry).call(arguments: rest, out: out, err: err)
+      ::Space::Src::CLI.last_outcome&.exit_code || 0
     end
   end
 end

data/lib/space_architect/cli.rb

@@ -1,15 +1,20 @@
 # frozen_string_literal: true
 
 require "dry/cli"
+require "pastel"
+require "space_core/cli"
 
-module SpaceArchitect
+module Space::Architect
   module CLI
-    Outcome = Data.define(:exit_code, :message) do
-      def initialize(exit_code:, message: nil) = super
-    end
+    # Delegate the outcome seam to Space::Core::CLI so both architect commands
+    # (which call CLI.record_outcome lexically) and the moved Helpers (which call
+    # CLI.record_outcome with Space::Core::CLI as lexical root) share one slot.
+    Outcome     = Space::Core::CLI::Outcome
+    Helpers     = Space::Core::CLI::Helpers
+    BaseCommand = Space::Core::CLI::BaseCommand
 
-    def self.record_outcome(o) = (Thread.current[:space_architect_outcome] = o)
-    def self.last_outcome = Thread.current[:space_architect_outcome]
+    def self.record_outcome(o) = Space::Core::CLI.record_outcome(o)
+    def self.last_outcome      = Space::Core::CLI.last_outcome
 
     module Registry
       extend Dry::CLI::Registry
@@ -19,7 +24,8 @@ module SpaceArchitect
     VERSION_REQUEST   = [["version"], ["--version"]].freeze
 
     def self.call(argv, out = $stdout, err = $stderr)
-      Thread.current[:space_architect_outcome] = nil
+      Thread.current[:space_core_cli_outcome] = nil
+      Space::Core::CLI.help_pastel = Pastel.new(enabled: Space::Core::CLI.help_colors?(argv, out, err))
 
       if TOP_LEVEL_HELP.include?(argv)
         out.puts Dry::CLI::Usage.call(Registry.get([]))
@@ -27,7 +33,7 @@ module SpaceArchitect
       end
 
       if VERSION_REQUEST.include?(argv)
-        out.puts SpaceArchitect::VERSION
+        out.puts Space::Core::VERSION
         return 0
       end
 
@@ -35,7 +41,13 @@ module SpaceArchitect
         return dispatch_src(argv[1..], out, err)
       end
 
-      Dry::CLI.new(Registry).call(arguments: normalize_args(argv), out: out, err: err)
+      normalized = normalize_args(argv)
+
+      if normalized.first == "space"
+        return dispatch_space(normalized[1..], out, err)
+      end
+
+      Dry::CLI.new(Registry).call(arguments: normalized, out: out, err: err)
       last_outcome&.exit_code || 0
     end
 
@@ -84,19 +96,7 @@ module SpaceArchitect
   end
 end
 
-require_relative "cli/options"
-require_relative "cli/helpers"
-require_relative "cli/init"
-require_relative "cli/new"
-require_relative "cli/list"
-require_relative "cli/show"
-require_relative "cli/path"
-require_relative "cli/use"
-require_relative "cli/current"
-require_relative "cli/status"
-require_relative "cli/config"
-require_relative "cli/repo"
-require_relative "cli/shell"
 require_relative "cli/architect"
 require_relative "cli/space"
 require_relative "cli/src"
+require_relative "cli/research"