@zalom/plastic 1.4.0 → 1.4.1

package/scripts/lib/installer_core.rb

@@ -17,9 +17,10 @@ class InstallerCore
   DEFAULT_PLASTIC_HOME = File.join(Dir.home, ".plastic")
 
   DEFAULT_AGENTS = [
-    { key: "claude", name: "Claude Code", dir: File.join(Dir.home, ".claude"), flag: "--claude" },
+    { key: "claude", name: "Claude Code", dir: File.join(Dir.home, ".claude"), flag: "--claude",
+      skill_prefix: "/" },
     { key: "codex", name: "Codex CLI", dir: File.join(Dir.home, ".agents"),
-      home_dir: File.join(Dir.home, ".codex"), flag: "--codex" },
+      home_dir: File.join(Dir.home, ".codex"), flag: "--codex", skill_prefix: "$" },
     { key: "hermes", name: "Hermes", dir: File.join(Dir.home, ".hermes"), flag: "--hermes" },
   ].freeze
 
@@ -43,7 +44,8 @@ class InstallerCore
     - The full conventions live in ~/.plastic/PLASTIC.md. Read it and follow it exactly.
       It is generated and overwritten on Plastic updates, so never edit it.
     - Operational procedures are installed as skills under ~/.agents/skills/ (each
-      plastic-<name>/SKILL.md). Use them for the lifecycle work they describe.
+      plastic-<name>/SKILL.md). Invoke one explicitly as $plastic-<name> (for example
+      $plastic-doctor), or let Codex pick one implicitly by matching its description.
     - Intents, specs, plans, checklists, and outcomes live under ~/.plastic/, never in
       the project tree.
 
@@ -175,7 +177,7 @@ class InstallerCore
     return ["claude"] unless input.tty?
 
     puts "Which agents should Plastic register for?\n\n"
-    agents.each_with_index { |a, i| puts "  #{i + 1}. #{a[:name]} (#{a[:dir]})" }
+    agents.each_with_index { |a, i| puts "  #{i + 1}. #{a[:name]} (#{a[:home_dir] || a[:dir]})" }
     puts "  #{agents.size + 1}. All"
     puts
 
@@ -420,12 +422,44 @@ class InstallerCore
     (data["files"] || {}).keys
   end
 
+  # Per-agent registration probe (intent 198, D7 follow-up). `installed?` in
+  # install.rb only answers "is Plastic core installed at all", which cannot
+  # tell two harnesses apart: once core is present, install.rb's old gate
+  # refused to add ANY new harness, even one that had never been touched. This
+  # asks the narrower, correct question, "has Plastic already registered
+  # files for THIS agent", using the signal already tracked for prune-on-update:
+  # the per-agent manifest (manifest_path_for). A missing manifest file, or a
+  # manifest whose "files" list is empty (write_manifest still writes one when
+  # nothing was installed), both mean nothing is registered for this agent yet.
+  # An unknown key is never "installed" (fail toward proceeding, since a caller
+  # that already validated the key gets its own "Unknown agent" result from
+  # install_for_agent).
+  def agent_installed?(key)
+    config = agent_config(key)
+    return false unless config
+    !manifest_files(manifest_path_for(key, config)).empty?
+  end
+
   def install_for_agent(key, force, argv: [], input: $stdin, reinstall: false)
     config = agent_config(key)
     return { agent: config[:name], success: false, reason: "Unknown agent" } unless config
 
