shapeup-cli 0.10.4 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c09048590d2fb0edc18e5479d5d9a761c2d7360b165db1eb1de88887de2a1b6
-  data.tar.gz: 4802cc019c1372cc91c8b1ea089f0a3b0af559e390a9cd54fadd85f1a293fde4
+  metadata.gz: 6efeb5fc129ef621f013c263f9f34166099966883a85802eb13cac37106fff95
+  data.tar.gz: 8b0f1597a8e9788bb8aac040990ebb164e0494b6dbd5c4eaf1b5e1399b3e1239
 SHA512:
-  metadata.gz: 5bb78243d2cf2cc5bb30bf303a6eded89088921f13901e8d128f54096701709aadd6c75b80bdf35aa55fc5c2e884720a527316f922eb16cf2b17b4a8959cf47c
-  data.tar.gz: 632ab3fc5ecbcc4a753b79b92735509698ca9e04c8d823d6119616a12f30328d85142107594256f015db633631b590845ec80995ba0efaba6d5a213d16295bb0
+  metadata.gz: 57f00b45c5e0d1c35439a490dac6ee9ff7c7a2f985b86e64c986d2b364f694c9db0aa48f577ae5bb7d0ad430fddcf018706d97d9aa2c403076086572d4985d31
+  data.tar.gz: 7cbc8fcc785b949da9748df97051ac74618ab73fe4d3bb6db7f85b438fd3f5b5f6e682a3449c5b80bc297037bd3234be2a30ec880bbd8d16226375eb86f853c0

data/lib/shapeup_cli/commands/connect.rb

@@ -16,12 +16,15 @@ module ShapeupCli
             { name: "as", type: "string", usage: "Which of your agents, by handle (default: your only one)" },
             { name: "interval", type: "integer", usage: "Seconds between checks (default: #{DEFAULT_INTERVAL})" },
             { name: "trust", type: "string", usage: "Whose requests to pass on: owner (default) or members" },
-            { name: "once", type: "bool", usage: "Check once and exit" }
+            { name: "once", type: "bool", usage: "Check once and exit" },
+            { name: "until-request", type: "bool", usage: "Exit after the first check that passes on a request, remembering what was handed out" },
+            { name: "fresh", type: "bool", usage: "With --until-request, forget what earlier runs handed out" }
           ],
           examples: [
             "shapeup connect",
             "shapeup connect --as bond --trust members",
-            "SHAPEUP_PROFILE=bond shapeup connect --once"
+            "SHAPEUP_PROFILE=bond shapeup connect --once",
+            "shapeup connect --until-request --fresh"
           ]
         }
       end
@@ -32,13 +35,14 @@ module ShapeupCli
         @trust = extract_option("--trust") || "owner"
         abort "--trust must be one of: #{TRUST_LEVELS.join(", ")}" unless TRUST_LEVELS.include?(@trust)
         once = consume_flag("--once")
+        @until_request = consume_flag("--until-request")
+        @fresh = consume_flag("--fresh")
 
         $stdout.sync = true
-        @handed_out = Set.new
         @profile, @agent_client = keep_trying(forever: !once) { sign_in_as_agent(handle) }
 
         poll
-        until once
+        until once || @requested
           pause @interval
           poll
         end
@@ -97,20 +101,40 @@ module ShapeupCli
           agent = inbox["agent"]
 
           announce(agent) unless @connected
+          @handed_out ||= Set.new(@until_request && !@fresh ? read_handed_out(agent) : [])
 
           inbox["items"].reverse_each do |item|
             next unless @handed_out.add?(item["id"])
 
             if trusted?(item["requester"], agent)
               emit(type: "request", **item.transform_keys(&:to_sym))
+              @requested = @until_request
             else
               emit(type: "ignored", id: item["id"], requester: item["requester"], why: "#{item["requester"]["name"]} is not trusted (--trust #{@trust})")
             end
           end
+
+          write_handed_out(agent, inbox["items"].map { |item| item["id"] }) if @until_request
         rescue Client::NetworkError, Client::RateLimitError => error
           emit(type: "error", message: error.message, retryable: true)
         end
 
+        def handed_out_path(agent)
+          File.join(Config::CONFIG_DIR, "connect", "#{agent["name"]}.json")
+        end
+
+        def read_handed_out(agent)
+          JSON.parse(File.read(handed_out_path(agent)))
+        rescue Errno::ENOENT, JSON::ParserError
+          []
+        end
+
+        def write_handed_out(agent, waiting)
+          @handed_out &= waiting
+          FileUtils.mkdir_p(File.dirname(handed_out_path(agent)))
+          File.write(handed_out_path(agent), JSON.generate(@handed_out.to_a))
+        end
+
         def announce(agent)
           emit(type: "connected", agent: agent, profile: @profile, organisation_id: org_id.to_s, trust: @trust, interval: @interval)
           @connected = true

