textus 0.35.1 → 0.39.0

data/lib/textus/mcp/tools.rb

@@ -1,129 +1,14 @@
 module Textus
   module MCP
-    # Dispatch table for MCP tool names → implementations. Each implementation
-    # receives (session:, store:, args:) and returns a JSON-encodable value.
-    # Tool errors are wrapped in ToolError; ContractDrift / CursorExpired
-    # propagate verbatim so the server can map them to JSON-RPC codes.
+    # Thin delegator kept for name stability (ADR 0039). The dispatch table
+    # and JSON schemas are now DERIVED from per-verb contracts by MCP::Catalog;
+    # this module only forwards.
     module Tools
       module_function
 
       def call(name, session:, store:, args:)
-        impl = REGISTRY[name] or raise ToolError.new("unknown tool: #{name}")
-        impl.call(session, store, args || {})
-      rescue ContractDrift, CursorExpired
-        raise
-      rescue Textus::Error => e
-        raise ToolError.new("#{name}: #{e.message}")
+        Catalog.call(name, session: session, store: store, args: args || {})
       end
-
-      def ops_for(session, store)
-        store.as(session.role)
-      end
-
-      REGISTRY = {
-        "boot" => ->(_s, store, _a) { store.boot },
-
-        "find" => lambda do |s, store, args|
-          ops_for(s, store).list(zone: args["zone"], prefix: args["prefix"])
-        end,
-
-        "read" => lambda do |s, store, args|
-          key = args.fetch("key") { raise ToolError.new("read: missing key") }
-          env = ops_for(s, store).get(key)
-          env.to_h_for_wire
-        end,
-
-        "tick" => lambda do |s, store, args|
-          since = (args["since"] || s.cursor).to_i
-          ops_for(s, store).pulse(since: since)
-        end,
-
-        "write" => lambda do |s, store, args|
-          key = args.fetch("key") { raise ToolError.new("write: missing key") }
-          env = ops_for(s, store).put(
-            key,
-            meta: args["meta"] || {},
-            body: args["body"],
-            content: args["content"],
-            if_etag: args["if_etag"],
-          )
-          { "uid" => env.uid, "etag" => env.etag }
-        end,
-
-        "propose" => lambda do |s, store, args|
-          raise ToolError.new("propose: session has no propose_zone") unless s.propose_zone
-
-          rel = args.fetch("key") { raise ToolError.new("propose: missing key") }
-          target = "#{s.propose_zone}.#{rel}"
-          env = ops_for(s, store).put(
-            target,
-            meta: args["meta"] || {},
-            body: args["body"],
-            content: args["content"],
-          )
-          { "uid" => env.uid, "etag" => env.etag, "key" => target }
-        end,
-
-        "fetch" => lambda do |s, store, args|
-          key = args.fetch("key") { raise ToolError.new("fetch: missing key") }
-          outcome = ops_for(s, store).fetch(key)
-          { "outcome" => outcome.class.name.split("::").last.downcase }
-        end,
-
-        "fetch_stale" => lambda do |s, store, args|
-          ops_for(s, store).fetch_all(zone: args["zone"], prefix: args["prefix"])
-        end,
-
-        "schema" => lambda do |_s, store, args|
-          family = args.fetch("family") { raise ToolError.new("schema: missing family") }
-          store.schemas.fetch(family)
-        end,
-
-        "rules" => lambda do |_s, store, args|
-          key = args.fetch("key") { raise ToolError.new("rules: missing key") }
-          set = store.manifest.rules.for(key)
-          {
-            "fetch" => set.fetch&.to_h,
-            "guard" => set.guard,
-          }.compact
-        end,
-
-        "key_mv_prefix" => lambda do |s, store, args|
-          ops_for(s, store).key_mv_prefix(
-            from_prefix: args.fetch("from_prefix") { raise ToolError.new("key_mv_prefix: missing from_prefix") },
-            to_prefix: args.fetch("to_prefix") { raise ToolError.new("key_mv_prefix: missing to_prefix") },
-            dry_run: args["dry_run"] || false,
-          ).to_h
-        end,
-
-        "key_delete_prefix" => lambda do |s, store, args|
-          ops_for(s, store).key_delete_prefix(
-            prefix: args.fetch("prefix") { raise ToolError.new("key_delete_prefix: missing prefix") },
-            dry_run: args["dry_run"] || false,
-          ).to_h
-        end,
-
-        "zone_mv" => lambda do |s, store, args|
-          ops_for(s, store).zone_mv(
-            from: args.fetch("from") { raise ToolError.new("zone_mv: missing from") },
-            to: args.fetch("to") { raise ToolError.new("zone_mv: missing to") },
-            dry_run: args["dry_run"] || false,
-          ).to_h
-        end,
-
-        "rule_lint" => lambda do |s, store, args|
-          ops_for(s, store).rule_lint(
-            candidate_yaml: args.fetch("candidate_yaml") { raise ToolError.new("rule_lint: missing candidate_yaml") },
-          ).to_h
-        end,
-
-        "migrate" => lambda do |s, store, args|
-          ops_for(s, store).migrate(
-            plan_yaml: args.fetch("plan_yaml") { raise ToolError.new("migrate: missing plan_yaml") },
-            dry_run: args["dry_run"] || false,
-          ).to_h
-        end,
-      }.freeze
     end
   end
 end