-    unless File.directory?(config[:dir])
-      return { agent: config[:name], success: false, reason: "#{config[:dir]} not found \u{2014} #{config[:name]} not installed?" }
+    # Presence probe (intent 198, Decision D1): an agent that declares its own
+    # home directory (Codex, home_dir: ~/.codex) is checked THERE, because
+    # config[:dir] (~/.agents) is the shared cross-tool skills root, not
+    # anything Codex itself creates. A fresh Codex install has no ~/.agents
+    # yet, so testing config[:dir] aborted a genuinely-present Codex. Claude
+    # and Hermes declare no home_dir, so presence_dir resolves to config[:dir]
+    # exactly as before and their behavior is unchanged. The failure message
+    # reuses the same resolved directory, so it always names the directory
+    # actually tested. install_codex still needs config[:dir] to exist by the
+    # time it writes skills; install_skills_flat and generate_codex_agents
+    # already FileUtils.mkdir_p their own nested paths under config[:dir] and
+    # config[:home_dir], so a fresh install creates it as a side effect (no
+    # separate top-level mkdir_p is required here).
+    presence_dir = config[:home_dir] || config[:dir]
+    unless File.directory?(presence_dir)
+      return { agent: config[:name], success: false, reason: "#{presence_dir} not found, #{config[:name]} not installed?" }
     end
 
     # Capture the prior manifest so we can prune files that no longer ship

package/scripts/lib/lock.rb

@@ -24,7 +24,30 @@ require "time"
 module Lock
   module_function
 
+  # Skill-invocation prefix per harness (intent 201, D2/D3). Claude Code invokes a
+  # skill with a slash (/plastic-doctor); Codex CLI invokes explicitly with a
+  # dollar ($plastic-doctor) and may also select one implicitly by matching the
+  # skill's description. This table is the actual source of truth for
+  # Bridge.skill_ref (bridge.rb requires lock.rb, never the reverse, so the
+  # table lives here rather than pulling Bridge into this dependency-free file
+  # just to render two characters). InstallerCore::DEFAULT_AGENTS carries the
+  # same values per adapter as documented config (see ACTION_2); this constant
+  # is not read from it at runtime, by the same reasoning bridge.rb/hook-*
+  # already stay clear of installer_core.rb (spec Alternatives Considered).
+  SKILL_PREFIXES = { "claude" => "/", "codex" => "$" }.freeze
+
+  # Renders a skill reference for the given harness. Unset or unrecognized
+  # harness falls back to Claude's slash form, so an existing call site that
+  # never passes harness: keeps behaving exactly as it does today (D2). name
+  # is the bare skill name ("plastic-doctor"), never pre-prefixed.
+  def self.skill_ref(name, harness: :claude)
+    prefix = SKILL_PREFIXES.fetch(harness.to_s, SKILL_PREFIXES["claude"])
+    "#{prefix}#{name}"
+  end
+
   TYPES = %w[delivery maintenance].freeze
+  DELEGATE_ACTIVITY_LIMIT = 20
+  DELEGATE_STATUSES = %w[active finished failed].freeze
 
   # Lease TTL. Heartbeats fire from the write-path hooks (PostToolUse
   # gate-check and the lock-gate allow path), so a delivering session
@@ -84,7 +107,8 @@ module Lock
   #   [:excluded, other] the OTHER lock type is fresh (D3)
   #   [:corrupt, nil]    unparseable lock file: run repair
   def acquire(intent_dir, session:, type: "delivery", host: Socket.gethostname,
-              ttl: TTL_SECONDS, now: Time.now)
+              ttl: TTL_SECONDS, now: Time.now, harness: nil, agent: nil,
+              model: nil, thread: nil, run_mode: nil)
     raise ArgumentError, "unknown lock type #{type.inspect}" unless TYPES.include?(type)
     raise ArgumentError, "lock session must be present" if blank?(session)
 
@@ -99,7 +123,13 @@ module Lock
     if existing
       if existing["owner_session"].to_s == session.to_s
         data = payload(session: session, type: type, host: host, now: now,
-                       delegates: Array(existing["delegates"]))
+                       delegates: Array(existing["delegates"]),
+                       delegate_activity: Array(existing["delegate_activity"]),
+                       harness: merged_value(harness, existing["owner_harness"]),
+                       agent: merged_value(agent, existing["owner_agent"]),
+                       model: merged_value(model, existing["owner_model"]),
+                       thread: merged_value(thread, existing["owner_thread"]),
+                       run_mode: merged_value(run_mode, existing["run_mode"]))
         write(intent_dir, data, type: type)
         return [:owned, data]
       end
@@ -107,7 +137,9 @@ module Lock
       return [:stale, existing]
     end
 
-    data = payload(session: session, type: type, host: host, now: now)
+    data = payload(session: session, type: type, host: host, now: now,
+                   harness: harness, agent: agent, model: model, thread: thread,
+                   run_mode: run_mode)
     File.open(path(intent_dir, type: type),
               File::WRONLY | File::CREAT | File::EXCL) do |io|
       io.write(JSON.pretty_generate(data))
@@ -117,16 +149,49 @@ module Lock
     [:held, read(intent_dir, type: type)] # lost the O_EXCL race
   end
 
-  def payload(session:, type:, host:, now:, delegates: [])
+  def payload(session:, type:, host:, now:, delegates: [], delegate_activity: [],
+              harness: nil, agent: nil, model: nil, thread: nil, run_mode: nil)
     {
       "type" => type,
       "owner_session" => session.to_s,
       "host" => host,
       "acquired_at" => now.utc.iso8601,
       "delegates" => delegates,
+      "owner_harness" => normalized_value(harness),
+      "owner_agent" => normalized_value(agent),
+      "owner_model" => normalized_value(model),
+      "owner_thread" => normalized_value(thread),
+      "run_mode" => normalized_value(run_mode),
+      "delegate_activity" => bounded_delegate_activity(delegate_activity, delegates: delegates),
     }
   end
 
+  def normalized_value(value)
+    blank?(value) ? nil : value.to_s
+  end
+
+  def merged_value(explicit, existing)
+    blank?(explicit) ? normalized_value(existing) : explicit.to_s
+  end
+
+  # Keep every active record that still names an authorized delegate, while
+  # bounding completed history. Active work is current truth and must never be
+  # evicted merely because newer delegates finished.
+  def bounded_delegate_activity(records, delegates:)
+    records = Array(records)
+    authorized = Array(delegates).map(&:to_s)
+    terminal_indexes = records.each_index.reject do |index|
+      record = records[index]
+      record.is_a?(Hash) && record["status"].to_s == "active" &&
+        authorized.include?(record["session"].to_s)
+    end.last(DELEGATE_ACTIVITY_LIMIT)
+    records.each_with_index.filter_map do |record, index|
+      active = record.is_a?(Hash) && record["status"].to_s == "active" &&
+               authorized.include?(record["session"].to_s)
+      record if active || terminal_indexes.include?(index)
+    end
+  end
+
   # Owner/delegate heartbeat: touch the mtime, never rewrite content.
   def heartbeat(intent_dir, session:, type: "delivery", now: Time.now)
     return false unless holds?(intent_dir, session: session, type: type)
@@ -136,11 +201,49 @@ module Lock
 
   # Owner registers a delegate (D4): a session allowed to write under this
   # lock. Only the OWNER may delegate; delegates cannot re-delegate.
-  def add_delegate(intent_dir, delegate:, session:, type: "delivery")
+  def add_delegate(intent_dir, delegate:, session:, type: "delivery", now: Time.now,
+                   harness: nil, agent: nil, model: nil, thread: nil)
     data = read(intent_dir, type: type)
     return false if blank?(delegate)
     return false unless data && data["owner_session"].to_s == session.to_s
     data["delegates"] = (Array(data["delegates"]) + [delegate.to_s]).uniq
