mcp-gee-sweet 0.7.0.dev82__tar.gz → 0.7.0.dev87__tar.gz

mcp_gee_sweet-0.7.0.dev87/.claude/commands/merge-pr.md

@@ -0,0 +1,15 @@
+Merge the current branch's PR and clean up its worktree. Uses `--admin` only to bypass the required-review gate (this is a solo-maintainer repo, so a second approver is never coming) — it must never be used to bypass a failing or pending status check.
+
+1. Get the PR: if given a PR number (e.g. following on from `/verify-pr <number>`), use `gh pr view <number> --json ...` explicitly rather than relying on current-branch detection — `/verify-pr` may have checked out a locally-named `review/<headRefName>` branch (see its step 3) instead of the PR's real branch name, which current-branch auto-detection can't always resolve. Otherwise, get the PR for the current branch: `gh pr view --json number,title,url,state,mergeable,statusCheckRollup,reviewDecision`. If there's no open PR for this branch/number, stop and tell the user.
+2. Verify it's actually safe to merge:
+   - `state` must be `OPEN`.
+   - Every check in `statusCheckRollup` (in particular "Lint and test") must show success. If anything is failing or still pending, stop and report which — do not merge, and do not wait/poll.
+   - `mergeable` must not be `CONFLICTING`.
+3. Show the user a summary: PR number, title, URL, check status, and review status (expected to be blocked only on the missing-approval requirement). State plainly that merging will use `--admin` to bypass that review gate. Ask for explicit confirmation before proceeding.
+4. On confirmation, squash-merge (matching this repo's existing history — commits land on `develop` as a single `title (#number)` commit): `gh pr merge <number> --admin --squash`. The remote branch is auto-deleted on merge (repo setting), so don't pass `--delete-branch`.
+5. Clean up:
+   - If the current branch is a `review/<headRefName>` branch created by `/verify-pr` (not a `.claude/worktrees/*` worktree — just a local branch in the main checkout), there's no worktree to remove: switch to `develop` and `git branch -D review/<headRefName>`.
+   - If this session created the current worktree (i.e. it got here via `/start-worktree` or `/next-issue` earlier in this same session), use `ExitWorktree` with `action: "remove"`.
+   - Otherwise (worktree predates this session), fall back to manual cleanup from the main checkout: `git worktree remove <path>`, then `git branch -d <branch>`, then `git worktree prune`.
+6. Update the roadmap: from the main checkout on `develop`, `git pull` then check `docs/roadmap.md` for a checkbox line referencing the issue(s) this PR closes (search by issue number). If found, check it off (`- [ ]` → `- [x]`) and append `(PR <number>)` in the existing style (e.g. `(PR #280)`) — see recent `- [x]` entries for the exact convention. If the roadmap has no line item for this issue (not every ticket is roadmap-tracked — chores, follow-up defects, etc.), skip this step silently. Commit directly to `develop` (`docs(roadmap): check off #<issue> (PR <number>)`) and push — `develop`'s branch protection has `enforce_admins: false`, so a direct push by the repo owner is allowed for this kind of small, reversible, docs-only change; don't open a separate PR for it.
+7. Report a summary: the merge commit, the now-merged PR URL, confirmation the worktree was removed, and whether the roadmap was updated.

{mcp_gee_sweet-0.7.0.dev82 → mcp_gee_sweet-0.7.0.dev87}/.claude/commands/verify-pr.md

@@ -6,7 +6,13 @@ CI (the "Lint and test" check `/merge-pr` already gates on) covers unit tests. I
 
 2. **Identify the PR.** Take a PR number as an argument if given, otherwise use `gh pr list --state open` and ask the user which one if there's more than one. Get its details: `gh pr view <number> --json number,title,url,headRefName,baseRefName,statusCheckRollup,mergeable,mergeStateStatus`. If `mergeable` is `CONFLICTING`, stop here — report it and say the branch needs a rebase onto `<baseRefName>` before verification is worth doing. Don't spend code-review or live-QA effort on a branch that can't merge as-is; that cost is only worth paying once it's rebased.
 
-3. **Check out the branch.** `gh pr checkout <number>`. This fetches and switches the main checkout to the PR's branch directly (no worktree needed — the orchestrator owns the main checkout).
+3. **Check out the branch.** Don't use `gh pr checkout <number>` directly — if the worker's own worktree still has `<headRefName>` checked out (the normal case while that worker session is active), it fails with "already checked out," and the only recovery `gh` offers is unlocking/removing that worktree, which disrupts the worker for no reason. Git only blocks two worktrees from sharing the same branch *name*, not the same commit — so fetch the PR's branch into a locally-named review branch instead:
+   ```
+   git fetch origin <headRefName>:review/<headRefName> --force
+   git checkout review/<headRefName>
+   git branch --set-upstream-to=origin/<headRefName> review/<headRefName>
+   ```
+   This points the main checkout at the exact same commit without touching the worker's worktree at all. The `--set-upstream-to` matters: without it, `gh pr view`/`gh pr merge` with no PR number can't map the local `review/<headRefName>` branch back to the PR later (their current-branch auto-detection relies on tracked-branch info, not name matching) — `/merge-pr` should also be run with the PR number as an explicit argument here rather than relying on that auto-detection. When pushing QA-result commits later (step 9), push to the PR's real branch name via a refspec: `git push origin review/<headRefName>:<headRefName>`. Delete the local `review/<headRefName>` branch once you're done with this PR (switch away first, then `git branch -D review/<headRefName>`) so it doesn't accumulate across sessions.
 
 4. **Reconnect the MCP server.** The server hot-reloads on file change, but this Claude session's MCP connection stays on the old process. Tell the user to run:
    ```
@@ -26,7 +32,15 @@ CI (the "Lint and test" check `/merge-pr` already gates on) covers unit tests. I
 
 8. **Record results honestly.** For each test case actually executed, add `**Result (<date>) ✅ PASS**` or `**Result (<date>) ❌ FAIL — <what happened>**` directly below its `Checks` block. Never write a Result for a case you didn't actually invoke — if something blocks a case (fixture missing, tool errors before completing), write `**Result (<date>)** pending — <reason>` and say so plainly rather than guessing the outcome.
 
-9. **Commit and push the results.** If any Result entries were added, commit just those QA doc changes onto the PR branch (`qa: record live verification for PR #<number>`) and push, so the evidence lands in history before merge. Ask before pushing, per this repo's normal commit/push confirmation rule.
+9. **Commit and push the results.** If any Result entries were added, they need to land in a real file edit. If this session runs under an isolation policy that blocks edits outside `.claude/worktrees/*` (background jobs do — regardless of which branch is checked out in the main checkout), don't spin up a fresh throwaway worktree per PR (churn — create, edit, commit, push, remove, repeat). Instead keep **one persistent scratch worktree** for the whole orchestrator session, e.g. `.claude/worktrees/qa-scratch`, and reuse it every time this step comes up:
+   ```
+   git worktree add .claude/worktrees/qa-scratch -b orchestrator-qa-scratch develop   # first time only
+   ```
+   Its own branch name (`orchestrator-qa-scratch`) is arbitrary and never touches any PR branch, so it can never conflict with a worker's worktree. Each time this step comes up: enter it (`EnterWorktree` with `path`), `git fetch origin <headRefName> && git reset --hard origin/<headRefName>` to line it up with the PR's latest commit, make the edits, commit (`qa: record live verification for PR #<number>`), then push straight to the PR's real branch via refspec — same trick as step 3:
+   ```
+   git push origin HEAD:<headRefName>
+   ```
+   Ask before pushing, per this repo's normal commit/push confirmation rule. Leave the scratch worktree in place afterward (`ExitWorktree` with `action: "keep"`) for next time — don't remove it between PRs, only if the user asks for a cleanup pass.
 
 10. **Report.** Summarize: code review findings (if any), which test cases passed/failed/pending, any coverage gaps found in step 6, and whether the branch looks ready to merge. If everything passed, say the next step is `/merge-pr`. If something failed, say the PR needs to go back to its worker session — don't attempt the fix yourself here; this session's job is verification, not implementation.
 

{mcp_gee_sweet-0.7.0.dev82 → mcp_gee_sweet-0.7.0.dev87}/CLAUDE.md

@@ -32,7 +32,7 @@ Tests live in `tests/` and can be run with `uv run pytest`.
 Logic is split across `src/mcp_gee_sweet/`: `server.py` (MCP setup, tool decorator, resources), `auth.py` (lifespan, `SpreadsheetContext`), and `tools/` (domain-based layout):
 
 - `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/structure.py` — sheet structure (`list_sheets`, `copy_sheet`, `duplicate_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`, `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`)

{mcp_gee_sweet-0.7.0.dev82 → mcp_gee_sweet-0.7.0.dev87}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mcp-gee-sweet
-Version: 0.7.0.dev82
+Version: 0.7.0.dev87
 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.dev82 → mcp_gee_sweet-0.7.0.dev87}/docs/configuration.md

