From e65ca56f92f16642667adafd7a40a0fcdf97392a Mon Sep 17 00:00:00 2001 From: Anya Tokugawa Date: Sun, 8 Nov 2026 02:35:29 +0900 Subject: [PATCH] feat: add audited work records and controlled digest retries --- docs/design/implementation-roadmap.md | 24 +- docs/design/implementation-status.md | 22 + docs/design/ja/index.md | 2 + docs/design/ja/roadmap.md | 10 +- docs/design/ja/task-digest-delivery.md | 81 ++++ docs/design/ja/task-productivity-contacts.md | 41 +- internal/extensions/registry.go | 2 +- internal/server/organizer_dashboard.go | 2 + internal/server/task_digest.go | 149 +++--- internal/server/task_digest_history.go | 82 ++++ internal/server/task_digest_history_test.go | 447 ++++++++++++++++++ internal/server/task_productivity.go | 15 +- internal/server/task_productivity_test.go | 3 + internal/server/task_work_history.go | 95 ++++ internal/server/task_work_history_test.go | 343 ++++++++++++++ internal/server/tasks_handler.go | 12 + .../server/testdata/task-digest-history.js | 28 ++ internal/server/testdata/task-work-history.js | 34 ++ internal/store/schema_modules_test.go | 82 ++++ internal/store/task_digest.go | 48 +- internal/store/task_digest_history.go | 382 +++++++++++++++ internal/store/task_productivity.go | 147 ++++-- internal/store/task_work_history.go | 186 ++++++++ static/css/task-productivity.css | 1 + static/css/task-work-history.css | 1 + static/js/task-digest-history.js | 54 +++ static/js/task-productivity.js | 12 +- static/js/task-work-history.js | 52 ++ static/js/tasks.js | 2 +- templates/pages/organizer_dashboard.gohtml | 4 +- templates/pages/organizer_settings.gohtml | 6 +- templates/pages/task_work_history.gohtml | 5 + templates/pages/tasks.gohtml | 2 +- 33 files changed, 2262 insertions(+), 114 deletions(-) create mode 100644 docs/design/ja/task-digest-delivery.md create mode 100644 internal/server/task_digest_history.go create mode 100644 internal/server/task_digest_history_test.go create mode 100644 internal/server/task_work_history.go create mode 100644 internal/server/task_work_history_test.go create mode 100644 internal/server/testdata/task-digest-history.js create mode 100644 internal/server/testdata/task-work-history.js create mode 100644 internal/store/task_digest_history.go create mode 100644 internal/store/task_work_history.go create mode 100644 static/css/task-work-history.css create mode 100644 static/js/task-digest-history.js create mode 100644 static/js/task-work-history.js create mode 100644 templates/pages/task_work_history.gohtml diff --git a/docs/design/implementation-roadmap.md b/docs/design/implementation-roadmap.md index 38cb5ae..c99f3ab 100644 --- a/docs/design/implementation-roadmap.md +++ b/docs/design/implementation-roadmap.md @@ -1,5 +1,27 @@ # Architecture Implementation Roadmap +## Daily email history and controlled retries (2026-11-08) + +- [x] Private, paginated delivery history and explicit same-day retry from personal settings. +- [x] Durable request receipts, attempt-generation fencing, opt-out/version/revocation rechecks and duplicate-delivery acknowledgment. +- [x] Bounded 90-day detail cleanup; preserve daily reservations and retry receipts permanently. +- [x] Additive schema v4 with old-state preservation, interrupted-migration rollback and integrity tests. +- [ ] Production rollout; backup restoration must reconcile external SMTP effects before resuming delivery. +- [ ] Retention controls, safe receipt compaction, queued-request cancellation and Inbox outcomes. + +See [delivery contracts and recovery](ja/task-digest-delivery.md). + +## Work history and project reporting (2026-11-08) + +- [x] Owner-scoped paginated work history with inline correction/cancellation and lazy revision display. +- [x] Atomic immutable audit snapshots, optimistic concurrency, current authorization and cross-Domain overlap checks. +- [x] Exclude cancelled time from reports; aggregate by current project without per-project queries. +- [x] Task/dashboard navigation, Japanese/English UI and desktop/mobile browser coverage. +- [ ] Production rollout with an aligned DB backup; old binaries must not read the upgraded DB. +- [ ] Revoked-Domain recording recovery, cancellation restoration and audit retention policy. + +See [work history contracts and migration](ja/task-productivity-contacts.md). + ## Organizer dashboard (2026-11-02) - [x] Common navigation for tasks, calendars, contacts and dashboard; home/navbar contacts entry. @@ -17,7 +39,7 @@ See [dashboard contracts](ja/organizer-dashboard.md). Production rollout is a se - [x] Add home search commands with project/calendar suggestions and explicit creation confirmation. - [x] Add private contacts CRUD, trash/restore, vCard import/export and unknown-property preservation. - [x] Add private CardDAV serving with isolated credentials, conditional writes, bounded reports and sync tokens; revision preview/restore and whole-book export (2026-11-02). -- [ ] Shared address books, external CardDAV connectors, physical-device compatibility, work-record corrections and manual digest retry. +- [ ] Shared address books, external CardDAV connectors and physical-device compatibility. See [CardDAV operation and limits](../operations/carddav-contacts.md). The private profile is not full CardDAV compliance; production rollout is tracked separately. diff --git a/docs/design/implementation-status.md b/docs/design/implementation-status.md index dfa1630..a45518c 100644 --- a/docs/design/implementation-status.md +++ b/docs/design/implementation-status.md @@ -13,6 +13,28 @@ security. ## Current state +2026-11-08 digest follow-up: private delivery history and explicit same-day retry +are implemented in source. Manual requests are queued for the existing scheduler; +attempt IDs fence stale completions, and consent/version/authorization are checked +again before SMTP. Detailed terminal attempts expire after 90 days, while daily +reservations and request receipts remain. Additive schema v4 and recovery rules +preserve duplicate prevention; production rollout remains deferred. See +[delivery history and migration](ja/task-digest-delivery.md). + +2026-11-08 work history: owner-only bounded history, inline correction/cancellation, +immutable audit snapshots and project-level reports are implemented in source. +Cancelled spans leave the report but not the audit. Task/dashboard navigation and +Japanese/English desktop/mobile UI are connected. Schema migration v3 requires an +aligned DB backup before production rollout; do not hot-swap older binaries onto +the upgraded DB. See [contracts and remaining scope](ja/task-productivity-contacts.md). + +The dated task/inbox paragraphs below describe earlier slices. VTODO, time blocks, +Pomodoro, active notifications, daily task email, private CardDAV and the organizer +dashboard have since been implemented. Their remaining work is shared access, +external connectors, conflict resolution and retention, not reimplementation of +the existing private interfaces. The [Japanese roadmap](ja/roadmap.md) tracks the +current order. + 2026-09-25 task reminders: explicit per-task due/planned-date switches and a local notification time now schedule owner-only Inbox reminders. Reservations are updated in the source transaction; the bounded scheduler rechecks current state/authority, diff --git a/docs/design/ja/index.md b/docs/design/ja/index.md index 4ffe2aa..d71b163 100644 --- a/docs/design/ja/index.md +++ b/docs/design/ja/index.md @@ -4,6 +4,8 @@ ## この設計書の読み方 +2026-11-08追加:[日次タスクメールの配信履歴と手動再送](task-digest-delivery.md)。予約・要求receipt・詳細履歴の保持境界と、DB移行・復旧時の二重送信防止。 + 2026-11-02追加:[オーガナイザーの共通ナビゲーションと個人ダッシュボード](organizer-dashboard.md)。配置可能なウィジェット、個人設定への統合、保存・認可・読込負荷の契約。 2026-11-01追加:[タスク作成・作業記録・達成度レポート・日次メール・個人アドレス帳](task-productivity-contacts.md)。[neomuttとCLIの操作リファレンス](../../operations/neomutt-tasks.md)も参照。 diff --git a/docs/design/ja/roadmap.md b/docs/design/ja/roadmap.md index f1be196..0907b0d 100644 --- a/docs/design/ja/roadmap.md +++ b/docs/design/ja/roadmap.md @@ -4,11 +4,15 @@ ## 優先順 +2026-11-08:[日次メールの配信履歴・手動再送・保持境界](task-digest-delivery.md)をソース実装。migration v4は旧予約を保持し、詳細整理後も日別予約と要求receiptを残す。本番反映は保留して整合性検証を優先する。次は失効Domainに取り残された作業記録の回復、取消済み作業記録の復元と監査保持。共有・外部書き込みは別段階。 + +2026-11-08:[作業記録の訂正・取消と監査履歴、プロジェクト別集計](task-productivity-contacts.md#作業記録の訂正と取消)をソース実装。タスク一覧・ダッシュボードから履歴画面へ接続。DBのmanaged migration v3を伴うため、本番反映はバックアップと別工程にする。日次メールの配信結果・手動再送・保持契約は同日の後続実装へ進んだ。失効Domainに取り残された作業記録の回復、共有、外部書き込みは残件。 + 2026-11-02:[共通ナビゲーション・個人設定・ウィジェットダッシュボード](organizer-dashboard.md)を実装。タスク/カレンダー/連絡先の導線統一、トップ・ナビバーの連絡先、個人別の配置・サイズ保存。ソース実装と本番反映は区別し、共有・外部ウィジェットは後続。 2026-11-02:[個人CardDAV提供と履歴復元・一括export](../../operations/carddav-contacts.md)を実装。専用資格情報、条件付き更新、変更tokenと削除tombstone、bounded REPORTを追加。09:04:17 JSTに[v0.6.0として本番2系統へ反映](../../operations/deployments/2026-11-02-v0.6.0.md)。共有アドレス帳・外部CardDAV connector・実機互換確認は同資料の後続範囲。 -2026-11-01:[タスク作成・作業記録・達成度・日次メール・個人アドレス帳](task-productivity-contacts.md)を追加。Web/CLI/neomuttの共通capture、時間記録、既定値、検索コマンドを接続。作業記録の事後訂正、日次メールの再送・保持期間は同設計の後続範囲へ集約する。 +2026-11-01:[タスク作成・作業記録・達成度・日次メール・個人アドレス帳](task-productivity-contacts.md)を追加。Web/CLI/neomuttの共通capture、時間記録、既定値、検索コマンドを接続。作業記録の事後訂正と日次メールの再送・保持境界は2026-11-08の実装へ進んだ。 2026-10-31:ユーザ指定により[日常操作・ブラウザ・エディタ・CLI](priority-ux-20261031.md)を次期開発の最優先とする。下記の従来機能追加より優先するが、認可・データ保全の安全条件は省略しない。TODO、受け入れ条件、復元用チェックポイントを同文書に集約する。 @@ -34,7 +38,7 @@ | P1-3 | 検索・decode・大容量 | 現行上限と測定 | current-only検索、隔離、stream、cancel | | P2-1 | 通知と承認Inbox | P0、outbox | 現在権限で再表示・決裁・失効 | | P2-2 | HTMLパーツ | round-trip fixture | macro/asset/未知HTMLを壊さない | -| P2-3 | local task | extension契約、原子的ジャーナル | 個人タスク/プロジェクト・Inbox通知・個人local時間枠・永続化Pomodoro・Todayの見積/時間枠/集中集約を実装済み。次は計画持ち越し、日課、共有 | +| P2-3 | local task | extension契約、原子的ジャーナル | 個人タスク/プロジェクト・Inbox通知・個人local時間枠・永続化Pomodoro・日別計画と持ち越し・作業記録訂正と集計・日次メール再送を実装済み。次は失効Domainの作業記録回復、日課、共有 | | P2-4 | RSS読取・Wiki保存 | connector共通部 | FreshRSS fixtureと安全なcopy | | P2-6 | 料理レシピ管理 | Document/Asset、検索、権限 | 材料・分量・手順・調理時間・人数・タグを構造化し、単位変換と安全な共有を検証 | | P3 | calendar/contact/mail | import/secret/競合契約 | read-only同期、明示copy、障害復旧 | @@ -57,7 +61,7 @@ P2以降の順序は利用価値で入れ替え可能ですが、P0の該当安 - 認証・グループ:実装あり。全endpoint監査・identity lifecycleが残り。 - 匿名公開・children/tree/City:実装あり。大規模影響確認、share、承認Inboxが残り。 - ブログ・日記・公開射影・本文RSS:実装あり。遠隔射影、コメント、tDiary等が残り。 -- オーガナイザー:カレンダーと限定CalDAV、個人タスク/プロジェクト・個別ONのInbox通知、個人local時間枠と永続化Pomodoroあり。[タスク実装契約](tasks-implementation.md)、[時間枠とPomodoro](task-planning-focus.md)参照。一般のカレンダー予定通知・共有・VTODO、RSS購読・IMAPは未実装。 +- オーガナイザー:カレンダーと限定CalDAV、個人タスク/プロジェクト・VTODO同期・個別ONのInbox通知・個人local時間枠・永続化Pomodoro・日次メール・個人CardDAV・ウィジェットダッシュボードあり。[タスク実装契約](tasks-implementation.md)、[時間枠とPomodoro](task-planning-focus.md)、[タスク所属とDAV同期](task-dav-project-unification.md)参照。一般のカレンダー予定通知・共有、DAV競合候補の通知と採否選択、RSS購読・IMAPは残件。 - 全面WYSIWYG、native app起動、第三者runtime、vim.wasm改善:判断待ちまたは保留。 ## 共通のDone diff --git a/docs/design/ja/task-digest-delivery.md b/docs/design/ja/task-digest-delivery.md new file mode 100644 index 0000000..2b46612 --- /dev/null +++ b/docs/design/ja/task-digest-delivery.md @@ -0,0 +1,81 @@ +# 日次タスクメールの配信履歴と手動再送 + +2026-11-08、`organizer.tasks 0.14.0` のソース実装。個人設定で配信試行を確認し、当日分を明示的に再送できる。送信は既存の `task.digest.deliver` イベントが行い、Webリクエスト内ではSMTPに接続しない。本番反映は別工程とする。 + +## 利用者の操作と公開範囲 + +入口は `/-/sys/config?panel=organizer` の「メール配信履歴・再送」。初期は閉じておき、開いたときだけ履歴を取得する。自動ポーリングは行わず、更新ボタンとページ送りを用意する。PCは表、スマホは表の領域内だけ横スクロールする。 + +本人・現在のDomainの履歴だけを返す。管理者権限は他人の履歴を読む根拠にならない。readonlyは閲覧だけ可能。無効化したタスク拡張へのAPIアクセスは拒否する。履歴には対象日、定期/手動/移行前の区分、状態、更新時刻、理由コードだけを表示する。本文・宛先・SMTP認証情報・生のエラーを保存しない。 + +再送は保存済みの配信設定が有効で、当日の配信試行が既に存在する場合だけ可能とする。初回配信の前倒しや過去日のまとめ送りは含めない。現在のタスクから本文を再構成し、現在の本人のアカウントメールアドレスへ送る。元のメールの完全な再現ではない。設定画面の未保存値は使わない。 + +送信済みまたは結果不明の場合は、受信状況を確認し、重複配信の可能性を了承するチェックを必須にする。送信中・待機中には次の再送を受け付けない。同じDomain・本人・日付につき、手動要求は最大5件。処理前に中止された要求も回数に含める。 + +## API + +基点は `/_/api/v1/extension/organizer.tasks/`。既存の個人タスクAPIと同じ認証を用いる。CalDAV専用資格情報を一般APIの資格情報へ拡張しない。 + +| 操作 | URI | 内容 | +| --- | --- | --- | +| GET | `digest-history?limit=25&after=...` | 新しい順のitems、次のcursor、設定timezoneのtoday、当日のcurrent、手動要求数retries、配信設定enabled、retention_days | +| POST | `digest-history/retry` | request_id、day、expected_attempt、duplicate_acknowledgedを受け取り、受付成功は202とrequest_id | + +一覧は1〜100件、既定50件、Webは25件。`created_ms, uuid` のkeysetを使う。cursorは256 bytes以内。expected_attemptは一覧で取得した当日のcurrent.uuidをそのまま送る。 + +要求IDはクライアント生成のcanonical UUID。同じ要求IDと同じ内容の再送は新たな予約を作らない。異なる内容での再利用、古いexpected_attempt、実行中、上限到達は412。対象日が現在の配信timezoneの今日でない場合や、必要な重複確認がない場合は422。配信設定OFF、readonly、権限不足は拒否する。APIはSMTP有効設定とアカウントのメール形式も確認する。 + +Webはネットワーク失敗時に同じ要求IDを保持して再試行する。受付済みの要求をGETで観測した場合は、再送を重ねず状態表示へ切り替える。古い要求のreceiptがある場合は、日付が過ぎたり詳細履歴が整理された後の同内容再送にも既存の受付IDを返す。新しいSMTP処理は起こさない。受付応答はメールの到達を意味しない。 + +## 状態とワーカー + +| 状態 | 意味 | 次の扱い | +| --- | --- | --- | +| queued | 手動要求をDBで受付済み | スケジューラがclaimする | +| sending | 1つの試行が送信処理を担当 | 通常はsent、uncertain、cancelledへ遷移 | +| sent | SMTP処理が正常終了 | 受信箱への到達保証ではない。手動再送には確認が必要 | +| uncertain | SMTP結果が不明、またはワーカー中断の可能性 | 自動再送しない。手動再送には確認が必要 | +| cancelled | SMTPに渡す前に処理中止 | 原因を確認し、当日なら手動で再予約できる | + +イベントは60秒周期。定期配信の候補は最大20件、手動キューは最大10件を取得し、両者を交互に処理する。全体の時間予算は30秒で、残りは次回へ持ち越す。手動キューは受付時の設定versionを固定する。claim時に権限・拡張機能・配信同意・設定version・対象日を確認し、変更されていれば送信中止にする。 + +SMTP直前にも、現在の権限・メールアドレス・同意version・拡張状態・対象日・試行IDを読み取りtransactionで再確認する。2分以上古いclaimでは送信を開始しない。処理の終了は現在の試行IDと状態が一致するときだけ保存し、古いワーカーが新しい試行を完了扱いにできないようにする。 + +10分以上sendingのままの試行は、イベントの保守処理で最大100件ずつuncertainへ移す。これは「未送信」との断定ではない。プロセス停止・長い休止・SMTPの応答喪失では送信済みの可能性がある。SMTPとDBを一つのtransactionにできないため、exactly-onceや、休止した古いプロセスからのネットワーク送信を完全に取り消す保証はしない。明示確認付きの再送でこの不確実性を扱う。 + +理由コードはSMTP未設定、タスク取得失敗、設定・権限変更、拡張無効化、対象日経過、SMTP結果不明、ワーカー中断に限定する。イベントログには件数だけを残す。 + +## DBの正本と保持境界 + +正本はSQLite。配信に関する以下の3つを分離する。 + +| テーブル | 役割 | 保持 | +| --- | --- | --- | +| organizer_digest_deliveries | Domain・本人・日付の予約と現在の試行ID/状態 | 恒久。日別の自動二重配信を防ぐ | +| organizer_digest_requests | 手動要求IDと要求内容・重複確認・受付時刻 | 恒久。同じ要求の再受付を防ぐ | +| organizer_digest_attempts | 個々の試行状態・理由・日時 | 終端状態のupdated_msから90日。queued/sendingは削除対象外 | + +詳細の削除はイベント1回につき最大500件で、日時と状態のindexから選ぶ。設定や再送受付は別のwriter transactionで行い、削除と同じSQLite書き込みロックに従う。日別予約と手動receiptを削除・再作成しない。詳細が期限切れになると古い予約が指す試行の詳細行は存在しなくなるが、予約の状態と重複防止機能は残る。現時点では恒久記録の圧縮・失効は実装しない。 + +## 移行と復旧 + +task-productivityのmanaged migration v4で、既存の日別予約へattempt_uuidを追加し、試行・受付receiptのテーブルとindexを作る。既存の日別予約を削除せず、元のstateとupdated_msを保ってlegacy試行へ対応付ける。旧試行の設定version・timezoneは不明として扱い、現在の設定から過去の同意を推測しない。 + +DDL、旧データの対応付け、migration台帳の更新は同じtransactionで完了する。途中失敗なら旧スキーマと予約へ戻る。再実行でIDや予約を再生成しない。前段のv3を含め、旧migration定義の書き換えは行わない。 + +本番反映前には、書き込みを停止した整合DBバックアップと、対応するイメージを確保する。反映後にschema version、予約数、legacy試行との対応、`PRAGMA integrity_check` を確認する。旧イメージは更新DBに接続しない。forward-fixを基本とし、旧DBへ戻す場合は更新後の書き込みを保全して照合する。 + +特にメールはDB外で送信されるため、送信開始後のバックアップ復元だけでは重複防止を復元できない。復旧時はイベントの自動送信を止め、更新後の予約・receiptを保全して照合し、送信済みか不明な分を自動再送しないこと。移行・反映・復旧の成功と、実際の受信箱への到達は別の確認である。 + +## 受け入れ条件と後続 + +- 旧予約の全状態を保つ移行、反復、途中失敗のrollback、DB integrity check。 +- 二重クリック・応答喪失後の同一要求、異内容再利用、当日制約、5回上限。 +- readonly・別本人・未認証・配信OFF・権限失効・設定変更・日付経過の拒否または送信中止。 +- 古い試行の送信前チェックと完了通知の拒否、SMTP結果不明の扱い。 +- 詳細を削除した後も、手動receipt再送や日別自動claimで配信が復活しないこと。 +- fake SMTPを用いた予約から送信・結果保存までの試験。ブラウザはPCと390px幅。 + +検証結果:`go test ./...`、`go vet ./...`、追加の受付競合・権限・保持境界テストの `-race`、JavaScript構文検査が成功。Chromiumの1440px・390pxで、履歴の遅延読込、重複確認、受付応答の喪失後の同一ID再試行、キュー処理後の状態表示を確認した。DB移行の反復・途中失敗のrollbackと `PRAGMA integrity_check` は隔離DBで確認。本番DBは変更していない。 + +後続は保持期間の管理UI、恒久receiptの安全な圧縮、当日予約の明示取消、配信結果のInbox連携、複数ワーカーの運用メトリクス。共有送信先・任意宛先・過去日の送信はこの機能へ暗黙に追加しない。 diff --git a/docs/design/ja/task-productivity-contacts.md b/docs/design/ja/task-productivity-contacts.md index 745344f..6b4a612 100644 --- a/docs/design/ja/task-productivity-contacts.md +++ b/docs/design/ja/task-productivity-contacts.md @@ -13,6 +13,9 @@ | 実行中の記録 | GET `work` | itemがnullなら停止中 | | 開始 | POST `work` | action=start、uuid、task_uuid。開始時刻はサーバーで記録 | | 終了 | POST `work` | action=stopとGETで得たitem。versionで条件付き更新 | +| 作業一覧 | GET `work-history?from=YYYY-MM-DD&to=YYYY-MM-DD&limit=50&after=...` | fromを含みtoを含まない期間と重なる本人の記録。最大367日、1ページ最大100件、取消済みを含む | +| 作業の履歴 | GET `work-history/{uuid}?before=VERSION` | 新しい版から最大100件。nextが0なら終了。それ以外は次のbeforeへ渡す | +| 作業の訂正・取消 | POST `work` | action=correctまたはcancel、uuid、version、reasonが必須。終了済み・未取消の記録のみ | | レポート | GET `report?from=YYYY-MM-DD&to=YYYY-MM-DD` | fromを含み、toを含まない。ドメインのtimezone、最大367日 | | 予定を作る | POST `calendar-capture` | request_id、calendar_uuid、title、from、to。本人所有・非公開・非共有・外部sourceなしのカレンダー限定 | @@ -48,13 +51,35 @@ Webのタスク行の▶から開始し、上部の作業記録欄で終了す 深夜をまたぐ作業はローカル日付境界で分割し、夏時間の日も24時間固定にしない。Pomodoroと手動記録は別集計で、両者を合算しない。各系列は最大10,000件で、上限到達時はpartialを返して期間の絞り込みを促す。 +### 作業記録の訂正と取消 + +2026-11-08に `organizer.tasks 0.13.0` としてソース実装。`/v/plan/tasks/work` で一覧と変更履歴を確認し、開始・終了をインラインで訂正する。タスク一覧とダッシュボードの達成度ウィジェットから移動できる。初期期間はドメイン時刻の今日を含む30日。ページ送りは開始時刻・UUIDのkeysetで行い、一度に全履歴を描画しない。変更履歴も開いた記録だけ取得する。スマホはラベル付き縦配置にし、操作部を44px以上とする。 + +訂正には `start_ms`・`end_ms`、または `start`・`end` の日時ペアを渡す。日時文字列はオフセット付きRFC 3339、あるいはドメインのタイムゾーンでの `YYYY-MM-DDTHH:mm[:ss]`。夏時間移行で存在しない・二通りに解釈できるローカル時刻は422。繰り返される時刻はAPIから明示オフセットを指定する。Webで未変更の時刻は元の瞬間をRFC 3339で送るため、ミリ秒やオフセットを失わない。 + +開始はUNIX epochより後、終了は開始より後かつ現在以前、訂正後の長さは31日以内。同じ本人の他の未取消記録と重なる区間は、別Domainも含めて412で拒否する。隣接区間は許可し、他Domainの記録内容は返さない。実行中は従来の終了操作を先に行う。`reason` は前後空白除去後1〜500 UTF-8 bytes、改行・NUL不可。Web入力は160文字まで。 + +取消は物理削除ではなく `cancelled_ms` を記録し、作業時間レポートから除外する。タスクの状態・完了ポイントは変更しない。元の時刻と全変更履歴は残る。訂正・取消後の自動復元、過去の記録の新規挿入はこの段階では扱わない。 + +現在値と監査snapshotは同じwriter transactionで保存する。認可・拡張機能の有効状態をロック内で再検査し、versionが一致しない更新は412。理由・変更前後の時刻・版・変更時刻を記録し、他人の記録を管理者権限だけで操作する経路は設けない。通信結果が不明な訂正・取消の再送もversionを検証し、古ければ412にする。最新値と履歴を再取得して判断する。Webは失敗時に入力を保持し、自動上書きしない。従来の開始・終了の再送契約は維持する。 + +移行前の記録には過去の編集履歴を捏造しない。初回の変更時に直前の値をbaselineとして捕捉する。baselineのchanged_msは捕捉時刻であり、過去の編集時刻ではない。未変更の旧記録を開いた際は現在値だけをbaselineとして表示する。 + +### プロジェクト別の集計 + +`report` の `projects` 配列にUUID・タイトル・完了数・ポイント・作業時間を返す。ダッシュボードの達成度ウィジェットに表を追加し、日付セルで選んだ日の内訳にも反映する。プロジェクトなしは独立した行とする。所属は現在のタスクから取得するため、過去時点の所属スナップショットではない。Pomodoroはプロジェクト表に合算しない。 + +集計は既存の上限付き取得結果を再利用し、プロジェクトごとに追加クエリを発行しない。10,000件上限でpartialとなる場合はプロジェクト表も部分集計であり、全件合計とは表示しない。 + ## 毎日のメール `/-/sys/config?panel=organizer` の個人設定で本人が有効化する。旧 `/v/plan/tasks/settings` もここへ移動する。送信先は現在の本人のアカウントメールアドレスのみ。管理者のSMTP設定が必要。時刻はHH:mmとIANA timezoneを保存する。`task.digest.deliver` イベントが60秒周期で期限到来設定を最大20件ずつ処理する。キュー停止・負荷・SMTP遅延で配信時刻が遅れる場合がある。 当日の計画・期限到来タスクを最大100件送る。件名、期限、取り組む日、見積、タスクURLを含め、メモは送らない。送信直前にアカウント状態・同意のversion・送信先を再確認する。メールによる保存・転送の可能性があるため、既定は無効。 -SMTPとSQLiteをまたぐexactly-onceは保証できない。送信前にDomain・本人・日付で予約し、配送結果はsent、uncertain、cancelled。予約後のクラッシュはsendingとして残す。結果不明の場合は自動再送せず、二重送信を避ける。翌日は通常通り処理し、過去日の取りこぼしをまとめて送らない。設定画面に直近結果を表示する。 +SMTPとSQLiteをまたぐexactly-onceは保証できない。送信前にDomain・本人・日付で予約し、結果不明の場合は自動再送しない。翌日は通常通り処理し、過去日の取りこぼしをまとめて送らない。 + +2026-11-08に `organizer.tasks 0.14.0` として[配信履歴・当日分の手動再送・詳細90日保持](task-digest-delivery.md)をソース実装。個人設定の折り畳み履歴から操作する。送信済み/結果不明の再送には重複の了承が必要。詳細の保持期限後も日別予約・再送receiptを残し、重複防止を維持する。migration v4とDB外のメール送信を考慮した復旧条件は同設計を参照。 ## トップ検索コマンド @@ -87,8 +112,18 @@ vCardの内容はDocumentStore snapshot、現在値と所有者・version・検 managed schemaにtask-productivityとcontactsを追加。task-productivityは既存organizer_items作成後に実行し、旧完了タスクを1回だけ集計projectionへ移す。既存スキーマ定義の改変ではない。切戻しでは旧版のschema checkが新コンポーネントを未知とするため、単に旧イメージを起動できるとは扱わない。データを消して戻さない。 - 連絡先の共有アドレス帳、外部CardDAV connector、重複候補mergeは別段階。個人CardDAV提供面と外部サービスの取り込みは区別する。 -- 作業記録の事後修正・取消、失効Domainで取り残された記録の管理用終了手順、プロジェクト別集計、担当者への共有・通知は後続。 -- 日次メールの手動再送・配信ログの保管期間、receiptの失効設計は後続。安易な削除で重複作成・配信を復活させない。 +- 失効Domainで取り残された記録の管理用終了手順、取消済み記録の復元、作業監査履歴の保持期間、担当者への共有・通知は後続。 +- 日次メールの保持期間UI、恒久receiptの圧縮・失効、配信結果のInbox連携は後続。現在は詳細90日、重複防止記録は恒久保持とする。 - vCard legacy変換・version間変換と履歴保持期間は後続。 利用手順は [neomuttとタスクCLI](../../operations/neomutt-tasks.md) を参照。 + +### 作業履歴の移行と検証 + +task-productivityのmanaged migration v3は、作業記録へのcancelled_ms追加、organizer_work_revisionsの作成、本人別の区間検索index追加を行う。既存の作業時刻・versionは保ち、既存記録は未取消とする。新しい監査データの正本はSQLiteで、アプリのDBバックアップに含める。 + +反映前に整合したDBバックアップを取得する。旧版は取消済み記録を正しく集計できず、schemaのversionも一致しないため、更新DBに旧イメージを向ける切戻しは禁止する。通常はforward-fixを選ぶ。復旧が必要ならアプリを停止し、移行前のDBと対応するイメージへ一緒に戻す。更新後の書き込みは別途保全・照合してから復旧する。本番反映は別工程。 + +受け入れ試験は、旧スキーマ移行の反復、本人・Domain分離、readonly・失効・無効化、版競合、重複時間、夏時間の欠落・重複、監査失敗時のrollback、並行訂正、取消による集計除外を対象とする。ブラウザはデスクトップと390px幅で訂正・取消・履歴・412時の入力保持を確認する。既存CLIの開始/終了とCalDAVの契約は変更しない。 + +2026-11-08の検証結果:`go test ./...`、`go vet ./...`、追加した競合・監査試験の `-race`、変更JSの構文検査が成功。Chromiumの1440px・390pxで、ダッシュボードのプロジェクト別表から履歴へ移動し、訂正・取消・監査表示・競合時の入力保持と横幅の収まりを確認した。すべて隔離fixtureによる試験で、本番移行は未実施。 diff --git a/internal/extensions/registry.go b/internal/extensions/registry.go index 625c230..e21a865 100644 --- a/internal/extensions/registry.go +++ b/internal/extensions/registry.go @@ -22,7 +22,7 @@ type Manifest struct { func Catalog() []Manifest { return []Manifest{ {ID: "organizer.contacts", APIVersion: 1, Version: "0.2.0", Kind: "contacts", Scope: "domain", NameKey: "contacts.title", DescriptionKey: "contacts.help", Capabilities: []string{"contacts.own.read", "contacts.own.write"}, Events: []string{}, SettingsPanel: "extensions", Builtin: true, Enabled: true, ResourceClass: "foreground+index"}, - {ID: "organizer.tasks", APIVersion: 1, Version: "0.12.0", Kind: "tasks", Scope: "domain", NameKey: "tasks.title", DescriptionKey: "tasks.help", Capabilities: []string{"tasks.own.read", "tasks.own.write"}, Events: []string{"organizer.task.changed", "organizer.project.changed", "task.digest.deliver"}, SettingsPanel: "extensions", Builtin: true, Enabled: true, ResourceClass: "foreground+background+index"}, + {ID: "organizer.tasks", APIVersion: 1, Version: "0.14.0", Kind: "tasks", Scope: "domain", NameKey: "tasks.title", DescriptionKey: "tasks.help", Capabilities: []string{"tasks.own.read", "tasks.own.write"}, Events: []string{"organizer.task.changed", "organizer.project.changed", "task.digest.deliver"}, SettingsPanel: "extensions", Builtin: true, Enabled: true, ResourceClass: "foreground+background+index"}, {ID: "organizer.calendar", APIVersion: 1, Version: "0.2.0", Kind: "calendar", Scope: "domain", NameKey: "calendar.title", DescriptionKey: "calendar.help", Capabilities: []string{"calendar.read", "calendar.write"}, Events: []string{}, SettingsPanel: "extensions", Builtin: true, Enabled: true, ResourceClass: "foreground+index"}, {ID: "content.diary", APIVersion: 1, Version: "0.1.0", Kind: "diary", Scope: "domain", NameKey: "periodical.diary", DescriptionKey: "periodical.diary_help", Capabilities: []string{"path.read", "path.write", "domain.extensions.manage"}, Events: []string{"periodical.registered", "periodical.removed"}, SettingsPanel: "diary", Builtin: true, Enabled: true, ResourceClass: "foreground+index"}, {ID: "content.blog", APIVersion: 1, Version: "0.1.0", Kind: "blog", Scope: "domain", NameKey: "periodical.blog", DescriptionKey: "periodical.blog_help", Capabilities: []string{"path.read", "path.write", "domain.extensions.manage"}, Events: []string{"periodical.registered", "periodical.removed"}, SettingsPanel: "blog", Builtin: true, Enabled: true, ResourceClass: "foreground+index"}, diff --git a/internal/server/organizer_dashboard.go b/internal/server/organizer_dashboard.go index b466695..f1e2884 100644 --- a/internal/server/organizer_dashboard.go +++ b/internal/server/organizer_dashboard.go @@ -108,6 +108,8 @@ func organizerSection(path string) string { } func init() { + translations["en"]["task.work_history"] = "Work history" + translations["ja"]["task.work_history"] = "作業記録" for lang, entries := range map[string]map[string]string{ "en": {"organizer.title": "Organizer", "organizer.dashboard": "Dashboard", "organizer.settings": "Personal settings", "organizer.contacts": "Contacts", "organizer.private": "Preferences apply only to you in this Domain. System administration is separate.", "organizer.calendar_defaults": "Default calendars", "organizer.open": "Open"}, "ja": {"organizer.title": "オーガナイザー", "organizer.dashboard": "ダッシュボード", "organizer.settings": "個人設定", "organizer.contacts": "連絡先", "organizer.private": "このドメイン内の自分だけに適用する設定です。システムの管理設定とは別です。", "organizer.calendar_defaults": "既定のカレンダー", "organizer.open": "開く"}, diff --git a/internal/server/task_digest.go b/internal/server/task_digest.go index 1b61183..ed8687a 100644 --- a/internal/server/task_digest.go +++ b/internal/server/task_digest.go @@ -38,67 +38,110 @@ func sendTaskDigestSMTP(ctx context.Context, config store.AuthProviderConfig, re func (s *Server) deliverTaskDigests(ctx context.Context, job *store.EventJob) error { ctx, cancel := context.WithTimeout(ctx, 30*time.Second) defer cancel() + if _, err := s.store.MaintainTaskDigests(ctx, time.Now()); err != nil { + return err + } + queued, err := s.store.QueuedTaskDigests(ctx) + if err != nil { + return err + } due, err := s.store.DueTaskDigests(ctx, time.Now()) if err != nil { return err } - sent, uncertain := 0, 0 - for _, candidate := range due { + sent, uncertain, checked := 0, 0, 0 + deliver := func(claim store.TaskDigestClaim) error { + state, reason := s.deliverTaskDigest(ctx, claim) + if state == "sent" { + sent++ + } + if state == "uncertain" { + uncertain++ + } + checked++ + finish, stop := context.WithTimeout(context.Background(), 2*time.Second) + defer stop() + err := s.store.FinishTaskDigestReason(finish, claim, state, reason, time.Now()) + // A reclaimed generation cannot complete a newer attempt. + if errors.Is(err, store.ErrTaskConflict) { + return nil + } + return err + } + // Alternate automatic delivery and manual retries within the shared time + // budget, so a retry backlog cannot monopolize scheduled deliveries. + for i := 0; i < max(len(due), len(queued)); i++ { + for _, manual := range []bool{false, true} { + if ctx.Err() != nil { + break + } + var claim store.TaskDigestClaim + var e error + if manual { + if i >= len(queued) { + continue + } + claim, e = s.store.ClaimQueuedTaskDigest(ctx, queued[i], time.Now()) + } else { + if i >= len(due) { + continue + } + claim, e = s.store.ClaimTaskDigest(ctx, due[i], time.Now()) + } + if errors.Is(e, sql.ErrNoRows) { + continue + } + if e != nil { + return e + } + if e = deliver(claim); e != nil { + return e + } + } if ctx.Err() != nil { break } - claim, e := s.store.ClaimTaskDigest(ctx, candidate, time.Now()) - if errors.Is(e, sql.ErrNoRows) { - continue - } - if e != nil { - return e - } - state := "cancelled" - if s.systemExtensionEnabled(claim.Domain, "organizer.tasks") { - config, e := s.store.AuthProviderConfig(claim.Domain, "smtp") - if e == nil && config.Enabled { - items, next, e := s.store.ListTasks(ctx, claim.Domain, claim.Owner, store.TaskQuery{Kind: "task", View: "today", Today: claim.Day, Limit: 100}) - if e == nil { - var body strings.Builder - host, _ := s.store.GetDomainEffectiveHost(claim.Domain) - base := "" - if host != "" && !strings.ContainsAny(host, "/\\\r\n\t @") { - base = "https://" + host - } - fmt.Fprintf(&body, "Tasks / やることリスト — %s (%s)\n\n", claim.Day, claim.Timezone) - if len(items) == 0 { - body.WriteString("No tasks due or planned today. / 今日の対象タスクはありません。\n") - } - for _, item := range items { - fmt.Fprintf(&body, "- %s\n due/期限: %s | planned/予定: %s | estimate/見積: %d min\n %s/v/plan/task/%s\n", item.Title, item.DueOn, item.PlannedOn, item.Estimate, base, item.UUID) - } - if next != "" { - body.WriteString("\nFirst 100 items only. / 最初の100件です。続きはタスク画面で確認してください。\n") - } - // Check consent and current account email immediately before send. - if recipient, e := s.store.TaskDigestRecipient(ctx, claim); e == nil { - state = "uncertain" - if e = sendTaskDigestSMTP(ctx, config, recipient, claim.Day, body.String()); e == nil { - state = "sent" - sent++ - } else { - uncertain++ - } - } - } - } - } - // Persist delivery outcome even if the scheduler context was cancelled. - finish, stop := context.WithTimeout(context.Background(), 2*time.Second) - e = s.store.FinishTaskDigest(finish, claim, state) - stop() - if e != nil { - return e - } } - if len(due) > 0 { - s.addEventProgressLog(ctx, job, fmt.Sprintf("task digest checked=%d sent=%d uncertain=%d", len(due), sent, uncertain)) + if checked > 0 { + s.addEventProgressLog(ctx, job, fmt.Sprintf("task digest checked=%d sent=%d uncertain=%d", checked, sent, uncertain)) } return nil } + +func (s *Server) deliverTaskDigest(ctx context.Context, claim store.TaskDigestClaim) (string, string) { + if !s.systemExtensionEnabled(claim.Domain, "organizer.tasks") { + return "cancelled", "extension_disabled" + } + config, err := s.store.AuthProviderConfig(claim.Domain, "smtp") + if err != nil || !config.Enabled { + return "cancelled", "smtp_unavailable" + } + items, next, err := s.store.ListTasks(ctx, claim.Domain, claim.Owner, store.TaskQuery{Kind: "task", View: "today", Today: claim.Day, Limit: 100}) + if err != nil { + return "cancelled", "tasks_unavailable" + } + var body strings.Builder + host, _ := s.store.GetDomainEffectiveHost(claim.Domain) + base := "" + if host != "" && !strings.ContainsAny(host, "/\\\r\n\t @") { + base = "https://" + host + } + fmt.Fprintf(&body, "Tasks / やることリスト — %s (%s)\n\n", claim.Day, claim.Timezone) + if len(items) == 0 { + body.WriteString("No tasks due or planned today. / 今日の対象タスクはありません。\n") + } + for _, item := range items { + fmt.Fprintf(&body, "- %s\n due/期限: %s | planned/予定: %s | estimate/見積: %d min\n %s/v/plan/task/%s\n", item.Title, item.DueOn, item.PlannedOn, item.Estimate, base, item.UUID) + } + if next != "" { + body.WriteString("\nFirst 100 items only. / 最初の100件です。続きはタスク画面で確認してください。\n") + } + recipient, err := s.store.TaskDigestRecipient(ctx, claim) + if err != nil { + return "cancelled", "consent_changed" + } + if err = sendTaskDigestSMTP(ctx, config, recipient, claim.Day, body.String()); err != nil { + return "uncertain", "transport_uncertain" + } + return "sent", "" +} diff --git a/internal/server/task_digest_history.go b/internal/server/task_digest_history.go new file mode 100644 index 0000000..38d6dba --- /dev/null +++ b/internal/server/task_digest_history.go @@ -0,0 +1,82 @@ +package server + +import ( + "database/sql" + "errors" + "net/http" + "strconv" + "time" + + "pageswiki/internal/store" +) + +func (s *Server) handleTaskDigestHistory(w http.ResponseWriter, r *http.Request, actor string, active bool, parts []string) { + domain := s.domainUUIDForRequest(r) + if len(parts) == 1 && r.Method == "GET" { + limit := 50 + if raw := r.URL.Query().Get("limit"); raw != "" { + v, e := strconv.Atoi(raw) + if e != nil { + taskError(w, store.ErrTaskInvalid) + return + } + limit = v + } + result, err := s.store.TaskDigestHistory(r.Context(), domain, actor, r.URL.Query().Get("after"), limit, time.Now()) + if err != nil { + taskError(w, err) + return + } + writeEventJSON(w, 200, result) + return + } + if len(parts) == 2 && parts[1] == "retry" && r.Method == "POST" { + if !active { + taskError(w, store.ErrAccessDenied) + return + } + var input store.TaskDigestRetry + if !taskJSON(w, r, &input) { + return + } + if id, err := s.store.TaskDigestRetryReceipt(r.Context(), domain, actor, input); err == nil { + writeEventJSON(w, 202, map[string]string{"request_id": id}) + return + } else if !errors.Is(err, sql.ErrNoRows) { + taskError(w, err) + return + } + principal, err := s.store.PrincipalForSession(domain, s.authTokenFromRequest(r)) + if err != nil { + taskError(w, store.ErrAccessDenied) + return + } + if _, err = smtpMailbox(principal.Email); err != nil { + writeEventJSON(w, 422, map[string]string{"error": "email_required"}) + return + } + config, err := s.store.AuthProviderConfig(domain, "smtp") + if err != nil || !config.Enabled { + writeEventJSON(w, 422, map[string]string{"error": "smtp_unavailable"}) + return + } + id, err := s.store.QueueTaskDigestRetry(r.Context(), domain, actor, input, time.Now()) + if err != nil { + taskError(w, err) + return + } + writeEventJSON(w, 202, map[string]string{"request_id": id}) + return + } + if len(parts) == 1 { + w.Header().Set("Allow", "GET") + w.WriteHeader(405) + return + } + if len(parts) == 2 && parts[1] == "retry" { + w.Header().Set("Allow", "POST") + w.WriteHeader(405) + return + } + http.NotFound(w, r) +} diff --git a/internal/server/task_digest_history_test.go b/internal/server/task_digest_history_test.go new file mode 100644 index 0000000..51c4f2d --- /dev/null +++ b/internal/server/task_digest_history_test.go @@ -0,0 +1,447 @@ +package server + +import ( + "context" + "database/sql" + "encoding/json" + "errors" + "net/http" + "net/http/httptest" + "os" + "os/exec" + "strings" + "sync" + "testing" + "time" + + "github.com/google/uuid" + "pageswiki/internal/store" +) + +func digestHistoryFixture(t *testing.T) (*Server, string, string, string, time.Time, store.TaskDigestClaim) { + t.Helper() + s, token, domain, actor := taskFixture(t) + ctx := context.Background() + now := time.Now().UTC() + p := store.TaskPreferences{Complexity: 1, DigestEnabled: true, DigestTime: "00:00", Timezone: "UTC"} + if _, err := s.store.SaveTaskPreferences(ctx, domain, actor, p, now.Add(-24*time.Hour)); err != nil { + t.Fatal(err) + } + if _, err := s.store.DB.Exec(`UPDATE principals SET email='reader@example.test' WHERE uuid=?`, actor); err != nil { + t.Fatal(err) + } + if err := s.store.SetAuthProviderConfig(domain, store.AuthProviderConfig{Kind: "smtp", Enabled: true, SMTPAddress: "127.0.0.1:1", SMTPFrom: "wiki@example.test"}); err != nil { + t.Fatal(err) + } + c, err := s.store.ClaimTaskDigest(ctx, store.TaskDigestDue{Domain: domain, Owner: actor}, now) + if err != nil { + t.Fatal(err) + } + return s, token, domain, actor, now, c +} + +func TestTaskDigestHistoryRetryGenerationAndConsent(t *testing.T) { + s, token, domain, actor, now, c := digestHistoryFixture(t) + ctx := context.Background() + if recipient, err := s.store.TaskDigestRecipient(ctx, c); err != nil || recipient != "reader@example.test" { + t.Fatal(recipient, err) + } + input := store.TaskDigestRetry{RequestID: uuid.NewString(), Day: c.Day, ExpectedAttempt: c.AttemptUUID} + post := func(v store.TaskDigestRetry) int { + return taskRequest(s, token, "POST", "digest-history/retry", v, "").Code + } + if got := post(input); got != 412 { + t.Fatal("retried active delivery", got) + } + if err := s.store.FinishTaskDigest(ctx, c, "sent"); err != nil { + t.Fatal(err) + } + if got := post(input); got != 422 { + t.Fatal("missing duplicate acknowledgment", got) + } + input.DuplicateAcknowledged = true + var wg sync.WaitGroup + results := make(chan int, 2) + for range 2 { + wg.Add(1) + go func() { defer wg.Done(); results <- post(input) }() + } + wg.Wait() + close(results) + for code := range results { + if code != 202 { + t.Fatal("idempotent retry", code) + } + } + q, err := s.store.QueuedTaskDigests(ctx) + if err != nil || len(q) != 1 || q[0].AttemptUUID != input.RequestID { + t.Fatal(q, err) + } + if err = s.store.SetAuthProviderConfig(domain, store.AuthProviderConfig{Kind: "smtp", Enabled: false, SMTPAddress: "127.0.0.1:1", SMTPFrom: "wiki@example.test"}); err != nil { + t.Fatal(err) + } + if got := post(input); got != 202 { + t.Fatal("accepted receipt lost after SMTP disabled", got) + } + if err = s.store.SetAuthProviderConfig(domain, store.AuthProviderConfig{Kind: "smtp", Enabled: true, SMTPAddress: "127.0.0.1:1", SMTPFrom: "wiki@example.test"}); err != nil { + t.Fatal(err) + } + changed := input + changed.DuplicateAcknowledged = false + if got := post(changed); got != 412 { + t.Fatal("changed replay", got) + } + changed = input + changed.RequestID = uuid.NewString() + if got := post(changed); got != 412 { + t.Fatal("second queued request", got) + } + newClaim, err := s.store.ClaimQueuedTaskDigest(ctx, q[0], now) + if err != nil { + t.Fatal(err) + } + if _, err = s.store.ClaimQueuedTaskDigest(ctx, q[0], now); !errors.Is(err, sql.ErrNoRows) { + t.Fatal("double claim", err) + } + if err = s.store.FinishTaskDigest(ctx, c, "cancelled"); !errors.Is(err, store.ErrTaskConflict) { + t.Fatal("old generation finished new attempt", err) + } + if _, err = s.store.TaskDigestRecipient(ctx, c); err == nil { + t.Fatal("old generation can send") + } + if _, err = s.store.TaskDigestRecipient(ctx, newClaim); err != nil { + t.Fatal(err) + } + p, err := s.store.TaskPreferences(ctx, domain, actor) + if err != nil { + t.Fatal(err) + } + p.DigestEnabled = false + if _, err = s.store.SaveTaskPreferences(ctx, domain, actor, p, now); err != nil { + t.Fatal(err) + } + if _, err = s.store.TaskDigestRecipient(ctx, newClaim); err == nil { + t.Fatal("opt out ignored") + } + if err = s.store.FinishTaskDigestReason(ctx, newClaim, "cancelled", "consent_changed", now); err != nil { + t.Fatal(err) + } + w := taskRequest(s, token, "GET", "digest-history?limit=1", nil, "") + if w.Code != 200 { + t.Fatal(w.Code, w.Body) + } + var page store.TaskDigestHistory + if err = json.Unmarshal(w.Body.Bytes(), &page); err != nil || len(page.Items) != 1 || page.Next == "" || page.Retries != 1 || page.Current.UUID != input.RequestID { + t.Fatal(page, err) + } + w = taskRequest(s, token, "GET", "digest-history?limit=1&after="+page.Next, nil, "") + if w.Code != 200 { + t.Fatal(w.Code, w.Body) + } + for _, suffix := range []string{"?limit=101", "?after=bad", "?limit=NaN"} { + if w = taskRequest(s, token, "GET", "digest-history"+suffix, nil, ""); w.Code != 422 { + t.Fatal(suffix, w.Code) + } + } + if strings.Contains(w.Body.String(), "reader@example.test") { + t.Fatal("email in history") + } +} + +func TestTaskDigestHistoryQueueExpiryAndPermissions(t *testing.T) { + for _, change := range []string{"preference", "extension", "suspended", "tomorrow"} { + t.Run(change, func(t *testing.T) { + s, _, domain, actor, now, c := digestHistoryFixture(t) + ctx := context.Background() + if err := s.store.FinishTaskDigest(ctx, c, "cancelled"); err != nil { + t.Fatal(err) + } + input := store.TaskDigestRetry{RequestID: uuid.NewString(), Day: c.Day, ExpectedAttempt: c.AttemptUUID} + if _, err := s.store.QueueTaskDigestRetry(ctx, domain, actor, input, now); err != nil { + t.Fatal(err) + } + q, err := s.store.QueuedTaskDigests(ctx) + if err != nil { + t.Fatal(err) + } + switch change { + case "preference": + p, e := s.store.TaskPreferences(ctx, domain, actor) + if e != nil { + t.Fatal(e) + } + p.Estimate++ + _, err = s.store.SaveTaskPreferences(ctx, domain, actor, p, now) + case "extension": + err = s.store.SetConfigInDomain(domain, "system_extension_states", `{"organizer.tasks":false}`) + case "suspended": + _, err = s.store.DB.Exec(`UPDATE domain_memberships SET state='suspended' WHERE domain_uuid=? AND principal_uuid=?`, domain, actor) + case "tomorrow": + now = now.Add(24 * time.Hour) + } + if err != nil { + t.Fatal(err) + } + if _, err = s.store.ClaimQueuedTaskDigest(ctx, q[0], now); !errors.Is(err, sql.ErrNoRows) { + t.Fatal("cancelled queue returned live claim", err) + } + var state string + if err = s.store.DB.QueryRow(`SELECT state FROM organizer_digest_attempts WHERE uuid=?`, input.RequestID).Scan(&state); err != nil || state != "cancelled" { + t.Fatal(state, err) + } + }) + } + s, token, domain, actor, now, c := digestHistoryFixture(t) + ctx := context.Background() + if err := s.store.FinishTaskDigest(ctx, c, "cancelled"); err != nil { + t.Fatal(err) + } + other, err := s.store.CreatePasswordAccount(domain, "digest-other", "a long test password", "Other", "") + if err != nil { + t.Fatal(err) + } + otherToken, err := s.store.CreateAuthSession(domain, other.UUID) + if err != nil { + t.Fatal(err) + } + w := taskRequest(s, otherToken, "GET", "digest-history", nil, "") + if w.Code != 200 || !strings.Contains(w.Body.String(), `"items":[]`) { + t.Fatal("history privacy", w.Code, w.Body) + } + input := store.TaskDigestRetry{RequestID: uuid.NewString(), Day: c.Day, ExpectedAttempt: c.AttemptUUID} + if _, err = s.store.QueueTaskDigestRetry(ctx, domain, other.UUID, input, now); err == nil { + t.Fatal("retried other's mail") + } + if err = s.store.SetPrincipalState(domain, actor, "readonly"); err != nil { + t.Fatal(err) + } + token, err = s.store.CreateAuthSession(domain, actor) + if err != nil { + t.Fatal(err) + } + if w = taskRequest(s, token, "POST", "digest-history/retry", input, ""); w.Code != 403 { + t.Fatal(w.Code, w.Body) + } + if w = taskRequest(s, token, "GET", "digest-history", nil, ""); w.Code != 200 { + t.Fatal(w.Code, w.Body) + } + if w = taskRequest(s, "", "GET", "digest-history", nil, ""); w.Code == 200 { + t.Fatal("anonymous history") + } +} + +func TestTaskDigestHistoryRetentionAndStaleWorker(t *testing.T) { + s, _, domain, actor, now, c := digestHistoryFixture(t) + ctx := context.Background() + // Keep synthetic stale-worker time within the same date even near midnight. + now = time.Date(now.Year(), now.Month(), now.Day(), 12, 0, 0, 0, time.UTC) + if _, err := s.store.DB.Exec(`UPDATE organizer_digest_attempts SET updated_ms=? WHERE uuid=?`, now.UnixMilli(), c.AttemptUUID); err != nil { + t.Fatal(err) + } + if _, err := s.store.MaintainTaskDigests(ctx, now.Add(11*time.Minute)); err != nil { + t.Fatal(err) + } + page, err := s.store.TaskDigestHistory(ctx, domain, actor, "", 50, now) + if err != nil || page.Current.State != "uncertain" { + t.Fatal(page, err) + } + input := store.TaskDigestRetry{RequestID: uuid.NewString(), Day: c.Day, ExpectedAttempt: c.AttemptUUID, DuplicateAcknowledged: true} + if _, err = s.store.QueueTaskDigestRetry(ctx, domain, actor, input, now.Add(12*time.Minute)); err != nil { + t.Fatal(err) + } + q, err := s.store.QueuedTaskDigests(ctx) + if err != nil { + t.Fatal(err) + } + claim, err := s.store.ClaimQueuedTaskDigest(ctx, q[0], now.Add(12*time.Minute)) + if err != nil { + t.Fatal(err) + } + if err = s.store.FinishTaskDigest(ctx, c, "sent"); !errors.Is(err, store.ErrTaskConflict) { + t.Fatal("stale completion", err) + } + if err = s.store.FinishTaskDigestReason(ctx, claim, "sent", "", now.Add(12*time.Minute)); err != nil { + t.Fatal(err) + } + deleted, err := s.store.MaintainTaskDigests(ctx, now.Add(91*24*time.Hour)) + if err != nil || deleted != 2 { + t.Fatal("retention", deleted, err) + } + var reservations, receipts int + if err = s.store.DB.QueryRow(`SELECT count(*) FROM organizer_digest_deliveries WHERE domain_uuid=? AND owner_uuid=?`, domain, actor).Scan(&reservations); err != nil { + t.Fatal(err) + } + if err = s.store.DB.QueryRow(`SELECT count(*) FROM organizer_digest_requests WHERE domain_uuid=? AND owner_uuid=?`, domain, actor).Scan(&receipts); err != nil || reservations != 1 || receipts != 1 { + t.Fatal("deduplication lost", reservations, receipts, err) + } + // Even an old request replay after retention returns its receipt without requeueing. + if id, err := s.store.QueueTaskDigestRetry(ctx, domain, actor, input, now.Add(91*24*time.Hour)); err != nil || id != input.RequestID { + t.Fatal(id, err) + } + q, err = s.store.QueuedTaskDigests(ctx) + if err != nil || len(q) != 0 { + t.Fatal("retention resurrected mail", q, err) + } + if _, err = s.store.DB.Exec(`UPDATE organizer_task_preferences SET next_digest_ms=? WHERE domain_uuid=? AND owner_uuid=?`, now.Add(-time.Minute).UnixMilli(), domain, actor); err != nil { + t.Fatal(err) + } + if _, err = s.store.ClaimTaskDigest(ctx, store.TaskDigestDue{Domain: domain, Owner: actor}, now); !errors.Is(err, sql.ErrNoRows) { + t.Fatal("reservation lost", err) + } +} + +func TestTaskDigestHistorySMTPWorker(t *testing.T) { + s, _, domain, actor, now, c := digestHistoryFixture(t) + ctx := context.Background() + if err := s.store.FinishTaskDigest(ctx, c, "cancelled"); err != nil { + t.Fatal(err) + } + input := store.TaskDigestRetry{RequestID: uuid.NewString(), Day: c.Day, ExpectedAttempt: c.AttemptUUID} + if _, err := s.store.QueueTaskDigestRetry(ctx, domain, actor, input, now); err != nil { + t.Fatal(err) + } + address, _, done := fakeSMTP(t, "", false) + if err := s.store.SetAuthProviderConfig(domain, store.AuthProviderConfig{Kind: "smtp", Enabled: true, SMTPAddress: address, SMTPFrom: "wiki@example.test"}); err != nil { + t.Fatal(err) + } + if err := s.deliverTaskDigests(ctx, &store.EventJob{}); err != nil { + t.Fatal(err) + } + delivery := <-done + if !strings.Contains(delivery.message, "Subject: PagesWiki tasks "+c.Day) { + t.Fatal("message missing") + } + page, err := s.store.TaskDigestHistory(ctx, domain, actor, "", 50, now) + if err != nil || page.Current.State != "sent" || len(page.Items) != 2 { + t.Fatal(page, err) + } + if err := s.deliverTaskDigests(ctx, &store.EventJob{}); err != nil { + t.Fatal(err) + } +} + +func TestTaskDigestHistoryLimitsAndAtomicQueue(t *testing.T) { + s, _, domain, actor, now, c := digestHistoryFixture(t) + ctx := context.Background() + if err := s.store.FinishTaskDigest(ctx, c, "cancelled"); err != nil { + t.Fatal(err) + } + input := store.TaskDigestRetry{RequestID: uuid.NewString(), Day: c.Day, ExpectedAttempt: c.AttemptUUID} + if _, err := s.store.DB.Exec(`CREATE TRIGGER fail_digest_queue BEFORE INSERT ON organizer_digest_attempts WHEN NEW.kind='manual' BEGIN SELECT RAISE(ABORT,'test queue failure'); END`); err != nil { + t.Fatal(err) + } + if _, err := s.store.QueueTaskDigestRetry(ctx, domain, actor, input, now); err == nil { + t.Fatal("injected failure ignored") + } + var count int + if err := s.store.DB.QueryRow(`SELECT count(*) FROM organizer_digest_requests`).Scan(&count); err != nil || count != 0 { + t.Fatal("partial receipt", count, err) + } + if _, err := s.store.DB.Exec(`DROP TRIGGER fail_digest_queue`); err != nil { + t.Fatal(err) + } + for i := 0; i < 5; i++ { + input.RequestID = uuid.NewString() + if _, err := s.store.QueueTaskDigestRetry(ctx, domain, actor, input, now); err != nil { + t.Fatal(i, err) + } + q, err := s.store.QueuedTaskDigests(ctx) + if err != nil || len(q) != 1 { + t.Fatal(q, err) + } + claim, err := s.store.ClaimQueuedTaskDigest(ctx, q[0], now) + if err != nil { + t.Fatal(err) + } + if err = s.store.FinishTaskDigest(ctx, claim, "cancelled"); err != nil { + t.Fatal(err) + } + input.ExpectedAttempt = claim.AttemptUUID + } + input.RequestID = uuid.NewString() + if _, err := s.store.QueueTaskDigestRetry(ctx, domain, actor, input, now); !errors.Is(err, store.ErrTaskConflict) { + t.Fatal("retry cap", err) + } + input.Day = now.AddDate(0, 0, -1).Format("2006-01-02") + if _, err := s.store.QueueTaskDigestRetry(ctx, domain, actor, input, now); !errors.Is(err, store.ErrTaskInvalid) { + t.Fatal("past day accepted", err) + } + // A bounded retention pass leaves queued rows and durable guards untouched. + _, err := s.store.DB.Exec(`WITH RECURSIVE n(i) AS (VALUES(1) UNION ALL SELECT i+1 FROM n WHERE i<501) INSERT INTO organizer_digest_attempts SELECT 'old-'||i,'d','u','2000-01-01','scheduled','sent',1,'UTC','',1,1 FROM n`) + if err != nil { + t.Fatal(err) + } + deleted, err := s.store.MaintainTaskDigests(ctx, now) + if err != nil || deleted != 500 { + t.Fatal("unbounded retention", deleted, err) + } + if err = s.store.DB.QueryRow(`SELECT count(*) FROM organizer_digest_attempts WHERE uuid LIKE 'old-%'`).Scan(&count); err != nil || count != 1 { + t.Fatal(count, err) + } + var integrity string + if err = s.store.DB.QueryRow(`PRAGMA integrity_check`).Scan(&integrity); err != nil || integrity != "ok" { + t.Fatal(integrity, err) + } +} + +func TestTaskDigestHistoryChromium(t *testing.T) { + if os.Getenv("PAGESWIKI_BROWSER_TEST") != "1" { + t.Skip("opt-in Chromium") + } + s, token, domain, actor, now, c := digestHistoryFixture(t) + s.store.BackgroundJobsDisabled = true + s = New(s.store) + if err := s.store.FinishTaskDigest(context.Background(), c, "uncertain"); err != nil { + t.Fatal(err) + } + address, _, done := fakeSMTP(t, "", false) + if err := s.store.SetAuthProviderConfig(domain, store.AuthProviderConfig{Kind: "smtp", Enabled: true, SMTPAddress: address, SMTPFrom: "wiki@example.test"}); err != nil { + t.Fatal(err) + } + script, err := os.ReadFile("internal/server/testdata/task-digest-history.js") + if err != nil { + t.Fatal(err) + } + handler := s.handler() + server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + r.Host = "localhost" + r.Header.Set("Authorization", "Bearer "+token) + if r.URL.Path == "/fixture" { + w.Header().Set("Content-Type", "text/html; charset=utf-8") + _, _ = w.Write([]byte("")) + return + } + if r.URL.Path == "/fixture/tick" && r.Method == "POST" { + if e := s.deliverTaskDigests(r.Context(), &store.EventJob{}); e != nil { + http.Error(w, "worker failed", 500) + return + } + w.WriteHeader(204) + return + } + handler.ServeHTTP(w, r) + })) + defer server.Close() + ctx, cancel := context.WithTimeout(context.Background(), 55*time.Second) + defer cancel() + width := os.Getenv("DIGEST_HISTORY_WIDTH") + if width == "" { + width = "1440" + } + args := []string{"internal/server/testdata/vim-browser-smoke.mjs", server.URL + "/fixture", t.TempDir(), os.Getenv("DIGEST_HISTORY_SCREENSHOT"), width, "850"} + if out, err := exec.CommandContext(ctx, "node", args...).CombinedOutput(); err != nil { + t.Fatalf("browser: %v\n%s", err, out) + } + select { + case delivery := <-done: + if !strings.Contains(delivery.message, "Subject: PagesWiki tasks "+c.Day) { + t.Fatal("mail missing") + } + case <-ctx.Done(): + t.Fatal("SMTP not observed") + } + page, err := s.store.TaskDigestHistory(context.Background(), domain, actor, "", 50, now) + if err != nil || page.Retries != 1 || len(page.Items) != 2 || page.Current.State != "sent" { + t.Fatal(page, err) + } +} diff --git a/internal/server/task_productivity.go b/internal/server/task_productivity.go index e803c7a..215fb2b 100644 --- a/internal/server/task_productivity.go +++ b/internal/server/task_productivity.go @@ -301,11 +301,24 @@ func (s *Server) handleTaskProductivity(w http.ResponseWriter, r *http.Request, var input struct { store.TaskWork Action string `json:"action"` + Reason string `json:"reason"` + Start string `json:"start"` + End string `json:"end"` } if !taskJSON(w, r, &input) { return } - v, err := s.store.ChangeTaskWork(r.Context(), domain, actor, input.Action, input.TaskWork, time.Now()) + if input.Action == "correct" && (input.Start != "" || input.End != "") { + a, e1 := parseWorkInstant(input.Start, s.getLocation(domain)) + b, e2 := parseWorkInstant(input.End, s.getLocation(domain)) + if e1 != nil || e2 != nil { + taskError(w, store.ErrTaskInvalid) + return + } + input.StartMS = a.UnixMilli() + input.EndMS = b.UnixMilli() + } + v, err := s.store.ChangeTaskWork(r.Context(), domain, actor, input.Action, input.TaskWork, time.Now(), input.Reason) if err != nil { taskError(w, err) return diff --git a/internal/server/task_productivity_test.go b/internal/server/task_productivity_test.go index a01fc3d..7fabe70 100644 --- a/internal/server/task_productivity_test.go +++ b/internal/server/task_productivity_test.go @@ -222,6 +222,9 @@ func TestTaskWorkReportSplitsMidnightAndCompletion(t *testing.T) { if err != nil || report.Days[0].Points != 7 || report.Days[0].Completed != 1 { t.Fatal("points", report, err) } + if len(report.Projects) != 1 || report.Projects[0].UUID != "" || report.Projects[0].Points != 7 || report.Projects[0].Completed != 1 { + t.Fatal("unassigned project totals", report.Projects) + } item.Status = "todo" if _, err = s.store.SaveTask(ctx, domain, actor, item, item.Version); err != nil { t.Fatal(err) diff --git a/internal/server/task_work_history.go b/internal/server/task_work_history.go new file mode 100644 index 0000000..45a19a6 --- /dev/null +++ b/internal/server/task_work_history.go @@ -0,0 +1,95 @@ +package server + +import ( + "net/http" + "pageswiki/internal/store" + "strconv" + "time" +) + +func parseWorkInstant(raw string, loc *time.Location) (time.Time, error) { + if v, err := time.Parse(time.RFC3339Nano, raw); err == nil { + return v, nil + } + for _, format := range []string{"2006-01-02T15:04:05", "2006-01-02T15:04"} { + v, err := time.ParseInLocation(format, raw, loc) + if err != nil || v.Format(format) != raw { + continue + } + // A repeated wall time needs an explicit offset. Do not silently choose + // the earlier/later occurrence when a browser datetime-local cannot express it. + for _, delta := range []time.Duration{-24 * time.Hour, -2 * time.Hour, -time.Hour, -30 * time.Minute, 30 * time.Minute, time.Hour, 2 * time.Hour, 24 * time.Hour} { + if v.Add(delta).In(loc).Format(format) == raw { + return time.Time{}, store.ErrTaskInvalid + } + } + return v, nil + } + return time.Time{}, store.ErrTaskInvalid +} + +func (s *Server) handleTaskWorkHistory(w http.ResponseWriter, r *http.Request, actor string, parts []string) { + if r.Method != "GET" { + w.Header().Set("Allow", "GET") + w.WriteHeader(405) + return + } + domain := s.domainUUIDForRequest(r) + if len(parts) == 2 && parts[1] != "" { + var before int64 + if raw := r.URL.Query().Get("before"); raw != "" { + var err error + before, err = strconv.ParseInt(raw, 10, 64) + if err != nil || before < 0 { + taskError(w, store.ErrTaskInvalid) + return + } + } + items, err := s.store.TaskWorkRevisions(r.Context(), domain, actor, parts[1], before) + if err != nil { + taskError(w, err) + return + } + var next int64 + if len(items) == 100 { + next = items[len(items)-1].Item.Version + } + writeEventJSON(w, 200, map[string]any{"items": items, "next": next}) + return + } + if len(parts) != 1 { + http.NotFound(w, r) + return + } + now := time.Now().In(s.getLocation(domain)) + end := time.Date(now.Year(), now.Month(), now.Day()+1, 0, 0, 0, 0, now.Location()) + start := end.AddDate(0, 0, -30) + for _, v := range []struct { + key string + target *time.Time + }{{"from", &start}, {"to", &end}} { + if raw := r.URL.Query().Get(v.key); raw != "" { + date, err := time.ParseInLocation("2006-01-02", raw, now.Location()) + if err != nil || date.Format("2006-01-02") != raw { + taskError(w, store.ErrTaskInvalid) + return + } + *v.target = date + } + } + limit := 50 + if raw := r.URL.Query().Get("limit"); raw != "" { + var err error + limit, err = strconv.Atoi(raw) + if err != nil { + taskError(w, store.ErrTaskInvalid) + return + } + } + result, err := s.store.TaskWorkHistory(r.Context(), domain, actor, start, end, r.URL.Query().Get("after"), limit) + if err != nil { + taskError(w, err) + return + } + writeEventJSON(w, 200, map[string]any{"items": result.Items, "next": result.Next, "from": start.Format("2006-01-02"), "to": end.Format("2006-01-02"), "timezone": now.Location().String()}) +} diff --git a/internal/server/task_work_history_test.go b/internal/server/task_work_history_test.go new file mode 100644 index 0000000..81bb473 --- /dev/null +++ b/internal/server/task_work_history_test.go @@ -0,0 +1,343 @@ +package server + +import ( + "context" + "encoding/json" + "errors" + "net/http" + "net/http/httptest" + "net/url" + "os" + "os/exec" + "strings" + "sync" + "testing" + "time" + + "github.com/google/uuid" + "pageswiki/internal/store" +) + +func recordedWork(t *testing.T, s *Server, domain, actor, task string, start time.Time) store.TaskWork { + t.Helper() + v, err := s.store.ChangeTaskWork(context.Background(), domain, actor, "start", store.TaskWork{UUID: uuid.NewString(), TaskUUID: task, CancelledMS: 99}, start) + if err != nil || v.CancelledMS != 0 { + t.Fatal(v, err) + } + v, err = s.store.ChangeTaskWork(context.Background(), domain, actor, "stop", v, start.Add(time.Hour)) + if err != nil { + t.Fatal(err) + } + return v +} + +func TestWorkHistoryCorrectionCancellationAndReports(t *testing.T) { + s, token, domain, actor := taskFixture(t) + ctx := context.Background() + project, err := s.store.SaveTask(ctx, domain, actor, newTaskRecord("project", "Project A"), 0) + if err != nil { + t.Fatal(err) + } + item := newTaskRecord("task", "Audited work") + item.ProjectUUID = project.UUID + item, err = s.store.SaveTask(ctx, domain, actor, item, 0) + if err != nil { + t.Fatal(err) + } + start := time.Date(2026, 1, 2, 12, 0, 0, 0, time.UTC) + first := recordedWork(t, s, domain, actor, item.UUID, start) + second := recordedWork(t, s, domain, actor, item.UUID, start.Add(2*time.Hour)) + post := func(v store.TaskWork, action, reason string) int { + return taskRequest(s, token, "POST", "work", map[string]any{"uuid": v.UUID, "task_uuid": v.TaskUUID, "version": v.Version, "action": action, "reason": reason, "start_ms": v.StartMS, "end_ms": v.EndMS}, "").Code + } + if got := post(first, "correct", ""); got != 422 { + t.Fatal("missing reason", got) + } + bad := first + bad.EndMS = second.EndMS + if got := post(bad, "correct", "overlap"); got != 412 { + t.Fatal("overlap", got) + } + bad = first + bad.EndMS = bad.StartMS + if got := post(bad, "correct", "empty"); got != 422 { + t.Fatal("empty interval", got) + } + first.EndMS = start.Add(2 * time.Hour).UnixMilli() // adjacency is valid + if got := post(first, "correct", "Finished later"); got != 200 { + t.Fatal("correct", got) + } + if got := post(first, "correct", "stale mutation"); got != 412 { + t.Fatal("stale version", got) + } + first.Version++ + report, err := s.store.TaskReport(ctx, domain, actor, start.Add(-time.Hour), start.Add(5*time.Hour), time.Now()) + if err != nil || len(report.Projects) != 1 || report.Projects[0].Title != "Project A" || report.Projects[0].WorkMS != 3*3600000 { + t.Fatal(report, err) + } + if got := post(first, "cancel", "Duplicate recording"); got != 200 { + t.Fatal("cancel", got) + } + report, err = s.store.TaskReport(ctx, domain, actor, start.Add(-time.Hour), start.Add(5*time.Hour), time.Now()) + if err != nil || report.Projects[0].WorkMS != 3600000 { + t.Fatal("cancelled counted", report, err) + } + audit, err := s.store.TaskWorkRevisions(ctx, domain, actor, first.UUID, 0) + if err != nil || len(audit) != 4 || audit[0].Action != "cancel" || audit[1].Action != "correct" || audit[2].Action != "stop" || audit[3].Action != "start" || audit[2].Item.EndMS != start.Add(time.Hour).UnixMilli() { + t.Fatal(audit, err) + } + page, err := s.store.TaskWorkHistory(ctx, domain, actor, start.Add(-time.Hour), start.Add(5*time.Hour), "", 1) + if err != nil || len(page.Items) != 1 || page.Items[0].UUID != second.UUID || page.Next == "" { + t.Fatal(page, err) + } + page, err = s.store.TaskWorkHistory(ctx, domain, actor, start.Add(-time.Hour), start.Add(5*time.Hour), page.Next, 1) + if err != nil || len(page.Items) != 1 || page.Items[0].UUID != first.UUID || page.Items[0].CancelledMS == 0 || page.Next != "" { + t.Fatal(page, err) + } + for _, query := range []string{"limit=101", "after=bad", "from=2026-01-02&to=2026-01-01", "from=2020-01-01&to=2026-01-01"} { + if w := taskRequest(s, token, "GET", "work-history?"+query, nil, ""); w.Code != 422 { + t.Fatal(query, w.Code, w.Body) + } + } + if w := taskRequest(s, token, "GET", "work-history/"+first.UUID+"?before=3", nil, ""); w.Code != 200 { + t.Fatal(w.Code, w.Body) + } + if w := taskRequest(s, token, "POST", "work-history", nil, ""); w.Code != 405 { + t.Fatal(w.Code, w.Body) + } + stranger, err := s.store.CreatePasswordAccount(domain, "history-stranger", "a long test password", "Stranger", "") + if err != nil { + t.Fatal(err) + } + strangerToken, err := s.store.CreateAuthSession(domain, stranger.UUID) + if err != nil { + t.Fatal(err) + } + if w := taskRequest(s, strangerToken, "GET", "work-history/"+first.UUID, nil, ""); w.Code != 404 { + t.Fatal("history leaked", w.Code, w.Body) + } + if w := taskRequest(s, strangerToken, "GET", "work-history?from=2026-01-01&to=2026-01-04", nil, ""); w.Code != 200 || !strings.Contains(w.Body.String(), `"items":[]`) { + t.Fatal("list leaked", w.Code, w.Body) + } + if err = s.store.SetPrincipalState(domain, actor, "readonly"); err != nil { + t.Fatal(err) + } + token, err = s.store.CreateAuthSession(domain, actor) + if err != nil { + t.Fatal(err) + } + if got := post(second, "cancel", "No permission"); got != 403 { + t.Fatal("readonly mutation", got) + } + if err = s.store.SetConfigInDomain(domain, "system_extension_states", `{"organizer.tasks":false}`); err != nil { + t.Fatal(err) + } + if w := taskRequest(s, token, "GET", "work-history", nil, ""); w.Code != 404 { + t.Fatal("disabled extension", w.Code) + } +} + +func TestWorkInstantTimezone(t *testing.T) { + for _, tc := range []struct { + zone, input string + valid bool + }{{"Asia/Tokyo", "2026-01-02T12:30", true}, {"America/New_York", "2026-03-08T02:30", false}, {"America/New_York", "2026-11-01T01:30", false}, {"America/New_York", "2026-11-01T01:30:00-04:00", true}, {"Australia/Lord_Howe", "2026-04-05T01:45", false}, {"UTC", "bad", false}} { + loc, err := time.LoadLocation(tc.zone) + if err != nil { + t.Fatal(err) + } + _, err = parseWorkInstant(tc.input, loc) + if (err == nil) != tc.valid { + t.Fatal(tc, err) + } + } +} + +func TestWorkHistoryFencingAndAtomicAudit(t *testing.T) { + s, _, domain, actor := taskFixture(t) + ctx := context.Background() + item, err := s.store.SaveTask(ctx, domain, actor, newTaskRecord("task", "Fenced work"), 0) + if err != nil { + t.Fatal(err) + } + start := time.Now().Add(-10 * time.Hour) + v := recordedWork(t, s, domain, actor, item.UUID, start) + // Simulate a pre-upgrade session: capture its old value, never invent older versions. + if _, err = s.store.DB.Exec(`DELETE FROM organizer_work_revisions WHERE work_uuid=?`, v.UUID); err != nil { + t.Fatal(err) + } + if _, err = s.store.DB.Exec(`CREATE TRIGGER fail_work_audit BEFORE INSERT ON organizer_work_revisions WHEN NEW.action='correct' BEGIN SELECT RAISE(ABORT,'test audit unavailable'); END`); err != nil { + t.Fatal(err) + } + edit := v + edit.EndMS += 60000 + if _, err = s.store.ChangeTaskWork(ctx, domain, actor, "correct", edit, time.Now(), "must rollback"); err == nil { + t.Fatal("audit failure accepted") + } + var version int64 + if err = s.store.DB.QueryRow(`SELECT version FROM organizer_work_sessions WHERE uuid=?`, v.UUID).Scan(&version); err != nil || version != 2 { + t.Fatal("partial mutation", version, err) + } + if _, err = s.store.DB.Exec(`DROP TRIGGER fail_work_audit`); err != nil { + t.Fatal(err) + } + // Two concurrent corrections must not overwrite one another. + var wg sync.WaitGroup + results := make(chan error, 2) + for range 2 { + wg.Add(1) + go func() { + defer wg.Done() + _, e := s.store.ChangeTaskWork(ctx, domain, actor, "correct", edit, time.Now(), "racing correction") + results <- e + }() + } + wg.Wait() + close(results) + wins, conflicts := 0, 0 + for err := range results { + if err == nil { + wins++ + } else if errors.Is(err, store.ErrTaskConflict) { + conflicts++ + } else { + t.Fatal(err) + } + } + if wins != 1 || conflicts != 1 { + t.Fatal(wins, conflicts) + } + history, err := s.store.TaskWorkRevisions(ctx, domain, actor, v.UUID, 0) + if err != nil || len(history) != 2 || history[1].Action != "baseline" || history[1].Item.EndMS != v.EndMS { + t.Fatal(history, err) + } + // Cross-Domain intervals belong to the same person, but never appear in this list. + d, err := s.store.GetDomainByUUID(domain) + if err != nil { + t.Fatal(err) + } + if err = s.store.CreateDomain(d.CampusUUID, "work-other", "Other", "work-other", "local", "", "", true); err != nil { + t.Fatal(err) + } + domains, err := s.store.ListDomains() + if err != nil { + t.Fatal(err) + } + other := "" + for _, d := range domains { + if d.Name == "work-other" { + other = d.UUID + } + } + if other == "" { + t.Fatal("missing domain") + } + if _, err = s.store.DB.Exec(`INSERT OR IGNORE INTO domain_memberships(uuid,domain_uuid,principal_uuid,state,created_at_ms) VALUES(?,?,?,'active',0)`, uuid.NewString(), other, actor); err != nil { + t.Fatal(err) + } + otherTask, err := s.store.SaveTask(ctx, other, actor, newTaskRecord("task", "Private other work"), 0) + if err != nil { + t.Fatal(err) + } + foreign := recordedWork(t, s, other, actor, otherTask.UUID, start.Add(2*time.Hour)) + edit = history[0].Item + edit.EndMS = foreign.EndMS + if _, err = s.store.ChangeTaskWork(ctx, domain, actor, "correct", edit, time.Now(), "overlaps other domain"); !errors.Is(err, store.ErrTaskConflict) { + t.Fatal(err) + } + if _, err = s.store.TaskWorkRevisions(ctx, domain, actor, foreign.UUID, 0); err == nil { + t.Fatal("cross-domain audit leaked") + } + page, err := s.store.TaskWorkHistory(ctx, domain, actor, start.Add(-time.Hour), time.Now(), "", 50) + if err != nil || len(page.Items) != 1 { + t.Fatal(page, err) + } + active, err := s.store.ChangeTaskWork(ctx, domain, actor, "start", store.TaskWork{UUID: uuid.NewString(), TaskUUID: item.UUID}, start.Add(5*time.Hour)) + if err != nil { + t.Fatal(err) + } + for _, action := range []string{"correct", "cancel"} { + if _, err = s.store.ChangeTaskWork(ctx, domain, actor, action, active, time.Now(), "active recording"); !errors.Is(err, store.ErrTaskConflict) { + t.Fatal(action, err) + } + } + if _, err = s.store.DB.Exec(`UPDATE domain_memberships SET state='suspended' WHERE domain_uuid=? AND principal_uuid=?`, domain, actor); err != nil { + t.Fatal(err) + } + if _, err = s.store.ChangeTaskWork(ctx, domain, actor, "cancel", history[0].Item, time.Now(), "revoked"); !errors.Is(err, store.ErrAccessDenied) { + t.Fatal("revocation not fenced", err) + } +} + +func TestWorkHistoryChromium(t *testing.T) { + if os.Getenv("PAGESWIKI_BROWSER_TEST") != "1" { + t.Skip("opt-in Chromium") + } + s, token, domain, actor := taskFixture(t) + s.store.BackgroundJobsDisabled = true + s = New(s.store) + item, err := s.store.SaveTask(context.Background(), domain, actor, newTaskRecord("task", "Browser work record"), 0) + if err != nil { + t.Fatal(err) + } + v := recordedWork(t, s, domain, actor, item.UUID, time.Now().Add(-3*time.Hour)) + script, err := os.ReadFile("internal/server/testdata/task-work-history.js") + if err != nil { + t.Fatal(err) + } + handler := s.handler() + server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + r.Host = "localhost" + r.Header.Set("Authorization", "Bearer "+token) + if r.URL.Path == "/fixture" { + w.Header().Set("Content-Type", "text/html; charset=utf-8") + _, _ = w.Write([]byte("")) + return + } + handler.ServeHTTP(w, r) + })) + defer server.Close() + ctx, cancel := context.WithTimeout(context.Background(), 55*time.Second) + defer cancel() + width := os.Getenv("WORK_HISTORY_WIDTH") + if width == "" { + width = "1440" + } + args := []string{"internal/server/testdata/vim-browser-smoke.mjs", server.URL + "/fixture", t.TempDir(), os.Getenv("WORK_HISTORY_SCREENSHOT"), width, "850"} + if out, err := exec.CommandContext(ctx, "node", args...).CombinedOutput(); err != nil { + t.Fatalf("browser: %v\n%s", err, out) + } + history, err := s.store.TaskWorkRevisions(context.Background(), domain, actor, v.UUID, 0) + if err != nil || len(history) != 4 || history[0].Action != "cancel" || history[1].Action != "correct" { + t.Fatal(history, err) + } +} + +func TestWorkHistoryLocalTimestampAPI(t *testing.T) { + s, token, domain, actor := taskFixture(t) + ctx := context.Background() + item, err := s.store.SaveTask(ctx, domain, actor, newTaskRecord("task", "Timestamp"), 0) + if err != nil { + t.Fatal(err) + } + start := time.Date(2026, 1, 2, 12, 0, 0, 123000000, time.UTC) + v := recordedWork(t, s, domain, actor, item.UUID, start) + input := map[string]any{"uuid": v.UUID, "version": v.Version, "action": "correct", "reason": "API timestamp", "start": start.Format(time.RFC3339Nano), "end": start.Add(90 * time.Minute).Format(time.RFC3339Nano)} + w := taskRequest(s, token, "POST", "work", input, "") + if w.Code != 200 { + t.Fatal(w.Code, w.Body) + } + var result struct { + Item store.TaskWork `json:"item"` + } + if err = json.Unmarshal(w.Body.Bytes(), &result); err != nil { + t.Fatal(err) + } + page, err := s.store.TaskWorkHistory(ctx, domain, actor, start.Add(-time.Hour), start.Add(3*time.Hour), "", 50) + if err != nil || page.Items[0].StartMS != start.UnixMilli() { + t.Fatal(page, err) + } + if w = taskRequest(s, token, "GET", "work-history?"+url.Values{"from": {"2026-01-02"}, "to": {"2026-01-03"}}.Encode(), nil, ""); w.Code != 200 { + t.Fatal(w.Code, w.Body) + } +} diff --git a/internal/server/tasks_handler.go b/internal/server/tasks_handler.go index 7a7e95f..9ef735a 100644 --- a/internal/server/tasks_handler.go +++ b/internal/server/tasks_handler.go @@ -98,6 +98,10 @@ func (s *Server) handleTaskPage(w http.ResponseWriter, r *http.Request) { return } domain := s.domainUUIDForRequest(r) + if r.URL.Path == "/v/plan/tasks/work" { + s.renderWithContext(w, r, "task_work_history.gohtml", map[string]any{"TaskWritable": active, "Timezone": s.getTimezoneName(domain)}) + return + } if r.URL.Path == "/v/plan/tasks/report" || r.URL.Path == "/v/plan/tasks/settings" { s.handleTaskProductivityPage(w, r, active) return @@ -212,6 +216,14 @@ func (s *Server) handleTasksAPI(w http.ResponseWriter, r *http.Request) { r = r.WithContext(ctx) domain := s.domainUUIDForRequest(r) parts := strings.Split(strings.TrimPrefix(r.URL.Path, tasksAPI), "/") + if parts[0] == "digest-history" { + s.handleTaskDigestHistory(w, r, actor, active, parts) + return + } + if parts[0] == "work-history" { + s.handleTaskWorkHistory(w, r, actor, parts) + return + } if len(parts) == 1 && (parts[0] == "dashboard" || parts[0] == "progress" || parts[0] == "calendar-capture" || parts[0] == "capture" || parts[0] == "preferences" || parts[0] == "work" || parts[0] == "report") { s.handleTaskProductivity(w, r, actor, active, parts[0]) return diff --git a/internal/server/testdata/task-digest-history.js b/internal/server/testdata/task-digest-history.js new file mode 100644 index 0000000..88b2ee4 --- /dev/null +++ b/internal/server/testdata/task-digest-history.js @@ -0,0 +1,28 @@ +(async()=>{ + const assert=(ok,msg)=>{if(!ok)throw Error(msg);},delay=ms=>new Promise(r=>setTimeout(r,ms)); + const wait=async check=>{for(let n=0;n<240;n++){if(check())return;await delay(25);}throw Error('Timed out: '+check);}; + const frame=document.createElement('iframe');frame.style='display:block;width:100%;height:100vh;border:0';document.body.append(frame); + try{ + await new Promise(resolve=>{frame.onload=resolve;frame.src='/-/sys/config?panel=organizer';}); + const w=frame.contentWindow,d=frame.contentDocument;await wait(()=>d.querySelector('#task-digest-history details')); + const root=d.getElementById('task-digest-history'),details=root.querySelector('details'); + assert(!details.open,'History not lazy');assert(!w.performance.getEntriesByType('resource').some(x=>x.name.includes('/digest-history')),'History eagerly fetched'); + details.open=true;await wait(()=>root.querySelector('.digest-retry form')); + const form=root.querySelector('.digest-retry form'),ack=form.querySelector('input'); + assert(ack.required&&!ack.checked,'Uncertain delivery must require confirmation');assert(!form.checkValidity(),'Unchecked acknowledgment valid');ack.checked=true; + const original=w.fetch,requests=[];let lose=true; + w.fetch=async(url,options)=>{if(String(url).endsWith('/digest-history/retry')){requests.push(JSON.parse(options.body));const response=await original(url,options);if(lose){lose=false;await response.text();throw new TypeError('Simulated lost response');}return response;}return original(url,options);}; + form.requestSubmit();await wait(()=>root.querySelector('[role=status]').textContent&&!form.querySelector('button').disabled); + assert(root.contains(form),'Lost response removed retry controls');form.requestSubmit(); + await wait(()=>!root.querySelector('.digest-retry form')&&!root.querySelector('.productivity-controls button').disabled); + assert(requests.length===2&&requests[0].request_id===requests[1].request_id,'Retry generated a second request ID'); + assert(root.querySelectorAll('tbody tr').length===2,'Duplicate attempt created'); + const tick=await fetch('/fixture/tick',{method:'POST'});assert(tick.ok,'Worker failed'); + root.querySelector('.productivity-controls button').click();await wait(()=>root.querySelector('.digest-retry form')); + assert(root.querySelector('.digest-retry input').required,'Sent retry must require confirmation'); + assert(root.textContent.includes('メールサーバー受付済み')||root.textContent.includes('Accepted by mail server'),'Sent status missing'); + assert(!root.textContent.includes('reader@example.test'),'Recipient leaked in history'); + assert(d.documentElement.scrollWidth<=w.innerWidth,'Settings overflow viewport'); + details.scrollIntoView({block:'start'});document.body.dataset.vimReady='1'; + }catch(error){const out=document.createElement('pre');out.id='error';out.textContent=error.stack;document.body.append(out);} +})(); diff --git a/internal/server/testdata/task-work-history.js b/internal/server/testdata/task-work-history.js new file mode 100644 index 0000000..3080749 --- /dev/null +++ b/internal/server/testdata/task-work-history.js @@ -0,0 +1,34 @@ +(async()=>{ + const assert=(ok,msg)=>{if(!ok)throw Error(msg);},delay=ms=>new Promise(r=>setTimeout(r,ms)); + const wait=async check=>{for(let n=0;n<200;n++){if(check())return;await delay(25);}throw Error('Timed out: '+check);}; + const frame=document.createElement('iframe');frame.style='display:block;width:100%;height:100vh;border:0';document.body.append(frame); + try{ + await new Promise(resolve=>{frame.onload=resolve;frame.src='/v/plan/dashboard';}); + await wait(()=>frame.contentDocument.querySelector('.productivity-table tbody tr')); + const reportTable=frame.contentDocument.querySelector('.productivity-table'); + assert(reportTable.querySelectorAll('thead th').length===4,'Project aggregate table missing'); + assert(reportTable.querySelector('tbody tr').lastElementChild.textContent==='1.00','Project duration incorrect'); + const historyLink=frame.contentDocument.querySelector('a[href="/v/plan/tasks/work"]');assert(historyLink,'Dashboard history link missing'); + await new Promise(resolve=>{frame.onload=resolve;historyLink.click();}); + const w=frame.contentWindow,d=frame.contentDocument; + await wait(()=>d.querySelector('.work-history-table tbody button')); + assert(d.documentElement.scrollWidth<=w.innerWidth,'History overflows viewport'); + d.querySelector('.work-history-table tbody button').click(); + let form=d.querySelector('.work-history-edit');assert(form,'Inline correction missing'); + const inputs=form.querySelectorAll('input');inputs[2].value='Browser correction'; + form.requestSubmit();await wait(()=>!d.querySelector('.work-history-edit')&&!d.getElementById('work-history-list').inert); + d.querySelector('#work-history-list details').open=true;await wait(()=>d.querySelector('#work-history-list details strong')); + assert(d.querySelector('#work-history-list details').textContent.includes('Browser correction'),'Audit missing'); + const originalFetch=w.fetch;w.fetch=async(url,options)=>options?.method==='POST'?new w.Response(JSON.stringify({error:'conflict'}),{status:412}):originalFetch(url,options); + d.querySelector('.work-history-table tbody button').click();form=d.querySelector('.work-history-edit');form.querySelector('input[type=text]').value='Retain my input';form.requestSubmit(); + await wait(()=>form.querySelector('[role=status]').textContent);assert(form.querySelector('input[type=text]').value==='Retain my input','Conflict discarded input'); + w.fetch=originalFetch;w.confirm=()=>true;form.querySelector('button[type=button]').click(); + d.querySelectorAll('.work-history-table tbody tr:first-child button')[1].click();form=d.querySelector('.work-history-edit');form.querySelector('input').value='Browser cancellation';form.requestSubmit();await wait(()=>!d.querySelector('.work-history-edit')&&!d.getElementById('work-history-list').inert); + assert(!d.querySelector('.work-history-table tbody tr:first-child button'),'Cancelled work remains editable'); + d.querySelector('#work-history-list details').open=true;await wait(()=>d.querySelector('#work-history-list details strong')); + assert(d.querySelector('#work-history-list details').textContent.includes('Browser cancellation'),'Cancellation audit missing'); + const report=await (await fetch('/_/api/v1/extension/organizer.tasks/report')).json();assert(report.days.every(day=>day.work_ms===0),'Cancelled time remains in report'); + assert(d.documentElement.scrollWidth<=w.innerWidth,'Expanded history overflows viewport'); + document.body.dataset.vimReady='1'; + }catch(error){const out=document.createElement('pre');out.id='error';out.textContent=error.stack;document.body.append(out);} +})(); diff --git a/internal/store/schema_modules_test.go b/internal/store/schema_modules_test.go index 299e4d9..4027336 100644 --- a/internal/store/schema_modules_test.go +++ b/internal/store/schema_modules_test.go @@ -110,6 +110,88 @@ func TestDashboardUpgradePreservesTaskPreferences(t *testing.T) { } } +func TestWorkHistoryUpgradePreservesLegacySessions(t *testing.T) { + st := newSchemaTestStore(t) + if err := db.ApplySQLiteMigrations(context.Background(), st.DB, "task-productivity", taskProductivityMigrations[:2]); err != nil { + t.Fatal(err) + } + if _, err := st.DB.Exec(`INSERT INTO organizer_work_sessions VALUES('w','d','u','t',100,200,2)`); err != nil { + t.Fatal(err) + } + for range 2 { + if err := st.ensureSchemaComponent("task-productivity"); err != nil { + t.Fatal(err) + } + } + var start, end, version, cancelled int64 + if err := st.DB.QueryRow(`SELECT start_ms,end_ms,version,cancelled_ms FROM organizer_work_sessions WHERE uuid='w'`).Scan(&start, &end, &version, &cancelled); err != nil || start != 100 || end != 200 || version != 2 || cancelled != 0 { + t.Fatal(start, end, version, cancelled, err) + } + var count int + if err := st.DB.QueryRow(`SELECT count(*) FROM organizer_work_revisions`).Scan(&count); err != nil || count != 0 { + t.Fatal("invented history", count, err) + } +} + +func TestDigestHistoryUpgradePreservesReservations(t *testing.T) { + st := newSchemaTestStore(t) + ctx := context.Background() + if err := db.ApplySQLiteMigrations(ctx, st.DB, "task-productivity", taskProductivityMigrations[:3]); err != nil { + t.Fatal(err) + } + for i, state := range []string{"sent", "sending", "uncertain", "cancelled"} { + if _, err := st.DB.Exec(`INSERT INTO organizer_digest_deliveries VALUES(?,?,?, ?,?)`, "d", state, "2026-11-01", state, 100+i); err != nil { + t.Fatal(err) + } + } + for range 2 { + if err := st.ensureSchemaComponent("task-productivity"); err != nil { + t.Fatal(err) + } + } + var count int + if err := st.DB.QueryRow(`SELECT count(*) FROM organizer_digest_deliveries d JOIN organizer_digest_attempts a ON a.uuid=d.attempt_uuid AND a.domain_uuid=d.domain_uuid AND a.owner_uuid=d.owner_uuid AND a.day=d.day AND a.state=d.state AND a.updated_ms=d.updated_ms WHERE a.kind='legacy' AND a.preference_version=0`).Scan(&count); err != nil || count != 4 { + t.Fatal("reservation migration", count, err) + } + var integrity string + if err := st.DB.QueryRow(`PRAGMA integrity_check`).Scan(&integrity); err != nil || integrity != "ok" { + t.Fatal(integrity, err) + } +} + +func TestDigestHistoryMigrationRollback(t *testing.T) { + st := newSchemaTestStore(t) + ctx := context.Background() + if err := db.ApplySQLiteMigrations(ctx, st.DB, "task-productivity", taskProductivityMigrations[:3]); err != nil { + t.Fatal(err) + } + if _, err := st.DB.Exec(`INSERT INTO organizer_digest_deliveries VALUES('d','u','2026-11-01','sent',123)`); err != nil { + t.Fatal(err) + } + steps := append([]db.SQLMigration(nil), taskProductivityMigrations...) + steps[3].Statements = append(append([]string(nil), steps[3].Statements...), `INVALID MIGRATION STATEMENT`) + if err := db.ApplySQLiteMigrations(ctx, st.DB, "task-productivity", steps); err == nil { + t.Fatal("failed migration committed") + } + var columns, ledger, attempts int + if err := st.DB.QueryRow(`SELECT count(*) FROM pragma_table_info('organizer_digest_deliveries')`).Scan(&columns); err != nil || columns != 5 { + t.Fatal("DDL not rolled back", columns, err) + } + if err := st.DB.QueryRow(`SELECT count(*) FROM schema_migration_steps WHERE component='task-productivity'`).Scan(&ledger); err != nil || ledger != 3 { + t.Fatal(ledger, err) + } + if err := st.DB.QueryRow(`SELECT count(*) FROM sqlite_master WHERE name='organizer_digest_attempts'`).Scan(&attempts); err != nil || attempts != 0 { + t.Fatal(attempts, err) + } + var state string + if err := st.DB.QueryRow(`SELECT state FROM organizer_digest_deliveries`).Scan(&state); err != nil || state != "sent" { + t.Fatal(state, err) + } + if err := st.ensureSchemaComponent("task-productivity"); err != nil { + t.Fatal("retry migration", err) + } +} + func TestManagedSchemasFreshRepeatAndReadOnly(t *testing.T) { for component := range managedStoreSchemas { t.Run(component, func(t *testing.T) { diff --git a/internal/store/task_digest.go b/internal/store/task_digest.go index 4290596..62e204f 100644 --- a/internal/store/task_digest.go +++ b/internal/store/task_digest.go @@ -6,6 +6,8 @@ import ( "encoding/json" "errors" "time" + + "github.com/google/uuid" ) const TaskDigestEventType = "task.digest.deliver" @@ -16,9 +18,10 @@ type TaskDigestDue struct { } type TaskDigestClaim struct { TaskDigestDue - Day string - Version int64 - Timezone string + Day string + Version int64 + Timezone string + AttemptUUID string } func (s *Store) EnsureTaskDigestEvent() error { @@ -124,11 +127,17 @@ func (s *Store) ClaimTaskDigest(ctx context.Context, due TaskDigestDue, now time } return out, sql.ErrNoRows } - res, err = tx.ExecContext(ctx, `INSERT OR IGNORE INTO organizer_digest_deliveries VALUES(?,?,?,'sending',?)`, due.Domain, due.Owner, out.Day, now.UnixMilli()) + out.AttemptUUID = uuid.NewString() + res, err = tx.ExecContext(ctx, `INSERT OR IGNORE INTO organizer_digest_deliveries(domain_uuid,owner_uuid,day,state,updated_ms,attempt_uuid) VALUES(?,?,?,'sending',?,?)`, due.Domain, due.Owner, out.Day, now.UnixMilli(), out.AttemptUUID) if err != nil { return out, err } n, _ = res.RowsAffected() + if n == 1 { + if err = insertDigestAttempt(ctx, tx, out, "scheduled", "sending", now); err != nil { + return out, err + } + } if err = tx.Commit(); err != nil { return out, err } @@ -139,12 +148,20 @@ func (s *Store) ClaimTaskDigest(ctx context.Context, due TaskDigestDue, now time } func (s *Store) TaskDigestRecipient(ctx context.Context, c TaskDigestClaim) (string, error) { - if err := taskActor(ctx, s.DB, c.Domain, c.Owner, true); err != nil { + if s.ReadOnly { + return "", ErrReadOnly + } + tx, err := s.DB.BeginTx(ctx, &sql.TxOptions{ReadOnly: true}) + if err != nil { + return "", err + } + defer tx.Rollback() + if err := taskActor(ctx, tx, c.Domain, c.Owner, true); err != nil { return "", err } var raw, email string var version int64 - err := s.DB.QueryRowContext(ctx, `SELECT f.data,f.version,p.email FROM organizer_task_preferences f JOIN principals p ON p.uuid=f.owner_uuid WHERE f.domain_uuid=? AND f.owner_uuid=?`, c.Domain, c.Owner).Scan(&raw, &version, &email) + err = tx.QueryRowContext(ctx, `SELECT f.data,f.version,p.email FROM organizer_task_preferences f JOIN principals p ON p.uuid=f.owner_uuid JOIN organizer_digest_deliveries d ON d.domain_uuid=f.domain_uuid AND d.owner_uuid=f.owner_uuid JOIN organizer_digest_attempts a ON a.uuid=d.attempt_uuid WHERE f.domain_uuid=? AND f.owner_uuid=? AND d.day=? AND d.attempt_uuid=? AND d.state='sending' AND a.state='sending' AND a.updated_ms>?`, c.Domain, c.Owner, c.Day, c.AttemptUUID, time.Now().Add(-2*time.Minute).UnixMilli()).Scan(&raw, &version, &email) if err != nil { return "", err } @@ -152,15 +169,22 @@ func (s *Store) TaskDigestRecipient(ctx context.Context, c TaskDigestClaim) (str if json.Unmarshal([]byte(raw), &p) != nil || !p.DigestEnabled || version != c.Version { return "", ErrAccessDenied } - return email, nil + loc, err := time.LoadLocation(c.Timezone) + if err != nil || time.Now().In(loc).Format("2006-01-02") != c.Day { + return "", ErrAccessDenied + } + on, err := taskReminderExtensionEnabled(ctx, tx, c.Domain) + if err != nil { + return "", err + } + if !on { + return "", ErrAccessDenied + } + return email, tx.Commit() } func (s *Store) FinishTaskDigest(ctx context.Context, c TaskDigestClaim, state string) error { - if state != "sent" && state != "uncertain" && state != "cancelled" { - return ErrTaskInvalid - } - _, err := s.DB.ExecContext(ctx, `UPDATE organizer_digest_deliveries SET state=?,updated_ms=? WHERE domain_uuid=? AND owner_uuid=? AND day=? AND state='sending'`, state, time.Now().UnixMilli(), c.Domain, c.Owner, c.Day) - return err + return s.FinishTaskDigestReason(ctx, c, state, "", time.Now()) } func (s *Store) LastTaskDigest(ctx context.Context, domain, actor string) (map[string]any, error) { diff --git a/internal/store/task_digest_history.go b/internal/store/task_digest_history.go new file mode 100644 index 0000000..17a161a --- /dev/null +++ b/internal/store/task_digest_history.go @@ -0,0 +1,382 @@ +package store + +import ( + "context" + "database/sql" + "encoding/base64" + "encoding/json" + "errors" + "time" + + "github.com/google/uuid" +) + +const TaskDigestRetentionDays = 90 + +type TaskDigestAttempt struct { + UUID string `json:"uuid"` + Day string `json:"day"` + Kind string `json:"kind"` + State string `json:"state"` + Reason string `json:"reason"` + Timezone string `json:"timezone"` + CreatedMS int64 `json:"created_ms"` + UpdatedMS int64 `json:"updated_ms"` +} +type TaskDigestRetry struct { + RequestID string `json:"request_id"` + Day string `json:"day"` + ExpectedAttempt string `json:"expected_attempt"` + DuplicateAcknowledged bool `json:"duplicate_acknowledged"` +} +type TaskDigestHistory struct { + Items []TaskDigestAttempt `json:"items"` + Next string `json:"next"` + Today string `json:"today"` + Current *TaskDigestAttempt `json:"current"` + Retries int `json:"retries"` + Enabled bool `json:"enabled"` + RetentionDays int `json:"retention_days"` +} + +const digestAttemptColumns = `uuid,day,kind,state,reason,timezone,created_ms,updated_ms` + +func scanDigestAttempt(row interface{ Scan(...any) error }) (TaskDigestAttempt, error) { + var v TaskDigestAttempt + err := row.Scan(&v.UUID, &v.Day, &v.Kind, &v.State, &v.Reason, &v.Timezone, &v.CreatedMS, &v.UpdatedMS) + return v, err +} + +func insertDigestAttempt(ctx context.Context, tx *sql.Tx, c TaskDigestClaim, kind, state string, now time.Time) error { + _, err := tx.ExecContext(ctx, `INSERT INTO organizer_digest_attempts(uuid,domain_uuid,owner_uuid,day,kind,state,preference_version,timezone,created_ms,updated_ms) VALUES(?,?,?,?,?,?,?,?,?,?)`, c.AttemptUUID, c.Domain, c.Owner, c.Day, kind, state, c.Version, c.Timezone, now.UnixMilli(), now.UnixMilli()) + return err +} + +// Receipt lookup is read-only. It lets clients confirm an accepted request even +// when SMTP is subsequently disabled; it never reactivates a delivery. +func (s *Store) TaskDigestRetryReceipt(ctx context.Context, domain, actor string, input TaskDigestRetry) (string, error) { + if err := taskActor(ctx, s.DB, domain, actor, false); err != nil { + return "", err + } + id, err := uuid.Parse(input.RequestID) + if err != nil || id.String() != input.RequestID { + return "", ErrTaskInvalid + } + var day, expected string + var ack bool + err = s.DB.QueryRowContext(ctx, `SELECT day,expected_attempt,duplicate_ack FROM organizer_digest_requests WHERE uuid=? AND domain_uuid=? AND owner_uuid=?`, input.RequestID, domain, actor).Scan(&day, &expected, &ack) + if err != nil { + return "", err + } + if day != input.Day || expected != input.ExpectedAttempt || ack != input.DuplicateAcknowledged { + return "", ErrTaskConflict + } + return input.RequestID, nil +} + +// A retry is durable queue admission, never an SMTP send in a browser request. +// Keep request receipts and daily reservations even after detail retention. +func (s *Store) QueueTaskDigestRetry(ctx context.Context, domain, actor string, input TaskDigestRetry, now time.Time) (string, error) { + if s.ReadOnly { + return "", ErrReadOnly + } + id, err := uuid.Parse(input.RequestID) + if err != nil || id.String() != input.RequestID { + return "", ErrTaskInvalid + } + tx, err := s.DB.BeginTx(ctx, nil) + if err != nil { + return "", err + } + defer tx.Rollback() + if err = taskProductivityWriter(ctx, tx, domain, actor); err != nil { + return "", err + } + var oldDomain, oldOwner, oldDay, oldExpected string + var oldAck bool + err = tx.QueryRowContext(ctx, `SELECT domain_uuid,owner_uuid,day,expected_attempt,duplicate_ack FROM organizer_digest_requests WHERE uuid=?`, input.RequestID).Scan(&oldDomain, &oldOwner, &oldDay, &oldExpected, &oldAck) + if err == nil { + if oldDomain != domain || oldOwner != actor || oldDay != input.Day || oldExpected != input.ExpectedAttempt || oldAck != input.DuplicateAcknowledged { + return "", ErrTaskConflict + } + return input.RequestID, tx.Commit() + } + if !errors.Is(err, sql.ErrNoRows) { + return "", err + } + var raw string + if err = tx.QueryRowContext(ctx, `SELECT data FROM organizer_task_preferences WHERE domain_uuid=? AND owner_uuid=?`, domain, actor).Scan(&raw); err != nil { + return "", err + } + var p TaskPreferences + if err = json.Unmarshal([]byte(raw), &p); err != nil { + return "", err + } + loc, err := time.LoadLocation(p.Timezone) + if err != nil { + return "", err + } + if !p.DigestEnabled { + return "", ErrAccessDenied + } + if input.Day != now.In(loc).Format("2006-01-02") { + return "", ErrTaskInvalid + } + var state, current string + if err = tx.QueryRowContext(ctx, `SELECT state,attempt_uuid FROM organizer_digest_deliveries WHERE domain_uuid=? AND owner_uuid=? AND day=?`, domain, actor, input.Day).Scan(&state, ¤t); err != nil { + return "", err + } + if current != input.ExpectedAttempt || state == "queued" || state == "sending" { + return "", ErrTaskConflict + } + if state != "sent" && state != "uncertain" && state != "cancelled" { + return "", ErrTaskConflict + } + if (state == "sent" || state == "uncertain") && !input.DuplicateAcknowledged { + return "", ErrTaskInvalid + } + var count int + if err = tx.QueryRowContext(ctx, `SELECT count(*) FROM organizer_digest_requests WHERE domain_uuid=? AND owner_uuid=? AND day=?`, domain, actor, input.Day).Scan(&count); err != nil { + return "", err + } + if count >= 5 { + return "", ErrTaskConflict + } + _, err = tx.ExecContext(ctx, `INSERT INTO organizer_digest_requests VALUES(?,?,?,?,?,?,?)`, input.RequestID, domain, actor, input.Day, input.ExpectedAttempt, input.DuplicateAcknowledged, now.UnixMilli()) + if err != nil { + return "", err + } + c := TaskDigestClaim{TaskDigestDue: TaskDigestDue{domain, actor}, Day: input.Day, Version: p.Version, Timezone: p.Timezone, AttemptUUID: input.RequestID} + if err = insertDigestAttempt(ctx, tx, c, "manual", "queued", now); err != nil { + return "", err + } + if _, err = tx.ExecContext(ctx, `UPDATE organizer_digest_deliveries SET state='queued',attempt_uuid=?,updated_ms=? WHERE domain_uuid=? AND owner_uuid=? AND day=?`, c.AttemptUUID, now.UnixMilli(), domain, actor, input.Day); err != nil { + return "", err + } + return c.AttemptUUID, tx.Commit() +} + +func (s *Store) QueuedTaskDigests(ctx context.Context) ([]TaskDigestClaim, error) { + rows, err := s.DB.QueryContext(ctx, `SELECT uuid,domain_uuid,owner_uuid,day,preference_version,timezone FROM organizer_digest_attempts WHERE state='queued' ORDER BY updated_ms,uuid LIMIT 10`) + if err != nil { + return nil, err + } + defer rows.Close() + out := []TaskDigestClaim{} + for rows.Next() { + var c TaskDigestClaim + if err = rows.Scan(&c.AttemptUUID, &c.Domain, &c.Owner, &c.Day, &c.Version, &c.Timezone); err != nil { + return nil, err + } + out = append(out, c) + } + return out, rows.Err() +} + +func (s *Store) ClaimQueuedTaskDigest(ctx context.Context, c TaskDigestClaim, now time.Time) (TaskDigestClaim, error) { + if s.ReadOnly { + return c, ErrReadOnly + } + tx, err := s.DB.BeginTx(ctx, nil) + if err != nil { + return c, err + } + defer tx.Rollback() + res, err := tx.ExecContext(ctx, `UPDATE organizer_digest_attempts SET state='sending',updated_ms=? WHERE uuid=? AND domain_uuid=? AND owner_uuid=? AND state='queued' AND EXISTS(SELECT 1 FROM organizer_digest_deliveries d WHERE d.domain_uuid=? AND d.owner_uuid=? AND d.day=? AND d.attempt_uuid=? AND d.state='queued')`, now.UnixMilli(), c.AttemptUUID, c.Domain, c.Owner, c.Domain, c.Owner, c.Day, c.AttemptUUID) + if err != nil { + return c, err + } + n, err := res.RowsAffected() + if err != nil { + return c, err + } + if n != 1 { + return c, sql.ErrNoRows + } + // Reload all claim fields from the queue, not from an earlier enumeration. + if err = tx.QueryRowContext(ctx, `SELECT day,preference_version,timezone FROM organizer_digest_attempts WHERE uuid=?`, c.AttemptUUID).Scan(&c.Day, &c.Version, &c.Timezone); err != nil { + return c, err + } + state, reason := "sending", "" + allowed := taskActor(ctx, tx, c.Domain, c.Owner, true) + if allowed != nil && !errors.Is(allowed, ErrAccessDenied) { + return c, allowed + } + on, err := taskReminderExtensionEnabled(ctx, tx, c.Domain) + if err != nil { + return c, err + } + var raw string + err = tx.QueryRowContext(ctx, `SELECT data FROM organizer_task_preferences WHERE domain_uuid=? AND owner_uuid=?`, c.Domain, c.Owner).Scan(&raw) + if err != nil && !errors.Is(err, sql.ErrNoRows) { + return c, err + } + var p TaskPreferences + if err == nil { + if err = json.Unmarshal([]byte(raw), &p); err != nil { + return c, err + } + } + if allowed != nil || !on || !p.DigestEnabled || p.Version != c.Version { + state, reason = "cancelled", "consent_changed" + } + loc, e := time.LoadLocation(c.Timezone) + if e != nil || now.In(loc).Format("2006-01-02") != c.Day { + state, reason = "cancelled", "day_expired" + } + if _, err = tx.ExecContext(ctx, `UPDATE organizer_digest_attempts SET state=?,reason=? WHERE uuid=?`, state, reason, c.AttemptUUID); err != nil { + return c, err + } + if _, err = tx.ExecContext(ctx, `UPDATE organizer_digest_deliveries SET state=?,updated_ms=? WHERE domain_uuid=? AND owner_uuid=? AND day=? AND attempt_uuid=?`, state, now.UnixMilli(), c.Domain, c.Owner, c.Day, c.AttemptUUID); err != nil { + return c, err + } + if err = tx.Commit(); err != nil { + return c, err + } + if state != "sending" { + return c, sql.ErrNoRows + } + return c, nil +} + +func (s *Store) FinishTaskDigestReason(ctx context.Context, c TaskDigestClaim, state, reason string, now time.Time) error { + if s.ReadOnly { + return ErrReadOnly + } + if state != "sent" && state != "uncertain" && state != "cancelled" { + return ErrTaskInvalid + } + switch reason { + case "", "smtp_unavailable", "tasks_unavailable", "consent_changed", "transport_uncertain", "extension_disabled": + default: + return ErrTaskInvalid + } + tx, err := s.DB.BeginTx(ctx, nil) + if err != nil { + return err + } + defer tx.Rollback() + res, err := tx.ExecContext(ctx, `UPDATE organizer_digest_deliveries SET state=?,updated_ms=? WHERE domain_uuid=? AND owner_uuid=? AND day=? AND attempt_uuid=? AND state='sending'`, state, now.UnixMilli(), c.Domain, c.Owner, c.Day, c.AttemptUUID) + if err != nil { + return err + } + n, err := res.RowsAffected() + if err != nil { + return err + } + if n != 1 { + return ErrTaskConflict + } + res, err = tx.ExecContext(ctx, `UPDATE organizer_digest_attempts SET state=?,reason=?,updated_ms=? WHERE uuid=? AND state='sending'`, state, reason, now.UnixMilli(), c.AttemptUUID) + if err != nil { + return err + } + n, err = res.RowsAffected() + if err != nil { + return err + } + if n != 1 { + return ErrTaskConflict + } + return tx.Commit() +} + +func (s *Store) TaskDigestHistory(ctx context.Context, domain, actor, after string, limit int, now time.Time) (TaskDigestHistory, error) { + out := TaskDigestHistory{Items: []TaskDigestAttempt{}, RetentionDays: TaskDigestRetentionDays} + p, err := s.TaskPreferences(ctx, domain, actor) + if err != nil { + return out, err + } + loc, err := time.LoadLocation(p.Timezone) + if err != nil { + return out, err + } + out.Today = now.In(loc).Format("2006-01-02") + out.Enabled = p.DigestEnabled + if limit < 1 || limit > 100 { + return out, ErrTaskInvalid + } + query := `SELECT ` + digestAttemptColumns + ` FROM organizer_digest_attempts WHERE domain_uuid=? AND owner_uuid=?` + args := []any{domain, actor} + if after != "" { + if len(after) > 256 { + return out, ErrTaskInvalid + } + var cursor struct { + MS int64 + ID string + } + raw, e := base64.RawURLEncoding.DecodeString(after) + if e != nil || json.Unmarshal(raw, &cursor) != nil || cursor.MS < 0 || len(cursor.ID) > 80 || cursor.ID == "" { + return out, ErrTaskInvalid + } + query += ` AND (created_ms,uuid)<(?,?)` + args = append(args, cursor.MS, cursor.ID) + } + query += ` ORDER BY created_ms DESC,uuid DESC LIMIT ?` + args = append(args, limit+1) + rows, err := s.DB.QueryContext(ctx, query, args...) + if err != nil { + return out, err + } + for rows.Next() { + v, e := scanDigestAttempt(rows) + if e != nil { + rows.Close() + return out, e + } + out.Items = append(out.Items, v) + } + err = rows.Err() + rows.Close() + if err != nil { + return out, err + } + if len(out.Items) > limit { + out.Items = out.Items[:limit] + last := out.Items[limit-1] + raw, _ := json.Marshal(struct { + MS int64 + ID string + }{last.CreatedMS, last.UUID}) + out.Next = base64.RawURLEncoding.EncodeToString(raw) + } + current, e := scanDigestAttempt(s.DB.QueryRowContext(ctx, `SELECT `+digestAttemptColumns+` FROM organizer_digest_attempts WHERE uuid=(SELECT attempt_uuid FROM organizer_digest_deliveries WHERE domain_uuid=? AND owner_uuid=? AND day=?)`, domain, actor, out.Today)) + if e == nil { + out.Current = ¤t + } else if !errors.Is(e, sql.ErrNoRows) { + return out, e + } + err = s.DB.QueryRowContext(ctx, `SELECT count(*) FROM organizer_digest_requests WHERE domain_uuid=? AND owner_uuid=? AND day=?`, domain, actor, out.Today).Scan(&out.Retries) + return out, err +} + +// Only detailed terminal attempts expire. Reservations and request receipts are +// permanent deduplication state; retention must never delete them. +func (s *Store) MaintainTaskDigests(ctx context.Context, now time.Time) (int64, error) { + if s.ReadOnly { + return 0, ErrReadOnly + } + tx, err := s.DB.BeginTx(ctx, nil) + if err != nil { + return 0, err + } + defer tx.Rollback() + _, err = tx.ExecContext(ctx, `UPDATE organizer_digest_attempts SET state='uncertain',reason='worker_interrupted',updated_ms=? WHERE uuid IN (SELECT uuid FROM organizer_digest_attempts WHERE state='sending' AND updated_ms 0 { + reason = reasons[0] + } + return correctTaskWork(ctx, tx, domain, actor, action, reason, v, old, now) + } switch action { case "start": if v.Version != 0 { @@ -300,6 +341,7 @@ func (s *Store) ChangeTaskWork(ctx context.Context, domain, actor, action string } v.StartMS = now.UnixMilli() v.EndMS = 0 + v.CancelledMS = 0 v.Version = 1 res, e := tx.ExecContext(ctx, `INSERT OR IGNORE INTO organizer_work_sessions(uuid,domain_uuid,owner_uuid,task_uuid,start_ms) VALUES(?,?,?,?,?)`, v.UUID, domain, actor, v.TaskUUID, v.StartMS) if e != nil { @@ -313,6 +355,9 @@ func (s *Store) ChangeTaskWork(ctx context.Context, domain, actor, action string if err != nil { return v, err } + if old.CancelledMS != 0 { + return v, ErrTaskConflict + } if old.EndMS > 0 { if v.Version == old.Version || v.Version == old.Version-1 { return old, tx.Commit() @@ -332,6 +377,14 @@ func (s *Store) ChangeTaskWork(ctx context.Context, domain, actor, action string default: return v, ErrTaskInvalid } + if action == "stop" { + if err = auditTaskWork(ctx, tx, domain, actor, "baseline", "", old, now); err != nil { + return v, err + } + } + if err = auditTaskWork(ctx, tx, domain, actor, action, "", v, now); err != nil { + return v, err + } return v, tx.Commit() } @@ -344,19 +397,21 @@ type TaskReportDay struct { FocusMS int64 `json:"focus_ms"` } type TaskReportItem struct { - UUID string `json:"uuid"` - Title string `json:"title"` - ProjectUUID string `json:"project_uuid"` - WorkMS int64 `json:"work_ms"` - Points int `json:"points"` - Completed bool `json:"completed"` + UUID string `json:"uuid"` + Title string `json:"title"` + ProjectUUID string `json:"project_uuid"` + ProjectTitle string `json:"project_title"` + WorkMS int64 `json:"work_ms"` + Points int `json:"points"` + Completed bool `json:"completed"` } type TaskReport struct { - Days []TaskReportDay `json:"days"` - Tasks []TaskReportItem `json:"tasks"` - Sessions []TaskWork `json:"sessions"` - Partial bool `json:"partial"` - Timezone string `json:"timezone"` + Days []TaskReportDay `json:"days"` + Tasks []TaskReportItem `json:"tasks"` + Sessions []TaskWork `json:"sessions"` + Partial bool `json:"partial"` + Timezone string `json:"timezone"` + Projects []TaskReportProject `json:"projects"` } func (s *Store) TaskReport(ctx context.Context, domain, actor string, start, end, now time.Time) (TaskReport, error) { @@ -373,7 +428,7 @@ func (s *Store) TaskReport(ctx context.Context, domain, actor string, start, end out.Days = append(out.Days, TaskReportDay{Date: day.Format("2006-01-02")}) } byTask := map[string]int{} - rows, err := s.DB.QueryContext(ctx, `SELECT m.completed_ms,m.estimate,m.complexity,m.task_uuid,COALESCE(i.title,''),COALESCE(i.project_uuid,'') FROM organizer_task_metrics m LEFT JOIN organizer_items i ON i.domain_uuid=m.domain_uuid AND i.owner_uuid=m.owner_uuid AND i.uuid=m.task_uuid WHERE m.domain_uuid=? AND m.owner_uuid=? AND m.completed_ms>=? AND m.completed_ms=? AND m.completed_ms?) ORDER BY w.start_ms DESC,w.uuid LIMIT 10001`, domain, actor, end.UnixMilli(), start.UnixMilli()) + rows, err = s.DB.QueryContext(ctx, `SELECT w.uuid,w.task_uuid,w.start_ms,w.end_ms,w.version,COALESCE(i.title,''),COALESCE(i.project_uuid,''),COALESCE(p.title,'') FROM organizer_work_sessions w LEFT JOIN organizer_items i ON i.domain_uuid=w.domain_uuid AND i.owner_uuid=w.owner_uuid AND i.uuid=w.task_uuid LEFT JOIN organizer_items p ON p.uuid=i.project_uuid AND p.domain_uuid=w.domain_uuid AND p.owner_uuid=w.owner_uuid AND p.kind='project' WHERE w.cancelled_ms=0 AND w.domain_uuid=? AND w.owner_uuid=? AND w.start_ms?) ORDER BY w.start_ms DESC,w.uuid LIMIT 10001`, domain, actor, end.UnixMilli(), start.UnixMilli()) if err != nil { return out, err } n = 0 for rows.Next() { var v TaskWork - var title, project string - if err = rows.Scan(&v.UUID, &v.TaskUUID, &v.StartMS, &v.EndMS, &v.Version, &title, &project); err != nil { + var title, project, projectTitle string + if err = rows.Scan(&v.UUID, &v.TaskUUID, &v.StartMS, &v.EndMS, &v.Version, &title, &project, &projectTitle); err != nil { rows.Close() return out, err } @@ -458,7 +513,7 @@ func (s *Store) TaskReport(ctx context.Context, domain, actor string, start, end if !ok { index = len(out.Tasks) byTask[v.TaskUUID] = index - out.Tasks = append(out.Tasks, TaskReportItem{UUID: v.TaskUUID, Title: title, ProjectUUID: project}) + out.Tasks = append(out.Tasks, TaskReportItem{UUID: v.TaskUUID, Title: title, ProjectUUID: project, ProjectTitle: projectTitle}) } out.Tasks[index].WorkMS += elapsed } @@ -485,5 +540,39 @@ func (s *Store) TaskReport(ctx context.Context, domain, actor string, start, end } addSpan(a, b, true) } - return out, rows.Err() + if err = rows.Err(); err != nil { + return out, err + } + groups := map[string]*TaskReportProject{} + for _, task := range out.Tasks { + p := groups[task.ProjectUUID] + if p == nil { + p = &TaskReportProject{UUID: task.ProjectUUID, Title: task.ProjectTitle} + groups[task.ProjectUUID] = p + } + if task.Completed { + p.Completed++ + } + p.Points += task.Points + p.WorkMS += task.WorkMS + } + out.Projects = []TaskReportProject{} + for _, p := range groups { + out.Projects = append(out.Projects, *p) + } + sort.Slice(out.Projects, func(i, j int) bool { + if out.Projects[i].Title != out.Projects[j].Title { + return out.Projects[i].Title < out.Projects[j].Title + } + return out.Projects[i].UUID < out.Projects[j].UUID + }) + return out, nil +} + +type TaskReportProject struct { + UUID string `json:"uuid"` + Title string `json:"title"` + Completed int `json:"completed"` + Points int `json:"points"` + WorkMS int64 `json:"work_ms"` } diff --git a/internal/store/task_work_history.go b/internal/store/task_work_history.go new file mode 100644 index 0000000..83cf830 --- /dev/null +++ b/internal/store/task_work_history.go @@ -0,0 +1,186 @@ +package store + +import ( + "context" + "database/sql" + "encoding/base64" + "encoding/json" + "strings" + "time" + "unicode/utf8" + + "github.com/google/uuid" +) + +type TaskWorkRevision struct { + Item TaskWork `json:"item"` + Action string `json:"action"` + Reason string `json:"reason"` + ChangedMS int64 `json:"changed_ms"` +} + +func auditTaskWork(ctx context.Context, tx *sql.Tx, domain, actor, action, reason string, v TaskWork, now time.Time) error { + raw, err := json.Marshal(v) + if err != nil { + return err + } + // Legacy sessions acquire a baseline lazily. Never rewrite an earlier audit. + query := `INSERT INTO organizer_work_revisions(work_uuid,version,domain_uuid,owner_uuid,action,reason,changed_ms,data) VALUES(?,?,?,?,?,?,?,?)` + if action == "baseline" { + query += ` ON CONFLICT(work_uuid,version) DO NOTHING` + } + _, err = tx.ExecContext(ctx, query, v.UUID, v.Version, domain, actor, action, reason, now.UnixMilli(), string(raw)) + return err +} + +func correctTaskWork(ctx context.Context, tx *sql.Tx, domain, actor, action, reason string, v, old TaskWork, now time.Time) (TaskWork, error) { + reason = strings.TrimSpace(reason) + if reason == "" || len(reason) > 500 || !utf8.ValidString(reason) || strings.ContainsAny(reason, "\x00\r\n") { + return v, ErrTaskInvalid + } + if v.Version < 1 || old.EndMS == 0 || old.CancelledMS != 0 { + return v, ErrTaskConflict + } + if old.Version != v.Version { + return v, ErrTaskConflict + } + if v.TaskUUID != "" && v.TaskUUID != old.TaskUUID { + return v, ErrTaskInvalid + } + result := old + if action == "correct" { + if v.StartMS <= 0 || v.EndMS <= v.StartMS || v.EndMS > now.UnixMilli() || v.EndMS-v.StartMS > int64(31*24*time.Hour/time.Millisecond) { + return v, ErrTaskInvalid + } + // Adjacent spans are valid; double-counted elapsed time is not. Scope across + // Domains like the existing one-active-session constraint, without disclosing them. + var overlap bool + err := tx.QueryRowContext(ctx, `SELECT EXISTS(SELECT 1 FROM organizer_work_sessions WHERE owner_uuid=? AND uuid<>? AND cancelled_ms=0 AND start_ms?))`, actor, old.UUID, v.EndMS, v.StartMS).Scan(&overlap) + if err != nil { + return v, err + } + if overlap { + return v, ErrTaskConflict + } + result.StartMS = v.StartMS + result.EndMS = v.EndMS + } else { + result.CancelledMS = now.UnixMilli() + } + if err := auditTaskWork(ctx, tx, domain, actor, "baseline", "", old, now); err != nil { + return v, err + } + result.Version++ + updated, err := tx.ExecContext(ctx, `UPDATE organizer_work_sessions SET start_ms=?,end_ms=?,cancelled_ms=?,version=? WHERE uuid=? AND domain_uuid=? AND owner_uuid=? AND version=?`, result.StartMS, result.EndMS, result.CancelledMS, result.Version, old.UUID, domain, actor, old.Version) + if err != nil { + return v, err + } + if count, err := updated.RowsAffected(); err != nil { + return v, err + } else if count != 1 { + return v, ErrTaskConflict + } + if err := auditTaskWork(ctx, tx, domain, actor, action, reason, result, now); err != nil { + return v, err + } + return result, tx.Commit() +} + +type TaskWorkEntry struct { + TaskWork + Title string `json:"title"` + ProjectUUID string `json:"project_uuid"` +} +type TaskWorkPage struct { + Items []TaskWorkEntry `json:"items"` + Next string `json:"next"` +} +type workCursor struct { + Start int64 `json:"start"` + UUID string `json:"uuid"` +} + +func (s *Store) TaskWorkHistory(ctx context.Context, domain, actor string, start, end time.Time, after string, limit int) (TaskWorkPage, error) { + out := TaskWorkPage{Items: []TaskWorkEntry{}} + if err := taskActor(ctx, s.DB, domain, actor, false); err != nil { + return out, err + } + if !end.After(start) || end.Sub(start) > 367*24*time.Hour || limit < 1 || limit > 100 { + return out, ErrTaskInvalid + } + query := `SELECT w.uuid,w.task_uuid,w.start_ms,w.end_ms,w.version,w.cancelled_ms,COALESCE(i.title,''),COALESCE(i.project_uuid,'') FROM organizer_work_sessions w LEFT JOIN organizer_items i ON i.uuid=w.task_uuid AND i.domain_uuid=w.domain_uuid AND i.owner_uuid=w.owner_uuid WHERE w.domain_uuid=? AND w.owner_uuid=? AND w.start_ms?)` + args := []any{domain, actor, end.UnixMilli(), start.UnixMilli()} + if after != "" { + if len(after) > 256 { + return out, ErrTaskInvalid + } + raw, err := base64.RawURLEncoding.DecodeString(after) + var cursor workCursor + if err != nil || json.Unmarshal(raw, &cursor) != nil || cursor.Start <= 0 { + return out, ErrTaskInvalid + } + if id, err := uuid.Parse(cursor.UUID); err != nil || id.String() != cursor.UUID { + return out, ErrTaskInvalid + } + query += ` AND (w.start_ms,w.uuid)<(?,?)` + args = append(args, cursor.Start, cursor.UUID) + } + query += ` ORDER BY w.start_ms DESC,w.uuid DESC LIMIT ?` + args = append(args, limit+1) + rows, err := s.DB.QueryContext(ctx, query, args...) + if err != nil { + return out, err + } + defer rows.Close() + for rows.Next() { + var v TaskWorkEntry + if err = rows.Scan(&v.UUID, &v.TaskUUID, &v.StartMS, &v.EndMS, &v.Version, &v.CancelledMS, &v.Title, &v.ProjectUUID); err != nil { + return out, err + } + out.Items = append(out.Items, v) + } + if len(out.Items) > limit { + out.Items = out.Items[:limit] + last := out.Items[limit-1] + raw, _ := json.Marshal(workCursor{Start: last.StartMS, UUID: last.UUID}) + out.Next = base64.RawURLEncoding.EncodeToString(raw) + } + return out, rows.Err() +} + +func (s *Store) TaskWorkRevisions(ctx context.Context, domain, actor, id string, before int64) ([]TaskWorkRevision, error) { + out := []TaskWorkRevision{} + if err := taskActor(ctx, s.DB, domain, actor, false); err != nil { + return out, err + } + if before < 0 { + return out, ErrTaskInvalid + } + current, err := scanTaskWork(s.DB.QueryRowContext(ctx, `SELECT `+taskWorkColumns+` FROM organizer_work_sessions WHERE uuid=? AND domain_uuid=? AND owner_uuid=?`, id, domain, actor)) + if err != nil { + return out, err + } + if before == 0 { + before = current.Version + 1 + } + rows, err := s.DB.QueryContext(ctx, `SELECT action,reason,changed_ms,data FROM organizer_work_revisions WHERE work_uuid=? AND domain_uuid=? AND owner_uuid=? AND version current.Version { + out = append(out, TaskWorkRevision{Item: current, Action: "baseline"}) + } + return out, rows.Err() +} diff --git a/static/css/task-productivity.css b/static/css/task-productivity.css index b9c21aa..c35d9b4 100644 --- a/static/css/task-productivity.css +++ b/static/css/task-productivity.css @@ -1,4 +1,5 @@ #task-productivity{max-width:1200px;margin:1rem auto;padding:0 1rem;color:var(--fg,var(--text-color));box-sizing:border-box} +#task-digest-history{min-width:0;margin:1rem 0}#task-digest-history summary{cursor:pointer;font-weight:600}#task-digest-history p{font-size:.9rem}#task-digest-history .digest-retry form{display:flex;gap:.6rem;align-items:center;flex-wrap:wrap}#task-digest-history .digest-retry label{display:flex;gap:.5rem;align-items:center}#task-digest-history button{font:inherit;color:inherit;background:var(--input-bg,var(--bg));border:1px solid var(--border);border-radius:.3rem;padding:.4rem .6rem;cursor:pointer}#task-digest-history th,#task-digest-history td{white-space:nowrap}#task-digest-history td:last-child{white-space:normal;min-width:10rem}@media(max-width:600px){#task-digest-history button,#task-digest-history .digest-retry label{min-height:44px}#task-digest-history .digest-retry input{min-width:24px;min-height:24px}} body:has(#task-productivity) .topbar,body:has(#contacts-app) .topbar{flex-wrap:wrap;gap:.5rem} #task-productivity,#contacts-app{min-width:0;width:100%;overflow-wrap:anywhere} @media(max-width:600px){body:has(#task-productivity) .topbar,body:has(#contacts-app) .topbar{padding:.5rem;gap:.3rem}body:has(#task-productivity) .topbar>.brand,body:has(#contacts-app) .topbar>.brand{flex:1}body:has(#task-productivity) .topbar>nav{display:none}} diff --git a/static/css/task-work-history.css b/static/css/task-work-history.css new file mode 100644 index 0000000..45e49ff --- /dev/null +++ b/static/css/task-work-history.css @@ -0,0 +1 @@ +#task-work-history{max-width:1320px;margin:1rem auto;padding:0 1rem;color:var(--fg);box-sizing:border-box}#task-work-history>header,.work-history-controls{display:flex;align-items:center;flex-wrap:wrap;gap:.75rem}#task-work-history>header{justify-content:space-between}#task-work-history a{color:var(--link,var(--accent))}.work-history-controls label,.work-history-edit label{display:grid;gap:.25rem}.work-history-controls{margin-block:1rem}#task-work-history input,#task-work-history button{font:inherit;color:var(--fg);background:var(--input-bg,var(--bg));border:1px solid var(--border);border-radius:.3rem;padding:.35rem .5rem;box-sizing:border-box}#task-work-history button{cursor:pointer}#work-history-list{overflow:auto}.work-history-table{width:100%;border-collapse:collapse}.work-history-table td,.work-history-table th{padding:.3rem .4rem;text-align:left;vertical-align:top;border-bottom:1px solid var(--border)}.work-history-table td:not(:first-child){white-space:nowrap}.work-history-table td:first-child{overflow-wrap:anywhere}.work-history-table td button+button{margin-left:.4rem}.work-history-extra td{white-space:normal!important}.work-history-extra summary{color:var(--muted);font-size:.85rem;cursor:pointer}.work-history-extra ol{max-height:20rem;overflow:auto}.work-history-extra p{margin:.25rem 0;overflow-wrap:anywhere}.work-history-edit{display:flex;align-items:end;flex-wrap:wrap;gap:.6rem;padding:.7rem 0}.work-history-edit label:last-of-type{flex:1;min-width:12rem}.work-history-edit>p{width:100%}.work-history-edit input{max-width:100%}#work-history-paging{display:flex;justify-content:flex-end;gap:.6rem;margin-block:1rem}@media(max-width:760px){.work-history-table thead{display:none}.work-history-table,.work-history-table tbody,.work-history-table tr,.work-history-table td{display:block}.work-history-table tr{border-bottom:1px solid var(--border);padding:.4rem 0}.work-history-table td{border:0;white-space:normal!important}.work-history-table td[data-label]::before{content:attr(data-label);display:inline-block;min-width:4rem;color:var(--muted);margin-right:.5rem}#task-work-history input,#task-work-history button{min-height:44px}.work-history-edit{align-items:stretch}.work-history-edit label{width:100%;min-width:0!important}.work-history-extra summary{padding:.6rem 0}.work-history-controls label{max-width:100%}} diff --git a/static/js/task-digest-history.js b/static/js/task-digest-history.js new file mode 100644 index 0000000..4c75bb4 --- /dev/null +++ b/static/js/task-digest-history.js @@ -0,0 +1,54 @@ +(() => { + 'use strict'; + const root=document.getElementById('task-digest-history');if(!root)return; + const ja=document.documentElement.lang.startsWith('ja'),t=(en,jp)=>ja?jp:en; + const api='/_/api/v1/extension/organizer.tasks/digest-history'; + const el=(tag,text)=>{const n=document.createElement(tag);if(text!==undefined)n.textContent=text;return n;}; + const states={queued:t('Queued','待機中'),sending:t('Sending / pending result','送信中・結果待ち'),sent:t('Accepted by mail server','メールサーバー受付済み'),uncertain:t('Delivery uncertain','結果不明'),cancelled:t('Not sent','送信中止')}; + const reasons={legacy:t('Migrated record; attempt details unknown','移行前の記録(詳細不明)'),smtp_unavailable:t('SMTP unavailable','SMTPを利用できません'),tasks_unavailable:t('Tasks unavailable','タスクを取得できません'),consent_changed:t('Settings or permission changed','設定・権限が変わりました'),transport_uncertain:t('SMTP result uncertain','SMTPの結果が不明です'),extension_disabled:t('Extension disabled','拡張機能が無効です'),day_expired:t('Requested date has passed','対象日を過ぎました'),worker_interrupted:t('Worker interrupted; check for delivery','処理中断の可能性・受信を確認してください')}; + const details=el('details'),summary=el('summary',t('Email delivery history and retry','メール配信履歴・再送'));details.append(summary);root.append(details); + const status=el('p');status.role='status';status.setAttribute('aria-live','polite'); + const controls=el('div'),refresh=el('button','↻ '+t('Refresh','更新'));refresh.type='button';controls.className='productivity-controls';controls.append(refresh); + const content=el('div'),pager=el('div');pager.className='productivity-controls';details.append(status,controls,content,pager); + let loaded=false,busy=false,cursor='',stack=[],pending=null,generation=0; + async function request(suffix='',options={}){ + const response=await fetch(api+suffix,{credentials:'same-origin',cache:'no-store',signal:AbortSignal.timeout(15000),...options,headers:{'Content-Type':'application/json'}}); + const data=await response.json().catch(()=>({})); + if(!response.ok||response.redirected){const errors={conflict:t('Changed, already queued, or the daily retry limit was reached. Refresh to check.','状態の変更・処理中・再送回数上限のいずれかです。更新して確認してください。'),invalid:t('Check the date and duplicate-delivery confirmation.','対象日と重複送信の確認を見直してください。'),forbidden:t('Enable delivery and check your permissions.','配信設定と権限を確認してください。'),email_required:t('Set your account email first.','先にプロフィールのメールアドレスを設定してください。'),smtp_unavailable:t('SMTP is not configured or enabled.','SMTPが未設定または無効です。')};const error=Error(errors[data.error]||t('Unable to confirm the result. Retry uses the same request.','結果を確認できません。同じ要求で再試行できます。'));error.status=response.status;throw error;} + return data; + } + function retryForm(data){ + const box=el('div');box.className='digest-retry';const current=data.current; + box.append(el('p',t('Retries use current tasks and your current account email, not the original message. Saved settings apply. Up to 5 retries per day.','再送は元の本文ではなく、現在のタスクとアカウントのメールアドレスを使います。保存済み設定に従い、1日5回までです。'))); + if(pending&¤t?.uuid===pending.request_id){pending=null;status.textContent=t('Request is recorded. Check its status below.','要求は記録されています。以下の状態を確認してください。');} + if(root.dataset.writable!=='true')return box; + if(!pending&&(!data.enabled||!current||['queued','sending'].includes(current.state)||data.retries>=5)){ + box.append(el('p',!data.enabled?t('Enable daily email in the settings above.','上の設定で日次メールを有効にしてください。'):!current?t('No delivery attempt for today yet.','本日の配信記録はまだありません。'):data.retries>=5?t('Daily retry limit reached.','本日の再送回数上限に達しました。'):t('Request is queued or running. Refresh later.','待機中または実行中です。しばらくして更新してください。')));return box; + } + const form=el('form'),ack=el('input'),label=el('label');ack.type='checkbox';ack.checked=!!pending?.duplicate_acknowledged; + const duplicate=pending?pending.duplicate_acknowledged:['sent','uncertain'].includes(current.state); + ack.required=duplicate;label.append(ack,document.createTextNode(t('I checked my inbox and accept possible duplicate delivery.','受信状況を確認し、重複して届く可能性を了承します。')));if(duplicate)form.append(label); + const send=el('button',pending?t('Retry the same request','同じ要求で再試行'):t('Queue today’s email again','本日分の再送を予約'));send.type='submit';form.append(send);box.append(form); + form.onsubmit=async event=>{event.preventDefault();if(busy||!form.reportValidity())return; + if(!pending)pending={request_id:crypto.randomUUID(),day:current.day,expected_attempt:current.uuid,duplicate_acknowledged:duplicate&&ack.checked}; + busy=true;send.disabled=refresh.disabled=ack.disabled=true;pager.inert=true; + try{await request('/retry',{method:'POST',body:JSON.stringify(pending)});pending=null;cursor='';stack=[];const refreshed=await load();if(refreshed)status.textContent=t('Queued. The scheduler will process this request; queue delays may apply.','予約しました。スケジューラが処理するまでお待ちください。');else status.textContent=t('Request accepted. ','予約済みです。')+status.textContent;} + catch(error){if(error.status>=400&&error.status<500)pending=null;status.textContent=error.message;send.textContent=pending?t('Retry the same request','同じ要求で再試行'):t('Queue today’s email again','本日分の再送を予約');} + finally{busy=false;send.disabled=refresh.disabled=ack.disabled=false;pager.inert=false;} + };return box; + } + async function load(){ + const ticket=++generation;refresh.disabled=true;content.inert=true;pager.inert=true; + try{const data=await request('?'+new URLSearchParams({limit:'25',...(cursor?{after:cursor}:{})}));if(ticket!==generation)return; + const table=el('table');table.className='productivity-table';const head=el('tr');for(const title of [t('Date','対象日'),t('Method','区分'),t('Status','状態'),t('Updated','更新'),t('Detail','詳細')])head.append(el('th',title));const thead=el('thead');thead.append(head);table.append(thead);const body=el('tbody'); + for(const item of data.items){const row=el('tr');const date=new Date(item.updated_ms).toLocaleString(ja?'ja-JP':'en-GB',{timeZone:item.timezone||undefined});for(const value of [item.day,item.kind==='manual'?t('Manual','手動'):item.kind==='legacy'?t('Legacy','移行前'):t('Scheduled','定期'),states[item.state]||item.state,date+(item.timezone?' · '+item.timezone:''),reasons[item.reason]||''])row.append(el('td',value));body.append(row);}table.append(body); + const wrap=el('div');wrap.className='productivity-table-wrap';wrap.append(table);if(!data.items.length)wrap.append(el('p',t('No delivery history.','配信履歴はありません。'))); + status.textContent='';content.replaceChildren(retryForm(data),wrap,el('p',t('Detailed attempts: '+data.retention_days+' days. Duplicate-prevention receipts are retained. An accepted message is not a guarantee of inbox delivery.','詳細履歴は'+data.retention_days+'日保持します。重複防止記録は残します。メールサーバーの受付は受信箱への到達保証ではありません。'))); + pager.replaceChildren();const button=(title,fn)=>{const b=el('button',title);b.type='button';b.onclick=fn;pager.append(b);}; + if(stack.length)button(t('Previous','前へ'),()=>{if(!busy){cursor=stack.pop();load();}}); + if(data.next)button(t('Next','次へ'),()=>{if(!busy){stack.push(cursor);cursor=data.next;load();}});loaded=true;return true; + }catch(error){status.textContent=error.message;}finally{if(ticket===generation){refresh.disabled=false;content.inert=false;pager.inert=false;}} + } + refresh.onclick=()=>{if(!busy){cursor='';stack=[];load();}}; + details.ontoggle=()=>{if(details.open&&!loaded)load();}; +})(); diff --git a/static/js/task-productivity.js b/static/js/task-productivity.js index 87a51e9..7b38520 100644 --- a/static/js/task-productivity.js +++ b/static/js/task-productivity.js @@ -30,22 +30,26 @@ if(key==='reminder_time'){const help=el('p',ja?'新規タスクの対応する日付が設定されている場合だけ通知します。既存タスクは変更しません。通知時刻は保存時のドメインのタイムゾーン('+data.timezone+')を使用します。':'Reminders apply only to new tasks with the corresponding date. Existing tasks are unchanged. Times use the Domain timezone on save ('+data.timezone+').');help.className='productivity-note';form.append(help);} } const note=el('p',ja?'日数は作成日からの暦日です。空欄は未設定、0は当日。担当者の指定では閲覧権限は付与されません。メールは今日の計画・期限到来分を最大100件送ります。SMTPは管理者設定を使用し、配信時刻にはキュー待ちの遅延があります。':'Offsets are calendar days from creation; blank means unset, 0 means today. Assignment does not grant access. Email includes up to 100 tasks planned or due today, using administrator SMTP settings. Queue delays may apply.');note.className='productivity-note';form.append(note); - if(data.last_digest){const states={sent:['Sent','送信済み'],sending:['Sending / result pending','送信中・結果未確定'],uncertain:['Delivery uncertain (no automatic retry)','結果不明(自動再送なし)'],cancelled:['Cancelled','送信取消']};form.append(el('p',(ja?'直近の配信: ':'Latest delivery: ')+data.last_digest.day+' · '+(states[data.last_digest.state]||['Unknown','不明'])[ja?1:0]));} const save=el('button',t('save'));save.type='submit';save.disabled=root.dataset.writable!=='true';form.append(save);content.replaceChildren(form); fields.project_uuid.value=p.project_uuid||''; form.onsubmit=async event=>{event.preventDefault();if(!form.reportValidity())return;save.disabled=true;const value={...p};for(const [key,input] of Object.entries(fields)){value[key]=input.type==='checkbox'?input.checked:input.type==='number'?(input.value===''?null:Number(input.value)):input.value;}try{const result=await request('preferences',{method:'PUT',body:JSON.stringify(value)});Object.assign(p,result.preferences);status.textContent=t('saved');}catch(e){error(e);}finally{save.disabled=false;}}; } function taskTable(data){const wrap=el('div');wrap.className='productivity-table-wrap';const table=el('table');table.className='productivity-table';const head=el('tr');for(const name of [ja?'タスク':'Task',t('points'),t('work')])head.append(el('th',name));const thead=el('thead');thead.append(head);table.append(thead);const body=el('tbody');for(const task of data.tasks){const row=el('tr'),name=el('td'),link=el('a',(task.completed?'✓ ':'')+(task.title||task.uuid));link.href='/v/plan/task/'+encodeURIComponent(task.uuid);name.append(link);row.append(name,el('td',String(task.points||0)),el('td',(task.work_ms/3600000).toFixed(2)));body.append(row);}table.append(body);wrap.append(table);if(!data.tasks.length)wrap.append(el('p',t('empty')));return wrap;} + function projectTable(data){ + const wrap=el('section');wrap.className='productivity-table-wrap';wrap.append(el('h3',ja?'プロジェクト別':'By project')); + const table=el('table');table.className='productivity-table';const head=el('tr');for(const title of [ja?'プロジェクト':'Project',t('completed'),t('points'),t('work')])head.append(el('th',title));const thead=el('thead');thead.append(head);table.append(thead);const body=el('tbody'); + for(const p of data.projects||[]){const row=el('tr'),name=el('td');if(p.uuid){const link=el('a',p.title||p.uuid);link.href='/v/plan/project/'+encodeURIComponent(p.uuid);name.append(link);}else name.textContent=ja?'プロジェクトなし':'No project';row.append(name,el('td',String(p.completed)),el('td',String(p.points)),el('td',(p.work_ms/3600000).toFixed(2)));body.append(row);}table.append(body);wrap.append(table,el('small',ja?'現在の所属で集計します。集中時間(Pomodoro)は別集計です。':'Grouped by current project membership. Pomodoro time is reported separately.'));return wrap; + } async function report(){ - const controls=el('form');controls.className='productivity-controls';const from=el('input'),to=el('input');from.type=to.type='date';from.required=to.required=true;from.ariaLabel=ja?'開始日':'From';to.ariaLabel=ja?'終了日(含まない)':'To (exclusive)';const refresh=el('button','↻ '+t('refresh'));controls.append(from,to,refresh); + const controls=el('form');controls.className='productivity-controls';const from=el('input'),to=el('input');from.type=to.type='date';from.required=to.required=true;from.ariaLabel=ja?'開始日':'From';to.ariaLabel=ja?'終了日(含まない)':'To (exclusive)';const refresh=el('button','↻ '+t('refresh'));const history=el('a',ja?'作業記録・訂正':'Work history & corrections');history.href='/v/plan/tasks/work';controls.append(from,to,refresh,history); const results=el('section');content.replaceChildren(controls,results);let generation=0; async function load(){const ticket=++generation;refresh.disabled=true;try{const query=new URLSearchParams();if(from.value)query.set('from',from.value);if(to.value)query.set('to',to.value);const d=await request('report?'+query);if(ticket!==generation)return;status.textContent=d.partial?t('partial'):d.timezone; if(!from.value&&d.days.length){from.value=d.days[0].date;const end=new Date(d.days.at(-1).date+'T12:00:00Z');end.setUTCDate(end.getUTCDate()+1);to.value=end.toISOString().slice(0,10);} const stats=el('div');stats.className='productivity-stats';for(const [label,key,divisor] of [['completed','completed',1],['points','points',1],['work','work_ms',3600000],['focus','focus_ms',3600000]]){const card=el('div',t(label));card.className='productivity-stat';const sum=d.days.reduce((total,day)=>total+day[key],0)/divisor;card.append(el('strong',divisor===1?String(sum):sum.toFixed(2)));stats.append(card);} - const scroll=el('div');scroll.className='productivity-heatmap-scroll';const grid=el('div');grid.className='productivity-heatmap';grid.ariaLabel=t('report');const detail=el('section');detail.append(taskTable(d));let detailSequence=0; + const scroll=el('div');scroll.className='productivity-heatmap-scroll';const grid=el('div');grid.className='productivity-heatmap';grid.ariaLabel=t('report');const detail=el('section');detail.append(projectTable(d),taskTable(d));let detailSequence=0; if(d.days.length){const weekday=new Date(d.days[0].date+'T12:00:00Z').getUTCDay();for(let i=0;i{const sequence=++detailSequence;try{const next=new Date(day.date+'T12:00:00Z');next.setUTCDate(next.getUTCDate()+1);const single=await request('report?'+new URLSearchParams({from:day.date,to:next.toISOString().slice(0,10)}));if(sequence!==detailSequence)return;detail.replaceChildren(el('h2',day.date),taskTable(single));}catch(e){error(e);}};grid.append(cell);} + cell.onclick=async()=>{const sequence=++detailSequence;try{const next=new Date(day.date+'T12:00:00Z');next.setUTCDate(next.getUTCDate()+1);const single=await request('report?'+new URLSearchParams({from:day.date,to:next.toISOString().slice(0,10)}));if(sequence!==detailSequence)return;detail.replaceChildren(el('h2',day.date),projectTable(single),taskTable(single));}catch(e){error(e);}};grid.append(cell);} scroll.append(grid);const note=el('p',ja?'1タスクのポイント = 1 + ⌈見積分数 / 30⌉ × 複雑度(1〜5)。完了取消は集計から除外。作業時間とPomodoroは別集計で、重複する場合は加算しません。':'Points per task = 1 + ceil(estimated minutes / 30) × complexity (1–5). Reopened tasks are excluded. Work and Pomodoro are separate; overlapping time is not added together.');note.className='productivity-note';results.replaceChildren(stats,scroll,note,detail); }catch(e){error(e);}finally{refresh.disabled=false;}} controls.onsubmit=e=>{e.preventDefault();load();};await load(); diff --git a/static/js/task-work-history.js b/static/js/task-work-history.js new file mode 100644 index 0000000..87f5d5c --- /dev/null +++ b/static/js/task-work-history.js @@ -0,0 +1,52 @@ +(() => { + 'use strict'; + const root=document.getElementById('task-work-history');if(!root)return; + const ja=document.documentElement.lang.startsWith('ja'),t=(en,jp)=>ja?jp:en; + const api='/_/api/v1/extension/organizer.tasks/',writable=root.dataset.writable==='true',zone=root.dataset.timezone; + const status=document.getElementById('work-history-status'),list=document.getElementById('work-history-list'),paging=document.getElementById('work-history-paging'); + const el=(tag,text)=>{const n=document.createElement(tag);if(text!==undefined)n.textContent=text;return n;}; + const button=(text,fn)=>{const b=el('button',text);b.type='button';b.onclick=fn;return b;}; + const messages={conflict:t('The record changed or overlaps another recording. Reload and check before retrying.','他の更新または作業時間の重複があります。再読み込みして確認してください。'),forbidden:t('You cannot change this record.','この記録は変更できません。'),invalid:t('Check the time range and reason. End must not be in the future; corrections are limited to 31 days. Ambiguous daylight-saving times require an explicit offset via the API.','日時と理由を確認してください。終了は現在以前、期間は31日以内です。夏時間の曖昧な時刻はAPIでオフセット指定が必要です。')}; + let controller=null,sequence=0,cursor='',stack=[],editing=null,busy=false; + const form=el('form'),from=el('input'),to=el('input');form.className='work-history-controls'; + for(const [input,label] of [[from,t('From','開始日')],[to,t('To (exclusive)','終了日(含まない)')]]){input.type='date';input.required=true;const l=el('label',label);l.append(input);form.append(l);} + const refresh=el('button','↻ '+t('Refresh','更新'));refresh.type='submit';form.append(refresh,el('span',zone));document.getElementById('work-history-controls').append(form); + async function request(path,options={}){const r=await fetch(api+path,{credentials:'same-origin',cache:'no-store',signal:AbortSignal.any([AbortSignal.timeout(15000),controller.signal]),...options,headers:{'Content-Type':'application/json'}});const d=await r.json().catch(()=>({}));if(!r.ok||r.redirected)throw Error(messages[d.error]||t('Request failed. Input is retained.','処理に失敗しました。入力は保持しています。'));return d;} + const parts=new Intl.DateTimeFormat('en-CA',{timeZone:zone,year:'numeric',month:'2-digit',day:'2-digit',hour:'2-digit',minute:'2-digit',second:'2-digit',hourCycle:'h23'}); + const wall=ms=>{const p=Object.fromEntries(parts.formatToParts(new Date(ms)).map(x=>[x.type,x.value]));return `${p.year}-${p.month}-${p.day}T${p.hour}:${p.minute}:${p.second}`;}; + const stamp=ms=>ms?wall(ms).replace('T',' '):t('Running','記録中'); + const dirty=()=>editing&&[...editing.querySelectorAll('input,textarea')].some(n=>n.value!==n.defaultValue); + const canLeave=()=>!busy&&(!dirty()||confirm(t('Discard unsaved changes?','未保存の変更を破棄しますか?'))); + window.addEventListener('beforeunload',e=>{if(dirty()||busy){e.preventDefault();e.returnValue='';}}); + function editor(entry,slot,action){ + if(!canLeave())return;if(editing)editing.remove(); + const f=el('form');f.className='work-history-edit';editing=f; + const start=el('input'),end=el('input'); + if(action==='correct')for(const [input,value,label] of [[start,entry.start_ms,t('Start','開始')],[end,entry.end_ms,t('End','終了')]]){input.type='datetime-local';input.step='1';input.value=input.defaultValue=wall(value);input.required=true;const l=el('label',label+' · '+zone);l.append(input);f.append(l);} + else f.append(el('p',t('Exclude this recording from reports. Its values and audit history are retained.','この記録を集計対象から除外します。元の時刻と変更履歴は残ります。'))); + const reason=el('input');reason.type='text';reason.required=true;reason.maxLength=160;const label=el('label',t('Reason','変更理由'));label.append(reason);f.append(label); + const message=el('p');message.role='status';const save=el('button',action==='correct'?t('Save correction','訂正を保存'):t('Cancel recording','記録を取り消す'));save.type='submit'; + const dismiss=button(t('Close','閉じる'),()=>{if(canLeave()){f.remove();editing=null;}});f.append(message,save,dismiss);slot.append(f);reason.focus(); + f.onsubmit=async e=>{e.preventDefault();if(busy||!f.reportValidity())return;busy=true;const controls=[...f.querySelectorAll('input,button')];controls.forEach(n=>n.disabled=true); + const data={uuid:entry.uuid,task_uuid:entry.task_uuid,version:entry.version,action,reason:reason.value}; + if(action==='correct'){data.start=start.value===start.defaultValue?new Date(entry.start_ms).toISOString():start.value;data.end=end.value===end.defaultValue?new Date(entry.end_ms).toISOString():end.value;} + try{await request('work',{method:'POST',body:JSON.stringify(data)});editing=null;f.remove();cursor='';stack=[];if(await load())status.textContent=t('Saved. Reports now use the corrected values.','保存しました。集計にも反映されます。');} + catch(error){message.textContent=error.message;}finally{busy=false;controls.forEach(n=>n.disabled=false);} + }; + } + function audit(entry,slot){ + const details=el('details'),summary=el('summary',t('Change history','変更履歴')),body=el('div');details.append(summary,body);slot.append(details);let loaded=false; + const names={start:t('Started','開始'),stop:t('Stopped','終了'),correct:t('Corrected','訂正'),cancel:t('Cancelled','取消'),baseline:t('Previous value','以前の値')}; + async function more(before=0){body.replaceChildren(el('p',t('Loading…','読み込み中…')));try{const data=await request('work-history/'+encodeURIComponent(entry.uuid)+(before?'?before='+before:''));const rows=el('ol');for(const revision of data.items){const li=el('li');li.append(el('strong',`v${revision.item.version} · ${names[revision.action]||revision.action}`),el('p',`${stamp(revision.item.start_ms)} → ${stamp(revision.item.end_ms)}`));if(revision.reason)li.append(el('p',revision.reason));if(revision.changed_ms)li.append(el('small',stamp(revision.changed_ms)));rows.append(li);}body.replaceChildren(rows);if(data.next)body.append(button(t('Older changes','以前の変更'),()=>more(data.next)));loaded=true;}catch(e){if(e.name!=='AbortError')body.replaceChildren(el('p',e.message),button(t('Retry','再試行'),()=>more(before)));}} + details.ontoggle=()=>{if(details.open&&!loaded)more();}; + } + function render(entries){ + const table=el('table');table.className='work-history-table';const thead=el('thead'),head=el('tr');for(const title of [t('Task','タスク'),t('Start','開始'),t('End','終了'),t('Duration','時間'),t('Actions','操作')])head.append(el('th',title));thead.append(head);table.append(thead);const tbody=el('tbody'); + for(const entry of entries){const row=el('tr'),name=el('td'),link=el('a',entry.title||entry.task_uuid);link.href='/v/plan/task/'+encodeURIComponent(entry.task_uuid);name.append(link);if(entry.cancelled_ms)name.append(el('span',t(' · Cancelled',' · 取消済み')));const controls=el('td'),slot=el('td'),extra=el('tr');slot.colSpan=5;extra.append(slot);extra.className='work-history-extra'; + if(writable&&entry.end_ms&&!entry.cancelled_ms){controls.append(button(t('Edit','訂正'),()=>editor(entry,slot,'correct')),button(t('Cancel','取消'),()=>editor(entry,slot,'cancel')));} + audit(entry,slot);const values=[name,el('td',stamp(entry.start_ms)),el('td',stamp(entry.end_ms)),el('td',entry.end_ms?((entry.end_ms-entry.start_ms)/3600000).toFixed(2)+'h':'—'),controls];values.forEach((cell,i)=>{cell.dataset.label=head.children[i].textContent;row.append(cell);});tbody.append(row,extra); + }table.append(tbody);list.replaceChildren(table);if(!entries.length)list.append(el('p',t('No recordings in this period.','この期間の記録はありません。'))); + } + async function load(){const ticket=++sequence;controller?.abort();controller=new AbortController();refresh.disabled=true;list.inert=true;status.textContent=t('Loading…','読み込み中…');try{const query=new URLSearchParams({limit:'50'});if(from.value)query.set('from',from.value);if(to.value)query.set('to',to.value);if(cursor)query.set('after',cursor);const data=await request('work-history?'+query);if(ticket!==sequence)return;from.value=data.from;to.value=data.to;editing=null;render(data.items);status.textContent='';paging.replaceChildren();if(stack.length)paging.append(button(t('Previous','前のページ'),()=>{if(canLeave()){cursor=stack.pop();load();}}));if(data.next)paging.append(button(t('Next','次のページ'),()=>{if(canLeave()){stack.push(cursor);cursor=data.next;load();}}));return true;}catch(error){if(error.name!=='AbortError')status.textContent=error.message;}finally{if(ticket===sequence){refresh.disabled=false;list.inert=false;}}} + form.onsubmit=e=>{e.preventDefault();if(canLeave()){cursor='';stack=[];load();}};load(); +})(); diff --git a/static/js/tasks.js b/static/js/tasks.js index cc444eb..2ac644a 100644 --- a/static/js/tasks.js +++ b/static/js/tasks.js @@ -33,7 +33,7 @@ const routes = {today:'/v/plan/today',all:'/v/plan/tasks',projects:'/v/plan/projects'}; const icons = {carryover:'↶',today:'☀',tomorrow:'⇢',inbox:'↓',backlog:'≡',someday:'◇',review:'↻',all:'☷',projects:'▱',done:'✓',archived:'▣'}; Object.keys(icons).forEach(key => { const a = el('a'); a.href = routes[key] || '/v/plan/tasks/' + key; a.append(el('span',icons[key]),el('span',t(key))); if(view===key||(key==='tomorrow'&&view==='day'&&selectedDate===nextDay(today)))a.setAttribute('aria-current','page'); $('nav').append(a); }); - const schedule=el('a','▦ '+t('schedule'));schedule.href='/v/plan/tasks/schedule'+(projectID?'?project='+projectID:'');$('nav').append(schedule); + const schedule=el('a','▦ '+t('schedule'));schedule.href='/v/plan/tasks/schedule'+(projectID?'?project='+projectID:'');$('nav').append(schedule);const workHistory=el('a',ja?'◷ 作業記録':'◷ Work history');workHistory.href='/v/plan/tasks/work';$('nav').append(workHistory); $('date').textContent = view==='day'?selectedDate:today; $('heading').textContent = t(view === 'project' ? 'project' : view === 'detail' || view === 'new' ? 'all' : view); $('help').textContent = t(view==='today'?'todayHelp':view==='review'?'reviewHelp':'private'); $('search-label').textContent=t('search');$('quick-title').placeholder=t('quick');$('quick-title').setAttribute('aria-label',t('title')); diff --git a/templates/pages/organizer_dashboard.gohtml b/templates/pages/organizer_dashboard.gohtml index 857db47..b39508d 100644 --- a/templates/pages/organizer_dashboard.gohtml +++ b/templates/pages/organizer_dashboard.gohtml @@ -1,7 +1,7 @@ {{ define "organizer_dashboard.gohtml" }} -{{ T "organizer.dashboard" }} · {{ .WikiName }} +{{ T "organizer.dashboard" }} · {{ .WikiName }}
{{ template "auth-menu" . }}
{{ template "organizer-nav" . }}

