bugcap 0.5.1__tar.gz → 0.6.0__tar.gz

{bugcap-0.5.1/src/bugcap.egg-info → bugcap-0.6.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bugcap
-Version: 0.5.1
+Version: 0.6.0
 Summary: Local-first, agent-readable bug capture: annotated screenshots + notes, stored locally, synced to trackers on your own schedule.
 Author: Konrad Tagnon Amen ALAHASSA
 License: MIT
@@ -83,6 +83,8 @@ bugcap dashboard --open                 # browse and triage in the browser
 The [usage guide](https://amenalahassa.github.io/bugcap/usage.html) covers every command: images
 and labels, recording, live mode, `@` references, GitHub pull and sync, and the MCP tools.
 
+If a report ID is not found, the error suggests `bugcap list --all` to see report IDs across all repos.
+
 ## Connect your agent (MCP)
 
 Requires the `mcp` extra. Then give your agent access to the reports:
@@ -98,7 +100,7 @@ Or in a project's `.mcp.json`:
 ```
 
 The server exposes six tools: `list_reports`, `get_report` (returns the screenshot), `request_screenshot`,
-`pull_issues`, `attach_image` and `update_notes`. Logs go to `logs/mcp-server.log` in the data
+`pull_issues`, `attach_image`, `attach_file` and `update_notes`. Logs go to `logs/mcp-server.log` in the data
 directory, never to stdout.
 
 Ask your agent something like *"list the open bugcap reports for this repo and fix the one with
@@ -147,7 +149,7 @@ pull and sync, MCP, and where data lives per OS.
 
 Notes on the more involved behaviour:
 
-- **References.** In a note, `@i1` is image 1, `@v2` a video, `@g3` an animated GIF, `@f4` a frame set, and `@login-error` a labelled item. `#3` points at report 3 (a missing one is kept as text with a warning). Media references are validated on save, and relabelling or removing a referenced item needs `--force`.
+- **References.** In a note, `@i1` is image 1, `@v2` a video, `@g3` an animated GIF, `@f4` a frame set, `@d5` an attached file (`attach --file`, any type), and `@login-error` a labelled item. `#3` points at report 3 (a missing one is kept as text with a warning). Media references are validated on save, and relabelling or removing a referenced item needs `--force`.
 - **Repo values** (`init`, `sync`, `config repo set`) are checked for format and, with `gh`, for existence. Changing the repo identity offers to move existing reports.
 - **Media sync** over `[sync] max_upload_mb` (default 25) is skipped with a warning.
 

{bugcap-0.5.1 → bugcap-0.6.0}/README.md

@@ -66,6 +66,8 @@ bugcap dashboard --open                 # browse and triage in the browser
 The [usage guide](https://amenalahassa.github.io/bugcap/usage.html) covers every command: images
 and labels, recording, live mode, `@` references, GitHub pull and sync, and the MCP tools.
 
+If a report ID is not found, the error suggests `bugcap list --all` to see report IDs across all repos.
+
 ## Connect your agent (MCP)
 
 Requires the `mcp` extra. Then give your agent access to the reports:
@@ -81,7 +83,7 @@ Or in a project's `.mcp.json`:
 ```
 
 The server exposes six tools: `list_reports`, `get_report` (returns the screenshot), `request_screenshot`,
-`pull_issues`, `attach_image` and `update_notes`. Logs go to `logs/mcp-server.log` in the data
+`pull_issues`, `attach_image`, `attach_file` and `update_notes`. Logs go to `logs/mcp-server.log` in the data
 directory, never to stdout.
 
 Ask your agent something like *"list the open bugcap reports for this repo and fix the one with
@@ -130,7 +132,7 @@ pull and sync, MCP, and where data lives per OS.
 
 Notes on the more involved behaviour:
 
-- **References.** In a note, `@i1` is image 1, `@v2` a video, `@g3` an animated GIF, `@f4` a frame set, and `@login-error` a labelled item. `#3` points at report 3 (a missing one is kept as text with a warning). Media references are validated on save, and relabelling or removing a referenced item needs `--force`.
+- **References.** In a note, `@i1` is image 1, `@v2` a video, `@g3` an animated GIF, `@f4` a frame set, `@d5` an attached file (`attach --file`, any type), and `@login-error` a labelled item. `#3` points at report 3 (a missing one is kept as text with a warning). Media references are validated on save, and relabelling or removing a referenced item needs `--force`.
 - **Repo values** (`init`, `sync`, `config repo set`) are checked for format and, with `gh`, for existence. Changing the repo identity offers to move existing reports.
 - **Media sync** over `[sync] max_upload_mb` (default 25) is skipped with a warning.
 

{bugcap-0.5.1 → bugcap-0.6.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "bugcap"
-version = "0.5.1"
+version = "0.6.0"
 description = "Local-first, agent-readable bug capture: annotated screenshots + notes, stored locally, synced to trackers on your own schedule."
 readme = "README.md"
 requires-python = ">=3.10"

bugcap-0.6.0/src/bugcap/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.6.0"

{bugcap-0.5.1 → bugcap-0.6.0}/src/bugcap/agent_api.py

@@ -97,10 +97,19 @@ def get_report(store: Store, id: int) -> dict:
 
 def attach_image(store: Store, id: int, sources: list[str], labels: Optional[list] = None) -> dict:
     """Attach images (paths, globs, http(s) URLs) to a report; partial batches are reported."""
+    return _attach(store, id, sources, labels, service.add_media)
+
+
+def attach_file(store: Store, id: int, sources: list[str], labels: Optional[list] = None) -> dict:
+    """Attach files of any type (paths, globs, http(s) URLs) to a report."""
+    return _attach(store, id, sources, labels, service.add_files)
+
+
+def _attach(store: Store, id: int, sources: list[str], labels, add) -> dict:
     if not sources or len(sources) > 20:
         return {"code": "bad_query", "error": "sources must contain 1 to 20 entries"}
     try:
-        result = service.add_media(store, id, list(sources), labels)
+        result = add(store, id, list(sources), labels)
     except ServiceError as exc:
         return {"error": exc.message, **exc.as_dict()}
     return {

{bugcap-0.5.1 → bugcap-0.6.0}/src/bugcap/backends.py

@@ -95,8 +95,51 @@ def by_name(name: str) -> Backend:
     raise KeyError(name)
 
 
+def _sync_path_from_registry() -> None:
+    """Pick up a freshly-installed Windows tool without a new terminal.
+
+    winget/scoop/choco update the user/machine PATH in the registry, but an
+    already-running process (and any shell that was already open when the
+    install happened) keeps its original PATH until it restarts. That made
+    `bugcap live` report "No capture tool found" right after `bugcap setup`
+    had just installed flameshot in the same session. Re-reading PATH from
+    the registry before every detection closes that gap. Best-effort: any
+    failure here just leaves PATH as-is.
+    """
+    if sys.platform != "win32":
+        return
+    try:
+        import winreg
+    except ImportError:
+        return
+    try:
+        chunks = [os.environ.get("PATH", "")]
+        for hive, subkey in (
+            (winreg.HKEY_CURRENT_USER, r"Environment"),
+            (winreg.HKEY_LOCAL_MACHINE, r"SYSTEM\CurrentControlSet\Control\Session Manager\Environment"),
+        ):
+            try:
+                with winreg.OpenKey(hive, subkey) as key:
+                    value, _ = winreg.QueryValueEx(key, "Path")
+                    chunks.append(value)
+            except OSError:
+                continue
+        seen = set()
+        merged = []
+        for chunk in chunks:
+            for part in chunk.split(os.pathsep):
+                key = part.lower()
+                if part and key not in seen:
+                    seen.add(key)
+                    merged.append(part)
+        os.environ["PATH"] = os.pathsep.join(merged)
+    except OSError:
+        pass
+
+
 def detect() -> Optional[Backend]:
     """First available backend, in preference order."""
+    _sync_path_from_registry()
     return next((b for b in BACKENDS if b.available()), None)
 
 

{bugcap-0.5.1 → bugcap-0.6.0}/src/bugcap/cli.py

@@ -24,7 +24,10 @@ def resolve_report(store: Store, report_id: int):
     """Return the report, or print the standard not-found error and return None."""
     report = store.get(report_id)
     if report is None:
-        print(f"error: no report with id {report_id}", file=sys.stderr)
+        print(
+            f"error: no report with id {report_id}; run `bugcap list --all` to see report ids",
+            file=sys.stderr,
+        )
     return report
 
 
@@ -40,7 +43,7 @@ def print_service_error(exc: ServiceError) -> None:
 def print_ingest(added, rejected) -> None:
     """One line per input: `added #<idx> ...` on stdout, `skipped ...` on stderr."""
     for media in added:
-        name = os.path.basename(media.path or "")
+        name = os.path.basename((media.source if media.kind == "file" and media.source else media.path) or "")
         print(f"added {refs.media_token(media)} {name} ({media.kind}, {human_size(media.size_bytes)})")
     for item in rejected:
         print(f"skipped {item['source']}: {item['reason']}", file=sys.stderr)
@@ -225,7 +228,13 @@ def _setup_capture(args: argparse.Namespace) -> int:
     if rc != 0:
         print(f"error: install command failed (exit {rc}).", file=sys.stderr)
         return 1
-    print(f"{rec.name} installed.")
+    if backends.detect() is not None:
+        print(f"{rec.name} installed.")
+        return 0
+    print(
+        f"{rec.name} installed, but this terminal can't see it on PATH yet.\n"
+        f"Close and reopen your terminal (or start a new one), then run `bugcap setup` again."
+    )
     return 0
 
 
@@ -536,14 +545,22 @@ def cmd_attach(args: argparse.Namespace) -> int:
         added: list = []
         rejected: list = []
         shot_path = None
-        if args.image:
-            try:
-                result = service.add_media(store, args.id, list(args.image), labels)
-            except ServiceError as exc:
-                print_service_error(exc)
-                return 1
-            added, rejected = result.added, result.rejected
-            print_ingest(added, rejected)
+        if args.image or args.file:
+            batches = (
+                (args.image, service.add_media, labels),
+                (args.file, service.add_files, list(args.file_label or [])),
+            )
+            for sources, add, batch_labels in batches:
+                if not sources:
+                    continue
+                try:
+                    result = add(store, args.id, list(sources), batch_labels)
+                except ServiceError as exc:
+                    print_service_error(exc)
+                    return 1
+                added += result.added
+                rejected += result.rejected
+                print_ingest(result.added, result.rejected)
         else:
             try:
                 shot_path = capture.capture_screenshot()
@@ -568,7 +585,7 @@ def cmd_attach(args: argparse.Namespace) -> int:
                 return 1
         current = store.get(args.id)
         _warn_report_refs(store, current.notes)
-        if args.image:
+        if args.image or args.file:
             try:
                 refs.validate_references(current.notes, current.media)
             except ServiceError as exc:
@@ -901,12 +918,16 @@ def build_parser() -> argparse.ArgumentParser:
     p.add_argument("tags", nargs="+")
     p.set_defaults(func=cmd_tag)
 
-    p = sub.add_parser("attach", help="Attach a screenshot (captured or imported) to a report.")
+    p = sub.add_parser("attach", help="Attach a screenshot (captured or imported) or any file to a report.")
     p.add_argument("id", type=int)
     p.add_argument("--image", action="append", metavar="SRC",
                    help="Import an image (path, glob or http(s) URL) instead of launching a capture tool; repeatable.")
     p.add_argument("--label", action="append", help="Label for the --image at the same position (repeatable).")
-    p.add_argument("--note", help="Text appended to the report's notes, tied to the image(s) added here.")
+    p.add_argument("--file", action="append", metavar="SRC",
+                   help="Attach a file of any type (path, glob or http(s) URL); repeatable. "
+                        "Refer to it in notes as @d1, @d2, ... or by label.")
+    p.add_argument("--file-label", action="append", help="Label for the --file at the same position (repeatable).")
+    p.add_argument("--note", help="Text appended to the report's notes, tied to the item(s) added here.")
     p.set_defaults(func=cmd_attach)
 
     p = sub.add_parser("images", help="List a report's images, or relabel/remove one.")
@@ -982,7 +1003,27 @@ def build_parser() -> argparse.ArgumentParser:
     return parser
 
 
+def _use_utf8_streams() -> None:
+    """Make stdout/stderr tolerant of report text the console's codepage can't show.
+
+    Report titles and notes are free-form user text and may contain characters
+    (accents, emoji, …) outside the active console codepage. On Windows that
+    codepage is often cp1252, so a bare `print()` of such text raises
+    UnicodeEncodeError and crashes the CLI (e.g. `bugcap show`). Reconfiguring
+    to UTF-8 with 'replace' keeps the command running and shows readable output
+    instead of a traceback.
+    """
+    for stream in (sys.stdout, sys.stderr):
+        reconfigure = getattr(stream, "reconfigure", None)
+        if reconfigure is not None:
+            try:
+                reconfigure(encoding="utf-8", errors="replace")
+            except (ValueError, OSError):
+                pass
+
+
 def main(argv: list[str] | None = None) -> int:
+    _use_utf8_streams()
     parser = build_parser()
     args = parser.parse_args(argv)
     return args.func(args)

{bugcap-0.5.1 → bugcap-0.6.0}/src/bugcap/dashboard/media.py

@@ -31,8 +31,10 @@ def parse_range(header: str | None, size: int):
     return start, min(end, size - 1)
 
 
-def serve_media(handler, rel_path, mime: str, range_header: str | None) -> None:
-    """`rel_path` is the stored data-relative path; it must resolve inside images/ or media/."""
+def serve_media(handler, rel_path, mime: str, range_header: str | None, download_name: str | None = None) -> None:
+    """`rel_path` is the stored data-relative path; it must resolve inside the media store.
+    With `download_name` (attached files of any type) the bytes are always sent as an opaque
+    download, never rendered, so an uploaded HTML or SVG file cannot run on the dashboard origin."""
     try:
         path = resolve_data_path(rel_path)
         if not path.is_file():
@@ -53,7 +55,12 @@ def serve_media(handler, rel_path, mime: str, range_header: str | None) -> None:
     start, end = rng if rng else (0, size - 1)
     handler.send_response(206 if rng else 200)
     handler.send_security_headers()
-    handler.send_header("Content-Type", mime)
+    if download_name is not None:
+        safe = re.sub(r"[^A-Za-z0-9._-]", "_", download_name)[:100] or "file"
+        handler.send_header("Content-Type", "application/octet-stream")
+        handler.send_header("Content-Disposition", f'attachment; filename="{safe}"')
+    else:
+        handler.send_header("Content-Type", mime)
     handler.send_header("Accept-Ranges", "bytes")
     handler.send_header("Cache-Control", "private, max-age=3600")
     handler.send_header("Content-Length", str(end - start + 1) if size else "0")

{bugcap-0.5.1 → bugcap-0.6.0}/src/bugcap/dashboard/server.py

@@ -7,6 +7,7 @@ from __future__ import annotations
 
 import hmac
 import json
+import os
 import re
 import secrets
 import sys
@@ -182,7 +183,10 @@ class Handler(BaseHTTPRequestHandler):
         if frame_no is None:
             if media.kind == "frames" or not media.path:
                 return self.send_json(404, {"code": "not_found", "message": "media not found"})
-            return serve_media(self, media.path, media.mime, self.headers.get("Range"))
+            name = None
+            if media.kind == "file":
+                name = os.path.basename((media.source or "").replace("\\", "/")) or os.path.basename(media.path)
+            return serve_media(self, media.path, media.mime, self.headers.get("Range"), name)
         frame = next((f for f in media.frames if f.frame_no == frame_no), None)
         if frame is None:
             return self.send_json(404, {"code": "not_found", "message": "frame not found"})

{bugcap-0.5.1 → bugcap-0.6.0}/src/bugcap/dashboard/static/app.js

@@ -90,11 +90,15 @@
         var img = document.createElement("img");
         img.src = f.url; img.alt = "frame " + f.frame_no; fig.appendChild(img);
       });
+    } else if (m.kind === "file") {
+      var a = document.createElement("a");
+      a.href = m.url; a.download = ""; a.textContent = "Download " + (m.label || ("file " + m.index));
+      fig.appendChild(a);
     } else {
       var i = document.createElement("img");
       i.src = m.url; i.alt = m.label || ("image " + m.index); fig.appendChild(i);
     }
-    var letters = {image: "i", video: "v", animated: "g", frames: "f"};
+    var letters = {image: "i", video: "v", animated: "g", frames: "f", file: "d"};
     var label = caption || ("@" + (letters[m.kind] || "i") + m.index);
     if (m.label) label += " (" + m.label + ")";
     fig.appendChild(el("figcaption", label + " · " + m.kind + " · " + Math.round(m.size_bytes / 1024) + " KB"));

{bugcap-0.5.1 → bugcap-0.6.0}/src/bugcap/ingest.py

@@ -9,8 +9,10 @@ from __future__ import annotations
 import glob
 import hashlib
 import os
+import re
 import socket
 import urllib.error
+import urllib.parse
 import urllib.request
 import uuid
 from dataclasses import dataclass, field
@@ -18,13 +20,15 @@ from pathlib import Path
 from typing import Literal, Optional
 
 from .errors import ServiceError
-from .paths import images_dir, to_data_relative
+from .paths import files_dir, images_dir, to_data_relative
+from .store import guess_mime
 
 MAX_DOWNLOAD_BYTES = 25 * 1024 * 1024
 DOWNLOAD_TIMEOUT = 20
 MAX_REDIRECTS = 5
 
 _EXT = {"image/png": ".png", "image/jpeg": ".jpg", "image/gif": ".gif", "image/webp": ".webp"}
+_SUFFIX_RE = re.compile(r"^\.[a-z0-9]{1,16}$")
 
 
 @dataclass
@@ -146,13 +150,9 @@ def _clearly_not_image(content_type: str) -> bool:
     return main == "text" or any(k in sub for k in ("html", "json", "xml"))
 
 
-def download_url(
-    url: str,
-    *,
-    max_bytes: int = MAX_DOWNLOAD_BYTES,
-    timeout: float = DOWNLOAD_TIMEOUT,
-    max_redirects: int = MAX_REDIRECTS,
-) -> StoredFile:
+def _fetch(url: str, *, max_bytes: int, timeout: float, max_redirects: int, images_only: bool) -> tuple[bytes, str]:
+    """GET `url`; returns (body, content-type hint). With `images_only`, text/HTML/JSON/XML
+    responses are refused early."""
     if not url.lower().startswith(("http://", "https://")):
         raise ServiceError("invalid_image", "only http(s) URLs are supported")
     request = urllib.request.Request(url, headers={"User-Agent": "bugcap"}, method="GET")
@@ -160,7 +160,7 @@ def download_url(
     try:
         with opener.open(request, timeout=timeout) as response:
             hint = response.headers.get("Content-Type", "").split(";")[0].strip().lower()
-            if _clearly_not_image(hint):
+            if images_only and _clearly_not_image(hint):
                 raise ServiceError("invalid_image", f"not an image (content is {hint})")
             declared = response.headers.get("Content-Length")
             if declared and declared.isdigit() and int(declared) > max_bytes:
@@ -187,7 +187,17 @@ def download_url(
         if isinstance(exc.reason, (socket.timeout, TimeoutError)):
             raise ServiceError("timeout", f"timed out after {timeout:g} s") from exc
         raise ServiceError("invalid_image", f"download failed: {exc.reason}") from exc
-    data = b"".join(chunks)
+    return b"".join(chunks), hint
+
+
+def download_url(
+    url: str,
+    *,
+    max_bytes: int = MAX_DOWNLOAD_BYTES,
+    timeout: float = DOWNLOAD_TIMEOUT,
+    max_redirects: int = MAX_REDIRECTS,
+) -> StoredFile:
+    data, hint = _fetch(url, max_bytes=max_bytes, timeout=timeout, max_redirects=max_redirects, images_only=True)
     try:
         return _store(data, url)
     except ServiceError as exc:
@@ -195,6 +205,71 @@ def download_url(
         raise ServiceError(exc.code, exc.message + suffix) from None
 
 
+# --- any file (attachments) ---------------------------------------------------
+
+def _store_file(data: bytes, source: str, name: str) -> StoredFile:
+    """Store any bytes under their content hash, keeping a sane extension so the file still
+    opens with the right program. Identical content is stored once."""
+    suffix = Path(name).suffix.lower()
+    if not _SUFFIX_RE.match(suffix):
+        suffix = ""
+    dest = files_dir() / f"{hashlib.sha256(data).hexdigest()}{suffix}"
+    if dest.is_file() and dest.stat().st_size == len(data):
+        return StoredFile(to_data_relative(dest), dest, guess_mime(name), len(data), source, reused=True)
+    tmp = dest.with_name(f"{dest.name}.{uuid.uuid4().hex}.part")
+    try:
+        tmp.write_bytes(data)
+        os.replace(tmp, dest)
+    finally:
+        tmp.unlink(missing_ok=True)
+    return StoredFile(to_data_relative(dest), dest, guess_mime(name), len(data), source)
+
+
+def import_local_file(path: Path) -> StoredFile:
+    path = Path(path).expanduser()
+    if path.is_dir():
+        raise ServiceError("invalid_file", "is a directory")
+    if not path.is_file():
+        raise ServiceError("not_found", "file not found")
+    try:
+        data = path.read_bytes()
+    except OSError as exc:
+        raise ServiceError("invalid_file", f"cannot read file: {exc.strerror or exc}")
+    return _store_file(data, str(path), path.name)
+
+
+def download_file(
+    url: str,
+    *,
+    max_bytes: int = MAX_DOWNLOAD_BYTES,
+    timeout: float = DOWNLOAD_TIMEOUT,
+    max_redirects: int = MAX_REDIRECTS,
+) -> StoredFile:
+    data, _ = _fetch(url, max_bytes=max_bytes, timeout=timeout, max_redirects=max_redirects, images_only=False)
+    return _store_file(data, url, urllib.parse.urlparse(url).path)
+
+
+def adopt_file(path) -> Path:
+    """Give a file already copied into the files directory its content-derived name (same
+    rules as `adopt`): an identical file already stored wins and the new copy is dropped."""
+    path = Path(path)
+    if path.parent != files_dir():
+        return path
+    try:
+        data = path.read_bytes()
+    except OSError:
+        return path
+    suffix = path.suffix.lower() if _SUFFIX_RE.match(path.suffix.lower()) else ""
+    dest = files_dir() / f"{hashlib.sha256(data).hexdigest()}{suffix}"
+    if dest == path:
+        return path
+    if dest.is_file() and dest.stat().st_size == len(data):
+        path.unlink(missing_ok=True)
+        return dest
+    os.replace(path, dest)
+    return dest
+
+
 def resolve_glob(pattern: str) -> list[str]:
     """All matches, sorted by name (directories included; they are rejected per item)."""
     return sorted(glob.glob(os.path.expanduser(pattern)))
@@ -229,6 +304,14 @@ def ingest_item(item: Item) -> StoredFile:
     return import_local(Path(item.source))
 
 
+def ingest_file_item(item: Item) -> StoredFile:
+    if item.error is not None:
+        raise item.error
+    if classify_source(item.source) == "url":
+        return download_file(item.source)
+    return import_local_file(Path(item.source))
+
+
 def ingest_sources(sources: list[str], labels: Optional[list[Optional[str]]] = None) -> IngestResult:
     """Process each input independently (a failure never blocks the others)."""
     result = IngestResult()

{bugcap-0.5.1 → bugcap-0.6.0}/src/bugcap/live.py

@@ -76,6 +76,7 @@ class _App:
         self.results: "queue.Queue" = queue.Queue()
         self.details = None
         self.widgets: dict = {}
+        self.repo_choices: list = []
         self.pending_drafts: list = []
         self.stop_recording = threading.Event()
         self.record_started = 0.0
@@ -158,18 +159,22 @@ class _App:
         self.shot_button.grid(row=1, column=0, sticky="ew", pady=(10, 0), padx=(0, 4))
         self.record_button = ttk.Button(frame, text="Record", command=self.on_record)
         self.record_button.grid(row=1, column=1, sticky="ew", pady=(10, 0), padx=(4, 0))
+        self.upload_button = ttk.Button(frame, text="Upload image...", command=self.on_upload_image)
+        self.upload_button.grid(row=2, column=0, sticky="ew", pady=(6, 0), padx=(0, 4))
+        self.file_button = ttk.Button(frame, text="Attach file...", command=self.on_upload_file)
+        self.file_button.grid(row=2, column=1, sticky="ew", pady=(6, 0), padx=(4, 0))
         self.staged_label = ttk.Label(frame, text="", style="Heading.TLabel", wraplength=230)
-        self.staged_label.grid(row=2, column=0, sticky="w", pady=(12, 0))
+        self.staged_label.grid(row=3, column=0, sticky="w", pady=(12, 0))
         self.clear_button = ttk.Button(frame, text="Clear", command=self.on_clear)
-        self.clear_button.grid(row=2, column=1, sticky="e", pady=(12, 0))
+        self.clear_button.grid(row=3, column=1, sticky="e", pady=(12, 0))
         self.new_button = ttk.Button(frame, text="New bug (note only)", command=self.on_new)
-        self.new_button.grid(row=3, column=0, columnspan=2, sticky="ew", pady=(6, 0))
+        self.new_button.grid(row=4, column=0, columnspan=2, sticky="ew", pady=(6, 0))
         self.existing_button = ttk.Button(frame, text="Add to existing bug...", command=self.on_existing)
-        self.existing_button.grid(row=4, column=0, columnspan=2, sticky="ew", pady=(6, 0))
+        self.existing_button.grid(row=5, column=0, columnspan=2, sticky="ew", pady=(6, 0))
         self.counter = ttk.Label(frame, text="0 saved this session", style="Muted.TLabel")
-        self.counter.grid(row=5, column=0, columnspan=2, pady=(10, 0), sticky="w")
+        self.counter.grid(row=6, column=0, columnspan=2, pady=(10, 0), sticky="w")
         self.status = ttk.Label(frame, text=notice, wraplength=230, style="Warning.TLabel")
-        self.status.grid(row=6, column=0, columnspan=2, pady=(4, 0), sticky="w")
+        self.status.grid(row=7, column=0, columnspan=2, pady=(4, 0), sticky="w")
         root.protocol("WM_DELETE_WINDOW", self.on_close_control)
         self.refresh()
         self.anchor_control()
@@ -197,6 +202,8 @@ class _App:
         else:
             self.clear_button.grid_remove()
             self.new_button.configure(text="New bug (note only)")
+        self.upload_button.state(["!disabled"] if ready else ["disabled"])
+        self.file_button.state(["!disabled"] if ready else ["disabled"])
         self.clear_button.state(["!disabled"] if ready else ["disabled"])
         self.new_button.state(["!disabled"] if ready else ["disabled"])
         self.existing_button.state(["!disabled"] if ready else ["disabled"])
@@ -231,6 +238,29 @@ class _App:
         threading.Thread(target=worker, daemon=True).start()
         self.root.after(100, self._poll)
 
+    # --- uploads ---------------------------------------------------------------
+
+    def on_upload_image(self) -> None:
+        self._pick_and_stage("Choose image(s)", self.session.upload_images, [
+            ("Images", "*.png *.jpg *.jpeg *.gif *.webp"), ("All files", "*.*")])
+
+    def on_upload_file(self) -> None:
+        self._pick_and_stage("Choose file(s) to attach", self.session.upload_files, [("All files", "*.*")])
+
+    def _pick_and_stage(self, title: str, stage, filetypes) -> None:
+        from tkinter import filedialog, messagebox
+
+        if self.session.state is not LiveState.READY:
+            return
+        paths = filedialog.askopenfilenames(title=title, parent=self.root, filetypes=filetypes)
+        if not paths:
+            return
+        errors = stage(paths)
+        self.refresh()
+        if errors:
+            messagebox.showerror("Not added", "\n".join(errors), parent=self.root)
+        self.set_status("Staged. Add more, or file a bug." if self.session.staged else "")
+
     # --- recording -------------------------------------------------------------
 
     def on_record(self) -> None:
@@ -386,8 +416,20 @@ class _App:
         w["status"].set(prefill.get("status", "open"))
         w["status"].grid(row=3, column=1, sticky="w", pady=4)
         ttk.Label(form, text="Repo", style="Heading.TLabel").grid(row=4, column=0, sticky="w", padx=(0, 12), pady=4)
-        ttk.Label(form, text=(self.cfg.key if self.cfg else "(none)"), style="Muted.TLabel").grid(
-            row=4, column=1, sticky="w", pady=4)
+        self.repo_choices = repo.known_repos()
+        if self.cfg is not None and all(c.root != self.cfg.root for c in self.repo_choices):
+            self.repo_choices.append(self.cfg)
+        if self.repo_choices:
+            current_key = self.cfg.key if self.cfg else ""
+            w["repo"] = ttk.Combobox(
+                form, values=[c.key for c in self.repo_choices], state="readonly", width=30,
+            )
+            w["repo"].set(current_key)
+            w["repo"].grid(row=4, column=1, sticky="w", pady=4)
+            w["repo"].bind("<<ComboboxSelected>>", self.on_repo_change)
+        else:
+            ttk.Label(form, text="(none - run `bugcap init` in a repo to tag reports)",
+                      style="Muted.TLabel").grid(row=4, column=1, sticky="w", pady=4)
         row += 1
         w["error"] = ttk.Label(frame, text="", style="Error.TLabel", wraplength=420)
         w["error"].grid(row=row, column=0, columnspan=2, sticky="w", pady=(6, 0))
@@ -402,6 +444,24 @@ class _App:
         w["title"].focus_set()
         self.check_notes()
 
+    def on_repo_change(self, _event=None) -> None:
+        """The details form's repo picker changed: this report (and its auto tag) now
+        belongs to the newly-selected repo instead of the one `live` launched in."""
+        selected_key = self.widgets["repo"].get()
+        match = next((c for c in self.repo_choices if c.key == selected_key), None)
+        if match is None:
+            return
+        previous = self.cfg
+        self.cfg = self.session.repo_cfg = match
+        tags_entry = self.widgets["tags"]
+        current_tags = [t.strip() for t in tags_entry.get().split(",") if t.strip()]
+        if previous is not None and previous.tag in current_tags and previous.tag != match.tag:
+            current_tags = [match.tag if t == previous.tag else t for t in current_tags]
+        elif match.tag not in current_tags:
+            current_tags.append(match.tag)
+        tags_entry.delete(0, "end")
+        tags_entry.insert(0, ", ".join(current_tags))
+
     def fields(self) -> dict:
         w = self.widgets
         return {