ms365-toolkit 0.2.0__tar.gz → 0.2.2__tar.gz

{ms365_toolkit-0.2.0 → ms365_toolkit-0.2.2}/CHANGELOG.md

@@ -1,5 +1,28 @@
 # Changelog
 
+## Unreleased
+
+## 0.2.2 - 2026-05-27
+
+- Improved usage health diagnostics with stable invalid-input error codes,
+  Graph status hotspots, and recommendations for common MCP usage failures.
+- Reduced email search fallback churn, sped up global Teams message search by
+  avoiding top-results ranking, and made focused inbox reads fall back on Graph
+  `InefficientFilter` responses.
+- Clarified reply-draft thread preservation: `quote_mode=replace` now requires
+  explicit `preserve_thread=false`, draft responses include thread-linkage
+  status and message-header metadata, and `discard_draft` / `discard-draft`
+  safely deletes verified drafts.
+
+## 0.2.1 - 2026-05-19
+
+- Hardened MCP cursors, share-link downloads, attachment text extraction, domain
+  allowlist validation, calendar path encoding, delegated-calendar audit context,
+  and folder allowlist enforcement for guarded move/archive actions.
+- Fixed Microsoft Graph calendar timezone parsing so event reads and
+  free/busy searches handle Windows timezone IDs without crashing or losing
+  calendar accuracy for common Graph zones.
+
 ## 0.2.0 - 2026-05-18
 
 - Added guarded EA calendar write tools for creating, updating, cancelling, and