data/lib/textus/ports/audit_log.rb

@@ -10,7 +10,7 @@ module Textus
 
       def initialize(root, max_size: DEFAULT_MAX_SIZE, keep: DEFAULT_KEEP)
         @root     = root
-        @path     = File.join(root, "audit.log")
+        @path     = Textus::Layout.audit_log(root)
         @max_size = max_size
         @keep     = keep
       end
@@ -54,6 +54,7 @@ module Textus
       end
 
       def append(role:, verb:, key:, etag_before:, etag_after:, extras: nil)
+        FileUtils.mkdir_p(File.dirname(@path))
         File.open(@path, File::WRONLY | File::APPEND | File::CREAT, 0o644) do |f|
           f.flock(File::LOCK_EX)
           next_seq = current_max_seq_unlocked + 1
@@ -81,6 +82,14 @@ module Textus
 
       private
 
+      def rotated(n)
+        File.join(Textus::Layout.audit_dir(@root), "audit.log.#{n}")
+      end
+
+      def rotated_meta(n)
+        File.join(Textus::Layout.audit_dir(@root), "audit.log.#{n}.meta.json")
+      end
+
       # Caller holds the flock. Returns the highest seq across the active log,
       # OR the most-recent rotated file's max_seq if the active log is empty.
       def current_max_seq_unlocked
@@ -113,7 +122,7 @@ module Textus
       end
 
       def read_meta(n)
-        path = File.join(@root, "audit.log.#{n}.meta.json")
+        path = rotated_meta(n)
         return nil unless File.exist?(path)
 
         JSON.parse(File.read(path))
@@ -151,25 +160,18 @@ module Textus
         meta = { "min_seq" => min_seq, "max_seq" => max_seq, "rotated_at" => Time.now.utc.iso8601 }
 
         # Drop the file that would be shifted past @keep.
-        oldest      = File.join(@root, "audit.log.#{@keep}")
-        oldest_meta = File.join(@root, "audit.log.#{@keep}.meta.json")
-        FileUtils.rm_f(oldest)
-        FileUtils.rm_f(oldest_meta)
+        FileUtils.rm_f(rotated(@keep))
+        FileUtils.rm_f(rotated_meta(@keep))
 
         # Shift .N → .(N+1) for N = keep-1 down to 1.
         (@keep - 1).downto(1) do |n|
-          src      = File.join(@root, "audit.log.#{n}")
-          dst      = File.join(@root, "audit.log.#{n + 1}")
-          File.rename(src, dst) if File.exist?(src)
-
-          src_meta = File.join(@root, "audit.log.#{n}.meta.json")
-          dst_meta = File.join(@root, "audit.log.#{n + 1}.meta.json")
-          File.rename(src_meta, dst_meta) if File.exist?(src_meta)
+          File.rename(rotated(n), rotated(n + 1)) if File.exist?(rotated(n))
+          File.rename(rotated_meta(n), rotated_meta(n + 1)) if File.exist?(rotated_meta(n))
         end
 
         # Active log → .1
