@papi-ai/server 0.7.12 → 0.7.13

package/dist/index.js

@@ -2068,6 +2068,102 @@ ${footer}`);
         await this.write("STRATEGY_RECOMMENDATIONS.md", updated);
       }
       // -------------------------------------------------------------------------
+      // Strategy Review Agenda (markdown persistence)
+      // -------------------------------------------------------------------------
+      async addAgendaTopic(input) {
+        const id = randomUUID6();
+        const createdAt = (/* @__PURE__ */ new Date()).toISOString();
+        const full = {
+          id,
+          topic: input.topic,
+          source: input.source,
+          sourceCycle: input.sourceCycle,
+          status: "pending",
+          createdAt
+        };
+        const content = await this.readOptional("STRATEGY_REVIEW_AGENDA.md");
+        const header = "# Strategy Review Agenda\n\n<!-- PAPI-ADAPTER: parse the yaml block below -->\n\n<!-- PAPI-YAML-START -->\ntopics:\n";
+        const footer = "<!-- PAPI-YAML-END -->\n";
+        const entry = [
+          `  - id: ${full.id}`,
+          `    topic: ${JSON.stringify(full.topic)}`,
+          `    source: ${full.source}`,
+          full.sourceCycle != null ? `    source_cycle: ${full.sourceCycle}` : null,
+          `    status: ${full.status}`,
+          `    created_at: ${full.createdAt}`
+        ].filter(Boolean).join("\n");
+        if (!content) {
+          await this.write("STRATEGY_REVIEW_AGENDA.md", `${header}${entry}
+${footer}`);
+        } else {
+          const insertPoint = content.indexOf("<!-- PAPI-YAML-END -->");
+          if (insertPoint === -1) {
+            await this.write("STRATEGY_REVIEW_AGENDA.md", `${header}${entry}
+${footer}`);
+          } else {
+            const updated = content.slice(0, insertPoint) + entry + "\n" + content.slice(insertPoint);
+            await this.write("STRATEGY_REVIEW_AGENDA.md", updated);
+          }
+        }
+        return full;
+      }
+      async getPendingAgendaTopics() {
+        const content = await this.readOptional("STRATEGY_REVIEW_AGENDA.md");
+        if (!content) return [];
+        const yamlStart = content.indexOf("<!-- PAPI-YAML-START -->");
+        const yamlEnd = content.indexOf("<!-- PAPI-YAML-END -->");
+        if (yamlStart === -1 || yamlEnd === -1) return [];
+        const yamlBlock = content.slice(yamlStart + "<!-- PAPI-YAML-START -->".length, yamlEnd).trim();
+        const entries = yamlBlock.split(/(?=\s+-\s+id:)/);
+        const topics = [];
+        for (const block of entries) {
+          const idMatch = block.match(/id:\s+(.+)/);
+          const topicMatch = block.match(/topic:\s+(.+)/);
+          const sourceMatch = block.match(/source:\s+(\S+)/);
+          const statusMatch = block.match(/status:\s+(\S+)/);
+          const createdMatch = block.match(/created_at:\s+(.+)/);
+          const sourceCycleMatch = block.match(/source_cycle:\s+(\d+)/);
+          if (!idMatch || !topicMatch || !sourceMatch || !statusMatch || !createdMatch) continue;
+          if (statusMatch[1].trim() !== "pending") continue;
+          let parsedTopic = topicMatch[1].trim();
+          if (parsedTopic.startsWith('"') && parsedTopic.endsWith('"')) {
+            try {
+              parsedTopic = JSON.parse(parsedTopic);
+            } catch {
+            }
+          }
+          topics.push({
+            id: idMatch[1].trim(),
+            topic: parsedTopic,
+            source: sourceMatch[1].trim(),
+            sourceCycle: sourceCycleMatch ? parseInt(sourceCycleMatch[1], 10) : void 0,
+            status: "pending",
+            createdAt: createdMatch[1].trim()
+          });
+        }
+        return topics;
+      }
+      async markAgendaTopicsAddressed(ids, cycleNumber) {
+        if (ids.length === 0) return;
+        const content = await this.readOptional("STRATEGY_REVIEW_AGENDA.md");
+        if (!content) return;
+        let updated = content;
+        const addressedAt = (/* @__PURE__ */ new Date()).toISOString();
+        for (const id of ids) {
+          const statusPattern = new RegExp(`(\\s+-\\s+id:\\s+${id}\\n(?:.*\\n)*?\\s+status:\\s+)pending`);
+          updated = updated.replace(statusPattern, `$1addressed`);
+          const insertionAnchor = new RegExp(`(\\s+-\\s+id:\\s+${id}\\n(?:.*\\n)*?\\s+created_at:\\s+[^\\n]+)\\n`);
+          const match = updated.match(insertionAnchor);
+          if (match && !match[0].includes("addressed_at:")) {
+            updated = updated.replace(insertionAnchor, `$1
+    addressed_at: ${addressedAt}
+    addressed_in_review: ${cycleNumber}
+`);
+          }
+        }
+        await this.write("STRATEGY_REVIEW_AGENDA.md", updated);
+      }
+      // -------------------------------------------------------------------------
       // Decision Events & Scores (markdown persistence)
       // -------------------------------------------------------------------------
       async appendDecisionEvent(event) {
@@ -7569,6 +7665,50 @@ ${newParts.join("\n")}` : newParts.join("\n");
       UPDATE strategy_recommendations
       SET status = 'actioned', dismissal_reason = ${reason}, updated_at = now()
       WHERE id = ${id} AND project_id = ${this.projectId}