{ms365_toolkit-0.2.0 → ms365_toolkit-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ms365-toolkit
-Version: 0.2.0
+Version: 0.2.2
 Summary: Local-first Microsoft 365 email, calendar, and Teams toolkit with MCP support and guarded write flows
 Project-URL: Homepage, https://github.com/sadhiappan/ms365-toolkit
 Project-URL: Repository, https://github.com/sadhiappan/ms365-toolkit
@@ -21,6 +21,7 @@ Classifier: Topic :: Communications :: Email
 Classifier: Topic :: Office/Business
 Requires-Python: >=3.11
 Requires-Dist: beautifulsoup4<5,>=4.12
+Requires-Dist: idna<4,>=3.15
 Requires-Dist: keyring<26,>=25.0
 Requires-Dist: msal<2,>=1.31
 Requires-Dist: openpyxl<4,>=3.1
@@ -65,6 +66,8 @@ See [CHANGELOG.md](CHANGELOG.md) for release notes.
 - Device-code auth uses a public-client Entra app registration; no client secret is required.
 - Usage analytics record coarse command/tool metadata, durations, sizes, and sanitized errors, not email bodies, recipients, subjects, transcript text, raw Graph IDs, or tokens.
 - Guarded email writes require a write token, `user.endpoint = "me"`, configured allowlists, rate limits, confirmation/audit checks, and a content hash for send.
+- Guarded calendar writes support own and delegated/shared calendars, record the target endpoint in local audit logs, and require confirmation plus content-hash checks for mutations.
+- MCP share-link downloads are confined to the active profile's downloads directory; use the CLI for explicit arbitrary local output paths.
 - Microsoft Graph access is delegated and tenant-controlled. Some Teams channel-message, file, transcript, and Copilot notes features require additional scopes, admin consent, licenses, or available tenant data.
 
 ## Agent Setup
@@ -475,6 +478,7 @@ Supported v1 tools include guarded email writes:
 - `create_reply_draft`
 - `create_reply_all_draft`
 - `send_email_draft`
+- `discard_draft`
 - `flag_email`
 - `unflag_email`
 - `move_email`
@@ -519,13 +523,17 @@ the destination folder to match `folder_allowlist`.
 Use `create_email_draft` for standalone new messages, `create_reply_draft` for
 sender-only threaded replies, and `create_reply_all_draft` for threaded
 reply-all drafts. Reply drafts are created through Graph reply actions and
-verified against the source conversation before they are returned. Reply and
-reply-all drafts preserve Outlook's generated original message chain by default;
-pass `quote_mode="replace"` in MCP or `--quote-mode replace` in the CLI to
-replace the generated quoted body. Reply and reply-all drafts may include
-external recipients who were already original thread participants; newly added
-external recipients are still blocked unless they match `domain_allowlist`. Use
-`flag_email`, `unflag_email`,
+reported with `thread_preservation_status`, `source_internet_message_id`,
+`source_conversation_id`, `draft_in_reply_to`, and `draft_references` metadata
+so callers can verify true thread linkage. Use `quote_mode="preserve"` for real
+replies; `quote_mode="replace"` is only for intentionally non-thread-preserving
+drafts and requires `preserve_thread=false` (CLI: `--no-preserve-thread`).
+Draft results warn when a subject starts with `RE:` but the draft will not send
+as a preserved-thread reply. Reply and reply-all drafts may include external
+recipients who were already original thread participants; newly added external
+recipients are still blocked unless they match `domain_allowlist`. Use
+`discard_draft` / `discard-draft` to clean up a bad draft by draft ID after the
+tool verifies the target is still a draft. Use `flag_email`, `unflag_email`,
 `move_email`, and `archive_email` for guarded mailbox state changes.
 
 ## CLI Verification and Useful Commands
@@ -571,7 +579,9 @@ Try the guarded email write flow:
 uvx --from ms365-toolkit@latest ms365-toolkit create-email-draft --to user@example.com --subject "Hello" --body "<p>Hello</p>"
 uvx --from ms365-toolkit@latest ms365-toolkit create-reply-draft <message_id> --body "<p>Reply</p>"
 uvx --from ms365-toolkit@latest ms365-toolkit create-reply-all-draft <message_id> --body "<p>Reply all</p>"
+uvx --from ms365-toolkit@latest ms365-toolkit create-reply-draft <message_id> --body "<p>New body only</p>" --quote-mode replace --no-preserve-thread
 uvx --from ms365-toolkit@latest ms365-toolkit send-email-draft <draft_id> <content_hash>
+uvx --from ms365-toolkit@latest ms365-toolkit discard-draft <draft_id>
 uvx --from ms365-toolkit@latest ms365-toolkit flag-email <message_id>
 uvx --from ms365-toolkit@latest ms365-toolkit unflag-email <message_id>
 uvx --from ms365-toolkit@latest ms365-toolkit move-email <message_id> <folder_id>
@@ -607,7 +617,9 @@ metrics, durations, result sizes, sanitized Graph endpoint templates, retry
 counts, and sanitized error categories. They do not record email
 bodies, subjects, recipients, message IDs, full URLs, query strings, transcript
 text, raw Graph IDs, or tokens. Use `usage health` to identify failure hotspots,
-slow tools, large responses, Graph endpoint hotspots, and recommended fixes.
+slow tools, large responses, Graph endpoint/status hotspots, and recommended
+fixes. Invalid-input failures are grouped with stable sanitized error codes
+instead of raw user-provided values.
 By default, `usage health` focuses on the current toolkit version when current
 events exist; use `--scope all` to include older versions. Usage reports also
 support `--version`, `--client`, `--surface`, and `--name` filters.
@@ -621,8 +633,8 @@ uv run python scripts/inspect_mcp_sessions.py
 Pinned/reproducible MCP registration:
 
 ```bash
-codex mcp add ms365 --env MS365_TOOLKIT_PROFILE=default --env MS365_TOOLKIT_CLIENT=codex --env MS365_TOOLKIT_WARN_STALE=1 --env UV_CACHE_DIR=/tmp/ms365-toolkit-uv-cache --env UV_TOOL_DIR=/tmp/ms365-toolkit-uv-tools -- sh -lc 'cd /tmp && exec uvx --from ms365-toolkit-mcp==0.2.0 ms365-toolkit-mcp'
-claude mcp add -s user ms365 -e MS365_TOOLKIT_PROFILE=default -e MS365_TOOLKIT_CLIENT=claude -e MS365_TOOLKIT_WARN_STALE=1 -e UV_CACHE_DIR=/tmp/ms365-toolkit-uv-cache -e UV_TOOL_DIR=/tmp/ms365-toolkit-uv-tools -- sh -lc 'cd /tmp && exec uvx --from ms365-toolkit-mcp==0.2.0 ms365-toolkit-mcp'
+codex mcp add ms365 --env MS365_TOOLKIT_PROFILE=default --env MS365_TOOLKIT_CLIENT=codex --env MS365_TOOLKIT_WARN_STALE=1 --env UV_CACHE_DIR=/tmp/ms365-toolkit-uv-cache --env UV_TOOL_DIR=/tmp/ms365-toolkit-uv-tools -- sh -lc 'cd /tmp && exec uvx --from ms365-toolkit-mcp==0.2.2 ms365-toolkit-mcp'
+claude mcp add -s user ms365 -e MS365_TOOLKIT_PROFILE=default -e MS365_TOOLKIT_CLIENT=claude -e MS365_TOOLKIT_WARN_STALE=1 -e UV_CACHE_DIR=/tmp/ms365-toolkit-uv-cache -e UV_TOOL_DIR=/tmp/ms365-toolkit-uv-tools -- sh -lc 'cd /tmp && exec uvx --from ms365-toolkit-mcp==0.2.2 ms365-toolkit-mcp'
 ```
 
 Pinned registrations are deterministic but can become stale. Use them only when

{ms365_toolkit-0.2.0 → ms365_toolkit-0.2.2}/README.md

@@ -19,6 +19,8 @@ See [CHANGELOG.md](CHANGELOG.md) for release notes.
 - Device-code auth uses a public-client Entra app registration; no client secret is required.
 - Usage analytics record coarse command/tool metadata, durations, sizes, and sanitized errors, not email bodies, recipients, subjects, transcript text, raw Graph IDs, or tokens.
 - Guarded email writes require a write token, `user.endpoint = "me"`, configured allowlists, rate limits, confirmation/audit checks, and a content hash for send.
+- Guarded calendar writes support own and delegated/shared calendars, record the target endpoint in local audit logs, and require confirmation plus content-hash checks for mutations.
+- MCP share-link downloads are confined to the active profile's downloads directory; use the CLI for explicit arbitrary local output paths.
 - Microsoft Graph access is delegated and tenant-controlled. Some Teams channel-message, file, transcript, and Copilot notes features require additional scopes, admin consent, licenses, or available tenant data.
 
 ## Agent Setup
@@ -429,6 +431,7 @@ Supported v1 tools include guarded email writes:
 - `create_reply_draft`
 - `create_reply_all_draft`
 - `send_email_draft`
+- `discard_draft`
 - `flag_email`
 - `unflag_email`
 - `move_email`
@@ -473,13 +476,17 @@ the destination folder to match `folder_allowlist`.
 Use `create_email_draft` for standalone new messages, `create_reply_draft` for
 sender-only threaded replies, and `create_reply_all_draft` for threaded
 reply-all drafts. Reply drafts are created through Graph reply actions and
-verified against the source conversation before they are returned. Reply and
-reply-all drafts preserve Outlook's generated original message chain by default;
-pass `quote_mode="replace"` in MCP or `--quote-mode replace` in the CLI to
-replace the generated quoted body. Reply and reply-all drafts may include
-external recipients who were already original thread participants; newly added
-external recipients are still blocked unless they match `domain_allowlist`. Use
-`flag_email`, `unflag_email`,
+reported with `thread_preservation_status`, `source_internet_message_id`,
+`source_conversation_id`, `draft_in_reply_to`, and `draft_references` metadata
+so callers can verify true thread linkage. Use `quote_mode="preserve"` for real
+replies; `quote_mode="replace"` is only for intentionally non-thread-preserving
+drafts and requires `preserve_thread=false` (CLI: `--no-preserve-thread`).
+Draft results warn when a subject starts with `RE:` but the draft will not send
+as a preserved-thread reply. Reply and reply-all drafts may include external
+recipients who were already original thread participants; newly added external
+recipients are still blocked unless they match `domain_allowlist`. Use
+`discard_draft` / `discard-draft` to clean up a bad draft by draft ID after the
+tool verifies the target is still a draft. Use `flag_email`, `unflag_email`,
 `move_email`, and `archive_email` for guarded mailbox state changes.
 
 ## CLI Verification and Useful Commands
@@ -525,7 +532,9 @@ Try the guarded email write flow:
 uvx --from ms365-toolkit@latest ms365-toolkit create-email-draft --to user@example.com --subject "Hello" --body "<p>Hello</p>"
 uvx --from ms365-toolkit@latest ms365-toolkit create-reply-draft <message_id> --body "<p>Reply</p>"
 uvx --from ms365-toolkit@latest ms365-toolkit create-reply-all-draft <message_id> --body "<p>Reply all</p>"
+uvx --from ms365-toolkit@latest ms365-toolkit create-reply-draft <message_id> --body "<p>New body only</p>" --quote-mode replace --no-preserve-thread
 uvx --from ms365-toolkit@latest ms365-toolkit send-email-draft <draft_id> <content_hash>
+uvx --from ms365-toolkit@latest ms365-toolkit discard-draft <draft_id>
 uvx --from ms365-toolkit@latest ms365-toolkit flag-email <message_id>
 uvx --from ms365-toolkit@latest ms365-toolkit unflag-email <message_id>
 uvx --from ms365-toolkit@latest ms365-toolkit move-email <message_id> <folder_id>
@@ -561,7 +570,9 @@ metrics, durations, result sizes, sanitized Graph endpoint templates, retry
 counts, and sanitized error categories. They do not record email
 bodies, subjects, recipients, message IDs, full URLs, query strings, transcript
 text, raw Graph IDs, or tokens. Use `usage health` to identify failure hotspots,
-slow tools, large responses, Graph endpoint hotspots, and recommended fixes.
+slow tools, large responses, Graph endpoint/status hotspots, and recommended
+fixes. Invalid-input failures are grouped with stable sanitized error codes
+instead of raw user-provided values.
 By default, `usage health` focuses on the current toolkit version when current
 events exist; use `--scope all` to include older versions. Usage reports also
 support `--version`, `--client`, `--surface`, and `--name` filters.
@@ -575,8 +586,8 @@ uv run python scripts/inspect_mcp_sessions.py
 Pinned/reproducible MCP registration:
 
 ```bash
-codex mcp add ms365 --env MS365_TOOLKIT_PROFILE=default --env MS365_TOOLKIT_CLIENT=codex --env MS365_TOOLKIT_WARN_STALE=1 --env UV_CACHE_DIR=/tmp/ms365-toolkit-uv-cache --env UV_TOOL_DIR=/tmp/ms365-toolkit-uv-tools -- sh -lc 'cd /tmp && exec uvx --from ms365-toolkit-mcp==0.2.0 ms365-toolkit-mcp'
-claude mcp add -s user ms365 -e MS365_TOOLKIT_PROFILE=default -e MS365_TOOLKIT_CLIENT=claude -e MS365_TOOLKIT_WARN_STALE=1 -e UV_CACHE_DIR=/tmp/ms365-toolkit-uv-cache -e UV_TOOL_DIR=/tmp/ms365-toolkit-uv-tools -- sh -lc 'cd /tmp && exec uvx --from ms365-toolkit-mcp==0.2.0 ms365-toolkit-mcp'
+codex mcp add ms365 --env MS365_TOOLKIT_PROFILE=default --env MS365_TOOLKIT_CLIENT=codex --env MS365_TOOLKIT_WARN_STALE=1 --env UV_CACHE_DIR=/tmp/ms365-toolkit-uv-cache --env UV_TOOL_DIR=/tmp/ms365-toolkit-uv-tools -- sh -lc 'cd /tmp && exec uvx --from ms365-toolkit-mcp==0.2.2 ms365-toolkit-mcp'
+claude mcp add -s user ms365 -e MS365_TOOLKIT_PROFILE=default -e MS365_TOOLKIT_CLIENT=claude -e MS365_TOOLKIT_WARN_STALE=1 -e UV_CACHE_DIR=/tmp/ms365-toolkit-uv-cache -e UV_TOOL_DIR=/tmp/ms365-toolkit-uv-tools -- sh -lc 'cd /tmp && exec uvx --from ms365-toolkit-mcp==0.2.2 ms365-toolkit-mcp'
 ```
 
 Pinned registrations are deterministic but can become stale. Use them only when

{ms365_toolkit-0.2.0 → ms365_toolkit-0.2.2}/SECURITY.md

@@ -19,6 +19,8 @@ Security fixes are expected to target the latest published version. Users should
 - No client secret is required or supported for normal device-code auth.
 - MCP and CLI tools use delegated Microsoft Graph permissions granted by the tenant.
 - Guarded write actions require an explicit write token, configured safety gates, allowlist checks, rate limits, and audit logging.
+- MCP continuation cursors are signed by the local server process and are rejected if tampered with or reused after the server secret changes.
+- MCP share-link downloads are confined to the active profile's downloads directory and enforce a maximum downloaded file size before writing.
 - Profile names are treated as local path components and must be simple names, not paths.
 - The local labeling UI binds to loopback hosts only and requires a per-server CSRF token for label updates.
 

{ms365_toolkit-0.2.0 → ms365_toolkit-0.2.2}/packages/ms365-toolkit-mcp/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "ms365-toolkit-mcp"
-version = "0.2.0"
+version = "0.2.2"
 description = "Installable MCP entrypoint for ms365-toolkit"
 readme = "README.md"
 requires-python = ">=3.11"
@@ -27,7 +27,7 @@ classifiers = [
     "Topic :: Office/Business",
 ]
 dependencies = [
-    "ms365-toolkit[mcp]==0.2.0",
+    "ms365-toolkit[mcp]==0.2.2",
 ]
 
 [project.scripts]

{ms365_toolkit-0.2.0 → ms365_toolkit-0.2.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "ms365-toolkit"
-version = "0.2.0"
+version = "0.2.2"
 description = "Local-first Microsoft 365 email, calendar, and Teams toolkit with MCP support and guarded write flows"
 readme = "README.md"
 requires-python = ">=3.11"
@@ -32,6 +32,7 @@ dependencies = [
     "msal>=1.31,<2",
     "pyjwt>=2.8,<3",
     "beautifulsoup4>=4.12,<5",
+    "idna>=3.15,<4",
     "keyring>=25.0,<26",
     "openpyxl>=3.1,<4",
     "packaging>=24,<26",

ms365_toolkit-0.2.2/src/ms365_toolkit/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.2.2"

{ms365_toolkit-0.2.0 → ms365_toolkit-0.2.2}/src/ms365_toolkit/cli/__init__.py

@@ -64,6 +64,7 @@ from ms365_toolkit.cli.write_tools import (
     create_event_command,
     create_reply_all_draft_command,
     create_reply_draft_command,
+    discard_draft_command,
     flag_email_command,
     move_email_command,
     respond_event_command,
@@ -266,6 +267,11 @@ def _build_parser() -> argparse.ArgumentParser:
         choices=("preserve", "replace"),
         default="preserve",
     )
+    create_reply_draft_parser.add_argument(
+        "--preserve-thread",
+        action=argparse.BooleanOptionalAction,
+        default=True,
+    )
     create_reply_draft_parser.set_defaults(handler=create_reply_draft_command)
 
     create_reply_all_draft_parser = subparsers.add_parser("create-reply-all-draft")
@@ -281,6 +287,11 @@ def _build_parser() -> argparse.ArgumentParser:
         choices=("preserve", "replace"),
         default="preserve",
     )
+    create_reply_all_draft_parser.add_argument(
+        "--preserve-thread",
+        action=argparse.BooleanOptionalAction,
+        default=True,
+    )
     create_reply_all_draft_parser.set_defaults(handler=create_reply_all_draft_command)
 
     send_email_draft_parser = subparsers.add_parser("send-email-draft")
@@ -288,6 +299,10 @@ def _build_parser() -> argparse.ArgumentParser:
     send_email_draft_parser.add_argument("content_hash")
     send_email_draft_parser.set_defaults(handler=send_email_draft_command)
 
+    discard_draft_parser = subparsers.add_parser("discard-draft")
+    discard_draft_parser.add_argument("draft_id")
+    discard_draft_parser.set_defaults(handler=discard_draft_command)
+
     flag_email_parser = subparsers.add_parser("flag-email")
     flag_email_parser.add_argument("message_id")
     flag_email_parser.set_defaults(handler=flag_email_command)
@@ -642,6 +657,7 @@ def _is_write_intent(args: argparse.Namespace, name: str) -> bool:
         "create-reply-draft",
         "create-reply-all-draft",
         "send-email-draft",
+        "discard-draft",
         "flag-email",
         "unflag-email",
         "move-email",

{ms365_toolkit-0.2.0 → ms365_toolkit-0.2.2}/src/ms365_toolkit/cli/read_common.py

@@ -12,6 +12,7 @@ from ms365_toolkit.client.mail_index import MailboxIndex
 from ms365_toolkit.config.loader import get_profile_dir
 from ms365_toolkit.safety.audit import AuditLogger
 from ms365_toolkit.safety.dialog import show_confirmation_dialog
+from ms365_toolkit.safety.folder_allowlist import FolderAllowlistChecker
 from ms365_toolkit.safety.gate import ConfiguredSafetyGate, DialogPreview, SafetyResult
 from ms365_toolkit.safety.rate_limiter import RateLimiter
 from ms365_toolkit.safety.reply_registry import ReplyDraftSafetyRegistry
@@ -87,6 +88,14 @@ def build_safety_gate(config: ToolkitConfig, profile: str) -> ConfiguredSafetyGa
         ),
         audit_logger=AuditLogger(path=safety_dir / "audit.jsonl"),
         dialog=_confirmation_dialog,
+        folder_checker=FolderAllowlistChecker(
+            profile=profile,
+            allowed_folders=config.safety.folder_allowlist,
+            folder_provider=lambda: EmailClient(
+                build_read_graph_client(config, profile)
+            ).list_folders(),
+            cache_path=safety_dir / "folders.json",
+        ),
     )
 
 

