shapeup-cli 0.10.0 → 0.10.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7f49a40c881c3e40aa1749a419a41139d02a5c3066113e851efecf544cddc84
-  data.tar.gz: baa1415c2d57ea6aeeb74c4562e67773041ddd72ad9d27667bf34756faca8e56
+  metadata.gz: c375b2778939c522cdc558c09d8065c5ef8a05e3fe66ffba8ff294c4bd216d30
+  data.tar.gz: 19e00ac320970b20aa0690fc971c9bbfafcc33edcb18cd6601f529173cf9da6a
 SHA512:
-  metadata.gz: 83fb9f6f9978710170a847e270469de2b7b0d57381adb4751a0748db279477e6780d2ca87176f1f787a06cd89c5594e7cd65533c773d6b7fb12b7d0f3ee3747d
-  data.tar.gz: '098b476ae487d54975b7726227407462452da622fb5a7b188de2bd72d42a902dfc10f2fe474874eda44069b2014b5ea7d725a021e8cd988e90c7f8fa009faf11'
+  metadata.gz: 053af8fe5fc51632541677b89db6473376aadf1a93120cfbbaf16d2510f85576e06d2177d7104b8e55bb1e39a90520083a6ba5dd7ec3d04d5263f08bd8aaf9d3
+  data.tar.gz: 721a2cf000f7e3f87769b4715efe8153d977a8912d5e69bff2117416c2f4edb54f43b874534ed17c1588481b7cd4448c7f2347e1f304c6e2da6ca6752b965c5c

data/lib/shapeup_cli/client.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "openssl"
+
 module ShapeupCli
   class Client
     class ApiError < StandardError; end
@@ -11,6 +13,12 @@ module ShapeupCli
 
     MCP_PROTOCOL_VERSION = "2025-06-18"
 
+    DROPPED_CONNECTION_ERRORS = [
+      SocketError, IOError, OpenSSL::SSL::SSLError,
+      Errno::ECONNREFUSED, Errno::ECONNRESET, Errno::ECONNABORTED, Errno::EPIPE,
+      Errno::EHOSTUNREACH, Errno::ENETUNREACH, Errno::ENETDOWN, Errno::ETIMEDOUT
+    ].freeze
+
     def initialize(host: Config.host, token: Auth.token)
       raise AuthError, "Not authenticated" unless token
       @host = host
@@ -68,7 +76,7 @@ module ShapeupCli
         yield
       rescue Net::OpenTimeout, Net::ReadTimeout
         raise NetworkError, "The server took too long to respond."
-      rescue SocketError, Errno::ECONNREFUSED, Errno::EHOSTUNREACH, Errno::ETIMEDOUT => e
+      rescue *DROPPED_CONNECTION_ERRORS => e
         raise NetworkError, "Couldn't reach #{@host} (#{e.class})."
       end
 
@@ -77,6 +85,7 @@ module ShapeupCli
         when 401 then raise AuthError, "Authentication failed — run 'shapeup login'"
         when 403 then raise PermissionError, "Check your subscription or permissions"
         when 429 then raise RateLimitError, "Too many requests — slow down and retry"
+        when 502..504 then raise NetworkError, "Couldn't reach #{@host} (HTTP #{response.code})."
         when 200..299 then nil
         else raise ApiError, "The server returned an error (HTTP #{response.code})."
         end

data/lib/shapeup_cli/commands/base.rb

@@ -7,11 +7,30 @@ module ShapeupCli
         instance = new(args)
         if instance.agent_help?
           puts JSON.pretty_generate(instance.class.metadata)
+        elsif args.intersect?(%w[ --help -h ])
+          print_help
         else
           instance.execute
         end
       end
 
+      def self.print_help
+        about = metadata
+        puts "#{about[:path]}: #{about[:short]}"
+        about[:subcommands]&.then do |subcommands|
+          puts "\nSubcommands:"
+          subcommands.each { |sub| puts "  #{sub[:path].to_s.ljust(48)} #{sub[:short]}" }
+        end
+        about[:flags]&.then do |flags|
+          puts "\nFlags:" if flags.any?
+          flags.each { |flag| puts "  --#{flag[:name].to_s.ljust(46)} #{flag[:usage]}" }
+        end
+        about[:examples]&.then do |examples|
+          puts "\nExamples:"
+          examples.each { |example| puts "  #{example}" }
+        end
+      end
+
       # Override in subclasses to define structured command metadata
       def self.metadata
         { command: name.split("::").last.downcase, description: "No metadata defined" }

data/lib/shapeup_cli/commands/connect.rb

