mcp-gee-sweet 0.7.0.dev69__tar.gz → 0.7.0.dev72__tar.gz

{mcp_gee_sweet-0.7.0.dev69 → mcp_gee_sweet-0.7.0.dev72}/CLAUDE.md

@@ -34,7 +34,7 @@ Logic is split across `src/mcp_gee_sweet/`: `server.py` (MCP setup, tool decorat
 - `tools/sheets/data.py` — read/write cell data (`get_sheet_data`, `get_sheet_formulas`, `get_multiple_*`, `find_in_spreadsheet`, `clear_values`, `update_cells`, `batch_update_cells`, `batch_update`)
 - `tools/sheets/structure.py` — sheet structure (`list_sheets`, `copy_sheet`, `rename_sheet`, `create_sheet`, `delete_sheet`, `add_rows`, `add_columns`, `delete_rows`, `delete_columns`, `format_cells`, `merge_cells`, `unmerge_cells`, `freeze`, `sort_range`, `add_chart`)
 - `tools/sheets/helpers.py` — A1 notation helpers (`_parse_a1_notation`, `_column_index_to_letter`, etc.)
-- `tools/drive/files.py` — file/folder operations (`create_spreadsheet`, `list_spreadsheets`, `list_files`, `search_files`, `create_folder`, `copy_file`, `move_file`, `rename_file`, `delete_file`, `list_shared_with_me`, `list_recent_files`, `get_storage_quota`, etc.)
+- `tools/drive/files.py` — file/folder operations (`create_spreadsheet`, `import_csv_to_sheet`, `list_spreadsheets`, `list_files`, `search_files`, `create_folder`, `copy_file`, `move_file`, `rename_file`, `delete_file`, `list_shared_with_me`, `list_recent_files`, `get_storage_quota`, etc.)
 - `tools/drive/sharing.py` — permissions (`share_spreadsheet`, `share_file`, `list_permissions`, `update_permission`, `remove_permission`)
 - `tools/drive/transfer.py` — upload/download/sync/export/revisions
 - `tools/drive/activity.py` — `list_file_activity` (Drive Activity API v2; requires `drive.activity.readonly` scope)

{mcp_gee_sweet-0.7.0.dev69 → mcp_gee_sweet-0.7.0.dev72}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mcp-gee-sweet
-Version: 0.7.0.dev69
+Version: 0.7.0.dev72
 Summary: MCP server for Google Workspace — Sheets, Drive, Docs, and Calendar. 60+ tools for AI clients.
 Project-URL: Homepage, https://github.com/khuisman/mcp-gee-sweet
 Project-URL: Bug Tracker, https://github.com/khuisman/mcp-gee-sweet/issues

{mcp_gee_sweet-0.7.0.dev69 → mcp_gee_sweet-0.7.0.dev72}/docs/configuration.md

@@ -69,7 +69,7 @@ Access logs are emitted at `INFO` level — they appear when `DEBUG_LEVEL` is `D
 
 <!-- Auto-generated by `scripts/gen_tool_docs.py` — do not edit by hand, your changes will be overwritten on the next commit. -->
 
-By default all 87 tools are registered. Use `ENABLED_TOOLS` (or `--include-tools` on the CLI) to restrict the server to exactly the tools you need. This reduces the AI's context window cost — each registered tool is a name the model must reason about on every call.
+By default all 90 tools are registered. Use `ENABLED_TOOLS` (or `--include-tools` on the CLI) to restrict the server to exactly the tools you need. This reduces the AI's context window cost — each registered tool is a name the model must reason about on every call.
 
 ```bash
 # Environment variable
@@ -90,7 +90,7 @@ get_sheet_data,get_sheet_formulas,get_multiple_sheet_data,get_multiple_spreadshe
 
 **Sheets read + write:**
 ```
-get_sheet_data,get_sheet_formulas,get_multiple_sheet_data,get_multiple_spreadsheet_summary,find_in_spreadsheet,list_sheets,list_spreadsheets,update_cells,batch_update_cells,create_sheet,rename_sheet,add_rows,add_columns
+get_sheet_data,get_sheet_formulas,get_multiple_sheet_data,get_multiple_spreadsheet_summary,find_in_spreadsheet,list_sheets,list_spreadsheets,update_cells,batch_update_cells,create_sheet,rename_sheet,add_rows,add_columns,import_csv_to_sheet
 ```
 
 **Docs only:**
@@ -100,7 +100,7 @@ create_doc,get_doc_content,get_doc_structure,write_doc_content,insert_doc_text,i
 
 **Calendar only:**
 ```
-list_calendars,get_calendar,create_calendar,update_calendar,delete_calendar,list_events,get_event,create_event,update_event,delete_event,find_free_slots
+list_calendars,get_calendar,create_calendar,update_calendar,delete_calendar,add_calendar_to_list,remove_calendar_from_list,list_events,get_event,create_event,update_event,delete_event,find_free_slots
 ```
 
 See [Tools](tools.md) for the full list of tool names.

{mcp_gee_sweet-0.7.0.dev69 → mcp_gee_sweet-0.7.0.dev72}/docs/qa/tests/calendar.md

@@ -243,6 +243,113 @@ Fixtures: see [`docs/qa/setup.md`](../setup.md). Substitute your `{CALENDAR_ID}`
 
 ---
 
+## `add_calendar_to_list`
+
+> **Note on test targets:** subscribing/unsubscribing only makes sense for a calendar you don't own — Google's API rejects unsubscribing from a calendar you're the owner of (see TC-CAL59). Public holiday calendars (e.g. `en.japanese#holiday@group.v.calendar.google.com`, `en.canadian#holiday@group.v.calendar.google.com`) are convenient, safe, reversible targets: not owned by any test account, freely subscribable, and already used elsewhere in this account for `en.usa#holiday@group.v.calendar.google.com`.
+
+### TC-CAL53: Subscribe to an existing calendar ⚠️ destructive
+
+**Setup:** a public calendar not currently in your list, e.g. `en.japanese#holiday@group.v.calendar.google.com` (Holidays in Japan)
+
+**Prompt**
+> "Subscribe me to calendar 'en.japanese#holiday@group.v.calendar.google.com'"
+
+**Checks**
+- Returns `id`, `summary`, `time_zone`, `access_role`, `primary`, `color_id`
+- Calendar now appears in a follow-up `list_calendars` call (cache invalidated)
+
+**Result (2026-07-05) ✅** — Response had `summary: "Holidays in Japan"`, `access_role: "reader"`, `color_id: "8"` (Google's default color for this public calendar). Confirmed present in a follow-up `list_calendars` call.
+
+---
+
+### TC-CAL54: Subscribe with a color ⚠️ destructive
+
+**Setup:** another public calendar not yet in your list, e.g. `en.canadian#holiday@group.v.calendar.google.com` (Holidays in Canada)
+
+**Prompt**
+> "Subscribe me to calendar 'en.canadian#holiday@group.v.calendar.google.com' with color ID '7'"
+
+**Checks**
+- `color_id` in the response is `7`
+- Calendar appears in `list_calendars`
+
+**Result (2026-07-05) ✅** — Response had `color_id: "7"` and `summary: "Holidays in Canada"`. Confirmed present in `list_calendars`.
+
+---
+
+### TC-CAL55: Non-existent calendar ID
+
+**Prompt**
+> "Subscribe me to calendar 'totally-invalid-cal-id@example.com'"
+
+**Checks**
+- Returns `{"error": "..."}` — not a top-level exception
+- No entry added to the calendar list
+
+**Result (2026-07-05) ✅** — Returned `{"error": "<HttpError 404 ... 'reason': 'notFound' ...>"}`.
+
+---
+
+## `remove_calendar_from_list`
+
+### TC-CAL56: Unsubscribe from a calendar ⚠️ destructive
+
+**Setup:** use the calendar subscribed to in TC-CAL53
+
+**Prompt**
+> "Remove calendar 'en.japanese#holiday@group.v.calendar.google.com' from my calendar list"
+
+**Checks**
+- Returns `{"calendar_id": "...", "action": "removed_from_list"}`
+- Calendar no longer appears in a follow-up `list_calendars` call
+
+**Result (2026-07-05) ✅** — Returned `{"calendar_id": "en.japanese#holiday@group.v.calendar.google.com", "action": "removed_from_list"}`. Confirmed absent from a follow-up `list_calendars` call (the still-subscribed "Holidays in Canada" from TC-CAL54 remained, confirming only the targeted subscription was removed).
+
+---
+
+### TC-CAL57: Unsubscribing does not delete the calendar ⚠️ destructive
+
+**Setup:** the calendar removed from the list in TC-CAL56
+
+**Prompt**
+> "Subscribe me again to calendar 'en.japanese#holiday@group.v.calendar.google.com'"
+
+**Checks**
+- `add_calendar_to_list` succeeds and returns the same `summary` as TC-CAL53
+- Confirms `remove_calendar_from_list` only removed the subscription — the underlying calendar was never affected and is still fully subscribable
+
+**Result (2026-07-05) ✅** — Re-subscribed successfully; response had the identical `summary: "Holidays in Japan"` as TC-CAL53. Confirms `remove_calendar_from_list` does not touch the calendar resource itself.
+
+---
+
+### TC-CAL58: Non-existent calendar ID
+
+**Prompt**
+> "Remove calendar 'totally-invalid-cal-id@example.com' from my calendar list"
+
+**Checks**
+- Returns `{"error": "..."}` — not a top-level exception
+- No side effects
+
+**Result (2026-07-05) ✅** — Returned `{"error": "<HttpError 404 ... 'reason': 'notFound' ...>"}`.
+
+---
+
+### TC-CAL59: Cannot unsubscribe from a calendar you own
+
+**Setup:** a calendar owned by the authenticated user (e.g. a fresh calendar from `create_calendar`)
+
+**Prompt**
+> "Remove calendar {OWNED_CALENDAR_ID} from my calendar list"
+
+**Checks**
+- Returns `{"error": "..."}` — not a top-level exception
+- The error message is actionable and names `delete_calendar` as the correct tool — `remove_calendar_from_list` detects the `cannotUnsubscribeFromOwnedCalendar` reason specifically and substitutes a friendly message instead of passing through the raw `HttpError` repr
+
+**Result (2026-07-05) ✅** — First pass (before the friendly-message special-case was added) returned the raw passthrough: `{"error": "<HttpError 403 ... 'reason': 'cannotUnsubscribeFromOwnedCalendar', 'message': 'The data owner of a calendar cannot remove such a calendar from their calendar list.' ...>"}`. After adding the special-case (reviewer feedback on #269), re-ran against a freshly created owned calendar and got `{"error": "Google does not allow removing a calendar you own from your own calendar list (reason: cannotUnsubscribeFromOwnedCalendar). Use delete_calendar instead to permanently delete it."}` — confirms the friendlier message is live and correctly names the fix.
+
+---
+
 ## `list_events`
 
 ### TC-CAL09: No time filters — upcoming events

{mcp_gee_sweet-0.7.0.dev69 → mcp_gee_sweet-0.7.0.dev72}/docs/qa/tests/drive.md

@@ -2015,3 +2015,86 @@ Exporting even the small QA fixture spreadsheet as `xlsx` immediately exceeded t
 **Background:** `list_file_activity` is already Drive-API-paginated (`page_size` clamped 1–100) and low per-item size — the only realistic exposure is a single activity's `actors` list ballooning on a file with many collaborators. Per the #242 decision doc, this tool intentionally did NOT get a dedicated live-fixture verification (reproducing hundreds of real Drive Activity events isn't cheaply reproducible) — the cap was added for defense-in-depth only, verified by unit tests (`tests/drive/test_activity.py::TestListFileActivity::test_oversized_result_raises`, `test_error_points_to_page_size_not_local_path`).
 
 **Result (2026-07-03) ✅ N/A (by design)** — sanity-checked live that the tool still functions normally post-change (`list_file_activity(file_id={SPREADSHEET_ID}, page_size=5)` returned a normal activity list, no regression). Cap-triggering behavior covered by unit tests only, not live-verified — documented scoping decision, not an oversight.
+
+---
+
+## `import_csv_to_sheet` (issue #187)
+
+### TC-D169: Basic import creates a populated spreadsheet ⚠️ requires-oauth ⚠️ local-filesystem
+**Prompt**
+> "Import the CSV at `/tmp/qa-import.csv` into a new spreadsheet called 'QA-CSV-Import' in {FOLDER_ID}" *(create `/tmp/qa-import.csv` first with a header row and 3-4 data rows, e.g. `name,age\nAlice,30\nBob,25`)*
+
+**Checks**
+- Response includes `spreadsheetId`, `title` exactly 'QA-CSV-Import', `web_link`, and `rows_written` matching the CSV's row count (including header)
+- `get_sheet_data` on the new spreadsheet's default sheet returns the same rows, in order
+- `drive_folder_cache.mark_dirty` fired — `list_files` on {FOLDER_ID} shows the new spreadsheet without a manual refresh
+
+**Result (2026-07-05) ✅ PASS** Created spreadsheet with `rows_written: 4`, exact title, and a `web_link`. `get_sheet_data` returned `[["name","age"],["Alice","30"],["Bob","25"],["Carol","42"]]` — matches the source CSV exactly. `list_files` on `{FOLDER_ID}` showed the new spreadsheet immediately, confirming the folder cache invalidation.
+
+---
+
+### TC-D170: Custom sheet_name renames the default sheet ⚠️ requires-oauth ⚠️ local-filesystem
+**Prompt**
+> "Import `/tmp/qa-import.csv` into a new spreadsheet called 'QA-CSV-SheetName', writing to a sheet named 'Imported Data'"
+
+**Checks**
+- `list_sheets` on the new spreadsheet shows exactly one sheet, named 'Imported Data' (not the default 'Sheet1')
+- Data is present on that sheet via `get_sheet_data`
+
+**Result (2026-07-05) ✅ PASS** `list_sheets` returned exactly `["Imported Data"]` — the default 'Sheet1' was renamed, not left as a second sheet. `get_sheet_data(sheet="Imported Data")` returned all 4 rows intact.
+
+---
+
+### TC-D171: Grid auto-expands beyond the default 1000-row limit ⚠️ requires-oauth ⚠️ local-filesystem
+**Prompt**
+> "Import `/tmp/qa-import-large.csv` into a new spreadsheet called 'QA-CSV-Large'" *(generate a CSV with 1500+ rows first, e.g. a header plus 1500 numbered rows)*
+
+**Checks**
+- Call succeeds without a grid-limit error (the documented pre-fix failure mode from the issue)
+- `rows_written` matches the CSV's row count
+- `get_sheet_data` confirms the last row of data is present and readable (not silently truncated at row 1000)
+
+**Result (2026-07-05) ✅ PASS** Imported a 1501-row CSV (header + 1500 numbered rows) with no grid-limit error — `rows_written: 1501`. Fetched `A999:B1501` and confirmed rows 998–1500 are all present and correctly ordered, including the final row `["1500","row-1500"]` — no truncation at the default 1000-row boundary.
+
+---
+
+### TC-D172: Ragged rows padded to a common width ⚠️ requires-oauth ⚠️ local-filesystem
+**Prompt**
+> "Import `/tmp/qa-import-ragged.csv` into a new spreadsheet called 'QA-CSV-Ragged'" *(create a CSV where some rows have fewer columns than others, e.g. `a,b,c\n1,2\n`)*
+
+**Checks**
+- No dropped or misaligned rows in `get_sheet_data` — short rows are padded with empty cells rather than shifted
+- `rows_written` counts every row, including the short one
+
+**Result (2026-07-05) ✅ PASS** CSV `a,b,c / 1,2 / 4,5,6` (middle row missing column `c`) imported with `rows_written: 3`. `get_sheet_data` returned `[["a","b","c"],["1","2"],["4","5","6"]]` — the short row landed under columns a/b with no shift, and the third row wasn't dropped. (Sheets' values.get omits the trailing empty string we pad with, which is expected — the important signal is correct alignment, not a literal empty-string round-trip.)
+
+---
+
+### TC-D173: Non-existent local path (unit test)
+
+**Checks (unit test)**
+- Missing `local_path` returns `{"error": "..."}` mentioning the path — no Drive API call made
+
+**Result:** ✅ Unit test `test_file_not_found_returns_error` confirms this — no live Drive call needed since the function returns before touching `ctx`.
+
+---
+
+### TC-D174: Non-.csv extension rejected (unit test)
+
+**Checks (unit test)**
+- A `.txt` (or other non-.csv) file returns `{"error": "..."}` mentioning `.csv`, without calling the Drive API
+
+**Result:** ✅ Unit test `test_unsupported_extension_returns_error` confirms this.
+
+---
+
+### TC-D175: Service account Drive limitation
+
+**Prompt**
+> "Import `/tmp/qa-import.csv` into a new spreadsheet called 'QA-CSV-SA-Limit' — I want to verify whether the service account can create in personal Drive"
+
+**Checks**
+- 🔍 **Known limitation:** same as `create_spreadsheet` (TC-D04) — service account cannot create in personal Drive, only shared folders it has access to
+- Unit-level equivalent already covered: `test_storage_quota_error_returns_helpful_message`
+
+**Result (2026-07-05) ✅ PASS** Against the service-account server (`mcp-gee-sweet-sa`), the call returned `{"error": "Service accounts cannot create or copy files in personal Drive (no storage quota). Use OAuth or ADC auth for full Drive write access, or use a Shared Drive destination. Check server://auth-status for your current auth method and affected tools."}` — the same `_SA_QUOTA_ERROR` message `create_spreadsheet` returns, confirming the shared error path works for this tool too.

{mcp_gee_sweet-0.7.0.dev69 → mcp_gee_sweet-0.7.0.dev72}/docs/tools.md

@@ -2,7 +2,7 @@
 
 <!-- Auto-generated by `scripts/gen_tool_docs.py` — do not edit by hand, your changes will be overwritten on the next commit. -->
 
-87 tools. All tool names are lowercase with underscores — use these exact strings with `ENABLED_TOOLS` or `--include-tools`.
+90 tools. All tool names are lowercase with underscores — use these exact strings with `ENABLED_TOOLS` or `--include-tools`.
 
 ## Sheets — data
 
@@ -47,6 +47,7 @@
 | Tool | Description | Key parameters |
 |---|---|---|
 | `create_spreadsheet` | Create a new Google Spreadsheet. | `title`, `folder_id?` |
+| `import_csv_to_sheet` | Create a new Google Spreadsheet populated from a local CSV file. | `local_path`, `title`, `folder_id?`, `sheet_name?` |
 | `list_spreadsheets` | List all spreadsheets in the specified Google Drive folder. If no folder is specified, uses the configured default folder or lists from 'My Drive'. | `folder_id?` |
 | `search_spreadsheets` | Search for spreadsheets in Google Drive by name or content. | `query`, `max_results?` |
 
@@ -144,6 +145,8 @@ Requires the `drive.activity.readonly` scope; uses the Drive Activity API v2.
 | `create_calendar` | Create a new secondary calendar owned by the authenticated user. | `summary`, `description?`, `timezone?` |
 | `update_calendar` | Update fields on an existing calendar using patch semantics. Only the fields you provide are changed; omitted fields are left as-is. | `calendar_id`, `summary?`, `description?`, `timezone?`, `color_id?` |
 | `delete_calendar` | Permanently delete a calendar. For calendars you own, this deletes the calendar entirely for all users it is shared with — use with caution. To only stop seeing a calendar in your own list, use remove_calendar_from_list instead. | `calendar_id` |
+| `add_calendar_to_list` | Subscribe the authenticated user (or service account) to a calendar, adding it to their calendar list so it appears in list_calendars. | `calendar_id`, `color_id?` |
+| `remove_calendar_from_list` | Unsubscribe from a calendar, removing it from the authenticated user's calendar list. The calendar itself is not deleted and is unaffected for any other user it's shared with — use delete_calendar to permanently delete a calendar you own. | `calendar_id` |
 | `list_events` | List events in a calendar. | `calendar_id`, `time_min?`, `time_max?`, `query?`, `max_results?`, `expand_recurring?` |
 | `get_event` | Fetch a single event by calendar ID and event ID. | `calendar_id`, `event_id` |
 | `create_event` | Create a new event in a calendar. | `calendar_id`, `summary`, `start`, `end`, `description?`, `location?`, `attendees?`, `timezone?`, `recurrence?` |

mcp_gee_sweet-0.7.0.dev72/pyrightconfig.json

@@ -0,0 +1,4 @@
+{
+  "venvPath": ".",
+  "venv": ".venv"
+}

{mcp_gee_sweet-0.7.0.dev69 → mcp_gee_sweet-0.7.0.dev72}/scripts/gen_tool_docs.py

@@ -97,7 +97,13 @@ SECTIONS = [
         "Spreadsheets (Drive-level)",
         lambda f: (
             f.__module__ == "mcp_gee_sweet.tools.drive.files"
-            and f.__name__ in {"create_spreadsheet", "list_spreadsheets", "search_spreadsheets"}
+            and f.__name__
+            in {
+                "create_spreadsheet",
+                "list_spreadsheets",
+                "search_spreadsheets",
+                "import_csv_to_sheet",
+            }
         ),
         "`create_spreadsheet` cannot create files in a personal Drive when using "
         "service account auth — use OAuth or a Shared Drive.",
@@ -106,7 +112,13 @@ SECTIONS = [
         "Drive — files",
         lambda f: (
             f.__module__ == "mcp_gee_sweet.tools.drive.files"
-            and f.__name__ not in {"create_spreadsheet", "list_spreadsheets", "search_spreadsheets"}
+            and f.__name__
+            not in {
+                "create_spreadsheet",
+                "list_spreadsheets",
+                "search_spreadsheets",
+                "import_csv_to_sheet",
+            }
         ),
         None,
     ),
@@ -194,6 +206,7 @@ SUBSETS = [
             "rename_sheet",
             "add_rows",
             "add_columns",
+            "import_csv_to_sheet",
         ],
     ),
     (
@@ -218,6 +231,8 @@ SUBSETS = [
             "create_calendar",
             "update_calendar",
             "delete_calendar",
+            "add_calendar_to_list",
+            "remove_calendar_from_list",
             "list_events",
             "get_event",
             "create_event",

{mcp_gee_sweet-0.7.0.dev69 → mcp_gee_sweet-0.7.0.dev72}/src/mcp_gee_sweet/tools/calendar.py

@@ -2,11 +2,18 @@ import logging
 from datetime import datetime, timezone
 from typing import Any
 
+from googleapiclient.errors import HttpError
 from mcp.server.fastmcp import Context
 from mcp.types import ToolAnnotations
 
 logger = logging.getLogger(__name__)
 
+_CANNOT_UNSUBSCRIBE_OWNED_ERROR = (
+    "Google does not allow removing a calendar you own from your own calendar list "
+    "(reason: cannotUnsubscribeFromOwnedCalendar). Use delete_calendar instead to "
+    "permanently delete it."
+)
+
 
 def register(tool):
     @tool(annotations=ToolAnnotations(title="List Calendars", readOnlyHint=True))
@@ -207,6 +214,81 @@ def register(tool):
         logger.debug("Deleted calendar %s", calendar_id)
         return {"calendar_id": calendar_id, "action": "deleted"}
 
+    @tool(annotations=ToolAnnotations(title="Add Calendar To List", destructiveHint=True))
+    def add_calendar_to_list(
+        calendar_id: str,
+        color_id: str | None = None,
+        ctx: Context = None,
+    ) -> dict[str, Any]:
+        """
+        Subscribe the authenticated user (or service account) to a calendar,
+        adding it to their calendar list so it appears in list_calendars.
+
+        This does not create or share a calendar — it only adds an existing,
+        already-accessible calendar to your own list. For service accounts,
+        this is the required step before a calendar shared with the service
+        account's email will show up in list_calendars.
+
+        Args:
+            calendar_id: The calendar ID to subscribe to (e.g. the owner's email
+                         for a personal calendar, or a `...@group.calendar.google.com` ID).
+            color_id: Optional color ID from the palette returned by the Calendar
+                      API's colors().get() endpoint (predefined IDs, typically '1'-'24').
+
+        Returns:
+            The new calendar list entry: id, summary, time_zone, access_role,
+            primary, color_id.
+        """
+        lc = ctx.request_context.lifespan_context
+
+        body: dict[str, Any] = {"id": calendar_id}
+        if color_id is not None:
+            body["colorId"] = color_id
+
+        try:
+            c = lc.calendar_service.calendarList().insert(body=body).execute()
+        except Exception as e:
+            return {"error": str(e)}
+
+        lc.calendar_cache.mark_dirty(c["id"])
+        logger.debug("Added calendar %s to calendar list", c["id"])
+        return {
+            "id": c["id"],
+            "summary": c.get("summary", ""),
+            "time_zone": c.get("timeZone"),
+            "access_role": c.get("accessRole"),
+            "primary": c.get("primary", False),
+            "color_id": c.get("colorId"),
+        }
+
+    @tool(annotations=ToolAnnotations(title="Remove Calendar From List", destructiveHint=True))
+    def remove_calendar_from_list(calendar_id: str, ctx: Context = None) -> dict[str, Any]:
+        """
+        Unsubscribe from a calendar, removing it from the authenticated user's
+        calendar list. The calendar itself is not deleted and is unaffected for
+        any other user it's shared with — use delete_calendar to permanently
+        delete a calendar you own.
+
+        Args:
+            calendar_id: The calendar ID to remove from the list.
+
+        Returns:
+            Confirmation with calendar_id and action 'removed_from_list'.
+        """
+        lc = ctx.request_context.lifespan_context
+        try:
+            lc.calendar_service.calendarList().delete(calendarId=calendar_id).execute()
+        except HttpError as e:
+            if e.resp.status == 403 and b"cannotUnsubscribeFromOwnedCalendar" in (e.content or b""):
+                return {"error": _CANNOT_UNSUBSCRIBE_OWNED_ERROR}
+            return {"error": str(e)}
+        except Exception as e:
+            return {"error": str(e)}
+
+        lc.calendar_cache.mark_dirty(calendar_id)
+        logger.debug("Removed calendar %s from calendar list", calendar_id)
+        return {"calendar_id": calendar_id, "action": "removed_from_list"}
+
     @tool(annotations=ToolAnnotations(title="List Events", readOnlyHint=True))
     def list_events(
         calendar_id: str,

{mcp_gee_sweet-0.7.0.dev69 → mcp_gee_sweet-0.7.0.dev72}/src/mcp_gee_sweet/tools/drive/files.py

@@ -1,15 +1,20 @@
+import csv
 import logging
 from datetime import datetime, timedelta, timezone
+from pathlib import Path
 from typing import Any
 
 from googleapiclient.errors import HttpError
 from mcp.server.fastmcp import Context
 from mcp.types import ToolAnnotations
 
+from ..sheets.helpers import _quote_sheet_name
 from . import _SA_QUOTA_ERROR
 
 logger = logging.getLogger(__name__)
 
+_CSV_IMPORT_CHUNK_ROWS = 5000
+
 
 def register(tool):
     @tool(annotations=ToolAnnotations(title="Create Spreadsheet", destructiveHint=True))
@@ -71,6 +76,155 @@ def register(tool):
             "folder": parents[0] if parents else "root",
         }
 
+    @tool(annotations=ToolAnnotations(title="Import CSV to Sheet", destructiveHint=True))
+    def import_csv_to_sheet(
+        local_path: str,
+        title: str,
+        folder_id: str | None = None,
+        sheet_name: str = "Sheet1",
+        ctx: Context = None,
+    ) -> dict[str, Any]:
+        """
+        Create a new Google Spreadsheet populated from a local CSV file.
+
+        Reads the CSV, creates the spreadsheet, expands the sheet's grid to fit
+        the data (avoiding the default 1000-row/26-column limit), and writes
+        every row in one or more batched value updates.
+
+        Args:
+            local_path: Absolute path to the local .csv file.
+            title: Title for the new spreadsheet.
+            folder_id: Optional Google Drive folder ID where the spreadsheet should
+                      be created. If not provided, uses the configured default
+                      folder or creates in root.
+            sheet_name: Name of the sheet the data is written to (default "Sheet1").
+
+        Returns:
+            spreadsheetId, title, web_link, and rows_written.
+
+        Note:
+            Requires OAuth or ADC auth. Service accounts cannot create files in personal
+            Drive (no storage quota). Works on Shared Drives regardless of auth method.
+            Check server://auth-status for your current auth method.
+        """
+        path = Path(local_path)
+        if not path.exists():
+            return {"error": f"File not found: {local_path}"}
+        if path.suffix.lower() != ".csv":
+            return {"error": f"Unsupported file extension '{path.suffix}'. Use .csv"}
+
+        with path.open(newline="", encoding="utf-8") as f:
+            rows = list(csv.reader(f))
+
+        if not rows:
+            return {"error": f"CSV file is empty: {local_path}"}
+
+        width = max(len(row) for row in rows)
+        rows = [row + [""] * (width - len(row)) for row in rows]
+
+        lc = ctx.request_context.lifespan_context
+        drive_service = lc.drive_service
+        sheets_service = lc.sheets_service
+        target_folder_id = folder_id or lc.folder_id
+
+        file_body = {"name": title, "mimeType": "application/vnd.google-apps.spreadsheet"}
+        if target_folder_id:
+            file_body["parents"] = [target_folder_id]
+
+        try:
+            spreadsheet = (
+                drive_service.files()
+                .create(
+                    supportsAllDrives=True,
+                    body=file_body,
+                    fields="id, name, parents, webViewLink",
+                )
+                .execute()
+            )
+        except HttpError as e:
+            if e.resp.status == 403 and b"storageQuotaExceeded" in (e.content or b""):
+                return {"error": _SA_QUOTA_ERROR}
+            raise
+
+        spreadsheet_id = spreadsheet.get("id")
+        target_folder_id = target_folder_id or (spreadsheet.get("parents", [None])[0])
+
+        default_sheet = (
+            sheets_service.spreadsheets()
+            .get(
+                spreadsheetId=spreadsheet_id,
+                fields="sheets(properties(sheetId,title,gridProperties))",
+            )
+            .execute()
+            .get("sheets", [{}])[0]
+        )
+        default_props = default_sheet.get("properties", {})
+        sheet_id = default_props.get("sheetId", 0)
+        default_title = default_props.get("title")
+        grid = default_props.get("gridProperties", {})
+
+        requests: list[dict[str, Any]] = []
+        if default_title != sheet_name:
+            requests.append(
+                {
+                    "updateSheetProperties": {
+                        "properties": {"sheetId": sheet_id, "title": sheet_name},
+                        "fields": "title",
+                    }
+                }
+            )
+        needed_rows, needed_cols = len(rows), width
+        if needed_rows > grid.get("rowCount", 1000) or needed_cols > grid.get("columnCount", 26):
+            requests.append(
+                {
+                    "updateSheetProperties": {
+                        "properties": {
+                            "sheetId": sheet_id,
+                            "gridProperties": {
+                                "rowCount": max(needed_rows, grid.get("rowCount", 1000)),
+                                "columnCount": max(needed_cols, grid.get("columnCount", 26)),
+                            },
+                        },
+                        "fields": "gridProperties.rowCount,gridProperties.columnCount",
+                    }
+                }
+            )
+
+        if requests:
+            sheets_service.spreadsheets().batchUpdate(
+                spreadsheetId=spreadsheet_id, body={"requests": requests}
+            ).execute()
+            lc.cache.mark_dirty(spreadsheet_id)
+
+        quoted_sheet = _quote_sheet_name(sheet_name)
+        for start in range(0, len(rows), _CSV_IMPORT_CHUNK_ROWS):
+            chunk = rows[start : start + _CSV_IMPORT_CHUNK_ROWS]
+            sheets_service.spreadsheets().values().update(
+                spreadsheetId=spreadsheet_id,
+                range=f"{quoted_sheet}!A{start + 1}",
+                valueInputOption="USER_ENTERED",
+                body={"values": chunk},
+            ).execute()
+
+        if target_folder_id:
+            lc.drive_folder_cache.mark_dirty(target_folder_id)
+        lc.sheet_data_cache.mark_dirty(spreadsheet_id)
+
+        logger.debug(
+            "Imported CSV %s into spreadsheet %s (%d rows, %d cols)",
+            local_path,
+            spreadsheet_id,
+            len(rows),
+            width,
+        )
+
+        return {
+            "spreadsheetId": spreadsheet_id,
+            "title": spreadsheet.get("name", title),
+            "web_link": spreadsheet.get("webViewLink"),
+            "rows_written": len(rows),
+        }
+
     @tool(annotations=ToolAnnotations(title="List Spreadsheets", readOnlyHint=True))
     def list_spreadsheets(
         folder_id: str | None = None, ctx: Context = None