klok-cli 1.1.0__tar.gz → 1.2.1__tar.gz

{klok_cli-1.1.0/klok_cli.egg-info → klok_cli-1.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: klok-cli
-Version: 1.1.0
+Version: 1.2.1
 Summary: A batteries-included command-line time tracker with a plaintext backend.
 Author: Rajat Singh
 License: MIT
@@ -131,6 +131,35 @@ klok checkin --mood 4 --energy 3 --stress 2
 klok mindful :month          # sessions, time, averages, streaks
 ```
 
+## What drains you, what lifts you
+
+The thing no other tracker does: klok joins *how you felt* to *what you were
+doing*. Rate a day's blocks in about twenty seconds, then let klok tell you which
+work costs you energy and which gives it back — from your own private, local data,
+no cloud and no screen surveillance.
+
+```sh
+klok review                  # walk today's blocks, rate each 1–5 (a digit, then Enter)
+klok stop --felt 4           # or rate a block the moment you stop it
+klok digest :week            # what drained vs lifted you, in plain language
+klok digest :month -o energy.txt   # write a shareable copy
+```
+
+`klok review` asks one quick energy rating per tracked block (blank skips, `b`
+goes back, `q` quits), so the data stays cheap to keep. `klok digest` then reports
+the projects and tags whose energy sits clearly above or below your average, and
+only once there's enough rated data to trust it — the footer always says how many
+blocks it's working from.
+
+```text
++reviews drains you
+  averages 1.3 points below your overall energy over 7 blocks
+deep work lifts you
+  averages 0.9 points above your overall energy over 11 blocks
+
+Based on 34 rated blocks across 12 days. Rate more with `klok review` for sharper results.
+```
+
 ## A web dashboard
 
 ```sh

{klok_cli-1.1.0 → klok_cli-1.2.1}/README.md

@@ -105,6 +105,35 @@ klok checkin --mood 4 --energy 3 --stress 2
 klok mindful :month          # sessions, time, averages, streaks
 ```
 
+## What drains you, what lifts you
+
+The thing no other tracker does: klok joins *how you felt* to *what you were
+doing*. Rate a day's blocks in about twenty seconds, then let klok tell you which
+work costs you energy and which gives it back — from your own private, local data,
+no cloud and no screen surveillance.
+
+```sh
+klok review                  # walk today's blocks, rate each 1–5 (a digit, then Enter)
+klok stop --felt 4           # or rate a block the moment you stop it
+klok digest :week            # what drained vs lifted you, in plain language
+klok digest :month -o energy.txt   # write a shareable copy
+```
+
+`klok review` asks one quick energy rating per tracked block (blank skips, `b`
+goes back, `q` quits), so the data stays cheap to keep. `klok digest` then reports
+the projects and tags whose energy sits clearly above or below your average, and
+only once there's enough rated data to trust it — the footer always says how many
+blocks it's working from.
+
+```text
++reviews drains you
+  averages 1.3 points below your overall energy over 7 blocks
+deep work lifts you
+  averages 0.9 points above your overall energy over 11 blocks
+
+Based on 34 rated blocks across 12 days. Rate more with `klok review` for sharper results.
+```
+
 ## A web dashboard
 
 ```sh

{klok_cli-1.1.0 → klok_cli-1.2.1}/klok/__init__.py

@@ -1,3 +1,3 @@
 """klok - a command-line time tracker with a plaintext backend."""
 
-__version__ = "1.1.0"
+__version__ = "1.2.1"

{klok_cli-1.1.0 → klok_cli-1.2.1}/klok/cli.py

@@ -20,6 +20,8 @@ from klok.mindful import (BREATHING_TAG, MEDITATION_TAG, PATTERNS, Checkin,
                           parse_pattern, pattern_phases, rounds_for, sit_plan,
                           sparkline, streak)
 from klok.model import Frame, normalise_tags
+from klok.insights import drain_findings
+from klok.pairing import frame_at, is_practice
 from klok.report import (Renderer, by_day, by_project, by_sheet, by_tag,
                          render_day_chart, render_gaps, render_log,
                          render_punchcard, render_report, render_summary,
@@ -38,11 +40,25 @@ TIME_OPTIONS = {"-a", "--at", "--from", "--to", "--start", "--stop", "--now",
                 "--for", "--interval-bell", "--warmup"}
 
 
+def _default_ask(prompt: str):
+    """The real input seam: one line from the user, or ``None`` at EOF.
+
+    ``review`` reads through this rather than calling ``input`` directly, the
+    same spirit as the ``sleep=``/``clock=`` seams in ``focus``/``mindful``,
+    so the in-process test suite can feed scripted answers with no real TTY.
+    """
+    try:
+        return input(prompt)
+    except EOFError:
+        return None
+
+
 class Context:
     """Everything a command needs: config, store, clock and renderer."""
 
-    def __init__(self, args):
+    def __init__(self, args, ask=None):
         self.config = Config(args.home)
+        self.ask = ask or _default_ask
         self.store = Store(self.config)
         self.now = parse_datetime(args.now) if args.now else now_local()
         color_mode = "never" if args.no_color else (args.color or self.config.get("general.color", "auto"))
@@ -198,6 +214,7 @@ def cmd_start(ctx: Context) -> int:
 
 def cmd_stop(ctx: Context) -> int:
     args = ctx.args
+    felt = check_score("felt", getattr(args, "felt", None))  # validate before stopping
     at = resolve_time(ctx, args.at)
     sheet = None if args.all else ctx.sheet_filter()
     stopped = stop_running(ctx, at, note=args.note or "", sheet=sheet)
@@ -205,10 +222,17 @@ def cmd_stop(ctx: Context) -> int:
         ctx.echo("Nothing is running.")
         return 1
     ctx.store.save("stop")
+    if felt is not None:
+        store = CheckinStore(ctx.config)
+        for frame in stopped:
+            store.replace(store.energy_at(frame.start, frame.end_or(ctx.now)),
+                          Checkin(at=frame.start, energy=felt))
     for frame in stopped:
         ctx.echo("Stopped %s after %s [%s]" % (describe(ctx, frame),
                                                format_duration(frame.duration(ctx.now)),
                                                ctx.term.paint(frame.id, "grey")))
+    if felt is not None:
+        ctx.echo("Noted energy %d for %s." % (felt, "it" if len(stopped) == 1 else "them"))
     return 0
 
 
@@ -1173,9 +1197,14 @@ def cmd_checkin(ctx: Context) -> int:
                  % (removed.id, removed.at.strftime("%Y-%m-%d %H:%M")))
         return 0
 
+    words = list(args.words)
     mood = check_score("mood", args.mood)
     energy = check_score("energy", args.energy)
     stress = check_score("stress", args.stress)
+    # `klok checkin 4` shorthand: a bare leading integer is an energy rating,
+    # as long as --energy was not also given.  Everything else stays the note.
+    if energy is None and words and re.fullmatch(r"\d+", words[0]):
+        energy = check_score("energy", words.pop(0))
     if mood is None and energy is None and stress is None and sys.stdin.isatty():
         mood = check_score("mood", _ask("Mood 1-5 (1 low, 5 good)"))
         energy = check_score("energy", _ask("Energy 1-5"))
@@ -1184,7 +1213,7 @@ def cmd_checkin(ctx: Context) -> int:
         raise MindfulError("give at least one of --mood, --energy or --stress")
 
     checkin = Checkin(at=resolve_time(ctx, args.at), mood=mood, energy=energy, stress=stress,
-                      note=" ".join(args.words).strip(), tags=normalise_tags(args.tag or []))
+                      note=" ".join(words).strip(), tags=normalise_tags(args.tag or []))
     store.add(checkin)
     store.save()
     parts = ["%s %d" % (name, value) for name, value in
@@ -1325,6 +1354,134 @@ def cmd_mindful(ctx: Context) -> int:
     return 0
 
 
+def cmd_review(ctx: Context) -> int:
+    """Walk the range's tracked blocks and rate each one's energy, 1-5.
+
+    One block at a time: a digit then Enter records it, a blank line skips,
+    ``b`` steps back to re-rate the previous block, ``q`` (or EOF) stops.  By
+    default it walks the active sheet only and the blocks that have no energy
+    rating yet; ``--all-sheets`` widens the scope and ``--redo`` re-walks the
+    already-rated ones too.  Practice sessions and a still-running frame are
+    left out.  Each rating is one energy ``Checkin`` stamped at the block's
+    start instant, so the timestamp join associates it with that block.
+    """
+    start, end = ctx.range_of(":day")
+    sheet = ctx.sheet_filter()
+    practice = ctx.config.get("mindful.sheet", "wellbeing")
+    frames = ctx.store.select(start, end, sheet=sheet, now=ctx.now)
+    blocks = sorted((frame for frame in frames
+                     if not frame.running and not is_practice(frame, practice)
+                     and frame.start < frame.end_or(ctx.now)),
+                    key=lambda frame: frame.start)
+    store = CheckinStore(ctx.config)
+    redo = ctx.args.redo
+    pending = [frame for frame in blocks
+               if redo or store.energy_at(frame.start, frame.end_or(ctx.now)) is None]
+    if not pending:
+        if blocks:
+            ctx.echo("Every block here is already rated. Use `klok review --redo` to re-rate.")
+        else:
+            ctx.echo("No blocks to review in this range.")
+        return 0
+
+    rated = 0
+    index = 0
+    while index < len(pending):
+        frame = pending[index]
+        current = store.energy_at(frame.start, frame.end_or(ctx.now))
+        marker = ctx.term.paint("  [energy %d]" % current.energy, "grey") if current else ""
+        ctx.echo("%s  %s  (%s-%s)%s" % (
+            frame.label(), format_duration(frame.duration(ctx.now)),
+            ctx.renderer.fmt_time(frame.start), ctx.renderer.fmt_time(frame.stop), marker))
+        answer = ctx.ask("  Energy 1-5 (Enter skips, b back, q quit): ")
+        if answer is None:
+            break
+        answer = answer.strip().lower()
+        if answer == "":
+            index += 1
+            continue
+        if answer == "q":
+            break
+        if answer == "b":
+            index = max(0, index - 1)
+            continue
+        try:
+            value = check_score("energy", answer)
+        except MindfulError as exc:
+            ctx.echo("  %s" % exc)
+            continue
+        store.replace(current, Checkin(at=frame.start, energy=value))
+        rated += 1
+        index += 1
+
+    ctx.echo("Rated %d block%s." % (rated, "" if rated == 1 else "s"))
+    return 0
+
+
+def cmd_digest(ctx: Context) -> int:
+    """What your energy ratings add up to: which work drains or lifts you.
+
+    Reads the frames and energy check-ins in the range, joins each rating to
+    the block it falls in, and reports the projects and tags whose energy sits
+    clearly above or below your overall average.  It only reports a pattern
+    once there is enough data to trust it, so an honest footer always says how
+    many rated blocks it is working from.  ``-o`` writes the same text to a
+    file to share.
+    """
+    start, end = ctx.range_of(":week")
+    sheet = ctx.sheet_filter()
+    now = min(ctx.now, end - timedelta(seconds=1))
+    frames = ctx.store.select(start, end, sheet=sheet, now=now)
+    checkins = CheckinStore(ctx.config).select(start, end)
+
+    findings = drain_findings(frames, checkins, now)
+
+    # Rated blocks and the days they span, joined the same way insights does.
+    rated = {}
+    for checkin in checkins:
+        if checkin.energy is None:
+            continue
+        frame = frame_at(frames, checkin.at, now)
+        if frame is not None:
+            rated[id(frame)] = frame  # by identity, matching insights._rated_blocks
+    block_count = len(rated)
+    day_count = len({frame.start.date() for frame in rated.values()})
+
+    header = "Energy digest  %s to %s" % (
+        start.date().isoformat(), (end - timedelta(seconds=1)).date().isoformat())
+    body = []  # (kind, text): kind "head" is a finding headline, "plain" is as-is
+    if findings:
+        for finding in findings:
+            body.append(("head", finding.headline))
+            body.append(("plain", "  %s" % finding.detail))
+    elif block_count:
+        body.append(("plain", "No clear pattern yet. Keep rating blocks with `klok review`;"))
+        body.append(("plain", "a project or tag needs several rated blocks before it shows up here."))
+    else:
+        body.append(("plain", "Nothing rated yet. Rate a day's blocks with `klok review` and come back."))
+    footer = "Based on %d rated block%s across %d day%s." % (
+        block_count, "" if block_count == 1 else "s",
+        day_count, "" if day_count == 1 else "s")
+    if block_count:
+        footer += " Rate more with `klok review` for sharper results."
+
+    def render(colored: bool) -> str:
+        paint = ctx.term.paint if colored else (lambda text, *styles: text)
+        out = [paint(header, "bold"), ""]
+        for kind, text in body:
+            out.append(paint(text, "bold") if kind == "head" else text)
+        out += ["", paint(footer, "grey")]
+        return "\n".join(out)
+
+    if ctx.args.output:
+        with open(ctx.args.output, "w", encoding="utf-8") as handle:
+            handle.write(render(False) + "\n")
+        ctx.echo("Wrote the digest to %s" % ctx.args.output)
+    else:
+        print(render(True))
+    return 0
+
+
 # ------------------------------------------------------------------- checks
 def cmd_check(ctx: Context) -> int:
     problems = []
@@ -1361,7 +1518,7 @@ _klok_completions() {
   local commands="start stop cancel status restart switch track add stretch edit annotate tag untag
 rename move lengthen shorten fill join split delete undo log summary report chart gaps stats projects
 tags sheet sheets archive export import config where timer pomodoro breathe meditate checkin mood
-mindful check completion version"
+mindful review digest check completion version"
   COMPREPLY=($(compgen -W "$commands" -- "${COMP_WORDS[COMP_CWORD]}"))
 }
 complete -F _klok_completions klok
@@ -1373,7 +1530,7 @@ _klok() {
   commands=(start stop cancel status restart switch track add stretch edit annotate tag untag rename
 move lengthen shorten fill join split delete undo log summary report chart gaps stats projects tags
 sheet sheets archive export import config where timer pomodoro breathe meditate checkin mood
-mindful check completion version)
+mindful review digest check completion version)
   _describe 'klok command' commands
 }
 compdef _klok klok
