shapeup-cli 0.11.0 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6efeb5fc129ef621f013c263f9f34166099966883a85802eb13cac37106fff95
-  data.tar.gz: 8b0f1597a8e9788bb8aac040990ebb164e0494b6dbd5c4eaf1b5e1399b3e1239
+  metadata.gz: aaa4bfac80b5b904dc087542495c2b208af118e757c186154decdc5f10a27202
+  data.tar.gz: 5807b66ff822944751b0261953465424413dec6d3017141502fc46c8090ef0ba
 SHA512:
-  metadata.gz: 57f00b45c5e0d1c35439a490dac6ee9ff7c7a2f985b86e64c986d2b364f694c9db0aa48f577ae5bb7d0ad430fddcf018706d97d9aa2c403076086572d4985d31
-  data.tar.gz: 7cbc8fcc785b949da9748df97051ac74618ab73fe4d3bb6db7f85b438fd3f5b5f6e682a3449c5b80bc297037bd3234be2a30ec880bbd8d16226375eb86f853c0
+  metadata.gz: 0cbb7d0347602e616ad0212a2e802df002b8e79e9c9732055b00a2c734a6f3b3ee7b9624ea6ff77cf7d1effaeeaf17473d33701532ef8b7c34446e2b11130c31
+  data.tar.gz: 1efa2c97485f0c93b655be01e04f5f2be20ba828f2bb735a33e12b93ce8074dafc94d6eddb78a2571327975da25d639437b8869394a41fae36de4249946c472c

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.1"
 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.
 
@@ -159,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.11.0
+  version: 0.11.1
 platform: ruby
 authors:
 - ShapeUp