taskcheck 1.6.1__tar.gz → 1.7.0__tar.gz

{taskcheck-1.6.1 → taskcheck-1.7.0}/PKG-INFO

@@ -1,8 +1,8 @@
 Metadata-Version: 2.4
 Name: taskcheck
-Version: 1.6.1
+Version: 1.7.0
 Summary: Automatic scheduler for taskwarrior
-Requires-Python: >=3.11
+Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 Requires-Dist: appdirs>=1.4.4
 Requires-Dist: google-api-python-client>=2.198.0
@@ -114,6 +114,11 @@ Create a preview with `taskcheck --schedule --dry-run`. It does not update Taskw
 saves the generated schedule to the Taskwarrior data directory. Reuse it with `taskcheck --report
 today --dry-run` or `taskcheck --timeline 1w --dry-run`.
 
+Report columns use the labels from `uda.<attribute>.label` in the active Taskwarrior configuration.
+Reports show a robot icon beside the task ID for tasks tagged `agent`.
+Dry-run schedules retain custom task attributes, including `agent_weight`.
+When you load an older preview, Taskcheck fills missing task attributes from Taskwarrior and keeps the saved schedule.
+
 Timeline rows follow dotted project levels such as `work.client`. Without `--zoom`, the most
 detailed view that fits the terminal width is selected: day, then week, then month. The track uses
 `▶` for a start, `━` for work, `◀` for an end, and `◆` for a deadline. Thin, heavy, and double rules
@@ -148,6 +153,10 @@ Before writing a schedule, taskcheck backs up the affected tasks' `scheduled`, `
 
 If a task would finish after its due date, taskcheck retries with a total-urgency override. Each retry moves the task immediately above the task with the smallest greater urgency by adding `urgency_epsilon` (default: `0.1`). At rank 1, it adds epsilon for up to `max_top_urgency_rounds` retries (default: `10`), then tries once at urgency `1000`. If the task is still late, taskcheck stops raising it and optimizes the other overdue tasks.
 
+Each task gets at most `N - 1 + max_top_urgency_rounds` priority increases before the final retry at urgency `1000`.
+Here, `N` is the number of tasks in the schedule.
+This limit stops repeated retries when tasks with competing deadlines keep overtaking each other.
+
 ## Tips and Tricks
 
 - You can exclude a task from being scheduled by removing the `time_map` or `estimated` attributes.

taskcheck-1.6.1/taskcheck.egg-info/PKG-INFO → taskcheck-1.7.0/README.md

@@ -1,18 +1,3 @@
-Metadata-Version: 2.4
-Name: taskcheck
-Version: 1.6.1
-Summary: Automatic scheduler for taskwarrior
-Requires-Python: >=3.11
-Description-Content-Type: text/markdown
-Requires-Dist: appdirs>=1.4.4
-Requires-Dist: google-api-python-client>=2.198.0
-Requires-Dist: google-auth>=2.56.2
-Requires-Dist: google-auth-oauthlib>=1.2.2
-Requires-Dist: icalendar>=6.0.1
-Requires-Dist: random-unicode-emoji>=2.8
-Requires-Dist: requests>=2.32.3
-Requires-Dist: rich>=13.9.4
-
 A Taskwarrior scheduler for people who want a realistic plan, not a manual to-do list.
 It turns tasks, working hours, and calendar blocks into an actionable schedule — then keeps due dates visible.
 
@@ -114,6 +99,11 @@ Create a preview with `taskcheck --schedule --dry-run`. It does not update Taskw
 saves the generated schedule to the Taskwarrior data directory. Reuse it with `taskcheck --report
 today --dry-run` or `taskcheck --timeline 1w --dry-run`.
 
