tcw-cli 2.6.1__tar.gz → 2.6.3__tar.gz

{tcw_cli-2.6.1/tcw_cli.egg-info → tcw_cli-2.6.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tcw-cli
-Version: 2.6.1
+Version: 2.6.3
 Summary: Taxonomy · Capabilities · Work — a storage-abstracted framework for describing and evolving a software project.
 License:                                  Apache License
                                    Version 2.0, January 2004
@@ -908,9 +908,9 @@ driving it to completion, verifying it, processing the inbox) described in
 | -------------------- | ----------------------------------------------------------------- |
 | `tcw work inbox`     | `inbox list`, `inbox show` and `inbox accept` raw requests, and Jira tickets awaiting triage |
 | `tcw work nodes`     | lists this project's parent and child projects                    |
-| `tcw work delegate`  | writes a request into a child project's inbox                     |
+| `tcw work delegate`  | writes a request into the nearest child project with a board      |
 | `tcw work escalate`  | writes a request into the parent project's inbox                  |
-| `tcw work reconcile` | reads child projects' items and writes an epic's rolled-up status |
+| `tcw work reconcile` | reads every project below with a board; writes the epic's roll-up |
 
 **Jira and housekeeping**
 

{tcw_cli-2.6.1 → tcw_cli-2.6.3}/README.md

@@ -692,9 +692,9 @@ driving it to completion, verifying it, processing the inbox) described in
 | -------------------- | ----------------------------------------------------------------- |
 | `tcw work inbox`     | `inbox list`, `inbox show` and `inbox accept` raw requests, and Jira tickets awaiting triage |
 | `tcw work nodes`     | lists this project's parent and child projects                    |
-| `tcw work delegate`  | writes a request into a child project's inbox                     |
+| `tcw work delegate`  | writes a request into the nearest child project with a board      |
 | `tcw work escalate`  | writes a request into the parent project's inbox                  |
-| `tcw work reconcile` | reads child projects' items and writes an epic's rolled-up status |
+| `tcw work reconcile` | reads every project below with a board; writes the epic's roll-up |
 
 **Jira and housekeeping**
 

