@bridge_gpt/mcp-server 0.2.41 → 0.2.43

package/build/worktree-core.js

@@ -97,21 +97,32 @@ function pickWorktreePathField(parsed) {
     return undefined;
 }
 /**
- * F7: decide whether a PRE-EXISTING branch is safe to reuse as a conductor
- * worktree base. A branch whose tip is an ancestor of the resolved base carries
- * no commits beyond base (nothing stale to build on) and is safe. A branch with
- * commits not on base is a leftover from a prior run — refuse it. Prefers the
- * authoritative `origin/<base>` ref when present. Conservative: any inability to
- * prove ancestry refuses (when in doubt, refuse).
+ * The remediation sentence for a branch left over by a prior FAILED run.
+ * Unchanged since the guard was introduced.
+ */
+function staleLeftoverRemedy(branch, baseRef) {
+    return (`it carries commits not on the resolved base (likely a leftover from a prior run). ` +
+        `Refusing to reuse a stale worktree — delete it (git worktree remove + git branch -D ${branch}) ` +
+        `or rebase it onto ${baseRef}, then re-dispatch.`);
+}
+/**
+ * BAPI-862: the remediation for a branch that carries a SUCCEEDED implement whose
+ * pull request was never attached.
  *
- * `baseStartPoint` (BAPI-527) is the SAME effective base new worktrees are cut
- * from: a branch name for interactive dispatch, or the fetched immutable commit
- * SHA for non-mutating conductor dispatch. When it is a SHA the `origin/<sha>`
- * probe below naturally fails to resolve, so the ancestry check falls back to
- * comparing the existing branch directly against that fetched SHA — never
- * against the local `main` branch name.
+ * Names the `pr_not_attached` gate observation so the executor refusal and the
+ * reconciler's own state are one searchable vocabulary, points at attachment, and
+ * states plainly that the two remedies above destroy completed work. It must not
+ * contain the words "delete" or "rebase" at all: an operator scanning a wall of
+ * job output for the next command is exactly who lost work last time.
  */