{ms365_toolkit-0.2.0 → ms365_toolkit-0.2.2}/src/ms365_toolkit/cli/usage.py

@@ -143,6 +143,11 @@ def usage_health_command(args: Namespace, config: ToolkitConfig) -> int:
     _print_section("Slow tools", report["slow_tools"], _format_slow_tool)
     _print_section("Large responses", report["large_responses"], _format_large_response)
     _print_section("Graph hotspots", report["graph_hotspots"], _format_graph_hotspot)
+    _print_section(
+        "Graph status hotspots",
+        report["graph_status_hotspots"],
+        _format_graph_status_hotspot,
+    )
     _print_section("Recommendations", report["recommendations"], str)
     return 0
 
@@ -250,3 +255,10 @@ def _format_graph_hotspot(row: dict[str, object]) -> str:
         f"{row['endpoint']} count={row['count']} "
         f"duration={row['duration_ms']}ms"
     )
+
+
+def _format_graph_status_hotspot(row: dict[str, object]) -> str:
+    return (
+        f"{row['name']} status={row['status']} count={row['count']} "
+        f"latest={row['latest_timestamp']}"
+    )

{ms365_toolkit-0.2.0 → ms365_toolkit-0.2.2}/src/ms365_toolkit/cli/write_tools.py

@@ -53,6 +53,7 @@ def create_reply_draft_command(args: Namespace, config: ToolkitConfig) -> int:
             body=_body_value(args),
             importance=_optional_importance_value(args),
             quote_mode=args.quote_mode,
