shapeup-cli 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c4b97dfcf5b4550677ef419ad28ae3900f770c5f3c3795e7b005d2a09582f472
-  data.tar.gz: 8ad78fe52812199514232eadbf8d5e52506e916c391ac6c240ad7730edd6d8fe
+  metadata.gz: ecb0aff2791935bf727f5afbb283ec92bb181325bb57b8ba0d6778d05b18db26
+  data.tar.gz: 8f938f4be9b1dafc98c44916bcf539b936ba89fa0ca9c245cf78b1531c6a64c6
 SHA512:
-  metadata.gz: 0467cb5be9b5e7d830406d00495cb9929dfd15772aa7ae09e8abb30237ebceb4e8cc2ad3286e2ef191d5a4186ced7cf900b1d66016edb9f31719a4bead6b06da
-  data.tar.gz: 9a8eea1d289458f647e4c9352a479e8f2bcc726d268a4577e3659c0b4f00132bf0d06a62f8d8f1a5251b01080c69611fe2baea7e0ebe54c53d203ed1432221f7
+  metadata.gz: f337c2f8aade0196c9cdaff8f48d7e10a4216736844e7b2381aa348dcc0855a12d8a0d3ee557fee7778599f1ab8bb15399676afcf87c8150b446e54e5328d323
+  data.tar.gz: 517305b0931a662d4b3b8a4cfb2910a3a879b64bfce4d303edaf7da7cf390a6f0c2c8f1155ab9f2f0261ec64c6ef69574fed070f564c0ad0b9f8b9ebe820149f

data/lib/shapeup_cli/commands/base.rb

@@ -100,6 +100,14 @@ module ShapeupCli
           value
         end
 
+        def extract_options(flag)
+          values = []
+          while (value = extract_option(flag))
+            values << value
+          end
+          values
+        end
+
         # Get the first positional arg (not a flag)
         def positional_arg(position = 0)
           positionals = @remaining.reject { |a| a.start_with?("--") }

data/lib/shapeup_cli/commands/comments.rb

@@ -20,7 +20,8 @@ module ShapeupCli
             { name: "pitch", type: "string", usage: "Pitch ID" },
             { name: "scope", type: "string", usage: "Scope ID" },
             { name: "task", type: "string", usage: "Task ID" },
