unify Google Drive plugin

.agents/plugins/marketplace.json

@@ -40,30 +40,6 @@
       },
       "category": "Productivity"
     },
-    {
-      "name": "google-docs",
-      "source": {
-        "source": "local",
-        "path": "./plugins/google-docs"
-      },
-      "policy": {
-        "installation": "AVAILABLE",
-        "authentication": "ON_INSTALL"
-      },
-      "category": "Productivity"
-    },
-    {
-      "name": "google-sheets",
-      "source": {
-        "source": "local",
-        "path": "./plugins/google-sheets"
-      },
-      "policy": {
-        "installation": "AVAILABLE",
-        "authentication": "ON_INSTALL"
-      },
-      "category": "Productivity"
-    },
     {
       "name": "slack",
       "source": {
@@ -2573,18 +2549,6 @@
       },
       "category": "Lifestyle"
     },
-    {
-      "name": "google-slides",
-      "source": {
-        "source": "local",
-        "path": "./plugins/google-slides"
-      },
-      "policy": {
-        "installation": "AVAILABLE",
-        "authentication": "ON_INSTALL"
-      },
-      "category": "Productivity"
-    },
     {
       "name": "game-studio",
       "source": {

README.md

@@ -13,4 +13,4 @@ Highlighted richer examples in this repo include:
 - `plugins/notion` for planning, research, meetings, and knowledge capture
 - `plugins/ios-design` for SwiftUI implementation, refactors, performance, and debugging
 - `plugins/vibe-builder` for deployment, UI, payments, and database workflows
-- `plugins/netlify`, `plugins/render`, and `plugins/google-slides` for additional public skill- and MCP-backed plugin bundles
+- `plugins/netlify`, `plugins/render`, and `plugins/google-drive` for additional public skill- and MCP-backed plugin bundles

plugins/google-drive/.codex-plugin/plugin.json

@@ -1,28 +1,43 @@
 {
   "name": "google-drive",
-  "description": "Search and reference files from your Drive.",
+  "version": "0.1.0",
+  "description": "Use Google Drive as the single entrypoint for Drive, Docs, Sheets, and Slides work.",
   "author": {
     "name": "OpenAI",
-    "url": "https://www.google.com/"
+    "email": "support@openai.com",
+    "url": "https://openai.com/"
   },
-  "homepage": "https://www.google.com/",
+  "homepage": "https://workspace.google.com/products/drive/",
   "repository": "https://github.com/openai/plugins",
   "license": "MIT",
-  "keywords": [],
+  "keywords": [
+    "google-drive",
+    "google-docs",
+    "google-sheets",
+    "google-slides",
+    "productivity"
+  ],
+  "skills": "./skills/",
   "apps": "./.app.json",
   "interface": {
     "displayName": "Google Drive",
-    "shortDescription": "Search and reference files from your Drive.",
+    "shortDescription": "Work across Drive, Docs, Sheets, and Slides",
+    "longDescription": "Use Google Drive as one unified Google file plugin for search, file organization, sharing, and Google Docs, Google Sheets, and Google Slides workflows.",
     "developerName": "OpenAI",
     "category": "Productivity",
-    "capabilities": [],
-    "websiteURL": "https://www.google.com/",
-    "privacyPolicyURL": "https://policies.google.com/privacy",
-    "defaultPrompt": [
-      "Find a Drive doc and summarize the key points"
+    "capabilities": [
+      "Interactive",
+      "Write"
     ],
     "composerIcon": "./assets/app-icon.png",
     "logo": "./assets/app-icon.png",
+    "websiteURL": "https://workspace.google.com/products/drive/",
+    "privacyPolicyURL": "https://policies.google.com/privacy",
+    "termsOfServiceURL": "https://policies.google.com/terms",
+    "defaultPrompt": [
+      "Find a Drive file, then summarize or edit the right Google document"
+    ],
+    "brandColor": "#0F9D58",
     "screenshots": []
   }
 }

plugins/google-drive/skills/google-drive/SKILL.md

@@ -0,0 +1,57 @@
+---
+name: google-drive
+description: Use connected Google Drive as the single entrypoint for Drive, Docs, Sheets, and Slides work. Use when the user wants to find, fetch, organize, share, export, copy, or delete Drive files, or summarize and edit Google Docs, Google Sheets, and Google Slides through one unified Google Drive plugin.
+---
+
+# Google Drive
+
+Use this as the only top-level skill for Google file work. Do not route the user toward separate Google Docs, Google Sheets, or Google Slides plugins.
+
+Start with Google Drive for file discovery and file lifecycle tasks, then read narrower references only when the task becomes specific to Docs, Sheets, or Slides.
+
+## Workflow
+
+1. Ground the target file first.
+- If the user did not provide an exact file URL or ID, use Google Drive search, recent files, folder listing, or metadata reads to identify the right file.
+- If the request starts as "find X and then update it," do the Drive discovery step first instead of guessing the target.
+
+2. Stay in the base Google Drive workflow for Drive-native tasks.
+- Use the base workflow for search, fetch, recent files, folders, sharing, copying, deleting, exporting, and other file-lifecycle work that is not primarily about editing Docs, Sheets, or Slides content.
+
+3. Route to the narrowest reference that matches the file type and job.
+- Google Docs content summary, revision planning, prose rewriting, or section edits: read [docs/workflows.md](./references/docs/workflows.md).
+- Google Sheets range inspection, table cleanup, data restructuring, or batch updates: read [sheets/workflows.md](./references/sheets/workflows.md).
+- Google Sheets formula design or repair: read [sheets/formulas.md](./references/sheets/formulas.md).
+- Google Sheets chart creation or repair: read [sheets/charts.md](./references/sheets/charts.md).
+- Google Slides deck summary, content edits, new deck creation, or import handoff: read [slides/workflows.md](./references/slides/workflows.md).
+- Google Slides visual cleanup: read [slides/visual-iteration.md](./references/slides/visual-iteration.md).
+- Google Slides PPT/PPTX/ODP import: read [slides/import-presentation.md](./references/slides/import-presentation.md).
+- Google Slides repeated-layout repair: read [slides/template-surgery.md](./references/slides/template-surgery.md).
+- Google Slides template migration: read [slides/template-migration.md](./references/slides/template-migration.md).
+
+## Routing Rules
+
+- If the request is ambiguous between Drive and a file-type surface, use the artifact itself as the tie-breaker:
+  - Doc -> Docs reference
+  - Sheet -> Sheets reference
+  - Deck -> Slides reference
+- If the user wants to find a file and then edit it, do both in one flow: Drive for discovery, then the file-type reference for the edit.
+- If the user wants a Google Workspace outcome but has not named a file type yet, start with Drive discovery instead of asking them to choose among separate Google plugins.
+
+## Write Safety
+
+- Preserve the user's existing file organization, sharing state, and target artifact unless the request clearly asks to change them.
+- When a task can be satisfied by a file-level Drive operation alone, do not load heavier Docs, Sheets, or Slides references.
+- For write-heavy Sheets or Slides work, read the specialized reference before the first large update so request shapes stay grounded.
+
+## References
+
+- Docs workflows: [docs/workflows.md](./references/docs/workflows.md)
+- Sheets workflows: [sheets/workflows.md](./references/sheets/workflows.md)
+- Sheets formulas: [sheets/formulas.md](./references/sheets/formulas.md)
+- Sheets charts: [sheets/charts.md](./references/sheets/charts.md)
+- Slides workflows: [slides/workflows.md](./references/slides/workflows.md)
+- Slides visual iteration: [slides/visual-iteration.md](./references/slides/visual-iteration.md)
+- Slides import: [slides/import-presentation.md](./references/slides/import-presentation.md)
+- Slides template surgery: [slides/template-surgery.md](./references/slides/template-surgery.md)
+- Slides template migration: [slides/template-migration.md](./references/slides/template-migration.md)

plugins/google-drive/skills/google-drive/agents/openai.yaml

@@ -0,0 +1,5 @@
+interface:
+  display_name: "Google Drive"
+  short_description: "One entrypoint for Drive, Docs, Sheets, and Slides"
+  brand_color: "#0F9D58"
+  default_prompt: "Use $google-drive to find the right Drive file, then summarize a Doc, update a Sheet, or edit a Slides deck through the unified Google Drive workflow."

plugins/google-docs/skills/google-docs/SKILL.md → plugins/google-drive/skills/google-drive/references/docs/workflows.md

@@ -1,13 +1,8 @@
----
-name: google-docs
-description: Summarize and revise connected Google Docs. Use when the user asks to inspect a doc, review structure, convert notes into prose, plan section-level revisions, or apply edits while preserving heading hierarchy.
----
-
 # Google Docs
 
 ## Overview
 
-Use this skill to turn document content into clear summaries, revision plans, and structured edits. Read the document first, preserve its organization, and distinguish between summarizing, rewriting, and directly editing content.
+Use this reference to turn document content into clear summaries, revision plans, and structured edits. Read the document first, preserve its organization, and distinguish between summarizing, rewriting, and directly editing content.
 
 ## Preferred Deliverables
 

plugins/google-sheets/skills/google-sheets-chart-builder/SKILL.md → plugins/google-drive/skills/google-drive/references/sheets/charts.md

@@ -1,13 +1,8 @@
----
-name: google-sheets-chart-builder
-description: Design, create, and revise Google Sheets charts with better chart-spec recall and editing discipline. Use when the user wants to add a chart to a sheet, choose the right chart type for existing data, repair a broken chart, update a chart's data series, or reposition or resize a chart after creating it.
----
-
 # Google Sheets Chart Builder
 
-Use this skill when the chart itself is the task.
+Use this reference when the chart itself is the task.
 
-Read `./references/chart-recipes.md` before the first chart write. The point is to refresh chart request shapes and a few non-obvious API constraints before building or editing.
+Read `./chart-recipes.md` before the first chart write. The point is to refresh chart request shapes and a few non-obvious API constraints before building or editing.
 
 ## Workflow
 
@@ -25,4 +20,4 @@ Read `./references/chart-recipes.md` before the first chart write. The point is
 
 ## References
 
-- For chart-type heuristics, request-shape reminders, and official Google Sheets docs links, read `./references/chart-recipes.md`.
+- For chart-type heuristics, request-shape reminders, and official Google Sheets docs links, read `./chart-recipes.md`.

plugins/google-sheets/skills/google-sheets-formula-builder/SKILL.md → plugins/google-drive/skills/google-drive/references/sheets/formulas.md

@@ -1,13 +1,8 @@
----
-name: google-sheets-formula-builder
-description: Design, repair, and roll out Google Sheets formulas with better syntax recall and validation discipline. Use when the user wants to add a formula column, fix a broken formula, choose between a row formula and a spill formula, build a lookup or filter formula, or turn repeated logic into a reusable named function.
----
-
 # Google Sheets Formula Builder
 
-Use this skill when the formula itself is the task.
+Use this reference when the formula itself is the task.
 
-Read `./references/formula-patterns.md` before drafting the first formula. The point is not to relearn Sheets from scratch. It is to refresh exact syntax and a few high-value function constraints before writing.
+Read `./formula-patterns.md` before drafting the first formula. The point is not to relearn Sheets from scratch. It is to refresh exact syntax and a few high-value function constraints before writing.
 
 ## Workflow
 
@@ -30,4 +25,4 @@ Read `./references/formula-patterns.md` before drafting the first formula. The p
 
 ## References
 
-- For syntax reminders, formula-shape heuristics, and official Google Sheets docs links, read `./references/formula-patterns.md`.
+- For syntax reminders, formula-shape heuristics, and official Google Sheets docs links, read `./formula-patterns.md`.

plugins/google-sheets/skills/google-sheets/SKILL.md → plugins/google-drive/skills/google-drive/references/sheets/workflows.md

@@ -1,18 +1,13 @@
----
-name: google-sheets
-description: Analyze and edit connected Google Sheets with range precision. Use when the user wants to find a spreadsheet, inspect tabs or ranges, search rows, plan formulas, clean or restructure tables, write concise summaries, or make explicit cell-range updates.
----
-
 # Google Sheets
 
-Use this skill to keep spreadsheet work grounded in the exact spreadsheet, sheet, range, headers, and formulas that matter.
+Use this reference to keep spreadsheet work grounded in the exact spreadsheet, sheet, range, headers, and formulas that matter.
 
 ## Workflow
 
 1. If the spreadsheet or tab is not already grounded, identify it first and read metadata before deeper reads or writes.
 2. Prefer narrow reads and row search over dumping large tabs into context.
 3. Ground the task in exact sheet, range, header, and formula context before proposing changes.
-4. Before the first write-heavy `batch_update`, read `./references/batch-update-recipes.md` for request-shape recall.
+4. Before the first write-heavy `batch_update`, read `./batch-update-recipes.md` for request-shape recall.
 5. Cluster logically related edits into one `batch_update` so the batch is coherent and atomic. Avoid both mega-batches and one-request micro-batches.
 6. If the user asks to clean, normalize, or restructure data, summarize the intended table shape before writing.
 
@@ -23,4 +18,4 @@ Use this skill to keep spreadsheet work grounded in the exact spreadsheet, sheet
 
 ## References
 
-- For raw Sheets write shapes and example `batch_update` bodies, read `./references/batch-update-recipes.md`.
+- For raw Sheets write shapes and example `batch_update` bodies, read `./batch-update-recipes.md`.

plugins/google-slides/skills/google-slides-import-presentation/SKILL.md → plugins/google-drive/skills/google-drive/references/slides/import-presentation.md

@@ -1,13 +1,8 @@
----
-name: google-slides-import-presentation
-description: Import a local `.ppt`, `.pptx`, or `.odp` file into Google Slides, verify the resulting native deck, and hand it off to the right follow-on workflow. Use when the user wants to convert a presentation file into a native Google Slides deck before follow-on work.
----
-
 # Google Slides Import Presentation
 
 ## Overview
 
-Use this skill when the source material is a presentation file rather than an existing Google Slides deck. The goal is to create a native Google Slides copy first, then continue work on the imported deck.
+Use this reference when the source material is a presentation file rather than an existing Google Slides deck. The goal is to create a native Google Slides copy first, then continue work on the imported deck.
 
 ## Required Tooling
 
@@ -36,10 +31,10 @@ If `import_presentation` is unavailable, stop and say the file cannot be convert
 - Compare the imported slide count to the source file when that information is available.
 - Use thumbnails for spot checks when layout fidelity matters or the user plans formatting cleanup next.
 
-5. Hand off to the right next skill.
-- Use [google-slides](../google-slides/SKILL.md) for general summaries or edits.
-- Use [google-slides-visual-iteration](../google-slides-visual-iteration/SKILL.md) for post-import slide formatting cleanup.
-- Use [google-slides-template-migration](../google-slides-template-migration/SKILL.md) when the imported deck should move onto a branded template.
+5. Hand off to the right next reference.
+- Use [google-slides](./workflows.md) for general summaries or edits.
+- Use [google-slides-visual-iteration](./visual-iteration.md) for post-import slide formatting cleanup.
+- Use [google-slides-template-migration](./template-migration.md) when the imported deck should move onto a branded template.
 
 ## Rules