fix: include recent MCP target IDs in issue reports

Author: kof

apps/builder/app/services/github-issue-report.server.test.ts

@@ -46,6 +46,10 @@ const report: IssueReportInput = {
         },
       ],
     },
+    recentTarget: {
+      tool: "screenshot",
+      entityIds: [{ field: "pageId", id: "page-456" }],
+    },
     session: {
       staleNamespaces: ["styles"],
       missingNamespaces: ["instances"],
@@ -82,6 +86,8 @@ describe("GitHub issue reports", () => {
     expect(body).toContain("- Client: Codex 1.2.3");
     expect(body).toContain("- CLI: 1.2.3");
     expect(body).toContain("- Project ID: `project-123`");
+    expect(body).toContain("- Last targeted tool: `screenshot`");
+    expect(body).toContain("- Target pageId: `page-456`");
     expect(body).toContain("- pageId: `page-123`");
     expect(body).toContain("- instanceId: `instance-123`");
     expect(body).toContain("- Node.js: 22.14.0");

apps/builder/app/services/github-issue-report.server.ts

@@ -32,6 +32,14 @@ const formatRuntime = (runtime: IssueReportInput["runtime"]) =>
     ...(runtime?.projectId === undefined
       ? []
       : [`- Project ID: \`${runtime.projectId}\``]),
+    ...(runtime?.recentTarget === undefined
+      ? []
+      : [
+          `- Last targeted tool: \`${runtime.recentTarget.tool}\``,
+          ...runtime.recentTarget.entityIds.map(
+            ({ field, id }) => `- Target ${field}: \`${id}\``
+          ),
+        ]),
     ...(runtime === undefined
       ? []
       : [

packages/cli/src/commands/mcp.test.ts

@@ -24,11 +24,12 @@ import {
 } from "@webstudio-is/project-build/state";
 import { publicApiOperations } from "@webstudio-is/protocol";
 import { contentEngineLimits } from "@webstudio-is/content-engine/limits";
-import { ROOT_INSTANCE_ID } from "@webstudio-is/sdk";
+import { ROOT_INSTANCE_ID, type Pages } from "@webstudio-is/sdk";
 import { updatePersistedMcpCheckpoint } from "./mcp-checkpoint";
 import {
   createCliProjectSessionStorage,
   createIssueReportFailureTracker,
+  createIssueReportTargetTracker,
 } from "../project-session";
 import {
   __testing__,
@@ -40,6 +41,7 @@ import {
 const {
   getMcpDownloadAsset,
   getIssueReportFailureFile,
+  getIssueReportPageId,
   persistIssueReportFailure,
   restoreIssueReportFailure,
   assertSingleOpCallToolSupported,
@@ -511,6 +513,69 @@ test("persists sanitized issue-report failure diagnostics for the next CLI proce
   });
 });
 
+test("resolves a screenshot route to a page ID without retaining its URL", () => {
+  const pages = {
+    homePageId: "home",
+    rootFolderId: "root",
+    pages: new Map([
+      ["home", { id: "home", path: "" }],
+      ["blog", { id: "blog", path: "/blog/:slug" }],
+    ]),
+    folders: new Map(),
+  } as unknown as Pages;
+  expect(
+    getIssueReportPageId(
+      "screenshot",
+      { path: "/blog/private-post?authToken=secret" },
+      pages
+    )
+  ).toBe("blog");
+  expect(
+    getIssueReportPageId(
+      "screenshot",
+      { path: "https://private.example/" },
+      pages
+    )
+  ).toBeUndefined();
+  expect(
+    getIssueReportPageId(
+      "screenshot",
+      { path: "/blog/private-post", url: "https://private.example/" },
+      pages
+    )
+  ).toBeUndefined();
+  expect(
+    getIssueReportPageId("list-pages", { path: "/blog/private-post" }, pages)
+  ).toBeUndefined();
+});
+
+test("restores a successful tool target across CLI processes without private input", async () => {
+  const projectRoot = await mkdtemp(
+    path.join(tmpdir(), "webstudio-mcp-target-report-")
+  );
+  tempDirs.push(projectRoot);
+  const filePath = getIssueReportFailureFile(projectRoot, "project-1");
+  const firstTarget = createIssueReportTargetTracker();
+  firstTarget.record(
+    "screenshot",
+    { path: "/blog/private-post?authToken=secret" },
+    "page-1"
+  );
+  await persistIssueReportFailure(filePath, undefined, firstTarget.snapshot());
+  const restoredTarget = createIssueReportTargetTracker();
+  await restoreIssueReportFailure(
+    filePath,
+    createIssueReportFailureTracker(),
+    restoredTarget
+  );
+  expect(restoredTarget.get()).toEqual({
+    tool: "screenshot",
+    entityIds: [{ field: "pageId", id: "page-1" }],
+  });
+  expect(await readFile(filePath, "utf8")).not.toContain("private-post");
+  expect(await readFile(filePath, "utf8")).not.toContain("authToken");
+});
+
 test("preserves a destructive confirmation failure reason without the token or plan", async () => {
   const projectRoot = await mkdtemp(
     path.join(tmpdir(), "webstudio-mcp-confirmation-report-")