+            preserve_thread=args.preserve_thread,
         )
     except (
         AuthenticationError,
@@ -74,6 +75,7 @@ def create_reply_all_draft_command(args: Namespace, config: ToolkitConfig) -> in
             body=_body_value(args),
             importance=_optional_importance_value(args),
             quote_mode=args.quote_mode,
+            preserve_thread=args.preserve_thread,
         )
     except (
         AuthenticationError,
@@ -108,6 +110,24 @@ def send_email_draft_command(args: Namespace, config: ToolkitConfig) -> int:
     return 0
 
 
+def discard_draft_command(args: Namespace, config: ToolkitConfig) -> int:
+    try:
+        result = build_write_email_client(config, args.profile).discard_draft(
+            args.draft_id.strip()
+        )
+    except (
+        AuthenticationError,
+        GraphAPIError,
+        RateLimitedError,
+        SafetyDeniedError,
+        OSError,
+        ValueError,
+    ) as exc:
+        return _print_write_error(exc)
+    _print_action_result(result)
+    return 0
+
+
 def flag_email_command(args: Namespace, config: ToolkitConfig) -> int:
     return _message_state_command(args, config, flagged=True)
 
@@ -355,9 +375,21 @@ def _print_email_draft(draft: EmailDraft) -> None:
     print(f"Importance: {draft.importance}")
     if draft.is_threaded_reply:
         print("Threaded Reply: yes")
+    if draft.quote_mode != "replace" or draft.source_conversation_id or draft.thread_warnings:
         print(f"Quote Mode: {draft.quote_mode}")
+        print(f"Thread Preservation: {draft.thread_preservation_status}")
+    for warning in draft.thread_warnings:
+        print(f"Warning: {warning}")
     if draft.conversation_id:
         print(f"Conversation ID: {draft.conversation_id}")
+    if draft.source_conversation_id:
+        print(f"Source Conversation ID: {draft.source_conversation_id}")
+    if draft.source_internet_message_id:
+        print(f"Source Internet Message ID: {draft.source_internet_message_id}")
+    if draft.draft_in_reply_to:
+        print(f"Draft In-Reply-To: {draft.draft_in_reply_to}")
+    if draft.draft_references:
+        print(f"Draft References Source: {'yes' if draft.draft_references_source else 'no'}")
     print(f"To: {', '.join(draft.to) or '(none)'}")
     if draft.cc:
         print(f"Cc: {', '.join(draft.cc)}")

{ms365_toolkit-0.2.0 → ms365_toolkit-0.2.2}/src/ms365_toolkit/client/attachment_text.py

@@ -16,6 +16,7 @@ _CONTENT_TYPE_FORMATS = {
     "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet": "xlsx",
     "application/vnd.openxmlformats-officedocument.presentationml.presentation": "pptx",
 }
+MAX_EXTRACTABLE_BYTES = 25 * 1024 * 1024
 
 
 def extract_attachment_text(
@@ -26,6 +27,10 @@ def extract_attachment_text(
 ) -> ExtractedAttachment:
     if max_chars <= 0:
         raise ValueError("max_chars must be a positive integer")
+    if len(content) > MAX_EXTRACTABLE_BYTES:
+        raise ValueError(
+            f"attachment exceeds {MAX_EXTRACTABLE_BYTES} byte text extraction limit"
+        )
     format_name = _detect_format(attachment)
     extractor = {
         "pdf": _extract_pdf_text,

{ms365_toolkit-0.2.0 → ms365_toolkit-0.2.2}/src/ms365_toolkit/client/calendar.py

@@ -6,13 +6,13 @@ from dataclasses import replace
 from datetime import UTC, datetime, timedelta
 from typing import TYPE_CHECKING, Any, Protocol, TypeVar
 from urllib.parse import quote
-from zoneinfo import ZoneInfo, ZoneInfoNotFoundError
 
 import jwt
 
 from ms365_toolkit.client.exceptions import AuthenticationError, GraphAPIError, SafetyDeniedError
 from ms365_toolkit.client.paging import GraphPage, graph_next_link
 from ms365_toolkit.client.sanitize import strip_html
+from ms365_toolkit.graph_datetime import graph_zoneinfo, parse_graph_datetime
 from ms365_toolkit.models.calendar import (
     Attendee,
     CalendarActionResult,
@@ -94,7 +94,7 @@ class CalendarClient:
             return self._events_page_from_response(response)
         if start is None or end is None:
             raise ValueError("start and end are required unless next_link is provided")
-        path = f"calendars/{calendar_id}/calendarView" if calendar_id else "calendarView"
+        path = _calendar_view_path(calendar_id)
         query: dict[str, Any] = {
             "startDateTime": _to_graph_datetime(start),
             "endDateTime": _to_graph_datetime(end),
@@ -106,7 +106,7 @@ class CalendarClient:
         return self._events_page_from_response(response)
 
     def get_event(self, event_id: str) -> CalendarEvent:
-        response = self.graph.get(f"events/{event_id}")
+        response = self.graph.get(_event_path(event_id))
         return self._event_from_item(response)
 
     def find_free_slots(
@@ -131,8 +131,8 @@ class CalendarClient:
             for item in schedule.get("scheduleItems", []):
                 slots.append(
                     FreeBusySlot(
-                        start=_parse_graph_datetime(item.get("start", {}).get("dateTime")),
-                        end=_parse_graph_datetime(item.get("end", {}).get("dateTime")),
+                        start=_parse_graph_datetime(item.get("start", {})),
+                        end=_parse_graph_datetime(item.get("end", {})),
                         status=item.get("status", "unknown"),
                     )
                 )
@@ -246,8 +246,14 @@ class CalendarClient:
                 recipients=attendees,
                 dialog_preview=DialogPreview(
                     title="Confirm Calendar Event Create",
-                    body=_event_dialog_body(event, action="Create"),
+                    body=_event_dialog_body(
+                        event,
+                        action="Create",
+                        target=_calendar_target_label(self.graph.config),
+                    ),
                 ),
+                target_endpoint=self.graph.config.user.endpoint,
+                target_user=self.graph.config.user.user_principal_name,
             )
         )
         item = self.graph.post(_events_collection_path(calendar_id), body=payload)
@@ -332,10 +338,16 @@ class CalendarClient:
                 domain_exempt_recipients=existing_recipients,
                 dialog_preview=DialogPreview(
                     title="Confirm Calendar Event Update",
-                    body=_event_dialog_body(updated_event, action="Update"),
+                    body=_event_dialog_body(
+                        updated_event,
+                        action="Update",
+                        target=_calendar_target_label(self.graph.config),
+                    ),
                 ),
                 ical_uid=current.ical_uid,
                 operation_id=current.ical_uid or current.id,
+                target_endpoint=self.graph.config.user.endpoint,
+                target_user=self.graph.config.user.user_principal_name,
             )
         )
         item = self.graph.patch(_event_path(normalized_event_id, calendar_id), body=payload)
@@ -372,10 +384,17 @@ class CalendarClient:
                 domain_exempt_recipients=recipients,
                 dialog_preview=DialogPreview(
                     title="Confirm Calendar Event Cancel",
-                    body=_event_dialog_body(current, action="Cancel", comment=comment),
+                    body=_event_dialog_body(
+                        current,
+                        action="Cancel",
+                        comment=comment,
+                        target=_calendar_target_label(self.graph.config),
+                    ),
                 ),
                 ical_uid=current.ical_uid,
                 operation_id=current.ical_uid or current.id,
+                target_endpoint=self.graph.config.user.endpoint,
+                target_user=self.graph.config.user.user_principal_name,
             )
         )
         self.graph.post(
@@ -419,10 +438,13 @@ class CalendarClient:
                         current,
                         action=f"Respond {normalized_response}",
                         comment=comment,
+                        target=_calendar_target_label(self.graph.config),
                     ),
                 ),
                 ical_uid=current.ical_uid,
                 operation_id=f"{current.ical_uid or current.id}:{normalized_response}",