+    activity = Array(data["delegate_activity"])
+    previous = activity.find { |record| record.is_a?(Hash) && record["session"].to_s == delegate.to_s }
+    activity.reject! { |record| record.is_a?(Hash) && record["session"].to_s == delegate.to_s }
+    record = {
+      "session" => delegate.to_s,
+      "status" => "active",
+      "registered_at" => now.utc.iso8601,
+      "last_activity_at" => now.utc.iso8601,
+      "harness" => merged_value(harness, previous && previous["harness"]),
+      "agent" => merged_value(agent, previous && previous["agent"]),
+      "model" => merged_value(model, previous && previous["model"]),
+      "thread" => merged_value(thread, previous && previous["thread"]),
+    }
+    data["delegate_activity"] = bounded_delegate_activity(activity + [record],
+                                                          delegates: data["delegates"])
+    write(intent_dir, data, type: type)
+    true
+  end
+
+  # Activity metadata is observational only. Finishing or failing a delegate
+  # never removes its string session id from the authorization list.
+  def update_delegate_status(intent_dir, delegate:, status:, session:, type: "delivery",
+                             now: Time.now)
+    return false unless (DELEGATE_STATUSES - ["active"]).include?(status.to_s)
+    data = read(intent_dir, type: type)
+    return false unless data && data["owner_session"].to_s == session.to_s
+    activity = Array(data["delegate_activity"])
+    index = activity.index do |record|
+      record.is_a?(Hash) && record["session"].to_s == delegate.to_s
+    end
+    return false unless index
+    activity[index] = activity[index].merge(
+      "status" => status.to_s,
+      "last_activity_at" => now.utc.iso8601
+    )
+    data["delegate_activity"] = bounded_delegate_activity(activity,
+                                                          delegates: data["delegates"])
     write(intent_dir, data, type: type)
     true
   end
@@ -164,7 +267,8 @@ module Lock
   # lock; there is no silent reclaim path anywhere else.
   # Returns [:taken, data], [:fresh, existing], or acquire's error statuses.
   def takeover(intent_dir, session:, type: "delivery", host: Socket.gethostname,
-               ttl: TTL_SECONDS, now: Time.now)
+               ttl: TTL_SECONDS, now: Time.now, harness: nil, agent: nil,
+               model: nil, thread: nil, run_mode: nil)
     existing = read(intent_dir, type: type)
     if existing && !authorized?(existing, session) &&
        fresh?(intent_dir, type: type, ttl: ttl, now: now)
@@ -175,7 +279,8 @@ module Lock
     p = path(intent_dir, type: type)
     File.delete(p) if File.exist?(p)
     status, data = acquire(intent_dir, session: session, type: type, host: host,
-                           ttl: ttl, now: now)
+                           ttl: ttl, now: now, harness: harness, agent: agent,
+                           model: model, thread: thread, run_mode: run_mode)
     return [status, data] unless status == :acquired
 
     audit = "#{now.utc.iso8601}  Lock  takeover: #{session} reclaimed #{type} " \
@@ -190,6 +295,75 @@ module Lock
   def write(intent_dir, data, type: "delivery")
     File.write(path(intent_dir, type: type), JSON.pretty_generate(data))
   end