+    `;
+      }
+      // -------------------------------------------------------------------------
+      // Strategy Review Agenda
+      // -------------------------------------------------------------------------
+      async addAgendaTopic(input) {
+        const [row] = await this.sql`
+      INSERT INTO strategy_review_agenda (project_id, topic, source, source_cycle)
+      VALUES (${this.projectId}, ${input.topic}, ${input.source}, ${input.sourceCycle ?? null})
+      RETURNING id, topic, source, source_cycle, status, created_at
+    `;
+        return {
+          id: row.id,
+          topic: row.topic,
+          source: row.source,
+          sourceCycle: row.source_cycle ?? void 0,
+          status: row.status,
+          createdAt: row.created_at
+        };
+      }
+      async getPendingAgendaTopics() {
+        const rows = await this.sql`
+      SELECT id, topic, source, source_cycle, status, created_at, addressed_at, addressed_in_review
+      FROM strategy_review_agenda
+      WHERE project_id = ${this.projectId} AND status = 'pending'
+      ORDER BY created_at ASC
+    `;
+        return rows.map((r) => ({
+          id: r.id,
+          topic: r.topic,
+          source: r.source,
+          sourceCycle: r.source_cycle ?? void 0,
+          status: "pending",
+          createdAt: r.created_at,
+          addressedAt: r.addressed_at ?? void 0,
+          addressedInReview: r.addressed_in_review ?? void 0
+        }));
+      }
+      async markAgendaTopicsAddressed(ids, cycleNumber) {
+        if (ids.length === 0) return;
+        await this.sql`
+      UPDATE strategy_review_agenda
+      SET status = 'addressed', addressed_at = now(), addressed_in_review = ${cycleNumber}
+      WHERE project_id = ${this.projectId} AND id = ANY(${ids}::uuid[])
     `;
       }
       // -------------------------------------------------------------------------
@@ -8761,6 +8901,7 @@ __export(git_exports, {
   getHeadCommitSha: () => getHeadCommitSha,
   getLatestTag: () => getLatestTag,
   getOriginRepoSlug: () => getOriginRepoSlug,
+  getPullRequestUrl: () => getPullRequestUrl,
   getUnmergedBranches: () => getUnmergedBranches,
   gitPull: () => gitPull,
   gitPush: () => gitPush,
@@ -8770,9 +8911,11 @@ __export(git_exports, {
   isGhAvailable: () => isGhAvailable,
   isGitAvailable: () => isGitAvailable,
   isGitRepo: () => isGitRepo,
+  listGroupedCycleBranches: () => listGroupedCycleBranches,
   mergePullRequest: () => mergePullRequest,
   resolveBaseBranch: () => resolveBaseBranch,
   runAutoCommit: () => runAutoCommit,
+  squashMergePullRequest: () => squashMergePullRequest,
   stageAllAndCommit: () => stageAllAndCommit,
   stageDirAndCommit: () => stageDirAndCommit,
   tagExists: () => tagExists,
@@ -9226,6 +9369,68 @@ function runAutoCommit(projectRoot, commitFn) {
     return `Auto-commit failed: ${err instanceof Error ? err.message : String(err)}`;
   }
 }
+function getPullRequestUrl(cwd, branch) {
+  try {
+    const output = execFileSync(
+      "gh",
+      ["pr", "view", branch, "--json", "url", "--jq", ".url"],
+      { cwd, encoding: "utf-8" }
+    ).trim();
+    return output || null;
+  } catch {
+    return null;
+  }
+}
+function squashMergePullRequest(cwd, branch) {
+  const repo = getOriginRepoSlug(cwd);
+  const baseArgs = ["pr", "merge", branch, "--squash", "--delete-branch"];
+  if (repo) baseArgs.push("--repo", repo);
+  for (let attempt = 1; attempt <= MERGE_MAX_RETRIES; attempt++) {
+    try {
+      execFileSync("gh", baseArgs, { cwd, encoding: "utf-8" });
+      return { success: true, message: `Squash-merged PR for '${branch}' and deleted branch.` };
+    } catch (err) {
+      const msg = err instanceof Error ? err.message : String(err);
+      if (msg.includes("not mergeable") && attempt < MERGE_MAX_RETRIES) {
+        sleepSync(MERGE_RETRY_DELAY_MS);
+        continue;
+      }
+      return { success: false, message: `PR squash-merge failed: ${msg}` };
+    }
+  }
+  return { success: false, message: "PR squash-merge failed: max retries exceeded" };
+}
+function listGroupedCycleBranches(cwd, cycleNum, baseBranch) {
+  const prefix = `feat/cycle-${cycleNum}-`;
+  try {
+    const remoteOutput = execFileSync(
+      "git",
+      ["ls-remote", "--heads", "origin", `${prefix}*`],
+      { cwd, encoding: "utf-8" }
+    ).trim();
+    if (!remoteOutput) return [];
+    const remoteBranches = remoteOutput.split("\n").map((line) => line.split("	")[1]?.replace("refs/heads/", "").trim()).filter((b2) => !!b2 && b2.startsWith(prefix));
+    return remoteBranches.filter((branch) => {
+      try {
+        const branchTip = execFileSync(
+          "git",
+          ["rev-parse", `origin/${branch}`],
+          { cwd, encoding: "utf-8" }
+        ).trim();
+        execFileSync(
+          "git",
+          ["merge-base", "--is-ancestor", branchTip, baseBranch],
+          { cwd, stdio: "ignore" }
+        );
+        return false;
+      } catch {
+        return true;
+      }
+    });
+  } catch {
+    return getUnmergedBranches(cwd, baseBranch).filter((b2) => b2.startsWith(prefix));
+  }
+}
 function getFilesChangedFromBase(cwd, baseBranch) {
   try {
     const mergeBase = execFileSync("git", ["merge-base", baseBranch, "HEAD"], { cwd, encoding: "utf-8" }).trim();
@@ -9277,6 +9482,8 @@ function loadConfig() {
   const lightMode = process.env.PAPI_LIGHT_MODE === "true";
   const projectOwner = process.env.PAPI_OWNER ?? "Cathal";
   const skipProjectSpecificRules = process.env.PAPI_SKIP_PROJECT_RULES === "true";
+  const userId = process.env.PAPI_USER_ID || void 0;
+  const telemetryEnabled = process.env.PAPI_TELEMETRY !== "off" && process.env.PAPI_TELEMETRY !== "false";
   const papiEndpoint = process.env.PAPI_ENDPOINT;
   const dataEndpoint = process.env.PAPI_DATA_ENDPOINT;
   const databaseUrl = process.env.DATABASE_URL;
@@ -9287,9 +9494,18 @@ function loadConfig() {
     adapterType = "proxy";
     console.error("[papi] PAPI_PROJECT_ID detected \u2014 switching to proxy adapter (md adapter blocked for external users).");
   }
-  if (!projectId && !databaseUrl && !papiEndpoint && adapterType === "md") {
+  if (adapterType === "md" && !userId) {
     throw new Error(
-      "PAPI_PROJECT_ID is required to connect to your project.\n\nGet yours at https://getpapi.ai/setup\n\nAlready have one? Make sure PAPI_PROJECT_ID is set in your .mcp.json env config."
+      `PAPI requires a free account to run in local mode.
+
+Create your account at https://getpapi.ai/setup \u2014 it takes under a minute.
+Your project data stays on your machine. The account lets PAPI identify you
+and unlocks dashboard features when you're ready.
+
+After signing up, add this to your .mcp.json env config:
+  "PAPI_USER_ID": "your-email@example.com"
+
+Already have an account? Make sure PAPI_USER_ID is set in your .mcp.json env config.`
     );
   }
   return {
@@ -9303,7 +9519,9 @@ function loadConfig() {
     papiEndpoint,
     lightMode,
     projectOwner,
-    skipProjectSpecificRules
+    skipProjectSpecificRules,
+    userId,
+    telemetryEnabled
   };
 }
 
@@ -9396,7 +9614,25 @@ async function createAdapter(optionsOrType, maybePapiDir) {
               console.error("[papi]   Set PAPI_USER_ID in your .mcp.json env to fix this.");
             }
           }
-          await pgAdapter.createProject({ id: projectId, slug, name: slug, papi_dir: papiDir, user_id: userId });
+          let skipCreate = false;
+          if (userId) {
+            const bySlug = await pgAdapter.listProjects({ slug });
+            const userDup = bySlug.find((p) => p.user_id === userId);
+            if (userDup) {
+              console.error(`[papi] \u26A0 Project '${slug}' already exists for this user (id: ${userDup.id}).`);
+              console.error(`[papi]   Update PAPI_PROJECT_ID=${userDup.id} in .mcp.json to avoid a duplicate.`);
+              skipCreate = true;
+            }
+          }
+          if (!skipCreate) {
+            await pgAdapter.createProject({ id: projectId, slug, name: slug, papi_dir: papiDir, user_id: userId });
+          }
+        } else if (existing.user_id) {
+          const configuredUserId = process.env["PAPI_USER_ID"] ?? detectUserId();
+          if (configuredUserId && existing.user_id !== configuredUserId) {
+            console.error(`[papi] \u26A0 PAPI_PROJECT_ID=${projectId} belongs to a different user.`);
+            console.error("[papi]   Run papi setup or update PAPI_PROJECT_ID in .mcp.json.");
+          }
         }
         await pgAdapter.close();
       } catch {
@@ -10835,6 +11071,9 @@ function buildPlanUserMessage(ctx) {
     }) : PLAN_FULL_INSTRUCTIONS;
     parts.push(instructions);
   }
+  if (ctx.foundationalTasksGuidance) {
+    parts.push("", ctx.foundationalTasksGuidance);
+  }
   if (ctx.skipHandoffs) {
     parts.push(
       "",
@@ -11356,6 +11595,9 @@ function buildReviewUserMessage(ctx) {
   if (ctx.docActionStaleness) {
     parts.push("### Doc Action Staleness", "", ctx.docActionStaleness, "");
   }
+  if (ctx.pendingAgendaTopics) {
+    parts.push("### Queued Agenda Topics", "", "_Topics queued via `strategy_agenda` since the last review. Address each one in this review \u2014 they will be auto-marked as addressed on apply._", "", ctx.pendingAgendaTopics, "");
+  }
   return parts.join("\n");
 }
 function parseReviewStructuredOutput(raw) {
@@ -12042,6 +12284,64 @@ function stripTasksForPlan(tasks) {
     hasHandoff: !!buildHandoff
   }));
 }
+var BRIEF_SECTIONS = [
+  { name: "title", pattern: /^#\s+\S/m },
+  {
+    name: "target audience",
+    pattern: /\b(target users?|audience|for whom|who (it'?s for|uses|it serves|we're building))/i
+  },
+  {
+    name: "problem statement",
+    pattern: /\b(problem|pain point|why it matters|what problem|solves?)/i
+  },
+  {
+    name: "solution / vision",
+    pattern: /\b(solution|approach|vision|what (it|we) do|how it works|value proposition)/i
+  },
+  {
+    name: "GTM / distribution",
+    pattern: /\b(GTM|go[- ]to[- ]market|distribution|channel|pricing|how (users?|people) (discover|find|reach))/i
+  }
+];
+function assessBriefThinness(brief) {
+  const TEMPLATE_MARKER = "*Describe your project's core value proposition here.*";
+  const briefWithoutTemplate = brief.replace(TEMPLATE_MARKER, "");
+  const populated = [];
+  const missing = [];
+  for (const section of BRIEF_SECTIONS) {
+    if (section.pattern.test(briefWithoutTemplate)) populated.push(section.name);
+    else missing.push(section.name);
+  }
+  return { populatedSections: populated, missingSections: missing };
+}
+function computeFoundationalTasksGuidance(cycleNumber, brief) {
+  if (cycleNumber > 1) return void 0;
+  const { populatedSections, missingSections } = assessBriefThinness(brief);
+  if (populatedSections.length >= 4) return void 0;
+  const populatedList = populatedSections.length > 0 ? populatedSections.join(", ") : "none";
+  const missingList = missingSections.join(", ");
+  return [
+    "## FOUNDATIONAL TASKS GUIDANCE",
+    "",
+    `The project brief is thin \u2014 only ${populatedSections.length} of 5 key sections are clearly populated (${populatedList}). Missing or weak sections: ${missingList}.`,
+    "",
+    "Generate 3-5 foundational research/discovery tasks targeting the MISSING sections. These help the Owner fill in their brief before the product gets built on top of shaky foundations.",
+    "",
+    "Rules for foundational tasks:",
+    "- **ADDITIONS, not replacements.** Include them ALONGSIDE the user's backlog items. If the user submitted 3 ideas, the cycle should have 3 user items + 3-5 foundational items (total 6-8 tasks).",
+    '- **Target specific missing sections.** Do NOT generate "refine audience" if audience is already populated. Each foundational task must close a specific gap above.',
+    "- **Task type: `research` or `discovery`** \u2014 deliverable is a findings doc, not shipped code.",
+    "- **Effort: S or M** \u2014 foundational work should be timeboxed, not open-ended.",
+    '- **WHY in the handoff must tie to the specific gap.** Example: "Brief is thin on GTM \u2014 knowing how users discover the product is a prerequisite for scoping distribution work." Not generic.',
+    "- **Cap at 5 foundational tasks** to avoid drowning the user.",
+    "- **Cycle 2+ will NOT receive this guidance** \u2014 even if the brief stays thin. Foundational work is a one-shot onboarding primitive, not a recurring pattern.",
+    "",
+    "In the structured output:",
+    "- Emit foundational tasks via the `newTasks` array (mark `reviewed: true`, type `research` or `discovery`).",
+    "- Generate full BUILD HANDOFFs for each in `cycleHandoffs` \u2014 use `new-N` IDs to reference them.",
+    "- User-submitted backlog tasks remain in `cycleHandoffs` as usual \u2014 do NOT drop them in favour of foundational tasks."
+  ].join("\n");
+}
 function detectBoardFlags(tasks) {
   let hasBugTasks = false;
   let hasResearchTasks = false;
@@ -12320,7 +12620,8 @@ ${lines.join("\n")}`;
       preAssignedTasks: preAssignedTextLean,
       recentlyShippedCapabilities: recentlyShippedLean,
       strategyReviewCadence,
