@papi-ai/server 0.7.48 → 0.7.50

package/dist/backfill-cycle-metrics.js

@@ -30,6 +30,7 @@ __export(git_exports, {
   getCurrentBranch: () => getCurrentBranch,
   getDocPathsTouchedOnBranch: () => getDocPathsTouchedOnBranch,
   getFilesChangedBetween: () => getFilesChangedBetween,
+  getFilesChangedForTask: () => getFilesChangedForTask,
   getFilesChangedFromBase: () => getFilesChangedFromBase,
   getHeadCommitSha: () => getHeadCommitSha,
   getHeadCommitSubject: () => getHeadCommitSubject,
@@ -980,6 +981,21 @@ function getFilesChangedBetween(cwd, fromRef, toRef) {
     return [];
   }
 }
+function getFilesChangedForTask(cwd, baseBranch, taskId) {
+  try {
+    const mergeBase = execFileSync("git", ["merge-base", baseBranch, "HEAD"], { cwd, encoding: "utf-8" }).trim();
+    const output = execFileSync(
+      "git",
+      ["log", `${mergeBase}..HEAD`, "-E", `--grep=${taskId}($|[^0-9])`, "--pretty=format:", "--name-only"],
+      { cwd, encoding: "utf-8" }
+    ).trim();
+    if (!output) return [];
+    const files = output.split("\n").map((l) => l.trim()).filter(Boolean);
+    return Array.from(new Set(files));
+  } catch {
+    return [];
+  }
+}
 function getLastCommitFiles(cwd) {
   try {
     const output = execFileSync(

package/dist/index.js

@@ -31,6 +31,7 @@ __export(git_exports, {
   getCurrentBranch: () => getCurrentBranch,
   getDocPathsTouchedOnBranch: () => getDocPathsTouchedOnBranch,
   getFilesChangedBetween: () => getFilesChangedBetween,
+  getFilesChangedForTask: () => getFilesChangedForTask,
   getFilesChangedFromBase: () => getFilesChangedFromBase,
   getHeadCommitSha: () => getHeadCommitSha,
   getHeadCommitSubject: () => getHeadCommitSubject,
@@ -981,6 +982,21 @@ function getFilesChangedBetween(cwd, fromRef, toRef) {
     return [];
   }
 }
+function getFilesChangedForTask(cwd, baseBranch, taskId) {
+  try {
+    const mergeBase = execFileSync("git", ["merge-base", baseBranch, "HEAD"], { cwd, encoding: "utf-8" }).trim();
+    const output = execFileSync(
+      "git",
+      ["log", `${mergeBase}..HEAD`, "-E", `--grep=${taskId}($|[^0-9])`, "--pretty=format:", "--name-only"],
+      { cwd, encoding: "utf-8" }
+    ).trim();
+    if (!output) return [];
+    const files = output.split("\n").map((l) => l.trim()).filter(Boolean);
+    return Array.from(new Set(files));
+  } catch {
+    return [];
+  }
+}
 function getLastCommitFiles(cwd) {
   try {
     const output = execFileSync(
@@ -20771,7 +20787,13 @@ async function completeBuild(adapter2, config2, taskId, input, options = {}, cli
     const changed = getFilesChangedFromBase(config2.projectRoot, baseBranch);
     if (changed.length > 0) report.filesChanged = changed;
     const startSha = taskStartShaMap.get(taskId);
-    const driftChanged = startSha ? getFilesChangedBetween(config2.projectRoot, startSha, "HEAD") : changed;
+    let driftChanged;
+    if (startSha) {
+      driftChanged = getFilesChangedBetween(config2.projectRoot, startSha, "HEAD");
+    } else {
+      const taskScoped = getFilesChangedForTask(config2.projectRoot, baseBranch, taskId);
+      driftChanged = taskScoped.length > 0 ? taskScoped : changed;
+    }
     const drift = computeScopeDriftSignal(task.buildHandoff?.filesLikelyTouched, driftChanged);
     if (drift) report.scopeDriftSignal = drift;
   }
@@ -23680,19 +23702,19 @@ function mergeAfterAccept(config2, taskId) {
     return { merged: false, skipped: false, message: `PR merge failed: ${merge.message}`, details };
   }
   details.push(merge.message);
-  if (hasUncommittedChanges(config2.projectRoot, AUTO_WRITTEN_PATHS)) {
-    try {
-      const cleanup = stageDirAndCommit(
-        config2.projectRoot,
-        ".",
-        `chore(${taskId}): commit remaining changes before branch switch`
-      );
-      if (cleanup.committed) {
-        details.push("Committed remaining changes before branch switch.");
-      }
-    } catch {
-      details.push("Warning: uncommitted changes detected \u2014 branch switch may fail.");
-    }
+  const trackedDirty = getTrackedModifiedFiles(config2.projectRoot);
+  if (trackedDirty.length > 0) {
+    const shown = trackedDirty.slice(0, 5).join(", ");
+    const more = trackedDirty.length > 5 ? ` (+${trackedDirty.length - 5} more)` : "";
+    details.push(
+      `Local branch switch skipped: the working tree has uncommitted tracked changes on '${featureBranch}' (possibly another session's in-progress work) that a checkout to '${baseBranch}' would revert. Commit or stash them, then run \`git checkout ${baseBranch} && git pull\` to finish. Dirty: ${shown}${more}.`
+    );
+    return {
+      merged: true,
+      skipped: false,
+      message: `PR merged: \`${featureBranch}\` \u2192 \`${baseBranch}\`. Local switch skipped \u2014 tracked-dirty tree preserved.`,
+      details
+    };
   }
   const checkout = checkoutBranch(config2.projectRoot, baseBranch);
   if (checkout.success) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@papi-ai/server",
-  "version": "0.7.48",
-  "description": "PAPI MCP server \u2014 AI-powered sprint planning, build execution, and strategy review for software projects",
+  "version": "0.7.50",
+  "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",
   "type": "module",
@@ -42,7 +42,7 @@
   ],
   "repository": {
     "type": "git",
-    "url": "https://github.com/cathalos92/papi-ui.git",
+    "url": "https://github.com/getpapi/papi.git",
     "directory": "packages/server"
   },
   "engines": {