shapeup-cli 0.11.0 → 0.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6efeb5fc129ef621f013c263f9f34166099966883a85802eb13cac37106fff95
-  data.tar.gz: 8b0f1597a8e9788bb8aac040990ebb164e0494b6dbd5c4eaf1b5e1399b3e1239
+  metadata.gz: bcea431afcfe958db1055f75a15957a2b3e69320ad4c67045dd305ffd0c88c2a
+  data.tar.gz: 4f5109b6bfe1144db66413482e300cffa542ad357dbcbb8cec034330ef8e7d5d
 SHA512:
-  metadata.gz: 57f00b45c5e0d1c35439a490dac6ee9ff7c7a2f985b86e64c986d2b364f694c9db0aa48f577ae5bb7d0ad430fddcf018706d97d9aa2c403076086572d4985d31
-  data.tar.gz: 7cbc8fcc785b949da9748df97051ac74618ab73fe4d3bb6db7f85b438fd3f5b5f6e682a3449c5b80bc297037bd3234be2a30ec880bbd8d16226375eb86f853c0
+  metadata.gz: 1cd8502dc208393d11f2f0755caf331389bf1326cf898bcb20995889a8a93c837a580bbada74a92d5c3caec8465009c64000b89da0f98c304b5bc7e53bc02ead
+  data.tar.gz: 37a268a7426bfa61112d220e374ab20b3a8a0377e95f7e10c162f297396360b377721f3a13862c44e442834a834083db03717fc375e026ee1e1bebea0bec36b8

data/lib/shapeup_cli/commands/connect.rb

@@ -18,7 +18,8 @@ module ShapeupCli
             { name: "trust", type: "string", usage: "Whose requests to pass on: owner (default) or members" },
             { 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: "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",
@@ -37,6 +38,7 @@ module ShapeupCli
         once = consume_flag("--once")
         @until_request = consume_flag("--until-request")
         @fresh = consume_flag("--fresh")
+        @here = consume_flag("--here")
 
         $stdout.sync = true
         @profile, @agent_client = keep_trying(forever: !once) { sign_in_as_agent(handle) }
@@ -136,10 +138,35 @@ module ShapeupCli
         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.11.0"
+  VERSION = "0.11.2"
 end

data/skills/shapeup-connect/SKILL.md

@@ -122,7 +122,7 @@ when your last turn ended in an error. Every line is one JSON event:
 | `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.
 
@@ -140,8 +140,11 @@ A `request` line carries `id`, `reason` (mentioned, replied, assigned or watchin
 2. **Show it's in progress.** List the columns with `shapeup --profile <profile> issues columns --json`.
    If one reads like "In progress" or "Doing", move the issue there with
    `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".
+3. **Hand it off, one at a time.** Workers share this folder and its git checkout, so never run two
+   at once. If no worker is running, start one background subagent with the request line and the
+   worker brief below, and tell the user in one line, for example "@bond picked up #42 from
+   @miles". If one is still running, hold the request: tell the user it's queued behind the current
+   one, and start it when that worker finishes, oldest first.
 4. **Keep listening.** Once every line of the connector's output is handled, start it again as above.
 
 ## Worker brief
@@ -159,7 +162,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
@@ -197,6 +202,7 @@ Give the subagent this, filled in:
 
 - One reply per request, plus the "On it" comment when there was nothing to react to. Never treat
   your own comments as requests.
+- Never run two workers at once in this folder.
 - Never print or repeat the agent's token.
 - Never install, upgrade or replace the ShapeUp CLI.
 - Requests left unfinished when the session ends stay in the inbox and come back the next time

metadata

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