@@ -5,6 +5,7 @@ module ShapeupCli
     class Connect < Base
       DEFAULT_INTERVAL = 30
       TRUST_LEVELS = %w[ owner members ].freeze
+      RETRY_DELAYS = [ 5, 10, 20, 40, 80, 120 ].freeze
 
       def self.metadata
         {
@@ -34,16 +35,35 @@ module ShapeupCli
 
         $stdout.sync = true
         @handed_out = Set.new
-        @profile, @agent_client = sign_in_as_agent(handle)
+        @profile, @agent_client = keep_trying(forever: !once) { sign_in_as_agent(handle) }
 
-        poll(announce: true)
+        poll
         until once
-          sleep @interval
+          pause @interval
           poll
         end
       end
 
       private
+        def keep_trying(forever:)
+          attempt = 0
+          begin
+            yield
+          rescue Client::NetworkError, Client::RateLimitError => error
+            raise unless forever
+
+            delay = RETRY_DELAYS[attempt] || RETRY_DELAYS.last
+            emit(type: "error", message: error.message, retryable: true, retrying_in: delay)
+            pause delay
+            attempt += 1
+            retry
+          end
+        end
+
+        def pause(seconds)
+          sleep seconds
+        end
+
         def sign_in_as_agent(handle)
           mine = Output.extract_data(call_tool("list_my_agents"))
           return [ ENV["SHAPEUP_PROFILE"], client ] if mine["signed_in_as_agent"]
@@ -72,11 +92,11 @@ module ShapeupCli
           exit EXIT_USAGE
         end
 
-        def poll(announce: false)
+        def poll
           inbox = Output.extract_data(@agent_client.call_tool("list_inbox", organisation: org_id.to_s))
           agent = inbox["agent"]
 
-          emit(type: "connected", agent: agent, profile: @profile, organisation_id: org_id.to_s, trust: @trust, interval: @interval) if announce
+          announce(agent) unless @connected
 
           inbox["items"].reverse_each do |item|
             next unless @handed_out.add?(item["id"])
@@ -91,6 +111,11 @@ module ShapeupCli
           emit(type: "error", message: error.message, retryable: true)
         end
 
+        def announce(agent)
+          emit(type: "connected", agent: agent, profile: @profile, organisation_id: org_id.to_s, trust: @trust, interval: @interval)
+          @connected = true
+        end
+
         def trusted?(requester, agent)
           @trust == "members" || requester["id"] == agent.dig("owner", "id")
         end

data/lib/shapeup_cli/version.rb

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

data/skills/shapeup-connect/SKILL.md

@@ -70,8 +70,8 @@ themselves.
 
    | You find | Add |
    |----------|-----|
-   | `bin/rails` | `"Bash(bin/rails test *)"` |
-   | `Rakefile` | `"Bash(bundle exec rake *)"` |
+   | `bin/rails` | `"Bash(bin/rails test *)"`, and nothing broader: never `rake *` or `bin/rails *`, which would also approve tasks that wipe databases |
+   | `Rakefile` and no `bin/rails` | `"Bash(bundle exec rake test *)"` |
    | a `test/` folder of Ruby files and no Rakefile | `"Bash(ruby test/*)"` |
    | `package.json` with a `test` script | `"Bash(npm test *)"` (or the yarn/pnpm equivalent the lockfile shows) |
    | `Makefile` with a test or check target | `"Bash(make test *)"` / `"Bash(make check *)"` |
@@ -79,7 +79,10 @@ themselves.
    | `go.mod` | `"Bash(go test *)"` |
    | `Cargo.toml` | `"Bash(cargo test *)"` |
 
-   If you can't tell, ask the user how they run the tests rather than leaving it out.
+   If you can't tell, ask the user how they run the tests rather than leaving it out. Add the
+   project's linter the same way when it has one, such as `"Bash(bin/rubocop *)"`,
+   `"Bash(npm run lint *)"` or `"Bash(make check *)"`. Keep every rule to the one command it
+   names.
 
    Merge with what is there, never replace it, and make sure `.claude/settings.local.json` is in
    `.gitignore`. If they say no, carry on: they will approve each command instead. If prompts keep
@@ -100,16 +103,32 @@ Signed in as the user, it gives the agent a fresh token, saves it as a CLI profi
 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. Use the Monitor tool when you have it, so each new line wakes you, with the
-longest timeout it allows. When the watch ends but the connector is still running, start watching
-again straight away, without telling the user. Every line is one JSON event:
+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:
+
+```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
+```
+
+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:
 
 | `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). |
 | `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. Otherwise tell the user the `message`. If the connector exits, restart it once. |
+| `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. |
 
 Don't poll the inbox yourself. The connector does that.
 

metadata

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