+Report columns use the labels from `uda.<attribute>.label` in the active Taskwarrior configuration.
+Reports show a robot icon beside the task ID for tasks tagged `agent`.
+Dry-run schedules retain custom task attributes, including `agent_weight`.
+When you load an older preview, Taskcheck fills missing task attributes from Taskwarrior and keeps the saved schedule.
+
 Timeline rows follow dotted project levels such as `work.client`. Without `--zoom`, the most
 detailed view that fits the terminal width is selected: day, then week, then month. The track uses
 `▶` for a start, `━` for work, `◀` for an end, and `◆` for a deadline. Thin, heavy, and double rules
@@ -148,6 +138,10 @@ Before writing a schedule, taskcheck backs up the affected tasks' `scheduled`, `
 
 If a task would finish after its due date, taskcheck retries with a total-urgency override. Each retry moves the task immediately above the task with the smallest greater urgency by adding `urgency_epsilon` (default: `0.1`). At rank 1, it adds epsilon for up to `max_top_urgency_rounds` retries (default: `10`), then tries once at urgency `1000`. If the task is still late, taskcheck stops raising it and optimizes the other overdue tasks.
 
+Each task gets at most `N - 1 + max_top_urgency_rounds` priority increases before the final retry at urgency `1000`.
+Here, `N` is the number of tasks in the schedule.
+This limit stops repeated retries when tasks with competing deadlines keep overtaking each other.
+
 ## Tips and Tricks
 
 - You can exclude a task from being scheduled by removing the `time_map` or `estimated` attributes.

{taskcheck-1.6.1 → taskcheck-1.7.0}/pyproject.toml

@@ -1,9 +1,9 @@
 [project]
 name = "taskcheck"
-version = "1.6.1"
+version = "1.7.0"
 description = "Automatic scheduler for taskwarrior"
 readme = "README.md"
-requires-python = ">=3.11"
+requires-python = ">=3.12"
 dependencies = [
   "appdirs>=1.4.4",
   "google-api-python-client>=2.198.0",

{taskcheck-1.6.1 → taskcheck-1.7.0}/taskcheck/__main__.py

@@ -102,8 +102,8 @@ def load_config():
         },
         "report": {
             "include_unplanned": true,
-            "additional_attributes": [],
-            "additional_attributes_unplanned": [],
+            "attributes": ["id", "project", "description", "scheduling_hours"],
+            "attributes_unplanned": ["id", "project", "description"],
             "emoji_keywords": {},
             ...
         }

{taskcheck-1.6.1 → taskcheck-1.7.0}/taskcheck/dry_run.py

@@ -1,7 +1,9 @@
 import json
+import subprocess
 from pathlib import Path
 
 from taskcheck.undo import get_task_data_dir
+from taskcheck.common import get_task_env
 
 
 def get_dry_run_path(taskrc=None):
@@ -19,4 +21,17 @@ def load_dry_run_results(taskrc=None):
     path = get_dry_run_path(taskrc)
     if not path.exists():
         return None
-    return json.loads(path.read_text())
+    results = json.loads(path.read_text())
+    if not results:
+        return results
+    response = subprocess.run(
+        ["task", "export"], capture_output=True, text=True,
+        env=get_task_env(taskrc),
+    )
+    current_tasks = {
+        task["uuid"]: task for task in json.loads(response.stdout)
+    }
+    return [
+        {**current_tasks.get(task.get("uuid"), {}), **task}
+        for task in results
+    ]

{taskcheck-1.6.1 → taskcheck-1.7.0}/taskcheck/install.py

@@ -20,8 +20,8 @@ n_undos = 1
 
 [report]
 include_unplanned = true
-additional_attributes = []
-additional_attributes_unplanned = []
+attributes = ["id", "project", "description", "scheduling_hours"]
+attributes_unplanned = ["id", "project", "description"]
 # unplanned_max_due = "30d"
 emoji_keywords = {}
 

{taskcheck-1.6.1 → taskcheck-1.7.0}/taskcheck/parallel.py