data/lib/shapeup_cli/commands/doctor.rb

@@ -33,7 +33,9 @@ module ShapeupCli
           check_api_reachable,
           check_auth,
           check_org_access,
-          check_claude_skill
+          check_claude_skills,
+          check_agent,
+          check_connector
         ]
 
         report(checks)
@@ -127,7 +129,7 @@ module ShapeupCli
         def check_auth
           return skip("auth", "no token to test") unless Config.token
 
-          result = Output.extract_data(Client.new.call_tool("list_organisations"))
+          result = Output.extract_data(client.call_tool("list_organisations"))
           @organisations = result.is_a?(Hash) ? (result["organisations"] || []) : Array(result)
           pass "auth", "signed in, #{@organisations.length} organisation(s)"
         rescue Client::AuthError
@@ -149,15 +151,59 @@ module ShapeupCli
           end
         end
 
-        def check_claude_skill
-          installed = File.join(Dir.home, ".claude", "skills", "shapeup", "SKILL.md")
-          return warn!("claude skill", "not installed", hint: "shapeup setup claude") unless File.exist?(installed)
+        def check_claude_skills
+          states = Setup::SKILL_NAMES.to_h do |name|
+            installed = File.join(Dir.home, ".claude", "skills", name, "SKILL.md")
+            current = File.exist?(installed) && File.read(installed) == File.read(File.join(Setup::SKILLS_DIR, name, "SKILL.md"))
+            [ name, File.exist?(installed) ? (current ? :current : :stale) : :missing ]
+          end
+
+          if states.values.all?(:current)
+            pass "claude skills", "#{states.keys.join(", ")} installed and current"
+          else
+            behind = states.reject { |_, state| state == :current }.map { |name, state| "#{name} #{state == :missing ? "not installed" : "stale"}" }
+            warn! "claude skills", behind.join(", "), hint: "shapeup setup claude"
+          end
+        end
+
+        def check_agent
+          return skip("agent", "auth not verified") unless @organisations && Config.organisation_id
+
+          mine = Output.extract_data(client.call_tool("list_my_agents", organisation: Config.organisation_id.to_s))
+          return pass("agent", "signed in as an agent") if mine["signed_in_as_agent"]
+
+          @agent = mine["agents"].first
+          return skip("agent", mine["can_add"] ? "you have no agent here" : "agents need a Pro organisation where you're a member") unless @agent
 
-          if File.read(installed) == File.read(Setup::SKILL_SOURCE)
-            pass "claude skill", "installed and current"
+          handle = @agent["name"]
+          profile = Config.profile(handle)
+          return warn!("agent", "@#{handle} isn't connected on this computer yet", hint: "/shapeup-connect in Claude Code") unless profile&.dig("token")
+
+          Client.new(host: profile["host"] || Config.host, token: profile["token"])
+            .call_tool("list_inbox", organisation: (profile["organisation_id"] || Config.organisation_id).to_s)
+          @connected_agent = handle
+          pass "agent", "@#{handle} signs in with profile '#{handle}'"
+        rescue Client::AuthError
+          fail! "agent", "@#{handle}'s saved token was rejected", hint: "/shapeup-connect in Claude Code"
+        rescue Client::ApiError => e
+          fail! "agent", e.message
+        end
+
+        def check_connector
+          return skip("connector", "no connected agent to listen for") unless @connected_agent
+
+          if connector_running_for?(@connected_agent)
+            pass "connector", "listening as @#{@connected_agent} on this computer"
           else
-            warn! "claude skill", "installed but stale", hint: "shapeup setup claude"
+            warn! "connector", "not listening as @#{@connected_agent} on this computer", hint: "/shapeup-connect in Claude Code"
           end