-            { name: "parent", type: "string", usage: "Comment ID to reply under" }
+            { name: "parent", type: "string", usage: "Comment ID to reply under" },
+            { name: "attach", type: "string", usage: "Image to show under the comment (repeatable). Local ![description](path) images in the text are attached too" }
           ],
           examples: [
             "shapeup comments list --issue 42",
@@ -62,10 +63,15 @@ module ShapeupCli
         def add
           type, id = resolve_commentable
           parent = extract_option("--parent")
-          text = positional_arg(1) || abort('Usage: shapeup comments add --issue <id> [--parent <comment_id>] "Comment text"')
+          attach_paths = extract_options("--attach")
+          text = positional_arg(1) || abort('Usage: shapeup comments add --issue <id> [--parent <comment_id>] [--attach <image>] "Comment text"')
+
+          text, images = local_images_in(text)
+          images += attach_paths.map { |path| [ path, nil ] }
 
           arguments = { commentable_type: type, commentable_id: id.to_s, content: text }
           arguments[:parent_id] = parent.to_s if parent
+          arguments[:attachments] = images.map { |path, alt| upload_image(path, alt) } if images.any?
           result = call_tool("create_comment", **arguments)
 
           render result,
@@ -103,6 +109,35 @@ module ShapeupCli
           render result, summary: "Reacted #{emoji} to comment ##{comment_id}"
         end
 
+        IMAGE_TYPES = { ".png" => "image/png", ".jpg" => "image/jpeg", ".jpeg" => "image/jpeg", ".gif" => "image/gif", ".webp" => "image/webp" }.freeze
+        IMAGE_MAX_SIZE = 10 * 1024 * 1024
+        MARKDOWN_IMAGE = /!\[([^\]]*)\]\(([^)\s]+)\)\n?/
+
+        def local_images_in(text)
+          images = []
+          text = text.gsub(MARKDOWN_IMAGE) do |markdown|
+            alt, path = $1, $2
+            if path.match?(%r{\A[a-z][a-z0-9+.-]*://}i) || !File.file?(path)
+              markdown
+            else
+              images << [ path, alt ]
+              ""
+            end
+          end
+          [ text.strip, images ]
+        end
+
+        def upload_image(path, alt)
+          abort "No such file: #{path}" unless File.file?(path)
+          content_type = IMAGE_TYPES[File.extname(path).downcase] or abort "Only PNG, JPEG, GIF and WebP images can be attached: #{path}"
+          abort "Images can be at most 10 MB: #{path}" if File.size(path) > IMAGE_MAX_SIZE
+
+          data = [ File.binread(path) ].pack("m0")
+          uploaded = Output.extract_data(call_tool("upload_attachment", filename: File.basename(path), content_type: content_type, data: data))
+
+          { attachment: uploaded["attachment"], alt: alt.to_s.empty? ? File.basename(path, ".*").tr("-_", " ") : alt }
+        end
+
         def resolve_commentable
           issue = extract_option("--issue")
           pitch = extract_option("--pitch")

data/lib/shapeup_cli/commands/config_cmd.rb

@@ -121,7 +121,7 @@ module ShapeupCli
 
         def profile_candidates
           select_first [
-            { source: "SHAPEUP_PROFILE env", value: ENV["SHAPEUP_PROFILE"] },
+            { source: "--profile flag or SHAPEUP_PROFILE env", value: ENV["SHAPEUP_PROFILE"] },
             { source: "profiles.json default", value: Config.saved_default_profile }
           ]
         end
@@ -130,6 +130,7 @@ module ShapeupCli
           select_first [
             { source: "--org flag", value: @org_id },
             { source: "SHAPEUP_ORG env", value: ENV["SHAPEUP_ORG"] },
+            { source: picked_profile_source, value: Config.chosen_profile_value("organisation_id") },
             { source: project_config_source, value: Config.project_config["organisation_id"] },
             { source: "~/.config/shapeup/config.json", value: Config.global_config["organisation_id"] },
             { source: "profile '#{Config.current_profile_name}'", value: Config.current_profile&.dig("organisation_id") }
@@ -139,6 +140,7 @@ module ShapeupCli
         def host_candidates
           select_first [
             { source: "SHAPEUP_HOST env", value: ENV["SHAPEUP_HOST"] },
+            { source: picked_profile_source, value: Config.chosen_profile_value("host") },
             { source: project_config_source, value: Config.project_config["host"] },
             { source: "~/.config/shapeup/config.json", value: Config.global_config["host"] },
             { source: "profile '#{Config.current_profile_name}'", value: Config.current_profile&.dig("host") },
@@ -153,6 +155,10 @@ module ShapeupCli
           ]
         end
 
+        def picked_profile_source
+          "profile picked with --profile (#{ENV["SHAPEUP_PROFILE"] || "none"})"
+        end
+
         def project_config_source
           Config.project_config_path || Config::PROJECT_CONFIG_NAME
         end

data/lib/shapeup_cli/version.rb

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

data/skills/shapeup/SKILL.md

@@ -222,6 +222,7 @@ Branch on `retryable` to decide retry-vs-abandon; `false` means "no known reason
 | Watch the inbox as JSON lines | `SHAPEUP_PROFILE=<agent> shapeup connect` |
 | Reply under a comment | `shapeup comments add --issue <id> --parent <comment_id> "Reply"` |
 | React to a comment | `shapeup comments react <comment_id> 👀` |
+| Attach screenshots to a comment | `shapeup comments add --issue <id> "Text ![What it shows](./shot.png)"` or `--attach shot.png` |
 
 ## Common Workflows
 

data/skills/shapeup-connect/SKILL.md

@@ -64,6 +64,23 @@ themselves.
    }
    ```
 
+   Always fill in the test command before asking, so the agent can check its work unattended.
+   Work out how this project runs its tests from what is in the directory, and list each way
+   you find:
+
+   | You find | Add |
+   |----------|-----|
+   | `bin/rails` | `"Bash(bin/rails test *)"` |
+   | `Rakefile` | `"Bash(bundle exec rake *)"` |
+   | 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 *)"` |
+   | `pyproject.toml`, `pytest.ini` or `tests/` with Python | `"Bash(pytest *)"` |
+   | `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.
+
    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
    appearing after writing it, tell them a new session picks the rules up.
@@ -125,13 +142,20 @@ Give the subagent this, filled in:
 >    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.
-> 5. Reply once, under the comment that asked:
+> 5. If the work changes anything people see, show it. Use whatever browser tool you have to take
+>    screenshots of each place it touches, before (from the main branch) and after (from yours),
+>    at the size people use it and on a phone when it matters. Save them as PNG files outside the
+>    repository, with names that say what they show.
+> 6. Reply once, under the comment that asked:
 >    `shapeup --profile <profile> comments add --issue <issue.id> --parent <reply_to.comment_id> "<reply>"`
 >    (leave out `--parent` when `reply_to.comment_id` is null). Start with `@<requester.name>`.
 >    Say what changed, the branch and commit, how you checked it, and anything still open.
->    Keep it short and plain.
-> 6. Then take it out of the inbox: `shapeup --profile <profile> inbox done <id>`.
-> 7. Report back in one line.
+>    Keep it short and plain. Put each screenshot in the reply as a local Markdown image,
+>    `![Toolbar after the fix, on a phone](/tmp/toolbar-after-phone.png)`: the CLI uploads it and
+>    the words in brackets become its description for people who can't see it, so write them
+>    properly. Mention anyone the requester asked you to hand over to.
+> 7. Then take it out of the inbox: `shapeup --profile <profile> inbox done <id>`.
+> 8. Report back in one line.
 
 ## Rules
 

metadata

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