plyo-mcp 0.2.0 → 0.3.0

package/dist/index.js

@@ -109,13 +109,26 @@ async function pushBranch(branch) {
             await git(["push", "--force", REMOTE_NAME, `HEAD:${branch}`]);
             return;
         }
-        throw new Error(`The project already has saved work that this folder doesn't have. Bring it in first with: git pull ${REMOTE_NAME} ${branch} --rebase — then save again. (Never force-push; the user's timeline lives there.)`);
+        // The project moved on Plyo's side (a restore, an upload, a teammate).
+        // Rebase this folder's work on top and push once more — the common case
+        // resolves itself; only a real conflict surfaces to the agent.
+        try {
+            await git(["pull", REMOTE_NAME, branch, "--rebase"]);
+            await git(["push", REMOTE_NAME, `HEAD:${branch}`]);
+            return;
+        }
+        catch {
+            await git(["rebase", "--abort"]).catch(() => "");
+            throw new Error(`The project has newer saved work that clashes with this folder's changes. Run: git pull ${REMOTE_NAME} ${branch} --rebase — resolve what git reports, then save again. (Never force-push; the user's timeline lives there.)`);
+        }
     }
 }
 function text(s) {
     return { content: [{ type: "text", text: s }] };
 }
-const server = new McpServer({ name: "plyo", version: "0.1.0" });
+const server = new McpServer({ name: "plyo", version: "0.3.0" }, {
+    instructions: "Plyo keeps every version of this project safe for a non-technical user. Call save_checkpoint automatically after every completed piece of work — do not wait to be asked. Pass both a plain-English note and the intent (what the user asked for, in their words). If the user started a Draft in Plyo, use start_draft with that draft's exact name to work in it — never create a duplicate.",
+});
 server.tool("list_projects", "List the user's Plyo projects (name, slug, live URL).", {}, async () => {
     const data = await api("/v1/projects");
     if (!data.projects.length)
@@ -162,8 +175,17 @@ server.tool("save_checkpoint", "Save the current state of the project as a check
     await pushBranch(target);
     return text(`Checkpoint saved: "${note}". It's on the user's timeline and can be restored anytime.`);
 });
-server.tool("start_draft", "Start a Draft — a safe copy of the project to try changes without touching the live version. Switches this folder to the draft.", { name: z.string().describe("What this draft tries, e.g. 'Trying a new pricing page'") }, async ({ name }) => {
+server.tool("start_draft", "Start a Draft — a safe copy of the project to try changes without touching the live version. Switches this folder to the draft. If the user already started a draft in Plyo, pass its exact name and this folder joins it instead of creating a new one.", { name: z.string().describe("What this draft tries, e.g. 'Trying a new pricing page'") }, async ({ name }) => {
     const link = await requireLink();
+    // The user may have started this draft in the dashboard already — join it
+    // instead of creating a same-named twin they'd find empty.
+    const existing = await api(`/v1/projects/${link.slug}/drafts`);
+    const match = existing.drafts.find((d) => d.status === "open" && d.name.trim().toLowerCase() === name.trim().toLowerCase());
+    if (match?.branch) {
+        await git(["fetch", REMOTE_NAME, match.branch]);
+        await git(["checkout", "-B", match.branch, `${REMOTE_NAME}/${match.branch}`]);
+        return text(`Joined the user's existing draft "${match.name}" — this folder now works in it. save_checkpoint saves into the draft, and it shows up on the draft's page in Plyo.`);
+    }
     const data = await api(`/v1/projects/${link.slug}/drafts`, { method: "POST", body: JSON.stringify({ name }) });
     const branch = data.hint.match(/"([^"]+)"/)?.[1];
     if (branch) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "plyo-mcp",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "MCP server for Plyo \u2014 Undo and Publish for everything your AI builds. Save checkpoints, publish, restore.",
   "type": "module",
   "bin": {