-export async function isExistingBranchSafeToReuse(deps, branch, baseStartPoint) {
+function unattachedSuccessRemedy(branch) {
+    return (`it carries the commits of a SUCCEEDED implement whose pull request was never attached ` +
+        `(implement gate observation: pr_not_attached). Refusing to reuse the worktree — but this ` +
+        `branch is finished work, not a leftover. Open or attach a pull request from '${branch}' and ` +
+        `let the reconciler bind it. Do NOT remove or re-write the branch: either would destroy a ` +
+        `completed implementation.`);
+}
+export async function isExistingBranchSafeToReuse(deps, branch, baseStartPoint, classification = "unknown") {
     let baseRef = baseStartPoint;
     const originRef = `origin/${baseStartPoint}`;
     const originExists = await deps.runCommand("git", ["rev-parse", "--verify", "--quiet", originRef], { cwd: deps.cwd });
@@ -122,11 +133,14 @@ export async function isExistingBranchSafeToReuse(deps, branch, baseStartPoint)
     const ancestor = await deps.runCommand("git", ["merge-base", "--is-ancestor", branch, baseRef], { cwd: deps.cwd });
     if (commandSucceeded(ancestor))
         return { safe: true };
+    // The REFUSAL is identical either way (BAPI-862 non-goal: refusal behavior is
+    // unchanged). Only the diagnosis and the remedy differ.
+    const remedy = classification === "succeeded_pr_not_attached"
+        ? unattachedSuccessRemedy(branch)
+        : staleLeftoverRemedy(branch, baseRef);
     return {
         safe: false,
-        reason: `existing branch '${branch}' is not an ancestor of ${baseRef}; it carries commits not on the ` +
-            `resolved base (likely a leftover from a prior run). Refusing to reuse a stale worktree — delete it ` +
-            `(git worktree remove + git branch -D ${branch}) or rebase it onto ${baseRef}, then re-dispatch.`,
+        reason: `existing branch '${branch}' is not an ancestor of ${baseRef}; ${remedy}`,
     };
 }
 /**
@@ -263,7 +277,7 @@ export async function createWorktreeForTicket(deps, key, branchOverrides, worktr
         // check compares against the SAME effective base start point (branch name or
         // fetched SHA) that a NEW branch would be cut from below.
         if (exists && guardStaleWorktree) {
-            const safety = await isExistingBranchSafeToReuse(deps, branch, baseStartPoint);
+            const safety = await isExistingBranchSafeToReuse(deps, branch, baseStartPoint, behavior.staleBranchClassification ?? "unknown");
             if (!safety.safe) {
                 return {
                     key,

package/docs/CONDUCTOR.md

@@ -315,6 +315,28 @@ redeems the approval token and the server returns `merge.succeeded`.
 store uses schema version 5 (BAPI-413) to accommodate the `merge.pending_approval`
 type in the `events.type` CHECK constraint.
 
+**Who performs the write (BAPI-832).** "Never holds VCS write credentials" above
+describes the *credential*, not the *typing*, and it remains true everywhere. Two
+paths now perform the provider write with the operator's local `gh` rather than
+with the GitHub App installation token, because GitHub's merge endpoint requires
+`contents: write` and the Bridge GPT App installation is `contents: read`:
+
+- the executor's `merge` job, via `makeLocalMergeExecutor` — the arrangement
+  BAPI-572 locked in; and
+- the `merge_pull_request` MCP tool, which since BAPI-832 sends
+  `execution: "local"`, receives a non-terminal `approved_for_local_execution`
+  from the route above, merges through that same `conductor/local-merge.ts` seam,
+  and reports the outcome to
+  `POST /vcs/pull-requests/{pr_number}/merge/complete`.
+
+In both, the server still owns every decision — the guards, the lease, and the
+terminal ledger row — and neither path holds a credential of its own; they borrow
+the operator's `gh` session. Mode is `merge_execution` on `epic_supervisor_config`
+(`local` by default, `server` for installations whose App holds
+`contents: write`). A caller that dies mid-merge is recovered by lease expiry, not
+by a new mechanism: the next call re-runs the whole tail, and the provider re-read
+reports `already_merged` if the merge landed.
+
 ## Durable execution environment hardening (BAPI-527)
 
 Worker ledger tools are made **reliable again** — this is a robustness fix for the

package/docs/install/mcp-tool-integrations.md

@@ -179,15 +179,31 @@ by tier.
 | Tool | Dependencies (class) |
 |---|---|
 | `create_pull_request` | VCS **[BLOCK]** (Tier-1) |
-| `merge_pull_request` | VCS **[BLOCK]** (Tier-1; protected server-decided merge — see below) |
+| `merge_pull_request` | VCS **[BLOCK]** (Tier-1; protected server-decided merge) + local `gh` login **[BLOCK]** (the merge executes here — see below) |
 | `resolve_ci_checks` | VCS **[BLOCK]** (Tier-1) |
 | `poll_ci_checks` | VCS **[BLOCK]** (Tier-1); also **hidden until `ci_check_config` is resolved** (needs a prior `resolve_ci_checks`) |
 | `materialize_fresh_base` | VCS / git base ref **[BLOCK]** (Tier-1; materializes a pinned base tree) |
 
 #### `merge_pull_request` — what the caller can observe
 
-The tool holds no VCS credential and performs no merge of its own; it asks the
-server and reports the answer. Four constraints are worth knowing before calling it:
+The tool holds no VCS credential and makes no merge decision of its own; it asks
+the server, and the server decides. Since **BAPI-832** the tool does perform the
+*write*, with the operator's `gh` login, because GitHub's merge endpoint needs
+`contents: write` and the Bridge GPT App installation is `contents: read` — a
+server-side merge simply cannot succeed here. Every server-side guard still runs
+first, and the local path is reachable only from a live approval for that exact
+pull request and head commit.
+
+Constraints worth knowing before calling it:
+
+- **A logged-in `gh` is required on the machine running the MCP server**, because
+  that is where the merge executes. Without one the tool refuses with
+  `local_gh_unavailable` or `local_gh_unauthenticated` and a `hint` naming the fix
+  (`gh auth login`); nothing is merged and the server-side lease is released. This
+  is a **BLOCK**, not a degrade: with no `gh`, no merge is possible at all.
+  `doctor` reports the same state under `local_merge`, so it is diagnosable
+  read-only before a run. Repositories configured `merge_execution: server` are
+  the exception — they need the App permission instead, and no local `gh`.
 
 - **Only `merged: true` is success.** `dry_run`, `pending_approval`, and
   `lease_held` are non-progress outcomes — nothing was merged, and repeating the

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bridge_gpt/mcp-server",
-  "version": "0.2.41",
+  "version": "0.2.43",
   "description": "Bridge API MCP server — exposes Jira endpoints as MCP tools for Claude Code agents",
   "license": "MIT",
   "type": "module",
@@ -29,7 +29,7 @@
     "test": "npm run test:normal && npm run test:module-mocks",
     "test:normal": "node scripts/run-unit-tests.js normal",
     "test:module-mocks": "node scripts/run-unit-tests.js module-mocks",
-    "test:integration": "node --test build/conductor/conductor-runtime.integration.test.js build/integration/refresh-main.integration.test.js build/integration/command-provisioning.integration.test.js build/integration/start-tickets.integration.test.js build/integration/start-tickets-tier-handoff.integration.test.js build/integration/doctor.integration.test.js build/integration/agent-capabilities.integration.test.js build/integration/conductor-producer.integration.test.js build/integration/conductor-message-relay.integration.test.js build/integration/executor-http-runner.integration.test.js build/integration/executor-job-behaviors.integration.test.js build/integration/executor-recovery-jobs.integration.test.js build/integration/executor-spec-review-prompt.integration.test.js build/integration/resume-pre-spawn.git.integration.test.js build/integration/executor-containment.git.integration.test.js build/integration/conduct-epic-cli.integration.test.js build/integration/conduct-epic-corrections.integration.test.js build/integration/worker-finalization-origin.integration.test.js build/integration/post-remediation-merge-ci-wait.integration.test.js build/integration/executor-merge-supervision.integration.test.js build/integration/attachment-binary-roundtrip.integration.test.js build/integration/dependent-ticket-fresh-base.integration.test.js build/integration/execute-plan-instructions.integration.test.js build/integration/implement-ticket-finalization-order.integration.test.js build/integration/conductor-bundle-artifacts.integration.test.js build/integration/install-bridge-repo-resolution.integration.test.js build/integration/capability-report-contract.integration.test.js build/integration/request-brainstorm-general.integration.test.js build/integration/request-council-trigger-drop.integration.test.js build/integration/install-bridge-onboarding-launch.integration.test.js build/integration/install-bridge-conductor.integration.test.js build/integration/install-bridge-conductor-executor.integration.test.js build/integration/install-bridge-failure-guards.integration.test.js build/integration/learn-repository-pipeline.integration.test.js build/integration/visual-diff-mcp.integration.test.js build/integration/executor-mcp-provisioning.integration.test.js build/integration/executor-worktree-reentry.integration.test.js build/integration/sfcc-read-error-contract.integration.test.js build/integration/sfcc-read-surface.integration.test.js build/integration/sfcc-response-envelope.integration.test.js build/integration/sfcc-total-error-contract.integration.test.js build/integration/sfcc-target-boundary.integration.test.js build/integration/serve-stdio.integration.test.js build/integration/install-alias.integration.test.js build/integration/setup-epic-validation.integration.test.js build/integration/plane-cli.integration.test.js build/integration/executor-auth-retirement.integration.test.js build/integration/decision-implications-command-scaffold.test.js build/integration/strict-mcp-worker-contract.test.js build/integration/executor-adapter-flow.test.js build/integration/install-cli-contract.integration.test.js build/integration/inline-phase-state-tools.test.js",
+    "test:integration": "node scripts/run-integration-tests.js",
     "test:smoke": "node --test build/integration/packaged-cli-smoke.test.js",
     "canary:agent-capabilities": "npm run build && node scripts/agent-capabilities-canary.mjs",
     "prepublishOnly": "node scripts/bundle-assets.js && npm run build && node scripts/verify-shebang.cjs"

package/pipelines/greenfield-setup.json

@@ -0,0 +1,286 @@
+{
+  "name": "greenfield-setup",
+  "description": "Onboard a brand-new project that has no code to learn from yet. Offers a bounded interview (or generic defaults), ratifies the open non-functional requirements on a decision page, settles version control, convenes a general council, synthesizes one coherent set of project standards behind a single approval, writes the unset standards fields, and closes with the one authoritative install-manifest apply plus the read-after-write manifest /install-bridge resumes from.",
+  "variables": [
+    "docs_dir",
+    "repo_name"
+  ],
+  "steps": [
+    {
+      "type": "mcp_call",
+      "tool": "ping",
+      "params": {},
+      "description": "Verify Bridge API connectivity"
+    },
+    {
+      "type": "agent_task",
+      "instruction": "Create the required output directory by running: mkdir -p {docs_dir}/greenfield/{repo_name}/standards",
+      "description": "Create the greenfield working directory"
+    },
+    {
+      "type": "mcp_call",
+      "id": "read_install_manifest",
+      "tool": "get_install_manifest",
+      "params": {},
+      "description": "Read the install manifest once and keep its snapshot token for the final apply"
+    },
+    {
+      "type": "mcp_call",
+      "id": "fetch_architecture_instructions",
+      "tool": "config_field",
+      "params": {
+        "field_name": "architecture_instructions",
+        "operation": "get"
+      },
+      "description": "Check whether architecture_instructions already has content",
+      "on_error": "warn_and_continue"
+    },
+    {
+      "type": "mcp_call",
+      "id": "fetch_review_instructions",
+      "tool": "config_field",
+      "params": {
+        "field_name": "review_instructions",
+        "operation": "get"
+      },
+      "description": "Check whether review_instructions already has content",
+      "on_error": "warn_and_continue"
+    },
+    {
+      "type": "mcp_call",
+      "id": "fetch_documentation_instructions",
+      "tool": "config_field",
+      "params": {
+        "field_name": "documentation_instructions",
+        "operation": "get"
+      },
+      "description": "Check whether documentation_instructions already has content",
+      "on_error": "warn_and_continue"
+    },
+    {
+      "type": "mcp_call",
+      "id": "fetch_unit_testing_instructions",
+      "tool": "config_field",
+      "params": {
+        "field_name": "unit_testing_instructions",
+        "operation": "get"
+      },
+      "description": "Check whether unit_testing_instructions already has content",
+      "on_error": "warn_and_continue"
+    },
+    {
+      "type": "mcp_call",
+      "id": "fetch_e2e_testing_instructions",
+      "tool": "config_field",
+      "params": {
+        "field_name": "e2e_testing_instructions",
+        "operation": "get"
+      },
+      "description": "Check whether e2e_testing_instructions already has content",
+      "on_error": "warn_and_continue"
+    },
+    {
+      "type": "mcp_call",
+      "id": "fetch_frontend_correctness_standards",
+      "tool": "config_field",
+      "params": {
+        "field_name": "frontend_correctness_standards",
+        "operation": "get"
+      },
+      "description": "Check whether frontend_correctness_standards already has content",
+      "on_error": "warn_and_continue"
+    },
+    {
+      "type": "mcp_call",
+      "id": "fetch_backend_correctness_standards",
+      "tool": "config_field",
+      "params": {
+        "field_name": "backend_correctness_standards",
+        "operation": "get"
+      },
+      "description": "Check whether backend_correctness_standards already has content",
+      "on_error": "warn_and_continue"
+    },
+    {
+      "type": "mcp_call",
+      "id": "fetch_template_correctness_standards",
+      "tool": "config_field",
+      "params": {
+        "field_name": "template_correctness_standards",
+        "operation": "get"
+      },
+      "description": "Check whether template_correctness_standards already has content",
+      "on_error": "warn_and_continue"
+    },
+    {
+      "type": "mcp_call",
+      "id": "fetch_style_correctness_standards",
+      "tool": "config_field",
+      "params": {
+        "field_name": "style_correctness_standards",
+        "operation": "get"
+      },
+      "description": "Check whether style_correctness_standards already has content",
+      "on_error": "warn_and_continue"
+    },
+    {
+      "type": "mcp_call",
+      "id": "fetch_design_principles",
+      "tool": "config_field",
+      "params": {
+        "field_name": "design_principles",
+        "operation": "get"
+      },
+      "description": "Check whether design_principles already has content",
+      "on_error": "warn_and_continue"
+    },
+    {
+      "type": "agent_task",
+      "id": "greenfield_interview",
+      "instruction_file": "greenfield-interview.md",
+      "description": "Offer the interview, settle the project framing and version control, and commit the decisions"
+    },
+    {
+      "type": "agent_task",
+      "id": "synthesize_standards",
+      "instruction_file": "greenfield-synthesize-standards.md",
+      "description": "Draft the project standards from the committed framing and take one approval"
+    },
+    {
+      "type": "mcp_call",
+      "id": "upload_architecture_instructions",
+      "tool": "config_field",
+      "params": {
+        "field_name": "architecture_instructions",
+        "file_path": "{docs_dir}/greenfield/{repo_name}/standards/architecture_instructions.md",
+        "operation": "update",
+        "only_if_null": true
+      },
+      "description": "Save the architecture standard",
+      "on_error": "warn_and_continue"
+    },
+    {
+      "type": "mcp_call",
+      "id": "upload_review_instructions",
+      "tool": "config_field",
+      "params": {
+        "field_name": "review_instructions",
+        "file_path": "{docs_dir}/greenfield/{repo_name}/standards/review_instructions.md",
+        "operation": "update",
+        "only_if_null": true
+      },
+      "description": "Save the code-review standard",
+      "on_error": "warn_and_continue"
+    },
+    {
+      "type": "mcp_call",
+      "id": "upload_documentation_instructions",
+      "tool": "config_field",
+      "params": {
+        "field_name": "documentation_instructions",
+        "file_path": "{docs_dir}/greenfield/{repo_name}/standards/documentation_instructions.md",
+        "operation": "update",
+        "only_if_null": true
+      },
+      "description": "Save the documentation standard",
+      "on_error": "warn_and_continue"
+    },
+    {
+      "type": "mcp_call",
+      "id": "upload_unit_testing_instructions",
+      "tool": "config_field",
+      "params": {
+        "field_name": "unit_testing_instructions",
+        "file_path": "{docs_dir}/greenfield/{repo_name}/standards/unit_testing_instructions.md",
+        "operation": "update",
+        "only_if_null": true
+      },
+      "description": "Save the unit-testing standard",
+      "on_error": "warn_and_continue"
+    },
+    {
+      "type": "mcp_call",
+      "id": "upload_e2e_testing_instructions",
+      "tool": "config_field",
+      "params": {
+        "field_name": "e2e_testing_instructions",
+        "file_path": "{docs_dir}/greenfield/{repo_name}/standards/e2e_testing_instructions.md",
+        "operation": "update",
+        "only_if_null": true
+      },
+      "description": "Save the end-to-end testing standard",
+      "on_error": "warn_and_continue"
+    },
+    {
+      "type": "mcp_call",
+      "id": "upload_frontend_correctness_standards",
+      "tool": "config_field",
+      "params": {
+        "field_name": "frontend_correctness_standards",
+        "file_path": "{docs_dir}/greenfield/{repo_name}/standards/frontend_correctness_standards.md",
+        "operation": "update",
+        "only_if_null": true
+      },
+      "description": "Save the frontend correctness standard",
+      "on_error": "warn_and_continue"
+    },
+    {
+      "type": "mcp_call",
+      "id": "upload_backend_correctness_standards",
+      "tool": "config_field",
+      "params": {
+        "field_name": "backend_correctness_standards",
+        "file_path": "{docs_dir}/greenfield/{repo_name}/standards/backend_correctness_standards.md",
+        "operation": "update",
+        "only_if_null": true
+      },
+      "description": "Save the backend correctness standard",
+      "on_error": "warn_and_continue"
+    },
+    {
+      "type": "mcp_call",
+      "id": "upload_template_correctness_standards",
+      "tool": "config_field",
+      "params": {
+        "field_name": "template_correctness_standards",
+        "file_path": "{docs_dir}/greenfield/{repo_name}/standards/template_correctness_standards.md",
+        "operation": "update",
+        "only_if_null": true
+      },
+      "description": "Save the template correctness standard",
+      "on_error": "warn_and_continue"
+    },
+    {
+      "type": "mcp_call",
+      "id": "upload_style_correctness_standards",
+      "tool": "config_field",
+      "params": {
+        "field_name": "style_correctness_standards",
+        "file_path": "{docs_dir}/greenfield/{repo_name}/standards/style_correctness_standards.md",
+        "operation": "update",
+        "only_if_null": true
+      },
+      "description": "Save the style correctness standard",
+      "on_error": "warn_and_continue"
+    },
+    {
+      "type": "mcp_call",
+      "id": "upload_design_principles",
+      "tool": "config_field",
+      "params": {
+        "field_name": "design_principles",
+        "file_path": "{docs_dir}/greenfield/{repo_name}/standards/design_principles.md",
+        "operation": "update",
+        "only_if_null": true
+      },
+      "description": "Save the design principles",
+      "on_error": "warn_and_continue"
+    },
+    {
+      "type": "agent_task",
+      "id": "apply_and_report",
+      "instruction_file": "greenfield-apply-and-report.md",
+      "description": "Save the project setup and report where the project stands"
+    }
+  ]
+}