cctally 1.24.0 → 1.26.0

package/bin/_lib_share.py

@@ -66,8 +66,14 @@ class DeltaCell:
 
 @dataclass(frozen=True)
 class ProjectCell:
-    """Anonymization chokepoint — scrubber rewrites the `label` field."""
+    """Anonymization chokepoint — scrubber rewrites the `label` field.
+
+    `rank_cost` (#130): an explicit spend value used by
+    `_collect_project_costs` to rank anonymized labels, replacing the old
+    hidden-MoneyCell hack. When None, ranking falls back to summing sibling
+    MoneyCells (back-compat for every non-budget construction site)."""
     label: str
+    rank_cost: float | None = None
 
 Cell = TextCell | MoneyCell | PercentCell | DateCell | DeltaCell | ProjectCell
 
@@ -735,7 +741,8 @@ def _render_svg_footer(snap: ShareSnapshot, *, palette: dict,
 
 def _collect_project_costs(snap: ShareSnapshot) -> dict[str, float]:
     """Walk rows: for each row containing a ProjectCell, sum MoneyCell values
-    in the same row under the project label.
+    in the same row under the project label — unless the ProjectCell carries an
+    explicit ``rank_cost``, which takes precedence over the MoneyCell sum (#130).
 
     Charts also contribute via ChartPoint.project_label + y_value (when y_value
     is in $). For consistency we union both sources; rows take precedence on
@@ -744,13 +751,16 @@ def _collect_project_costs(snap: ShareSnapshot) -> dict[str, float]:
     for row in snap.rows:
         proj_label: str | None = None
         money = 0.0
+        explicit_rank: float | None = None
         for cell in row.cells.values():
             if isinstance(cell, ProjectCell):
                 proj_label = cell.label
+                explicit_rank = cell.rank_cost
             elif isinstance(cell, MoneyCell):
                 money += cell.usd
         if proj_label is not None:
-            costs[proj_label] = costs.get(proj_label, 0.0) + money
+            contribution = explicit_rank if explicit_rank is not None else money
+            costs[proj_label] = costs.get(proj_label, 0.0) + contribution
 
     if snap.chart is not None:
         chart_pts: list[ChartPoint] = []
@@ -825,7 +835,9 @@ def _apply_anon_mapping(
         new_cells: dict[str, Cell] = {}
         for key, cell in row.cells.items():
             if isinstance(cell, ProjectCell) and cell.label in mapping:
-                new_cells[key] = ProjectCell(mapping[cell.label])
+                new_cells[key] = ProjectCell(
+                    mapping[cell.label], rank_cost=cell.rank_cost
+                )
             else:
                 new_cells[key] = cell
         new_rows.append(Row(cells=new_cells))

package/bin/cctally

@@ -376,11 +376,13 @@ _lib_alerts_payload = _load_sibling("_lib_alerts_payload")
 _alert_text_weekly = _lib_alerts_payload._alert_text_weekly
 _alert_text_five_hour = _lib_alerts_payload._alert_text_five_hour
 _alert_text_budget = _lib_alerts_payload._alert_text_budget
+_alert_text_project_budget = _lib_alerts_payload._alert_text_project_budget
 _alert_text_projected = _lib_alerts_payload._alert_text_projected
 _escape_applescript_string = _lib_alerts_payload._escape_applescript_string
 _build_alert_payload_weekly = _lib_alerts_payload._build_alert_payload_weekly
 _build_alert_payload_five_hour = _lib_alerts_payload._build_alert_payload_five_hour
 _build_alert_payload_budget = _lib_alerts_payload._build_alert_payload_budget
+_build_alert_payload_project_budget = _lib_alerts_payload._build_alert_payload_project_budget
 _build_alert_payload_projected = _lib_alerts_payload._build_alert_payload_projected
 
 _lib_alert_dispatch = _load_sibling("_lib_alert_dispatch")
@@ -628,6 +630,13 @@ cmd_sync_week = _cctally_sync_week.cmd_sync_week
 # module-private (no external caller).
 _cctally_project = _load_sibling("_cctally_project")
 cmd_project = _cctally_project.cmd_project
+# Shared per-project cost compute (#19/#121, spec §7.1). Re-exported so the
+# per-project budget display (cmd_budget) and the Task 3 firing path reach it
+# via the cctally namespace.
+_sum_cost_by_project = _cctally_project._sum_cost_by_project
+# Shared per-project label disambiguation (#130). Re-exported so the budget
+# display, firing path, and dashboard SSE envelope reach the SAME primitive.
+_project_budget_labels = _cctally_project._project_budget_labels
 
 # Eager re-export of bin/_cctally_pricing_check.py — `cmd_pricing_check`
 # is invoked via the parser's `set_defaults(func=c.cmd_pricing_check)`,
@@ -812,6 +821,7 @@ _PERCENT_NORMALIZE_DECIMALS = _cctally_record._PERCENT_NORMALIZE_DECIMALS
 _normalize_percent = _cctally_record._normalize_percent
 maybe_record_milestone = _cctally_record.maybe_record_milestone
 maybe_record_budget_milestone = _cctally_record.maybe_record_budget_milestone
+maybe_record_project_budget_milestone = _cctally_record.maybe_record_project_budget_milestone
 maybe_record_projected_alert = _cctally_record.maybe_record_projected_alert
 _weekly_pct_week_avg_projection = _cctally_record._weekly_pct_week_avg_projection
 _compute_block_totals = _cctally_record._compute_block_totals
@@ -1107,6 +1117,11 @@ _render_forecast_terminal = _cctally_forecast._render_forecast_terminal
 _BUDGET_JSON_SCHEMA_VERSION = _cctally_forecast._BUDGET_JSON_SCHEMA_VERSION
 _cmd_budget_set = _cctally_forecast._cmd_budget_set
 _cmd_budget_unset = _cctally_forecast._cmd_budget_unset
+# Per-project budget set/unset (#19/#121, spec §4.3 / §7).
+_resolve_project_budget_target = _cctally_forecast._resolve_project_budget_target
+_cmd_budget_set_project = _cctally_forecast._cmd_budget_set_project
+_cmd_budget_unset_project = _cctally_forecast._cmd_budget_unset_project
+_build_project_budget_rows = _cctally_forecast._build_project_budget_rows
 _budget_render_unset = _cctally_forecast._budget_render_unset
 _budget_verdict_ansi_code = _cctally_forecast._budget_verdict_ansi_code
 _budget_render_terminal = _cctally_forecast._budget_render_terminal
@@ -2068,10 +2083,13 @@ get_milestone_cost_for_week         = _cctally_milestones.get_milestone_cost_for
 get_milestones_for_week             = _cctally_milestones.get_milestones_for_week             # forecast c.; tui shim; percent-breakdown c.
 insert_percent_milestone            = _cctally_milestones.insert_percent_milestone            # record shim; idempotency-test mod.
 insert_budget_milestone             = _cctally_milestones.insert_budget_milestone             # record shim
+insert_project_budget_milestone     = _cctally_milestones.insert_project_budget_milestone     # record shim; project-budget-config-test ns[]
+_project_crossings                  = _cctally_milestones._project_crossings                  # record shim; milestones c. (#130 firing/reconcile shared crossing arithmetic)
 insert_projected_milestone          = _cctally_milestones.insert_projected_milestone          # record shim
 _projected_levels_already_latched   = _cctally_milestones._projected_levels_already_latched   # record shim
 _reconcile_budget_milestones_on_set = _cctally_milestones._reconcile_budget_milestones_on_set # test_budget_alerts ns[]
 _reconcile_budget_on_config_write   = _cctally_milestones._reconcile_budget_on_config_write   # forecast/config/dashboard c.; test_forecast_ns_patch mod. patch
+_reconcile_project_budget_milestones_on_write = _cctally_milestones._reconcile_project_budget_milestones_on_write  # forecast/config/dashboard c. (forward-only project-budget reconcile)
 
 
 # === Update-banner predicate (spec §4.2) extracted to