+
+  # Read-only normalized inspection. The lock file and its mtime remain the
+  # sole sources of owner and heartbeat truth; no environment or transcript
+  # inference belongs here.
+  def who(intent_dir, ttl: TTL_SECONDS, now: Time.now)
+    p = path(intent_dir)
+    unless File.exist?(p)
+      return { "state" => "none",
+               "claims" => Claim.claims_status(intent_dir, ttl: ttl, now: now) }
+    end
+    data = read(intent_dir)
+    unless data
+      return { "state" => "corrupt",
+               "claims" => Claim.claims_status(intent_dir, ttl: ttl, now: now) }
+    end
+
+    activity = Array(data["delegate_activity"])
+    activity_by_session = activity.each_with_object({}) do |record, memo|
+      memo[record["session"].to_s] = record if record.is_a?(Hash)
+    end
+    authorized_sessions = Array(data["delegates"]).map(&:to_s)
+    activity_sessions = activity.filter_map do |record|
+      record["session"].to_s if record.is_a?(Hash) &&
+                                authorized_sessions.include?(record["session"].to_s)
+    end.uniq
+    activity_order = activity.each_with_index.each_with_object({}) do |(record, index), memo|
+      memo[record["session"].to_s] = index if record.is_a?(Hash)
+    end
+    activity_sessions.sort_by! do |session|
+      record = activity_by_session[session] || {}
+      # Active delegates are current ahead of terminal delegates. Within that
+      # group, latest activity wins; original record order is the stable
+      # fallback for legacy records without timestamps.
+      [record["status"].to_s == "active" ? 1 : 0,
+       record["last_activity_at"].to_s, activity_order.fetch(session, -1)]
+    end
+    # Legacy string-only delegates retain their authorization order. Rich
+    # records follow in deterministic current/latest order, so consumers may
+    # reliably take the last projection entry: the most recent active delegate
+    # when one exists, otherwise the most recent terminal activity.
+    ordered_sessions = (authorized_sessions - activity_sessions) + activity_sessions
+    delegates = ordered_sessions.map do |session|
+      record = activity_by_session[session] || {}
+      {
+        "session" => session,
+        "harness" => normalized_value(record["harness"]) || "unknown",
+        "agent" => normalized_value(record["agent"]) || "unknown",
+        "model" => normalized_value(record["model"]) || "unknown",
+        "thread" => normalized_value(record["thread"]) || "unknown",
+        "status" => normalized_value(record["status"]) || "unknown",
+        "registered_at" => record["registered_at"],
+        "last_activity_at" => record["last_activity_at"],
+      }
+    end
+    {
+      "state" => fresh?(intent_dir, ttl: ttl, now: now) ? "fresh" : "stale",
+      "owner" => {
+        "harness" => normalized_value(data["owner_harness"]) || "unknown",
+        "agent" => normalized_value(data["owner_agent"]) || "unknown",
+        "model" => normalized_value(data["owner_model"]) || "unknown",
+        "thread" => normalized_value(data["owner_thread"]) || "unknown",
+        "run_mode" => normalized_value(data["run_mode"]) || "unknown",
+      },
+      "owner_session" => data["owner_session"],
+      "heartbeat_at" => File.mtime(p).utc.iso8601,
+      "delegates" => delegates,
+      "claims" => Claim.claims_status(intent_dir, ttl: ttl, now: now),
+    }
+  end
 end
 
 # Claim: the per-artifact claim-token layer (intent 111, D1/D7). Sits BENEATH
@@ -359,7 +533,8 @@ module Claim
   # ENGAGES only when a claim file exists (dormant otherwise, so single-owner flows
   # and the existing suite stay green, AC7). Fails open on stale/corrupt via
   # fail_open?, the named contract.
-  def claim_gate_reason(intent_dir, artifact, session:, ttl: Lock::TTL_SECONDS, now: Time.now)
+  def claim_gate_reason(intent_dir, artifact, session:, ttl: Lock::TTL_SECONDS, now: Time.now,
+                        harness: :claude)
     return nil if Lock.blank?(artifact)
     return nil unless File.exist?(path(intent_dir, artifact))   # dormant: no claim
     return nil if holds_claim?(intent_dir, artifact, session: session)  # you hold it
@@ -368,8 +543,8 @@ module Claim
     holder = data && data["owner_session"]
     since = data && data["acquired_at"]
     "artifact #{artifact} is claimed by #{holder} since #{since}; another writer holds " \
-      "it. Back off or run /plastic-doctor check the lock status. If you are a distinct " \
-      "delegate, the owner must register you: plastic-lock delegate --intent-dir " \
-      "#{intent_dir} --session <your-session-id>"
+      "it. Back off or run #{Lock.skill_ref('plastic-doctor', harness: harness)} check the " \
+      "lock status. If you are a distinct delegate, the owner must register you: " \
+      "plastic-lock delegate --intent-dir #{intent_dir} --session <your-session-id>"
   end
 end

package/scripts/plastic-lock

@@ -5,10 +5,11 @@
 # plastic-lock: inspect and repair the durable delivery lock (intent 108, D5),
 # and take/free per-artifact claim tokens (intent 111 D1/D5).
 #
-# Usage: plastic-lock <status|fix|release|reclaim|delegate|claim|release-claim>
+# Usage: plastic-lock <status|who|fix|release|reclaim|delegate|claim|release-claim>
 #          [--intent-dir DIR] [--session SID] [--delegate SID] [--artifact NAME]
 #
 # Verbs:
+#   who           compact, read-only durable owner/activity view
 #   status        report the lock file, the bridge cache, their agreement,
 #                 and any live per-artifact claims
 #   fix           idempotent repair: rebuild lock + bridge from disk truth for
@@ -29,13 +30,15 @@ require_relative "lib/bridge"
 require_relative "lib/lock"
 
 def usage!