-        File.rename(@path, File.join(@root, "audit.log.1"))
-        File.write(File.join(@root, "audit.log.1.meta.json"), JSON.generate(meta) + "\n")
+        File.rename(@path, rotated(1))
+        File.write(rotated_meta(1), JSON.generate(meta) + "\n")
         # Next append will create a fresh audit.log via File::CREAT.
       end
 

data/lib/textus/ports/build_lock.rb

@@ -5,7 +5,6 @@ require "time"
 module Textus
   module Ports
     class BuildLock
-      LOCK_FILENAME = ".build.lock"
       MAX_HOLDER_BYTES = 512
 
       def self.with(root:, &)
@@ -13,7 +12,7 @@ module Textus
       end
 
       def initialize(root:)
-        @path = File.join(root, LOCK_FILENAME)
+        @path = Textus::Layout.build_lock(root)
         @file = nil
       end
 

data/lib/textus/ports/fetch/lock.rb

@@ -7,7 +7,7 @@ module Textus
         def initialize(root:, key:)
           @root = root
           @key  = key
-          @path = File.join(root, ".locks", "#{safe_key}.lock")
+          @path = File.join(Textus::Layout.locks(root), "#{safe_key}.lock")
           @file = nil
         end
 

data/lib/textus/read/audit.rb

@@ -3,7 +3,7 @@ require "time"
 
 module Textus
   module Read
-    # Queries .textus/audit.log. Filters: key, zone, role, verb, since,
+    # Queries .textus/.run/audit/audit.log. Filters: key, zone, role, verb, since,
     # correlation_id, limit. Reads the log file as JSON-Lines (legacy TSV
     # rows produce nil and are skipped).
     class Audit
@@ -33,7 +33,7 @@ module Textus
       def initialize(container:, call: nil) # rubocop:disable Lint/UnusedMethodArgument
         @manifest  = container.manifest
         @root      = container.root
-        @log_path  = File.join(container.root, "audit.log")
+        @log_path  = Textus::Layout.audit_log(container.root)
         @audit_log = container.audit_log
       end
 
@@ -84,7 +84,7 @@ module Textus
       end
 
       def all_log_files
-        rotated = Dir.glob(File.join(@root, "audit.log.*"))
+        rotated = Dir.glob(File.join(Textus::Layout.audit_dir(@root), "audit.log.*"))
                      .reject { |p| p.end_with?(".meta.json") }
                      .sort_by { |p| -p.scan(/\d+$/).first.to_i } # .5 .4 .3 .2 .1 → oldest first
         active = File.exist?(@log_path) ? [@log_path] : []

data/lib/textus/read/boot.rb

@@ -5,6 +5,12 @@ module Textus
     # (container:, call:) entry point that Dispatcher::VERBS resolves to.
     # Boot is role-independent, so `call` is not consulted.
     class Boot
+      extend Textus::Contract::DSL
+
+      verb     :boot
+      summary  "Return the orientation contract: zones, entries, schemas, write_flows, agent_quickstart."
+      surfaces :cli, :ruby, :mcp
+
       def initialize(container:, call:)
         @container = container
         @call      = call

data/lib/textus/read/get.rb

@@ -6,6 +6,14 @@ module Textus
     # For interactive reads that want fetch-on-stale, use
     # `Read::GetOrFetch`, which composes this with the orchestrator.
     class Get
+      extend Textus::Contract::DSL
+
+      verb     :get
+      summary  "Read one entry. Returns the envelope (uid, etag, _meta, body, freshness)."
+      surfaces :cli, :ruby, :mcp
+      arg :key, String, required: true, positional: true
+      response(&:to_h_for_wire)
+
       def initialize(container:, call:, evaluator: Textus::Domain::Freshness::Evaluator)
         @container  = container
         @call       = call