{tcw_cli-2.6.1 → tcw_cli-2.6.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "tcw-cli"
-version = "2.6.1"
+version = "2.6.3"
 description = "Taxonomy · Capabilities · Work — a storage-abstracted framework for describing and evolving a software project."
 readme = "README.md"
 requires-python = ">=3.11"

tcw_cli-2.6.3/tcw/__init__.py

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

{tcw_cli-2.6.1 → tcw_cli-2.6.3}/tcw/cli.py

@@ -71,7 +71,9 @@ def run_init(components: list[str], project_id: str | None = None,
             components, root, project_id,
             Path(work_path).expanduser() if work_path is not None else None,
             {c: Path(p).expanduser() for c, p in (paths or {}).items()})
-    except (ValueError, OSError) as error:
+    # `RuntimeError` too: `Path.expanduser()` raises it for a `~name` naming no
+    # user, whether that came from `--path` or from `work.path` in the config.
+    except (ValueError, OSError, RuntimeError) as error:
         print(f"tcw init: {error}", file=sys.stderr)
         return 1
     print(f"Scaffolded {len(created)} dir(s):")

{tcw_cli-2.6.1 → tcw_cli-2.6.3}/tcw/serve/__init__.py

@@ -230,7 +230,10 @@ def _strict_refuses(work, action: str, slug: str = "", body: dict | None = None)
     if not work.tracker_strict():
         return None
     body = body or {}
-    item = work.get(slug) if slug else None
+    # An interrupted claim is read as the item it was: an ordinary read of one
+    # raises, and this runs before any route's error handling.
+    item = (next((c for c in work.interrupted_claims() if c.slug == slug), None)
+            or work.get(slug)) if slug else None
     epic = (body.get("type") == "epic") if action == "create" else (
         item is not None and item.type == "epic")
     from tcw.tracker.intake import ever_bound
@@ -238,7 +241,8 @@ def _strict_refuses(work, action: str, slug: str = "", body: dict | None = None)
     if action == "create" and not epic:
         return lead + "create work from a ticket with `tcw work tracker import <ticket>`."
     if action == "start" and not epic:
-        return lead + f"use `tcw work start {slug}`, which claims the ticket."
+        take_over = " --take-over" if body.get("recover") else ""
+        return lead + f"use `tcw work start {slug}{take_over}`, which claims the ticket."
     if action == "complete" and not epic and body.get("resolution") == "done":
         return lead + f"use `tcw work complete {slug}`, which checks the ticket."
     if action == "drop" and ever_bound(work, slug):
@@ -286,13 +290,16 @@ def _map_store_error(e: Exception) -> tuple[int, bytes]:
     """Map store-level exceptions to HTTP status codes and JSON error bodies.
 
     "no such" / "no heading" ValueError messages → 404.
-    StaleRevision → 409.
+    StaleRevision → 409, with `"code": "stale-revision"`.
     IllegalTransition / validation ValueError / RefError → 422.
     Everything else → 500.
     """
     msg = str(e).lower()
     if isinstance(e, StaleRevision):
-        return _err(HTTPStatus.CONFLICT, str(e))
+        # The one 409 the web app answers with its conflict banner. Marked,
+        # because strict-tracker and generated-sidecar refusals are 409 too and
+        # must show their own message instead.
+        return _err(HTTPStatus.CONFLICT, str(e), code="stale-revision")
     if isinstance(e, IllegalTransition):
         return _err(HTTPStatus.UNPROCESSABLE_ENTITY, str(e))
     if isinstance(e, RefError):
@@ -525,19 +532,32 @@ class TcwHandler(BaseHTTPRequestHandler):
         items are shaped differently from the items every other route returns,
         which is the drift the projection exists to prevent.
         """
-        anchor = self.server.node_root.resolve()
-        roots = [anchor]
-        if self.server.include_descendants:
-            roots += descendant_nodes(anchor)
         items = []
-        for root in roots:
-            prefix = "" if root == anchor else f"{registered_project_id(anchor, root)}/"
+        for root, prefix in self._board_roots():
             work = FsWorkStore.open(root)
             for it in work.board():
                 items.append(_item_payload(work, it.slug, it,
                                            f"{prefix}{it.slug}" if prefix else None))
         return items
 
+    def _board_roots(self) -> list[tuple[Path, str]]:
+        """The nodes the board shows, each with the prefix its slugs carry."""
+        anchor = self.server.node_root.resolve()
+        roots = [anchor]
+        if self.server.include_descendants:
+            roots += descendant_nodes(anchor)
+        return [(root, "" if root == anchor
+                 else f"{registered_project_id(anchor, root)}/") for root in roots]
+
+    def _interrupted_claims(self) -> list[dict]:
+        """Interrupted starts on every node the board shows, slugs qualified as
+        the board's are, so Recover addresses the node that holds the claim."""
+        claims = []
+        for root, prefix in self._board_roots():
+            claims += [{"slug": f"{prefix}{c.slug}", "title": c.title}
+                       for c in FsWorkStore.open(root).interrupted_claims()]
+        return claims
+
     # ── HTTP method dispatchers ───────────────────────────────────────────
 
     def do_GET(self) -> None:
@@ -672,6 +692,19 @@ class TcwHandler(BaseHTTPRequestHandler):
                 return
             try:
                 resource = work.read_sidecar(slug, name)
+            except OSError as e:
+                # Something is at the name but it is not a readable file. Only a
+                # message TCW wrote (no errno) is shown: the system's own names
+                # an absolute path on the server.
+                reason = str(e) if e.errno is None else f"{name} cannot be read"
+                self._send(HTTPStatus.BAD_REQUEST, reason.encode("utf-8"))
+                return
+            except UnicodeDecodeError:
+                # Before ValueError, which it is: the decoder's own message names
+                # a byte offset, not the file.
+                self._send(HTTPStatus.BAD_REQUEST,
+                           f"{name} is not valid UTF-8; fix or replace the file".encode("utf-8"))
+                return
             except ValueError as e:
                 self._send(HTTPStatus.BAD_REQUEST, str(e).encode("utf-8"))
                 return
@@ -724,6 +757,13 @@ class TcwHandler(BaseHTTPRequestHandler):
             self._send_json(HTTPStatus.OK, {"tags": work.registered_tags()})
             return
 
+        # GET /api/work/interrupted-claims — starts whose claimant died mid-move.
+        # They are on no board (they are in no status), so without this the web
+        # app could neither show one nor offer to recover it.
+        if path == "/api/work/interrupted-claims":
+            self._send_json(HTTPStatus.OK, self._interrupted_claims())
+            return
+
         # Catch-all work detail: /api/work/<slug>
         if path.startswith("/api/work/"):
             slug = _parse_ref_param(path, "/api/work/")
@@ -949,8 +989,23 @@ class TcwHandler(BaseHTTPRequestHandler):
                 return
             if action == "start":
                 force = bool(body.get("force", False))
+                start = lambda: work.start(slug, force=force)  # noqa: E731
+                if body.get("recover"):
+                    # Recovery only. `take_over` also takes an *active* item from
+                    # its owner, which a browser must not do without the CLI's
+                    # explicit `--take-over`; so the slug has to be an
+                    # interrupted claim, and the claim goes to this server's own
+                    # identity, found the way the CLI finds one.
+                    from tcw.work.cli import _local_owner
+                    owner = _local_owner(work)
+                    if not owner:
+                        self._send_err(HTTPStatus.CONFLICT,
+                                       "no claimant identity for this server; set "
+                                       "TCW_WORK_OWNER or git user.email and restart it")
+                        return
+                    start = lambda: work.start(slug, owner=owner, recover=True)  # noqa: E731
                 try:
-                    item = _transition_ok(work, slug, lambda: work.start(slug, force=force))
+                    item = _transition_ok(work, slug, start)
                     # Payload built from the bare slug the store knows, then
                     # relabelled with the qualified one the UI addresses by.
                     self._send_json(HTTPStatus.OK,