Fix rem review findings: jungle recompute, vacation null, fee estimates.

Restore jungle backlog remaining before period re-enqueue, treat null vacation max as unlimited while enforcing monthly capacity on leave, avoid rewriting intentional company/project settings, settle only product_pool null-project lines onto the pool project, and align fee report estimates with fee-after-costs.

Co-authored-by: Cursor <cursoragent@cursor.com>

Author: Herklos

apps/mobile/src/app/(app)/reports/company-fee.tsx

@@ -48,8 +48,8 @@ export default function CompanyFeeReportScreen() {
   }, [reserve, period]);
 
   const estimatedFee = useMemo(
-    () => estimateCompanyFeeCents(revenue ?? [], projectRefs, feePct, period),
-    [revenue, projectRefs, feePct, period],
+    () => estimateCompanyFeeCents(revenue ?? [], projectRefs, feePct, period, costs ?? []),
+    [revenue, projectRefs, feePct, period, costs],
   );
   const feeCents = resolveCompanyFeeTotal({
     reserveCents: reserveForPeriod,

apps/mobile/src/components/settings/WorkingDaysCard.tsx

@@ -41,7 +41,9 @@ export function WorkingDaysCard({ company }: WorkingDaysCardProps) {
     company.max_holidays_per_year != null ? String(company.max_holidays_per_year) : '',
   );
   const [maxVacationDays, setMaxVacationDays] = useState(
-    String(company.max_vacation_days_per_year ?? DEFAULT_PAID_VACATION_DAYS),
+    company.max_vacation_days_per_year != null
+      ? String(company.max_vacation_days_per_year)
+      : String(DEFAULT_PAID_VACATION_DAYS),
   );
 
   const onWorkingWeekdaysChange = (value: number[]) => {
@@ -57,8 +59,8 @@ export function WorkingDaysCard({ company }: WorkingDaysCardProps) {
 
   const saveMaxVacationDays = () => {
     const trimmed = maxVacationDays.trim();
-    const parsed = trimmed === '' ? DEFAULT_PAID_VACATION_DAYS : parseInt(trimmed, 10);
-    if (!Number.isFinite(parsed) || parsed < 0) return;
+    const parsed = trimmed === '' ? null : parseInt(trimmed, 10);
+    if (parsed != null && (!Number.isFinite(parsed) || parsed < 0)) return;
     void update(company.id, { max_vacation_days_per_year: parsed });
   };
 

apps/mobile/src/lib/company-rem-reports.test.ts

@@ -16,7 +16,7 @@ const projects = [
 ];
 
 describe('estimateCompanyFeeCents', () => {
-  it('fees paid revenue on pool/service/staffing/jungle projects', () => {
+  it('fees paid revenue on service/staffing; pool fee is after costs', () => {
     const fee = estimateCompanyFeeCents(
       [
         { project_id: 'p1', period_month: '2026-07-01', amount_cents: 100_000, paid_at: '2026-07-10' },
@@ -27,9 +27,21 @@ describe('estimateCompanyFeeCents', () => {
       projects,
       5,
       '2026-07',
+      [
+        {
+          kind: 'one_off',
+          amount_cents: 20_000,
+          active: true,
+          paid_at: '2026-07-01',
+          auto_deduct: false,
+          period_month: '2026-07-01',
+          starts_on: null,
+          ends_on: null,
+        },
+      ],
     );
-    // 300_000 × 5% = 15_000 (unpaid excluded; staffing included)
-    expect(fee).toBe(15_000);
+    // service+staffing 200_000 × 5% = 10_000; pool (100_000 − 20_000) × 5% = 4_000
+    expect(fee).toBe(14_000);
   });
 });
 

apps/mobile/src/lib/company-rem-reports.ts

@@ -5,10 +5,13 @@ import { lastMonths } from '@/lib/reports';
 import { matchesPeriodMonth, type StatsPeriod } from '@/lib/period-month';
 import { todayISO } from '@/lib/date';
 
-/** Policies that accrue company fee % into the reserve (global fee). */
-const FEE_POLICIES: RemPolicy[] = ['product_pool', 'product_service', 'staffing', 'jungle'];
+/** Policies that accrue company fee % on gross paid revenue. */
+const GROSS_FEE_POLICIES: RemPolicy[] = ['product_service', 'staffing', 'jungle'];
 
-/** Policies that carve license % for rem partners. */
+/** Product pool fees apply after eligible costs. */
+const POOL_FEE_POLICIES: RemPolicy[] = ['product_pool'];
+
+/** Policies that carve license % for license recipients. */
 const LICENSE_POLICIES: RemPolicy[] = ['product_service'];
 
 export type ProjectRemRef = Pick<Project, 'id' | 'rem_policy' | 'name'>;
@@ -41,17 +44,22 @@ function scopedRevenue(
 
 /**
  * Estimated company fee for the period from fee-eligible project revenue
- * (paid), matching rem: fee = R × company_fee_pct across all rem policies.
+ * (paid). Product-pool fee is on (gross − costs); other policies fee on gross.
  */
 export function estimateCompanyFeeCents(
   entries: Rev[],
   projects: ProjectRemRef[],
   companyFeePct: number,
   period: StatsPeriod,
+  costs: Cost[] = [],
 ): number {
   const byProject = policyMap(projects);
-  const R = scopedRevenue(entries, period, new Set(FEE_POLICIES), byProject, true);
-  return companyFeeCents(R, companyFeePct);
+  const grossR = scopedRevenue(entries, period, new Set(GROSS_FEE_POLICIES), byProject, true);
+  const poolR = scopedRevenue(entries, period, new Set(POOL_FEE_POLICIES), byProject, true);
+  const poolCosts =
+    period === 'all' ? companyPoolCostsCents(costs, 'all') : totalCostForMonth(costs, period);
+  const poolBase = Math.max(0, poolR - poolCosts);
+  return companyFeeCents(grossR, companyFeePct) + companyFeeCents(poolBase, companyFeePct);
 }
 
 /**
@@ -111,7 +119,13 @@ export function feeVsCostsTrend(input: {
     const feeCents =
       fromLedger != null
         ? fromLedger
-        : estimateCompanyFeeCents(input.revenueEntries, input.projects, input.companyFeePct, month);
+        : estimateCompanyFeeCents(
+            input.revenueEntries,
+            input.projects,
+            input.companyFeePct,
+            month,
+            input.costs,
+          );
     return { month, feeCents, costsCents, netCents: feeCents - costsCents };
   });
 }

apps/mobile/src/lib/i18n/catalogs/rem.ts

@@ -21,7 +21,7 @@ export const remCatalog: CatalogSlice = {
     'rem.policy.desc.external_tjm':
       'Days × TJM via classic invoices. When referrers are set, rem shows the referral carve-out; referrals are paid from the funding pool.',
     'rem.policy.desc.product_pool': 'Paid product revenue (after costs & company fee) shared by time, with max share caps.',
-    'rem.policy.desc.product_service': 'Service revenue: company fee, then license % to rem partners, rest by time.',
+    'rem.policy.desc.product_service': 'Service revenue: company fee, then license % to license recipients, rest by time.',
     'rem.policy.desc.jungle':
       'A day-rate credit is accrued each month and paid later, in order, when cash is available.',
     'rem.kind.label': 'Revenue kind (rem)',
@@ -80,7 +80,7 @@ export const remCatalog: CatalogSlice = {
     'rem.policy.desc.external_tjm':
       'Jours × TJM via factures classiques. Si des apporteurs sont définis, la rem affiche la part referral ; les apporteurs sont payés sur le pool de financement.',
     'rem.policy.desc.product_pool': 'Revenus produits payés (après coûts & frais société) partagés au temps, avec plafond de part.',
-    'rem.policy.desc.product_service': 'Prestation : frais société, puis % licence aux associés rem, reste au temps.',
+    'rem.policy.desc.product_service': 'Prestation : frais société, puis % licence aux bénéficiaires licence, reste au temps.',
     'rem.policy.desc.jungle':
       'Un crédit de TJM est accumulé chaque mois et payé plus tard, dans l’ordre, quand la trésorerie le permet.',
     'rem.kind.label': 'Type de revenu (rem)',

apps/mobile/src/lib/reports.test.ts

@@ -141,6 +141,7 @@ function member(userId: string, weeklyCapacityDays: number): CompanyMemberWithPr
     weekly_capacity_days: weeklyCapacityDays,
     working_weekdays: null,
     rem_partner: false,
+    rem_license_recipient: false,
     rem_max_percent: null,
     created_at: '',
     updated_at: '',

backend/supabase/migrations/20260808000000_canonical_remuneration.sql

@@ -22,30 +22,21 @@ alter table public.companies
 alter table public.companies
   alter column default_hours_per_day set default 8;
 
+-- Only fill null hours; do not rewrite intentional fee/max/license/vacation values.
 update public.companies
-set
-  company_fee_pct = case when company_fee_pct = 0 then 5 else company_fee_pct end,
-  rem_max_percent = case when rem_max_percent = 100 then 75 else rem_max_percent end,
-  default_license_pct = case when default_license_pct = 0 then 30 else default_license_pct end,
-  default_hours_per_day = coalesce(default_hours_per_day, 8),
-  max_vacation_days_per_year = coalesce(max_vacation_days_per_year, 15)
-where deleted = false;
+set default_hours_per_day = 8
+where deleted = false and default_hours_per_day is null;
 
 alter table public.projects
   alter column hours_per_day set default 8;
 
-update public.projects
-set hours_per_day = 8
-where hours_per_day = 7 and deleted = false;
-
 alter table public.company_members
   add column if not exists rem_license_recipient boolean not null default false;
 
 comment on column public.company_members.rem_license_recipient is
   'Receives product-service / standalone license splits (exactly two active recipients required).';
 
--- Seed: if a company has rem partners but no license recipients, promote the two
--- oldest rem_partner members (or all rem_partners when fewer than two).
+-- Seed license recipients only when a company has at least two rem partners and none set yet.
 with ranked as (
   select
     id,
@@ -59,7 +50,8 @@ update public.company_members cm
 set rem_license_recipient = true
 from ranked r
 where cm.id = r.id
-  and r.rn <= least(2, r.n)
+  and r.n >= 2
+  and r.rn <= 2
   and not exists (
     select 1 from public.company_members x
     where x.company_id = r.company_id
@@ -203,6 +195,39 @@ as $$
   );
 $$;
 
+revoke all on function public.company_hours_per_day(uuid) from public;
+revoke all on function public.company_hours_per_day(uuid) from anon, authenticated;
+
+create or replace function public._chrono_restore_jungle_period(
+  p_company_id uuid,
+  p_period date
+)
+returns void
+language plpgsql
+security definer
+set search_path = ''
+as $$
+begin
+  update public.jungle_tjm_queue_entries e
+  set remaining_cents = remaining_cents + s.amount_cents, updated_at = now()
+  from public.jungle_tjm_queue_settlements s
+  where s.queue_entry_id = e.id
+    and s.company_id = p_company_id
+    and s.period_month = p_period
+    and e.deleted = false;
+
+  delete from public.jungle_tjm_queue_settlements
+  where company_id = p_company_id and period_month = p_period;
+
+  update public.jungle_tjm_queue_entries
+    set deleted = true, updated_at = now()
+  where company_id = p_company_id and period_month = p_period and deleted = false;
+end;
+$$;
+
+revoke all on function public._chrono_restore_jungle_period(uuid, date) from public;
+revoke all on function public._chrono_restore_jungle_period(uuid, date) from anon, authenticated;
+
 create or replace function public.enforce_vacation_allowance()
 returns trigger
 language plpgsql
@@ -215,6 +240,11 @@ declare
   v_year integer;
   v_used numeric;
   v_adding numeric;
+  v_period date;
+  v_cap_minutes numeric;
+  v_work_minutes numeric;
+  v_leave_minutes numeric;
+  v_new_minutes numeric;
 begin
   if tg_op = 'DELETE' then
     return old;
@@ -225,31 +255,68 @@ begin
 
   select max_vacation_days_per_year into v_max
   from public.companies where id = new.company_id;
-  v_max := coalesce(v_max, 15);
+  -- null = unlimited (documented company policy)
+  if v_max is not null then
+    v_hpd := public.company_hours_per_day(new.company_id);
+    v_year := extract(year from new.off_date)::integer;
+
+    select coalesce(sum(
+      case
+        when t.duration_minutes is null then 1
+        else t.duration_minutes::numeric / nullif(v_hpd * 60, 0)
+      end
+    ), 0) into v_used
+    from public.time_off t
+    where t.company_id = new.company_id
+      and t.user_id = new.user_id
+      and t.kind = 'vacation'
+      and extract(year from t.off_date) = v_year
+      and t.id is distinct from new.id;
+
+    v_adding := case
+      when new.duration_minutes is null then 1
+      else new.duration_minutes::numeric / nullif(v_hpd * 60, 0)
+    end;
+
+    if v_used + v_adding > v_max + 1e-9 then
+      raise exception 'Vacation allowance exceeded (% days/year)', v_max;
+    end if;
+  end if;
+
+  -- Monthly capacity: work + leave ≤ 22 × company hours/day
   v_hpd := public.company_hours_per_day(new.company_id);
-  v_year := extract(year from new.off_date)::integer;
+  v_cap_minutes := 22 * v_hpd * 60;
+  v_period := date_trunc('month', new.off_date)::date;
+  v_new_minutes := case
+    when new.duration_minutes is null then v_hpd * 60
+    else greatest(0, new.duration_minutes)
+  end;
+
+  select coalesce(sum(greatest(0, te.duration_minutes)), 0) into v_work_minutes
+  from public.time_entries te
+  where te.company_id = new.company_id
+    and te.user_id = new.user_id
+    and te.deleted = false
+    and te.status is distinct from 'rejected'
+    and date_trunc('month', te.entry_date)::date = v_period;
 
   select coalesce(sum(
     case
-      when t.duration_minutes is null then 1
-      else t.duration_minutes::numeric / nullif(v_hpd * 60, 0)
+      when t.duration_minutes is null then v_hpd * 60
+      else greatest(0, t.duration_minutes)
     end
-  ), 0) into v_used
+  ), 0) into v_leave_minutes
   from public.time_off t
   where t.company_id = new.company_id
     and t.user_id = new.user_id
     and t.kind = 'vacation'
-    and extract(year from t.off_date) = v_year
+    and date_trunc('month', t.off_date)::date = v_period
     and t.id is distinct from new.id;
 
-  v_adding := case
-    when new.duration_minutes is null then 1
-    else new.duration_minutes::numeric / nullif(v_hpd * 60, 0)
-  end;
-
-  if v_used + v_adding > v_max + 1e-9 then
-    raise exception 'Vacation allowance exceeded (% days/year)', v_max;
+  if v_work_minutes + v_leave_minutes + v_new_minutes > v_cap_minutes + 1e-9 then
+    raise exception 'Monthly capacity exceeded (22 × %h)', v_hpd;
   end if;
+
   return new;
 end;
 $$;
@@ -280,10 +347,7 @@ begin
     return new;
   end if;
 
-  v_hpd := coalesce(
-    (select hours_per_day from public.projects where id = new.project_id),
-    public.company_hours_per_day(new.company_id)
-  );
+  v_hpd := public.company_hours_per_day(new.company_id);
   v_cap_minutes := 22 * v_hpd * 60;
   v_period := date_trunc('month', new.entry_date)::date;
   v_new_minutes := greatest(0, coalesce(new.duration_minutes, 0));
@@ -860,15 +924,8 @@ begin
     end loop;
   end loop;
 
-  -- ---- jungle: enqueue period, fee on paid revenue, FIFO dequeue post-fee ----
-  delete from public.jungle_tjm_queue_settlements s
-  using public.jungle_tjm_queue_entries e
-  where s.queue_entry_id = e.id
-    and e.company_id = p_company_id
-    and e.period_month = v_period;
-  update public.jungle_tjm_queue_entries
-    set deleted = true, updated_at = now()
-  where company_id = p_company_id and period_month = v_period and deleted = false;
+  -- ---- jungle: restore prior settlements for this period, then re-enqueue ----
+  perform public._chrono_restore_jungle_period(p_company_id, v_period);
 
   for v_proj in
     select id, jungle_fictitious_tjm_cents, hours_per_day, company_id
@@ -1017,9 +1074,10 @@ begin
         and user_id is not null
         and bucket not in ('company_fee', 'staffing_tjm')
         and (
-          project_id = p_project_id
+          (project_id = p_project_id)
           or (
             project_id is null
+            and bucket = 'product_pool'
             and v_policy = 'product_pool'
             and p_project_id = v_pool_project
           )