+                target_endpoint=self.graph.config.user.endpoint,
+                target_user=self.graph.config.user.user_principal_name,
             )
         )
         self.graph.post(
@@ -591,8 +613,8 @@ class CalendarClient:
         event = CalendarEvent(
             id=item.get("id", ""),
             subject=item.get("subject", ""),
-            start=_parse_graph_datetime(start_time.get("dateTime")),
-            end=_parse_graph_datetime(end_time.get("dateTime")),
+            start=_parse_graph_datetime(start_time),
+            end=_parse_graph_datetime(end_time),
             timezone=start_time.get("timeZone", "UTC"),
             location=location,
             body_content=strip_html(body),
@@ -877,6 +899,13 @@ def _events_collection_path(calendar_id: str | None = None) -> str:
     return f"calendars/{_path_segment('calendar_id', normalized_calendar_id)}/events"
 
 
+def _calendar_view_path(calendar_id: str | None = None) -> str:
+    normalized_calendar_id = (calendar_id or "").strip()
+    if not normalized_calendar_id:
+        return "calendarView"
+    return f"calendars/{_path_segment('calendar_id', normalized_calendar_id)}/calendarView"
+
+
 def _event_path(event_id: str, calendar_id: str | None = None) -> str:
     normalized_event_id = _required_text(event_id, "event_id")
     normalized_calendar_id = (calendar_id or "").strip()
@@ -1084,8 +1113,8 @@ def _datetime_for_timezone(value: datetime, timezone: str) -> datetime:
     if timezone.upper() == "UTC":
         return value.astimezone(UTC)
     try:
-        return value.astimezone(ZoneInfo(timezone))
-    except ZoneInfoNotFoundError:
+        return value.astimezone(graph_zoneinfo(timezone))
+    except ValueError:
         return value
 
 
@@ -1136,16 +1165,28 @@ def _required_text(value: str, field: str) -> str:
     return normalized
 
 
-def _event_dialog_body(event: CalendarEvent, *, action: str, comment: str = "") -> str:
+def _event_dialog_body(
+    event: CalendarEvent,
+    *,
+    action: str,
+    comment: str = "",
+    target: str = "",
+) -> str:
     attendees = ", ".join(attendee.email for attendee in event.attendees) or "(none)"
     parts = [
         f"Action: {action}",
-        f"Subject: {event.subject or '(no subject)'}",
-        f"Start: {event.start.isoformat()}",
-        f"End: {event.end.isoformat()}",
-        f"Location: {event.location or '(none)'}",
-        f"Attendees: {attendees}",
     ]
+    if target:
+        parts.append(f"Calendar Target: {target}")
+    parts.extend(
+        [
+            f"Subject: {event.subject or '(no subject)'}",
+            f"Start: {event.start.isoformat()}",
+            f"End: {event.end.isoformat()}",
+            f"Location: {event.location or '(none)'}",
+            f"Attendees: {attendees}",
+        ]
+    )
     if comment:
         parts.append(f"Comment: {comment}")
     if event.body_content:
@@ -1153,6 +1194,12 @@ def _event_dialog_body(event: CalendarEvent, *, action: str, comment: str = "")
     return "\n".join(parts)
 
 
+def _calendar_target_label(config: Any) -> str:
+    if config.user.endpoint == "users":
+        return f"users/{config.user.user_principal_name}"
+    return "me"
+
+
 def _calendar_action_result(
     event: CalendarEvent,
     *,
@@ -1196,9 +1243,11 @@ def _to_graph_datetime(value: datetime) -> str:
 
 
 def _parse_graph_datetime(value: Any) -> datetime:
-    if not isinstance(value, str) or not value:
+    if isinstance(value, str):
+        return parse_graph_datetime(value)
+    if not isinstance(value, dict):
         return datetime.fromtimestamp(0, tz=UTC)
-    return datetime.fromisoformat(value.replace("Z", "+00:00")).astimezone(UTC)
+    return parse_graph_datetime(value.get("dateTime"), value.get("timeZone", "UTC"))
 
 
 def _extract_transcript_segments(content: str) -> tuple[TranscriptSegment, ...]: