freeagent-cli 0.2.0__tar.gz → 0.3.0__tar.gz

{freeagent_cli-0.2.0 → freeagent_cli-0.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: freeagent-cli
-Version: 0.2.0
+Version: 0.3.0
 Summary: CLI for submitting FreeAgent timeslips
 Project-URL: Homepage, https://github.com/tomdyson/freeagent-cli
 Project-URL: Repository, https://github.com/tomdyson/freeagent-cli
@@ -67,9 +67,9 @@ Credentials are stored at `~/Library/Application Support/freeagent-cli/config.js
 
 ```
 freeagent-cli --help                                       # canonical flow
-freeagent-cli projects                                     # projects + tasks in one call
+freeagent-cli recent                                       # what you've already logged (run this first to avoid duplicates)
 freeagent-cli log <project> <duration> [comment...]        # submit a timeslip
-freeagent-cli recent                                       # last few timeslips
+freeagent-cli projects                                     # first-time / discovery: projects + tasks in one call
 ```
 
 Examples:

{freeagent_cli-0.2.0 → freeagent_cli-0.3.0}/README.md

@@ -40,9 +40,9 @@ Credentials are stored at `~/Library/Application Support/freeagent-cli/config.js
 
 ```
 freeagent-cli --help                                       # canonical flow
-freeagent-cli projects                                     # projects + tasks in one call
+freeagent-cli recent                                       # what you've already logged (run this first to avoid duplicates)
 freeagent-cli log <project> <duration> [comment...]        # submit a timeslip
-freeagent-cli recent                                       # last few timeslips
+freeagent-cli projects                                     # first-time / discovery: projects + tasks in one call
 ```
 
 Examples:

{freeagent_cli-0.2.0 → freeagent_cli-0.3.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "freeagent-cli"
-version = "0.2.0"
+version = "0.3.0"
 description = "CLI for submitting FreeAgent timeslips"
 readme = "README.md"
 requires-python = ">=3.11"
@@ -40,3 +40,8 @@ build-backend = "hatchling.build"
 
 [tool.hatch.build.targets.wheel]
 packages = ["src/freeagent_cli"]
+
+[dependency-groups]
+dev = [
+    "pytest>=9.0.3",
+]

freeagent_cli-0.3.0/src/freeagent_cli/__init__.py

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

{freeagent_cli-0.2.0 → freeagent_cli-0.3.0}/src/freeagent_cli/api.py

@@ -71,3 +71,20 @@ class FreeAgent:
         if comment:
             body["timeslip"]["comment"] = comment
         return self.post("/v2/timeslips", body)
+
+    def delete(self, path: str) -> dict:
+        with self._client() as c:
+            r = c.delete(path)
+            r.raise_for_status()
+            return r.json()
+
+    def delete_timeslip(self, timeslip_id: str) -> dict:
+        try:
+            return self.delete(f"/v2/timeslips/{timeslip_id}")
+        except httpx.HTTPStatusError as e:
+            if e.response.status_code == 404:
+                return {"deleted": True, "id": timeslip_id, "already_deleted": True}
+            raise
+
+    def get_timeslip(self, timeslip_id: str) -> dict:
+        return self.get(f"/v2/timeslips/{timeslip_id}", nested="true")["timeslip"]

{freeagent_cli-0.2.0 → freeagent_cli-0.3.0}/src/freeagent_cli/cli.py

@@ -19,6 +19,10 @@ def _api() -> FreeAgent:
     return FreeAgent(c)
 
 
+def _extract_id(query: str) -> str:
+    return query.rsplit("/", 1)[-1] if "/" in query else query
+
+
 def parse_hours(s: str) -> float:
     """Parse a duration: 1.5, 90m, 1h, 1h30m, 1:30."""
     s = s.strip().lower()
@@ -37,6 +41,22 @@ def parse_hours(s: str) -> float:
     raise ValueError(f"Cannot parse duration {s!r}; try 1.5, 90m, 1h30m, or 1:30")
 
 
+def format_hours(value) -> str:
+    """Format a decimal-hours value as 40m / 1h / 1h30m, rounding to the nearest minute."""
+    try:
+        total_min = round(float(value) * 60)
+    except (TypeError, ValueError):
+        return str(value)
+    if total_min == 0:
+        return "0m"
+    h, m = divmod(total_min, 60)
+    if h == 0:
+        return f"{m}m"
+    if m == 0:
+        return f"{h}h"
+    return f"{h}h{m}m"
+
+
 def _resolve(items: list[dict], query: str, label: str) -> dict:
     if query.startswith("http"):
         match = [i for i in items if i["url"] == query]
@@ -73,9 +93,9 @@ def _pick_task(tasks: list[dict], task_q: str | None, project_name: str) -> dict
 @click.group(epilog="""
 \b
 Typical flow:
-  freeagent-cli projects                          # projects + tasks in one call
+  freeagent-cli recent                            # check what you've already logged (avoids duplicates)
   freeagent-cli log <project> <duration> [comment]  [--task <name>] [--dry-run]
-  freeagent-cli recent                            # last few timeslips
+  freeagent-cli projects                          # first-time / discovery: projects + tasks
 
 \b
 Examples:
@@ -209,6 +229,8 @@ def log(project_q, duration, comment_parts, task_q, date_, dry_run):
       freeagent-cli log Acme 1h30m "fixed the thing"
       freeagent-cli log Acme 90m fixed the thing       # comment without quotes
       freeagent-cli log "Big Co" 1.5 --task Coding --date 2026-05-01
+
+    Tip: run `freeagent-cli recent` first to avoid duplicate entries.
     """
     try:
         hours = parse_hours(duration)
@@ -222,7 +244,7 @@ def log(project_q, duration, comment_parts, task_q, date_, dry_run):
     dated_on = date_ or _dt.date.today().isoformat()
 
     if dry_run:
-        click.echo(f"DRY RUN — would submit {hours}h on {dated_on} → {project['name']} / {task['name']}")
+        click.echo(f"DRY RUN — would submit {format_hours(hours)} on {dated_on} → {project['name']} / {task['name']}")
         click.echo(f"  project: {project['url']}")
         click.echo(f"  task:    {task['url']}")
         if comment:
@@ -235,7 +257,7 @@ def log(project_q, duration, comment_parts, task_q, date_, dry_run):
         dated_on=dated_on, hours=hours, comment=comment,
     )
     ts = result["timeslips"][0] if "timeslips" in result else result.get("timeslip", result)
-    click.echo(f"Submitted {hours}h on {dated_on} → {project['name']} / {task['name']}")
+    click.echo(f"Submitted {format_hours(hours)} on {dated_on} → {project['name']} / {task['name']}")
     if isinstance(ts, dict) and "url" in ts:
         click.echo(ts["url"])
 
@@ -265,7 +287,151 @@ def recent(limit, days, all_users):
         pname = proj["name"] if isinstance(proj, dict) else "?"
         tname = task_["name"] if isinstance(task_, dict) else "?"
         comment = (s.get("comment") or "").replace("\n", " ")
-        click.echo(f"{s.get('dated_on','?')}\t{s.get('hours','?')}h\t{pname}\t{tname}\t{comment}")
+        click.echo(f"{s.get('dated_on','?')}\t{format_hours(s.get('hours'))}\t{pname}\t{tname}\t{comment}\t{s.get('url','')}")
+
+
+# -- delete --------------------------------------------------------------
+
+@main.command()
+@click.argument("timeslip_q", metavar="TIMESLIP_ID_OR_URL")
+@click.option("--yes", "-y", is_flag=True, help="Skip confirmation.")
+def delete(timeslip_q, yes):
+    """Delete a timeslip by numeric ID or full URL."""
+    api = _api()
+    tid = _extract_id(timeslip_q)
+    try:
+        ts = api.get_timeslip(tid)
+    except Exception:
+        raise click.UsageError(f"Timeslip {tid!r} not found.")
+    proj = ts.get("project")
+    task_ = ts.get("task")
+    pname = proj["name"] if isinstance(proj, dict) else "?"
+    tname = task_["name"] if isinstance(task_, dict) else "?"
+    comment = (ts.get("comment") or "")[:80]
+    click.echo(f"{ts.get('dated_on','?')}  {format_hours(ts.get('hours'))}  {pname} / {tname}")
+    if comment:
+        click.echo(f"  {comment}")
+    if not yes:
+        click.confirm("Delete this timeslip?", abort=True)
+    result = api.delete_timeslip(tid)
+    if result.get("already_deleted"):
+        click.echo("Timeslip already deleted.")
+    else:
+        click.echo("Deleted.")
+    click.echo(ts.get("url", ""))
+
+
+# -- edit ----------------------------------------------------------------
+
+@main.command()
+@click.argument("timeslip_q", metavar="TIMESLIP_ID_OR_URL")
+@click.option("--project", "project_q", default=None,
+              help="New project (name substring, id, or URL).")
+@click.option("--task", "task_q", default=None,
+              help="New task (name substring, id, or URL).")
+@click.option("--duration", "duration_str", default=None,
+              help="New duration (1.5, 90m, 1h30m, 1:30).")
+@click.option("--date", "date_", default=None, help="New date YYYY-MM-DD.")
+@click.option("--comment", "comment", default=None, help="New comment.")
+@click.option("--dry-run", is_flag=True, help="Resolve and preview, but don't submit.")
+@click.option("--yes", "-y", is_flag=True, help="Skip confirmation.")
+def edit(timeslip_q, project_q, task_q, duration_str, date_, comment, dry_run, yes):
+    """Edit a timeslip: fetch, apply changes, delete old, create new.
+
+    \b
+    Only the options you pass are changed; everything else stays the same.
+    If you change --project, --task defaults to a matching task name in the new
+    project if one exists, otherwise you must pass --task explicitly.
+
+    \b
+    Examples:
+      freeagent-cli edit 123456 --duration 2h
+      freeagent-cli edit https://api.freeagent.com/v2/timeslips/123456 --comment "done"
+      freeagent-cli edit 123456 --project "Big Co" --task Coding --dry-run
+    """
+    api = _api()
+    tid = _extract_id(timeslip_q)
+    try:
+        old = api.get_timeslip(tid)
+    except Exception:
+        raise click.UsageError(f"Timeslip {tid!r} not found.")
+
+    if not any([project_q, task_q, duration_str, date_, comment is not None]):
+        raise click.UsageError("Nothing to change. Use --help to see options.")
+
+    old_proj = old.get("project")
+    old_task = old.get("task")
+
+    new_project_url = old_proj["url"] if isinstance(old_proj, dict) else ""
+    new_task_url = old_task["url"] if isinstance(old_task, dict) else ""
+    new_hours = float(old.get("hours", 0))
+    new_date = old.get("dated_on", "")
+    new_comment = old.get("comment") or ""
+
+    old_pname = old_proj["name"] if isinstance(old_proj, dict) else "?"
+    old_tname = old_task["name"] if isinstance(old_task, dict) else "?"
+    new_pname = old_pname
+    new_tname = old_tname
+
+    if project_q:
+        new_proj = _resolve(api.projects(view="active"), project_q, "project")
+        new_project_url = new_proj["url"]
+        new_pname = new_proj["name"]
+        if not task_q:
+            new_tasks = api.tasks(new_project_url)
+            matches = [t for t in new_tasks if t["name"].lower() == old_tname.lower()]
+            if len(matches) == 1:
+                new_task_url = matches[0]["url"]
+                new_tname = matches[0]["name"]
+            else:
+                names = ", ".join(t["name"] for t in new_tasks) or "(none)"
+                raise click.UsageError(
+                    f"Project changed; --task required. Available in {new_proj['name']!r}: {names}"
+                )
+
+    if task_q:
+        proj_tasks = api.tasks(new_project_url)
+        new_task = _resolve(proj_tasks, task_q, "task")
+        new_task_url = new_task["url"]
+        new_tname = new_task["name"]
+
+    if duration_str:
+        try:
+            new_hours = parse_hours(duration_str)
+        except ValueError as e:
+            raise click.UsageError(str(e))
+
+    if date_:
+        new_date = date_
+
+    if comment is not None:
+        new_comment = comment
+
+    lines = []
+    lines.append("Before → After")
+    lines.append(f"  Project:  {old_pname} → {new_pname}")
+    lines.append(f"  Task:     {old_tname} → {new_tname}")
+    lines.append(f"  Date:     {old.get('dated_on','?')} → {new_date}")
+    lines.append(f"  Duration: {format_hours(old.get('hours'))} → {format_hours(new_hours)}")
+    lines.append(f"  Comment:  {repr(old.get('comment') or '')} → {repr(new_comment)}")
+    click.echo("\n".join(lines))
+
+    if dry_run:
+        return
+
+    if not yes:
+        click.confirm("Proceed with edit?", abort=True)
+
+    user_url = api.me()["url"]
+    result = api.create_timeslip(
+        user=user_url, project=new_project_url, task=new_task_url,
+        dated_on=new_date, hours=new_hours, comment=new_comment or None,
+    )
+    ts = result["timeslips"][0] if "timeslips" in result else result.get("timeslip", result)
+    api.delete_timeslip(tid)
+    click.echo(f"Edited → {new_pname} / {new_tname}{' --dry-run' if dry_run else ''}")
+    if isinstance(ts, dict) and "url" in ts:
+        click.echo(ts["url"])
 
 
 if __name__ == "__main__":

freeagent_cli-0.3.0/tests/test_api.py

@@ -0,0 +1,111 @@
+from __future__ import annotations
+
+from unittest.mock import MagicMock, patch
+
+import httpx
+import pytest
+
+from freeagent_cli.api import FreeAgent
+from freeagent_cli.config import Config
+
+
+@pytest.fixture
+def config():
+    c = Config()
+    c.client_id = "test-id"
+    c.client_secret = "test-secret"
+    c.refresh_token = "test-refresh"
+    c.access_token = "test-access"
+    c.access_token_expires_at = 9999999999.0
+    return c
+
+
+@pytest.fixture
+def api(config):
+    return FreeAgent(config)
+
+
+class TestDeleteTimeslip:
+    def test_delete_success(self, api):
+        mock_client = MagicMock()
+        mock_response = MagicMock()
+        mock_response.status_code = 200
+        mock_response.raise_for_status.return_value = None
+        mock_response.json.return_value = {"timeslip": {"url": "/v2/timeslips/42"}}
+        mock_client.__enter__.return_value = mock_client
+        mock_client.delete.return_value = mock_response
+
+        with patch.object(api, "_client", return_value=mock_client):
+            result = api.delete_timeslip("42")
+            assert result == {"timeslip": {"url": "/v2/timeslips/42"}}
+            mock_client.delete.assert_called_once_with("/v2/timeslips/42")
+
+    def test_delete_404_returns_already_deleted(self, api):
+        mock_client = MagicMock()
+        mock_response = MagicMock()
+        mock_response.status_code = 404
+        mock_client.__enter__.return_value = mock_client
+
+        error_response = MagicMock()
+        error_response.status_code = 404
+        error_response.text = "Not found"
+        error = httpx.HTTPStatusError("404 Not Found", request=MagicMock(), response=error_response)
+        mock_client.delete.side_effect = error
+
+        with patch.object(api, "_client", return_value=mock_client):
+            result = api.delete_timeslip("42")
+            assert result == {"deleted": True, "id": "42", "already_deleted": True}
+
+    def test_delete_500_reraises(self, api):
+        mock_client = MagicMock()
+        mock_client.__enter__.return_value = mock_client
+
+        error_response = MagicMock()
+        error_response.status_code = 500
+        error = httpx.HTTPStatusError("500 Server Error", request=MagicMock(), response=error_response)
+        mock_client.delete.side_effect = error
+
+        with patch.object(api, "_client", return_value=mock_client):
+            with pytest.raises(httpx.HTTPStatusError):
+                api.delete_timeslip("42")
+
+
+class TestGetTimeslip:
+    def test_get_timeslip(self, api):
+        mock_client = MagicMock()
+        mock_response = MagicMock()
+        mock_response.raise_for_status.return_value = None
+        mock_response.json.return_value = {
+            "timeslip": {
+                "url": "/v2/timeslips/42",
+                "hours": "2.5",
+                "dated_on": "2026-05-15",
+                "comment": "test work",
+                "project": {"name": "Acme", "url": "/v2/projects/1"},
+                "task": {"name": "Coding", "url": "/v2/tasks/1"},
+            }
+        }
+        mock_client.__enter__.return_value = mock_client
+        mock_client.get.return_value = mock_response
+
+        with patch.object(api, "_client", return_value=mock_client):
+            result = api.get_timeslip("42")
+            assert result["url"] == "/v2/timeslips/42"
+            assert result["hours"] == "2.5"
+            mock_client.get.assert_called_once_with("/v2/timeslips/42", params={"nested": "true"})
+
+
+class TestDelete:
+    def test_delete_generic(self, api):
+        mock_client = MagicMock()
+        mock_response = MagicMock()
+        mock_response.status_code = 200
+        mock_response.raise_for_status.return_value = None
+        mock_response.json.return_value = {"status": "ok"}
+        mock_client.__enter__.return_value = mock_client
+        mock_client.delete.return_value = mock_response
+
+        with patch.object(api, "_client", return_value=mock_client):
+            result = api.delete("/v2/some/resource")
+            assert result == {"status": "ok"}
+            mock_client.delete.assert_called_once_with("/v2/some/resource")

freeagent_cli-0.3.0/tests/test_cli.py

@@ -0,0 +1,281 @@
+from __future__ import annotations
+
+from unittest.mock import MagicMock, patch
+
+import pytest
+from click.testing import CliRunner
+
+from freeagent_cli.cli import main
+from freeagent_cli.config import Config
+
+
+@pytest.fixture
+def runner():
+    return CliRunner()
+
+
+@pytest.fixture
+def mock_config():
+    c = Config()
+    c.client_id = "test-id"
+    c.client_secret = "test-secret"
+    c.refresh_token = "test-refresh"
+    c.access_token = "test-access"
+    c.access_token_expires_at = 9999999999.0
+    return c
+
+
+@pytest.fixture
+def mock_api():
+    return MagicMock()
+
+
+def _mock_api_and_config(api_mock, config):
+    api_mock.me.return_value = {"url": "/v2/users/me"}
+    api_mock.projects.return_value = [
+        {"name": "Acme", "url": "/v2/projects/1"},
+        {"name": "Big Co", "url": "/v2/projects/2"},
+    ]
+    api_mock.tasks.return_value = [
+        {"name": "Coding", "url": "/v2/tasks/1"},
+        {"name": "Design", "url": "/v2/tasks/2"},
+    ]
+
+
+class TestDelete:
+    def test_delete_confirmed(self, runner, mock_config, mock_api):
+        _mock_api_and_config(mock_api, mock_config)
+        mock_api.get_timeslip.return_value = {
+            "url": "/v2/timeslips/42",
+            "hours": "2.5",
+            "dated_on": "2026-05-15",
+            "comment": "test work",
+            "project": {"name": "Acme", "url": "/v2/projects/1"},
+            "task": {"name": "Coding", "url": "/v2/tasks/1"},
+        }
+        mock_api.delete_timeslip.return_value = {"deleted": True, "id": "42", "already_deleted": False}
+
+        with patch("freeagent_cli.cli.cfg.load", return_value=mock_config), \
+             patch("freeagent_cli.cli.FreeAgent", return_value=mock_api):
+            result = runner.invoke(main, ["delete", "42"], input="y\n")
+            assert result.exit_code == 0
+            assert "Acme / Coding" in result.output
+            assert "2026-05-15" in result.output
+            assert "Deleted" in result.output
+
+    def test_delete_aborted(self, runner, mock_config, mock_api):
+        _mock_api_and_config(mock_api, mock_config)
+        mock_api.get_timeslip.return_value = {
+            "url": "/v2/timeslips/42",
+            "hours": "2.5",
+            "dated_on": "2026-05-15",
+            "comment": "test work",
+            "project": {"name": "Acme", "url": "/v2/projects/1"},
+            "task": {"name": "Coding", "url": "/v2/tasks/1"},
+        }
+
+        with patch("freeagent_cli.cli.cfg.load", return_value=mock_config), \
+             patch("freeagent_cli.cli.FreeAgent", return_value=mock_api):
+            result = runner.invoke(main, ["delete", "42"], input="n\n")
+            assert result.exit_code == 1
+
+    def test_delete_yes_flag_skips_confirm(self, runner, mock_config, mock_api):
+        _mock_api_and_config(mock_api, mock_config)
+        mock_api.get_timeslip.return_value = {
+            "url": "/v2/timeslips/42",
+            "hours": "2.5",
+            "dated_on": "2026-05-15",
+            "comment": "test work",
+            "project": {"name": "Acme", "url": "/v2/projects/1"},
+            "task": {"name": "Coding", "url": "/v2/tasks/1"},
+        }
+        mock_api.delete_timeslip.return_value = {"deleted": True, "id": "42", "already_deleted": False}
+
+        with patch("freeagent_cli.cli.cfg.load", return_value=mock_config), \
+             patch("freeagent_cli.cli.FreeAgent", return_value=mock_api):
+            result = runner.invoke(main, ["delete", "42", "--yes"])
+            assert result.exit_code == 0
+            assert "Deleted" in result.output
+
+    def test_delete_by_url(self, runner, mock_config, mock_api):
+        _mock_api_and_config(mock_api, mock_config)
+        mock_api.get_timeslip.return_value = {
+            "url": "/v2/timeslips/42",
+            "hours": "1.0",
+            "dated_on": "2026-05-14",
+            "comment": "",
+            "project": {"name": "Big Co", "url": "/v2/projects/2"},
+            "task": {"name": "Design", "url": "/v2/tasks/2"},
+        }
+        mock_api.delete_timeslip.return_value = {"deleted": True, "id": "42", "already_deleted": False}
+
+        with patch("freeagent_cli.cli.cfg.load", return_value=mock_config), \
+             patch("freeagent_cli.cli.FreeAgent", return_value=mock_api):
+            result = runner.invoke(main, ["delete", "https://api.freeagent.com/v2/timeslips/42", "--yes"])
+            assert result.exit_code == 0
+            mock_api.get_timeslip.assert_called_once_with("42")
+            mock_api.delete_timeslip.assert_called_once_with("42")
+
+    def test_delete_already_deleted(self, runner, mock_config, mock_api):
+        _mock_api_and_config(mock_api, mock_config)
+        mock_api.get_timeslip.side_effect = Exception("not found")
+
+        with patch("freeagent_cli.cli.cfg.load", return_value=mock_config), \
+             patch("freeagent_cli.cli.FreeAgent", return_value=mock_api):
+            result = runner.invoke(main, ["delete", "999", "--yes"])
+            assert result.exit_code == 2
+            assert "not found" in result.output
+
+
+class TestEdit:
+    def _old_timeslip(self):
+        return {
+            "url": "/v2/timeslips/42",
+            "hours": "2.5",
+            "dated_on": "2026-05-15",
+            "comment": "test work",
+            "project": {"name": "Acme", "url": "/v2/projects/1"},
+            "task": {"name": "Coding", "url": "/v2/tasks/1"},
+        }
+
+    def test_edit_duration(self, runner, mock_config, mock_api):
+        _mock_api_and_config(mock_api, mock_config)
+        mock_api.get_timeslip.return_value = self._old_timeslip()
+        mock_api.create_timeslip.return_value = {
+            "timeslip": {"url": "/v2/timeslips/43", "hours": "1.0", "dated_on": "2026-05-15"}
+        }
+        mock_api.delete_timeslip.return_value = {"deleted": True, "id": "42", "already_deleted": False}
+
+        with patch("freeagent_cli.cli.cfg.load", return_value=mock_config), \
+             patch("freeagent_cli.cli.FreeAgent", return_value=mock_api):
+            result = runner.invoke(main, ["edit", "42", "--duration", "1h", "--yes"])
+            assert result.exit_code == 0
+            assert "2h30m → 1h" in result.output
+            mock_api.create_timeslip.assert_called_once()
+            mock_api.delete_timeslip.assert_called_once_with("42")
+
+    def test_edit_dry_run(self, runner, mock_config, mock_api):
+        _mock_api_and_config(mock_api, mock_config)
+        mock_api.get_timeslip.return_value = self._old_timeslip()
+
+        with patch("freeagent_cli.cli.cfg.load", return_value=mock_config), \
+             patch("freeagent_cli.cli.FreeAgent", return_value=mock_api):
+            result = runner.invoke(main, ["edit", "42", "--duration", "1h", "--dry-run"])
+            assert result.exit_code == 0
+            assert "2h30m → 1h" in result.output
+            mock_api.create_timeslip.assert_not_called()
+            mock_api.delete_timeslip.assert_not_called()
+
+    def test_edit_no_changes(self, runner, mock_config, mock_api):
+        _mock_api_and_config(mock_api, mock_config)
+        mock_api.get_timeslip.return_value = self._old_timeslip()
+
+        with patch("freeagent_cli.cli.cfg.load", return_value=mock_config), \
+             patch("freeagent_cli.cli.FreeAgent", return_value=mock_api):
+            result = runner.invoke(main, ["edit", "42"])
+            assert result.exit_code == 2
+            assert "Nothing to change" in result.output
+
+    def test_edit_project_with_matching_task(self, runner, mock_config, mock_api):
+        _mock_api_and_config(mock_api, mock_config)
+        mock_api.get_timeslip.return_value = self._old_timeslip()
+
+        def _tasks(project_url):
+            if "/projects/2" in project_url:
+                return [
+                    {"name": "Coding", "url": "/v2/tasks/3"},
+                    {"name": "Testing", "url": "/v2/tasks/4"},
+                ]
+            return [
+                {"name": "Coding", "url": "/v2/tasks/1"},
+                {"name": "Design", "url": "/v2/tasks/2"},
+            ]
+
+        mock_api.tasks.side_effect = _tasks
+        mock_api.create_timeslip.return_value = {
+            "timeslip": {"url": "/v2/timeslips/43", "hours": "2.5", "dated_on": "2026-05-15"}
+        }
+        mock_api.delete_timeslip.return_value = {"deleted": True, "id": "42", "already_deleted": False}
+
+        with patch("freeagent_cli.cli.cfg.load", return_value=mock_config), \
+             patch("freeagent_cli.cli.FreeAgent", return_value=mock_api):
+            result = runner.invoke(main, ["edit", "42", "--project", "Big Co", "--yes"])
+            assert result.exit_code == 0
+            assert "Acme → Big Co" in result.output
+
+    def test_edit_project_task_not_found_requires_flag(self, runner, mock_config, mock_api):
+        _mock_api_and_config(mock_api, mock_config)
+        mock_api.get_timeslip.return_value = self._old_timeslip()
+
+        def _tasks(project_url):
+            if "/projects/2" in project_url:
+                return [
+                    {"name": "Testing", "url": "/v2/tasks/4"},
+                ]
+            return [
+                {"name": "Coding", "url": "/v2/tasks/1"},
+            ]
+
+        mock_api.tasks.side_effect = _tasks
+
+        with patch("freeagent_cli.cli.cfg.load", return_value=mock_config), \
+             patch("freeagent_cli.cli.FreeAgent", return_value=mock_api):
+            result = runner.invoke(main, ["edit", "42", "--project", "Big Co", "--yes"])
+            assert result.exit_code == 2
+            assert "--task required" in result.output
+
+    def test_edit_aborted(self, runner, mock_config, mock_api):
+        _mock_api_and_config(mock_api, mock_config)
+        mock_api.get_timeslip.return_value = self._old_timeslip()
+
+        with patch("freeagent_cli.cli.cfg.load", return_value=mock_config), \
+             patch("freeagent_cli.cli.FreeAgent", return_value=mock_api):
+            result = runner.invoke(main, ["edit", "42", "--duration", "3h"], input="n\n")
+            assert result.exit_code == 1
+            mock_api.create_timeslip.assert_not_called()
+
+    def test_edit_timeslip_not_found(self, runner, mock_config, mock_api):
+        _mock_api_and_config(mock_api, mock_config)
+        mock_api.get_timeslip.side_effect = Exception("not found")
+
+        with patch("freeagent_cli.cli.cfg.load", return_value=mock_config), \
+             patch("freeagent_cli.cli.FreeAgent", return_value=mock_api):
+            result = runner.invoke(main, ["edit", "999", "--duration", "2h"])
+            assert result.exit_code == 2
+            assert "not found" in result.output
+
+    def test_edit_comment_blank(self, runner, mock_config, mock_api):
+        _mock_api_and_config(mock_api, mock_config)
+        mock_api.get_timeslip.return_value = self._old_timeslip()
+        mock_api.create_timeslip.return_value = {
+            "timeslip": {"url": "/v2/timeslips/43"}
+        }
+        mock_api.delete_timeslip.return_value = {"deleted": True, "id": "42", "already_deleted": False}
+
+        with patch("freeagent_cli.cli.cfg.load", return_value=mock_config), \
+             patch("freeagent_cli.cli.FreeAgent", return_value=mock_api):
+            result = runner.invoke(main, ["edit", "42", "--comment", "", "--yes"])
+            assert result.exit_code == 0
+            assert "'test work' → ''" in result.output
+
+
+class TestRecent:
+    def test_recent_includes_url(self, runner, mock_config, mock_api):
+        _mock_api_and_config(mock_api, mock_config)
+        mock_api.list_timeslips.return_value = [
+            {
+                "url": "/v2/timeslips/42",
+                "hours": "2.5",
+                "dated_on": "2026-05-15",
+                "created_at": "2026-05-15T10:00:00Z",
+                "comment": "test work",
+                "project": {"name": "Acme"},
+                "task": {"name": "Coding"},
+            }
+        ]
+
+        with patch("freeagent_cli.cli.cfg.load", return_value=mock_config), \
+             patch("freeagent_cli.cli.FreeAgent", return_value=mock_api):
+            result = runner.invoke(main, ["recent"])
+            assert result.exit_code == 0
+            assert "/v2/timeslips/42" in result.output

freeagent_cli-0.3.0/tests/test_helpers.py

@@ -0,0 +1,83 @@
+from __future__ import annotations
+
+import pytest
+
+from freeagent_cli.cli import _extract_id, format_hours, parse_hours
+
+
+class TestParseHours:
+    def test_decimal(self):
+        assert parse_hours("1.5") == 1.5
+        assert parse_hours("0.25") == 0.25
+
+    def test_minutes_only(self):
+        assert parse_hours("90m") == 1.5
+        assert parse_hours("30m") == 0.5
+        assert parse_hours("0m") == 0.0
+
+    def test_hours_only(self):
+        assert parse_hours("1h") == 1.0
+        assert parse_hours("2h") == 2.0
+
+    def test_hours_and_minutes(self):
+        assert parse_hours("1h30m") == 1.5
+        assert parse_hours("2h15m") == 2.25
+        assert parse_hours("0h45m") == 0.75
+
+    def test_colon_format(self):
+        assert parse_hours("1:30") == 1.5
+        assert parse_hours("0:45") == 0.75
+        assert parse_hours("2:00") == 2.0
+
+    def test_case_insensitive(self):
+        assert parse_hours("1H30M") == 1.5
+        assert parse_hours("90M") == 1.5
+
+    def test_whitespace(self):
+        assert parse_hours("  1.5  ") == 1.5
+
+    def test_invalid(self):
+        with pytest.raises(ValueError, match="Cannot parse duration"):
+            parse_hours("abc")
+        with pytest.raises(ValueError, match="Cannot parse duration"):
+            parse_hours("")
+
+    def test_fractional_hours_with_minutes(self):
+        assert parse_hours("1.5h30m") == 2.0
+
+
+class TestFormatHours:
+    def test_minutes_only(self):
+        assert format_hours(0.5) == "30m"
+        assert format_hours(0.25) == "15m"
+        assert format_hours(0) == "0m"
+
+    def test_hours_only(self):
+        assert format_hours(1.0) == "1h"
+        assert format_hours(2.0) == "2h"
+
+    def test_hours_and_minutes(self):
+        assert format_hours(1.5) == "1h30m"
+        assert format_hours(2.25) == "2h15m"
+        assert format_hours(0.75) == "45m"
+
+    def test_rounding(self):
+        assert format_hours(0.505) == "30m"
+        assert format_hours(0.495) == "30m"
+
+    def test_bad_input(self):
+        assert format_hours(None) == "None"
+
+
+class TestExtractId:
+    def test_numeric_id(self):
+        assert _extract_id("123456") == "123456"
+
+    def test_full_url(self):
+        assert _extract_id("https://api.freeagent.com/v2/timeslips/123456") == "123456"
+
+    def test_sandbox_url(self):
+        assert _extract_id("https://api.sandbox.freeagent.com/v2/timeslips/789") == "789"
+
+    def test_url_with_query(self):
+        assert _extract_id("https://api.freeagent.com/v2/timeslips/42?nested=true") == "42?nested=true"

{freeagent_cli-0.2.0 → freeagent_cli-0.3.0}/uv.lock

@@ -47,7 +47,7 @@ wheels = [
 
 [[package]]
 name = "freeagent-cli"
-version = "0.2.0"
+version = "0.3.0"
 source = { editable = "." }
 dependencies = [
     { name = "click" },
@@ -55,6 +55,11 @@ dependencies = [
     { name = "platformdirs" },
 ]
 
+[package.dev-dependencies]
+dev = [
+    { name = "pytest" },
+]
+
 [package.metadata]
 requires-dist = [
     { name = "click", specifier = ">=8.1" },
@@ -62,6 +67,9 @@ requires-dist = [
     { name = "platformdirs", specifier = ">=4.0" },
 ]
 
+[package.metadata.requires-dev]
+dev = [{ name = "pytest", specifier = ">=9.0.3" }]
+
 [[package]]
 name = "h11"
 version = "0.16.0"
@@ -108,6 +116,24 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/6c/3c/3f62dee257eb3d6b2c1ef2a09d36d9793c7111156a73b5654d2c2305e5ce/idna-3.14-py3-none-any.whl", hash = "sha256:e677eaf072e290f7b725f9acf0b3a2bd55f9fd6f7c70abe5f0e34823d0accf69", size = 72184, upload-time = "2026-05-10T20:32:14.295Z" },
 ]
 
+[[package]]
+name = "iniconfig"
+version = "2.3.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/72/34/14ca021ce8e5dfedc35312d08ba8bf51fdd999c576889fc2c24cb97f4f10/iniconfig-2.3.0.tar.gz", hash = "sha256:c76315c77db068650d49c5b56314774a7804df16fee4402c1f19d6d15d8c4730", size = 20503, upload-time = "2025-10-18T21:55:43.219Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/cb/b1/3846dd7f199d53cb17f49cba7e651e9ce294d8497c8c150530ed11865bb8/iniconfig-2.3.0-py3-none-any.whl", hash = "sha256:f631c04d2c48c52b84d0d0549c99ff3859c98df65b3101406327ecc7d53fbf12", size = 7484, upload-time = "2025-10-18T21:55:41.639Z" },
+]
+
+[[package]]
+name = "packaging"
+version = "26.2"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/d7/f1/e7a6dd94a8d4a5626c03e4e99c87f241ba9e350cd9e6d75123f992427270/packaging-26.2.tar.gz", hash = "sha256:ff452ff5a3e828ce110190feff1178bb1f2ea2281fa2075aadb987c2fb221661", size = 228134, upload-time = "2026-04-24T20:15:23.917Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/df/b2/87e62e8c3e2f4b32e5fe99e0b86d576da1312593b39f47d8ceef365e95ed/packaging-26.2-py3-none-any.whl", hash = "sha256:5fc45236b9446107ff2415ce77c807cee2862cb6fac22b8a73826d0693b0980e", size = 100195, upload-time = "2026-04-24T20:15:22.081Z" },
+]
+
 [[package]]
 name = "platformdirs"
 version = "4.9.6"
@@ -117,6 +143,40 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/75/a6/a0a304dc33b49145b21f4808d763822111e67d1c3a32b524a1baf947b6e1/platformdirs-4.9.6-py3-none-any.whl", hash = "sha256:e61adb1d5e5cb3441b4b7710bea7e4c12250ca49439228cc1021c00dcfac0917", size = 21348, upload-time = "2026-04-09T00:04:09.463Z" },
 ]
 
+[[package]]
+name = "pluggy"
+version = "1.6.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/f9/e2/3e91f31a7d2b083fe6ef3fa267035b518369d9511ffab804f839851d2779/pluggy-1.6.0.tar.gz", hash = "sha256:7dcc130b76258d33b90f61b658791dede3486c3e6bfb003ee5c9bfb396dd22f3", size = 69412, upload-time = "2025-05-15T12:30:07.975Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/54/20/4d324d65cc6d9205fabedc306948156824eb9f0ee1633355a8f7ec5c66bf/pluggy-1.6.0-py3-none-any.whl", hash = "sha256:e920276dd6813095e9377c0bc5566d94c932c33b27a3e3945d8389c374dd4746", size = 20538, upload-time = "2025-05-15T12:30:06.134Z" },
+]
+
+[[package]]
+name = "pygments"
+version = "2.20.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/c3/b2/bc9c9196916376152d655522fdcebac55e66de6603a76a02bca1b6414f6c/pygments-2.20.0.tar.gz", hash = "sha256:6757cd03768053ff99f3039c1a36d6c0aa0b263438fcab17520b30a303a82b5f", size = 4955991, upload-time = "2026-03-29T13:29:33.898Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/f4/7e/a72dd26f3b0f4f2bf1dd8923c85f7ceb43172af56d63c7383eb62b332364/pygments-2.20.0-py3-none-any.whl", hash = "sha256:81a9e26dd42fd28a23a2d169d86d7ac03b46e2f8b59ed4698fb4785f946d0176", size = 1231151, upload-time = "2026-03-29T13:29:30.038Z" },
+]
+
+[[package]]
+name = "pytest"
+version = "9.0.3"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "colorama", marker = "sys_platform == 'win32'" },
+    { name = "iniconfig" },
+    { name = "packaging" },
+    { name = "pluggy" },
+    { name = "pygments" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/7d/0d/549bd94f1a0a402dc8cf64563a117c0f3765662e2e668477624baeec44d5/pytest-9.0.3.tar.gz", hash = "sha256:b86ada508af81d19edeb213c681b1d48246c1a91d304c6c81a427674c17eb91c", size = 1572165, upload-time = "2026-04-07T17:16:18.027Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/d4/24/a372aaf5c9b7208e7112038812994107bc65a84cd00e0354a88c2c77a617/pytest-9.0.3-py3-none-any.whl", hash = "sha256:2c5efc453d45394fdd706ade797c0a81091eccd1d6e4bccfcd476e2b8e0ab5d9", size = 375249, upload-time = "2026-04-07T17:16:16.13Z" },
+]
+
 [[package]]
 name = "typing-extensions"
 version = "4.15.0"

freeagent_cli-0.2.0/src/freeagent_cli/__init__.py

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