@@ -1382,7 +1539,7 @@ compdef _klok klok
 for cmd in start stop cancel status restart switch track add stretch edit annotate tag untag rename \\
     move lengthen shorten fill join split delete undo log summary report chart gaps stats projects \\
     tags sheet sheets archive export import config where timer pomodoro breathe meditate \\
-    checkin mood mindful check completion version
+    checkin mood mindful review digest check completion version
     complete -c klok -n __fish_use_subcommand -a $cmd
 end
 """,
@@ -1564,6 +1721,7 @@ def build_parser() -> argparse.ArgumentParser:
     stop.add_argument("-a", "--at", metavar="TIME", help="stop at this time (e.g. 17:30, -5m)")
     stop.add_argument("-n", "--note", metavar="TEXT", help="append an annotation while stopping")
     stop.add_argument("--all", action="store_true", help="stop running entries on every sheet")
+    stop.add_argument("--felt", metavar="1-5", help="also record how the stretch felt, as an energy check-in")
 
     add("cancel", "Discard the running entry without recording it.",
         aliases=["abort"], parents=[sheet_opts], func=cmd_cancel)
@@ -1826,6 +1984,16 @@ def build_parser() -> argparse.ArgumentParser:
                       parents=[range_opts, sheet_opts], func=cmd_mindful)
     mindful_cmd.add_argument("--no-chart", action="store_true", help="skip the per-day chart")
 
+    review_cmd = add("review", "Rate each of a day's tracked blocks for energy, one at a time.",
+                     parents=[range_opts, sheet_opts], func=cmd_review)
+    review_cmd.add_argument("--redo", action="store_true",
+                            help="re-walk blocks that are already rated and replace their rating")
+
+    digest_cmd = add("digest", "What your energy ratings add up to: what drains or lifts you.",
+                     parents=[range_opts, sheet_opts], func=cmd_digest)
+    digest_cmd.add_argument("-o", "--output", metavar="FILE",
+                            help="write the digest to a file instead of stdout")
+
     current_group[0] = "Other"
     add("check", "Look for overlaps and other suspicious entries.", aliases=["sanity", "doctor"],
         func=cmd_check)
@@ -1840,7 +2008,7 @@ def build_parser() -> argparse.ArgumentParser:
     return parser
 
 
-def main(argv=None) -> int:
+def main(argv=None, ask=None) -> int:
     argv = list(sys.argv[1:] if argv is None else argv)
     if not argv:
         argv = ["status"]
@@ -1850,7 +2018,7 @@ def main(argv=None) -> int:
         parser.print_help()
         return 1
     try:
-        ctx = Context(args)
+        ctx = Context(args, ask=ask)
         return args.func(ctx) or 0
     except (StoreError, TimeParseError, ValueError, KeyError) as exc:
         return die(str(exc))

{klok_cli-1.1.0 → klok_cli-1.2.1}/klok/dashboard.html

@@ -5,82 +5,96 @@
 <meta name="viewport" content="width=device-width, initial-scale=1, viewport-fit=cover">
 <title>Hours & Feelings</title>
 <meta name="description" content="A klok dashboard that shows not just where your time went, but how it felt.">
-<link rel="preconnect" href="https://fonts.googleapis.com">
-<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
-<link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Fraunces:ital,opsz,wght@0,9..144,400;0,9..144,500;0,9..144,600;1,9..144,400&family=IBM+Plex+Mono:wght@400;500;600&family=IBM+Plex+Sans:wght@400;500;600&display=swap">
+<!-- Offline-first: the whole page is one self-contained file with no network
+     fetches. Type is the system font stack (thin Helvetica / system mono), so
+     the dashboard opens straight from disk with nothing to load. -->
 
 <style>
 /* ---- layout concept: single-column calm instrument panel; one color language (feeling ramp) tints every block of time; serif = feeling, mono = measurement ---- */
 :root{
-  /* light — "day paper" */
-  --plane:      #efede7;   /* page plane */
-  --surface:    #faf9f5;   /* card surface */
-  --surface-2:  #f3f1ea;   /* inset / track */
-  --ink:        #201e19;   /* primary text (warm near-black) */
-  --ink-2:      #57544c;   /* secondary */
-  --muted:      #8d8a80;   /* axis / captions */
-  --line:       #e2dfd4;   /* hairline */
-  --line-2:     #d6d2c5;
-  --accent:     #3a567f;   /* instrument accent — hours / magnitude / chrome */
-  --accent-2:   #2d4568;
-  --clay:       #b8473a;   /* stress hue */
-  --teal:       #2f8f6b;   /* mood hue */
-  --tip-bg:     #201e19;
-  --tip-fg:     #faf9f5;
-  --shadow:     0 1px 2px rgba(32,30,25,.05), 0 8px 28px rgba(32,30,25,.06);
+  /* light — "Renaissance daylight": parchment + sky, muted & earthy, one magenta pop */
+  --paper:      #e7e1d3;   /* base parchment */
+  --sky:        #cdd7da;   /* upper light wash */
+  --land:       #c6ccb0;   /* lower foliage warmth */
+  --plane:      #e7e1d3;
+  --surface:    rgba(250,248,242,.70);   /* frosted-glass card */
+  --surface-2:  rgba(238,235,227,.78);   /* inset / track */
+  --ink:        #26231c;   /* primary text (warm near-black) */
+  --ink-2:      #595345;   /* secondary */
+  --muted:      #6b6452;   /* axis / captions (AA on the parchment ground) */
+  --line:       rgba(92,80,58,.20);      /* hairline */
+  --line-2:     rgba(92,80,58,.32);
+  --accent:     #cf1d84;   /* the magenta pop — chrome / magnitude / highlight */
+  --accent-2:   #a8166a;
+  --clay:       #b05a3f;   /* stress hue — terracotta */
+  --teal:       #5f7d53;   /* mood hue — sage / olive */
+  --tip-bg:     #26231c;
+  --tip-fg:     #faf8f2;
+  --shadow:     0 2px 6px rgba(40,35,25,.06), 0 18px 44px rgba(40,35,25,.10);
   color-scheme: light;
 }
 @media (prefers-color-scheme: dark){
   :root:not([data-theme="light"]){
-    --plane:     #100f0d;
-    --surface:   #1a1917;
-    --surface-2: #232220;
-    --ink:       #f0eee7;
-    --ink-2:     #bbb6aa;
-    --muted:     #8f8c82;
-    --line:      #2b2a27;
-    --line-2:    #35332f;
-    --accent:    #8aa6d6;
-    --accent-2:  #a7bde3;
-    --clay:      #d9685a;
-    --teal:      #46a885;
-    --tip-bg:    #f0eee7;
-    --tip-fg:    #1a1917;
-    --shadow:    0 1px 2px rgba(0,0,0,.3), 0 10px 32px rgba(0,0,0,.4);
+    --paper:     #121813;
+    --sky:       #27313a;
+    --land:      #182414;
+    --plane:     #121813;
+    --surface:   rgba(28,34,26,.52);
+    --surface-2: rgba(20,26,19,.62);
+    --ink:       #ece7da;
+    --ink-2:     #b6afa0;
+    --muted:     #85806f;
+    --line:      rgba(225,215,190,.14);
+    --line-2:    rgba(225,215,190,.22);
+    --accent:    #ef4aa6;
+    --accent-2:  #f472b8;
+    --clay:      #cf7a5a;
+    --teal:      #83a271;
+    --tip-bg:    #ece7da;
+    --tip-fg:    #141b16;
+    --shadow:    0 2px 6px rgba(0,0,0,.35), 0 18px 44px rgba(0,0,0,.45);
     color-scheme: dark;
   }
 }
 :root[data-theme="dark"]{
-  --plane:     #100f0d;
-  --surface:   #1a1917;
-  --surface-2: #232220;
-  --ink:       #f0eee7;
-  --ink-2:     #bbb6aa;
-  --muted:     #8f8c82;
-  --line:      #2b2a27;
-  --line-2:    #35332f;
-  --accent:    #8aa6d6;
-  --accent-2:  #a7bde3;
-  --clay:      #d9685a;
-  --teal:      #46a885;
-  --tip-bg:    #f0eee7;
-  --tip-fg:    #1a1917;
-  --shadow:    0 1px 2px rgba(0,0,0,.3), 0 10px 32px rgba(0,0,0,.4);
+  --paper:     #121813;
+  --sky:       #27313a;
+  --land:      #182414;
+  --plane:     #121813;
+  --surface:   rgba(28,34,26,.52);
+  --surface-2: rgba(20,26,19,.62);
+  --ink:       #ece7da;
+  --ink-2:     #b6afa0;
+  --muted:     #85806f;
+  --line:      rgba(225,215,190,.14);
+  --line-2:    rgba(225,215,190,.22);
+  --accent:    #ef4aa6;
+  --accent-2:  #f472b8;
+  --clay:      #cf7a5a;
+  --teal:      #83a271;
+  --tip-bg:    #ece7da;
+  --tip-fg:    #141b16;
+  --shadow:    0 2px 6px rgba(0,0,0,.35), 0 18px 44px rgba(0,0,0,.45);
   color-scheme: dark;
 }
 
 *{ box-sizing:border-box; }
 body{
-  margin:0; background:var(--plane); color:var(--ink);
-  font-family:"IBM Plex Sans", system-ui, -apple-system, "Segoe UI", sans-serif;
-  font-size:15px; line-height:1.55; -webkit-font-smoothing:antialiased;
+  margin:0; color:var(--ink);
+  background:
+    radial-gradient(135% 95% at 50% -20%, var(--sky) 0%, transparent 56%),
+    radial-gradient(110% 75% at 85% 118%, var(--land) 0%, transparent 60%),
+    var(--paper);
+  background-attachment:fixed;
+  font-family:"Helvetica Neue", Helvetica, -apple-system, system-ui, "Segoe UI", "Noto Sans JP", Arial, sans-serif;
+  font-size:15px; line-height:1.55; font-weight:380; -webkit-font-smoothing:antialiased; text-rendering:optimizeLegibility;
 }
-.wrap{ max-width:1080px; margin:0 auto; padding-inline:20px; padding-block:0 72px; }
+.wrap{ max-width:1080px; margin:0 auto; padding-inline:20px; padding-block:0 96px; counter-reset:sec; }
 .mono{ font-family:"IBM Plex Mono", ui-monospace, "SF Mono", Menlo, monospace; font-variant-numeric:tabular-nums; }
-.serif{ font-family:"Fraunces", Georgia, "Times New Roman", serif; }
+.serif{ font-family:Georgia,"Iowan Old Style","Palatino Linotype","Times New Roman",serif; }
 
 a{ color:var(--accent); }
-h1,h2,h3{ margin:0; text-wrap:balance; font-family:"Fraunces", Georgia, serif; font-weight:500; letter-spacing:-.01em; }
+h1,h2,h3{ margin:0; text-wrap:balance; font-family:Georgia,"Iowan Old Style","Palatino Linotype","Times New Roman",serif; font-weight:400; letter-spacing:-.005em; }
 
 /* ---------- header ---------- */
 header.top{
@@ -92,9 +106,9 @@ header.top{
 }
 .brand{ display:flex; align-items:baseline; gap:12px; min-width:0; }
 .logo{ font-family:"IBM Plex Mono",monospace; font-weight:600; font-size:19px; letter-spacing:.02em; color:var(--ink); }
-.logo b{ color:var(--teal); font-weight:600; }
+.logo b{ color:var(--accent); font-weight:600; }
 .brand .cmd{ font-family:"IBM Plex Mono",monospace; font-size:12px; color:var(--muted); white-space:nowrap; overflow:hidden; text-overflow:ellipsis; }
-.brand .cmd .caret{ color:var(--teal); }
+.brand .cmd .caret{ color:var(--accent); }
 .controls{ display:flex; align-items:center; gap:8px; flex-shrink:0; }
 .seg{ display:inline-flex; background:var(--surface-2); border:1px solid var(--line); border-radius:999px; padding:3px; }
 .seg button{
@@ -110,15 +124,15 @@ header.top{
 button:focus-visible, a:focus-visible, [tabindex]:focus-visible{ outline:2px solid var(--accent); outline-offset:2px; border-radius:4px; }
 
 /* ---------- hero ---------- */
-.hero{ padding:26px 0 8px; }
-.hero h1{ font-size:clamp(30px,6vw,52px); line-height:1.04; letter-spacing:-.02em; }
-.hero h1 em{ font-style:italic; color:var(--teal); }
+.hero{ padding:40px 0 12px; }
+.hero h1{ font-size:clamp(38px,8vw,84px); line-height:1.0; letter-spacing:-.02em; font-weight:400; }
+.hero h1 em{ font-style:italic; color:var(--accent); }
 .lede{ margin:18px 0 0; max-width:60ch; color:var(--ink-2); font-size:clamp(15px,2.2vw,18px); line-height:1.5; }
 .lede strong{ color:var(--ink); font-weight:600; }
 
 /* ---------- stat tiles ---------- */
 .tiles{ display:grid; grid-template-columns:repeat(4,1fr); gap:12px; margin-top:26px; }
-.tile{ background:var(--surface); border:1px solid var(--line); border-radius:14px; padding:16px 16px 14px; box-shadow:var(--shadow); min-width:0; }
+.tile{ background:var(--surface); border:1px solid var(--line); border-radius:14px; padding:16px 16px 14px; box-shadow:var(--shadow); min-width:0; backdrop-filter:blur(14px) saturate(1.15); -webkit-backdrop-filter:blur(14px) saturate(1.15); }
 .tile .k{ font-family:"IBM Plex Mono",monospace; font-size:11px; letter-spacing:.06em; text-transform:lowercase; color:var(--muted); }
 .tile .v{ font-family:"IBM Plex Mono",monospace; font-weight:500; font-size:clamp(22px,3.3vw,30px); margin-top:6px; line-height:1; color:var(--ink); }
 .tile .v small{ font-size:.5em; color:var(--muted); font-weight:400; margin-left:3px; }
@@ -127,11 +141,12 @@ button:focus-visible, a:focus-visible, [tabindex]:focus-visible{ outline:2px sol
 
 /* ---------- section + cards ---------- */
 section{ margin-top:40px; }
-.sec-head{ display:flex; align-items:flex-end; justify-content:space-between; gap:16px; margin-bottom:14px; }
-.sec-head h2{ font-size:clamp(20px,3vw,26px); }
+.sec-head{ display:flex; align-items:flex-end; justify-content:space-between; gap:16px; margin-bottom:14px; counter-increment:sec; }
+.sec-head h2{ font-size:clamp(22px,3vw,28px); }
+.sec-head h2::before{ content:counter(sec,upper-roman) "\00a0\00a0"; font-family:"IBM Plex Mono",monospace; font-weight:600; font-size:.5em; letter-spacing:.1em; color:var(--accent-2); vertical-align:.2em; }
 .sec-head p{ margin:4px 0 0; color:var(--ink-2); font-size:13.5px; max-width:52ch; }
 .sec-head .hint{ font-family:"IBM Plex Mono",monospace; font-size:11px; color:var(--muted); white-space:nowrap; }
-.card{ background:var(--surface); border:1px solid var(--line); border-radius:16px; padding:20px; box-shadow:var(--shadow); }
+.card{ background:var(--surface); border:1px solid var(--line); border-radius:16px; padding:20px; box-shadow:var(--shadow); backdrop-filter:blur(14px) saturate(1.15); -webkit-backdrop-filter:blur(14px) saturate(1.15); }
 
 /* ---------- bubble (energy–time map) ---------- */
 .map-wrap{ position:relative; }
@@ -191,7 +206,7 @@ table.feel tr:last-child td{ border-bottom:0; }
 .trend-grid{ display:grid; grid-template-columns:repeat(3,1fr); gap:14px; }
 .trend{ background:var(--surface); border:1px solid var(--line); border-radius:14px; padding:14px 14px 10px; box-shadow:var(--shadow); min-width:0; }
 .trend .th{ display:flex; align-items:baseline; justify-content:space-between; gap:8px; }
-.trend .th b{ font-family:"Fraunces",serif; font-weight:500; font-size:16px; }
+.trend .th b{ font-family:"Helvetica Neue",Helvetica,-apple-system,system-ui,sans-serif; font-weight:500; font-size:16px; }
 .trend .th .now{ font-family:"IBM Plex Mono",monospace; font-size:17px; font-weight:500; }
 .trend .cap{ font-size:11.5px; color:var(--muted); margin-top:1px; }
 .trend svg{ width:100%; height:auto; display:block; margin-top:8px; }
@@ -218,7 +233,7 @@ table.feel tr:last-child td{ border-bottom:0; }
   background:radial-gradient(circle at 36% 32%, color-mix(in srgb, var(--accent) 48%, #ffffff) 0%, var(--accent) 72%);
   box-shadow:0 0 55px -6px var(--accent); opacity:.94; transform:scale(.66); }
 .b-now{ text-align:center; min-height:34px; }
-.b-now .phase{ font-family:"Fraunces",serif; font-weight:500; font-size:22px; color:var(--ink); }
+.b-now .phase{ font-family:"Helvetica Neue",Helvetica,-apple-system,system-ui,sans-serif; font-weight:500; font-size:22px; color:var(--ink); }
 .b-now .count{ font-family:"IBM Plex Mono",monospace; font-size:14px; color:var(--muted); margin-left:8px; }
 .breathe-controls{ display:flex; align-items:center; gap:14px; flex-wrap:wrap; justify-content:center; }
 .b-begin{ font-family:"IBM Plex Mono",monospace; font-size:14px; letter-spacing:.02em; background:var(--accent); color:#fff; border:0; border-radius:999px; padding:11px 28px; cursor:pointer; }
@@ -226,7 +241,7 @@ table.feel tr:last-child td{ border-bottom:0; }
 .pattern-seg{ display:inline-flex; background:var(--surface-2); border:1px solid var(--line); border-radius:999px; padding:3px; }
 .pattern-seg button{ font-family:"IBM Plex Mono",monospace; font-size:12px; border:0; background:transparent; color:var(--ink-2); padding:6px 14px; border-radius:999px; cursor:pointer; }
 .pattern-seg button[aria-pressed="true"]{ background:var(--surface); color:var(--ink); box-shadow:0 1px 2px rgba(0,0,0,.08); }
-.breathe-guide{ font-family:"Fraunces",serif; font-style:italic; font-size:16px; line-height:1.5; color:var(--ink-2); text-align:center; max-width:42ch; min-height:24px; }
+.breathe-guide{ font-family:"Helvetica Neue",Helvetica,-apple-system,system-ui,sans-serif; font-style:italic; font-size:16px; line-height:1.5; color:var(--ink-2); text-align:center; max-width:42ch; min-height:24px; }
 @media (prefers-reduced-motion:reduce){ .orb{ transform:scale(.82) !important; } }
 
 /* ---------- footer ---------- */

{klok_cli-1.1.0 → klok_cli-1.2.1}/klok/dashboard.py

@@ -12,12 +12,12 @@ from pathlib import Path
 from typing import List, Optional
 
 from klok import __version__
-from klok.mindful import BREATHING_TAG, MEDITATION_TAG, Checkin
+from klok.mindful import Checkin
 from klok.model import Frame
+from klok.pairing import frame_at, is_practice
 
 TEMPLATE = "dashboard.html"
 DATA_MARKER = "/*KLOK_DATA*/null"
-PRACTICE_TAGS = {BREATHING_TAG, MEDITATION_TAG}
 NO_PROJECT = "(no project)"
 
 
@@ -29,22 +29,6 @@ def _iso(moment: datetime) -> str:
     return moment.isoformat(timespec="seconds")
 
 
-def is_practice(frame: Frame, practice_sheet: str = "") -> bool:
-    """Breathing and sitting sessions, however they were recorded."""
-    return bool(PRACTICE_TAGS.intersection(frame.tags)) or (
-        bool(practice_sheet) and frame.sheet == practice_sheet)
-
-
-def frame_at(frames: List[Frame], moment: datetime, now: datetime) -> Optional[Frame]:
-    """The frame that was running at ``moment``; the latest-started one wins."""
-    found = None
-    for frame in frames:
-        if frame.start <= moment < frame.end_or(now):
-            if found is None or frame.start >= found.start:
-                found = frame
-    return found
-
-
 def _mean(values) -> Optional[float]:
     present = [value for value in values if value is not None]
     return round(sum(present) / len(present), 2) if present else None