@@ -70,7 +70,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 92 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 93 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

{mcp_gee_sweet-0.7.0.dev82 → mcp_gee_sweet-0.7.0.dev87}/docs/design/docs-ast-pipeline.md

@@ -338,3 +338,17 @@ Cells with no `Table` in `children` are still filled in one bulk batch by `_buil
 - Text before, between, and after any number of nested tables in one cell renders in true source order, at any nesting depth.
 - The "one level of nesting only" and "no colspan/rowspan/col_widths inside nested tables" limitations from the original #92 design are otherwise unchanged — this rewrite only touches content ordering, not those structural features.
 - Tested with `tests/test_docs_tables.py`'s `TestFillNestedCellContent`, which drives the real algorithm against a small in-memory Docs-API simulator (`FakeDoc`/`Para`/`TableNode` in that file) that actually applies `insertText`/`insertTable` mutations and re-derives indices — chosen over hand-computed index fixtures because this much re-fetch/recursion logic is easy to get subtly wrong in a way a fixture can't catch (and did, twice, during development).
+
+---
+
+## Nested table colspan/rowspan (#109)
+
+**Date:** 2026-07-08
+
+Nested tables produced a correctly-sized shell but never merged cells with `colspan`/`rowspan` > 1 — `_fill_table_fully` (the per-nested-table fill helper introduced in the rewrite above) only ran the plain-cell bulk fill, with no equivalent of the outer-table merge phase (`fill_tables` phase 2).
+
+Fix: `_fill_table_fully` now checks the nested `ast_table` for any cell with `colspan > 1 or rowspan > 1` and, if found, builds and executes `mergeTableCells` requests via the existing `_build_merge_requests` (unchanged — it already operated generically on any `doc_table`/`ast_table` pair, nested or not) before re-fetching and running the bulk fill. This exactly mirrors `fill_tables`'s own phase 1→2→3 order, just scoped to one nested table.
+
+`col_widths` on nested tables remains unsupported — out of scope for #109, not addressed here.
+
+Tested in `tests/test_docs_tables.py`'s `TestNestedTableMerges`, extending the same `FakeDoc` simulator with a no-op `mergeTableCells` handler (the real Docs API doesn't shift indices or delete content on merge — covered cells stay physical, just skipped by the existing phantom-cell mapping — so the simulator has nothing to mutate; the tests instead assert the merge request's shape and its position in batch order relative to the fill).

{mcp_gee_sweet-0.7.0.dev82 → mcp_gee_sweet-0.7.0.dev87}/docs/qa/tests/docs.md

@@ -1038,6 +1038,25 @@ These test the HTML→AST→Docs API pipeline introduced in Phase 2 (#87). All u
 
 ---
 
+### TC-DOC90: `colspan`/`rowspan` inside a nested table now merges correctly (issue #109) ⚠️ destructive
+
+**Background:** Nested tables produced a correctly-sized shell but silently ignored `colspan`/`rowspan` on their own cells — no `mergeTableCells` request was ever emitted for them, unlike outer-table cells (TC-DOC34/36/37). Fixed by having `_fill_table_fully` run the same merge phase for a nested table's own cells that `fill_tables` already runs for the outer table.
+
+**Prompt**
+> "Write this HTML to doc {DOC_ID}: `<table><tr><td><table><tr><td colspan=\"2\">Header</td></tr><tr><td>A</td><td>B</td></tr></table></td></tr></table>`"
+
+**Checks**
+- Call succeeds with no API error
+- `get_doc_structure` shows the outer table (1 row × 1 col) with cell [0,0] text empty (holds the nested table, not text)
+- 🔍 Visual check: nested table renders with "Header" spanning both columns of the top row, and "A"/"B" as two separate cells in the second row — not four ungrouped cells
+
+**Cleanup:** write fixture content back
+
+**Result (2026-07-09) ✅ PASS**
+`write_doc_content` succeeded. `get_doc_structure` showed the outer table (1 row × 1 col) with cell [0,0] text empty. Playwright screenshot confirmed the nested table rendered with "Header" spanning both columns of the top row and "A"/"B" as two separate cells below — the merge applied correctly. (Unrelated observation: the fixture doc had leftover header/footer text visible in the render and in `get_doc_content`'s plain-text export but not in `get_doc_structure` — headers/footers aren't part of the body map that tool returns; pre-existing fixture-doc state from an earlier header/footer test, untouched by `write_doc_content`, not a regression from this PR.) Fixture content restored per cleanup step.
+
+---
+
 ### TC-DOC52: `get_doc_theme` scans body paragraph styles
 **Note:** `get_doc_theme` reads explicit per-paragraph and per-run styles from the document body. It returns data for AI-generated docs (where styles are set explicitly on runs); for standard docs whose styles are fully inherited from named style defaults it returns an empty dict.
 