-  warn "usage: plastic-lock <status|fix|release|reclaim|delegate|claim|release-claim> " \
-       "[--intent-dir DIR] [--session SID] [--delegate SID] [--artifact NAME]"
+  warn "usage: plastic-lock <status|who|fix|release|reclaim|delegate|claim|release-claim> " \
+       "[--intent-dir DIR] [--session SID] [--delegate SID] [--artifact NAME] " \
+       "[--harness claude|codex] [--agent NAME] [--model MODEL] [--thread ID] " \
+       "[--mode auto|guided] [--status finished|failed]"
   exit 1
 end
 
 verb = ARGV.shift
-usage! unless %w[status fix release reclaim delegate claim release-claim].include?(verb)
+usage! unless %w[status who fix release reclaim delegate claim release-claim].include?(verb)
 
 opts = {}
 until ARGV.empty?
@@ -44,17 +47,30 @@ until ARGV.empty?
   when "--session" then opts[:session] = ARGV.shift
   when "--delegate" then opts[:delegate] = ARGV.shift
   when "--artifact" then opts[:artifact] = ARGV.shift
+  when "--harness" then opts[:harness] = ARGV.shift
+  when "--agent" then opts[:agent] = ARGV.shift
+  when "--model" then opts[:model] = ARGV.shift
+  when "--thread" then opts[:thread] = ARGV.shift
+  when "--mode" then opts[:mode] = ARGV.shift
+  when "--status" then opts[:status] = ARGV.shift
   else
     warn "unknown flag #{flag}"
     usage!
   end
 end
+usage! if opts[:mode] && !%w[auto guided].include?(opts[:mode])
 
 session = opts[:session]
 session = ENV["CLAUDE_CODE_SESSION_ID"] if session.nil? || session.strip.empty?
+harness = opts[:harness]
+hint_harness = harness || "claude"
 
 dir = opts[:dir]
 if dir.nil? || dir.strip.empty?
+  if verb == "who"
+    warn "plastic-lock: who is strictly durable-state only; pass --intent-dir <intent dir>"
+    exit 1
+  end
   bridge = Bridge.discover_bridge(session: session, cwd: Dir.pwd)
   dir = Bridge.bridge_intent_dir(bridge)
 end
@@ -64,6 +80,37 @@ if dir.nil?
 end
 dir = File.expand_path(dir)
 
+if verb == "who"
+  view = Lock.who(dir)
+  basename = File.basename(dir)
+  intent_id, slug = basename.split("--", 2)
+  display = ->(value) { value.nil? || value.to_s.strip.empty? || value == "unknown" ? "Unknown" : value.to_s }
+  harness = ->(value) {
+    shown = display.call(value)
+    shown == "Unknown" ? shown : shown.sub(/\A./) { |char| char.upcase }
+  }
+  owner = view["owner"] || {}
+  claims = Array(view["claims"]).select { |claim| claim["fresh"] && !claim["corrupt"] }
+  claim_text = claims.map do |claim|
+    writer = claim["delegate"] || claim["owner_session"]
+    "#{display.call(claim['artifact'])} by #{display.call(writer)}"
+  end
+  delegate = Array(view["delegates"]).last
+
+  puts "#{intent_id} · #{slug || basename}"
+  puts "State: #{view['state']}"
+  puts "Controller: #{display.call(owner['agent'])} via #{harness.call(owner['harness'])}"
+  puts "Session: #{display.call(view['owner_session'])}"
+  puts "Heartbeat: #{view['heartbeat_at'] || 'none'}"
+  puts "Claims: #{claim_text.empty? ? 'none' : claim_text.join(', ')}"
+  if delegate
+    puts "Delegate: #{display.call(delegate['agent'])} via #{harness.call(delegate['harness'])}, #{display.call(delegate['status'])}"
+  else
+    puts "Delegate: none"
+  end
+  exit 0
+end
+
 intent_id = Bridge.intent_id_from_dir(dir)
 store = File.dirname(dir)
 name = File.basename(dir)
