worklog-for-claude-code 0.4.0__tar.gz → 0.4.1__tar.gz

{worklog_for_claude_code-0.4.0/worklog_for_claude_code.egg-info → worklog_for_claude_code-0.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: worklog-for-claude-code
-Version: 0.4.0
+Version: 0.4.1
 Summary: See what you did with Claude Code each day and how many tokens it used: an automatic daily work log across accounts and devices, private by default
 Author: Urvin
 License-Expression: MIT
@@ -123,7 +123,7 @@ A checklist then shows anything still missing, with the exact command for your c
 
 **Wrong project on a card?** Click **✏️ Edit** to rename it or move the sessions. Worklog can remember the folder you always start in.
 
-**How do I update?** Click **Update now** when the dashboard says a new version is out, or run `pipx upgrade --pip-args=--no-cache-dir worklog-for-claude-code`.
+**How do I update?** Click **Update now** when the dashboard says a new version is out, or run `pipx upgrade --pip-args=--no-cache-dir worklog-for-claude-code` and click **Restart now** on the page. Still the old version? [Restart it once](https://github.com/us-urvin/worklog-for-claude-code/blob/main/docs/TROUBLESHOOTING.md#i-updated-but-the-page-still-shows-the-old-version).
 
 **Something isn't working?** Run `claude-worklog doctor`, or see [Troubleshooting](https://github.com/us-urvin/worklog-for-claude-code/blob/main/docs/TROUBLESHOOTING.md).
 

{worklog_for_claude_code-0.4.0 → worklog_for_claude_code-0.4.1}/README.md

@@ -84,7 +84,7 @@ A checklist then shows anything still missing, with the exact command for your c
 
 **Wrong project on a card?** Click **✏️ Edit** to rename it or move the sessions. Worklog can remember the folder you always start in.
 
-**How do I update?** Click **Update now** when the dashboard says a new version is out, or run `pipx upgrade --pip-args=--no-cache-dir worklog-for-claude-code`.
+**How do I update?** Click **Update now** when the dashboard says a new version is out, or run `pipx upgrade --pip-args=--no-cache-dir worklog-for-claude-code` and click **Restart now** on the page. Still the old version? [Restart it once](https://github.com/us-urvin/worklog-for-claude-code/blob/main/docs/TROUBLESHOOTING.md#i-updated-but-the-page-still-shows-the-old-version).
 
 **Something isn't working?** Run `claude-worklog doctor`, or see [Troubleshooting](https://github.com/us-urvin/worklog-for-claude-code/blob/main/docs/TROUBLESHOOTING.md).
 

{worklog_for_claude_code-0.4.0 → worklog_for_claude_code-0.4.1}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 [project]
 # Distribution name on PyPI. The command stays `claude-worklog` and the package stays `worklog`.
 name = "worklog-for-claude-code"
-version = "0.4.0"
+version = "0.4.1"
 description = "See what you did with Claude Code each day and how many tokens it used: an automatic daily work log across accounts and devices, private by default"
 readme = "README.md"
 requires-python = ">=3.10"

{worklog_for_claude_code-0.4.0 → worklog_for_claude_code-0.4.1}/tests/test_platforms.py

@@ -283,3 +283,36 @@ def test_our_hook_is_recognised_in_every_form():
         assert _is_ours(cmd), cmd
     for cmd in ("some-other-tool", "claude-worklog-helper hook", "claude-worklog hooked", None):
         assert not _is_ours(cmd), cmd
+
+
+# ------------------------------------------------------------------ "still running the old version" (doctor)
+def test_port_and_restart_command_per_os(monkeypatch, fake, home):
+    monkeypatch.setattr(services.sys, "platform", "linux")
+    monkeypatch.setattr(services, "UNIT_DIR", home / ".config/systemd/user")
+    assert services.configured_port() == 8765  # not installed yet: the default
+    services.install(9100, report=False)
+    assert services.configured_port() == 9100
+    assert services.restart_hint() == "systemctl --user restart claude-worklog-web"
+    monkeypatch.setattr(services.sys, "platform", "darwin")
+    monkeypatch.setattr(services, "AGENT_DIR", home / "Library" / "LaunchAgents")
+    monkeypatch.setattr(services.os, "getuid", lambda: 501, raising=False)
+    services.install(9200, report=False)
+    assert services.configured_port() == 9200
+    assert services.restart_hint() == "launchctl kickstart -k gui/$(id -u)/dev.worklog.web"
+    monkeypatch.setattr(services.sys, "platform", "win32")
+    assert "sign out" in services.restart_hint()
+
+
+def test_running_version_asks_the_page(monkeypatch):
+    import io
+
+    def page(req, timeout):
+        assert req.full_url == "http://127.0.0.1:8765/api/status"
+        return io.BytesIO(b'{"running": null, "version": "0.2.0"}')
+    monkeypatch.setattr("urllib.request.urlopen", page)
+    assert services.running_version(8765) == "0.2.0"
+
+    def down(req, timeout):
+        raise OSError("connection refused")
+    monkeypatch.setattr("urllib.request.urlopen", down)
+    assert services.running_version(8765) is None

{worklog_for_claude_code-0.4.0 → worklog_for_claude_code-0.4.1}/tests/test_smart.py

@@ -363,7 +363,7 @@ def test_timesheet_rows_use_summaries_edits_and_filters(repo):
     assert [(r.day.isoformat(), r.project, r.minutes) for r in rows] == [
         ("2026-11-02", "xoo", 50), ("2026-11-02", "R&D / misc", 40), ("2026-11-03", "xoo", 20)]
     assert rows[0].summary == "Added the item quantity field" and rows[0].summarized and rows[0].tag == "Feature"
-    assert not rows[1].summarized and rows[1].tag == "Review"
+    assert not rows[1].summarized and rows[1].tag == ""  # no summary yet: no guessed tag
     assert ts.missing_days(rows) == [_date(2026, 11, 2), _date(2026, 11, 3)]
     overrides.change(store, "Office", {"lines": {"2026-11-02|misc:R&D / misc": "Code review of PR #505"},
                                        "rules": {"~/development": "github.com/xoikospos/xoo"}})
@@ -572,3 +572,63 @@ def test_collect_end_to_end_review_started_outside_the_repo(home, repo):
     x = projects["github.com/xoikospos/xoo"]
     assert x.name == "xoo" and x.tag == "Review"
     assert xoo.exists()
+
+
+# ------------------------------------------------------------------ 0.4.1: the right summary, line and tag
+from worklog.report import ProjectDay, pick_summary, plain_line, summary_line  # noqa: E402
+
+
+def _pd(prompts):
+    p = ProjectDay("k", "xoo", "git", None)
+    p.prompts = [("09:00", q) for q in prompts]
+    return p
+
+
+def test_timesheet_line_never_falls_back_to_a_one_word_prompt():
+    """Screenshot: summaries from before 0.4.0 had no line, so "Approve" became the timesheet line."""
+    p = _pd(["Approve", "yes", "Pull every In Progress task assigned to me on the XOO board"])
+    assert plain_line(p) == "Pull every In Progress task assigned to me on the XOO board"
+    old = {"source": "ai", "bullets": ["- Reviewed the PRs listed as subtasks under XOO2-295. Then more.", "- x"]}
+    assert summary_line(old, p) == "Reviewed the PRs listed as subtasks under XOO2-295"
+    assert summary_line({"source": "ai", "line": "Reviewed PRs for XOO2-295"}, p) == "Reviewed PRs for XOO2-295"
+    assert summary_line(old, p, mine="My own line") == "My own line"
+    assert plain_line(_pd(["ok"])) == "ok" and plain_line(_pd([])) == "Work in Claude Code"
+
+
+def test_a_summary_written_for_other_sessions_is_not_shown():
+    """Screenshot: R&D / misc showed the PR #505 review summary, but that session had moved to xoo."""
+    metas = [{"generated_at": "2026-11-02T23:30:00+00:00",
+              "summaries": {"misc:R&D / misc": {"source": "ai", "bullets": ["- Reviewed PR #505"],
+                                                "sessions": ["pr505"]}}}]
+    assert pick_summary(metas, "misc:R&D / misc", ["mic"])[1] == "other"
+    assert pick_summary(metas, "misc:R&D / misc", ["pr505"])[1] == "ok"
+    assert pick_summary(metas, "misc:R&D / misc", ["pr505", "mic"])[1] == "partial"
+    assert pick_summary(metas, "nope", ["x"])[1] == "none"
+    legacy = [{"generated_at": "2026-11-01T23:30:00+00:00", "summaries": {"k": {"bullets": ["- a"]}}}]
+    assert pick_summary(legacy, "k", ["x"])[1] == "ok"  # before 0.4.1 summaries didn't list their sessions
+    both = [{"generated_at": "2026-11-03", "summaries": {"k": {"sessions": ["a"], "line": "new, partial"}}},
+            {"generated_at": "2026-11-02", "summaries": {"k": {"sessions": ["a", "b"], "line": "older, complete"}}}]
+    assert pick_summary(both, "k", ["a", "b"])[0]["line"] == "older, complete"  # the one that covers everything
+
+
+def test_cards_show_only_claudes_or_your_tag(day_app, repo):
+    app, cfg = day_app
+    body, _ = web.page_day(app, cfg, D1)
+    assert body.count('class="pill tag"') == 1  # xoo has Claude's "Feature"; the unsummarized card has none
+    overrides.change(GitStore(repo), "Office", {"tags": {"b": "Review"}})
+    assert web.page_day(app, cfg, D1)[0].count('class="pill tag"') == 2
+
+
+def test_old_misc_summary_is_hidden_after_its_session_moved_to_the_real_project(day_app, repo):
+    """The exact screenshot: an old R&D / misc summary about PR #505, while misc now holds only a mic question."""
+    app, cfg = day_app
+    store = GitStore(repo)
+    moved = dict(XOO, detected_by="commands", started_in="~/development")
+    _put(store, "2026-11-02", "Office", "work", _rec("pr505", "14:00", "14:40", project=moved, active=40,
+                                                   prompts=["/code-review 505 with proper check"]))
+    store.write_json("reports/2026-11-02/HP.json", {"generated_at": "2026-11-01T23:59:00+00:00", "summaries": {
+        "misc:R&D / misc": {"source": "ai", "bullets": ["- Reviewed PR #505 and posted a comment"]}}})
+    body, _ = web.page_day(app, cfg, D1)
+    assert "Reviewed PR #505 and posted a comment" not in body
+    assert "The saved summary was about other sessions" in body
+    assert "Summary out of date" in body  # xoo's older summary misses the moved-in review

{worklog_for_claude_code-0.4.0 → worklog_for_claude_code-0.4.1}/worklog/__init__.py

@@ -1,3 +1,3 @@
 """claude-worklog: daily work log + token report for Claude Code."""
 
-__version__ = "0.4.0"
+__version__ = "0.4.1"

{worklog_for_claude_code-0.4.0 → worklog_for_claude_code-0.4.1}/worklog/cli.py

@@ -110,6 +110,17 @@ def cmd_doctor(args) -> int:
               "Run `claude-worklog install-service` again.")
     elif auto is not None:
         print(f"{'✓' if auto else '!'} starts at login: {'yes' if auto else 'no (run claude-worklog install-service)'}")
+    if auto:
+        port = services.configured_port()
+        running = services.running_version(port)
+        if running is None:
+            print(f"! web page: not answering on port {port}. Restart it: {services.restart_hint()}")
+        elif running != __version__:
+            ok = False
+            print(f"✗ web page: still running {running}, but {__version__} is installed. "
+                  f"Restart it once: {services.restart_hint()}")
+        else:
+            print(f"✓ web page: running {running} at http://worklog.localhost:{port}")
     return 0 if ok else 1
 
 

{worklog_for_claude_code-0.4.0 → worklog_for_claude_code-0.4.1}/worklog/report.py

@@ -116,6 +116,7 @@ class ProjectDay:
     started_in: set[str] = field(default_factory=set)  # home-relative folders the misc sessions started in
     guess: dict | None = None  # "Probably xoo?" for sessions that found no repo
     moved: bool = False  # sessions were moved here or a rule applied
+    detected: bool = False  # a session here was found by 0.4.0's detection (it started outside this repo)
 
     @property
     def tag(self) -> str | None:
@@ -203,6 +204,7 @@ def aggregate(records: list[dict], ov: Overrides | None = None, time_mode: str =
             p = projects[key] = ProjectDay(key, ov.names.get(key) or project_title(info), str(info.get("kind")),
                                            info.get("remote"))
         p.moved = p.moved or bool(moved_to)
+        p.detected = p.detected or (proj.get("detected_by") in ("cwd-other", "files", "commands") and not moved_to)
         p.accounts.add(r.get("account", "?"))
         p.devices.add(r.get("device", "?"))
         if is_chat(r):
@@ -320,7 +322,7 @@ def ai_summary(p: ProjectDay, day: date, cfg: Config) -> dict | None:
         return None
     data = {
         "project": p.name, "kind": p.kind, "branches": sorted(p.branches), "folders": sorted(p.folders),
-        "minutes_worked": p.minutes, "likely_kind_of_work": p.tag,
+        "minutes_worked": p.minutes,
         "chats": [{"title": c["title"], "your_messages": c["prompts"], "chat_summary": c["summary"]}
                   for c in p.chat_items],
         "prompts_in_order": [q for _, q in p.prompts],
@@ -342,7 +344,10 @@ def ai_summary(p: ProjectDay, day: date, cfg: Config) -> dict | None:
         'triaged the mobile item-quantity bug\'",\n'
         ' "paragraph": "2-4 plain sentences about the day\'s work on this project",\n'
         ' "bullets": ["2-7 short points: what was built, fixed, reviewed or decided"],\n'
-        f' "tag": "one of: {", ".join(TAGS)}",\n'
+        f' "tag": "the ONE kind of work that took most of the time, one of: {", ".join(TAGS)}. Review = reviewing '
+        'pull requests or someone else\'s code, or triaging tickets; Bug fix = finding and fixing a problem; '
+        'Feature = building something new; Research = reading, asking or comparing without changing code; '
+        'Planning = deciding what to do or writing a plan; Release = shipping, deploying, versions or CI setup",\n'
         ' "next": ["open items still to do, if the data shows any; else an empty list"]}\n\n'
         f"<data>\n{blob}\n</data>"
     )
@@ -366,13 +371,77 @@ def ai_summary(p: ProjectDay, day: date, cfg: Config) -> dict | None:
     return parsed
 
 
+def _clip(text: str, n: int = 120) -> str:
+    text = " ".join(text.split())
+    return text if len(text) <= n else text[: n - 1].rsplit(" ", 1)[0].rstrip(",;:") + "…"
+
+
 def plain_line(p: ProjectDay) -> str:
-    """A one-line description without AI: the chat titles or the first prompt."""
+    """A one-line description without AI: the chat titles, or the first prompt that says something
+    (one-word answers such as "Approve" or "yes" are skipped)."""
     if p.chat_items:
-        text = "; ".join(c["title"] for c in p.chat_items[:3])
-    else:
-        text = p.prompts[0][1].splitlines()[0] if p.prompts else "Work in Claude Code"
-    return text if len(text) <= 120 else text[:119].rsplit(" ", 1)[0] + "…"
+        return _clip("; ".join(c["title"] for c in p.chat_items[:3]))
+    firsts = [q.splitlines()[0].strip() for _, q in p.prompts if q.strip()]
+    good = next((q for q in firsts if len(q.split()) >= 4), firsts[0] if firsts else "Work in Claude Code")
+    return _clip(good)
+
+
+def summary_line(s: dict | None, p: ProjectDay, mine: str | None = None) -> str:
+    """The timesheet line: yours if you wrote one, else Claude's, else the first point of an older summary
+    (written before 0.4.0, without a line), else a plain line from your prompts."""
+    if mine:
+        return mine
+    s = s or {}
+    if s.get("line"):
+        return str(s["line"])
+    bullets = [str(b).removeprefix("- ") for b in s.get("bullets") or [] if str(b).strip()]
+    if s.get("source") == "ai" and bullets:
+        return _clip(bullets[0].split(". ")[0].rstrip("."))
+    return plain_line(p)
+
+
+def summary_metas(store: GitStore, day: date) -> list[dict]:
+    """Every device's saved summaries for `day`, newest first."""
+    metas = [m for m in store.iter_json(f"reports/{day.isoformat()}") if isinstance(m, dict)]
+    return sorted(metas, key=lambda m: str(m.get("generated_at", "")), reverse=True)
+
+
+def legacy_fit(p: ProjectDay, projects: dict[str, ProjectDay]) -> str:
+    """How far to trust a summary written before 0.4.1 (it doesn't say which sessions it covers).
+
+    0.4.0 started filing sessions that began outside a repo under their real project. On a day where that
+    happened, an older "R&D / misc" summary probably describes a session that has moved away ("other"),
+    and the project it moved into is missing it ("partial"). Other days are fine.
+    """
+    if not any(q.detected for q in projects.values()):
+        return "ok"
+    if p.kind == "misc":
+        return "other"
+    return "partial" if p.detected else "ok"
+
+
+def pick_summary(metas: list[dict], key: str, ids: list[str], legacy: str = "ok") -> tuple[dict, str, str]:
+    """The saved summary that fits a card best: (summary, status, generated_at).
+
+    Summaries written from 0.4.0 on list the sessions they cover. status is "ok" when one covers all of
+    the card's sessions (or predates that list), "partial" when the best one covers only some (sessions
+    were added or moved in since), and "other" when it covers none of them: it describes different work,
+    for example after a session was moved to another project. Then the summary isn't shown at all.
+    """
+    want = set(ids)
+    candidates = [(m, (m.get("summaries") or {}).get(key)) for m in metas]
+    candidates = [(m, sm) for m, sm in candidates if isinstance(sm, dict)]
+    if not candidates:
+        return {}, "none", ""
+    for m, sm in candidates:  # newest first: the newest one that covers everything
+        covered = sm.get("sessions")
+        if not isinstance(covered, list):
+            return sm, legacy, str(m.get("generated_at", ""))
+        if want <= set(covered):
+            return sm, "ok", str(m.get("generated_at", ""))
+    m, sm = max(candidates, key=lambda c: (len(want & set(c[1].get("sessions") or [])), str(c[0].get("generated_at"))))
+    status = "partial" if want & set(sm.get("sessions") or []) else "other"
+    return sm, status, str(m.get("generated_at", ""))
 
 
 def chat_line(c: dict) -> str:
@@ -410,6 +479,7 @@ def summarize_all(projects: dict[str, ProjectDay], day: date, cfg: Config, use_a
         else:
             out[key] = {"bullets": plain_summary(p), "source": "plain", "line": plain_line(p), "paragraph": "",
                         "tag": "", "next": []}
+        out[key]["sessions"] = sorted(x["id"] for x in p.sessions_list)  # which sessions this summary covers
     return out
 
 

{worklog_for_claude_code-0.4.0 → worklog_for_claude_code-0.4.1}/worklog/services.py

@@ -494,6 +494,48 @@ def configured_python() -> str | None:
         return None
 
 
+def configured_port(default: int = 8765) -> int:
+    """The port the installed web service listens on (from its unit, agent or Run entry)."""
+    import re
+    kind = system()
+    try:
+        if kind == "mac":
+            f = AGENT_DIR / f"{MAC_WEB}.plist"
+            text = " ".join(plistlib.loads(f.read_bytes())["ProgramArguments"]) if f.exists() else ""
+        elif kind == "windows":
+            text = _reg_get(RUN_VALUE) or ""
+        else:
+            f = UNIT_DIR / WEB
+            text = f.read_text(encoding="utf-8") if f.exists() else ""
+    except (OSError, ValueError, KeyError, plistlib.InvalidFileException):
+        text = ""
+    m = re.search(r"--port[ =](\d{2,5})", text)
+    return int(m.group(1)) if m else default
+
+
+def restart_hint() -> str:
+    """How to restart the web page by hand on this system (needed once after updating from before 0.3.2)."""
+    kind = system()
+    if kind == "mac":
+        return f"launchctl kickstart -k gui/$(id -u)/{MAC_WEB}"
+    if kind == "windows":
+        return "sign out of Windows and back in (or restart the computer)"
+    return f"systemctl --user restart {WEB.removesuffix('.service')}"
+
+
+def running_version(port: int, timeout: float = 2.0) -> str | None:
+    """The version the web page on this computer is running right now, or None if it doesn't answer."""
+    import json
+    from urllib.request import Request, urlopen
+    try:
+        req = Request(f"http://127.0.0.1:{port}/api/status", headers={"Host": f"127.0.0.1:{port}"})
+        with urlopen(req, timeout=timeout) as r:  # noqa: S310 - loopback only
+            v = json.loads(r.read(100_000).decode("utf-8")).get("version")
+    except (OSError, ValueError, AttributeError):
+        return None
+    return v if isinstance(v, str) else None
+
+
 def report_timer_enabled() -> bool:
     try:
         return available() and backend().report_timer_enabled()

{worklog_for_claude_code-0.4.0 → worklog_for_claude_code-0.4.1}/worklog/timesheet.py

@@ -15,7 +15,7 @@ from datetime import date, timedelta
 from xml.sax.saxutils import escape
 
 from . import overrides
-from .report import aggregate, load_saved_summaries, plain_line
+from .report import aggregate, legacy_fit, pick_summary, summary_line, summary_metas
 from .store import GitStore
 
 MAX_DAYS = 92
@@ -76,21 +76,20 @@ def build(store: GitStore, start: date, end: date, *, time_mode: str = "active",
                    if isinstance(r, dict) and (not account or r.get("account") == account)]
         if records:
             _, projects = aggregate(records, ov, time_mode)
-            saved = load_saved_summaries(store, d).get("summaries", {})
+            metas = summary_metas(store, d)
             for key, p in projects.items():
                 if project and key != project:
                     continue
-                s = saved.get(key) or {}
+                sm, fit, _ = pick_summary(metas, key, [x["id"] for x in p.sessions_list], legacy_fit(p, projects))
+                if fit == "other":
+                    sm = {}
                 mine = ov.lines.get(f"{d.isoformat()}|{key}")
-                line = mine or s.get("line") or ""
-                if not line and s.get("bullets"):
-                    line = str(s["bullets"][0]).removeprefix("- ")
-                summarized = bool(mine or (line and s.get("source") == "ai"))
-                edited_tag = any(ov.tags.get(x["id"]) for x in p.sessions_list)
-                rows.append(Row(d, p.name, key, p.minutes,
-                                (p.tag if edited_tag else s.get("tag") or p.tag) or "",
-                                line or plain_line(p), summarized, sorted(p.accounts), sorted(p.devices),
-                                p.sessions + p.chats, sum(p.tokens.values()), p.approx))
+                summarized = bool(mine or sm.get("source") == "ai")
+                mine_tags = [ov.tags.get(x["id"]) for x in p.sessions_list if ov.tags.get(x["id"])]
+                tag = max(set(mine_tags), key=mine_tags.count) if mine_tags else sm.get("tag") or ""
+                rows.append(Row(d, p.name, key, p.minutes, tag, summary_line(sm, p, mine), summarized,
+                                sorted(p.accounts), sorted(p.devices), p.sessions + p.chats, sum(p.tokens.values()),
+                                p.approx))
         d += timedelta(days=1)
     rows.sort(key=lambda r: (r.day, -r.minutes, r.project))
     return rows

{worklog_for_claude_code-0.4.0 → worklog_for_claude_code-0.4.1}/worklog/web.py

@@ -47,12 +47,14 @@ from .identity import detected_logins, mask_email
 from .report import (
     aggregate,
     build_report,
-    load_saved_summaries,
+    legacy_fit,
     model_rows,
-    plain_line,
+    pick_summary,
     plain_summary,
     project_key,
     project_title,
+    summary_line,
+    summary_metas,
 )
 from .store import GitStore
 from .tags import TAGS
@@ -671,6 +673,15 @@ def _summary_age(meta: dict) -> float:
         return 0.0
 
 
+def card_tag(p, s: dict, ov) -> str | None:
+    """The tag on a card: yours if you set one, else the one Claude chose when it wrote the summary.
+    Worklog's own guess from keywords isn't shown: it was often wrong (a review of PRs read as Research)."""
+    mine = [ov.tags.get(x["id"]) for x in p.sessions_list if ov.tags.get(x["id"])]
+    if mine:
+        return max(set(mine), key=mine.count)
+    return s.get("tag") or None
+
+
 def _tasks_html(p, s: dict) -> str:
     """Claude's to-do items for this project and day, with Copy; or the summary's suggested next steps."""
     if p.tasks:
@@ -709,7 +720,7 @@ def _guess_html(app: App, day: date, p) -> str:
             f'<button class="quiet">No</button></form></span></div>')
 
 
-def _edit_form(app: App, day: date, p, projects: dict, known: dict[str, str], ov, line: str) -> str:
+def _edit_form(app: App, day: date, p, projects: dict, known: dict[str, str], ov, line: str, ai_tag: str = "") -> str:
     """The "Edit" popup for one card: rename, move (all or some sessions), folder rule, tag, timesheet line."""
     c = f'<input type="hidden" name="csrf" value="{app.csrf}">'
     choices = [(k, q.name) for k, q in projects.items() if k != p.key]
@@ -737,8 +748,8 @@ def _edit_form(app: App, day: date, p, projects: dict, known: dict[str, str], ov
                 "".join(f'<option value="{e(f)}">{e(f)}</option>' for f in folders) + "</select>")
         rule = (f'<div class="check"><input type="checkbox" id="rule" name="rule" value="1"><label for="rule">Always put '
                 f'sessions started in {pick} into that project on this computer (also for past days)</label></div>')
-    auto = p.tag or "Feature"
-    tag_opts = f'<option value="auto">Automatic ({e(auto)})</option>' + "".join(
+    auto = f"Automatic ({ai_tag}, from the summary)" if ai_tag else "Automatic (set when the summary is written)"
+    tag_opts = f'<option value="auto">{e(auto)}</option>' + "".join(
         f'<option value="{t}"{" selected" if any(ov.tags.get(x["id"]) == t for x in p.sessions_list) else ""}>{t}</option>'
         for t in TAGS)
     return f"""<section class="block edit-card" id="edit" aria-labelledby="edit-title">
@@ -868,8 +879,8 @@ def page_day(app: App, cfg: Config, day: date, edit_key: str | None = None) -> t
     records = list(store.iter_json(f"records/{day.isoformat()}"))
     ov = overrides.load(store.path)
     accounts, projects = aggregate(records, ov, cfg.time_mode)
-    saved_meta = load_saved_summaries(store, day)
-    saved = saved_meta.get("summaries", {})
+    metas = summary_metas(store, day)
+    saved = metas[0].get("summaries", {}) if metas else {}
 
     history_days = [day - timedelta(days=i) for i in reversed(range(HISTORY_DAYS))]
     history, names = [], [a.name for a in cfg.accounts]
@@ -972,19 +983,23 @@ def page_day(app: App, cfg: Config, day: date, edit_key: str | None = None) -> t
         '</div>')
 
     entries = []
-    summarized_at = _summary_age(saved_meta)
     edit_html = ""
     for p in sorted(projects.values(), key=lambda p: (p.kind == "chat", p.kind == "misc", -sum(p.tokens.values()))):
-        s = saved.get(p.key) or {}
-        stale = ov.stale.get(f"{day.isoformat()}|{p.key}", 0) > summarized_at
+        s, fit, written = pick_summary(metas, p.key, [x["id"] for x in p.sessions_list], legacy_fit(p, projects))
+        if fit == "other":  # written for other sessions (moved since): don't show someone else's story
+            s = {}
+        stale = fit == "partial" or ov.stale.get(f"{day.isoformat()}|{p.key}", 0) > _summary_age({"generated_at": written})
         bullets = s["bullets"] if s.get("bullets") else plain_summary(p)
-        if not s:
+        if fit == "other":
+            src = "Your prompts. The saved summary was about other sessions: press “Rewrite summaries”."
+        elif not s:
             src = "Your prompts. Press “Write summaries” for a written summary."
         elif stale:
-            src = "Summary out of date: sessions were moved. Press “Rewrite summaries”."
+            src = "Summary out of date: sessions were moved or added. Press “Rewrite summaries”."
         else:
             src = "Summary by Claude" if s.get("source") == "ai" else "Your prompts"
-        line = ov.lines.get(f"{day.isoformat()}|{p.key}") or s.get("line") or plain_line(p)
+        mine = ov.lines.get(f"{day.isoformat()}|{p.key}")
+        line = summary_line(s, p, mine)
         if s.get("paragraph"):
             items = (f'<p class="para">{e(s["paragraph"])}</p><details><summary>Details</summary><ul>'
                      + "".join(f"<li>{e(b[2:] if b.startswith('- ') else b)}</li>" for b in bullets) + "</ul></details>")
@@ -1017,20 +1032,19 @@ def page_day(app: App, cfg: Config, day: date, edit_key: str | None = None) -> t
         if p.files:
             extra += ('<details><summary>Files edited</summary><ul>'
                       + "".join(f"<li><code>{e(f)}</code></li>" for f in sorted(p.files)[:60]) + "</ul></details>")
-        edited_tag = any(ov.tags.get(x["id"]) for x in p.sessions_list)
-        tag = (p.tag if edited_tag else s.get("tag") or p.tag) if p.sessions or p.chats else None
+        tag = card_tag(p, s, ov)
         edit_url = f"/?d={day.isoformat()}&edit={quote(p.key, safe='')}"
         head_row = (f'<div class="cardhead"><h3>{e(p.name)}</h3>'
                     + (f'<span class="pill tag">{e(tag)}</span>' if tag else "")
                     + f'<a class="btn quiet edit" href="{edit_url}#edit" data-popup="edit" '
                       f'aria-label="Edit {e(p.name)}">✏️ Edit</a></div>')
         tline = (f'<div class="tline"><span class="muted">Timesheet:</span> {e(line)}</div>'
-                 if s or ov.lines.get(f"{day.isoformat()}|{p.key}") else "")
+                 if s.get("source") == "ai" or mine else "")
         entries.append(f'<article class="entry">{head_row}<div class="where">{where}</div>{_guess_html(app, day, p)}'
                        f'{items}{tline}{_tasks_html(p, s)}<div class="src">{e(src)}</div><dl class="facts">{dl}</dl>'
                        f'{extra}</article>')
         if edit_key == p.key:
-            edit_html = _edit_form(app, day, p, projects, known, ov, line)
+            edit_html = _edit_form(app, day, p, projects, known, ov, line, s.get("tag") or "")
 
     acct_rows = "".join(
         f'<tr><td><i style="display:inline-block;width:9px;height:9px;border-radius:2px;margin-right:6px;'
@@ -1946,8 +1960,8 @@ class App:
             edits["tags"].update({i: tag for i in ids if ov.tags.get(i) != tag})
         line = " ".join(form.get("line", "").split())[:160]
         if line != (ov.lines.get(here) or ""):
-            saved = load_saved_summaries(store, day).get("summaries", {}).get(p.key) or {}
-            auto_line = saved.get("line") or plain_line(p)
+            picked, fit, _ = pick_summary(summary_metas(store, day), p.key, ids, legacy_fit(p, projects))
+            auto_line = summary_line(picked if fit != "other" else {}, p)
             edits["lines"][here] = None if not line or line == auto_line else line
         edits = {k: v for k, v in edits.items() if v}
         if edits:

{worklog_for_claude_code-0.4.0 → worklog_for_claude_code-0.4.1/worklog_for_claude_code.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: worklog-for-claude-code
-Version: 0.4.0
+Version: 0.4.1
 Summary: See what you did with Claude Code each day and how many tokens it used: an automatic daily work log across accounts and devices, private by default
 Author: Urvin
 License-Expression: MIT
@@ -123,7 +123,7 @@ A checklist then shows anything still missing, with the exact command for your c
 
 **Wrong project on a card?** Click **✏️ Edit** to rename it or move the sessions. Worklog can remember the folder you always start in.
 
-**How do I update?** Click **Update now** when the dashboard says a new version is out, or run `pipx upgrade --pip-args=--no-cache-dir worklog-for-claude-code`.
+**How do I update?** Click **Update now** when the dashboard says a new version is out, or run `pipx upgrade --pip-args=--no-cache-dir worklog-for-claude-code` and click **Restart now** on the page. Still the old version? [Restart it once](https://github.com/us-urvin/worklog-for-claude-code/blob/main/docs/TROUBLESHOOTING.md#i-updated-but-the-page-still-shows-the-old-version).
 
 **Something isn't working?** Run `claude-worklog doctor`, or see [Troubleshooting](https://github.com/us-urvin/worklog-for-claude-code/blob/main/docs/TROUBLESHOOTING.md).