shapeup-cli 0.10.5 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a45ee37e8d065758ff406860f939921f4ddb7341bed82732cee1454ab2cde0c1
-  data.tar.gz: 9b8230e7e221798866fa6c1ca1fbe947f2aacef3a6ae03500a32cdfd494a08cd
+  metadata.gz: aaa4bfac80b5b904dc087542495c2b208af118e757c186154decdc5f10a27202
+  data.tar.gz: 5807b66ff822944751b0261953465424413dec6d3017141502fc46c8090ef0ba
 SHA512:
-  metadata.gz: 03bb70e47f6b4322602c8e86d8e129ad153dc9e6f0596dd9fa54f6127f910a8fa428b51cd723c19389f4b2a31b698469afdc851c862a97390aa94f272af4bf63
-  data.tar.gz: 6eba12bf921de8b62efbda85d1d410ece152c11399872384ef54b9daae70adc64bc1ced1fcf8fb808cfb0e1343a2d506154d9db53ef6c6c39ed7a023c1fa4907
+  metadata.gz: 0cbb7d0347602e616ad0212a2e802df002b8e79e9c9732055b00a2c734a6f3b3ee7b9624ea6ff77cf7d1effaeeaf17473d33701532ef8b7c34446e2b11130c31
+  data.tar.gz: 1efa2c97485f0c93b655be01e04f5f2be20ba828f2bb735a33e12b93ce8074dafc94d6eddb78a2571327975da25d639437b8869394a41fae36de4249946c472c

data/lib/shapeup_cli/commands/connect.rb

@@ -16,12 +16,16 @@ 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" },
+            { name: "here", type: "bool", usage: "Use this folder even though another of your agents last listened in it" }
           ],
           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 +36,15 @@ 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")
+        @here = consume_flag("--here")
 
         $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,25 +103,70 @@ 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)
+          claim_folder(agent)
+          emit(type: "connected", agent: agent, profile: @profile, organisation_id: org_id.to_s, trust: @trust, interval: @interval, folder: Dir.pwd)
           @connected = true
         end
 
+        def claim_folder(agent)
+          folders = read_folders
+          previous = folders[Dir.pwd]
+
+          if previous && previous != agent["name"] && !@here
+            emit(type: "error", code: "folder", retryable: false, folder: Dir.pwd, last_used_by: previous,
+              message: "@#{previous} last listened in this folder. Run again with --here to use it for @#{agent["name"]} instead.")
+            exit EXIT_USAGE
+          end
+
+          FileUtils.mkdir_p(File.dirname(folders_path))
+          File.write(folders_path, JSON.pretty_generate(folders.merge(Dir.pwd => agent["name"])))
+        end
+
+        def folders_path
+          File.join(Config::CONFIG_DIR, "connect", "folders.json")
+        end
+
+        def read_folders
+          JSON.parse(File.read(folders_path))
+        rescue Errno::ENOENT, JSON::ParserError
+          {}
+        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.5"
+  VERSION = "0.11.1"
 end

data/skills/shapeup-connect/SKILL.md

@@ -93,42 +93,36 @@ 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. |
+| `error` | If `code` is `folder`, another of the user's agents last listened in this folder: ask the user whether this folder is right for this agent, and only if they say yes, start again with `--here`. Otherwise, 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.
 
@@ -148,7 +142,7 @@ A `request` line carries `id`, `reason` (mentioned, replied, assigned or watchin
    `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
 
@@ -165,7 +159,9 @@ Give the subagent this, filled in:
 >    `agent/<issue.id>-<short-slug>` from the latest default branch on the remote (for example
 >    `origin/main`), not from whatever is checked out, and commit there. Never push, deploy, merge or delete branches unless the owner said so in this
 >    session.
-> 4. If the ask is unclear or you are blocked, ask on the issue rather than guess.
+> 4. If the ask is unclear or you are blocked, ask on the issue rather than guess. If the issue is
+>    clearly about a different product or codebase than this repository, say so on the issue and
+>    stop.
 > 5. If the work changes anything people see, compare it the way a careful reviewer would:
 >    - From your diff, list the screens and states it touches, including the ones it could break.
 >    - Run the main branch beside yours: check main out into a git worktree outside this

metadata

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