@@ -87,7 +134,10 @@ when "status"
   puts JSON.pretty_generate(report)
 when "fix"
   report = Bridge.repair_lock(key, intent_id: intent_id, intent_dir: dir,
-                              store: store, name: name)
+                              store: store, name: name, harness: harness,
+                              agent: opts[:agent], model: opts[:model], thread: opts[:thread],
+                              run_mode: opts[:mode],
+                              hint_harness: hint_harness)
   puts JSON.pretty_generate(report)
   unless report["status"] == "repaired"
     warn "plastic-lock: #{report['status']} by #{report['owner']}" \
@@ -108,23 +158,40 @@ when "release"
   end
   puts "released (#{result})"
 when "reclaim"
-  status, lock_data = Lock.takeover(dir, session: key)
+  status, lock_data = Lock.takeover(dir, session: key, harness: harness,
+                                    agent: opts[:agent], model: opts[:model],
+                                    thread: opts[:thread], run_mode: opts[:mode])
   if status == :fresh
     warn "plastic-lock: lock is FRESH and held by #{lock_data['owner_session']}; " \
          "back off (no silent reclaim)"
     exit 1
   end
   report = Bridge.repair_lock(key, intent_id: intent_id, intent_dir: dir,
-                              store: store, name: name)
+                              store: store, name: name, harness: harness,
+                              agent: opts[:agent], model: opts[:model], thread: opts[:thread],
+                              run_mode: opts[:mode],
+                              hint_harness: hint_harness)
   puts JSON.pretty_generate(report)
 when "delegate"
   usage! if opts[:delegate].nil?
-  ok = Lock.add_delegate(dir, delegate: opts[:delegate], session: key)
+  usage! if opts[:status] && !%w[finished failed].include?(opts[:status])
+  ok = if opts[:status]
+         Lock.update_delegate_status(dir, delegate: opts[:delegate],
+                                     status: opts[:status], session: key)
+       else
+         Lock.add_delegate(dir, delegate: opts[:delegate], session: key,
+                           harness: harness, agent: opts[:agent], model: opts[:model],
+                           thread: opts[:thread])
+       end
   unless ok
     warn "plastic-lock: only the lock owner may delegate; run plastic-lock status"
     exit 1
   end
