@papi-ai/server 0.7.104 → 0.7.105

package/dist/backfill-cycle-metrics.js

@@ -201,6 +201,7 @@ __export(git_exports, {
   ensureLatestDevelop: () => ensureLatestDevelop,
   ensureTagAtHead: () => ensureTagAtHead,
   fetchBaseBranch: () => fetchBaseBranch,
+  findCollidingWork: () => findCollidingWork,
   findContributorReleasePullRequests: () => findContributorReleasePullRequests,
   findTaskCommitsOnBase: () => findTaskCommitsOnBase,
   getBaseDivergence: () => getBaseDivergence,
@@ -1493,6 +1494,23 @@ function getRemoteBranchFiles(cwd, branch, baseBranch) {
     return [];
   }
 }
+function findCollidingWork(cwd, baseBranch, filesLikelyTouched) {
+  if (filesLikelyTouched.length === 0) return null;
+  const prs = listOpenPullRequests(cwd);
+  if (!prs || prs.length === 0) return null;
+  const wanted = new Set(filesLikelyTouched);
+  for (const pr of prs) {
+    const branchFiles = getRemoteBranchFiles(cwd, pr.headRefName, baseBranch);
+    const overlap = branchFiles.filter((f) => wanted.has(f));
+    if (overlap.length > 0) {
+      return {
+        label: `PR #${pr.number} "${pr.title}" (branch \`${pr.headRefName}\`, opened by ${pr.author})`,
+        files: overlap
+      };
+    }
+  }
+  return null;
+}
 var AUTO_WRITTEN_PATHS, GIT_NETWORK_TIMEOUT_MS, MERGE_RETRY_DELAY_MS, MERGE_MAX_RETRIES, GIT_FETCH_TIMEOUT_MS;
 var init_git = __esm({
   "src/lib/git.ts"() {
@@ -1684,7 +1702,6 @@ var init_proxy_adapter = __esm({
       "getBuildReportsSince",
       "getContextHashes",
       "getContextUtilisation",
-      "getCostSnapshots",
       "getCostSummary",
       "getCurrentNorthStar",
       "getCycleHealth",
@@ -2338,9 +2355,8 @@ Check PAPI_PROJECT_ID in your .mcp.json config. Find your project ID in the PAPI
       getCostSummary(cycleNumber) {
         return this.invoke("getCostSummary", [cycleNumber]);
       }
-      getCostSnapshots() {
-        return this.invoke("getCostSnapshots");
-      }
+      // task-3332: getCostSnapshots retired — see the removal note on CostSnapshot
+      // in packages/shared/src/entities.ts.
       appendCycleMetrics(snapshot) {
         return this.invoke("appendCycleMetrics", [snapshot]);
       }

package/dist/index.js

@@ -971,6 +971,7 @@ __export(git_exports, {
   ensureLatestDevelop: () => ensureLatestDevelop,
   ensureTagAtHead: () => ensureTagAtHead,
   fetchBaseBranch: () => fetchBaseBranch,
+  findCollidingWork: () => findCollidingWork,
   findContributorReleasePullRequests: () => findContributorReleasePullRequests,
   findTaskCommitsOnBase: () => findTaskCommitsOnBase,
   getBaseDivergence: () => getBaseDivergence,
@@ -2263,6 +2264,23 @@ function getRemoteBranchFiles(cwd, branch, baseBranch) {
     return [];
   }
 }
+function findCollidingWork(cwd, baseBranch, filesLikelyTouched) {
+  if (filesLikelyTouched.length === 0) return null;
+  const prs = listOpenPullRequests(cwd);
+  if (!prs || prs.length === 0) return null;
+  const wanted = new Set(filesLikelyTouched);
+  for (const pr of prs) {
+    const branchFiles = getRemoteBranchFiles(cwd, pr.headRefName, baseBranch);
+    const overlap = branchFiles.filter((f) => wanted.has(f));
+    if (overlap.length > 0) {
+      return {
+        label: `PR #${pr.number} "${pr.title}" (branch \`${pr.headRefName}\`, opened by ${pr.author})`,
+        files: overlap
+      };
+    }
+  }
+  return null;
+}
 var AUTO_WRITTEN_PATHS, GIT_NETWORK_TIMEOUT_MS, MERGE_RETRY_DELAY_MS, MERGE_MAX_RETRIES, GIT_FETCH_TIMEOUT_MS;
 var init_git = __esm({
   "src/lib/git.ts"() {
@@ -2520,7 +2538,6 @@ var init_proxy_adapter = __esm({
       "getBuildReportsSince",
       "getContextHashes",
       "getContextUtilisation",
-      "getCostSnapshots",
       "getCostSummary",
       "getCurrentNorthStar",
       "getCycleHealth",
@@ -3174,9 +3191,8 @@ Check PAPI_PROJECT_ID in your .mcp.json config. Find your project ID in the PAPI
       getCostSummary(cycleNumber) {
         return this.invoke("getCostSummary", [cycleNumber]);
       }
-      getCostSnapshots() {
-        return this.invoke("getCostSnapshots");
-      }
+      // task-3332: getCostSnapshots retired — see the removal note on CostSnapshot
+      // in packages/shared/src/entities.ts.
       appendCycleMetrics(snapshot) {
         return this.invoke("appendCycleMetrics", [snapshot]);
       }
@@ -27762,7 +27778,7 @@ function resolveAdHocCycle(cycle, latest, latestComplete) {
   if (cycle === "current") return latest;
   return latestComplete ? latest + 1 : latest;
 }
-async function recordAdHoc(adapter2, input) {
+async function recordAdHoc(adapter2, config2, input) {
   const [health, phases] = await Promise.all([
     adapter2.getCycleHealth(),
     adapter2.readPhases()
@@ -27784,9 +27800,16 @@ async function recordAdHoc(adapter2, input) {
     if (!existing) {
       throw new Error(`Task "${input.taskId}" not found on the board. Check the task ID and try again.`);
     }
-    if (!existing.assigneeId) {
+    if (existing.assigneeId) {
+      const gate = await resolveOwnerGate(adapter2, config2);
+      if (gate.enforced && (!gate.callerUserId || gate.callerUserId !== existing.assigneeId)) {
+        throw new Error(
+          `Task "${input.taskId}" (${existing.title}) is claimed by another member \u2014 ad-hoc work cannot be recorded against it. Have the claimer record it, or run \`task_unclaim\` to release it first.`
+        );
+      }
+    } else {
       warnings.push(
-        `\u2139\uFE0F ${input.taskId} has no assignee \u2014 recording ad-hoc work against an unclaimed pool task. If someone else might be building it too, check for an open PR/branch on the same files before merging.`
+        `\u2139\uFE0F ${input.taskId} has no assignee \u2014 recording ad-hoc work against an unclaimed pool task. ` + (input.collidingWorkNote ?? `If someone else might be building it too, check for an open PR/branch on the same files before merging.`)
       );
     }
     const updatePayload = {
@@ -28043,7 +28066,22 @@ async function handleAdHoc(adapter2, config2, args) {
   const gitUsable = !overrideNote && isGitAvailable() && isGitRepo(config2.projectRoot);
   const currentBranch = gitUsable ? getCurrentBranch(config2.projectRoot) : null;
   const baseBranch = gitUsable ? resolveBaseBranch(config2.projectRoot, config2.baseBranch) : null;
-  const result = await recordAdHoc(target, {
+  let collidingWorkNote;
+  if (taskId && gitUsable && baseBranch) {
+    try {
+      const existingTask = await target.getTask(taskId);
+      const filesLikelyTouched = existingTask?.buildHandoff?.filesLikelyTouched ?? [];
+      if (existingTask && !existingTask.assigneeId && filesLikelyTouched.length > 0) {
+        const collision = findCollidingWork(config2.projectRoot, baseBranch, filesLikelyTouched);
+        if (collision) {
+          const fileList = collision.files.slice(0, 3).join(", ") + (collision.files.length > 3 ? ", \u2026" : "");
+          collidingWorkNote = `${collision.label} already touches ${collision.files.length === 1 ? "the same file" : `${collision.files.length} of the same files`} (${fileList}) \u2014 check it before merging.`;
+        }
+      }
+    } catch {
+    }
+  }
+  const result = await recordAdHoc(target, config2, {
     title: title || "",
     taskId,
     notes: rawNotes,
@@ -28058,7 +28096,8 @@ async function handleAdHoc(adapter2, config2, args) {
     stage: stageArg,
     hold: holdArg,
     currentBranch,
-    baseBranch
+    baseBranch,
+    collidingWorkNote
   });
   if (!holdArg && gitUsable) {
     try {
@@ -29090,6 +29129,27 @@ var reviewSubmitTool = {
           }
         },
         required: ["verdict", "summary", "findings"]
+      },
+      proposal: {
+        type: "object",
+        description: 'task-3388, OPTIONAL (build-acceptance + verdict:"accept" only): propose a Decision or a Convention the build or the review itself settled. Same mechanism as build_execute\u2019s `proposal` (task-3273) \u2014 PAPI never mints one for you. A proposal that passes all four admission tests is QUEUED for the owner behind a decision gate, and nothing is written as an Active Decision. YOU apply the four tests (they are stated in the planning prompts); the server routes on your answers and makes no judgement about the content. Fails "arguable today" only and it is recorded as a Convention instead, riding every future build. Fails "constrains future work" and it is returned to you with the reason, unrecorded.',
+        properties: {
+          title: { type: "string", description: "One line stating the stance or rule." },
+          body: { type: "string", description: "What was decided or settled, and why." },
+          module: { type: "string", description: "Optional module scope. Only used when this lands as a Convention." },
+          tests: {
+            type: "object",
+            description: "The four admission tests, each answered explicitly. An omitted test is NOT a failed test \u2014 the proposal is refused rather than routed.",
+            properties: {
+              alternativesWereReal: { type: "boolean", description: "(a) Something else could genuinely have been chosen." },
+              constrainsFutureWork: { type: "boolean", description: "(b) It changes what a task nobody has written yet will do." },
+              arguableToday: { type: "boolean", description: "(c) A competent person could argue the other side right now." },
+              reversalCostsMore: { type: "boolean", description: "(d) Reversing it costs more than making it did." }
+            },
+            required: ["alternativesWereReal", "constrainsFutureWork", "arguableToday", "reversalCostsMore"]
+          }
+        },
+        required: ["title", "body", "tests"]
       }
     },
     required: ["task_id", "stage", "verdict", "comments"],
@@ -29705,6 +29765,30 @@ Next: address the feedback, then run \`build_execute ${taskId}\` to resubmit.`;
       }
     } catch {
     }
+    let proposalNote = "";
+    if (args.proposal !== void 0) {
+      if (!(stage === "build-acceptance" && verdict === "accept")) {
+        proposalNote = "\n\n---\n\n**Proposal not recorded.** `proposal` is only accepted on a build-acceptance `accept` \u2014 nothing has settled on a handoff-review or a non-accept verdict.\n\nThe review itself is unaffected \u2014 only the proposal was skipped.";
+      } else {
+        const validated = validateProposal(args.proposal);
+        if ("error" in validated) {
+          proposalNote = `
+
+---
+
+**Proposal not recorded.** ${validated.error}
+
+The review itself is unaffected \u2014 only the proposal failed.`;
+        } else {
+          const routing = routeProposal(validated.proposal);
+          const applied = await applyProposal(adapter2, routing, validated.proposal, {
+            cycleNumber: result.currentCycle,
+            sourceTaskId: result.taskId
+          });
+          proposalNote = formatProposalOutcome(routing, validated.proposal, applied);
+        }
+      }
+    }
     tracker.mark("format-response");
     return textResponse(
       `**${result.stageLabel}** recorded for ${result.taskId}.
@@ -29712,7 +29796,7 @@ Next: address the feedback, then run \`build_execute ${taskId}\` to resubmit.`;
 - **Verdict:** ${result.verdict}
 - **Comments:** ${trimForEcho(result.comments)}
 
-${statusNote}${capabilityReviewSkippedNote}${autoReviewNote}${securityNote}${adConflictNote}${unblockNote}${docClosureNote}${regenNote}${mergeNote}${overlapNote}${batchSummaryNote}${autoReleaseNote}${nextStepNote}${phaseNote}`
+${statusNote}${capabilityReviewSkippedNote}${autoReviewNote}${securityNote}${adConflictNote}${unblockNote}${docClosureNote}${regenNote}${mergeNote}${overlapNote}${batchSummaryNote}${autoReleaseNote}${nextStepNote}${phaseNote}${proposalNote}`
     );
   } catch (err) {
     const message = err instanceof Error ? err.message : String(err);
@@ -30746,6 +30830,41 @@ function formatUnblockSection(candidates) {
   return lines.join("\n");
 }
 
+// src/lib/decision-drafts.ts
+async function findPendingDecisionDrafts(adapter2) {
+  let blockedProbe;
+  try {
+    blockedProbe = await adapter2.queryBoard({ status: ["Blocked"], compact: true });
+  } catch {
+    return [];
+  }
+  if (blockedProbe.length === 0) return [];
+  const drafts = [];
+  for (const task of blockedProbe) {
+    const blocker = task.blocker;
+    if (!blocker || blocker.type !== "decision-gate" || blocker.ref !== PROPOSED_DECISION_REF) continue;
+    const evidence = (task.notes ?? "").split("\n")[0]?.trim() ?? "";
+    drafts.push({
+      taskId: task.displayId ?? task.id,
+      taskTitle: task.title,
+      evidence
+    });
+  }
+  return drafts;
+}
+function formatPendingDecisionDrafts(drafts) {
+  if (drafts.length === 0) return "";
+  const lines = ["## Decisions Awaiting Your Call"];
+  lines.push(
+    `${drafts.length} decision${drafts.length === 1 ? "" : "s"} proposed during a build, waiting on you \u2014 mint with \`strategy_change\` to make it a real Active Decision, or \`board_edit <task> status:Cancelled\` to dismiss it. Neither is automatic.`
+  );
+  lines.push("");
+  for (const d of drafts) {
+    lines.push(`- **${formatRef(d.taskId, d.taskTitle)}**${d.evidence ? ` \u2014 ${d.evidence}` : ""}`);
+  }
+  return lines.join("\n");
+}
+
 // src/lib/deferred-gate.ts
 var GATE_PHRASES = [
   "depends on",
@@ -32288,7 +32407,8 @@ async function handleOrient(rawAdapter, config2, args = {}, clientName, serverVe
         }
         let unrecordedNote2 = "";
         try {
-          const unrecorded = detectUnrecordedCommits(config2.projectRoot, config2.baseBranch);
+          const { compareRef } = getBaseDivergence(config2.projectRoot, config2.baseBranch, { timeoutMs: ORIGIN_FETCH_TIMEOUT_MS });
+          const unrecorded = detectUnrecordedCommits(config2.projectRoot, compareRef);
           if (unrecorded.length > 0) {
             const doneTasks = await adapter2.queryBoard({ status: ["Done"] });
             const adHocDoneTasks = doneTasks.filter((t) => t.cycle == null);
@@ -32417,8 +32537,14 @@ ${versionDrift}` : "";
     }
     tracker.mark("parallel-tail");
     const sharedContributorsPromise = adapterSupports(adapter2, "listContributors") ? adapter2.listContributors().catch(() => []) : Promise.resolve([]);
-    const [unblockCandidates, subAgents, teamSummaryLine, releaseHistoryLine, cohortVisibilityLine, carryForwardRefs] = await Promise.all([
+    const [unblockCandidates, pendingDecisionDrafts, subAgents, teamSummaryLine, releaseHistoryLine, cohortVisibilityLine, carryForwardRefs] = await Promise.all([
       tracked("unblock-candidates", () => findUnblockCandidates(adapter2, currentCycle2))().catch(() => []),
+      // task-3388: pending decision-proposal drafts (build_execute/review_submit's
+      // `proposal` param, task-3273/3388) — mandatory reader, deliberately
+      // uncapped and separate from the housekeeping-suggestion unblock list above
+      // (see lib/decision-drafts.ts for why). Runs on every orient call, not
+      // gated behind deep_housekeeping — same posture as unblock-candidates.
+      tracked("pending-decision-drafts", () => findPendingDecisionDrafts(adapter2))().catch(() => []),
       // task-1866: discover project sub-agents for the orient surface (read-only, never throws).
       listAgents(config2.projectRoot),
       // task-2071 (MU-3) + task-2072 (MU-5): team summary + release-history — both
@@ -32437,6 +32563,10 @@ ${versionDrift}` : "";
     const unblockNote = unblockSection ? `
 
 ${unblockSection}` : "";
+    const decisionDraftsSection = formatPendingDecisionDrafts(pendingDecisionDrafts);
+    const decisionDraftsNote = decisionDraftsSection ? `
+
+${decisionDraftsSection}` : "";
     const teamSummary = [teamSummaryLine, releaseHistoryLine, cohortVisibilityLine].filter(Boolean).join("\n") || void 0;
     let deferredGateNote = "";
     if (deepHousekeeping) {
@@ -32472,7 +32602,7 @@ ${formatRuntimeIdentity(getRuntimeIdentity(config2, serverVersion))}`;
     let effStaleSkillsNote = staleSkillsNote;
     let effResearchSignalsNote = researchSignalsNote;
     const droppedNotes = [];
-    const assembleOrientOutput = () => 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 + effStaleSkillsNote + effResearchSignalsNote + recsNote + pendingReviewNote + patternsNote + unactionedIssuesNote + skillProposalsNote + sessionGuidanceNote + effOnboardingCoachingNote + versionNote + enrichmentNote + deliveryShapeNote + preBuildCheckNote + effDeepHint + enrichmentFilesSection;
+    const assembleOrientOutput = () => projectOverrideLine + projectBannerNote + formatOrientSummary(healthResult, buildInfo, hierarchy, latestTag, config2.projectRoot, environment, subAgents, projectName, teamSummary, clientName, carryForwardRefs) + runtimeIdentityNote + unblockNote + decisionDraftsNote + deferredGateNote + feedbackResolvedNote + alertsNote + ttfvNote + reconciliationNote + mergedInProgressNote + unrecordedNote + unregisteredDocsNote + effStaleSkillsNote + effResearchSignalsNote + recsNote + pendingReviewNote + patternsNote + unactionedIssuesNote + skillProposalsNote + sessionGuidanceNote + effOnboardingCoachingNote + versionNote + enrichmentNote + deliveryShapeNote + preBuildCheckNote + effDeepHint + enrichmentFilesSection;
     const orientBudgetSoft = Number(process.env.PAPI_ORIENT_CONTEXT_BUDGET) || 6e4;
     let assembled = assembleOrientOutput();
     if (Buffer.byteLength(assembled, "utf-8") > orientBudgetSoft && effDeepHint) {

package/package.json

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