@papi-ai/server 0.7.83 → 0.7.85

package/dist/index.js

@@ -73,11 +73,20 @@ function resolveDeploymentProfile(env) {
     }
   };
 }
+function isNoneLeadProse(trimmed) {
+  const m = NONE_LEAD_RE.exec(trimmed);
+  if (!m) return false;
+  if (/\bP[0-3]\s*[:—–-]/.test(trimmed)) return false;
+  const rest = (m.groups?.rest ?? "").replace(/^[-•]\s*/, "").trim();
+  if (CONTRAST_LEAD_RE.test(rest)) return false;
+  return true;
+}
 function splitFindings(raw, kind) {
   if (!raw) return [];
   const trimmed = raw.trim();
   if (trimmed.length === 0 || NONE_RE.test(trimmed)) return [];
   if (kind !== "issue" && AD_HOC_PLACEHOLDER_RE.test(trimmed)) return [];
+  if (isNoneLeadProse(trimmed)) return [];
   const chunks = trimmed.split(/\n+/).flatMap((line) => line.split(/(?=\bP[0-3]\s*[:—-])/)).map((s) => s.trim()).filter((s) => s.length > 0 && !NONE_RE.test(s));
   const items = [];
   for (const chunk of chunks) {
@@ -760,7 +769,7 @@ function parsePhaseBlock(block) {
   if (isNaN(order)) return null;
   return { id, slug, label, description, status, order };
 }
-var CAPABILITY_REGISTRY, CAPABILITY_KEYS, SENSITIVE_CHANGELOG_PATTERNS, CONTRIBUTOR_PRICING_URL, HOSTED_APP_URL, HOSTED_MCP_URL, HOSTED_SUPABASE_URL, SEVERITY_ORDER, NONE_RE, AD_HOC_PLACEHOLDER_RE, MIN_REASON_LENGTH, LOW_SEVERITIES, WAB_WINDOW_DAYS, WAB_DEFAULT_WEEKS, WAB_WEEK_MS, PRODUCT_MARKER, MECHANICS_MARKER, CHECK_VALUE_MAX, VALID_EFFORT_SIZES, SECTION_HEADERS, VALID_EFFORT_SIZES2, EFFORT_SCALE, NONE_PATTERN, NONE_PATTERN2, VALID_STATUSES, PHASES_START, PHASES_END;
+var CAPABILITY_REGISTRY, CAPABILITY_KEYS, ASSIGNABLE_CONTRIBUTOR_ROLES, SENSITIVE_CHANGELOG_PATTERNS, CONTRIBUTOR_PRICING_URL, HOSTED_APP_URL, HOSTED_MCP_URL, HOSTED_SUPABASE_URL, SEVERITY_ORDER, NONE_RE, AD_HOC_PLACEHOLDER_RE, NONE_LEAD_RE, CONTRAST_LEAD_RE, MIN_REASON_LENGTH, LOW_SEVERITIES, WAB_WINDOW_DAYS, WAB_DEFAULT_WEEKS, WAB_WEEK_MS, PRODUCT_MARKER, MECHANICS_MARKER, CHECK_VALUE_MAX, VALID_EFFORT_SIZES, SECTION_HEADERS, VALID_EFFORT_SIZES2, EFFORT_SCALE, NONE_PATTERN, NONE_PATTERN2, VALID_STATUSES, PHASES_START, PHASES_END;
 var init_dist = __esm({
   "../shared/dist/index.js"() {
     "use strict";
@@ -800,9 +809,24 @@ var init_dist = __esm({
       { key: "autoBranch", label: "Auto branch", description: "Creates a feature branch per task/cycle at build start.", step: "build" },
       { key: "autoCommit", label: "Auto commit", description: "Commits your work automatically when a build completes.", step: "build" },
       { key: "autoPush", label: "Auto push & PR", description: "Pushes the branch and opens a pull request on build complete.", step: "build" },
-      { key: "papiMetaFraming", label: "PAPI self-referential framing", description: "Includes PAPI-meta build-discipline framing in handoff output.", step: "build" }
+      { key: "papiMetaFraming", label: "PAPI self-referential framing", description: "Includes PAPI-meta build-discipline framing in handoff output.", step: "build" },
+      // Editor-equal release. Two legitimate team shapes need opposite answers, so
+      // this is a PROJECT policy rather than a global rule:
+      //
+      //   OFF (default) — an editor's release opens a CONTRIBUTOR PR and PAPI records
+      //     the release when GitHub merges it. Right for an open//multi-contributor
+      //     product where the project owner is the last gate before production.
+      //   ON — an editor releases on exactly the owner's path. Right for a small team
+      //     of trusted peers who each run whole cycles end to end, where routing every
+      //     close back through one person is the bottleneck, not the safeguard.
+      //
+      // Defaults OFF so existing projects are byte-identical, and because widening who
+      // can ship to production must be a deliberate choice, never a silent upgrade.
+      // A VIEWER is denied either way — this moves the editor line only.
+      { key: "editorRelease", label: "Editors release like the owner", description: "Lets editors run a full release instead of opening a contributor PR.", step: "release", defaultEnabled: false }
     ];
     CAPABILITY_KEYS = CAPABILITY_REGISTRY.map((c) => c.key);
+    ASSIGNABLE_CONTRIBUTOR_ROLES = ["editor", "viewer"];
     SENSITIVE_CHANGELOG_PATTERNS = [
       // ── Test-user machinery ────────────────────────────────────────────────
       /@test\.papi\.dev/i,
@@ -851,6 +875,8 @@ var init_dist = __esm({
     };
     NONE_RE = /^(none|n\/a|no(ne)? (found|discovered))\.?$/i;
     AD_HOC_PLACEHOLDER_RE = /^none\s*[—–-]\s*ad[-\s]?hoc work\.?$/i;
+    NONE_LEAD_RE = /^(none|n\/a|no(ne)? (found|discovered))\s*[.,:;—–-]\s*(?<rest>.*)$/is;
+    CONTRAST_LEAD_RE = /^(but|however|although|though|except|aside from|other than|besides)\b/i;
     MIN_REASON_LENGTH = 12;
     LOW_SEVERITIES = /* @__PURE__ */ new Set(["P2", "P3"]);
     WAB_WINDOW_DAYS = 7;
@@ -906,6 +932,7 @@ __export(git_exports, {
   detectUnrecordedCommits: () => detectUnrecordedCommits,
   ensureLatestDevelop: () => ensureLatestDevelop,
   ensureTagAtHead: () => ensureTagAtHead,
+  findContributorReleasePullRequests: () => findContributorReleasePullRequests,
   findTaskCommitsOnBase: () => findTaskCommitsOnBase,
   getBranchDiff: () => getBranchDiff,
   getCommitFiles: () => getCommitFiles,
@@ -923,6 +950,7 @@ __export(git_exports, {
   getOriginRepoSlug: () => getOriginRepoSlug,
   getOriginUrl: () => getOriginUrl,
   getPathsDifferingFrom: () => getPathsDifferingFrom,
+  getPullRequestState: () => getPullRequestState,
   getPullRequestUrl: () => getPullRequestUrl,
   getRemoteBranchFiles: () => getRemoteBranchFiles,
   getRootCommitHash: () => getRootCommitHash,
@@ -949,6 +977,7 @@ __export(git_exports, {
   listGroupedCycleBranches: () => listGroupedCycleBranches,
   listOpenPullRequests: () => listOpenPullRequests,
   listOrphanFeatBranches: () => listOrphanFeatBranches,
+  memberBranchSlug: () => memberBranchSlug,
   mergePullRequest: () => mergePullRequest,
   normalizeGitUrl: () => normalizeGitUrl,
   pickModuleCycleBranch: () => pickModuleCycleBranch,
@@ -1841,9 +1870,20 @@ function detectUnrecordedCommits(cwd, baseBranch) {
 function taskBranchName(taskId) {
   return `feat/${taskId}`;
 }
-function cycleBranchName(cycleNumber, module) {
+function cycleBranchName(cycleNumber, module, memberSlug) {
   const slug = module.toLowerCase().replace(/&amp;/g, "and").replace(/&/g, "and").replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "");
-  return `feat/cycle-${cycleNumber}-${slug}`;
+  const member = memberSlug ? `-${memberSlug}` : "";
+  return `feat/cycle-${cycleNumber}-${slug}${member}`;
+}
+function memberBranchSlug(member) {
+  const sanitise = (raw) => raw.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "").slice(0, 20).replace(/-+$/g, "");
+  const fromName = member.displayName ? sanitise(member.displayName) : "";
+  if (fromName) return fromName;
+  const localPart = member.email ? member.email.split("@")[0] : "";
+  const fromEmail = localPart ? sanitise(localPart) : "";
+  if (fromEmail) return fromEmail;
+  const fromId = member.userId ? sanitise(member.userId).slice(0, 8) : "";
+  return fromId || void 0;
 }
 function getHeadCommitSha(cwd) {
   try {
@@ -1874,6 +1914,56 @@ function getPullRequestUrl(cwd, branch) {
     return null;
   }
 }
+function getPullRequestState(cwd, prUrl) {
+  try {
+    const output = execFileSync(
+      "gh",
+      ["pr", "view", prUrl, "--json", "url,state,mergedAt"],
+      { cwd, encoding: "utf-8" }
+    ).trim();
+    if (!output) return null;
+    const parsed = JSON.parse(output);
+    if (!parsed.url || !["OPEN", "CLOSED", "MERGED"].includes(parsed.state ?? "")) return null;
+    return {
+      url: parsed.url,
+      state: parsed.state,
+      mergedAt: parsed.mergedAt ?? null
+    };
+  } catch {
+    return null;
+  }
+}
+function findContributorReleasePullRequests(cwd, cycle) {
+  if (!Number.isInteger(cycle) || cycle <= 0) return [];
+  try {
+    const output = execFileSync(
+      "gh",
+      [
+        "pr",
+        "list",
+        "--state",
+        "all",
+        "--limit",
+        "20",
+        "--search",
+        `"Contributor release PR for cycle ${cycle}" in:body`,
+        "--json",
+        "url,state,mergedAt,headRefName"
+      ],
+      { cwd, encoding: "utf-8" }
+    ).trim();
+    if (!output) return [];
+    const parsed = JSON.parse(output);
+    return parsed.flatMap((pr) => pr.url && pr.headRefName && ["OPEN", "CLOSED", "MERGED"].includes(pr.state ?? "") ? [{
+      url: pr.url,
+      state: pr.state,
+      mergedAt: pr.mergedAt ?? null,
+      branch: pr.headRefName
+    }] : []);
+  } catch {
+    return [];
+  }
+}
 function squashMergePullRequest(cwd, branch) {
   const repo = getOriginRepoSlug(cwd);
   const baseArgs = ["pr", "merge", branch, "--squash", "--delete-branch"];
@@ -1966,9 +2056,9 @@ function isBranchContentAlreadyInBase(cwd, branch, baseBranch) {
     return false;
   }
 }
-function pickModuleCycleBranch(candidates, cycleNumber, module) {
+function pickModuleCycleBranch(candidates, cycleNumber, module, memberSlug) {
   if (candidates.length === 0) return void 0;
-  const expected = cycleBranchName(cycleNumber, module);
+  const expected = cycleBranchName(cycleNumber, module, memberSlug);
   return candidates.find((b2) => b2 === expected);
 }
 function listOrphanFeatBranches(cwd, baseBranch) {
@@ -2307,6 +2397,10 @@ var init_proxy_adapter = __esm({
       "dismissRecommendation",
       "findPendingDocActionsForTask",
       "getActiveDecisions",
+      "getContributorRole",
+      "listContributorReleasePrs",
+      "recordContributorReleasePr",
+      "setContributorReleasePrStatus",
       "getActiveStage",
       "getBuildReportCountForTask",
       "getBuildReportsSince",
@@ -2446,7 +2540,7 @@ var init_proxy_adapter = __esm({
       "applyActiveDecisionUpdates",
       // getToolCallCount + updatePhaseStatus are ABSENT: they now have edge handlers and
       // are served through the forwarder (getToolCallCount = SUP-2026-026 handler #1).
-      "getContributorRole",
+      // getContributorRole is edge-wired and binds identity from the bearer.
       // task-3018 (C356): storeDocBody + getDocBodyUsage are now WIRED — edge case
       // handlers + ALLOWED_METHODS/WRITE_METHODS entries exist, so they forward and
       // hosted callers get body storage. Removed from this list, as task-3017 required.
@@ -2454,9 +2548,6 @@ var init_proxy_adapter = __esm({
       // of the owner-action queue. Six readers were wired C329 (task-2412) but the
       // producer stayed here, so the hosted Owner Action Queue was structurally empty
       // (AD-74 inverted). Now forwards; the edge binds user_id to the bearer ([C]).
-      "recordContributorReleasePr",
-      "setContributorReleasePrStatus",
-      "listContributorReleasePrs",
       "claimReview",
       "getSiblingAds",
       "getSiblingRepoTasks",
@@ -3172,8 +3263,8 @@ Check PAPI_PROJECT_ID in your .mcp.json config. Find your project ID in the PAPI
       getCycleLearningPatterns() {
         return this.invoke("getCycleLearningPatterns", []);
       }
-      updateCycleLearningActionRef(learningId, taskDisplayId) {
-        return this.invoke("updateCycleLearningActionRef", [learningId, taskDisplayId]);
+      updateCycleLearningActionRef(learningId, taskDisplayId, opts) {
+        return this.invoke("updateCycleLearningActionRef", [learningId, taskDisplayId, opts ?? {}]);
       }
       // --- Strategy Review Drafts ---
       savePendingReviewResponse(cycleNumber, rawResponse) {
@@ -3232,8 +3323,8 @@ Check PAPI_PROJECT_ID in your .mcp.json config. Find your project ID in the PAPI
       async listContributors() {
         return this.invoke("listContributors", []);
       }
-      async addContributorByEmail(email) {
-        return this.invoke("addContributorByEmail", [email]);
+      async addContributorByEmail(email, role) {
+        return this.invoke("addContributorByEmail", [email, role]);
       }
       async removeContributorByEmail(email) {
         return this.invoke("removeContributorByEmail", [email]);
@@ -3279,7 +3370,11 @@ Check PAPI_PROJECT_ID in your .mcp.json config. Find your project ID in the PAPI
        */
       async getMeteredUsage() {
         const body = await this.postRoute("metering", {});
-        return { tier: body.tier ?? "free", monthlyToolCalls: body.monthlyToolCalls ?? 0 };
+        return {
+          tier: body.tier ?? "free",
+          monthlyToolCalls: body.monthlyToolCalls ?? 0,
+          projectLimitOverride: body.projectLimitOverride ?? null
+        };
       }
       async listUserProjects() {
         const body = await this.postRoute("project-list", {});
@@ -6391,7 +6486,7 @@ async function runSetup() {
     log(`Project: ${result.project_slug}`);
   }
   log("");
-  log(`Done. Open Claude Code in this folder and say "run setup" to scaffold your first plan.`);
+  log(`Done. Open your AI client in this folder and say "run setup" to scaffold your first plan.`);
   return 0;
 }
 var DEFAULT_BASE_URL, MAX_POLL_SECONDS, NETWORK_RETRY_LIMIT;
@@ -6499,7 +6594,7 @@ function loadConfig() {
 ${conflicting} is set in your environment, but PAPI_DATA_API_KEY is also set \u2014
 you have a hosted PAPI account, so the database URL is being ignored anyway.
 
-Fix: \`unset ${conflicting}\` (and PAPI_ADAPTER if also set) before starting Claude Code,
+Fix: \`unset ${conflicting}\` (and PAPI_ADAPTER if also set) before starting your AI client,
 or remove it from your shell rc file (~/.zshrc, ~/.bashrc).
 
 If you intentionally self-host, set PAPI_SELF_HOST=1 in your environment to bypass this guard.`
@@ -6944,7 +7039,7 @@ Fix the PAPI_PROJECT_ID in your .mcp.json (or unset it and let PAPI resolve the
 Get started in 3 steps:
   1. Sign up at ${dashboardUrl ? `${dashboardUrl}/login` : "your configured PAPI dashboard"}
   2. Complete the onboarding wizard \u2014 it generates your .mcp.json config
-  3. Download the config, place it in your project root, and restart Claude Code
+  3. Download the config, place it in your project root, and restart your AI client
 
 Already have an account? Make sure PAPI_DATA_API_KEY is set in your .mcp.json env config.`
         );
@@ -7870,7 +7965,11 @@ The guard above says what to reject. This says what to propose. Rejecting is not
 
 **Copy variants are NEVER decisions.** A tagline, a headline, a value proposition, a piece of marketing or product wording: swapping one for another constrains no future work, so it fails test (b) outright. Wording changes as often as the market teaches you something, and routing every edit through decision ceremony is what buries the handful of decisions that genuinely constrain the project. Edit the wording where the wording lives. If two variants are being compared against a measurement, that is an experiment, not a decision.
 
-**A decision decaying into a convention is the healthy path, not a failure.** When a live AD stops being arguable \u2014 the alternatives are no longer on the table and nobody would re-litigate it \u2014 say so during housekeeping and propose retiring it into a convention. An AD registry where most entries are settled is one nobody reads.`;
+**A decision decaying into a convention is the healthy path, not a failure.** When a live AD stops being arguable \u2014 the alternatives are no longer on the table and nobody would re-litigate it \u2014 propose demoting it during housekeeping with \`action: "demote"\`. An AD registry where most entries are settled is one nobody reads.
+
+DEMOTION IS THE THIRD TRANSITION, and it is not either of the other two. \`supersede\` replaces a stance with a NEW one; \`delete\` removes something that was never a decision. \`demote\` is for a decision that was RIGHT and still holds \u2014 it keeps riding every build handoff as a convention and simply stops occupying decision surface. Apply test (c) to each live AD: could a competent person argue the other side TODAY, on current evidence? If no, propose \`demote\` and give the one-line reason it is no longer contested.
+
+PROPOSE, NEVER ASSUME. A demotion is a judgement about whether something is still arguable, and the owner is the one who knows. Surface candidates with reasoning and let the human confirm on apply, exactly as board corrections and cancellations are gated. Do not demote in bulk to tidy the registry.`;
 var AD_CONFLICT_SURFACING_RULES = `**A contradiction is NOT a veto \u2014 surface it, never silently shelve it.**
 
 Active Decisions are *active*: they can be superseded, modified, or abandoned. You do NOT have authority to kill a piece of work simply because it cuts against one. That is the user's call, and they can only make it if you show it to them.
@@ -8857,7 +8956,7 @@ After your natural language output, include this EXACT format on its own line:
   "activeDecisionUpdates": [
     {
       "id": "string \u2014 AD-N (existing) or new AD-N (for new decisions)",
-      "action": "confidence_change | modify | resolve | supersede | new | delete",
+      "action": "confidence_change | modify | resolve | supersede | new | delete | demote",
       "body": "string \u2014 full AD block including ### heading, confidence tag, and body text (empty string for delete)",
       "evidenceRef": "string (optional) \u2014 for DELIBERATE decisions (modify / resolve / delete = validate/modify/invalidate), a pointer to the evidence that justified the change: a doc path (docs/research/foo.md), a build-report id, or a metric name. Builds the decision->outcome ledger. Omit if no concrete evidence.",
       "metricDelta": "object (optional) \u2014 { "metric": string, "before": number, "after": number, "delta": number } \u2014 which metric moved and by how much. Use a REAL metric name from cycle_metrics_snapshots where possible (e.g. scope_accuracy, velocity, est_actual_drift). Omit if no metric moved."
@@ -9109,7 +9208,7 @@ After your natural language output, include this EXACT format on its own line:
   "activeDecisionUpdates": [
     {
       "id": "string \u2014 AD-N (existing) or new AD-N (for new decisions)",
-      "action": "confidence_change | modify | resolve | supersede | new | delete",
+      "action": "confidence_change | modify | resolve | supersede | new | delete | demote",
       "body": "string \u2014 full AD block including ### heading, confidence tag, and body text (empty string for delete)",
       "evidenceRef": "string (optional) \u2014 for DELIBERATE changes (modify / resolve / delete), a pointer to the justifying evidence: a doc path, a build-report id, or a metric name. Builds the decision->outcome ledger. Omit if none.",
       "metricDelta": "object (optional) \u2014 { "metric": string, "before": number, "after": number, "delta": number } \u2014 which metric moved. Prefer a real metric name from cycle_metrics_snapshots. Omit if none."
@@ -9620,13 +9719,20 @@ async function getPrompt(name) {
 }
 
 // src/lib/foundation.ts
-var cache2 = null;
+var cache2 = /* @__PURE__ */ new Map();
 var CACHE_TTL_MS2 = 5 * 60 * 1e3;
+var UNKNOWN_PROJECT_KEY = "\0unknown-project";
+function cacheKeyFor(adapter2) {
+  const id = adapter2.getProjectId?.();
+  return id && id.length > 0 ? id : UNKNOWN_PROJECT_KEY;
+}
 var MAX_TOKENS = 800;
 var MAX_CHARS = MAX_TOKENS * 4;
 async function buildProjectFoundation(adapter2) {
   const now = Date.now();
-  if (cache2 && cache2.expiresAt > now) return cache2.content;
+  const cacheKey = cacheKeyFor(adapter2);
+  const hit = cache2.get(cacheKey);
+  if (hit && hit.expiresAt > now) return hit.content;
   const [briefRaw, decisions, northStar, horizons, stages] = await Promise.all([
     safe(() => adapter2.readProductBrief(), ""),
     safe(() => adapter2.getActiveDecisions(), []),
@@ -9648,7 +9754,7 @@ async function buildProjectFoundation(adapter2) {
   const userType = extractUserType(briefRaw);
   if (userType) lines.push(`Primary user: ${userType}`);
   if (lines.length === 0) {
-    cache2 = { content: "", expiresAt: now + CACHE_TTL_MS2 };
+    cache2.set(cacheKey, { content: "", expiresAt: now + CACHE_TTL_MS2 });
     return "";
   }
   const body = lines.join("\n");
@@ -9661,7 +9767,7 @@ ${body}
 [/project_foundation]
 
 ` : block;
-  cache2 = { content: final, expiresAt: now + CACHE_TTL_MS2 };
+  cache2.set(cacheKey, { content: final, expiresAt: now + CACHE_TTL_MS2 });
   return final;
 }
 async function safe(fn, fallback) {
@@ -10155,6 +10261,46 @@ function computeCarryForwardStaleness(log2, doneTaskIds) {
   ].join("\n");
 }
 
+// src/lib/refs.ts
+var MAX_LABEL = 55;
+function truncateLabel(title, max = MAX_LABEL) {
+  if (title.length <= max) return title;
+  return `${title.slice(0, max - 1).trimEnd()}\u2026`;
+}
+function formatRef(id, title) {
+  const label = title?.trim();
+  if (!label) return id;
+  if (label.toLowerCase() === id.toLowerCase()) return id;
+  return `${id} (${truncateLabel(label)})`;
+}
+function formatRefList(ids, titles) {
+  return ids.map((id) => formatRef(id, lookupTitle(id, titles))).join(", ");
+}
+function lookupTitle(id, titles) {
+  if (!titles) return void 0;
+  return titles.get(id) ?? titles.get(id.toLowerCase()) ?? titles.get(id.toUpperCase());
+}
+function titleMap(entities) {
+  const map = /* @__PURE__ */ new Map();
+  for (const e of entities) {
+    if (!e.title) continue;
+    for (const key of [e.id, e.displayId, e.uuid]) {
+      if (!key) continue;
+      map.set(key, e.title);
+      map.set(key.toLowerCase(), e.title);
+    }
+  }
+  return map;
+}
+function formatEntityRef(value, entities) {
+  const needle = value.toLowerCase();
+  const match = entities.find(
+    (e) => e.uuid?.toLowerCase() === needle || e.id?.toLowerCase() === needle || e.displayId?.toLowerCase() === needle
+  );
+  if (!match) return formatRef(value, lookupTitle(value, titleMap(entities)));
+  return formatRef(match.displayId || match.id || value, match.title);
+}
+
 // src/lib/blocker.ts
 function idMatches(candidate, ref) {
   if (!candidate) return false;
@@ -10188,16 +10334,31 @@ function isBlockerResolved(blocker, ctx) {
       return false;
   }
 }
-function formatBlockerWaiting(blocker) {
+function formatBlockerWaiting(blocker, refTitle) {
+  const ref = formatRef(blocker.ref, refTitle);
   switch (blocker.type) {
     case "depends-on":
-      return `waiting on ${blocker.ref} \u2014 clears when that task is Done`;
+      return `waiting on ${ref} \u2014 clears when that task is Done`;
     case "owner-action":
-      return `waiting on owner action ${blocker.ref} \u2014 clears when you complete it`;
+      return `waiting on owner action ${ref} \u2014 clears when you complete it`;
+    case "decision-gate":
+      return `waiting on decision ${ref} \u2014 clears when that decision is resolved`;
+    default:
+      return `waiting on ${ref}`;
+  }
+}
+function resolveBlockerTitle(blocker, ctx) {
+  switch (blocker.type) {
+    case "depends-on":
+      return ctx.tasks.find(
+        (t) => idMatches(t.displayId, blocker.ref) || idMatches(t.id, blocker.ref)
+      )?.title;
     case "decision-gate":
-      return `waiting on decision ${blocker.ref} \u2014 clears when that decision is resolved`;
+      return ctx.decisions.find(
+        (d) => idMatches(d.displayId, blocker.ref) || idMatches(d.id, blocker.ref)
+      )?.title;
     default:
-      return `waiting on ${blocker.ref}`;
+      return void 0;
   }
 }
 
@@ -10303,6 +10464,31 @@ function isProjectOwner(callerUserId, ownerUserId) {
   if (caller.length === 0 || owner.length === 0) return false;
   return caller === owner;
 }
+var CYCLE_ROLES = ["owner", "editor"];
+async function resolveCycleGate(adapter2, gate) {
+  if (!gate.enforced) return { allowed: true, role: null };
+  if (gate.callerIsOwner) return { allowed: true, role: "owner" };
+  if (!gate.callerUserId) {
+    return {
+      allowed: false,
+      role: null,
+      resolutionError: gate.resolutionError ?? "no caller identity could be resolved"
+    };
+  }
+  if (!adapterSupports(adapter2, "getContributorRole")) {
+    return { allowed: false, role: null, resolutionError: "role lookup is unavailable on this transport" };
+  }
+  try {
+    const role = await adapter2.getContributorRole(gate.callerUserId);
+    return { allowed: role != null && CYCLE_ROLES.includes(role), role: role ?? null };
+  } catch (err) {
+    return {
+      allowed: false,
+      role: null,
+      resolutionError: err instanceof Error ? err.message : String(err)
+    };
+  }
+}
 async function resolveOwnerGate(adapter2, config2) {
   if (adapterSupports(adapter2, "getOwnerIdentity")) {
     try {
@@ -10368,6 +10554,48 @@ function normalizeComplexity(value) {
   const key = (value ?? "").trim().toUpperCase();
   return COMPLEXITY_ALIASES[key] ?? "Small";
 }
+var PRIORITY_ALIASES = {
+  "P0": "P0 Critical",
+  "P1": "P1 High",
+  "P2": "P2 Medium",
+  "P3": "P3 Low",
+  "CRITICAL": "P0 Critical",
+  "URGENT": "P0 Critical",
+  "HIGH": "P1 High",
+  "MEDIUM": "P2 Medium",
+  "MED": "P2 Medium",
+  "LOW": "P3 Low",
+  "P0 CRITICAL": "P0 Critical",
+  "P1 HIGH": "P1 High",
+  "P2 MEDIUM": "P2 Medium",
+  "P3 LOW": "P3 Low"
+};
+function resolvePriority(value) {
+  const key = (value ?? "").trim().toUpperCase();
+  if (!key) return "P1 High";
+  return PRIORITY_ALIASES[key] ?? null;
+}
+function normalizePriority(value) {
+  return resolvePriority(value) ?? "P1 High";
+}
+function validateNewTaskVocab(tasks) {
+  const problems = [];
+  for (const t of tasks) {
+    const name = t.title?.trim() || "(untitled task)";
+    if (resolvePriority(t.priority) === null) {
+      problems.push(
+        `"${name}": priority "${t.priority}" is not one of P0 Critical / P1 High / P2 Medium / P3 Low`
+      );
+    }
+    const cx = (t.complexity ?? "").trim();
+    if (cx && !COMPLEXITY_ALIASES[cx.toUpperCase()]) {
+      problems.push(
+        `"${name}": complexity "${t.complexity}" is not one of XS / Small / Medium / Large / XL`
+      );
+    }
+  }
+  return problems;
+}
 var PLAN_BUILD_REPORT_BUDGET = { maxReports: 12, fieldBudget: 280 };
 function leadChainWithRecommended(chain, recommendedTaskId) {
   const rec = recommendedTaskId?.trim();
@@ -10384,10 +10612,7 @@ async function resolvePlanScope(adapter2, config2) {
 }
 function filterToPersonalBacklog(tasks, scope) {
   if (!scope.callerUserId) return tasks;
-  if (scope.callerIsOwner) {
-    return tasks.filter((t) => !t.assigneeId || t.assigneeId === scope.callerUserId);
-  }
-  return tasks.filter((t) => t.assigneeId === scope.callerUserId);
+  return tasks.filter((t) => !t.assigneeId || t.assigneeId === scope.callerUserId);
 }
 function determineContextTier(cycleCount) {
   if (cycleCount <= 5) return 1;
@@ -10428,11 +10653,22 @@ async function parkDecisionConflicts(adapter2, conflicts, newTaskIdMap, blockedC
   if (conflicts.length === 0) return [];
   const scheduled = new Set(scheduledTaskIds.map((id) => id.toLowerCase()));
   const results = [];
+  let adTitles = /* @__PURE__ */ new Map();
+  try {
+    if (adapter2.getActiveDecisions) adTitles = titleMap(await adapter2.getActiveDecisions());
+  } catch {
+  }
   for (const conflict of conflicts) {
     const resolvedTaskId = newTaskIdMap.get(conflict.taskId) ?? conflict.taskId;
-    const base = { ...conflict, resolvedTaskId, parked: false };
+    const adTitle = lookupTitle(conflict.adId, adTitles);
+    const base = { ...conflict, resolvedTaskId, parked: false, adTitle };
     if (scheduled.has(resolvedTaskId.toLowerCase())) {
-      results.push({ ...base, skipReason: "scheduled in this cycle \u2014 left in the cycle, conflict still surfaced" });
+      const [scheduledTask] = await adapter2.getTasks([resolvedTaskId]).catch(() => []);
+      results.push({
+        ...base,
+        taskTitle: scheduledTask?.title,
+        skipReason: "scheduled in this cycle \u2014 left in the cycle, conflict still surfaced"
+      });
       continue;
     }
     try {
@@ -10441,6 +10677,7 @@ async function parkDecisionConflicts(adapter2, conflicts, newTaskIdMap, blockedC
         results.push({ ...base, skipReason: "task not found" });
         continue;
       }
+      base.taskTitle = task.title;
       if (!PARKABLE_STATUSES.has(task.status)) {
         results.push({ ...base, skipReason: `status is ${task.status} \u2014 left as-is` });
         continue;
@@ -10453,7 +10690,7 @@ async function parkDecisionConflicts(adapter2, conflicts, newTaskIdMap, blockedC
         blocker: {
           type: "decision-gate",
           ref: conflict.adId,
-          reason: conflict.conflict || `Contradicts ${conflict.adId} \u2014 awaiting the owner's decision.`,
+          reason: conflict.conflict || `Contradicts ${formatRef(conflict.adId, adTitle)} \u2014 awaiting the owner's decision.`,
           blockedCycle
         }
       });
@@ -10780,7 +11017,8 @@ async function computeResurfacedBlockers(adapter2, tasks, decisions, currentCycl
   const resolvedLines = [];
   for (const t of blocked) {
     if (t.blocker && isBlockerResolved(t.blocker, ctx)) {
-      resolvedLines.push(`- **${t.displayId}** (${t.title}) \u2014 ${formatBlockerWaiting(t.blocker)} \u2192 now RESOLVED, ready to unblock`);
+      const waiting = formatBlockerWaiting(t.blocker, resolveBlockerTitle(t.blocker, ctx));
+      resolvedLines.push(`- **${t.displayId}** (${t.title}) \u2014 ${waiting} \u2192 now RESOLVED, ready to unblock`);
     }
   }
   return resolvedLines.length > 0 ? resolvedLines.join("\n") : void 0;
@@ -11338,6 +11576,14 @@ function applyCancellationGuard(corrections, confirmCancellations) {
 async function transactionalWriteBack(adapter2, cycleNumber, data, contextHashes, options = {}) {
   const writeBackTimer = startTimer();
   const newCycleNumber = cycleNumber + 1;
+  const vocabProblems = validateNewTaskVocab(data.newTasks ?? []);
+  if (vocabProblems.length > 0) {
+    throw new Error(
+      `plan apply refused before writing: ${vocabProblems.length} task(s) use values the board does not accept.
+` + vocabProblems.map((p) => `  - ${p}`).join("\n") + `
+Nothing was written \u2014 no cycle was created and no tasks were changed. Correct these values in the plan output and re-run apply.`
+    );
+  }
   const skippedCancellations = [];
   const cleanTitle = data.cycleLogTitle.replace(/^(?:Cycle|Session)\s+\d+\s*—\s*/i, "").trim();
   const cleanContent = data.cycleLogContent.replace(/^#{1,3}\s+(?:Cycle|Session)\s+\d+\s*—[^\n]*\n*/i, "").trim();
@@ -11444,7 +11690,7 @@ ${cleanContent}`;
       // task-2242: stable handoff join key
       title: t.title,
       status: t.status || "Backlog",
-      priority: t.priority || "P1 High",
+      priority: normalizePriority(t.priority),
       complexity: normalizeComplexity(t.complexity),
       module: t.module || "Core",
       epic: t.epic || "Platform",
@@ -11592,7 +11838,7 @@ ${cleanContent}`;
         displayId: "",
         title: task.title,
         status: task.status || "Backlog",
-        priority: task.priority || "P1 High",
+        priority: normalizePriority(task.priority),
         complexity: normalizeComplexity(task.complexity),
         module: task.module || "Core",
         epic: task.epic || "Platform",
@@ -11894,7 +12140,7 @@ async function validateAndPrepare(adapter2, force, callerUserId, adapterType) {
   try {
     const health = await adapter2.getCycleHealth();
     cycleNumber = health.totalCycles;
-    mode = determineMode(health.totalCycles);
+    mode = determineMode(health.projectCycleCount ?? health.totalCycles);
     const blockingCycle = callerUserId ? await resolveCallerLatestCycle(adapter2, callerUserId) : void 0;
     const latestStatus = callerUserId ? blockingCycle?.status : health.latestCycleStatus;
     const blockingNumber = blockingCycle?.number ?? cycleNumber;
@@ -13085,6 +13331,22 @@ var planTool = {
     ]
   }
 };
+function formatDecisionConflicts(conflicts) {
+  if (conflicts.length === 0) return [];
+  const lines = [""];
+  lines.push(`\u{1F500} **${conflicts.length} decision(s) need your call \u2014 work was NOT dropped.**`);
+  lines.push("These tasks cut against a live Active Decision. An AD is *active* \u2014 it can be superseded, so the planner parked the work instead of shelving it:");
+  for (const c of conflicts) {
+    const ad = formatRef(c.adId, c.adTitle);
+    const state = c.parked ? `Blocked behind ${ad}` : `still ${c.skipReason ?? "unparked"}`;
+    lines.push(`- **${formatRef(c.resolvedTaskId, c.taskTitle)} vs ${ad}** \u2014 ${c.conflict} _(${state})_`);
+    if (c.options.length > 0) lines.push(`  Options: ${c.options.join(" | ")}`);
+    if (c.recommendation) lines.push(`  Planner recommends: ${c.recommendation}`);
+  }
+  lines.push("");
+  lines.push('Decide: `strategy_change` with `mode: "capture"` to supersede or modify the AD (parked tasks auto-unblock once it moves), or `board_edit` to cancel the task if the AD stands.');
+  return lines;
+}
 function formatPlanResult(result) {
   const modeLabel = result.mode === "bootstrap" ? "Bootstrap" : "Full";
   const cycleLabel = `Cycle ${result.cycleNumber + 1}`;
@@ -13131,20 +13393,7 @@ function formatPlanResult(result) {
     lines.push('To apply these cancellations, re-run `plan` with `mode: "apply"` and `confirm_cancellations: true`.');
     lines.push("To keep these tasks, do nothing \u2014 they remain on the board.");
   }
-  const conflicts = result.decisionConflicts ?? [];
-  if (conflicts.length > 0) {
-    lines.push("");
-    lines.push(`\u{1F500} **${conflicts.length} decision(s) need your call \u2014 work was NOT dropped.**`);
-    lines.push("These tasks cut against a live Active Decision. An AD is *active* \u2014 it can be superseded, so the planner parked the work instead of shelving it:");
-    for (const c of conflicts) {
-      const state = c.parked ? `Blocked behind ${c.adId}` : `still ${c.skipReason ?? "unparked"}`;
-      lines.push(`- **${c.resolvedTaskId} vs ${c.adId}** \u2014 ${c.conflict} _(${state})_`);
-      if (c.options.length > 0) lines.push(`  Options: ${c.options.join(" | ")}`);
-      if (c.recommendation) lines.push(`  Planner recommends: ${c.recommendation}`);
-    }
-    lines.push("");
-    lines.push('Decide: `strategy_change` with `mode: "capture"` to supersede or modify the AD (parked tasks auto-unblock once it moves), or `board_edit` to cancel the task if the AD stands.');
-  }
+  lines.push(...formatDecisionConflicts(result.decisionConflicts ?? []));
   if (result.skipHandoffs) {
     const taskCount = result.writeSummary?.taskIds.length ?? 0;
     lines.push("", `Next: run \`handoff_generate\` to create BUILD HANDOFFs for your ${taskCount} cycle task(s), then \`build_list\` to start building.`);
@@ -13381,6 +13630,85 @@ ${result.userMessage}
   }
 }
 
+// src/lib/capabilities.ts
+init_dist();
+
+// src/lib/directive-builders.ts
+function buildPrReviewerDirective(caps) {
+  if (!isCapabilityEnabled(caps, "prReviewer")) return null;
+  return `
+
+**Quality Gate:** no auto-review attached. PAPI's standard pre-accept step is a code review of the branch diff \u2014 run \`review_submit\` with \`dispatch:"subagent"\` to auto-review, or attach \`auto_review\` findings. Risk-tier work (auth, data, migrations, CI) should always carry one.`;
+}
+function buildChangelogDirective(caps, inner) {
+  if (!isCapabilityEnabled(caps, "changelog")) return null;
+  return inner;
+}
+function buildDiscoveredIssuesDirective(caps, issueLines) {
+  if (!isCapabilityEnabled(caps, "discoveredIssues")) return null;
+  if (issueLines.length === 0) return null;
+  return [
+    "",
+    "---",
+    "",
+    `## Discovered Issues (${issueLines.length})`,
+    "",
+    ...issueLines,
+    "",
+    "*These issues were logged during builds \u2014 triage them in the next plan.*"
+  ].join("\n");
+}
+function buildModelRecommendationDirective(caps, tierBlock) {
+  if (!isCapabilityEnabled(caps, "modelRecommendation")) return null;
+  return tierBlock;
+}
+function buildVerifyHealthCheckDirective(caps) {
+  if (!isCapabilityEnabled(caps, "verifyHealthCheck")) return null;
+  return `
+
+**Health check:** before you consider the cycle shipped, verify cycle state (plan validity, review coverage, branch hygiene) \u2014 run the \`papi-verify\` skill or a quick \`board_view\` pass.`;
+}
+function buildGestaltPreBuildDirective(caps) {
+  if (!isCapabilityEnabled(caps, "gestaltPreBuild")) return null;
+  return `
+
+**Gestalt pre-build:** on the first task of a multi-task cycle, read every task's BUILD HANDOFF together (shared files, sequencing, module split) before building \u2014 one-time check at cycle start.`;
+}
+function buildBatchBuildRollupDirective(caps) {
+  if (!isCapabilityEnabled(caps, "batchBuildRollup")) return null;
+  return `
+
+**Batch rollup:** after the final task of a batch, emit a cycle-level rollup \u2014 build summary table + discovered issues grouped by severity + next action.`;
+}
+function buildSecurityScanDirective(caps) {
+  if (!isCapabilityEnabled(caps, "securityScan")) return null;
+  return `
+
+**Security scan:** risk-tier changes (auth, data, migrations, secrets, endpoints) should carry a security pass \u2014 OWASP top-10 + secret-exposure check on the changed surface before merge.`;
+}
+function buildDeployHookDirective(caps, deployCommand) {
+  if (!isCapabilityEnabled(caps, "deployHook")) return null;
+  const command = deployCommand?.trim() || void 0;
+  if (!command) return null;
+  return `
+
+---
+
+## Deploy \u2014 run after this release
+
+The post-release deploy hook is on and a deploy command is configured, so ship the merged release now.
+
+Run your deploy command yourself:
+\`\`\`
+${command}
+\`\`\`
+PAPI never runs this command itself (AD-58) \u2014 you run it in your own environment. Turn the "Post-release deploy" capability off in the dashboard, or unset PAPI_DEPLOY, to stop this reminder.`;
+}
+function buildPapiMetaFramingDirective(caps, inner) {
+  if (!isCapabilityEnabled(caps, "papiMetaFraming")) return null;
+  return inner;
+}
+
 // src/services/strategy.ts
 import { randomUUID as randomUUID5, createHash as createHash4 } from "crypto";
 import { execFileSync as execFileSync2 } from "child_process";
@@ -13737,8 +14065,10 @@ ${lines.join("\n")}
   }
   let notesWithAlignment = input.notes || "";
   let detectedAdIds = [];
+  let adTitles = /* @__PURE__ */ new Map();
   try {
     const ads = await adapter2.getActiveDecisions();
+    adTitles = titleMap(ads);
     const ideaCombined = `${input.text} ${input.notes ?? ""}`;
     const alignmentMatches = findAdAlignmentMatches(ideaCombined, ads);
     if (alignmentMatches.length > 0) {
@@ -13828,7 +14158,7 @@ AD-CONFLICT: ${conflictsWithAd} \u2014 submitter flagged this as cutting against
         blocker: {
           type: "decision-gate",
           ref: conflictsWithAd,
-          reason: `Submitted as cutting against ${conflictsWithAd}. Awaiting the owner's decision.`,
+          reason: `Submitted as cutting against ${formatRef(conflictsWithAd, lookupTitle(conflictsWithAd, adTitles))}. Awaiting the owner's decision.`,
           blockedCycle: health.totalCycles
         }
       });
@@ -13847,21 +14177,36 @@ AD-CONFLICT: ${conflictsWithAd} \u2014 submitter flagged this as cutting against
     routing: "task",
     task,
     message: `${task.id}: "${task.title}" \u2014 ${landing}${typeNote}${visibilityNote}${mismatchNote}`,
-    ...adIds.length > 0 ? { adConflicts: { adIds, explicit: Boolean(conflictsWithAd), gated } } : {}
+    ...adIds.length > 0 ? {
+      adConflicts: {
+        adIds,
+        explicit: Boolean(conflictsWithAd),
+        gated,
+        // task-3347: id → title for exactly the ADs named above, so the tool
+        // layer renders `AD-12 (Single board view)` without a second read.
+        adTitles: Object.fromEntries(
+          adIds.flatMap((id) => {
+            const title = lookupTitle(id, adTitles);
+            return title ? [[id, title]] : [];
+          })
+        )
+      }
+    } : {}
   };
 }
-function buildAdConflictNote(conflictsWithAd, detectedAdIds, gated) {
+function buildAdConflictNote(conflictsWithAd, detectedAdIds, gated, adTitles) {
   if (conflictsWithAd) {
-    const state = gated ? `Parked as **Blocked** behind a decision gate on ${conflictsWithAd} \u2014 it auto-unblocks once that AD is superseded, modified, or reaffirmed.` : `Recorded against ${conflictsWithAd} (gate could not be applied \u2014 the AD-CONFLICT note is on the task).`;
+    const ref = formatRef(conflictsWithAd, lookupTitle(conflictsWithAd, adTitles));
+    const state = gated ? `Parked as **Blocked** behind a decision gate on ${ref} \u2014 it auto-unblocks once that AD is superseded, modified, or reaffirmed.` : `Recorded against ${ref} (gate could not be applied \u2014 the AD-CONFLICT note is on the task).`;
     return `
 
-\u{1F500} **Conflicts with ${conflictsWithAd}.** ${state}
+\u{1F500} **Conflicts with ${ref}.** ${state}
 **Tell the user now** \u2014 an AD is *active*, so this is their call to make, not yours. Offer both paths: supersede the AD via \`strategy_change\`, or leave the AD standing and drop the task.`;
   }
   if (detectedAdIds.length > 0) {
     return `
 
-\u{1F500} **Possible conflict with ${detectedAdIds.join(", ")}** (keyword match \u2014 verify it is real).
+\u{1F500} **Possible conflict with ${formatRefList(detectedAdIds, adTitles)}** (keyword match \u2014 verify it is real).
 If it IS a real contradiction, **do not shelve the idea on those grounds**: surface it to the user and re-submit with \`conflicts_with_ad\` so the task is gated on the decision instead of quietly competing in the backlog.`;
   }
   return "";
@@ -14332,7 +14677,8 @@ async function assembleContext2(adapter2, cycleNumber, cyclesSinceLastReview, pr
     pendingRecs,
     registeredDocs,
     docsWithPendingActions,
-    decisionScores
+    decisionScores,
+    allClosedTasks
   ] = await Promise.all([
     adapter2.readProductBrief(),
     // Strategy review needs to see retired ADs to triage/restore them as needed.
@@ -14361,7 +14707,15 @@ 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([]),
     // task-2264: decision risk scores + movement, so the review can show trajectory.
-    adapter2.getDecisionScorePatterns?.()?.catch(() => []) ?? Promise.resolve([])
+    adapter2.getDecisionScorePatterns?.()?.catch(() => []) ?? Promise.resolve([]),
+    // task-3331 (C363): UNWINDOWED closed-task ids, purely to exclude already-closed
+    // tasks from the repeat-deferral detector. Deliberately NOT reusing
+    // recentDoneTasks: that set is windowed with `cycleSince: lastReviewCycleNum`
+    // because the surfaces it feeds (review-window comments) genuinely want the
+    // window. Carry-forward history spans many cycles, so a task that shipped BEFORE
+    // the window was invisible to the exclusion and kept being flagged. Compact +
+    // Cancelled, matching what services/plan.ts already does correctly.
+    adapter2.queryBoard({ status: ["Done", "Cancelled"], compact: true }).catch(() => [])
   ]);
   const pendingAgendaTopics = await (adapter2.getPendingAgendaTopics?.().catch(() => []) ?? Promise.resolve([]));
   const tasks = [...activeTasks, ...recentDoneTasks];
@@ -14643,7 +14997,7 @@ ${lines.join("\n")}`;
     { label: "docActionStaleness", hasData: docActionStalenessText !== void 0 }
   ]);
   const doneTaskIds = new Set(
-    recentDoneTasks.map((t) => t.displayId ?? t.id).filter((id) => !!id)
+    allClosedTasks.map((t) => t.displayId ?? t.id).filter((id) => !!id)
   );
   const earnedPushback = computeEarnedPushback({ reports, log: recentLog, doneTaskIds });
   const context = {
@@ -14796,6 +15150,29 @@ function asDecisionBatchApplier(adapter2) {
   const candidate = adapter2;
   return typeof candidate.applyActiveDecisionUpdates === "function" ? candidate : void 0;
 }
+async function demoteDecisionToConvention(ad, adapter2, cycleNumber, warnings) {
+  if (!adapter2.createConvention) {
+    warnings.push(
+      `AD ${ad.id}: demotion skipped \u2014 this adapter cannot create conventions, and retiring the decision without writing the rule would lose the stance entirely. Left live.`
+    );
+    return false;
+  }
+  const rule = ad.body.trim();
+  if (!rule) {
+    warnings.push(`AD ${ad.id}: demotion skipped \u2014 empty body, nothing to carry into a convention. Left live.`);
+    return false;
+  }
+  try {
+    await adapter2.createConvention({ rule });
+  } catch (err) {
+    warnings.push(
+      `AD ${ad.id}: demotion skipped \u2014 writing the convention failed (${err instanceof Error ? err.message : String(err)}). The decision is left live rather than retired with nothing to replace it.`
+    );
+    return false;
+  }
+  await adapter2.updateActiveDecision(ad.id, ad.body, cycleNumber, "demote");
+  return true;
+}
 function routeDecisionUpdate(ad, adapter2, cycleNumber, warnings) {
   const action = ad.action;
   let route;
@@ -15542,7 +15919,10 @@ ${cleanContent}`;
       });
       if (data.activeDecisionUpdates && data.activeDecisionUpdates.length > 0) {
         for (const ad of data.activeDecisionUpdates) {
-          if (ad.action === "delete" && adapter2.deleteActiveDecision) {
+          if (ad.action === "demote") {
+            const demoted = await demoteDecisionToConvention(ad, adapter2, cycleNumber, evidenceWarnings);
+            if (!demoted) continue;
+          } else if (ad.action === "delete" && adapter2.deleteActiveDecision) {
             await adapter2.deleteActiveDecision(ad.id);
           } else if (ad.action === "new" && adapter2.upsertActiveDecision) {
             const titleMatch = ad.body.match(/^###\s+\S+:\s*([^\n[]+?)(?:\s*\[|$)/m);
@@ -15792,6 +16172,35 @@ function toDateLabel(value) {
   const d = value instanceof Date ? value : new Date(value);
   return Number.isNaN(d.getTime()) ? "" : d.toISOString().slice(0, 10);
 }
+var STRATEGY_REVIEW_CHANNEL_ENV = "DISCORD_STRATEGY_REVIEW_CHANNEL_ID";
+function buildStrategyReviewPostDirective(cycleNumber) {
+  const channelId = process.env[STRATEGY_REVIEW_CHANNEL_ENV]?.trim();
+  if (!channelId) return null;
+  return [
+    "",
+    "---",
+    "## \u{1F4E3} Post the patch notes to Discord #papi-strategy-review",
+    "",
+    `This review closed **Cycle ${cycleNumber}**. Post a curated, safety-gated **rich embed** (NOT plain content, so links do not unfurl) to #papi-strategy-review (id \`${channelId}\`) via \`mcp__discord__send_embed\`. Run \`/patch-notes\` \u2014 it owns the mechanics.`,
+    "",
+    "**LOCKED TEMPLATE \u2014 every patch note uses this exact shape (do NOT improvise the structure):**",
+    "- `title`: `PAPI Patch Notes v<version>`",
+    "- `description`: `Covering Cycles <start>\u2013<end>`",
+    "- `color`: `#6C5CE7` (PAPI purple)",
+    "- `fields`: one per non-empty category, `inline: false`, `\u2022 ` bullets \u2014 \u{1F680} New Features, \u{1F6E0} Improvements, \u{1F41B} Bug Fixes, \u2699\uFE0F Under the Hood, \u{1F52E} What's Coming (always included)",
+    "- `footer`: `PAPI v<version> \xB7 <date>`",
+    "",
+    "This is the DEEP multi-cycle note covering the whole review window, not a single release. Aim for 5-7 items in the strong sections. Strip task-IDs, branch names and internal framing; only changes an existing user would notice.",
+    "",
+    "Then:",
+    "1. Run the build-in-public safety gate: NO external usernames, NO contributor or private work, NO owner cost/commercial data, NO failure-rate or funnel percentages.",
+    "2. Show the draft embed for approval BEFORE posting.",
+    `3. On approval, send the embed to channel \`${channelId}\`.`,
+    "4. Then run `/content-pack --source=strategy_review` \u2014 a review is the richest content source PAPI produces, and it is the cadence the Blog and Substack lanes exist for.",
+    "",
+    "Skip only if nothing user-facing shipped in the whole window, and say so explicitly rather than moving on silently."
+  ].join("\n");
+}
 var reviewPrepareCache = new PerCallerCache();
 var strategyReviewTool = {
   name: "strategy_review",
@@ -15973,6 +16382,19 @@ ${recLines.join("\n")}
         }
       } catch {
       }
+      let caps = {};
+      try {
+        const info = adapter2.getProjectInfo ? await adapter2.getProjectInfo() : null;
+        caps = info?.capabilities ?? {};
+      } catch {
+        caps = {};
+      }
+      const postDirective = buildChangelogDirective(
+        caps,
+        buildStrategyReviewPostDirective(result.cycleNumber)
+      );
+      const postStep = postDirective ? `4. Post the patch notes to Discord \u2014 see the directive at the end of this output.
+5. Then run \`plan\` for the next cycle.` : `4. Then run \`plan\` for the next cycle.`;
       const actionReminder = `
 
 ---
@@ -15981,8 +16403,10 @@ ${recLines.join("\n")}
 1. Review the AD changes above \u2014 are any resolved/modified ADs still referenced by active tasks?
 2. Act on strategic recommendations \u2014 cancel, defer, or reprioritise tasks as suggested.
 3. Run \`strategy_change\` if any recommendation requires an AD update not already captured.
-4. Then run \`plan\` for the next cycle.`;
-      const response = textResponse(header + result.displayText + slackNote + recsCloseOut + actionReminder);
+` + postStep;
+      const response = textResponse(
+        header + result.displayText + slackNote + recsCloseOut + actionReminder + (postDirective ?? "")
+      );
       return {
         ...response,
         ...contextBytes !== void 0 ? { _contextBytes: contextBytes } : {},
@@ -16386,7 +16810,17 @@ var BOARD_COLUMNS = [
   { name: "createdAt", header: "Created", value: (t) => t.createdAt ?? "-" },
   { name: "source", header: "Source", value: (t) => t.source ?? "-" }
 ];
-var BOARD_FIELDS = BOARD_COLUMNS.map((c) => c.name);
+var ASSIGNEE_FIELD = "assignee";
+function assigneeColumn(nameOf) {
+  return {
+    name: ASSIGNEE_FIELD,
+    header: "Assignee",
+    // An unresolved id still renders as a short id rather than blank: "someone holds
+    // this" is the fact that matters, and a blank cell reads as unclaimed.
+    value: (t) => t.assigneeId ? nameOf.get(t.assigneeId) ?? t.assigneeId.slice(0, 8) : "\u2014"
+  };
+}
+var BOARD_FIELDS = [...BOARD_COLUMNS.map((c) => c.name), ASSIGNEE_FIELD];
 var BOARD_SINGLE_LABELS = {
   id: "Task",
   title: "Title",
@@ -16445,6 +16879,11 @@ var boardViewTool = {
         enum: ["full", "summary"],
         description: 'Output mode: "full" (default) shows task table, "summary" shows counts only.'
       },
+      assignee: {
+        type: "string",
+        enum: ["me", "unclaimed"],
+        description: 'Filter by who holds the task on a shared project. "me" shows only your own claims; "unclaimed" shows the open pool nobody has taken. Omit to see everything. On a multi-member project the board also gains an Assignee column showing who holds each task.'
+      },
       fields: {
         type: "string",
         description: `Optional sparse-field projection \u2014 comma-separated column names, e.g. "title,status". Returns ONLY those columns (id is always included so rows stay addressable) which is far cheaper on session context than the full table. Allowed: ${BOARD_FIELDS.join(", ")}. An unknown name is an error.`
@@ -16657,11 +17096,16 @@ function formatSingleTask(t, fields) {
   if (t.why?.trim()) lines.push(`- **Why:** ${t.why.trim()}`);
   return lines.join("\n");
 }
-function formatBoard(result, fields) {
+function formatBoard(result, fields, assignee) {
   if (result.tasks.length === 0) {
     return "No tasks found.";
   }
-  const columns = selectColumns(BOARD_COLUMNS, fields);
+  const available = assignee ? [
+    ...BOARD_COLUMNS.slice(0, 4),
+    assignee,
+    ...BOARD_COLUMNS.slice(4)
+  ] : BOARD_COLUMNS;
+  const columns = selectColumns(available, fields);
   const headers = columns.map((c) => c.header);
   const rows = result.tasks.map((t) => columns.map((c) => c.value(t)));
   const lines = [];
@@ -16690,6 +17134,38 @@ function formatSummary(summary) {
   }
   return lines.join("\n");
 }
+async function resolveBoardMembership(adapter2) {
+  const empty = { isMultiMember: false, nameOf: /* @__PURE__ */ new Map(), callerUserId: null };
+  if (!adapterSupports(adapter2, "listContributors")) return empty;
+  let contributors;
+  try {
+    contributors = await adapter2.listContributors();
+  } catch {
+    return empty;
+  }
+  if (contributors.length <= 1) return empty;
+  const nameOf = new Map(
+    contributors.map((c) => [c.userId, c.displayName || c.email || c.userId.slice(0, 8)])
+  );
+  let callerUserId = null;
+  try {
+    if (adapterSupports(adapter2, "getOwnerIdentity")) {
+      callerUserId = (await adapter2.getOwnerIdentity()).callerUserId ?? null;
+    } else if (adapterSupports(adapter2, "getProjectOwnerUserId")) {
+      callerUserId = await adapter2.getProjectOwnerUserId();
+    }
+  } catch {
+    callerUserId = null;
+  }
+  return { isMultiMember: true, nameOf, callerUserId };
+}
+function applyAssigneeFilter(result, filter, callerUserId) {
+  if (!filter) return result;
+  const tasks = result.tasks.filter(
+    (t) => filter === "unclaimed" ? !t.assigneeId : t.assigneeId === callerUserId
+  );
+  return { ...result, tasks, returned: tasks.length, total: tasks.length, hasMore: false };
+}
 async function handleBoardView(adapter2, args) {
   const mode = args.mode;
   const projection = resolveFields(args.fields, BOARD_FIELDS, "board_view");
@@ -16708,6 +17184,18 @@ async function handleBoardView(adapter2, args) {
     const meta2 = emitMeta ? { total: 1, filtered: 1, returned: 1, limit: null, offset: 0 } : null;
     return textResponse(withMeta(formatSingleTask(task, fields), meta2));
   }
+  const membership = await resolveBoardMembership(adapter2);
+  const assigneeFilterRaw = typeof args.assignee === "string" ? args.assignee.trim().toLowerCase() : void 0;
+  if (assigneeFilterRaw !== void 0 && assigneeFilterRaw !== "me" && assigneeFilterRaw !== "unclaimed") {
+    return errorResponse(
+      `Unknown assignee filter "${args.assignee}". Use assignee="me" for your own claims, or assignee="unclaimed" for the open pool.`
+    );
+  }
+  if (assigneeFilterRaw === "me" && !membership.callerUserId) {
+    return errorResponse(
+      'assignee="me" needs an identified caller, and this connection has none. Use assignee="unclaimed" to see the open pool.'
+    );
+  }
   const result = await viewBoard(adapter2, void 0, {
     phase: args.phase,
     status: args.status,
@@ -16716,7 +17204,12 @@ async function handleBoardView(adapter2, args) {
     query: args.query,
     cycle: args.cycle
   });
-  let output = formatBoard(result, fields);
+  const filtered = applyAssigneeFilter(result, assigneeFilterRaw, membership.callerUserId);
+  let output = formatBoard(
+    filtered,
+    fields,
+    membership.isMultiMember ? assigneeColumn(membership.nameOf) : null
+  );
   if (!fields) {
     try {
       const comments = await adapter2.getRecentTaskComments?.(30);
@@ -16943,11 +17436,13 @@ async function handleBoardEdit(adapter2, args) {
         } else {
           const health = await target.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 stampedAt = (/* @__PURE__ */ new Date()).toISOString().slice(0, 16).replace("T", " ");
+          const stamp = activeCycle != null ? `[C${activeCycle} ${stampedAt} UTC]` : `[${stampedAt} UTC]`;
           const entry = `${stamp} ${trimmed}`;
           updates.notes = existing.trim().length > 0 ? `${entry}
 
+---
+
 ${existing}` : entry;
         }
       }
@@ -18658,6 +19153,118 @@ async function ensureMcpJsonGitignored(projectRoot) {
   }
 }
 
+// src/tools/join.ts
+var joinTool = {
+  name: "join",
+  description: "Join a project that already exists, as a new team member. Run this instead of `setup` when someone else already set the project up \u2014 setup is for creating a project, and running it as a joiner writes scaffolding into a repo that already has it. `join` confirms which project you are bound to, shows the Active Decisions and canon docs you are expected to read, and shows the task pool you can claim from. It writes NOTHING to your repo. Does not call the Anthropic API.",
+  annotations: { title: "Join Project", readOnlyHint: true, destructiveHint: false, openWorldHint: false },
+  inputSchema: {
+    type: "object",
+    properties: {
+      limit: {
+        type: "integer",
+        description: "Maximum claimable tasks to list (default 10)."
+      }
+    },
+    required: []
+  }
+};
+function formatDecisions(decisions) {
+  if (decisions.length === 0) {
+    return "_No Active Decisions recorded yet._";
+  }
+  const shown = decisions.slice(0, 15);
+  const lines = shown.map((d) => `- **${d.id}** \u2014 ${d.title ?? "(untitled)"}${d.confidence ? ` _(${d.confidence})_` : ""}`);
+  const more = decisions.length > shown.length ? `
+- _\u2026and ${decisions.length - shown.length} more. Run \`ad_view\` for the full set._` : "";
+  return lines.join("\n") + more;
+}
+function formatDocs(docs) {
+  if (docs.length === 0) {
+    return "_No registered canon docs. Ask the project owner what to read._";
+  }
+  return docs.slice(0, 12).map((d) => `- \`${d.path}\`${d.title ? ` \u2014 ${d.title}` : ""}`).join("\n");
+}
+function formatPool(tasks, limit) {
+  if (tasks.length === 0) {
+    return "_The shared backlog is empty right now \u2014 ask the owner what to pick up._";
+  }
+  const rows = tasks.slice(0, limit).map(
+    (t) => `| ${t.id} | ${t.title} | ${t.priority ?? "-"} | ${t.complexity ?? "-"} |`
+  );
+  const more = tasks.length > limit ? `
+
+_\u2026and ${tasks.length - limit} more in the pool._` : "";
+  return `| Task | Summary | Priority | Effort |
+|---|---|---|---|
+${rows.join("\n")}${more}`;
+}
+var JOIN_POINTER = "Run `join` instead \u2014 it shows you the project, its Active Decisions, the docs to read, and the tasks you can claim, without writing anything to the repo.";
+async function handleJoin(adapter2, config2, args) {
+  const limit = typeof args.limit === "number" && args.limit > 0 ? Math.floor(args.limit) : 10;
+  let projectLabel = "this project";
+  try {
+    const brief = adapterSupports(adapter2, "readProductBrief") ? await adapter2.readProductBrief() : "";
+    const heading = brief.match(/^#\s+(.+)$/m)?.[1]?.trim();
+    if (heading) projectLabel = heading;
+  } catch {
+  }
+  const gate = await resolveOwnerGate(adapter2, config2);
+  const [decisions, docs, pool] = await Promise.all([
+    adapter2.getActiveDecisions().catch(() => []),
+    // SECURITY: visibility scoping is delegated to searchDocs' requesterUserId
+    // (task-1977) rather than reading rows directly — a contributors-tier or
+    // private doc must not become readable just because someone joined. Passing
+    // the caller means a non-owner sees public docs plus the contributors-tier
+    // docs they are actually a cohort member of; private is excluded fail-closed.
+    adapterSupports(adapter2, "searchDocs") ? adapter2.searchDocs({ requesterUserId: gate.callerUserId ?? void 0, limit: 12 }).catch(() => []) : Promise.resolve([]),
+    // The claimable pool is the shared backlog: unassigned AND not yet pulled into
+    // anyone's cycle. Same invariant task_claim enforces (assigneeId == null &&
+    // cycle == null), so nothing is listed here that a claim would then refuse.
+    adapter2.queryBoard({ status: ["Backlog"] }).catch(() => [])
+  ]);
+  const claimable = pool.filter((t) => !t.assigneeId && t.cycle == null);
+  let conventionLine = "";
+  try {
+    if (adapterSupports(adapter2, "listConventions")) {
+      const conventions = await adapter2.listConventions();
+      if (conventions.length > 0) {
+        conventionLine = `
+
+## Conventions that ride every build
+` + conventions.slice(0, 8).map((c) => `- ${c.rule}`).join("\n");
+      }
+    }
+  } catch {
+  }
+  const roleLine = gate.callerIsOwner ? `You are the **owner** of this project.` : `You are a **member** of this project.`;
+  return textResponse(
+    `# Joined \u2014 ${projectLabel}
+
+${roleLine} Nothing has been written to your repo \u2014 \`join\` is read-only, and this project's harness files are already committed by whoever set it up.
+
+**If that is not the project you expected, stop here.** Your connection is bound to the wrong project; fix \`PAPI_PROJECT_ID\` (local) or the \`x-papi-project-id\` header (remote), or run \`project_switch\`, before writing anything.
+
+## Decisions already made
+These are settled stances, not suggestions. Read them before proposing a different approach \u2014 if you disagree with one, say so rather than working around it.
+
+${formatDecisions(decisions)}
+
+## Canon docs to read
+${formatDocs(docs)}` + conventionLine + `
+
+## Work you can claim
+${claimable.length} task(s) in the shared backlog. Claim one with \`task_claim <task-id>\` \u2014 it becomes yours and shows against your name on the board.
+
+${formatPool(claimable, limit)}
+
+## Your next move
+Run \`orient\` to see where the project stands and what your own cycle looks like. You get your OWN cycle numbering \u2014 your cycle 1 is independent of everyone else's.
+
+Do NOT run \`setup\`. It is for creating a project, and this one already exists.`
+  );
+}
+
 // src/tools/setup.ts
 var setupTool = {
   name: "setup",
@@ -18875,8 +19482,36 @@ function formatSetupNarration(result) {
     ...steps.map((s, i) => `${i + 1}. ${s}`)
   ];
 }
+async function refuseIfJoiner(adapter2, config2) {
+  let gate;
+  try {
+    gate = await resolveOwnerGate(adapter2, config2);
+  } catch {
+    return null;
+  }
+  if (!gate.enforced || gate.callerIsOwner) return null;
+  if (gate.resolutionError || !gate.callerUserId) return null;
+  let alreadySetUp = false;
+  try {
+    if (adapterSupports(adapter2, "readProductBrief")) {
+      alreadySetUp = (await adapter2.readProductBrief()).trim().length > 0;
+    }
+  } catch {
+    return null;
+  }
+  if (!alreadySetUp) return null;
+  return `This project is already set up, and you are joining it rather than creating it.
+
+\`setup\` writes the project harness \u2014 AGENTS.md, CLAUDE.md, .claude/settings.json, docs/ \u2014 into your repo. Those files are already here and committed by whoever set the project up, so running setup would rewrite shared files and record "first" Active Decisions into a registry that already has them.
+
+${JOIN_POINTER}
+
+If you genuinely need to re-scaffold this project, ask its owner to run setup.`;
+}
 async function handleSetup(adapter2, config2, args, clientName) {
   const toolMode = args.mode;
+  const joinerRefusal = await refuseIfJoiner(adapter2, config2);
+  if (joinerRefusal) return errorResponse(joinerRefusal);
   const REQUIRED_FIELDS = ["project_name"];
   const missing = REQUIRED_FIELDS.filter((f) => !args[f] || typeof args[f] === "string" && !args[f].trim());
   if (missing.length > 0) {
@@ -19154,89 +19789,10 @@ Examples (use whichever provider you have): ${spec.examples}.
 _Recommendation only \u2014 PAPI never selects or runs a model. Policy: XS/S \u2192 cheap, M/L \u2192 capable, XL \u2192 frontier._`;
 }
 
-// src/lib/capabilities.ts
-init_dist();
-
 // src/tools/build.ts
 init_dist();
 init_dist();
 
-// src/lib/directive-builders.ts
-function buildPrReviewerDirective(caps) {
-  if (!isCapabilityEnabled(caps, "prReviewer")) return null;
-  return `
-
-**Quality Gate:** no auto-review attached. PAPI's standard pre-accept step is a code review of the branch diff \u2014 run \`review_submit\` with \`dispatch:"subagent"\` to auto-review, or attach \`auto_review\` findings. Risk-tier work (auth, data, migrations, CI) should always carry one.`;
-}
-function buildChangelogDirective(caps, inner) {
-  if (!isCapabilityEnabled(caps, "changelog")) return null;
-  return inner;
-}
-function buildDiscoveredIssuesDirective(caps, issueLines) {
-  if (!isCapabilityEnabled(caps, "discoveredIssues")) return null;
-  if (issueLines.length === 0) return null;
-  return [
-    "",
-    "---",
-    "",
-    `## Discovered Issues (${issueLines.length})`,
-    "",
-    ...issueLines,
-    "",
-    "*These issues were logged during builds \u2014 triage them in the next plan.*"
-  ].join("\n");
-}
-function buildModelRecommendationDirective(caps, tierBlock) {
-  if (!isCapabilityEnabled(caps, "modelRecommendation")) return null;
-  return tierBlock;
-}
-function buildVerifyHealthCheckDirective(caps) {
-  if (!isCapabilityEnabled(caps, "verifyHealthCheck")) return null;
-  return `
-
-**Health check:** before you consider the cycle shipped, verify cycle state (plan validity, review coverage, branch hygiene) \u2014 run the \`papi-verify\` skill or a quick \`board_view\` pass.`;
-}
-function buildGestaltPreBuildDirective(caps) {
-  if (!isCapabilityEnabled(caps, "gestaltPreBuild")) return null;
-  return `
-
-**Gestalt pre-build:** on the first task of a multi-task cycle, read every task's BUILD HANDOFF together (shared files, sequencing, module split) before building \u2014 one-time check at cycle start.`;
-}
-function buildBatchBuildRollupDirective(caps) {
-  if (!isCapabilityEnabled(caps, "batchBuildRollup")) return null;
-  return `
-
-**Batch rollup:** after the final task of a batch, emit a cycle-level rollup \u2014 build summary table + discovered issues grouped by severity + next action.`;
-}
-function buildSecurityScanDirective(caps) {
-  if (!isCapabilityEnabled(caps, "securityScan")) return null;
-  return `
-
-**Security scan:** risk-tier changes (auth, data, migrations, secrets, endpoints) should carry a security pass \u2014 OWASP top-10 + secret-exposure check on the changed surface before merge.`;
-}
-function buildDeployHookDirective(caps, deployCommand) {
-  if (!isCapabilityEnabled(caps, "deployHook")) return null;
-  const command = deployCommand?.trim() || void 0;
-  if (!command) return null;
-  return `
-
----
-
-## Deploy \u2014 run after this release
-
-The post-release deploy hook is on and a deploy command is configured, so ship the merged release now.
-
-Run your deploy command yourself:
-\`\`\`
-${command}
-\`\`\`
-PAPI never runs this command itself (AD-58) \u2014 you run it in your own environment. Turn the "Post-release deploy" capability off in the dashboard, or unset PAPI_DEPLOY, to stop this reminder.`;
-}
-function buildPapiMetaFramingDirective(caps, inner) {
-  if (!isCapabilityEnabled(caps, "papiMetaFraming")) return null;
-  return inner;
-}
-
 // src/services/build.ts
 init_dist();
 import { randomUUID as randomUUID6 } from "crypto";
@@ -19716,6 +20272,47 @@ To override, pass force=true (emits a telemetry warning).`
   }
   return { resolvedCycleNum, warnings, force, skipVersion };
 }
+async function reconcileContributorReleasePrs(config2, adapter2, callerUserId, cycle) {
+  if (!callerUserId || !adapter2?.listContributorReleasePrs || !adapter2.setContributorReleasePrStatus) {
+    return { merged: [], open: [] };
+  }
+  const records = await adapter2.listContributorReleasePrs();
+  let own = records.filter((record) => record.contributorUserId === callerUserId);
+  if (own.length === 0 && cycle && adapter2.recordContributorReleasePr) {
+    const discovered = findContributorReleasePullRequests(config2.projectRoot, cycle);
+    for (const pr of discovered) {
+      await adapter2.recordContributorReleasePr({
+        prUrl: pr.url,
+        branch: pr.branch,
+        cycle,
+        contributorUserId: callerUserId
+      });
+    }
+    own = discovered.map((pr, index) => ({
+      id: `discovered-${index}`,
+      contributorUserId: callerUserId,
+      prUrl: pr.url,
+      branch: pr.branch,
+      cycle,
+      status: "open",
+      createdAt: pr.mergedAt ?? "",
+      updatedAt: pr.mergedAt ?? ""
+    }));
+  }
+  const merged = [];
+  const open = [];
+  for (const record of own) {
+    const discoveredState = findContributorReleasePullRequests(config2.projectRoot, record.cycle ?? 0).find((pr) => pr.url === record.prUrl);
+    const state = discoveredState ?? getPullRequestState(config2.projectRoot, record.prUrl);
+    if (state?.state === "MERGED") {
+      await adapter2.setContributorReleasePrStatus(record.prUrl, "merged");
+      merged.push({ prUrl: record.prUrl, branch: record.branch, cycle: record.cycle });
+    } else if (state?.state === "OPEN") {
+      open.push({ prUrl: record.prUrl, branch: record.branch, cycle: record.cycle });
+    }
+  }
+  return { merged, open };
+}
 async function contributorAutoPrRelease(config2, adapter2, version, productionBaseBranch, options) {
   if (!isGhAvailable()) {
     throw new Error(
@@ -20234,8 +20831,18 @@ async function postReleaseToX(version, cycleClosed) {
 }
 function buildHostedReleaseOutput(params) {
   const { version, branch, cyclePart, warningsBlock, skipVersion } = params;
+  const handoff = buildHostedGitHandoff({ version, branch, skipVersion });
+  return `## Release ${version}${skipVersion ? " (skip version)" : ""} \u2014 cycle closed in the DB
+
+${cyclePart} is now marked **complete** in PAPI's database, so \`orient\` will no longer flag "Release has not been run."
+` + warningsBlock + `
+${handoff}
+
+Next: cycle closed! Run \`plan\` to start your next cycle, or \`idea "<what's next>"\` first if your backlog is thin.`;
+}
+function buildHostedGitHandoff(params) {
+  const { version, branch, skipVersion } = params;
   const tagAnnotation = `Release ${version}`;
-  const titleSuffix = skipVersion ? " (skip version)" : "";
   const gitHalf = skipVersion ? "the git half of the release (the CHANGELOG.md commit and the branch push) must run on your own machine" : "the git half of the release (tag, push, CHANGELOG.md) must run on your own machine";
   const commands = skipVersion ? `git checkout ${branch}
 git pull
@@ -20252,17 +20859,13 @@ git -c user.name="Your Name" -c user.email="you@example.com" tag -a ${version} -
 \`\`\`
 
 `;
-  return `## Release ${version}${titleSuffix} \u2014 cycle closed in the DB
-
-${cyclePart} is now marked **complete** in PAPI's database, so \`orient\` will no longer flag "Release has not been run."
-` + warningsBlock + `
-The hosted remote MCP transport (mcp.getpapi.ai) has no checkout of your project and no git binary, so ${gitHalf}.
+  return `The hosted remote MCP transport (mcp.getpapi.ai) has no checkout of your project and no git binary, so ${gitHalf}.
 
 Finish the release locally:
 \`\`\`
 ` + commands + `\`\`\`
 
-` + identityBlock + `Next: cycle closed! Run \`plan\` to start your next cycle, or \`idea "<what's next>"\` first if your backlog is thin.`;
+` + identityBlock.trimEnd();
 }
 var releaseTool = {
   name: "release",
@@ -20350,7 +20953,16 @@ async function handleRelease(adapter2, config2, args) {
     await beginRelease(tracker, cycleToClose);
     const productionBaseBranch = resolveBaseBranch(config2.projectRoot, config2.baseBranch);
     if (branch === productionBaseBranch) {
-      if (gate.enforced && !gate.callerIsOwner) {
+      let releaseCaps = {};
+      try {
+        const info = adapter2.getProjectInfo ? await adapter2.getProjectInfo() : null;
+        releaseCaps = info?.capabilities ?? {};
+      } catch {
+        releaseCaps = {};
+      }
+      const editorsReleaseLikeOwner = isCapabilityEnabled(releaseCaps, "editorRelease");
+      const cycleGate = editorsReleaseLikeOwner ? await resolveCycleGate(adapter2, gate) : { allowed: gate.callerIsOwner, role: gate.callerIsOwner ? "owner" : null };
+      if (gate.enforced && !cycleGate.allowed) {
         const resolutionNote = gate.resolutionError ? `
 
 Identity resolution failed (${gate.resolutionError}) \u2014 the gate fails closed. Retry once connectivity is restored.` : "";
@@ -20371,13 +20983,62 @@ Then reconnect your AI tool and run release again. (Direct/pg setups read identi
           const ownerHint = gate.transport === "pg" ? `If you ARE the owner, set PAPI_USER_ID to your account UUID in .mcp.json (getpapi.ai \u2192 Settings \u2192 Account).` : `If you ARE the owner, your identity comes from your API key \u2014 check you are using YOUR key for YOUR project.`;
           const roleNote = callerRole === "viewer" ? `Your role on this project is "viewer", which cannot release. Ask the owner (or an editor) to release, or ask for editor access.` : `Your identity does not match this project's owner, and you do not have an editor role to open a release PR. If you are a contributor, ask the owner for editor access (or push your branch and open a PR manually). ` + ownerHint;
           return errorResponse(
-            `Release to ${productionBaseBranch} is restricted to the project owner.
+            `Release to ${productionBaseBranch} needs an owner or editor role.
 
 ` + roleNote + `
 
 Releasing to a non-base branch (e.g. dev) is unaffected.` + resolutionNote
           );
         }
+        tracker.mark("contributor-pr-reconciliation");
+        try {
+          const reconciled = await reconcileContributorReleasePrs(config2, adapter2, gate.callerUserId, cycleToClose);
+          if (reconciled.merged.length > 0) {
+            const latest = reconciled.merged[0];
+            let caps2 = {};
+            try {
+              const info = adapter2.getProjectInfo ? await adapter2.getProjectInfo() : null;
+              caps2 = info?.capabilities ?? {};
+            } catch {
+              caps2 = {};
+            }
+            await recordReadinessVerified(tracker);
+            await recordQualityGate(tracker, evaluateReleaseGate(caps2, config2.gateCommand, gateResult), caps2);
+            await completeRelease(tracker, {
+              cycleClosed: latest.cycle,
+              version,
+              caps: caps2,
+              branchMerges: latest.branch ? [{ branch: latest.branch, prUrl: latest.prUrl }] : [],
+              changelogEmitted: false
+            });
+            const localHandoff = isHostedTransport() ? `
+
+${buildHostedGitHandoff({ version, branch, skipVersion: skipVersion ?? false })}` : "";
+            return textResponse(
+              `## Release ${version} \u2014 contributor PR merged
+
+PAPI detected that ${latest.prUrl} was merged on GitHub and reconciled the contributor release. GitHub granted the merge permission; your PAPI **editor** role granted the release workflow.
+
+${latest.cycle ? `Cycle ${latest.cycle}` : "The contributor cycle"} remains **complete**, and the release is now recorded as **released** in PAPI.` + localHandoff + `
+
+Next: run \`plan\` to start your next cycle.`
+            );
+          }
+          if (reconciled.open.length > 0) {
+            const prLines = reconciled.open.map((p) => `- ${p.prUrl}`).join("\n");
+            return textResponse(
+              `## Release ${version} \u2014 contributor PR awaiting merge
+
+${prLines}
+
+Your PAPI **editor** role allowed this release PR. Merge permission is controlled separately by GitHub: if GitHub lets you merge, review and merge it there; otherwise a repository maintainer must merge it.
+
+After it is merged, run \`release\` again so PAPI can detect the merge and finish the release record.`
+            );
+          }
+        } catch (err) {
+          console.error(`[release] contributor PR reconciliation failed (non-blocking): ${err instanceof Error ? err.message : String(err)}`);
+        }
         tracker.mark("contributor-auto-pr");
         try {
           const cr = await contributorAutoPrRelease(config2, adapter2, version, productionBaseBranch, {
@@ -20393,9 +21054,9 @@ Releasing to a non-base branch (e.g. dev) is unaffected.` + resolutionNote
 \u26A0\uFE0F Warnings: ${cr.warnings.join("; ")}
 ` : "";
           return textResponse(
-            `## Release ${version} \u2014 PR opened for owner review
+            `## Release ${version} \u2014 contributor PR opened
 
-You released as an **editor**, so PAPI opened a pull request to \`${productionBaseBranch}\` instead of merging directly. The owner reviews and merges it.
+You released as an **editor**, so PAPI opened a pull request to \`${productionBaseBranch}\` instead of merging directly. GitHub merge permission is separate from your PAPI role: merge it yourself if GitHub allows, otherwise a repository maintainer must merge it.
 
 **Pull request(s):**
 ${prLines.join("\n")}
@@ -20405,7 +21066,7 @@ ${failLines.join("\n")}
 ` : "") + warnBlock + `
 ${cyclePart} is now marked **complete** in PAPI \u2014 your work is shipped from your side. Any changes the owner requests come forward as a fast-follow in your next cycle; your closed cycle is not rewound.
 
-Next: run \`plan\` to start your next cycle.`
+After the PR is merged, run \`release\` again so PAPI can reconcile it.`
           );
         } catch (err) {
           return errorResponse(err instanceof Error ? err.message : String(err));
@@ -21335,6 +21996,20 @@ async function safeUpdateBlocker(adapter2, taskId, blocker) {
   } catch {
   }
 }
+async function resolveMemberBranchSlug(adapter2) {
+  if (!adapterSupports(adapter2, "listContributors")) return void 0;
+  try {
+    const members = await adapter2.listContributors();
+    if (members.length <= 1) return void 0;
+    const callerUserId = adapterSupports(adapter2, "getOwnerIdentity") ? (await adapter2.getOwnerIdentity()).callerUserId ?? null : adapterSupports(adapter2, "getProjectOwnerUserId") ? await adapter2.getProjectOwnerUserId() : null;
+    if (!callerUserId) return void 0;
+    const me = members.find((m) => m.userId === callerUserId);
+    if (!me) return void 0;
+    return memberBranchSlug({ displayName: me.displayName, email: me.email, userId: me.userId });
+  } catch {
+    return void 0;
+  }
+}
 async function startBuild(adapter2, config2, taskId, options = {}, clientName) {
   const task = await adapter2.getTask(taskId);
   if (!task) {
@@ -21437,13 +22112,14 @@ async function startBuild(adapter2, config2, taskId, options = {}, clientName) {
     }
     const inFlightTaskBranch = !depBranchReuse && branchExists(config2.projectRoot, taskBranchName(taskId)) ? taskBranchName(taskId) : void 0;
     const useSharedBranch = !depBranchReuse && !inFlightTaskBranch && !!task.module && cycleNumber > 0;
+    const memberSlug = useSharedBranch ? await resolveMemberBranchSlug(adapter2) : void 0;
     let originCycleBranch;
     if (useSharedBranch && hasRemote(config2.projectRoot)) {
       const baseBranch = resolveBaseBranch(config2.projectRoot, config2.baseBranch);
       const remoteCycleBranches = listGroupedCycleBranches(config2.projectRoot, cycleNumber, baseBranch);
-      originCycleBranch = pickModuleCycleBranch(remoteCycleBranches, cycleNumber, task.module);
+      originCycleBranch = pickModuleCycleBranch(remoteCycleBranches, cycleNumber, task.module, memberSlug);
     }
-    const featureBranch = depBranchReuse ? depBranchReuse.branch : inFlightTaskBranch ? inFlightTaskBranch : useSharedBranch ? originCycleBranch ?? cycleBranchName(cycleNumber, task.module) : taskBranchName(taskId);
+    const featureBranch = depBranchReuse ? depBranchReuse.branch : inFlightTaskBranch ? inFlightTaskBranch : useSharedBranch ? originCycleBranch ?? cycleBranchName(cycleNumber, task.module, memberSlug) : taskBranchName(taskId);
     if (depBranchReuse) {
       branchLines.push(
         `Reusing branch '${depBranchReuse.branch}' from dependency ${depBranchReuse.upstreamId} \u2014 commits will stack for a single PR.`
@@ -22779,8 +23455,19 @@ function isPaidTier(tier) {
 }
 async function enforceProjectCap(adapter2, target) {
   if (isSelfHostedDeployment(process.env.PAPI_SELF_HOST)) return null;
-  const tier = await resolveTier(adapter2);
-  if (tier === null || isPaidTier(tier)) return null;
+  let entitlement = null;
+  if (adapterSupports(adapter2, "getMeteredUsage")) {
+    try {
+      entitlement = await adapter2.getMeteredUsage();
+    } catch {
+      return null;
+    }
+  }
+  if (!entitlement) return null;
+  const override = entitlement.projectLimitOverride;
+  if (override === 0) return null;
+  const effectiveLimit = typeof override === "number" && Number.isInteger(override) && override > 0 ? override : FREE_PROJECT_CAP;
+  if (override == null && isPaidTier(entitlement.tier)) return null;
   if (!adapterSupports(adapter2, "listUserProjects")) return null;
   let projects;
   try {
@@ -22792,17 +23479,20 @@ async function enforceProjectCap(adapter2, target) {
     (p) => target.papiDir && p.papi_dir && p.papi_dir === target.papiDir || target.name && p.name && p.name.trim().toLowerCase() === target.name.trim().toLowerCase()
   );
   if (matchesExisting) return null;
-  if (projects.length >= FREE_PROJECT_CAP) return projectCapMessage(projects.length);
+  if (projects.length >= effectiveLimit) {
+    return projectCapMessage(projects.length, effectiveLimit, entitlement.tier);
+  }
   return null;
 }
 async function resolveContributorUpsell(adapter2) {
   const tier = await resolveTier(adapter2);
   return evaluateContributorGate(tier).upsell ?? null;
 }
-function projectCapMessage(currentCount) {
-  return `**You're on the Free plan (${currentCount} of ${FREE_PROJECT_CAP} projects).**
+function projectCapMessage(currentCount, limit = FREE_PROJECT_CAP, tier = "free") {
+  const nextStep = isPaidTier(tier) ? "request more projects" : "upgrade to Pro or request more projects";
+  return `**You've reached your account project limit (${currentCount} of ${limit} projects).**
 
-Free covers up to ${FREE_PROJECT_CAP} projects. To run more, upgrade to Pro for unlimited projects at a flat monthly price (no usage bills): ${PRICING_URL}
+Your account currently covers up to ${limit} projects. To run more, ${nextStep} at a flat monthly price (no usage bills): ${PRICING_URL}
 
 Your existing projects are untouched, and you can keep working in any of them.`;
 }
@@ -22981,14 +23671,24 @@ Diagnostic JSON:
 ${JSON.stringify(payload, null, 2)}`
   );
 }
-function ensureDocDurable(path7, projectRoot) {
+function ensureDocDurable(path7, projectRoot, bodyStored = false) {
   if (!hasLocalWorkspace() || !projectRoot) return "";
-  const warn = (reason, fix) => `
+  const warn = (reason, fix) => {
+    if (bodyStored) {
+      return `
+- **Not in git:** ${reason} The body is stored in the registry, so it survives a branch switch or stash; the file on disk is not version-controlled.`;
+    }
+    return `
 
 \u26A0\uFE0F **Registered, but NOT durable.** ${reason}
 The registry stores metadata and a summary \u2014 not the body. This doc has one copy, on disk, and a branch switch or stash can take it.
 **Fix:** ${fix}`;
+  };
   if (!existsSync9(join13(projectRoot, path7))) {
+    if (bodyStored) {
+      return `
+- **No file at \`${path7}\`:** the body is stored in the registry, but nothing is on disk at the registered path. Write it there so readers resolve it.`;
+    }
     return warn(
       `No file exists at \`${path7}\`.`,
       `write the doc body to that path, then re-run doc_register.`
@@ -23005,7 +23705,11 @@ The registry stores metadata and a summary \u2014 not the body. This doc has one
   if (isPathIgnored(projectRoot, path7)) {
     return warn(
       `\`${path7}\` is excluded by .gitignore, so it cannot be committed (docs/private/ is ignored by design).`,
-      `keep a copy outside the working tree, or move the doc to a tracked folder if it is not owner-only.`
+      // task-3358: no longer suggests moving the doc to a tracked folder. For anything
+      // under docs/private/ that flips resolveDocVisibility off the private tier and
+      // fails the no-private-artifacts gate — advising a leak to fix a durability gap.
+      // Only reachable now when the body was NOT stored, where a copy is the real fix.
+      `pass \`body\` to doc_register so the registry stores the content, or keep a copy outside the working tree.`
     );
   }
   const result = commitSinglePath(projectRoot, path7, `docs: register ${path7}`);
@@ -23098,6 +23802,7 @@ async function handleDocRegister(adapter2, args, config2) {
       visibility
     });
     let bodyNote = "";
+    let bodyIsStored = false;
     try {
       const supplied = typeof args.body === "string" ? args.body : void 0;
       let body = supplied;
@@ -23128,6 +23833,7 @@ ${decision.message}`;
             visibility: entry.visibility ?? visibility,
             ownerUserId: entry.ownerUserId
           });
+          bodyIsStored = true;
           bodyNote = result.stored ? `
 - **Body stored:** ${result.byteSize.toLocaleString()} bytes` : "\n- **Body:** unchanged since last registration";
         }
@@ -23138,7 +23844,7 @@ ${decision.message}`;
     const visibilityLabel = entry.visibility === "contributors" ? "team member" : entry.visibility ?? "private";
     let durability = "";
     try {
-      durability = ensureDocDurable(entry.path, config2?.projectRoot);
+      durability = ensureDocDurable(entry.path, config2?.projectRoot, bodyIsStored);
     } catch {
       durability = "";
     }
@@ -23855,19 +24561,106 @@ function formatListItem(task) {
   }
   return base;
 }
+var AD_KEYWORD_STOPWORDS = /* @__PURE__ */ new Set([
+  "the",
+  "and",
+  "for",
+  "but",
+  "not",
+  "you",
+  "all",
+  "any",
+  "can",
+  "has",
+  "had",
+  "was",
+  "are",
+  "its",
+  "our",
+  "out",
+  "off",
+  "own",
+  "via",
+  "per",
+  "use",
+  "get",
+  "set",
+  "new",
+  "old",
+  "one",
+  "two",
+  "now",
+  "why",
+  "how",
+  "who",
+  "let",
+  "may",
+  "yet",
+  "too",
+  "from",
+  "that",
+  "this",
+  "with",
+  "into",
+  "when",
+  "then",
+  "than",
+  "them",
+  "they",
+  "their",
+  "there",
+  "here",
+  "have",
+  "been",
+  "were",
+  "will",
+  "would",
+  "should",
+  "could",
+  "make",
+  "made",
+  "more",
+  "most",
+  "less",
+  "only",
+  "also",
+  "just",
+  "like",
+  "over",
+  "some",
+  "such",
+  "each",
+  "both",
+  "does",
+  "done",
+  "stop",
+  "keep",
+  "take",
+  "give",
+  "work",
+  "thing",
+  "things",
+  "about",
+  "after",
+  "before"
+]);
 function filterRelevantADs(ads, task) {
+  const live = ads.filter((ad) => !ad.superseded);
   const keywords = [];
   if (task.module) keywords.push(task.module.toLowerCase());
   if (task.epic) keywords.push(task.epic.toLowerCase());
   if (task.phase) keywords.push(task.phase.toLowerCase());
-  const titleWords = (task.title ?? task.displayId ?? "").toLowerCase().split(/\s+/).filter((w) => w.length > 3);
+  const titleWords = (task.title ?? task.displayId ?? "").toLowerCase().split(/[^a-z0-9-]+/).filter((w) => w.length > 2 && !AD_KEYWORD_STOPWORDS.has(w));
   keywords.push(...titleWords);
-  if (keywords.length === 0) return [];
-  return ads.filter((ad) => {
-    if (ad.superseded) return false;
+  const matches = keywords.length === 0 ? [] : live.filter((ad) => {
     const text = `${ad.title} ${ad.body}`.toLowerCase();
     return keywords.some((kw) => text.includes(kw));
   });
+  const selected = [...matches];
+  for (const ad of live) {
+    if (ad.confidence === "HIGH" && !selected.includes(ad)) selected.push(ad);
+  }
+  return { ads: selected, matched: matches.length, total: live.length };
 }
 async function getModuleContext(adapter2, task) {
   if (!task.module) return "";
@@ -23893,9 +24686,18 @@ async function getModuleContext(adapter2, task) {
     return "";
   }
 }
-function formatRelevantADs(ads) {
-  if (ads.length === 0) return "";
+function formatRelevantADs(ads, stats) {
+  if (ads.length === 0 && !stats) return "";
   const lines = ["\n\n---\n\n**ACTIVE DECISIONS (relevant):**"];
+  if (stats) {
+    lines.push(
+      `_${stats.matched} of ${stats.total} active decisions matched this task's keywords${ads.length > stats.matched ? `; HIGH-confidence decisions are always included` : ""}. Keyword matching is approximate \u2014 an absent decision has not been ruled out._`
+    );
+  }
+  if (ads.length === 0) {
+    lines.push("\n_No active decisions matched. This is a filter result, not a statement that none apply._");
+    return lines.join("\n");
+  }
   for (const ad of ads) {
     const bodyLines = ad.body.split("\n").filter((l) => l.trim() && !l.startsWith("#"));
     const summary = bodyLines[0]?.trim().slice(0, 120) ?? "";
@@ -24076,7 +24878,7 @@ If >80% of the scope is already implemented, call \`build_execute\` with complet
     try {
       const allADs = await adapter2.getActiveDecisions();
       const relevant = filterRelevantADs(allADs, result.task);
-      adSection = formatRelevantADs(relevant);
+      adSection = formatRelevantADs(relevant.ads, { matched: relevant.matched, total: relevant.total });
     } catch {
     }
     let dogfoodSection = "";
@@ -24749,7 +25551,10 @@ Re-submit with \`notes: "... Reference: <path>"\` to link one, or ignore if none
     const conflictNote = result.adConflicts ? buildAdConflictNote(
       result.adConflicts.explicit ? result.adConflicts.adIds[0] : void 0,
       result.adConflicts.explicit ? [] : result.adConflicts.adIds,
-      result.adConflicts.gated
+      result.adConflicts.gated,
+      // task-3347: resolved alongside the ids, so the directive names the
+      // decision the user is being asked to rule on.
+      new Map(Object.entries(result.adConflicts.adTitles ?? {}))
     ) : "";
     return textResponse(`${result.message}${overrideNote}${branchNote}${truncateWarning}${refNudge}${conflictNote}`);
   }
@@ -25617,6 +26422,21 @@ async function recordAdHoc(adapter2, input) {
 var VALID_EFFORTS = ["XS", "S", "M", "L", "XL"];
 var VALID_PRIORITIES = ["P0 Critical", "P1 High", "P2 Medium", "P3 Low"];
 var VALID_TYPES = ["task", "bug", "research", "discovery", "spike", "idea"];
+var AD_HOC_CONFLICT_GATE_INSTRUCTION = "\n**AD conflict gate:** This work is already done. If any of it cuts against a decision above, say so now \u2014 add a `task_comment` on this task, or pass `proposal` to record the boundary as its own Decision or Convention. A conflict noticed here and not written down is one nobody can find later. A contradiction is not a veto \u2014 surfacing it is the owner's call to make, not yours to skip.";
+async function adHocDecisionSection(adapter2, task) {
+  try {
+    const allADs = await adapter2.getActiveDecisions();
+    const relevant = filterRelevantADs(allADs, task);
+    if (relevant.total === 0) return "";
+    const section = formatRelevantADs(relevant.ads, {
+      matched: relevant.matched,
+      total: relevant.total
+    });
+    return section.replace(AD_CONFLICT_GATE_INSTRUCTION, AD_HOC_CONFLICT_GATE_INSTRUCTION);
+  } catch {
+    return "";
+  }
+}
 function inferTaskType(description) {
   const lower = description.toLowerCase();
   if (/\bfix\b|bug|error|crash|broken|regression|defect/.test(lower)) return "bug";
@@ -25843,12 +26663,12 @@ The task is recorded **In Review** and pinned to **Cycle ${result.task.cycle}**,
    \`\`\`
 2. Leave the branch **unmerged** \u2014 it is picked up by the next cycle's \`release\`.
 
-_To correct: board_edit ${result.task.id} with updated fields._` + await recordAdHocProposal(adapter2, args, { cycleNumber: result.task.cycle ?? 0, sourceTaskId: result.task.id })
+_To correct: board_edit ${result.task.id} with updated fields._` + await recordAdHocProposal(adapter2, args, { cycleNumber: result.task.cycle ?? 0, sourceTaskId: result.task.id }) + await adHocDecisionSection(target, result.task)
     );
   }
   return textResponse(
     `**${result.task.id}:** "${result.task.title}" recorded (${effortRaw}, ${priorityRaw}, ${typeLabel}, ${taskModule})${overrideNote}.${truncateWarning}${promoNote} Build report attached.
-_To correct: board_edit ${result.task.id} with updated fields._` + await recordAdHocProposal(adapter2, args, { cycleNumber: result.task.cycle ?? 0, sourceTaskId: result.task.id })
+_To correct: board_edit ${result.task.id} with updated fields._` + await recordAdHocProposal(adapter2, args, { cycleNumber: result.task.cycle ?? 0, sourceTaskId: result.task.id }) + await adHocDecisionSection(target, result.task)
   );
 }
 
@@ -27222,14 +28042,23 @@ ${overlap}`;
         const allTasks = await adapter2.queryBoard();
         const cycleTasks = allTasks.filter((t) => t.cycle === result.currentCycle);
         const gate = await resolveOwnerGate(adapter2, config2);
-        const callerIsOwner = !gate.enforced || gate.callerIsOwner;
-        if (cycleTasks.length > 0 && cycleTasks.every((t) => t.status === "Done") && !callerIsOwner) {
-          const resolutionNote = gate.resolutionError ? ` (Identity resolution failed: ${gate.resolutionError} \u2014 the gate fails closed; the owner can run \`release\` directly.)` : "";
+        let releaseCaps = {};
+        try {
+          const info = adapter2.getProjectInfo ? await adapter2.getProjectInfo() : null;
+          releaseCaps = info?.capabilities ?? {};
+        } catch {
+          releaseCaps = {};
+        }
+        const cycleGate = isCapabilityEnabled(releaseCaps, "editorRelease") ? await resolveCycleGate(adapter2, gate) : { allowed: !gate.enforced || gate.callerIsOwner, role: gate.callerIsOwner ? "owner" : null };
+        const callerMayRelease = cycleGate.allowed;
+        if (cycleTasks.length > 0 && cycleTasks.every((t) => t.status === "Done") && !callerMayRelease) {
+          const why = cycleGate.role === "viewer" ? `your role on this project is "viewer"` : `your role on this project could not be confirmed`;
+          const resolutionNote = cycleGate.resolutionError ? ` (Role resolution failed: ${cycleGate.resolutionError} \u2014 the gate fails closed.)` : "";
           autoReleaseNote = `
 
 ---
 
-\u2705 Verdict recorded. All cycle tasks are Done, but **auto-release is owner-only** \u2014 your identity does not match this project's owner, so no release was cut. Push your branch and open a PR for the owner to run \`release\`.${resolutionNote}`;
+\u2705 Verdict recorded. All cycle tasks are Done, but no release was cut \u2014 **auto-release needs an owner or editor role**, and ${why}. Push your branch and open a PR, or ask for editor access.${resolutionNote}`;
         } else if (cycleTasks.length > 0 && cycleTasks.every((t) => t.status === "Done")) {
           let planRunCount = null;
           if (adapterSupports(adapter2, "countPlanRunsForCycle")) {
@@ -27483,7 +28312,7 @@ import { access as access2, readFile as readFile5, writeFile as writeFile3 } fro
 import path5 from "path";
 var initTool = {
   name: "init",
-  description: "Write the MCP config file that connects this project to PAPI. Generates .mcp.json (Claude Code default) or the equivalent for Cursor, VS Code, Windsurf, OpenCode, Amazon Q, Kilo Code, Gemini CLI, Codex CLI, or Hermes Agent. Config-only \u2014 does not create any project data. Run this first, then run `setup` to create your PAPI project.",
+  description: "Write the MCP config file that connects this project to PAPI. Generates .mcp.json, or the equivalent for whichever MCP client you use \u2014 Claude Code, Cursor, VS Code, Windsurf, OpenCode, Amazon Q, Kilo Code, Gemini CLI, Codex CLI, or Hermes Agent. Config-only \u2014 does not create any project data. Run this first, then run `setup` to create your PAPI project.",
   annotations: { title: "Initialise Project", readOnlyHint: false, destructiveHint: false, openWorldHint: false },
   inputSchema: {
     type: "object",
@@ -27972,6 +28801,29 @@ ${writeNote}
   return textResponse(output);
 }
 
+// src/lib/workspace-mode.ts
+init_git();
+var cache3 = /* @__PURE__ */ new Map();
+function resolveWorkspaceMode(projectRoot) {
+  const cached2 = cache3.get(projectRoot);
+  if (cached2) return cached2;
+  let result;
+  if (!isGitAvailable()) {
+    result = { mode: "no-git", gitBacked: false, reason: "git-not-installed" };
+  } else if (!isGitRepo(projectRoot)) {
+    result = { mode: "no-git", gitBacked: false, reason: "not-a-repo" };
+  } else {
+    result = { mode: "git", gitBacked: true, reason: null };
+  }
+  cache3.set(projectRoot, result);
+  return result;
+}
+function formatWorkspaceModeLine(result) {
+  if (result.gitBacked) return void 0;
+  const because = result.reason === "git-not-installed" ? "no version control was detected on this machine" : "this folder is not under version control";
+  return `**Mode:** running without version control \u2014 ${because}. The full loop works: plan, build, review and release all run normally, and your work is saved to PAPI either way. Version control would add branch-per-task, change history and pull-request review on top.`;
+}
+
 // src/services/health.ts
 function computeZoomOutWarning(cycleNumber, lastZoomOutCycle) {
   if (cycleNumber <= 0) return "";
@@ -28309,15 +29161,16 @@ async function findUnblockCandidates(adapter2, currentCycle) {
     const blocker = blocked.blocker;
     if (!blocker) continue;
     const resolved = isBlockerResolved(blocker, ctx);
+    const blockerTitle = resolveBlockerTitle(blocker, ctx) ?? "";
     candidates.push({
       blockedId: blocked.displayId ?? blocked.id,
       blockedTitle: blocked.title,
       blockerId: blocker.ref,
-      blockerTitle: "",
+      blockerTitle,
       blockerCycle: blocker.blockedCycle,
       typed: {
         kind: blocker.type,
-        waiting: formatBlockerWaiting(blocker),
+        waiting: formatBlockerWaiting(blocker, blockerTitle),
         resolved
       }
     });
@@ -28383,9 +29236,9 @@ function formatUnblockSection(candidates) {
     lines.push("");
     for (const c of resolved) {
       if (c.typed) {
-        lines.push(`- **${c.blockedId}** (${c.blockedTitle}) \u2014 ${c.typed.kind}: ${c.blockerId} now resolved \u2705`);
+        lines.push(`- **${c.blockedId}** (${c.blockedTitle}) \u2014 ${c.typed.kind}: ${formatRef(c.blockerId, c.blockerTitle)} now resolved \u2705`);
       } else {
-        lines.push(`- **${c.blockedId}** (${c.blockedTitle}) \u2014 blocker **${c.blockerId}** Done in C${c.blockerCycle}`);
+        lines.push(`- **${c.blockedId}** (${c.blockedTitle}) \u2014 blocker **${formatRef(c.blockerId, c.blockerTitle)}** Done in C${c.blockerCycle}`);
       }
     }
   }
@@ -28903,6 +29756,13 @@ var orientTool = {
       full: {
         type: "boolean",
         description: "Run the heavy enrichment blocks that the lean default path skips: Research Signals (doc search) and npm version-drift. Default false \u2014 the lean path keeps the per-session query count down so orient stays well under the tool timeout on large projects. Implied automatically when deep_housekeeping is true."
+      },
+      // SUP-2026-027: orient stopped multi-project accounts asking which project
+      // to use, while declaring no way to answer — the caller could not pass one
+      // without the schema advertising it. Same contract as board_view / bug.
+      project: {
+        type: "string",
+        description: "Project id (UUID) or slug to orient on, overriding the session project for THIS call only. Must be a project on your account \u2014 fails closed otherwise. Use project_switch to change the session default. PASS THIS WHENEVER YOU KNOW WHICH REPO THE SESSION IS IN: on a multi-project account a connection with no project bound cannot be resolved, and PAPI will stop and ask rather than guess."
       }
     },
     required: []
@@ -29005,6 +29865,13 @@ function formatOrientSummary(health, buildInfo, hierarchy, latestTag, projectRoo
     lines.push(`**Connection:** ${statusIcon} ${statusLabel}`);
     lines.push("");
   }
+  if (projectRoot && hasLocalWorkspace()) {
+    const modeLine = formatWorkspaceModeLine(resolveWorkspaceMode(projectRoot));
+    if (modeLine) {
+      lines.push(modeLine);
+      lines.push("");
+    }
+  }
   const harness = detectHarness(clientName);
   const roleNote = connectOnlyRoleNote(harness);
   if (roleNote) {
@@ -29349,6 +30216,42 @@ async function computeTeamSummary(adapter2, contributorsInput) {
   const reviewQueue = tasks.filter((t) => t.status === "In Review").length;
   return `**Team:** ${members} members \xB7 ${pool} in pool \xB7 ${inFlight} in flight \xB7 ${reviewQueue} in review`;
 }
+async function computeCohortVisibility(adapter2, config2, contributorsInput) {
+  if (!adapterSupports(adapter2, "listContributors")) return void 0;
+  let members;
+  try {
+    members = (await (contributorsInput ?? adapter2.listContributors())).length;
+  } catch {
+    return void 0;
+  }
+  if (members <= 1) return void 0;
+  let gate;
+  try {
+    gate = await resolveOwnerGate(adapter2, config2);
+  } catch {
+    return void 0;
+  }
+  const cycleGate = await resolveCycleGate(adapter2, gate);
+  if (!cycleGate.allowed) return void 0;
+  let tasks;
+  try {
+    tasks = await adapter2.queryBoard({ compact: true });
+  } catch {
+    return void 0;
+  }
+  const open = tasks.filter(
+    (t) => t.status !== "Done" && t.status !== "Cancelled" && t.status !== "Archived"
+  );
+  if (open.length === 0) return void 0;
+  const publicCount = open.filter((t) => !t.visibility || t.visibility === "public").length;
+  const contributorCount = publicCount + open.filter((t) => t.visibility === "contributors").length;
+  const hiddenFromContributors = open.length - contributorCount;
+  if (hiddenFromContributors === 0) {
+    return `**Cohort visibility:** your ${members - 1} teammate(s) can see the whole active board (${open.length} tasks).`;
+  }
+  const pct = Math.round(hiddenFromContributors / open.length * 100);
+  return `**Cohort visibility:** of ${open.length} active tasks, a contributor sees ${contributorCount} and a public-tier viewer sees ${publicCount} \u2014 **${hiddenFromContributors} (${pct}%) are private and invisible to your team.**`;
+}
 async function computeReleaseHistory(adapter2, contributorsInput) {
   if (!adapterSupports(adapter2, "listContributors")) return void 0;
   let contributors;
@@ -29412,7 +30315,21 @@ function withBoardMemo(adapter2) {
   });
 }
 async function handleOrient(rawAdapter, config2, args = {}, clientName, serverVersion = "unknown") {
-  const adapter2 = withBoardMemo(rawAdapter);
+  let resolvedAdapter = rawAdapter;
+  let projectOverrideNote = "";
+  try {
+    ({ adapter: resolvedAdapter, overrideNote: projectOverrideNote } = await resolvePerCallProjectAdapter(
+      rawAdapter,
+      args
+    ));
+  } catch (err) {
+    if (err instanceof ProjectResolutionError) return errorResponse(err.message);
+    throw err;
+  }
+  const projectOverrideLine = projectOverrideNote ? `_Project override${projectOverrideNote}_
+
+` : "";
+  const adapter2 = withBoardMemo(resolvedAdapter);
   const environment = normaliseEnvironment(args.environment);
   const deepHousekeeping = args.deep_housekeeping === true;
   const fullEnrichment = args.full === true || deepHousekeeping;
@@ -29654,7 +30571,7 @@ async function handleOrient(rawAdapter, config2, args = {}, clientName, serverVe
             return adWords.some((w) => docText.includes(w));
           });
           const cycleLabel = `C${doc.cycleUpdated ?? doc.cycleCreated}`;
-          const adRef = relatedAds.length > 0 ? ` \u2014 may relate to ${relatedAds.map((a) => a.displayId).join(", ")}` : "";
+          const adRef = relatedAds.length > 0 ? ` \u2014 may relate to ${relatedAds.map((a) => formatRef(a.displayId, a.title)).join(", ")}` : "";
           const pendingActions = doc.actions?.filter((a) => a.status === "pending") ?? [];
           lines.push(`- **${doc.title}** [${cycleLabel}${adRef}]`);
           for (const action of pendingActions.slice(0, 2)) {
@@ -29761,8 +30678,8 @@ async function handleOrient(rawAdapter, config2, args = {}, clientName, serverVe
           const mismatches = detectBoardMismatches(config2.projectRoot, allTasks);
           if (mismatches.codeAhead.length > 0 || mismatches.staleInProgress.length > 0) {
             const lines = ["\n\n## Reconciliation"];
-            for (const m of mismatches.codeAhead) lines.push(`\u26A0\uFE0F **${m.displayId}** \u2014 branch \`${m.branch}\` merged to main but task is still Backlog. Run \`board_edit\` to mark Done.`);
-            for (const m of mismatches.staleInProgress) lines.push(`\u26A0\uFE0F **${m.displayId}** \u2014 In Progress but no feature branch found. May be stale or built without \`build_execute\`.`);
+            for (const m of mismatches.codeAhead) lines.push(`\u26A0\uFE0F **${formatRef(m.displayId, m.title)}** \u2014 branch \`${m.branch}\` merged to main but task is still Backlog. Run \`board_edit\` to mark Done.`);
+            for (const m of mismatches.staleInProgress) lines.push(`\u26A0\uFE0F **${formatRef(m.displayId, m.title)}** \u2014 In Progress but no feature branch found. May be stale or built without \`build_execute\`.`);
             reconciliationNote2 = lines.join("\n");
           }
         } catch {
@@ -29776,7 +30693,7 @@ async function handleOrient(rawAdapter, config2, args = {}, clientName, serverVe
               lines.push(`${merged.length} In-Progress task(s) already merged to the default branch \u2014 close them out with \`build_execute\` complete (or \`board_edit\` to mark Done):`);
               for (const m of merged) {
                 const ref = m.pr ? `${m.pr} (\`${m.commit}\`)` : `\`${m.commit}\``;
-                lines.push(`- \u26A0\uFE0F **${m.displayId}** \u2014 merged via ${ref}: ${m.subject}`);
+                lines.push(`- \u26A0\uFE0F **${formatRef(m.displayId, m.title)}** \u2014 merged via ${ref}: ${m.subject}`);
               }
               mergedInProgressNote2 = lines.join("\n");
             }
@@ -29909,7 +30826,7 @@ ${versionDrift}` : "";
     }
     tracker.mark("parallel-tail");
     const sharedContributorsPromise = adapterSupports(adapter2, "listContributors") ? adapter2.listContributors().catch(() => []) : Promise.resolve([]);
-    const [unblockCandidates, subAgents, teamSummaryLine, releaseHistoryLine, carryForwardRefs] = await Promise.all([
+    const [unblockCandidates, subAgents, teamSummaryLine, releaseHistoryLine, cohortVisibilityLine, carryForwardRefs] = await Promise.all([
       tracked("unblock-candidates", () => findUnblockCandidates(adapter2, currentCycle))().catch(() => []),
       // task-1866: discover project sub-agents for the orient surface (read-only, never throws).
       listAgents(config2.projectRoot),
@@ -29918,6 +30835,8 @@ ${versionDrift}` : "";
       // byte-identical there.
       tracked("team-summary", () => computeTeamSummary(adapter2, sharedContributorsPromise))().catch(() => void 0),
       tracked("release-history", () => computeReleaseHistory(adapter2, sharedContributorsPromise))().catch(() => void 0),
+      // task-3339 (C363): owner-only readout of how much of the board the cohort cannot see.
+      tracked("cohort-visibility", () => computeCohortVisibility(adapter2, config2, sharedContributorsPromise))().catch(() => void 0),
       // task-2751 (C332): resolve every task-NNNN mentioned in the Carry-Forward
       // prose to its title so orient can name it inline. Built from the board
       // already in hand — no extra query.
@@ -29927,7 +30846,7 @@ ${versionDrift}` : "";
     const unblockNote = unblockSection ? `
 
 ${unblockSection}` : "";
-    const teamSummary = [teamSummaryLine, releaseHistoryLine].filter(Boolean).join("\n") || void 0;
+    const teamSummary = [teamSummaryLine, releaseHistoryLine, cohortVisibilityLine].filter(Boolean).join("\n") || void 0;
     let deferredGateNote = "";
     if (deepHousekeeping) {
       try {
@@ -29957,7 +30876,7 @@ ${section}`;
     const runtimeIdentityNote = `
 
 ${formatRuntimeIdentity(getRuntimeIdentity(config2, serverVersion))}`;
-    return { ...textResponse(projectBannerNote + formatOrientSummary(healthResult, buildInfo, hierarchy, latestTag, config2.projectRoot, environment, subAgents, projectName, teamSummary, clientName, carryForwardRefs) + runtimeIdentityNote + unblockNote + deferredGateNote + feedbackResolvedNote + alertsNote + ttfvNote + reconciliationNote + mergedInProgressNote + unrecordedNote + unregisteredDocsNote + staleSkillsNote + researchSignalsNote + recsNote + pendingReviewNote + patternsNote + unactionedIssuesNote + skillProposalsNote + sessionGuidanceNote + onboardingCoachingNote + versionNote + enrichmentNote + deliveryShapeNote + preBuildCheckNote + deepHint + enrichmentFilesSection), _cycleNumber: healthResult.cycleNumber };
+    return { ...textResponse(projectOverrideLine + projectBannerNote + formatOrientSummary(healthResult, buildInfo, hierarchy, latestTag, config2.projectRoot, environment, subAgents, projectName, teamSummary, clientName, carryForwardRefs) + runtimeIdentityNote + unblockNote + deferredGateNote + feedbackResolvedNote + alertsNote + ttfvNote + reconciliationNote + mergedInProgressNote + unrecordedNote + unregisteredDocsNote + staleSkillsNote + researchSignalsNote + recsNote + pendingReviewNote + patternsNote + unactionedIssuesNote + skillProposalsNote + sessionGuidanceNote + onboardingCoachingNote + versionNote + enrichmentNote + deliveryShapeNote + preBuildCheckNote + deepHint + enrichmentFilesSection), _cycleNumber: healthResult.cycleNumber };
   } catch (err) {
     const message = err instanceof Error ? err.message : String(err);
     const isKnownFriendly = /^(Orient failed|Project not found|No project|Setup required)/i.test(message);
@@ -31059,15 +31978,35 @@ function readLlmResponse(args) {
 }
 
 // src/tools/ad-view.ts
-var AD_COLUMNS = [
-  { name: "id", header: "AD", value: (d) => d.id },
-  { name: "title", header: "Title", value: (d) => d.title },
-  { name: "confidence", header: "Confidence", value: (d) => d.confidence },
-  { name: "superseded", header: "Superseded", value: (d) => d.superseded ? "yes" : "no" },
-  { name: "supersededBy", header: "Superseded By", value: (d) => d.supersededBy ?? "-" },
-  { name: "body", header: "Body", value: (d) => d.body.replace(/\s+/g, " ").trim() }
-];
-var AD_FIELDS = AD_COLUMNS.map((c) => c.name);
+function adColumns(all) {
+  return [
+    { name: "id", header: "AD", value: (d) => d.id },
+    { name: "title", header: "Title", value: (d) => d.title },
+    { name: "confidence", header: "Confidence", value: (d) => d.confidence },
+    { name: "superseded", header: "Superseded", value: (d) => d.superseded ? "yes" : "no" },
+    {
+      name: "supersededBy",
+      header: "Superseded By",
+      value: (d) => d.supersededBy ? formatEntityRef(d.supersededBy, all) : "-"
+    },
+    { name: "body", header: "Body", value: (d) => d.body.replace(/\s+/g, " ").trim() }
+  ];
+}
+var AD_FIELDS = adColumns([]).map((c) => c.name);
+function supersededNote(d, all) {
+  if (!d.superseded) return "";
+  const by = d.supersededBy;
+  if (!by) return " [SUPERSEDED by unknown]";
+  return ` [SUPERSEDED by ${formatEntityRef(by, all)}]`;
+}
+function formatAdBody(d, all) {
+  return `## ${d.id}: ${d.title} [${d.confidence}]${supersededNote(d, all)}
+
+${d.body}`;
+}
+function formatAdList(decisions, all) {
+  return decisions.map((d) => formatAdBody(d, all)).join("\n\n---\n\n");
+}
 var adViewTool = {
   name: "ad_view",
   description: "View one or all Active Decisions with full bodies. Use when you need to read the complete reasoning and evidence behind a specific AD before running strategy_change.",
@@ -31130,16 +32069,11 @@ async function handleAdView(adapter2, args) {
     }
     const meta2 = emitMeta ? { total: decisions.length, filtered: 1, returned: 1, limit: null, offset: 0 } : null;
     if (fields) {
-      const columns = selectColumns(AD_COLUMNS, fields);
+      const columns = selectColumns(adColumns(decisions), fields);
       const body = columns.map((c) => `- **${c.header}:** ${c.value(target)}`).join("\n");
       return textResponse(withMeta(body, meta2));
     }
-    const supersededNote = target.superseded ? ` [SUPERSEDED by ${target.supersededBy}]` : "";
-    return textResponse(
-      withMeta(`## ${target.id}: ${target.title} [${target.confidence}]${supersededNote}
-
-${target.body}`, meta2)
-    );
+    return textResponse(withMeta(formatAdBody(target, decisions), meta2));
   }
   const filtered = includeSuperseded ? decisions : decisions.filter((d) => !d.superseded);
   const paged = limit === null && offset === 0 ? filtered : filtered.slice(offset, limit === null ? void 0 : offset + limit);
@@ -31148,16 +32082,11 @@ ${target.body}`, meta2)
     return textResponse(withMeta("No active decisions found.", meta));
   }
   if (fields) {
-    const columns = selectColumns(AD_COLUMNS, fields);
+    const columns = selectColumns(adColumns(decisions), fields);
     const rows = paged.map((d) => columns.map((c) => c.value(d)));
     return textResponse(withMeta(renderTable(columns.map((c) => c.header), rows), meta));
   }
-  const formatted = paged.map((d) => {
-    const supersededNote = d.superseded ? ` [SUPERSEDED by ${d.supersededBy}]` : "";
-    return `## ${d.id}: ${d.title} [${d.confidence}]${supersededNote}
-
-${d.body}`;
-  }).join("\n\n---\n\n");
+  const formatted = formatAdList(paged, decisions);
   return textResponse(withMeta(`# Active Decisions (${paged.length})
 
 ${formatted}`, meta));
@@ -31285,7 +32214,10 @@ async function handleLearningAction(adapter2, args) {
     if (!learningId?.trim()) return errorResponse('learning_id is required for mode "mark".');
     if (!actionTaken) return errorResponse('action_taken is required for mode "mark".');
     try {
-      await adapter2.updateCycleLearningActionRef(learningId.trim(), actionRef?.trim() ?? actionTaken);
+      await adapter2.updateCycleLearningActionRef(learningId.trim(), actionRef?.trim() ?? actionTaken, {
+        actionTaken,
+        force: true
+      });
       return textResponse(
         `Learning \`${learningId}\` marked as **${actionTaken}**${actionRef ? ` \u2192 \`${actionRef}\`` : ""}.`
       );
@@ -31478,14 +32410,24 @@ On hosted/remote sessions this is now your DEFAULT project \u2014 calls without
 }
 
 // src/tools/contributor.ts
+init_dist();
 var contributorAddTool = {
   name: "contributor_add",
-  description: "Add a contributor to the current project by email (owner-only). The person must already have a PAPI account. Grants cohort membership on project_contributors \u2014 contributors-tier visibility, no roles yet.",
+  description: `Add a contributor to a project by email, or change an existing member's role (owner-only). The person must already have a PAPI account. Grants membership on project_contributors. Pass role="editor" for a working teammate who needs to run the full cycle \u2014 the default, "viewer", cannot release. Calling it again with a different role promotes or demotes that member.`,
   annotations: { title: "Add Contributor", readOnlyHint: false, destructiveHint: false, openWorldHint: false },
   inputSchema: {
     type: "object",
     properties: {
-      email: { type: "string", description: 'Email of the PAPI account to add (e.g. "wes@example.com").' }
+      email: { type: "string", description: 'Email of the PAPI account to add (e.g. "wes@example.com").' },
+      role: {
+        type: "string",
+        enum: [...ASSIGNABLE_CONTRIBUTOR_ROLES],
+        description: `Membership role. "editor" can run the full build/review/release cycle; "viewer" has read-only visibility and is REFUSED by the release gate. Defaults to "viewer" for a new member; omit it when changing nothing to leave an existing member's role untouched. Project ownership cannot be granted here.`
+      },
+      project: {
+        type: "string",
+        description: "Project id (UUID) or slug to add this contributor to, overriding the session project for THIS call only. Must be a project on your account \u2014 fails closed otherwise. Does NOT change your default project."
+      }
     },
     required: ["email"]
   }
@@ -31550,21 +32492,37 @@ function requireEmail(args) {
   return EMAIL_SHAPE.test(email) ? email : null;
 }
 async function handleContributorAdd(adapter2, config2, args) {
-  const denied = await denyUnlessOwner(adapter2, config2);
-  if (denied) return errorResponse(denied);
   const email = requireEmail(args);
   if (!email) return errorResponse('A valid email is required. Example: contributor_add email="wes@example.com"');
+  const rawRole = typeof args.role === "string" ? args.role.trim().toLowerCase() : void 0;
+  if (rawRole !== void 0 && !ASSIGNABLE_CONTRIBUTOR_ROLES.includes(rawRole)) {
+    return errorResponse(
+      `Invalid role "${args.role}". Assignable roles: ${ASSIGNABLE_CONTRIBUTOR_ROLES.join(", ")}. Project ownership cannot be granted through contributor_add.`
+    );
+  }
+  let target = adapter2;
+  let overrideNote = "";
   try {
-    const entry = await adapter2.addContributorByEmail(email);
+    ({ adapter: target, overrideNote } = await resolvePerCallProjectAdapter(adapter2, args));
+  } catch (err) {
+    if (err instanceof ProjectResolutionError) return errorResponse(err.message);
+    throw err;
+  }
+  const denied = await denyUnlessOwner(target, config2);
+  if (denied) return errorResponse(denied);
+  try {
+    const entry = await target.addContributorByEmail(email, rawRole);
     const name = entry.displayName ? ` (${entry.displayName})` : "";
-    const upsell = await resolveContributorUpsell(adapter2);
+    const upsell = await resolveContributorUpsell(target);
     const upsellSuffix = upsell ? `
 
 ${upsell}` : "";
+    const where = overrideNote ? ` ${overrideNote}` : " on this project";
+    const roleLine = entry.role === "editor" ? `They can run the full cycle \u2014 plan, build, review and release.` : `**They are a "${entry.role}" and cannot run \`release\`.** Re-run with role="editor" if they are a working teammate rather than an observer.`;
     return textResponse(
-      `\u2705 Added **${entry.email ?? email}**${name} as a contributor.
+      `\u2705 **${entry.email ?? email}**${name} is now a **${entry.role}**${where}.
 
-They now have contributors-tier visibility on this project. Roles and invites land with MU-2 \u2014 today membership is the whole model.` + upsellSuffix
+` + roleLine + upsellSuffix
     );
   } catch (err) {
     return errorResponse(err instanceof Error ? err.message : String(err));
@@ -32069,12 +33027,13 @@ async function readPapiResource(adapter2, uri) {
       const ads = await adapter2.getActiveDecisions({ includeRetired: true });
       const target = ads.find((d) => d.id === adId);
       if (!target) throw new Error(`Active Decision not found in this project: ${adId}`);
-      const supersededNote = target.superseded ? ` [SUPERSEDED by ${target.supersededBy ?? "unknown"}]` : "";
+      const titles = titleMap(ads);
+      const supersededNote2 = target.superseded ? ` [SUPERSEDED by ${target.supersededBy ? formatRef(target.supersededBy, lookupTitle(target.supersededBy, titles)) : "unknown"}]` : "";
       const supersedes = ads.filter((d) => d.supersededBy === target.id).map((d) => d.id);
       const chain = supersedes.length > 0 ? `
 
-_Supersedes: ${supersedes.join(", ")}_` : "";
-      return md(`## ${target.id}: ${target.title} [${target.confidence}]${supersededNote}
+_Supersedes: ${formatRefList(supersedes, titles)}_` : "";
+      return md(`## ${target.id}: ${target.title} [${target.confidence}]${supersededNote2}
 
 ${target.body}${chain}`);
     }
@@ -32214,7 +33173,7 @@ var inflightWork = /* @__PURE__ */ new Map();
 var ToolTimeoutError = class extends Error {
   constructor(toolName, expectedMs, actualMs, wedged, pendingNote) {
     super(
-      wedged ? `Tool '${toolName}' timed out after ${actualMs}ms (budget ${expectedMs}ms). A database operation ran the entire time without returning \u2014 the connection is likely wedged or contended (SUP-2026-012); a second PAPI session open against the same database is a common cause.${pendingNote} The MCP server is restarting; reconnect with /mcp in Claude Code (or restart your MCP host), and close any other open PAPI session, before the next call.` : `Tool '${toolName}' timed out after ${actualMs}ms (budget ${expectedMs}ms). No single operation was stuck \u2014 this is cumulative query load exceeding the budget, not a wedged pool, and the database is healthy.${pendingNote} Retry the call; \`orient\` runs a lean path by default (heavy enrichment is opt-in via \`full: true\`).`
+      wedged ? `Tool '${toolName}' timed out after ${actualMs}ms (budget ${expectedMs}ms). A database operation ran the entire time without returning \u2014 the connection is likely wedged or contended (SUP-2026-012); a second PAPI session open against the same database is a common cause.${pendingNote} The MCP server is restarting; reconnect to the PAPI server in your AI client (in some clients that is /mcp; otherwise restart the client), and close any other open PAPI session, before the next call.` : `Tool '${toolName}' timed out after ${actualMs}ms (budget ${expectedMs}ms). No single operation was stuck \u2014 this is cumulative query load exceeding the budget, not a wedged pool, and the database is healthy.${pendingNote} Retry the call; \`orient\` runs a lean path by default (heavy enrichment is opt-in via \`full: true\`).`
     );
     this.toolName = toolName;
     this.expectedMs = expectedMs;
@@ -32302,6 +33261,7 @@ var PAPI_TOOLS = [
   boardArchiveTool,
   boardEditTool,
   setupTool,
+  joinTool,
   buildListTool,
   buildDescribeTool,
   buildExecuteTool,
@@ -32467,6 +33427,8 @@ function createServer(adapter2, config2, observation) {
           return handleBoardEdit(adapter2, safeArgs);
         case "setup":
           return handleSetup(adapter2, config2, safeArgs, server2.getClientVersion()?.name);
+        case "join":
+          return handleJoin(adapter2, config2, safeArgs);
         case "build_list":
           return handleBuildList(adapter2, config2, safeArgs);
         case "build_describe":
@@ -32712,7 +33674,12 @@ var FRIENDLY_GET_HTML = `<!doctype html>
      <code>https://mcp.getpapi.ai/mcp</code>.</p>
   <a class="btn" href="https://getpapi.ai/docs/install">See the install guide \u2192</a>
 </div></body></html>`;
-var KNOWN_INSTALL_CLIENTS = /* @__PURE__ */ new Set(["claude-code-plugin"]);
+var KNOWN_INSTALL_CLIENTS = /* @__PURE__ */ new Set([
+  "claude-code-plugin",
+  "cursor-plugin",
+  "gemini-extension",
+  "codex-plugin"
+]);
 var MAX_BODY_BYTES = 1 * 1024 * 1024;
 var SLOW_REQUEST_MS = 5e3;
 var CRITICAL_REQUEST_MS = 3e4;
@@ -33325,7 +34292,7 @@ Options:
 Getting started:
   1. Run "npx @papi-ai/server setup" in any project folder
   2. Approve in the browser when it opens
-  3. Open Claude Code in the same folder and say "run setup"
+  3. Open your AI client in the same folder and say "run setup"
 
 Stuck?
   npx @papi-ai/server doctor    # diagnose your config