-      candidateTaskFullNotes: candidateTaskFullNotesLean
+      candidateTaskFullNotes: candidateTaskFullNotesLean,
+      foundationalTasksGuidance: computeFoundationalTasksGuidance(health.totalCycles, productBrief)
     };
     const { label: leanTierLabel } = applyContextTier(ctx2, health.totalCycles);
     ctx2.contextTier = leanTierLabel;
@@ -12482,7 +12783,8 @@ ${logLines}`);
     preAssignedTasks: preAssignedText,
     recentlyShippedCapabilities: formatRecentlyShippedCapabilities(reports),
     strategyReviewCadence: strategyReviewCadenceFull,
-    candidateTaskFullNotes: formatCandidateTaskFullNotes(plannerTasks)
+    candidateTaskFullNotes: formatCandidateTaskFullNotes(plannerTasks),
+    foundationalTasksGuidance: computeFoundationalTasksGuidance(health.totalCycles, productBrief)
   };
   const { label: fullTierLabel } = applyContextTier(ctx, health.totalCycles);
   ctx.contextTier = fullTierLabel;
@@ -13863,6 +14165,7 @@ async function assembleContext2(adapter2, cycleNumber, cyclesSinceLastReview, pr
     // Doc registry — docs with pending actions for staleness audit
     adapter2.searchDocs?.({ hasPendingActions: true, limit: 20 })?.catch(() => []) ?? Promise.resolve([])
   ]);
+  const pendingAgendaTopics = await (adapter2.getPendingAgendaTopics?.().catch(() => []) ?? Promise.resolve([]));
   const tasks = [...activeTasks, ...recentDoneTasks];
   const existingAdIds = new Set(decisions.map((d) => d.id));
   const survivingPendingRecs = [];
@@ -14100,6 +14403,15 @@ ${deferred.join("\n")}`);
       }
     }
   } catch {
+  }
+  let pendingAgendaText;
+  if (pendingAgendaTopics.length > 0) {
+    const lines = pendingAgendaTopics.map((t, i) => {
+      const cycleSuffix = t.sourceCycle != null ? ` (queued Cycle ${t.sourceCycle})` : "";
+      return `${i + 1}. ${t.topic} _[${t.source}${cycleSuffix}]_`;
+    });
+    pendingAgendaText = `${pendingAgendaTopics.length} topic(s) queued via strategy_agenda:
+${lines.join("\n")}`;
   }
   logDataSourceSummary("strategy_review_audit", [
     { label: "discoveryCanvas", hasData: discoveryCanvasText !== void 0 },
@@ -14140,7 +14452,8 @@ ${deferred.join("\n")}`);
     recentPlans: recentPlansText,
     unregisteredDocs: unregisteredDocsText,
     taskComments: taskCommentsText,
-    docActionStaleness: docActionStalenessText
+    docActionStaleness: docActionStalenessText,
+    pendingAgendaTopics: pendingAgendaText
   };
   const BUDGET_SOFT2 = 5e4;
   const BUDGET_HARD2 = 6e4;
@@ -14455,6 +14768,15 @@ async function processReviewOutput(adapter2, rawOutput, cycleNumber) {
         await adapter2.clearPendingReviewResponse?.();
       } catch {
       }
+      try {
+        if (adapter2.getPendingAgendaTopics && adapter2.markAgendaTopicsAddressed) {
+          const pending = await adapter2.getPendingAgendaTopics();
+          if (pending.length > 0) {
+            await adapter2.markAgendaTopicsAddressed(pending.map((t) => t.id), cycleNumber);
+          }
+        }
+      } catch {
+      }
       const webhookUrl = process.env.PAPI_SLACK_WEBHOOK_URL;
       slackWarning = await sendSlackWebhook(webhookUrl, buildSlackSummary(data));
     }
@@ -14975,6 +15297,34 @@ var strategyReviewTool = {
     required: []
   }
 };
+var strategyAgendaTool = {
+  name: "strategy_agenda",
+  description: 'Queue topics for the next strategy review. Topics surface as input in the next `strategy_review` prepare phase and are automatically marked as addressed after the review completes. Two modes: "add" to queue a topic, "list" to see pending topics. Use this when you spot a strategic question during a build \u2014 capture the topic now instead of losing it.',
+  annotations: { readOnlyHint: false, destructiveHint: false },
+  inputSchema: {
+    type: "object",
+    properties: {
+      mode: {
+        type: "string",
+        enum: ["add", "list"],
+        description: '"add" to queue a topic (requires `topic`). "list" returns all pending topics. Defaults to "list" when omitted.'
+      },
+      topic: {
+        type: "string",
+        description: 'The topic to queue (mode "add" only). One sentence describing what the next strategy review should consider.'
+      },
+      source: {
+        type: "string",
+        description: 'Optional origin label \u2014 e.g. "manual", "carry-forward", "idea". Defaults to "manual".'
+      },
+      source_cycle: {
+        type: "number",
+        description: 'Optional cycle number this topic originated from (mode "add" only).'
+      }
+    },
+    required: []
+  }
+};
 var strategyChangeTool = {
   name: "strategy_change",
   description: 'Apply a strategic shift to the project. Three modes: "capture" for lightweight mid-conversation decision capture (no LLM round-trip), "prepare" to get a change prompt for full analysis, "apply" to persist analysis output. Use "capture" when you detect a strategic decision in conversation and want to persist it quickly without disrupting the build flow.',
@@ -15131,6 +15481,49 @@ ${result.userMessage}
     return errorResponse(err instanceof Error ? err.message : String(err));
   }
 }
+async function handleStrategyAgenda(adapter2, _config, args) {
+  const mode = args.mode ?? "list";
+  if (!adapter2.addAgendaTopic || !adapter2.getPendingAgendaTopics) {
+    return errorResponse("strategy_agenda is not supported by the current adapter.");
+  }
+  try {
+    if (mode === "add") {
+      const topic = args.topic;
+      if (!topic || !topic.trim()) {
+        return errorResponse('topic is required for mode "add". Describe what the next strategy review should consider.');
+      }
+      const source = (args.source ?? "manual").trim() || "manual";
+      const sourceCycle = typeof args.source_cycle === "number" ? args.source_cycle : void 0;
+      const entry = await adapter2.addAgendaTopic({ topic: topic.trim(), source, sourceCycle });
+      return textResponse(
+        `**Agenda Topic Queued**
+
+${entry.topic}
+
+Source: ${entry.source}${entry.sourceCycle != null ? ` (Cycle ${entry.sourceCycle})` : ""}
+ID: ${entry.id}
+
+This topic will surface in the next \`strategy_review\`.`
+      );
+    }
+    const topics = await adapter2.getPendingAgendaTopics();
+    if (topics.length === 0) {
+      return textResponse('No pending agenda topics. Use `strategy_agenda` with `mode: "add"` to queue one.');
+    }
+    const lines = topics.map((t, i) => {
+      const cycleSuffix = t.sourceCycle != null ? ` (Cycle ${t.sourceCycle})` : "";
+      return `${i + 1}. ${t.topic}
+   _source: ${t.source}${cycleSuffix} \xB7 queued ${t.createdAt.slice(0, 10)}_`;
+    });
+    return textResponse(
+      `**Pending Agenda (${topics.length})** \u2014 surfaces at next strategy review
+
+${lines.join("\n\n")}`
+    );
+  } catch (err) {
+    return errorResponse(err instanceof Error ? err.message : String(err));
+  }
+}
 async function handleStrategyChange(adapter2, _config, args) {
   const toolMode = args.mode;
   try {
@@ -15402,7 +15795,7 @@ var boardArchiveTool = {
 };
 var boardEditTool = {
   name: "board_edit",
-  description: "Edit fields on an existing task. Supports title, priority, complexity, module, epic, phase, notes, status, and maturity. Pass task_id plus any fields to update. Does not call the Anthropic API.",
+  description: "Edit fields on an existing task. Supports title, priority, complexity, module, epic, phase, notes (with notes_mode for append/replace/clear), status, and maturity. Pass task_id plus any fields to update. Does not call the Anthropic API.",
   annotations: { readOnlyHint: false, destructiveHint: false },
   inputSchema: {
     type: "object",
@@ -15439,7 +15832,12 @@ var boardEditTool = {
       },
       notes: {
         type: "string",
-        description: "New notes (replaces existing notes)."
+        description: "Note content. Default behaviour is append \u2014 see notes_mode to control."
+      },
+      notes_mode: {
+        type: "string",
+        enum: ["append", "replace", "clear"],
+        description: "How to apply the notes value. append (default) = add a new dated entry above existing notes; replace = overwrite all existing notes; clear = empty the notes field (notes value ignored)."
       },
       status: {
         type: "string",
@@ -15642,6 +16040,10 @@ async function handleBoardEdit(adapter2, args) {
       changes.push(field);
     }
   }
+  const notesMode = args.notes_mode;
+  if (notesMode === "clear" && !changes.includes("notes")) {
+    changes.push("notes");
+  }
   if (changes.length === 0) {
     return errorResponse("No fields to update. Pass at least one field (title, priority, complexity, module, epic, phase, notes, status, maturity).");
   }
@@ -15650,6 +16052,35 @@ async function handleBoardEdit(adapter2, args) {
     if (!task) {
       return errorResponse(`Task ${taskId} not found.`);
     }
+    if (changes.includes("notes")) {
+      const incoming = args.notes ?? "";
+      const existing = task.notes ?? "";
+      const mode = notesMode ?? "append";
+      if (mode === "clear") {
+        updates.notes = "";
+      } else if (mode === "replace") {
+        updates.notes = incoming;
+      } else {
+        const trimmed = incoming.trim();
+        if (trimmed.length === 0) {
+          delete updates.notes;
+          const idx = changes.indexOf("notes");
+          if (idx >= 0) changes.splice(idx, 1);
+        } else {
+          const health = await adapter2.getCycleHealth().catch(() => null);
+          const activeCycle = health?.totalCycles ?? null;
+          const date = (/* @__PURE__ */ new Date()).toISOString().slice(0, 10);
+          const stamp = activeCycle != null ? `[C${activeCycle} ${date}]` : `[${date}]`;
+          const entry = `${stamp} ${trimmed}`;
+          updates.notes = existing.trim().length > 0 ? `${entry}
+
+${existing}` : entry;
+        }
+      }
+      if (changes.length === 0) {
+        return errorResponse("No fields to update. Pass at least one field (title, priority, complexity, module, epic, phase, notes, status, maturity).");
+      }
+    }
     if (updates.status === "Backlog" && task.cycle != null) {
       updates.cycle = void 0;
       updates.cycle = null;
@@ -16671,9 +17102,8 @@ async function prepareSetup(adapter2, config2, input) {
     );
   }
   const TEMPLATE_MARKER = "*Describe your project's core value proposition here.*";
-  if (existingBrief.trim() && !existingBrief.includes(TEMPLATE_MARKER) && !input.force) {
-    throw new Error("PRODUCT_BRIEF.md already contains a generated Product Brief. Running setup again would overwrite it.\n\nTo proceed anyway, run setup with force: true.");
-  }
+  const briefHasRealContent = existingBrief.trim().length > 0 && !existingBrief.includes(TEMPLATE_MARKER);
+  const briefAlreadyExists = briefHasRealContent && !input.force;
   const detectedCodebaseType = detectCodebaseType(config2.projectRoot);
   const autoDetected = input.existingProject === void 0 || input.existingProject === false;
   const isExistingProject = input.existingProject === true || autoDetected && detectedCodebaseType === "existing_codebase";
@@ -16686,7 +17116,7 @@ async function prepareSetup(adapter2, config2, input) {
     }
     codebaseSummary = formatCodebaseSummary(scan, sourceContents);
   }
-  const briefPrompt = {
+  const briefPrompt = briefAlreadyExists ? void 0 : {
     system: PRODUCT_BRIEF_SYSTEM,
     user: buildProductBriefPrompt({
       projectName: input.projectName,
@@ -16740,15 +17170,29 @@ async function prepareSetup(adapter2, config2, input) {
     initialTasksPrompt,
     codebaseSummary,
     detectedCodebaseType,
-    autoDetected: autoDetected && detectedCodebaseType !== "new_project"
+    autoDetected: autoDetected && detectedCodebaseType !== "new_project",
+    briefAlreadyExists
   };
 }
 async function applySetup(adapter2, config2, input, briefText, adSeedText, conventionsText, initialTasksText) {
   const createdProject = await scaffoldPapiDir(adapter2, config2, input);
-  if (!briefText.trim()) {
-    throw new Error("brief_response is required and cannot be empty.");
+  const TEMPLATE_MARKER = "*Describe your project's core value proposition here.*";
+  let effectiveBriefText = briefText;
+  if (!effectiveBriefText.trim()) {
+    let existingBrief = "";
+    try {
+      existingBrief = await adapter2.readProductBrief();
+    } catch {
+      existingBrief = "";
+    }
+    const existingIsReal = existingBrief.trim().length > 0 && !existingBrief.includes(TEMPLATE_MARKER);
+    if (existingIsReal && !input.force) {
+      effectiveBriefText = existingBrief;
+    } else {
+      throw new Error("brief_response is required and cannot be empty.");
+    }
   }
-  const { seededAds, warnings } = await applySetupOutputs(adapter2, config2, input, briefText, adSeedText, conventionsText);
+  const { seededAds, warnings } = await applySetupOutputs(adapter2, config2, input, effectiveBriefText, adSeedText, conventionsText);
   let createdTasks = 0;
   if (initialTasksText?.trim()) {
     try {
@@ -16974,10 +17418,7 @@ PAPI needs just 3 things: project name, what it does, and who it's for.`
   const input = extractInput(args);
   try {
     if (toolMode === "apply") {
-      const briefResponse = args.brief_response;
-      if (!briefResponse || !briefResponse.trim()) {
-        return errorResponse('brief_response is required for mode "apply".');
-      }
+      const briefResponse = args.brief_response ?? "";
       const adSeedResponse = args.ad_seed_response;
       const conventionsResponse = args.conventions_response;
       const initialTasksResponse = args.initial_tasks_response;
@@ -17010,6 +17451,12 @@ PAPI needs just 3 things: project name, what it does, and who it's for.`
           ""
         );
       }
+      if (result.briefAlreadyExists) {
+        sections.push(
+          `**Existing brief detected:** this project already has a Product Brief (e.g. from the web wizard). Setup will preserve it and skip brief generation \u2014 no \`brief_response\` needed in the apply step. To overwrite the brief instead, re-run setup with \`force: true\`.`,
+          ""
+        );
+      }
       if (inferredDefaults.length > 0) {
         sections.push(
           `**Defaults applied** (override by re-running setup with these fields):`,
@@ -17020,30 +17467,37 @@ PAPI needs just 3 things: project name, what it does, and who it's for.`
       sections.push(
         `Generate the outputs below, then call \`setup\` again with:`,
         `- \`mode\`: "apply"`,
-        `- \`brief_response\`: your Product Brief markdown`,
+        result.briefPrompt ? `- \`brief_response\`: your Product Brief markdown` : "",
         result.adSeedPrompt ? `- \`ad_seed_response\`: your AD seed JSON array` : "",
         result.conventionsPrompt ? `- \`conventions_response\`: your conventions markdown` : "",
         result.initialTasksPrompt ? `- \`initial_tasks_response\`: your initial tasks JSON array` : "",
         `- Plus all the original setup fields (project_name, description, target_users${isExisting ? ", existing_project: true" : ""})`,
         "",
-        `---`,
-        "",
-        `### 1. Product Brief`,
-        "",
-        `<system_prompt>
+        `---`
+      );
+      let sectionNum = 0;
+      if (result.briefPrompt) {
+        sectionNum++;
+        sections.push(
+          "",
+          `### ${sectionNum}. Product Brief`,
+          "",
+          `<system_prompt>
 ${result.briefPrompt.system}
 </system_prompt>`,
-        "",
-        `<context>
+          "",
+          `<context>
 ${result.briefPrompt.user}
 </context>`
-      );
+        );
+      }
       if (result.adSeedPrompt) {
+        sectionNum++;
         sections.push(
           "",
           `---`,
           "",
-          `### 2. Active Decision Seeds`,
+          `### ${sectionNum}. Active Decision Seeds`,
           "",
           `<system_prompt>
 ${result.adSeedPrompt.system}
@@ -17055,11 +17509,12 @@ ${result.adSeedPrompt.user}
         );
       }
       if (result.conventionsPrompt) {
+        sectionNum++;
         sections.push(
           "",
           `---`,
           "",
-          `### 3. Conventions`,
+          `### ${sectionNum}. Conventions`,
           "",
           `<system_prompt>
 ${result.conventionsPrompt.system}
@@ -17071,11 +17526,12 @@ ${result.conventionsPrompt.user}
         );
       }
       if (result.initialTasksPrompt) {
+        sectionNum++;
         sections.push(
           "",
           `---`,
           "",
-          `### 4. Initial Backlog Tasks`,
+          `### ${sectionNum}. Initial Backlog Tasks`,
           "",
           `<system_prompt>
 ${result.initialTasksPrompt.system}
@@ -17487,18 +17943,37 @@ async function completeBuild(adapter2, config2, taskId, input, options = {}) {
     }
   }
   let autoTriagedCount = 0;
+  const autoTriagedIds = [];
+  const autoTriagedDupes = [];
   if (input.discoveredIssues && input.discoveredIssues !== "None" && typeof adapter2.createTask === "function") {
     const issueLines = input.discoveredIssues.split(/\n|;/).map((s) => s.trim()).filter((s) => s.length > 0);
+    const backlogTitleMap = /* @__PURE__ */ new Map();
+    try {
+      const backlog = await adapter2.queryBoard({ status: ["Backlog"] });
+      for (const t of backlog) {
+        const normalized = t.title.replace(/^\[Auto-triaged\]\s*/i, "").trim().toLowerCase();
+        if (normalized && !backlogTitleMap.has(normalized)) {
+          backlogTitleMap.set(normalized, t.displayId);
+        }
+      }
+    } catch {
+    }
     for (const line of issueLines) {
       const sevMatch = line.match(/^(P[0-3])[\s:]+/i);
       if (!sevMatch) continue;
       const severityLabel = sevMatch[1].toUpperCase();
-      const priority = severityLabel === "P0" || severityLabel === "P1" ? "P1 High" : severityLabel === "P2" ? "P2 Medium" : "P3 Low";
+      const priority = severityLabel === "P0" ? "P0 Critical" : severityLabel === "P1" ? "P1 High" : severityLabel === "P2" ? "P2 Medium" : "P3 Low";
       const titleRaw = line.replace(/^P[0-3][\s:]+/i, "").trim();
       const title = titleRaw.length > 120 ? titleRaw.slice(0, 120) : titleRaw;
       if (!title) continue;
+      const normalized = title.toLowerCase();
+      const dupId = backlogTitleMap.get(normalized);
+      if (dupId) {
+        autoTriagedDupes.push(dupId);
+        continue;
+      }
       try {
-        await adapter2.createTask({
+        const created = await adapter2.createTask({
           uuid: "",
           displayId: "",
           title: `[Auto-triaged] ${title}`,
@@ -17515,6 +17990,10 @@ async function completeBuild(adapter2, config2, taskId, input, options = {}) {
           createdCycle: cycleNumber
         });
         autoTriagedCount++;
+        if (created?.displayId) {
+          autoTriagedIds.push(created.displayId);
+          backlogTitleMap.set(normalized, created.displayId);
+        }
       } catch {
       }
     }
@@ -17711,6 +18190,8 @@ async function completeBuild(adapter2, config2, taskId, input, options = {}) {
     dogfoodResolvedCount: dogfoodResolvedCount > 0 ? dogfoodResolvedCount : void 0,
     learningsLinkedCount: learningsLinkedCount > 0 ? learningsLinkedCount : void 0,
     autoTriagedCount: autoTriagedCount > 0 ? autoTriagedCount : void 0,
+    autoTriagedIds: autoTriagedIds.length > 0 ? autoTriagedIds : void 0,
+    autoTriagedDupes: autoTriagedDupes.length > 0 ? autoTriagedDupes : void 0,
     reportWriteVerified
   };
 }
@@ -18214,8 +18695,16 @@ function formatCompleteResult(result) {
   if (result.learningsLinkedCount) {
     lines.push("", `Linked ${result.learningsLinkedCount} unactioned learning(s) to this task.`);
   }
-  if (result.autoTriagedCount) {
-    lines.push("", `\u{1F516} Auto-triaged ${result.autoTriagedCount} discovered issue(s) to Backlog.`);
+  if (result.autoTriagedCount || result.autoTriagedDupes?.length) {
+    const parts = [];
+    if (result.autoTriagedCount) {
+      const ids = result.autoTriagedIds?.length ? ` (${result.autoTriagedIds.join(", ")})` : "";
+      parts.push(`\u{1F516} Auto-triaged ${result.autoTriagedCount} discovered issue(s) to Backlog${ids}.`);
+    }
+    if (result.autoTriagedDupes?.length) {
+      parts.push(`Skipped ${result.autoTriagedDupes.length} duplicate issue(s) already in Backlog: ${result.autoTriagedDupes.join(", ")}.`);
+    }
+    lines.push("", parts.join(" "));
   }
   if (result.reportWriteVerified === false) {
     lines.push("", "\u26A0\uFE0F Build report write could not be verified \u2014 the report may not have been persisted. Run `build_list` to check, and resubmit if missing.");
@@ -19830,7 +20319,41 @@ function generateChangelog(version, commits) {
 ${commitList}
 `;
 }
-async function createRelease(config2, branch, version, adapter2) {
+function mergeGroupedCycleBranches(config2, cycleNum, baseBranch) {
+  const branches = listGroupedCycleBranches(config2.projectRoot, cycleNum, baseBranch);
+  if (branches.length === 0) return [];
+  if (!isGhAvailable()) {
+    throw new Error(
+      `Release blocked: ${branches.length} unmerged grouped cycle branch(es) detected (${branches.join(", ")}) but \`gh\` CLI is not available. Install gh and re-run release.`
+    );
+  }
+  const results = [];
+  for (const branch of branches) {
+    let prUrl = getPullRequestUrl(config2.projectRoot, branch);
+    if (!prUrl) {
+      const moduleName = branch.replace(`feat/cycle-${cycleNum}-`, "");
+      const prCreate = createPullRequest(
+        config2.projectRoot,
+        branch,
+        baseBranch,
+        `feat(cycle-${cycleNum}): merge shared cycle branch \u2014 ${moduleName}`,
+        `Automated PR created at release time for shared cycle branch \`${branch}\` (Cycle ${cycleNum}).`
+      );
+      if (!prCreate.success) {
+        results.push({ branch, prUrl: null, status: "failed", message: prCreate.message });
+        continue;
+      }
+      prUrl = prCreate.message;
+    }
+    const merge = squashMergePullRequest(config2.projectRoot, branch);
+    if (merge.success) {
+      deleteLocalBranch(config2.projectRoot, branch);
+    }
+    results.push({ branch, prUrl, status: merge.success ? "merged" : "failed", message: merge.message });
+  }
+  return results;
+}
+async function createRelease(config2, branch, version, adapter2, cycleNum) {
   if (!isGitAvailable()) {
     throw new Error("git is not available.");
   }
@@ -19841,10 +20364,13 @@ async function createRelease(config2, branch, version, adapter2) {
     throw new Error("working directory has uncommitted changes. Commit or stash them before releasing.");
   }
   const warnings = [];
+  const resolvedCycleNum = cycleNum && cycleNum > 0 ? cycleNum : (() => {
+    const m = version.match(/^v0\.(\d+)\./);
+    return m ? parseInt(m[1], 10) : 0;
+  })();
   if (adapter2) {
     try {
-      const versionMatch = version.match(/^v0\.(\d+)\./);
-      const currentCycle = versionMatch ? parseInt(versionMatch[1], 10) : 0;
+      const currentCycle = resolvedCycleNum;
       if (currentCycle > 0) {
         await adapter2.createCycle({
           id: `cycle-${currentCycle}`,
@@ -19873,6 +20399,24 @@ async function createRelease(config2, branch, version, adapter2) {
       warnings.push(`git pull failed: ${pull.message}. Run manually.`);
     }
   }
+  let groupedBranchMerges;
+  if (resolvedCycleNum > 0) {
+    const mergeResults = mergeGroupedCycleBranches(config2, resolvedCycleNum, branch);
+    if (mergeResults.length > 0) {
+      groupedBranchMerges = mergeResults;
+      const failures = mergeResults.filter((r) => r.status === "failed");
+      if (failures.length > 0) {
+        const detail = failures.map((r) => `${r.branch}: ${r.message}`).join("; ");
+        throw new Error(`Release blocked: grouped cycle branch merge failed \u2014 ${detail}. Resolve conflicts and retry release.`);
+      }
+      if (hasRemote(config2.projectRoot)) {
+        const repull = gitPull(config2.projectRoot);
+        if (!repull.success) {
+          warnings.push(`Post-merge pull failed: ${repull.message}. Run manually.`);
+        }
+      }
+    }
+  }
   if (tagExists(config2.projectRoot, version)) {
     throw new Error(`tag "${version}" already exists. Use a different version.`);
   }
@@ -19909,7 +20453,8 @@ async function createRelease(config2, branch, version, adapter2) {
     commitNote,
     tagMessage: tagResult.message,
     pushNotes,
-    warnings: warnings.length > 0 ? warnings : void 0
+    warnings: warnings.length > 0 ? warnings : void 0,
+    ...groupedBranchMerges ? { groupedBranchMerges } : {}
   };
 }
 
@@ -19965,7 +20510,9 @@ async function handleRelease(adapter2, config2, args) {
     return errorResponse(`version must start with "v" (got "${version}"). Example: "v0.1.0-alpha"`);
   }
   try {
-    const result = await createRelease(config2, branch, version, adapter2);
+    const cycleMatch = version.match(/^v0\.(\d+)\./);
+    const cycleNum = cycleMatch ? parseInt(cycleMatch[1], 10) : void 0;
+    const result = await createRelease(config2, branch, version, adapter2, cycleNum);
     const lines = [
       `## Release ${result.version}`,
       "",
@@ -19978,13 +20525,17 @@ async function handleRelease(adapter2, config2, args) {
       lines.push("", "---", "");
       lines.push(...result.pushNotes);
     }
+    if (result.groupedBranchMerges?.length) {
+      lines.push("", "**Shared cycle branches merged:**");
+      for (const m of result.groupedBranchMerges) {
+        lines.push(`- \`${m.branch}\` \u2014 ${m.message}${m.prUrl ? ` (${m.prUrl})` : ""}`);
+      }
+    }
     if (result.warnings?.length) {
       lines.push("", "\u26A0\uFE0F Warnings: " + result.warnings.join("; "));
     }
     try {
-      const cycleMatch = version.match(/^v0\.(\d+)\./);
-      const cycleNum = cycleMatch ? parseInt(cycleMatch[1], 10) : 0;
-      if (cycleNum > 0) {
+      if (cycleNum && cycleNum > 0) {
         const reports = await adapter2.getBuildReportsSince(cycleNum);
         const EMPTY = /* @__PURE__ */ new Set(["None", "none", "N/A", "", "null"]);
         const issues = reports.filter((r) => r.discoveredIssues && !EMPTY.has(r.discoveredIssues.trim())).map((r) => `- **${r.taskId}** (${r.taskName}): ${r.discoveredIssues}`);
@@ -19997,10 +20548,10 @@ async function handleRelease(adapter2, config2, args) {
     }
     if (rawObservations && rawObservations.length > 0 && adapter2.writeDogfoodEntries) {
       try {
-        const cycleMatch = version.match(/^v0\.(\d+)\./);
-        const cycleNum = cycleMatch ? parseInt(cycleMatch[1], 10) : 0;
+        const cycleMatch2 = version.match(/^v0\.(\d+)\./);
+        const cycleNum2 = cycleMatch2 ? parseInt(cycleMatch2[1], 10) : 0;
         const entries = rawObservations.map((obs) => ({
-          cycleNumber: cycleNum,
+          cycleNumber: cycleNum2,
           category: obs.category,
           content: obs.content,
           sourceTool: "release",
@@ -20256,6 +20807,10 @@ function mergeAfterAccept(config2, taskId) {
   }
   const featureBranch = taskBranchName(taskId);
   const baseBranch = resolveBaseBranch(config2.projectRoot, config2.baseBranch);
+  if (!branchExists(config2.projectRoot, featureBranch)) {
+    lines.push(`Task is on a shared cycle branch \u2014 will be merged at release time.`);
+    return lines;
+  }
   const papiDir = join7(config2.projectRoot, ".papi");
   if (existsSync4(papiDir)) {
     try {
@@ -20431,8 +20986,9 @@ ${result.handoffRegenPrompt.userMessage}
           }
           const version = `v0.${result.currentCycle}.0`;
           const baseBranch = resolveBaseBranch(config2.projectRoot, config2.baseBranch);
-          const releaseResult = await createRelease(config2, baseBranch, version, adapter2);
+          const releaseResult = await createRelease(config2, baseBranch, version, adapter2, result.currentCycle);
           const pushInfo = releaseResult.pushNotes.join(" ");
+          const groupedMergeNote = releaseResult.groupedBranchMerges?.length ? "\n" + releaseResult.groupedBranchMerges.map((r) => `- Merged shared branch \`${r.branch}\` via PR: ${r.prUrl ?? "n/a"}`).join("\n") : "";
           autoReleaseNote = `
 
 ---
@@ -20442,7 +20998,7 @@ ${result.handoffRegenPrompt.userMessage}
 - Version: **${releaseResult.version}**
 - ${releaseResult.commitNote}
 - ${releaseResult.tagMessage}
-- ${pushInfo}` + (releaseResult.warnings?.length ? `
+- ${pushInfo}` + groupedMergeNote + (releaseResult.warnings?.length ? `
 - Warnings: ${releaseResult.warnings.join(", ")}` : "") + `
 
 Run \`plan\` to create Cycle ${result.currentCycle + 1}.`;
@@ -20689,7 +21245,7 @@ function countByStatus(tasks) {
 async function getHealthSummary(adapter2) {
   const health = await adapter2.getCycleHealth();
   const activeTasks = await adapter2.queryBoard({
-    status: ["Backlog", "In Cycle", "Ready", "In Progress", "In Review", "Blocked"]
+    status: ["Backlog", "In Cycle", "Ready", "In Progress", "In Review", "Blocked", "Deferred"]
   });
   const logEntries = await adapter2.getCycleLog(3);
   const cycleNumber = health.totalCycles;
@@ -22488,16 +23044,19 @@ function emitToolCall(projectId, toolName, durationMs, extra) {
     metadata: { duration_ms: durationMs, ...extra }
   });
 }
-function emitMdAdapterPing(toolName, extra) {
+function emitMdAdapterPing(toolName, extra, userId, projectSlug) {
   if (!isEnabled()) return;
   const installId = getInstallId();
   if (!installId) return;
+  const resolvedUserId = userId ?? process.env["PAPI_USER_ID"] ?? void 0;
   const body = {
     install_id: installId,
     tool_name: toolName,
     papi_version: process.env["npm_package_version"] ?? null,
     metadata: extra ?? {}
   };
+  if (resolvedUserId) body["user_id"] = resolvedUserId;
+  if (projectSlug) body["project_slug"] = projectSlug;
   fetch(`${TELEMETRY_SUPABASE_URL}/rest/v1/md_adapter_pings`, {
     method: "POST",
     headers: {
@@ -22525,6 +23084,7 @@ var TOOLS_REQUIRING_PAPI = /* @__PURE__ */ new Set([
   "plan",
   "strategy_review",
   "strategy_change",
+  "strategy_agenda",
   "board_view",
   "board_deprioritise",
   "board_archive",
@@ -22617,6 +23177,7 @@ function createServer(adapter2, config2) {
       planTool,
       strategyReviewTool,
       strategyChangeTool,
+      strategyAgendaTool,
       boardViewTool,
       boardDeprioritiseTool,
       boardArchiveTool,
@@ -22683,6 +23244,9 @@ function createServer(adapter2, config2) {
       case "strategy_change":
         result = await handleStrategyChange(adapter2, config2, safeArgs);
         break;
+      case "strategy_agenda":
+        result = await handleStrategyAgenda(adapter2, config2, safeArgs);
+        break;
       case "board_view":
         result = await handleBoardView(adapter2, safeArgs);
         break;
@@ -22777,7 +23341,8 @@ function createServer(adapter2, config2) {
     } catch {
     }
     if (config2.adapterType === "md") {
-      emitMdAdapterPing(name, { duration_ms: elapsed, success: !isError });
+      const mdProjectSlug = config2.projectRoot ? config2.projectRoot.split("/").pop() : void 0;
+      emitMdAdapterPing(name, { duration_ms: elapsed, success: !isError }, config2.userId, mdProjectSlug);
     }
     const telemetryProjectId = process.env["PAPI_PROJECT_ID"];
     if (telemetryProjectId) {

package/dist/prompts.js

@@ -535,6 +535,9 @@ function buildPlanUserMessage(ctx) {
     }) : PLAN_FULL_INSTRUCTIONS;
     parts.push(instructions);
   }
+  if (ctx.foundationalTasksGuidance) {
+    parts.push("", ctx.foundationalTasksGuidance);
+  }
   if (ctx.skipHandoffs) {
     parts.push(
       "",
@@ -1056,6 +1059,9 @@ function buildReviewUserMessage(ctx) {
   if (ctx.docActionStaleness) {
     parts.push("### Doc Action Staleness", "", ctx.docActionStaleness, "");
   }
+  if (ctx.pendingAgendaTopics) {
+    parts.push("### Queued Agenda Topics", "", "_Topics queued via `strategy_agenda` since the last review. Address each one in this review \u2014 they will be auto-marked as addressed on apply._", "", ctx.pendingAgendaTopics, "");
+  }
   return parts.join("\n");
 }
 function parseReviewStructuredOutput(raw) {

package/package.json

@@ -1,7 +1,6 @@
 {
   "name": "@papi-ai/server",
-  "version": "0.7.12",
-  "mcpName": "io.github.cathalos92/papi",
+  "version": "0.7.13",
   "description": "PAPI MCP server — AI-powered sprint planning, build execution, and strategy review for software projects",
   "license": "Elastic-2.0",
   "type": "module",