{{ T "organizer.dashboard" }}

{{ .Today }} · {{ .Timezone }}

-
{{ end }} +{{ end }} diff --git a/templates/pages/organizer_settings.gohtml b/templates/pages/organizer_settings.gohtml index 3427858..a3a68ca 100644 --- a/templates/pages/organizer_settings.gohtml +++ b/templates/pages/organizer_settings.gohtml @@ -1,8 +1,8 @@ {{ define "organizer_settings.gohtml" }} -{{ T "organizer.settings" }} · {{ .WikiName }} +{{ T "organizer.settings" }} · {{ .WikiName }}
{{ template "auth-menu" . }}
{{ template "organizer-nav" . }}

{{ T "organizer.settings" }}

{{ T "organizer.private" }}

-{{ if .TasksEnabled }}

{{ end }} +{{ if .TasksEnabled }}

{{ end }} {{ if .CalendarEnabled }}

{{ T "organizer.calendar_defaults" }}

{{ end }} -
{{ end }} +{{ end }} diff --git a/templates/pages/task_work_history.gohtml b/templates/pages/task_work_history.gohtml new file mode 100644 index 0000000..ed8a48f --- /dev/null +++ b/templates/pages/task_work_history.gohtml @@ -0,0 +1,5 @@ +{{ define "task_work_history.gohtml" }} +{{ T "task.work_history" }} · {{ .WikiName }} +
{{ template "auth-menu" . }}
{{ template "organizer-nav" . }} +

{{ T "task.work_history" }}

{{ T "organizer.dashboard" }}

+{{ end }} diff --git a/templates/pages/tasks.gohtml b/templates/pages/tasks.gohtml index 9e51653..af73df1 100644 --- a/templates/pages/tasks.gohtml +++ b/templates/pages/tasks.gohtml @@ -11,4 +11,4 @@

    -{{ end }} +{{ end }}