data/lib/textus/read/list.rb

@@ -1,6 +1,14 @@
 module Textus
   module Read
     class List
+      extend Textus::Contract::DSL
+
+      verb     :list
+      summary  "List keys filtered by zone and/or prefix."
+      surfaces :cli, :ruby, :mcp
+      arg :prefix, String
+      arg :zone,   String
+
       def initialize(container:, call: nil) # rubocop:disable Lint/UnusedMethodArgument
         @manifest = container.manifest
       end

data/lib/textus/read/pulse.rb

@@ -7,6 +7,13 @@ module Textus
     # APIs; pulse is sugar with a stable envelope shape and a monotonic
     # cursor (seq).
     class Pulse
+      extend Textus::Contract::DSL
+
+      verb     :pulse
+      summary  "Delta since cursor — changed entries, stale, pending proposals, doctor summary."
+      surfaces :cli, :ruby, :mcp
+      arg :since, Integer, session_default: :cursor, description: "audit seq to diff from; defaults to the session cursor"
+
       def initialize(container:, call:)
         @container  = container
         @call       = call

data/lib/textus/read/rules.rb

@@ -0,0 +1,24 @@
+module Textus
+  module Read
+    # Effective rule set (fetch + guard) for a key. Was the inlined MCP
+    # `rules` tool; promoted to a first-class verb so MCP is a pure projection
+    # (ADR 0039).
+    class Rules
+      extend Textus::Contract::DSL
+
+      verb     :rules
+      summary  "Return effective rules for a key (fetch, guard, ...)."
+      surfaces :ruby, :mcp
+      arg :key, String, required: true, positional: true
+
+      def initialize(container:, call: nil) # rubocop:disable Lint/UnusedMethodArgument
+        @manifest = container.manifest
+      end
+
+      def call(key)
+        set = @manifest.rules.for(key)
+        { "fetch" => set.fetch&.to_h, "guard" => set.guard }.compact
+      end
+    end
+  end
+end

data/lib/textus/read/schema_envelope.rb

@@ -1,6 +1,13 @@
 module Textus
   module Read
     class SchemaEnvelope
+      extend Textus::Contract::DSL
+
+      verb     :schema
+      summary  "Return the schema (field shape) for an entry's family, by key."
+      surfaces :ruby, :mcp
+      arg :key, String, required: true, positional: true
+
       def initialize(container:, call: nil) # rubocop:disable Lint/UnusedMethodArgument
         @manifest = container.manifest
         @schemas  = container.schemas

data/lib/textus/role.rb

@@ -2,9 +2,13 @@ module Textus
   module Role
     PATTERN = /\A[a-z][a-z0-9_-]*\z/
     DEFAULT = "human".freeze
+    # The default acting identity for the MCP transport (ADR 0040): an agent
+    # over stdio proposes; it does not inherit the human's authority. CLI
+    # callers keep the `human` DEFAULT.
+    AGENT = "agent".freeze
 
-    def self.resolve(root:, flag: nil, env: ENV)
-      candidate = flag || env["TEXTUS_ROLE"] || read_file(root) || DEFAULT
+    def self.resolve(root:, flag: nil, env: ENV, default: DEFAULT)
+      candidate = flag || env["TEXTUS_ROLE"] || read_file(root) || default
       raise InvalidRole.new(candidate) unless candidate.match?(PATTERN)
 
       candidate

data/lib/textus/session.rb

