crowdtime-cli 0.21.0__tar.gz → 0.22.0__tar.gz

{crowdtime_cli-0.21.0 → crowdtime_cli-0.22.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: crowdtime-cli
-Version: 0.21.0
+Version: 0.22.0
 Summary: AI-powered time tracking CLI — a modern, developer-friendly alternative to Harvest
 Project-URL: Homepage, https://crowdtime.lat
 Project-URL: Documentation, https://crowdtime.lat/docs

{crowdtime_cli-0.21.0 → crowdtime_cli-0.22.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "crowdtime-cli"
-version = "0.21.0"
+version = "0.22.0"
 description = "AI-powered time tracking CLI — a modern, developer-friendly alternative to Harvest"
 readme = "README.md"
 license = {text = "Proprietary"}

{crowdtime_cli-0.21.0 → crowdtime_cli-0.22.0}/src/crowdtime_cli/__init__.py

@@ -1,3 +1,3 @@
 """CrowdTime CLI - AI-powered time tracking from the command line."""
 
-__version__ = "0.21.0"
+__version__ = "0.22.0"

{crowdtime_cli-0.21.0 → crowdtime_cli-0.22.0}/src/crowdtime_cli/commands/clients_cmd.py

@@ -75,7 +75,7 @@ def list_clients(
                 return
 
             table = Table(show_header=True, header_style="bold")
-            table.add_column("ID", style="dim")
+            table.add_column("ID", style="dim", no_wrap=True, min_width=36)
             table.add_column("Name")
             table.add_column("Contact")
             table.add_column("Projects", justify="right")
@@ -355,7 +355,7 @@ def list_contacts(
                 return
 
             table = Table(show_header=True, header_style="bold")
-            table.add_column("ID", style="dim")
+            table.add_column("ID", style="dim", no_wrap=True, min_width=36)
             table.add_column("Name", width=20)
             table.add_column("Email", width=25)
             table.add_column("Phone", width=15)

{crowdtime_cli-0.21.0 → crowdtime_cli-0.22.0}/src/crowdtime_cli/commands/expense_cmd.py

@@ -21,16 +21,22 @@ console = Console()
 # ─── Helpers ──────────────────────────────────────────────────────
 
 
-def _print_expenses_table(expenses: list[dict]) -> None:
-    """Print expenses in a Rich table."""
+def _print_expenses_table(expenses: list[dict], me: str | None = None) -> None:
+    """Print expenses in a Rich table, with a User column whenever one isn't yours."""
     if not expenses:
         console.print("[dim]No expenses found.[/dim]")
         console.print("Run [bold]ct expense create[/bold] to log an expense.")
         return
 
     table = Table(show_header=True, header_style="bold")
-    table.add_column("ID", style="dim")
+    # Full UUIDs: they are what show/edit/delete take, so never let Rich clip them.
+    table.add_column("ID", style="dim", no_wrap=True, min_width=36)
     table.add_column("Date", width=12)
+    # The list holds every expense the caller can see — colleagues' too for
+    # managers and project leads — so mark whose each one is (CRO-93).
+    show_user = any(str(exp.get("user")) != me for exp in expenses)
+    if show_user:
+        table.add_column("User", width=16)
     table.add_column("Description", width=25)
     table.add_column("Category", width=14)
     table.add_column("Project", style="cyan", width=15)
@@ -51,9 +57,14 @@ def _print_expenses_table(expenses: list[dict]) -> None:
         is_billable = exp.get("is_billable", False)
         is_invoiced = exp.get("is_invoiced", False)
 
+        user_cell = (
+            ["You" if str(exp.get("user")) == me else exp.get("user_name", "") or ""]
+            if show_user else []
+        )
         table.add_row(
             str(exp.get("id", "")),
             exp.get("date", ""),
+            *user_cell,
             exp.get("description", ""),
             exp.get("category_name", exp.get("category", "")) or "",
             exp.get("project_name", exp.get("project", "")) or "",
@@ -65,6 +76,8 @@ def _print_expenses_table(expenses: list[dict]) -> None:
 
     console.print(table)
     console.print(f"\n[bold]Total:[/bold] {format_currency(total)} ({len(expenses)} expenses)")
+    if show_user:
+        console.print("[dim]Includes other people's expenses. Use --mine for only yours.[/dim]")
 
 
 # ─── Commands ─────────────────────────────────────────────────────
@@ -74,7 +87,12 @@ def _print_expenses_table(expenses: list[dict]) -> None:
 def expense_default(ctx: typer.Context) -> None:
     """Manage expenses."""
     if ctx.invoked_subcommand is None:
-        list_expenses()
+        # Called directly, so every option needs a real value — Typer's
+        # defaults are OptionInfo objects outside the CLI parser.
+        list_expenses(
+            from_date=None, to_date=None, project=None, category=None,
+            billable=None, invoiced=None, mine=False, output_json=False,
+        )
 
 
 @app.command("list")
@@ -85,22 +103,35 @@ def list_expenses(
     category: Optional[str] = typer.Option(None, "--category", "-c", help="Filter by category."),
     billable: Optional[bool] = typer.Option(None, "--billable/--no-billable", help="Filter by billable status."),
     invoiced: Optional[bool] = typer.Option(None, "--invoiced/--uninvoiced", help="Filter by invoiced status."),
+    mine: bool = typer.Option(
+        False, "--mine",
+        help="Only your own expenses. Managers and project leads otherwise see colleagues' too.",
+    ),
     output_json: bool = typer.Option(False, "--json", help="Output as JSON."),
 ) -> None:
     """List expenses with optional filters.
 
-    By default, shows the current month's expenses.
+    By default, shows the current month's expenses — every expense you can
+    see. The table shows a User column whenever one isn't yours.
 
     Examples:
         ct expense list
         ct expense list --from 2026-03-01 --to 2026-03-31
         ct expense list --project myproject --billable
         ct expense list --category travel --uninvoiced
+        ct expense list --mine
     """
     client = CrowdTimeClient(require_auth=True, require_org=True)
 
     params: dict = {}
 
+    me = client.current_user_id()
+    if mine:
+        if not me:
+            format_error("Could not resolve your user id. Run ct auth login again.")
+            raise typer.Exit(1)
+        params["user"] = me
+
     # Default to current month if no date filters provided
     if not from_date and not to_date:
         today = date_type.today()
@@ -137,7 +168,7 @@ def list_expenses(
         if output_json:
             print_json(results)
         else:
-            _print_expenses_table(results)
+            _print_expenses_table(results, me)
     except APIError as e:
         format_error(e.message)
         raise typer.Exit(1)
@@ -385,7 +416,7 @@ def list_categories(
                 return
 
             table = Table(show_header=True, header_style="bold")
-            table.add_column("ID", style="dim")
+            table.add_column("ID", style="dim", no_wrap=True, min_width=36)
             table.add_column("Name", width=25)
 
             for cat in results:

{crowdtime_cli-0.21.0 → crowdtime_cli-0.22.0}/src/crowdtime_cli/commands/invoice_cmd.py

@@ -589,6 +589,14 @@ def create_invoice(
             "in a client-wide invoice."
         ),
     ),
+    payments: Optional[list[str]] = typer.Option(
+        None, "--payment",
+        help=(
+            "One-off fixed-fee payment ID(s) to bill (see `ct projects show`). "
+            "Repeat for multiple. Without it a selected one-off project bills "
+            "its next unbilled payment; each payment is billed only once."
+        ),
+    ),
     group_by: Optional[str] = typer.Option(
         None, "--group-by", "-g", help="Group line items by: project, task, user, date, none."
     ),
@@ -630,6 +638,7 @@ def create_invoice(
         ct invoice create --client <id> --from monday --to friday --payment-terms 15
         ct invoice create --client <id> --period last-month --due-date 2026-09-15
         ct invoice create --client <id> --period last-month --project <fixed-project-id>
+        ct invoice create --client <id> --period last-month --project <fixed-project-id> --payment <payment-id>
     """
     # Resolve period dates
     if period:
@@ -690,6 +699,11 @@ def create_invoice(
         payload["due_date"] = due_date_str
     if projects:
         payload["project_ids"] = list(projects)
+    if payments:
+        if not projects:
+            format_error("--payment needs the fixed-fee project selected with --project.")
+            raise typer.Exit(1)
+        payload["milestone_ids"] = list(payments)
     if group_by:
         payload["group_by"] = group_by
     if tax_rate is not None:
@@ -1305,7 +1319,7 @@ def list_recurring(
                 return
 
             table = Table(show_header=True, header_style="bold")
-            table.add_column("ID", style="dim")
+            table.add_column("ID", style="dim", no_wrap=True, min_width=36)
             table.add_column("Name", width=20)
             table.add_column("Client", width=18)
             table.add_column("Schedule", width=14)
@@ -1674,7 +1688,7 @@ def list_retainers(
                 return
 
             table = Table(show_header=True, header_style="bold")
-            table.add_column("ID", style="dim")
+            table.add_column("ID", style="dim", no_wrap=True, min_width=36)
             table.add_column("Name", width=20)
             table.add_column("Client", width=18)
             table.add_column("Monthly", justify="right", width=12)
@@ -1878,7 +1892,7 @@ def list_withdrawals(
                 return
 
             table = Table(show_header=True, header_style="bold")
-            table.add_column("ID", style="dim")
+            table.add_column("ID", style="dim", no_wrap=True, min_width=36)
             table.add_column("Invoice", width=14)
             table.add_column("Amount", justify="right", width=12)
             table.add_column("Date", width=12)
@@ -1981,7 +1995,7 @@ def tax_rates_list(
                 return
 
             table = Table(title="Tax Rates")
-            table.add_column("ID", style="dim")
+            table.add_column("ID", style="dim", no_wrap=True, min_width=36)
             table.add_column("Name", style="bold")
             table.add_column("Rate %", justify="right")
             table.add_column("Default")
@@ -2140,7 +2154,7 @@ def uninvoiced_entries(
             table.add_column("Entries", justify="right")
             table.add_column("Hours", justify="right")
             table.add_column("Amount", justify="right", style="green")
-            table.add_column("Client ID", style="dim")
+            table.add_column("Client ID", style="dim", no_wrap=True, min_width=36)
 
             total_entries = 0
             total_hours = Decimal("0")

{crowdtime_cli-0.21.0 → crowdtime_cli-0.22.0}/src/crowdtime_cli/commands/org_cmd.py

@@ -383,7 +383,7 @@ def invitations(
             return
 
         table = Table(show_header=True, header_style="bold")
-        table.add_column("ID", style="dim")
+        table.add_column("ID", style="dim", no_wrap=True, min_width=36)
         table.add_column("Email", width=25)
         table.add_column("Role", width=18)
         table.add_column("Status", width=10)

{crowdtime_cli-0.21.0 → crowdtime_cli-0.22.0}/src/crowdtime_cli/commands/projects_cmd.py

@@ -42,6 +42,69 @@ def _resolve_billing_type(value: str) -> str | None:
     return BILLING_TYPE_ALIASES.get(value.strip().lower().replace("-", "_"))
 
 
+FEE_SCHEDULES = {"one-off": "one_off", "one_off": "one_off", "oneoff": "one_off",
+                 "recurring": "recurring"}
+FEE_FREQUENCIES = ["weekly", "biweekly", "monthly", "quarterly"]
+
+
+def _parse_payment(value: str) -> dict:
+    """Parse a --payment value: NAME=AMOUNT or NAME=AMOUNT@YYYY-MM-DD."""
+    if "=" not in value:
+        raise ValueError(f"Invalid --payment '{value}'. Use NAME=AMOUNT or NAME=AMOUNT@YYYY-MM-DD.")
+    name, rest = value.rsplit("=", 1)
+    amount, _, due = rest.partition("@")
+    try:
+        amount_dec = Decimal(amount.strip())
+    except Exception:
+        raise ValueError(f"Invalid amount in --payment '{value}'.")
+    if not name.strip() or amount_dec <= 0:
+        raise ValueError(f"Invalid --payment '{value}': needs a name and an amount above zero.")
+    return {"name": name.strip(), "amount": str(amount_dec), "due_date": due.strip() or None}
+
+
+def _fee_plan_payload(
+    fee_schedule: Optional[str],
+    fee_frequency: Optional[str],
+    payments: Optional[List[str]],
+    first_invoice: Optional[str],
+    existing: Optional[list[dict]] = None,
+) -> dict:
+    """Build the fixed-fee plan fields of a project payload (CRO-61).
+
+    On update, ``existing`` milestones keep their id when a --payment names
+    them, and payments already invoiced are always kept — the API refuses a
+    plan that drops or changes them.
+    """
+    payload: dict = {}
+    if fee_schedule is not None:
+        resolved = FEE_SCHEDULES.get(fee_schedule.strip().lower())
+        if resolved is None:
+            raise ValueError("Invalid --fee-schedule. Choose from: one-off, recurring.")
+        payload["fixed_fee_schedule"] = resolved
+    if fee_frequency is not None:
+        if fee_frequency not in FEE_FREQUENCIES:
+            raise ValueError(f"Invalid --fee-frequency. Choose from: {', '.join(FEE_FREQUENCIES)}.")
+        payload["fixed_fee_frequency"] = fee_frequency
+        payload.setdefault("fixed_fee_schedule", "recurring")
+    if first_invoice is not None:
+        payload["fixed_fee_first_invoice_date"] = first_invoice
+    if payments:
+        items = [_parse_payment(p) for p in payments]
+        by_name = {m["name"]: m for m in (existing or [])}
+        for item in items:
+            if item["name"] in by_name:
+                item["id"] = by_name[item["name"]]["id"]
+        named = {i["name"] for i in items}
+        billed = [
+            {"id": m["id"], "name": m["name"], "amount": m["amount"], "due_date": m.get("due_date")}
+            for m in (existing or [])
+            if m.get("invoice") and m["name"] not in named
+        ]
+        payload["fixed_fee_milestones"] = billed + items
+        payload.setdefault("fixed_fee_schedule", "one_off")
+    return payload
+
+
 PAYMENT_TERMS_ALIASES = {"receipt": 0, "net7": 7, "net15": 15, "net30": 30}
 
 
@@ -146,7 +209,26 @@ def show(
                     if project.fixed_fee_amount is not None
                     else "[red]not set[/red]"
                 )
-                console.print(f"  Billing:      Fixed Fee — {fee}")
+                if project.fixed_fee_schedule == "recurring":
+                    freq = project.fixed_fee_frequency or "?"
+                    console.print(f"  Billing:      Recurring fixed fee — {fee} {freq}")
+                    tpl = project.fixed_fee_template
+                    if tpl:
+                        state = (f"next invoice {tpl['next_run_date']}" if tpl.get("is_active")
+                                 else "paused")
+                        console.print(f"  Invoiced by:  {tpl['name']} ({tpl['id']}) — {state}")
+                    else:
+                        console.print("  Invoiced by:  [yellow]no active recurring invoice[/yellow]")
+                else:
+                    console.print(f"  Billing:      Fixed Fee (one-off) — {fee}")
+                    for m in project.fixed_fee_milestones or []:
+                        inv = m.get("invoice")
+                        status = f"billed on {inv['invoice_number']}" if inv else "not billed"
+                        due = f" due {m['due_date']}" if m.get("due_date") else ""
+                        console.print(
+                            f"    • {m['name']}: {format_currency(Decimal(m['amount']), currency)}"
+                            f"{due} — {status}  [dim]{m['id']}[/dim]"
+                        )
             else:
                 console.print("  Billing:      Time & Materials")
                 console.print(f"  Billing Mode: {billing_labels.get(project.billing_mode, project.billing_mode)}")
@@ -184,6 +266,22 @@ def create(
         None, "--fixed-fee",
         help="Agreed price billed instead of logged hours. Implies --billing-type fixed_fee.",
     ),
+    fee_schedule: Optional[str] = typer.Option(
+        None, "--fee-schedule",
+        help="one-off (the price is paid in payments, default) or recurring (the price every period).",
+    ),
+    fee_frequency: Optional[str] = typer.Option(
+        None, "--fee-frequency",
+        help="How often a recurring fee is billed: weekly, biweekly, monthly, quarterly.",
+    ),
+    payments: Optional[List[str]] = typer.Option(
+        None, "--payment",
+        help="One-off payment as NAME=AMOUNT or NAME=AMOUNT@YYYY-MM-DD (due date). Repeat; must add up to --fixed-fee.",
+    ),
+    first_invoice: Optional[str] = typer.Option(
+        None, "--first-invoice",
+        help="Recurring fee: date of the first invoice (YYYY-MM-DD). Default: one period after start.",
+    ),
     payment_terms: Optional[str] = typer.Option(
         None, "--payment-terms",
         help=(
@@ -202,9 +300,16 @@ def create(
 ) -> None:
     """Create a new project.
 
-    Fixed-fee projects bill an agreed price instead of logged hours. That fee
-    is never billed automatically — only when the project is selected
-    explicitly on an invoice, or pulled in by a recurring template.
+    Fixed-fee projects bill an agreed price instead of logged hours, one of two
+    ways. One-off: --fixed-fee is the whole price, paid in --payment
+    milestones (one full payment if none are given), each billed once.
+    Recurring: --fixed-fee is billed every --fee-frequency period by a
+    recurring invoice the project sets up for itself.
+
+    Examples:
+        ct projects create "Website" -c Acme --fixed-fee 5000 \
+            --payment Kickoff=1500@2026-06-01 --payment Midpoint=1500 --payment Delivery=2000
+        ct projects create "Support" -c Acme --fixed-fee 4000 --fee-frequency monthly
     """
     api_client = CrowdTimeClient(require_auth=True, require_org=True)
 
@@ -251,6 +356,17 @@ def create(
         payload["billing_type"] = resolved_billing_type
     if fixed_fee is not None:
         payload["fixed_fee_amount"] = fixed_fee
+    if resolved_billing_type != "fixed_fee" and (fee_schedule or fee_frequency or payments or first_invoice):
+        format_error("--fee-schedule, --fee-frequency, --payment and --first-invoice only apply to fixed-fee projects.")
+        raise typer.Exit(1)
+    try:
+        payload.update(_fee_plan_payload(fee_schedule, fee_frequency, payments, first_invoice))
+    except ValueError as e:
+        format_error(str(e))
+        raise typer.Exit(1)
+    if payload.get("fixed_fee_schedule") == "recurring" and not payload.get("fixed_fee_frequency"):
+        format_error("A recurring fee needs --fee-frequency.")
+        raise typer.Exit(1)
     if payment_terms is not None:
         resolved_terms = _resolve_payment_terms_opt(payment_terms)
         if resolved_terms is None:
@@ -341,6 +457,22 @@ def update(
         None, "--fixed-fee",
         help="Agreed price billed instead of logged hours.",
     ),
+    fee_schedule: Optional[str] = typer.Option(
+        None, "--fee-schedule",
+        help="one-off (the price is paid in payments, default) or recurring (the price every period).",
+    ),
+    fee_frequency: Optional[str] = typer.Option(
+        None, "--fee-frequency",
+        help="How often a recurring fee is billed: weekly, biweekly, monthly, quarterly.",
+    ),
+    payments: Optional[List[str]] = typer.Option(
+        None, "--payment",
+        help="One-off payment as NAME=AMOUNT or NAME=AMOUNT@YYYY-MM-DD (due date). Repeat; replaces the plan; invoiced payments are kept.",
+    ),
+    first_invoice: Optional[str] = typer.Option(
+        None, "--first-invoice",
+        help="Recurring fee: date of the first invoice (YYYY-MM-DD). Moves the next invoice.",
+    ),
     payment_terms: Optional[str] = typer.Option(
         None, "--payment-terms",
         help="Payment terms: receipt, net7, net15, net30, or a number of days.",
@@ -364,6 +496,8 @@ def update(
         ct projects update my-project --name "New Name"
         ct projects update my-project --budget 200 --budget-type hours
         ct projects update my-project --billing-mode per_person --status paused
+        ct projects update my-project --fixed-fee 6000 --payment Kickoff=1500 --payment Rest=4500
+        ct projects update my-project --fee-frequency quarterly
     """
     api_client = CrowdTimeClient(require_auth=True, require_org=True)
 
@@ -411,6 +545,21 @@ def update(
         payload["billing_type"] = resolved_billing_type
     if fixed_fee is not None:
         payload["fixed_fee_amount"] = fixed_fee
+    existing_milestones = None
+    if payments:
+        try:
+            current = api_client.get(f"/projects/{resolve_project(api_client, project_id)}/")
+            existing_milestones = current.get("fixed_fee_milestones") or []
+        except APIError as e:
+            format_error(e.message)
+            raise typer.Exit(1)
+    try:
+        payload.update(_fee_plan_payload(
+            fee_schedule, fee_frequency, payments, first_invoice, existing_milestones,
+        ))
+    except ValueError as e:
+        format_error(str(e))
+        raise typer.Exit(1)
     if payment_terms is not None:
         resolved_terms = _resolve_payment_terms_opt(payment_terms)
         if resolved_terms is None:
@@ -618,7 +767,7 @@ def list_members(
         table.add_column("Project Role", width=16)
         table.add_column("Org Role", width=16)
         table.add_column("Rate", justify="right", width=10)
-        table.add_column("User ID", style="dim")
+        table.add_column("User ID", style="dim", no_wrap=True, min_width=36)
 
         for m in members_list:
             proj_role = m.get("project_role") or "[dim]-[/dim]"
@@ -677,7 +826,7 @@ def list_tasks(
         table.add_column("Task Rate", justify="right", width=12)
         table.add_column("Project Rate", justify="right", width=14)
         table.add_column("Active", width=8)
-        table.add_column("Task ID", style="dim")
+        table.add_column("Task ID", style="dim", no_wrap=True, min_width=36)
 
         for t in tasks_list:
             billable = "[green]Yes[/green]" if t.get("task_is_billable") else "[dim]No[/dim]"
@@ -784,7 +933,7 @@ def assignable_users(
             return
 
         table = Table(title="Assignable users")
-        table.add_column("ID", style="dim")
+        table.add_column("ID", style="dim", no_wrap=True, min_width=36)
         table.add_column("Name")
         table.add_column("Email")
         table.add_column("Org role")

{crowdtime_cli-0.21.0 → crowdtime_cli-0.22.0}/src/crowdtime_cli/commands/pto_cmd.py

@@ -778,7 +778,7 @@ def allowance_list_cmd(
     from rich.table import Table
 
     table = Table(show_header=True, header_style="bold")
-    table.add_column("User ID", style="dim")
+    table.add_column("User ID", style="dim", no_wrap=True, min_width=36)
     table.add_column("Name")
     table.add_column("Days/year", justify="right")
     table.add_column("Counting from")

{crowdtime_cli-0.21.0 → crowdtime_cli-0.22.0}/src/crowdtime_cli/commands/report_cmd.py

@@ -562,7 +562,7 @@ def saved_list(
             return
 
         table = Table(show_header=True, header_style="bold", title="Saved Reports")
-        table.add_column("ID", width=36)
+        table.add_column("ID", no_wrap=True, min_width=36)
         table.add_column("Name", style="bold", width=25)
         table.add_column("Type", width=18)
         table.add_column("Shared", justify="center", width=8)

{crowdtime_cli-0.21.0 → crowdtime_cli-0.22.0}/src/crowdtime_cli/commands/tasks_cmd.py

@@ -195,7 +195,7 @@ def list_tasks(
             return
 
         table = Table(show_header=True, header_style="bold")
-        table.add_column("ID", style="dim")
+        table.add_column("ID", style="dim", no_wrap=True, min_width=36)
         table.add_column("Name", width=25)
         table.add_column("Project", style="cyan", width=15)
         table.add_column("Billable", justify="center", width=8)

{crowdtime_cli-0.21.0 → crowdtime_cli-0.22.0}/src/crowdtime_cli/commands/team_cmd.py

@@ -343,7 +343,7 @@ def list_assignments(
         return
 
     table = Table(show_header=True, header_style="bold")
-    table.add_column("Assignment ID", style="dim")
+    table.add_column("Assignment ID", style="dim", no_wrap=True, min_width=36)
     table.add_column("Manager")
     table.add_column("Manager Email", style="dim")
     table.add_column("Direct Report")
@@ -402,8 +402,8 @@ def reports(
     table = Table(show_header=True, header_style="bold")
     table.add_column("Direct Report")
     table.add_column("Email", style="dim")
-    table.add_column("User ID", style="dim")
-    table.add_column("Assignment ID", style="dim")
+    table.add_column("User ID", style="dim", no_wrap=True, min_width=36)
+    table.add_column("Assignment ID", style="dim", no_wrap=True, min_width=36)
 
     for row in rows:
         table.add_row(
@@ -496,7 +496,7 @@ def show(
     projects = profile.get("projects") or []
     if projects:
         table = Table(show_header=True, header_style="bold", title="Assigned projects")
-        table.add_column("Project ID", style="dim")
+        table.add_column("Project ID", style="dim", no_wrap=True, min_width=36)
         table.add_column("Project")
         table.add_column("Client", style="dim")
         table.add_column("Role on project")
@@ -532,7 +532,7 @@ def show(
         by_project = overview.get("by_project") or []
         if by_project:
             table = Table(show_header=True, header_style="bold", title="By project")
-            table.add_column("Project ID", style="dim")
+            table.add_column("Project ID", style="dim", no_wrap=True, min_width=36)
             table.add_column("Project")
             table.add_column("Client", style="dim")
             table.add_column("Hours", justify="right")

{crowdtime_cli-0.21.0 → crowdtime_cli-0.22.0}/src/crowdtime_cli/commands/timer_cmd.py

@@ -281,11 +281,25 @@ def continue_timer(
     """
     client = CrowdTimeClient(require_auth=True, require_org=True)
 
-    # Fetch recent entries to find the last non-running one
+    # The time list holds everything the caller can see — colleagues' entries
+    # too for project leads and managers — so ask for your own (CRO-93).
+    me = client.current_user_id()
+    if not me:
+        format_error("Could not resolve your user id. Run ct auth login again.")
+        raise typer.Exit(1)
+
+    # Fetch recent entries to find the last non-running one. Server ordering is
+    # newest date first; future-dated entries and paid-leave rows aren't
+    # something you'd resume.
     try:
-        data = client.get("/time/", params={"page_size": "1", "ordering": "-start_time"})
+        from datetime import date as date_type
+        data = client.get("/time/", params={
+            "user": me,
+            "date_to": date_type.today().isoformat(),
+            "page_size": "10",
+        })
         from ..formatters import extract_results
-        entries = extract_results(data)
+        entries = [e for e in extract_results(data) if e.get("source") != "time_off"]
         if not entries:
             format_error("No recent entries to continue from.")
             raise typer.Exit(1)

{crowdtime_cli-0.21.0 → crowdtime_cli-0.22.0}/src/crowdtime_cli/commands/timesheet_cmd.py

@@ -41,7 +41,7 @@ def _print_timesheets_table(timesheets: list[dict], show_user: bool = False) ->
         return
 
     table = Table(show_header=True, header_style="bold")
-    table.add_column("ID", style="dim")
+    table.add_column("ID", style="dim", no_wrap=True, min_width=36)
     if show_user:
         table.add_column("User", width=20)
     table.add_column("Period", width=25)
@@ -684,7 +684,7 @@ def viewable_users(
                 return
 
             table = Table(show_header=True, header_style="bold")
-            table.add_column("ID", style="dim")
+            table.add_column("ID", style="dim", no_wrap=True, min_width=36)
             table.add_column("Name", width=20)
             table.add_column("Email", width=30)
 
@@ -1121,7 +1121,7 @@ def compliance_report(
                 title=f"[blue]Pending Approval ({len(pending)})[/blue]",
             )
             table.add_column("Member", width=22)
-            table.add_column("Timesheet ID", style="dim")
+            table.add_column("Timesheet ID", style="dim", no_wrap=True, min_width=36)
             table.add_column("Hours", justify="right", width=8)
             table.add_column("Submitted", width=12)
             table.add_column("Days Pending", justify="right", width=13)
@@ -1147,7 +1147,7 @@ def compliance_report(
                 title=f"[red]Rejected ({len(rejected_list)})[/red]",
             )
             table.add_column("Member", width=22)
-            table.add_column("Timesheet ID", style="dim")
+            table.add_column("Timesheet ID", style="dim", no_wrap=True, min_width=36)
             table.add_column("Hours", justify="right", width=8)
             table.add_column("Reviewer Notes", width=35)
 

{crowdtime_cli-0.21.0 → crowdtime_cli-0.22.0}/src/crowdtime_cli/formatters.py

@@ -208,7 +208,7 @@ def format_entries_table(
         return
 
     table = Table(show_header=True, header_style="bold")
-    table.add_column("ID", style="dim")
+    table.add_column("ID", style="dim", no_wrap=True, min_width=36)
     if show_date:
         table.add_column("Date", width=12)
     if show_user:
@@ -352,7 +352,7 @@ def format_projects_table(projects: list[Project]) -> None:
         return
 
     table = Table(show_header=True, header_style="bold")
-    table.add_column("ID", style="dim")
+    table.add_column("ID", style="dim", no_wrap=True, min_width=36)
     table.add_column("Name", style="bold", width=20)
     table.add_column("Code", width=8)
     table.add_column("Client", width=15)
@@ -438,7 +438,7 @@ def format_favorites_table(favorites: list[FavoriteEntry]) -> None:
         return
 
     table = Table(show_header=True, header_style="bold")
-    table.add_column("ID", style="dim")
+    table.add_column("ID", style="dim", no_wrap=True, min_width=36)
     table.add_column("Project", style="cyan", width=15)
     table.add_column("Task", width=15)
     table.add_column("Description", width=30)
@@ -952,7 +952,7 @@ def format_timeoff_summary_panel(summary: TimeOffSummary) -> Panel:
         padding=(0, 2),
     )
     by_user_table.add_column("User", width=24)
-    by_user_table.add_column("User ID", style="dim", width=36)
+    by_user_table.add_column("User ID", style="dim", no_wrap=True, min_width=36)
     by_user_table.add_column("Hours", justify="right", width=10)
     by_user_table.add_column("Days", justify="right", width=6)
     if summary.by_user:

{crowdtime_cli-0.21.0 → crowdtime_cli-0.22.0}/src/crowdtime_cli/main.py

@@ -428,13 +428,14 @@ def expense_list_alias(
     category: Optional[str] = typer.Option(None, "--category", "-c"),
     billable: Optional[bool] = typer.Option(None, "--billable/--no-billable"),
     invoiced: Optional[bool] = typer.Option(None, "--invoiced/--uninvoiced"),
+    mine: bool = typer.Option(False, "--mine"),
     output_json: bool = typer.Option(False, "--json"),
 ) -> None:
     """Alias for 'expense list'."""
     expense_cmd.list_expenses(
         from_date=from_date, to_date=to_date, project=project,
         category=category, billable=billable, invoiced=invoiced,
-        output_json=output_json,
+        mine=mine, output_json=output_json,
     )
 
 

{crowdtime_cli-0.21.0 → crowdtime_cli-0.22.0}/src/crowdtime_cli/models.py

@@ -40,6 +40,11 @@ class Project(BaseModel):
     billing_mode: str = "custom"
     billing_type: str = "time_and_materials"
     fixed_fee_amount: Decimal | None = None
+    # one_off (price paid in milestones) or recurring (amount per period).
+    fixed_fee_schedule: str = "one_off"
+    fixed_fee_frequency: str = ""
+    fixed_fee_milestones: list[dict] | None = None
+    fixed_fee_template: dict | None = None
     payment_terms_days: int | None = None
     status: str = "active"
     is_billable: bool = True

{crowdtime_cli-0.21.0 → crowdtime_cli-0.22.0}/src/crowdtime_cli/skills/crowdtime/SKILL.md

@@ -140,7 +140,8 @@ ct clients remove-contact <id> <contact-id>
 
 ### Expenses
 ```bash
-ct expense list                     # List expenses
+ct expense list                     # List expenses you can see (colleagues' too if you're a manager or run a project)
+ct expense list --mine              # Only your own — use this for "my expenses" and totals
 ct expense list --from 2026-03-01 --to 2026-03-31 --billable
 ct expense create --amount 49.99 "Domain renewal" --project acme-website --category "Software" --vendor "Namecheap" --billable
 ct expense edit <id> --amount 59.99 --description "Domain + SSL renewal"
@@ -148,9 +149,8 @@ ct expense delete <id>
 ct expense categories               # List expense categories
 ct expense add-category "Travel"    # Create a new category
 
-# Short alias
-ct ex list                          # expense list
-ct ex create --amount 25 "Lunch with client" --category "Meals" --billable
+# Short alias (list only — takes the same options as expense list)
+ct ex --mine                        # expense list --mine
 ```
 
 **Who sees which expenses**: members and viewers see only their own; project managers also see expenses on projects they manage; account managers and above see all. Only the owner of an expense (or an account manager+) can edit or delete it, and not once it has been invoiced. `--project` must be a project the user is assigned to. The invoiced flag is set by invoicing and cannot be edited.
@@ -161,7 +161,9 @@ ct projects list                    # List all projects
 ct projects show <id>               # Project details
 ct projects create "New Project" --client "Acme" --budget 100 --budget-type hours -b
 ct projects create "New Project" --client "Acme" --billing-mode per_person  # Set billing mode
-ct projects create "Redesign" --client "Acme" --fixed-fee 10000  # Fixed price instead of hours
+ct projects create "Redesign" --client "Acme" --fixed-fee 10000  # One-off price, one payment
+ct projects create "Web" --client "Acme" --fixed-fee 5000 --payment Kickoff=1500@2026-06-01 --payment Delivery=3500
+ct projects create "Support" --client "Acme" --fixed-fee 4000 --fee-frequency monthly  # Recurring fee
 ct projects archive <id>            # Archive a project
 ct projects switch <slug>           # Set default project
 
@@ -202,9 +204,13 @@ ct projects add-tasks <project-id> --task <tid1> --task <tid2>  # Bulk assign ta
 
 **Billing types** (*what* is charged): `time_and_materials` (default) or `fixed_fee` (an agreed price via `--fixed-fee`, billed instead of logged hours).
 
+**Fixed fees come in two schedules** — ask which one when the user doesn't say:
+- **One-off** (default): `--fixed-fee` is the whole project price, split into `--payment NAME=AMOUNT[@DUE]` milestones that must add up to it (one "Full payment" if none are given). Each payment is invoiced exactly once.
+- **Recurring**: `--fixed-fee` is charged every `--fee-frequency` (`weekly`, `biweekly`, `monthly`, `quarterly`). The project sets up its own recurring invoice automatically — don't create a template for it by hand.
+
 **Billing modes** (*how* an hourly rate resolves, T&M only): `custom` (default), `per_task` (rate per task), `per_person` (rate per person).
 
-A fixed fee is never billed automatically — client-wide invoices skip fixed-fee projects. Bill it by naming the project explicitly (`ct invoice create --project <id>`) or via a recurring template.
+A fixed fee is never swept into a client-wide invoice. A one-off price is billed by naming the project (`ct invoice create --project <id>`, which bills its next unbilled payment; add `--payment <payment-id>` to pick one — IDs are in `ct projects show`). A recurring fee is billed by its own recurring invoice.
 
 **Rate waterfall** (order depends on billing mode):
 - `custom`: Entry → ProjectMember → ProjectTask → Project → Task → Membership → User
@@ -296,7 +302,8 @@ A favorite can only point at a project the user is assigned to (and a task on th
 
 ### Timesheets
 ```bash
-ct timesheet list                       # List your timesheets
+ct timesheet list --mine                # List your own timesheets
+ct timesheet list                       # Everyone's you can see (a User column marks rows that aren't yours)
 ct timesheet list --status submitted    # Filter by status
 ct timesheet submit --from 2026-03-10 --to 2026-03-16  # Submit full week
 ct timesheet submit --from 2026-03-30 --to 2026-03-31  # Partial week (end-of-month split)
@@ -437,7 +444,7 @@ ct pto add <user> <dates>             # Add PTO on behalf of user, auto-approved
 ct pto list [--mine|--team]           # List PTO entries with optional filters
 ct pto show <id>                      # Detail view of a single PTO entry (NEVER truncate the ID)
 ct pto edit <id> [fields]             # Edit date range, kind, notes, hours/day (your own: pending only)
-ct pto cancel <id> [--force]          # Cancel a PTO entry (own pending; or project manager+ any)
+ct pto cancel <id> [--force]          # Cancel a PTO entry (own pending; or project manager+ someone else's; your own decided leave needs another approver, admins excepted)
 ct pto approve <id> [--notes "..."]   # Approve a pending entry (project manager+; never your own unless admin)
 ct pto reject <id> --notes "..."      # Reject a pending entry — notes required (project manager+; never your own unless admin)
 ct pto calendar [--from --to --user --status]  # PTO slice for a date window (approved only unless --status)

{crowdtime_cli-0.21.0 → crowdtime_cli-0.22.0}/src/crowdtime_cli/skills/crowdtime/references/commands.md

@@ -233,9 +233,9 @@ ct timer continue [--note/-n NOTE] [--billable/-b] [--no-billable/-B] [--json]
 | `--no-billable`, `-B` | flag | Override billable status (mark non-billable) |
 | `--json` | flag | Output as JSON |
 
-Starts a new timer with the same project, task, and description as the most recently stopped entry. Great for resuming after a break. Use `--billable`/`--no-billable` to override the original entry's billable status.
+Starts a new timer with the same project, task, and description as your most recent entry (up to today; paid-leave rows are skipped). Great for resuming after a break. Use `--billable`/`--no-billable` to override the original entry's billable status.
 
-- **Endpoint:** `GET /time/` (fetch last entry) + `POST /time/start/`
+- **Endpoint:** `GET /time/?user=<you>` (fetch your last entry) + `POST /time/start/`
 - **Alias:** `ct c` (e.g. `ct c -b` to continue as billable)
 
 ### ct timer discard
@@ -563,10 +563,12 @@ ct expense list [options]
 | `--category` | string | Filter by category |
 | `--billable` | flag | Only billable expenses |
 | `--invoiced` | flag | Only invoiced expenses |
+| `--mine` | flag | Only your own expenses |
 | `--json` | flag | JSON output |
 
-Shows: ID, Date, Description, Amount, Category, Project, Billable, Invoiced.
-Scope: members and viewers see their own expenses; project managers also see those on projects they manage; account managers and above see all.
+Shows: ID, Date, User (only when a row isn't yours), Description, Amount, Category, Project, Billable, Invoiced. The total adds up every row shown.
+Scope: members and viewers see their own expenses; anyone running a project also sees those logged on it; account managers and above see all. Pass `--mine` whenever the question is about the user's own expenses — without it, a manager's or project lead's list and total include colleagues'. In `--json` output compare each row's `user` with yours.
+Alias: `ct ex [options]` (list only).
 Endpoint: `GET /expenses/`
 
 ### ct expense show
@@ -602,8 +604,8 @@ ct expense create --amount AMOUNT DESCRIPTION [options]
 **Usage examples:**
 ```bash
 ct expense create --amount 49.99 "Domain renewal" --project acme-website --category "Software" --billable
-ct ex create --amount 125 "Client lunch" --category "Meals" --vendor "La Trattoria" --billable --notes "Q1 planning lunch"
-ct ex create --amount 29.99 "Adobe subscription" -p design-project --category "Software" -d yesterday -b
+ct expense create --amount 125 "Client lunch" --category "Meals" --vendor "La Trattoria" --billable --notes "Q1 planning lunch"
+ct expense create --amount 29.99 "Adobe subscription" -p design-project --category "Software" -d yesterday -b
 ```
 
 Endpoint: `POST /expenses/`
@@ -956,7 +958,11 @@ ct projects create NAME [options]
 | `--billable`, `-b` | flag | Billable (default: true) |
 | `--no-billable`, `-B` | flag | Non-billable |
 | `--billing-type` | string | What the client is charged: `time_and_materials` (default) or `fixed_fee`. Accepts `tm` / `fixed` as aliases |
-| `--fixed-fee` | float | Agreed price billed instead of logged hours. Implies `--billing-type fixed_fee` |
+| `--fixed-fee` | float | Agreed price billed instead of logged hours. Implies `--billing-type fixed_fee`. The whole price for a one-off fee; the amount per period for a recurring one |
+| `--fee-schedule` | string | `one-off` (default) or `recurring` |
+| `--fee-frequency` | string | Recurring fee cadence: `weekly`, `biweekly`, `monthly`, `quarterly`. Implies `--fee-schedule recurring` |
+| `--payment` | string (repeatable) | One-off payment `NAME=AMOUNT` or `NAME=AMOUNT@YYYY-MM-DD`. Must add up to `--fixed-fee`. Omitted → one "Full payment" |
+| `--first-invoice` | string | Recurring fee: date of the first invoice. Default: one period after the project starts |
 | `--billing-mode` | string | Rate resolution for T&M work: `per_task`, `per_person`, `custom` (default). Ignored for fixed-fee projects |
 | `--payment-terms` | string | Terms for this project: `receipt`, `net7`, `net15`, `net30`, or a number of days. Omit to inherit the client, then org, default |
 | `--color` | string | Hex color code |
@@ -972,9 +978,13 @@ ct projects create NAME [options]
 | `time_and_materials` | Default. Billed from logged hours at the resolved rate |
 | `fixed_fee` | Billed at `--fixed-fee`, an agreed price. Logged hours are tracked but never charged by the hour |
 
-> **How a fixed fee gets invoiced.** It is *never* billed automatically. A client-wide invoice (`ct invoice create` with no project filter) deliberately skips fixed-fee projects entirely, so the fee cannot go out by accident. It is billed only when:
+> **Fixed-fee schedules.**
+> - **One-off** — the price is paid in payments (milestones) that add up to it. Each payment is billed **once**: naming the project on an invoice bills its next unbilled payment (or the ones picked with `--payment <id>`), and a fully billed project bills nothing. Voiding or deleting the invoice frees the payment again. A recurring template that lists the project bills the payments due by the end of the period it covers; payments without a due date are only billed by naming the project on an invoice. Duplicating an invoice leaves out its payment lines. Invoiced payments cannot be changed or removed.
+> - **Recurring** — the amount is billed every period. Creating the project (or switching it to recurring) sets up its own recurring invoice template with that cadence; changing the frequency updates it, and switching away, making it non-billable or archiving pauses it. If a hand-made template already bills the project, no second one is created.
+>
+> **How a fixed fee gets invoiced.** A client-wide invoice (`ct invoice create` with no project filter) deliberately skips fixed-fee projects entirely, so the fee cannot go out by accident. It is billed only when:
 > 1. the project is named explicitly — `ct invoice create --client <id> --project <fixed-project-id>`, or
-> 2. a recurring template lists the project.
+> 2. a recurring template lists the project (including the one a recurring fee creates for itself).
 >
 > When the fee is billed, that project's hours in the period are linked to the fee line and marked invoiced, so they stop showing as outstanding work without ever being charged twice. Until then they stay uninvoiced and available.
 
@@ -990,7 +1000,12 @@ ct projects create NAME [options]
 **Fixed-fee examples:**
 ```bash
 ct projects create "Rediseño Web" --client "Acme" --fixed-fee 10000
+ct projects create "Web" --client "Acme" --fixed-fee 5000 \
+  --payment Kickoff=1500@2026-06-01 --payment Midpoint=1500@2026-07-01 --payment Delivery=2000@2026-08-01
+ct projects create "Soporte" --client "Acme" --fixed-fee 4000 --fee-frequency monthly --first-invoice 2026-12-01
 ct projects update redesign --billing-type fixed --fixed-fee 12000
+ct projects update web --fixed-fee 6000 --payment Kickoff=1500 --payment Rest=4500  # Invoiced payments are kept
+ct projects update soporte --fee-frequency quarterly
 ct projects update redesign --billing-type tm --billing-mode per_person
 ```
 
@@ -2026,6 +2041,7 @@ Creates an invoice from tracked time entries. Requires either `--from`/`--to` or
 | `--to` | string | Period end date |
 | `--period` | string | Preset: `last-week`, `last-2-weeks`, `last-month`, `this-month` |
 | `--project`, `-p` | string (repeatable) | Limit to specific project ID(s). **Required to bill a fixed-fee project** — those are never included in a client-wide invoice |
+| `--payment` | string (repeatable) | One-off fixed-fee payment ID(s) to bill (from `ct projects show`). Without it, each selected one-off project bills its next unbilled payment |
 | `--group-by` | string | Group line items by: `project`, `task`, `user`, `date`, `none` |
 | `--tax-rate` | float | Tax rate percentage (e.g. 21 for 21%) |
 | `--payment-terms` | string | Payment terms: `receipt` (0 days), `net7`, `net15`, `net30`, or number of days. **Omit** to resolve from the waterfall below |
@@ -2049,7 +2065,8 @@ ct invoice create --client <id> --period last-2-weeks --group-by project
 ct invoice create --client <id> --period last-month --group-by user    # One line item per team member
 ct invoice create --client <id> --period last-month                    # Uses the client's own terms
 ct invoice create --client <id> --period last-month --due-date 2026-09-15
-ct invoice create --client <id> --period last-month --project <fixed-project-id>  # Bills the fixed fee
+ct invoice create --client <id> --period last-month --project <fixed-project-id>  # Bills the next payment / one period
+ct invoice create --client <id> --period last-month --project <fixed-project-id> --payment <payment-id>
 ```
 
 Endpoint: `POST /invoices/from-time-entries/`
@@ -2860,7 +2877,7 @@ routing from the list payload.
 ct pto list [--mine] [--team] [--status/-s STATUS] [--kind/-k KIND] [--from DATE] [--to DATE] [--user/-u USER] [--json]
 ```
 
-List PTO entries. Defaults to showing your own entries if `--mine` is passed, or all entries you can see if `--team` is passed. Without either flag, shows all visible entries.
+List PTO entries. Shows your own entries by default (same as `--mine`); `--team` shows every entry you can see.
 
 **Who can call it:**
 - Any member — sees own entries only (scoped by server regardless of flags).
@@ -2988,6 +3005,7 @@ Cancel a PTO entry. Transitions status to `canceled`.
 **Authorization:**
 - Own entry + `status=pending` → any member.
 - Manager+ → any non-canceled entry for users in their visibility scope (including approved entries).
+- Your own entry once it is approved or rejected → admins and owners only; a manager or project manager gets a `403` and must ask another approver (same rule as editing).
 
 `decided_by` / `decided_at` are NOT stamped by cancel (only by approve/reject).
 

{crowdtime_cli-0.21.0 → crowdtime_cli-0.22.0}/src/crowdtime_cli/skills/crowdtime/references/pto.md

@@ -45,7 +45,7 @@ If the user doesn't specify a kind, default to `vacation` but **confirm before s
 | Status | Meaning | Who can act next |
 |--------|---------|-----------------|
 | `pending` | Submitted, awaiting decision | Manager+ can approve or reject; owner of the entry can cancel or edit |
-| `approved` | Approved and active | Manager+ can cancel (removes from active capacity); manager+ can edit dates/hours (audit-logged) |
+| `approved` | Approved and active | Manager+ can cancel (removes from active capacity) or edit dates/hours (audit-logged) — but not their own entry unless they are admin/owner |
 | `rejected` | Rejected by manager | Entry owner can submit a new request with corrected dates |
 | `canceled` | Canceled (no longer active) | Terminal state — no further transitions |
 
@@ -93,7 +93,7 @@ Project managers and account managers using `ct pto list --team` or `ct pto add
 | `ct pto add <user>` (on-behalf) | No | Within scope → approved (400 outside it) | Any user → approved |
 | `ct pto list / show` | Own only | Within scope | Any |
 | `ct pto edit` | Own + pending only | Within scope (any status); **their own** entry only while pending | Any |
-| `ct pto cancel` | Own + pending only | Within scope (any non-canceled) | Any |
+| `ct pto cancel` | Own + pending only | Within scope (any non-canceled); **their own** entry only while pending | Any |
 | `ct pto approve` | No | Within scope + pending, **never their own** (403) | Any pending, including their own |
 | `ct pto reject` | No | Within scope + pending, **never their own** (403) | Any pending, including their own |
 | `ct pto calendar / summary` | Own | Within scope | Any |

{crowdtime_cli-0.21.0 → crowdtime_cli-0.22.0}/src/crowdtime_cli/skills/crowdtime/references/workflows.md

@@ -278,6 +278,26 @@ ct projects update-member consulting-engagement senior@co.com --rate 200
 ct projects update-member consulting-engagement junior@co.com --rate 100
 ```
 
+### Set Up a Fixed-Fee Project
+
+First ask which kind of fixed fee it is — the two are billed very differently:
+
+```bash
+# One project price, paid in milestones (each invoiced exactly once)
+ct projects create "Website" --client "Acme" --fixed-fee 5000 \
+  --payment Kickoff=1500@2026-06-01 --payment Midpoint=1500@2026-07-01 --payment Delivery=2000@2026-08-01
+
+# Bill the next payment when it's time (see `ct projects show` for payment IDs)
+ct invoice create --client <client-id> --period this-month --project <project-id>
+
+# The same amount every month — a recurring invoice is created for it automatically
+ct projects create "Support" --client "Acme" --fixed-fee 4000 --fee-frequency monthly
+ct projects show support   # "Invoiced by:" names the template and its next run
+```
+
+Payments must add up to the price. Invoiced payments can't be changed or removed;
+void the invoice first if one was billed by mistake.
+
 ### Apply Task Presets to an Existing Project
 
 ```bash
@@ -577,8 +597,8 @@ ct timesheet submit --from 2026-03-09 --to 2026-03-15 --force
 ct timesheet submit --from monday --to wednesday --force   # Close out March
 ct timesheet submit --from thursday --to friday --force     # Start April
 
-# Check submission status
-ct timesheet list
+# Check submission status (--mine: project leads and managers also see colleagues' timesheets)
+ct timesheet list --mine
 
 # Made a mistake? Recall it back to draft (before approval) — confirms before executing
 ct timesheet recall <timesheet-id> --notes "Need to fix Wednesday entries"
@@ -714,7 +734,7 @@ ct expense create --amount 49.99 "Domain renewal" --project acme-website --categ
 ct expense create --amount 29.99 "Team Slack subscription" --category "Software"
 
 # Log a past expense
-ct ex create --amount 85 "Client dinner" --category "Meals" --vendor "La Trattoria" -d yesterday --billable -p acme-project
+ct expense create --amount 85 "Client dinner" --category "Meals" --vendor "La Trattoria" -d yesterday --billable -p acme-project
 ```
 
 ### Setting Up Expense Categories
@@ -734,8 +754,10 @@ ct expense add-category "Hardware"
 ### Reviewing Expenses
 
 ```bash
-# List expenses for a period
+# List expenses for a period. Managers and project leads also see colleagues'
+# expenses here; add --mine when the user means their own
 ct expense list --from 2026-03-01 --to 2026-03-31
+ct expense list --mine --from 2026-03-01 --to 2026-03-31
 
 # Filter by project and billable status
 ct expense list --project acme-website --billable
@@ -1140,8 +1162,9 @@ ct invoice recurring generate-now <template-id> \
 ```
 
 Logged hours cannot be double-billed — they are settled on the invoice that
-pulled them. Fixed lines and fixed-fee projects can: they are billed in full on
-every run whatever the period, which is what the guard exists for.
+pulled them. Fixed lines and recurring fixed fees can: they are billed in full
+on every run whatever the period, which is what the guard exists for. One-off
+fixed-fee payments are safe — each is billed only once.
 
 ---