diff --git a/docs/design/README.md b/docs/design/README.md index 212c1c3..a052544 100644 --- a/docs/design/README.md +++ b/docs/design/README.md @@ -9,6 +9,8 @@ language-neutral; existing English source documents remain here for traceability and future aligned translations, not as automatically current English editions. - Concepts and boundaries: chapters 1–6. +- [Task capture, work reporting and private address book](ja/task-productivity-contacts.md): + shared Web/CLI API, neomutt, defaults, daily digest and home search commands. - Existing product and runtime: chapters 7–11. - Organizer / task / calendar / RSS / mail / HTML editing proposals: chapters 12–17. - Operations, i18n, ordered work, decisions and sources: chapters 18–22. diff --git a/docs/design/implementation-roadmap.md b/docs/design/implementation-roadmap.md index 1bc9bc7..2043822 100644 --- a/docs/design/implementation-roadmap.md +++ b/docs/design/implementation-roadmap.md @@ -1,5 +1,17 @@ # Architecture Implementation Roadmap +## Task productivity and private contacts (2026-11-01) + +- [x] Add idempotent task capture API and neomutt configuration reference. +- [x] Extend pages-cli with task planning, start/stop records, reports and private contact lookup. +- [x] Add per-user defaults, accomplishment heatmap and opt-in daily SMTP task digest. +- [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. +- [ ] Shared address books, CardDAV synchronization, work-record corrections and manual digest retry. + +See [contracts and remaining scope](ja/task-productivity-contacts.md). These checks describe +the implemented slice; production rollout and test evidence are recorded separately. + ## Current highest priority (2026-10-31) The user-prioritized [daily UX / browser / editor / CLI backlog](ja/priority-ux-20261031.md) diff --git a/docs/design/ja/calendar-contacts.md b/docs/design/ja/calendar-contacts.md index 9bd202f..630dc9a 100644 --- a/docs/design/ja/calendar-contacts.md +++ b/docs/design/ja/calendar-contacts.md @@ -1,6 +1,6 @@ # 14. 予定・iCalendar・CalDAV・連絡先 -状態:カレンダー部分は2026-09-22にローカル正本・Plan UI・限定CalDAVを実装開始。最新の契約・実装範囲・残作業は [カレンダー詳細設計](calendar-implementation.md) を参照。以下の旧順序/URI案より同設計を優先する。連絡先と外部同期は引き続き設計案。 +状態:カレンダー部分は2026-09-22にローカル正本・Plan UI・限定CalDAVを実装開始。最新の契約・実装範囲・残作業は [カレンダー詳細設計](calendar-implementation.md) を参照。2026-11-01に個人アドレス帳のCRUD・vCard入出力・neomutt検索を実装した。[個人アドレス帳の実装契約](task-productivity-contacts.md)を以下の旧URI案より優先する。共有アドレス帳とCardDAV同期は引き続き設計案。 ## 四つのレイヤー diff --git a/docs/design/ja/index.md b/docs/design/ja/index.md index 01e391a..95661ea 100644 --- a/docs/design/ja/index.md +++ b/docs/design/ja/index.md @@ -4,6 +4,8 @@ ## この設計書の読み方 +2026-11-01追加:[タスク作成・作業記録・達成度レポート・日次メール・個人アドレス帳](task-productivity-contacts.md)。[neomuttとCLIの操作リファレンス](../../operations/neomutt-tasks.md)も参照。 + - **実装済み**:利用できる機能の範囲。関連する制約や未監査部分も併記します。 - **設計案**:今回具体化した方針。API・テーブル・既定値は、実装や互換性試験で確定させます。 - **TODO**:未実装の作業。記述やURL例が存在しても利用可能とは限りません。 diff --git a/docs/design/ja/roadmap.md b/docs/design/ja/roadmap.md index dcbc3c9..37489bf 100644 --- a/docs/design/ja/roadmap.md +++ b/docs/design/ja/roadmap.md @@ -4,6 +4,8 @@ ## 優先順 +2026-11-01:[タスク作成・作業記録・達成度・日次メール・個人アドレス帳](task-productivity-contacts.md)を追加。Web/CLI/neomuttの共通capture、時間記録、既定値、検索コマンドを接続。共有アドレス帳とCardDAV同期、作業記録の事後訂正、日次メールの再送・保持期間は同設計の後続範囲へ集約する。 + 2026-10-31:ユーザ指定により[日常操作・ブラウザ・エディタ・CLI](priority-ux-20261031.md)を次期開発の最優先とする。下記の従来機能追加より優先するが、認可・データ保全の安全条件は省略しない。TODO、受け入れ条件、復元用チェックポイントを同文書に集約する。 2026-09-27追記:`organizer.tasks 0.11.1`で[既定タスクリスト名の変更](task-dav-default-list-name.md)を実装し、12:51 JSTに[本番両インスタンスへ反映](../../operations/deployments/2026-09-27-default-task-list-name.md)。PROPPATCH 405を解消し、利用者・domain別の表示名を保存、全探索結果へ反映する。実機再試行は確認待ち。色・アイコン・通常プロジェクトのPROPPATCHは別件。 diff --git a/docs/design/ja/task-productivity-contacts.md b/docs/design/ja/task-productivity-contacts.md new file mode 100644 index 0000000..c0fa335 --- /dev/null +++ b/docs/design/ja/task-productivity-contacts.md @@ -0,0 +1,74 @@ +# タスク作成と作業記録と個人アドレス帳 + +タスクの入口をWeb・CLI・メールで共通化する。タスク、作業記録、既定値、配信設定、連絡先はDomainと本人に属する。既存のタスクAPI・CalDAVを変更せず、個人向けAPIを追加する。管理者であることだけでは他人のデータを読めない。 + +## 作成API + +基点は `/_/api/v1/extension/organizer.tasks/`。通常のログインセッションのBearer認証を使う。CalDAV専用資格情報はこのAPIの資格情報ではない。 + +| 操作 | Methodと相対URI | 契約 | +| --- | --- | --- | +| タスクを作る | POST `capture` | UUIDのrequest_id、titleが必須。notes、project_uuid、assignee_uuid、due_on、start_on、planned_on、review_on、estimate_minutes、complexityを指定可能 | +| 既定値 | GET / PUT `preferences` | PUTはGETしたversionを含める。競合は412 | +| 実行中の記録 | GET `work` | itemがnullなら停止中 | +| 開始 | POST `work` | action=start、uuid、task_uuid。開始時刻はサーバーで記録 | +| 終了 | POST `work` | action=stopとGETで得たitem。versionで条件付き更新 | +| レポート | 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なしのカレンダー限定 | + +captureは省略した項目に本人の既定値を適用する。日付の空文字は既定値を使わず明示的に解除する。日数は作成日のドメインtimezoneにおける暦日で、0は当日、空欄は未設定。担当者UUIDは計画上の注記であり、所有権の移転や閲覧権限の付与ではない。 + +同じrequest_id・同じ要求内容の再送は既存タスクを返す。最初の保存後に既定値やタスクが更新されても作り直さない。同じrequest_idで別内容を送ると412。要求のreceiptとタスクRevisionは同一トランザクションで保存する。API入力は32 KiBまで、件名300 UTF-8 bytes、メモ16 KiBまで。 + +calendar-captureも同じUIDを再利用し、再送で既存予定を上書きしない。時刻は `2026-11-02T09:00` のドメイン時刻、またはオフセット付きRFC 3339。終了は開始後、最大31日。予定内容を取得する前にPersonalLocal制約をロック内で検査する。外部取り込みカレンダーの内容を読まない。 + +## 作業時間と達成度 + +Webのタスク行の▶から開始し、上部の作業記録欄で終了する。CLIは `task start UUID` / `task stop`。タイマーはサーバーで継続するので、ブラウザや端末を閉じても止まらない。停止はタスク完了とは別操作。忘れずに終了すること。同一人物で同時に開始できる記録は1件。 + +`/v/plan/tasks/report` は完了数、ポイント、作業時間、Pomodoro集中時間を表示する。ポイントは `1 + ceil(見積分数 / 30) × 複雑度`。複雑度は1〜5、未設定の旧タスクは1。見積なしは1ポイント。完了の取消は集計から除外し、再完了するとその日の実績になる。完了済みタスクの見積変更も現在のポイントへ反映される。これは個人の振り返り指標であり、人事評価や客観的生産性の尺度ではない。 + +深夜をまたぐ作業はローカル日付境界で分割し、夏時間の日も24時間固定にしない。Pomodoroと手動記録は別集計で、両者を合算しない。各系列は最大10,000件で、上限到達時はpartialを返して期間の絞り込みを促す。 + +## 毎日のメール + +`/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として残す。結果不明の場合は自動再送せず、二重送信を避ける。翌日は通常通り処理し、過去日の取りこぼしをまとめて送らない。設定画面に直近結果を表示する。 + +## トップ検索コマンド + +```text +add task 見積を確認 project:"開発 計画" cost:2h due:2026-11-03 review:2026-11-02 complexity:3 +add task 文書を書く start:2026-11-02 planned:2026-11-02 +add cal 打ち合わせ calendar:personal from:2026-11-02T09:00 to:2026-11-02T10:00 +``` + +`project:` は名前またはUUID、候補を表示する。`calendar:` は名前・pretty_name・UUID、対象が1つだけなら省略可能。スペースを含む名前は引用符で囲む。工数は2h、30m、1.5hなど整数分に換算できる値。日付はYYYY-MM-DD。 + +Enterでは確認欄を表示し、「作成」で保存する。通常の検索候補への移動とは分離する。未知のオプション・重複指定・曖昧な名前は拒否。通信失敗時は同じ画面の再試行で同じrequest_idを使用する。トップ検索の入力は再読込をまたぐ永続下書きではない。 + +## 個人アドレス帳 + +画面は `/v/plan/contacts`、APIは `/_/api/v1/extension/organizer.contacts/`。拡張機能organizer.contactsを無効化すると読み書きとも停止する。Principal・プロフィール連絡先とは独立し、メール一致による自動アカウント紐付けはしない。 + +名前、複数メール・電話、所属、メモを編集できる。GET itemsはqとafterで最大100件ずつ検索・取得。POST itemsでUUID付き新規作成、GET items/UUIDで詳細、PUT items/UUIDでversionとIf-Matchを伴う条件付き更新。削除はdeleted=trueの同じPUTで行い、一覧から除外する。「削除済み」へ切り替えて復元できる(一覧APIのdeleted=1、更新時deleted=false)。削除したデータとvCard snapshotは保全される。 + +POST importは1件のUTF-8 vCard、GET items/UUID.vcfは書き出し。Webは最大2 MiB・200件のファイルを確認後に1件ずつ取り込み、失敗したカード番号を報告する。原子的な一括処理ではなく、成功分は保持する。同じUID・同じ内容は重複登録せず、同じUIDの異なる内容は412。UIDなしは入力バイト列のSHA-256から安定したUIDを補う。 + +vCard 3.0/4.0のUTF-8を対象とし、fold/unfold、テキストescape、複数のEMAIL/TEL、未知propertyを扱う。未対応propertyは保存・再出力し、PHOTO等の外部URLを取得しない。変更していない編集項目のparameterや繰り返しも保持する。変更した項目は画面の値で置換するため、その項目のTYPE等は外れる。vCard 2.1、ENCODING/CHARSET指定、壊れた行は欠落を起こす前に拒否する。1件64 KiBまで。 + +vCardの内容はDocumentStore snapshot、現在値と所有者・version・検索用projectionはSQLite、履歴はorganizer_contact_revisionsに保存する。DR snapshotのDocument参照抽出にも連絡先の現在・履歴を含める。一般のWiki/アセットURLに公開するための登録はしない。 + +## 移行と後続範囲 + +managed schemaにtask-productivityとcontactsを追加。task-productivityは既存organizer_items作成後に実行し、旧完了タスクを1回だけ集計projectionへ移す。既存スキーマ定義の改変ではない。切戻しでは旧版のschema checkが新コンポーネントを未知とするため、単に旧イメージを起動できるとは扱わない。データを消して戻さない。 + +- 連絡先の共有アドレス帳、CardDAV提供・外部双方向同期、重複候補mergeは別段階。今回の個人アドレス帳APIをCardDAV対応とは称さない。 +- 作業記録の事後修正・取消、失効Domainで取り残された記録の管理用終了手順、プロジェクト別集計、担当者への共有・通知は後続。 +- 日次メールの手動再送・配信ログの保管期間、receiptの失効設計は後続。安易な削除で重複作成・配信を復活させない。 +- 連絡先履歴の画面復元・アドレス帳一括export、vCard legacy変換は後続。 + +利用手順は [neomuttとタスクCLI](../../operations/neomutt-tasks.md) を参照。 diff --git a/docs/operations/neomutt-tasks.md b/docs/operations/neomutt-tasks.md new file mode 100644 index 0000000..b866c8e --- /dev/null +++ b/docs/operations/neomutt-tasks.md @@ -0,0 +1,109 @@ +# neomuttとpages CLIによるタスク管理 + +メールからタスクを作り、作業の開始・終了を記録し、個人アドレス帳をneomuttの宛先補完に使う。先に通常の端末でpages-cliを設定してログインする。neomuttの設定やシェル履歴にトークンを書かない。 + +```sh +pages configure --origin https://pages.anya.jp --username YOUR_USERNAME +pages login --oidc --no-browser +pages task --help +``` + +別接続を使うときは `pages --profile NAME task ...`。保存セッションはprivateなプロファイルファイルを使い、処理中はプロファイルロックを取得する。 + +## メールから作成 + +```sh +pages task from-mail < message.eml +pages task from-mail --project '開発 計画' --due 2026-11-03 < message.eml +# 本文を保存してよいメールに限り明示する +pages task from-mail --include-body < message.eml +``` + +既定では件名をタスク名、From・Date・Message-IDをメモにする。本文と添付はアップロードしない。include-bodyはplain text本文だけを追加し、HTML画像・添付・外部URLは取得しない。1通2 MiB、メモ16 KiBが上限。件名が300 UTF-8 bytesを超える場合は `--title '短い件名'` で指定する。 + +同じ接続・本人・Message-IDから同じrequest_idを作るため、同じメールの再取り込みで重複しない。Message-IDなしはメール全体のSHA-256を使う。同じメールを別の独立タスクにもしたい場合は `task add` を使う。 + +`~/.config/neomutt/neomuttrc` の例。pagesの絶対パスはインストール先に合わせる。件名等をシェルコマンド文字列に展開せず、メールを標準入力で渡す。 + +```muttrc +set pipe_split = yes +set pipe_decode = no +macro index,pager ,t "/home/anya/.local/bin/pages task from-mail" "Create PagesWiki task" +``` + +`,` → `t` で選択メールを取り込む。pipe_splitは複数メールを1つのMIME入力へ連結しないため、pipe_decode=noはCLI側でMIMEを解釈するための設定。既存のpipe操作にも影響するので、自分の設定と合わせて確認する。[NeoMutt設定リファレンス](https://neomutt.org/guide/reference.html)を参照。 + +## 通信失敗と再送 + +CLIは作成要求を送信前にprivateなセッションファイルへ保持する。失敗時に表示するrequest_idで明示的に再送する。 + +```sh +pages task retry REQUEST_UUID +``` + +最大20件を保留でき、成功した要求はローカルから削除する。同じ本人への再ログインで保留分を維持する。別アカウントへ切り替える場合は別プロファイルを使う。認証済みセッションがない状態からの完全オフライン入力受付ではない。 + +サーバーで保存された直後に応答が失われても、同じrequest_idで再送すれば既存タスクが返る。保留要求を書き換えて再送すると412になる。セッションファイルにはトークンもあるため、デバッグ目的で内容を貼り付けない。 + +## 計画と実績 + +```sh +pages task project-add '開発 計画' +pages task projects +pages task preferences --project '開発 計画' --due-days 3 --review-days 1 --estimate 60 --complexity 2 +pages task add '設計をレビュー' --estimate 120 --planned 2026-11-02 +pages task list --view today +pages task update TASK_UUID --due 2026-11-04 +pages task start TASK_UUID +pages task status +pages task stop +pages task done TASK_UUID +pages task report --from 2026-11-01 --to 2026-12-01 +pages task report --from 2026-11-01 --to 2026-12-01 --json +``` + +stopは作業記録の終了、doneはタスクの完了。両者は独立している。見積は分単位、complexityは1〜5。期間のtoは含まない。CSV等への後処理にはJSONを使う。APIはドメインのタイムゾーンで日付を集計する。 + +日次メールを設定する例。SMTP設定と本人のメール登録が必要で、CLIを実行しただけでは第三者へ送信しない。 + +```sh +pages task preferences --digest on --at 09:00 --timezone Asia/Tokyo +pages task preferences --digest off +``` + +## neomuttの宛先補完 + +```sh +pages contacts list --query 田中 +pages contacts import contact.vcf +pages contacts export CONTACT_UUID > contact.vcf +pages contacts query 田中 --neomutt +``` + +```muttrc +set query_command = "/home/anya/.local/bin/pages contacts query --neomutt -- %s" +bind editor complete-query +``` + +neomuttは%sをシェル用に引用するので、%sをさらに引用符で囲まない。出力は先頭の状態行と、メール・名前・所属のタブ区切り。`--`は検索語をCLIオプションとして解釈させないために付ける。標準のCtrl-Tによる補完を残したい場合はbind行を省略する。[外部アドレス検索](https://neomutt.org/guide/advancedusage.html#query)、[query_command](https://neomutt.org/guide/reference.html#query-command)。 + +連絡先は本人のDomain内だけを検索し、最大100件。メールアドレスのない連絡先は候補に出ない。ログイン切れの場合は通常の端末で再ログインする。書き出したvCardには非公開情報が含まれるため、ファイル権限と保存先を確認する。 + +## HTTPクライアントから使う + +`POST https://pages.anya.jp/_/api/v1/extension/organizer.tasks/capture` + +Content-Typeはapplication/json、AuthorizationはBearerセッション。例示UUIDは要求ごとに生成し、通信再送時だけ同じものを使う。 + +```json +{ + "request_id": "884587b2-6ae5-4aef-86d0-fd21dac39d1c", + "title": "メールで依頼された内容を確認", + "notes": "Message-ID: ", + "estimate_minutes": 30, + "complexity": 2, + "due_on": "2026-11-03" +} +``` + +成功は201とitem。認証切れ401、権限不足403、要求IDの内容競合412、不正入力422。トークンをクエリ文字列に含めず、HTTPSで送る。詳細は [タスクと連絡先の設計](../design/ja/task-productivity-contacts.md) を参照。 diff --git a/internal/dr/snapshot.go b/internal/dr/snapshot.go index 37f42b8..cfa8058 100644 --- a/internal/dr/snapshot.go +++ b/internal/dr/snapshot.go @@ -508,7 +508,7 @@ func publish(stage, target string) error { func verifyReferences(ctx context.Context, database *sql.DB, seen map[string]bool) error { // Only authoritative references, not derived projection/preview caches. Some // installations predate optional modules, hence the explicit table check. - for _, ref := range [][2]string{{"revisions", "document_hash"}, {"assets", "head_document_hash"}, {"asset_head_history", "document_hash"}, {"organizer_items", "document_hash"}, {"organizer_revisions", "document_hash"}} { + for _, ref := range [][2]string{{"revisions", "document_hash"}, {"assets", "head_document_hash"}, {"asset_head_history", "document_hash"}, {"organizer_items", "document_hash"}, {"organizer_revisions", "document_hash"}, {"organizer_contacts", "hash"}, {"organizer_contact_revisions", "hash"}} { var exists bool if err := database.QueryRowContext(ctx, "SELECT EXISTS(SELECT 1 FROM sqlite_master WHERE type='table' AND name=?)", ref[0]).Scan(&exists); err != nil { return err diff --git a/internal/extensions/registry.go b/internal/extensions/registry.go index 41d40f6..e9ea030 100644 --- a/internal/extensions/registry.go +++ b/internal/extensions/registry.go @@ -21,7 +21,8 @@ type Manifest struct { func Catalog() []Manifest { return []Manifest{ - {ID: "organizer.tasks", APIVersion: 1, Version: "0.11.1", 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"}, SettingsPanel: "extensions", Builtin: true, Enabled: true, ResourceClass: "foreground+background+index"}, + {ID: "organizer.contacts", APIVersion: 1, Version: "0.1.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.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/contact_i18n.go b/internal/server/contact_i18n.go index 5cb76cf..cecbfc2 100644 --- a/internal/server/contact_i18n.go +++ b/internal/server/contact_i18n.go @@ -3,6 +3,7 @@ package server func init() { for lang, entries := range map[string]map[string]string{ "en": { + "contacts.title": "Private address book", "contacts.help": "Private contacts, vCard import/export and email address lookup.", "contact.title": "Contact details", "contact.phone": "Phone number", "contact.help": "Private by default, independently of your profile. A tap opens the phone app. Leave blank to remove. Use 3–15 digits with an optional leading +, spaces, hyphens or parentheses; extensions and service codes are not supported.", "contact.visibility_help": "The profile audience remains the upper limit. Anonymous access also requires the domain to permit public profiles. Administrators do not automatically see private numbers.", @@ -10,6 +11,7 @@ func init() { "contact.invalid_phone": "Enter a phone number with 3–15 digits and optional leading +; only spaces, hyphens and parentheses may separate digits.", }, "ja": { + "contacts.title": "個人アドレス帳", "contacts.help": "非公開の連絡先、vCard入出力、メールアドレス検索。", "contact.title": "連絡先", "contact.phone": "電話番号", "contact.help": "プロフィールとは別に、既定で非公開です。タップすると電話アプリを開きます。空欄で削除。3〜15桁の数字と先頭の+、空白・ハイフン・括弧を使用できます。内線やサービスコードは未対応です。", "contact.visibility_help": "プロフィールの公開範囲を上限とします。匿名公開にはドメイン側の許可も必要です。管理者でも非公開の番号は表示されません。", diff --git a/internal/server/contacts.go b/internal/server/contacts.go new file mode 100644 index 0000000..6327fb7 --- /dev/null +++ b/internal/server/contacts.go @@ -0,0 +1,133 @@ +package server + +import ( + "encoding/json" + "github.com/google/uuid" + "io" + "net/http" + "pageswiki/internal/store" + "strconv" + "strings" +) + +const contactsAPI = "/_/api/v1/extension/organizer.contacts/" + +func contactRoute(p string) bool { return p == "/v/plan/contacts" || strings.HasPrefix(p, contactsAPI) } +func (s *Server) handleContacts(w http.ResponseWriter, r *http.Request) { + w.Header().Set("Cache-Control", "private, no-store") + domain := s.domainUUIDForRequest(r) + if !s.systemExtensionEnabled(domain, "organizer.contacts") { + http.NotFound(w, r) + return + } + actor, active := s.calendarActor(r) + if actor == "" { + s.authRequired(w, r) + return + } + if r.Method != "GET" && r.Method != "HEAD" && !active { + taskError(w, store.ErrAccessDenied) + return + } + if r.URL.Path == "/v/plan/contacts" { + if r.Method != "GET" && r.Method != "HEAD" { + w.WriteHeader(405) + return + } + if _, _, e := s.store.Contacts(r.Context(), domain, actor, "", ""); e != nil { + taskError(w, e) + return + } + s.renderWithContext(w, r, "contacts.gohtml", map[string]any{"Title": "Contacts", "ContactWritable": active, "Path": r.URL.Path}) + return + } + key := strings.TrimPrefix(r.URL.Path, contactsAPI) + if key == "items" && r.Method == "GET" { + items, next, e := s.store.ListContacts(r.Context(), domain, actor, r.URL.Query().Get("q"), r.URL.Query().Get("after"), r.URL.Query().Get("deleted") == "1") + if e != nil { + taskError(w, e) + return + } + writeEventJSON(w, 200, map[string]any{"items": items, "next": next}) + return + } + if key == "import" && r.Method == "POST" { + raw, e := io.ReadAll(http.MaxBytesReader(w, r.Body, 65536)) + if e != nil { + taskError(w, store.ErrTaskInvalid) + return + } + c, e := s.store.SaveContact(r.Context(), domain, actor, store.Contact{UUID: uuid.NewString(), VCard: string(raw)}, true) + if e != nil { + taskError(w, e) + return + } + writeEventJSON(w, 201, map[string]any{"item": c}) + return + } + id := strings.TrimPrefix(key, "items/") + export := strings.HasSuffix(id, ".vcf") + if export { + id = strings.TrimSuffix(id, ".vcf") + } + if key != "items" { + if u, e := uuid.Parse(id); e != nil || u.String() != id { + http.NotFound(w, r) + return + } + } + if key != "items" && (r.Method == "GET" || r.Method == "HEAD") { + c, e := s.store.Contact(r.Context(), domain, actor, id) + if e != nil { + taskError(w, e) + return + } + w.Header().Set("ETag", `"`+strconv.FormatInt(c.Version, 10)+`"`) + if export { + w.Header().Set("Content-Type", "text/vcard; charset=utf-8") + w.Header().Set("Content-Disposition", `attachment; filename="contact.vcf"`) + w.Write([]byte(c.VCard)) + } else { + writeEventJSON(w, 200, map[string]any{"item": c}) + } + return + } + if !export && (key == "items" && r.Method == "POST" || key != "items" && r.Method == "PUT") { + var c store.Contact + decoder := json.NewDecoder(http.MaxBytesReader(w, r.Body, 128<<10)) + decoder.DisallowUnknownFields() + if decoder.Decode(&c) != nil || decoder.Decode(&struct{}{}) != io.EOF { + taskError(w, store.ErrTaskInvalid) + return + } + if key == "items" { + if c.Version != 0 { + taskError(w, store.ErrTaskInvalid) + return + } + } else { + if c.UUID != id { + taskError(w, store.ErrTaskInvalid) + return + } + if r.Header.Get("If-Match") == "" { + w.WriteHeader(428) + return + } + if r.Header.Get("If-Match") != `"`+strconv.FormatInt(c.Version, 10)+`"` { + taskError(w, store.ErrTaskConflict) + return + } + } + c, e := s.store.SaveContact(r.Context(), domain, actor, c, false) + if e != nil { + taskError(w, e) + return + } + w.Header().Set("ETag", `"`+strconv.FormatInt(c.Version, 10)+`"`) + writeEventJSON(w, 200, map[string]any{"item": c}) + return + } + w.Header().Set("Allow", "GET, HEAD, POST, PUT") + w.WriteHeader(405) +} diff --git a/internal/server/contacts_test.go b/internal/server/contacts_test.go new file mode 100644 index 0000000..61b9d28 --- /dev/null +++ b/internal/server/contacts_test.go @@ -0,0 +1,79 @@ +package server + +import ( + "context" + "github.com/google/uuid" + "net/http/httptest" + "pageswiki/internal/store" + "strings" + "testing" +) + +func TestContactsPreserveImportAndIsolation(t *testing.T) { + s, token, domain, actor := taskFixture(t) + ctx := context.Background() + raw := "BEGIN:VCARD\r\nVERSION:4.0\r\nUID:urn:test:person\r\nFN:田中\r\nEMAIL;TYPE=work:tanaka@example.invalid\r\nTEL;TYPE=cell:1234\r\nX-PRIVATE:keep\\,this\r\nPHOTO:https://example.invalid/do-not-fetch\r\nEND:VCARD\r\n" + c, e := s.store.SaveContact(ctx, domain, actor, store.Contact{UUID: uuid.NewString(), VCard: raw}, true) + if e != nil { + t.Fatal(e) + } + repeat, e := s.store.SaveContact(ctx, domain, actor, store.Contact{UUID: uuid.NewString(), VCard: raw}, true) + if e != nil || repeat.UUID != c.UUID { + t.Fatal("not idempotent", e) + } + c.Name = "変更" + c, e = s.store.SaveContact(ctx, domain, actor, c, false) + if e != nil { + t.Fatal(e) + } + for _, preserved := range []string{"EMAIL;TYPE=work:", "TEL;TYPE=cell:", "X-PRIVATE:keep\\,this", "PHOTO:https:"} { + if !strings.Contains(c.VCard, preserved) { + t.Fatal("lost", preserved) + } + } + old := c + old.Version-- + if _, e = s.store.SaveContact(ctx, domain, actor, old, false); e != store.ErrTaskConflict { + t.Fatal(e) + } + if _, e = s.store.Contact(ctx, domain, uuid.NewString(), c.UUID); e == nil { + t.Fatal("other user read") + } + req := httptest.NewRequest("GET", "http://localhost"+contactsAPI+"items?q=tanaka", nil) + req.Header.Set("Authorization", "Bearer "+token) + w := httptest.NewRecorder() + s.handleContacts(w, req) + if w.Code != 200 || !strings.Contains(w.Body.String(), "変更") { + t.Fatal(w.Code, w.Body) + } + c.Deleted = true + if _, e = s.store.SaveContact(ctx, domain, actor, c, false); e != nil { + t.Fatal(e) + } + items, _, e := s.store.Contacts(ctx, domain, actor, "", "") + if e != nil || len(items) != 0 { + t.Fatal(items, e) + } + if e = s.setSystemExtensionEnabled(domain, "organizer.contacts", false); e != nil { + t.Fatal(e) + } + if _, e = s.store.Contact(ctx, domain, actor, c.UUID); e != store.ErrAccessDenied { + t.Fatal(e) + } +} +func TestContactFormatValidation(t *testing.T) { + for _, raw := range []string{"BEGIN:VCARD\nVERSION:2.1\nFN:x\nEND:VCARD\n", "BEGIN:VCARD\nVERSION:4.0\nFN;ENCODING=QUOTED-PRINTABLE:x\nEND:VCARD\n", "BEGIN:VCARD\nVERSION:4.0\nFN:x\nmalformed\nEND:VCARD\n"} { + if _, e := store.ParseContact(raw); e == nil { + t.Fatal("accepted malformed/legacy") + } + } + raw := "BEGIN:VCARD\r\nVERSION:4.0\r\nFN:" + strings.Repeat("名", 90) + "\r\nNOTE:one\\ntwo\r\nEND:VCARD\r\n" + c, e := store.ParseContact(raw) + if e != nil { + t.Fatal(e) + } + again, e := store.ParseContact(c.VCard) + if e != nil || again.Name != c.Name || again.Notes != "one\ntwo" { + t.Fatal(again, e) + } +} diff --git a/internal/server/event_handlers.go b/internal/server/event_handlers.go index c83586d..ee97343 100644 --- a/internal/server/event_handlers.go +++ b/internal/server/event_handlers.go @@ -16,6 +16,7 @@ func (s *Server) registeredEventHandlers() *dregarnuhr.Registry { s.eventHandlersOnce.Do(func() { registry := &dregarnuhr.Registry{} handlers := map[string]dregarnuhr.Handler{ + store.TaskDigestEventType: s.deliverTaskDigests, store.NotificationPushEventType: func(ctx context.Context, job *store.EventJob) error { return s.deliverNotificationPushContext(ctx, job) }, diff --git a/internal/server/event_scheduler.go b/internal/server/event_scheduler.go index 8743c1a..b1db5a7 100644 --- a/internal/server/event_scheduler.go +++ b/internal/server/event_scheduler.go @@ -73,6 +73,9 @@ func (s *Server) startEventScheduler() { if err := s.store.EnsureTaskFocusEvent(); err != nil { log.Printf("focus timer initialization failed: %v", err) } + if err := s.store.EnsureTaskDigestEvent(); err != nil { + log.Printf("task digest initialization failed: %v", err) + } if err := s.store.EnsureNotificationPushEvent(); err != nil { log.Printf("notification push initialization failed: %v", err) } diff --git a/internal/server/productivity_browser_test.go b/internal/server/productivity_browser_test.go new file mode 100644 index 0000000..6e35064 --- /dev/null +++ b/internal/server/productivity_browser_test.go @@ -0,0 +1,80 @@ +package server + +import ( + "context" + "net/http" + "net/http/httptest" + "os" + "os/exec" + "strings" + "testing" + "time" +) + +func TestProductivityChromium(t *testing.T) { + if os.Getenv("PAGESWIKI_BROWSER_TEST") != "1" { + t.Skip("opt-in Chromium") + } + for _, view := range []string{"contacts", "settings", "report", "tasks", "home"} { + for _, size := range []string{"desktop", "mobile"} { + t.Run(view+"-"+size, func(t *testing.T) { + s, token, domain, actor := taskFixture(t) + s.mux.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) { s.renderSearchHome(w, r, "search") }) + item := newTaskRecord("task", "Browser work task") + item.Status = "done" + item.Estimate = 60 + item.Complexity = 3 + if _, e := s.store.SaveTask(context.Background(), domain, actor, item, 0); e != nil { + t.Fatal(e) + } + repo, e := s.calendars() + if e != nil { + t.Fatal(e) + } + if _, e = repo.Create(context.Background(), domain, actor, "Command calendar", "local"); e != nil { + t.Fatal(e) + } + script, e := os.ReadFile("internal/server/testdata/productivity-browser.js") + if e != nil { + t.Fatal(e) + } + path := map[string]string{"contacts": "/v/plan/contacts", "settings": "/v/plan/tasks/settings", "report": "/v/plan/tasks/report", "tasks": "/v/plan/tasks", "home": "/"}[view] + server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + r.Header.Set("Authorization", "Bearer "+token) + if r.Method == "GET" && r.URL.Path == path { + rec := httptest.NewRecorder() + s.withAuthorization(s.mux).ServeHTTP(rec, r) + for k, v := range rec.Header() { + w.Header()[k] = v + } + w.WriteHeader(rec.Code) + // The home template uses nonce CSP. Reuse its already generated nonce + // only in this synthetic fixture; production HTML is never rewritten. + nonce := "" + if csp := rec.Header().Get("Content-Security-Policy"); strings.Contains(csp, "'nonce-") { + nonce = strings.SplitN(strings.SplitN(csp, "'nonce-", 2)[1], "'", 2)[0] + } + w.Write([]byte(strings.Replace(rec.Body.String(), "", "", 1))) + return + } + s.withAuthorization(s.mux).ServeHTTP(w, r) + })) + defer server.Close() + width, height := "1440", "1000" + if size == "mobile" { + width, height = "390", "844" + } + ctx, cancel := context.WithTimeout(context.Background(), 45*time.Second) + defer cancel() + shot := "" + if prefix := os.Getenv("PAGESWIKI_PRODUCTIVITY_SCREENSHOT"); prefix != "" { + shot = prefix + "-" + view + "-" + size + ".png" + } + out, e := exec.CommandContext(ctx, "node", "internal/server/testdata/vim-browser-smoke.mjs", strings.Replace(server.URL, "127.0.0.1", "localhost", 1)+path, t.TempDir(), shot, width, height).CombinedOutput() + if e != nil { + t.Fatalf("%v: %s", e, out) + } + }) + } + } +} diff --git a/internal/server/smtp_delivery.go b/internal/server/smtp_delivery.go index 93b08a5..ed7000e 100644 --- a/internal/server/smtp_delivery.go +++ b/internal/server/smtp_delivery.go @@ -84,6 +84,10 @@ func sendMagicLinkSMTPWithTLS(ctx context.Context, config store.AuthProviderConf if err != nil { return err } + return deliverSMTPMessage(ctx, config, host, sender, addressee, message, tlsOverride) +} + +func deliverSMTPMessage(ctx context.Context, config store.AuthProviderConfig, host, sender, addressee string, message []byte, tlsOverride *tls.Config) error { ctx, cancel := context.WithTimeout(ctx, smtpDeliveryTimeout) defer cancel() connection, err := (&net.Dialer{Timeout: 3 * time.Second}).DialContext(ctx, "tcp", config.SMTPAddress) diff --git a/internal/server/task_calendar_capture_test.go b/internal/server/task_calendar_capture_test.go new file mode 100644 index 0000000..b972742 --- /dev/null +++ b/internal/server/task_calendar_capture_test.go @@ -0,0 +1,26 @@ +package server + +import ( + "context" + "github.com/google/uuid" + "testing" +) + +func TestTaskCalendarCapture(t *testing.T) { + s, token, domain, actor := taskFixture(t) + repo, e := s.calendars() + if e != nil { + t.Fatal(e) + } + c, e := repo.Create(context.Background(), domain, actor, "Command calendar", "local") + if e != nil { + t.Fatal(e) + } + input := map[string]any{"request_id": uuid.NewString(), "calendar_uuid": c.ID, "title": "会議", "from": "2026-11-02T09:00", "to": "2026-11-02T10:00"} + for range 2 { + w := taskRequest(s, token, "POST", "calendar-capture", input, "") + if w.Code != 201 { + t.Fatal(w.Code, w.Body) + } + } +} diff --git a/internal/server/task_cli_test.go b/internal/server/task_cli_test.go new file mode 100644 index 0000000..9410db1 --- /dev/null +++ b/internal/server/task_cli_test.go @@ -0,0 +1,32 @@ +package server + +import ( + "bytes" + "context" + "encoding/json" + "net/http" + "net/http/httptest" + "os/exec" + "testing" + "time" +) + +func TestTaskCLIHTTPIntegration(t *testing.T) { + if _, e := exec.LookPath("python3"); e != nil { + t.Skip("python3 not installed") + } + s, token, _, _ := taskFixture(t) + server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + r.Host = "localhost" + s.withAuthorization(s.mux).ServeHTTP(w, r) + })) + defer server.Close() + ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second) + defer cancel() + cmd := exec.CommandContext(ctx, "python3", "pages-cli/test_task_integration.py") + b, _ := json.Marshal(map[string]string{"origin": server.URL, "token": token, "root": t.TempDir()}) + cmd.Stdin = bytes.NewReader(b) + if out, e := cmd.CombinedOutput(); e != nil { + t.Fatalf("CLI task integration %v: %s", e, out) + } +} diff --git a/internal/server/task_digest.go b/internal/server/task_digest.go new file mode 100644 index 0000000..1b61183 --- /dev/null +++ b/internal/server/task_digest.go @@ -0,0 +1,104 @@ +package server + +import ( + "context" + "database/sql" + "encoding/base64" + "errors" + "fmt" + "strings" + "time" + + "pageswiki/internal/store" +) + +func sendTaskDigestSMTP(ctx context.Context, config store.AuthProviderConfig, recipient, day, body string) error { + // Reuse envelope validation and bounded TLS-aware SMTP transport, without + // exposing SMTP credentials, recipient or task content to job logs. + host, from, to, _, err := smtpMessage(config, recipient, "https://pages.invalid/") + if err != nil { + return err + } + sender, _ := smtpMailbox(config.SMTPFrom) + addressee, _ := smtpMailbox(recipient) + if len(body) > 128<<10 || len(day) != 10 || strings.ContainsAny(day, "\r\n\x00") { + return store.ErrTaskInvalid + } + encoded := base64.StdEncoding.EncodeToString([]byte(body)) + var lines strings.Builder + for len(encoded) > 76 { + lines.WriteString(encoded[:76] + "\r\n") + encoded = encoded[76:] + } + lines.WriteString(encoded + "\r\n") + message := []byte(fmt.Sprintf("To: %s\r\nFrom: %s\r\nSubject: PagesWiki tasks %s\r\nDate: %s\r\nMIME-Version: 1.0\r\nContent-Type: text/plain; charset=UTF-8\r\nContent-Transfer-Encoding: base64\r\n\r\n%s", addressee.String(), sender.String(), day, time.Now().Format(time.RFC1123Z), lines.String())) + return deliverSMTPMessage(ctx, config, host, from, to, message, nil) +} + +func (s *Server) deliverTaskDigests(ctx context.Context, job *store.EventJob) error { + ctx, cancel := context.WithTimeout(ctx, 30*time.Second) + defer cancel() + due, err := s.store.DueTaskDigests(ctx, time.Now()) + if err != nil { + return err + } + sent, uncertain := 0, 0 + for _, candidate := range due { + 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)) + } + return nil +} diff --git a/internal/server/task_productivity.go b/internal/server/task_productivity.go new file mode 100644 index 0000000..1c87a09 --- /dev/null +++ b/internal/server/task_productivity.go @@ -0,0 +1,268 @@ +package server + +import ( + "crypto/sha256" + "encoding/hex" + "encoding/json" + "io" + "net/http" + "strings" + "time" + + "github.com/google/uuid" + cal "pageswiki/internal/calendar" + "pageswiki/internal/store" +) + +func taskJSON(w http.ResponseWriter, r *http.Request, output any) bool { + d := json.NewDecoder(http.MaxBytesReader(w, r.Body, 32768)) + d.DisallowUnknownFields() + if d.Decode(output) != nil || d.Decode(&struct{}{}) != io.EOF { + taskError(w, store.ErrTaskInvalid) + return false + } + return true +} + +func defaultTask(p store.TaskPreferences, now time.Time) store.TaskRecord { + item := store.TaskRecord{Kind: "task", Status: "todo", Bucket: "inbox", Priority: 1, ProjectUUID: p.ProjectUUID, AssigneeUUID: p.AssigneeUUID, Estimate: p.Estimate, Complexity: p.Complexity} + for _, date := range []struct { + offset *int + target *string + }{{p.DueDays, &item.DueOn}, {p.StartDays, &item.StartOn}, {p.PlannedDays, &item.PlannedOn}, {p.ReviewDays, &item.ReviewOn}} { + if date.offset != nil { + *date.target = now.AddDate(0, 0, *date.offset).Format("2006-01-02") + } + } + return item +} + +type taskCaptureInput struct { + RequestID string `json:"request_id"` + Title string `json:"title"` + Notes string `json:"notes"` + ProjectUUID *string `json:"project_uuid"` + AssigneeUUID *string `json:"assignee_uuid"` + DueOn *string `json:"due_on"` + StartOn *string `json:"start_on"` + PlannedOn *string `json:"planned_on"` + ReviewOn *string `json:"review_on"` + Estimate *int `json:"estimate_minutes"` + Complexity *int `json:"complexity"` +} + +func (s *Server) handleTaskProductivity(w http.ResponseWriter, r *http.Request, actor string, active bool, kind string) { + domain := s.domainUUIDForRequest(r) + if r.Method != "GET" && !active { + taskError(w, store.ErrAccessDenied) + return + } + switch kind { + case "calendar-capture": + if r.Method == "POST" { + if !s.systemExtensionEnabled(domain, "organizer.calendar") { + http.NotFound(w, r) + return + } + var input struct { + RequestID string `json:"request_id"` + CalendarUUID string `json:"calendar_uuid"` + Title string `json:"title"` + Start string `json:"from"` + End string `json:"to"` + } + if !taskJSON(w, r, &input) { + return + } + if id, e := uuid.Parse(input.RequestID); e != nil || id.String() != input.RequestID || strings.TrimSpace(input.Title) == "" || len(input.Title) > 300 { + taskError(w, store.ErrTaskInvalid) + return + } + if _, _, e := s.store.ListTasks(r.Context(), domain, actor, store.TaskQuery{Kind: "task", View: "all", Today: time.Now().In(s.getLocation(domain)).Format("2006-01-02"), Limit: 1}); e != nil { + taskError(w, e) + return + } + parse := func(value string) (time.Time, error) { + if strings.HasSuffix(value, "Z") || len(value) > 19 { + return time.Parse(time.RFC3339, value) + } + v, e := time.ParseInLocation("2006-01-02T15:04", value, s.getLocation(domain)) + if e == nil && v.Format("2006-01-02T15:04") != value { + e = store.ErrTaskInvalid + } + return v, e + } + start, e1 := parse(input.Start) + end, e2 := parse(input.End) + if e1 != nil || e2 != nil || !end.After(start) || end.Sub(start) > 31*24*time.Hour { + taskError(w, store.ErrTaskInvalid) + return + } + repo, e := s.calendars() + if e != nil { + taskError(w, e) + return + } + event, e := cal.Build("", cal.Event{UID: input.RequestID, Summary: input.Title, Start: start, End: end}) + if e != nil { + calendarError(w, e) + return + } + c, event, e := repo.TaskBlock(r.Context(), domain, input.CalendarUUID, actor, input.RequestID, &event) + if e != nil { + calendarError(w, e) + return + } + writeEventJSON(w, 201, map[string]any{"uid": event.UID, "calendar": c.PrettyName}) + return + } + case "preferences": + if r.Method == "GET" { + p, err := s.store.TaskPreferences(r.Context(), domain, actor) + if err != nil { + taskError(w, err) + return + } + if p.Version == 0 { + p.Timezone = s.getTimezoneName(domain) + } + last, err := s.store.LastTaskDigest(r.Context(), domain, actor) + if err != nil { + taskError(w, err) + return + } + writeEventJSON(w, 200, map[string]any{"preferences": p, "defaults": defaultTask(p, time.Now().In(s.getLocation(domain))), "timezone": s.getTimezoneName(domain), "last_digest": last}) + return + } + if r.Method == "PUT" { + var p store.TaskPreferences + if !taskJSON(w, r, &p) { + return + } + if p.DigestEnabled { + 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 + } + } + p, err := s.store.SaveTaskPreferences(r.Context(), domain, actor, p, time.Now()) + if err != nil { + taskError(w, err) + return + } + writeEventJSON(w, 200, map[string]any{"preferences": p}) + return + } + case "capture": + if r.Method == "POST" { + var input taskCaptureInput + if !taskJSON(w, r, &input) { + return + } + if id, err := uuid.Parse(input.RequestID); err != nil || id.String() != input.RequestID { + taskError(w, store.ErrTaskInvalid) + return + } + p, err := s.store.TaskPreferences(r.Context(), domain, actor) + if err != nil { + taskError(w, err) + return + } + item := defaultTask(p, time.Now().In(s.getLocation(domain))) + item.Title = input.Title + item.Notes = input.Notes + for _, v := range []struct { + from *string + to *string + }{{input.ProjectUUID, &item.ProjectUUID}, {input.AssigneeUUID, &item.AssigneeUUID}, {input.DueOn, &item.DueOn}, {input.StartOn, &item.StartOn}, {input.PlannedOn, &item.PlannedOn}, {input.ReviewOn, &item.ReviewOn}} { + if v.from != nil { + *v.to = *v.from + } + } + if input.Estimate != nil { + item.Estimate = *input.Estimate + } + if input.Complexity != nil { + item.Complexity = *input.Complexity + } + raw, _ := json.Marshal(input) + hash := sha256.Sum256(raw) + item, err = s.store.CaptureTask(r.Context(), domain, actor, input.RequestID, hex.EncodeToString(hash[:]), item) + if err != nil { + taskError(w, err) + return + } + s.taskResponse(w, r, item, 201) + return + } + case "work": + if r.Method == "GET" { + v, err := s.store.ActiveTaskWork(r.Context(), domain, actor) + if err != nil { + taskError(w, err) + return + } + writeEventJSON(w, 200, map[string]any{"item": v, "server_now_ms": time.Now().UnixMilli()}) + return + } + if r.Method == "POST" { + var input struct { + store.TaskWork + Action string `json:"action"` + } + if !taskJSON(w, r, &input) { + return + } + v, err := s.store.ChangeTaskWork(r.Context(), domain, actor, input.Action, input.TaskWork, time.Now()) + if err != nil { + taskError(w, err) + return + } + writeEventJSON(w, 200, map[string]any{"item": v, "server_now_ms": time.Now().UnixMilli()}) + return + } + case "report": + if r.Method == "GET" { + 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(-1, 0, 0) + for _, v := range []struct { + key string + target *time.Time + }{{"from", &start}, {"to", &end}} { + if value := r.URL.Query().Get(v.key); value != "" { + parsed, err := time.ParseInLocation("2006-01-02", value, now.Location()) + if err != nil || parsed.Format("2006-01-02") != value { + taskError(w, store.ErrTaskInvalid) + return + } + *v.target = parsed + } + } + report, err := s.store.TaskReport(r.Context(), domain, actor, start, end, now) + if err != nil { + taskError(w, err) + return + } + writeEventJSON(w, 200, report) + return + } + } + w.Header().Set("Allow", map[string]string{"calendar-capture": "POST", "capture": "POST", "work": "GET, POST", "report": "GET", "preferences": "GET, PUT"}[kind]) + w.WriteHeader(405) +} + +func (s *Server) handleTaskProductivityPage(w http.ResponseWriter, r *http.Request, active bool) { + view := strings.TrimPrefix(r.URL.Path, "/v/plan/tasks/") + s.renderWithContext(w, r, "task_productivity.gohtml", map[string]any{"Title": "Tasks", "ProductivityView": view, "TaskWritable": active, "Path": r.URL.Path}) +} diff --git a/internal/server/task_productivity_test.go b/internal/server/task_productivity_test.go new file mode 100644 index 0000000..49f9ff8 --- /dev/null +++ b/internal/server/task_productivity_test.go @@ -0,0 +1,187 @@ +package server + +import ( + "context" + "encoding/base64" + "encoding/json" + "strings" + "testing" + "time" + + "github.com/google/uuid" + "pageswiki/internal/store" +) + +func TestTaskDigestSMTPContent(t *testing.T) { + address, _, done := fakeSMTP(t, "", false) + body := "やること\n- 私用タスク\n" + if e := sendTaskDigestSMTP(context.Background(), store.AuthProviderConfig{SMTPAddress: address, SMTPFrom: "wiki@example.test"}, "reader@example.test", "2026-11-01", body); e != nil { + t.Fatal(e) + } + result := <-done + parts := strings.SplitN(strings.ReplaceAll(result.message, "\r\n", "\n"), "\n\n", 2) + if len(parts) != 2 { + t.Fatal("missing MIME body") + } + decoded, e := base64.StdEncoding.DecodeString(strings.Join(strings.Fields(parts[1]), "")) + if e != nil || string(decoded) != body { + t.Fatal("body encoding", e) + } + if !strings.Contains(parts[0], "Subject: PagesWiki tasks 2026-11-01") || strings.Contains(parts[0], "私用") { + t.Fatal("wrong headers") + } +} + +func TestTaskCaptureDefaultsReplayAndPermissions(t *testing.T) { + s, token, domain, actor := taskFixture(t) + ctx := context.Background() + days := 2 + p := store.TaskPreferences{AssigneeUUID: actor, DueDays: &days, Complexity: 3, Estimate: 60, Timezone: "Asia/Tokyo", DigestTime: "09:00"} + p, err := s.store.SaveTaskPreferences(ctx, domain, actor, p, time.Now()) + if err != nil { + t.Fatal(err) + } + id := uuid.NewString() + input := map[string]any{"request_id": id, "title": "Mail task", "notes": "Subject only"} + w := taskRequest(s, token, "POST", "capture", input, "") + if w.Code != 201 { + t.Fatalf("capture %d %s", w.Code, w.Body) + } + var response struct { + Item store.TaskRecord `json:"item"` + } + if err = json.Unmarshal(w.Body.Bytes(), &response); err != nil { + t.Fatal(err) + } + if response.Item.Complexity != 3 || response.Item.Estimate != 60 || response.Item.AssigneeUUID != actor || response.Item.DueOn == "" { + t.Fatalf("defaults missing %+v", response.Item) + } + p.Estimate = 120 + if _, err = s.store.SaveTaskPreferences(ctx, domain, actor, p, time.Now()); err != nil { + t.Fatal(err) + } + if w = taskRequest(s, token, "POST", "capture", input, ""); w.Code != 201 { + t.Fatalf("retry %d %s", w.Code, w.Body) + } + loaded, err := s.store.GetTask(ctx, domain, actor, id) + if err != nil || loaded.Estimate != 60 || loaded.Version != 1 { + t.Fatal(loaded, err) + } + input["title"] = "Different" + if w = taskRequest(s, token, "POST", "capture", input, ""); w.Code != 412 { + t.Fatalf("conflicting replay %d", w.Code) + } + input["request_id"] = uuid.NewString() + input["due_on"] = "" + if w = taskRequest(s, token, "POST", "capture", input, ""); w.Code != 201 { + t.Fatal(w.Code, w.Body) + } + if err = json.Unmarshal(w.Body.Bytes(), &response); err != nil || response.Item.DueOn != "" { + t.Fatal("explicit clear lost", err) + } + if w = taskRequest(s, "", "POST", "capture", input, ""); w.Code == 201 { + t.Fatal("anonymous capture") + } + 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", "capture", input, ""); w.Code != 403 { + t.Fatal("readonly capture", w.Code) + } +} + +func TestTaskWorkReportSplitsMidnightAndCompletion(t *testing.T) { + s, _, domain, actor := taskFixture(t) + ctx := context.Background() + item := newTaskRecord("task", "Tracked task") + item.Estimate = 60 + item.Complexity = 3 + item, err := s.store.SaveTask(ctx, domain, actor, item, 0) + if err != nil { + t.Fatal(err) + } + loc, _ := time.LoadLocation("Asia/Tokyo") + start := time.Date(2026, 11, 1, 23, 30, 0, 0, loc) + end := start.Add(90 * time.Minute) + v, err := s.store.ChangeTaskWork(ctx, domain, actor, "start", store.TaskWork{UUID: uuid.NewString(), TaskUUID: item.UUID}, start) + if err != nil { + t.Fatal(err) + } + if _, err = s.store.ChangeTaskWork(ctx, domain, actor, "start", store.TaskWork{UUID: uuid.NewString(), TaskUUID: item.UUID}, start); err != store.ErrTaskConflict { + t.Fatal("second active timer", err) + } + v, err = s.store.ChangeTaskWork(ctx, domain, actor, "stop", v, end) + if err != nil { + t.Fatal(err) + } + if again, e := s.store.ChangeTaskWork(ctx, domain, actor, "stop", v, end.Add(time.Hour)); e != nil || again.EndMS != v.EndMS { + t.Fatal("stop replay changed duration", e) + } + a := time.Date(2026, 11, 1, 0, 0, 0, 0, loc) + report, err := s.store.TaskReport(ctx, domain, actor, a, a.AddDate(0, 0, 2), end) + if err != nil { + t.Fatal(err) + } + if len(report.Tasks) != 1 || report.Tasks[0].WorkMS != 90*60000 || report.Days[0].WorkMS != 30*60000 || report.Days[1].WorkMS != 60*60000 { + t.Fatalf("wrong split %+v", report) + } + item.Status = "done" + item, err = s.store.SaveTask(ctx, domain, actor, item, item.Version) + if err != nil { + t.Fatal(err) + } + now := time.Now().In(loc) + day := time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, loc) + report, err = s.store.TaskReport(ctx, domain, actor, day, day.AddDate(0, 0, 1), now) + if err != nil || report.Days[0].Points != 7 || report.Days[0].Completed != 1 { + t.Fatal("points", report, err) + } + item.Status = "todo" + if _, err = s.store.SaveTask(ctx, domain, actor, item, item.Version); err != nil { + t.Fatal(err) + } + report, err = s.store.TaskReport(ctx, domain, actor, day, day.AddDate(0, 0, 1), now) + if err != nil || report.Days[0].Points != 0 { + t.Fatal("reopen did not retract", err) + } +} + +func TestTaskDigestClaimOnceAndOptOut(t *testing.T) { + s, _, domain, actor := taskFixture(t) + ctx := context.Background() + now := time.Date(2026, 11, 1, 8, 0, 0, 0, time.UTC) + p := store.TaskPreferences{Complexity: 1, DigestEnabled: true, DigestTime: "09:00", Timezone: "UTC"} + p, err := s.store.SaveTaskPreferences(ctx, domain, actor, p, now) + if err != nil { + t.Fatal(err) + } + if rows, e := s.store.DueTaskDigests(ctx, now); e != nil || len(rows) != 0 { + t.Fatal(rows, e) + } + now = now.Add(2 * time.Hour) + due, err := s.store.DueTaskDigests(ctx, now) + if err != nil || len(due) != 1 { + t.Fatal(due, err) + } + claim, err := s.store.ClaimTaskDigest(ctx, due[0], now) + if err != nil { + t.Fatal(err) + } + if _, e := s.store.ClaimTaskDigest(ctx, due[0], now); e == nil { + t.Fatal("double claim") + } + if err = s.store.FinishTaskDigest(ctx, claim, "sent"); 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, claim); err == nil { + t.Fatal("opt-out not enforced") + } +} diff --git a/internal/server/tasks_handler.go b/internal/server/tasks_handler.go index 6815972..1a56914 100644 --- a/internal/server/tasks_handler.go +++ b/internal/server/tasks_handler.go @@ -20,10 +20,15 @@ import ( const tasksAPI = "/_/api/v1/extension/organizer.tasks/" func taskRoute(p string) bool { + if contactRoute(p) { + return true + } return strings.HasPrefix(p, tasksAPI) || p == strings.TrimSuffix(taskDAVRoot, "/") || strings.HasPrefix(p, taskDAVRoot) || p == "/v/plan/today" || p == "/v/plan/tasks" || strings.HasPrefix(p, "/v/plan/tasks/") || p == "/v/plan/projects" || strings.HasPrefix(p, "/v/plan/project/") || strings.HasPrefix(p, "/v/plan/task/") } func (s *Server) registerTaskRoutes() { + s.mux.HandleFunc(contactsAPI, s.handleContacts) + s.mux.HandleFunc("/v/plan/contacts", s.handleContacts) for _, p := range []string{"/v/plan/today", "/v/plan/tasks", "/v/plan/tasks/", "/v/plan/projects", "/v/plan/project/", "/v/plan/task/"} { s.mux.HandleFunc(p, s.handleTaskPage) } @@ -86,6 +91,10 @@ func (s *Server) handleTaskPage(w http.ResponseWriter, r *http.Request) { return } domain := s.domainUUIDForRequest(r) + if r.URL.Path == "/v/plan/tasks/report" || r.URL.Path == "/v/plan/tasks/settings" { + s.handleTaskProductivityPage(w, r, active) + return + } if strings.HasPrefix(r.URL.Path, "/v/plan/tasks/schedule") { s.handleTaskSchedulePage(w, r, actor) return @@ -196,6 +205,10 @@ 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 len(parts) == 1 && (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 + } if len(parts) == 1 && parts[0] == "schedule" { s.handleTaskScheduleAPI(w, r, actor) return diff --git a/internal/server/testdata/productivity-browser.js b/internal/server/testdata/productivity-browser.js new file mode 100644 index 0000000..2b878e5 --- /dev/null +++ b/internal/server/testdata/productivity-browser.js @@ -0,0 +1,15 @@ +window.addEventListener('load',async()=>{const wait=async(fn)=>{for(let i=0;i<120;i++){if(fn())return;await new Promise(r=>setTimeout(r,100));}throw Error('Timed out: '+fn.toString());};const fill=(n,value)=>{n.value=value;n.dispatchEvent(new Event('input',{bubbles:true}));};try{ + const path=location.pathname; + if(path==='/v/plan/contacts'){ + await wait(()=>document.querySelector('#contacts-controls button'));document.querySelector('#contacts-controls button').click();fill(document.querySelector('[name=name]'),'ブラウザ連絡先');fill(document.querySelector('[name=emails]'),'browser@example.invalid');fill(document.querySelector('[name=notes]'),'Non-public notes');document.querySelector('#contact-editor form').requestSubmit();await wait(()=>document.querySelector('#contacts-list button')?.textContent.includes('ブラウザ'));const r=await fetch('/_/api/v1/extension/organizer.contacts/items?q=browser').then(r=>r.json());if(r.items.length!==1)throw Error('Contact save missing'); + }else if(path.endsWith('/settings')){ + await wait(()=>document.querySelector('[name=due_days]'));fill(document.querySelector('[name=due_days]'),'2');document.querySelector('.productivity-settings').requestSubmit();await wait(()=>document.querySelector('#productivity-status').textContent.includes('保存'));const d=await fetch('/_/api/v1/extension/organizer.tasks/preferences').then(r=>r.json());if(d.preferences.due_days!==2)throw Error('Preferences missing'); + }else if(path.endsWith('/report')){ + await wait(()=>document.querySelectorAll('.productivity-day').length>300);if(!document.querySelector('.productivity-day[data-level="2"]'))throw Error('Seven-point completion missing'); + }else if(path==='/v/plan/tasks'){ + await wait(()=>document.querySelector('#tasks-quick-title'));fill(document.querySelector('#tasks-quick-title'),'Recording task');document.querySelector('#tasks-capture').requestSubmit();await wait(()=>document.querySelector('[data-action=work]'));document.querySelector('[data-action=work]').click();await wait(()=>document.querySelector('.task-work-bar a').textContent.includes('Recording task'));document.querySelector('.task-work-bar button').click();await wait(()=>document.querySelector('.task-work-bar').hidden); + }else{ + const input=document.querySelector('[data-home-type-search]');fill(input,'add task 検証 cost:2h complexity:3');input.closest('form').requestSubmit();await wait(()=>document.querySelector('.home-command-panel button'));document.querySelector('.home-command-panel button').click();await wait(()=>document.querySelector('.home-command-panel a'));const d=await fetch('/_/api/v1/extension/organizer.tasks/items?q='+encodeURIComponent('検証')).then(r=>r.json());if(d.items[0].estimate_minutes!==120)throw Error('Command cost missing');fill(input,'add cal 会議 from:2026-11-02T09:00 to:2026-11-02T10:00');input.closest('form').requestSubmit();await wait(()=>document.querySelector('.home-command-panel button'));document.querySelector('.home-command-panel button').click();await wait(()=>document.querySelector('.home-command-panel a')?.href.includes('/event/')); + } + if(document.documentElement.scrollWidth>innerWidth+2)throw Error('Page horizontal overflow');document.body.dataset.vimReady='true'; +}catch(e){const n=document.createElement('pre');n.id='error';n.textContent=(e.stack||String(e))+'\n'+(document.querySelector('.home-command-panel')?.textContent||'');document.body.append(n);}}); diff --git a/internal/store/contacts.go b/internal/store/contacts.go new file mode 100644 index 0000000..06087a3 --- /dev/null +++ b/internal/store/contacts.go @@ -0,0 +1,431 @@ +package store + +import ( + "context" + "crypto/sha256" + "database/sql" + "encoding/hex" + "encoding/json" + "errors" + "fmt" + "net/mail" + "strings" + "time" + "unicode/utf8" + + "github.com/google/uuid" + "pageswiki/internal/db" +) + +var contactMigrations = []db.SQLMigration{{Version: 1, Name: "private_address_book", Statements: []string{ + `CREATE TABLE organizer_contacts(domain_uuid TEXT NOT NULL,owner_uuid TEXT NOT NULL,uuid TEXT NOT NULL,uid TEXT NOT NULL,version INTEGER NOT NULL,name TEXT NOT NULL,search TEXT NOT NULL,data TEXT NOT NULL,hash TEXT NOT NULL,deleted INTEGER NOT NULL DEFAULT 0,PRIMARY KEY(domain_uuid,owner_uuid,uuid),UNIQUE(domain_uuid,owner_uuid,uid))`, + `CREATE INDEX organizer_contacts_owner ON organizer_contacts(domain_uuid,owner_uuid,deleted,uuid)`, + `CREATE TABLE organizer_contact_revisions(domain_uuid TEXT NOT NULL,owner_uuid TEXT NOT NULL,uuid TEXT NOT NULL,version INTEGER NOT NULL,hash TEXT NOT NULL,deleted INTEGER NOT NULL,created_ms INTEGER NOT NULL,PRIMARY KEY(domain_uuid,owner_uuid,uuid,version))`, +}, Assertions: []string{schemaColumns("organizer_contacts", "domain_uuid,owner_uuid,uuid,uid,version,name,search,data,hash,deleted"), schemaUnique("organizer_contacts", "domain_uuid,owner_uuid,uid")}}} + +type Contact struct { + UUID string `json:"uuid"` + UID string `json:"uid"` + Version int64 `json:"version"` + Name string `json:"name"` + Emails []string `json:"emails"` + Phones []string `json:"phones"` + Organization string `json:"organization"` + Notes string `json:"notes"` + VCard string `json:"vcard,omitempty"` + Deleted bool `json:"deleted"` +} + +// Preserve every unfolded property, including unsupported fields/parameters. +// Encoded legacy v2.1/QP and malformed data are rejected, never silently lost. +func cardLines(raw string) ([]string, error) { + if len(raw) > 65536 || !utf8.ValidString(raw) || strings.ContainsRune(raw, 0) { + return nil, ErrTaskInvalid + } + for _, c := range raw { + if c < 32 && c != '\r' && c != '\n' && c != '\t' || c == 127 { + return nil, ErrTaskInvalid + } + } + raw = strings.ReplaceAll(raw, "\r\n", "\n") + if strings.ContainsRune(raw, '\r') { + return nil, ErrTaskInvalid + } + var lines []string + for _, line := range strings.Split(strings.TrimSuffix(raw, "\n"), "\n") { + if strings.HasPrefix(line, " ") || strings.HasPrefix(line, "\t") { + if len(lines) == 0 { + return nil, ErrTaskInvalid + } + lines[len(lines)-1] += line[1:] + } else { + lines = append(lines, line) + } + } + if len(lines) < 4 || lines[0] != "BEGIN:VCARD" || lines[len(lines)-1] != "END:VCARD" { + return nil, ErrTaskInvalid + } + return lines, nil +} +func cardKey(line string) (string, string, error) { + quoted := false + colon := -1 + for i, c := range line { + if c == '"' { + quoted = !quoted + } + if c == ':' && !quoted { + colon = i + break + } + } + if colon < 1 { + return "", "", ErrTaskInvalid + } + head := line[:colon] + key := strings.SplitN(head, ";", 2)[0] + if i := strings.LastIndex(key, "."); i >= 0 { + key = key[i+1:] + } + for _, c := range key { + if !(c >= 'a' && c <= 'z' || c >= 'A' && c <= 'Z' || c >= '0' && c <= '9' || c == '-') { + return "", "", ErrTaskInvalid + } + } + upper := strings.ToUpper(head) + if strings.Contains(upper, "ENCODING=") || strings.Contains(upper, "CHARSET=") { + return "", "", ErrTaskInvalid + } + return strings.ToUpper(key), line[colon+1:], nil +} +func cardText(s string) string { + var b strings.Builder + for i := 0; i < len(s); i++ { + if s[i] == '\\' && i+1 < len(s) { + i++ + if s[i] == 'n' || s[i] == 'N' { + b.WriteByte('\n') + continue + } + } + b.WriteByte(s[i]) + } + return b.String() +} +func escapeCard(s string) string { + return strings.NewReplacer("\\", "\\\\", "\r\n", "\\n", "\n", "\\n", ";", "\\;", ",", "\\,").Replace(s) +} +func foldCard(lines []string) string { + var b strings.Builder + for _, line := range lines { + first := true + for len(line) > 0 { + n := 75 + if !first { + b.WriteByte(' ') + n = 74 + } + if len(line) < n { + n = len(line) + } + for n > 0 && n < len(line) && !utf8.RuneStart(line[n]) { + n-- + } + b.WriteString(line[:n]) + b.WriteString("\r\n") + line = line[n:] + first = false + } + } + return b.String() +} +func ParseContact(raw string) (Contact, error) { + c := Contact{Emails: []string{}, Phones: []string{}} + lines, err := cardLines(raw) + if err != nil { + return c, err + } + versions, names, uids := 0, 0, 0 + for _, line := range lines[1 : len(lines)-1] { + key, value, e := cardKey(line) + if e != nil { + return c, e + } + value = cardText(value) + switch key { + case "VERSION": + versions++ + if value != "4.0" && value != "3.0" { + return c, ErrTaskInvalid + } + case "BEGIN", "END": + return c, ErrTaskInvalid + case "UID": + uids++ + c.UID = value + case "FN": + names++ + if c.Name == "" { + c.Name = value + } + case "EMAIL": + c.Emails = append(c.Emails, value) + case "TEL": + c.Phones = append(c.Phones, strings.TrimPrefix(value, "tel:")) + case "ORG": + if c.Organization == "" { + c.Organization = value + } + case "NOTE": + if c.Notes == "" { + c.Notes = value + } + } + } + if versions != 1 || names < 1 || uids > 1 || len(c.Name) > 300 || len(c.UID) > 1024 || strings.TrimSpace(c.Name) == "" || len(c.Emails) > 30 || len(c.Phones) > 30 { + return c, ErrTaskInvalid + } + if lines[1] != "VERSION:4.0" && lines[1] != "VERSION:3.0" { + return c, ErrTaskInvalid + } + for _, value := range append([]string{c.Name, c.UID}, c.Emails...) { + if strings.ContainsAny(value, "\r\n\x00") { + return c, ErrTaskInvalid + } + } + for _, value := range c.Emails { + a, e := mail.ParseAddress(value) + if e != nil || a.Address != value { + return c, ErrTaskInvalid + } + } + if c.UID == "" { + sum := sha256.Sum256([]byte(raw)) + c.UID = "urn:pageswiki:import:" + hex.EncodeToString(sum[:]) + lines = append(lines[:len(lines)-1], "UID:"+c.UID, "END:VCARD") + } + c.VCard = foldCard(lines) + return c, nil +} + +// Editing the visible fields retains other fields verbatim. Even repeated FN, +// ORG/NOTE and typed email/phone fields survive when that field is unchanged. +func buildContact(old Contact, c Contact) (Contact, error) { + if len(c.Name) > 300 || strings.TrimSpace(c.Name) == "" || len(c.Notes) > 16384 || len(c.Organization) > 1000 || len(c.Emails) > 30 || len(c.Phones) > 30 { + return c, ErrTaskInvalid + } + for _, value := range append(append([]string{c.Name, c.Organization}, c.Emails...), c.Phones...) { + if strings.ContainsAny(value, "\r\n\x00") { + return c, ErrTaskInvalid + } + } + for _, value := range c.Emails { + a, e := mail.ParseAddress(value) + if e != nil || a.Address != value { + return c, ErrTaskInvalid + } + } + lines := []string{"BEGIN:VCARD", "VERSION:4.0", "UID:urn:uuid:" + c.UUID, "END:VCARD"} + if old.VCard != "" { + var e error + lines, e = cardLines(old.VCard) + if e != nil { + return c, e + } + } + changes := map[string][]string{} + if old.VCard == "" || c.Name != old.Name { + changes["FN"] = []string{c.Name} + } + if c.Organization != old.Organization { + changes["ORG"] = []string{c.Organization} + } + if c.Notes != old.Notes { + changes["NOTE"] = []string{c.Notes} + } + if strings.Join(c.Emails, "\x00") != strings.Join(old.Emails, "\x00") { + changes["EMAIL"] = c.Emails + } + if strings.Join(c.Phones, "\x00") != strings.Join(old.Phones, "\x00") { + changes["TEL"] = c.Phones + } + out := []string{} + for _, line := range lines[:len(lines)-1] { + k, _, _ := cardKey(line) + if _, replace := changes[k]; !replace { + out = append(out, line) + } + } + for _, key := range []string{"FN", "ORG", "NOTE", "EMAIL", "TEL"} { + for _, value := range changes[key] { + if value != "" { + out = append(out, key+":"+escapeCard(value)) + } + } + } + out = append(out, "END:VCARD") + parsed, e := ParseContact(foldCard(out)) + parsed.UUID = c.UUID + parsed.Version = c.Version + parsed.Deleted = c.Deleted + return parsed, e +} +func contactEnabled(ctx context.Context, q interface { + QueryRowContext(context.Context, string, ...any) *sql.Row +}, domain string) error { + var raw string + err := q.QueryRowContext(ctx, `SELECT value FROM config WHERE domain_uuid=? AND key='system_extension_states'`, domain).Scan(&raw) + if errors.Is(err, sql.ErrNoRows) || err == nil && raw == "" { + return nil + } + if err != nil { + return err + } + states := map[string]bool{} + if json.Unmarshal([]byte(raw), &states) != nil { + return ErrAccessDenied + } + if on, ok := states["organizer.contacts"]; ok && !on { + return ErrAccessDenied + } + return nil +} +func (s *Store) Contacts(ctx context.Context, domain, actor, query, after string) ([]Contact, string, error) { + return s.ListContacts(ctx, domain, actor, query, after, false) +} +func (s *Store) ListContacts(ctx context.Context, domain, actor, query, after string, deleted bool) ([]Contact, string, error) { + if err := taskActor(ctx, s.DB, domain, actor, false); err != nil { + return nil, "", err + } + if err := contactEnabled(ctx, s.DB, domain); err != nil { + return nil, "", err + } + if len(query) > 200 { + return nil, "", ErrTaskInvalid + } + rows, err := s.DB.QueryContext(ctx, `SELECT data FROM organizer_contacts WHERE domain_uuid=? AND owner_uuid=? AND deleted=? AND uuid>? AND instr(search,?)>0 ORDER BY uuid LIMIT 101`, domain, actor, deleted, after, strings.ToLower(query)) + if err != nil { + return nil, "", err + } + defer rows.Close() + out := []Contact{} + next := "" + for rows.Next() { + var raw string + if err = rows.Scan(&raw); err != nil { + return nil, "", err + } + var c Contact + if err = json.Unmarshal([]byte(raw), &c); err != nil { + return nil, "", err + } + if len(out) == 100 { + next = out[99].UUID + break + } + c.VCard = "" + out = append(out, c) + } + return out, next, rows.Err() +} +func (s *Store) Contact(ctx context.Context, domain, actor, id string) (Contact, error) { + var c Contact + if err := taskActor(ctx, s.DB, domain, actor, false); err != nil { + return c, err + } + if err := contactEnabled(ctx, s.DB, domain); err != nil { + return c, err + } + var raw string + err := s.DB.QueryRowContext(ctx, `SELECT data FROM organizer_contacts WHERE domain_uuid=? AND owner_uuid=? AND uuid=?`, domain, actor, id).Scan(&raw) + if err == nil { + err = json.Unmarshal([]byte(raw), &c) + } + return c, err +} +func (s *Store) SaveContact(ctx context.Context, domain, actor string, c Contact, rawImport bool) (Contact, error) { + if s.ReadOnly { + return c, ErrReadOnly + } + if id, e := uuid.Parse(c.UUID); e != nil || id.String() != c.UUID || c.Version < 0 { + return c, ErrTaskInvalid + } + tx, err := s.DB.BeginTx(ctx, nil) + if err != nil { + return c, err + } + defer tx.Rollback() + if _, err = tx.ExecContext(ctx, `UPDATE domain_memberships SET state=state WHERE domain_uuid=? AND principal_uuid=?`, domain, actor); err != nil { + return c, err + } + if err = taskActor(ctx, tx, domain, actor, true); err != nil { + return c, err + } + if err = contactEnabled(ctx, tx, domain); err != nil { + return c, err + } + var old Contact + var data string + err = tx.QueryRowContext(ctx, `SELECT data FROM organizer_contacts WHERE domain_uuid=? AND owner_uuid=? AND uuid=?`, domain, actor, c.UUID).Scan(&data) + if err == nil { + if err = json.Unmarshal([]byte(data), &old); err != nil { + return c, err + } + } else if !errors.Is(err, sql.ErrNoRows) { + return c, err + } + if c.Version != old.Version { + return c, ErrTaskConflict + } + if rawImport { + if c.Version != 0 { + return c, ErrTaskInvalid + } + parsed, e := ParseContact(c.VCard) + if e != nil { + return c, e + } + parsed.UUID = c.UUID + c = parsed + var existing string + err = tx.QueryRowContext(ctx, `SELECT data FROM organizer_contacts WHERE domain_uuid=? AND owner_uuid=? AND uid=?`, domain, actor, c.UID).Scan(&existing) + if err == nil { + var previous Contact + if json.Unmarshal([]byte(existing), &previous) != nil { + return c, ErrTaskInvalid + } + if previous.VCard != c.VCard || previous.Deleted { + return c, ErrTaskConflict + } + return previous, nil + } + if !errors.Is(err, sql.ErrNoRows) { + return c, err + } + } else { + c, err = buildContact(old, c) + if err != nil { + return c, err + } + } + c.Version++ + b, err := json.Marshal(c) + if err != nil { + return c, err + } + hash := sha256.Sum256([]byte(c.VCard)) + digest := hex.EncodeToString(hash[:]) + if err = s.persistDocument(digest, c.VCard); err != nil { + return c, err + } + search := strings.ToLower(c.Name + "\n" + c.Organization + "\n" + strings.Join(c.Emails, "\n") + "\n" + strings.Join(c.Phones, "\n")) + _, err = tx.ExecContext(ctx, `INSERT INTO organizer_contacts(domain_uuid,owner_uuid,uuid,uid,version,name,search,data,hash,deleted) VALUES(?,?,?,?,?,?,?,?,?,?) ON CONFLICT(domain_uuid,owner_uuid,uuid) DO UPDATE SET version=excluded.version,name=excluded.name,search=excluded.search,data=excluded.data,hash=excluded.hash,deleted=excluded.deleted`, domain, actor, c.UUID, c.UID, c.Version, c.Name, search, string(b), digest, c.Deleted) + if err != nil { + return c, fmt.Errorf("save contact: %w", err) + } + _, err = tx.ExecContext(ctx, `INSERT INTO organizer_contact_revisions VALUES(?,?,?,?,?,?,?)`, domain, actor, c.UUID, c.Version, digest, c.Deleted, time.Now().UnixMilli()) + if err != nil { + return c, err + } + return c, tx.Commit() +} diff --git a/internal/store/schema_modules.go b/internal/store/schema_modules.go index b5b7a2f..fc7d4e8 100644 --- a/internal/store/schema_modules.go +++ b/internal/store/schema_modules.go @@ -12,9 +12,11 @@ import ( // Once released, add a new version; never edit an applied definition. // Auth, City, tasks and calendars remain in their existing migration paths. var managedStoreSchemas = map[string][]db.SQLMigration{ - "cli-auth": cliAuthMigrations, - "profile-contacts": profileContactMigrations, - "event-jobs": eventJobMigrations, + "contacts": contactMigrations, + "task-productivity": taskProductivityMigrations, + "cli-auth": cliAuthMigrations, + "profile-contacts": profileContactMigrations, + "event-jobs": eventJobMigrations, "projection-metadata": {{Version: 1, Name: "adopt_projection_metadata", Statements: []string{ `CREATE TABLE IF NOT EXISTS projection_metadata ( document_hash TEXT NOT NULL,kind TEXT NOT NULL,version INTEGER NOT NULL, diff --git a/internal/store/schema_modules_test.go b/internal/store/schema_modules_test.go index 6512a2c..84ed8e0 100644 --- a/internal/store/schema_modules_test.go +++ b/internal/store/schema_modules_test.go @@ -15,9 +15,31 @@ func newSchemaTestStore(t *testing.T) *Store { t.Fatal(err) } t.Cleanup(func() { database.Close() }) + // task-productivity follows the legacy task schema at application startup. + // Provide its source projection, not the component under test itself. + if _, err = database.Exec(`CREATE TABLE organizer_items(domain_uuid TEXT,owner_uuid TEXT,uuid TEXT,kind TEXT,data TEXT)`); err != nil { + t.Fatal(err) + } return &Store{DB: database} } +func TestTaskProductivityMigrationBackfillsOnce(t *testing.T) { + st := newSchemaTestStore(t) + if _, e := st.DB.Exec(`INSERT INTO organizer_items VALUES('d','u','t','task','{"completed_at_ms":123,"estimate_minutes":60}')`); e != nil { + t.Fatal(e) + } + for range 2 { + if e := st.ensureSchemaComponent("task-productivity"); e != nil { + t.Fatal(e) + } + } + var count, complexity int + var completed int64 + if e := st.DB.QueryRow(`SELECT count(*),completed_ms,complexity FROM organizer_task_metrics`).Scan(&count, &completed, &complexity); e != nil || count != 1 || completed != 123 || complexity != 1 { + t.Fatal(count, completed, complexity, e) + } +} + func TestManagedSchemasFreshRepeatAndReadOnly(t *testing.T) { for component := range managedStoreSchemas { t.Run(component, func(t *testing.T) { diff --git a/internal/store/store.go b/internal/store/store.go index f2b14c4..25843e4 100644 --- a/internal/store/store.go +++ b/internal/store/store.go @@ -108,6 +108,9 @@ func NewWithDocumentRoot( if err := st.EnsureTasksSchema(); err != nil { panic(err) } + if err := st.ensureSchemaComponent("contacts"); err != nil { + panic(err) + } if err := st.EnsureBrowserNavigationSchema(); err != nil { panic(err) } diff --git a/internal/store/task_digest.go b/internal/store/task_digest.go new file mode 100644 index 0000000..4290596 --- /dev/null +++ b/internal/store/task_digest.go @@ -0,0 +1,180 @@ +package store + +import ( + "context" + "database/sql" + "encoding/json" + "errors" + "time" +) + +const TaskDigestEventType = "task.digest.deliver" + +type TaskDigestDue struct { + Domain string + Owner string +} +type TaskDigestClaim struct { + TaskDigestDue + Day string + Version int64 + Timezone string +} + +func (s *Store) EnsureTaskDigestEvent() error { + if s.ReadOnly { + return ErrReadOnly + } + now := time.Now().UnixMilli() + _, err := s.DB.Exec(`INSERT OR IGNORE INTO event_definitions(uuid,name,event_type,event_key,payload,schedule_kind,interval_seconds,next_run_at_ms,enabled,priority,max_attempts,created_at_ms,updated_at_ms) VALUES('builtin.task.digest','Daily task email',?,'local','{}','interval',60,?,1,-2,1,?,?)`, TaskDigestEventType, now, now, now) + return err +} + +func (s *Store) DueTaskDigests(ctx context.Context, now time.Time) ([]TaskDigestDue, error) { + rows, err := s.DB.QueryContext(ctx, `SELECT domain_uuid,owner_uuid FROM organizer_task_preferences WHERE next_digest_ms>0 AND next_digest_ms<=? ORDER BY next_digest_ms,domain_uuid,owner_uuid LIMIT 20`, now.UnixMilli()) + if err != nil { + return nil, err + } + defer rows.Close() + out := []TaskDigestDue{} + for rows.Next() { + var v TaskDigestDue + if err = rows.Scan(&v.Domain, &v.Owner); err != nil { + return nil, err + } + out = append(out, v) + } + return out, rows.Err() +} + +// Claim before SMTP: an ambiguous delivery is never automatically sent twice. +// An interrupted claim stays visible as "sending" for operator review. +func (s *Store) ClaimTaskDigest(ctx context.Context, due TaskDigestDue, now time.Time) (TaskDigestClaim, error) { + out := TaskDigestClaim{TaskDigestDue: due} + if s.ReadOnly { + return out, ErrReadOnly + } + tx, err := s.DB.BeginTx(ctx, nil) + if err != nil { + return out, err + } + defer tx.Rollback() + res, err := tx.ExecContext(ctx, `UPDATE organizer_task_preferences SET next_digest_ms=next_digest_ms WHERE domain_uuid=? AND owner_uuid=? AND next_digest_ms>0 AND next_digest_ms<=?`, due.Domain, due.Owner, now.UnixMilli()) + if err != nil { + return out, err + } + n, _ := res.RowsAffected() + if n != 1 { + return out, sql.ErrNoRows + } + var raw string + if err = tx.QueryRowContext(ctx, `SELECT data FROM organizer_task_preferences WHERE domain_uuid=? AND owner_uuid=?`, due.Domain, due.Owner).Scan(&raw); err != nil { + return out, err + } + var p TaskPreferences + if err = json.Unmarshal([]byte(raw), &p); err != nil { + return out, err + } + loc, err := time.LoadLocation(p.Timezone) + if err != nil { + return out, err + } + out.Day = now.In(loc).Format("2006-01-02") + out.Timezone = p.Timezone + out.Version = p.Version + allowed := taskActor(ctx, tx, due.Domain, due.Owner, true) + on, e := taskReminderExtensionEnabled(ctx, tx, due.Domain) + if e != nil { + return out, e + } + if allowed != nil && !errors.Is(allowed, ErrAccessDenied) { + return out, allowed + } + if allowed != nil || !on || !p.DigestEnabled { + // An opted-in schedule resumes after a domain or extension is restored. + next, e := nextTaskDigest(now, p) + if e != nil { + return out, e + } + _, err = tx.ExecContext(ctx, `UPDATE organizer_task_preferences SET next_digest_ms=? WHERE domain_uuid=? AND owner_uuid=?`, next, due.Domain, due.Owner) + if err != nil { + return out, err + } + if err = tx.Commit(); err != nil { + return out, err + } + return out, sql.ErrNoRows + } + // Missed days are not replayed. Run once for today's due time; if the + // configured hour has not arrived, move the cursor there without sending. + clock, _ := time.Parse("15:04", p.DigestTime) + local := now.In(loc) + today := time.Date(local.Year(), local.Month(), local.Day(), clock.Hour(), clock.Minute(), 0, 0, loc) + next, err := nextTaskDigest(now, p) + if err != nil { + return out, err + } + _, err = tx.ExecContext(ctx, `UPDATE organizer_task_preferences SET next_digest_ms=? WHERE domain_uuid=? AND owner_uuid=?`, next, due.Domain, due.Owner) + if err != nil { + return out, err + } + if today.After(now) { + if err = tx.Commit(); err != nil { + return out, err + } + 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()) + if err != nil { + return out, err + } + n, _ = res.RowsAffected() + if err = tx.Commit(); err != nil { + return out, err + } + if n != 1 { + return out, sql.ErrNoRows + } + return out, nil +} + +func (s *Store) TaskDigestRecipient(ctx context.Context, c TaskDigestClaim) (string, error) { + if err := taskActor(ctx, s.DB, 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) + if err != nil { + return "", err + } + var p TaskPreferences + if json.Unmarshal([]byte(raw), &p) != nil || !p.DigestEnabled || version != c.Version { + return "", ErrAccessDenied + } + return email, nil +} + +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 +} + +func (s *Store) LastTaskDigest(ctx context.Context, domain, actor string) (map[string]any, error) { + if err := taskActor(ctx, s.DB, domain, actor, false); err != nil { + return nil, err + } + var day, state string + var ms int64 + err := s.DB.QueryRowContext(ctx, `SELECT day,state,updated_ms FROM organizer_digest_deliveries WHERE domain_uuid=? AND owner_uuid=? ORDER BY day DESC LIMIT 1`, domain, actor).Scan(&day, &state, &ms) + if errors.Is(err, sql.ErrNoRows) { + return nil, nil + } + if err != nil { + return nil, err + } + return map[string]any{"day": day, "state": state, "updated_at_ms": ms}, nil +} diff --git a/internal/store/task_productivity.go b/internal/store/task_productivity.go new file mode 100644 index 0000000..7d34f24 --- /dev/null +++ b/internal/store/task_productivity.go @@ -0,0 +1,458 @@ +package store + +import ( + "context" + "database/sql" + "encoding/json" + "errors" + "time" + + "github.com/google/uuid" + "pageswiki/internal/db" +) + +var taskProductivityMigrations = []db.SQLMigration{{Version: 1, Name: "task_capture_work_and_reporting", Statements: []string{ + `CREATE TABLE organizer_task_preferences(domain_uuid TEXT NOT NULL,owner_uuid TEXT NOT NULL,version INTEGER NOT NULL,data TEXT NOT NULL,next_digest_ms INTEGER NOT NULL DEFAULT 0,PRIMARY KEY(domain_uuid,owner_uuid))`, + `CREATE INDEX organizer_digest_due ON organizer_task_preferences(next_digest_ms) WHERE next_digest_ms>0`, + `CREATE TABLE organizer_capture_receipts(domain_uuid TEXT NOT NULL,owner_uuid TEXT NOT NULL,request_uuid TEXT NOT NULL,request_hash TEXT NOT NULL,item_uuid TEXT NOT NULL,PRIMARY KEY(domain_uuid,owner_uuid,request_uuid))`, + `CREATE TABLE organizer_work_sessions(uuid TEXT PRIMARY KEY,domain_uuid TEXT NOT NULL,owner_uuid TEXT NOT NULL,task_uuid TEXT NOT NULL,start_ms INTEGER NOT NULL,end_ms INTEGER NOT NULL DEFAULT 0,version INTEGER NOT NULL DEFAULT 1)`, + `CREATE UNIQUE INDEX organizer_work_active ON organizer_work_sessions(owner_uuid) WHERE end_ms=0`, + `CREATE INDEX organizer_work_period ON organizer_work_sessions(domain_uuid,owner_uuid,start_ms,uuid)`, + `CREATE TABLE organizer_task_metrics(domain_uuid TEXT NOT NULL,owner_uuid TEXT NOT NULL,task_uuid TEXT NOT NULL,completed_ms INTEGER NOT NULL,estimate INTEGER NOT NULL,complexity INTEGER NOT NULL,PRIMARY KEY(domain_uuid,task_uuid))`, + `CREATE INDEX organizer_task_completed ON organizer_task_metrics(domain_uuid,owner_uuid,completed_ms)`, + `INSERT INTO organizer_task_metrics SELECT domain_uuid,owner_uuid,uuid,COALESCE(json_extract(data,'$.completed_at_ms'),0),COALESCE(json_extract(data,'$.estimate_minutes'),0),max(1,COALESCE(json_extract(data,'$.complexity'),1)) FROM organizer_items WHERE kind='task'`, + `CREATE TABLE organizer_digest_deliveries(domain_uuid TEXT NOT NULL,owner_uuid TEXT NOT NULL,day TEXT NOT NULL,state TEXT NOT NULL,updated_ms INTEGER NOT NULL,PRIMARY KEY(domain_uuid,owner_uuid,day))`, +}, Assertions: []string{ + schemaColumns("organizer_task_preferences", "domain_uuid,owner_uuid,version,data,next_digest_ms"), + schemaUnique("organizer_capture_receipts", "domain_uuid,owner_uuid,request_uuid"), + schemaIndex("organizer_work_sessions", "organizer_work_period", "domain_uuid,owner_uuid,start_ms,uuid"), +}}} + +type TaskPreferences struct { + Version int64 `json:"version"` + ProjectUUID string `json:"project_uuid"` + AssigneeUUID string `json:"assignee_uuid"` + DueDays *int `json:"due_days"` + StartDays *int `json:"start_days"` + PlannedDays *int `json:"planned_days"` + ReviewDays *int `json:"review_days"` + Estimate int `json:"estimate_minutes"` + Complexity int `json:"complexity"` + DigestEnabled bool `json:"digest_enabled"` + DigestTime string `json:"digest_time"` + Timezone string `json:"timezone"` +} + +func (s *Store) TaskPreferences(ctx context.Context, domain, actor string) (TaskPreferences, error) { + p := TaskPreferences{AssigneeUUID: actor, Complexity: 1, DigestTime: "09:00", Timezone: "UTC"} + if err := taskActor(ctx, s.DB, domain, actor, false); err != nil { + return p, err + } + var raw string + err := s.DB.QueryRowContext(ctx, `SELECT data FROM organizer_task_preferences WHERE domain_uuid=? AND owner_uuid=?`, domain, actor).Scan(&raw) + if errors.Is(err, sql.ErrNoRows) { + return p, nil + } + if err != nil { + return p, err + } + err = json.Unmarshal([]byte(raw), &p) + return p, err +} + +func nextTaskDigest(now time.Time, p TaskPreferences) (int64, error) { + loc, err := time.LoadLocation(p.Timezone) + if err != nil { + return 0, ErrTaskInvalid + } + clock, err := time.Parse("15:04", p.DigestTime) + if err != nil || clock.Format("15:04") != p.DigestTime { + return 0, ErrTaskInvalid + } + if !p.DigestEnabled { + return 0, nil + } + t := now.In(loc) + candidate := time.Date(t.Year(), t.Month(), t.Day(), clock.Hour(), clock.Minute(), 0, 0, loc) + if !candidate.After(now) { + candidate = time.Date(t.Year(), t.Month(), t.Day()+1, clock.Hour(), clock.Minute(), 0, 0, loc) + } + return candidate.UnixMilli(), nil +} + +func (s *Store) SaveTaskPreferences(ctx context.Context, domain, actor string, p TaskPreferences, now time.Time) (TaskPreferences, error) { + if s.ReadOnly { + return p, ErrReadOnly + } + for _, n := range []*int{p.DueDays, p.StartDays, p.PlannedDays, p.ReviewDays} { + if n != nil && (*n < 0 || *n > 3650) { + return p, ErrTaskInvalid + } + } + if p.Estimate < 0 || p.Estimate > 10080 || p.Complexity < 1 || p.Complexity > 5 || p.Version < 0 { + return p, ErrTaskInvalid + } + next, err := nextTaskDigest(now, p) + if err != nil { + return p, err + } + tx, err := s.DB.BeginTx(ctx, nil) + if err != nil { + return p, err + } + defer tx.Rollback() + if err = taskProductivityWriter(ctx, tx, domain, actor); err != nil { + return p, err + } + if err = validateTaskAssignee(ctx, tx, domain, p.AssigneeUUID); err != nil { + return p, err + } + if p.ProjectUUID != "" { + var yes bool + if err = tx.QueryRowContext(ctx, `SELECT EXISTS(SELECT 1 FROM organizer_items WHERE domain_uuid=? AND owner_uuid=? AND uuid=? AND kind='project' AND archived=0)`, domain, actor, p.ProjectUUID).Scan(&yes); err != nil { + return p, err + } + if !yes { + return p, ErrTaskInvalid + } + } + var current int64 + err = tx.QueryRowContext(ctx, `SELECT version FROM organizer_task_preferences WHERE domain_uuid=? AND owner_uuid=?`, domain, actor).Scan(¤t) + if err != nil && !errors.Is(err, sql.ErrNoRows) { + return p, err + } + if current != p.Version { + return p, ErrTaskConflict + } + p.Version++ + raw, _ := json.Marshal(p) + _, err = tx.ExecContext(ctx, `INSERT INTO organizer_task_preferences VALUES(?,?,?,?,?) ON CONFLICT(domain_uuid,owner_uuid) DO UPDATE SET version=excluded.version,data=excluded.data,next_digest_ms=excluded.next_digest_ms`, domain, actor, p.Version, string(raw), next) + if err != nil { + return p, err + } + return p, tx.Commit() +} + +func taskProductivityWriter(ctx context.Context, tx *sql.Tx, domain, actor string) error { + if _, err := tx.ExecContext(ctx, `UPDATE domain_memberships SET state=state WHERE domain_uuid=? AND principal_uuid=?`, domain, actor); err != nil { + return err + } + if err := taskActor(ctx, tx, domain, actor, true); err != nil { + return err + } + on, err := taskReminderExtensionEnabled(ctx, tx, domain) + if err != nil { + return err + } + if !on { + return ErrAccessDenied + } + return nil +} + +// Assignment is a private planning annotation, NOT a grant to read this task. +func validateTaskAssignee(ctx context.Context, tx *sql.Tx, domain, assignee string) error { + if assignee == "" { + return nil + } + if _, err := uuid.Parse(assignee); err != nil { + return ErrTaskInvalid + } + if err := taskActor(ctx, tx, domain, assignee, false); err != nil { + return ErrTaskInvalid + } + return nil +} + +func (s *Store) CapturedTask(ctx context.Context, domain, actor, request, hash string) (TaskRecord, error) { + if err := taskActor(ctx, s.DB, domain, actor, false); err != nil { + return TaskRecord{}, err + } + var stored, id string + err := s.DB.QueryRowContext(ctx, `SELECT request_hash,item_uuid FROM organizer_capture_receipts WHERE domain_uuid=? AND owner_uuid=? AND request_uuid=?`, domain, actor, request).Scan(&stored, &id) + if err != nil { + return TaskRecord{}, err + } + if stored != hash { + return TaskRecord{}, ErrTaskConflict + } + return s.GetTask(ctx, domain, actor, id) +} + +func (s *Store) CaptureTask(ctx context.Context, domain, actor, request, hash string, item TaskRecord) (TaskRecord, error) { + if _, err := uuid.Parse(request); err != nil { + return TaskRecord{}, ErrTaskInvalid + } + old, err := s.CapturedTask(ctx, domain, actor, request, hash) + if err == nil { + return old, nil + } + if !errors.Is(err, sql.ErrNoRows) { + return old, err + } + item.UUID = request + out, err := s.saveTask(ctx, domain, actor, item, 0, func(tx *sql.Tx, _ *TaskRecord, _ TaskRecord) error { + _, e := tx.ExecContext(ctx, `INSERT INTO organizer_capture_receipts VALUES(?,?,?,?,?)`, domain, actor, request, hash, item.UUID) + return e + }) + if err != nil { + if old, e := s.CapturedTask(ctx, domain, actor, request, hash); e == nil { + return old, nil + } + } + return out, err +} + +type TaskWork struct { + UUID string `json:"uuid"` + TaskUUID string `json:"task_uuid"` + StartMS int64 `json:"start_ms"` + EndMS int64 `json:"end_ms"` + Version int64 `json:"version"` +} + +func scanTaskWork(row interface{ Scan(...any) error }) (TaskWork, error) { + var v TaskWork + err := row.Scan(&v.UUID, &v.TaskUUID, &v.StartMS, &v.EndMS, &v.Version) + return v, err +} + +const taskWorkColumns = `uuid,task_uuid,start_ms,end_ms,version` + +func (s *Store) ActiveTaskWork(ctx context.Context, domain, actor string) (*TaskWork, error) { + if err := taskActor(ctx, s.DB, domain, actor, false); err != nil { + return nil, err + } + v, err := scanTaskWork(s.DB.QueryRowContext(ctx, `SELECT `+taskWorkColumns+` FROM organizer_work_sessions WHERE domain_uuid=? AND owner_uuid=? AND end_ms=0`, domain, actor)) + if errors.Is(err, sql.ErrNoRows) { + return nil, nil + } + return &v, err +} + +func (s *Store) ChangeTaskWork(ctx context.Context, domain, actor, action string, v TaskWork, now time.Time) (TaskWork, error) { + if s.ReadOnly { + return v, ErrReadOnly + } + if _, err := uuid.Parse(v.UUID); err != nil { + return v, ErrTaskInvalid + } + tx, err := s.DB.BeginTx(ctx, nil) + if err != nil { + return v, err + } + defer tx.Rollback() + if err = taskProductivityWriter(ctx, tx, domain, actor); err != nil { + return v, err + } + old, err := scanTaskWork(tx.QueryRowContext(ctx, `SELECT `+taskWorkColumns+` FROM organizer_work_sessions WHERE uuid=? AND domain_uuid=? AND owner_uuid=?`, v.UUID, domain, actor)) + if err != nil && !errors.Is(err, sql.ErrNoRows) { + return v, err + } + switch action { + case "start": + if v.Version != 0 { + return v, ErrTaskInvalid + } + if err == nil { + if old.TaskUUID != v.TaskUUID { + return v, ErrTaskConflict + } + return old, tx.Commit() + } + var yes bool + if err = tx.QueryRowContext(ctx, `SELECT EXISTS(SELECT 1 FROM organizer_items WHERE domain_uuid=? AND owner_uuid=? AND uuid=? AND kind='task' AND archived=0 AND status NOT IN ('done','cancelled'))`, domain, actor, v.TaskUUID).Scan(&yes); err != nil { + return v, err + } + if !yes { + return v, sql.ErrNoRows + } + v.StartMS = now.UnixMilli() + v.EndMS = 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 { + return v, e + } + n, _ := res.RowsAffected() + if n != 1 { + return v, ErrTaskConflict + } + case "stop": + if err != nil { + return v, err + } + if old.EndMS > 0 { + if v.Version == old.Version || v.Version == old.Version-1 { + return old, tx.Commit() + } + return v, ErrTaskConflict + } + if old.Version != v.Version { + return v, ErrTaskConflict + } + v = old + v.EndMS = max(v.StartMS, now.UnixMilli()) + v.Version++ + _, err = tx.ExecContext(ctx, `UPDATE organizer_work_sessions SET end_ms=?,version=? WHERE uuid=?`, v.EndMS, v.Version, v.UUID) + if err != nil { + return v, err + } + default: + return v, ErrTaskInvalid + } + return v, tx.Commit() +} + +type TaskReportDay struct { + Date string `json:"date"` + Completed int `json:"completed"` + Points int `json:"points"` + Estimate int `json:"estimate_minutes"` + WorkMS int64 `json:"work_ms"` + 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"` +} +type TaskReport struct { + Days []TaskReportDay `json:"days"` + Tasks []TaskReportItem `json:"tasks"` + Sessions []TaskWork `json:"sessions"` + Partial bool `json:"partial"` + Timezone string `json:"timezone"` +} + +func (s *Store) TaskReport(ctx context.Context, domain, actor string, start, end, now time.Time) (TaskReport, error) { + out := TaskReport{Days: []TaskReportDay{}, Tasks: []TaskReportItem{}, Sessions: []TaskWork{}, Timezone: start.Location().String()} + 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 { + return out, ErrTaskInvalid + } + days := map[string]int{} + for day := start; day.Before(end); day = day.AddDate(0, 0, 1) { + days[day.Format("2006-01-02")] = len(out.Days) + 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 10000 { + out.Partial = true + break + } + if index, ok := days[time.UnixMilli(ms).In(start.Location()).Format("2006-01-02")]; ok { + d := &out.Days[index] + d.Completed++ + d.Estimate += estimate + d.Points += 1 + ((estimate+29)/30)*max(1, complexity) + byTask[id] = len(out.Tasks) + out.Tasks = append(out.Tasks, TaskReportItem{UUID: id, Title: title, ProjectUUID: project, Completed: true, Points: 1 + ((estimate+29)/30)*max(1, complexity)}) + } + } + err = rows.Err() + rows.Close() + if err != nil { + return out, err + } + // Split intervals at local midnight; never assume a day is exactly 24h. + addSpan := func(a, b int64, focus bool) int64 { + a = max(a, start.UnixMilli()) + b = min(b, end.UnixMilli(), now.UnixMilli()) + if b <= a { + return 0 + } + total := b - a + for a < b { + t := time.UnixMilli(a).In(start.Location()) + next := time.Date(t.Year(), t.Month(), t.Day()+1, 0, 0, 0, 0, t.Location()).UnixMilli() + stop := min(next, b) + if index, ok := days[t.Format("2006-01-02")]; ok { + if focus { + out.Days[index].FocusMS += stop - a + } else { + out.Days[index].WorkMS += stop - a + } + } + a = stop + } + return total + } + 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,'') 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 WHERE 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 { + rows.Close() + return out, err + } + n++ + if n > 10000 { + out.Partial = true + break + } + finish := v.EndMS + if finish == 0 { + finish = now.UnixMilli() + } + elapsed := addSpan(v.StartMS, finish, false) + if elapsed == 0 { + continue + } + out.Sessions = append(out.Sessions, v) + index, ok := byTask[v.TaskUUID] + 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[index].WorkMS += elapsed + } + err = rows.Err() + rows.Close() + if err != nil { + return out, err + } + rows, err = s.DB.QueryContext(ctx, `SELECT start_ms,end_ms FROM organizer_focus_spans WHERE domain_uuid=? AND owner_uuid=? AND start_ms>=? AND start_ms? AND phase='focus' ORDER BY start_ms,session_uuid,version LIMIT 10001`, domain, actor, start.Add(-180*time.Minute).UnixMilli(), end.UnixMilli(), start.UnixMilli()) + if err != nil { + return out, err + } + defer rows.Close() + n = 0 + for rows.Next() { + var a, b int64 + if err = rows.Scan(&a, &b); err != nil { + return out, err + } + n++ + if n > 10000 { + out.Partial = true + break + } + addSpan(a, b, true) + } + return out, rows.Err() +} diff --git a/internal/store/tasks.go b/internal/store/tasks.go index d021767..94f470d 100644 --- a/internal/store/tasks.go +++ b/internal/store/tasks.go @@ -36,6 +36,8 @@ type TaskRecord struct { DueOn string `json:"due_on"` PlannedOn string `json:"planned_on"` ReviewOn string `json:"review_on"` + AssigneeUUID string `json:"assignee_uuid,omitempty"` + Complexity int `json:"complexity,omitempty"` PageUUID string `json:"page_uuid"` Archived bool `json:"archived"` Version int64 `json:"version"` @@ -96,7 +98,10 @@ func (s *Store) EnsureTasksSchema() error { if err := s.ensureTaskBlocksSchema(); err != nil { return err } - return s.ensureTaskFocusSchema() + if err := s.ensureTaskFocusSchema(); err != nil { + return err + } + return s.ensureSchemaComponent("task-productivity") } func validTaskDate(v string) bool { @@ -108,6 +113,9 @@ func validTaskDate(v string) bool { } func validateTask(item *TaskRecord) error { + if item.Complexity < 0 || item.Complexity > 5 { + return ErrTaskInvalid + } if !validTaskNotesSubpath(item.NotesSubpath) || (item.Kind != "project" && item.NotesSubpath != "") { return ErrTaskInvalid } @@ -188,6 +196,9 @@ func (s *Store) SaveTask(ctx context.Context, domain, actor string, item TaskRec // prepare participates in the same writer transaction as the task head. func (s *Store) saveTask(ctx context.Context, domain, actor string, item TaskRecord, expected int64, prepare func(*sql.Tx, *TaskRecord, TaskRecord) error) (TaskRecord, error) { + if s.ReadOnly { + return TaskRecord{}, ErrReadOnly + } if err := validateTask(&item); err != nil { return TaskRecord{}, err } @@ -266,6 +277,11 @@ func (s *Store) saveTask(ctx context.Context, domain, actor string, item TaskRec if err = s.validateTaskParentTx(ctx, tx, domain, actor, item, old); err != nil { return TaskRecord{}, err } + if item.AssigneeUUID != old.AssigneeUUID { + if err = validateTaskAssignee(ctx, tx, domain, item.AssigneeUUID); err != nil { + return TaskRecord{}, err + } + } // DAV identity and round-trip metadata are writable only through the DAV // transaction callback, never through a generic JSON/UI update. item.CalDAV = old.CalDAV @@ -330,6 +346,11 @@ func (s *Store) saveTask(ctx context.Context, domain, actor string, item TaskRec if err = s.syncTaskRemindersTx(ctx, tx, domain, actor, item); err != nil { return TaskRecord{}, err } + if item.Kind == "task" { + if _, err = tx.ExecContext(ctx, `INSERT INTO organizer_task_metrics VALUES(?,?,?,?,?,?) ON CONFLICT(domain_uuid,task_uuid) DO UPDATE SET completed_ms=excluded.completed_ms,estimate=excluded.estimate,complexity=excluded.complexity`, domain, actor, item.UUID, item.CompletedMS, item.Estimate, max(1, item.Complexity)); err != nil { + return TaskRecord{}, err + } + } if err = tx.Commit(); err != nil { return TaskRecord{}, err } diff --git a/pages-cli/README.md b/pages-cli/README.md index d04c5b3..84224c0 100644 --- a/pages-cli/README.md +++ b/pages-cli/README.md @@ -153,3 +153,8 @@ go test ./internal/server -run TestRemoteCLIHTTPIntegration -count=1 ``` 偽サーバと一時DBのみを使用します。本番資格情報や外部カレンダーは不要です。 +## タスクと連絡先 + +`pages task --help` で作成・計画・開始/終了・レポートを操作できる。 +`pages contacts --help` で個人アドレス帳の検索・vCard入出力を行える。 +[neomutt設定と操作例](../docs/operations/neomutt-tasks.md)を参照。 diff --git a/pages-cli/pages b/pages-cli/pages index 3007e77..b3c5a2f 100755 --- a/pages-cli/pages +++ b/pages-cli/pages @@ -1,6 +1,9 @@ #!/usr/bin/env python3 """pages — navigate and edit PagesWiki from your terminal (pages-cli).""" import argparse +import email.policy +import email.parser +import uuid import base64 import contextlib import difflib @@ -75,16 +78,18 @@ class Client: self.base, self.token, self.lang = origin(base), token, lang self.opener = http.build_opener(NoRedirect()) - def request(self, route, method='GET', data=None, form=None, limit=4 << 20): + def request(self, route, method='GET', data=None, form=None, limit=4 << 20, etag=None, content_type=None): if not route.startswith('/') or route.startswith('//'): raise Failure('Invalid API route.') headers = {'Accept': 'application/json', 'User-Agent': 'pages-cli/0.1'} + if etag is not None: + headers['If-Match'] = etag if self.token: headers['Authorization'] = 'Bearer ' + self.token body = None if data is not None: - body = json.dumps(data, ensure_ascii=False).encode() - headers['Content-Type'] = 'application/json' + body = data if isinstance(data, bytes) else json.dumps(data, ensure_ascii=False).encode() + headers['Content-Type'] = content_type or 'application/json' if form is not None: body = url.urlencode(form).encode() headers['Content-Type'] = 'application/x-www-form-urlencoded' @@ -107,7 +112,8 @@ class Client: if not isinstance(payload, dict): payload = {} messages = {303: 'Login redirect refused; log in again.', 401: 'Session expired or authentication required.', 403: 'Access denied.', - 404: 'Not found or not readable.', 409: 'Conflict: remote revision changed.'} + 404: 'Not found or not readable.', 409: 'Conflict: remote revision changed.', + 412: 'Conflict: remote item changed; reload before saving.', 422: 'Invalid fields; check dates, project and required settings.'} raise Failure(messages.get(e.code, 'HTTP request failed (%d); redirects are not followed.' % e.code), e.code, payload) from None except (urllib.error.URLError, TimeoutError, OSError): raise Failure('Connection/TLS failure; no automatic write retry was attempted.') from None @@ -440,7 +446,183 @@ def editor(client, addr, mode): print('Local edit retained:', safe_text(file), file=sys.stderr) +TASK_API = '/_/api/v1/extension/organizer.tasks/' + + +def task_uuid(value): + try: + parsed = str(uuid.UUID(value)) + if parsed != value: raise ValueError() + return parsed + except (ValueError, AttributeError): + raise Failure('Use a canonical task or project UUID.') from None + + +def task_project(client, value): + if value == '': return '' + try: return task_uuid(value) + except Failure: pass + data = client.json(TASK_API+'items?'+url.urlencode({'kind':'project','view':'all','q':value,'limit':100})) + matches = [item['uuid'] for item in data.get('items',[]) if item['title'] == value] + if len(matches) != 1 or data.get('next'): + raise Failure('Project name is missing or ambiguous; use its UUID.') + return matches[0] + + +def task_mail(raw, include_body=False, override_title=None): + if len(raw) > 2 << 20: raise Failure('Mail input exceeds 2 MiB; pipe one message at a time.') + message = email.parser.BytesParser(policy=email.policy.default).parsebytes(raw) + clean = lambda value: ' '.join(safe_text(str(value or '')).split()) + title = override_title or clean(message.get('Subject')) or '(No subject)' + if len(title.encode()) > 300: raise Failure('Mail subject exceeds 300 UTF-8 bytes; use --title.') + notes = '\n'.join(key+': '+clean(message.get(key)) for key in ('From','Date','Message-ID') if message.get(key)) + if include_body: + part = message.get_body(preferencelist=('plain',)) + if part: + content = part.get_content() + if not isinstance(content,str): raise Failure('Mail body is not readable text.') + notes += '\n\n' + content + if len(notes.encode()) > 16384: raise Failure('Mail notes exceed 16 KiB; omit --include-body.') + return title, notes, clean(message.get('Message-ID')) or hashlib.sha256(raw).hexdigest() + + +def tasks(client, profile, words): + parser = argparse.ArgumentParser(prog='pages task',description='Private task capture, planning and work-time records. Stops do not complete a task.') + sub = parser.add_subparsers(dest='action',required=True) + p=sub.add_parser('list');p.add_argument('--view',default='all',choices=['all','today','inbox','backlog','someday','review','done','archived','carryover']);p.add_argument('--project');p.add_argument('--q',default='');p.add_argument('--before',default='') + sub.add_parser('projects') + p=sub.add_parser('project-add');p.add_argument('title');p.add_argument('--notes',default='') + p=sub.add_parser('show');p.add_argument('uuid',type=task_uuid) + for name in ('add','from-mail','update'): + p=sub.add_parser(name) + if name=='add':p.add_argument('title') + elif name=='update':p.add_argument('uuid',type=task_uuid);p.add_argument('--title') + else:p.add_argument('--title');p.add_argument('--include-body',action='store_true') + p.add_argument('--notes');p.add_argument('--project');p.add_argument('--assignee') + p.add_argument('--due');p.add_argument('--start-on');p.add_argument('--planned');p.add_argument('--review') + p.add_argument('--estimate',type=int);p.add_argument('--complexity',type=int,choices=range(1,6)) + if name=='add':p.add_argument('--request-id',type=task_uuid) + for name in ('done','reopen','archive','start'): + p=sub.add_parser(name);p.add_argument('uuid',type=task_uuid) + sub.add_parser('stop');sub.add_parser('status') + p=sub.add_parser('retry');p.add_argument('request_id',type=task_uuid) + p=sub.add_parser('report');p.add_argument('--from',dest='start');p.add_argument('--to',dest='end') + p=sub.add_parser('preferences');p.add_argument('--project');p.add_argument('--assignee');p.add_argument('--due-days',type=int);p.add_argument('--start-days',type=int);p.add_argument('--planned-days',type=int);p.add_argument('--review-days',type=int);p.add_argument('--estimate',type=int);p.add_argument('--complexity',type=int);p.add_argument('--digest',choices=['on','off']);p.add_argument('--at');p.add_argument('--timezone') + for child in sub.choices.values():child.add_argument('--json',action='store_true') + a=parser.parse_args(words);action=a.action + def emit(data): print(json.dumps(data,ensure_ascii=False,indent=2)) + def capture(payload): + pending=profile.data.setdefault('task_outbox',{}) + if len(pending)>=20 and payload['request_id'] not in pending:raise Failure('20 pending captures retained. Retry them before adding more.') + pending[payload['request_id']]=payload;profile.save() + try: result=client.json(TASK_API+'capture',method='POST',data=payload) + except Failure: + print('Draft retained; retry with: pages task retry '+payload['request_id'],file=sys.stderr);raise + del pending[payload['request_id']];profile.save();return result + if action in ('list','projects'): + query={'kind':'project' if action=='projects' else 'task','view':getattr(a,'view','all'),'limit':100,'q':getattr(a,'q',''),'before':getattr(a,'before','')} + if getattr(a,'project',None) is not None:query['project']=task_project(client,a.project) + data=client.json(TASK_API+'items?'+url.urlencode(query)) + if a.json:emit(data) + else: + for item in data.get('items',[]):print(safe_text('\t'.join([item['uuid'],item['status'],item.get('due_on',''),item['title']]))) + if data.get('next'):print('Next page: --before '+data['next'],file=sys.stderr) + return + if action=='show':emit(client.json(TASK_API+'items/'+a.uuid));return + if action=='preferences': + data=client.json(TASK_API+'preferences');p=data['preferences'];changed=False + for attr,key in [('project','project_uuid'),('assignee','assignee_uuid'),('due_days','due_days'),('start_days','start_days'),('planned_days','planned_days'),('review_days','review_days'),('estimate','estimate_minutes'),('complexity','complexity'),('at','digest_time'),('timezone','timezone')]: + value=getattr(a,attr) + if value is not None:p[key]=task_project(client,value) if attr=='project' else value;changed=True + if a.digest:p['digest_enabled']=a.digest=='on';changed=True + emit(client.json(TASK_API+'preferences',method='PUT',data=p) if changed else data);return + if action=='retry': + payload=profile.data.get('task_outbox',{}).get(a.request_id) + if not payload:raise Failure('No retained task capture with this request ID.') + emit(capture(payload));return + if action in ('add','from-mail'): + payload={'request_id':getattr(a,'request_id',None) or str(uuid.uuid4()),'title':a.title,'notes':a.notes or ''} + if action=='from-mail': + title,notes,message_id=task_mail(sys.stdin.buffer.read((2<<20)+1),a.include_body,a.title) + payload.update(title=a.title or title,notes=a.notes if a.notes is not None else notes,request_id=str(uuid.uuid5(uuid.NAMESPACE_URL,client.base+'\n'+profile.data.get('username','')+'\n'+message_id))) + for attr,key in [('project','project_uuid'),('assignee','assignee_uuid'),('due','due_on'),('start_on','start_on'),('planned','planned_on'),('review','review_on'),('estimate','estimate_minutes'),('complexity','complexity')]: + value=getattr(a,attr) + if value is not None:payload[key]=task_project(client,value) if attr=='project' else value + emit(capture(payload));return + if action=='project-add': + emit(client.json(TASK_API+'items',method='POST',data={'uuid':str(uuid.uuid4()),'kind':'project','title':a.title,'notes':a.notes,'status':'todo','bucket':'inbox','priority':1}));return + if action in ('update','done','reopen','archive'): + item=client.json(TASK_API+'items/'+a.uuid)['item'] + if item['kind']!='task':raise Failure('This operation requires a task.') + for attr,key in [('title','title'),('notes','notes'),('project','project_uuid'),('assignee','assignee_uuid'),('due','due_on'),('start_on','start_on'),('planned','planned_on'),('review','review_on'),('estimate','estimate_minutes'),('complexity','complexity')]: + value=getattr(a,attr,None) + if value is not None:item[key]=task_project(client,value) if attr=='project' else value + if action=='done':item['status']='done' + elif action=='reopen':item['status']='todo' + elif action=='archive':item['archived']=True + emit(client.json(TASK_API+'items/'+a.uuid,method='PUT',data=item,etag='"'+str(item['version'])+'"'));return + if action=='start': + emit(client.json(TASK_API+'work',method='POST',data={'action':'start','uuid':str(uuid.uuid4()),'task_uuid':a.uuid,'version':0}));return + if action in ('stop','status'): + data=client.json(TASK_API+'work') + if action=='stop': + if not data['item']:raise Failure('No running work timer in this Domain.') + data=client.json(TASK_API+'work',method='POST',data={**data['item'],'action':'stop'}) + emit(data);return + if action=='report': + query={k:v for k,v in [('from',a.start),('to',a.end)] if v} + data=client.json(TASK_API+'report?'+url.urlencode(query)) + if a.json:emit(data);return + print('Timezone:',safe_text(data['timezone'])) + print('Date\tCompleted\tPoints\tWork minutes\tPomodoro minutes') + for day in data['days']: + if day['completed'] or day['work_ms'] or day['focus_ms']:print('%s\t%d\t%d\t%.1f\t%.1f'%(day['date'],day['completed'],day['points'],day['work_ms']/60000,day['focus_ms']/60000)) + print('\nTask UUID\tWork minutes\tTitle') + for task in data['tasks']:print(safe_text('%s\t%.1f\t%s'%(task['uuid'],task['work_ms']/60000,task['title']))) + if data['partial']:print('Partial report: narrow the date range.',file=sys.stderr) + + +def contacts(client, words): + parser=argparse.ArgumentParser(prog='pages contacts',description='Private address book; never links contacts to login accounts.') + sub=parser.add_subparsers(dest='action',required=True) + p=sub.add_parser('list');p.add_argument('--query',default='');p.add_argument('--after',default='') + p=sub.add_parser('query');p.add_argument('query');p.add_argument('--neomutt',action='store_true') + p=sub.add_parser('show');p.add_argument('uuid',type=task_uuid) + p=sub.add_parser('export');p.add_argument('uuid',type=task_uuid) + p=sub.add_parser('import');p.add_argument('file',type=Path) + a=parser.parse_args(words);api='/_/api/v1/extension/organizer.contacts/' + if a.action=='import': + with a.file.open('rb') as f:raw=f.read(65537) + if len(raw)>65536:raise Failure('One UTF-8 vCard per import, up to 64 KiB. Use the Web importer for multiple cards.') + data=client.json(api+'import',method='POST',data=raw,content_type='text/vcard') + elif a.action=='export': + data=client.json(api+'items/'+a.uuid);sys.stdout.write(data['item']['vcard']);return + elif a.action=='show':data=client.json(api+'items/'+a.uuid) + else: + try: data=client.json(api+'items?'+url.urlencode({'q':a.query,'after':getattr(a,'after','')})) + except Failure: + if a.action=='query' and a.neomutt: print('PagesWiki address query failed; check login and permissions.') + raise + if a.action=='query' and a.neomutt: + if not any(item['emails'] for item in data.get('items',[])): + print('No matching email addresses.') + raise Failure('No matching email addresses.') + print('PagesWiki contacts'+(' (first 100; narrow query)' if data.get('next') else '')) + for item in data.get('items',[]): + clean=lambda v:' '.join(safe_text(v).split()) + for address in item['emails']: + # Do not let imported metadata forge query result columns. + if '\t' not in address and '\n' not in address and '\r' not in address: + print(clean(address)+'\t'+clean(item['name'])+'\t'+clean(item['organization'])) + return + print(json.dumps(data,ensure_ascii=False,indent=2)) + + def execute(client, profile, words): + if words and words[0] in ('contact','contacts'): + return contacts(client,words[1:]) + if words and words[0] in ('task','tasks'): + return tasks(client,profile,words[1:]) parser = argparse.ArgumentParser(prog='pages') sub = parser.add_subparsers(dest='command', required=True) for command in ('ls', 'cd', 'cat', 'view', 'edit', 'open'): @@ -556,7 +738,7 @@ def shell(client, profile): def main(argv=None): - parser = argparse.ArgumentParser(prog='pages', description=__doc__, epilog='Commands: configure, login, logout, status, shell, ls, cd, pwd, cat, view, get, put, edit, search, open. Use pages COMMAND --help.') + parser = argparse.ArgumentParser(prog='pages', description=__doc__, epilog='Commands: configure, login, logout, status, shell, ls, cd, pwd, cat, view, get, put, edit, search, open, task, contacts. Use pages COMMAND --help.') parser.add_argument('--profile', help='Use another configured connection for this invocation') parser.add_argument('--lang', help='auto or an exact language tag for this invocation') parser.add_argument('command', nargs='?', default='shell') @@ -595,8 +777,14 @@ def main(argv=None): username = spec['username'] expires = client.login(username, getpass.getpass('Password: ')) same_identity = profile.data.get('origin') == client.base and profile.data.get('username') == username + pending = profile.data.get('task_outbox', {}) + if pending and not same_identity: + try: client.json('/_/auth/logout', method='POST') + except Failure: pass + raise Failure('Pending task drafts belong to the previous account. Use a separate profile; the drafts were retained.') cwd = profile.data.get('cwd', '/') if same_identity else '/' profile.data = {'origin': client.base, 'username': username, 'configured_username': spec.get('username', ''), 'token': client.token, 'expires': expires, 'cwd': cwd} + if pending: profile.data['task_outbox'] = pending try: profile.save() except OSError: diff --git a/pages-cli/test_productivity.py b/pages-cli/test_productivity.py new file mode 100644 index 0000000..b1c708a --- /dev/null +++ b/pages-cli/test_productivity.py @@ -0,0 +1,44 @@ +import contextlib +import io +import json +import runpy +from pathlib import Path +from types import SimpleNamespace +import unittest + +m=runpy.run_path(str(Path(__file__).with_name('pages'))) + +class ProductivityTests(unittest.TestCase): + def test_mail_privacy_and_long_subject_override(self): + raw=b'Subject: Test\r\nFrom: Person \r\nMessage-ID: \r\nContent-Type: text/plain; charset=utf-8\r\n\r\nPRIVATE BODY' + title,notes,ident=m['task_mail'](raw) + self.assertEqual(title,'Test');self.assertNotIn('PRIVATE BODY',notes);self.assertIn('Message-ID:',notes) + self.assertIn('PRIVATE BODY',m['task_mail'](raw,True)[1]) + raw=raw.replace(b'Subject: Test',b'Subject: '+b'a'*301) + with self.assertRaises(m['Failure']):m['task_mail'](raw) + self.assertEqual(m['task_mail'](raw,False,'Override')[0],'Override') + + def test_capture_retains_request_until_explicit_retry(self): + calls=[] + def send(route,**kwargs): + calls.append(kwargs['data'].copy()) + if len(calls)==1:raise m['Failure']('offline') + return {'item':{'uuid':kwargs['data']['request_id']}} + profile=SimpleNamespace(data={},save=lambda:None) + client=SimpleNamespace(json=send) + with contextlib.redirect_stdout(io.StringIO()),contextlib.redirect_stderr(io.StringIO()): + with self.assertRaises(m['Failure']):m['tasks'](client,profile,['add','Offline task']) + ident=next(iter(profile.data['task_outbox'])) + m['tasks'](client,profile,['retry',ident]) + self.assertEqual(calls[0],calls[1]);self.assertEqual(profile.data['task_outbox'],{}) + + def test_neomutt_query_columns_are_not_forgeable(self): + client=SimpleNamespace(json=lambda *a,**kw:{'items':[{'name':'A\tB\nC','emails':['a@example.invalid'],'organization':'Org\nInjected'}]}) + out=io.StringIO() + with contextlib.redirect_stdout(out):m['contacts'](client,['query','A','--neomutt']) + rows=out.getvalue().splitlines();self.assertEqual(len(rows),2);self.assertEqual(len(rows[1].split('\t')),3) + + def test_command_help_without_credentials(self): + for cmd in [('task','--help'),('contacts','--help'),('task','add','--help')]: + with contextlib.redirect_stdout(io.StringIO()),self.assertRaises(SystemExit) as raised:m['main'](list(cmd)) + self.assertEqual(raised.exception.code,0) diff --git a/pages-cli/test_task_integration.py b/pages-cli/test_task_integration.py new file mode 100644 index 0000000..8d1dd0a --- /dev/null +++ b/pages-cli/test_task_integration.py @@ -0,0 +1,40 @@ +"""Called by the Go synthetic HTTP fixture; no production credentials.""" +import contextlib +import io +import json +from pathlib import Path +import runpy +import sys + +def run(): + m=runpy.run_path(str(Path(__file__).with_name('pages'))) + fixture=json.load(sys.stdin) + client=m['Client'](fixture['origin'],fixture['token']) + profile=m['Profile']('test',fixture['root']) + def task(*words): + output=io.StringIO() + with contextlib.redirect_stdout(output):m['tasks'](client,profile,list(words)) + return json.loads(output.getvalue()) + with profile.locked(): + prefs=task('preferences','--due-days','2','--estimate','60','--complexity','3') + assert prefs['preferences']['due_days']==2 + item=task('add','CLI task')['item'];ident=item['uuid'] + assert item['estimate_minutes']==60 and item['due_on'] + task('start',ident);assert task('status')['item']['task_uuid']==ident + task('stop');assert task('status')['item'] is None + item=task('update',ident,'--title','Updated CLI task')['item'];assert item['title']=='Updated CLI task' + task('done',ident) + report=task('report','--json');assert sum(d['points'] for d in report['days'])==7 + assert any(i['uuid']==ident for i in report['tasks']) + path=Path(fixture['root'])/'person.vcf' + path.write_text('BEGIN:VCARD\r\nVERSION:4.0\r\nUID:urn:test:cli\r\nFN:CLI Person\r\nEMAIL:cli@example.invalid\r\nEND:VCARD\r\n') + output=io.StringIO() + with contextlib.redirect_stdout(output):m['contacts'](client,['import',str(path)]) + contact=json.loads(output.getvalue())['item'];output=io.StringIO() + with contextlib.redirect_stdout(output):m['contacts'](client,['query','CLI','--neomutt']) + assert 'cli@example.invalid\tCLI Person\t' in output.getvalue() + output=io.StringIO() + with contextlib.redirect_stdout(output):m['contacts'](client,['export',contact['uuid']]) + assert 'UID:urn:test:cli' in output.getvalue() + +if __name__=='__main__':run() diff --git a/static/css/contacts.css b/static/css/contacts.css new file mode 100644 index 0000000..0ca840d --- /dev/null +++ b/static/css/contacts.css @@ -0,0 +1,2 @@ +#contacts-app{max-width:1200px;margin:auto;padding:1rem}#contacts-controls{display:flex;gap:.5rem;flex-wrap:wrap}.contacts-layout{display:grid;grid-template-columns:minmax(200px,1fr) minmax(300px,2fr);gap:1rem;margin-top:1rem}#contacts-list>button{display:block;width:100%;text-align:start;padding:.5rem;border:0;border-bottom:1px solid var(--border-color,#7775);background:transparent;color:inherit}#contact-editor form{display:grid;gap:.6rem}#contact-editor label{display:grid;grid-template-columns:8rem 1fr;gap:.5rem}#contact-editor input,#contact-editor textarea{width:100%;min-width:0}#contact-editor textarea{min-height:5rem}#contact-editor details pre{white-space:pre-wrap;overflow-wrap:anywhere;max-height:20rem;overflow:auto}@media(max-width:650px){.contacts-layout{grid-template-columns:1fr}#contacts-list{max-height:30vh;overflow:auto}#contact-editor label{grid-template-columns:1fr}} +#contacts-app,#contacts-app *{box-sizing:border-box}.contacts-layout>*{min-width:0}#contacts-list button{overflow-wrap:anywhere} diff --git a/static/css/task-productivity.css b/static/css/task-productivity.css new file mode 100644 index 0000000..b9c21aa --- /dev/null +++ b/static/css/task-productivity.css @@ -0,0 +1,11 @@ +#task-productivity{max-width:1200px;margin:1rem auto;padding:0 1rem;color:var(--fg,var(--text-color));box-sizing:border-box} +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}} +.productivity-nav,.productivity-controls{display:flex;flex-wrap:wrap;align-items:center;gap:.65rem;margin:.5rem 0}.productivity-nav a{color:var(--link,var(--accent,#478ddd))} +.productivity-stats{display:grid;grid-template-columns:repeat(4,minmax(0,1fr));gap:.6rem;margin:1rem 0}.productivity-stat{padding:.6rem;border:1px solid var(--border,#8885);border-radius:.4rem}.productivity-stat strong{display:block;font-size:1.5rem} +.productivity-heatmap-scroll{overflow:auto;max-width:100%;padding:.4rem 0}.productivity-heatmap{display:grid;grid-template-rows:repeat(7,13px);grid-auto-flow:column;grid-auto-columns:13px;gap:3px;width:max-content} +.productivity-day{padding:0;min-width:0;border:0;border-radius:2px;background:var(--border,#8884);cursor:pointer}.productivity-day[data-level="1"]{background:#9be9a8}.productivity-day[data-level="2"]{background:#40c463}.productivity-day[data-level="3"]{background:#30a14e}.productivity-day[data-level="4"]{background:#216e39}.productivity-day:focus-visible{outline:2px solid var(--link,#4af);outline-offset:2px} +.productivity-table-wrap{overflow:auto}.productivity-table{border-collapse:collapse;width:100%}.productivity-table th,.productivity-table td{padding:.35rem .5rem;text-align:left;border-bottom:1px solid var(--border,#8884)}.productivity-table a{color:var(--link,#478ddd)} +.productivity-settings{max-width:850px}.productivity-setting{display:grid;grid-template-columns:minmax(180px,1fr) minmax(160px,2fr);gap:.5rem;padding:.4rem 0;border-bottom:1px solid var(--border,#8884);align-items:center}.productivity-setting input,.productivity-setting select,.productivity-controls input{box-sizing:border-box;width:100%;min-width:0;color:inherit;background:var(--input-bg,var(--bg,#222));border:1px solid var(--border,#8887);border-radius:.3rem;padding:.4rem}.productivity-setting input[type=checkbox]{width:2.2rem;height:1.2rem;accent-color:var(--link,#40a060)}.productivity-controls input{width:auto}.productivity-settings button,.productivity-controls button{padding:.4rem .8rem;color:inherit;background:var(--button-bg,var(--bg,#555));border:1px solid var(--border,#8887);border-radius:.3rem;cursor:pointer}.productivity-note{font-size:.85rem;opacity:.8}.productivity-running{padding:.5rem;border:1px solid var(--border,#8885);display:flex;gap:.5rem;align-items:center;flex-wrap:wrap} +@media(max-width:600px){.productivity-stats{grid-template-columns:repeat(2,minmax(0,1fr))}.productivity-setting{grid-template-columns:1fr}.productivity-setting input,.productivity-setting select,.productivity-settings button{min-height:42px}.productivity-controls{align-items:stretch}.productivity-controls input{max-width:43%}#task-productivity{padding:0 .6rem}.productivity-table th,.productivity-table td{padding:.5rem .3rem}} diff --git a/static/js/contacts.js b/static/js/contacts.js new file mode 100644 index 0000000..59b18c6 --- /dev/null +++ b/static/js/contacts.js @@ -0,0 +1,10 @@ +(()=>{'use strict';const app=document.getElementById('contacts-app');if(!app)return;const ja=document.documentElement.lang.startsWith('ja'),t=(en,jp)=>ja?jp:en,api='/_/api/v1/extension/organizer.contacts/',writable=app.dataset.writable==='true',status=document.getElementById('contacts-status'),list=document.getElementById('contacts-list'),editor=document.getElementById('contact-editor'),controls=document.getElementById('contacts-controls'); +const el=(tag,text)=>{const n=document.createElement(tag);if(text!==undefined)n.textContent=text;return n;},button=(text,fn)=>{const b=el('button',text);b.type='button';b.onclick=fn;return b;};app.querySelector('h1').textContent=t('Private contacts','個人アドレス帳');app.querySelector('nav a').textContent=t('Tasks','タスク');app.querySelector('nav a+a').textContent=t('Settings','設定'); +async function request(path,options={}){const r=await fetch(api+path,{credentials:'same-origin',signal:AbortSignal.timeout(15000),...options,headers:{'Content-Type':'application/json',...options.headers}});const d=await r.json().catch(()=>({}));if(!r.ok||r.redirected)throw Error(r.status===412?t('Changed or duplicate UID. Your input is retained.','競合または同じUIDの連絡先があります。入力は保持しています。'):t('Unable to save/load. Check your login, permissions and input.','保存・読込できません。ログイン、権限、入力を確認してください。'));return d;} +let dirty=false,busy=false,ticket=0;const search=el('input');search.type='search';search.placeholder=search.ariaLabel=t('Name, email, phone, organization','名前・メール・電話・所属');controls.append(search);const trash=el('select');trash.ariaLabel=t('Contacts or trash','連絡先・削除済み');for(const [value,label]of [['0',t('Contacts','連絡先')],['1',t('Deleted contacts','削除済み')]]){const o=el('option',label);o.value=value;trash.append(o);}controls.append(trash);trash.onchange=()=>load();const allowLeave=()=>!dirty||confirm(t('Discard unsaved edits?','未保存の変更を破棄しますか?')); +function show(c){dirty=false;editor.replaceChildren();const form=el('form'),inputs={};for(const [key,label,multi] of [['name',t('Name','名前'),false],['emails',t('Emails (one per line)','メール(1行1件)'),true],['phones',t('Phones (one per line)','電話(1行1件)'),true],['organization',t('Organization','所属'),false],['notes',t('Notes','メモ'),true]]){const l=el('label',label),n=el(multi?'textarea':'input');n.value=Array.isArray(c[key])?c[key].join('\n'):c[key]||'';n.disabled=!writable;n.name=key;if(key==='name'){n.required=true;n.maxLength=300;}l.append(n);form.append(l);inputs[key]=n;n.oninput=()=>{dirty=true;};} +const actions=el('div'),save=el('button',t('Save','保存'));save.type='submit';save.disabled=!writable;actions.append(save);if(c.version){const a=el('a',t('Export vCard','vCardを書き出す'));a.href=api+'items/'+c.uuid+'.vcf';actions.append(' ',a);const remove=button(c.deleted?t('Restore','復元'):t('Delete','削除'),async()=>{if(busy||!confirm(c.deleted?t('Restore this contact?','この連絡先を復元しますか?'):t('Delete this contact?','この連絡先を削除しますか?')))return;busy=true;try{await request('items/'+c.uuid,{method:'PUT',headers:{'If-Match':'"'+c.version+'"'},body:JSON.stringify({...c,deleted:!c.deleted})});dirty=false;editor.replaceChildren();await load();}catch(e){status.textContent=e.message;}finally{busy=false;}});remove.disabled=!writable;actions.append(' ',remove);} +form.append(actions);form.onsubmit=async e=>{e.preventDefault();if(busy)return;const draft={...c};for(const key of Object.keys(inputs))draft[key]=['emails','phones'].includes(key)?inputs[key].value.split('\n').map(v=>v.trim()).filter(Boolean):inputs[key].value;busy=true;save.disabled=true;try{const d=await request('items'+(c.version?'/'+c.uuid:''),{method:c.version?'PUT':'POST',headers:c.version?{'If-Match':'"'+c.version+'"'}:{},body:JSON.stringify(draft)});show(d.item);status.textContent=t('Saved','保存しました');await load();}catch(e){status.textContent=e.message;}finally{busy=false;save.disabled=!writable;}};editor.append(form);if(c.vcard){const d=el('details'),summary=el('summary',t('Original vCard (unsupported properties are retained)','vCard(未対応プロパティも保持)'));d.append(summary,el('pre',c.vcard));editor.append(d);}inputs.name.focus();} +async function load(after='',append=false){const id=++ticket;try{const d=await request('items?'+new URLSearchParams({q:search.value,after,deleted:trash.value}));if(id!==ticket)return;if(!append)list.replaceChildren();list.querySelector('[data-more]')?.remove();for(const c of d.items){const b=button(c.name+' · '+(c.emails[0]||c.organization||''),async()=>{if(!allowLeave())return;try{const d=await request('items/'+c.uuid);show(d.item);}catch(e){status.textContent=e.message;}});list.append(b);}if(d.next){const b=button(t('More','続き'),()=>load(d.next,true));b.dataset.more='true';list.append(b);}if(!list.children.length)list.append(el('p',t('No contacts','連絡先がありません')));}catch(e){status.textContent=e.message;}} +let timer;search.oninput=()=>{clearTimeout(timer);timer=setTimeout(()=>load(),200);};if(writable){controls.append(button(t('New contact','連絡先を追加'),()=>{if(allowLeave())show({uuid:crypto.randomUUID(),version:0,emails:[],phones:[],deleted:false});}));const file=el('input');file.type='file';file.accept='.vcf,text/vcard';file.hidden=true;controls.append(button(t('Import vCard','vCardを取り込む'),()=>file.click()),file);file.onchange=async()=>{const f=file.files[0];if(!f)return;try{if(f.size>2*1024*1024)throw Error(t('Maximum 2 MiB','上限は2 MiBです'));const text=await f.text();const cards=text.match(/BEGIN:VCARD\r?\n[\s\S]*?END:VCARD(?:\r?\n|$)/g)||[];if(!cards.length||cards.length>200||text.replace(/BEGIN:VCARD\r?\n[\s\S]*?END:VCARD(?:\r?\n|$)/g,'').trim())throw Error(t('Expected up to 200 UTF-8 vCards (3.0/4.0).','UTF-8のvCard 3.0/4.0(最大200件)を指定してください。'));if(!confirm(t('Import contacts: ','連絡先を取り込みます:')+cards.length+'\n'+t('Existing identical UID/content is skipped. Conflicts are not overwritten.','同一UID・内容は重複登録しません。競合は上書きせず報告します。')))return;let success=0,failed=[];for(let i=0;i{if(dirty){e.preventDefault();e.returnValue='';}});load();})(); diff --git a/static/js/home-command-parser.js b/static/js/home-command-parser.js new file mode 100644 index 0000000..24a013f --- /dev/null +++ b/static/js/home-command-parser.js @@ -0,0 +1,14 @@ +(function(root){'use strict';function parse(input){ + const tokens=[];let value='',quote='',escaped=false,started=false; + for(const ch of input.trim()){if(escaped){value+=ch;escaped=false;started=true;continue;}if(ch==='\\'){escaped=true;continue;}if(quote){if(ch===quote)quote='';else value+=ch;continue;}if(ch==='"'||ch==="'"){quote=ch;started=true;continue;}if(/\s/.test(ch)){if(started){tokens.push(value);value='';started=false;}}else{value+=ch;started=true;}} + if(quote||escaped)throw Error('Unclosed quote / 引用符を閉じてください');if(started)tokens.push(value); + if(tokens[0]?.toLowerCase()!=='add'||!['task','cal'].includes(tokens[1]?.toLowerCase()))throw Error('add task / add cal'); + const kind=tokens[1].toLowerCase(),options={},title=[],allowed=kind==='task'?['project','cost','due','start','review','planned','complexity']:['calendar','from','to']; + for(const token of tokens.slice(2)){const m=token.match(/^([a-z]+):(.*)$/i);if(!m){title.push(token);continue;}const key=m[1].toLowerCase();if(!allowed.includes(key)||Object.hasOwn(options,key)||!m[2])throw Error('Invalid option / オプションを確認:'+key);options[key]=m[2];} + if(!title.join(' ').trim())throw Error('Title required / 件名を入力してください'); + if(options.cost){const m=options.cost.match(/^(\d+(?:\.\d+)?)(h|m)$/);if(!m)throw Error('cost:2h / cost:30m');options.estimate_minutes=Number(m[1])*(m[2]==='h'?60:1);if(!Number.isInteger(options.estimate_minutes)||options.estimate_minutes>10080)throw Error('Invalid cost / 工数を確認してください');} + for(const k of ['due','start','review','planned'])if(options[k]&&!/^\d{4}-\d{2}-\d{2}$/.test(options[k]))throw Error(k+':YYYY-MM-DD'); + if(options.complexity&&!/^[1-5]$/.test(options.complexity))throw Error('complexity:1–5'); + if(kind==='cal'&&(!options.from||!options.to))throw Error('from:YYYY-MM-DDTHH:mm to:YYYY-MM-DDTHH:mm'); + return {kind,title:title.join(' '),options}; +}root.PagesWikiHomeCommand={parse};if(typeof module!=='undefined')module.exports={parse};})(globalThis); diff --git a/static/js/home-command-parser.test.cjs b/static/js/home-command-parser.test.cjs new file mode 100644 index 0000000..eb8bdf4 --- /dev/null +++ b/static/js/home-command-parser.test.cjs @@ -0,0 +1,3 @@ +const {test}=require('node:test');const assert=require('node:assert/strict');const {parse}=require('./home-command-parser.js'); +test('commands preserve quoted project and title',()=>{const c=parse('add task "調査を進める" project:"開発 計画" cost:2h due:2026-11-02');assert.equal(c.title,'調査を進める');assert.equal(c.options.project,'開発 計画');assert.equal(c.options.estimate_minutes,120);}); +test('calendar and malformed input',()=>{assert.equal(parse('add cal 会議 from:2026-11-02T09:00 to:2026-11-02T10:00').kind,'cal');for(const v of ['add task','add task x cost:0.001h','add task x foo:z','add task x project:a project:b','add task "x','add cal x'])assert.throws(()=>parse(v));}); diff --git a/static/js/home-commands.js b/static/js/home-commands.js new file mode 100644 index 0000000..5b7bb4b --- /dev/null +++ b/static/js/home-commands.js @@ -0,0 +1,12 @@ +(()=>{'use strict';const input=document.querySelector('[data-home-type-search]'),parser=window.PagesWikiHomeCommand;if(!input||!parser)return;const form=input.closest('form'),ja=document.documentElement.lang.startsWith('ja'),t=(en,jp)=>ja?jp:en,api='/_/api/v1/extension/organizer.tasks/',box=document.createElement('section');box.className='home-command-panel';box.hidden=true;box.style.cssText='position:relative;z-index:30;padding:.7rem;border-radius:.5rem;background:var(--bg-color,var(--bg,#222));color:var(--text-color,var(--fg,#eee));text-align:start';form.after(box);let busy=false,sequence=0,timer,prepared=null; +const el=(tag,text)=>{const n=document.createElement(tag);if(text!==undefined)n.textContent=text;return n;}; +async function request(path,options={}){const r=await fetch(api+path,{credentials:'same-origin',signal:AbortSignal.timeout(15000),...options,headers:{'Content-Type':'application/json'}});const d=await r.json().catch(()=>({}));if(!r.ok||r.redirected)throw Error(t('Check login, permissions, dates and current task settings. Input is retained.','ログイン、権限、日時、タスク設定を確認してください。入力は保持しています。'));return d;} +const matches=()=>/^add\s+(task|cal)\b/i.test(input.value.trim()); +async function resolve(kind,name){const d=await request(kind==='project'?'items?'+new URLSearchParams({kind:'project',view:'all',q:name,limit:100}):'calendars'),items=d.items.filter(c=>kind==='project'?c.title===name||c.uuid===name:c.name===name||c.pretty_name===name||c.id===name||!name);if(items.length!==1||d.next)throw Error(t('Select a unique '+kind+' (name or UUID).',kind==='project'?'プロジェクトを名前またはUUIDで一意に指定してください。':'カレンダーを指定してください(calendar:名前)。'));return kind==='project'?items[0].uuid:items[0].id;} +async function suggestions(){const id=++sequence;if(!matches()){box.hidden=true;return;}box.hidden=false;box.replaceChildren(el('small',t('Enter: review → Create. Dates use the Domain timezone.','Enterで確認 → 作成。日時はドメインのタイムゾーンです。')));const m=input.value.match(/\b(project|calendar):([^\s"]*)$/i);if(!m)return;try{const kind=m[1].toLowerCase(),d=await request(kind==='project'?'items?'+new URLSearchParams({kind:'project',view:'all',q:m[2],limit:20}):'calendars');if(id!==sequence||!matches())return;for(const c of d.items.filter(c=>kind==='project'||c.name.toLowerCase().includes(m[2].toLowerCase())).slice(0,8)){const b=el('button',kind==='project'?c.title:c.name);b.type='button';b.style.display='block';b.onclick=()=>{const name=kind==='project'?c.title:c.pretty_name;input.value=input.value.slice(0,m.index)+kind+':'+JSON.stringify(name)+' ';input.focus();prepared=null;sequence++;box.replaceChildren();};box.append(b);}}catch(e){if(id===sequence)box.append(el('p',e.message));}} +input.addEventListener('input',()=>{prepared=null;sequence++;clearTimeout(timer);timer=setTimeout(suggestions,180);});input.addEventListener('keydown',e=>{if(matches()&&e.key==='Escape'){box.hidden=true;sequence++;}}); +form.addEventListener('submit',async e=>{if(!matches())return;e.preventDefault();e.stopImmediatePropagation();if(busy)return;clearTimeout(timer);sequence++;busy=true;const source=input.value;box.hidden=false;box.replaceChildren();try{const cmd=parser.parse(source),o=cmd.options;let path,payload; + if(prepared?.source===source){({path,payload}=prepared);}else if(cmd.kind==='task'){path='capture';payload={request_id:crypto.randomUUID(),title:cmd.title};if(o.project)payload.project_uuid=await resolve('project',o.project);for(const [a,b]of [['due','due_on'],['start','start_on'],['planned','planned_on'],['review','review_on'],['estimate_minutes','estimate_minutes']])if(o[a]!==undefined)payload[b]=o[a];if(o.complexity)payload.complexity=Number(o.complexity);}else{path='calendar-capture';payload={request_id:crypto.randomUUID(),title:cmd.title,calendar_uuid:await resolve('calendar',o.calendar||''),from:o.from,to:o.to};} + if(source!==input.value)return;prepared={source,path,payload};box.append(el('strong',cmd.title),el('pre',Object.entries(o).map(([k,v])=>k+': '+v).join('\n')));const create=el('button',t('Create','作成')),cancel=el('button',t('Cancel','キャンセル'));create.type=cancel.type='button';cancel.onclick=()=>{box.hidden=true;};create.onclick=async()=>{if(busy)return;busy=true;create.disabled=true;cancel.disabled=true;input.disabled=true;try{const d=await request(path,{method:'POST',body:JSON.stringify(payload)});prepared=null;box.replaceChildren();const link=el('a',t('Created → Open','作成しました → 開く'));link.href=path==='capture'?'/v/plan/task/'+d.item.uuid:'/v/plan/event/'+encodeURIComponent(d.uid)+'?calendar='+encodeURIComponent(d.calendar);box.append(link);input.value='';}catch(err){box.append(el('p',err.message));}finally{busy=false;create.disabled=false;cancel.disabled=false;input.disabled=false;}};box.append(create,cancel); + }catch(err){box.append(el('p',err.message));}finally{busy=false;}},true); +})(); diff --git a/static/js/home-search-suggest.js b/static/js/home-search-suggest.js index 029d93f..8d2f738 100644 --- a/static/js/home-search-suggest.js +++ b/static/js/home-search-suggest.js @@ -105,6 +105,7 @@ candidates = []; close(); const query = input.value.trim(); + if (/^add\s+(task|cal)\b/i.test(query)) return; if ([...query].length < 2) return; timer = setTimeout(() => request(query), 140); }); @@ -114,6 +115,7 @@ else if (event.key === 'Escape') { event.preventDefault(); close(); } }); form.addEventListener('submit', event => { + if (/^add\s+(task|cal)\b/i.test(input.value.trim())) return; if (event.ctrlKey || event.metaKey) return; const options = rows(); let selected = active >= 0 ? options[active] : null; diff --git a/static/js/task-inline.js b/static/js/task-inline.js index fb865a1..ca5b9c0 100644 --- a/static/js/task-inline.js +++ b/static/js/task-inline.js @@ -25,6 +25,7 @@ function button(label,icon,fn){const b=el('button',icon);b.type='button';b.title=b.ariaLabel=label;b.addEventListener('click',fn);actions.append(b);return b;} const detail=el('a','⋯');detail.title=detail.ariaLabel=t('Details','詳細');detail.href='/v/plan/task/'+item.uuid;detail.dataset.action='detail';if(options.onDetail)detail.addEventListener('click',e=>{if(e.ctrlKey||e.metaKey||e.shiftKey||e.button)return;e.preventDefault();if(blocked())return;options.onDetail(item.uuid);});actions.append(detail); function blocked(){if(saving||dirtyRows.has(row)){message(t('Save or reload this row first.','先にこの行の変更を保存するか再読込してください。'));return true;}return false;} + if(writable&&!item.archived)button(t('Start work recording','作業時間を記録開始'),'▶',()=>{if(!blocked())document.getElementById('tasks-app')?.dispatchEvent(new CustomEvent('task-work',{detail:item}));}).dataset.action='work'; button(t('Calendar time blocks','カレンダーへ時間枠を追加'),'▦',async()=>{if(blocked())return;try{const d=await request(api+'/'+item.uuid);document.getElementById('tasks-app')?.dispatchEvent(new CustomEvent('task-plan',{detail:d.item}));}catch(e){message(e.message);}}).dataset.action='plan'; const reset=button(t('Reload row (discard edits)','行を再読込(編集を破棄)'),'↻',async()=>{if(saving)return;if(dirtyRows.has(row)&&!confirm(t('Discard changes in this row?','この行の変更を破棄しますか?')))return;try{const d=await request(api+'/'+item.uuid);item=d.item;draft={};dirtyRows.delete(row);Object.keys(inputs).forEach(k=>inputs[k].value=item[k]||'');paint();message('','idle');}catch(e){message(e.message);}});reset.dataset.action='reload'; function buttonMore(cursor){const more=el('button',t('More subtasks','続きのサブタスク'));more.type='button';more.className='task-children-more';more.addEventListener('click',async()=>{if(dirtyRows.size)return;more.disabled=true;try{const d=await request(api+'?'+new URLSearchParams({view:'family',parent:item.uuid,limit:100,before:cursor}));if(dirtyRows.size)return;d.items.forEach(c=>more.before(create(c,{...options,initialChildren:[],context:false,nested:true})));if(d.next)more.replaceWith(buttonMore(d.next));else more.remove();}catch(e){message(e.message);}finally{more.disabled=false;}});return more;} diff --git a/static/js/task-productivity.js b/static/js/task-productivity.js new file mode 100644 index 0000000..c7fbbea --- /dev/null +++ b/static/js/task-productivity.js @@ -0,0 +1,43 @@ +(() => { + 'use strict'; + const root=document.getElementById('task-productivity');if(!root)return; + const ja=document.documentElement.lang.startsWith('ja'), api='/_/api/v1/extension/organizer.tasks/'; + const word={tasks:['Tasks','タスク'],report:['Activity report','達成度・作業レポート'],settings:['Task defaults and email','タスクの既定値・メール'],contacts:['Contacts','連絡先'],completed:['Completed','完了件数'],points:['Points','ポイント'],work:['Work hours','作業時間'],focus:['Pomodoro hours','集中時間'],save:['Save','保存'],saved:['Saved','保存しました'],refresh:['Refresh','更新'],project_uuid:['Default project','既定のプロジェクト'],assignee_uuid:['Assignee UUID (annotation only)','担当者UUID(管理用メモ)'],due_days:['Due in days','期限までの日数'],start_days:['Start in days','着手までの日数'],planned_days:['Plan in days','取り組む日までの日数'],review_days:['Review in days','見直しまでの日数'],estimate_minutes:['Estimated minutes','見込み工数(分)'],complexity:['Complexity (1–5)','複雑度(1〜5)'],digest_enabled:['Email daily task list to my account email','毎日のやることリストを自分のメールに送る'],digest_time:['Delivery time','配信時刻'],timezone:['IANA timezone','タイムゾーン(IANA)'],none:['None','なし'],empty:['No records in this period.','この期間の記録はありません。'],partial:['Partial results: narrow the period.','件数上限に達しました。期間を狭めてください。'],error:['Request failed. Input is retained.','処理に失敗しました。入力は保持しています。'],email_required:['Set your account email first.','先にプロフィールにメールアドレスを設定してください。'],smtp_unavailable:['Ask an administrator to configure SMTP.','管理者によるSMTP設定が必要です。']}; + const t=k=>(word[k]||[k,k])[ja?1:0],el=(tag,text)=>{const n=document.createElement(tag);if(text!==undefined)n.textContent=text;return n;}; + const status=document.getElementById('productivity-status'),content=document.getElementById('productivity-content'); + root.querySelectorAll('[data-word]').forEach(n=>n.textContent=t(n.dataset.word));root.querySelector('h1').textContent=t(root.dataset.view==='settings'?'settings':'report'); + async function request(path,options={}){const r=await fetch(api+path,{credentials:'same-origin',cache:'no-store',signal:AbortSignal.timeout(15000),...options,headers:{'Content-Type':'application/json',...options.headers}});const d=await r.json().catch(()=>({}));if(!r.ok||r.redirected)throw Error(t(d.error||'error'));return d;} + const error=e=>{status.textContent=e.message||t('error');}; + async function settings(){ + const data=await request('preferences'),p=data.preferences;const form=el('form');form.className='productivity-settings';const fields={}; + const projects=await request('items?kind=project&view=all&limit=100'); + for(const key of ['project_uuid','assignee_uuid','due_days','start_days','planned_days','review_days','estimate_minutes','complexity','digest_enabled','digest_time','timezone']){ + const label=el('label',t(key));label.className='productivity-setting';const input=el(key==='project_uuid'?'select':'input');input.name=key; + if(key==='project_uuid'){const empty=el('option',t('none'));empty.value='';input.append(empty);for(const item of projects.items){const option=el('option',item.title);option.value=item.uuid;input.append(option);}if(p[key]&&!projects.items.some(x=>x.uuid===p[key])){const current=el('option',p[key]);current.value=p[key];input.append(current);}} + else if(key==='digest_enabled'){input.type='checkbox';input.checked=p[key];input.setAttribute('role','switch');} + else if(key.endsWith('_days')||['estimate_minutes','complexity'].includes(key)){input.type='number';input.min=key==='complexity'?1:0;input.max=key.endsWith('_days')?3650:key==='complexity'?5:10080;input.step=1;} + else input.type=key==='digest_time'?'time':'text'; + if(key!=='digest_enabled')input.value=p[key]??'';input.disabled=root.dataset.writable!=='true';fields[key]=input;label.append(input);form.append(label); + } + 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); + 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]=key==='digest_enabled'?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;} + 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 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; + 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);} + 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(); + } + (root.dataset.view==='settings'?settings():report()).catch(error); +})(); diff --git a/static/js/task-work.js b/static/js/task-work.js new file mode 100644 index 0000000..1263e91 --- /dev/null +++ b/static/js/task-work.js @@ -0,0 +1,6 @@ +(()=>{'use strict';const app=document.getElementById('tasks-app');if(!app)return;const ja=document.documentElement.lang.startsWith('ja'),t=(a,b)=>ja?b:a,api='/_/api/v1/extension/organizer.tasks/',bar=document.createElement('section'),label=document.createElement('a'),clock=document.createElement('span'),stop=document.createElement('button'),status=document.createElement('span');bar.className='task-work-bar';bar.hidden=true;bar.style.cssText='display:none;grid-column:1/-1;gap:.6rem;align-items:center;flex-wrap:wrap;padding:.5rem 0';stop.type='button';stop.textContent=t('■ Stop recording','■ 作業記録を終了');status.role='status';bar.append(label,clock,stop,status);app.prepend(bar);let current=null,busy=false; +async function request(path,options={}){const r=await fetch(api+path,{credentials:'same-origin',signal:AbortSignal.timeout(15000),...options,headers:{'Content-Type':'application/json'}});const d=await r.json().catch(()=>({}));if(!r.ok||r.redirected)throw Error(t('Recording failed. Check the active timer and reload; no duplicate timer is started.','記録できません。実行中の記録と権限を確認し再読込してください。タイマーは重複開始しません。'));return d;} +function tick(){clock.textContent=current?.uuid?Math.floor(Math.max(0,Date.now()-current.start_ms)/60000)+' min':'';} +async function load(){if(busy||document.hidden)return;try{const d=await request('work');current=d.item;bar.hidden=!current?.uuid;bar.style.display=bar.hidden?'none':'flex';if(current?.uuid){label.href='/v/plan/task/'+current.task_uuid;const task=await request('items/'+current.task_uuid);label.textContent=t('Recording: ','作業記録:')+task.item.title;}tick();}catch(e){status.textContent=e.message;}} +app.addEventListener('task-work',async e=>{if(busy)return;busy=true;try{await request('work',{method:'POST',body:JSON.stringify({action:'start',uuid:crypto.randomUUID(),task_uuid:e.detail.uuid})});status.textContent='';}catch(err){bar.hidden=false;bar.style.display='flex';status.textContent=err.message;const feedback=document.getElementById('tasks-status');if(feedback)feedback.textContent=err.message;}finally{busy=false;await load();}}); +stop.onclick=async()=>{if(busy||!current?.uuid)return;busy=true;stop.disabled=true;try{await request('work',{method:'POST',body:JSON.stringify({...current,action:'stop'})});status.textContent='';}catch(e){status.textContent=e.message;}finally{busy=false;stop.disabled=false;await load();}};setInterval(()=>{if(!document.hidden)tick();},10000);setInterval(load,60000);document.addEventListener('visibilitychange',load);load();})(); diff --git a/static/js/tasks.js b/static/js/tasks.js index e08e471..346791d 100644 --- a/static/js/tasks.js +++ b/static/js/tasks.js @@ -34,6 +34,8 @@ 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); + for(const [route,label] of [['report',ja?'▥ 達成度・作業レポート':'▥ Activity report'],['settings',ja?'⚙ 既定値・メール':'⚙ Defaults and email']]){const a=el('a',label);a.href='/v/plan/tasks/'+route;$('nav').append(a);} + const contacts=el('a',ja?'♧ 連絡先':'♧ Contacts');contacts.href='/v/plan/contacts';$('nav').append(contacts); $('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')); @@ -53,7 +55,9 @@ if(view==='carryover')$('help').textContent=ja?'昨日以前の計画・期限が残っている未完了タスク。行の矢印で割り当て直します(期限は変更しません)。':'Unfinished tasks planned or due before today. Use the row arrow to reschedule without changing the due date.'; } if(!writable)$('help').textContent+=' '+t('readonly'); - function blank(kind='task') { return { uuid:crypto.randomUUID(),kind,title:'',notes:'',status:'todo',bucket:['inbox','backlog','someday'].includes(view)?view:'inbox',priority:1,estimate_minutes:0,project_uuid:kind==='task'?projectID:'',page_uuid:'',due_on:'',planned_on:['today','day'].includes(view)&&kind==='task'?(view==='day'?selectedDate:today):'',review_on:'',archived:false,version:0 }; } + let taskDefaults={}; + async function refreshDefaults(){taskDefaults=(await request('/_/api/v1/extension/organizer.tasks/preferences')).defaults;} + function blank(kind='task') { const defaults=kind==='task'?taskDefaults:{};return { ...defaults,uuid:crypto.randomUUID(),kind,title:'',notes:'',status:'todo',bucket:['inbox','backlog','someday'].includes(view)?view:'inbox',priority:1,estimate_minutes:defaults.estimate_minutes||0,project_uuid:kind==='task'?(projectID||defaults.project_uuid||''):'',page_uuid:'',due_on:defaults.due_on||'',planned_on:['today','day'].includes(view)&&kind==='task'?(view==='day'?selectedDate:today):(defaults.planned_on||''),review_on:defaults.review_on||'',archived:false,version:0 }; } function listView(){return ['project','detail','new'].includes(view)?'all':view;} async function load(append=false) { if(window.PagesWikiTaskRows?.hasDirty()){$('status').textContent=ja?'編集中の行を保存または再読込してください。':'Save or reload edited rows first.';return;} @@ -97,6 +101,7 @@ if($('dialog').open&&!closeDialog())return; const ticket=++detailGeneration;dialogController?.abort();dialogController=new AbortController();$('error').textContent='';editing=null;dirty=false;$('fields').replaceChildren();Object.keys(fields).forEach(k=>delete fields[k]);$('history').open=false;$('history').querySelector('ol').replaceChildren();$('dialog-title').textContent=t('loading');$('save').disabled=true;$('archive').hidden=true;$('history').hidden=true;$('project-open').hidden=true;$('dialog').showModal(); try { + if(!id&&kind==='task')await refreshDefaults(); const data=id?await request(api+'/'+id,{signal:dialogController.signal}):{item:blank(kind),page_path:''};if(ticket!==detailGeneration)return;editing=data.item; $('dialog-title').textContent=t(id?'edit':kind==='project'?'newProject':'newTask'); const title=field('title',t('title'),'text',editing.title,true);title.required=true;title.maxLength=300; @@ -108,6 +113,8 @@ field('project_uuid',t('project'),'select',editing.project_uuid,true,[[editing.project_uuid,t(editing.project_uuid?'loading':'noProject')]]);await fillProjects(editing.project_uuid);if(ticket!==detailGeneration)return; field('priority',t('priority'),'select',editing.priority,false,[[0,t('low')],[1,t('normal')],[2,t('high')],[3,t('urgent')]]); const estimate=field('estimate_minutes',t('estimate'),'number',editing.estimate_minutes);estimate.min=0;estimate.max=10080; + const complexity=field('complexity',ja?'複雑度(1〜5)':'Complexity (1–5)','number',editing.complexity||1);complexity.min=1;complexity.max=5; + field('assignee_uuid',ja?'担当者UUID(権限は付与しません)':'Assignee UUID (does not grant access)','text',editing.assignee_uuid||'',true); ['due_on','planned_on','review_on','start_on','end_on'].forEach(k=>field(k,t(k),'date',editing[k])); ['notify_due','notify_planned'].forEach(k=>{const input=field(k,t(k),'checkbox','',true);input.checked=!!editing[k];input.parentElement.classList.add('task-toggle');}); const clock=field('reminder_time',t('reminder_time'),'time',editing.reminder_time||'09:00');clock.step=60; @@ -132,14 +139,14 @@ function closeDialog(force=false){if(saving)return false;if(!force&&dirty&&!confirm(t('discard')))return false;detailGeneration++;projectGeneration++;dialogController?.abort();$('dialog').close();editing=null;dirty=false;return true;} $('close').addEventListener('click',()=>closeDialog());$('dialog').addEventListener('cancel',e=>{e.preventDefault();closeDialog();}); $('form').addEventListener('input',()=>{dirty=true;}); - function readForm(){const item={...editing};['title','notes','notes_subpath','status','bucket','project_uuid','due_on','planned_on','review_on','start_on','end_on','reminder_time'].forEach(k=>{if(fields[k])item[k]=fields[k].value;});['notify_due','notify_planned'].forEach(k=>{if(fields[k])item[k]=fields[k].checked;});['priority','estimate_minutes'].forEach(k=>{if(fields[k])item[k]=Number(fields[k].value);});if(fields.page_path?.dataset.changed||(!item.page_uuid&&fields.page_path?.value))item.page_path=fields.page_path.value;return item;} + function readForm(){const item={...editing};['title','notes','notes_subpath','status','bucket','project_uuid','assignee_uuid','due_on','planned_on','review_on','start_on','end_on','reminder_time'].forEach(k=>{if(fields[k])item[k]=fields[k].value;});['notify_due','notify_planned'].forEach(k=>{if(fields[k])item[k]=fields[k].checked;});['priority','estimate_minutes','complexity'].forEach(k=>{if(fields[k])item[k]=Number(fields[k].value);});if(fields.page_path?.dataset.changed||(!item.page_uuid&&fields.page_path?.value))item.page_path=fields.page_path.value;return item;} async function saveItem(item){const data=await request(api+(item.version?'/'+item.uuid:''),{method:item.version?'PUT':'POST',headers:item.version?{'If-Match':'"'+item.version+'"'}:{},body:JSON.stringify(item)});app.dispatchEvent(new Event('task-today-refresh'));return data;} async function submit(archive=false){if(!editing||saving||!writable)return;if(!$('form').reportValidity())return;const item=readForm();if(archive)item.archived=!item.archived;saving=true;Object.values(fields).forEach(f=>f.disabled=true);$('save').disabled=$('archive').disabled=true;$('error').textContent='';try{await saveItem(item);saving=false;closeDialog(true);await load();if(projectID)await loadProject();}catch(e){$('error').textContent=e.message;}finally{saving=false;Object.values(fields).forEach(f=>f.disabled=!writable);$('save').disabled=$('archive').disabled=false;}} $('form').addEventListener('submit',e=>{e.preventDefault();submit();});$('archive').addEventListener('click',()=>submit(true)); $('history').addEventListener('toggle',async()=>{if(!$('history').open||!editing?.version)return;const id=editing.uuid;try{const data=await request(api+'/'+id+'/history');if(editing?.uuid!==id)return;const ol=$('history').querySelector('ol');ol.replaceChildren();data.items.forEach(v=>ol.append(el('li','#'+v.version+' · '+new Date(v.created_at_ms).toLocaleString())));}catch(e){$('error').textContent=e.message;}}); $('new').addEventListener('click',()=>open('',view==='projects'?'project':'task')); let capturing=false,captureDraft=null; - $('capture').addEventListener('submit',async e=>{e.preventDefault();if(capturing)return;const title=$('quick-title').value.trim();if(!title)return;capturing=true;const b=$('capture').querySelector('button');b.disabled=$('quick-title').disabled=true;if(!captureDraft||captureDraft.title!==title)captureDraft={...blank(),title};try{await saveItem(captureDraft);captureDraft=null;$('quick-title').value='';await load();}catch(err){$('status').textContent=err.message;}finally{capturing=false;b.disabled=$('quick-title').disabled=false;$('quick-title').focus();}}); + $('capture').addEventListener('submit',async e=>{e.preventDefault();if(capturing)return;const title=$('quick-title').value.trim();if(!title)return;capturing=true;const b=$('capture').querySelector('button');b.disabled=$('quick-title').disabled=true;try{if(!captureDraft||captureDraft.title!==title){await refreshDefaults();captureDraft={...blank(),title};}await saveItem(captureDraft);captureDraft=null;$('quick-title').value='';await load();}catch(err){$('status').textContent=err.message;}finally{capturing=false;b.disabled=$('quick-title').disabled=false;$('quick-title').focus();}}); function debounce(fn,delay){let timer;return()=>{clearTimeout(timer);timer=setTimeout(fn,delay);};} $('search').addEventListener('input',debounce(()=>load(),200));$('refresh').addEventListener('click',()=>load());$('more').addEventListener('click',()=>load(true)); async function loadProject(){try{const {item}=await request(api+'/'+projectID);$('heading').textContent=item.title;$('help').textContent=(item.archived?t('archived')+' · ':'')+(item.notes||t('private'));$('new').hidden=$('capture').hidden=!writable||item.archived;$('project-edit').hidden=false;$('project-edit').title=$('project-edit').ariaLabel=t('edit');}catch(e){$('status').textContent=e.message;}} diff --git a/templates/pages/contacts.gohtml b/templates/pages/contacts.gohtml new file mode 100644 index 0000000..d6bf63f --- /dev/null +++ b/templates/pages/contacts.gohtml @@ -0,0 +1 @@ +{{ define "contacts.gohtml" }}{{ .Title }} - {{ .WikiName }}
{{ template "auth-menu" . }}

{{ end }} diff --git a/templates/pages/home.gohtml b/templates/pages/home.gohtml index 19065dd..6d49be1 100644 --- a/templates/pages/home.gohtml +++ b/templates/pages/home.gohtml @@ -14,6 +14,7 @@ + diff --git a/templates/pages/search_home.gohtml b/templates/pages/search_home.gohtml index e690b5d..844b3eb 100644 --- a/templates/pages/search_home.gohtml +++ b/templates/pages/search_home.gohtml @@ -66,7 +66,8 @@ {{ end }} - + + diff --git a/templates/pages/task_productivity.gohtml b/templates/pages/task_productivity.gohtml new file mode 100644 index 0000000..644e10c --- /dev/null +++ b/templates/pages/task_productivity.gohtml @@ -0,0 +1,4 @@ +{{ define "task_productivity.gohtml" }} +{{ T "tasks.title" }} · {{ .WikiName }} +
{{ template "auth-menu" . }}
+

{{ end }} diff --git a/templates/pages/tasks.gohtml b/templates/pages/tasks.gohtml index 77d506f..6ca8382 100644 --- a/templates/pages/tasks.gohtml +++ b/templates/pages/tasks.gohtml @@ -11,4 +11,4 @@

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