+        rescue Errno::ENOENT
+          skip "connector", "can't check for running processes here"
+        end
+
+        def connector_running_for?(handle)
+          commands = IO.popen([ "pgrep", "-lf", "shapeup connect" ], err: File::NULL, &:readlines)
+          commands.any? { |command| command.match?(/--as @?#{Regexp.escape(handle)}\b/) || !command.include?("--as") }
         end
 
         def pass(name, message) = Check.new(name: name, status: :pass, message: message)

data/lib/shapeup_cli/config.rb

@@ -66,6 +66,10 @@ module ShapeupCli
       end
     end
 
+    def self.profile(name)
+      load_profiles_raw.dig("profiles", name)
+    end
+
     def self.current_profile
       data = load_profiles_raw
       name = ENV["SHAPEUP_PROFILE"] || data["default"]

data/lib/shapeup_cli/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ShapeupCli
-  VERSION = "0.10.4"
+  VERSION = "0.11.0"
 end

data/skills/shapeup-connect/SKILL.md

@@ -93,39 +93,33 @@ themselves.
 
 ## Listen
 
-Start the connector as a background command and keep it running:
+Start the connector in the background, as a command you are told about when it finishes (in
+Claude Code: Bash with `run_in_background`):
 
 ```bash
-shapeup connect [--as <handle>]
+shapeup connect --until-request --fresh [--as <handle>]
 ```
 
 Signed in as the user, it gives the agent a fresh token, saves it as a CLI profile named after
 the agent, and listens as the agent. Add `--trust members` only if the user asked for anyone in
 the organisation to be able to use the agent. The default trusts only the agent's owner.
 
-Watch its output with the Monitor tool when you have it, using the longest timeout it allows and
-exactly this command, with `OUTPUT` set to the connector's output file:
+It checks the inbox every 30 seconds and finishes as soon as it has passed on a request. When it
+finishes, read its whole output and act on every line, then start it again straight away, in the
+background, as the agent and without `--fresh` (keep `--trust members` if you used it):
 
 ```bash
-f=OUTPUT; seen="$f.seen"; n=$(cat "$seen" 2>/dev/null || echo 0)
-while true; do
-  m=$(wc -l < "$f")
-  if [ "$m" -gt "$n" ]; then
-    sed -n "$((n + 1)),${m}p" "$f" | grep -v '"retryable":true'
-    n=$m; echo "$n" > "$seen"
-  fi
-  sleep 3
-done
+shapeup --profile <profile> connect --until-request
 ```
 
-Don't use `tail -f` or `tail -F` on the output file: they can miss lines. The command keeps its place
-in `OUTPUT.seen`, so when the watch ends but the connector is still running, start it again
-straight away, without telling the user, and nothing is missed or repeated. If the connector
-exits, you are told separately. Every line is one JSON event:
+`--fresh` is only for the first start in a session: it hands out again anything an earlier
+session left unfinished. Without it, the connector never hands out the same request twice.
+Don't watch its output with Monitor or `tail`: the connector finishing is what wakes you, even
+when your last turn ended in an error. Every line is one JSON event:
 
 | `type` | What to do |
 |--------|------------|
-| `connected` | Tell the user the agent is listening. Note `profile`: from now on, run every ShapeUp command for this agent as `shapeup --profile <profile> ...` (leave out `--profile` when it is null). |
+| `connected` | The first time, tell the user the agent is listening; after a restart, say nothing. Note `profile`: from now on, run every ShapeUp command for this agent as `shapeup --profile <profile> ...` (leave out `--profile` when it is null). |
 | `request` | Handle it, below. |
 | `ignored` | Tell the user in one line who asked and that they are not trusted. Do nothing else. |
 | `error` | Nothing while `retryable` is true: the connector keeps retrying by itself, pausing longer each time, up to two minutes. Otherwise tell the user the `message`. If the connector exits after a network error (`code` is `network`, or the message mentions a connection), wait a minute and restart it; give up and tell the user after five restarts in a row that never reach `connected`. For any other exit, restart it once. |
@@ -134,7 +128,7 @@ Don't poll the inbox yourself. The connector does that.
 
 ## Handle a request, within seconds
 
-A `request` line carries `id`, `reason` (mentioned, assigned or watching), `issue`, `request`
+A `request` line carries `id`, `reason` (mentioned, replied, assigned or watching), `issue`, `request`
 (the words that asked), `requester` and `reply_to`.
 
 1. **Acknowledge it.** When `request.comment_id` is set, react to it:
@@ -148,7 +142,7 @@ A `request` line carries `id`, `reason` (mentioned, assigned or watching), `issu
    `shapeup --profile <profile> issues move <issue_id> --column "<name>"`. If there is none, skip this.
 3. **Hand it off.** Start one background subagent per request, with the request line and the
    worker brief below. Tell the user in one line, for example "@bond picked up #42 from @miles".
-4. **Keep listening.**
+4. **Keep listening.** Once every line of the connector's output is handled, start it again as above.
 
 ## Worker brief
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shapeup-cli
 version: !ruby/object:Gem::Version
-  version: 0.10.4
+  version: 0.11.0
 platform: ruby
 authors:
 - ShapeUp