@@ -58,7 +58,7 @@ def advance_urgency_override(
     for task_uuid in overdue_uuids:
         state = adjustment_states.setdefault(
             task_uuid,
-            {"top_rounds": 0, "fallback_used": False, "exhausted": False},
+            {"top_rounds": 0, "rounds": 0, "fallback_used": False, "exhausted": False},
         )
         if state["exhausted"]:
             continue
@@ -72,7 +72,10 @@ def advance_urgency_override(
             for uuid in task_info
             if uuid != task_uuid and effective_urgency(uuid) > current_urgency
         ]
-        if greater_urgencies:
+        if state["rounds"] >= len(task_info) - 1 + max_top_rounds:
+            urgency_overrides[task_uuid] = 1000.0
+            state["fallback_used"] = True
+        elif greater_urgencies:
             urgency_overrides[task_uuid] = min(greater_urgencies) + epsilon
         elif state["top_rounds"] < max_top_rounds:
             urgency_overrides[task_uuid] = current_urgency + epsilon
@@ -80,6 +83,7 @@ def advance_urgency_override(
         else:
             urgency_overrides[task_uuid] = 1000.0
             state["fallback_used"] = True
+        state["rounds"] += 1
         return task_uuid
     return None
 
@@ -289,13 +293,7 @@ def check_tasks_parallel(
                 scheduling_note += f"{date_str} - {hours_to_pdth(hours)}\n"
 
             task_result = {
-                "id": task["id"],
-                "uuid": task["uuid"],
-                "description": task["description"],
-                "project": task.get("project", ""),
-                "urgency": task.get("urgency", 0),
-                "estimated": task["estimated"],
-                "due": task.get("due", ""),
+                **task,
                 "scheduled": start_date,
                 "completion_date": end_date,
                 "scheduling": scheduling_note.strip(),

{taskcheck-1.6.1 → taskcheck-1.7.0}/taskcheck/report.py

@@ -198,16 +198,10 @@ def get_tasks(config, tasks, year, month, day):
                     due = due - datetime.today()
                 valid_tasks.append(
                     {
-                        "id": task["id"],
-                        "project": task.get("project", ""),
-                        "description": task["description"],
-                        "urgency": task["urgency"],
+                        **task,
                         "scheduling_day": f"{year}-{month}-{day}",
                         "scheduling_hours": m.group(1),
-                        **{
-                            attr: task.get(attr, "")
-                            for attr in config.get("additional_attributes", [])
-                        },
+                        "tags": task.get("tags", []),
                     }
                 )
     valid_tasks = sorted(valid_tasks, key=lambda x: x["urgency"], reverse=True)
@@ -287,7 +281,22 @@ def get_unplanned_tasks(config, tasks, taskrc=None):
 
 
 def generate_report(config, constraint, verbose=False, force_update=False, taskrc=None, scheduling_results=None):
-    report_config = config["report"]
+    from taskcheck.common import get_task_env
+
+    report_config = dict(config["report"])
+    result = subprocess.run(
+        ["task", "_show"],
+        capture_output=True,
+        text=True,
+        env=get_task_env(taskrc),
+    )
+    report_config["attribute_labels"] = {
+        key[4:-6]: value
+        for line in result.stdout.splitlines()
+        if "=" in line
+        for key, value in [line.split("=", 1)]
+        if key.startswith("uda.") and key.endswith(".label") and value
+    }
     theme = detect_theme(config=config.get("timeline", {}))
     console = Console()
     
@@ -347,32 +356,38 @@ def display_tasks_table(console, config, tasks, theme="dark"):
 
 def build_tasks_table(config, tasks, theme="dark"):
     """Build a Rich table for displaying tasks."""
+    return _build_report_table(
+        config, tasks, config.get("attributes", ["id", "project", "description", "scheduling_hours"]), theme
+    )
+
+
+def _build_report_table(config, tasks, attributes, theme):
     header_style = "bold cyan" if theme == "dark" else "bold blue"
     table = Table(show_header=True, header_style=header_style)
-    table.add_column("Task", style="dim", width=12)
-    table.add_column("Project", style="dim", width=12)
-    table.add_column("Description")
-    table.add_column("Time", justify="right")
-    for attr in config.get("additional_attributes", []):
-        table.add_column(attr.capitalize(), justify="right")
-
-    for task in tasks:
-        task_id = f"[bold green]#{task['id']}[/bold green]"
-        project = task.get("project", "")
-        description = Text(task["description"], style="italic")
-        hours = f"[yellow]{task['scheduling_hours']}[/yellow]"
-        emoji = get_task_emoji(config, task)
-
-        table.add_row(
-            f"{emoji} {task_id}",
-            project,
-            description,
-            hours,
-            *[
-                tostring(task.get(attr, ""))
-                for attr in config.get("additional_attributes", [])
-            ],
+    labels = {"id": "Task", "scheduling_hours": "Time"}
+    for attr in attributes:
+        label = config.get("attribute_labels", {}).get(
+            attr, labels.get(attr, attr.capitalize())
         )
+        if attr in ("id", "project"):
+            table.add_column(label, style="dim", width=12)
+        else:
+            table.add_column(label, justify="left" if attr == "description" else "right")
+    if not attributes:
+        return table
+    for task in tasks:
+        cells = []
+        for attr in attributes:
+            if attr == "id":
+                icon = " 🤖" if "agent" in task.get("tags", []) else ""
+                cells.append(f"{get_task_emoji(config, task)} [bold green]#{task['id']}[/bold green]{icon}")
+            elif attr == "description":
+                cells.append(Text(task.get(attr, ""), style="italic"))
+            elif attr == "scheduling_hours":
+                cells.append(f"[yellow]{task.get(attr, '')}[/yellow]")
+            else:
+                cells.append(tostring(task.get(attr, "")))
+        table.add_row(*cells)
     return table
 
 
@@ -417,27 +432,6 @@ def display_unplanned_tasks(console, config, tasks, theme="dark"):
 
 def build_unplanned_tasks_table(config, tasks, theme="dark"):
     """Build a Rich table for displaying unplanned tasks."""
-    header_style = "bold cyan" if theme == "dark" else "bold blue"
-    table = Table(show_header=True, header_style=header_style)
-    table.add_column("Task", style="dim", width=12)
-    table.add_column("Project", style="dim", width=12)
-    table.add_column("Description")
-    for attr in config.get("additional_attributes_unplanned", []):
-        table.add_column(attr.capitalize(), justify="right")
-
-    for task in tasks:
-        task_id = f"[bold green]#{task['id']}[/bold green]"
-        project = task.get("project", "")
-        description = Text(task["description"], style="italic")
-        emoji = get_task_emoji(config, task)
-
-        table.add_row(
-            f"{emoji} {task_id}",
-            project,
-            description,
-            *[
-                tostring(task.get(attr, ""))
-                for attr in config.get("additional_attributes_unplanned", [])
-            ],
-        )
-    return table
+    return _build_report_table(
+        config, tasks, config.get("attributes_unplanned", ["id", "project", "description"]), theme
+    )

taskcheck-1.6.1/README.md → taskcheck-1.7.0/taskcheck.egg-info/PKG-INFO

@@ -1,3 +1,18 @@
+Metadata-Version: 2.4
+Name: taskcheck
+Version: 1.7.0
+Summary: Automatic scheduler for taskwarrior
+Requires-Python: >=3.12
+Description-Content-Type: text/markdown
+Requires-Dist: appdirs>=1.4.4
+Requires-Dist: google-api-python-client>=2.198.0
+Requires-Dist: google-auth>=2.56.2
+Requires-Dist: google-auth-oauthlib>=1.2.2
+Requires-Dist: icalendar>=6.0.1
+Requires-Dist: random-unicode-emoji>=2.8
+Requires-Dist: requests>=2.32.3
+Requires-Dist: rich>=13.9.4
+
 A Taskwarrior scheduler for people who want a realistic plan, not a manual to-do list.
 It turns tasks, working hours, and calendar blocks into an actionable schedule — then keeps due dates visible.
 
@@ -99,6 +114,11 @@ Create a preview with `taskcheck --schedule --dry-run`. It does not update Taskw
 saves the generated schedule to the Taskwarrior data directory. Reuse it with `taskcheck --report
 today --dry-run` or `taskcheck --timeline 1w --dry-run`.
 
+Report columns use the labels from `uda.<attribute>.label` in the active Taskwarrior configuration.
+Reports show a robot icon beside the task ID for tasks tagged `agent`.
+Dry-run schedules retain custom task attributes, including `agent_weight`.
+When you load an older preview, Taskcheck fills missing task attributes from Taskwarrior and keeps the saved schedule.
+
 Timeline rows follow dotted project levels such as `work.client`. Without `--zoom`, the most
 detailed view that fits the terminal width is selected: day, then week, then month. The track uses
 `▶` for a start, `━` for work, `◀` for an end, and `◆` for a deadline. Thin, heavy, and double rules
@@ -133,6 +153,10 @@ Before writing a schedule, taskcheck backs up the affected tasks' `scheduled`, `
 
 If a task would finish after its due date, taskcheck retries with a total-urgency override. Each retry moves the task immediately above the task with the smallest greater urgency by adding `urgency_epsilon` (default: `0.1`). At rank 1, it adds epsilon for up to `max_top_urgency_rounds` retries (default: `10`), then tries once at urgency `1000`. If the task is still late, taskcheck stops raising it and optimizes the other overdue tasks.
 
+Each task gets at most `N - 1 + max_top_urgency_rounds` priority increases before the final retry at urgency `1000`.
+Here, `N` is the number of tasks in the schedule.
+This limit stops repeated retries when tasks with competing deadlines keep overtaking each other.
+
 ## Tips and Tricks
 
 - You can exclude a task from being scheduled by removing the `time_map` or `estimated` attributes.

{taskcheck-1.6.1 → taskcheck-1.7.0}/taskcheck.egg-info/SOURCES.txt

@@ -22,11 +22,13 @@ taskcheck.egg-info/top_level.txt
 tests/test_agent_blocks.py
 tests/test_agent_scheduler_integration.py
 tests/test_common.py
+tests/test_dry_run.py
 tests/test_google_calendar.py
 tests/test_ical.py
 tests/test_install.py
 tests/test_main.py
 tests/test_parallel.py
 tests/test_report.py
+tests/test_report_columns.py
 tests/test_timeline.py
 tests/test_undo.py

taskcheck-1.7.0/tests/test_dry_run.py

@@ -0,0 +1,21 @@
+import json
+from unittest.mock import patch
+
+from taskcheck.dry_run import load_dry_run_results
+
+
+def test_old_preview_recovers_missing_attributes_without_changing_schedule(tmp_path):
+    path = tmp_path / "dry-run.json"
+    cached = [{"uuid": "agent", "scheduling": "2026-11-10 - PT2H"}]
+    path.write_text(json.dumps(cached))
+    current = [{"uuid": "agent", "agent_weight": 25,
+                "scheduling": "2026-11-11 - PT1H"}]
+    with patch("taskcheck.dry_run.get_dry_run_path", return_value=path), patch(
+        "taskcheck.dry_run.subprocess.run"
+    ) as export:
+        export.return_value.stdout = json.dumps(current)
+        result = load_dry_run_results()
+    assert result is not None
+    assert result[0]["agent_weight"] == 25
+    assert result[0]["scheduling"] == "2026-11-10 - PT2H"
+    assert json.loads(path.read_text()) == cached

{taskcheck-1.6.1 → taskcheck-1.7.0}/tests/test_parallel.py

@@ -388,6 +388,25 @@ class TestMainSchedulingFunction:
 
 
 class TestAutoAdjustUrgency:
+    def test_competing_overdue_tasks_exhaust_retries(self):
+        task_info = {
+            uuid: {"task": {"uuid": uuid, "urgency": urgency}, "urgency": urgency}
+            for uuid, urgency in (("a", 1.0), ("b", 2.0))
+        }
+        overrides = {}
+        states = {}
+        # Resolving one deadline can make the other task late on the next pass.
+        for index in range(12):
+            overdue = [task_info["a" if index % 2 == 0 else "b"]["task"]]
+            advance_urgency_override(
+                overdue, task_info, overrides, states, epsilon=0.1, max_top_rounds=2
+            )
+        assert advance_urgency_override(
+            [info["task"] for info in task_info.values()],
+            task_info, overrides, states, epsilon=0.1, max_top_rounds=2,
+        ) is None
+        assert overrides == {"a": 1000.0, "b": 1000.0}
+
     def test_urgency_override_moves_up_one_rank_then_uses_bounded_top_rounds(self):
         task_info = {
             "t1": {"task": {"uuid": "t1"}, "urgency": 1.0},

{taskcheck-1.6.1 → taskcheck-1.7.0}/tests/test_report.py

@@ -246,7 +246,7 @@ class TestReportGeneration:
     @patch('taskcheck.report.fetch_tasks')
     @patch('taskcheck.report.get_days_in_constraint')
     @patch('taskcheck.report.get_unplanned_tasks')
-    def test_generate_report_with_unplanned(self, mock_unplanned, mock_days, mock_fetch, sample_config, test_taskrc):
+    def test_generate_report_with_unplanned(self, mock_unplanned, mock_days, mock_fetch, sample_config, test_taskrc, capsys):
         mock_fetch.return_value = []
         mock_days.return_value = [(2023, 12, 5)]
         mock_unplanned.return_value = [
@@ -260,7 +260,7 @@ class TestReportGeneration:
         
         generate_report(sample_config, "today", verbose=True, taskrc=test_taskrc)
         
-        mock_unplanned.assert_called_once_with(sample_config["report"], [], taskrc=test_taskrc)
+        assert "Unplanned task" in capsys.readouterr().out
 
     @patch('taskcheck.report.display_unplanned_tasks')
     @patch('taskcheck.report.get_unplanned_tasks')
@@ -278,5 +278,4 @@ class TestReportGeneration:
         generate_report(sample_config, "today", verbose=False, taskrc=test_taskrc, scheduling_results=scheduling_results)
 
         mock_fetch.assert_called_once_with(test_taskrc)
-        mock_unplanned.assert_called_once_with(sample_config["report"], mock_fetch.return_value, taskrc=test_taskrc)
         mock_display.assert_called_once()

taskcheck-1.7.0/tests/test_report_columns.py

@@ -0,0 +1,29 @@
+from io import StringIO
+
+from rich.console import Console
+
+from taskcheck.report import build_tasks_table, build_unplanned_tasks_table, get_tasks
+
+
+def test_explicit_columns_replace_defaults_in_order():
+    task = {"id": 2, "description": "Agent work", "urgency": 1,
+            "tags": ["agent"], "agent_weight": 0.34,
+            "scheduling": "2026-11-10 - PT2H"}
+    config = {"attributes": ["agent_weight", "description"],
+              "attribute_labels": {"agent_weight": "Attention"}}
+    rows = get_tasks(config, [task], 2026, 11, 10)
+    table = build_tasks_table(config, rows)
+    assert [column.header for column in table.columns] == ["Attention", "Description"]
+    stream = StringIO()
+    Console(file=stream, width=100).print(table)
+    assert "0.34" in stream.getvalue()
+    assert "Agent work" in stream.getvalue()
+    assert "#2" not in stream.getvalue()
+
+
+def test_unplanned_columns_are_independent_and_empty_means_none():
+    config = {"attributes": [], "attributes_unplanned": ["description"]}
+    tasks = [{"id": 1, "description": "Unplanned work"}]
+    assert build_tasks_table(config, tasks).columns == []
+    table = build_unplanned_tasks_table(config, tasks)
+    assert [column.header for column in table.columns] == ["Description"]