{mcp_gee_sweet-0.7.0.dev82 → mcp_gee_sweet-0.7.0.dev87}/docs/qa/tests/sheets_mgmt.md

@@ -125,6 +125,94 @@ Tests marked **⚠️ destructive** rename or delete sheets — reset fixtures a
 
 ---
 
+## `duplicate_sheet`
+
+### TC-S51: Duplicate within the same spreadsheet, default name ⚠️ destructive
+
+**Prompt**
+> "Duplicate the Sales sheet in {SPREADSHEET_ID}"
+
+**Checks**
+- New tab appears, named by Google's default (e.g. "Copy of Sales")
+- Data in the new tab matches Sales (6 rows, 4 columns)
+- Original Sales sheet unchanged
+- Response includes `sheetId`, `title`, `index`, `spreadsheetId`
+
+**Result (2026-07-10) ✅ PASS**
+`duplicate_sheet(spreadsheet_id, sheet="Sales")` → `{"sheetId":1766233601,"title":"Copy of Sales","index":1,...}`. `get_sheet_data` on "Copy of Sales" returned matching headers/rows. Deleted after verification.
+
+---
+
+### TC-S52: Duplicate with a custom name ⚠️ destructive
+
+**Prompt**
+> "Duplicate the Sales sheet in {SPREADSHEET_ID} and name the copy 'Sales Duplicate'"
+
+**Checks**
+- New tab is named 'Sales Duplicate', not Google's default
+- `newSheetName` was passed on the same `duplicateSheet` request (single API call, no follow-up rename)
+
+**Result (2026-07-10) ✅ PASS**
+`duplicate_sheet(spreadsheet_id, sheet="Sales", new_name="Sales Duplicate")` → title `"Sales Duplicate"`, confirmed via code that `newSheetName` is set on the same request body as `sourceSheetId`. Deleted after verification.
+
+---
+
+### TC-S53: Default position lands immediately after the source tab ⚠️ destructive
+
+**Prompt**
+> "Duplicate the Sales sheet in {SPREADSHEET_ID} without specifying a position, then list all sheets"
+
+**Checks**
+- The new tab appears immediately after 'Sales' in the `list_sheets` response order
+- 🔍 **Regression:** the Sheets API's own default for `duplicateSheet` places the copy at tab position 0 regardless of source position (confirmed via live QA on this tool) — the tool must compute and pass `insertSheetIndex` explicitly to land the copy after the source, matching Sheets UI's native "Duplicate" behavior
+
+**Result (2026-07-10) ✅ PASS**
+`duplicate_sheet(spreadsheet_id, sheet="Sales")` → index 1. `list_sheets` → `["Sales","Copy of Sales","Empty","Notes & Misc","BrandNew"]` — lands immediately after Sales, confirming the regression fix (`_get_sheet_index` + explicit `insertSheetIndex`). Deleted after verification.
+
+---
+
+### TC-S54: Explicit insert_index is honored ⚠️ destructive
+
+**Prompt**
+> "Duplicate the Sales sheet in {SPREADSHEET_ID}, placing the copy at tab position 0"
+
+**Checks**
+- The new tab is the first tab in the `list_sheets` response order
+- Confirms an explicit `insert_index` overrides the "after source" default
+
+**Result (2026-07-10) ✅ PASS**
+`duplicate_sheet(spreadsheet_id, sheet="Sales", insert_index=0)` → index 0. `list_sheets` → `["Copy of Sales","Sales",...]` — explicit index correctly overrides the default. Deleted after verification.
+
+---
+
+### TC-S55: Source sheet not found
+
+**Prompt**
+> "Duplicate a sheet called 'DoesNotExist' in {SPREADSHEET_ID}"
+
+**Checks**
+- Returns `{"error": ...}` before calling the duplicate API
+- Error references the missing sheet name
+
+**Result (2026-07-10) ✅ PASS**
+`duplicate_sheet(spreadsheet_id, sheet="DoesNotExist")` → `{"error": "Sheet 'DoesNotExist' not found"}`. No mutation, non-destructive.
+
+---
+
+### TC-S56: Cache invalidated after duplicate ⚠️ destructive
+
+**Prompt**
+> "Duplicate the Sales sheet in {SPREADSHEET_ID} as 'PostDuplicateCache', then immediately list all sheets"
+
+**Checks**
+- `list_sheets` includes 'PostDuplicateCache'
+- Confirms `cache.mark_dirty(spreadsheet_id)` fires after duplicate
+
+**Result (2026-07-10) ✅ PASS**
+`duplicate_sheet(spreadsheet_id, sheet="Sales", new_name="PostDuplicateCache")` succeeded; immediate `list_sheets` (no explicit `refresh_cache`) included `"PostDuplicateCache"`, confirming `mark_dirty` fired. Deleted after verification; fixture restored to `["Sales","Empty","Notes & Misc","BrandNew"]`.
+
+---
+
 ## `rename_sheet`
 
 ### TC-S11: Rename to a new name ⚠️ destructive