-  puts "delegated #{opts[:delegate]} under #{key}"
+  if opts[:status]
+    puts "delegate #{opts[:delegate]} marked #{opts[:status]} under #{key}"
+  else
+    puts "delegated #{opts[:delegate]} under #{key}"
+  end
 when "claim"
   usage! if opts[:artifact].nil?
   status, data = Claim.acquire_claim(dir, opts[:artifact], session: key,

package/skills/auto/SKILL.md

@@ -93,13 +93,15 @@ edited before the plan exists (the gate applies to YOU, the orchestrator):
 
 ```bash
 ruby -r ~/.plastic/scripts/lib/bridge -e \
-  'Bridge.arm_auto(ENV["CLAUDE_CODE_SESSION_ID"], intent_id: "<ID>", intent_dir: "<STORE>/<dir>", store: "<STORE>", name: "<name>")'
+  'codex=ENV["CODEX_THREAD_ID"].to_s.strip; claude=ENV["CLAUDE_CODE_SESSION_ID"].to_s.strip; harness=!codex.empty? ? "codex" : (!claude.empty? ? "claude" : nil); session=!codex.empty? ? codex : (!claude.empty? ? claude : nil); Bridge.arm_auto(session, intent_id: "<ID>", intent_dir: "<STORE>/<dir>", store: "<STORE>", name: "<name>", harness: harness, agent: "plastic-enforcer", thread: (!codex.empty? ? codex : nil))'
 ```
 
 Replace `<ID>`, `<STORE>` (e.g. `~/.plastic/projects/<slug>/store` or `~/.plastic/store`),
 `<dir>` (the `ID--slug` directory), and `<name>`. The first argument is the session id you
-want the bridge keyed by: pass the hook stdin `session_id` when you have it, otherwise
-`ENV["CLAUDE_CODE_SESSION_ID"]`, otherwise `nil`. Arming always succeeds and acquires the
+want the bridge keyed by: pass the hook stdin `session_id` when you have it. The executable
+snippet trusts a nonblank `CODEX_THREAD_ID` as Codex, otherwise a nonblank
+`CLAUDE_CODE_SESSION_ID` as Claude, otherwise leaves harness and thread unknown. Never guess
+identity from an absent runtime variable. Arming always succeeds and acquires the
 durable `delivery.lock` in the intent dir. For the `resolve_session` fallback chain
 (why arming never needs a non-empty session env var, and what the lock ownership model
 implies for later tool calls) read `references/end-tail.md`.
@@ -148,12 +150,33 @@ The enforcer's session owns the delivery lock. Per-stage specialists run in
 their own sessions and would be denied by the lock gate, so register each one
 as a delegate before (or when) it needs to write into the intent dir:
 
-1. Instruct each spawned specialist to report its session id
-   (`CLAUDE_CODE_SESSION_ID`) in its first message.
+1. Instruct each spawned specialist to report its session id and runtime identity in its first
+   message: `CODEX_THREAD_ID` for Codex, or `CLAUDE_CODE_SESSION_ID` for Claude. Use the
+   specialist/hook identity when known; never infer a harness or model from missing context.
 2. As the lock owner, run:
-   `ruby ~/.plastic/scripts/plastic-lock delegate --delegate <specialist-session-id>`
+   `ruby ~/.plastic/scripts/plastic-lock delegate --intent-dir <intent-dir> --delegate <specialist-session-id> --harness <specialist-harness-when-known> --agent <role> --model <resolved-model-when-known> --thread <reported-CODEX_THREAD_ID-when-Codex>`
+   Omit `--harness`, `--model`, or `--thread` when that value is unknown; `--agent <role>` is
+   always known from the dispatch roster.
 3. If a specialist hits a lock-gate deny, the deny message names this exact
    command; run it and have the specialist retry.
+4. Immediately after the specialist returns, and before validating or dispatching
+   the next handoff, classify the return and record its activity status as the owner:
+   - `finished` means the specialist returned a usable completion report, whether
+     agent-authored or synthesized through `scripts/agent-report`.
+   - `failed` means the specialist returned blocked, errored, or without a usable
+     completion report that can be synthesized.
+5. Record the classification with exactly one of:
+   ```bash
+   ruby ~/.plastic/scripts/plastic-lock delegate --intent-dir <intent-dir> \
+     --delegate <specialist-session-id> --status finished --harness <same-specialist-harness-when-known> \
+     --agent <same-role> --model <same-resolved-model-when-known> --thread <same-CODEX_THREAD_ID-when-Codex>
+   ruby ~/.plastic/scripts/plastic-lock delegate --intent-dir <intent-dir> \
+     --delegate <specialist-session-id> --status failed --harness <same-specialist-harness-when-known> \
+     --agent <same-role> --model <same-resolved-model-when-known> --thread <same-CODEX_THREAD_ID-when-Codex>
+   ```
+   Apply the same omission rule to unknown values on terminal status commands.
+   A failed specialist stops that handoff under the normal blocker/error procedure;
+   never dispatch the next specialist first.
 
 Only the owner can delegate. Delegates cannot re-delegate or release.
 

package/skills/auto/references/agent-architecture.md

@@ -81,6 +81,13 @@ account therefore always exists: agent-authored when present, deterministically
 otherwise. This structures the finish notification only; in-flight observations stay in
 `## Insights`, no progress chatter is added.
 
+Immediately after a specialist returns and before the next handoff, the enforcer records the
+delegate's activity through `plastic-lock delegate --intent-dir <intent-dir> --delegate <id>
+--status finished|failed`. `finished` requires a usable agent-authored or synthesized completion
+report. A blocked or errored return, or one with no report that can be synthesized, is `failed`
+and stops the handoff under the normal error procedure. Activity status is descriptive and does
+not revoke the registered delegate's authorization.
+
 ### Gate Ownership
 
 The enforcer arms and verifies the lifecycle gate, then gates every stage transition.