@@ -0,0 +1,24 @@
+module Textus
+  # The agent session: per-connection (MCP), per-process (CLI), or per-loop
+  # (Ruby) orientation state — the audit cursor plus the manifest etag and
+  # propose_zone captured at boot. Immutable Data value; advance_cursor
+  # returns a new instance. ADR 0036.
+  Session = Data.define(:role, :cursor, :propose_zone, :manifest_etag) do
+    def advance_cursor(new_cursor) = with(cursor: new_cursor)
+
+    def check_etag!(observed_etag)
+      return if observed_etag == manifest_etag
+
+      raise Textus::MCP::ContractDrift.new(
+        "manifest changed (was #{short_etag(manifest_etag)}, now #{short_etag(observed_etag)}); re-run boot",
+      )
+    end
+
+    private
+
+    # First 8 hex chars after the "sha256:" prefix — a stable short id for
+    # the drift diagnostic. Tolerates non-prefixed values (delete_prefix is
+    # a no-op when the prefix is absent).
+    def short_etag(etag) = etag.to_s.delete_prefix("sha256:")[0, 8]
+  end
+end

data/lib/textus/store.rb

@@ -50,6 +50,17 @@ module Textus
       @container ||= Textus::Container.from_store(self)
     end
 
+    # Build an agent Session oriented at the current cursor/manifest — the
+    # Ruby equivalent of an MCP `initialize`. ADR 0036.
+    def session(role:)
+      Textus::Session.new(
+        role: role,
+        cursor: audit_log.latest_seq,
+        propose_zone: manifest.policy.propose_zone_for(role),
+        manifest_etag: file_store.etag(File.join(root, "manifest.yaml")),
+      )
+    end
+
     def as(role, dry_run: false, correlation_id: nil)
       RoleScope.new(container: container, role: role, dry_run: dry_run, correlation_id: correlation_id)
     end

data/lib/textus/version.rb

@@ -1,4 +1,4 @@
 module Textus
-  VERSION = "0.35.1"
+  VERSION = "0.39.0"
   PROTOCOL = "textus/3"
 end

data/lib/textus/write/accept.rb

@@ -18,7 +18,7 @@ module Textus
         guard.for(:accept, target).check!(
           Textus::Domain::Policy::Evaluation.new(
             actor: @call.role, transition: :accept, origin: pending_key,
-            target: target, envelope: env, snapshot: @manifest
+            target: target, envelope: env, manifest: @manifest
           ),
         )
 

data/lib/textus/write/delete.rb

@@ -36,7 +36,7 @@ module Textus
       def eval_for(transition, target_key:, envelope: nil)
         Textus::Domain::Policy::Evaluation.new(
           actor: @call.role, transition: transition, origin: nil,
-          target: target_key, envelope: envelope, snapshot: @manifest
+          target: target_key, envelope: envelope, manifest: @manifest
         )
       end
 

data/lib/textus/write/fetch_all.rb

@@ -1,6 +1,14 @@
 module Textus
   module Write
     class FetchAll
+      extend Textus::Contract::DSL
+
+      verb     :fetch_all
+      summary  "Fetch all stale quarantine entries, optionally scoped by zone/prefix."
+      surfaces :cli, :ruby, :mcp
+      arg :prefix, String
+      arg :zone,   String
+
       def initialize(container:, call:)
         @container    = container
         @call         = call

data/lib/textus/write/fetch_worker.rb

@@ -3,6 +3,14 @@ require "timeout"
 module Textus
   module Write
     class FetchWorker
+      extend Textus::Contract::DSL
+
+      verb     :fetch
+      summary  "Run a fetch action for one quarantine entry."
+      surfaces :cli, :ruby, :mcp
+      arg :key, String, required: true, positional: true
+      response { |outcome| { "outcome" => outcome.class.name.split("::").last.downcase } }
+
       FETCH_TIMEOUT_SECONDS = IntakeFetch::FETCH_TIMEOUT_SECONDS
 
       def initialize(container:, call:)