{mcp_gee_sweet-0.7.0.dev82 → mcp_gee_sweet-0.7.0.dev87}/docs/roadmap.md

@@ -95,8 +95,8 @@ No new tools. Stabilize on what Tier 1 shipped before starting Tier 2 feature wo
 ### Tier 2 — Useful for structured work, plus defects surfaced since v0.8.1 _(target: [v0.9.0](https://github.com/khuisman/mcp-gee-sweet/issues?q=is%3Aissue+label%3Av0.9))_
 
 **Defects** _(found after v0.8.1 shipped; too late for that release, don't warrant a standalone patch)_
-- [ ] Bare URLs in markdown content aren't autolinked — Python-Markdown's built-in autolink only fires on `<https://...>` or `[text](url)`, not a bare URL ([#248](https://github.com/khuisman/mcp-gee-sweet/issues/248))
-- [ ] `zip(doc_tables, ast_tables)` in `emitter.py` silently cross-pairs tables when one is skipped (zero-row/zero-col table), misapplying fill/merge/style requests to the wrong table — surfaced during #276's review ([#277](https://github.com/khuisman/mcp-gee-sweet/issues/277))
+- [x] Bare URLs in markdown content aren't autolinked — Python-Markdown's built-in autolink only fires on `<https://...>` or `[text](url)`, not a bare URL (PR #265) ([#248](https://github.com/khuisman/mcp-gee-sweet/issues/248))
+- [x] `zip(doc_tables, ast_tables)` in `emitter.py` silently cross-pairs tables when one is skipped (zero-row/zero-col table), misapplying fill/merge/style requests to the wrong table — surfaced during #276's review (PR #282) ([#277](https://github.com/khuisman/mcp-gee-sweet/issues/277))
 
 **Sheets**
 - [ ] `update_borders` — border style, width, color on a range ([#122](https://github.com/khuisman/mcp-gee-sweet/issues/122)) _(freema/mcp-gsheets)_
@@ -106,11 +106,11 @@ No new tools. Stabilize on what Tier 1 shipped before starting Tier 2 feature wo
 - [ ] `update_sheet_properties` — tab color, hide/show gridlines ([#126](https://github.com/khuisman/mcp-gee-sweet/issues/126)) _(freema/mcp-gsheets)_
 - [ ] `duplicate_sheet` — copy a sheet within the same spreadsheet ([#127](https://github.com/khuisman/mcp-gee-sweet/issues/127))
 - [ ] Partial (rich-text) hyperlinks in `update_cells` ([#89](https://github.com/khuisman/mcp-gee-sweet/issues/89))
-- [ ] `import_csv_to_sheet` — populate a spreadsheet from a local CSV file ([#187](https://github.com/khuisman/mcp-gee-sweet/issues/187))
+- [x] `import_csv_to_sheet` — populate a spreadsheet from a local CSV file (PR #272) ([#187](https://github.com/khuisman/mcp-gee-sweet/issues/187))
 
 **Calendar**
-- [ ] `create_calendar` / `update_calendar` / `delete_calendar` — calendar lifecycle ([#156](https://github.com/khuisman/mcp-gee-sweet/issues/156))
-- [ ] `add_calendar_to_list` / `remove_calendar_from_list` — subscribe/unsubscribe ([#157](https://github.com/khuisman/mcp-gee-sweet/issues/157))
+- [x] `create_calendar` / `update_calendar` / `delete_calendar` — calendar lifecycle (PR #266) ([#156](https://github.com/khuisman/mcp-gee-sweet/issues/156))
+- [x] `add_calendar_to_list` / `remove_calendar_from_list` — subscribe/unsubscribe (PR #269) ([#157](https://github.com/khuisman/mcp-gee-sweet/issues/157))
 - [ ] Calendar ACL — share a calendar with users or groups ([#158](https://github.com/khuisman/mcp-gee-sweet/issues/158))
 - [ ] `list_all_events` — query all subscribed calendars in parallel _(decision needed — also tracked in Decisions Needed)_ ([#194](https://github.com/khuisman/mcp-gee-sweet/issues/194))
 
@@ -120,8 +120,8 @@ No new tools. Stabilize on what Tier 1 shipped before starting Tier 2 feature wo
 - [ ] Comments API — list, add, resolve doc comments ([#151](https://github.com/khuisman/mcp-gee-sweet/issues/151))
 - [ ] `create_named_range` / `create_bookmark` — anchor points for internal links ([#152](https://github.com/khuisman/mcp-gee-sweet/issues/152))
 - [ ] Rowspan emitter — AST `Cell.rowspan` field exists but emitter does not yet merge rows ([#195](https://github.com/khuisman/mcp-gee-sweet/issues/195))
-- [ ] Warn/error on mixed text + nested table in same cell ([#108](https://github.com/khuisman/mcp-gee-sweet/issues/108))
-- [ ] colspan/rowspan inside nested tables ([#109](https://github.com/khuisman/mcp-gee-sweet/issues/109))
+- [x] Warn/error on mixed text + nested table in same cell — shipped as the fuller `Cell.children: list[Run | Table]` ordered model, also fixing trailing-text-after-nested-table ordering ([#275](https://github.com/khuisman/mcp-gee-sweet/issues/275)) in the same PR (PR #276) ([#108](https://github.com/khuisman/mcp-gee-sweet/issues/108))
+- [x] colspan/rowspan inside nested tables (PR #287) ([#109](https://github.com/khuisman/mcp-gee-sweet/issues/109))
 - [ ] `find_in_doc` — search doc text and return match locations, parallel to `find_in_spreadsheet`; removes the manual index math currently needed to retrofit links (or any style) onto text already in a doc, raised while fixing #248 ([#262](https://github.com/khuisman/mcp-gee-sweet/issues/262))
 
 **Drive**
@@ -135,7 +135,8 @@ No new tools. Stabilize on what Tier 1 shipped before starting Tier 2 feature wo
 - [x] Drive Activity API — file change history ([#72](https://github.com/khuisman/mcp-gee-sweet/issues/72))
 
 **Infrastructure**
-- [ ] Cache reliability & configurability — runtime-configurable TTL, smarter invalidation for shared files ([#99](https://github.com/khuisman/mcp-gee-sweet/issues/99)); harden concurrent-session access — fail-open on cache read/write errors, `busy_timeout` ([#234](https://github.com/khuisman/mcp-gee-sweet/issues/234))
+- [x] Harden concurrent-session access — fail-open on cache read/write errors, `busy_timeout` (PR #280) ([#234](https://github.com/khuisman/mcp-gee-sweet/issues/234))
+- [x] Cache reliability & configurability — runtime-configurable TTL, smarter invalidation for shared files (PR #284) ([#99](https://github.com/khuisman/mcp-gee-sweet/issues/99))
 - [ ] Async tool execution — `asyncio.gather()` for parallel Google API calls; establishes the project's parallel-call pattern, which [#194](https://github.com/khuisman/mcp-gee-sweet/issues/194) should reuse rather than introducing its own `ThreadPoolExecutor` ([#183](https://github.com/khuisman/mcp-gee-sweet/issues/183))
 
 **Documentation**

{mcp_gee_sweet-0.7.0.dev82 → mcp_gee_sweet-0.7.0.dev87}/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. -->
 
-92 tools. All tool names are lowercase with underscores — use these exact strings with `ENABLED_TOOLS` or `--include-tools`.
+93 tools. All tool names are lowercase with underscores — use these exact strings with `ENABLED_TOOLS` or `--include-tools`.
 
 ## Sheets — data
 
@@ -26,6 +26,7 @@
 |---|---|---|
 | `list_sheets` | List all sheets in a Google Spreadsheet. | `spreadsheet_id` |
 | `copy_sheet` | Copy a sheet from one spreadsheet to another. | `src_spreadsheet`, `src_sheet`, `dst_spreadsheet`, `dst_sheet` |
+| `duplicate_sheet` | Duplicate a sheet tab within the same spreadsheet. | `spreadsheet_id`, `sheet`, `new_name?`, `insert_index?` |
 | `rename_sheet` | Rename a sheet in a Google Spreadsheet. | `spreadsheet`, `sheet`, `new_name` |
 | `create_sheet` | Create a new sheet tab in an existing Google Spreadsheet. | `spreadsheet_id`, `title` |
 | `add_rows` | Add rows to a sheet in a Google Spreadsheet. | `spreadsheet_id`, `sheet`, `count`, `start_row?` |

{mcp_gee_sweet-0.7.0.dev82 → mcp_gee_sweet-0.7.0.dev87}/src/mcp_gee_sweet/tools/docs/emitter.py

@@ -199,24 +199,20 @@ def fill_tables(docs_service, doc_id: str, tables: list[Table]) -> None:
       3. Fill plain cells (no nested table) — insertText + updateTextStyle, high→low
       4. Fill cells with a nested table, segment by segment (see
          _fill_nested_cell_content) — text and tables in true source order,
-         recursing into any depth of further nesting
+         recursing into any depth of further nesting. Each nested table's own
+         merges are handled by _fill_table_fully, mirroring phase 2 above (#109).
       5. Emit updateTableColumnProperties for tables with col_widths
       6. If any cell has Phase 3 style fields: emit updateTableCellStyle
 
-    Nested table limitations: no colspan/rowspan or col_widths inside nested
-    tables. Text sharing a cell with one or more nested tables (#108, #275) is
-    fully supported — each run of text and each nested table renders in the
-    same order it appeared in the source, at any nesting depth.
+    Nested table limitations: no col_widths inside nested tables. colspan/
+    rowspan (#109) and text sharing a cell with one or more nested tables
+    (#108, #275) are both fully supported, at any nesting depth — each run of
+    text, merge, and nested table renders in the same order and shape it had
+    in the source.
     """
     if not tables:
         return
 
-    has_merges = any(
-        cell.colspan > 1 or cell.rowspan > 1
-        for table in tables
-        for row in table.rows
-        for cell in row.cells
-    )
     has_nested = any(
         any(isinstance(child, Table) for child in cell.children)
         for table in tables
@@ -238,14 +234,7 @@ def fill_tables(docs_service, doc_id: str, tables: list[Table]) -> None:
     doc_tables = _top_level_tables(live_doc)
 
     # Step 2: outer merges
-    if has_merges:
-        merge_requests = _build_merge_requests(doc_tables, tables)
-        if merge_requests:
-            docs_service.documents().batchUpdate(
-                documentId=doc_id, body={"requests": merge_requests}
-            ).execute()
-            live_doc = docs_service.documents().get(documentId=doc_id).execute()
-            doc_tables = _top_level_tables(live_doc)
+    doc_tables = _apply_merges(docs_service, doc_id, doc_tables, tables, _top_level_tables)
 
     # Step 3: fill plain cells (no nested table) in one bulk batch
     fill_requests = _build_fill_requests(doc_tables, tables)
@@ -552,12 +541,13 @@ def _fill_children_recursive(
 
 
 def _fill_table_fully(docs_service, doc_id: str, resolve, ast_table: Table) -> None:
-    """Fill one (typically just-inserted) table's cells: plain cells in bulk,
-    cells with a further nested table via the recursive round algorithm.
+    """Fill one (typically just-inserted) table's cells: merges first, then
+    plain cells in bulk, then cells with a further nested table via the
+    recursive round algorithm.
 
     Every nested table needs this — not just ones with further nesting — since
-    a nested table's own plain-text cells are never touched by the top-level
-    _build_fill_requests bulk pass (that only sees the outer tables list).
+    a nested table's own plain-text cells (and merges) are never touched by the
+    top-level fill_tables passes (those only see the outer tables list).
     """
     live_doc = docs_service.documents().get(documentId=doc_id).execute()
     doc_tables = resolve(live_doc)
@@ -569,6 +559,8 @@ def _fill_table_fully(docs_service, doc_id: str, resolve, ast_table: Table) -> N
         )
         return
 
+    doc_tables = _apply_merges(docs_service, doc_id, doc_tables, [ast_table], resolve)
+
     fill_requests = _build_fill_requests(doc_tables, [ast_table])
     if fill_requests:
         docs_service.documents().batchUpdate(
@@ -582,6 +574,48 @@ def _fill_table_fully(docs_service, doc_id: str, resolve, ast_table: Table) -> N
         _fill_children_recursive(docs_service, doc_id, resolve, [ast_table], _doc_tables=doc_tables)
 
 
+def _apply_merges(
+    docs_service, doc_id: str, doc_tables: list[dict], ast_tables: list[Table], resolve
+) -> list[dict]:
+    """Emit mergeTableCells for any ast_tables cell with colspan/rowspan > 1,
+    re-fetch, and return the updated doc_tables — or doc_tables unchanged if
+    nothing needed merging.
+
+    mergeTableCells doesn't shift character indices or delete content (covered
+    cells remain physical entries in the doc tree), so doc_tables — already
+    successfully resolved by the caller — is expected to resolve again right
+    after. If it doesn't, the live doc no longer matches the model used to
+    build the merge requests just executed; silently returning here would mean
+    every already-merged table renders with zero content and no operator-
+    visible signal, so raise instead of skipping the fill.
+    """
+    has_merges = any(
+        cell.colspan > 1 or cell.rowspan > 1
+        for table in ast_tables
+        for row in table.rows
+        for cell in row.cells
+    )
+    if not has_merges:
+        return doc_tables
+
+    merge_requests = _build_merge_requests(doc_tables, ast_tables)
+    if not merge_requests:
+        return doc_tables
+
+    docs_service.documents().batchUpdate(
+        documentId=doc_id, body={"requests": merge_requests}
+    ).execute()
+    live_doc = docs_service.documents().get(documentId=doc_id).execute()
+    updated = resolve(live_doc)
+    if len(updated) < len(ast_tables) or any(t is None for t in updated):
+        raise RuntimeError(
+            f"_apply_merges: table(s) vanished from doc {doc_id} immediately after "
+            "mergeTableCells, which does not itself shift indices or delete content — "
+            "refusing to silently skip the fill and leave the merged table empty."
+        )
+    return updated
+
+
 def _build_phantom_set(ast_table: Table) -> set[tuple[int, int]]:
     """Return (row, col) logical positions covered by rowspan from a cell in an earlier row."""
     phantom: set[tuple[int, int]] = set()

{mcp_gee_sweet-0.7.0.dev82 → mcp_gee_sweet-0.7.0.dev87}/src/mcp_gee_sweet/tools/sheets/helpers.py

@@ -106,3 +106,19 @@ def _get_sheet_id(
         return None
     except Exception:
         return None
+
+
+def _get_sheet_index(sheets_service: Any, spreadsheet_id: str, sheet_id: int) -> int | None:
+    """Return the current 0-based tab position of sheet_id, or None if not found."""
+    try:
+        spreadsheet = (
+            sheets_service.spreadsheets()
+            .get(spreadsheetId=spreadsheet_id, fields="sheets.properties(sheetId,index)")
+            .execute()
+        )
+        for sheet in spreadsheet.get("sheets", []):
+            if sheet["properties"]["sheetId"] == sheet_id:
+                return sheet["properties"]["index"]
+        return None
+    except Exception:
+        return None

{mcp_gee_sweet-0.7.0.dev82 → mcp_gee_sweet-0.7.0.dev87}/src/mcp_gee_sweet/tools/sheets/structure.py

@@ -4,7 +4,7 @@ from mcp.server.fastmcp import Context
 from mcp.types import ToolAnnotations
 
 from ...cache import fetch_sheets
-from .helpers import _get_sheet_id, _parse_a1_notation
+from .helpers import _get_sheet_id, _get_sheet_index, _parse_a1_notation
 
 _VALID_CHART_TYPES = ["COLUMN", "BAR", "LINE", "AREA", "PIE", "SCATTER", "COMBO", "HISTOGRAM"]
 
@@ -124,6 +124,66 @@ def register(tool):
         lc.cache.mark_dirty(dst_spreadsheet)
         return result
 
+    @tool(annotations=ToolAnnotations(title="Duplicate Sheet", destructiveHint=True))
+    def duplicate_sheet(
+        spreadsheet_id: str,
+        sheet: str,
+        new_name: str | None = None,
+        insert_index: int | None = None,
+        ctx: Context = None,
+    ) -> dict[str, Any]:
+        """
+        Duplicate a sheet tab within the same spreadsheet.
+
+        Distinct from copy_sheet, which copies a sheet across spreadsheets.
+
+        Args:
+            spreadsheet_id: The ID of the spreadsheet
+            sheet: The name of the sheet to duplicate
+            new_name: Optional title for the new sheet. Defaults to Google's
+                auto-generated name (e.g. "Copy of Sheet1") if omitted.
+            insert_index: Optional 0-based tab position for the new sheet.
+                Defaults to immediately after the source sheet if omitted.
+
+        Returns:
+            Information about the newly created sheet
+        """
+        lc = ctx.request_context.lifespan_context
+        sheets_service = lc.sheets_service
+
+        sheet_id = _get_sheet_id(sheets_service, spreadsheet_id, sheet, lc.cache, lc.drive_service)
+        if sheet_id is None:
+            return {"error": f"Sheet '{sheet}' not found"}
+
+        duplicate_request: dict[str, Any] = {"sourceSheetId": sheet_id}
+        if insert_index is not None:
+            duplicate_request["insertSheetIndex"] = insert_index
+        else:
+            source_index = _get_sheet_index(sheets_service, spreadsheet_id, sheet_id)
+            if source_index is not None:
+                duplicate_request["insertSheetIndex"] = source_index + 1
+        if new_name is not None:
+            duplicate_request["newSheetName"] = new_name
+
+        result = (
+            sheets_service.spreadsheets()
+            .batchUpdate(
+                spreadsheetId=spreadsheet_id,
+                body={"requests": [{"duplicateSheet": duplicate_request}]},
+            )
+            .execute()
+        )
+
+        lc.cache.mark_dirty(spreadsheet_id)
+
+        new_sheet_props = result["replies"][0]["duplicateSheet"]["properties"]
+        return {
+            "sheetId": new_sheet_props["sheetId"],
+            "title": new_sheet_props["title"],
+            "index": new_sheet_props.get("index"),
+            "spreadsheetId": spreadsheet_id,
+        }
+
     @tool(annotations=ToolAnnotations(title="Rename Sheet", destructiveHint=True))
     def rename_sheet(
         spreadsheet: str, sheet: str, new_name: str, ctx: Context = None