From c37622fdbafc0fcd29efcffbe75eb47473b701ca Mon Sep 17 00:00:00 2001 From: yoshikazu Date: Tue, 13 Oct 2026 06:22:09 +0900 Subject: [PATCH] =?UTF-8?q?n8n=20=E9=80=A3=E6=90=BA:=20=E7=B6=9A=E3=81=8D?= =?UTF-8?q?=E3=81=AE=E3=82=BB=E3=83=83=E3=82=B7=E3=83=A7=E3=83=B3=E3=81=AB?= =?UTF-8?q?=E5=86=99=E3=81=95=E3=82=8C=E3=81=9F=E5=90=8C=E3=81=98=E5=8C=BA?= =?UTF-8?q?=E9=96=93=E3=82=92=201=20=E4=BB=B6=E3=81=AB=E3=81=BE=E3=81=A8?= =?UTF-8?q?=E3=82=81=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude Opus 5.5 --- chktime.py | 10 ++++++++-- tests/test_n8n.py | 10 ++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/chktime.py b/chktime.py index c7f9378..dae983d 100644 --- a/chktime.py +++ b/chktime.py @@ -1312,8 +1312,14 @@ def collect_blocks(store, project_id, start, end, gap_min=N8N_GAP_MIN, min_min=N } ) out.append(block) - out.sort(key=lambda b: b["startEpoch"]) - return out + # 会話を続けると新しいセッションのファイルに前の履歴が同じ時刻のまま写されるので、 + # 開始時刻 (ミリ秒) が同じ区間は写しとみなし、いちばん後まで続いているものだけを残す。 + unique = {} + for block in out: + key = int(round(block["startEpoch"] * 1000)) + if key not in unique or block["endEpoch"] > unique[key]["endEpoch"]: + unique[key] = block + return sorted(unique.values(), key=lambda b: b["startEpoch"]) def mark_blocks(blocks, rows, deleted_sources, now=None): diff --git a/tests/test_n8n.py b/tests/test_n8n.py index e76e9c5..9279d27 100644 --- a/tests/test_n8n.py +++ b/tests/test_n8n.py @@ -153,6 +153,16 @@ class CollectAndMarkTest(unittest.TestCase): self.assertEqual([b["date"] for b in day1], ["2026-01-05"]) self.assertEqual(day2, []) + def test_continued_session_copies_are_listed_once(self): + # 会話を続けると、新しいセッションのファイルに前の履歴が同じ時刻のまま写される + old = [(0, "user", "設計して"), (10, "assistant", "ok")] + write_session(self.root, "C--debug-demo", "old", old, r"C:\debug\demo") + write_session(self.root, "C--debug-demo", "new", + old + [(20, "user", "続き"), (25, "assistant", "ok"), (90, "user", "次"), (100, "assistant", "ok")], + r"C:\debug\demo") + blocks = chktime.collect_blocks(self.store, "", date(2026, 1, 5), date(2026, 1, 5), 30, 5, now=LATER) + self.assertEqual([(b["sessionId"], b["minutes"]) for b in blocks], [("new", 25), ("new", 10)]) + def test_mark_blocks(self): b1 = {"source": "chktime:a:1", "startEpoch": BASE, "endEpoch": BASE + 600, "start": "", "end": "", "taskName": "A"} b2 = {"source": "chktime:b:2", "startEpoch": BASE + 600, "endEpoch": BASE + 1200, "start": "", "end": "", "taskName": "B"}