@@ -101,7 +109,7 @@ module Textus
         ).for(:fetch, key).check!(
           Textus::Domain::Policy::Evaluation.new(
             actor: @call.role, transition: :fetch, origin: nil,
-            target: key, envelope: nil, snapshot: @manifest
+            target: key, envelope: nil, manifest: @manifest
           ),
         )
         envelope = writer.put(

data/lib/textus/write/mv.rb

@@ -109,7 +109,7 @@ module Textus
       def eval_for(transition, target_key:, envelope: nil)
         Textus::Domain::Policy::Evaluation.new(
           actor: @call.role, transition: transition, origin: nil,
-          target: target_key, envelope: envelope, snapshot: @manifest
+          target: target_key, envelope: envelope, manifest: @manifest
         )
       end
 

data/lib/textus/write/propose.rb

@@ -0,0 +1,46 @@
+module Textus
+  module Write
+    # Queue a proposal: resolve the acting role's propose_zone, prefix the key,
+    # and write there via the Put verb. Was inlined in the MCP `propose` tool
+    # and the CLI propose verb; promoted to a first-class verb so all three
+    # transports share one implementation (ADR 0036, ADR 0039).
+    class Propose
+      extend Textus::Contract::DSL
+
+      verb     :propose
+      summary  "Write a proposal to the role's propose_zone. Auto-prefixes the key."
+      surfaces :cli, :ruby, :mcp
+      arg :key,     String, required: true, positional: true,
+                            description: "key relative to propose_zone, e.g. 'decisions.feature-x'"
+      arg :meta,    Hash,   required: true
+      arg :body,    String
+      arg :content, Hash
+      response { |env| { "uid" => env.uid, "etag" => env.etag, "key" => env.key } }
+
+      def initialize(container:, call:)
+        @container = container
+        @call      = call
+        @manifest  = container.manifest
+      end
+
+      # if_etag is intentionally absent: a proposal is always a fresh queue write.
+      def call(key, meta: nil, body: nil, content: nil)
+        zone = @manifest.policy.propose_zone_for(@call.role)
+        unless zone
+          raise Textus::Error.new(
+            "propose_forbidden",
+            "role '#{@call.role}' has no writable propose_zone",
+            details: { "role" => @call.role },
+            hint: "the manifest must define a queue zone and '#{@call.role}' must hold the 'propose' capability",
+          )
+        end
+
+        Textus::Dispatcher.invoke(
+          :put, container: @container, call: @call,
+                args: ["#{zone}.#{key}"],
+                kwargs: { meta: meta || {}, body: body, content: content }
+        )
+      end
+    end
+  end
+end

data/lib/textus/write/put.rb

@@ -1,6 +1,18 @@
 module Textus
   module Write
     class Put
+      extend Textus::Contract::DSL
+
+      verb     :put
+      summary  "Create or update an entry. Schema-validated. Returns {uid, etag}."
+      surfaces :cli, :ruby, :mcp
+      arg :key,     String, required: true, positional: true
+      arg :meta,    Hash, required: true
+      arg :body,    String
+      arg :content, Hash
+      arg :if_etag, String
+      response { |env| { "uid" => env.uid, "etag" => env.etag } }
+
       def initialize(container:, call:)
         @container    = container
         @call         = call
@@ -41,7 +53,7 @@ module Textus
       def eval_for(transition, target_key:, envelope: nil)
         Textus::Domain::Policy::Evaluation.new(
           actor: @call.role, transition: transition, origin: nil,
-          target: target_key, envelope: envelope, snapshot: @manifest
+          target: target_key, envelope: envelope, manifest: @manifest
         )
       end
 

data/lib/textus/write/reject.rb

@@ -13,7 +13,7 @@ module Textus
         guard.for(:reject, pending_key).check!(
           Textus::Domain::Policy::Evaluation.new(
             actor: @call.role, transition: :reject, origin: pending_key,
-            target: pending_key, envelope: nil, snapshot: @manifest
+            target: pending_key, envelope: nil, manifest: @manifest
           ),
         )
 

data/lib/textus.rb

@@ -20,6 +20,10 @@ loader.ignore(File.expand_path("textus/mcp/errors.rb", __dir__))
 loader.setup
 loader.eager_load
 
+# Derive CLI_VERBS after eager_load so all contract-declaring files are present
+# (boot.rb loads first alphabetically; Dispatcher contracts are declared later).
+Textus::Boot::CLI_VERBS = Textus::Boot.build_cli_verbs.freeze
+
 module Textus
   @hook_mutex  = Mutex.new
   @hook_blocks = []